6 Commits

Author SHA1 Message Date
rjbatista@gmail.com
2f4e5fece4 Version 2.1.1 2012-03-12 23:59:26 +00:00
rjbatista@gmail.com
da0b7ec9e2 Version 2.1.1 2012-03-12 23:59:00 +00:00
rjbatista@gmail.com
8ba4623718 ISSUE #21: Problems on clearDisplay and setupDisplay 2012-03-12 23:58:28 +00:00
rjbatista@gmail.com
cb437405ea Version 2.1.0 2012-02-20 22:18:16 +00:00
rjbatista@gmail.com
f52570e011 ISSUE #20: Support for negative decimal numbers 2012-02-20 22:17:47 +00:00
rjbatista@gmail.com
8b1fda292d ISSUE #19: Corrected setDisplayToString dot bug 2012-02-20 21:29:32 +00:00
7 changed files with 60 additions and 5 deletions

View File

@@ -1,3 +1,12 @@
Version 2.1.1
- ISSUE #21: Problems on clearDisplay and setupDisplay;
Version 2.1.0
- ISSUE #20: Support for negative decimal numbers;
- ISSUE #19: Corrected setDisplayToString dot bug.
Version 2.0.1 Version 2.0.1
- ISSUE #15: Backwards compatibility with previous Arduino IDE (pure virtual functions were not supported); - ISSUE #15: Backwards compatibility with previous Arduino IDE (pure virtual functions were not supported);

View File

@@ -44,13 +44,13 @@ 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;
@@ -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++) {

View File

@@ -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

View File

@@ -36,3 +36,13 @@ void TM1640::sendChar(byte pos, byte data, boolean dot)
{ {
sendData(pos, data | (dot ? 0b10000000 : 0)); sendData(pos, data | (dot ? 0b10000000 : 0));
} }
void TM1640::clearDisplay()
{
digitalWrite(strobePin, LOW);
send(0xC0);
for (int i = 0; i < 16; i++) {
send(0x00);
}
digitalWrite(strobePin, HIGH);
}

View File

@@ -33,6 +33,8 @@ class TM1640 : public TM16XX
public: public:
/** 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);
/** Clear the display */
virtual void clearDisplay();
protected: protected:
virtual void sendChar(byte pos, byte data, boolean dot); virtual void sendChar(byte pos, byte data, boolean dot);

View File

@@ -54,6 +54,12 @@ TM16XX::TM16XX(byte dataPin, byte clockPin, byte strobePin, byte displays, boole
void TM16XX::setupDisplay(boolean active, byte intensity) void TM16XX::setupDisplay(boolean active, byte intensity)
{ {
sendCommand(0x80 | (active ? 8 : 0) | min(7, intensity)); sendCommand(0x80 | (active ? 8 : 0) | min(7, intensity));
// necessary for the TM1640
digitalWrite(strobePin, LOW);
digitalWrite(clockPin, LOW);
digitalWrite(clockPin, HIGH);
digitalWrite(strobePin, HIGH);
} }
void TM16XX::setDisplayDigit(byte digit, byte pos, boolean dot, const byte numberFont[]) void TM16XX::setDisplayDigit(byte digit, byte pos, boolean dot, const byte numberFont[])
@@ -93,7 +99,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 +112,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;
} }

View File

@@ -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