Imported-Repos/gunner47-GyverLamp
1
0
Fork 0
mirror of https://github.com/gunner47/GyverLamp.git synced 2025-08-08 09:20:59 +03:00
Code Issues Packages Projects Releases Wiki Activity

Добавлен режим автоматического переключения избранных эффектов; Реорганизован код, исправлены ошибки

Browse Source
This commit is contained in:
gunner47
2019-08-26 14:35:37 +03:00
parent b2d0110a63
commit 5012ee3141
17 changed files with 704 additions and 236 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
firmware/GyverLamp_v1.4/effectTicker.ino
View File

@@ -4,51 +4,32 @@ void effectsTick()
{
if (!dawnFlag)
{
if (ONflag && (millis() - effTimer >= ((currentMode < 5 || currentMode > 13) ? modes[currentMode].speed : 50)))
if (ONflag && (millis() - effTimer >= ((currentMode < 5 || currentMode > 13) ? modes[currentMode].Speed : 50)))
{
effTimer = millis();
switch (currentMode)
{
case 0: sparklesRoutine();
break;
case 1: fireRoutine();
break;
case 2: rainbowVertical();
break;
case 3: rainbowHorizontal();
break;
case 4: colorsRoutine();
break;
case 5: madnessNoise();
break;
case 6: cloudNoise();
break;
case 7: lavaNoise();
break;
case 8: plasmaNoise();
break;
case 9: rainbowNoise();
break;
case 10: rainbowStripeNoise();
break;
case 11: zebraNoise();
break;
case 12: forestNoise();
break;
case 13: oceanNoise();
break;
case 14: colorRoutine();
break;
case 15: snowRoutine();
break;
case 16: matrixRoutine();
break;
case 17: lightersRoutine();
break;
case 18: lightBalls();
break;
case 19: whiteColor();
break;
case 0: sparklesRoutine(); break;
case 1: fireRoutine(); break;
case 2: rainbowVertical(); break;
case 3: rainbowHorizontal(); break;
case 4: colorsRoutine(); break;
case 5: madnessNoise(); break;
case 6: cloudNoise(); break;
case 7: lavaNoise(); break;
case 8: plasmaNoise(); break;
case 9: rainbowNoise(); break;
case 10: rainbowStripeNoise(); break;
case 11: zebraNoise(); break;
case 12: forestNoise(); break;
case 13: oceanNoise(); break;
case 14: colorRoutine(); break;
case 15: snowRoutine(); break;
case 16: matrixRoutine(); break;
case 17: lightersRoutine(); break;
case 18: lightBalls(); break;
case 19: whiteColor(); break;
default: break;
}
FastLED.show();
}
@@ -60,20 +41,20 @@ void changePower()
if (ONflag)
{
effectsTick();
for (uint8_t i = 0; i < modes[currentMode].brightness; i = constrain(i + 8, 0, modes[currentMode].brightness))
for (uint8_t i = 0; i < modes[currentMode].Brightness; i = constrain(i + 8, 0, modes[currentMode].Brightness))
{
FastLED.setBrightness(i);
delay(1);
FastLED.show();
}
FastLED.setBrightness(modes[currentMode].brightness);
FastLED.setBrightness(modes[currentMode].Brightness);
delay(2);
FastLED.show();
}
else
{
effectsTick();
for (uint8_t i = modes[currentMode].brightness; i > 0; i = constrain(i - 8, 0, modes[currentMode].brightness))
for (uint8_t i = modes[currentMode].Brightness; i > 0; i = constrain(i - 8, 0, modes[currentMode].Brightness))
{
FastLED.setBrightness(i);
delay(1);