ThinkNode G3, ETH support WIP

.trunk/trunk.yaml

@@ -4,31 +4,31 @@ cli:
 plugins:
   sources:
     - id: trunk
-      ref: v1.7.4
+      ref: v1.7.3
       uri: https://github.com/trunk-io/plugins
 lint:
   enabled:
-    - checkov@3.2.495
-    - renovate@42.24.1
+    - checkov@3.2.492
+    - renovate@42.5.4
     - prettier@3.6.2
-    - trufflehog@3.91.1
+    - trufflehog@3.90.13
     - yamllint@1.37.1
-    - bandit@1.9.2
+    - bandit@1.8.6
     - trivy@0.67.2
     - taplo@0.10.0
-    - ruff@0.14.6
+    - ruff@0.14.4
     - isort@7.0.0
-    - markdownlint@0.46.0
+    - markdownlint@0.45.0
     - oxipng@9.1.5
     - svgo@4.0.0
-    - actionlint@1.7.9
+    - actionlint@1.7.8
     - flake8@7.3.0
     - hadolint@2.14.0
     - shfmt@3.6.0
     - shellcheck@0.11.0
     - black@25.11.0
     - git-diff-check
-    - gitleaks@8.30.0
+    - gitleaks@8.29.0
     - clang-format@16.0.3
   ignore:
     - linters: [ALL]

arch/stm32/stm32.ini

@@ -2,7 +2,7 @@
 extends = arduino_base
 platform =
   # renovate: datasource=custom.pio depName=platformio/ststm32 packageName=platformio/platform/ststm32
-  platformio/ststm32@19.4.0
+  platformio/ststm32@19.3.0
 platform_packages =
   # TODO renovate
   platformio/framework-arduinoststm32@https://github.com/stm32duino/Arduino_Core_STM32/archive/2.10.1.zip

boards/ThinkNode-M4.json

@@ -1,53 +0,0 @@
-{
-  "build": {
-    "arduino": {
-      "ldscript": "nrf52840_s140_v6.ld"
-    },
-    "core": "nRF5",
-    "cpu": "cortex-m4",
-    "extra_flags": "-DARDUINO_NRF52840_ELECROW_M4 -DNRF52840_XXAA",
-    "f_cpu": "64000000L",
-    "hwids": [
-      ["0x239A", "0x4405"],
-      ["0x239A", "0x0029"],
-      ["0x239A", "0x002A"]
-    ],
-    "usb_product": "elecrow_thinknode_m4",
-    "mcu": "nrf52840",
-    "variant": "ELECROW-ThinkNode-M4",
-    "variants_dir": "variants",
-    "bsp": {
-      "name": "adafruit"
-    },
-    "softdevice": {
-      "sd_flags": "-DS140",
-      "sd_name": "s140",
-      "sd_version": "6.1.1",
-      "sd_fwid": "0x00B6"
-    },
-    "bootloader": {
-      "settings_addr": "0xFF000"
-    }
-  },
-  "connectivity": ["bluetooth"],
-  "debug": {
-    "jlink_device": "nRF52840_xxAA",
-    "onboard_tools": ["jlink"],
-    "svd_path": "nrf52840.svd",
-    "openocd_target": "nrf52840-mdk-rs"
-  },
-  "frameworks": ["arduino"],
-  "name": "ELECROW ThinkNode m4",
-  "upload": {
-    "maximum_ram_size": 248832,
-    "maximum_size": 815104,
-    "speed": 115200,
-    "protocol": "nrfutil",
-    "protocols": ["jlink", "nrfjprog", "nrfutil", "stlink"],
-    "use_1200bps_touch": true,
-    "require_upload_port": true,
-    "wait_for_upload_port": true
-  },
-  "url": "https://www.elecrow.com/thinknode-m4-power-bank-lora-device-with-meshtastic-lora-tracker-function-powered-by-nrf52840.html",
-  "vendor": "ELECROW"
-}

platformio.ini

@@ -90,7 +90,7 @@ framework = arduino
 lib_deps =
 	${env.lib_deps}
 	# renovate: datasource=custom.pio depName=NonBlockingRTTTL packageName=end2endzone/library/NonBlockingRTTTL
-	end2endzone/NonBlockingRTTTL@1.4.0
+	end2endzone/NonBlockingRTTTL@1.3.0
 build_flags = ${env.build_flags} -Os
 build_src_filter = ${env.build_src_filter} -<platform/portduino/> -<graphics/niche/>
 
@@ -169,7 +169,7 @@ lib_deps =
 	# renovate: datasource=git-refs depName=DFRobot_RainfallSensor packageName=https://github.com/DFRobot/DFRobot_RainfallSensor gitBranch=master
 	https://github.com/DFRobot/DFRobot_RainfallSensor/archive/38fea5e02b40a5430be6dab39a99a6f6347d667e.zip
 	# renovate: datasource=custom.pio depName=INA226 packageName=robtillaart/library/INA226
-	robtillaart/INA226@0.6.5
+	robtillaart/INA226@0.6.4
 	# renovate: datasource=custom.pio depName=SparkFun MAX3010x packageName=sparkfun/library/SparkFun MAX3010x Pulse and Proximity Sensor Library
 	sparkfun/SparkFun MAX3010x Pulse and Proximity Sensor Library@1.1.2
 	# renovate: datasource=custom.pio depName=SparkFun 9DoF IMU Breakout ICM 20948 packageName=sparkfun/library/SparkFun 9DoF IMU Breakout - ICM 20948 - Arduino Library
@@ -213,6 +213,6 @@ lib_deps =
 	# renovate: datasource=git-refs depName=meshtastic-DFRobot_LarkWeatherStation packageName=https://github.com/meshtastic/DFRobot_LarkWeatherStation gitBranch=master
 	https://github.com/meshtastic/DFRobot_LarkWeatherStation/archive/4de3a9cadef0f6a5220a8a906cf9775b02b0040d.zip
 	# renovate: datasource=custom.pio depName=Sensirion Core packageName=sensirion/library/Sensirion Core
-	sensirion/Sensirion Core@0.7.2
+	sensirion/Sensirion Core@0.7.1
 	# renovate: datasource=custom.pio depName=Sensirion I2C SCD4x packageName=sensirion/library/Sensirion I2C SCD4x
 	sensirion/Sensirion I2C SCD4x@1.1.0

src/DebugConfiguration.h

@@ -13,6 +13,11 @@ extern MemGet memGet;
 #define LED_STATE_ON 1
 #endif
 
+// WIFI LED
+#ifndef WIFI_STATE_ON
+#define WIFI_STATE_ON 1
+#endif
+
 // -----------------------------------------------------------------------------
 // DEBUG
 // -----------------------------------------------------------------------------
@@ -147,7 +152,9 @@ extern "C" void logLegacy(const char *level, const char *fmt, ...);
 // Default Bluetooth PIN
 #define defaultBLEPin 123456
 
-#if HAS_ETHERNET && !defined(USE_WS5500)
+#if HAS_ETHERNET && defined(USE_CH390D)
+#include <ESP32_CH390.h>
+#elif HAS_ETHERNET && !defined(USE_WS5500)
 #include <RAK13800_W5100S.h>
 #endif // HAS_ETHERNET
 

src/Power.cpp

@@ -692,8 +692,6 @@ bool Power::setup()
         found = true;
     } else if (lipoChargerInit()) {
         found = true;
-    } else if (serialBatteryInit()) {
-        found = true;
     } else if (meshSolarInit()) {
         found = true;
     } else if (analogInit()) {
@@ -709,6 +707,7 @@ bool Power::setup()
         []() {
             power->setIntervalFromNow(0);
             runASAP = true;
+            BaseType_t higherWake = 0;
         },
         CHANGE);
 #endif
