1 Commits

Author SHA1 Message Date
rjbatista@gmail.com
082d20c562 Version 2.0.1 2012-01-18 00:03:49 +00:00
5 changed files with 5 additions and 38 deletions

View File

@@ -1,8 +1,3 @@
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);

View File

@@ -44,18 +44,18 @@ void TM1638::setDisplayToHexNumber(unsigned long number, byte dots, boolean lead
}
}
void TM1638::setDisplayToDecNumberAt(unsigned long number, byte dots, byte startingPos, boolean leadingZeros,
void TM1638::setDisplayToDecNumber(unsigned long number, byte dots, boolean leadingZeros,
const byte numberFont[])
{
if (number > 99999999L) {
setDisplayToError();
} else {
for (int i = 0; i < displays - startingPos; i++) {
for (int i = 0; i < displays; i++) {
if (number != 0) {
setDisplayDigit(number % 10, displays - i - 1, (dots & (1 << i)) != 0, numberFont);
number /= 10;
} else {
if (leadingZeros) {
if (leadingZeros) {
setDisplayDigit(0, displays - i - 1, (dots & (1 << i)) != 0, numberFont);
} else {
clearDisplayDigit(displays - i - 1, (dots & (1 << i)) != 0);
@@ -65,27 +65,6 @@ void TM1638::setDisplayToDecNumberAt(unsigned long number, byte dots, byte start
}
}
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[])
{
for (int i = 0; i < displays; i++) {

View File

@@ -43,9 +43,6 @@ class TM1638 : public TM16XX
/** Set the display to a unsigned decimal number (with or without leading zeros) */
void setDisplayToDecNumber(unsigned long number, byte dots, boolean leadingZeros = true,
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 */
void setDisplayToBinNumber(byte number, byte dots,
const byte numberFont[] = NUMBER_FONT);
@@ -60,8 +57,6 @@ class TM1638 : public TM16XX
protected:
virtual void sendChar(byte pos, byte data, boolean dot);
void setDisplayToDecNumberAt(unsigned long number, byte dots, byte startingPos,
boolean leadingZeros, const byte numberFont[]);
};
#endif

View File

@@ -93,7 +93,7 @@ void TM16XX::setDisplayToString(const char* string, const word dots, const byte
{
for (int i = 0; i < displays - pos; i++) {
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 {
break;
}
@@ -106,7 +106,7 @@ void TM16XX::setDisplayToString(const String string, const word dots, const byte
for (int i = 0; i < displays - pos; i++) {
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 {
break;
}

View File

@@ -50,8 +50,6 @@ const byte NUMBER_FONT[] = {
0b01110001 // F
};
const byte MINUS = 0b01000000;
// definition for error
const byte ERROR_DATA[] = {
0b01111001, // E