Update src/mesh/Router.cpp - more detail in warning message

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

.envrc

@@ -0,0 +1 @@
+use nix

.gitignore

@@ -50,3 +50,6 @@ idf_component.yml
 CMakeLists.txt
 /sdkconfig.*
 .dummy/*
+
+# PYTHONPATH used by the Nix shell
+.python3

flake.lock

@@ -0,0 +1,44 @@
+{
+  "nodes": {
+    "flake-compat": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1767039857,
+        "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
+        "owner": "NixOS",
+        "repo": "flake-compat",
+        "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1766314097,
+        "narHash": "sha256-laJftWbghBehazn/zxVJ8NdENVgjccsWAdAqKXhErrM=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "306ea70f9eb0fb4e040f8540e2deab32ed7e2055",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "flake-compat": "flake-compat",
+        "nixpkgs": "nixpkgs"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}

flake.nix

@@ -0,0 +1,66 @@
+{
+  description = "Nix flake to compile Meshtastic firmware";
+
+  inputs = {
+    nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
+
+    # Shim to make flake.nix work with stable Nix.
+    flake-compat = {
+      url = "github:NixOS/flake-compat";
+      flake = false;
+    };
+  };
+
+  outputs =
+    inputs:
+    let
+      lib = inputs.nixpkgs.lib;
+
+      forAllSystems =
+        fn:
+        lib.genAttrs lib.systems.flakeExposed (
+          system:
+          fn {
+            pkgs = import inputs.nixpkgs {
+              inherit system;
+            };
+            inherit system;
+          }
+        );
+    in
+    {
+      devShells = forAllSystems (
+        { pkgs, ... }:
+        let
+          python3 = pkgs.python312.withPackages (
+            ps: with ps; [
+              google
+            ]
+          );
+        in
+        {
+          default = pkgs.mkShell {
+            buildInputs = with pkgs; [
+              python3
+              platformio
+            ];
+
+            shellHook = ''
+              # Set up PlatformIO to use a local core directory.
+              export PLATFORMIO_CORE_DIR=$PWD/.platformio
+              # Tell pip to put packages into $PIP_PREFIX instead of the usual
+              # location. This is especially necessary under NixOS to avoid having
+              # pip trying to write to the read-only Nix store. For more info,
+              # see https://wiki.nixos.org/wiki/Python
+              export PIP_PREFIX=$PWD/.python3
+              export PYTHONPATH="$PIP_PREFIX/${python3.sitePackages}"
+              export PATH="$PIP_PREFIX/bin:$PATH"
+              # Avoids reproducibility issues with some Python packages
+              # See https://nixos.org/manual/nixpkgs/stable/#python-setup.py-bdist_wheel-cannot-create-.whl
+              unset SOURCE_DATE_EPOCH
+            '';
+          };
+        }
+      );
+    };
+}

shell.nix

@@ -0,0 +1,12 @@
+(import (
+  let
+    lock = builtins.fromJSON (builtins.readFile ./flake.lock);
+    nodeName = lock.nodes.root.inputs.flake-compat;
+  in
+  fetchTarball {
+    url =
+      lock.nodes.${nodeName}.locked.url
+        or "https://github.com/NixOS/flake-compat/archive/${lock.nodes.${nodeName}.locked.rev}.tar.gz";
+    sha256 = lock.nodes.${nodeName}.locked.narHash;
+  }
+) { src = ./.; }).shellNix

src/Power.cpp

@@ -816,6 +816,9 @@ void Power::shutdown()
 #endif
 #ifdef PIN_LED3
     ledOff(PIN_LED3);
+#endif
+#ifdef LED_NOTIFICATION
+    ledOff(LED_NOTIFICATION);
 #endif
     doDeepSleep(DELAY_FOREVER, true, true);
 #elif defined(ARCH_PORTDUINO)

src/configuration.h

@@ -428,12 +428,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define HAS_RGB_LED
 #endif
 
-#ifndef LED_STATE_OFF
-#define LED_STATE_OFF 0
-#endif
 #ifndef LED_STATE_ON
 #define LED_STATE_ON 1
 #endif
+#ifndef LED_STATE_OFF
+#define LED_STATE_OFF (LED_STATE_ON ^ 1)
+#endif
+
+#ifndef ledOff
+#define ledOff(pin) pinMode(pin, INPUT)
+#endif
 
 // default mapping of pins
 #if defined(PIN_BUTTON2) && !defined(CANCEL_BUTTON_PIN)

src/input/SerialKeyboard.cpp

@@ -5,7 +5,6 @@
 SerialKeyboard *globalSerialKeyboard = nullptr;
 
 #ifdef INPUTBROKER_SERIAL_TYPE
-#define CANNED_MESSAGE_MODULE_ENABLE 1 // in case it's not set in the variant file
 
 #if INPUTBROKER_SERIAL_TYPE == 1 // It's a Chatter
 // 3 SHIFT level (lower case, upper case, numbers), up to 4 repeated presses, button number

src/main.cpp

@@ -354,9 +354,9 @@ void setup()
     digitalWrite(LED_POWER, LED_STATE_ON);
 #endif
 
-#ifdef USER_LED
-    pinMode(USER_LED, OUTPUT);
-    digitalWrite(USER_LED, HIGH ^ LED_STATE_ON);
+#ifdef LED_NOTIFICATION
+    pinMode(LED_NOTIFICATION, OUTPUT);
+    digitalWrite(LED_NOTIFICATION, HIGH ^ LED_STATE_ON);
 #endif
 
 #ifdef WIFI_LED

src/mesh/LR11x0Interface.cpp

@@ -170,7 +170,7 @@ template <typename T> bool LR11x0Interface<T>::reconfigure()
     if (err != RADIOLIB_ERR_NONE)
         RECORD_CRITICALERROR(meshtastic_CriticalErrorCode_INVALID_RADIO_SETTING);
 
-    err = lora.setCodingRate(cr);
+    err = lora.setCodingRate(cr, cr != 7); // use long interleaving except if CR is 4/7 which doesn't support it
     if (err != RADIOLIB_ERR_NONE)
         RECORD_CRITICALERROR(meshtastic_CriticalErrorCode_INVALID_RADIO_SETTING);
 

src/mesh/NodeDB.cpp

@@ -824,16 +824,10 @@ void NodeDB::installDefaultModuleConfig()
     moduleConfig.external_notification.output_ms = 500;
     moduleConfig.external_notification.nag_timeout = 2;
 #endif
-#if defined(RAK4630) || defined(RAK11310) || defined(RAK3312) || defined(MUZI_BASE) || defined(ELECROW_ThinkNode_M3) ||          \
-    defined(ELECROW_ThinkNode_M4) || defined(ELECROW_ThinkNode_M6)
-    // Default to PIN_LED2 for external notification output (LED color depends on device variant)
+#if defined(LED_NOTIFICATION)
     moduleConfig.external_notification.enabled = true;
-    moduleConfig.external_notification.output = PIN_LED2;
-#if defined(MUZI_BASE) || defined(ELECROW_ThinkNode_M3)
-    moduleConfig.external_notification.active = false;
-#else
-    moduleConfig.external_notification.active = true;
-#endif
+    moduleConfig.external_notification.output = LED_NOTIFICATION;
+    moduleConfig.external_notification.active = LED_STATE_ON;
     moduleConfig.external_notification.alert_message = true;
     moduleConfig.external_notification.output_ms = 1000;
     moduleConfig.external_notification.nag_timeout = default_ringtone_nag_secs;
@@ -857,15 +851,6 @@ void NodeDB::installDefaultModuleConfig()
     moduleConfig.external_notification.output_ms = 100;
     moduleConfig.external_notification.active = true;
 #endif
-#ifdef ELECROW_ThinkNode_M1
-    // Default to Elecrow USER_LED (blue)
-    moduleConfig.external_notification.enabled = true;
-    moduleConfig.external_notification.output = USER_LED;
-    moduleConfig.external_notification.active = true;
-    moduleConfig.external_notification.alert_message = true;
-    moduleConfig.external_notification.output_ms = 1000;
-    moduleConfig.external_notification.nag_timeout = 60;
-#endif
 #ifdef T_LORA_PAGER
     moduleConfig.canned_message.updown1_enabled = true;
     moduleConfig.canned_message.inputbroker_pin_a = ROTARY_A;

src/mesh/RadioInterface.cpp

@@ -27,7 +27,7 @@
 #include "platform/portduino/USBHal.h"
 #endif
 
-#ifdef ARCH_STM32WL>
+#ifdef ARCH_STM32WL
 #include "STM32WLE5JCInterface.h"
 #endif
 

src/mesh/Router.cpp

@@ -620,15 +620,19 @@ meshtastic_Routing_Error perhapsEncode(meshtastic_MeshPacket *p)
             !(p->pki_encrypted != true && (strcasecmp(channels.getName(chIndex), Channels::serialChannel) == 0 ||
                                            strcasecmp(channels.getName(chIndex), Channels::gpioChannel) == 0)) &&
             // Check for valid keys and single node destination
-            config.security.private_key.size == 32 && !isBroadcast(p->to) && node != nullptr &&
-            // Check for a known public key for the destination
-            (node->user.public_key.size == 32) &&
+            config.security.private_key.size == 32 && !isBroadcast(p->to) &&
             // Some portnums either make no sense to send with PKC
             p->decoded.portnum != meshtastic_PortNum_TRACEROUTE_APP && p->decoded.portnum != meshtastic_PortNum_NODEINFO_APP &&
             p->decoded.portnum != meshtastic_PortNum_ROUTING_APP && p->decoded.portnum != meshtastic_PortNum_POSITION_APP) {
             LOG_DEBUG("Use PKI!");
             if (numbytes + MESHTASTIC_HEADER_LENGTH + MESHTASTIC_PKC_OVERHEAD > MAX_LORA_PAYLOAD_LEN)
                 return meshtastic_Routing_Error_TOO_LARGE;
+            // Check for a known public key for the destination
+            if (node == nullptr || node->user.public_key.size != 32) {
+                LOG_WARN("Unknown public key for destination node 0x%08x (portnum %d), refusing to send legacy DM", p->to,
+                         p->decoded.portnum);
+                return meshtastic_Routing_Error_PKI_SEND_FAIL_PUBLIC_KEY;
+            }
             if (p->pki_encrypted && !memfll(p->public_key.bytes, 0, 32) &&
                 memcmp(p->public_key.bytes, node->user.public_key.bytes, 32) != 0) {
                 LOG_WARN("Client public key differs from requested: 0x%02x, stored key begins 0x%02x", *p->public_key.bytes,

src/mesh/SX128xInterface.cpp

@@ -126,7 +126,7 @@ template <typename T> bool SX128xInterface<T>::reconfigure()
     if (err != RADIOLIB_ERR_NONE)
         RECORD_CRITICALERROR(meshtastic_CriticalErrorCode_INVALID_RADIO_SETTING);
 
-    err = lora.setCodingRate(cr);
+    err = lora.setCodingRate(cr, cr != 7); // use long interleaving except if CR is 4/7 which doesn't support it
     if (err != RADIOLIB_ERR_NONE)
         RECORD_CRITICALERROR(meshtastic_CriticalErrorCode_INVALID_RADIO_SETTING);
 

src/modules/CannedMessageModule.cpp

@@ -130,8 +130,7 @@ CannedMessageModule::CannedMessageModule()
     : SinglePortModule("canned", meshtastic_PortNum_TEXT_MESSAGE_APP), concurrency::OSThread("CannedMessage")
 {
     this->loadProtoForModule();
-    if ((this->splitConfiguredMessages() <= 0) && (cardkb_found.address == 0x00) && !INPUTBROKER_MATRIX_TYPE &&
-        !CANNED_MESSAGE_MODULE_ENABLE) {
+    if ((this->splitConfiguredMessages() <= 0) && (cardkb_found.address == 0x00) && !INPUTBROKER_MATRIX_TYPE) {
         LOG_INFO("CannedMessageModule: No messages are configured. Module is disabled");
         this->runState = CANNED_MESSAGE_RUN_STATE_DISABLED;
         disable();

src/modules/CannedMessageModule.h

@@ -27,10 +27,6 @@ enum CannedMessageModuleIconType { shift, backspace, space, enter };
 #define CANNED_MESSAGE_MODULE_MESSAGE_MAX_COUNT 50
 #define CANNED_MESSAGE_MODULE_MESSAGES_SIZE 800
 
-#ifndef CANNED_MESSAGE_MODULE_ENABLE
-#define CANNED_MESSAGE_MODULE_ENABLE 0
-#endif
-
 // ============================
 //        Data Structures
 // ============================

src/modules/StatusLEDModule.cpp

@@ -130,7 +130,6 @@ int32_t StatusLEDModule::runOnce()
 #ifdef LED_CHARGE
     digitalWrite(LED_CHARGE, CHARGE_LED_state);
 #endif
-    // digitalWrite(green_LED_PIN, LED_STATE_OFF);
 #ifdef LED_PAIRING
     digitalWrite(LED_PAIRING, PAIRING_LED_state);
 #endif

src/modules/Telemetry/Sensor/RAK12035Sensor.cpp

@@ -26,7 +26,7 @@ bool RAK12035Sensor::initDevice(TwoWire *bus, ScanI2C::FoundDevice *dev)
     sensor.get_sensor_version(&data);
     if (data != 0) {
         LOG_INFO("Init sensor: %s", sensorName);
-        LOG_INFO("RAK12035Sensor Init Succeed \nSensor1 Firmware version: %i, Sensor Name: %s", data, sensorName);
+        LOG_INFO("RAK12035Sensor Init Succeed \nSensor Firmware version: %i, Sensor Name: %s", data, sensorName);
         status = true;
         sensor.sensor_sleep();
         RESTORE_3V3_POWER();
@@ -49,33 +49,39 @@ void RAK12035Sensor::setup()
     // TODO:: Check for and run calibration check for up to 2 additional sensors if present.
     uint16_t zero_val = 0;
     uint16_t hundred_val = 0;
-    uint16_t default_zero_val = 550;
-    uint16_t default_hundred_val = 420;
+    const uint16_t default_zero_val = 510;
+    const uint16_t default_hundred_val = 390;
+
     sensor.sensor_on();
+    sensor.begin();
     delay(200);
     sensor.get_dry_cal(&zero_val);
+    delay(200);
     sensor.get_wet_cal(&hundred_val);
     delay(200);
-    if (zero_val == 0 || zero_val <= hundred_val) {
-        LOG_INFO("Dry calibration value is %d", zero_val);
-        LOG_INFO("Wet calibration value is %d", hundred_val);
-        LOG_INFO("This does not make sense. You can recalibrate this sensor using the calibration sketch included here: "
-                 "https://github.com/RAKWireless/RAK12035_SoilMoisture.");
-        LOG_INFO("For now, setting default calibration value for Dry Calibration: %d", default_zero_val);
+
+    bool calibrationReset = false;
+
+    if (zero_val == 0) {
+        LOG_INFO("Dry calibration not set, using default: %d", default_zero_val);
         sensor.set_dry_cal(default_zero_val);
-        sensor.get_dry_cal(&zero_val);
-        LOG_INFO("Dry calibration reset complete. New value is %d", zero_val);
+        delay(200);
+        zero_val = default_zero_val;
+        calibrationReset = true;
     }
     if (hundred_val == 0 || hundred_val >= zero_val) {
-        LOG_INFO("Dry calibration value is %d", zero_val);
-        LOG_INFO("Wet calibration value is %d", hundred_val);
-        LOG_INFO("This does not make sense. You can recalibrate this sensor using the calibration sketch included here: "
-                 "https://github.com/RAKWireless/RAK12035_SoilMoisture.");
-        LOG_INFO("For now, setting default calibration value for Wet Calibration: %d", default_hundred_val);
+        LOG_INFO("Wet calibration not set, using default: %d", default_hundred_val);
         sensor.set_wet_cal(default_hundred_val);
-        sensor.get_wet_cal(&hundred_val);
-        LOG_INFO("Wet calibration reset complete. New value is %d", hundred_val);
+        delay(200);
+        hundred_val = default_hundred_val;
+        calibrationReset = true;
     }
+    if (calibrationReset) {
+        LOG_INFO("Default calibration values applied. Consider running the calibration sketch for better accuracy: "
+                 "https://github.com/RAKWireless/RAK12035_SoilMoisture");
+    }
+
+    LOG_INFO("Dry calibration value: %d, Wet calibration value: %d", zero_val, hundred_val);
     sensor.sensor_sleep();
     RESTORE_3V3_POWER();
     delay(200);

src/sleep.cpp

@@ -241,7 +241,6 @@ void doDeepSleep(uint32_t msecToWake, bool skipPreflight = false, bool skipSaveN
 #ifdef PIN_POWER_EN
     digitalWrite(PIN_POWER_EN, LOW);
     pinMode(PIN_POWER_EN, INPUT); // power off peripherals
-    // pinMode(PIN_POWER_EN1, INPUT_PULLDOWN);
 #endif
 
 #ifdef RAK_WISMESH_TAP_V2

variants/esp32/chatter2/variant.h

@@ -98,7 +98,6 @@
 #define KB_LOAD 21 // load values from the switch and store in shift register
 #define KB_CLK 22  // clock pin for serial data out
 #define KB_DATA 23 // data pin
-#define CANNED_MESSAGE_MODULE_ENABLE 1
 
 /////////////////////////////////////////////////////////////////////////////////
 //                                                                             //

variants/esp32/diy/9m2ibr_aprs_lora_tracker/platformio.ini

@@ -10,3 +10,6 @@ build_flags =
   -D EBYTE_E22
   -D EBYTE_E22_900M30S ; Assume Tx power curve is identical to 900M30S as there is no documentation
   -I variants/esp32/diy/9m2ibr_aprs_lora_tracker
+build_src_filter =
+  ${esp32_base.build_src_filter}
+  +<../variants/esp32/diy/9m2ibr_aprs_lora_tracker>

variants/esp32/diy/9m2ibr_aprs_lora_tracker/variant.cpp

@@ -0,0 +1,8 @@
+#include "variant.h"
+#include "Arduino.h"
+
+void earlyInitVariant()
+{
+    pinMode(USER_LED, OUTPUT);
+    digitalWrite(USER_LED, HIGH ^ LED_STATE_ON);
+}

variants/esp32/m5stack_core/platformio.ini

@@ -30,7 +30,6 @@ build_flags =
   -DTFT_BL=32
   -DSPI_FREQUENCY=40000000
   -DSPI_READ_FREQUENCY=16000000
-  -DDISABLE_ALL_LIBRARY_WARNINGS
 lib_ignore =
   m5stack-core
 lib_deps = 

variants/esp32/tbeam/variant.h

@@ -57,7 +57,6 @@
 #ifndef TOUCH_IRQ
 #define TOUCH_IRQ -1
 #endif
-#define CANNED_MESSAGE_MODULE_ENABLE 1
 #define USE_VIRTUAL_KEYBOARD 1
 
 #define ST7796_NSS 25

variants/esp32/trackerd/variant.h

@@ -10,7 +10,6 @@
 
 #define LED_PIN 13 // 13 red, 2 blue, 15 red
 
-// #define HAS_BUTTON 0
 #define BUTTON_PIN 0
 #define BUTTON_NEED_PULLUP
 

variants/esp32s3/hackaday-communicator/variant.h

@@ -16,22 +16,12 @@
 #define SLEEP_TIME 120
 
 #define GPS_DEFAULT_NOT_PRESENT 1
-// #define GPS_RX_PIN 44
-// #define GPS_TX_PIN 43
-
-// #define BATTERY_PIN 4 // A battery voltage measurement pin, voltage divider connected here to measure battery voltage
-//  ratio of voltage divider = 2.0 (RD2=100k, RD3=100k)
-// #define ADC_MULTIPLIER 2.11 // 2.0 + 10% for correction of display undervoltage.
-// #define ADC_CHANNEL ADC1_GPIO4_CHANNEL
 
 // keyboard
 #define I2C_SDA 47 // I2C pins for this board
 #define I2C_SCL 14
-// #define KB_POWERON -1                  // must be set to HIGH
-// #define KB_SLAVE_ADDRESS TDECK_KB_ADDR // 0x55
 // #define KB_BL_PIN 46                   // not used for now
 #define KB_INT 13
-#define CANNED_MESSAGE_MODULE_ENABLE 1
 
 #define TFT_DC 39
 #define TFT_CS 41
@@ -44,11 +34,9 @@
 #define LORA_MOSI 3
 #define LORA_CS 17
 
-// #define LORA_DIO0 -1 // a No connect on the SX1262 module
 #define LORA_RESET 18
 #define LORA_DIO1 16 // SX1262 IRQ
 #define LORA_DIO2 15 // SX1262 BUSY
-// #define LORA_DIO3    // Not connected on PCB, but internally on the TTGO SX1262, if DIO3 is high the TXCO is enabled
 
 #define SX126X_CS LORA_CS
 #define SX126X_DIO1 LORA_DIO1
@@ -58,4 +46,5 @@
 #define SX126X_DIO2_AS_RF_SWITCH
 #define SX126X_DIO3_TCXO_VOLTAGE 1.8
 
-// #define LED_PIN 1
+#define LED_NOTIFICATION 1
+#define LED_STATE_ON 0

variants/esp32s3/nugget_s3_lora/variant.h

@@ -12,7 +12,7 @@
 #define NEOPIXEL_TYPE (NEO_GRB + NEO_KHZ800) // type of neopixels in use
 
 // Button A (44), B (43), R (12), U (13), L (11), D (18)
-#define BUTTON_PIN 44 // If defined, this will be used for user button presses
+#define BUTTON_PIN 43 // If defined, this will be used for user button presses
 #define BUTTON_NEED_PULLUP
 
 #define USE_RF95
@@ -20,8 +20,19 @@
 #define LORA_MISO 7
 #define LORA_MOSI 8
 #define LORA_CS 9
-#define LORA_DIO0 16 // a No connect on the SX1262 module
+#define LORA_DIO0 16
 #define LORA_RESET 4
 
 #define LORA_DIO1 RADIOLIB_NC
-#define LORA_DIO2 RADIOLIB_NC
+#define LORA_DIO2 RADIOLIB_NC
+
+// jk, its not really a trackball but we're gonna pretend!
+#define HAS_TRACKBALL 1
+#define TB_UP 13
+#define TB_DOWN 18
+#define TB_LEFT 11
+#define TB_RIGHT 12
+#define TB_PRESS 44 // BUTTON_PIN
+#define TB_DIRECTION FALLING
+
+#define ENABLE_AMBIENTLIGHTING

variants/esp32s3/picomputer-s3/variant.h

@@ -52,8 +52,6 @@
 // Picomputer gets a white on black display
 #define TFT_MESH_OVERRIDE COLOR565(255, 255, 255)
 
-#define CANNED_MESSAGE_MODULE_ENABLE 1
-
 #define INPUTBROKER_MATRIX_TYPE 1
 
 #define KEYS_COLS                                                                                                                \

variants/esp32s3/rak3312/variant.h

@@ -22,9 +22,8 @@
 #define LED_BLUE 45
 
 #define PIN_LED1 LED_GREEN
-#define PIN_LED2 LED_BLUE
+#define LED_NOTIFICATION LED_BLUE
 
-#define LED_CONN LED_BLUE
 #define LED_PIN LED_GREEN
 #define ledOff(pin) pinMode(pin, INPUT)
 

variants/esp32s3/rak_wismesh_tap_v2/variant.h

@@ -30,9 +30,8 @@
 #define LED_BLUE 45
 
 #define PIN_LED1 LED_GREEN
-#define PIN_LED2 LED_BLUE
+#define LED_NOTIFICATION LED_BLUE
 
-#define LED_CONN LED_BLUE
 #define LED_PIN LED_GREEN
 #define ledOff(pin) pinMode(pin, INPUT)
 
@@ -47,10 +46,8 @@
 #define SPI_MISO (10)
 #define SPI_CS (12)
 
-#define HAS_BUTTON 1
 #define BUTTON_PIN 0
 
-#define CANNED_MESSAGE_MODULE_ENABLE 1
 #define USE_VIRTUAL_KEYBOARD 1
 
 #define BATTERY_PIN 1

variants/esp32s3/t-deck-pro/variant.h

@@ -43,7 +43,6 @@
 
 // TCA8418 keyboard
 #define KB_BL_PIN 42
-#define CANNED_MESSAGE_MODULE_ENABLE 1
 
 // microphone PCM5102A
 #define PCM5102A_SCK 47

variants/esp32s3/t-deck/variant.h

@@ -61,7 +61,6 @@
 #define KB_POWERON 10                  // must be set to HIGH
 #define KB_SLAVE_ADDRESS TDECK_KB_ADDR // 0x55
 #define KB_BL_PIN 46                   // not used for now
-#define CANNED_MESSAGE_MODULE_ENABLE 1
 
 // trackball
 #define HAS_TRACKBALL 1

variants/esp32s3/tlora-pager/variant.h

@@ -61,7 +61,6 @@
 #define I2C_NO_RESCAN
 #define KB_BL_PIN 46
 #define KB_INT 6
-#define CANNED_MESSAGE_MODULE_ENABLE 1
 
 // audio codec ES8311
 #define HAS_I2S

variants/esp32s3/tracksenger/internal/variant.h

@@ -78,7 +78,6 @@
 // keyboard changes
 
 #define PIN_BUZZER 43
-#define CANNED_MESSAGE_MODULE_ENABLE 1
 
 #define INPUTBROKER_MATRIX_TYPE 1
 

variants/esp32s3/tracksenger/lcd/variant.h

@@ -102,7 +102,6 @@
 // keyboard changes
 
 #define PIN_BUZZER 43
-#define CANNED_MESSAGE_MODULE_ENABLE 1
 
 #define INPUTBROKER_MATRIX_TYPE 1
 

variants/esp32s3/tracksenger/oled/variant.h

@@ -79,7 +79,6 @@
 // keyboard changes
 
 #define PIN_BUZZER 43
-#define CANNED_MESSAGE_MODULE_ENABLE 1
 
 #define INPUTBROKER_MATRIX_TYPE 1
 

variants/native/portduino-buildroot/variant.h

@@ -1,6 +1,5 @@
 #define HAS_SCREEN 1
 #define USE_TFTDISPLAY 1
-#define CANNED_MESSAGE_MODULE_ENABLE 1
 #define HAS_GPS 1
 #define MAX_RX_TOPHONE portduino_config.maxtophone
 #define MAX_NUM_NODES portduino_config.MaxNodes

variants/native/portduino/variant.h

@@ -2,7 +2,6 @@
 #define HAS_SCREEN 1
 #endif
 #define USE_TFTDISPLAY 1
-#define CANNED_MESSAGE_MODULE_ENABLE 1
 #define HAS_GPS 1
 #define MAX_RX_TOPHONE portduino_config.maxtophone
 #define MAX_NUM_NODES portduino_config.MaxNodes

variants/nrf52840/Dongle_nRF52840-pca10059-v1/variant.h

@@ -50,8 +50,6 @@ extern "C" {
 #define RGBLED_BLUE (0 + 12)  // Blue of RGB   P0.12
 #define RGBLED_CA             // comment out this line if you have a common cathode type, as defined use common anode logic
 
-#define LED_CONN PIN_LED2
-
 #define LED_GREEN PIN_LED1
 #define LED_BLUE PIN_LED2
 

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

@@ -32,15 +32,8 @@ const uint32_t g_ADigitalPinMap[] = {
 
 void initVariant()
 {
-    // LED1 & LED2
     pinMode(PIN_LED1, OUTPUT);
     ledOff(PIN_LED1);
-
-    pinMode(PIN_LED2, OUTPUT);
-    ledOff(PIN_LED2);
-
-    pinMode(PIN_LED3, OUTPUT);
-    ledOff(PIN_LED3);
 }
 
 void variant_shutdown()

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

@@ -41,21 +41,15 @@ extern "C" {
 #define NUM_ANALOG_INPUTS (1)
 #define NUM_ANALOG_OUTPUTS (0)
 
-#define PIN_LED2 -1
-#define PIN_LED3 -1
-
 // LED
 #define PIN_LED1 (32 + 6) // red
 #define LED_POWER (32 + 4)
-#define USER_LED (0 + 13) // green
+#define LED_NOTIFICATION (0 + 13) // green
 // USB_CHECK
 #define EXT_PWR_DETECT (32 + 3)
 #define ADC_V (0 + 8)
 
-#define LED_RED PIN_LED3
 #define LED_BLUE PIN_LED1
-#define LED_GREEN PIN_LED2
-#define LED_CONN PIN_GREEN
 #define LED_STATE_ON 0 // State when LED is lit  // LED灯亮时的状态
 #define PIN_BUZZER (0 + 6)
 /*
@@ -170,8 +164,6 @@ External serial flash WP25R1635FZUIL0
 #define PIN_SPI_MOSI (0 + 22)
 #define PIN_SPI_SCK (0 + 19)
 
-#define PIN_PWR_EN (0 + 6)
-
 // To debug via the segger JLINK console rather than the CDC-ACM serial device
 // #define USE_SEGGER
 

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

@@ -37,8 +37,8 @@ void initVariant()
     digitalWrite(KEY_POWER, HIGH);
     pinMode(RGB_POWER, OUTPUT);
     digitalWrite(RGB_POWER, HIGH);
-    pinMode(green_LED_PIN, OUTPUT);
-    digitalWrite(green_LED_PIN, LED_STATE_OFF);
+    pinMode(LED_GREEN, OUTPUT);
+    digitalWrite(LED_GREEN, LED_STATE_OFF);
     pinMode(LED_BLUE, OUTPUT);
     pinMode(PIN_POWER_USB, INPUT);
     pinMode(PIN_POWER_DONE, INPUT);
@@ -63,8 +63,8 @@ void initVariant()
 // called from main-nrf52.cpp during the cpuDeepSleep() function
 void variant_shutdown()
 {
-    digitalWrite(red_LED_PIN, HIGH);
-    digitalWrite(green_LED_PIN, HIGH);
+    digitalWrite(LED_RED, HIGH);
+    digitalWrite(LED_GREEN, HIGH);
     digitalWrite(LED_BLUE, HIGH);
 
     digitalWrite(PIN_EN1, LOW);
@@ -81,8 +81,8 @@ void variant_shutdown()
         if (pin == PIN_POWER_USB || pin == BUTTON_PIN || pin == PIN_EN1 || pin == PIN_EN2 || pin == DHT_POWER ||
             pin == ACC_POWER || pin == Battery_POWER || pin == GPS_POWER || pin == LR1110_SPI_MISO_PIN ||
             pin == LR1110_SPI_MOSI_PIN || pin == LR1110_SPI_SCK_PIN || pin == LR1110_SPI_NSS_PIN || pin == LR1110_BUSY_PIN ||
-            pin == LR1110_NRESET_PIN || pin == LR1110_IRQ_PIN || pin == GPS_TX_PIN || pin == GPS_RX_PIN || pin == green_LED_PIN ||
-            pin == red_LED_PIN || pin == LED_BLUE) {
+            pin == LR1110_NRESET_PIN || pin == LR1110_IRQ_PIN || pin == GPS_TX_PIN || pin == GPS_RX_PIN || pin == LED_GREEN ||
+            pin == LED_RED || pin == LED_BLUE) {
             continue;
         }
         pinMode(pin, OUTPUT);

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

@@ -50,11 +50,11 @@ extern "C" {
 #define EEPROM_POWER 7
 
 // LED
-#define red_LED_PIN 33
-#define LED_POWER red_LED_PIN
+#define LED_RED 33
+#define LED_POWER LED_RED
 #define LED_CHARGE LED_POWER // Signals the Status LED Module to handle this LED
-#define green_LED_PIN 35
-#define PIN_LED2 green_LED_PIN
+#define LED_GREEN 35
+#define LED_NOTIFICATION LED_GREEN
 #define LED_BLUE 37
 #define LED_PAIRING LED_BLUE // Signals the Status LED Module to handle this LED
 

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

@@ -32,9 +32,6 @@ const uint32_t g_ADigitalPinMap[] = {
 
 void initVariant()
 {
-    pinMode(PIN_LED2, OUTPUT);
-    ledOff(PIN_LED2);
-
     pinMode(LED_PAIRING, OUTPUT);
     ledOff(LED_PAIRING);
 

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

@@ -41,7 +41,7 @@ extern "C" {
 
 // LEDs
 #define LED_BLUE -1
-#define PIN_LED2 (32 + 9)
+#define LED_NOTIFICATION (32 + 9)
 #define LED_PAIRING (13)
 
 #define Battery_LED_1 (15)

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

@@ -43,7 +43,7 @@ extern "C" {
 #define LED_BLUE -1
 #define LED_CHARGE (12)
 #define LED_PAIRING (7)
-#define PIN_LED2 LED_PAIRING
+#define LED_NOTIFICATION LED_PAIRING
 
 #define LED_STATE_ON HIGH
 #define LED_STATE_OFF LOW

variants/nrf52840/MakePython_nRF52840_eink/variant.cpp

@@ -32,7 +32,4 @@ void initVariant()
     // LED1 & LED2
     pinMode(PIN_LED1, OUTPUT);
     ledOff(PIN_LED1);
-
-    pinMode(PIN_LED2, OUTPUT);
-    ledOff(PIN_LED2);
 }

variants/nrf52840/MakePython_nRF52840_eink/variant.h

@@ -27,14 +27,10 @@ extern "C" {
 
 // LEDs
 #define PIN_LED1 (32 + 10) // LED        P1.15
-#define PIN_LED2 (-1)      //
-
-#define LED_CONN PIN_LED2
 
 #define LED_GREEN PIN_LED1
-#define LED_BLUE PIN_LED2
 
-#define LED_STATE_ON 0 // State when LED is litted
+#define LED_STATE_ON 0 // State when LED is lit
 
 /*
  * Buttons

variants/nrf52840/MakePython_nRF52840_oled/variant.cpp

@@ -32,7 +32,4 @@ void initVariant()
     // LED1 & LED2
     pinMode(PIN_LED1, OUTPUT);
     ledOff(PIN_LED1);
-
-    pinMode(PIN_LED2, OUTPUT);
-    ledOff(PIN_LED2);
 }

variants/nrf52840/MakePython_nRF52840_oled/variant.h

@@ -27,14 +27,10 @@ extern "C" {
 
 // LEDs
 #define PIN_LED1 (32 + 10) // LED        P1.15
-#define PIN_LED2 (-1)      //
-
-#define LED_CONN PIN_LED2
 
 #define LED_GREEN PIN_LED1
-#define LED_BLUE PIN_LED2
 
-#define LED_STATE_ON 0 // State when LED is litted
+#define LED_STATE_ON 0 // State when LED is lit
 
 /*
  * Buttons

variants/nrf52840/TWC_mesh_v4/variant.h

@@ -34,8 +34,6 @@ extern "C" {
 // #define PIN_LED1 (32 + 9) Green
 // #define PIN_LED1 (0 + 12) Blue
 
-#define LED_CONN PIN_LED2
-
 #define LED_GREEN PIN_LED1
 #define LED_BLUE PIN_LED2
 

variants/nrf52840/canaryone/variant.h

@@ -52,8 +52,6 @@ extern "C" {
 
 #define LED_BLUE PIN_LED1
 
-#define LED_CONN PIN_LED3
-
 #define LED_STATE_ON 0 // State when LED is lit
 
 /*

variants/nrf52840/diy/seeed-xiao-nrf52840-wio-sx1262/variant.h

@@ -36,7 +36,6 @@ extern "C" {
 #define PIN_LED3 LED_RED
 
 #define PIN_LED PIN_LED1
-#define LED_PWR (PINS_COUNT)
 
 #define LED_STATE_ON 1 // State when LED is lit
 

variants/nrf52840/feather_diy/variant.h

@@ -52,7 +52,7 @@ extern "C" {
 #define LED_GREEN PIN_LED2 // Actually red
 #define LED_BLUE PIN_LED1
 
-#define LED_STATE_ON 1 // State when LED is litted
+#define LED_STATE_ON 1 // State when LED is lit
 
 #define BUTTON_PIN (32 + 2) // P1.02 7
 

variants/nrf52840/gat562_mesh_trial_tracker/variant.cpp

@@ -36,9 +36,6 @@ void initVariant()
     pinMode(PIN_LED1, OUTPUT);
     ledOff(PIN_LED1);
 
-    pinMode(PIN_LED2, OUTPUT);
-    ledOff(PIN_LED2);
-
     // 3V3 Power Rail
     pinMode(PIN_3V3_EN, OUTPUT);
     digitalWrite(PIN_3V3_EN, HIGH);

variants/nrf52840/gat562_mesh_trial_tracker/variant.h

@@ -46,12 +46,10 @@ extern "C" {
 
 // LEDs
 #define PIN_LED1 (35)
-#define PIN_LED2 (36)
-
-#define LED_CONN PIN_LED2
+#define LED_BLUE (36)
 
 #define LED_GREEN PIN_LED1
-#define LED_BLUE PIN_LED2
+#define LED_NOTIFICATION LED_BLUE
 
 #define LED_STATE_ON 1 // State when LED is litted
 
@@ -62,8 +60,6 @@ extern "C" {
 #define PIN_BUTTON1 9 // Pin for button on E-ink button module or IO expansion
 #define BUTTON_NEED_PULLUP
 #define PIN_BUTTON2 12
-#define PIN_BUTTON3 24
-#define PIN_BUTTON4 25
 
 /*
  * Analog pins

variants/nrf52840/heltec_mesh_node_t114-inkhud/variant.h

@@ -137,8 +137,6 @@ No longer populated on PCB
 #define PIN_SPI1_MOSI PIN_EINK_MOSI
 #define PIN_SPI1_SCK PIN_EINK_SCLK
 
-// #define PIN_PWR_EN (0 + 6)
-
 // To debug via the segger JLINK console rather than the CDC-ACM serial device
 // #define USE_SEGGER
 

variants/nrf52840/heltec_mesh_node_t114/variant.h

@@ -192,8 +192,6 @@ No longer populated on PCB
 #define PIN_SPI_MOSI (0 + 22)
 #define PIN_SPI_SCK (0 + 19)
 
-// #define PIN_PWR_EN (0 + 6)
-
 // To debug via the segger JLINK console rather than the CDC-ACM serial device
 // #define USE_SEGGER
 

variants/nrf52840/heltec_mesh_pocket/variant.h

@@ -26,7 +26,6 @@ extern "C" {
 #define LED_RED PIN_LED1
 #define LED_BLUE PIN_LED1
 #define LED_GREEN PIN_LED1
-#define LED_CONN LED_BLUE
 #define LED_STATE_ON 0 // State when LED is lit
 
 /*
@@ -99,8 +98,6 @@ No longer populated on PCB
 #define PIN_SPI_MOSI (0 + 5)
 #define PIN_SPI_SCK (0 + 4)
 
-// #define PIN_PWR_EN (0 + 6)
-
 // To debug via the segger JLINK console rather than the CDC-ACM serial device
 // #define USE_SEGGER
 

variants/nrf52840/heltec_mesh_solar/variant.h

@@ -132,8 +132,6 @@ No longer populated on PCB
 #define PIN_SPI_MOSI (0 + 22)
 #define PIN_SPI_SCK (0 + 19)
 
-// #define PIN_PWR_EN (0 + 6)
-
 // To debug via the segger JLINK console rather than the CDC-ACM serial device
 // #define USE_SEGGER
 

variants/nrf52840/meshtiny/variant.cpp

@@ -32,12 +32,12 @@ const uint32_t g_ADigitalPinMap[] = {
 
 void initVariant()
 {
-    // LED1 & LED2
+    // LED1 & LED_BLUE
     pinMode(PIN_LED1, OUTPUT);
     ledOff(PIN_LED1);
 
-    pinMode(PIN_LED2, OUTPUT);
-    ledOff(PIN_LED2);
+    pinMode(LED_BLUE, OUTPUT);
+    ledOff(LED_BLUE);
 
     // 3V3 Power Rail
     pinMode(PIN_3V3_EN, OUTPUT);

variants/nrf52840/meshtiny/variant.h

@@ -47,12 +47,9 @@ extern "C" {
 
 // LEDs
 #define PIN_LED1 (35)
-#define PIN_LED2 (36)
-
-#define LED_CONN PIN_LED2
+#define LED_BLUE (36)
 
 #define LED_GREEN PIN_LED1
-#define LED_BLUE PIN_LED2
 
 #define LED_STATE_ON 1 // State when LED is litted
 
@@ -65,8 +62,6 @@ extern "C" {
 #define INPUTDRIVER_ENCODER_BTN 28
 #define UPDOWN_LONG_PRESS_REPEAT_INTERVAL 150
 
-#define CANNED_MESSAGE_MODULE_ENABLE 1
-
 /*
  * Buzzer - PWM
  */

