diff --git a/firmware/GyverLamp_v1.0/GyverLamp_v1.0.ino b/firmware/GyverLamp_v1.0/GyverLamp_v1.0.ino index 6dcd863..a96f421 100644 --- a/firmware/GyverLamp_v1.0/GyverLamp_v1.0.ino +++ b/firmware/GyverLamp_v1.0/GyverLamp_v1.0.ino @@ -118,7 +118,7 @@ boolean settChanged = false; void setup() { ESP.wdtDisable(); - ESP.wdtEnable(WDTO_8S); + //ESP.wdtEnable(WDTO_8S); delay(1000); // ЛЕНТА FastLED.addLeds(leds, NUM_LEDS)/*.setCorrection( TypicalLEDStrip )*/; diff --git a/firmware/GyverLamp_v1.0/effectTicker.ino b/firmware/GyverLamp_v1.0/effectTicker.ino index 3fa08e0..160dd8c 100644 --- a/firmware/GyverLamp_v1.0/effectTicker.ino +++ b/firmware/GyverLamp_v1.0/effectTicker.ino @@ -2,10 +2,7 @@ uint32_t effTimer; void effectsTick() { if (!dawnFlag) { - int thisDelay; - if (currentMode < 5) thisDelay = modes[currentMode].speed; - else thisDelay = 50; - if (ONflag && millis() - effTimer >= thisDelay) { + if (ONflag && millis() - effTimer >= ((currentMode < 5) ? modes[currentMode].speed : 50) ) { effTimer = millis(); switch (currentMode) { case 0: sparklesRoutine();