From da92b9d4a1aad57174a9be01bfc5bda148161f07 Mon Sep 17 00:00:00 2001 From: SQFMI Date: Fri, 21 Jan 2022 17:46:39 -0500 Subject: [PATCH 1/4] Update config.h --- src/config.h | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/src/config.h b/src/config.h index 119d393..f1b220d 100644 --- a/src/config.h +++ b/src/config.h @@ -1,6 +1,40 @@ #ifndef CONFIG_H #define CONFIG_H +//pins +static const uint8_t MENU_BTN_PIN = 26; +static const uint8_t BACK_BTN_PIN = 25; +static const uint8_t DOWN_BTN_PIN = 4; +static const uint8_t DISPLAY_CS = 5; +static const uint8_t DISPLAY_RES = 9; +static const uint8_t DISPLAY_DC = 10; +static const uint8_t DISPLAY_BUSY = 19; +static const uint8_t ACC_INT_1_PIN = 14; +static const uint8_t ACC_INT_2_PIN = 12; +static const uint8_t VIB_MOTOR_PIN = 13; +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 BTN_PIN_MASK MENU_BTN_MASK|BACK_BTN_MASK|UP_BTN_MASK|DOWN_BTN_MASK //display #define DISPLAY_WIDTH 200 #define DISPLAY_HEIGHT 200 From 266fb8ea954faeac98419128d2f188f887195719 Mon Sep 17 00:00:00 2001 From: Joshua Harlan Lifton Date: Sat, 22 Jan 2022 11:29:12 -0500 Subject: [PATCH 2/4] Add link to purchase Watchy at Crowd Supply --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index eb58827..0267751 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ ![Watchy](https://watchy.sqfmi.com/img/watchy_render.png) -[**Buy Watchy!**](https://www.mouser.com/ProductDetail/SQFMI/SQFMI-WATCHY-10?qs=DRkmTr78QARN9VSJRzqRxw%3D%3D) +**Buy Watchy at [Crowd Supply](https://www.crowdsupply.com/sqfmi/watchy) and [Mouser](https://www.mouser.com/ProductDetail/SQFMI/SQFMI-WATCHY-10?qs=DRkmTr78QARN9VSJRzqRxw%3D%3D)!** [**Watchy Case & Accessories**](https://shop.sqfmi.com) From 8e2582f02ad7c32d42093a7f2069158ee9f3e802 Mon Sep 17 00:00:00 2001 From: Joshua Harlan Lifton Date: Sat, 22 Jan 2022 12:11:56 -0500 Subject: [PATCH 3/4] Fix typo and light copy edits --- README.md | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 0267751..9f66332 100644 --- a/README.md +++ b/README.md @@ -6,22 +6,20 @@ [**Watchy Case & Accessories**](https://shop.sqfmi.com) - Visit [**https://watchy.sqfmi.com**](https://watchy.sqfmi.com) for documentation, hardware design files, and more! ## Setup -1. In the Arduino IDE Boards Manager, install support for the ESP32. You can find instructions here: https://docs.espressif.com/projects/arduino-esp32/en/latest/installing.html - * Arduino > Preferences > Additional Board Manager URL's +1. In the Arduino IDE Boards Manager, [install support for the ESP32](https://docs.espressif.com/projects/arduino-esp32/en/latest/installing.html). + * Arduino > Preferences > Additional Board Manager URLs * ```https://raw.githubusercontent.com/espressif/arduino-esp32/gh-pages/package_esp32_index.json``` - -2. Install this library (search for **Watchy** in the library manager), and any other depdencies when prompted +2. Install this library (search for **Watchy** in the library manager), and any other dependencies when prompted 3. Check out the examples under ```Examples``` -> ```Watchy``` 4. Compile & Upload with these board settings: * Board: "ESP32 Dev Module" * Partition Scheme: "Minimal SPIFFS" * All Other Settings: leave to default -You may also have to install the [CP2104 USB to Serial drivers](https://www.silabs.com/products/development-tools/software/usb-to-uart-bridge-vcp-drivers) if the port is not automatically detected +You may also have to install the [CP2104 USB to Serial drivers](https://www.silabs.com/products/development-tools/software/usb-to-uart-bridge-vcp-drivers) if the port is not automatically detected. ### Have Fun! :) From ee5770769820fa2de5f64d598fdeb4faed060b8e Mon Sep 17 00:00:00 2001 From: sqfmi Date: Sun, 23 Jan 2022 16:15:12 -0500 Subject: [PATCH 4/4] Revert "Update config.h" This reverts commit da92b9d4a1aad57174a9be01bfc5bda148161f07. --- src/config.h | 34 ---------------------------------- 1 file changed, 34 deletions(-) diff --git a/src/config.h b/src/config.h index f1b220d..119d393 100644 --- a/src/config.h +++ b/src/config.h @@ -1,40 +1,6 @@ #ifndef CONFIG_H #define CONFIG_H -//pins -static const uint8_t MENU_BTN_PIN = 26; -static const uint8_t BACK_BTN_PIN = 25; -static const uint8_t DOWN_BTN_PIN = 4; -static const uint8_t DISPLAY_CS = 5; -static const uint8_t DISPLAY_RES = 9; -static const uint8_t DISPLAY_DC = 10; -static const uint8_t DISPLAY_BUSY = 19; -static const uint8_t ACC_INT_1_PIN = 14; -static const uint8_t ACC_INT_2_PIN = 12; -static const uint8_t VIB_MOTOR_PIN = 13; -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 BTN_PIN_MASK MENU_BTN_MASK|BACK_BTN_MASK|UP_BTN_MASK|DOWN_BTN_MASK //display #define DISPLAY_WIDTH 200 #define DISPLAY_HEIGHT 200