variants/nrf52840/monteops_hw1/variant.cpp

@@ -35,7 +35,4 @@ void initVariant()
     // LED1 & LED2
     pinMode(PIN_LED1, OUTPUT);
     ledOff(PIN_LED1);
-
-    pinMode(PIN_LED2, OUTPUT);
-    ledOff(PIN_LED2);
 }

variants/nrf52840/monteops_hw1/variant.h

@@ -50,12 +50,10 @@ extern "C" {
 
 // LEDs
 #define PIN_LED1 (35)
-#define PIN_LED2 (36) // Connected to WWAN host LED (if present)
-
-#define LED_CONN PIN_LED2
+#define LED_BLUE (36) // Connected to WWAN host LED (if present)
 
 #define LED_GREEN PIN_LED1
-#define LED_BLUE PIN_LED2
+#define LED_NOTIFICATION LED_BLUE
 
 #define LED_STATE_ON 1 // State when LED is litted
 
@@ -66,8 +64,6 @@ extern "C" {
 // #define PIN_BUTTON1 9 // Pin for button on E-ink button module or IO expansion
 #define BUTTON_NEED_PULLUP
 #define PIN_BUTTON2 12
-#define PIN_BUTTON3 24
-#define PIN_BUTTON4 25
 
 /*
  * Analog pins

variants/nrf52840/muzi_base/variant.cpp

@@ -63,8 +63,8 @@ void initVariant()
     pinMode(PIN_LED1, OUTPUT);
     digitalWrite(PIN_LED1, HIGH);
 
-    pinMode(PIN_LED2, OUTPUT);
-    digitalWrite(PIN_LED2, HIGH);
+    pinMode(LED_BLUE, OUTPUT);
+    digitalWrite(LED_BLUE, HIGH);
 
     // Initialize LoRa pins
     pinMode(SX126X_RESET, OUTPUT);

variants/nrf52840/muzi_base/variant.h

@@ -43,9 +43,9 @@ extern "C" {
 
 // LEDs
 #define PIN_LED1 (32 + 3) // P1.03, Green
-#define PIN_LED2 (32 + 4) // P1.04, Blue
+#define LED_BLUE (32 + 4) // P1.04, Blue
 
-#define LED_BLUE PIN_LED2
+#define LED_NOTIFICATION LED_BLUE
 #define LED_STATE_ON 0 // State when LED is lit
 
 // Buttons

variants/nrf52840/nano-g2-ultra/variant.h

@@ -41,17 +41,6 @@ extern "C" {
 #define NUM_ANALOG_INPUTS (1)
 #define NUM_ANALOG_OUTPUTS (0)
 
-// LEDs
-#define PIN_LED1 (-1)
-#define PIN_LED2 (-1)
-#define PIN_LED3 (-1)
-
-#define LED_RED PIN_LED3
-#define LED_BLUE PIN_LED1
-#define LED_GREEN PIN_LED2
-
-#define LED_CONN PIN_GREEN
-
 #define LED_STATE_ON 0 // State when LED is lit
 
 /*
@@ -152,8 +141,6 @@ External serial flash W25Q16JV_IQ
 #define PIN_SPI_MOSI (0 + 11)
 #define PIN_SPI_SCK (0 + 12)
 
-// #define PIN_PWR_EN (0 + 6)
-
 // To debug via the segger JLINK console rather than the CDC-ACM serial device
 // #define USE_SEGGER
 

variants/nrf52840/nrf52.ini

@@ -7,7 +7,7 @@ extends = arduino_base
 platform_packages =
   ; our custom Git version until they merge our PR
   # TODO renovate
-  platformio/framework-arduinoadafruitnrf52 @ https://github.com/meshtastic/Adafruit_nRF52_Arduino#c770c8a16a351b55b86e347a3d9d7b74ad0bbf39
+  platformio/framework-arduinoadafruitnrf52 @ https://github.com/meshtastic/Adafruit_nRF52_Arduino#74096746e5f167a2ff22e483d8e79bb1aef00591
   ; Don't renovate toolchain-gccarmnoneeabi
   platformio/toolchain-gccarmnoneeabi@~1.90301.0
 

variants/nrf52840/r1-neo/variant.cpp

@@ -36,9 +36,6 @@ void initVariant()
     pinMode(PIN_LED1, OUTPUT);
     ledOff(PIN_LED1);
 
-    pinMode(PIN_LED2, OUTPUT);
-    ledOff(PIN_LED2);
-
     // 3V3 Power Rail
     // pinMode(PIN_3V3_EN, OUTPUT);
     // digitalWrite(PIN_3V3_EN, HIGH);

variants/nrf52840/r1-neo/variant.h

@@ -45,12 +45,10 @@ extern "C" {
 
 // LEDs
 #define PIN_LED1 (32 + 4) // P1.04 Controls Green LED
-#define PIN_LED2 (28)     // P0.28 Controls Blue LED
-
-#define LED_CONN PIN_LED2
+#define LED_BLUE (28)     // P0.28 Controls Blue LED
 
 #define LED_GREEN PIN_LED1
-#define LED_BLUE PIN_LED2
+#define LED_NOTIFICATION LED_BLUE
 
 #define LED_STATE_ON 1 // State when LED is litted
 

variants/nrf52840/rak2560/variant.cpp

@@ -36,9 +36,6 @@ void initVariant()
     pinMode(PIN_LED1, OUTPUT);
     ledOff(PIN_LED1);
 
-    pinMode(PIN_LED2, OUTPUT);
-    ledOff(PIN_LED2);
-
     // 3V3 Power Rail
     pinMode(PIN_3V3_EN, OUTPUT);
     digitalWrite(PIN_3V3_EN, HIGH);

variants/nrf52840/rak2560/variant.h

@@ -46,12 +46,10 @@ extern "C" {
 
 // LEDs
 #define PIN_LED1 (35)
-#define PIN_LED2 (36)
-
-#define LED_CONN PIN_LED2
+#define LED_BLUE (36)
 
 #define LED_GREEN PIN_LED1
-#define LED_BLUE PIN_LED2
+#define LED_NOTIFICATION LED_BLUE
 
 #define LED_STATE_ON 1 // State when LED is litted
 
@@ -62,8 +60,6 @@ extern "C" {
 #define PIN_BUTTON1 9 // Pin for button on E-ink button module or IO expansion
 #define BUTTON_NEED_PULLUP
 #define PIN_BUTTON2 12
-#define PIN_BUTTON3 24
-#define PIN_BUTTON4 25
 
 /*
  * Analog pins

variants/nrf52840/rak3401_1watt/variant.cpp

@@ -36,9 +36,6 @@ void initVariant()
     pinMode(PIN_LED1, OUTPUT);
     ledOff(PIN_LED1);
 
-    pinMode(PIN_LED2, OUTPUT);
-    ledOff(PIN_LED2);
-
     // 3V3 Power Rail
     pinMode(PIN_3V3_EN, OUTPUT);
     digitalWrite(PIN_3V3_EN, HIGH);

variants/nrf52840/rak3401_1watt/variant.h

@@ -45,12 +45,10 @@ extern "C" {
 
 // LEDs
 #define PIN_LED1 (35)
-#define PIN_LED2 (36)
-
-#define LED_CONN PIN_LED2
+#define LED_BLUE (36)
 
 #define LED_GREEN PIN_LED1
-#define LED_BLUE PIN_LED2
+#define LED_NOTIFICATION LED_BLUE
 
 #define LED_STATE_ON 1 // State when LED is litted
 

variants/nrf52840/rak4631/variant.cpp

@@ -36,9 +36,6 @@ void initVariant()
     pinMode(PIN_LED1, OUTPUT);
     ledOff(PIN_LED1);
 
-    pinMode(PIN_LED2, OUTPUT);
-    ledOff(PIN_LED2);
-
     // 3V3 Power Rail
     pinMode(PIN_3V3_EN, OUTPUT);
     digitalWrite(PIN_3V3_EN, HIGH);

variants/nrf52840/rak4631/variant.h

@@ -45,12 +45,10 @@ extern "C" {
 
 // LEDs
 #define PIN_LED1 (35)
-#define PIN_LED2 (36)
-
-#define LED_CONN PIN_LED2
+#define LED_BLUE (36)
 
 #define LED_GREEN PIN_LED1
-#define LED_BLUE PIN_LED2
+#define LED_NOTIFICATION LED_BLUE
 
 #define LED_STATE_ON 1 // State when LED is litted
 
@@ -61,8 +59,6 @@ extern "C" {
 #define PIN_BUTTON1 9 // Pin for button on E-ink button module or IO expansion
 #define BUTTON_NEED_PULLUP
 #define PIN_BUTTON2 12
-#define PIN_BUTTON3 24
-#define PIN_BUTTON4 25
 
 /*
  * Analog pins

variants/nrf52840/rak4631_epaper/variant.cpp

@@ -36,9 +36,6 @@ void initVariant()
     pinMode(PIN_LED1, OUTPUT);
     ledOff(PIN_LED1);
 
-    pinMode(PIN_LED2, OUTPUT);
-    ledOff(PIN_LED2);
-
     // 3V3 Power Rail
     pinMode(PIN_3V3_EN, OUTPUT);
     digitalWrite(PIN_3V3_EN, HIGH);

variants/nrf52840/rak4631_epaper/variant.h

@@ -45,12 +45,10 @@ extern "C" {
 
 // LEDs
 #define PIN_LED1 (35)
-#define PIN_LED2 (36)
-
-#define LED_CONN PIN_LED2
+#define LED_BLUE (36)
 
 #define LED_GREEN PIN_LED1
-#define LED_BLUE PIN_LED2
+#define LED_NOTIFICATION LED_BLUE
 
 #define LED_STATE_ON 1 // State when LED is litted
 
@@ -61,8 +59,6 @@ extern "C" {
 #define PIN_BUTTON1 9 // Pin for button on E-ink button module or IO expansion
 #define BUTTON_NEED_PULLUP
 #define PIN_BUTTON2 12
-#define PIN_BUTTON3 24
-#define PIN_BUTTON4 25
 
 /*
  * Analog pins

variants/nrf52840/rak4631_epaper_onrxtx/variant.cpp

@@ -36,9 +36,6 @@ void initVariant()
     pinMode(PIN_LED1, OUTPUT);
     ledOff(PIN_LED1);
 
-    pinMode(PIN_LED2, OUTPUT);
-    ledOff(PIN_LED2);
-
     // 3V3 Power Rail
     pinMode(PIN_3V3_EN, OUTPUT);
     digitalWrite(PIN_3V3_EN, HIGH);

variants/nrf52840/rak4631_epaper_onrxtx/variant.h

@@ -27,12 +27,10 @@ extern "C" {
 
 // LEDs
 #define PIN_LED1 (35)
-#define PIN_LED2 (36)
-
-#define LED_CONN PIN_LED2
+#define LED_BLUE (36)
 
 #define LED_GREEN PIN_LED1
-#define LED_BLUE PIN_LED2
+#define LED_NOTIFICATION LED_BLUE
 
 #define LED_STATE_ON 1 // State when LED is litted
 

variants/nrf52840/rak4631_eth_gw/variant.cpp

@@ -36,9 +36,6 @@ void initVariant()
     pinMode(PIN_LED1, OUTPUT);
     ledOff(PIN_LED1);
 
-    pinMode(PIN_LED2, OUTPUT);
-    ledOff(PIN_LED2);
-
     // 3V3 Power Rail
     pinMode(PIN_3V3_EN, OUTPUT);
     digitalWrite(PIN_3V3_EN, HIGH);

variants/nrf52840/rak4631_eth_gw/variant.h

@@ -45,12 +45,10 @@ extern "C" {
 
 // LEDs
 #define PIN_LED1 (35)
-#define PIN_LED2 (36)
-
-#define LED_CONN PIN_LED2
+#define LED_BLUE (36)
 
 #define LED_GREEN PIN_LED1
-#define LED_BLUE PIN_LED2
+#define LED_NOTIFICATION LED_BLUE
 
 #define LED_STATE_ON 1 // State when LED is litted
 
@@ -61,8 +59,6 @@ extern "C" {
 #define PIN_BUTTON1 9 // Pin for button on E-ink button module or IO expansion
 #define BUTTON_NEED_PULLUP
 #define PIN_BUTTON2 12
-#define PIN_BUTTON3 24
-#define PIN_BUTTON4 25
 
 /*
  * Analog pins

variants/nrf52840/rak4631_nomadstar_meteor_pro/variant.cpp

@@ -36,9 +36,6 @@ void initVariant()
     pinMode(PIN_LED1, OUTPUT);
     ledOff(PIN_LED1);
 
-    pinMode(PIN_LED2, OUTPUT);
-    ledOff(PIN_LED2);
-
     // 3V3 Power Rail
     pinMode(PIN_3V3_EN, OUTPUT);
     digitalWrite(PIN_3V3_EN, HIGH);

variants/nrf52840/rak4631_nomadstar_meteor_pro/variant.h

@@ -45,12 +45,10 @@ extern "C" {
 
 // LEDs
 #define PIN_LED1 (35)
-#define PIN_LED2 (36)
-
-#define LED_CONN PIN_LED2
+#define LED_BLUE (36)
 
 #define LED_GREEN PIN_LED1
-#define LED_BLUE PIN_LED2
+#define LED_NOTIFICATION LED_BLUE
 
 #define LED_STATE_ON 1 // State when LED is litted
 
@@ -61,8 +59,6 @@ extern "C" {
 #define PIN_BUTTON1 9 // Pin for button on E-ink button module or IO expansion
 #define BUTTON_NEED_PULLUP
 #define PIN_BUTTON2 12
-#define PIN_BUTTON3 24
-#define PIN_BUTTON4 25
 
 /*
  * Analog pins

variants/nrf52840/rak_wismeshtag/variant.cpp

@@ -36,9 +36,6 @@ void initVariant()
     pinMode(PIN_LED1, OUTPUT);
     ledOff(PIN_LED1);
 
-    pinMode(PIN_LED2, OUTPUT);
-    ledOff(PIN_LED2);
-
     // 3V3 Power Rail
     pinMode(PIN_3V3_EN, OUTPUT);
     digitalWrite(PIN_3V3_EN, HIGH);

variants/nrf52840/rak_wismeshtag/variant.h

@@ -45,12 +45,10 @@ extern "C" {
 
 // LEDs
 #define PIN_LED1 (35)
-#define PIN_LED2 (36)
-
-#define LED_CONN PIN_LED2
+#define LED_BLUE (36)
 
 #define LED_GREEN PIN_LED1
-#define LED_BLUE PIN_LED2
+#define LED_NOTIFICATION LED_BLUE
 
 #define LED_STATE_ON 1 // State when LED is litted
 
@@ -61,8 +59,6 @@ extern "C" {
 #define PIN_BUTTON1 9 // Pin for button on E-ink button module or IO expansion
 #define BUTTON_NEED_PULLUP
 #define PIN_BUTTON2 12
-#define PIN_BUTTON3 24
-#define PIN_BUTTON4 25
 
 /*
  * Analog pins

variants/nrf52840/rak_wismeshtap/variant.cpp

@@ -36,9 +36,6 @@ void initVariant()
     pinMode(PIN_LED1, OUTPUT);
     ledOff(PIN_LED1);
 
-    pinMode(PIN_LED2, OUTPUT);
-    ledOff(PIN_LED2);
-
     // 3V3 Power Rail
     pinMode(PIN_3V3_EN, OUTPUT);
     digitalWrite(PIN_3V3_EN, HIGH);

variants/nrf52840/rak_wismeshtap/variant.h

@@ -45,12 +45,10 @@ extern "C" {
 
 // LEDs
 #define PIN_LED1 (35)
-#define PIN_LED2 (36)
-
-#define LED_CONN PIN_LED2
+#define LED_BLUE (36)
 
 #define LED_GREEN PIN_LED1
-#define LED_BLUE PIN_LED2
+#define LED_NOTIFICATION LED_BLUE
 
 #define LED_STATE_ON 1 // State when LED is litted
 
@@ -61,8 +59,6 @@ extern "C" {
 #define PIN_BUTTON1 9 // Pin for button on E-ink button module or IO expansion such as the RAK14014 or RAK14015 TFT modules
 #define BUTTON_NEED_PULLUP
 #define PIN_BUTTON2 12
-#define PIN_BUTTON3 24
-#define PIN_BUTTON4 25
 
 /*
  * Analog pins
@@ -282,7 +278,6 @@ SO GPIO 39/TXEN MAY NOT BE DEFINED FOR SUCCESSFUL OPERATION OF THE SX1262 - TG
 
 #define RAK14014 // Tell it we have a RAK14014
 #define USER_SETUP_LOADED 1
-#define DISABLE_ALL_LIBRARY_WARNINGS 1
 #define ST7789_DRIVER 1
 #define TFT_WIDTH 240
 #define TFT_HEIGHT 320
@@ -310,7 +305,6 @@ SO GPIO 39/TXEN MAY NOT BE DEFINED FOR SUCCESSFUL OPERATION OF THE SX1262 - TG
 #define USE_POWERSAVE
 #define SLEEP_TIME 120
 
-#define CANNED_MESSAGE_MODULE_ENABLE 1
 #define USE_VIRTUAL_KEYBOARD 1
 /*----------------------------------------------------------------------------
  *        Arduino objects - C++ only

variants/nrf52840/seeed_solar_node/variant.h

@@ -23,11 +23,8 @@
 #define PIN_LED1 (12) // LED        P1.15
 #define PIN_LED2 (11) //
 
-#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

variants/nrf52840/seeed_wio_tracker_L1/variant.h

@@ -23,12 +23,9 @@
 #define PIN_LED1 (11) // LED        P1.15
 #define PIN_LED2 (12) //
 
-#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
+#define LED_STATE_ON 1 // State when LED is lit
 // ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
 //  Button Configuration
 // ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
@@ -157,8 +154,6 @@ static const uint8_t SCL = PIN_WIRE_SCL;
 //  joystick
 // ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
 
-#define CANNED_MESSAGE_MODULE_ENABLE 1
-
 #define CANNED_MESSAGE_ADD_CONFIRMATION 1
 
 // trackball

variants/nrf52840/seeed_wio_tracker_L1_eink/variant.h

@@ -23,12 +23,9 @@
 #define PIN_LED1 (11) // LED        P1.15
 #define PIN_LED2 (12) //
 
-#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
+#define LED_STATE_ON 1 // State when LED is lit
 // ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
 //  Button Configuration
 // ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
@@ -176,7 +173,6 @@ static const uint8_t SCL = PIN_WIRE_SCL;
 #define TB_PRESS 29
 #define TB_DIRECTION FALLING
 
-#define CANNED_MESSAGE_MODULE_ENABLE 1
 #define CANNED_MESSAGE_ADD_CONFIRMATION 1
 
 // ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━

variants/nrf52840/seeed_xiao_nrf52840_kit/variant.h

@@ -69,9 +69,6 @@ static const uint8_t A5 = PIN_A5;
 #define PIN_LED2 LED_BLUE
 #define PIN_LED3 LED_RED
 
-#define LED_PWR LED_RED
-#define USER_LED LED_BLUE
-
 /*
  * Buttons
  */

variants/nrf52840/t-echo-lite/variant.h

@@ -52,7 +52,6 @@ extern "C" {
 
 #define BLE_LED LED_BLUE
 #define BLE_LED_INVERTED 1
-#define LED_CONN LED_GREEN
 #define LED_STATE_ON 0 // State when LED is lit
 
 // Buttons

variants/nrf52840/t-echo-plus/variant.h

@@ -25,8 +25,6 @@ extern "C" {
 #define LED_BLUE PIN_LED1
 #define LED_GREEN PIN_LED2
 
-#define LED_CONN LED_GREEN
-
 #define LED_STATE_ON 0
 
 // Buttons / touch

variants/nrf52840/t-echo/variant.h

@@ -52,8 +52,6 @@ extern "C" {
 #define LED_BLUE PIN_LED1
 #define LED_GREEN PIN_LED2
 
-#define LED_CONN PIN_GREEN
-
 #define LED_STATE_ON 0 // State when LED is lit
 
 /*
@@ -163,7 +161,6 @@ External serial flash WP25R1635FZUIL0
 
 // Controls power for all peripherals (eink + GPS + LoRa + Sensor)
 #define PIN_POWER_EN (0 + 12)
-// #define PIN_POWER_EN1 (0 + 13)
 
 #define PIN_SPI1_MISO                                                                                                            \
     (32 + 7) // FIXME not really needed, but for now the SPI code requires something to be defined, pick an used GPIO

variants/nrf52840/wio-tracker-wm1110/variant.cpp

@@ -36,9 +36,6 @@ void initVariant()
     pinMode(PIN_LED1, OUTPUT);
     ledOff(PIN_LED1);
 
-    pinMode(PIN_LED2, OUTPUT);
-    ledOff(PIN_LED2);
-
     // 3V3 Power Rail
     pinMode(PIN_3V3_EN, OUTPUT);
     digitalWrite(PIN_3V3_EN, HIGH);

variants/nrf52840/wio-tracker-wm1110/variant.h

@@ -51,11 +51,8 @@ extern "C" {
 #define PIN_WIRE_SDA (0 + 5) // P0.05
 #define PIN_WIRE_SCL (0 + 4) // P0.04
 
-#define PIN_LED1 (0 + 6)      // P0.06
-#define PIN_LED2 (PINS_COUNT) // P0.14
-
+#define PIN_LED1 (0 + 6) // P0.06
 #define LED_GREEN PIN_LED1
-#define LED_BLUE PIN_LED2
 
 #define LED_STATE_ON 0
 

variants/rp2040/rak11310/pins_arduino.h

@@ -25,7 +25,7 @@ static const uint8_t A3 = PIN_A3;
 // LEDs
 #define PIN_LED (23u)
 #define PIN_LED1 PIN_LED
-#define PIN_LED2 (24u)
+#define LED_NOTIFICATION (24u)
 
 #define ADC_RESOLUTION 12
 

variants/rp2040/rak11310/variant.h

@@ -10,7 +10,6 @@
 #define I2C_SDA1 2
 #define I2C_SCL1 3
 
-#define LED_CONN PIN_LED2
 #define LED_PIN PIN_LED
 #define ledOff(pin) pinMode(pin, INPUT)
 

variants/stm32/milesight_gs301/platformio.ini

@@ -0,0 +1,24 @@
+; Milesight GS301 Bathroom Odor Detector
+; https://www.milesight.com/iot/product/lorawan-sensor/gs301
+[env:milesight_gs301]
+extends = stm32_base
+board = wiscore_rak3172 ; Convenient choice as the same USART is used for programming/debug
+board_level = extra
+board_upload.maximum_size = 233472 ; reserve the last 28KB for filesystem
+build_flags =
+  ${stm32_base.build_flags}
+  -Ivariants/stm32/milesight_gs301
+  -DPRIVATE_HW
+  -DMESHTASTIC_EXCLUDE_GPS=1
+  -DMESHTASTIC_EXCLUDE_I2C=1 # Analog ADuCM355 (unsupported) so no point building support for I2C in
+  -DMESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR=1
+  -DMESHTASTIC_EXCLUDE_AIR_QUALITY_SENSOR=1
+build_unflags =
+  -DDEBUG_MUTE # We have space for debug output until sensor support is added
+build_src_filter =
+  ${stm32_base.build_src_filter}
+  +<../variants/stm32/milesight_gs301>
+lib_deps =
+  ${stm32_base.lib_deps}
+
+upload_port = stlink