mirror of
https://github.com/gunner47/GyverLamp.git
synced 2025-08-08 09:20:59 +03:00
WiFi подключение переработано, код переформатирован, добавлены комментарии
This commit is contained in:
@@ -1,26 +1,36 @@
|
||||
#ifdef ESP_USE_BUTTON
|
||||
boolean brightDirection;
|
||||
|
||||
void buttonTick() {
|
||||
void buttonTick()
|
||||
{
|
||||
touch.tick();
|
||||
if (touch.isSingle()) {
|
||||
if (dawnFlag) {
|
||||
if (touch.isSingle())
|
||||
{
|
||||
if (dawnFlag)
|
||||
{
|
||||
manualOff = true;
|
||||
dawnFlag = false;
|
||||
loadingFlag = true;
|
||||
FastLED.setBrightness(modes[currentMode].brightness);
|
||||
changePower();
|
||||
} else {
|
||||
if (ONflag) {
|
||||
}
|
||||
else
|
||||
{
|
||||
if (ONflag)
|
||||
{
|
||||
ONflag = false;
|
||||
changePower();
|
||||
} else {
|
||||
}
|
||||
else
|
||||
{
|
||||
ONflag = true;
|
||||
changePower();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (ONflag && touch.isDouble()) {
|
||||
if (ONflag && touch.isDouble())
|
||||
{
|
||||
if (++currentMode >= MODE_AMOUNT) currentMode = 0;
|
||||
FastLED.setBrightness(modes[currentMode].brightness);
|
||||
loadingFlag = true;
|
||||
@@ -29,7 +39,9 @@ void buttonTick() {
|
||||
FastLED.clear();
|
||||
delay(1);
|
||||
}
|
||||
if (ONflag && touch.isTriple()) {
|
||||
|
||||
if (ONflag && touch.isTriple())
|
||||
{
|
||||
if (--currentMode < 0) currentMode = 0;
|
||||
FastLED.setBrightness(modes[currentMode].brightness);
|
||||
loadingFlag = true;
|
||||
@@ -39,21 +51,32 @@ void buttonTick() {
|
||||
delay(1);
|
||||
}
|
||||
|
||||
if (ONflag && touch.isHolded()) {
|
||||
if (ONflag && touch.isHolded())
|
||||
{
|
||||
brightDirection = !brightDirection;
|
||||
}
|
||||
if (ONflag && touch.isStep()) {
|
||||
if (brightDirection) {
|
||||
|
||||
if (ONflag && touch.isStep())
|
||||
{
|
||||
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;
|
||||
} else {
|
||||
}
|
||||
else
|
||||
{
|
||||
if (modes[currentMode].brightness > 15) modes[currentMode].brightness -= 5;
|
||||
else if (modes[currentMode].brightness > 1) modes[currentMode].brightness -= 1;
|
||||
else modes[currentMode].brightness = 1;
|
||||
else modes[currentMode].brightness = 0;
|
||||
}
|
||||
FastLED.setBrightness(modes[currentMode].brightness);
|
||||
settChanged = true;
|
||||
eepromTimer = millis();
|
||||
|
||||
#ifdef GENERAL_DEBUG
|
||||
Serial.printf("New brightness value: %d\n", modes[currentMode].brightness);
|
||||
#endif
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
Reference in New Issue
Block a user