| … | … | @@ -57,6 +57,7 @@ void cmdGreen(); |
| 57 | 57 | void cmdAmber(); |
| 58 | 58 | void cmdBlack(); |
| 59 | 59 | void cmdMultiColor(); |
| 60 | void cmdMultiMultiColor(); |
| 60 | 61 | void cmdSetColor(); |
| 61 | 62 | void cmdSetInd(); |
| 62 | 63 | //void cmdSetIndHelper(); |
| … | … | @@ -68,6 +69,7 @@ SerialCommand::Entry CommandsList[] = { |
| 68 | 69 | {"amber", cmdAmber}, |
| 69 | 70 | {"black", cmdBlack}, |
| 70 | 71 | {"m", cmdMultiColor}, |
| 72 | {"mm", cmdMultiMultiColor}, |
| 71 | 73 | {"c", cmdSetColor}, |
| 72 | 74 | {"i", cmdSetInd}, |
| 73 | 75 | // {"test", cmdSetIndHelper}, |
| … | … | @@ -120,8 +122,45 @@ void cmdAmber() { |
| 120 | 122 | // delay(30); |
| 121 | 123 | } |
| 122 | 124 | |
| 125 | void cmdMultiMultiColor() { |
| 126 | int index = 0; |
| 127 | while (1) { |
| 128 | char *larg = CmdMgr.next(); |
| 129 | if (larg == NULL) { |
| 130 | printlnError("Error: no id arguments"); |
| 131 | break; |
| 132 | } |
| 133 | else { |
| 134 | index = atoi(larg); |
| 135 | } |
| 136 | char *larg1 = CmdMgr.next(); |
| 137 | if (larg1 == NULL) { |
| 138 | printlnError("Error: no red arguments"); |
| 139 | } |
| 140 | else { |
| 141 | ledr = atoi(larg1); |
| 142 | } |
| 143 | char *larg2 = CmdMgr.next(); |
| 144 | if (larg2 == NULL) { |
| 145 | printlnError("Error: no green arguments"); |
| 146 | } |
| 147 | else { |
| 148 | ledg = atoi(larg2); |
| 149 | } |
| 150 | char *larg3 = CmdMgr.next(); |
| 151 | if (larg3 == NULL) { |
| 152 | printlnError("Error: no blue arguments"); |
| 153 | } |
| 154 | else { |
| 155 | ledb = atoi(larg3); |
| 156 | } |
| 157 | leds[index].setRGB( ledr, ledg, ledb); |
| 158 | FastLED.show(); |
| 159 | } |
| 160 | } |
| 161 | |
| 123 | 162 | void cmdMultiColor() { |
| 124 | | char *larg = CmdMgr.next(); |
| 163 | char *larg = CmdMgr.next(); |
| 125 | 164 | if (larg == NULL) { |
| 126 | 165 | printlnError("Error: no id arguments"); |
| 127 | 166 | } |
| … | … | @@ -153,6 +192,7 @@ char *larg = CmdMgr.next(); |
| 153 | 192 | FastLED.show(); |
| 154 | 193 | // delay(30); |
| 155 | 194 | } |
| 195 | |
| 156 | 196 | void cmdSetColor() { |
| 157 | 197 | char *arg = CmdMgr.next(); |
| 158 | 198 | if (arg == NULL) { |
| … | … | @@ -200,11 +240,11 @@ long parseRGB(const char *arg, long maxRGB) { |
| 200 | 240 | return v; |
| 201 | 241 | } |
| 202 | 242 | void cmdSetInd() { |
| 203 | | int count = 0; |
| 204 | | char *arg = CmdMgr.next(); |
| 205 | | if (arg == NULL) { |
| 206 | | printlnError("you missed something"); |
| 207 | | } |
| 243 | int count = 0; |
| 244 | char *arg = CmdMgr.next(); |
| 245 | if (arg == NULL) { |
| 246 | printlnError("you missed something"); |
| 247 | } |
| 208 | 248 | for ( int i = 0; i < NUM_LEDS; i++ ) { |
| 209 | 249 | // loop through columns of current row |
| 210 | 250 | for ( int j = 0; j < 3; j++ ){ |
| … | … | @@ -324,6 +364,3 @@ void loop() { |
| 324 | 364 | } |
| 325 | 365 | } |
| 326 | 366 | } |
| 327 | | |
| 328 | | |
| 329 | | |