diff --git a/library.json b/library.json index 696993e..c01fd54 100644 --- a/library.json +++ b/library.json @@ -1,6 +1,6 @@ { "name": "Watchy", - "version": "1.3.2", + "version": "1.3.3", "description": "Watchy - An Open Source E-Paper Watch by SQFMI", "authors": [ { diff --git a/library.properties b/library.properties index 794ee3a..04e5214 100644 --- a/library.properties +++ b/library.properties @@ -1,5 +1,5 @@ name=Watchy -version=1.3.2 +version=1.3.3 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 6aa38f0..566e2f7 100644 --- a/src/Watchy.cpp +++ b/src/Watchy.cpp @@ -279,17 +279,12 @@ void Watchy::showAbout(){ display.setTextColor(GxEPD_WHITE); display.setCursor(0, 20); - display.print("FW Ver: "); - display.println(Watchy_Version); + display.print("Lib Ver: v"); + display.println(WATCHY_LIB_VER); - const char *rtc_hw_type; - switch (RTC.rtcType) { - case 0: rtc_hw_type = "DS3231"; break; - case 1: rtc_hw_type = "PCF8563"; break; - default: rtc_hw_type = ""; - } + const char *RTC_HW[3] = { "", "DS3231", "PCF8563" }; display.print("RTC: "); - display.println(rtc_hw_type); + display.println(RTC_HW[RTC.rtcType]); //0 = UNKNOWN, 1 = DS3231, 2 = PCF8563 display.print("Batt: "); float voltage = getBatteryVoltage(); diff --git a/src/Watchy.h b/src/Watchy.h index c03c317..aeccc68 100644 --- a/src/Watchy.h +++ b/src/Watchy.h @@ -16,8 +16,6 @@ #include "bma.h" #include "config.h" -#define Watchy_Version "1.3.1" - typedef struct weatherData{ int8_t temperature; int16_t weatherConditionCode; diff --git a/src/WatchyRTC.h b/src/WatchyRTC.h index 5a96bf4..29da5d4 100644 --- a/src/WatchyRTC.h +++ b/src/WatchyRTC.h @@ -6,8 +6,8 @@ #include "config.h" #include "time.h" -#define DS3231 0 -#define PCF8563 1 +#define DS3231 1 +#define PCF8563 2 #define RTC_DS_ADDR 0x68 #define RTC_PCF_ADDR 0x51 #define YEAR_OFFSET_DS 1970 diff --git a/src/config.h b/src/config.h index 626c84d..6a523bc 100644 --- a/src/config.h +++ b/src/config.h @@ -50,5 +50,6 @@ #define SOFTWARE_VERSION_PATCH 0 #define HARDWARE_VERSION_MAJOR 1 #define HARDWARE_VERSION_MINOR 0 - +//Versioning +#define WATCHY_LIB_VER "1.3.3" #endif \ No newline at end of file