kopia lustrzana https://github.com/meshtastic/firmware
T-Deck/T-Watch: enhancements/fixes (#2786)
* T-Deck: enhancements/fixes * trunk fmt * T-Watch board update --------- Co-authored-by: Ben Meadors <benmmeadors@gmail.com>pull/2789/head
rodzic
44a77a10e1
commit
d6d51bc3f4
|
@ -1,7 +1,8 @@
|
|||
{
|
||||
"build": {
|
||||
"arduino": {
|
||||
"ldscript": "esp32s3_out.ld"
|
||||
"ldscript": "esp32s3_out.ld",
|
||||
"memory_type": "qio_opi"
|
||||
},
|
||||
"core": "esp32",
|
||||
"extra_flags": [
|
||||
|
@ -13,7 +14,7 @@
|
|||
],
|
||||
"f_cpu": "240000000L",
|
||||
"f_flash": "80000000L",
|
||||
"flash_mode": "dio",
|
||||
"flash_mode": "qio",
|
||||
"hwids": [["0x303A", "0x1001"]],
|
||||
"mcu": "esp32s3",
|
||||
"variant": "t-deck"
|
||||
|
|
|
@ -1,7 +1,8 @@
|
|||
{
|
||||
"build": {
|
||||
"arduino": {
|
||||
"ldscript": "esp32s3_out.ld"
|
||||
"ldscript": "esp32s3_out.ld",
|
||||
"memory_type": "qio_opi"
|
||||
},
|
||||
"core": "esp32",
|
||||
"extra_flags": [
|
||||
|
@ -14,7 +15,7 @@
|
|||
],
|
||||
"f_cpu": "240000000L",
|
||||
"f_flash": "80000000L",
|
||||
"flash_mode": "dio",
|
||||
"flash_mode": "qio",
|
||||
"hwids": [["0x303A", "0x1001"]],
|
||||
"mcu": "esp32s3",
|
||||
"variant": "t-watch-s3"
|
||||
|
@ -31,8 +32,9 @@
|
|||
"maximum_size": 8388608,
|
||||
"require_upload_port": true,
|
||||
"use_1200bps_touch": true,
|
||||
"wait_for_upload_port": true
|
||||
"wait_for_upload_port": true,
|
||||
"speed": 921600
|
||||
},
|
||||
"url": "http://www.lilygo.cn/",
|
||||
"url": "https://www.lilygo.cc/en-pl/products/t-watch-s3",
|
||||
"vendor": "LilyGo"
|
||||
}
|
||||
|
|
|
@ -158,6 +158,9 @@ static void darkEnter()
|
|||
{
|
||||
setBluetoothEnable(true);
|
||||
screen->setOn(false);
|
||||
#ifdef KB_POWERON
|
||||
digitalWrite(KB_POWERON, LOW);
|
||||
#endif
|
||||
}
|
||||
|
||||
static void serialEnter()
|
||||
|
@ -185,6 +188,9 @@ static void powerEnter()
|
|||
} else {
|
||||
screen->setOn(true);
|
||||
setBluetoothEnable(true);
|
||||
#ifdef KB_POWERON
|
||||
digitalWrite(KB_POWERON, HIGH);
|
||||
#endif
|
||||
// within enter() the function getState() returns the state we came from
|
||||
if (strcmp(powerFSM.getState()->name, "BOOT") != 0 && strcmp(powerFSM.getState()->name, "POWER") != 0 &&
|
||||
strcmp(powerFSM.getState()->name, "DARK") != 0) {
|
||||
|
@ -215,6 +221,9 @@ static void onEnter()
|
|||
LOG_DEBUG("Enter state: ON\n");
|
||||
screen->setOn(true);
|
||||
setBluetoothEnable(true);
|
||||
#ifdef KB_POWERON
|
||||
digitalWrite(KB_POWERON, HIGH);
|
||||
#endif
|
||||
}
|
||||
|
||||
static void onIdle()
|
||||
|
|
|
@ -11,4 +11,4 @@ build_flags = ${esp32_base.build_flags}
|
|||
-Ivariants/t-deck
|
||||
|
||||
lib_deps = ${esp32s3_base.lib_deps}
|
||||
lovyan03/LovyanGFX@^1.1.8
|
||||
lovyan03/LovyanGFX@^1.1.9
|
|
@ -27,8 +27,8 @@
|
|||
#define BUTTON_PIN 0
|
||||
// #define BUTTON_NEED_PULLUP
|
||||
|
||||
#undef GPS_RX_PIN
|
||||
#undef GPS_TX_PIN
|
||||
#define GPS_RX_PIN 44
|
||||
#define GPS_TX_PIN 43
|
||||
|
||||
// Have SPI interface SD card slot
|
||||
#define HAS_SDCARD 1
|
||||
|
@ -41,7 +41,7 @@
|
|||
#define BATTERY_PIN 4 // A battery voltage measurement pin, voltage divider connected here to measure battery voltage
|
||||
// ratio of voltage divider = 2.0 (RD2=100k, RD3=100k)
|
||||
#define ADC_MULTIPLIER 2.11 // 2.0 + 10% for correction of display undervoltage.
|
||||
#define ADC_CHANNEL ADC1_GPIO1_CHANNEL
|
||||
#define ADC_CHANNEL ADC1_GPIO4_CHANNEL
|
||||
|
||||
// keyboard
|
||||
#define I2C_SDA 18 // I2C pins for this board
|
||||
|
|
|
@ -3,8 +3,6 @@
|
|||
extends = esp32s3_base
|
||||
board = t-watch-s3
|
||||
upload_protocol = esptool
|
||||
upload_speed = 115200
|
||||
#upload_port = /dev/tty.usbmodem3485188D636C1
|
||||
|
||||
build_flags = ${esp32_base.build_flags}
|
||||
-DT_WATCH_S3
|
||||
|
@ -12,6 +10,6 @@ build_flags = ${esp32_base.build_flags}
|
|||
-DPCF8563_RTC=0x51
|
||||
|
||||
lib_deps = ${esp32s3_base.lib_deps}
|
||||
lovyan03/LovyanGFX@^1.1.8
|
||||
lovyan03/LovyanGFX@^1.1.9
|
||||
lewisxhe/PCF8563_Library@1.0.1
|
||||
adafruit/Adafruit DRV2605 Library@^1.2.2
|
Ładowanie…
Reference in New Issue