Merge branch 'master' into crowpanelV2

2026-01-03 00:20:43 +00:00 · 2025-12-31 13:35:53 +01:00 · 2025-12-10 13:38:41 +01:00 · 2025-12-05 10:59:34 +01:00 · 2025-10-11 23:32:09 +02:00 · 2025-10-07 14:22:46 +02:00
29 changed files with 76 additions and 467 deletions
--- a/.github/workflows/test_native.yml
+++ b/.github/workflows/test_native.yml
@@ -143,7 +143,7 @@ jobs:
          merge-multiple: true

      - name: Test Report
-        uses: dorny/test-reporter@v2.4.0
+        uses: dorny/test-reporter@v2.3.0
        with:
          name: PlatformIO Tests
          path: testreport.xml
--- a/.trunk/trunk.yaml
+++ b/.trunk/trunk.yaml
@@ -8,8 +8,8 @@ plugins:
      uri: https://github.com/trunk-io/plugins
 lint:
  enabled:
-    - checkov@3.2.497
-    - renovate@42.69.2
+    - checkov@3.2.496
+    - renovate@42.66.14
    - prettier@3.7.4
    - trufflehog@3.92.4
    - yamllint@1.37.1
@@ -21,7 +21,7 @@ lint:
    - markdownlint@0.47.0
    - oxipng@10.0.0
    - svgo@4.0.0
-    - actionlint@1.7.10
+    - actionlint@1.7.9
    - flake8@7.3.0
    - hadolint@2.14.0
    - shfmt@3.6.0
--- a/platformio.ini
+++ b/platformio.ini
@@ -123,7 +123,7 @@ lib_deps =
 [device-ui_base]
 lib_deps =
 	# renovate: datasource=git-refs depName=meshtastic/device-ui packageName=https://github.com/meshtastic/device-ui gitBranch=master
-	https://github.com/meshtastic/device-ui/archive/a8e2f947f7abaf0c5ac8e6dd189a22156335beaa.zip
+	https://github.com/meshtastic/device-ui/archive/14dc991a4b57066e0a83599be1a87ff08e5e5308.zip

 ; Common libs for environmental measurements in telemetry module
 [environmental_base]
--- a/2
+++ b/2
--- a/src/configuration.h
+++ b/src/configuration.h
@@ -269,6 +269,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define TCA9535_ADDR 0x20
 #define TCA9555_ADDR 0x26

+// used for display brightness control
+#define STC8H1K28_ADDR 0x30
+
 // -----------------------------------------------------------------------------
 // Touchscreen
 // -----------------------------------------------------------------------------
--- a/src/detect/ScanI2C.h
+++ b/src/detect/ScanI2C.h
@@ -61,6 +61,7 @@ class ScanI2C
        NAU7802,
        FT6336U,
        STK8BAXX,
+        STC8H1K28,
        ICM20948,
        SCD4X,
        MAX30102,
--- a/src/detect/ScanI2CTwoWire.cpp
+++ b/src/detect/ScanI2CTwoWire.cpp
@@ -234,6 +234,8 @@ void ScanI2CTwoWire::scanPort(I2CPort port, uint8_t *address, uint8_t asize)
 #endif
 #ifdef HAS_LP5562
                SCAN_SIMPLE_CASE(LP5562_ADDR, LP5562, "LP5562", (uint8_t)addr.address);
+#else
+                SCAN_SIMPLE_CASE(STC8H1K28_ADDR, LP5562, "STC8H1K28", (uint8_t)addr.address);
 #endif
            case XPOWERS_AXP192_AXP2101_ADDRESS:
                // Do we have the axp2101/192 or the TCA8418
--- a/src/graphics/EInkDisplay2.cpp
+++ b/src/graphics/EInkDisplay2.cpp
@@ -148,7 +148,7 @@ bool EInkDisplay::connect()
 #endif
 #endif

