rik/tm1638-library
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ISSUE #20: Support for negative decimal numbers

Browse Source
This commit is contained in:
rjbatista@gmail.com
2012-02-20 22:17:47 +00:00
parent 8b1fda292d
commit f52570e011
4 changed files with 32 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@@ -1,3 +1,4 @@
- ISSUE #20: Support for negative decimal numbers;
- ISSUE #19: Corrected setDisplayToString dot bug. - ISSUE #19: Corrected setDisplayToString dot bug.
Version 2.0.1 Version 2.0.1

27
TM1638.cpp
View File

@@ -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++) {

5
TM1638.h
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

2
TM16XXFonts.h
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