9 Commits

Author SHA1 Message Date
rjbatista@gmail.com
9350f93996 2011-11-14 21:10:44 +00:00
rjbatista@gmail.com
1c5a92c9fe Version 1.4.0 2011-11-14 21:09:03 +00:00
rjbatista@gmail.com
1f5d4b5d8d 2011-11-14 21:05:53 +00:00
rjbatista@gmail.com
8cd887a567 Support for specifying dots on setDisplayToString 2011-11-14 17:41:12 +00:00
rjbatista@gmail.com
51c24bfaee Version 1.3.2 2011-11-14 11:20:19 +00:00
rjbatista@gmail.com
b6a17f5989 ISSUE #5: Correction of string library import 2011-11-14 11:18:17 +00:00
rjbatista@gmail.com
19673f8650 2011-10-28 23:31:23 +00:00
rjbatista@gmail.com
2def3b9779 2011-10-28 22:43:52 +00:00
rjbatista@gmail.com
81aa413f28 Changed pins to match schematics on project site 2011-10-28 22:43:32 +00:00
6 changed files with 49 additions and 40 deletions

View File

@@ -1,3 +1,16 @@
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
- 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 Version 1.3.0
- added support for String Object; - added support for String Object;

View File

@@ -3,8 +3,6 @@ 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.
@@ -20,7 +18,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" #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)
{ {
@@ -55,11 +53,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;
} }
} }
} }
@@ -74,11 +72,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);
} }
} }
} }
} }
@@ -115,23 +113,23 @@ void TM1638::clearDisplay()
} }
} }
void TM1638::setDisplayToString(const char* string, const byte font[]) void TM1638::setDisplayToString(const char* string, const byte dots, const byte font[])
{ {
for (int i = 0; i < 8; i++) { for (int i = 0; i < 8; i++) {
sendData(i << 1, font[string[i] - 32]); sendData(i << 1, font[string[i] - 32] | ((dots & (1 << (7 - i))) != 0 ? 0b10000000 : 0));
} }
} }
void TM1638::setDisplayToString(const String string, const byte font[]) void TM1638::setDisplayToString(const String string, const byte dots, 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]); sendData(i << 1, font[string.charAt(i) - 32] | ((dots & (1 << (7 - i))) != 0 ? 0b10000000 : 0));
} else { } else {
sendData(i << 1, 0); sendData(i << 1, 0);
} }
} }
} }

View File

@@ -3,8 +3,6 @@ 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.
@@ -51,9 +49,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 font[] = FONT_DEFAULT); void setDisplayToString(const char* string, const byte dots = 0, 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 font[] = FONT_DEFAULT); void setDisplayToString(String string, const byte dots = 0, 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);

View File

@@ -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 8, 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

View File

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

View File

@@ -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;