Fix calculating system ticks in Ticker when sleep #bugfix

spaceAngel · Sep 25, 2022 · 07e230c · 07e230c
1 parent 3d87339
commit 07e230c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/src/Core/SystemTicker.cpp b/src/Core/SystemTicker.cpp
@@ -2,7 +2,6 @@
 
 #include "config.h"
 
-
 #include "Core/Hardware/RTC.h"
 
 SystemTicker* SystemTicker::inst;
@@ -16,20 +15,27 @@ SystemTicker *SystemTicker::getInstance() {
 }
 
 void SystemTicker::tickWakedUp() {
-	if (this->ticks == USHRT_MAX) {
+	if (this->ticks > this->maxTicks) {
 		this->ticks = 0;
 	}
 	RTC::getInstance()->getCurrentDate();
 	this->ticks++;
 }
 
 void SystemTicker::tickSleep() {
-	this->ticks += (uint8_t)((SLEEPCYCLE_MS / 1000) * TICK_WAKEUP);
-	if (this->ticks == USHRT_MAX) {
+	this->ticks += (uint8_t)((SLEEPCYCLE_MS * CPU_FREQUENCY_LOW) / 1000);
+	if (this->ticks > this->maxTicks) {
 		this->ticks = 0;
 	}
 }
 
 bool SystemTicker::isTickFor(uint16_t tickCount) {
+	this->setMaxTicks(tickCount);
 	return (this->ticks % tickCount) == 0;
 }
+
+void SystemTicker::setMaxTicks(uint16_t maxTicks) {
+	if (this->maxTicks < maxTicks) {
+		this->maxTicks = maxTicks;
+	}
+}
diff --git a/src/Core/SystemTicker.h b/src/Core/SystemTicker.h
@@ -20,6 +20,10 @@ class SystemTicker {
 
 		uint16_t ticks = 0;
 
+		uint16_t maxTicks = 0;
+
+		void setMaxTicks(uint16_t maxTicks);
+
 		SystemTicker() {
 
 		}