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

merged fixes for compilation issues

dev^2 v1.4.13
SQFMI 2024-07-04 14:21:04 -04:00
parent d7bb52d34c
commit b21516f9ee
5 changed files with 17 additions and 11 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", "name": "Watchy",
"version": "1.4.12", "version": "1.4.13",
"description": "Watchy - An Open Source E-Paper Watch by SQFMI", "description": "Watchy - An Open Source E-Paper Watch by SQFMI",
"authors": [ "authors": [
{ {

2
library.properties
View File

@ -1,5 +1,5 @@
name=Watchy name=Watchy
version=1.4.12 version=1.4.13
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

2
src/Display.cpp
View File

@ -19,9 +19,11 @@
RTC_DATA_ATTR bool displayFullInit = true; RTC_DATA_ATTR bool displayFullInit = true;
void WatchyDisplay::busyCallback(const void *) { void WatchyDisplay::busyCallback(const void *) {
#ifndef ARDUINO_ESP32S3_DEV
gpio_wakeup_enable((gpio_num_t)DISPLAY_BUSY, GPIO_INTR_LOW_LEVEL); gpio_wakeup_enable((gpio_num_t)DISPLAY_BUSY, GPIO_INTR_LOW_LEVEL);
esp_sleep_enable_gpio_wakeup(); esp_sleep_enable_gpio_wakeup();
esp_light_sleep_start(); esp_light_sleep_start();
#endif
} }
WatchyDisplay::WatchyDisplay() : WatchyDisplay::WatchyDisplay() :

3
src/Watchy.cpp
View File

@ -88,7 +88,6 @@ void Watchy::deepSleep() {
esp_sleep_enable_ext1_wakeup( esp_sleep_enable_ext1_wakeup(
BTN_PIN_MASK, BTN_PIN_MASK,
ESP_EXT1_WAKEUP_ANY_LOW); // enable deep sleep wake on button press ESP_EXT1_WAKEUP_ANY_LOW); // enable deep sleep wake on button press
rtc_clk_32k_enable(true); rtc_clk_32k_enable(true);
//rtc_clk_slow_freq_set(RTC_SLOW_FREQ_32K_XTAL); //rtc_clk_slow_freq_set(RTC_SLOW_FREQ_32K_XTAL);
struct tm timeinfo; struct tm timeinfo;
@ -109,7 +108,7 @@ void Watchy::deepSleep() {
BTN_PIN_MASK, BTN_PIN_MASK,
ESP_EXT1_WAKEUP_ANY_HIGH); // enable deep sleep wake on button press ESP_EXT1_WAKEUP_ANY_HIGH); // enable deep sleep wake on button press
#endif #endif
gpio_deep_sleep_hold_dis();
esp_deep_sleep_start(); esp_deep_sleep_start();
} }

19
src/config.h
View File

@ -2,13 +2,9 @@
#define CONFIG_H #define CONFIG_H
// Versioning // Versioning
#define WATCHY_LIB_VER "1.4.12" #define WATCHY_LIB_VER "1.4.13"
//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"
#ifdef ARDUINO_ESP32S3_DEV //V3 #ifdef ARDUINO_ESP32S3_DEV //V3
@ -42,10 +38,17 @@
#define UP_BTN_MASK (BIT64(0)) #define UP_BTN_MASK (BIT64(0))
#define DOWN_BTN_MASK (BIT64(8)) #define DOWN_BTN_MASK (BIT64(8))
#define ACC_INT_MASK (BIT64(14)) #define ACC_INT_MASK (BIT64(14))
#define BTN_PIN_MASK MENU_BTN_MASK|BACK_BTN_MASK|DOWN_BTN_MASK #define BTN_PIN_MASK MENU_BTN_MASK|BACK_BTN_MASK|UP_BTN_MASK|DOWN_BTN_MASK
#else //V1,V1.5,V2 #else //V1,V1.5,V2
#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"
#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
@ -83,6 +86,8 @@
#endif #endif
#endif
//display //display
#define DISPLAY_WIDTH 200 #define DISPLAY_WIDTH 200
#define DISPLAY_HEIGHT 200 #define DISPLAY_HEIGHT 200
@ -112,4 +117,4 @@
#define HARDWARE_VERSION_MAJOR 1 #define HARDWARE_VERSION_MAJOR 1
#define HARDWARE_VERSION_MINOR 0 #define HARDWARE_VERSION_MINOR 0
#endif #endif