pacohope
/
Watchy
mirror of https://github.com/sqfmi/Watchy.git
1
0
Fork 1
Code Issues Projects Releases Wiki Activity

Merge pull request #97 from gwilsonOSU/master 

Added variable HOUR_12_24 to config.h
pull/100/head
SQFMI 2021-08-25 21:24:48 -04:00 committed by GitHub
parent 2f12a2babd d9882ab634
commit 66b8fe9c8c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
examples/WatchFaces/7_SEG/Watchy_7_SEG.cpp
View File

@ -27,10 +27,16 @@ void Watchy7SEG::drawWatchFace(){
void Watchy7SEG::drawTime(){
display.setFont(&DSEG7_Classic_Bold_53);
display.setCursor(5, 53+5);
if(currentTime.Hour < 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);
display.print(displayHour);
display.print(":");
if(currentTime.Minute < 10){
display.print("0");

3
src/config.h
View File

@ -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
#endif