#129

Author: mvladic

src/eez/modules/psu/persist_conf.cpp

@@ -826,6 +826,13 @@ bool writeTotalOnTime(int type, uint32_t time) {
     buffer[5] = crc32((uint8_t *)(buffer + 3), 8);
 
     if (type == ontime::ON_TIME_COUNTER_MCU) {
+        // static uint32_t lastTime = time;
+        // DebugTrace("On-time counter: %u, systick: %u\n", time, millis());
+        // if (lastTime != 0 && (time - lastTime) >= 2 * WRITE_ONTIME_INTERVAL) {
+        //     psu::gui::errorMessage("On time counter alert!");
+        // }
+        // lastTime = time;
+
         return confWrite((uint8_t *)buffer, sizeof(buffer), mcu::eeprom::EEPROM_ONTIME_START_ADDRESS);
     } else {
         return moduleConfWrite(

src/eez/system.cpp

@@ -24,7 +24,7 @@
 #include <main.h>
 #include <iwdg.h>
 
-volatile uint32_t g_tickCount;
+volatile uint64_t g_tickCount;
 
 int g_watchdogExpectingTask = WATCHDOG_HIGH_PRIORITY_THREAD;
 
@@ -53,7 +53,7 @@ namespace eez {
 
 uint32_t millis() {
 #if defined(EEZ_PLATFORM_STM32)
-    return g_tickCount / 5;
+    return (uint32_t)(g_tickCount / 5);
 #endif
 
 #if defined(EEZ_PLATFORM_SIMULATOR)
@@ -77,9 +77,9 @@ uint32_t micros() {
 	auto cnt = TIM7->CNT;
 	auto tc2 = g_tickCount;
 	if (tc1 == tc2) {
-		return tc1 * 200 + 2 * cnt;
+		return (uint32_t)(tc1 * 200 + 2 * cnt);
 	}
-	return tc2 * 200;
+	return (uint32_t)(tc2 * 200);
 #endif
 
 #if defined(EEZ_PLATFORM_SIMULATOR)

src/eez/system.h

@@ -30,7 +30,7 @@
 void doWatchdogReset(int fromTask);
 #define WATCHDOG_RESET(fromTask) doWatchdogReset(fromTask)
 
-extern volatile uint32_t g_tickCount;
+extern volatile uint64_t g_tickCount;
 
 #else
 

src/eez/unit.h

@@ -51,8 +51,8 @@ enum Unit {
     UNIT_MICRO_FARAD,
     UNIT_NANO_FARAD,
     UNIT_PICO_FARAD,
-    UNIT_BIT,
     UNIT_MINUTE,
+    UNIT_BIT,
 };
 
 extern const char *g_unitNames[];