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

Merge pull request #256 from OlegGirko/fix_btn_mask_size 

Use correct 64-bit integer size for button masks.
dev^2
SQFMI 2024-07-04 13:07:03 -04:00 committed by GitHub
parent 2705fca5ba 1e07dc53d4
commit d7bb52d34c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/config.h
View File

@ -37,11 +37,11 @@
#define USB_DET_PIN 21 #define USB_DET_PIN 21
#define RTC_INT_PIN -1 //not used #define RTC_INT_PIN -1 //not used
#define MENU_BTN_MASK (BIT(7)) #define MENU_BTN_MASK (BIT64(7))
#define BACK_BTN_MASK (BIT(6)) #define BACK_BTN_MASK (BIT64(6))
#define UP_BTN_MASK (BIT(0)) #define UP_BTN_MASK (BIT64(0))
#define DOWN_BTN_MASK (BIT(8)) #define DOWN_BTN_MASK (BIT64(8))
#define ACC_INT_MASK (BIT(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|DOWN_BTN_MASK
#else //V1,V1.5,V2 #else //V1,V1.5,V2
@ -61,24 +61,24 @@
#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
#define UP_BTN_MASK (BIT(32)) #define UP_BTN_MASK (BIT64(32))
#define RTC_TYPE 1 //DS3231 #define RTC_TYPE 1 //DS3231
#elif defined (ARDUINO_WATCHY_V15) #elif defined (ARDUINO_WATCHY_V15)
#define UP_BTN_PIN 32 #define UP_BTN_PIN 32
#define BATT_ADC_PIN 35 #define BATT_ADC_PIN 35
#define UP_BTN_MASK (BIT(32)) #define UP_BTN_MASK (BIT64(32))
#define RTC_TYPE 2 //PCF8563 #define RTC_TYPE 2 //PCF8563
#elif defined (ARDUINO_WATCHY_V20) #elif defined (ARDUINO_WATCHY_V20)
#define UP_BTN_PIN 35 #define UP_BTN_PIN 35
#define BATT_ADC_PIN 34 #define BATT_ADC_PIN 34
#define UP_BTN_MASK (BIT(35)) #define UP_BTN_MASK (BIT64(35))
#define RTC_TYPE 2 //PCF8563 #define RTC_TYPE 2 //PCF8563
#endif #endif
#define MENU_BTN_MASK (BIT(26)) #define MENU_BTN_MASK (BIT64(26))
#define BACK_BTN_MASK (BIT(25)) #define BACK_BTN_MASK (BIT64(25))
#define DOWN_BTN_MASK (BIT(4)) #define DOWN_BTN_MASK (BIT64(4))
#define ACC_INT_MASK (BIT(14)) #define ACC_INT_MASK (BIT64(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 #endif
@ -112,4 +112,4 @@
#define HARDWARE_VERSION_MAJOR 1 #define HARDWARE_VERSION_MAJOR 1
#define HARDWARE_VERSION_MINOR 0 #define HARDWARE_VERSION_MINOR 0
#endif #endif