From 8ee368752b686b2d43fa5912d97388ac9e7e372b Mon Sep 17 00:00:00 2001 From: lewisxhe Date: Thu, 18 Apr 2019 11:53:34 +0800 Subject: [PATCH 1/5] Add TTGO T-Watch board definition --- boards.txt | 68 +++++++++++++++++++++++++++++++++ variants/t-watch/pins_arduino.h | 39 +++++++++++++++++++ 2 files changed, 107 insertions(+) create mode 100644 variants/t-watch/pins_arduino.h diff --git a/boards.txt b/boards.txt index e0c8be9bc29..423af150869 100644 --- a/boards.txt +++ b/boards.txt @@ -3522,4 +3522,72 @@ sparkfun_lora_gateway_1-channel.menu.UploadSpeed.512000.upload.speed=512000 ############################################################## +ttgo-t-watch.name=TTGO T-Watch + +ttgo-t-watch.upload.tool=esptool_py +ttgo-t-watch.upload.maximum_size=6553600 +ttgo-t-watch.upload.maximum_data_size=4521984 +ttgo-t-watch.upload.wait_for_upload_port=true + +ttgo-t-watch.serial.disableDTR=true +ttgo-t-watch.serial.disableRTS=true + +ttgo-t-watch.build.mcu=esp32 +ttgo-t-watch.build.core=esp32 +ttgo-t-watch.build.variant=t-watch +ttgo-t-watch.build.board=T-Watch + +ttgo-t-watch.build.f_cpu=240000000L +ttgo-t-watch.build.flash_size=16MB +ttgo-t-watch.build.flash_freq=80m +ttgo-t-watch.build.flash_mode=dio +ttgo-t-watch.build.boot=dio +ttgo-t-watch.build.partitions=default_16MB +ttgo-t-watch.build.defines= + +ttgo-t-watch.menu.PSRAM.enabled=Enabled +ttgo-t-watch.menu.PSRAM.enabled.build.defines=-DBOARD_HAS_PSRAM -mfix-esp32-psram-cache-issue +ttgo-t-watch.menu.PSRAM.disabled=Disabled +ttgo-t-watch.menu.PSRAM.disabled.build.defines= + +ttgo-t-watch.menu.PartitionScheme.default=Default (2 x 6.5 MB app, 3.6 MB SPIFFS) +ttgo-t-watch.menu.PartitionScheme.default.build.partitions=default_16MB +ttgo-t-watch.menu.PartitionScheme.large_spiffs=Large SPIFFS (7 MB) +ttgo-t-watch.menu.PartitionScheme.large_spiffs.build.partitions=large_spiffs_16MB +ttgo-t-watch.menu.PartitionScheme.large_spiffs.upload.maximum_size=4685824 + +ttgo-t-watch.menu.UploadSpeed.2000000=2000000 +ttgo-t-watch.menu.UploadSpeed.2000000.upload.speed=2000000 +ttgo-t-watch.menu.UploadSpeed.1152000=1152000 +ttgo-t-watch.menu.UploadSpeed.1152000.upload.speed=1152000 +ttgo-t-watch.menu.UploadSpeed.921600=921600 +ttgo-t-watch.menu.UploadSpeed.921600.upload.speed=921600 +ttgo-t-watch.menu.UploadSpeed.115200=115200 +ttgo-t-watch.menu.UploadSpeed.115200.upload.speed=115200 +ttgo-t-watch.menu.UploadSpeed.256000.windows=256000 +ttgo-t-watch.menu.UploadSpeed.256000.upload.speed=256000 +ttgo-t-watch.menu.UploadSpeed.230400.windows.upload.speed=256000 +ttgo-t-watch.menu.UploadSpeed.230400=230400 +ttgo-t-watch.menu.UploadSpeed.230400.upload.speed=230400 +ttgo-t-watch.menu.UploadSpeed.460800.linux=460800 +ttgo-t-watch.menu.UploadSpeed.460800.macosx=460800 +ttgo-t-watch.menu.UploadSpeed.460800.upload.speed=460800 +ttgo-t-watch.menu.UploadSpeed.512000.windows=512000 +ttgo-t-watch.menu.UploadSpeed.512000.upload.speed=512000 + +ttgo-t-watch.menu.DebugLevel.none=None +ttgo-t-watch.menu.DebugLevel.none.build.code_debug=0 +ttgo-t-watch.menu.DebugLevel.error=Error +ttgo-t-watch.menu.DebugLevel.error.build.code_debug=1 +ttgo-t-watch.menu.DebugLevel.warn=Warn +ttgo-t-watch.menu.DebugLevel.warn.build.code_debug=2 +ttgo-t-watch.menu.DebugLevel.info=Info +ttgo-t-watch.menu.DebugLevel.info.build.code_debug=3 +ttgo-t-watch.menu.DebugLevel.debug=Debug +ttgo-t-watch.menu.DebugLevel.debug.build.code_debug=4 +ttgo-t-watch.menu.DebugLevel.verbose=Verbose +ttgo-t-watch.menu.DebugLevel.verbose.build.code_debug=5 + +############################################################## + diff --git a/variants/t-watch/pins_arduino.h b/variants/t-watch/pins_arduino.h new file mode 100644 index 00000000000..add8276f080 --- /dev/null +++ b/variants/t-watch/pins_arduino.h @@ -0,0 +1,39 @@ +#ifndef Pins_Arduino_h +#define Pins_Arduino_h + +#include + +#define EXTERNAL_NUM_INTERRUPTS 16 +#define NUM_DIGITAL_PINS 20 +#define NUM_ANALOG_INPUTS 16 + +#define analogInputToDigitalPin(p) (((p)<20)?(esp32_adc2gpio[(p)]):-1) +#define digitalPinToInterrupt(p) (((p)<40)?(p):-1) +#define digitalPinHasPWM(p) (p < 34) + +#define TP_SDA 14 +#define TP_SCL 15 +#define TP_INT 38 + +#define RTC_INT 37 +#define APX20X_INT 35 +#define BMA42X_INT1 39 +#define BMA42X_INT2 4 + +static const uint8_t KEY_BUILTIN = 36; + +static const uint8_t TX = 33; +static const uint8_t RX = 34; + +static const uint8_t SDA = 21; +static const uint8_t SCL = 22; + +static const uint8_t SS = 13; +static const uint8_t MOSI = 15; +static const uint8_t MISO = 2; +static const uint8_t SCK = 14; + +static const uint8_t DAC1 = 25; +static const uint8_t DAC2 = 26; + +#endif /* Pins_Arduino_h */ From 0c090f8703f412458a149fc13c94a4aae9163b0d Mon Sep 17 00:00:00 2001 From: lewisxhe Date: Wed, 24 Apr 2019 09:11:25 +0800 Subject: [PATCH 2/5] Add pins description --- boards.txt | 2 +- variants/twatch/pins_arduino.h | 41 ++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 variants/twatch/pins_arduino.h diff --git a/boards.txt b/boards.txt index 423af150869..1b9882c9ecd 100644 --- a/boards.txt +++ b/boards.txt @@ -3534,7 +3534,7 @@ ttgo-t-watch.serial.disableRTS=true ttgo-t-watch.build.mcu=esp32 ttgo-t-watch.build.core=esp32 -ttgo-t-watch.build.variant=t-watch +ttgo-t-watch.build.variant=twatch ttgo-t-watch.build.board=T-Watch ttgo-t-watch.build.f_cpu=240000000L diff --git a/variants/twatch/pins_arduino.h b/variants/twatch/pins_arduino.h new file mode 100644 index 00000000000..69c55f7e5ac --- /dev/null +++ b/variants/twatch/pins_arduino.h @@ -0,0 +1,41 @@ +#ifndef Pins_Arduino_h +#define Pins_Arduino_h + +#include + +#define EXTERNAL_NUM_INTERRUPTS 16 +#define NUM_DIGITAL_PINS 20 +#define NUM_ANALOG_INPUTS 16 + +#define analogInputToDigitalPin(p) (((p)<20)?(esp32_adc2gpio[(p)]):-1) +#define digitalPinToInterrupt(p) (((p)<40)?(p):-1) +#define digitalPinHasPWM(p) (p < 34) + +// touch screen +#define TP_SDA 14 +#define TP_SCL 15 +#define TP_INT 38 + +// Interrupt IO port +#define RTC_INT 37 +#define APX20X_INT 35 +#define BMA42X_INT1 39 +#define BMA42X_INT2 4 + +static const uint8_t KEY_BUILTIN = 36; +//Serial1 Already assigned to GPS LORA +static const uint8_t TX = 33; +static const uint8_t RX = 34; +// Already assigned to BMA423 PCF8563 and external extensions +static const uint8_t SDA = 21; +static const uint8_t SCL = 22; +// SPI has been configured as an SD card slot and must be removed when downloading +static const uint8_t SS = 13; +static const uint8_t MOSI = 15; +static const uint8_t MISO = 2; +static const uint8_t SCK = 14; +// Externally programmable IO +static const uint8_t DAC1 = 25; +static const uint8_t DAC2 = 26; + +#endif /* Pins_Arduino_h */ From 14eedc5b12ccf36ef05368affeeede0a6dcc3ce6 Mon Sep 17 00:00:00 2001 From: lewisxhe Date: Wed, 24 Apr 2019 09:13:21 +0800 Subject: [PATCH 3/5] rename twatch --- variants/t-watch/pins_arduino.h | 39 --------------------------------- 1 file changed, 39 deletions(-) delete mode 100644 variants/t-watch/pins_arduino.h diff --git a/variants/t-watch/pins_arduino.h b/variants/t-watch/pins_arduino.h deleted file mode 100644 index add8276f080..00000000000 --- a/variants/t-watch/pins_arduino.h +++ /dev/null @@ -1,39 +0,0 @@ -#ifndef Pins_Arduino_h -#define Pins_Arduino_h - -#include - -#define EXTERNAL_NUM_INTERRUPTS 16 -#define NUM_DIGITAL_PINS 20 -#define NUM_ANALOG_INPUTS 16 - -#define analogInputToDigitalPin(p) (((p)<20)?(esp32_adc2gpio[(p)]):-1) -#define digitalPinToInterrupt(p) (((p)<40)?(p):-1) -#define digitalPinHasPWM(p) (p < 34) - -#define TP_SDA 14 -#define TP_SCL 15 -#define TP_INT 38 - -#define RTC_INT 37 -#define APX20X_INT 35 -#define BMA42X_INT1 39 -#define BMA42X_INT2 4 - -static const uint8_t KEY_BUILTIN = 36; - -static const uint8_t TX = 33; -static const uint8_t RX = 34; - -static const uint8_t SDA = 21; -static const uint8_t SCL = 22; - -static const uint8_t SS = 13; -static const uint8_t MOSI = 15; -static const uint8_t MISO = 2; -static const uint8_t SCK = 14; - -static const uint8_t DAC1 = 25; -static const uint8_t DAC2 = 26; - -#endif /* Pins_Arduino_h */ From c93b88d9a4383ab277f7a499323c1179089c17ac Mon Sep 17 00:00:00 2001 From: lewisxhe Date: Wed, 24 Apr 2019 14:58:35 +0800 Subject: [PATCH 4/5] rename tx/rx --- variants/twatch/pins_arduino.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/variants/twatch/pins_arduino.h b/variants/twatch/pins_arduino.h index 69c55f7e5ac..b6e102e58fb 100644 --- a/variants/twatch/pins_arduino.h +++ b/variants/twatch/pins_arduino.h @@ -24,8 +24,8 @@ static const uint8_t KEY_BUILTIN = 36; //Serial1 Already assigned to GPS LORA -static const uint8_t TX = 33; -static const uint8_t RX = 34; +static const uint8_t TX1 = 33; +static const uint8_t RX1 = 34; // Already assigned to BMA423 PCF8563 and external extensions static const uint8_t SDA = 21; static const uint8_t SCL = 22; From f4f58bcfd8f7a7b9730af78db6dca542ff8594de Mon Sep 17 00:00:00 2001 From: lewisxhe Date: Wed, 24 Apr 2019 15:32:43 +0800 Subject: [PATCH 5/5] Change to macro definition --- variants/twatch/pins_arduino.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/variants/twatch/pins_arduino.h b/variants/twatch/pins_arduino.h index b6e102e58fb..44570b72693 100644 --- a/variants/twatch/pins_arduino.h +++ b/variants/twatch/pins_arduino.h @@ -22,10 +22,12 @@ #define BMA42X_INT1 39 #define BMA42X_INT2 4 -static const uint8_t KEY_BUILTIN = 36; //Serial1 Already assigned to GPS LORA -static const uint8_t TX1 = 33; -static const uint8_t RX1 = 34; +#define TX1 33 +#define RX1 34 + +static const uint8_t KEY_BUILTIN = 36; + // Already assigned to BMA423 PCF8563 and external extensions static const uint8_t SDA = 21; static const uint8_t SCL = 22;