Takushima Yukimasa / Mbed 2 deprecated R19_ManuTakukAHWGeo

a

Dependencies:   mbed

Diff: main.h

Revision:
8:b79d21c8178b
Parent:
6:040d001acb12
Child:
10:7c73e1577742
--- a/main.h	Sat Aug 24 06:11:03 2019 +0000
+++ b/main.h	Tue Aug 27 08:54:15 2019 +0000
@@ -31,8 +31,12 @@
 #define DOWNkey  sbdbt.DOWNkey
 
 /* マクロ定義 ----------------------------------------------------------------*/
+//#define PALETTE(color)\
+//for(int s=0; s<3; s++) LED[s]=color&1<<s
 #define PALETTE(color)\
-for(int s=0; s<3; s++) LED[s]=color&1<<s
+for(int s=0; s<3; s++)\
+i2c.Out_Set(Out_Data, s+5, color&1<<s);\
+i2c.Out(Out_Data,8)
 
 /* 型定義 --------------------------------------------------------------------*/
 typedef enum
@@ -71,12 +75,12 @@
 
 typedef enum {
     BLACK,
+    GREEN,
+    RED,
+    YELLOW,
     BLUE,
-    GREEN,
     CYAN,
-    RED,
     MAGENTA,
-    YELLOW,
     WHITE,
 
     COLOR_MAX
@@ -110,6 +114,9 @@
     {0,2,0},        // タオルの先
     {0,3,0},        // タオル展開
     {1,0,0},        // タオルの中央
+    {1,1,0},        // 赤
+    {1,2,0},        // 青
+    {1,3,0},        // 緑
 };
 /* 変数宣言 ------------------------------------------------------------------*/