mirror of https://github.com/sqfmi/Watchy.git
parent
bf7425c7dc
commit
c5b43d2eac
|
@ -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": [
|
||||
{
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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 = "<unknown>";
|
||||
}
|
||||
const char *RTC_HW[3] = { "<UNKNOWN>", "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();
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
Loading…
Reference in New Issue