Skip to content

Update T_Watch board properties and add revision selection #4025

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 30, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
138 changes: 72 additions & 66 deletions boards.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4087,72 +4087,78 @@ 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=twatch
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.default.upload.maximum_size=6553600
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
twatch.name=TTGO T-Watch

twatch.upload.tool=esptool_py
twatch.upload.maximum_size=6553600
twatch.upload.maximum_data_size=4521984
twatch.upload.wait_for_upload_port=true

twatch.serial.disableDTR=true
twatch.serial.disableRTS=true

twatch.build.mcu=esp32
twatch.build.core=esp32
twatch.build.variant=twatch

twatch.menu.Revision.TWATCH_BASE=T-Watch Base
twatch.menu.Revision.TWATCH_BASE.build.board=TWATCH_BASE
twatch.menu.Revision.TWATCH_2020_V1=T-Watch-2020-V1
twatch.menu.Revision.TWATCH_2020_V1.build.board=TWATCH_2020_V1
twatch.menu.Revision.TWATCH_2020_V2=T-Watch-2020-V2
twatch.menu.Revision.TWATCH_2020_V2.build.board=TWATCH_2020_V2

twatch.build.f_cpu=240000000L
twatch.build.flash_size=16MB
twatch.build.flash_freq=80m
twatch.build.flash_mode=dio
twatch.build.boot=dio
twatch.build.partitions=default_16MB
twatch.build.defines=

twatch.menu.PSRAM.enabled=Enabled
twatch.menu.PSRAM.enabled.build.defines=-DBOARD_HAS_PSRAM -mfix-esp32-psram-cache-issue
twatch.menu.PSRAM.disabled=Disabled
twatch.menu.PSRAM.disabled.build.defines=

twatch.menu.PartitionScheme.default=Default (2 x 6.5 MB app, 3.6 MB SPIFFS)
twatch.menu.PartitionScheme.default.build.partitions=default_16MB
twatch.menu.PartitionScheme.default.upload.maximum_size=6553600
twatch.menu.PartitionScheme.large_spiffs=Large SPIFFS (7 MB)
twatch.menu.PartitionScheme.large_spiffs.build.partitions=large_spiffs_16MB
twatch.menu.PartitionScheme.large_spiffs.upload.maximum_size=4685824

twatch.menu.UploadSpeed.2000000=2000000
twatch.menu.UploadSpeed.2000000.upload.speed=2000000
twatch.menu.UploadSpeed.1152000=1152000
twatch.menu.UploadSpeed.1152000.upload.speed=1152000
twatch.menu.UploadSpeed.921600=921600
twatch.menu.UploadSpeed.921600.upload.speed=921600
twatch.menu.UploadSpeed.115200=115200
twatch.menu.UploadSpeed.115200.upload.speed=115200
twatch.menu.UploadSpeed.256000.windows=256000
twatch.menu.UploadSpeed.256000.upload.speed=256000
twatch.menu.UploadSpeed.230400.windows.upload.speed=256000
twatch.menu.UploadSpeed.230400=230400
twatch.menu.UploadSpeed.230400.upload.speed=230400
twatch.menu.UploadSpeed.460800.linux=460800
twatch.menu.UploadSpeed.460800.macosx=460800
twatch.menu.UploadSpeed.460800.upload.speed=460800
twatch.menu.UploadSpeed.512000.windows=512000
twatch.menu.UploadSpeed.512000.upload.speed=512000

twatch.menu.DebugLevel.none=None
twatch.menu.DebugLevel.none.build.code_debug=0
twatch.menu.DebugLevel.error=Error
twatch.menu.DebugLevel.error.build.code_debug=1
twatch.menu.DebugLevel.warn=Warn
twatch.menu.DebugLevel.warn.build.code_debug=2
twatch.menu.DebugLevel.info=Info
twatch.menu.DebugLevel.info.build.code_debug=3
twatch.menu.DebugLevel.debug=Debug
twatch.menu.DebugLevel.debug.build.code_debug=4
twatch.menu.DebugLevel.verbose=Verbose
twatch.menu.DebugLevel.verbose.build.code_debug=5

##############################################################

Expand Down
7 changes: 2 additions & 5 deletions variants/twatch/pins_arduino.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,22 +12,19 @@
#define digitalPinHasPWM(p) (p < 34)

// touch screen
#define TP_SDA 14
#define TP_SCL 15
#define TP_SDA 23
#define TP_SCL 32
#define TP_INT 38

// Interrupt IO port
#define RTC_INT 37
#define APX20X_INT 35
#define BMA42X_INT1 39
#define BMA42X_INT2 4

//Serial1 Already assigned to GPS LORA
#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;
Expand Down