From 20ee700d5a308c29f8038836d54be96c965dfd22 Mon Sep 17 00:00:00 2001
From: Greg Wilson <wilsongr@oregonstate.edu>
Date: Sat, 21 Aug 2021 16:46:51 -0700
Subject: [PATCH 1/2] Added variable HOUR_12_24 to config.h, for setting a
 12-hour or 24-hour time display.  Set to 24 by default.

---
 examples/WatchFaces/7_SEG/Watchy_7_SEG.cpp | 4 ++--
 src/config.h                               | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/examples/WatchFaces/7_SEG/Watchy_7_SEG.cpp b/examples/WatchFaces/7_SEG/Watchy_7_SEG.cpp
index 8929023..fc7ee73 100644
--- a/examples/WatchFaces/7_SEG/Watchy_7_SEG.cpp
+++ b/examples/WatchFaces/7_SEG/Watchy_7_SEG.cpp
@@ -27,10 +27,10 @@ void Watchy7SEG::drawWatchFace(){
 void Watchy7SEG::drawTime(){
     display.setFont(&DSEG7_Classic_Bold_53);
     display.setCursor(5, 53+5);
-    if(currentTime.Hour < 10){
+    if(currentTime.Hour % HOUR_12_24 < 10){
         display.print("0");
     }
-    display.print(currentTime.Hour);
+    display.print(currentTime.Hour % HOUR_12_24);
     display.print(":");
     if(currentTime.Minute < 10){
         display.print("0");
diff --git a/src/config.h b/src/config.h
index 28112d2..757c90e 100644
--- a/src/config.h
+++ b/src/config.h
@@ -48,6 +48,7 @@
 #define SET_MONTH 3
 #define SET_DAY 4
 #define YEAR_OFFSET 1970
+#define HOUR_12_24 24
 //BLE OTA
 #define BLE_DEVICE_NAME "Watchy BLE OTA"
 #define WATCHFACE_NAME "Watchy 7 Segment"
@@ -57,4 +58,4 @@
 #define HARDWARE_VERSION_MAJOR 1
 #define HARDWARE_VERSION_MINOR 0
 
-#endif
\ No newline at end of file
+#endif

From d9882ab63459f0c805c9c922d642175420812d80 Mon Sep 17 00:00:00 2001
From: Greg Wilson <wilsongr@oregonstate.edu>
Date: Sun, 22 Aug 2021 11:41:47 -0700
Subject: [PATCH 2/2] fixed incorrect 12h time conversion

---
 examples/WatchFaces/7_SEG/Watchy_7_SEG.cpp | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/examples/WatchFaces/7_SEG/Watchy_7_SEG.cpp b/examples/WatchFaces/7_SEG/Watchy_7_SEG.cpp
index fc7ee73..7389f14 100644
--- a/examples/WatchFaces/7_SEG/Watchy_7_SEG.cpp
+++ b/examples/WatchFaces/7_SEG/Watchy_7_SEG.cpp
@@ -27,10 +27,16 @@ void Watchy7SEG::drawWatchFace(){
 void Watchy7SEG::drawTime(){
     display.setFont(&DSEG7_Classic_Bold_53);
     display.setCursor(5, 53+5);
-    if(currentTime.Hour % HOUR_12_24 < 10){
+    int displayHour;
+    if(HOUR_12_24==12){
+      displayHour = ((currentTime.Hour+11)%12)+1;
+    } else {
+      displayHour = currentTime.Hour;
+    }
+    if(displayHour < 10){
         display.print("0");
     }
-    display.print(currentTime.Hour % HOUR_12_24);
+    display.print(displayHour);
     display.print(":");
     if(currentTime.Minute < 10){
         display.print("0");