12-hour format fix

mcer12 · Dec 4, 2021 · d156c3e · d156c3e
1 parent 84da41e
commit d156c3e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/Firmware/FLORA_FIRMWARE/FLORA_FIRMWARE.ino b/Firmware/FLORA_FIRMWARE/FLORA_FIRMWARE.ino
@@ -30,16 +30,16 @@
 
 // Pick a clock version below!
 //#define CLOCK_VERSION_IV6
-#define CLOCK_VERSION_IV12
-//#define CLOCK_VERSION_IV22
+//#define CLOCK_VERSION_IV12
+#define CLOCK_VERSION_IV22
 
 #if !defined(CLOCK_VERSION_IV6) && !defined(CLOCK_VERSION_IV12) && !defined(CLOCK_VERSION_IV22)
 #error "You have to select a clock version! Line 25"
 #endif
 
 #define AP_NAME "FLORA_"
 #define FW_NAME "FLORA"
-#define FW_VERSION "5.1"
+#define FW_VERSION "5.1.2"
 #define CONFIG_TIMEOUT 300000 // 300000 = 5 minutes
 
 // ONLY CHANGE DEFINES BELOW IF YOU KNOW WHAT YOU'RE DOING!

diff --git a/Firmware/FLORA_FIRMWARE/VFD_fns.ino b/Firmware/FLORA_FIRMWARE/VFD_fns.ino
@@ -188,6 +188,8 @@ void showTime() {
   int hours = hour();
   if (hours > 12 && json["t_format"].as<int>() == 0) { // 12 / 24 h format
     hours -= 12;
+  } else if (hours == 0 && json["t_format"].as<int>() == 0) {
+    hours = 12;
   }
 
   int splitTime[6] = {