@@ -718,6 +717,7 @@ bool Power::setup()
         []() {
             power->setIntervalFromNow(0);
             runASAP = true;
+            BaseType_t higherWake = 0;
         },
         CHANGE);
 #endif
@@ -777,7 +777,7 @@ void Power::shutdown()
     if (screen) {
 #ifdef T_DECK_PRO
         screen->showSimpleBanner("Device is powered off.\nConnect USB to start!", 0); // T-Deck Pro has no power button
-#elif defined(USE_EINK)
+#elif USE_EINK
         screen->showSimpleBanner("Shutting Down...", 2250); // dismiss after 3 seconds to avoid the banner on the sleep screen
 #else
         screen->showSimpleBanner("Shutting Down...", 0); // stays on screen
@@ -1568,135 +1568,3 @@ bool Power::meshSolarInit()
     return false;
 }
 #endif
-
-#ifdef HAS_SERIAL_BATTERY_LEVEL
-#include <SoftwareSerial.h>
-
-/**
- * SerialBatteryLevel class for pulling battery information from a secondary MCU over serial.
- */
-class SerialBatteryLevel : public HasBatteryLevel
-{
-
-  public:
-    /**
-     * Init the I2C meshSolar battery level sensor
-     */
-    bool runOnce()
-    {
-        BatterySerial.begin(4800);
-
-        return true;
-    }
-
-    /**
-     * Battery state of charge, from 0 to 100 or -1 for unknown
-     */
-    virtual int getBatteryPercent() override { return v_percent; }
-
-    /**
-     * The raw voltage of the battery in millivolts, or NAN if unknown
-     */
-    virtual uint16_t getBattVoltage() override { return voltage * 1000; }
-
-    /**
-     * return true if there is a battery installed in this unit
-     */
-    virtual bool isBatteryConnect() override
-    {
-        // definitely need to gobble up more bytes at once
-        if (BatterySerial.available() > 5) {
-            LOG_WARN("SerialBatteryLevel: %u bytes available", BatterySerial.available());
-            while (BatterySerial.available() > 11) {
-                BatterySerial.read(); // flush old data
-            }
-            LOG_WARN("SerialBatteryLevel: %u bytes now available", BatterySerial.available());
-            int tries = 0;
-            while (BatterySerial.read() != 0xFE) {
-                tries++; // wait for start byte
-                if (tries > 10) {
-                    LOG_WARN("SerialBatteryLevel: no start byte found");
-                    return 1;
-                }
-            }
-
-            Data[1] = BatterySerial.read();
-            Data[2] = BatterySerial.read();
-            Data[3] = BatterySerial.read();
-            Data[4] = BatterySerial.read();
-            Data[5] = BatterySerial.read();
-            if (Data[5] != 0xFD) {
-                LOG_WARN("SerialBatteryLevel: invalid end byte %02x", Data[5]);
-                return true;
-            }
-            v_percent = Data[1];
-            voltage = Data[2] + (((float)Data[3]) / 100) + (((float)Data[4]) / 10000);
-            voltage *= 2;
-            LOG_WARN("SerialBatteryLevel: received data %u, %f, %02x", v_percent, voltage, Data[5]);
-            return true;
-        }
-        // This function runs first, so use it to grab the latest data from the secondary MCU
-        return true;
-    }
-
-    /**
-     * return true if there is an external power source detected
-     */
-    virtual bool isVbusIn() override
-    {
-#if defined(EXT_CHRG_DETECT)
-
-        return digitalRead(EXT_CHRG_DETECT) == ext_chrg_detect_value;
-
-#endif
-        return false;
-    }
-
-    virtual bool isCharging() override
-    {
-#ifdef EXT_CHRG_DETECT
-        return digitalRead(EXT_CHRG_DETECT) == ext_chrg_detect_value;
-
-#endif
-        // by default, we check the battery voltage only
-        return isVbusIn();
-    }
-
-  private:
-    SoftwareSerial BatterySerial = SoftwareSerial(SERIAL_BATTERY_RX, SERIAL_BATTERY_TX);
-    uint8_t Data[6] = {0};
-    int v_percent = 0;
-    float voltage = 0.0;
-};
-
-SerialBatteryLevel serialBatteryLevel;
-
-/**
- * Init the serial battery level sensor
- */
-bool Power::serialBatteryInit()
-{
-#ifdef EXT_PWR_DETECT
-    pinMode(EXT_PWR_DETECT, INPUT);
-#endif
-#ifdef EXT_CHRG_DETECT
-    pinMode(EXT_CHRG_DETECT, ext_chrg_detect_mode);
-#endif
-
-    bool result = serialBatteryLevel.runOnce();
-    LOG_DEBUG("Power::serialBatteryInit serial battery sensor is %s", result ? "ready" : "not ready yet");
-    if (!result)
-        return false;
-    batteryLevel = &serialBatteryLevel;
-    return true;
-}
-
-#else
-/**
- * If this device has no serial battery level sensor, don't try to use it.
- */
-bool Power::serialBatteryInit()
-{
-    return false;
-}
-#endif

src/configuration.h

@@ -250,9 +250,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // Touchscreen
 // -----------------------------------------------------------------------------
 #define FT6336U_ADDR 0x48
-#define CST328_ADDR 0x1A // same address as CST226SE
+#define CST328_ADDR 0x1A
 #define CHSC6X_ADDR 0x2E
-#define CST226SE_ADDR_ALT 0x5A
 
 // -----------------------------------------------------------------------------
 // RAK12035VB Soil Monitor (using RAK12023 up to 3 RAK12035 monitors can be connected)

src/detect/ScanI2C.h

@@ -85,8 +85,7 @@ class ScanI2C
         DRV2605,
         BH1750,
         DA217,
-        CHSC6X,
-        CST226SE
+        CHSC6X
     } DeviceType;
 
     // typedef uint8_t DeviceAddress;

src/detect/ScanI2CTwoWire.cpp

@@ -499,18 +499,7 @@ void ScanI2CTwoWire::scanPort(I2CPort port, uint8_t *address, uint8_t asize)
                 SCAN_SIMPLE_CASE(DFROBOT_RAIN_ADDR, DFROBOT_RAIN, "DFRobot Rain Gauge", (uint8_t)addr.address);
                 SCAN_SIMPLE_CASE(LTR390UV_ADDR, LTR390UV, "LTR390UV", (uint8_t)addr.address);
                 SCAN_SIMPLE_CASE(PCT2075_ADDR, PCT2075, "PCT2075", (uint8_t)addr.address);
-            case CST328_ADDR:
-                // Do we have the CST328 or the CST226SE
-                registerValue = getRegisterValue(ScanI2CTwoWire::RegisterLocation(addr, 0xAB), 1);
-                if (registerValue == 0xA9) {
-                    type = CST226SE;
-                    logFoundDevice("CST226SE", (uint8_t)addr.address);
-                } else {
-                    type = CST328;
-                    logFoundDevice("CST328", (uint8_t)addr.address);
-                }
-                break;
-
+                SCAN_SIMPLE_CASE(CST328_ADDR, CST328, "CST328", (uint8_t)addr.address);
                 SCAN_SIMPLE_CASE(CHSC6X_ADDR, CHSC6X, "CHSC6X", (uint8_t)addr.address);
             case LTR553ALS_ADDR:
                 registerValue = getRegisterValue(ScanI2CTwoWire::RegisterLocation(addr, 0x86), 1); // Part ID register
@@ -539,12 +528,8 @@ void ScanI2CTwoWire::scanPort(I2CPort port, uint8_t *address, uint8_t asize)
 #endif
 
             case MLX90614_ADDR_DEF:
