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-14 00:18:36 +03:00
parent 754dde2f96
commit b2d0110a63
8 changed files with 106 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
firmware/GyverLamp_v1.4/parsing.ino
View File

@@ -132,6 +132,20 @@ void parseUDP()
}
}
else if (inputBuffer.startsWith("TMR_GET"))
{
sendTimer();
}
else if (inputBuffer.startsWith("TMR_SET"))
{
TimerManager::TimerRunning = inputBuffer.substring(8, 9).toInt();
TimerManager::TimerOption = inputBuffer.substring(10, 11).toInt();
TimerManager::TimeToFire = millis() + (uint64_t)(inputBuffer.substring(12).toInt() * 1000);
TimerManager::TimerHasFired = false;
sendTimer();
}
else
{
inputBuffer = "";
@@ -184,6 +198,8 @@ void sendCurrent()
inputBuffer += "0";
#endif
inputBuffer += " ";
inputBuffer += String((uint8_t)TimerManager::TimerRunning);
inputBuffer += " ";
#ifdef USE_NTP
inputBuffer += timeClient.getFormattedTime();
#else
@@ -208,3 +224,14 @@ void sendAlarms()
}
inputBuffer += (dawnMode + 1);
}
void sendTimer()
{
inputBuffer = "TMR";
inputBuffer += " ";
inputBuffer += String((uint8_t)TimerManager::TimerRunning);
inputBuffer += " ";
inputBuffer += String(TimerManager::TimerOption);
inputBuffer += " ";
inputBuffer += String(TimerManager::TimerRunning ? (uint16_t)floor((TimerManager::TimeToFire - millis()) / 1000) : 0);
}