pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-06-09 06:32:06 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Minor TFT branch synch (#5706)

Browse Source
This commit is contained in:
Tom Fifield 2025-01-01 03:15:01 +11:00 committed by GitHub
parent 8b34c4ff05
commit fdcc0e12aa
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/graphics/Screen.cpp
View File

@ -1506,7 +1506,7 @@ Screen::Screen(ScanI2C::DeviceAddress address, meshtastic_Config_DisplayConfig_O
#elif defined(USE_ST7567) #elif defined(USE_ST7567)
dispdev = new ST7567Wire(address.address, -1, -1, geometry, dispdev = new ST7567Wire(address.address, -1, -1, geometry,
(address.port == ScanI2C::I2CPort::WIRE1) ? HW_I2C::I2C_TWO : HW_I2C::I2C_ONE); (address.port == ScanI2C::I2CPort::WIRE1) ? HW_I2C::I2C_TWO : HW_I2C::I2C_ONE);
#elif ARCH_PORTDUINO #elif ARCH_PORTDUINO && !HAS_TFT
if (settingsMap[displayPanel] != no_screen) { if (settingsMap[displayPanel] != no_screen) {
LOG_DEBUG("Make TFTDisplay!"); LOG_DEBUG("Make TFTDisplay!");
dispdev = new TFTDisplay(address.address, -1, -1, geometry, dispdev = new TFTDisplay(address.address, -1, -1, geometry,

2
src/modules/CannedMessageModule.cpp
View File

@ -982,6 +982,7 @@ bool CannedMessageModule::interceptingKeyboardInput()
} }
} }
#if !HAS_TFT
void CannedMessageModule::drawFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y) void CannedMessageModule::drawFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y)
{ {
char buffer[50]; char buffer[50];
@ -1140,6 +1141,7 @@ void CannedMessageModule::drawFrame(OLEDDisplay *display, OLEDDisplayUiState *st
} }
} }
} }
#endif //! HAS_TFT
ProcessMessage CannedMessageModule::handleReceived(const meshtastic_MeshPacket &mp) ProcessMessage CannedMessageModule::handleReceived(const meshtastic_MeshPacket &mp)
{ {

5
src/sleep.cpp
View File

@ -58,7 +58,7 @@ RTC_DATA_ATTR int bootCount = 0;
*/ */
void setCPUFast(bool on) void setCPUFast(bool on)
{ {
#if defined(ARCH_ESP32) && HAS_WIFI #if defined(ARCH_ESP32) && HAS_WIFI && !HAS_TFT
if (isWifiAvailable()) { if (isWifiAvailable()) {
/* /*
@ -391,6 +391,9 @@ esp_sleep_wakeup_cause_t doLightSleep(uint64_t sleepMsec) // FIXME, use a more r
gpio_wakeup_enable(pin, GPIO_INTR_LOW_LEVEL); gpio_wakeup_enable(pin, GPIO_INTR_LOW_LEVEL);
esp_sleep_enable_gpio_wakeup(); esp_sleep_enable_gpio_wakeup();
#endif #endif
#ifdef INPUTDRIVER_ENCODER_BTN
gpio_wakeup_enable((gpio_num_t)INPUTDRIVER_ENCODER_BTN, GPIO_INTR_LOW_LEVEL);
#endif
#ifdef T_WATCH_S3 #ifdef T_WATCH_S3
gpio_wakeup_enable((gpio_num_t)SCREEN_TOUCH_INT, GPIO_INTR_LOW_LEVEL); gpio_wakeup_enable((gpio_num_t)SCREEN_TOUCH_INT, GPIO_INTR_LOW_LEVEL);
#endif #endif

2
variants/seeed-sensecap-indicator/platformio.ini
View File

@ -24,5 +24,5 @@ build_flags = ${esp32_base.build_flags}
lib_deps = ${esp32s3_base.lib_deps} lib_deps = ${esp32s3_base.lib_deps}
https://github.com/mverch67/LovyanGFX#develop https://github.com/mverch67/LovyanGFX#develop
earlephilhower/ESP8266Audio@^1.9.7 earlephilhower/ESP8266Audio@^1.9.9
earlephilhower/ESP8266SAM@^1.0.1 earlephilhower/ESP8266SAM@^1.0.1

3
variants/seeed-sensecap-indicator/variant.h
View File

@ -25,8 +25,7 @@
#define ST7701_BL 45 #define ST7701_BL 45
#define ST7701_SPI_HOST SPI2_HOST #define ST7701_SPI_HOST SPI2_HOST
#define ST7701_BACKLIGHT_EN 45 #define ST7701_BACKLIGHT_EN 45
#define SPI_FREQUENCY 20000000 #define SPI_FREQUENCY 12000000
#define SPI_READ_FREQUENCY 16000000
#define TFT_HEIGHT 480 #define TFT_HEIGHT 480
#define TFT_WIDTH 480 #define TFT_WIDTH 480
#define TFT_OFFSET_X 0 #define TFT_OFFSET_X 0

2
variants/t-deck/platformio.ini
View File

@ -6,7 +6,7 @@ board_check = true
upload_protocol = esptool upload_protocol = esptool
#upload_port = COM29 #upload_port = COM29
build_flags = ${esp32_base.build_flags} build_flags = ${esp32s3_base.build_flags}
-DT_DECK -DT_DECK
-DBOARD_HAS_PSRAM -DBOARD_HAS_PSRAM
-DMAX_THREADS=40 -DMAX_THREADS=40

4
variants/t-deck/variant.h
View File

@ -27,8 +27,10 @@
#define SLEEP_TIME 120 #define SLEEP_TIME 120
#ifndef HAS_TFT
#define BUTTON_PIN 0 #define BUTTON_PIN 0
// #define BUTTON_NEED_PULLUP // #define BUTTON_NEED_PULLUP
#endif
#define GPS_DEFAULT_NOT_PRESENT 1 #define GPS_DEFAULT_NOT_PRESENT 1
#define GPS_RX_PIN 44 #define GPS_RX_PIN 44
#define GPS_TX_PIN 43 #define GPS_TX_PIN 43
@ -60,7 +62,7 @@
#define TB_DOWN 15 #define TB_DOWN 15
#define TB_LEFT 1 #define TB_LEFT 1
#define TB_RIGHT 2 #define TB_RIGHT 2
#define TB_PRESS BUTTON_PIN #define TB_PRESS 0 // BUTTON_PIN
// microphone // microphone
#define ES7210_SCK 47 #define ES7210_SCK 47