diff --git a/examples/WatchFaces/7_SEG/Watchy_7_SEG.cpp b/examples/WatchFaces/7_SEG/Watchy_7_SEG.cpp index 89290233..7389f144 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 < 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"); diff --git a/library.json b/library.json index a1ff938b..d56ce5ea 100644 --- a/library.json +++ b/library.json @@ -1,6 +1,6 @@ { "name": "Watchy", - "version": "1.2.6", + "version": "1.2.7", "description": "Watchy - An Open Source E-Paper Watch by SQFMI", "authors": [ { diff --git a/library.properties b/library.properties index 0fa17f69..a17a113f 100644 --- a/library.properties +++ b/library.properties @@ -1,5 +1,5 @@ name=Watchy -version=1.2.6 +version=1.2.7 author=SQFMI maintainer=SQFMI sentence=Watchy - An Open Source E-Paper Watch by SQFMI diff --git a/src/Watchy.cpp b/src/Watchy.cpp index 40bdfa06..8f6eef47 100644 --- a/src/Watchy.cpp +++ b/src/Watchy.cpp @@ -648,7 +648,8 @@ weatherData Watchy::getWeatherData(){ } float Watchy::getBatteryVoltage(){ - return analogRead(ADC_PIN) / 4096.0 * 7.23; + // Battery voltage goes through a 1/2 divider. + return analogReadMilliVolts(ADC_PIN) / 1000.0f * 2.0f; } uint16_t Watchy::_readRegister(uint8_t address, uint8_t reg, uint8_t *data, uint16_t len) diff --git a/src/config.h b/src/config.h index 28112d27..757c90e1 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