Skip to content

Commit f48d901

Browse files
lewisxhelewis he
lewisxhe
and
lewis he
authored
Update T_Watch board properties and add revision selection (#4025)
Co-authored-by: lewis he <[email protected]>
1 parent a55265f commit f48d901

File tree

2 files changed

+74
-71
lines changed

2 files changed

+74
-71
lines changed

Diff for: ‎boards.txt

+72-66
Original file line numberDiff line numberDiff line change
@@ -4087,72 +4087,78 @@ sparkfun_lora_gateway_1-channel.menu.UploadSpeed.512000.upload.speed=512000
40874087

40884088
##############################################################
40894089

4090-
ttgo-t-watch.name=TTGO T-Watch
4091-
4092-
ttgo-t-watch.upload.tool=esptool_py
4093-
ttgo-t-watch.upload.maximum_size=6553600
4094-
ttgo-t-watch.upload.maximum_data_size=4521984
4095-
ttgo-t-watch.upload.wait_for_upload_port=true
4096-
4097-
ttgo-t-watch.serial.disableDTR=true
4098-
ttgo-t-watch.serial.disableRTS=true
4099-
4100-
ttgo-t-watch.build.mcu=esp32
4101-
ttgo-t-watch.build.core=esp32
4102-
ttgo-t-watch.build.variant=twatch
4103-
ttgo-t-watch.build.board=T-Watch
4104-
4105-
ttgo-t-watch.build.f_cpu=240000000L
4106-
ttgo-t-watch.build.flash_size=16MB
4107-
ttgo-t-watch.build.flash_freq=80m
4108-
ttgo-t-watch.build.flash_mode=dio
4109-
ttgo-t-watch.build.boot=dio
4110-
ttgo-t-watch.build.partitions=default_16MB
4111-
ttgo-t-watch.build.defines=
4112-
4113-
ttgo-t-watch.menu.PSRAM.enabled=Enabled
4114-
ttgo-t-watch.menu.PSRAM.enabled.build.defines=-DBOARD_HAS_PSRAM -mfix-esp32-psram-cache-issue
4115-
ttgo-t-watch.menu.PSRAM.disabled=Disabled
4116-
ttgo-t-watch.menu.PSRAM.disabled.build.defines=
4117-
4118-
ttgo-t-watch.menu.PartitionScheme.default=Default (2 x 6.5 MB app, 3.6 MB SPIFFS)
4119-
ttgo-t-watch.menu.PartitionScheme.default.build.partitions=default_16MB
4120-
ttgo-t-watch.menu.PartitionScheme.default.upload.maximum_size=6553600
4121-
ttgo-t-watch.menu.PartitionScheme.large_spiffs=Large SPIFFS (7 MB)
4122-
ttgo-t-watch.menu.PartitionScheme.large_spiffs.build.partitions=large_spiffs_16MB
4123-
ttgo-t-watch.menu.PartitionScheme.large_spiffs.upload.maximum_size=4685824
4124-
4125-
ttgo-t-watch.menu.UploadSpeed.2000000=2000000
4126-
ttgo-t-watch.menu.UploadSpeed.2000000.upload.speed=2000000
4127-
ttgo-t-watch.menu.UploadSpeed.1152000=1152000
4128-
ttgo-t-watch.menu.UploadSpeed.1152000.upload.speed=1152000
4129-
ttgo-t-watch.menu.UploadSpeed.921600=921600
4130-
ttgo-t-watch.menu.UploadSpeed.921600.upload.speed=921600
4131-
ttgo-t-watch.menu.UploadSpeed.115200=115200
4132-
ttgo-t-watch.menu.UploadSpeed.115200.upload.speed=115200
4133-
ttgo-t-watch.menu.UploadSpeed.256000.windows=256000
4134-
ttgo-t-watch.menu.UploadSpeed.256000.upload.speed=256000
4135-
ttgo-t-watch.menu.UploadSpeed.230400.windows.upload.speed=256000
4136-
ttgo-t-watch.menu.UploadSpeed.230400=230400
4137-
ttgo-t-watch.menu.UploadSpeed.230400.upload.speed=230400
4138-
ttgo-t-watch.menu.UploadSpeed.460800.linux=460800
4139-
ttgo-t-watch.menu.UploadSpeed.460800.macosx=460800
4140-
ttgo-t-watch.menu.UploadSpeed.460800.upload.speed=460800
4141-
ttgo-t-watch.menu.UploadSpeed.512000.windows=512000
4142-
ttgo-t-watch.menu.UploadSpeed.512000.upload.speed=512000
4143-
4144-
ttgo-t-watch.menu.DebugLevel.none=None
4145-
ttgo-t-watch.menu.DebugLevel.none.build.code_debug=0
4146-
ttgo-t-watch.menu.DebugLevel.error=Error
4147-
ttgo-t-watch.menu.DebugLevel.error.build.code_debug=1
4148-
ttgo-t-watch.menu.DebugLevel.warn=Warn
4149-
ttgo-t-watch.menu.DebugLevel.warn.build.code_debug=2
4150-
ttgo-t-watch.menu.DebugLevel.info=Info
4151-
ttgo-t-watch.menu.DebugLevel.info.build.code_debug=3
4152-
ttgo-t-watch.menu.DebugLevel.debug=Debug
4153-
ttgo-t-watch.menu.DebugLevel.debug.build.code_debug=4
4154-
ttgo-t-watch.menu.DebugLevel.verbose=Verbose
4155-
ttgo-t-watch.menu.DebugLevel.verbose.build.code_debug=5
4090+
twatch.name=TTGO T-Watch
4091+
4092+
twatch.upload.tool=esptool_py
4093+
twatch.upload.maximum_size=6553600
4094+
twatch.upload.maximum_data_size=4521984
4095+
twatch.upload.wait_for_upload_port=true
4096+
4097+
twatch.serial.disableDTR=true
4098+
twatch.serial.disableRTS=true
4099+
4100+
twatch.build.mcu=esp32
4101+
twatch.build.core=esp32
4102+
twatch.build.variant=twatch
4103+
4104+
twatch.menu.Revision.TWATCH_BASE=T-Watch Base
4105+
twatch.menu.Revision.TWATCH_BASE.build.board=TWATCH_BASE
4106+
twatch.menu.Revision.TWATCH_2020_V1=T-Watch-2020-V1
4107+
twatch.menu.Revision.TWATCH_2020_V1.build.board=TWATCH_2020_V1
4108+
twatch.menu.Revision.TWATCH_2020_V2=T-Watch-2020-V2
4109+
twatch.menu.Revision.TWATCH_2020_V2.build.board=TWATCH_2020_V2
4110+
4111+
twatch.build.f_cpu=240000000L
4112+
twatch.build.flash_size=16MB
4113+
twatch.build.flash_freq=80m
4114+
twatch.build.flash_mode=dio
4115+
twatch.build.boot=dio
4116+
twatch.build.partitions=default_16MB
4117+
twatch.build.defines=
4118+
4119+
twatch.menu.PSRAM.enabled=Enabled
4120+
twatch.menu.PSRAM.enabled.build.defines=-DBOARD_HAS_PSRAM -mfix-esp32-psram-cache-issue
4121+
twatch.menu.PSRAM.disabled=Disabled
4122+
twatch.menu.PSRAM.disabled.build.defines=
4123+
4124+
twatch.menu.PartitionScheme.default=Default (2 x 6.5 MB app, 3.6 MB SPIFFS)
4125+
twatch.menu.PartitionScheme.default.build.partitions=default_16MB
4126+
twatch.menu.PartitionScheme.default.upload.maximum_size=6553600
4127+
twatch.menu.PartitionScheme.large_spiffs=Large SPIFFS (7 MB)
4128+
twatch.menu.PartitionScheme.large_spiffs.build.partitions=large_spiffs_16MB
4129+
twatch.menu.PartitionScheme.large_spiffs.upload.maximum_size=4685824
4130+
4131+
twatch.menu.UploadSpeed.2000000=2000000
4132+
twatch.menu.UploadSpeed.2000000.upload.speed=2000000
4133+
twatch.menu.UploadSpeed.1152000=1152000
4134+
twatch.menu.UploadSpeed.1152000.upload.speed=1152000
4135+
twatch.menu.UploadSpeed.921600=921600
4136+
twatch.menu.UploadSpeed.921600.upload.speed=921600
4137+
twatch.menu.UploadSpeed.115200=115200
4138+
twatch.menu.UploadSpeed.115200.upload.speed=115200
4139+
twatch.menu.UploadSpeed.256000.windows=256000
4140+
twatch.menu.UploadSpeed.256000.upload.speed=256000
4141+
twatch.menu.UploadSpeed.230400.windows.upload.speed=256000
4142+
twatch.menu.UploadSpeed.230400=230400
4143+
twatch.menu.UploadSpeed.230400.upload.speed=230400
4144+
twatch.menu.UploadSpeed.460800.linux=460800
4145+
twatch.menu.UploadSpeed.460800.macosx=460800
4146+
twatch.menu.UploadSpeed.460800.upload.speed=460800
4147+
twatch.menu.UploadSpeed.512000.windows=512000
4148+
twatch.menu.UploadSpeed.512000.upload.speed=512000
4149+
4150+
twatch.menu.DebugLevel.none=None
4151+
twatch.menu.DebugLevel.none.build.code_debug=0
4152+
twatch.menu.DebugLevel.error=Error
4153+
twatch.menu.DebugLevel.error.build.code_debug=1
4154+
twatch.menu.DebugLevel.warn=Warn
4155+
twatch.menu.DebugLevel.warn.build.code_debug=2
4156+
twatch.menu.DebugLevel.info=Info
4157+
twatch.menu.DebugLevel.info.build.code_debug=3
4158+
twatch.menu.DebugLevel.debug=Debug
4159+
twatch.menu.DebugLevel.debug.build.code_debug=4
4160+
twatch.menu.DebugLevel.verbose=Verbose
4161+
twatch.menu.DebugLevel.verbose.build.code_debug=5
41564162

41574163
##############################################################
41584164

Diff for: ‎variants/twatch/pins_arduino.h

+2-5
Original file line numberDiff line numberDiff line change
@@ -12,22 +12,19 @@
1212
#define digitalPinHasPWM(p) (p < 34)
1313

1414
// touch screen
15-
#define TP_SDA 14
16-
#define TP_SCL 15
15+
#define TP_SDA 23
16+
#define TP_SCL 32
1717
#define TP_INT 38
1818

1919
// Interrupt IO port
2020
#define RTC_INT 37
2121
#define APX20X_INT 35
2222
#define BMA42X_INT1 39
23-
#define BMA42X_INT2 4
2423

2524
//Serial1 Already assigned to GPS LORA
2625
#define TX1 33
2726
#define RX1 34
2827

29-
static const uint8_t KEY_BUILTIN = 36;
30-
3128
// Already assigned to BMA423 PCF8563 and external extensions
3229
static const uint8_t SDA = 21;
3330
static const uint8_t SCL = 22;

0 commit comments

Comments
 (0)