From a2a0150ee83e734d6359f85882382a97601764cd Mon Sep 17 00:00:00 2001 From: Ben Meadors Date: Thu, 20 Nov 2025 06:14:29 -0600 Subject: [PATCH] Trunk fmt --- README.md | 1 - src/graphics/TFTDisplay.cpp | 53 +++++++++++++++++++----------------- src/graphics/niche/README.md | 1 - src/mesh/NodeDB.cpp | 2 +- 4 files changed, 29 insertions(+), 28 deletions(-) diff --git a/README.md b/README.md index a53fe9646..f34bf1839 100644 --- a/README.md +++ b/README.md @@ -37,4 +37,3 @@ Join our community and help improve Meshtastic! ๐Ÿš€ ## Stats ![Alt](https://repobeats.axiom.co/api/embed/8025e56c482ec63541593cc5bd322c19d5c0bdcf.svg "Repobeats analytics image") - diff --git a/src/graphics/TFTDisplay.cpp b/src/graphics/TFTDisplay.cpp index b662869dd..87593b0d4 100644 --- a/src/graphics/TFTDisplay.cpp +++ b/src/graphics/TFTDisplay.cpp @@ -427,33 +427,35 @@ static LGFX *tft = nullptr; #include "lgfx/v1/Touch.hpp" namespace lgfx { - inline namespace v1 - { +inline namespace v1 +{ class TOUCH_CHSC6X : public ITouch { -public: + public: TOUCH_CHSC6X(void) { - _cfg.i2c_addr = TOUCH_SLAVE_ADDRESS; - _cfg.x_min = 0; - _cfg.x_max = 240; - _cfg.y_min = 0; - _cfg.y_max = 320; + _cfg.i2c_addr = TOUCH_SLAVE_ADDRESS; + _cfg.x_min = 0; + _cfg.x_max = 240; + _cfg.y_min = 0; + _cfg.y_max = 320; }; - bool init(void) override { - if(chsc6xTouch==nullptr) { - chsc6xTouch=new chsc6x(&Wire1,TOUCH_SDA_PIN,TOUCH_SCL_PIN,TOUCH_INT_PIN,TOUCH_RST_PIN); + bool init(void) override + { + if (chsc6xTouch == nullptr) { + chsc6xTouch = new chsc6x(&Wire1, TOUCH_SDA_PIN, TOUCH_SCL_PIN, TOUCH_INT_PIN, TOUCH_RST_PIN); } chsc6xTouch->chsc6x_init(); return true; }; - uint_fast8_t getTouchRaw(touch_point_t* tp, uint_fast8_t count) override { - uint16_t raw_x,raw_y; - if (chsc6xTouch->chsc6x_read_touch_info(&raw_x, &raw_y)==0) { - tp[0].x = 320-1-raw_y; - tp[0].y = 240-1-raw_x ; + uint_fast8_t getTouchRaw(touch_point_t *tp, uint_fast8_t count) override + { + uint16_t raw_x, raw_y; + if (chsc6xTouch->chsc6x_read_touch_info(&raw_x, &raw_y) == 0) { + tp[0].x = 320 - 1 - raw_y; + tp[0].y = 240 - 1 - raw_x; tp[0].size = 1; tp[0].id = 1; return 1; @@ -462,13 +464,14 @@ public: return 0; }; - void wakeup(void) override {}; - void sleep(void) override {}; + void wakeup(void) override{}; + void sleep(void) override{}; + private: - chsc6x *chsc6xTouch=nullptr; - }; -} -} + chsc6x *chsc6xTouch = nullptr; +}; +} // namespace v1 +} // namespace lgfx #endif class LGFX : public lgfx::LGFX_Device { @@ -513,9 +516,9 @@ class LGFX : public lgfx::LGFX_Device { // Set the display panel control. auto cfg = _panel_instance.config(); // Gets a structure for display panel settings. - cfg.pin_cs = ST7789_CS; // Pin number where CS is connected (-1 = disable) - cfg.pin_rst = ST7789_RESET; // Pin number where RST is connected (-1 = disable) - cfg.pin_busy = ST7789_BUSY; // Pin number where BUSY is connected (-1 = disable) + cfg.pin_cs = ST7789_CS; // Pin number where CS is connected (-1 = disable) + cfg.pin_rst = ST7789_RESET; // Pin number where RST is connected (-1 = disable) + cfg.pin_busy = ST7789_BUSY; // Pin number where BUSY is connected (-1 = disable) // The following setting values โ€‹โ€‹are general initial values โ€‹โ€‹for each panel, so please comment out any // unknown items and try them. diff --git a/src/graphics/niche/README.md b/src/graphics/niche/README.md index e87464abc..e58578f6b 100644 --- a/src/graphics/niche/README.md +++ b/src/graphics/niche/README.md @@ -5,7 +5,6 @@ A pattern / collection of resources for creating custom UIs, to target small gro For an example, see the `heltec-vision-master-e290-inkhud` platformio env. - platformio.ini - - suppress default Meshtastic components (Screen, ButtonThread, etc) - define `MESHTASTIC_INCLUDE_NICHE_GRAPHICS` - (possibly) Edit `build_src_filter` to include our new nicheGraphics.h file diff --git a/src/mesh/NodeDB.cpp b/src/mesh/NodeDB.cpp index 6291fa4cc..d8146c4a3 100644 --- a/src/mesh/NodeDB.cpp +++ b/src/mesh/NodeDB.cpp @@ -653,7 +653,7 @@ void NodeDB::installDefaultConfig(bool preserveKey = false) strncpy(config.network.ntp_server, "meshtastic.pool.ntp.org", 32); #if (defined(T_DECK) || defined(T_WATCH_S3) || defined(UNPHONE) || defined(PICOMPUTER_S3) || defined(SENSECAP_INDICATOR) || \ - defined(ELECROW_PANEL)||defined(HELTEC_V4_TFT)) && \ + defined(ELECROW_PANEL) || defined(HELTEC_V4_TFT)) && \ HAS_TFT // switch BT off by default; use TFT programming mode or hotkey to enable config.bluetooth.enabled = false;