Compare commits
8 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
66b574252b | ||
|
|
51c24bfaee | ||
|
|
b6a17f5989 | ||
|
|
19673f8650 | ||
|
|
2def3b9779 | ||
|
|
81aa413f28 | ||
|
|
320ef7d54d | ||
|
|
e3075c02e2 |
24
CHANGES.txt
Normal file
24
CHANGES.txt
Normal file
@@ -0,0 +1,24 @@
|
|||||||
|
Version 1.3.2
|
||||||
|
|
||||||
|
- ISSUE #5: Correction of string library import
|
||||||
|
|
||||||
|
Version 1.3.1
|
||||||
|
|
||||||
|
- changed pins on the examples to match schematics on project site.
|
||||||
|
|
||||||
|
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,6 +20,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||||||
|
|
||||||
#include "WProgram.h"
|
#include "WProgram.h"
|
||||||
#include "TM1638.h"
|
#include "TM1638.h"
|
||||||
|
#include "string.h"
|
||||||
|
|
||||||
TM1638::TM1638(byte dataPin, byte clockPin, byte strobePin, boolean activateDisplay, byte intensity)
|
TM1638::TM1638(byte dataPin, byte clockPin, byte strobePin, boolean activateDisplay, byte intensity)
|
||||||
{
|
{
|
||||||
@@ -51,15 +52,19 @@ void TM1638::setupDisplay(boolean active, byte intensity)
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void TM1638::setDisplayToHexNumber(unsigned long number, byte dots)
|
void TM1638::setDisplayToHexNumber(unsigned long number, byte dots, boolean leadingZeros)
|
||||||
{
|
{
|
||||||
for (int i = 0; i < 8; i++) {
|
for (int i = 0; i < 8; i++) {
|
||||||
setDisplayDigit(number & 0xF, 7 - i, (dots & (1 << i)) != 0);
|
if (!leadingZeros && number == 0) {
|
||||||
number >>= 4;
|
clearDisplayDigit(7 - i, (dots & (1 << i)) != 0);
|
||||||
|
} else {
|
||||||
|
setDisplayDigit(number & 0xF, 7 - i, (dots & (1 << i)) != 0);
|
||||||
|
number >>= 4;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void TM1638::setDisplayToDecNumber(unsigned long number, byte dots)
|
void TM1638::setDisplayToDecNumber(unsigned long number, byte dots, boolean leadingZeros)
|
||||||
{
|
{
|
||||||
if (number > 99999999L) {
|
if (number > 99999999L) {
|
||||||
setDisplay(ERROR);
|
setDisplay(ERROR);
|
||||||
@@ -69,7 +74,11 @@ void TM1638::setDisplayToDecNumber(unsigned long number, byte dots)
|
|||||||
setDisplayDigit(number % 10, 7 - i, (dots & (1 << i)) != 0);
|
setDisplayDigit(number % 10, 7 - i, (dots & (1 << i)) != 0);
|
||||||
number /= 10;
|
number /= 10;
|
||||||
} else {
|
} else {
|
||||||
setDisplayDigit(0, 7 - i, (dots & (1 << i)) != 0);
|
if (leadingZeros) {
|
||||||
|
setDisplayDigit(0, 7 - i, (dots & (1 << i)) != 0);
|
||||||
|
} else {
|
||||||
|
clearDisplayDigit(7 - i, (dots & (1 << i)) != 0);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -87,6 +96,11 @@ void TM1638::setDisplayDigit(byte digit, byte pos, boolean dot)
|
|||||||
sendData(pos << 1, NUMBER_DATA[digit & 0xF] | (dot ? 0b10000000 : 0));
|
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[])
|
void TM1638::setDisplay(const byte values[])
|
||||||
{
|
{
|
||||||
for (int i = 0; i < 8; i++) {
|
for (int i = 0; i < 8; i++) {
|
||||||
@@ -108,6 +122,19 @@ 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)
|
void TM1638::setLED(byte color, byte pos)
|
||||||
{
|
{
|
||||||
sendData((pos << 1) + 1, color);
|
sendData((pos << 1) + 1, color);
|
||||||
|
|||||||
13
TM1638.h
13
TM1638.h
@@ -36,20 +36,24 @@ class TM1638
|
|||||||
/** Set the display (segments and LEDs) active or off and intensity (range from 0-7). */
|
/** Set the display (segments and LEDs) active or off and intensity (range from 0-7). */
|
||||||
void setupDisplay(boolean active, byte intensity);
|
void setupDisplay(boolean active, byte intensity);
|
||||||
|
|
||||||
/** Set the display to a unsigned hexadecimal number */
|
/** Set the display to a unsigned hexadecimal number (with or without leading zeros) */
|
||||||
void setDisplayToHexNumber(unsigned long number, byte dots);
|
void setDisplayToHexNumber(unsigned long number, byte dots, boolean leadingZeros = true);
|
||||||
/** Set the display to a unsigned decimal number */
|
/** Set the display to a unsigned decimal number (with or without leading zeros) */
|
||||||
void setDisplayToDecNumber(unsigned long number, byte dots);
|
void setDisplayToDecNumber(unsigned long number, byte dots, boolean leadingZeros = true);
|
||||||
/** 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);
|
||||||
/** Set a single display at pos (starting at 0) to a digit (left to right) */
|
/** Set a single display at pos (starting at 0) to a digit (left to right) */
|
||||||
void setDisplayDigit(byte digit, byte pos, boolean dot);
|
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) */
|
/** Set the display to the 8 values (left to right) */
|
||||||
void setDisplay(const byte values[]);
|
void setDisplay(const byte values[]);
|
||||||
/** Clear the display */
|
/** Clear the display */
|
||||||
void clearDisplay();
|
void clearDisplay();
|
||||||
/** Set the display to the string (defaults to built in font) */
|
/** Set the display to the string (defaults to built in font) */
|
||||||
void setDisplayToString(const char* string, const byte font[] = FONT_DEFAULT);
|
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) */
|
/** Set the LED at pos to color (TM1638_COLOR_RED, TM1638_COLOR_GREEN or both) */
|
||||||
void setLED(byte color, byte pos);
|
void setLED(byte color, byte pos);
|
||||||
@@ -72,4 +76,3 @@ class TM1638
|
|||||||
};
|
};
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|||||||
@@ -18,8 +18,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||||||
|
|
||||||
#include <TM1638.h>
|
#include <TM1638.h>
|
||||||
|
|
||||||
// define a module on data pin 3, clock pin 2 and strobe pin 4
|
// define a module on data pin 3, clock pin 9 and strobe pin 7
|
||||||
TM1638 module(3, 2, 4);
|
TM1638 module(8, 9, 7);
|
||||||
|
|
||||||
void setup() {
|
void setup() {
|
||||||
// display a hexadecimal number and set the left 4 dots
|
// display a hexadecimal number and set the left 4 dots
|
||||||
|
|||||||
@@ -22,10 +22,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||||||
|
|
||||||
// define a modules
|
// define a modules
|
||||||
TM1638 modules[] = {
|
TM1638 modules[] = {
|
||||||
TM1638(3, 2, 4),
|
TM1638(8, 9, 7),
|
||||||
TM1638(3, 2, 5),
|
TM1638(8, 9, 6),
|
||||||
TM1638(3, 2, 6),
|
TM1638(8, 9, 5),
|
||||||
TM1638(3, 2, 7)
|
TM1638(8, 9, 4)
|
||||||
};
|
};
|
||||||
|
|
||||||
void setup() {
|
void setup() {
|
||||||
|
|||||||
@@ -24,9 +24,9 @@ const byte hello[] = {
|
|||||||
};
|
};
|
||||||
|
|
||||||
// define the first module
|
// define the first module
|
||||||
TM1638 module1(3, 2, 4);
|
TM1638 module1(8, 9, 7);
|
||||||
// to chain modules, use the same clk and data - just specify a different strobe pin
|
// to chain modules, use the same clk and data - just specify a different strobe pin
|
||||||
TM1638 module2(3, 2, 5);
|
TM1638 module2(8, 9, 6);
|
||||||
|
|
||||||
unsigned long value = 0L;
|
unsigned long value = 0L;
|
||||||
boolean state = true;
|
boolean state = true;
|
||||||
|
|||||||
Reference in New Issue
Block a user