-                // Do we have the MLX90614 or the MPR121KB or the CST226SE
-                registerValue = getRegisterValue(ScanI2CTwoWire::RegisterLocation(addr, 0x06), 1);
-                if (registerValue == 0xAB) {
-                    type = CST226SE;
-                    logFoundDevice("CST226SE", (uint8_t)addr.address);
-                } else if (getRegisterValue(ScanI2CTwoWire::RegisterLocation(addr, 0x0e), 1) == 0x5a) {
+                registerValue = getRegisterValue(ScanI2CTwoWire::RegisterLocation(addr, 0x0e), 1);
+                if (registerValue == 0x5a) {
                     type = MLX90614;
                     logFoundDevice("MLX90614", (uint8_t)addr.address);
                 } else {

src/gps/GPS.cpp

@@ -896,11 +896,14 @@ void GPS::writePinEN(bool on)
 void GPS::writePinStandby(bool standby)
 {
 #ifdef PIN_GPS_STANDBY // Specifically the standby pin for L76B, L76K and clones
-    bool val;
-    if (standby)
-        val = GPS_STANDBY_ACTIVE;
-    else
-        val = !GPS_STANDBY_ACTIVE;
+
+// Determine the new value for the pin
+// Normally: active HIGH for awake
+#ifdef PIN_GPS_STANDBY_INVERTED
+    bool val = standby;
+#else
+    bool val = !standby;
+#endif
 
     // Write and log
     pinMode(PIN_GPS_STANDBY, OUTPUT);

src/gps/GPS.h

@@ -16,11 +16,6 @@
 #define GPS_EN_ACTIVE 1
 #endif
 
-// Allow defining the polarity of the STANDBY output.  default is LOW for standby
-#ifndef GPS_STANDBY_ACTIVE
-#define GPS_STANDBY_ACTIVE LOW
-#endif
-
 static constexpr uint32_t GPS_UPDATE_ALWAYS_ON_THRESHOLD_MS = 10 * 1000UL;
 static constexpr uint32_t GPS_FIX_HOLD_MAX_MS = 20000;
 

src/graphics/Screen.cpp

@@ -324,7 +324,7 @@ static int8_t prevFrame = -1;
 // Combined dynamic node list frame cycling through LastHeard, HopSignal, and Distance modes
 // Uses a single frame and changes data every few seconds (E-Ink variant is separate)
 
-#if defined(ESP_PLATFORM) && (defined(USE_ST7789) || defined(USE_ST7796))
+#if defined(ESP_PLATFORM) && defined(USE_ST7789)
 SPIClass SPI1(HSPI);
 #endif
 
@@ -356,18 +356,7 @@ Screen::Screen(ScanI2C::DeviceAddress address, meshtastic_Config_DisplayConfig_O
 #else
     dispdev = new ST7789Spi(&SPI1, ST7789_RESET, ST7789_RS, ST7789_NSS, GEOMETRY_RAWMODE, TFT_WIDTH, TFT_HEIGHT);
 #endif
-#elif defined(USE_ST7796)
-#ifdef ESP_PLATFORM
-    dispdev = new ST7796Spi(&SPI1, ST7796_RESET, ST7796_RS, ST7796_NSS, GEOMETRY_RAWMODE, TFT_WIDTH, TFT_HEIGHT, ST7796_SDA,
-                            ST7796_MISO, ST7796_SCK, TFT_SPI_FREQUENCY);
-#else
-    dispdev = new ST7796Spi(&SPI1, ST7796_RESET, ST7796_RS, ST7796_NSS, GEOMETRY_RAWMODE, TFT_WIDTH, TFT_HEIGHT);
-#endif
-#if defined(USE_ST7789)
     static_cast<ST7789Spi *>(dispdev)->setRGB(TFT_MESH);
-#elif defined(USE_ST7796)
-    static_cast<ST7796Spi *>(dispdev)->setRGB(TFT_MESH);
-#endif
 #elif defined(USE_SSD1306)
     dispdev = new SSD1306Wire(address.address, -1, -1, geometry,
                               (address.port == ScanI2C::I2CPort::WIRE1) ? HW_I2C::I2C_TWO : HW_I2C::I2C_ONE);
@@ -485,15 +474,6 @@ void Screen::handleSetOn(bool on, FrameCallback einkScreensaver)
             pinMode(VTFT_LEDA, OUTPUT);
             digitalWrite(VTFT_LEDA, TFT_BACKLIGHT_ON);
 #endif
-#endif
-#ifdef USE_ST7796
-            ui->init();
-#ifdef ESP_PLATFORM
-            analogWrite(VTFT_LEDA, BRIGHTNESS_DEFAULT);
-#else
-            pinMode(VTFT_LEDA, OUTPUT);
-            digitalWrite(VTFT_LEDA, TFT_BACKLIGHT_ON);
-#endif
 #endif
             enabled = true;
             setInterval(0); // Draw ASAP
@@ -532,21 +512,6 @@ void Screen::handleSetOn(bool on, FrameCallback einkScreensaver)
             nrf_gpio_cfg_default(ST7789_NSS);
 #endif
 #endif
-#ifdef USE_ST7796
-            SPI1.end();
-#if defined(ARCH_ESP32)
-            pinMode(VTFT_LEDA, OUTPUT);
-            digitalWrite(VTFT_LEDA, LOW);
-            pinMode(ST7796_RESET, ANALOG);
-            pinMode(ST7796_RS, ANALOG);
-            pinMode(ST7796_NSS, ANALOG);
-#else
-            nrf_gpio_cfg_default(VTFT_LEDA);
-            nrf_gpio_cfg_default(ST7796_RESET);
-            nrf_gpio_cfg_default(ST7796_RS);
-            nrf_gpio_cfg_default(ST7796_NSS);
-#endif
-#endif
 
 #ifdef T_WATCH_S3
             PMU->disablePowerOutput(XPOWERS_ALDO2);
@@ -592,10 +557,6 @@ void Screen::setup()
 #if defined(MUZI_BASE)
     dispdev->delayPoweron = true;
 #endif
-#if defined(USE_ST7796) && defined(TFT_MESH)
-    // Custom text color, if defined in variant.h
-    static_cast<ST7796Spi *>(dispdev)->setRGB(TFT_MESH);
-#endif
 
     // === Initialize display and UI system ===
     ui->init();
@@ -659,8 +620,6 @@ void Screen::setup()
         static_cast<TFTDisplay *>(dispdev)->flipScreenVertically();
 #elif defined(USE_ST7789)
         static_cast<ST7789Spi *>(dispdev)->flipScreenVertically();
-#elif defined(USE_ST7796)
-        static_cast<ST7796Spi *>(dispdev)->mirrorScreen();
 #elif !defined(M5STACK_UNITC6L)
         dispdev->flipScreenVertically();
 #endif
@@ -693,7 +652,7 @@ void Screen::setup()
             touchScreenImpl1->init();
         }
     }
-#elif HAS_TOUCHSCREEN && !defined(USE_EINK) && !HAS_CST226SE
+#elif HAS_TOUCHSCREEN && !defined(USE_EINK)
     touchScreenImpl1 =
         new TouchScreenImpl1(dispdev->getWidth(), dispdev->getHeight(), static_cast<TFTDisplay *>(dispdev)->getTouch);
     touchScreenImpl1->init();

src/graphics/Screen.h

@@ -83,8 +83,6 @@ class Screen
 #include <ST7789Spi.h>
 #elif defined(USE_SPISSD1306)
 #include <SSD1306Spi.h>
-#elif defined(USE_ST7796)
-#include <ST7796Spi.h>
 #else
 // the SH1106/SSD1306 variant is auto-detected
 #include <AutoOLEDWire.h>

src/graphics/ScreenFonts.h

@@ -73,7 +73,7 @@
 #endif
 
 #if (defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ILI9342_DRIVER) || defined(ST7701_CS) || defined(ST7735_CS) ||      \
-     defined(ST7789_CS) || defined(USE_ST7789) || defined(HX8357_CS) || defined(ILI9488_CS) || defined(ST7796_CS) || defined(USE_ST7796)) &&            \
+     defined(ST7789_CS) || defined(USE_ST7789) || defined(HX8357_CS) || defined(ILI9488_CS) || defined(ST7796_CS)) &&            \
     !defined(DISPLAY_FORCE_SMALL_FONTS)
 // The screen is bigger so use bigger fonts
 #define FONT_SMALL FONT_MEDIUM_LOCAL // Height: 19

