Skip to content

Commit

Permalink
Fix RGB шим
Browse files Browse the repository at this point in the history
  • Loading branch information
tretyakovsa committed Dec 4, 2018
1 parent d37675d commit c97592d
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions RGBJAL.ino
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ void initRGB() {
sendStatus(brightnessRGBS, readArgsInt()); //яркость
sendStatus(modeRGBS, readArgsInt()); //режим
String title = readArgsString(); // Пятый аргумент подпись
if (title=="" ) title = rgbS;
if (title == "" ) title = rgbS;
sendStatus(stateRGBS, state);
sCmd.readStr("wReg toggle "+rgbS+" "+title);
sCmd.readStr("wReg toggle " + rgbS + " " + title);
ws2812fx.init();
ws2812fx.setMode(getStatusInt(modeRGBS)); // Режим
setColorString(colorRGBS); // Начальный цвет
Expand Down Expand Up @@ -140,9 +140,9 @@ void initRGBSHIM() {
sendStatus(speedSRGBS, readArgsInt()); //скорость
sendStatus(brightnessSRGBS, readArgsInt()); //яркость
//sendStatus(modeSRGBS, readArgsInt()); //режим
String title = readArgsString(); // Пятый аргумент подпись
if (title=="" ) title = rgbSS;
sCmd.readStr("wReg toggle "+rgbSS+" "+title);
String title = readArgsString(); // Пятый аргумент подпись
if (title == "" ) title = rgbSS;
sCmd.readStr("wReg toggle " + rgbSS + " " + title);

//регистрируем модуль

Expand All @@ -153,9 +153,9 @@ String title = readArgsString(); // Пятый аргумент подпись
}
void setColorSString(String color) {
if (color.length() == 6) {
analogWrite(getOptionsInt("rgbSPin0"), hexToUint32(color.substring(0, 2)));
analogWrite(getOptionsInt("rgbSPin1"), hexToUint32(color.substring(2, 4)));
analogWrite(getOptionsInt("rgbSPin2"), hexToUint32(color.substring(4, 6)));
analogWrite(getOptionsInt("rgbSPin0"), map(hexToUint32(color.substring(0, 2)), 0, 255, 0, 1023));
analogWrite(getOptionsInt("rgbSPin1"), map(hexToUint32(color.substring(2, 4)), 0, 255, 0, 1023));
analogWrite(getOptionsInt("rgbSPin2"), map(hexToUint32(color.substring(4, 6)), 0, 255, 0, 1023));
}
}

Expand Down
Binary file modified build/build.0x00000_flash_size_1Mb.256Kb_2018.12.02.bin
Binary file not shown.
Binary file modified build/spiffs.0xBB000_flash_size_1Mb.256Kb_2018.12.03.bin
Binary file not shown.

0 comments on commit c97592d

Please sign in to comment.