Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c327bf715a |
16
CHANGES.txt
16
CHANGES.txt
@@ -1,16 +0,0 @@
|
||||
Version 1.3.0
|
||||
|
||||
- added support for String Object;
|
||||
- added support for removing leading zeros in displaying numbers.
|
||||
|
||||
Version 1.2.0
|
||||
|
||||
- added support for writing text.
|
||||
|
||||
Version 1.1.0
|
||||
|
||||
- restructuring and added 2 proper examples, available in the arduino ide.
|
||||
|
||||
Version 1.0.0
|
||||
|
||||
- initial release.
|
||||
37
TM1638.cpp
37
TM1638.cpp
@@ -20,7 +20,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
#include "WProgram.h"
|
||||
#include "TM1638.h"
|
||||
#include "String.h"
|
||||
|
||||
TM1638::TM1638(byte dataPin, byte clockPin, byte strobePin, boolean activateDisplay, byte intensity)
|
||||
{
|
||||
@@ -52,19 +51,15 @@ void TM1638::setupDisplay(boolean active, byte intensity)
|
||||
}
|
||||
|
||||
|
||||
void TM1638::setDisplayToHexNumber(unsigned long number, byte dots, boolean leadingZeros)
|
||||
void TM1638::setDisplayToHexNumber(unsigned long number, byte dots)
|
||||
{
|
||||
for (int i = 0; i < 8; i++) {
|
||||
if (!leadingZeros && number == 0) {
|
||||
clearDisplayDigit(7 - i, (dots & (1 << i)) != 0);
|
||||
} else {
|
||||
setDisplayDigit(number & 0xF, 7 - i, (dots & (1 << i)) != 0);
|
||||
number >>= 4;
|
||||
}
|
||||
setDisplayDigit(number & 0xF, 7 - i, (dots & (1 << i)) != 0);
|
||||
number >>= 4;
|
||||
}
|
||||
}
|
||||
|
||||
void TM1638::setDisplayToDecNumber(unsigned long number, byte dots, boolean leadingZeros)
|
||||
void TM1638::setDisplayToDecNumber(unsigned long number, byte dots)
|
||||
{
|
||||
if (number > 99999999L) {
|
||||
setDisplay(ERROR);
|
||||
@@ -74,11 +69,7 @@ void TM1638::setDisplayToDecNumber(unsigned long number, byte dots, boolean lead
|
||||
setDisplayDigit(number % 10, 7 - i, (dots & (1 << i)) != 0);
|
||||
number /= 10;
|
||||
} else {
|
||||
if (leadingZeros) {
|
||||
setDisplayDigit(0, 7 - i, (dots & (1 << i)) != 0);
|
||||
} else {
|
||||
clearDisplayDigit(7 - i, (dots & (1 << i)) != 0);
|
||||
}
|
||||
setDisplayDigit(0, 7 - i, (dots & (1 << i)) != 0);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -96,11 +87,6 @@ void TM1638::setDisplayDigit(byte digit, byte pos, boolean dot)
|
||||
sendData(pos << 1, NUMBER_DATA[digit & 0xF] | (dot ? 0b10000000 : 0));
|
||||
}
|
||||
|
||||
void TM1638::clearDisplayDigit(byte pos, boolean dot)
|
||||
{
|
||||
sendData(pos << 1, (dot ? 0b10000000 : 0));
|
||||
}
|
||||
|
||||
void TM1638::setDisplay(const byte values[])
|
||||
{
|
||||
for (int i = 0; i < 8; i++) {
|
||||
@@ -122,19 +108,6 @@ void TM1638::setDisplayToString(const char* string, const byte font[])
|
||||
}
|
||||
}
|
||||
|
||||
void TM1638::setDisplayToString(const String string, const byte font[])
|
||||
{
|
||||
int stringLength = string.length();
|
||||
|
||||
for (int i = 0; i < 8; i++) {
|
||||
if (i < stringLength) {
|
||||
sendData(i << 1, font[string.charAt(i) - 32]);
|
||||
} else {
|
||||
sendData(i << 1, 0);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void TM1638::setLED(byte color, byte pos)
|
||||
{
|
||||
sendData((pos << 1) + 1, color);
|
||||
|
||||
13
TM1638.h
13
TM1638.h
@@ -36,24 +36,20 @@ class TM1638
|
||||
/** Set the display (segments and LEDs) active or off and intensity (range from 0-7). */
|
||||
void setupDisplay(boolean active, byte intensity);
|
||||
|
||||
/** Set the display to a unsigned hexadecimal number (with or without leading zeros) */
|
||||
void setDisplayToHexNumber(unsigned long number, byte dots, boolean leadingZeros = true);
|
||||
/** Set the display to a unsigned decimal number (with or without leading zeros) */
|
||||
void setDisplayToDecNumber(unsigned long number, byte dots, boolean leadingZeros = true);
|
||||
/** Set the display to a unsigned hexadecimal number */
|
||||
void setDisplayToHexNumber(unsigned long number, byte dots);
|
||||
/** Set the display to a unsigned decimal number */
|
||||
void setDisplayToDecNumber(unsigned long number, byte dots);
|
||||
/** Set the display to a unsigned binary number */
|
||||
void setDisplayToBinNumber(byte number, byte dots);
|
||||
/** Set a single display at pos (starting at 0) to a digit (left to right) */
|
||||
void setDisplayDigit(byte digit, byte pos, boolean dot);
|
||||
/** Clear a single display at pos (starting at 0, left to right) */
|
||||
void clearDisplayDigit(byte pos, boolean dot);
|
||||
/** Set the display to the 8 values (left to right) */
|
||||
void setDisplay(const byte values[]);
|
||||
/** Clear the display */
|
||||
void clearDisplay();
|
||||
/** Set the display to the string (defaults to built in font) */
|
||||
void setDisplayToString(const char* string, const byte font[] = FONT_DEFAULT);
|
||||
/** Set the display to the String (defaults to built in font) */
|
||||
void setDisplayToString(String string, const byte font[] = FONT_DEFAULT);
|
||||
|
||||
/** Set the LED at pos to color (TM1638_COLOR_RED, TM1638_COLOR_GREEN or both) */
|
||||
void setLED(byte color, byte pos);
|
||||
@@ -76,3 +72,4 @@ class TM1638
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
Reference in New Issue
Block a user