Version 1.2.0

CHANGES.txt

@@ -1,29 +0,0 @@
-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
-
-- 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.

TM1638.cpp

@@ -3,6 +3,8 @@ TM1638.h - Library for TM1638.
 
 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
 it under the terms of the version 3 GNU General Public License as
 published by the Free Software Foundation.
@@ -18,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)
 {
@@ -35,7 +36,7 @@ TM1638::TM1638(byte dataPin, byte clockPin, byte strobePin, boolean activateDisp
 
   sendCommand(0x40);
   sendCommand(0x80 | (activateDisplay ? 8 : 0) | min(7, intensity));
-
+  
   digitalWrite(strobePin, LOW);
   send(0xC0);
   for (int i = 0; i < 16; i++) {
@@ -50,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;
-    }
   }
 }
 
-void TM1638::setDisplayToDecNumber(unsigned long number, byte dots, boolean leadingZeros)
+void TM1638::setDisplayToDecNumber(unsigned long number, byte dots)
 {
   if (number > 99999999L) {
     setDisplay(ERROR);
@@ -72,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);
       }
     }
   }
@@ -94,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++) {
@@ -113,29 +101,16 @@ 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++) {
-    sendData(i << 1, font[string[i] - 32] | ((dots & (1 << (7 - i))) != 0 ? 0b10000000 : 0));
-  }
-}
-
-void TM1638::setDisplayToString(const String string, const byte dots, 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] | ((dots & (1 << (7 - i))) != 0 ? 0b10000000 : 0));
-    } else {
-      sendData(i << 1, 0);
-    }
+    sendData(i << 1, font[string[i] - 32]);
   }
 }
 
 void TM1638::setLED(byte color, byte pos)
 {
-    sendData((pos << 1) + 1, color);
+    sendData((pos << 1) + 1, color);  
 }
 
 void TM1638::setLEDs(word leds)
@@ -146,7 +121,7 @@ void TM1638::setLEDs(word leds)
     if (leds & (1 << i)) {
       val |= 1;
     }
-
+      
     if (leds & (1 << (i + 8))) {
       val |= 2;
     }
@@ -159,7 +134,7 @@ byte TM1638::getButtons(void)
 {
   byte keys = 0;
 
-  digitalWrite(strobePin, LOW);
+  digitalWrite(strobePin, LOW);  
   send(0x42);
   for (int i = 0; i < 4; i++) {
     keys |= receive() << i;
@@ -201,23 +176,23 @@ byte TM1638::receive()
 
   // Pull-up on
   pinMode(dataPin, INPUT);
-  digitalWrite(dataPin, HIGH);
+  digitalWrite(dataPin, HIGH);        
 
   for (int i = 0; i < 8; i++) {
     temp >>= 1;
 
-    digitalWrite(clockPin, LOW);
+    digitalWrite(clockPin, LOW);        
 
     if (digitalRead(dataPin)) {
       temp |= 0x80;
     }
 
-    digitalWrite(clockPin, HIGH);
+    digitalWrite(clockPin, HIGH);        
   }
 
   // Pull-up off
   pinMode(dataPin, OUTPUT);
-  digitalWrite(dataPin, LOW);
+  digitalWrite(dataPin, LOW); 
 
   return temp;
 }

TM1638.h

@@ -3,6 +3,8 @@ TM1638.h - Library for TM1638.
 
 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
 it under the terms of the version 3 GNU General Public License as
 published by the Free Software Foundation.
@@ -34,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 dots = 0, const byte font[] = FONT_DEFAULT);
-    /** 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(const char* 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);
@@ -74,3 +72,4 @@ class TM1638
 };
 
 #endif
+

examples/tm1638_one_module_example/tm1638_one_module_example.pde

@@ -18,8 +18,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <TM1638.h>
 
-// define a module on data pin 8, clock pin 9 and strobe pin 7
-TM1638 module(8, 9, 7);
+// define a module on data pin 3, clock pin 2 and strobe pin 4
+TM1638 module(3, 2, 4);
 
 void setup() {
   // display a hexadecimal number and set the left 4 dots

examples/tm1638_scrolling_modules_example/tm1638_scrolling_modules_example.pde

@@ -22,10 +22,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 // define a modules
 TM1638 modules[] = {
-	TM1638(8, 9, 7),
-	TM1638(8, 9, 6),
-	TM1638(8, 9, 5),
-	TM1638(8, 9, 4)
+	TM1638(3, 2, 4),
+	TM1638(3, 2, 5),
+	TM1638(3, 2, 6),
+	TM1638(3, 2, 7)
 };
 
 void setup() {

examples/tm1638_two_modules_example/tm1638_two_modules_example.pde

@@ -24,9 +24,9 @@ const byte hello[] = {
 };
 
 // define the first module
-TM1638 module1(8, 9, 7);
+TM1638 module1(3, 2, 4);
 // to chain modules, use the same clk and data - just specify a different strobe pin
-TM1638 module2(8, 9, 6);
+TM1638 module2(3, 2, 5);
 
 unsigned long value = 0L;
 boolean state = true;