Fix compiler error in PowerFSM when WiFi is excluded (#6603)

* add seeed_solar_node

* fix RF_SW problem

* fix IIC problem

* Update Button redefination

* Add on-board flash pin defination

* fix missing a ','

* update seeed sorlar panel defination

* fix word spell

* fix upstream change

* fix upstream change

* fix upstream change

* fix formate

* Restore the FLASH definition that was deleted by mistake and pull down the CS pin to ensure low power consumption

* fix led defination conflict

* Delete lib/device-ui directory

* Restore protobufs submodule

---------

Co-authored-by: WayenWeng <jinyuan.weng@seeed.cc>

.trunk/trunk.yaml

@@ -8,7 +8,7 @@ plugins:
       uri: https://github.com/trunk-io/plugins
 lint:
   enabled:
-    - renovate@39.238.1
+    - renovate@39.243.0
     - prettier@3.5.3
     - trufflehog@3.88.23
     - yamllint@1.37.0
@@ -28,7 +28,7 @@ lint:
     - shellcheck@0.10.0
     - black@25.1.0
     - git-diff-check
-    - gitleaks@8.24.2
+    - gitleaks@8.24.3
     - clang-format@16.0.3
   ignore:
     - linters: [ALL]

bin/config.d/lora-piggystick-lr1121.yaml

@@ -0,0 +1,11 @@
+Lora:
+  Module: lr1121
+  CS: 0
+  IRQ: 6
+  Reset: 2
+  Busy: 4
+  spidev: ch341
+  DIO3_TCXO_VOLTAGE: 1.8
+#  USB_Serialnum: 12345678
+  USB_PID: 0x5512
+  USB_VID: 0x1A86

boards/Seeed_Solar_Node.json

@@ -0,0 +1,54 @@
+{
+  "build": {
+    "arduino": {
+      "ldscript": "nrf52840_s140_v7.ld"
+    },
+    "core": "nRF5",
+    "cpu": "cortex-m4",
+    "extra_flags": "-DARDUINO_MDBT50Q_RX -DNRF52840_XXAA",
+    "f_cpu": "64000000L",
+    "hwids": [["0x2886", "0x0059"]],
+    "usb_product": "XIAO-BOOT",
+    "mcu": "nrf52840",
+    "variant": "Seeed_Solar_Node",
+    "bsp": {
+      "name": "adafruit"
+    },
+    "softdevice": {
+      "sd_flags": "-DS140",
+      "sd_name": "s140",
+      "sd_version": "7.3.0",
+      "sd_fwid": "0x0123"
+    },
+    "bootloader": {
+      "settings_addr": "0xFF000"
+    }
+  },
+  "connectivity": ["bluetooth"],
+  "debug": {
+    "jlink_device": "nRF52840_xxAA",
+    "svd_path": "nrf52840.svd",
+    "openocd_target": "nrf52840-mdk-rs"
+  },
+  "frameworks": ["arduino"],
+  "name": "Seeed_Solar_Node",
+  "upload": {
+    "maximum_ram_size": 248832,
+    "maximum_size": 815104,
+    "speed": 115200,
+    "protocol": "nrfutil",
+    "protocols": [
+      "jlink",
+      "nrfjprog",
+      "nrfutil",
+      "stlink",
+      "cmsis-dap",
+      "blackmagic"
+    ],
+    "use_1200bps_touch": true,
+    "require_upload_port": true,
+    "wait_for_upload_port": true
+  },
+  "url": "https://www.seeedstudio.com/Seeed-XIAO-BLE-Sense-nRF52840-p-5253.html",
+  "vendor": "Seeed Studio"
+}

debian/ci_pack_sdeb.sh

@@ -5,8 +5,8 @@ export PLATFORMIO_PACKAGES_DIR=pio/packages
 export PLATFORMIO_CORE_DIR=pio/core
 
 # Download libraries to `pio`
-platformio pkg install -e native
-platformio pkg install -e native -t platformio/tool-scons@4.40502.0
+platformio pkg install -e native-tft
+platformio pkg install -e native-tft -t platformio/tool-scons@4.40502.0
 # Compress `pio` directory to prevent dh_clean from sanitizing it
 tar -cf pio.tar pio/
 rm -rf pio

debian/control

@@ -21,7 +21,10 @@ Build-Depends: debhelper-compat (= 13),
                openssl,
                libssl-dev,
                libulfius-dev,
-               liborcania-dev
+               liborcania-dev,
+               libx11-dev,
+               libinput-dev,
+               libxkbcommon-x11-dev
 Standards-Version: 4.6.2
 Homepage: https://github.com/meshtastic/firmware
 Rules-Requires-Root: no

debian/meshtasticd.install

@@ -1,8 +1,8 @@
-.pio/build/native/meshtasticd  usr/sbin
+.pio/build/native-tft/meshtasticd  usr/sbin
 
-bin/config.yaml                etc/meshtasticd
-bin/config.d/*                 etc/meshtasticd/available.d
+bin/config.yaml                    etc/meshtasticd
+bin/config.d/*                     etc/meshtasticd/available.d
 
-bin/meshtasticd.service        lib/systemd/system
+bin/meshtasticd.service            lib/systemd/system
 
-web/*                          usr/share/meshtasticd/web
+web/*                              usr/share/meshtasticd/web

debian/rules

@@ -26,7 +26,7 @@ override_dh_auto_build:
 	mkdir -p web && tar -xf web.tar -C web
 	gunzip web/ -r
 	# Build with platformio
-	$(PIO_ENV) platformio run -e native
+	$(PIO_ENV) platformio run -e native-tft
 	# Move the binary and default config to the correct name
-	mv .pio/build/native/program .pio/build/native/meshtasticd
+	mv .pio/build/native-tft/program .pio/build/native-tft/meshtasticd
 	cp bin/config-dist.yaml bin/config.yaml

src/PowerFSM.cpp

@@ -19,7 +19,7 @@
 #include "sleep.h"
 #include "target_specific.h"
 
-#if HAS_WIFI && !defined(ARCH_PORTDUINO)
+#if HAS_WIFI && !defined(ARCH_PORTDUINO) || defined(MESHTASTIC_EXCLUDE_WIFI)
 #include "mesh/wifi/WiFiAPClient.h"
 #endif
 
@@ -269,9 +269,6 @@ Fsm powerFSM(&stateBOOT);
 void PowerFSM_setup()
 {
     bool isRouter = (config.device.role == meshtastic_Config_DeviceConfig_Role_ROUTER ? 1 : 0);
-    bool isTrackerOrSensor = config.device.role == meshtastic_Config_DeviceConfig_Role_TRACKER ||
-                             config.device.role == meshtastic_Config_DeviceConfig_Role_TAK_TRACKER ||
-                             config.device.role == meshtastic_Config_DeviceConfig_Role_SENSOR;
     bool hasPower = isPowered();
 
     LOG_INFO("PowerFSM init, USB power=%d", hasPower ? 1 : 0);
@@ -383,6 +380,12 @@ void PowerFSM_setup()
     // See: https://github.com/meshtastic/firmware/issues/1071
     // Don't add power saving transitions if we are a power saving tracker or sensor or have Wifi enabled. Sleep will be initiated
     // through the modules
+
+#if HAS_WIFI || !defined(MESHTASTIC_EXCLUDE_WIFI)
+    bool isTrackerOrSensor = config.device.role == meshtastic_Config_DeviceConfig_Role_TRACKER ||
+                             config.device.role == meshtastic_Config_DeviceConfig_Role_TAK_TRACKER ||
+                             config.device.role == meshtastic_Config_DeviceConfig_Role_SENSOR;
+
     if ((isRouter || config.power.is_power_saving) && !isWifiAvailable() && !isTrackerOrSensor) {
         powerFSM.add_timed_transition(&stateNB, &stateLS,
                                       Default::getConfiguredOrDefaultMs(config.power.min_wake_secs, default_min_wake_secs), NULL,
@@ -400,7 +403,9 @@ void PowerFSM_setup()
                                       Default::getConfiguredOrDefaultMs(config.display.screen_on_secs, default_screen_on_secs),
                                       NULL, "Screen-on timeout");
     }
-#else
+#endif // HAS_WIFI || !defined(MESHTASTIC_EXCLUDE_WIFI)
+
+#else // (not) ARCH_ESP32
     // If not ESP32, light-sleep not used. Check periodically if config has drifted out of stateDark
     powerFSM.add_timed_transition(&stateDARK, &stateDARK,
                                   Default::getConfiguredOrDefaultMs(config.display.screen_on_secs, default_screen_on_secs), NULL,
@@ -409,4 +414,4 @@ void PowerFSM_setup()
 
     powerFSM.run_machine(); // run one iteration of the state machine, so we run our on enter tasks for the initial DARK state
 }
-#endif
+#endif

src/graphics/Screen.cpp

@@ -1796,7 +1796,9 @@ void Screen::setup()
     powerStatusObserver.observe(&powerStatus->onNewStatus);
     gpsStatusObserver.observe(&gpsStatus->onNewStatus);
     nodeStatusObserver.observe(&nodeStatus->onNewStatus);
+#if !MESHTASTIC_EXCLUDE_ADMIN
     adminMessageObserver.observe(adminModule);
+#endif
     if (textMessageModule)
         textMessageObserver.observe(textMessageModule);
     if (inputBroker)
@@ -2857,4 +2859,4 @@ int Screen::handleAdminMessage(const meshtastic_AdminMessage *arg)
 } // namespace graphics
 #else
 graphics::Screen::Screen(ScanI2C::DeviceAddress, meshtastic_Config_DisplayConfig_OledType, OLEDDISPLAY_GEOMETRY) {}
-#endif // HAS_SCREEN
+#endif // HAS_SCREEN

src/graphics/niche/InkHUD/Applets/System/Logo/LogoApplet.cpp

@@ -11,10 +11,19 @@ InkHUD::LogoApplet::LogoApplet() : concurrency::OSThread("LogoApplet")
     OSThread::setIntervalFromNow(8 * 1000UL);
     OSThread::enabled = true;
 
-    textLeft = "";
-    textRight = "";
-    textTitle = xstr(APP_VERSION_SHORT);
-    fontTitle = fontSmall;
+    // During onboarding, show the default short name as well as the version string
+    // This behavior assists manufacturers during mass production, and should not be modified without good reason
+    if (!settings->tips.safeShutdownSeen) {
+        fontTitle = fontLarge;
+        textLeft = xstr(APP_VERSION_SHORT);
+        textRight = owner.short_name;
+        textTitle = "Meshtastic";
+    } else {
+        fontTitle = fontSmall;
+        textLeft = "";
+        textRight = "";
+        textTitle = xstr(APP_VERSION_SHORT);
+    }
 
     bringToForeground();
     // This is then drawn with a FULL refresh by Renderer::begin

src/main.cpp

@@ -1310,7 +1310,7 @@ extern meshtastic_DeviceMetadata getDeviceMetadata()
     deviceMetadata.excluded_modules |= meshtastic_ExcludedModules_AUDIO_CONFIG;
 #endif
 // Option to explicitly include canned messages for edge cases, e.g. niche graphics
-#if (!HAS_SCREEN && NO_EXT_GPIO) && !MESHTASTIC_INCLUDE_CANNEDMSG
+#if (!HAS_SCREEN || NO_EXT_GPIO) || MESHTASTIC_EXCLUDE_CANNEDMESSAGES
     deviceMetadata.excluded_modules |= meshtastic_ExcludedModules_CANNEDMSG_CONFIG;
 #endif
 #if NO_EXT_GPIO
@@ -1318,11 +1318,11 @@ extern meshtastic_DeviceMetadata getDeviceMetadata()
 #endif
 // Only edge case here is if we apply this a device with built in Accelerometer and want to detect interrupts
 // We'll have to macro guard against those targets potentially
-#if NO_EXT_GPIO
+#if NO_EXT_GPIO || MESHTASTIC_EXCLUDE_DETECTIONSENSOR
     deviceMetadata.excluded_modules |= meshtastic_ExcludedModules_DETECTIONSENSOR_CONFIG;
 #endif
-// If we don't have any GPIO and we don't have GPS, no purpose in having serial config
-#if NO_EXT_GPIO && NO_GPS
+// If we don't have any GPIO and we don't have GPS OR we don't want too - no purpose in having serial config
+#if NO_EXT_GPIO && NO_GPS || MESHTASTIC_EXCLUDE_SERIAL
     deviceMetadata.excluded_modules |= meshtastic_ExcludedModules_SERIAL_CONFIG;
 #endif
 #ifndef ARCH_ESP32

src/mesh/generated/meshtastic/mesh.pb.h

@@ -241,6 +241,8 @@ typedef enum _meshtastic_HardwareModel {
     meshtastic_HardwareModel_RESERVED_FRIED_CHICKEN = 93,
     /* Heltec Magnetic Power Bank with Meshtastic compatible */
     meshtastic_HardwareModel_HELTEC_MESH_POCKET = 94,
+    /* Seeed Solar Node */
+    meshtastic_HardwareModel_SEEED_SOLAR_NODE = 95,
     /* ------------------------------------------------------------------------------------------------------------------------------------------
  Reserved ID For developing private Ports. These will show up in live traffic sparsely, so we can use a high number. Keep it within 8 bits.
  ------------------------------------------------------------------------------------------------------------------------------------------ */

src/platform/nrf52/architecture.h

@@ -81,6 +81,8 @@
 #define HW_VENDOR meshtastic_HardwareModel_MESHLINK
 #elif defined(SEEED_XIAO_NRF52840_KIT)
 #define HW_VENDOR meshtastic_HardwareModel_XIAO_NRF52_KIT
+#elif defined(SEEED_SOLAR_NODE)
+#define HW_VENDOR meshtastic_HardwareModel_SEEED_SOLAR_NODE
 #elif defined(HELTEC_MESH_POCKET)
 #define HW_VENDOR meshtastic_HardwareModel_HELTEC_MESH_POCKET
 #else
@@ -135,4 +137,4 @@
 #if !defined(PIN_SERIAL_RX) && !defined(NRF52840_XXAA)
 // No serial ports on this board - ONLY use segger in memory console
 #define USE_SEGGER
-#endif
+#endif

variants/Seeed_Solar_Node/platformio.ini

@@ -0,0 +1,14 @@
+[env:Seeed_Solar_Node]
+board = Seeed_Solar_Node
+extends = nrf52840_base
+;board_level = extra
+build_flags = ${nrf52840_base.build_flags} 
+  -I $PROJECT_DIR/variants/Seeed_Solar_Node 
+  -D SEEED_SOLAR_NODE 
+  -Isrc/platform/nrf52/softdevice -Isrc/platform/nrf52/softdevice/nrf52
+  -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m4/fpv4-sp-d16-hard"
+board_build.ldscript = src/platform/nrf52/nrf52840_s140_v7.ld
+build_src_filter = ${nrf52_base.build_src_filter} +<../variants/Seeed_Solar_Node>
+lib_deps =
+  ${nrf52840_base.lib_deps}
+debug_tool = jlink

variants/Seeed_Solar_Node/variant.cpp

@@ -0,0 +1,108 @@
+/*
+ * variant.cpp - Digital pin mapping for nRF52-based development board
+ *
+ * This file defines the pin mapping array that maps logical digital pins (D0-D17)
+ * to physical GPIO ports/pins on the Nordic nRF52 series microcontroller.
+ *
+ * Board: [Seeed Studio XIAO nRF52840 Sense (Seeed Solar Node)]
+ * Hardware Features:
+ *  - LoRa module (CS/SCK/MISO/MOSI control pins)
+ *  - GNSS module (TX/RX/Reset/Wakeup)
+ *  - User LEDs (D11-D12)
+ *  - User button (D13)
+ *  - Grove/NFC interface (D14-D15)
+ *  - Battery voltage monitoring (D16)
+ *
+ * Created [20250225]
+ * By [Dylan]
+ * Version 1.0
+ * License: [MIT]
+ */
+
+#include "variant.h"
+#include "nrf.h"
+#include "wiring_constants.h"
+#include "wiring_digital.h"
+
+/**
+ * @brief Digital pin to GPIO port/pin mapping table
+ *
+ * Format: Logical Pin (Dx) -> nRF Port.Pin (Px.xx)
+ *
+ * Pin Groupings:
+ * [D0-D10]  - Peripheral control (LoRa, GNSS)
+ * [D11-D12] - LED outputs
+ * [D13]     - User button
+ * [D14-D15] - Grove/NFC interface
+ * [D16]     - Battery voltage ADC input
+ * [D17]     - GNSS module reset
+ */
+
+extern "C" {
+const uint32_t g_ADigitalPinMap[] = {
+    // D0 .. D10 - Peripheral control pins
+    2,  // D0  P0.02 (A0)    GNSS_WAKEUP
+    3,  // D1  P0.03 (A1)    LORA_DIO1
+    28, // D2  P0.28 (A2)    LORA_RESET
+    29, // D3  P0.29 (A3)    LORA_BUSY
+    4,  // D4  P0.04 (A4/SDA) LORA_CS
+    5,  // D5  P0.05 (A5/SCL) LORA_SW
+    43, // D6  P1.11 (UART_TX) GNSS_TX
+    44, // D7  P1.12 (UART_RX) GNSS_RX
+    45, // D8  P1.13 (SPI_SCK) LORA_SCK
+    46, // D9  P1.14 (SPI_MISO) LORA_MISO
+    47, // D10 P1.15 (SPI_MOSI) LORA_MOSI
+
+    // D11-D12 - LED outputs
+    15, // D11 P0.15 User LED
+    19, // D12 P0.19 Breathing LED
+
+    // D13 - User input
+    33, // D13 P1.01 User Button
+
+    // D14-D15 - Grove/NFC interface
+    9,  // D14 P0.09 NFC1/GROVE_D1
+    10, // D15 P0.10 NFC2/GROVE_D0
+
+    // D16 - Power management
+    // 31, // D16 P0.31 VBAT_ADC (Battery voltage)
+    31, // D16 P0.31 VBAT_ADC (Battery voltage)
+    // D17 - GNSS control
+    35, // D17 P1.03 GNSS_RESET
+
+    37, // D18 P1.05 GNSS_ENABLE
+    14, // D19 P0.14 BAT_READ
+    39, // D20 P1.07 USER_BUTTON
+
+    //
+    21, // D21 P0.21 (QSPI_SCK)
+    25, // D22 P0.25 (QSPI_CSN)
+    20, // D23 P0.20 (QSPI_SIO_0 DI)
+    24, // D24 P0.24 (QSPI_SIO_1 DO)
+    22, // D25 P0.22 (QSPI_SIO_2 WP)
+    23, // D26 P0.23 (QSPI_SIO_3 HOLD)
+};
+}
+
+void initVariant()
+{
+    pinMode(PIN_QSPI_CS, OUTPUT);
+    digitalWrite(PIN_QSPI_CS, HIGH);
+    // This setup is crucial for ensuring low power consumption and proper initialization of the hardware components.
+    pinMode(GPS_EN, OUTPUT);
+    digitalWrite(GPS_EN, LOW);
+
+    // VBAT_ENABLE
+    pinMode(BAT_READ, OUTPUT);
+    digitalWrite(BAT_READ, LOW);
+
+    pinMode(PIN_LED1, OUTPUT);
+    digitalWrite(PIN_LED1, LOW);
+    pinMode(PIN_LED2, OUTPUT);
+    digitalWrite(PIN_LED2, LOW);
+    pinMode(PIN_LED2, OUTPUT);
+    // digitalWrite(LED_PIN, LOW);
+
+    pinMode(GPS_EN, OUTPUT);
+    digitalWrite(GPS_EN, HIGH);
+}

variants/Seeed_Solar_Node/variant.h

@@ -0,0 +1,157 @@
+#ifndef _SEEED_SOLAR_NODE_H_
+#define _SEEED_SOLAR_NODE_H_
+#include "WVariant.h"
+// ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+//  Clock Configuration
+// ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+#define VARIANT_MCK (64000000ul) // Master clock frequency
+#define USE_LFXO                 // 32.768kHz crystal for LFCLK
+
+// ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+//  Pin Capacity Definitions
+// ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+#define PINS_COUNT (33u)       // Total GPIO pins
+#define NUM_DIGITAL_PINS (33u) // Digital I/O pins
+#define NUM_ANALOG_INPUTS (8u) // Analog inputs (A0-A5 + VBAT + AREF)
+#define NUM_ANALOG_OUTPUTS (0u)
+
+// ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+//  LED Configuration
+// ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+//  LEDs
+//  LEDs
+#define PIN_LED1 (11) // LED        P1.15
+#define PIN_LED2 (12) //
+
+#define LED_BUILTIN PIN_LED1
+#define LED_CONN PIN_LED2
+
+#define LED_GREEN PIN_LED1
+#define LED_BLUE PIN_LED2
+// #define LED_PIN PIN_LED2
+#define LED_STATE_ON 1 // State when LED is litted
+// ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+//  Button Configuration
+// ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+#define BUTTON_PIN D13 // This is the Program Button
+// #define BUTTON_NEED_PULLUP   1
+#define BUTTON_ACTIVE_LOW true
+#define BUTTON_ACTIVE_PULLUP false
+
+#define BUTTON_PIN_TOUCH 20 // Touch button
+// ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+//  Digital Pin Mapping (D0-D10)
+// ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+#define D0 0   // P0.02 GNSS_WAKEUP/IO0
+#define D1 1   // P0.03 LORA_DIO1
+#define D2 2   // P0.28 LORA_RESET
+#define D3 3   // P0.29 LORA_BUSY
+#define D4 4   // P0.04 LORA_CS/I2C_SDA
+#define D5 5   // P0.05 LORA_SW/I2C_SCL
+#define D6 6   // P1.11 GNSS_TX
+#define D7 7   // P1.12 GNSS_RX
+#define D8 8   // P1.13 SPI_SCK
+#define D9 9   // P1.14 SPI_MISO
+#define D10 10 // P1.15 SPI_MOSI
+#define D13 13 // P1.01 User Button
+#define D14 14 // P0.09 NFC1/GROVE_D1
+#define D15 15 // P0.10 NFC2/GROVE_D0
+#define D16 16 // P0.31 VBAT_ADC (Battery voltage)
+#define D17 17 // P1.03 GNSS_RESET
+#define D18 18 // P1.05 GNSS_ENABLE
+#define D19 19 // P0.14 BAT_READ
+// ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+//  Analog Pin Definitions
+// ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+#define PIN_A0 0     // P0.02 Analog Input 0
+#define PIN_A1 1     // P0.03 Analog Input 1
+#define PIN_A2 2     // P0.28 Analog Input 2
+#define PIN_A3 3     // P0.29 Analog Input 3
+#define PIN_A4 4     // P0.04 Analog Input 4
+#define PIN_A5 5     // P0.05 Analog Input 5
+#define PIN_VBAT D16 // P0.31 Battery voltage sense
+// ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+//  Communication Interfaces
+// ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+//  I2C Configuration
+#define HAS_WIRE 1
+#define PIN_WIRE_SDA D14 // P0.09
+#define PIN_WIRE_SCL D15 // P0.10
+#define WIRE_INTERFACES_COUNT 1
+#define I2C_NO_RESCAN
+
+static const uint8_t SDA = PIN_WIRE_SDA;
+static const uint8_t SCL = PIN_WIRE_SCL;
+// SPI Configuration (SX1262)
+
+#define SPI_INTERFACES_COUNT 1
+#define PIN_SPI_MISO 9  // P1.14 (D9)
+#define PIN_SPI_MOSI 10 // P1.15 (D10)
+#define PIN_SPI_SCK 8   // P1.13 (D8)
+
+// SX1262 LoRa Module Pins
+#define USE_SX1262
+#define SX126X_CS D4                 // Chip select
+#define SX126X_DIO1 D1               // Digital IO 1 (Interrupt)
+#define SX126X_BUSY D3               // Busy status
+#define SX126X_RESET D2              // Reset control
+#define SX126X_DIO3_TCXO_VOLTAGE 1.8 // TCXO supply voltage
+#define SX126X_RXEN D5               // RX enable control
+#define SX126X_TXEN RADIOLIB_NC
+#define SX126X_DIO2_AS_RF_SWITCH // This Line is really necessary for SX1262  to work with RF switch or will loss TX power
+// ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+//  Power Management
+// ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+
+#define BAT_READ                                                                                                                 \
+    D19 // P0_14 = 14  Reads battery voltage from divider on signal board. (PIN_VBAT is reading voltage divider on XIAO and is
+        // program pin 32 / or P0.31)
+#define BATTERY_SENSE_RESOLUTION_BITS 12
+#define ADC_MULTIPLIER 3.3
+#define BATTERY_PIN PIN_VBAT // PIN_A7
+#define AREF_VOLTAGE 3.3
+// ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+//  GPS L76KB
+// ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+#define GPS_L76K
+#ifdef GPS_L76K
+#define PIN_GPS_RX D6 // 44
+#define PIN_GPS_TX D7 // 43
+#define HAS_GPS 1
+#define GPS_BAUDRATE 9600
+#define GPS_THREAD_INTERVAL 50
+#define PIN_SERIAL1_RX PIN_GPS_TX
+#define PIN_SERIAL1_TX PIN_GPS_RX
+#define PIN_GPS_STANDBY D0
+#define GPS_EN D18 // P1.05
+#endif
+
+// ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+//  On-board QSPI Flash
+// ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+// On-board QSPI Flash
+#define PIN_QSPI_SCK (21)
+#define PIN_QSPI_CS (22)
+#define PIN_QSPI_IO0 (23)
+#define PIN_QSPI_IO1 (24)
+#define PIN_QSPI_IO2 (25)
+#define PIN_QSPI_IO3 (26)
+
+#define EXTERNAL_FLASH_DEVICES P25Q16H
+#define EXTERNAL_FLASH_USE_QSPI
+
+// ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+//  Compatibility Definitions
+// ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+#ifdef __cplusplus
+extern "C" {
+#endif
+// Serial port placeholders
+
+#define PIN_SERIAL2_RX (-1)
+#define PIN_SERIAL2_TX (-1)
+#ifdef __cplusplus
+}
+#endif
+
+#endif //  _SEEED_SOLAR_NODE_H_

variants/tlora_v1/platformio.ini

@@ -3,4 +3,5 @@ board_level = extra
 extends = esp32_base
 board = ttgo-lora32-v1
 build_flags = 
-  ${esp32_base.build_flags} -D TLORA_V1 -I variants/tlora_v1
+  ${esp32_base.build_flags} -D TLORA_V1 -I variants/tlora_v1
+upload_speed = 115200

variants/tracker-t1000-e/platformio.ini

@@ -5,6 +5,10 @@ build_flags = ${nrf52840_base.build_flags} -Ivariants/tracker-t1000-e -Isrc/plat
   -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m4/fpv4-sp-d16-hard"
   -DGPS_POWER_TOGGLE
   -DMESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR_EXTERNAL=1
+  -DMESHTASTIC_EXCLUDE_CANNEDMESSAGES=1
+  -DMESHTASTIC_EXCLUDE_SCREEN=1
+  -DMESHTASTIC_EXCLUDE_DETECTIONSENSOR=1
+  -DMESHTASTIC_EXCLUDE_WIFI=1
 board_build.ldscript = src/platform/nrf52/nrf52840_s140_v7.ld
 build_src_filter = ${nrf52_base.build_src_filter} +<../variants/tracker-t1000-e>
 lib_deps = 
@@ -12,4 +16,4 @@ lib_deps =
   https://github.com/meshtastic/QMA6100P_Arduino_Library/archive/14c900b8b2e4feaac5007a7e41e0c1b7f0841136.zip
 debug_tool = jlink
 ; If not set we will default to uploading over serial (first it forces bootloader entry by talking 1200bps to cdcacm)
-upload_protocol = nrfutil
+upload_protocol = nrfutil

variants/tracker-t1000-e/variant.h

@@ -152,6 +152,8 @@ extern "C" {
 #define T1000X_NTC_PIN (0 + 31) // P0.31/AIN7
 #define T1000X_LUX_PIN (0 + 29) // P0.29/AIN5
 
+#define HAS_SCREEN 0
+
 #ifdef __cplusplus
 }
 #endif
@@ -160,4 +162,4 @@ extern "C" {
  *        Arduino objects - C++ only
  *----------------------------------------------------------------------------*/
 
-#endif // _VARIANT_TRACKER_T1000_E_
+#endif // _VARIANT_TRACKER_T1000_E_