mirror of https://github.com/sqfmi/Watchy.git
parent
53acbe6929
commit
8adde783be
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "Watchy",
|
"name": "Watchy",
|
||||||
"version": "1.4.1",
|
"version": "1.4.2",
|
||||||
"description": "Watchy - An Open Source E-Paper Watch by SQFMI",
|
"description": "Watchy - An Open Source E-Paper Watch by SQFMI",
|
||||||
"authors": [
|
"authors": [
|
||||||
{
|
{
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
name=Watchy
|
name=Watchy
|
||||||
version=1.4.1
|
version=1.4.2
|
||||||
author=SQFMI
|
author=SQFMI
|
||||||
maintainer=SQFMI
|
maintainer=SQFMI
|
||||||
sentence=Watchy - An Open Source E-Paper Watch by SQFMI
|
sentence=Watchy - An Open Source E-Paper Watch by SQFMI
|
||||||
|
|
|
@ -47,7 +47,7 @@ void WatchyRTC::read(tmElements_t &tm) {
|
||||||
if (rtcType == DS3231) {
|
if (rtcType == DS3231) {
|
||||||
rtc_ds.read(tm);
|
rtc_ds.read(tm);
|
||||||
} else {
|
} else {
|
||||||
rtc_pcf.getDateTime();
|
rtc_pcf.getDate();
|
||||||
tm.Year = y2kYearToTm(rtc_pcf.getYear());
|
tm.Year = y2kYearToTm(rtc_pcf.getYear());
|
||||||
tm.Month = rtc_pcf.getMonth();
|
tm.Month = rtc_pcf.getMonth();
|
||||||
tm.Day = rtc_pcf.getDay();
|
tm.Day = rtc_pcf.getDay();
|
||||||
|
|
18
src/config.h
18
src/config.h
|
@ -2,6 +2,14 @@
|
||||||
#define CONFIG_H
|
#define CONFIG_H
|
||||||
|
|
||||||
//pins
|
//pins
|
||||||
|
#if !defined(ARDUINO_WATCHY_V10) && !defined(ARDUINO_WATCHY_V15) && !defined(ARDUINO_WATCHY_V20)
|
||||||
|
|
||||||
|
#pragma message "Please install the latest ESP32 Arduino Core (2.0.5+) and choose Watchy as the target board"
|
||||||
|
#pragma message "Hardware revision is not defined at the project level, please define in config.h. Defaulting to ARDUINO_WATCHY_V20"
|
||||||
|
|
||||||
|
//Change to your board version
|
||||||
|
#define ARDUINO_WATCHY_V20
|
||||||
|
|
||||||
#define MENU_BTN_PIN 26
|
#define MENU_BTN_PIN 26
|
||||||
#define BACK_BTN_PIN 25
|
#define BACK_BTN_PIN 25
|
||||||
#define DOWN_BTN_PIN 4
|
#define DOWN_BTN_PIN 4
|
||||||
|
@ -14,12 +22,6 @@
|
||||||
#define VIB_MOTOR_PIN 13
|
#define VIB_MOTOR_PIN 13
|
||||||
#define RTC_INT_PIN 27
|
#define RTC_INT_PIN 27
|
||||||
|
|
||||||
|
|
||||||
#if !defined(ARDUINO_WATCHY_V10) && !defined(ARDUINO_WATCHY_V15) && !defined(ARDUINO_WATCHY_V20)
|
|
||||||
#warning Hardware revision is not defined at the project level. Using hard-coded value
|
|
||||||
#define ARDUINO_WATCHY_V20
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if defined (ARDUINO_WATCHY_V10)
|
#if defined (ARDUINO_WATCHY_V10)
|
||||||
#define UP_BTN_PIN 32
|
#define UP_BTN_PIN 32
|
||||||
#define BATT_ADC_PIN 33
|
#define BATT_ADC_PIN 33
|
||||||
|
@ -43,6 +45,8 @@
|
||||||
#define ACC_INT_MASK GPIO_SEL_14
|
#define ACC_INT_MASK GPIO_SEL_14
|
||||||
#define BTN_PIN_MASK MENU_BTN_MASK|BACK_BTN_MASK|UP_BTN_MASK|DOWN_BTN_MASK
|
#define BTN_PIN_MASK MENU_BTN_MASK|BACK_BTN_MASK|UP_BTN_MASK|DOWN_BTN_MASK
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
||||||
//display
|
//display
|
||||||
#define DISPLAY_WIDTH 200
|
#define DISPLAY_WIDTH 200
|
||||||
#define DISPLAY_HEIGHT 200
|
#define DISPLAY_HEIGHT 200
|
||||||
|
@ -72,5 +76,5 @@
|
||||||
#define HARDWARE_VERSION_MAJOR 1
|
#define HARDWARE_VERSION_MAJOR 1
|
||||||
#define HARDWARE_VERSION_MINOR 0
|
#define HARDWARE_VERSION_MINOR 0
|
||||||
// Versioning
|
// Versioning
|
||||||
#define WATCHY_LIB_VER "1.4.0"
|
#define WATCHY_LIB_VER "1.4.2"
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue