後田浩さんによる修正 v0.8.3

--- コマンド追加 LLTWO aaaaaa bbbbbb ２色で縞模様点灯例　?"LLTWO FF0000 0000FF" 赤、青色で縞模様点灯 LLTWO 000000 000000 = LLMONO 000000 = LLCLEAR バージョン0.8.3としました
yhironaka · Nov 29, 2015 · da4a418 · da4a418
1 parent 77e4f39
commit da4a418
Show file tree

Hide file tree

Showing 3 changed files with 160 additions and 97 deletions.
diff --git a/main.c b/main.c
@@ -226,6 +226,57 @@ int main(void)
 
 		}		
 	//ENDLLMONO 
+
+
+      //LLTOW
+      else if (startsWith("LLTWO ",readbuf)){
+ 		if(bufpos >= 5) break;
+		bufpos++;    
+    // デコード
+    bufpos = 0;
+    out_bufpos=0;
+    for(i = 0 ; i < 10 ; i++) readbuf[i]=0;
+    while(1)
+    {
+      if(!uart0test()) continue;
+
+      c = uart0read();
+      if(c == 0x0d || c == 0x0a) break;
+      if(c >='0' && c <='9') {
+        readbuf[bufpos] = c - '0';
+        bufpos++;
+      }
+      if(c >='A' && c <='F') {
+        readbuf[bufpos] = c - 'A' + 10;
+        bufpos++;
+      }
+      if(c >='a' && c <='f') {
+        readbuf[bufpos] = c - 'a' + 10;
+        bufpos++;
+      }
+      if(bufpos == 6) {
+        for(i = 0 ; i < 3 ; i++){
+          g_LED_Buf[out_bufpos + i] =  readbuf[i * 2] * 16;
+          g_LED_Buf[out_bufpos + i] += readbuf[i * 2 + 1];
+        }
+        out_bufpos += 3;
+        bufpos=0;
+        if (out_bufpos >= MAX_LED_NUM * 3) break;
+      }
+    }
+    spiSend(0);
+    spiSend(0);
+
+		for (i = 0 ; i < (MAX_LED_NUM /2); i++) {
+		sendRGB(g_LED_Buf[0] , g_LED_Buf[1] , g_LED_Buf[2]);
+		sendRGB(g_LED_Buf[3] , g_LED_Buf[4] , g_LED_Buf[5]);
+    }		
+
+
+
+
+		}		
+	//ENDLLTWO 
 
       else {
         uart0puts(readbuf);

diff --git a/main.h b/main.h
@@ -4,7 +4,7 @@ main.h
 #ifndef _MAIN
 #define _MAIN
 
-#define VERSION_NUM "0.8.2" 
+#define VERSION_NUM "0.8.3" 
 
 void SwitchMatrix_Init();
 int main(void);

diff --git a/obj/IchigoLamp.hex b/obj/IchigoLamp.hex
@@ -4,7 +4,7 @@
 :100030000000000000000000C7000000C900000030
 :10004000CB000000CB00000000000000CB0000004F
 :10005000CB000000CB00000000000000000000000A
-:10006000CB000000CB00000005050000CB00000025
+:10006000CB000000CB000000B9050000CB00000071
 :10007000CB000000CB00000000000000CB0000001F
 :100080000000000000000000000000000000000070
 :100090000000000000000000000000000000000060
@@ -13,102 +13,114 @@
 :1000C000FEE7FEE7FEE7FEE7FEE7FEE7002208B5F3
 :1000D000094B0A49D3188B4204D209498958043282
 :1000E0001960F5E7074B084A934202D2002204C385
-:1000F000F9E700F055F8FEE70000001000000010DE
-:10010000000700000000001084020010024B9A68F3
+:1000F000F9E700F061F8FEE70000001000000010D2
+:10010000BC0700000000001084020010024B9A6837
 :100110009207FBD5D86170470080054038B5074C81
 :1001200003115B00051C185BFFF7F0FF0F20284050
-:100130004000005BFFF7EAFF38BDC046A80600009C
-:1001400080200D4B0001191DCA6F0243CA670121AF
-:100150005A6800208A435A605A680A435A60042247
-:10016000064B5A625860B420000518621A601A687B
-:100170000A431A607047C046008004400080054072
-:10018000002210B58C5C835C002C05D0002B05D0C0
-:10019000A34203D10132F5E7012000E0002010BDA9
-:1001A0000022F0B58A4B87B01A6100F025F9FFF7FD
-:1001B000C7FFE120400200F035F9864800F0B2F9AF
-:1001C000854800F095F9854800F092F9844800F0E0
-:1001D0008FF90023002403AD5C5501330A2BF9D1BC
-:1001E00000F079F90028FBD000F07CF9291C285593
-:1001F0007C48FFF7C5FF002802D0062C09DD8FE000
-:100200007948291CFFF7BCFF071E04D0012C00DD34
-:1002100086E00134E4E77548291CFFF7B1FF061EAC
-:1002200016D0062C7CDC381CFFF770FF381CFFF75B
-:100230006DFF802601340020FFF770FF0020FFF7DC
-:100240006DFF013E0020FFF769FF002EF3D1C7E7E5
-:100250006748291CFFF794FF071E57D0301C052C58
-:100260005FDC00262E5401300A28FAD1002400F069
-:1002700032F90028FBD000F035F90D282ED00A28DD
-:100280002CD0031C303BDBB2092B01D82B55013499
-:10029000031C413BDBB2052B03D8031C373B2B551A
-:1002A0000134031C613BDBB2052B02D857382855BB
-:1002B0000134062CDBD100235A00A818AA5C4D4952
-:1002C0004078120189198218CA540133032BF3D1E3
-:1002D0007E330336FF339E42C8D100240020FFF74F
-:1002E00015FF0020FFF712FF8026424B013E9A784F
-:1002F0001F7801925878FFF711FF381CFFF70EFFA7
-:100300000198FFF70BFF002EEFD169E7281C00F0E2
-:10031000EFF8381C00242C5401300A28FAD15FE78A
-:10032000002000242C5401300A28FAD1002600F0C5
-:10033000D2F80028FBD000F0D5F80D282DD00A28DF
-:100340002BD0031C303BDBB2092B01D8AB55013657
-:10035000031C413BDBB2052B03D8031C373BAB55D9
-:100360000136031C613BDBB2052B02D85738A85578
-:100370000136062EDBD100235A00A818AA5C1D49BD
-:100380004078120109198218CA540133032BF3D1A2
-:100390007E330334FF339C42C8D10020FFF7B6FE02
-:1003A0000020FFF7B3FE134E351CAB1BA34200DB4E
-:1003B0000FE7AB782F7868780193FFF7AFFE381C12
-:1003C000FFF7ACFE0198FFF7A9FE0335EDE7C04645
-:1003D00000000440E02E0000C8060000D80600001F
-:1003E000DE060000E1060000EA060000EE0600005E
-:1003F000F7060000000000108021074AD36F0B436E
-:10040000D367064B064AC9391A60FD2252421A6167
-:10041000E0225200995070470480044000C0004020
-:100420000400FFFFF7B51E4C0122231C0826802183
-:100430001C4F943300901A603B1DDE67221DD36F62
-:10044000C9010B43D3676368174DB34363606368A7
-:10045000009933436360042314482B6000F092F842
-:10046000231CFF22F033013828621A601868296AB9
-:100470001B680130DB4301930C4B01315843009B57
-:10048000F434594300F07EF8019B012218188223AE
-:100490001B012060AB603E602B6813432B60F7BDEF
-:1004A0000080044000E100E000400640B0710B0015
-:1004B000024B9A685207FBD5D8617047004006404E
-:1004C00038B5041C4518AC4204D02078FFF7F0FF83
-:1004D0000134F8E738BD024B986801231840704793
-:1004E00000400640014B5869C0B2704700400640CA
-:1004F00010B5041C2078002803D00134FFF7D8FF82
-:10050000F8E710BD0122054BD968114204D0DA602A
-:10051000034A1368013313607047C046004000402F
-:100520008001001030B5802480250D4BE400191D9A
-:10053000CA6F2243CA675968A94359605A68802123
-:100540002A435A600022074B09061A60064B1860BE
-:100550001A680A431A6001229A60044B1C6030BD7D
-:1005600000800440800100100040004000E100E0F5
-:100570000022034B1A601A688242FCD37047C046BF
-:1005800080010010002243088B4274D303098B4280
-:100590005FD3030A8B4244D3030B8B4228D3030C53
-:1005A0008B420DD3FF22090212BA030C8B4202D3F5
-:1005B0001212090265D0030B8B4219D300E0090A1D
-:1005C000C30B8B4201D3CB03C01A5241830B8B4226
-:1005D00001D38B03C01A5241430B8B4201D34B030F
-:1005E000C01A5241030B8B4201D30B03C01A524174
-:1005F000C30A8B4201D3CB02C01A5241830A8B42F9
-:1006000001D38B02C01A5241430A8B4201D34B02E1
-:10061000C01A5241030A8B4201D30B02C01A524145
-:10062000CDD2C3098B4201D3CB01C01A52418309F9
-:100630008B4201D38B01C01A524143098B4201D333
-:100640004B01C01A524103098B4201D30B01C01A5E
-:100650005241C3088B4201D3CB00C01A52418308D8
-:100660008B4201D38B00C01A524143088B4201D305
-:100670004B00C01A5241411A00D201465241104665
-:100680007047FFE701B5002000F00CF802BDC0463E
-:100690000029F7D003B5FFF775FF0EBC4243891A56
-:1006A0001847C0467047C046240926093409360950
-:1006B000A409A609B409B609240D260D340D360D7A
-:1006C000A40DA60DB40DB60D49636869676F4C6142
-:1006D0006D70205665722E00302E382E32000A0DB5
-:1006E000004C45444C414D5020004C4C20004C4C9B
-:1006F000434C45415220004C4C4D4F4E4F20000082
+:100130004000005BFFF7EAFF38BDC0465C070000E7
+:1001400038B5051C141C081CFFF7E8FF281CFFF736
+:10015000E5FF201CFFF7E2FF38BD80200C4B0001BB
+:10016000191DCA6F0243CA6701215A6800208A43D9
+:100170005A605A680A435A600422064B5A62586011
+:10018000B420000518621A601A680A431A607047A2
+:100190000080044000800540002210B58C5C835C28
+:1001A000002C05D0002B05D0A34203D10132F5E786
+:1001B000012000E0002010BD0022F0B5B04B85B05A
+:1001C0001A6100F073F9FFF7C8FFE120400200F068
+:1001D00083F9AC4800F000FAAB4800F0E3F9AB4813
+:1001E00000F0E0F9AA4800F0DDF90023002401AD99
+:1001F0005C5501330A2BF9D100F0C7F90028FBD078
+:1002000000F0CAF9291C2855A248FFF7C5FF0028AD
+:1002100002D0062C09DDE2E09F48291CFFF7BCFF55
+:10022000061E04D0012C00DDD9E00134E4E79B4830
+:10023000291CFFF7B1FF071E13D0062C00DDCEE00E
+:10024000301CFFF763FF301CFFF760FF802601348E
+:100250000020013E011C021CFFF772FF002EF7D1A7
+:10026000CAE78F48291CFFF797FF061E51D0381C9C
+:10027000052C00DDB4E000262E5401300A28FAD106
+:10028000002400F082F90028FBD000F085F90D2849
+:100290002ED00A282CD0031C303BDBB2092B01D80E
+:1002A0002B550134031C413BDBB2052B03D8031C47
+:1002B000373B2B550134031C613BDBB2052B02D8C5
+:1002C000573828550134062CDBD100235A00A818D2
+:1002D000AA5C74494078120189198218CA54013302
+:1002E000032BF3D17E330336FF339E42C8D1002463
+:1002F0000020FFF70BFF0020FFF708FF8026694B67
+:10030000013E187859789A78FFF71AFF002EF6D137
+:1003100072E76548291CFFF73FFF071E55D0301CC8
+:10032000042C5DDC00262E5401300A28FAD100246A
+:1003300000F02BF90028FBD000F02EF90D282ED06C
+:100340000A282CD0031C303BDBB2092B01D82B55DB
+:100350000134031C413BDBB2052B03D8031C373BA4
+:100360002B550134031C613BDBB2052B02D85738F7
+:1003700028550134062CDBD100235A00A818AA5CAA
+:1003800048494078120189198218CA540133032B55
+:10039000F3D17E330336FF339E42C8D100240020C0
+:1003A000FFF7B4FE0020FFF7B1FE40273D4E013FAE
+:1003B00030787178B278FFF7C3FEF07831797279CE
+:1003C000FFF7BEFE002FF1D116E7281C00F0EAF877
+:1003D000381C00242C5401300A28FAD10CE70020E4
+:1003E00000262E5401300A28FAD1002400F0CDF85E
+:1003F0000028FBD000F0D0F80D282DD00A282BD0F3
+:10040000031C303BDBB2092B01D82B550134031CF4
+:10041000413BDBB2052B03D8031C373B2B55013482
+:10042000031C613BDBB2052B02D857382855013439
+:10043000062CDBD100235A00A818AA5C1949407881
+:10044000120189198218CA540133032BF3D17E3368
+:100450000336FF339E42C8D10020FFF757FE00202D
+:10046000FFF754FE0F4D2C1C631BB34200DBBCE6B0
+:1004700020786178A278FFF763FE0334F4E7C04682
+:1004800000000440E02E00007C0700008C07000004
+:1004900092070000950700009E070000A2070000D9
+:1004A000AB07000000000010B30700008021074ADE
+:1004B000D36F0B43D367064B064AC9391A60FD2236
+:1004C00052421A61E0225200995070470480044061
+:1004D00000C000400400FFFFF7B51E4C0122231CA2
+:1004E000082680211C4F943300901A603B1DDE6764
+:1004F000221DD36FC9010B43D3676368174DB34304
+:1005000063606368009933436360042314482B607D
+:1005100000F092F8231CFF22F033013828621A60A1
+:100520001868296A1B680130DB4301930C4B0131C9
+:100530005843009BF434594300F07EF8019B01229C
+:10054000181882231B012060AB603E602B681343A8
+:100550002B60F7BD0080044000E100E00040064051
+:10056000B0710B00024B9A685207FBD5D8617047F7
+:100570000040064038B5041C4518AC4204D0207831
+:10058000FFF7F0FF0134F8E738BD024B986801230C
+:100590001840704700400640014B5869C0B2704790
+:1005A0000040064010B5041C2078002803D0013418
+:1005B000FFF7D8FFF8E710BD0122054BD9681142BB
+:1005C00004D0DA60034A1368013313607047C046F1
+:1005D000004000408001001030B5802480250D4B84
+:1005E000E400191DCA6F2243CA675968A9435960BC
+:1005F0005A6880212A435A600022074B09061A6074
+:10060000064B18601A680A431A6001229A60044B6C
+:100610001C6030BD0080044080010010004000409C
+:1006200000E100E00022034B1A601A688242FCD30A
+:100630007047C04680010010002243088B4274D3EB
+:1006400003098B425FD3030A8B4244D3030B8B42D3
+:1006500028D3030C8B420DD3FF22090212BA030CDC
+:100660008B4202D31212090265D0030B8B4219D3BD
+:1006700000E0090AC30B8B4201D3CB03C01A5241DD
+:10068000830B8B4201D38B03C01A5241430B8B4225
+:1006900001D34B03C01A5241030B8B4201D30B030E
+:1006A000C01A5241C30A8B4201D3CB02C01A524135
+:1006B000830A8B4201D38B02C01A5241430A8B42F8
+:1006C00001D34B02C01A5241030A8B4201D30B02E1
+:1006D000C01A5241CDD2C3098B4201D3CB01C01AFB
+:1006E000524183098B4201D38B01C01A5241430905
+:1006F0008B4201D34B01C01A524103098B4201D3F3
+:100700000B01C01A5241C3088B4201D3CB00C01A5F
+:10071000524183088B4201D38B00C01A52414308D7
+:100720008B4201D34B00C01A5241411A00D20146FC
+:10073000524110467047FFE701B5002000F00CF869
+:1007400002BDC0460029F7D003B5FFF775FF0EBC08
+:100750004243891A1847C0467047C04624092609F3
+:1007600034093609A409A609B409B609240D260DD1
+:10077000340D360DA40DA60DB40DB60D4963686990
+:10078000676F4C616D70205665722E00302E382ECA
+:1007900033000A0D004C45444C414D5020004C4C58
+:1007A00020004C4C434C45415220004C4C4D4F4E88
+:0C07B0004F20004C4C54574F200000001C
 :04000003000000CD2C
 :00000001FF