Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
66b574252b |
@@ -1,8 +1,3 @@
|
|||||||
Version 1.4.0
|
|
||||||
|
|
||||||
- ISSUE #6: Support for specifying dots on setDisplayToString
|
|
||||||
WARNING: setDisplayToString methods have changed prototype and are incompatible with code compiled for 1.3.x (if you specified a custom font)
|
|
||||||
|
|
||||||
Version 1.3.2
|
Version 1.3.2
|
||||||
|
|
||||||
- ISSUE #5: Correction of string library import
|
- ISSUE #5: Correction of string library import
|
||||||
|
|||||||
36
TM1638.cpp
36
TM1638.cpp
@@ -3,6 +3,8 @@ TM1638.h - Library for TM1638.
|
|||||||
|
|
||||||
Copyright (C) 2011 Ricardo Batista (rjbatista <at> gmail <dot> com)
|
Copyright (C) 2011 Ricardo Batista (rjbatista <at> gmail <dot> com)
|
||||||
|
|
||||||
|
Based on a sketch by: Martin Hubacek (http://www.martinhubacek.cz)
|
||||||
|
|
||||||
This program is free software: you can redistribute it and/or modify
|
This program is free software: you can redistribute it and/or modify
|
||||||
it under the terms of the version 3 GNU General Public License as
|
it under the terms of the version 3 GNU General Public License as
|
||||||
published by the Free Software Foundation.
|
published by the Free Software Foundation.
|
||||||
@@ -53,11 +55,11 @@ 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, boolean leadingZeros)
|
||||||
{
|
{
|
||||||
for (int i = 0; i < 8; i++) {
|
for (int i = 0; i < 8; i++) {
|
||||||
if (!leadingZeros && number == 0) {
|
if (!leadingZeros && number == 0) {
|
||||||
clearDisplayDigit(7 - i, (dots & (1 << i)) != 0);
|
clearDisplayDigit(7 - i, (dots & (1 << i)) != 0);
|
||||||
} else {
|
} else {
|
||||||
setDisplayDigit(number & 0xF, 7 - i, (dots & (1 << i)) != 0);
|
setDisplayDigit(number & 0xF, 7 - i, (dots & (1 << i)) != 0);
|
||||||
number >>= 4;
|
number >>= 4;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -72,11 +74,11 @@ void TM1638::setDisplayToDecNumber(unsigned long number, byte dots, boolean lead
|
|||||||
setDisplayDigit(number % 10, 7 - i, (dots & (1 << i)) != 0);
|
setDisplayDigit(number % 10, 7 - i, (dots & (1 << i)) != 0);
|
||||||
number /= 10;
|
number /= 10;
|
||||||
} else {
|
} else {
|
||||||
if (leadingZeros) {
|
if (leadingZeros) {
|
||||||
setDisplayDigit(0, 7 - i, (dots & (1 << i)) != 0);
|
setDisplayDigit(0, 7 - i, (dots & (1 << i)) != 0);
|
||||||
} else {
|
} else {
|
||||||
clearDisplayDigit(7 - i, (dots & (1 << i)) != 0);
|
clearDisplayDigit(7 - i, (dots & (1 << i)) != 0);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -113,23 +115,23 @@ void TM1638::clearDisplay()
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void TM1638::setDisplayToString(const char* string, const byte dots, const byte font[])
|
void TM1638::setDisplayToString(const char* string, const byte font[])
|
||||||
{
|
{
|
||||||
for (int i = 0; i < 8; i++) {
|
for (int i = 0; i < 8; i++) {
|
||||||
sendData(i << 1, font[string[i] - 32] | ((dots & (1 << (7 - i))) != 0 ? 0b10000000 : 0));
|
sendData(i << 1, font[string[i] - 32]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void TM1638::setDisplayToString(const String string, const byte dots, const byte font[])
|
void TM1638::setDisplayToString(const String string, const byte font[])
|
||||||
{
|
{
|
||||||
int stringLength = string.length();
|
int stringLength = string.length();
|
||||||
|
|
||||||
for (int i = 0; i < 8; i++) {
|
for (int i = 0; i < 8; i++) {
|
||||||
if (i < stringLength) {
|
if (i < stringLength) {
|
||||||
sendData(i << 1, font[string.charAt(i) - 32] | ((dots & (1 << (7 - i))) != 0 ? 0b10000000 : 0));
|
sendData(i << 1, font[string.charAt(i) - 32]);
|
||||||
} else {
|
} else {
|
||||||
sendData(i << 1, 0);
|
sendData(i << 1, 0);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
6
TM1638.h
6
TM1638.h
@@ -3,6 +3,8 @@ TM1638.h - Library for TM1638.
|
|||||||
|
|
||||||
Copyright (C) 2011 Ricardo Batista <rjbatista at gmail dot com>
|
Copyright (C) 2011 Ricardo Batista <rjbatista at gmail dot com>
|
||||||
|
|
||||||
|
Based on a sketch by: Martin Hubacek (http://www.martinhubacek.cz)
|
||||||
|
|
||||||
This program is free software: you can redistribute it and/or modify
|
This program is free software: you can redistribute it and/or modify
|
||||||
it under the terms of the version 3 GNU General Public License as
|
it under the terms of the version 3 GNU General Public License as
|
||||||
published by the Free Software Foundation.
|
published by the Free Software Foundation.
|
||||||
@@ -49,9 +51,9 @@ class TM1638
|
|||||||
/** 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 dots = 0, 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) */
|
/** Set the display to the String (defaults to built in font) */
|
||||||
void setDisplayToString(String string, const byte dots = 0, const byte font[] = FONT_DEFAULT);
|
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);
|
||||||
|
|||||||
@@ -18,7 +18,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||||||
|
|
||||||
#include <TM1638.h>
|
#include <TM1638.h>
|
||||||
|
|
||||||
// define a module on data pin 8, clock pin 9 and strobe pin 7
|
// define a module on data pin 3, clock pin 9 and strobe pin 7
|
||||||
TM1638 module(8, 9, 7);
|
TM1638 module(8, 9, 7);
|
||||||
|
|
||||||
void setup() {
|
void setup() {
|
||||||
|
|||||||
Reference in New Issue
Block a user