iotmanager/IoTManager
1
0
Fork 0
mirror of https://github.com/IoTManagerProject/IoTManager.git synced 2026-03-28 23:22:19 +03:00
Code Issues Packages Projects Releases Wiki Activity

timer bug fully fixed

Browse Source
This commit is contained in:
Dmitry Borisenko
2020-11-18 13:18:08 +03:00
parent ceb516ddbe
commit b2e9d90686
3 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/items/vCountDown.cpp
View File

@@ -17,24 +17,23 @@ void CountDownClass::execute(unsigned int countDownPeriod) {
}
void CountDownClass::loop() {
static unsigned long prevMillis1;
static unsigned long prevMillis2;
static int sec;
if (_countDownPeriod > 0 && _start) {
prevMillis1 = millis();
_start = false;
sec = (_countDownPeriod / 1000) + 1;
sec = (_countDownPeriod / 1000);
}
unsigned long currentMillis = millis();
unsigned long difference1 = currentMillis - prevMillis1;
unsigned long difference2 = currentMillis - prevMillis2;
currentMillis = millis();
difference1 = currentMillis - prevMillis1;
difference2 = currentMillis - prevMillis2;
if (difference1 > _countDownPeriod && _countDownPeriod > 0) {
_countDownPeriod = 0;
eventGen2(_key, "0");
Serial.println(_key + " completed");
}
if (difference2 > 1000 && _countDownPeriod > 0) {
prevMillis2 = millis();
Serial.println(sec--);
sec--;
Serial.println(_key + " " + String(sec));
publishStatus(_key, String(sec));
}
}
@@ -49,6 +48,9 @@ void countDown() {
countDown_EnterCounter++;
addKey(key, countDown_KeyList, countDown_EnterCounter);
Serial.println(countDown_EnterCounter);
Serial.println(countDown_KeyList);
static bool firstTime = true;
if (firstTime) myCountDown = new MyCountDownVector();
firstTime = false;