-#if defined(TTGO_T_ECHO) || defined(ELECROW_ThinkNode_M1) || defined(T_ECHO_LITE) || defined(TTGO_T_ECHO_PLUS)
+#if defined(TTGO_T_ECHO) || defined(ELECROW_ThinkNode_M1) || defined(T_ECHO_LITE)
    {
        auto lowLevel = new EINK_DISPLAY_MODEL(PIN_EINK_CS, PIN_EINK_DC, PIN_EINK_RES, PIN_EINK_BUSY, SPI1);

--- a/src/main.cpp
+++ b/src/main.cpp
@@ -205,7 +205,7 @@ ScanI2C::FoundDevice rgb_found = ScanI2C::FoundDevice(ScanI2C::DeviceType::NONE,
 /// The I2C address of our Air Quality Indicator (if found)
 ScanI2C::DeviceAddress aqi_found = ScanI2C::ADDRESS_NONE;

-#ifdef HAS_DRV2605
+#if defined(T_WATCH_S3) || defined(T_LORA_PAGER)
 Adafruit_DRV2605 drv;
 #endif

@@ -788,6 +788,7 @@ void setup()
    // We do this as early as possible because this loads preferences from flash
    // but we need to do this after main cpu init (esp32setup), because we need the random seed set
    nodeDB = new NodeDB;
+
 #if HAS_TFT
    if (config.display.displaymode == meshtastic_Config_DisplayConfig_DisplayMode_COLOR) {
        tftSetup();
@@ -833,12 +834,7 @@ void setup()
 #endif
 #endif

-#ifdef HAS_DRV2605
-#if defined(PIN_DRV_EN)
-    pinMode(PIN_DRV_EN, OUTPUT);
-    digitalWrite(PIN_DRV_EN, HIGH);
-    delay(10);
-#endif
+#if defined(T_WATCH_S3) || defined(T_LORA_PAGER)
    drv.begin();
    drv.selectLibrary(1);
    // I2C trigger by sending 'go' command
@@ -874,7 +870,7 @@ void setup()
    SPI.begin();
 #endif
 #else
-// ESP32
+        // ESP32
 #if defined(HW_SPI1_DEVICE)
    SPI1.begin(LORA_SCK, LORA_MISO, LORA_MOSI, LORA_CS);
    LOG_DEBUG("SPI1.begin(SCK=%d, MISO=%d, MOSI=%d, NSS=%d)", LORA_SCK, LORA_MISO, LORA_MOSI, LORA_CS);
--- a/src/main.h
+++ b/src/main.h
@@ -42,7 +42,7 @@ extern bool eink_found;
 extern bool pmu_found;
 extern bool isUSBPowered;

-#ifdef HAS_DRV2605
+#if defined(T_WATCH_S3) || defined(T_LORA_PAGER)
 #include <Adafruit_DRV2605.h>
 extern Adafruit_DRV2605 drv;
 #endif
--- a/src/mesh/Router.cpp
+++ b/src/mesh/Router.cpp
@@ -744,19 +744,15 @@ void Router::handleReceived(meshtastic_MeshPacket *p, RxSource src)
        MeshModule::callModules(*p, src);

 #if !MESHTASTIC_EXCLUDE_MQTT
-        if (p_encrypted == nullptr) {
-            LOG_WARN("p_encrypted is null, skipping MQTT publish");
-        } else {
-            // Mark as pki_encrypted if it is not yet decoded and MQTT encryption is also enabled, hash matches and it's a DM not
-            // to us (because we would be able to decrypt it)
-            if (decodedState == DecodeState::DECODE_FAILURE && moduleConfig.mqtt.encryption_enabled && p->channel == 0x00 &&
-                !isBroadcast(p->to) && !isToUs(p))
-                p_encrypted->pki_encrypted = true;
-            // After potentially altering it, publish received message to MQTT if we're not the original transmitter of the packet
-            if ((decodedState == DecodeState::DECODE_SUCCESS || p_encrypted->pki_encrypted) && moduleConfig.mqtt.enabled &&
-                !isFromUs(p) && mqtt)
-                mqtt->onSend(*p_encrypted, *p, p->channel);
-        }
+        // Mark as pki_encrypted if it is not yet decoded and MQTT encryption is also enabled, hash matches and it's a DM not to
+        // us (because we would be able to decrypt it)
+        if (decodedState == DecodeState::DECODE_FAILURE && moduleConfig.mqtt.encryption_enabled && p->channel == 0x00 &&
+            !isBroadcast(p->to) && !isToUs(p))
+            p_encrypted->pki_encrypted = true;
+        // After potentially altering it, publish received message to MQTT if we're not the original transmitter of the packet
+        if ((decodedState == DecodeState::DECODE_SUCCESS || p_encrypted->pki_encrypted) && moduleConfig.mqtt.enabled &&
+            !isFromUs(p) && mqtt)
+            mqtt->onSend(*p_encrypted, *p, p->channel);
 #endif
    }

--- a/src/mesh/generated/meshtastic/admin.pb.cpp
+++ b/src/mesh/generated/meshtastic/admin.pb.cpp
@@ -12,9 +12,6 @@ PB_BIND(meshtastic_AdminMessage, meshtastic_AdminMessage, 2)
 PB_BIND(meshtastic_AdminMessage_InputEvent, meshtastic_AdminMessage_InputEvent, AUTO)


-PB_BIND(meshtastic_AdminMessage_OTAEvent, meshtastic_AdminMessage_OTAEvent, AUTO)
-
-
 PB_BIND(meshtastic_HamParameters, meshtastic_HamParameters, AUTO)


@@ -36,5 +33,3 @@ PB_BIND(meshtastic_KeyVerificationAdmin, meshtastic_KeyVerificationAdmin, AUTO)



-
-
--- a/src/mesh/generated/meshtastic/admin.pb.h
+++ b/src/mesh/generated/meshtastic/admin.pb.h
@@ -16,16 +16,6 @@
 #endif

 /* Enum definitions */
-/* Firmware update mode for OTA updates */
-typedef enum _meshtastic_OTAMode {
-    /* Do not reboot into OTA mode */
-    meshtastic_OTAMode_NO_REBOOT_OTA = 0,
-    /* Reboot into OTA mode for BLE firmware update */
-    meshtastic_OTAMode_OTA_BLE = 1,
-    /* Reboot into OTA mode for WiFi firmware update */
-    meshtastic_OTAMode_OTA_WIFI = 2
-} meshtastic_OTAMode;
-
 /* TODO: REPLACE */
 typedef enum _meshtastic_AdminMessage_ConfigType {
    /* TODO: REPLACE */
@@ -113,17 +103,6 @@ typedef struct _meshtastic_AdminMessage_InputEvent {
    uint16_t touch_y;
 } meshtastic_AdminMessage_InputEvent;

-typedef PB_BYTES_ARRAY_T(32) meshtastic_AdminMessage_OTAEvent_ota_hash_t;
-/* User is requesting an over the air update.
- Node will reboot into the OTA loader */
-typedef struct _meshtastic_AdminMessage_OTAEvent {
-    /* Tell the node to reboot into OTA mode for firmware update via BLE or WiFi (ESP32 only for now) */
-    meshtastic_OTAMode reboot_ota_mode;
-    /* A 32 byte hash of the OTA firmware.
- Used to verify the integrity of the firmware before applying an update. */
-    meshtastic_AdminMessage_OTAEvent_ota_hash_t ota_hash;
-} meshtastic_AdminMessage_OTAEvent;
-
 /* Parameters for setting up Meshtastic for ameteur radio usage */
 typedef struct _meshtastic_HamParameters {
    /* Amateur radio call sign, eg. KD2ABC */
@@ -282,8 +261,7 @@ typedef struct _meshtastic_AdminMessage {
        /* Tell the node to factory reset config everything; all device state and configuration will be returned to factory defaults and BLE bonds will be cleared. */
        int32_t factory_reset_device;
        /* Tell the node to reboot into the OTA Firmware in this many seconds (or <0 to cancel reboot)
-     Only Implemented for ESP32 Devices. This needs to be issued to send a new main firmware via bluetooth.
-     Deprecated in favor of reboot_ota_mode in 2.7.17 */
+     Only Implemented for ESP32 Devices. This needs to be issued to send a new main firmware via bluetooth. */
        int32_t reboot_ota_seconds;
        /* This message is only supported for the simulator Portduino build.
     If received the simulator will exit successfully. */
@@ -297,8 +275,6 @@ typedef struct _meshtastic_AdminMessage {
        /* Tell the node to reset the nodedb.
     When true, favorites are preserved through reset. */
        bool nodedb_reset;
-        /* Tell the node to reset into the OTA Loader */
-        meshtastic_AdminMessage_OTAEvent ota_request;
    };
    /* The node generates this key and sends it with any get_x_response packets.
 The client MUST include the same key with any set_x commands. Key expires after 300 seconds.
@@ -312,10 +288,6 @@ extern "C" {
 #endif

 /* Helper constants for enums */
-#define _meshtastic_OTAMode_MIN meshtastic_OTAMode_NO_REBOOT_OTA
-#define _meshtastic_OTAMode_MAX meshtastic_OTAMode_OTA_WIFI
-#define _meshtastic_OTAMode_ARRAYSIZE ((meshtastic_OTAMode)(meshtastic_OTAMode_OTA_WIFI+1))
-
 #define _meshtastic_AdminMessage_ConfigType_MIN meshtastic_AdminMessage_ConfigType_DEVICE_CONFIG
 #define _meshtastic_AdminMessage_ConfigType_MAX meshtastic_AdminMessage_ConfigType_DEVICEUI_CONFIG
 #define _meshtastic_AdminMessage_ConfigType_ARRAYSIZE ((meshtastic_AdminMessage_ConfigType)(meshtastic_AdminMessage_ConfigType_DEVICEUI_CONFIG+1))
@@ -339,8 +311,6 @@ extern "C" {
 #define meshtastic_AdminMessage_payload_variant_remove_backup_preferences_ENUMTYPE meshtastic_AdminMessage_BackupLocation


-#define meshtastic_AdminMessage_OTAEvent_reboot_ota_mode_ENUMTYPE meshtastic_OTAMode
-



@@ -350,14 +320,12 @@ extern "C" {
 /* Initializer values for message structs */
 #define meshtastic_AdminMessage_init_default     {0, {0}, {0, {0}}}
 #define meshtastic_AdminMessage_InputEvent_init_default {0, 0, 0, 0}
-#define meshtastic_AdminMessage_OTAEvent_init_default {_meshtastic_OTAMode_MIN, {0, {0}}}
 #define meshtastic_HamParameters_init_default    {"", 0, 0, ""}
 #define meshtastic_NodeRemoteHardwarePinsResponse_init_default {0, {meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default}}
 #define meshtastic_SharedContact_init_default    {0, false, meshtastic_User_init_default, 0, 0}
 #define meshtastic_KeyVerificationAdmin_init_default {_meshtastic_KeyVerificationAdmin_MessageType_MIN, 0, 0, false, 0}
 #define meshtastic_AdminMessage_init_zero        {0, {0}, {0, {0}}}
 #define meshtastic_AdminMessage_InputEvent_init_zero {0, 0, 0, 0}
-#define meshtastic_AdminMessage_OTAEvent_init_zero {_meshtastic_OTAMode_MIN, {0, {0}}}
 #define meshtastic_HamParameters_init_zero       {"", 0, 0, ""}
 #define meshtastic_NodeRemoteHardwarePinsResponse_init_zero {0, {meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero}}
 #define meshtastic_SharedContact_init_zero       {0, false, meshtastic_User_init_zero, 0, 0}
@@ -368,8 +336,6 @@ extern "C" {
 #define meshtastic_AdminMessage_InputEvent_kb_char_tag 2
 #define meshtastic_AdminMessage_InputEvent_touch_x_tag 3
 #define meshtastic_AdminMessage_InputEvent_touch_y_tag 4
-#define meshtastic_AdminMessage_OTAEvent_reboot_ota_mode_tag 1
-#define meshtastic_AdminMessage_OTAEvent_ota_hash_tag 2
 #define meshtastic_HamParameters_call_sign_tag   1
 #define meshtastic_HamParameters_tx_power_tag    2
 #define meshtastic_HamParameters_frequency_tag   3
@@ -437,7 +403,6 @@ extern "C" {
 #define meshtastic_AdminMessage_shutdown_seconds_tag 98
 #define meshtastic_AdminMessage_factory_reset_config_tag 99
 #define meshtastic_AdminMessage_nodedb_reset_tag 100
-#define meshtastic_AdminMessage_ota_request_tag  102
 #define meshtastic_AdminMessage_session_passkey_tag 101

 /* Struct field encoding specification for nanopb */
@@ -496,8 +461,7 @@ X(a, STATIC,   ONEOF,    INT32,    (payload_variant,reboot_seconds,reboot_second
 X(a, STATIC,   ONEOF,    INT32,    (payload_variant,shutdown_seconds,shutdown_seconds),  98) \
 X(a, STATIC,   ONEOF,    INT32,    (payload_variant,factory_reset_config,factory_reset_config),  99) \
 X(a, STATIC,   ONEOF,    BOOL,     (payload_variant,nodedb_reset,nodedb_reset), 100) \
-X(a, STATIC,   SINGULAR, BYTES,    session_passkey, 101) \
-X(a, STATIC,   ONEOF,    MESSAGE,  (payload_variant,ota_request,ota_request), 102)
+X(a, STATIC,   SINGULAR, BYTES,    session_passkey, 101)
 #define meshtastic_AdminMessage_CALLBACK NULL
 #define meshtastic_AdminMessage_DEFAULT NULL
 #define meshtastic_AdminMessage_payload_variant_get_channel_response_MSGTYPE meshtastic_Channel
@@ -518,7 +482,6 @@ X(a, STATIC,   ONEOF,    MESSAGE,  (payload_variant,ota_request,ota_request), 10
 #define meshtastic_AdminMessage_payload_variant_store_ui_config_MSGTYPE meshtastic_DeviceUIConfig
 #define meshtastic_AdminMessage_payload_variant_add_contact_MSGTYPE meshtastic_SharedContact
 #define meshtastic_AdminMessage_payload_variant_key_verification_MSGTYPE meshtastic_KeyVerificationAdmin
-#define meshtastic_AdminMessage_payload_variant_ota_request_MSGTYPE meshtastic_AdminMessage_OTAEvent

 #define meshtastic_AdminMessage_InputEvent_FIELDLIST(X, a) \
 X(a, STATIC,   SINGULAR, UINT32,   event_code,        1) \
@@ -528,12 +491,6 @@ X(a, STATIC,   SINGULAR, UINT32,   touch_y,           4)
 #define meshtastic_AdminMessage_InputEvent_CALLBACK NULL
 #define meshtastic_AdminMessage_InputEvent_DEFAULT NULL

-#define meshtastic_AdminMessage_OTAEvent_FIELDLIST(X, a) \
-X(a, STATIC,   SINGULAR, UENUM,    reboot_ota_mode,   1) \
-X(a, STATIC,   SINGULAR, BYTES,    ota_hash,          2)
-#define meshtastic_AdminMessage_OTAEvent_CALLBACK NULL
-#define meshtastic_AdminMessage_OTAEvent_DEFAULT NULL
-
 #define meshtastic_HamParameters_FIELDLIST(X, a) \
 X(a, STATIC,   SINGULAR, STRING,   call_sign,         1) \
 X(a, STATIC,   SINGULAR, INT32,    tx_power,          2) \
@@ -567,7 +524,6 @@ X(a, STATIC,   OPTIONAL, UINT32,   security_number,   4)

 extern const pb_msgdesc_t meshtastic_AdminMessage_msg;
 extern const pb_msgdesc_t meshtastic_AdminMessage_InputEvent_msg;
-extern const pb_msgdesc_t meshtastic_AdminMessage_OTAEvent_msg;
 extern const pb_msgdesc_t meshtastic_HamParameters_msg;
 extern const pb_msgdesc_t meshtastic_NodeRemoteHardwarePinsResponse_msg;
 extern const pb_msgdesc_t meshtastic_SharedContact_msg;
@@ -576,7 +532,6 @@ extern const pb_msgdesc_t meshtastic_KeyVerificationAdmin_msg;
 /* Defines for backwards compatibility with code written before nanopb-0.4.0 */
 #define meshtastic_AdminMessage_fields &meshtastic_AdminMessage_msg
 #define meshtastic_AdminMessage_InputEvent_fields &meshtastic_AdminMessage_InputEvent_msg
-#define meshtastic_AdminMessage_OTAEvent_fields &meshtastic_AdminMessage_OTAEvent_msg
 #define meshtastic_HamParameters_fields &meshtastic_HamParameters_msg
 #define meshtastic_NodeRemoteHardwarePinsResponse_fields &meshtastic_NodeRemoteHardwarePinsResponse_msg
 #define meshtastic_SharedContact_fields &meshtastic_SharedContact_msg
@@ -585,7 +540,6 @@ extern const pb_msgdesc_t meshtastic_KeyVerificationAdmin_msg;
 /* Maximum encoded size of messages (where known) */
 #define MESHTASTIC_MESHTASTIC_ADMIN_PB_H_MAX_SIZE meshtastic_AdminMessage_size
 #define meshtastic_AdminMessage_InputEvent_size  14
-#define meshtastic_AdminMessage_OTAEvent_size    36
 #define meshtastic_AdminMessage_size             511
 #define meshtastic_HamParameters_size            31
 #define meshtastic_KeyVerificationAdmin_size     25
--- a/src/mesh/generated/meshtastic/mesh.pb.cpp
+++ b/src/mesh/generated/meshtastic/mesh.pb.cpp
@@ -24,9 +24,6 @@ PB_BIND(meshtastic_Data, meshtastic_Data, 2)
 PB_BIND(meshtastic_KeyVerification, meshtastic_KeyVerification, AUTO)


-PB_BIND(meshtastic_StoreForwardPlusPlus, meshtastic_StoreForwardPlusPlus, 2)
-
-
 PB_BIND(meshtastic_Waypoint, meshtastic_Waypoint, AUTO)


@@ -124,8 +121,6 @@ PB_BIND(meshtastic_ChunkedPayloadResponse, meshtastic_ChunkedPayloadResponse, AU



-
-



--- a/src/mesh/generated/meshtastic/mesh.pb.h
+++ b/src/mesh/generated/meshtastic/mesh.pb.h
@@ -92,8 +92,8 @@ typedef enum _meshtastic_HardwareModel {
 Less common/prototype boards listed here (needs one more byte over the air)
 --------------------------------------------------------------------------- */
    meshtastic_HardwareModel_LORA_RELAY_V1 = 32,
-    /* T-Echo Plus device from LilyGo */
-    meshtastic_HardwareModel_T_ECHO_PLUS = 33,
+    /* TODO: REPLACE */
+    meshtastic_HardwareModel_NRF52840DK = 33,
    /* TODO: REPLACE */
    meshtastic_HardwareModel_PPR = 34,
    /* TODO: REPLACE */
@@ -475,28 +475,9 @@ typedef enum _meshtastic_Routing_Error {
    meshtastic_Routing_Error_ADMIN_PUBLIC_KEY_UNAUTHORIZED = 37,
    /* Airtime fairness rate limit exceeded for a packet
 This typically enforced per portnum and is used to prevent a single node from monopolizing airtime */
-    meshtastic_Routing_Error_RATE_LIMIT_EXCEEDED = 38,
-    /* PKI encryption failed, due to no public key for the remote node
- This is different from PKI_UNKNOWN_PUBKEY which indicates a failure upon receiving a packet */
-    meshtastic_Routing_Error_PKI_SEND_FAIL_PUBLIC_KEY = 39
+    meshtastic_Routing_Error_RATE_LIMIT_EXCEEDED = 38
 } meshtastic_Routing_Error;

-/* Enum of message types */
-typedef enum _meshtastic_StoreForwardPlusPlus_SFPP_message_type {
-    /* Send an announcement of the canonical tip of a chain */
-    meshtastic_StoreForwardPlusPlus_SFPP_message_type_CANON_ANNOUNCE = 0,
-    /* Query whether a specific link is on the chain */
-    meshtastic_StoreForwardPlusPlus_SFPP_message_type_CHAIN_QUERY = 1,
-    /* Request the next link in the chain */
-    meshtastic_StoreForwardPlusPlus_SFPP_message_type_LINK_REQUEST = 3,
-    /* Provide a link to add to the chain */
-    meshtastic_StoreForwardPlusPlus_SFPP_message_type_LINK_PROVIDE = 4,
-    /* If we must fragment, send the first half */
-    meshtastic_StoreForwardPlusPlus_SFPP_message_type_LINK_PROVIDE_FIRSTHALF = 5,
-    /* If we must fragment, send the second half */
-    meshtastic_StoreForwardPlusPlus_SFPP_message_type_LINK_PROVIDE_SECONDHALF = 6
-} meshtastic_StoreForwardPlusPlus_SFPP_message_type;
-
 /* The priority of this message for sending.
 Higher priorities are sent first (when managing the transmit queue).
 This field is never sent over the air, it is only used internally inside of a local device node.
@@ -801,34 +782,6 @@ typedef struct _meshtastic_KeyVerification {
    meshtastic_KeyVerification_hash2_t hash2;
 } meshtastic_KeyVerification;

-typedef PB_BYTES_ARRAY_T(32) meshtastic_StoreForwardPlusPlus_message_hash_t;
-typedef PB_BYTES_ARRAY_T(32) meshtastic_StoreForwardPlusPlus_commit_hash_t;
-typedef PB_BYTES_ARRAY_T(32) meshtastic_StoreForwardPlusPlus_root_hash_t;
-typedef PB_BYTES_ARRAY_T(240) meshtastic_StoreForwardPlusPlus_message_t;
-/* The actual over-the-mesh message doing store and forward++ */
-typedef struct _meshtastic_StoreForwardPlusPlus {
-    /* Which message type is this */
-    meshtastic_StoreForwardPlusPlus_SFPP_message_type sfpp_message_type;
-    /* The hash of the specific message */
-    meshtastic_StoreForwardPlusPlus_message_hash_t message_hash;
-    /* The hash of a link on a chain */
-    meshtastic_StoreForwardPlusPlus_commit_hash_t commit_hash;
-    /* the root hash of a chain */
-    meshtastic_StoreForwardPlusPlus_root_hash_t root_hash;
-    /* The encrypted bytes from a message */
-    meshtastic_StoreForwardPlusPlus_message_t message;
-    /* Message ID of the contained message */
-    uint32_t encapsulated_id;
-    /* Destination of the contained message */
-    uint32_t encapsulated_to;
-    /* Sender of the contained message */
-    uint32_t encapsulated_from;
-    /* The receive time of the message in question */
-    uint32_t encapsulated_rxtime;
-    /* Used in a LINK_REQUEST to specify the message X spots back from head */
-    uint32_t chain_count;
-} meshtastic_StoreForwardPlusPlus;
-
 /* Waypoint message, used to share arbitrary locations across the mesh */
 typedef struct _meshtastic_Waypoint {
    /* Id of the waypoint */
@@ -1354,12 +1307,8 @@ extern "C" {
 #define _meshtastic_Position_AltSource_ARRAYSIZE ((meshtastic_Position_AltSource)(meshtastic_Position_AltSource_ALT_BAROMETRIC+1))

 #define _meshtastic_Routing_Error_MIN meshtastic_Routing_Error_NONE
-#define _meshtastic_Routing_Error_MAX meshtastic_Routing_Error_PKI_SEND_FAIL_PUBLIC_KEY
-#define _meshtastic_Routing_Error_ARRAYSIZE ((meshtastic_Routing_Error)(meshtastic_Routing_Error_PKI_SEND_FAIL_PUBLIC_KEY+1))
-
-#define _meshtastic_StoreForwardPlusPlus_SFPP_message_type_MIN meshtastic_StoreForwardPlusPlus_SFPP_message_type_CANON_ANNOUNCE
-#define _meshtastic_StoreForwardPlusPlus_SFPP_message_type_MAX meshtastic_StoreForwardPlusPlus_SFPP_message_type_LINK_PROVIDE_SECONDHALF
-#define _meshtastic_StoreForwardPlusPlus_SFPP_message_type_ARRAYSIZE ((meshtastic_StoreForwardPlusPlus_SFPP_message_type)(meshtastic_StoreForwardPlusPlus_SFPP_message_type_LINK_PROVIDE_SECONDHALF+1))
+#define _meshtastic_Routing_Error_MAX meshtastic_Routing_Error_RATE_LIMIT_EXCEEDED
+#define _meshtastic_Routing_Error_ARRAYSIZE ((meshtastic_Routing_Error)(meshtastic_Routing_Error_RATE_LIMIT_EXCEEDED+1))

 #define _meshtastic_MeshPacket_Priority_MIN meshtastic_MeshPacket_Priority_UNSET
 #define _meshtastic_MeshPacket_Priority_MAX meshtastic_MeshPacket_Priority_MAX
@@ -1389,8 +1338,6 @@ extern "C" {
 #define meshtastic_Data_portnum_ENUMTYPE meshtastic_PortNum


-#define meshtastic_StoreForwardPlusPlus_sfpp_message_type_ENUMTYPE meshtastic_StoreForwardPlusPlus_SFPP_message_type
-


 #define meshtastic_MeshPacket_priority_ENUMTYPE meshtastic_MeshPacket_Priority
@@ -1433,7 +1380,6 @@ extern "C" {
 #define meshtastic_Routing_init_default          {0, {meshtastic_RouteDiscovery_init_default}}
 #define meshtastic_Data_init_default             {_meshtastic_PortNum_MIN, {0, {0}}, 0, 0, 0, 0, 0, 0, false, 0}
 #define meshtastic_KeyVerification_init_default  {0, {0, {0}}, {0, {0}}}
-#define meshtastic_StoreForwardPlusPlus_init_default {_meshtastic_StoreForwardPlusPlus_SFPP_message_type_MIN, {0, {0}}, {0, {0}}, {0, {0}}, {0, {0}}, 0, 0, 0, 0, 0}
 #define meshtastic_Waypoint_init_default         {0, false, 0, false, 0, 0, 0, "", "", 0}
 #define meshtastic_MqttClientProxyMessage_init_default {"", 0, {{0, {0}}}, 0}
 #define meshtastic_MeshPacket_init_default       {0, 0, 0, 0, {meshtastic_Data_init_default}, 0, 0, 0, 0, 0, _meshtastic_MeshPacket_Priority_MIN, 0, _meshtastic_MeshPacket_Delayed_MIN, 0, 0, {0, {0}}, 0, 0, 0, 0, _meshtastic_MeshPacket_TransportMechanism_MIN}
@@ -1465,7 +1411,6 @@ extern "C" {
 #define meshtastic_Routing_init_zero             {0, {meshtastic_RouteDiscovery_init_zero}}
 #define meshtastic_Data_init_zero                {_meshtastic_PortNum_MIN, {0, {0}}, 0, 0, 0, 0, 0, 0, false, 0}
 #define meshtastic_KeyVerification_init_zero     {0, {0, {0}}, {0, {0}}}
-#define meshtastic_StoreForwardPlusPlus_init_zero {_meshtastic_StoreForwardPlusPlus_SFPP_message_type_MIN, {0, {0}}, {0, {0}}, {0, {0}}, {0, {0}}, 0, 0, 0, 0, 0}
 #define meshtastic_Waypoint_init_zero            {0, false, 0, false, 0, 0, 0, "", "", 0}
 #define meshtastic_MqttClientProxyMessage_init_zero {"", 0, {{0, {0}}}, 0}
 #define meshtastic_MeshPacket_init_zero          {0, 0, 0, 0, {meshtastic_Data_init_zero}, 0, 0, 0, 0, 0, _meshtastic_MeshPacket_Priority_MIN, 0, _meshtastic_MeshPacket_Delayed_MIN, 0, 0, {0, {0}}, 0, 0, 0, 0, _meshtastic_MeshPacket_TransportMechanism_MIN}
@@ -1544,16 +1489,6 @@ extern "C" {
 #define meshtastic_KeyVerification_nonce_tag     1
 #define meshtastic_KeyVerification_hash1_tag     2
 #define meshtastic_KeyVerification_hash2_tag     3
-#define meshtastic_StoreForwardPlusPlus_sfpp_message_type_tag 1
-#define meshtastic_StoreForwardPlusPlus_message_hash_tag 2
-#define meshtastic_StoreForwardPlusPlus_commit_hash_tag 3
-#define meshtastic_StoreForwardPlusPlus_root_hash_tag 4
-#define meshtastic_StoreForwardPlusPlus_message_tag 5
-#define meshtastic_StoreForwardPlusPlus_encapsulated_id_tag 6
-#define meshtastic_StoreForwardPlusPlus_encapsulated_to_tag 7
-#define meshtastic_StoreForwardPlusPlus_encapsulated_from_tag 8
-#define meshtastic_StoreForwardPlusPlus_encapsulated_rxtime_tag 9
-#define meshtastic_StoreForwardPlusPlus_chain_count_tag 10
 #define meshtastic_Waypoint_id_tag               1
 #define meshtastic_Waypoint_latitude_i_tag       2
 #define meshtastic_Waypoint_longitude_i_tag      3
@@ -1770,20 +1705,6 @@ X(a, STATIC,   SINGULAR, BYTES,    hash2,             3)
 #define meshtastic_KeyVerification_CALLBACK NULL
 #define meshtastic_KeyVerification_DEFAULT NULL

-#define meshtastic_StoreForwardPlusPlus_FIELDLIST(X, a) \
-X(a, STATIC,   SINGULAR, UENUM,    sfpp_message_type,   1) \
-X(a, STATIC,   SINGULAR, BYTES,    message_hash,      2) \
-X(a, STATIC,   SINGULAR, BYTES,    commit_hash,       3) \
-X(a, STATIC,   SINGULAR, BYTES,    root_hash,         4) \
-X(a, STATIC,   SINGULAR, BYTES,    message,           5) \
-X(a, STATIC,   SINGULAR, UINT32,   encapsulated_id,   6) \
-X(a, STATIC,   SINGULAR, UINT32,   encapsulated_to,   7) \
-X(a, STATIC,   SINGULAR, UINT32,   encapsulated_from,   8) \
-X(a, STATIC,   SINGULAR, UINT32,   encapsulated_rxtime,   9) \
-X(a, STATIC,   SINGULAR, UINT32,   chain_count,      10)
-#define meshtastic_StoreForwardPlusPlus_CALLBACK NULL
-#define meshtastic_StoreForwardPlusPlus_DEFAULT NULL
-
 #define meshtastic_Waypoint_FIELDLIST(X, a) \
 X(a, STATIC,   SINGULAR, UINT32,   id,                1) \
 X(a, STATIC,   OPTIONAL, SFIXED32, latitude_i,        2) \
@@ -2059,7 +1980,6 @@ extern const pb_msgdesc_t meshtastic_RouteDiscovery_msg;
 extern const pb_msgdesc_t meshtastic_Routing_msg;
 extern const pb_msgdesc_t meshtastic_Data_msg;
 extern const pb_msgdesc_t meshtastic_KeyVerification_msg;
-extern const pb_msgdesc_t meshtastic_StoreForwardPlusPlus_msg;
 extern const pb_msgdesc_t meshtastic_Waypoint_msg;
 extern const pb_msgdesc_t meshtastic_MqttClientProxyMessage_msg;
 extern const pb_msgdesc_t meshtastic_MeshPacket_msg;
@@ -2093,7 +2013,6 @@ extern const pb_msgdesc_t meshtastic_ChunkedPayloadResponse_msg;
 #define meshtastic_Routing_fields &meshtastic_Routing_msg
 #define meshtastic_Data_fields &meshtastic_Data_msg
 #define meshtastic_KeyVerification_fields &meshtastic_KeyVerification_msg
-#define meshtastic_StoreForwardPlusPlus_fields &meshtastic_StoreForwardPlusPlus_msg
 #define meshtastic_Waypoint_fields &meshtastic_Waypoint_msg
 #define meshtastic_MqttClientProxyMessage_fields &meshtastic_MqttClientProxyMessage_msg
 #define meshtastic_MeshPacket_fields &meshtastic_MeshPacket_msg
@@ -2150,7 +2069,6 @@ extern const pb_msgdesc_t meshtastic_ChunkedPayloadResponse_msg;
 #define meshtastic_QueueStatus_size              23
 #define meshtastic_RouteDiscovery_size           256
 #define meshtastic_Routing_size                  259
-#define meshtastic_StoreForwardPlusPlus_size     377
 #define meshtastic_ToRadio_size                  504
 #define meshtastic_User_size                     115
 #define meshtastic_Waypoint_size                 165
--- a/src/mesh/generated/meshtastic/portnums.pb.h
+++ b/src/mesh/generated/meshtastic/portnums.pb.h
@@ -86,11 +86,6 @@ typedef enum _meshtastic_PortNum {
    /* Paxcounter lib included in the firmware
 ENCODING: protobuf */
    meshtastic_PortNum_PAXCOUNTER_APP = 34,
-    /* Store and Forward++ module included in the firmware
- ENCODING: protobuf
- This module is specifically for Native Linux nodes, and provides a Git-style
- chain of messages. */
-    meshtastic_PortNum_STORE_FORWARD_PLUSPLUS_APP = 35,
    /* Provides a hardware serial interface to send and receive from the Meshtastic network.
 Connect to the RX/TX pins of a device with 38400 8N1. Packets received from the Meshtastic
 network is forwarded to the RX pin while sending a packet to TX will go out to the Mesh network.
--- a/src/modules/ExternalNotificationModule.cpp
+++ b/src/modules/ExternalNotificationModule.cpp
@@ -168,7 +168,7 @@ int32_t ExternalNotificationModule::runOnce()
            delay = EXT_NOTIFICATION_FAST_THREAD_MS;
 #endif

-#ifdef HAS_DRV2605
+#if defined(T_WATCH_S3) || defined(T_LORA_PAGER)
            drv.go();
 #endif
        }
@@ -283,7 +283,7 @@ void ExternalNotificationModule::setExternalState(uint8_t index, bool on)
 #ifdef UNPHONE
    unphone.rgb(red, green, blue);
 #endif
-#ifdef HAS_DRV2605
+#if defined(T_WATCH_S3) || defined(T_LORA_PAGER)
    if (on) {
        drv.go();
    } else {
@@ -319,7 +319,7 @@ void ExternalNotificationModule::stopNow()
        externalTurnedOn[i] = 0;
    }
    setIntervalFromNow(0);
-#ifdef HAS_DRV2605
+#if defined(T_WATCH_S3) || defined(T_LORA_PAGER)
    drv.stop();
 #endif

--- a/src/modules/SerialModule.cpp
+++ b/src/modules/SerialModule.cpp
@@ -63,9 +63,9 @@
 SerialModule *serialModule;
 SerialModuleRadio *serialModuleRadio;

-#if defined(TTGO_T_ECHO) || defined(TTGO_T_ECHO_PLUS) || defined(CANARYONE) || defined(MESHLINK) ||                              \
-    defined(ELECROW_ThinkNode_M1) || defined(ELECROW_ThinkNode_M5) || defined(HELTEC_MESH_SOLAR) || defined(T_ECHO_LITE) ||      \
-    defined(ELECROW_ThinkNode_M3) || defined(MUZI_BASE)
+#if defined(TTGO_T_ECHO) || defined(CANARYONE) || defined(MESHLINK) || defined(ELECROW_ThinkNode_M1) ||                          \
+    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;
@@ -204,9 +204,8 @@ int32_t SerialModule::runOnce()
                Serial.begin(baud);
                Serial.setTimeout(moduleConfig.serial.timeout > 0 ? moduleConfig.serial.timeout : TIMEOUT);
            }
-#elif !defined(TTGO_T_ECHO) && !defined(TTGO_T_ECHO_PLUS) && !defined(T_ECHO_LITE) && !defined(CANARYONE) &&                     \
-    !defined(MESHLINK) && !defined(ELECROW_ThinkNode_M1) && !defined(ELECROW_ThinkNode_M3) && !defined(ELECROW_ThinkNode_M5) &&  \
-    !defined(MUZI_BASE)
+#elif !defined(TTGO_T_ECHO) && !defined(T_ECHO_LITE) && !defined(CANARYONE) && !defined(MESHLINK) &&                             \
+    !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);
@@ -262,7 +261,7 @@ int32_t SerialModule::runOnce()
                }
            }

-#if !defined(TTGO_T_ECHO) && !defined(TTGO_T_ECHO_PLUS) && !defined(T_ECHO_LITE) && !defined(CANARYONE) && !defined(MESHLINK) && \
+#if !defined(TTGO_T_ECHO) && !defined(T_ECHO_LITE) && !defined(CANARYONE) && !defined(MESHLINK) &&                               \
    !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();
@@ -537,9 +536,9 @@ ParsedLine parseLine(const char *line)
 */
 void SerialModule::processWXSerial()
 {
-#if !defined(TTGO_T_ECHO) && !defined(TTGO_T_ECHO_PLUS) && !defined(T_ECHO_LITE) && !defined(CANARYONE) &&                       \
-    !defined(CONFIG_IDF_TARGET_ESP32C6) && !defined(MESHLINK) && !defined(ELECROW_ThinkNode_M1) &&                               \
-    !defined(ELECROW_ThinkNode_M3) && !defined(ELECROW_ThinkNode_M5) && !defined(ARCH_STM32WL) && !defined(MUZI_BASE)
+#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_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;
--- a/src/platform/nrf52/architecture.h
+++ b/src/platform/nrf52/architecture.h
@@ -66,8 +66,6 @@
 #define HW_VENDOR meshtastic_HardwareModel_T_ECHO
 #elif defined(T_ECHO_LITE)
 #define HW_VENDOR meshtastic_HardwareModel_T_ECHO_LITE
-#elif defined(TTGO_T_ECHO_PLUS)
-#define HW_VENDOR meshtastic_HardwareModel_T_ECHO_PLUS
 #elif defined(ELECROW_ThinkNode_M1)
 #define HW_VENDOR meshtastic_HardwareModel_THINKNODE_M1
 #elif defined(ELECROW_ThinkNode_M3)
--- a/variants/esp32/tbeam/platformio.ini
+++ b/variants/esp32/tbeam/platformio.ini
@@ -2,7 +2,7 @@
 [env:tbeam]
 extends = esp32_base
 board = ttgo-t-beam
-
+board_level = extra
 board_check = true
 lib_deps = ${esp32_base.lib_deps}
 build_flags = ${esp32_base.build_flags}
@@ -14,7 +14,7 @@ upload_speed = 921600

 [env:tbeam-displayshield]
 extends = env:tbeam
-board_level = extra
+
 build_flags =
  ${env:tbeam.build_flags}
  -D USE_ST7796
--- a/variants/esp32s3/elecrow_panel/platformio.ini
+++ b/variants/esp32s3/elecrow_panel/platformio.ini
@@ -128,3 +128,6 @@ build_flags =
  ${crowpanel_large_esp32s3_base.build_flags}
  -D VIEW_320x240
  -D DISPLAY_SIZE=800x480 ; landscape mode
+build_src_filter =
+  ${esp32s3_base.build_src_filter}
+  +<../variants/esp32s3/elecrow_panel>
--- a/variants/esp32s3/elecrow_panel/variant.cpp
+++ b/variants/esp32s3/elecrow_panel/variant.cpp
@@ -0,0 +1,21 @@
+// meshtastic/firmware/variants/elecrow_panel/variant.cpp
+
+#include "variant.h"
+#include "Arduino.h"
+#include "Wire.h"
+
+bool elecrow_v2 = false; // false = v1, true = v2
+
+extern "C" {
+
+void initVariant()
+{
+    Wire.begin(I2C_SDA, I2C_SCL, 100000);
+    delay(50);
+    Wire.beginTransmission(0x30);
+    if (Wire.endTransmission() == 0) {
+        elecrow_v2 = true;
+    }
+    Wire.end();
+}
+}
--- a/variants/esp32s3/elecrow_panel/variant.h
+++ b/variants/esp32s3/elecrow_panel/variant.h
@@ -1,6 +1,8 @@
 #define I2C_SDA 15
 #define I2C_SCL 16

+extern bool elecrow_v2; // false = v1, true = v2
+
 #if CROW_SELECT == 1
 #define WAKE_ON_TOUCH
 #define SCREEN_TOUCH_INT 47
@@ -17,7 +19,7 @@
 #define DAC_I2S_DOUT 12
 #define DAC_I2S_MCLK 8 // don't use GPIO0 because it's assigned to LoRa or button
 #else
-#define PIN_BUZZER 8
+#define PIN_BUZZER (elecrow_v2 ? 0 : 8)
 #endif

 // GPS via UART1 connector
@@ -72,7 +74,7 @@
 #define SENSOR_POWER_ON LOW
 #else
 // 4.3", 5.0", 7.0"
-#define LORA_CS 0
+#define LORA_CS (elecrow_v2 ? 8 : 0)
 #define LORA_SCK 5
 #define LORA_MISO 4
 #define LORA_MOSI 6
--- a/variants/esp32s3/t-watch-s3/variant.h
+++ b/variants/esp32s3/t-watch-s3/variant.h
@@ -20,8 +20,6 @@
 #define SCREEN_TRANSITION_FRAMERATE 5 // fps
 #define USE_TFTDISPLAY 1

-#define HAS_DRV2605 1
-
 #define HAS_TOUCHSCREEN 1
 #define SCREEN_TOUCH_INT 16
 #define SCREEN_TOUCH_USE_I2C1
--- a/variants/esp32s3/tlora-pager/variant.h
+++ b/variants/esp32s3/tlora-pager/variant.h
@@ -26,8 +26,6 @@
 #define I2C_SDA SDA
 #define I2C_SCL SCL

-#define HAS_DRV2605 1
-
 #define USE_POWERSAVE
 #define SLEEP_TIME 120

--- a/variants/nrf52840/t-echo-plus/nicheGraphics.h
+++ b/variants/nrf52840/t-echo-plus/nicheGraphics.h
@@ -1,70 +0,0 @@
-#pragma once
-
-#include "configuration.h"
-
-#ifdef MESHTASTIC_INCLUDE_NICHE_GRAPHICS
-
-#include "graphics/niche/Drivers/Backlight/LatchingBacklight.h"
-#include "graphics/niche/Drivers/EInk/GDEY0154D67.h"
-#include "graphics/niche/InkHUD/Applets/User/AllMessage/AllMessageApplet.h"
-#include "graphics/niche/InkHUD/Applets/User/DM/DMApplet.h"
-#include "graphics/niche/InkHUD/Applets/User/Heard/HeardApplet.h"
-#include "graphics/niche/InkHUD/Applets/User/Positions/PositionsApplet.h"
-#include "graphics/niche/InkHUD/Applets/User/RecentsList/RecentsListApplet.h"
-#include "graphics/niche/InkHUD/Applets/User/ThreadedMessage/ThreadedMessageApplet.h"
-#include "graphics/niche/InkHUD/InkHUD.h"
-#include "graphics/niche/Inputs/TwoButton.h"
-
-void setupNicheGraphics()
-{
-    using namespace NicheGraphics;
-
-    SPI1.begin();
-
-    Drivers::EInk *driver = new Drivers::GDEY0154D67;
-    driver->begin(&SPI1, PIN_EINK_DC, PIN_EINK_CS, PIN_EINK_BUSY, PIN_EINK_RES);
-
-    InkHUD::InkHUD *inkhud = InkHUD::InkHUD::getInstance();
-    inkhud->setDriver(driver);
-    inkhud->setDisplayResilience(20, 1.5);
-    InkHUD::Applet::fontLarge = FREESANS_12PT_WIN1252;
-    InkHUD::Applet::fontMedium = FREESANS_9PT_WIN1252;
-    InkHUD::Applet::fontSmall = FREESANS_6PT_WIN1252;
-    inkhud->persistence->settings.userTiles.maxCount = 2;
-    inkhud->persistence->settings.rotation = 3;
-    inkhud->persistence->settings.optionalFeatures.batteryIcon = true;
-    inkhud->persistence->settings.optionalMenuItems.backlight = true;
-
-    Drivers::LatchingBacklight *backlight = Drivers::LatchingBacklight::getInstance();
-    backlight->setPin(PIN_EINK_BL);
-
-    inkhud->addApplet("All Messages", new InkHUD::AllMessageApplet, true, true);
-    inkhud->addApplet("DMs", new InkHUD::DMApplet);
-    inkhud->addApplet("Channel 0", new InkHUD::ThreadedMessageApplet(0));
-    inkhud->addApplet("Channel 1", new InkHUD::ThreadedMessageApplet(1));
-    inkhud->addApplet("Positions", new InkHUD::PositionsApplet, true);
-    inkhud->addApplet("Recents List", new InkHUD::RecentsListApplet);
-    inkhud->addApplet("Heard", new InkHUD::HeardApplet, true, false, 0);
-
-    inkhud->begin();
-
-    Inputs::TwoButton *buttons = Inputs::TwoButton::getInstance();
-
-    buttons->setWiring(0, Inputs::TwoButton::getUserButtonPin());
-    buttons->setTiming(0, 75, 500);
-    buttons->setHandlerShortPress(0, [inkhud]() { inkhud->shortpress(); });
-    buttons->setHandlerLongPress(0, [inkhud]() { inkhud->longpress(); });
-
-    buttons->setWiring(1, PIN_BUTTON_TOUCH);
-    buttons->setTiming(1, 50, 5000);
-    buttons->setHandlerDown(1, [inkhud, backlight]() {
-        backlight->peek();
-        inkhud->persistence->settings.optionalMenuItems.backlight = false;
-    });
-    buttons->setHandlerLongPress(1, [backlight]() { backlight->latch(); });
-    buttons->setHandlerShortPress(1, [backlight]() { backlight->off(); });
-
-    buttons->start();
-}
-
-#endif
--- a/variants/nrf52840/t-echo-plus/platformio.ini
+++ b/variants/nrf52840/t-echo-plus/platformio.ini
@@ -1,26 +0,0 @@
-[env:t-echo-plus]
-extends = nrf52840_base
-board = t-echo
-board_level = pr
-board_check = true
-debug_tool = jlink
-
-build_flags = ${nrf52840_base.build_flags}
-  -DTTGO_T_ECHO_PLUS
-  -Ivariants/nrf52840/t-echo-plus
-  -DEINK_DISPLAY_MODEL=GxEPD2_154_D67
-  -DEINK_WIDTH=200
-  -DEINK_HEIGHT=200
-  -DUSE_EINK
-  -DUSE_EINK_DYNAMICDISPLAY            ; Enable Dynamic EInk
-  -DEINK_LIMIT_FASTREFRESH=20          ; How many consecutive fast-refreshes are permitted
-  -DEINK_BACKGROUND_USES_FAST          ; (Optional) Use FAST refresh for both BACKGROUND and RESPONSIVE, until a limit is reached.
-  -DI2C_NO_RESCAN
-
-build_src_filter = ${nrf52_base.build_src_filter} +<../variants/nrf52840/t-echo-plus>
-
-lib_deps =
-  ${nrf52840_base.lib_deps}
-  https://github.com/meshtastic/GxEPD2/archive/55f618961db45a23eff0233546430f1e5a80f63a.zip
-  lewisxhe/PCF8563_Library@^1.0.1
-  adafruit/Adafruit DRV2605 Library@1.2.4
--- a/variants/nrf52840/t-echo-plus/variant.cpp
+++ b/variants/nrf52840/t-echo-plus/variant.cpp
@@ -1,24 +0,0 @@
-#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()
-{
-    // LEDs (if populated)
-    pinMode(PIN_LED1, OUTPUT);
-    ledOff(PIN_LED1);
-
-    pinMode(PIN_LED2, OUTPUT);
-    ledOff(PIN_LED2);
-
-    pinMode(PIN_LED3, OUTPUT);
-    ledOff(PIN_LED3);
-}
--- a/variants/nrf52840/t-echo-plus/variant.h
+++ b/variants/nrf52840/t-echo-plus/variant.h
@@ -1,145 +0,0 @@
-#ifndef _VARIANT_T_ECHO_PLUS_
-#define _VARIANT_T_ECHO_PLUS_
-
-#define VARIANT_MCK (64000000ul)
-#define USE_LFXO
-
-#include "WVariant.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-// Pin counts
-#define PINS_COUNT (48)
-#define NUM_DIGITAL_PINS (48)
-#define NUM_ANALOG_INPUTS (1)
-#define NUM_ANALOG_OUTPUTS (0)
-
-// LEDs (not documented on pinmap; keep defaults for compatibility)
-#define PIN_LED1 (0 + 14)
-#define PIN_LED2 (0 + 15)
-#define PIN_LED3 (0 + 13)
-
-#define LED_RED PIN_LED3
-#define LED_BLUE PIN_LED1
-#define LED_GREEN PIN_LED2
-
-#define LED_BUILTIN LED_BLUE
-#define LED_CONN LED_GREEN
-
-#define LED_STATE_ON 0
-
-// Buttons / touch
-#define PIN_BUTTON1 (32 + 10)
-#define BUTTON_ACTIVE_LOW true
-#define BUTTON_ACTIVE_PULLUP true
-#define PIN_BUTTON2 (0 + 18)      // reset-labelled but usable as GPIO
-#define PIN_BUTTON_TOUCH (0 + 11) // capacitive touch
-#define BUTTON_TOUCH_ACTIVE_LOW true
-#define BUTTON_TOUCH_ACTIVE_PULLUP true
-
-#define BUTTON_CLICK_MS 400
-#define BUTTON_TOUCH_MS 200
-
-// Analog
-#define PIN_A0 (4)
-#define BATTERY_PIN PIN_A0
-static const uint8_t A0 = PIN_A0;
-#define ADC_RESOLUTION 14
-#define BATTERY_SENSE_RESOLUTION_BITS 12
-#define BATTERY_SENSE_RESOLUTION 4096.0
-#undef AREF_VOLTAGE
-#define AREF_VOLTAGE 3.0
-#define VBAT_AR_INTERNAL AR_INTERNAL_3_0
-#define ADC_MULTIPLIER (2.0F)
-
-// NFC
-#define PIN_NFC1 (9)
-#define PIN_NFC2 (10)
-
-// I2C (IMU BHI260AP, RTC, etc.)
-#define WIRE_INTERFACES_COUNT 1
-#define PIN_WIRE_SDA (0 + 26)
-#define PIN_WIRE_SCL (0 + 27)
-#define HAS_BHI260AP
-
-#define TP_SER_IO (0 + 11)
-
-// RTC interrupt
-#define PIN_RTC_INT (0 + 16)
-
-// QSPI flash
-#define PIN_QSPI_SCK (32 + 14)
-#define PIN_QSPI_CS (32 + 15)
-#define PIN_QSPI_IO0 (32 + 12)
-#define PIN_QSPI_IO1 (32 + 13)
-#define PIN_QSPI_IO2 (0 + 7)
-#define PIN_QSPI_IO3 (0 + 5)
-
-// On-board QSPI Flash
-#define EXTERNAL_FLASH_DEVICES MX25R1635F
-#define EXTERNAL_FLASH_USE_QSPI
-
-// LoRa SX1262
-#define USE_SX1262
-#define USE_SX1268
-#define SX126X_CS (0 + 24)
-#define SX126X_DIO1 (0 + 20)
-#define SX1262_DIO3 (0 + 21)
-#define SX126X_BUSY (0 + 17)
-#define SX126X_RESET (0 + 25)
-#define SX126X_DIO2_AS_RF_SWITCH
-#define SX126X_DIO3_TCXO_VOLTAGE 1.8
-#define TCXO_OPTIONAL
-
-#define SPI_INTERFACES_COUNT 2
-
-#define PIN_SPI_MISO (0 + 23)
-#define PIN_SPI_MOSI (0 + 22)
-#define PIN_SPI_SCK (0 + 19)
-
-// E-paper (1.54" per pinmap)
-// Alias PIN_EINK_EN to keep common eink power control code working
-#define PIN_EINK_BL (32 + 11) // backlight / panel power switch
-#define PIN_EINK_EN PIN_EINK_BL
-#define PIN_EINK_CS (0 + 30)
-#define PIN_EINK_BUSY (0 + 3)
-#define PIN_EINK_DC (0 + 28)
-#define PIN_EINK_RES (0 + 2)
-#define PIN_EINK_SCLK (0 + 31)
-#define PIN_EINK_MOSI (0 + 29) // also called SDI
-
-// Power control
-#define PIN_POWER_EN (0 + 12)
-
-#define PIN_SPI1_MISO (32 + 7) // Placeholder MISO; keep off QSPI pins to avoid contention
-#define PIN_SPI1_MOSI PIN_EINK_MOSI
-#define PIN_SPI1_SCK PIN_EINK_SCLK
-
-// GPS (TX/RX/Wake/Reset/PPS per pinmap)
-#define GPS_L76K
-#define PIN_GPS_REINIT (32 + 5)  // Reset
-#define PIN_GPS_STANDBY (32 + 2) // Wake
-#define PIN_GPS_PPS (32 + 4)
-#define GPS_TX_PIN (32 + 8)
-#define GPS_RX_PIN (32 + 9)
-#define GPS_THREAD_INTERVAL 50
-
-#define PIN_SERIAL1_RX GPS_RX_PIN
-#define PIN_SERIAL1_TX GPS_TX_PIN
-
-// Sensors / accessories
-#define PIN_BUZZER (0 + 6)
-#define PIN_DRV_EN (0 + 8)
-
-#define HAS_DRV2605 1
-
-// Battery / ADC already defined above
-#define HAS_RTC 1
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
Author	SHA1	Message	Date
Manuel	3575c48e36	Merge branch 'master' into crowpanelV2	2025-12-31 13:35:53 +01:00
Manuel	469abe8dec	Merge branch 'master' into crowpanelV2	2025-12-10 13:38:41 +01:00
Manuel	fefce15b1a	Merge branch 'master' into crowpanelV2	2025-12-05 10:59:34 +01:00
Manuel	50ea7ace98	Merge branch 'master' into crowpanelV2	2025-10-11 23:32:09 +02:00
Manuel	96f371eafd	Merge branch 'master' into crowpanelV2	2025-10-07 14:22:46 +02:00
Manuel	dbc52c7576	update device-ui commit	2025-10-07 14:21:55 +02:00
Manuel	232e0412ff	cosmetic print when STC8H1K28 is found	2025-10-07 14:19:45 +02:00
Manuel	b94659ff6a	Update device-ui commit reference	2025-10-05 22:32:08 +02:00
Manuel	059e17b3e2	Update device-ui commit reference	2025-10-05 11:12:25 +02:00
Manuel	b09f6db9e2	Merge branch 'master' into crowpanelV2	2025-10-05 11:00:02 +02:00
Manuel	64706153e0	Merge branch 'master' into crowpanelV2	2025-10-02 16:35:36 +02:00
Manuel	f94043e4f2	Merge branch 'master' into crowpanelV2	2025-10-01 18:06:45 +02:00
Manuel	bc82cd803c	Merge branch 'master' into crowpanelV2	2025-09-29 10:49:38 +02:00
Manuel	c15b6de138	Merge branch 'master' into crowpanelV2	2025-09-28 00:30:03 +02:00
Manuel	fbf32b93b6	fix lora radio detection	2025-09-22 22:23:03 +02:00
Manuel	b7289f7f2d	Merge branch 'master' into crowpanelV2	2025-09-22 10:40:10 +02:00
Manuel	d3d932ccee	Merge branch 'master' into crowpanelV2	2025-09-21 14:11:29 +02:00
Manuel	3a267b440d	Merge branch 'master' into crowpanelV2	2025-09-21 09:39:49 +02:00
Manuel	b1821bfd4f	CrowPanel Advanced V2 support	2025-09-18 16:00:49 +02:00