Diff: Font_7Seg.h

Revision:

1:1f2453ed85d7

Parent:

0:201dfacbe0e5

Child:

2:532ce15ea9ec

--- a/Font_7Seg.h	Mon Dec 21 22:39:22 2015 +0000
+++ b/Font_7Seg.h	Sat Jan 09 14:30:43 2016 +0000
@@ -38,6 +38,7 @@
 #define S7_E    0x0010
 #define S7_F    0x0020
 #define S7_G    0x0040 
+#define S7_DP   0x0080 
 
 //Mask for blending out and setting 7 segments digits
 #define MASK_7S_ALL = (S7_A | S7_B | S7_C | S7_D | S7_E | S7_F | S7_G}
@@ -45,52 +46,62 @@
 //Icons Grid 1
 #define S7_DP1  0x0080
 #define S7_LD1  0x0100
-#define S7_ICON_GR1 (S7_LD1 | S7_DP1)
+#define S7_ICON_GR1 (S7_LD1)
+//#define S7_ICON_GR1 (S7_LD1 | S7_DP1)
 
 //Icons Grid 2
 #define S7_DP2  0x0080
 #define S7_LD2  0x0100
-#define S7_ICON_GR2 (S7_LD2 | S7_DP2)
+#define S7_ICON_GR2 (S7_LD2)
+//#define S7_ICON_GR2 (S7_LD2 | S7_DP2)
 
 //Icons Grid 3
 #define S7_DP3  0x0080
 #define S7_LD3  0x0100
-#define S7_ICON_GR3 (S7_LD3 | S7_DP3)
+#define S7_ICON_GR3 (S7_LD3)
+//#define S7_ICON_GR3 (S7_LD3 | S7_DP3)
 
 //Icons Grid 4
 #define S7_DP4  0x0080
 #define S7_LD4  0x0100
-#define S7_ICON_GR4 (S7_LD4 | S7_DP4)
+#define S7_ICON_GR4 (S7_LD4)
+//#define S7_ICON_GR4 (S7_LD4 | S7_DP4)
 
 //Icons Grid 5
 #define S7_DP5  0x0080
 #define S7_LD5  0x0100
-#define S7_ICON_GR5 (S7_LD5 | S7_DP5)
+#define S7_ICON_GR5 (S7_LD5)
+//#define S7_ICON_GR5 (S7_LD5 | S7_DP5)
 
 //Icons Grid 6
 #define S7_DP6  0x0080
 #define S7_LD6  0x0100
-#define S7_ICON_GR6 (S7_LD6 | S7_DP6)
+#define S7_ICON_GR6 (S7_LD6)
+//#define S7_ICON_GR6 (S7_LD6 | S7_DP6)
 
 //Icons Grid 7
 #define S7_DP7  0x0080
 #define S7_LD7  0x0100
-#define S7_ICON_GR7 (S7_LD7 | S7_DP7)
+#define S7_ICON_GR7 (S7_LD7)
+//#define S7_ICON_GR7 (S7_LD7 | S7_DP7)
 
 //Icons Grid 8
 #define S7_DP8  0x0080
 #define S7_LD8  0x0100
-#define S7_ICON_GR8 (S7_LD8 | S7_DP8)
+#define S7_ICON_GR8 (S7_LD8)
+//#define S7_ICON_GR8 (S7_LD8 | S7_DP8)
 
 //Icons Grid 9
 #define S7_DP9  0x0080
 #define S7_LD9  0x0100
-#define S7_ICON_GR9 (S7_LD9 | S7_DP9)
+#define S7_ICON_GR9 (S7_LD9)
+//#define S7_ICON_GR9 (S7_LD9 | S7_DP9)
 
 //Icons Grid 10
 #define S7_DP10 0x0080
 #define S7_LD10 0x0100
-#define S7_ICON_GR10 (S7_LD10 | S7_DP10)
+#define S7_ICON_GR10 (S7_LD10)
+//#define S7_ICON_GR10 (S7_LD10 | S7_DP10)
 
 //Mask for blending out and restoring Icons
 extern const char MASK_ICON_GRID[][2]; 
@@ -100,7 +111,10 @@
 // ASCII Font definitions for segments in each character
 //
 //32 0x20  Symbols
-#define C7_SPC  ()
+#define C7_SPC  (0x0000)
+#define C7_CMA  (S7_DP)
+#define C7_DPT  (S7_DP)
+#define C7_MIN  (S7_G)
 
 //48 0x30  Digits
 #define C7_0    (S7_A | S7_B | S7_C | S7_D | S7_E | S7_F)