Imported-Repos/gunner47-GyverLamp
1
0
Fork 0
mirror of https://github.com/gunner47/GyverLamp.git synced 2025-08-08 17:30: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

24
firmware/GyverLamp_v1.4/button.ino
View File

@@ -1,5 +1,5 @@
#ifdef ESP_USE_BUTTON
boolean brightDirection;
bool brightDirection;
void buttonTick()
{
@@ -11,7 +11,7 @@ void buttonTick()
manualOff = true;
dawnFlag = false;
loadingFlag = true;
FastLED.setBrightness(modes[currentMode].brightness);
FastLED.setBrightness(modes[currentMode].Brightness);
changePower();
}
else
@@ -24,7 +24,7 @@ void buttonTick()
if (ONflag && touch.isDouble())
{
if (++currentMode >= MODE_AMOUNT) currentMode = 0;
FastLED.setBrightness(modes[currentMode].brightness);
FastLED.setBrightness(modes[currentMode].Brightness);
loadingFlag = true;
settChanged = true;
eepromTimer = millis();
@@ -35,7 +35,7 @@ void buttonTick()
if (ONflag && touch.isTriple())
{
if (--currentMode < 0) currentMode = MODE_AMOUNT - 1;
FastLED.setBrightness(modes[currentMode].brightness);
FastLED.setBrightness(modes[currentMode].Brightness);
loadingFlag = true;
settChanged = true;
eepromTimer = millis();
@@ -64,22 +64,22 @@ void buttonTick()
{
if (brightDirection)
{
if (modes[currentMode].brightness < 10) modes[currentMode].brightness += 1;
else if (modes[currentMode].brightness < 250) modes[currentMode].brightness += 5;
else modes[currentMode].brightness = 255;
if (modes[currentMode].Brightness < 10) modes[currentMode].Brightness += 1;
else if (modes[currentMode].Brightness < 250) modes[currentMode].Brightness += 5;
else modes[currentMode].Brightness = 255;
}
else
{
if (modes[currentMode].brightness > 15) modes[currentMode].brightness -= 5;
else if (modes[currentMode].brightness > 1) modes[currentMode].brightness -= 1;
else modes[currentMode].brightness = 0;
if (modes[currentMode].Brightness > 15) modes[currentMode].Brightness -= 5;
else if (modes[currentMode].Brightness > 1) modes[currentMode].Brightness -= 1;
else modes[currentMode].Brightness = 0;
}
FastLED.setBrightness(modes[currentMode].brightness);
FastLED.setBrightness(modes[currentMode].Brightness);
settChanged = true;
eepromTimer = millis();
#ifdef GENERAL_DEBUG
Serial.printf("New brightness value: %d\n", modes[currentMode].brightness);
Serial.printf("New brightness value: %d\n", modes[currentMode].Brightness);
#endif
}
}