Просмотр исходного кода

Добавил символы 'U' и 'u'.

Vladimir N. Shilov 9 лет назад
Родитель
Сommit
c6d867ebde
1 измененных файлов с 42 добавлено и 79 удалено
  1. 42 79
      lib/max7219.h

+ 42 - 79
lib/max7219.h

@@ -19,50 +19,9 @@
 #include "stm8l15x.h"
 
 /* Exported defines ----------------------------------------------------------*/
-// соответсвие бит сегментам
-#define SEG_A			1
-#define SEG_B			3
-#define SEG_C			2
-#define SEG_D			5
-#define SEG_E			6
-#define SEG_F			0
-#define SEG_G			7
-#define SEG_DP		4
-
-// symbols
-// Для BCD
+// symbols Для BCD
 #define MAX7219_CHAR_BLANK	0x0F
 #define MAX7219_CHAR_FULL	  0x88
-// без кодирования
-#define SYM_0		    0x6F
-#define SYM_1		    0x0C
-#define SYM_2		    0xEA
-#define SYM_3		    0xAE
-#define SYM_4		    0x8D
-#define SYM_5		    0xA7
-#define SYM_6		    0xE7
-#define SYM_7		    0x0E
-#define SYM_8		    0xEF
-#define SYM_9		    0xAF
-#define SYM_A		    0xCF
-#define SYM_b		    0xE5
-#define SYM_c		    0xE0
-#define SYM_C		    0x63
-#define SYM_d		    0xEC
-#define SYM_E		    0xE3
-#define SYM_F		    0xC3
-#define SYM_H		    0xCD
-#define SYM_h		    0xC5
-#define SYM_P		    0xCB
-#define SYM_t		    0xE1
-#define SYM_Gradus	0x8B
-#define SYM_LGradus	0xE4
-#define SYM_Temp	  0xE1
-#define SYM_Minus	  0x80
-#define SYM_Plus	  0xD1
-#define SYM_BLANK	  0x00
-#define SYM_FULL	  0xFF
-#define SYM_DOT 	  0x10
 
 #define MAX7219_ON			0x01
 #define MAX7219_OFF			0x00
@@ -89,47 +48,51 @@ typedef enum _max7219_reg {
   RegTest        = 0x0F
 } max7219_reg_t;
 
+// соответсвие бит сегментам
 typedef enum _max7219_seg {
-  SegA    = SEG_A,
-  SegB    = SEG_B,
-  SegC    = SEG_C,
-  SegD    = SEG_D,
-  SegE    = SEG_E,
-  SegF    = SEG_F,
-  SegG    = SEG_G,
-  SegDP   = SEG_DP,
+  SegA    = 1,
+  SegB    = 3,
+  SegC    = 2,
+  SegD    = 5,
+  SegE    = 6,
+  SegF    = 0,
+  SegG    = 7,
+  SegDP   = 4,
 } max7219_seg_t;
 
+// symbols без кодирования
 typedef enum _max7219_sym {
-  Sym_0        = SYM_0,
-  Sym_1        = SYM_1,
-  Sym_2        = SYM_2,
-  Sym_3        = SYM_3,
-  Sym_4        = SYM_4,
-  Sym_5        = SYM_5,
-  Sym_6        = SYM_6,
-  Sym_7        = SYM_7,
-  Sym_8        = SYM_8,
-  Sym_9        = SYM_9,
-  Sym_A        = SYM_A,
-  Sym_b        = SYM_b,
-  Sym_c        = SYM_c,
-  Sym_C        = SYM_C,
-  Sym_d        = SYM_d,
-  Sym_E        = SYM_E,
-  Sym_h        = SYM_h,
-  Sym_H        = SYM_H,
-  Sym_F        = SYM_F,
-  Sym_P        = SYM_P,
-  Sym_t        = SYM_t,
-  Sym_Gradus	 = SYM_Gradus,
-  Sym_LGradus	 = SYM_LGradus,
-  Sym_Temp	   = SYM_Temp,
-  Sym_Minus	   = SYM_Minus,
-  Sym_Plus	   = SYM_P,
-  Sym_BLANK	   = SYM_BLANK,
-  Sym_FULL	   = SYM_FULL,
-  Sym_Dot      = SYM_DOT
+  Sym_0       = 0x6F,
+  Sym_1       = 0x0C,
+  Sym_2       = 0xEA,
+  Sym_3       = 0xAE,
+  Sym_4       = 0x8D,
+  Sym_5       = 0xA7,
+  Sym_6       = 0xE7,
+  Sym_7       = 0x0E,
+  Sym_8       = 0xEF,
+  Sym_9       = 0xAF,
+  Sym_A       = 0xCF,
+  Sym_b       = 0xE5,
+  Sym_c       = 0xE0,
+  Sym_C       = 0x63,
+  Sym_d       = 0xEC,
+  Sym_E       = 0xE3,
+  Sym_F       = 0xC3
+  Sym_h       = 0xC5,
+  Sym_H       = 0xCD,
+  Sym_P       = 0xCB,
+  Sym_t       = 0xE1,
+  Sym_u       = 0x64,
+  Sym_U       = 0x6D,
+  Sym_Gradus	= 0x8B,
+  Sym_LGradus	= 0xE4,
+  Sym_Temp	  = 0xE1,
+  Sym_Minus	  = 0x80,
+  Sym_Plus	  = 0xD1,
+  Sym_BLANK	  = 0x00,
+  Sym_FULL	  = 0xFF,
+  Sym_Dot     = 0x10
 } max7219_sym_t;
 
 /* Exported constants --------------------------------------------------------*/