src/graphics/draw/DebugRenderer.cpp

@@ -97,8 +97,7 @@ void drawFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16
                                           (storeForwardModule->heartbeatInterval * 1200))) { // no heartbeat, overlap a bit
 #if (defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ILI9342_DRIVER) || defined(ST7701_CS) || defined(ST7735_CS) ||      \
      defined(ST7789_CS) || defined(USE_ST7789) || defined(ILI9488_CS) || defined(HX8357_CS) || defined(ST7796_CS) ||             \
-     defined(USE_ST7796) ||            \
-     ARCH_PORTDUINO) &&                                                                                                                                                                                                    \
+     ARCH_PORTDUINO) &&                                                                                                          \
     !defined(DISPLAY_FORCE_SMALL_FONTS)
             display->drawFastImage(x + SCREEN_WIDTH - 14 - display->getStringWidth(screen->ourId), y + 3 + FONT_HEIGHT_SMALL, 12,
                                    8, imgQuestionL1);
@@ -110,7 +109,7 @@ void drawFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16
 #endif
         } else {
 #if (defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ILI9342_DRIVER) || defined(ST7701_CS) || defined(ST7735_CS) ||      \
-     defined(ST7789_CS) || defined(USE_ST7789) || defined(ILI9488_CS) || defined(HX8357_CS) || defined(ST7796_CS) || defined(USE_ST7796)) &&            \
+     defined(ST7789_CS) || defined(USE_ST7789) || defined(ILI9488_CS) || defined(HX8357_CS) || defined(ST7796_CS)) &&            \
     !defined(DISPLAY_FORCE_SMALL_FONTS)
             display->drawFastImage(x + SCREEN_WIDTH - 18 - display->getStringWidth(screen->ourId), y + 3 + FONT_HEIGHT_SMALL, 16,
                                    8, imgSFL1);
@@ -126,8 +125,7 @@ void drawFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16
         // TODO: Raspberry Pi supports more than just the one screen size
 #if (defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ILI9342_DRIVER) || defined(ST7701_CS) || defined(ST7735_CS) ||      \
      defined(ST7789_CS) || defined(USE_ST7789) || defined(ILI9488_CS) || defined(HX8357_CS) || defined(ST7796_CS) ||             \
-     defined(USE_ST7796) ||            \
-     ARCH_PORTDUINO) &&                                                                                                                                                                                                    \
+     ARCH_PORTDUINO) &&                                                                                                          \
     !defined(DISPLAY_FORCE_SMALL_FONTS)
         display->drawFastImage(x + SCREEN_WIDTH - 14 - display->getStringWidth(screen->ourId), y + 3 + FONT_HEIGHT_SMALL, 12, 8,
                                imgInfoL1);

src/graphics/draw/UIRenderer.cpp

@@ -257,7 +257,7 @@ void UIRenderer::drawNodes(OLEDDisplay *display, int16_t x, int16_t y, const mes
     }
 
 #if (defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ILI9342_DRIVER) || defined(ST7701_CS) || defined(ST7735_CS) ||      \
-     defined(ST7789_CS) || defined(USE_ST7789) || defined(ILI9488_CS) || defined(HX8357_CS) || defined(ST7796_CS) || defined(USE_ST7796)) &&            \
+     defined(ST7789_CS) || defined(USE_ST7789) || defined(ILI9488_CS) || defined(HX8357_CS) || defined(ST7796_CS)) &&            \
     !defined(DISPLAY_FORCE_SMALL_FONTS)
 
     if (isHighResolution) {

src/graphics/images.h

@@ -27,7 +27,8 @@ const uint8_t bluetoothConnectedIcon[36] PROGMEM = {0xfe, 0x01, 0xff, 0x03, 0x03
                                                     0xfe, 0x31, 0x00, 0x30, 0x30, 0x30, 0x30, 0x30, 0xf0, 0x3f, 0xe0, 0x1f};
 
 #if (defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ILI9342_DRIVER) || defined(ST7701_CS) || defined(ST7735_CS) ||      \
-     defined(ST7789_CS) || defined(USE_ST7789) || defined(HX8357_CS) || defined(ILI9488_CS) || defined(USE_ST7796) || defined(ST7796_CS) || ARCH_PORTDUINO) &&                \
+     defined(ST7789_CS) || defined(USE_ST7789) || defined(HX8357_CS) || defined(ILI9488_CS) || defined(ST7796_CS) ||             \
+     ARCH_PORTDUINO) &&                                                                                                          \
     !defined(DISPLAY_FORCE_SMALL_FONTS)
 const uint8_t imgQuestionL1[] PROGMEM = {0xff, 0x01, 0x01, 0x32, 0x7b, 0x49, 0x49, 0x6f, 0x26, 0x01, 0x01, 0xff};
 const uint8_t imgQuestionL2[] PROGMEM = {0x0f, 0x08, 0x08, 0x08, 0x06, 0x0f, 0x0f, 0x06, 0x08, 0x08, 0x08, 0x0f};

src/main.cpp

@@ -330,7 +330,7 @@ void setup()
 
 #ifdef WIFI_LED
     pinMode(WIFI_LED, OUTPUT);
-    digitalWrite(WIFI_LED, LOW);
+    digitalWrite(WIFI_LED, HIGH ^ WIFI_STATE_ON);
 #endif
 
 #ifdef BLE_LED
