Compare commits
8 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6ff3138ce1 | ||
|
|
cb437405ea | ||
|
|
f52570e011 | ||
|
|
8b1fda292d | ||
|
|
5e2afcdaeb | ||
|
|
bdee0e3872 | ||
|
|
fb4924cc0a | ||
|
|
ca9bc6f3bb |
10
CHANGES.txt
10
CHANGES.txt
@@ -1,3 +1,13 @@
|
|||||||
|
Version 2.1.0
|
||||||
|
|
||||||
|
- ISSUE #20: Support for negative decimal numbers;
|
||||||
|
- ISSUE #19: Corrected setDisplayToString dot bug.
|
||||||
|
|
||||||
|
Version 2.0.1
|
||||||
|
|
||||||
|
- ISSUE #15: Backwards compatibility with previous Arduino IDE (pure virtual functions were not supported);
|
||||||
|
- ISSUE #18: Corrected problem with setLEDs() caused by changes in the previous version.
|
||||||
|
|
||||||
Version 2.0.0
|
Version 2.0.0
|
||||||
|
|
||||||
- Support for the TM1640;
|
- Support for the TM1640;
|
||||||
|
|||||||
31
TM1638.cpp
31
TM1638.cpp
@@ -44,18 +44,18 @@ void TM1638::setDisplayToHexNumber(unsigned long number, byte dots, boolean lead
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void TM1638::setDisplayToDecNumber(unsigned long number, byte dots, boolean leadingZeros,
|
void TM1638::setDisplayToDecNumberAt(unsigned long number, byte dots, byte startingPos, boolean leadingZeros,
|
||||||
const byte numberFont[])
|
const byte numberFont[])
|
||||||
{
|
{
|
||||||
if (number > 99999999L) {
|
if (number > 99999999L) {
|
||||||
setDisplayToError();
|
setDisplayToError();
|
||||||
} else {
|
} else {
|
||||||
for (int i = 0; i < displays; i++) {
|
for (int i = 0; i < displays - startingPos; i++) {
|
||||||
if (number != 0) {
|
if (number != 0) {
|
||||||
setDisplayDigit(number % 10, displays - i - 1, (dots & (1 << i)) != 0, numberFont);
|
setDisplayDigit(number % 10, displays - i - 1, (dots & (1 << i)) != 0, numberFont);
|
||||||
number /= 10;
|
number /= 10;
|
||||||
} else {
|
} else {
|
||||||
if (leadingZeros) {
|
if (leadingZeros) {
|
||||||
setDisplayDigit(0, displays - i - 1, (dots & (1 << i)) != 0, numberFont);
|
setDisplayDigit(0, displays - i - 1, (dots & (1 << i)) != 0, numberFont);
|
||||||
} else {
|
} else {
|
||||||
clearDisplayDigit(displays - i - 1, (dots & (1 << i)) != 0);
|
clearDisplayDigit(displays - i - 1, (dots & (1 << i)) != 0);
|
||||||
@@ -65,6 +65,27 @@ void TM1638::setDisplayToDecNumber(unsigned long number, byte dots, boolean lead
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void TM1638::setDisplayToDecNumber(unsigned long number, byte dots, boolean leadingZeros,
|
||||||
|
const byte numberFont[])
|
||||||
|
{
|
||||||
|
setDisplayToDecNumberAt(number, dots, leadingZeros, 0, numberFont);
|
||||||
|
}
|
||||||
|
|
||||||
|
void TM1638::setDisplayToSignedDecNumber(signed long number, byte dots, boolean leadingZeros,
|
||||||
|
const byte numberFont[])
|
||||||
|
{
|
||||||
|
if (number >= 0) {
|
||||||
|
setDisplayToDecNumberAt(number, dots, 0, leadingZeros, numberFont);
|
||||||
|
} else {
|
||||||
|
if (-number > 9999999L) {
|
||||||
|
setDisplayToError();
|
||||||
|
} else {
|
||||||
|
setDisplayToDecNumberAt(-number, dots, 1, leadingZeros, numberFont);
|
||||||
|
sendChar(0, MINUS, (dots & (0x80)) != 0);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
void TM1638::setDisplayToBinNumber(byte number, byte dots, const byte numberFont[])
|
void TM1638::setDisplayToBinNumber(byte number, byte dots, const byte numberFont[])
|
||||||
{
|
{
|
||||||
for (int i = 0; i < displays; i++) {
|
for (int i = 0; i < displays; i++) {
|
||||||
@@ -82,11 +103,11 @@ void TM1638::setLEDs(word leds)
|
|||||||
for (int i = 0; i < displays; i++) {
|
for (int i = 0; i < displays; i++) {
|
||||||
byte color = 0;
|
byte color = 0;
|
||||||
|
|
||||||
if (leds & (1 << i) != 0) {
|
if ((leds & (1 << i)) != 0) {
|
||||||
color |= TM1638_COLOR_RED;
|
color |= TM1638_COLOR_RED;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (leds & (1 << (i + 8)) != 0) {
|
if ((leds & (1 << (i + 8))) != 0) {
|
||||||
color |= TM1638_COLOR_GREEN;
|
color |= TM1638_COLOR_GREEN;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
5
TM1638.h
5
TM1638.h
@@ -43,6 +43,9 @@ class TM1638 : public TM16XX
|
|||||||
/** Set the display to a unsigned decimal number (with or without leading zeros) */
|
/** Set the display to a unsigned decimal number (with or without leading zeros) */
|
||||||
void setDisplayToDecNumber(unsigned long number, byte dots, boolean leadingZeros = true,
|
void setDisplayToDecNumber(unsigned long number, byte dots, boolean leadingZeros = true,
|
||||||
const byte numberFont[] = NUMBER_FONT);
|
const byte numberFont[] = NUMBER_FONT);
|
||||||
|
/** Set the display to a signed decimal number (with or without leading zeros) */
|
||||||
|
void setDisplayToSignedDecNumber(signed long number, byte dots, boolean leadingZeros = true,
|
||||||
|
const byte numberFont[] = NUMBER_FONT);
|
||||||
/** Set the display to a unsigned binary number */
|
/** Set the display to a unsigned binary number */
|
||||||
void setDisplayToBinNumber(byte number, byte dots,
|
void setDisplayToBinNumber(byte number, byte dots,
|
||||||
const byte numberFont[] = NUMBER_FONT);
|
const byte numberFont[] = NUMBER_FONT);
|
||||||
@@ -57,6 +60,8 @@ class TM1638 : public TM16XX
|
|||||||
|
|
||||||
protected:
|
protected:
|
||||||
virtual void sendChar(byte pos, byte data, boolean dot);
|
virtual void sendChar(byte pos, byte data, boolean dot);
|
||||||
|
void setDisplayToDecNumberAt(unsigned long number, byte dots, byte startingPos,
|
||||||
|
boolean leadingZeros, const byte numberFont[]);
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
4
TM1640.h
4
TM1640.h
@@ -34,10 +34,6 @@ class TM1640 : public TM16XX
|
|||||||
/** Instantiate a tm1640 module specifying the display state, the starting intensity (0-7) data and clock pins. */
|
/** Instantiate a tm1640 module specifying the display state, the starting intensity (0-7) data and clock pins. */
|
||||||
TM1640(byte dataPin, byte clockPin, boolean activateDisplay = true, byte intensity = 7);
|
TM1640(byte dataPin, byte clockPin, boolean activateDisplay = true, byte intensity = 7);
|
||||||
|
|
||||||
/** Set the display to a unsigned decimal number (with or without leading zeros) */
|
|
||||||
void setDisplayToDecNumber(unsigned long number, word dots, boolean leadingZeros = true,
|
|
||||||
const byte numberFont[] = NUMBER_FONT);
|
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
virtual void sendChar(byte pos, byte data, boolean dot);
|
virtual void sendChar(byte pos, byte data, boolean dot);
|
||||||
};
|
};
|
||||||
|
|||||||
10
TM16XX.cpp
10
TM16XX.cpp
@@ -93,7 +93,7 @@ void TM16XX::setDisplayToString(const char* string, const word dots, const byte
|
|||||||
{
|
{
|
||||||
for (int i = 0; i < displays - pos; i++) {
|
for (int i = 0; i < displays - pos; i++) {
|
||||||
if (string[i] != '\0') {
|
if (string[i] != '\0') {
|
||||||
sendChar(i + pos, font[string[i] - 32], dots & (1 << (displays - i - 1)) != 0);
|
sendChar(i + pos, font[string[i] - 32], (dots & (1 << (displays - i - 1))) != 0);
|
||||||
} else {
|
} else {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@@ -106,7 +106,7 @@ void TM16XX::setDisplayToString(const String string, const word dots, const byte
|
|||||||
|
|
||||||
for (int i = 0; i < displays - pos; i++) {
|
for (int i = 0; i < displays - pos; i++) {
|
||||||
if (i < stringLength) {
|
if (i < stringLength) {
|
||||||
sendChar(i + pos, font[string.charAt(i) - 32], dots & (1 << (displays - i - 1)) != 0);
|
sendChar(i + pos, font[string.charAt(i) - 32], (dots & (1 << (displays - i - 1))) != 0);
|
||||||
} else {
|
} else {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@@ -165,3 +165,9 @@ byte TM16XX::receive()
|
|||||||
|
|
||||||
return temp;
|
return temp;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if !defined(ARDUINO) || ARDUINO < 100
|
||||||
|
// empty implementation instead of pure virtual for older Arduino IDE
|
||||||
|
void TM16XX::sendChar(byte pos, byte data, boolean dot) {}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|||||||
8
TM16XX.h
8
TM16XX.h
@@ -59,7 +59,13 @@ class TM16XX
|
|||||||
const byte font[] = FONT_DEFAULT);
|
const byte font[] = FONT_DEFAULT);
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
virtual void sendChar(byte pos, byte data, boolean dot) = 0;
|
#if defined(ARDUINO) && ARDUINO >= 100
|
||||||
|
// pure virtual is NOT supported in older Arduino IDE
|
||||||
|
virtual void sendChar(byte pos, byte data, boolean dot) = 0;
|
||||||
|
#else
|
||||||
|
virtual void sendChar(byte pos, byte data, boolean dot);
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
virtual void sendCommand(byte led);
|
virtual void sendCommand(byte led);
|
||||||
virtual void sendData(byte add, byte data);
|
virtual void sendData(byte add, byte data);
|
||||||
|
|||||||
@@ -50,6 +50,8 @@ const byte NUMBER_FONT[] = {
|
|||||||
0b01110001 // F
|
0b01110001 // F
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const byte MINUS = 0b01000000;
|
||||||
|
|
||||||
// definition for error
|
// definition for error
|
||||||
const byte ERROR_DATA[] = {
|
const byte ERROR_DATA[] = {
|
||||||
0b01111001, // E
|
0b01111001, // E
|
||||||
|
|||||||
Reference in New Issue
Block a user