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

Merge branch 'master' into dev

pull/193/head
sqfmi 2022-10-08 16:23:36 -04:00
parent 4c56a38f34 8adde783be
commit a24b1d0945
5 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
library.json
View File

@ -1,6 +1,6 @@
{
"name": "Watchy",
"version": "1.4.1",
"version": "1.4.2",
"description": "Watchy - An Open Source E-Paper Watch by SQFMI",
"authors": [
{

2
library.properties
View File

@ -1,5 +1,5 @@
name=Watchy
version=1.4.1
version=1.4.2
author=SQFMI
maintainer=SQFMI
sentence=Watchy - An Open Source E-Paper Watch by SQFMI

10
src/Watchy.cpp
View File

@ -53,10 +53,16 @@ void Watchy::displayBusyCallback(const void *) {
void Watchy::deepSleep() {
display.hibernate();
if (displayFullInit) // For some reason, seems to be enabled on first boot
esp_sleep_disable_wakeup_source(ESP_SLEEP_WAKEUP_TIMER);
displayFullInit = false; // Notify not to init it again
RTC.clearAlarm(); // resets the alarm flag in the RTC
// Set pins 0-39 to input to avoid power leaking out
for (int i = 0; i < 40; i++) {
// Set GPIOs 0-39 to input to avoid power leaking out
const uint64_t ignore = 0b11110001000000110000100111000010; // Ignore some GPIOs due to resets
for (int i = 0; i < GPIO_NUM_MAX; i++) {
if ((ignore >> i) & 0b1)
continue;
pinMode(i, INPUT);
}
esp_sleep_enable_ext0_wakeup((gpio_num_t)RTC_INT_PIN,

2
src/WatchyRTC.cpp
View File

@ -47,7 +47,7 @@ void WatchyRTC::read(tmElements_t &tm) {
if (rtcType == DS3231) {
rtc_ds.read(tm);
} else {
rtc_pcf.getDateTime();
rtc_pcf.getDate();
tm.Year = y2kYearToTm(rtc_pcf.getYear());
tm.Month = rtc_pcf.getMonth();
tm.Day = rtc_pcf.getDay();

18
src/config.h
View File

@ -2,6 +2,14 @@
#define CONFIG_H
//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 BACK_BTN_PIN 25
#define DOWN_BTN_PIN 4
@ -14,12 +22,6 @@
#define VIB_MOTOR_PIN 13
#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)
#define UP_BTN_PIN 32
#define BATT_ADC_PIN 33
@ -43,6 +45,8 @@
#define ACC_INT_MASK GPIO_SEL_14
#define BTN_PIN_MASK MENU_BTN_MASK|BACK_BTN_MASK|UP_BTN_MASK|DOWN_BTN_MASK
#endif
//display
#define DISPLAY_WIDTH 200
#define DISPLAY_HEIGHT 200
@ -72,5 +76,5 @@
#define HARDWARE_VERSION_MAJOR 1
#define HARDWARE_VERSION_MINOR 0
// Versioning
#define WATCHY_LIB_VER "1.4.1"
#define WATCHY_LIB_VER "1.4.2"
#endif