From ccdaabcb658c22bd101e6c9c238d39e5e6903286 Mon Sep 17 00:00:00 2001 From: Sugar Glider Date: Sat, 16 Aug 2025 10:21:49 -0300 Subject: [PATCH 1/3] fix(pins_arduino): Fixes te mask for the Watchy Device pins --- variants/watchy/pins_arduino.h | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/variants/watchy/pins_arduino.h b/variants/watchy/pins_arduino.h index c126b27aa06..44cb2b79bcd 100644 --- a/variants/watchy/pins_arduino.h +++ b/variants/watchy/pins_arduino.h @@ -29,24 +29,22 @@ static const uint8_t RTC_INT_PIN = 27; #if defined(ARDUINO_WATCHY_V10) static const uint8_t UP_BTN_PIN = 32; static const uint8_t BATT_ADC_PIN = 33; -#define UP_BTN_MASK GPIO_SEL_32 #define RTC_TYPE 1 //DS3231 #elif defined(ARDUINO_WATCHY_V15) static const uint8_t UP_BTN_PIN = 32; static const uint8_t BATT_ADC_PIN = 35; -#define UP_BTN_MASK GPIO_SEL_32 #define RTC_TYPE 2 //PCF8563 #elif defined(ARDUINO_WATCHY_V20) static const uint8_t UP_BTN_PIN = 35; static const uint8_t BATT_ADC_PIN = 34; -#define UP_BTN_MASK GPIO_SEL_35 #define RTC_TYPE 2 //PCF8563 #endif -#define MENU_BTN_MASK GPIO_SEL_26 -#define BACK_BTN_MASK GPIO_SEL_25 -#define DOWN_BTN_MASK GPIO_SEL_4 -#define ACC_INT_MASK GPIO_SEL_14 +#define UP_BTN_MASK (BIT64(UP_BTN_PIN)) +#define MENU_BTN_MASK (BIT64(MENU_BTN_PIN)) +#define BACK_BTN_MASK (BIT64(BACK_BTN_PIN)) +#define DOWN_BTN_MASK (BIT64(DOWN_BTN_PIN)) +#define ACC_INT_MASK (BIT64(ACC_INT_1_PIN)) #define BTN_PIN_MASK MENU_BTN_MASK | BACK_BTN_MASK | UP_BTN_MASK | DOWN_BTN_MASK #endif /* Pins_Arduino_h */ From e47b61a16f69ff8433d1339b9e66d976dee4692c Mon Sep 17 00:00:00 2001 From: Sugar Glider Date: Wed, 3 Sep 2025 15:08:12 -0300 Subject: [PATCH 2/3] fix(watchy): copilot suggestion Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- variants/watchy/pins_arduino.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/variants/watchy/pins_arduino.h b/variants/watchy/pins_arduino.h index 44cb2b79bcd..e2974873ccb 100644 --- a/variants/watchy/pins_arduino.h +++ b/variants/watchy/pins_arduino.h @@ -45,6 +45,6 @@ static const uint8_t BATT_ADC_PIN = 34; #define BACK_BTN_MASK (BIT64(BACK_BTN_PIN)) #define DOWN_BTN_MASK (BIT64(DOWN_BTN_PIN)) #define ACC_INT_MASK (BIT64(ACC_INT_1_PIN)) -#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 /* Pins_Arduino_h */ From b756680b5bbdff990a62f5ac288a967f4bdb5c41 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci-lite[bot]" <117423508+pre-commit-ci-lite[bot]@users.noreply.github.com> Date: Thu, 4 Sep 2025 11:27:55 +0000 Subject: [PATCH 3/3] ci(pre-commit): Apply automatic fixes --- variants/watchy/pins_arduino.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/variants/watchy/pins_arduino.h b/variants/watchy/pins_arduino.h index e2974873ccb..b77bc3966c1 100644 --- a/variants/watchy/pins_arduino.h +++ b/variants/watchy/pins_arduino.h @@ -29,15 +29,15 @@ static const uint8_t RTC_INT_PIN = 27; #if defined(ARDUINO_WATCHY_V10) static const uint8_t UP_BTN_PIN = 32; static const uint8_t BATT_ADC_PIN = 33; -#define RTC_TYPE 1 //DS3231 +#define RTC_TYPE 1 //DS3231 #elif defined(ARDUINO_WATCHY_V15) static const uint8_t UP_BTN_PIN = 32; static const uint8_t BATT_ADC_PIN = 35; -#define RTC_TYPE 2 //PCF8563 +#define RTC_TYPE 2 //PCF8563 #elif defined(ARDUINO_WATCHY_V20) static const uint8_t UP_BTN_PIN = 35; static const uint8_t BATT_ADC_PIN = 34; -#define RTC_TYPE 2 //PCF8563 +#define RTC_TYPE 2 //PCF8563 #endif #define UP_BTN_MASK (BIT64(UP_BTN_PIN))