@@ -877,7 +877,7 @@ void setup()
     if (config.display.displaymode != meshtastic_Config_DisplayConfig_DisplayMode_COLOR) {
 
 #if defined(ST7701_CS) || defined(ST7735_CS) || defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ILI9342_DRIVER) ||       \
-    defined(ST7789_CS) || defined(HX8357_CS) || defined(USE_ST7789) || defined(ILI9488_CS) || defined(ST7796_CS) || defined(USE_ST7796) ||              \
+    defined(ST7789_CS) || defined(HX8357_CS) || defined(USE_ST7789) || defined(ILI9488_CS) || defined(ST7796_CS) ||              \
     defined(USE_SPISSD1306)
         screen = new graphics::Screen(screen_found, screen_model, screen_geometry);
 #elif defined(ARCH_PORTDUINO)
@@ -1154,7 +1154,7 @@ void setup()
 // Don't call screen setup until after nodedb is setup (because we need
 // the current region name)
 #if defined(ST7701_CS) || defined(ST7735_CS) || defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ILI9342_DRIVER) ||       \
-    defined(ST7789_CS) || defined(HX8357_CS) || defined(USE_ST7789) || defined(ILI9488_CS) || defined(ST7796_CS) || defined(USE_ST7796) ||              \
+    defined(ST7789_CS) || defined(HX8357_CS) || defined(USE_ST7789) || defined(ILI9488_CS) || defined(ST7796_CS) ||              \
     defined(USE_SPISSD1306)
     if (screen)
         screen->setup();

src/mesh/InterfacesTemplates.cpp

@@ -25,7 +25,7 @@ template class LR11x0Interface<LR1121>;
 template class SX126xInterface<STM32WLx>;
 #endif
 
-#if HAS_ETHERNET && !defined(USE_WS5500)
+#if HAS_ETHERNET && !defined(USE_WS5500) && !defined(USE_CH390D)
 #include "api/ethServerAPI.h"
 template class ServerAPI<EthernetClient>;
 template class APIServerPort<ethServerAPI, EthernetServer>;

src/mesh/NodeDB.cpp

@@ -664,7 +664,7 @@ void NodeDB::installDefaultConfig(bool preserveKey = false)
     config.bluetooth.fixed_pin = defaultBLEPin;
 
 #if defined(ST7735_CS) || defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ILI9342_DRIVER) || defined(ST7789_CS) ||       \
-    defined(HX8357_CS) || defined(USE_ST7789) || defined(ILI9488_CS) || defined(ST7796_CS) || defined(USE_SPISSD1306) || defined(USE_ST7796)
+    defined(HX8357_CS) || defined(USE_ST7789) || defined(ILI9488_CS) || defined(ST7796_CS) || defined(USE_SPISSD1306)
     bool hasScreen = true;
 #ifdef HELTEC_MESH_NODE_T114
     uint32_t st7789_id = get_st7789_id(ST7789_NSS, ST7789_SCK, ST7789_SDA, ST7789_RS, ST7789_RESET);

src/mesh/api/ethServerAPI.cpp

@@ -1,7 +1,7 @@
 #include "configuration.h"
 #include <Arduino.h>
 
-#if HAS_ETHERNET && !defined(USE_WS5500)
+#if HAS_ETHERNET && !defined(USE_WS5500) && !defined(USE_CH390D)
 
 #include "ethServerAPI.h"
 

src/mesh/api/ethServerAPI.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "ServerAPI.h"
-#ifndef USE_WS5500
+#if !defined(USE_WS5500) && !defined(USE_CH390D)
 #include <RAK13800_W5100S.h>
 
 /**

src/mesh/wifi/WiFiAPClient.cpp

@@ -384,13 +384,13 @@ static void WiFiEvent(WiFiEvent_t event)
 #endif
         }
 #ifdef WIFI_LED
-        digitalWrite(WIFI_LED, HIGH);
+        digitalWrite(WIFI_LED, LOW ^ WIFI_STATE_ON);
 #endif
         break;
     case ARDUINO_EVENT_WIFI_STA_DISCONNECTED:
         LOG_INFO("Disconnected from WiFi access point");
 #ifdef WIFI_LED
-        digitalWrite(WIFI_LED, LOW);
+        digitalWrite(WIFI_LED, HIGH ^ WIFI_STATE_ON);
 #endif
         if (!isReconnecting) {
             WiFi.disconnect(false, true);
@@ -442,13 +442,13 @@ static void WiFiEvent(WiFiEvent_t event)
     case ARDUINO_EVENT_WIFI_AP_START:
         LOG_INFO("WiFi access point started");
 #ifdef WIFI_LED
-        digitalWrite(WIFI_LED, HIGH);
+        digitalWrite(WIFI_LED, LOW ^ WIFI_STATE_ON);
 #endif
         break;
     case ARDUINO_EVENT_WIFI_AP_STOP:
         LOG_INFO("WiFi access point stopped");
 #ifdef WIFI_LED
-        digitalWrite(WIFI_LED, LOW);
+        digitalWrite(WIFI_LED, HIGH ^ WIFI_STATE_ON);
 #endif
         break;
     case ARDUINO_EVENT_WIFI_AP_STACONNECTED:

src/modules/AdminModule.cpp

@@ -1227,7 +1227,7 @@ void AdminModule::handleGetDeviceConnectionStatus(const meshtastic_MeshPacket &r
     }
 #endif
 
-#if HAS_ETHERNET && !defined(USE_WS5500)
+#if HAS_ETHERNET && !defined(USE_WS5500) && !defined(USE_CH390D)
     conn.has_ethernet = true;
     conn.ethernet.has_status = true;
     if (Ethernet.linkStatus() == LinkON) {

src/modules/CannedMessageModule.cpp

@@ -836,7 +836,6 @@ bool CannedMessageModule::handleFreeTextInput(const InputEvent *event)
     if (event->inputEvent == INPUT_BROKER_BACK && this->freetext.length() > 0) {
         payload = 0x08;
         lastTouchMillis = millis();
-        requestFocus();
         runOnce();
         return true;
     }
@@ -845,7 +844,6 @@ bool CannedMessageModule::handleFreeTextInput(const InputEvent *event)
     if (event->inputEvent == INPUT_BROKER_LEFT) {
         payload = INPUT_BROKER_LEFT;
         lastTouchMillis = millis();
-        requestFocus();
         runOnce();
         return true;
     }
@@ -853,7 +851,6 @@ bool CannedMessageModule::handleFreeTextInput(const InputEvent *event)
     if (event->inputEvent == INPUT_BROKER_RIGHT) {
         payload = INPUT_BROKER_RIGHT;
         lastTouchMillis = millis();
-        requestFocus();
         runOnce();
         return true;
     }

src/modules/SerialModule.cpp

@@ -64,9 +64,8 @@ SerialModule *serialModule;
 SerialModuleRadio *serialModuleRadio;
 
 #if defined(TTGO_T_ECHO) || defined(CANARYONE) || defined(MESHLINK) || defined(ELECROW_ThinkNode_M1) ||                          \
-    defined(ELECROW_ThinkNode_M4) || defined(ELECROW_ThinkNode_M5) || defined(HELTEC_MESH_SOLAR) || defined(T_ECHO_LITE) ||      \
-    defined(ELECROW_ThinkNode_M3) || defined(MUZI_BASE)
-
+    defined(ELECROW_ThinkNode_M5) || defined(HELTEC_MESH_SOLAR) || defined(T_ECHO_LITE) || defined(ELECROW_ThinkNode_M3) ||      \
+    defined(MUZI_BASE)
 SerialModule::SerialModule() : StreamAPI(&Serial), concurrency::OSThread("Serial")
 {
     api_type = TYPE_SERIAL;
@@ -206,9 +205,7 @@ int32_t SerialModule::runOnce()
                 Serial.setTimeout(moduleConfig.serial.timeout > 0 ? moduleConfig.serial.timeout : TIMEOUT);
             }
 #elif !defined(TTGO_T_ECHO) && !defined(T_ECHO_LITE) && !defined(CANARYONE) && !defined(MESHLINK) &&                             \
-    !defined(ELECROW_ThinkNode_M1) && !defined(ELECROW_ThinkNode_M3) && !defined(ELECROW_ThinkNode_M4) &&                        \
-    !defined(ELECROW_ThinkNode_M5) && !defined(MUZI_BASE)
-
+    !defined(ELECROW_ThinkNode_M1) && !defined(ELECROW_ThinkNode_M3) && !defined(ELECROW_ThinkNode_M5) && !defined(MUZI_BASE)
             if (moduleConfig.serial.rxd && moduleConfig.serial.txd) {
 #ifdef ARCH_RP2040
                 Serial2.setFIFOSize(RX_BUFFER);
@@ -265,8 +262,7 @@ int32_t SerialModule::runOnce()
             }
 
 #if !defined(TTGO_T_ECHO) && !defined(T_ECHO_LITE) && !defined(CANARYONE) && !defined(MESHLINK) &&                               \
-    !defined(ELECROW_ThinkNode_M1) && !defined(ELECROW_ThinkNode_M3) && !defined(ELECROW_ThinkNode_M4) &&                        \
-    !defined(ELECROW_ThinkNode_M5) && !defined(MUZI_BASE)
+    !defined(ELECROW_ThinkNode_M1) && !defined(ELECROW_ThinkNode_M3) && !defined(ELECROW_ThinkNode_M5) && !defined(MUZI_BASE)
             else if ((moduleConfig.serial.mode == meshtastic_ModuleConfig_SerialConfig_Serial_Mode_WS85)) {
                 processWXSerial();
 
@@ -541,9 +537,8 @@ ParsedLine parseLine(const char *line)
 void SerialModule::processWXSerial()
 {
 #if !defined(TTGO_T_ECHO) && !defined(T_ECHO_LITE) && !defined(CANARYONE) && !defined(CONFIG_IDF_TARGET_ESP32C6) &&              \
-    !defined(MESHLINK) && !defined(ELECROW_ThinkNode_M1) && !defined(ELECROW_ThinkNode_M3) && !defined(ELECROW_ThinkNode_M4) &&  \
-    !defined(ELECROW_ThinkNode_M5) && !defined(ARCH_STM32WL) && !defined(MUZI_BASE)
-
+    !defined(MESHLINK) && !defined(ELECROW_ThinkNode_M1) && !defined(ELECROW_ThinkNode_M3) && !defined(ELECROW_ThinkNode_M5) &&  \
+    !defined(ARCH_STM32WL) && !defined(MUZI_BASE)
     static unsigned int lastAveraged = 0;
     static unsigned int averageIntervalMillis = 300000; // 5 minutes hard coded.
     static double dir_sum_sin = 0;

src/modules/StatusLEDModule.cpp

@@ -13,18 +13,16 @@ StatusLEDModule::StatusLEDModule() : concurrency::OSThread("StatusLEDModule")
 {
     bluetoothStatusObserver.observe(&bluetoothStatus->onNewStatus);
     powerStatusObserver.observe(&powerStatus->onNewStatus);
-    if (inputBroker)
-        inputObserver.observe(inputBroker);
 }
 
 int StatusLEDModule::handleStatusUpdate(const meshtastic::Status *arg)
 {
     switch (arg->getStatusType()) {
     case STATUS_TYPE_POWER: {
-        meshtastic::PowerStatus *_powerStatus = (meshtastic::PowerStatus *)arg;
-        if (_powerStatus->getHasUSB()) {
+        meshtastic::PowerStatus *powerStatus = (meshtastic::PowerStatus *)arg;
+        if (powerStatus->getHasUSB()) {
             power_state = charging;
-            if (_powerStatus->getBatteryChargePercent() >= 100) {
+            if (powerStatus->getBatteryChargePercent() >= 100) {
                 power_state = charged;
             }
         } else {
@@ -58,12 +56,6 @@ int StatusLEDModule::handleStatusUpdate(const meshtastic::Status *arg)
     return 0;
 };
 
-int StatusLEDModule::handleInputEvent(const InputEvent *event)
-{
-    lastUserbuttonTime = millis();
-    return 0;
-}
-
 int32_t StatusLEDModule::runOnce()
 {
 
@@ -90,21 +82,6 @@ int32_t StatusLEDModule::runOnce()
         PAIRING_LED_state = LED_STATE_ON;
     }
 
-    bool chargeIndicatorLED1 = LED_STATE_OFF;
-    bool chargeIndicatorLED2 = LED_STATE_OFF;
-    bool chargeIndicatorLED3 = LED_STATE_OFF;
-    bool chargeIndicatorLED4 = LED_STATE_OFF;
-    if (lastUserbuttonTime + 10 * 1000 > millis()) {
-        // should this be off at very low percentages?
-        chargeIndicatorLED1 = LED_STATE_ON;
-        if (powerStatus && powerStatus->getBatteryChargePercent() >= 25)
-            chargeIndicatorLED2 = LED_STATE_ON;
-        if (powerStatus && powerStatus->getBatteryChargePercent() >= 50)
-            chargeIndicatorLED3 = LED_STATE_ON;
-        if (powerStatus && powerStatus->getBatteryChargePercent() >= 75)
-            chargeIndicatorLED4 = LED_STATE_ON;
-    }
-
 #ifdef LED_CHARGE
     digitalWrite(LED_CHARGE, CHARGE_LED_state);
 #endif
@@ -113,18 +90,5 @@ int32_t StatusLEDModule::runOnce()
     digitalWrite(LED_PAIRING, PAIRING_LED_state);
 #endif
 
-#ifdef Battery_LED_1
-    digitalWrite(Battery_LED_1, chargeIndicatorLED1);
-#endif
-#ifdef Battery_LED_2
-    digitalWrite(Battery_LED_2, chargeIndicatorLED2);
-#endif
-#ifdef Battery_LED_3
-    digitalWrite(Battery_LED_3, chargeIndicatorLED3);
-#endif
-#ifdef Battery_LED_4
-    digitalWrite(Battery_LED_4, chargeIndicatorLED4);
-#endif
-
     return (my_interval);
 }

src/modules/StatusLEDModule.h

@@ -5,7 +5,6 @@
 #include "PowerStatus.h"
 #include "concurrency/OSThread.h"
 #include "configuration.h"
-#include "input/InputBroker.h"
 #include <Arduino.h>
 #include <functional>
 
@@ -18,8 +17,6 @@ class StatusLEDModule : private concurrency::OSThread
 
     int handleStatusUpdate(const meshtastic::Status *);
 
-    int handleInputEvent(const InputEvent *arg);
-
   protected:
     unsigned int my_interval = 1000; // interval in millisconds
     virtual int32_t runOnce() override;
@@ -28,15 +25,12 @@ class StatusLEDModule : private concurrency::OSThread
         CallbackObserver<StatusLEDModule, const meshtastic::Status *>(this, &StatusLEDModule::handleStatusUpdate);
     CallbackObserver<StatusLEDModule, const meshtastic::Status *> powerStatusObserver =
         CallbackObserver<StatusLEDModule, const meshtastic::Status *>(this, &StatusLEDModule::handleStatusUpdate);
-    CallbackObserver<StatusLEDModule, const InputEvent *> inputObserver =
-        CallbackObserver<StatusLEDModule, const InputEvent *>(this, &StatusLEDModule::handleInputEvent);
 
   private:
     bool CHARGE_LED_state = LED_STATE_OFF;
     bool PAIRING_LED_state = LED_STATE_OFF;
 
     uint32_t PAIRING_LED_starttime = 0;
-    uint32_t lastUserbuttonTime = 0;
 
     enum PowerState { discharging, charging, charged };
 

src/mqtt/MQTT.h

@@ -15,7 +15,7 @@
 #include <WiFiClientSecure.h>
 #endif
 #endif
-#if HAS_ETHERNET && !defined(USE_WS5500)
+#if HAS_ETHERNET && !defined(USE_WS5500) && !defined(USE_CH390D)
 #include <EthernetClient.h>
 #endif
 

src/platform/extra_variants/tbeam_displayshield/variant.cpp

@@ -1,43 +0,0 @@
-#include "configuration.h"
-
-#ifdef HAS_CST226SE
-
-#include "TouchDrvCSTXXX.hpp"
-#include "input/TouchScreenImpl1.h"
-#include <Wire.h>
-
-TouchDrvCSTXXX tsPanel;
-static constexpr uint8_t PossibleAddresses[2] = {CST328_ADDR, CST226SE_ADDR_ALT};
-uint8_t i2cAddress = 0;
-
-bool readTouch(int16_t *x, int16_t *y)
-{
-    int16_t x_array[1], y_array[1];
-    uint8_t touched = tsPanel.getPoint(x_array, y_array, 1);
-    if (touched > 0) {
-        *y = x_array[0];
-        *x = (TFT_WIDTH - y_array[0]);
-        // Check bounds
-        if (*x < 0 || *x >= TFT_WIDTH || *y < 0 || *y >= TFT_HEIGHT) {
-            return false;
-        }
-        return true; // Valid touch detected
-    }
-    return false; // No valid touch data
-}
-
-void lateInitVariant()
-{
-    tsPanel.setTouchDrvModel(TouchDrv_CST226);
-    for (uint8_t addr : PossibleAddresses) {
-        if (tsPanel.begin(Wire, addr, I2C_SDA, I2C_SCL)) {
-            i2cAddress = addr;
-            LOG_DEBUG("CST226SE init OK at address 0x%02X", addr);
-            touchScreenImpl1 = new TouchScreenImpl1(TFT_WIDTH, TFT_HEIGHT, readTouch);
-            touchScreenImpl1->init();
-            return;
-        }
-    }
-    LOG_ERROR("CST226SE init failed at all known addresses");
-}
-#endif

src/platform/nrf52/architecture.h

@@ -72,8 +72,6 @@
 #define HW_VENDOR meshtastic_HardwareModel_THINKNODE_M3
 #elif defined(ELECROW_ThinkNode_M6)
 #define HW_VENDOR meshtastic_HardwareModel_THINKNODE_M6
-#elif defined(ELECROW_ThinkNode_M4)
-#define HW_VENDOR meshtastic_HardwareModel_THINKNODE_M4
 #elif defined(NANO_G2_ULTRA)
 #define HW_VENDOR meshtastic_HardwareModel_NANO_G2_ULTRA
 #elif defined(CANARYONE)

src/power.h

@@ -132,8 +132,6 @@ class Power : private concurrency::OSThread
     bool lipoChargerInit();
     /// Setup a meshSolar battery sensor
     bool meshSolarInit();
-    /// Setup a serial battery sensor
-    bool serialBatteryInit();
 
   private:
     void shutdown();

variants/esp32/tbeam/platformio.ini

@@ -4,22 +4,12 @@ extends = esp32_base
 board = ttgo-t-beam
 board_level = pr
 board_check = true
-lib_deps = ${esp32_base.lib_deps}
-build_flags = ${esp32_base.build_flags}
+lib_deps =
+  ${esp32_base.lib_deps}
+build_flags = 
+  ${esp32_base.build_flags}
   -D TBEAM_V10
   -I variants/esp32/tbeam
   -DBOARD_HAS_PSRAM
   -mfix-esp32-psram-cache-issue
 upload_speed = 921600
-
-[env:tbeam-displayshield]
-extends = env:tbeam
-
-build_flags =
-  ${env:tbeam.build_flags}
-  -D USE_ST7796
-
-lib_deps =
-  ${env:tbeam.lib_deps}
-  https://github.com/meshtastic/st7796/archive/refs/tags/1.0.5.zip ; display addon
-  lewisxhe/SensorLib@0.3.1 ; touchscreen addon

variants/esp32/tbeam/variant.h

@@ -42,35 +42,4 @@
 #define GPS_UBLOX
 #define GPS_RX_PIN 34
 #define GPS_TX_PIN 12
-// #define GPS_DEBUG
-
-// Used when the display shield is chosen
-#ifdef USE_ST7796
-
-#undef EXT_NOTIFY_OUT
-#undef LED_STATE_ON
-#undef LED_PIN
-
-#define HAS_CST226SE 1
-#define HAS_TOUCHSCREEN 1
-// #define TOUCH_IRQ 35 // broken in this version of the lib 0.3.1
-#ifndef TOUCH_IRQ
-#define TOUCH_IRQ -1
-#endif
-#define CANNED_MESSAGE_MODULE_ENABLE 1
-#define USE_VIRTUAL_KEYBOARD 1
-
-#define ST7796_NSS 25
-#define ST7796_RS 13  // DC
-#define ST7796_SDA 14 // MOSI
-#define ST7796_SCK 15
-#define ST7796_RESET 2
-#define ST7796_MISO -1
-#define ST7796_BUSY -1
-#define VTFT_LEDA 4
-#define TFT_SPI_FREQUENCY 60000000
-#define TFT_HEIGHT 222
-#define TFT_WIDTH 480
-#define BRIGHTNESS_DEFAULT 100        // Medium Low Brightness
-#define SCREEN_TRANSITION_FRAMERATE 5 // fps
-#endif
+// #define GPS_DEBUG

variants/esp32s3/ELECROW-ThinkNode-G3/pins_arduino.h

@@ -0,0 +1,26 @@
+#ifndef Pins_Arduino_h
+#define Pins_Arduino_h
+
+#include <stdint.h>
+
+#define USB_VID 0x303a
+#define USB_PID 0x1001
+
+// The default Wire will be mapped to PMU and RTC
+static const uint8_t SDA = 17;
+static const uint8_t SCL = 18;
+
+// Default SPI will be mapped to Radio
+static const uint8_t SS = 39;
+static const uint8_t MOSI = 40;
+static const uint8_t MISO = 41;
+static const uint8_t SCK = 42;
+
+// #define SPI_MOSI (11)
+// #define SPI_SCK (10)
+// #define SPI_MISO (9)
+// #define SPI_CS (12)
+
+// #define SDCARD_CS SPI_CS
+
+#endif /* Pins_Arduino_h */

variants/esp32s3/ELECROW-ThinkNode-G3/platformio.ini

@@ -0,0 +1,22 @@
+[env:thinknode_g3]
+extends = esp32s3_base
+board = ESP32-S3-WROOM-1-N4
+board_build.psram_type = opi
+
+build_flags = 
+  ${esp32s3_base.build_flags}
+  -D ELECROW_ThinkNode_G3
+  -D HAS_UDP_MULTICAST=1
+  -D BOARD_HAS_PSRAM
+  -D PRIVATE_HW
+#  -D CONFIG_ETH_ENABLED=1
+#  -D CONFIG_ETH_USE_ESP32_EMAC=1
+  -I variants/esp32s3/ELECROW-ThinkNode-G3
+  -mfix-esp32-psram-cache-issue
+
+lib_ignore = 
+    Ethernet
+
+lib_deps = 
+  ${esp32s3_base.lib_deps}
+#  file://../ESP32-CH390/ESP32-CH390-1.0.1.tar.gz

variants/esp32s3/ELECROW-ThinkNode-G3/variant.h

@@ -0,0 +1,36 @@
+#define HAS_GPS 0
+#define HAS_WIRE 0
+#define I2C_NO_RESCAN
+
+#define WIFI_LED 5
+#define WIFI_STATE_ON 0
+
+#define LED_PIN 6 // The blue LORA LED
+#define LED_STATE_ON 0
+#define BUTTON_PIN 4 // the external user button of the device, BOOT and RESET are not accessible without opening it up.
+
+#define USE_SX1262
+#define LORA_SCK 42
+#define LORA_MISO 41
+#define LORA_MOSI 40
+#define LORA_CS 39
+#define LORA_RESET 21
+
+#define SX126X_CS LORA_CS
+#define SX126X_DIO1 15
+#define SX126X_BUSY 47
+#define SX126X_RESET LORA_RESET
+#define SX126X_DIO2_AS_RF_SWITCH
+#define SX126X_DIO3_TCXO_VOLTAGE 1.8
+#define PIN_POWER_EN 45
+
+// #define HAS_ETHERNET 1
+// #define USE_CH390D 1 // this driver uses the same stack as the ESP32 Wifi driver
+
+// #define ETH_MISO_PIN 47
+// #define ETH_MOSI_PIN 21
+// #define ETH_SCLK_PIN 48
+// #define ETH_CS_PIN 45
+// #define ETH_INT_PIN 14
+// #define ETH_RST_PIN -1
+// #define ETH_ADDR 1

variants/nrf52840/ELECROW-ThinkNode-M4/platformio.ini

@@ -1,15 +0,0 @@
-; ThinkNode M4 - Powerbank nrf52840/LR1110 by Elecrow
-[env:thinknode_m4]
-extends = nrf52840_base
-board = ThinkNode-M4
-board_check = true
-debug_tool = jlink
-
-build_flags = ${nrf52840_base.build_flags}
-  -Ivariants/nrf52840/ELECROW-ThinkNode-M4
-  -DELECROW_ThinkNode_M4
-
-build_src_filter = ${nrf52_base.build_src_filter} +<../variants/nrf52840/ELECROW-ThinkNode-M4>
-lib_deps =
-  ${nrf52840_base.lib_deps}
-  lewisxhe/PCF8563_Library@^1.0.1

variants/nrf52840/ELECROW-ThinkNode-M4/rfswitch.h

@@ -1,11 +0,0 @@
-#include "RadioLib.h"
-
-static const uint32_t rfswitch_dio_pins[] = {RADIOLIB_LR11X0_DIO5, RADIOLIB_LR11X0_DIO6, RADIOLIB_NC, RADIOLIB_NC, RADIOLIB_NC};
-
-static const Module::RfSwitchMode_t rfswitch_table[] = {
-    // mode                  DIO5  DIO6
-    {LR11x0::MODE_STBY, {LOW, LOW}},  {LR11x0::MODE_RX, {HIGH, LOW}},
-    {LR11x0::MODE_TX, {HIGH, HIGH}},  {LR11x0::MODE_TX_HP, {LOW, HIGH}},
-    {LR11x0::MODE_TX_HF, {LOW, LOW}}, {LR11x0::MODE_GNSS, {LOW, LOW}},
-    {LR11x0::MODE_WIFI, {LOW, LOW}},  END_OF_MODE_TABLE,
-};

variants/nrf52840/ELECROW-ThinkNode-M4/variant.cpp

@@ -1,51 +0,0 @@
-/*
-  Copyright (c) 2014-2015 Arduino LLC.  All right reserved.
-  Copyright (c) 2016 Sandeep Mistry All right reserved.
-  Copyright (c) 2018, Adafruit Industries (adafruit.com)
-
-  This library is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public
-  License as published by the Free Software Foundation; either
-  version 2.1 of the License, or (at your option) any later version.
-
-  This library is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-  See the GNU Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public
-  License along with this library; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-*/
-
-#include "variant.h"
-#include "nrf.h"
-#include "wiring_constants.h"
-#include "wiring_digital.h"
-
-const uint32_t g_ADigitalPinMap[] = {
-    // P0 - pins 0 and 1 are hardwired for xtal and should never be enabled
-    0xff, 0xff, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
-
-    // P1
-    32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47};
-
-void initVariant()
-{
-    pinMode(LED_CHARGE, OUTPUT);
-    ledOff(LED_CHARGE);
-
-    pinMode(LED_PAIRING, OUTPUT);
-    ledOff(LED_PAIRING);
-
-    pinMode(Battery_LED_1, OUTPUT);
-    ledOff(Battery_LED_1);
-    pinMode(Battery_LED_2, OUTPUT);
-    ledOff(Battery_LED_2);
-
-    pinMode(Battery_LED_3, OUTPUT);
-    ledOff(Battery_LED_3);
-
-    pinMode(Battery_LED_4, OUTPUT);
-    ledOff(Battery_LED_4);
-}

variants/nrf52840/ELECROW-ThinkNode-M4/variant.h

@@ -1,142 +0,0 @@
-/*
- Copyright (c) 2014-2015 Arduino LLC.  All right reserved.
- Copyright (c) 2016 Sandeep Mistry All right reserved.
- Copyright (c) 2018, Adafruit Industries (adafruit.com)
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- See the GNU Lesser General Public License for more details.
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-*/
-
-#ifndef _VARIANT_ELECROW_THINKNODE_M4_
-#define _VARIANT_ELECROW_THINKNODE_M4_
-
-/** Master clock frequency */
-#define VARIANT_MCK (64000000ul)
-
-#define USE_LFXO
-
-/*----------------------------------------------------------------------------
- *        Headers
- *----------------------------------------------------------------------------*/
-
-#include "WVariant.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-#define PINS_COUNT (48)
-#define NUM_DIGITAL_PINS (48)
-#define NUM_ANALOG_INPUTS (1)
-#define NUM_ANALOG_OUTPUTS (0)
-
-// LEDs
-#define LED_BUILTIN -1
-#define LED_BLUE -1
-#define LED_CHARGE (32 + 9)
-#define LED_PAIRING (13)
-
-#define Battery_LED_1 (15)
-#define Battery_LED_2 (17)
-#define Battery_LED_3 (32 + 2)
-#define Battery_LED_4 (32 + 4)
-
-#define LED_STATE_ON 1
-
-// Button
-#define PIN_BUTTON1 (4)
-
-// Battery ADC
-#define PIN_A0 (2)
-#define BATTERY_PIN PIN_A0
-#define BATTERY_SENSE_SAMPLES 30
-#define ADC_RESOLUTION 14
-#define BATTERY_SENSE_RESOLUTION_BITS 12
-#define BATTERY_SENSE_RESOLUTION 4096.0
-#define ADC_MULTIPLIER (2.00F)
-#undef AREF_VOLTAGE
-#define AREF_VOLTAGE 3.0
-#define VBAT_AR_INTERNAL AR_INTERNAL_3_0
-
-#define HAS_SERIAL_BATTERY_LEVEL 1
-#define SERIAL_BATTERY_RX 30
-#define SERIAL_BATTERY_TX 5
-
-static const uint8_t A0 = PIN_A0;
-
-#define PIN_NFC1 (9)
-#define PIN_NFC2 (10)
-
-// I2C
-#define WIRE_INTERFACES_COUNT 1
-#define PIN_WIRE_SDA (23)
-#define PIN_WIRE_SCL (25)
-
-// actually the LORA Radio
-#define PIN_POWER_EN (11)
-
-// charger status
-#define EXT_CHRG_DETECT (32 + 6)
-#define EXT_CHRG_DETECT_VALUE HIGH
-
-// SPI
-#define SPI_INTERFACES_COUNT 1
-#define PIN_SPI_MISO (8)
-#define PIN_SPI_MOSI (7)
-#define PIN_SPI_SCK (6)
-
-#define LORA_RESET (32 + 8)
-#define LORA_DIO1 (12)
-#define LORA_DIO2 (26)
-#define LORA_SCK PIN_SPI_SCK
-#define LORA_MISO PIN_SPI_MISO
-#define LORA_MOSI PIN_SPI_MOSI
-#define LORA_CS (27)
-
-#define USE_LR1110
-#define LR1110_IRQ_PIN LORA_DIO1
-#define LR1110_NRESET_PIN LORA_RESET
-#define LR1110_BUSY_PIN LORA_DIO2
-#define LR1110_SPI_NSS_PIN LORA_CS
-#define LR1110_SPI_SCK_PIN LORA_SCK
-#define LR1110_SPI_MOSI_PIN LORA_MOSI
-#define LR1110_SPI_MISO_PIN LORA_MISO
-
-#define LR11X0_DIO3_TCXO_VOLTAGE 1.6
-#define LR11X0_DIO_AS_RF_SWITCH
-
-// Peripherals on I2C bus. Active Low
-#define VEXT_ENABLE (32)
-#define VEXT_ON_VALUE LOW
-
-// GPS L76K
-#define HAS_GPS 1
-#define GPS_L76K
-#define GPS_BAUDRATE 9600
-#define PIN_GPS_EN (32 + 11)
-#define GPS_EN_ACTIVE LOW
-#define PIN_GPS_RESET (3)
-#define GPS_RESET_MODE HIGH
-#define PIN_GPS_STANDBY (28)
-#define GPS_STANDBY_ACTIVE HIGH
-#define GPS_TX_PIN (32 + 12)
-#define GPS_RX_PIN (32 + 14)
-#define GPS_THREAD_INTERVAL 50
-
-#define PIN_SERIAL1_RX GPS_RX_PIN
-#define PIN_SERIAL1_TX GPS_TX_PIN
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif