Move pb string length method and fix linker error

Refactor test utilities to use portable delay function and include necessary headers
Apply suggestion from @Copilot
2026-02-09 10:32:05 +00:00 · 2026-02-08 10:14:40 -06:00 · 2026-02-08 09:42:05 -06:00 · 2026-02-08 08:35:20 -06:00 · 2026-02-08 08:54:15 -05:00 · 2026-02-08 07:08:09 -06:00
56 changed files with 2122 additions and 480 deletions
--- a/.trunk/trunk.yaml
+++ b/.trunk/trunk.yaml
@@ -8,18 +8,18 @@ plugins:
      uri: https://github.com/trunk-io/plugins
 lint:
  enabled:
-    - checkov@3.2.497
-    - renovate@42.84.2
-    - prettier@3.8.0
-    - trufflehog@3.92.5
+    - checkov@3.2.500
+    - renovate@43.4.0
+    - prettier@3.8.1
+    - trufflehog@3.93.0
    - yamllint@1.38.0
    - bandit@1.9.3
-    - trivy@0.68.2
+    - trivy@0.69.1
    - taplo@0.10.0
-    - ruff@0.14.13
+    - ruff@0.15.0
    - isort@7.0.0
    - markdownlint@0.47.0
-    - oxipng@10.0.0
+    - oxipng@10.1.0
    - svgo@4.0.0
    - actionlint@1.7.10
    - flake8@7.3.0
--- a/platformio.ini
+++ b/platformio.ini
@@ -66,7 +66,7 @@ monitor_speed = 115200
 monitor_filters = direct
 lib_deps =
 	# renovate: datasource=git-refs depName=meshtastic-esp8266-oled-ssd1306 packageName=https://github.com/meshtastic/esp8266-oled-ssd1306 gitBranch=master
-	https://github.com/meshtastic/esp8266-oled-ssd1306/archive/b34c6817c25d6faabb3a8a162b5d14fb75395433.zip
+	https://github.com/meshtastic/esp8266-oled-ssd1306/archive/21e484f409cde18d44012caef84c244eb5ca28f3.zip
 	# renovate: datasource=git-refs depName=meshtastic-OneButton packageName=https://github.com/meshtastic/OneButton gitBranch=master
 	https://github.com/meshtastic/OneButton/archive/fa352d668c53f290cfa480a5f79ad422cd828c70.zip
 	# renovate: datasource=git-refs depName=meshtastic-arduino-fsm packageName=https://github.com/meshtastic/arduino-fsm gitBranch=master
@@ -120,7 +120,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/63967a4a557d33d56fc5746f9128200dde2d88c5.zip
+	https://github.com/meshtastic/device-ui/archive/6c75195e9987b7a49563232234f2f868dd343cae.zip

 ; Common libs for environmental measurements in telemetry module
 [environmental_base]
@@ -144,7 +144,7 @@ lib_deps =
 	# renovate: datasource=custom.pio depName=Adafruit INA219 packageName=adafruit/library/Adafruit INA219
 	adafruit/Adafruit INA219@1.2.3
 	# renovate: datasource=custom.pio depName=Adafruit MPU6050 packageName=adafruit/library/Adafruit MPU6050
-	adafruit/Adafruit MPU6050@2.2.6
+	adafruit/Adafruit MPU6050@2.2.8
 	# renovate: datasource=custom.pio depName=Adafruit LIS3DH packageName=adafruit/library/Adafruit LIS3DH
 	adafruit/Adafruit LIS3DH@1.3.0
 	# renovate: datasource=custom.pio depName=Adafruit AHTX0 packageName=adafruit/library/Adafruit AHTX0
@@ -213,6 +213,7 @@ lib_deps =
 	sensirion/Sensirion Core@0.7.2
 	# renovate: datasource=custom.pio depName=Sensirion I2C SCD4x packageName=sensirion/library/Sensirion I2C SCD4x
 	sensirion/Sensirion I2C SCD4x@1.1.0
+
 ; Same as environmental_extra but without BSEC (saves ~3.5KB DRAM for original ESP32 targets)
 [environmental_extra_no_bsec]
 lib_deps =
@@ -239,4 +240,4 @@ lib_deps =
 	# renovate: datasource=custom.pio depName=Sensirion Core packageName=sensirion/library/Sensirion Core
 	sensirion/Sensirion Core@0.7.2
 	# renovate: datasource=custom.pio depName=Sensirion I2C SCD4x packageName=sensirion/library/Sensirion I2C SCD4x
-	sensirion/Sensirion I2C SCD4x@1.1.0
+	sensirion/Sensirion I2C SCD4x@1.1.0
--- a/2
+++ b/2
--- a/src/configuration.h
+++ b/src/configuration.h
@@ -241,6 +241,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define BQ27220_ADDR 0x55 // same address as TDECK_KB
 #define BQ25896_ADDR 0x6B
 #define LTR553ALS_ADDR 0x23
+#define SEN5X_ADDR 0x69

 // -----------------------------------------------------------------------------
 // ACCELEROMETER
--- a/src/detect/ScanI2C.h
+++ b/src/detect/ScanI2C.h
@@ -88,7 +88,8 @@ class ScanI2C
        BH1750,
        DA217,
        CHSC6X,
-        CST226SE
+        CST226SE,
+        SEN5X
    } DeviceType;

    // typedef uint8_t DeviceAddress;
--- a/src/detect/ScanI2CTwoWire.cpp
+++ b/src/detect/ScanI2CTwoWire.cpp
@@ -8,6 +8,7 @@
 #endif
 #if !defined(ARCH_PORTDUINO) && !defined(ARCH_STM32WL)
 #include "meshUtils.h" // vformat
+
 #endif

 bool in_array(uint8_t *array, int size, uint8_t lookfor)
@@ -114,6 +115,45 @@ uint16_t ScanI2CTwoWire::getRegisterValue(const ScanI2CTwoWire::RegisterLocation
    return value;
 }

+/// for SEN5X detection
+// Note, this code needs to be called before setting the I2C bus speed
+// for the screen at high speed. The speed needs to be at 100kHz, otherwise
+// detection will not work
+String readSEN5xProductName(TwoWire *i2cBus, uint8_t address)
+{
+    uint8_t cmd[] = {0xD0, 0x14};
+    uint8_t response[48] = {0};
+
+    i2cBus->beginTransmission(address);
+    i2cBus->write(cmd, 2);
+    if (i2cBus->endTransmission() != 0)
+        return "";
+
+    delay(20);
+    if (i2cBus->requestFrom(address, (uint8_t)48) != 48)
+        return "";
+
+    for (int i = 0; i < 48 && i2cBus->available(); ++i) {
+        response[i] = i2cBus->read();
+    }
+
+    char productName[33] = {0};
+    int j = 0;
+    for (int i = 0; i < 48 && j < 32; i += 3) {
+        if (response[i] >= 32 && response[i] <= 126)
+            productName[j++] = response[i];
+        else
+            break;
+
+        if (response[i + 1] >= 32 && response[i + 1] <= 126)
+            productName[j++] = response[i + 1];
+        else
+            break;
+    }
+
+    return String(productName);
+}
+
 #define SCAN_SIMPLE_CASE(ADDR, T, ...)                                                                                           \
    case ADDR:                                                                                                                   \
        logFoundDevice(__VA_ARGS__);                                                                                             \
@@ -568,8 +608,9 @@ void ScanI2CTwoWire::scanPort(I2CPort port, uint8_t *address, uint8_t asize)
                }
                break;

-            case ICM20948_ADDR:     // same as BMX160_ADDR
+            case ICM20948_ADDR:     // same as BMX160_ADDR and SEN5X_ADDR
            case ICM20948_ADDR_ALT: // same as MPU6050_ADDR
+                // ICM20948 Register check
                registerValue = getRegisterValue(ScanI2CTwoWire::RegisterLocation(addr, 0x00), 1);
 #ifdef HAS_ICM20948
                type = ICM20948;
@@ -580,14 +621,31 @@ void ScanI2CTwoWire::scanPort(I2CPort port, uint8_t *address, uint8_t asize)
                    type = ICM20948;
                    logFoundDevice("ICM20948", (uint8_t)addr.address);
                    break;
-                } else if (addr.address == BMX160_ADDR) {
-                    type = BMX160;
-                    logFoundDevice("BMX160", (uint8_t)addr.address);
-                    break;
                } else {
-                    type = MPU6050;
-                    logFoundDevice("MPU6050", (uint8_t)addr.address);
-                    break;
+                    String prod = "";
+                    prod = readSEN5xProductName(i2cBus, addr.address);
+                    if (prod.startsWith("SEN55")) {
+                        type = SEN5X;
+                        logFoundDevice("Sensirion SEN55", addr.address);
+                        break;
+                    } else if (prod.startsWith("SEN54")) {
+                        type = SEN5X;
+                        logFoundDevice("Sensirion SEN54", addr.address);
+                        break;
+                    } else if (prod.startsWith("SEN50")) {
+                        type = SEN5X;
+                        logFoundDevice("Sensirion SEN50", addr.address);
+                        break;
+                    }
+                    if (addr.address == BMX160_ADDR) {
+                        type = BMX160;
+                        logFoundDevice("BMX160", (uint8_t)addr.address);
+                        break;
+                    } else {
+                        type = MPU6050;
+                        logFoundDevice("MPU6050", (uint8_t)addr.address);
+                        break;
+                    }
                }
                break;

--- a/src/detect/reClockI2C.cpp
+++ b/src/detect/reClockI2C.cpp
@@ -0,0 +1,31 @@
+#include "reClockI2C.h"
+#include "ScanI2CTwoWire.h"
+
+uint32_t reClockI2C(uint32_t desiredClock, TwoWire *i2cBus, bool force)
+{
+
+    uint32_t currentClock = 0;
+
+    /* See https://github.com/arduino/Arduino/issues/11457
+      Currently, only ESP32 can getClock()
+      While all cores can setClock()
+      https://github.com/sandeepmistry/arduino-nRF5/blob/master/libraries/Wire/Wire.h#L50
+      https://github.com/earlephilhower/arduino-pico/blob/master/libraries/Wire/src/Wire.h#L60
+      https://github.com/stm32duino/Arduino_Core_STM32/blob/main/libraries/Wire/src/Wire.h#L103
+      For cases when I2C speed is different to the ones defined by sensors (see defines in sensor classes)
+      we need to reclock I2C and set it back to the previous desired speed.
+      Only for cases where we can know OR predefine the speed, we can do this.
+    */
+
+// TODO add getClock function or return a predefined clock speed per variant?
+#ifdef CAN_RECLOCK_I2C
+    currentClock = i2cBus->getClock();
+#endif
+
+    if ((currentClock != desiredClock) || force) {
+        LOG_DEBUG("Changing I2C clock to %u", desiredClock);
+        i2cBus->setClock(desiredClock);
+    }
+
+    return currentClock;
+}
--- a/src/detect/reClockI2C.h
+++ b/src/detect/reClockI2C.h
@@ -1,41 +1,11 @@
-#ifdef CAN_RECLOCK_I2C
+
+#ifndef RECLOCK_I2C_
+#define RECLOCK_I2C_
+
 #include "ScanI2CTwoWire.h"
+#include <Wire.h>
+#include <stdint.h>

-uint32_t reClockI2C(uint32_t desiredClock, TwoWire *i2cBus)
-{
+uint32_t reClockI2C(uint32_t desiredClock, TwoWire *i2cBus, bool force);

-    uint32_t currentClock;
-
-    /* See https://github.com/arduino/Arduino/issues/11457
-      Currently, only ESP32 can getClock()
-      While all cores can setClock()
-      https://github.com/sandeepmistry/arduino-nRF5/blob/master/libraries/Wire/Wire.h#L50
-      https://github.com/earlephilhower/arduino-pico/blob/master/libraries/Wire/src/Wire.h#L60
-      https://github.com/stm32duino/Arduino_Core_STM32/blob/main/libraries/Wire/src/Wire.h#L103
-      For cases when I2C speed is different to the ones defined by sensors (see defines in sensor classes)
-      we need to reclock I2C and set it back to the previous desired speed.
-      Only for cases where we can know OR predefine the speed, we can do this.
-    */
-
-#ifdef ARCH_ESP32
-    currentClock = i2cBus->getClock();
-#elif defined(ARCH_NRF52)
-    // TODO add getClock function or return a predefined clock speed per variant?
-    return 0;
-#elif defined(ARCH_RP2040)
-    // TODO add getClock function or return a predefined clock speed per variant
-    return 0;
-#elif defined(ARCH_STM32WL)
-    // TODO add getClock function or return a predefined clock speed per variant
-    return 0;
-#else
-    return 0;
-#endif
-
-    if (currentClock != desiredClock) {
-        LOG_DEBUG("Changing I2C clock to %u", desiredClock);
-        i2cBus->setClock(desiredClock);
-    }
-    return currentClock;
-}
 #endif
--- a/src/gps/RTC.cpp
+++ b/src/gps/RTC.cpp
@@ -72,11 +72,13 @@ RTCSetResult readFromRTC()
 #elif defined(PCF8563_RTC) || defined(PCF85063_RTC)
 #if defined(PCF8563_RTC)
    if (rtc_found.address == PCF8563_RTC) {
+        SensorPCF8563 rtc;
 #elif defined(PCF85063_RTC)
    if (rtc_found.address == PCF85063_RTC) {
+        SensorPCF85063 rtc;
+
 #endif
        uint32_t now = millis();
-        SensorRtcHelper rtc;

 #if WIRE_INTERFACES_COUNT == 2
        rtc.begin(rtc_found.port == ScanI2C::I2CPort::WIRE1 ? Wire1 : Wire);
@@ -240,10 +242,12 @@ RTCSetResult perhapsSetRTC(RTCQuality q, const struct timeval *tv, bool forceUpd
 #elif defined(PCF8563_RTC) || defined(PCF85063_RTC)
 #if defined(PCF8563_RTC)
        if (rtc_found.address == PCF8563_RTC) {
+            SensorPCF8563 rtc;
 #elif defined(PCF85063_RTC)
        if (rtc_found.address == PCF85063_RTC) {
+            SensorPCF85063 rtc;
+
 #endif
-            SensorRtcHelper rtc;

 #if WIRE_INTERFACES_COUNT == 2
            rtc.begin(rtc_found.port == ScanI2C::I2CPort::WIRE1 ? Wire1 : Wire);
--- a/src/graphics/draw/MenuHandler.cpp
+++ b/src/graphics/draw/MenuHandler.cpp
@@ -58,7 +58,7 @@ BannerOverlayOptions createStaticBannerOptions(const char *message, const MenuOp

 } // namespace

-menuHandler::screenMenus menuHandler::menuQueue = menu_none;
+menuHandler::screenMenus menuHandler::menuQueue = MenuNone;
 uint32_t menuHandler::pickedNodeNum = 0;
 bool test_enabled = false;
 uint8_t test_count = 0;
@@ -66,7 +66,7 @@ uint8_t test_count = 0;
 void menuHandler::loraMenu()
 {
    static const char *optionsArray[] = {"Back", "Device Role", "Radio Preset", "Frequency Slot", "LoRa Region"};
-    enum optionsNumbers { Back = 0, device_role_picker = 1, radio_preset_picker = 2, frequency_slot = 3, lora_picker = 4 };
+    enum optionsNumbers { Back = 0, DeviceRolePicker = 1, RadioPresetPicker = 2, FrequencySlot = 3, LoraPicker = 4 };
    BannerOverlayOptions bannerOptions;
    bannerOptions.message = "LoRa Actions";
    bannerOptions.optionsArrayPtr = optionsArray;
@@ -74,14 +74,14 @@ void menuHandler::loraMenu()
    bannerOptions.bannerCallback = [](int selected) -> void {
        if (selected == Back) {
            // No action
-        } else if (selected == device_role_picker) {
-            menuHandler::menuQueue = menuHandler::device_role_picker;
-        } else if (selected == radio_preset_picker) {
-            menuHandler::menuQueue = menuHandler::radio_preset_picker;
-        } else if (selected == frequency_slot) {
-            menuHandler::menuQueue = menuHandler::frequency_slot;
-        } else if (selected == lora_picker) {
-            menuHandler::menuQueue = menuHandler::lora_picker;
+        } else if (selected == DeviceRolePicker) {
+            menuHandler::menuQueue = menuHandler::DeviceRolePicker;
+        } else if (selected == RadioPresetPicker) {
+            menuHandler::menuQueue = menuHandler::RadioPresetPicker;
+        } else if (selected == FrequencySlot) {
+            menuHandler::menuQueue = menuHandler::FrequencySlot;
+        } else if (selected == LoraPicker) {
+            menuHandler::menuQueue = menuHandler::LoraPicker;
        }
    };
    screen->showOverlayBanner(bannerOptions);
@@ -102,7 +102,7 @@ void menuHandler::OnboardMessage()
    bannerOptions.optionsArrayPtr = optionsArray;
    bannerOptions.optionsCount = 2;
    bannerOptions.bannerCallback = [](int selected) -> void {
-        menuHandler::menuQueue = menuHandler::no_timeout_lora_picker;
+        menuHandler::menuQueue = menuHandler::NoTimeoutLoraPicker;
        screen->runNow();
    };
    screen->showOverlayBanner(bannerOptions);
@@ -216,7 +216,7 @@ void menuHandler::LoraRegionPicker(uint32_t duration)
    screen->showOverlayBanner(bannerOptions);
 }

-void menuHandler::DeviceRolePicker()
+void menuHandler::deviceRolePicker()
 {
    static const char *optionsArray[] = {"Back", "Client", "Client Mute", "Lost and Found", "Tracker"};
    enum optionsNumbers {
@@ -232,7 +232,7 @@ void menuHandler::DeviceRolePicker()
    bannerOptions.optionsCount = 5;
    bannerOptions.bannerCallback = [](int selected) -> void {
        if (selected == Back) {
-            menuHandler::menuQueue = menuHandler::lora_Menu;
+            menuHandler::menuQueue = menuHandler::LoraMenu;
            screen->runNow();
            return;
        } else if (selected == devicerole_client) {
@@ -300,7 +300,7 @@ void menuHandler::FrequencySlotPicker()

    bannerOptions.bannerCallback = [](int selected) -> void {
        if (selected == Back) {
-            menuHandler::menuQueue = menuHandler::lora_Menu;
+            menuHandler::menuQueue = menuHandler::LoraMenu;
            screen->runNow();
            return;
        }
@@ -313,7 +313,7 @@ void menuHandler::FrequencySlotPicker()
    screen->showOverlayBanner(bannerOptions);
 }

-void menuHandler::RadioPresetPicker()
+void menuHandler::radioPresetPicker()
 {
    static const RadioPresetOption presetOptions[] = {
        {"Back", OptionsAction::Back},
@@ -333,7 +333,7 @@ void menuHandler::RadioPresetPicker()
    auto bannerOptions =
        createStaticBannerOptions("Radio Preset", presetOptions, presetLabels, [](const RadioPresetOption &option, int) -> void {
            if (option.action == OptionsAction::Back) {
-                menuHandler::menuQueue = menuHandler::lora_Menu;
+                menuHandler::menuQueue = menuHandler::LoraMenu;
                screen->runNow();
                return;
            }
@@ -352,7 +352,7 @@ void menuHandler::RadioPresetPicker()
    screen->showOverlayBanner(bannerOptions);
 }

-void menuHandler::TwelveHourPicker()
+void menuHandler::twelveHourPicker()
 {
    static const char *optionsArray[] = {"Back", "12-hour", "24-hour"};
    enum optionsNumbers { Back = 0, twelve = 1, twentyfour = 2 };
@@ -362,7 +362,7 @@ void menuHandler::TwelveHourPicker()
    bannerOptions.optionsCount = 3;
    bannerOptions.bannerCallback = [](int selected) -> void {
        if (selected == Back) {
-            menuHandler::menuQueue = menuHandler::clock_menu;
+            menuHandler::menuQueue = menuHandler::ClockMenu;
            screen->runNow();
        } else if (selected == twelve) {
            config.display.use_12h_clock = true;
@@ -390,7 +390,7 @@ void menuHandler::showConfirmationBanner(const char *message, std::function<void
    screen->showOverlayBanner(confirmBanner);
 }

-void menuHandler::ClockFacePicker()
+void menuHandler::clockFacePicker()
 {
    static const ClockFaceOption clockFaceOptions[] = {
        {"Back", OptionsAction::Back},
@@ -404,7 +404,7 @@ void menuHandler::ClockFacePicker()
    auto bannerOptions = createStaticBannerOptions("Which Face?", clockFaceOptions, clockFaceLabels,
                                                   [](const ClockFaceOption &option, int) -> void {
                                                       if (option.action == OptionsAction::Back) {
-                                                           menuHandler::menuQueue = menuHandler::clock_menu;
+                                                           menuHandler::menuQueue = menuHandler::ClockMenu;
                                                           screen->runNow();
                                                           return;
                                                       }
@@ -456,7 +456,7 @@ void menuHandler::TZPicker()
    auto bannerOptions = createStaticBannerOptions(
        "Pick Timezone", timezoneOptions, timezoneLabels, [](const TimezoneOption &option, int) -> void {
            if (option.action == OptionsAction::Back) {
-                menuHandler::menuQueue = menuHandler::clock_menu;
+                menuHandler::menuQueue = menuHandler::ClockMenu;
                screen->runNow();
                return;
            }
@@ -503,13 +503,13 @@ void menuHandler::clockMenu()
    bannerOptions.optionsCount = 4;
    bannerOptions.bannerCallback = [](int selected) -> void {
        if (selected == Clock) {
-            menuHandler::menuQueue = menuHandler::clock_face_picker;
+            menuHandler::menuQueue = menuHandler::ClockFacePicker;
            screen->runNow();
        } else if (selected == Time) {
-            menuHandler::menuQueue = menuHandler::twelve_hour_picker;
+            menuHandler::menuQueue = menuHandler::TwelveHourPicker;
            screen->runNow();
        } else if (selected == Timezone) {
-            menuHandler::menuQueue = menuHandler::TZ_picker;
+            menuHandler::menuQueue = menuHandler::TzPicker;
            screen->runNow();
        }
    };
@@ -572,12 +572,12 @@ void menuHandler::messageResponseMenu()
        LOG_DEBUG("[ReplyCtx] mode=%d ch=%d peer=0x%08x", (int)mode, ch, (unsigned int)peer);

        if (selected == ViewMode) {
-            menuHandler::menuQueue = menuHandler::message_viewmode_menu;
+            menuHandler::menuQueue = menuHandler::MessageViewModeMenu;
            screen->runNow();

            // Reply submenu
        } else if (selected == ReplyMenu) {
-            menuHandler::menuQueue = menuHandler::reply_menu;
+            menuHandler::menuQueue = menuHandler::ReplyMenu;
            screen->runNow();

        } else if (selected == MuteChannel) {
@@ -589,7 +589,7 @@ void menuHandler::messageResponseMenu()
            }

        } else if (selected == DeleteMenu) {
-            menuHandler::menuQueue = menuHandler::delete_messages_menu;
+            menuHandler::menuQueue = menuHandler::DeleteMessagesMenu;
            screen->runNow();

 #ifdef HAS_I2S
@@ -649,7 +649,7 @@ void menuHandler::replyMenu()
        uint32_t peer = graphics::MessageRenderer::getThreadPeer();

        if (selected == Back) {
-            menuHandler::menuQueue = menuHandler::message_response_menu;
+            menuHandler::menuQueue = menuHandler::MessageResponseMenu;
            screen->runNow();
            return;
        }
@@ -737,7 +737,7 @@ void menuHandler::deleteMessagesMenu()
        uint32_t peer = graphics::MessageRenderer::getThreadPeer();

        if (selected == Back) {
-            menuHandler::menuQueue = menuHandler::message_response_menu;
+            menuHandler::menuQueue = menuHandler::MessageResponseMenu;
            screen->runNow();
            return;
        }
@@ -901,7 +901,7 @@ void menuHandler::messageViewModeMenu()
    bannerOptions.bannerCallback = [=](int selected) -> void {
        LOG_DEBUG("messageViewModeMenu: selected=%d", selected);
        if (selected == -1) {
-            menuHandler::menuQueue = menuHandler::message_response_menu;
+            menuHandler::menuQueue = menuHandler::MessageResponseMenu;
            screen->runNow();
        } else if (selected == -2) {
            graphics::MessageRenderer::setThreadMode(graphics::MessageRenderer::ThreadMode::ALL);
@@ -1083,23 +1083,23 @@ void menuHandler::systemBaseMenu()
    bannerOptions.optionsEnumPtr = optionsEnumArray;
    bannerOptions.bannerCallback = [](int selected) -> void {
        if (selected == Notifications) {
-            menuHandler::menuQueue = menuHandler::buzzermodemenupicker;
+            menuHandler::menuQueue = menuHandler::BuzzerModeMenuPicker;
            screen->runNow();
        } else if (selected == ScreenOptions) {
-            menuHandler::menuQueue = menuHandler::screen_options_menu;
+            menuHandler::menuQueue = menuHandler::ScreenOptionsMenu;
            screen->runNow();
        } else if (selected == PowerMenu) {
-            menuHandler::menuQueue = menuHandler::power_menu;
+            menuHandler::menuQueue = menuHandler::PowerMenu;
            screen->runNow();
        } else if (selected == Test) {
-            menuHandler::menuQueue = menuHandler::test_menu;
+            menuHandler::menuQueue = menuHandler::TestMenu;
            screen->runNow();
        } else if (selected == Bluetooth) {
-            menuQueue = bluetooth_toggle_menu;
+            menuQueue = BluetoothToggleMenu;
            screen->runNow();
 #if HAS_WIFI && !defined(ARCH_PORTDUINO)
        } else if (selected == WiFiToggle) {
-            menuQueue = wifi_toggle_menu;
+            menuQueue = WifiToggleMenu;
            screen->runNow();
 #endif
        } else if (selected == Back && !test_enabled) {
@@ -1177,7 +1177,7 @@ void menuHandler::favoriteBaseMenu()
            evt.action = UIFrameEvent::Action::SWITCH_TO_TEXTMESSAGE;
            screen->handleUIFrameEvent(&evt);
        } else if (selected == Remove) {
-            menuHandler::menuQueue = menuHandler::remove_favorite;
+            menuHandler::menuQueue = menuHandler::RemoveFavorite;
            screen->runNow();
        } else if (selected == TraceRoute) {
            if (traceRouteModule) {
@@ -1238,15 +1238,15 @@ void menuHandler::positionBaseMenu()
        auto action = static_cast<PositionAction>(option.value);
        switch (action) {
        case PositionAction::GpsToggle:
-            menuQueue = gps_toggle_menu;
+            menuQueue = GpsToggleMenu;
            screen->runNow();
            break;
        case PositionAction::GpsFormat:
-            menuQueue = gps_format_menu;
+            menuQueue = GpsFormatMenu;
            screen->runNow();
            break;
        case PositionAction::CompassMenu:
-            menuQueue = compass_point_north_menu;
+            menuQueue = CompassPointNorthMenu;
            screen->runNow();
            break;
        case PositionAction::CompassCalibrate:
@@ -1255,15 +1255,15 @@ void menuHandler::positionBaseMenu()
            }
            break;
        case PositionAction::GPSSmartPosition:
-            menuQueue = gps_smart_position_menu;
+            menuQueue = GpsSmartPositionMenu;
            screen->runNow();
            break;
        case PositionAction::GPSUpdateInterval:
-            menuQueue = gps_update_interval_menu;
+            menuQueue = GpsUpdateIntervalMenu;
            screen->runNow();
            break;
        case PositionAction::GPSPositionBroadcast:
-            menuQueue = gps_position_broadcast_menu;
+            menuQueue = GpsPositionBroadcastMenu;
            screen->runNow();
            break;
        }
@@ -1303,13 +1303,13 @@ void menuHandler::nodeListMenu()
    bannerOptions.optionsEnumPtr = optionsEnumArray;
    bannerOptions.bannerCallback = [](int selected) -> void {
        if (selected == NodePicker) {
-            menuQueue = NodePicker_menu;
+            menuQueue = NodePickerMenu;
            screen->runNow();
        } else if (selected == Reset) {
-            menuQueue = reset_node_db_menu;
+            menuQueue = ResetNodeDbMenu;
            screen->runNow();
        } else if (selected == NodeNameLength) {
-            menuHandler::menuQueue = menuHandler::node_name_length_menu;
+            menuHandler::menuQueue = menuHandler::NodeNameLengthMenu;
            screen->runNow();
        }
    };
@@ -1330,12 +1330,12 @@ void menuHandler::NodePicker()
        menuHandler::pickedNodeNum = nodenum;
        // Keep UI favorite context in sync (used elsewhere for some node-based actions)
        graphics::UIRenderer::currentFavoriteNodeNum = nodenum;
-        menuQueue = Manage_Node_menu;
+        menuQueue = ManageNodeMenu;
        screen->runNow();
    });
 }

-void menuHandler::ManageNodeMenu()
+void menuHandler::manageNodeMenu()
 {
    // If we don't have a node selected yet, go fast exit
    auto node = nodeDB->getMeshNode(menuHandler::pickedNodeNum);
@@ -1391,7 +1391,7 @@ void menuHandler::ManageNodeMenu()
    bannerOptions.optionsEnumPtr = optionsEnumArray;
    bannerOptions.bannerCallback = [](int selected) -> void {
        if (selected == Back) {
-            menuQueue = node_base_menu;
+            menuQueue = NodeBaseMenu;
            screen->runNow();
            return;
        }
@@ -1483,7 +1483,7 @@ void menuHandler::nodeNameLengthMenu()
    auto bannerOptions = createStaticBannerOptions("Node Name Length", nodeNameOptions, nodeNameLabels,
                                                   [](const NodeNameOption &option, int) -> void {
                                                       if (option.action == OptionsAction::Back) {
-                                                           menuQueue = node_base_menu;
+                                                           menuQueue = NodeBaseMenu;
                                                           screen->runNow();
                                                           return;
                                                       }
@@ -1498,6 +1498,7 @@ void menuHandler::nodeNameLengthMenu()

                                                       config.display.use_long_node_name = option.value;
                                                       saveUIConfig();
+                                                       service->reloadConfig(SEGMENT_CONFIG);
                                                       LOG_INFO("Setting names to %s", option.value ? "long" : "short");
                                                   });

@@ -1528,7 +1529,7 @@ void menuHandler::resetNodeDBMenu()
            nodeDB->resetNodes(1);
            rebootAtMsec = (millis() + DEFAULT_REBOOT_SECONDS * 1000);
        } else if (selected == 0) {
-            menuQueue = node_base_menu;
+            menuQueue = NodeBaseMenu;
            screen->runNow();
        }
    };
@@ -1550,7 +1551,7 @@ void menuHandler::compassNorthMenu()
    auto bannerOptions = createStaticBannerOptions("North Directions?", compassOptions, compassLabels,
                                                   [](const CompassOption &option, int) -> void {
                                                       if (option.action == OptionsAction::Back) {
-                                                           menuQueue = position_base_menu;
+                                                           menuQueue = PositionBaseMenu;
                                                           screen->runNow();
                                                           return;
                                                       }
@@ -1595,7 +1596,7 @@ void menuHandler::GPSToggleMenu()
    auto bannerOptions =
        createStaticBannerOptions("Toggle GPS", gpsToggleOptions, toggleLabels, [](const GPSToggleOption &option, int) -> void {
            if (option.action == OptionsAction::Back) {
-                menuQueue = position_base_menu;
+                menuQueue = PositionBaseMenu;
                screen->runNow();
                return;
            }
@@ -1660,7 +1661,7 @@ void menuHandler::GPSFormatMenu()

    auto onSelection = [](const GPSFormatOption &option, int) -> void {
        if (option.action == OptionsAction::Back) {
-            menuQueue = position_base_menu;
+            menuQueue = PositionBaseMenu;
            screen->runNow();
            return;
        }
@@ -1715,7 +1716,7 @@ void menuHandler::GPSSmartPositionMenu()
    bannerOptions.optionsCount = 3;
    bannerOptions.bannerCallback = [](int selected) -> void {
        if (selected == 0) {
-            menuQueue = position_base_menu;
+            menuQueue = PositionBaseMenu;
            screen->runNow();
        } else if (selected == 1) {
            config.position.position_broadcast_smart_enabled = true;
@@ -1744,7 +1745,7 @@ void menuHandler::GPSUpdateIntervalMenu()
    bannerOptions.optionsCount = 16;
    bannerOptions.bannerCallback = [](int selected) -> void {
        if (selected == 0) {
-            menuQueue = position_base_menu;
+            menuQueue = PositionBaseMenu;
            screen->runNow();
        } else if (selected == 1) {
            config.position.gps_update_interval = 8;
@@ -1832,7 +1833,7 @@ void menuHandler::GPSPositionBroadcastMenu()
    bannerOptions.optionsCount = 17;
    bannerOptions.bannerCallback = [](int selected) -> void {
        if (selected == 0) {
-            menuQueue = position_base_menu;
+            menuQueue = PositionBaseMenu;
            screen->runNow();
        } else if (selected == 1) {
            config.position.position_broadcast_secs = 60;
@@ -1915,7 +1916,7 @@ void menuHandler::GPSPositionBroadcastMenu()

 #endif

-void menuHandler::BluetoothToggleMenu()
+void menuHandler::bluetoothToggleMenu()
 {
    static const char *optionsArray[] = {"Back", "Enabled", "Disabled"};
    BannerOverlayOptions bannerOptions;
@@ -2043,7 +2044,7 @@ void menuHandler::TFTColorPickerMenu(OLEDDisplay *display)
    auto bannerOptions = createStaticBannerOptions(
        "Select Screen Color", colorOptions, colorLabels, [display](const ScreenColorOption &option, int) -> void {
            if (option.action == OptionsAction::Back) {
-                menuQueue = system_base_menu;
+                menuQueue = SystemBaseMenu;
                screen->runNow();
                return;
            }
@@ -2138,7 +2139,7 @@ void menuHandler::rebootMenu()
            messageStore.saveToFlash();
            rebootAtMsec = millis() + DEFAULT_REBOOT_SECONDS * 1000;
        } else {
-            menuQueue = power_menu;
+            menuQueue = PowerMenu;
            screen->runNow();
        }
    };
@@ -2160,7 +2161,7 @@ void menuHandler::shutdownMenu()
            InputEvent event = {.inputEvent = (input_broker_event)INPUT_BROKER_SHUTDOWN, .kbchar = 0, .touchX = 0, .touchY = 0};
            inputBroker->injectInputEvent(&event);
        } else {
-            menuQueue = power_menu;
+            menuQueue = PowerMenu;
            screen->runNow();
        }
    };
@@ -2221,14 +2222,14 @@ void menuHandler::testMenu()
    bannerOptions.optionsEnumPtr = optionsEnumArray;
    bannerOptions.bannerCallback = [](int selected) -> void {
        if (selected == NumberPicker) {
-            menuQueue = number_test;
+            menuQueue = NumberTest;
            screen->runNow();
        } else if (selected == ShowChirpy) {
            screen->toggleFrameVisibility("chirpy");
            screen->setFrames(Screen::FOCUS_SYSTEM);

        } else {
-            menuQueue = system_base_menu;
+            menuQueue = SystemBaseMenu;
            screen->runNow();
        }
    };
@@ -2252,7 +2253,7 @@ void menuHandler::wifiBaseMenu()
    bannerOptions.optionsCount = 2;
    bannerOptions.bannerCallback = [](int selected) -> void {
        if (selected == Wifi_toggle) {
-            menuQueue = wifi_toggle_menu;
+            menuQueue = WifiToggleMenu;
            screen->runNow();
        }
    };
@@ -2301,9 +2302,9 @@ void menuHandler::screenOptionsMenu()
    hasSupportBrightness = false;
 #endif

-    enum optionsNumbers { Back, Brightness, ScreenColor, FrameToggles, DisplayUnits };
-    static const char *optionsArray[5] = {"Back"};
-    static int optionsEnumArray[5] = {Back};
+    enum optionsNumbers { Back, Brightness, ScreenColor, FrameToggles, DisplayUnits, MessageBubbles };
+    static const char *optionsArray[6] = {"Back"};
+    static int optionsEnumArray[6] = {Back};
    int options = 1;

    // Only show brightness for B&W displays
@@ -2325,6 +2326,9 @@ void menuHandler::screenOptionsMenu()
    optionsArray[options] = "Display Units";
    optionsEnumArray[options++] = DisplayUnits;

+    optionsArray[options] = "Message Bubbles";
+    optionsEnumArray[options++] = MessageBubbles;
+
    BannerOverlayOptions bannerOptions;
    bannerOptions.message = "Display Options";
    bannerOptions.optionsArrayPtr = optionsArray;
@@ -2332,10 +2336,10 @@ void menuHandler::screenOptionsMenu()
    bannerOptions.optionsEnumPtr = optionsEnumArray;
    bannerOptions.bannerCallback = [](int selected) -> void {
        if (selected == Brightness) {
-            menuHandler::menuQueue = menuHandler::brightness_picker;
+            menuHandler::menuQueue = menuHandler::BrightnessPicker;
            screen->runNow();
        } else if (selected == ScreenColor) {
-            menuHandler::menuQueue = menuHandler::tftcolormenupicker;
+            menuHandler::menuQueue = menuHandler::TftColorMenuPicker;
            screen->runNow();
        } else if (selected == FrameToggles) {
            menuHandler::menuQueue = menuHandler::FrameToggles;
@@ -2343,8 +2347,11 @@ void menuHandler::screenOptionsMenu()
        } else if (selected == DisplayUnits) {
            menuHandler::menuQueue = menuHandler::DisplayUnits;
            screen->runNow();
+        } else if (selected == MessageBubbles) {
+            menuHandler::menuQueue = menuHandler::MessageBubblesMenu;
+            screen->runNow();
        } else {
-            menuQueue = system_base_menu;
+            menuQueue = SystemBaseMenu;
            screen->runNow();
        }
    };
@@ -2380,16 +2387,16 @@ void menuHandler::powerMenu()
    bannerOptions.optionsEnumPtr = optionsEnumArray;
    bannerOptions.bannerCallback = [](int selected) -> void {
        if (selected == Reboot) {
-            menuHandler::menuQueue = menuHandler::reboot_menu;
+            menuHandler::menuQueue = menuHandler::RebootMenu;
            screen->runNow();
        } else if (selected == Shutdown) {
-            menuHandler::menuQueue = menuHandler::shutdown_menu;
+            menuHandler::menuQueue = menuHandler::ShutdownMenu;
            screen->runNow();
        } else if (selected == MUI) {
-            menuHandler::menuQueue = menuHandler::mui_picker;
+            menuHandler::menuQueue = menuHandler::MuiPicker;
            screen->runNow();
        } else {
-            menuQueue = system_base_menu;
+            menuQueue = SystemBaseMenu;
            screen->runNow();
        }
    };
@@ -2427,7 +2434,7 @@ void menuHandler::keyVerificationFinalPrompt()
    }
 }

-void menuHandler::FrameToggles_menu()
+void menuHandler::frameTogglesMenu()
 {
    enum optionsNumbers {
        Finish,
@@ -2571,7 +2578,7 @@ void menuHandler::FrameToggles_menu()
    screen->showOverlayBanner(bannerOptions);
 }

-void menuHandler::DisplayUnits_menu()
+void menuHandler::displayUnitsMenu()
 {
    enum optionsNumbers { Back, MetricUnits, ImperialUnits };

@@ -2592,7 +2599,34 @@ void menuHandler::DisplayUnits_menu()
            config.display.units = meshtastic_Config_DisplayConfig_DisplayUnits_IMPERIAL;
            service->reloadConfig(SEGMENT_CONFIG);
        } else {
-            menuHandler::menuQueue = menuHandler::screen_options_menu;
+            menuHandler::menuQueue = menuHandler::ScreenOptionsMenu;
+            screen->runNow();
+        }
+    };
+    screen->showOverlayBanner(bannerOptions);
+}
+
+void menuHandler::messageBubblesMenu()
+{
+    enum optionsNumbers { Back, ShowBubbles, HideBubbles };
+
+    static const char *optionsArray[] = {"Back", "Show Bubbles", "Hide Bubbles"};
+    BannerOverlayOptions bannerOptions;
+    bannerOptions.message = "Message Bubbles";
+    bannerOptions.optionsArrayPtr = optionsArray;
+    bannerOptions.optionsCount = 3;
+    bannerOptions.InitialSelected = config.display.enable_message_bubbles ? 1 : 2;
+    bannerOptions.bannerCallback = [](int selected) -> void {
+        if (selected == ShowBubbles) {
+            config.display.enable_message_bubbles = true;
+            service->reloadConfig(SEGMENT_CONFIG);
+            LOG_INFO("Message bubbles enabled");
+        } else if (selected == HideBubbles) {
+            config.display.enable_message_bubbles = false;
+            service->reloadConfig(SEGMENT_CONFIG);
+            LOG_INFO("Message bubbles disabled");
+        } else {
+            menuHandler::menuQueue = menuHandler::ScreenOptionsMenu;
            screen->runNow();
        }
    };
@@ -2601,153 +2635,156 @@ void menuHandler::DisplayUnits_menu()

 void menuHandler::handleMenuSwitch(OLEDDisplay *display)
 {
-    if (menuQueue != menu_none)
+    if (menuQueue != MenuNone)
        test_count = 0;
    switch (menuQueue) {
-    case menu_none:
+    case MenuNone:
        break;
-    case lora_Menu:
+    case LoraMenu:
        loraMenu();
        break;
-    case lora_picker:
+    case LoraPicker:
        LoraRegionPicker();
        break;
-    case device_role_picker:
-        DeviceRolePicker();
+    case DeviceRolePicker:
+        deviceRolePicker();
        break;
-    case radio_preset_picker:
-        RadioPresetPicker();
+    case RadioPresetPicker:
+        radioPresetPicker();
        break;
-    case frequency_slot:
+    case FrequencySlot:
        FrequencySlotPicker();
        break;
-    case no_timeout_lora_picker:
+    case NoTimeoutLoraPicker:
        LoraRegionPicker(0);
        break;
-    case TZ_picker:
+    case TzPicker:
        TZPicker();
        break;
-    case twelve_hour_picker:
-        TwelveHourPicker();
+    case TwelveHourPicker:
+        twelveHourPicker();
        break;
-    case clock_face_picker:
-        ClockFacePicker();
+    case ClockFacePicker:
+        clockFacePicker();
        break;
-    case clock_menu:
+    case ClockMenu:
        clockMenu();
        break;
-    case system_base_menu:
+    case SystemBaseMenu:
        systemBaseMenu();
        break;
-    case position_base_menu:
+    case PositionBaseMenu:
        positionBaseMenu();
        break;
-    case node_base_menu:
+    case NodeBaseMenu:
        nodeListMenu();
        break;
 #if !MESHTASTIC_EXCLUDE_GPS
-    case gps_toggle_menu:
+    case GpsToggleMenu:
        GPSToggleMenu();
        break;
-    case gps_format_menu:
+    case GpsFormatMenu:
        GPSFormatMenu();
        break;
-    case gps_smart_position_menu:
+    case GpsSmartPositionMenu:
        GPSSmartPositionMenu();
        break;
-    case gps_update_interval_menu:
+    case GpsUpdateIntervalMenu:
        GPSUpdateIntervalMenu();
        break;
-    case gps_position_broadcast_menu:
+    case GpsPositionBroadcastMenu:
        GPSPositionBroadcastMenu();
        break;
 #endif
-    case compass_point_north_menu:
+    case CompassPointNorthMenu:
        compassNorthMenu();
        break;
-    case reset_node_db_menu:
+    case ResetNodeDbMenu:
        resetNodeDBMenu();
        break;
-    case buzzermodemenupicker:
+    case BuzzerModeMenuPicker:
        BuzzerModeMenu();
        break;
-    case mui_picker:
+    case MuiPicker:
        switchToMUIMenu();
        break;
-    case tftcolormenupicker:
+    case TftColorMenuPicker:
        TFTColorPickerMenu(display);
        break;
-    case brightness_picker:
+    case BrightnessPicker:
        BrightnessPickerMenu();
        break;
-    case node_name_length_menu:
+    case NodeNameLengthMenu:
        nodeNameLengthMenu();
        break;
-    case reboot_menu:
+    case RebootMenu:
        rebootMenu();
        break;
-    case shutdown_menu:
+    case ShutdownMenu:
        shutdownMenu();
        break;
-    case NodePicker_menu:
+    case NodePickerMenu:
        NodePicker();
        break;
-    case Manage_Node_menu:
-        ManageNodeMenu();
+    case ManageNodeMenu:
+        manageNodeMenu();
        break;
-    case remove_favorite:
+    case RemoveFavorite:
        removeFavoriteMenu();
        break;
-    case trace_route_menu:
+    case TraceRouteMenu:
        traceRouteMenu();
        break;
-    case test_menu:
+    case TestMenu:
        testMenu();
        break;
-    case number_test:
+    case NumberTest:
        numberTest();
        break;
-    case wifi_toggle_menu:
+    case WifiToggleMenu:
        wifiToggleMenu();
        break;
-    case key_verification_init:
+    case KeyVerificationInit:
        keyVerificationInitMenu();
        break;
-    case key_verification_final_prompt:
+    case KeyVerificationFinalPrompt:
        keyVerificationFinalPrompt();
        break;
-    case bluetooth_toggle_menu:
-        BluetoothToggleMenu();
+    case BluetoothToggleMenu:
+        bluetoothToggleMenu();
        break;
-    case screen_options_menu:
+    case ScreenOptionsMenu:
        screenOptionsMenu();
        break;
-    case power_menu:
+    case PowerMenu:
        powerMenu();
        break;
    case FrameToggles:
-        FrameToggles_menu();
+        frameTogglesMenu();
        break;
    case DisplayUnits:
-        DisplayUnits_menu();
+        displayUnitsMenu();
        break;
-    case throttle_message:
+    case ThrottleMessage:
        screen->showSimpleBanner("Too Many Attempts\nTry again in 60 seconds.", 5000);
        break;
-    case message_response_menu:
+    case MessageResponseMenu:
        messageResponseMenu();
        break;
-    case reply_menu:
+    case ReplyMenu:
        replyMenu();
        break;
-    case delete_messages_menu:
+    case DeleteMessagesMenu:
        deleteMessagesMenu();
        break;
-    case message_viewmode_menu:
+    case MessageViewModeMenu:
        messageViewModeMenu();
        break;
+    case MessageBubblesMenu:
+        messageBubblesMenu();
+        break;
    }
-    menuQueue = menu_none;
+    menuQueue = MenuNone;
 }

 void menuHandler::saveUIConfig()
--- a/src/graphics/draw/MenuHandler.h
+++ b/src/graphics/draw/MenuHandler.h
@@ -8,53 +8,54 @@ class menuHandler
 {
  public:
    enum screenMenus {
-        menu_none,
-        lora_Menu,
-        lora_picker,
-        device_role_picker,
-        radio_preset_picker,
-        frequency_slot,
-        no_timeout_lora_picker,
-        TZ_picker,
-        twelve_hour_picker,
-        clock_face_picker,
-        clock_menu,
-        position_base_menu,
-        node_base_menu,
-        gps_toggle_menu,
-        gps_format_menu,
-        gps_smart_position_menu,
-        gps_update_interval_menu,
-        gps_position_broadcast_menu,
-        compass_point_north_menu,
-        reset_node_db_menu,
-        buzzermodemenupicker,
-        mui_picker,
-        tftcolormenupicker,
-        brightness_picker,
-        reboot_menu,
-        shutdown_menu,
-        NodePicker_menu,
-        Manage_Node_menu,
-        remove_favorite,
-        test_menu,
-        number_test,
-        wifi_toggle_menu,
-        bluetooth_toggle_menu,
-        screen_options_menu,
-        power_menu,
-        system_base_menu,
-        key_verification_init,
-        key_verification_final_prompt,
-        trace_route_menu,
-        throttle_message,
-        message_response_menu,
-        message_viewmode_menu,
-        reply_menu,
-        delete_messages_menu,
-        node_name_length_menu,
+        MenuNone,
+        LoraMenu,
+        LoraPicker,
+        DeviceRolePicker,
+        RadioPresetPicker,
+        FrequencySlot,
+        NoTimeoutLoraPicker,
+        TzPicker,
+        TwelveHourPicker,
+        ClockFacePicker,
+        ClockMenu,
+        PositionBaseMenu,
+        NodeBaseMenu,
+        GpsToggleMenu,
+        GpsFormatMenu,
+        GpsSmartPositionMenu,
+        GpsUpdateIntervalMenu,
+        GpsPositionBroadcastMenu,
+        CompassPointNorthMenu,
+        ResetNodeDbMenu,
+        BuzzerModeMenuPicker,
+        MuiPicker,
+        TftColorMenuPicker,
+        BrightnessPicker,
+        RebootMenu,
+        ShutdownMenu,
+        NodePickerMenu,
+        ManageNodeMenu,
+        RemoveFavorite,
+        TestMenu,
+        NumberTest,
+        WifiToggleMenu,
+        BluetoothToggleMenu,
+        ScreenOptionsMenu,
+        PowerMenu,
+        SystemBaseMenu,
+        KeyVerificationInit,
+        KeyVerificationFinalPrompt,
+        TraceRouteMenu,
+        ThrottleMessage,
+        MessageResponseMenu,
+        MessageViewModeMenu,
+        ReplyMenu,
+        DeleteMessagesMenu,
+        NodeNameLengthMenu,
        FrameToggles,
-        DisplayUnits
+        DisplayUnits,
+        MessageBubblesMenu
    };
    static screenMenus menuQueue;
    static uint32_t pickedNodeNum; // node selected by NodePicker for ManageNodeMenu
@@ -62,15 +63,15 @@ class menuHandler
    static void OnboardMessage();
    static void LoraRegionPicker(uint32_t duration = 30000);
    static void loraMenu();
-    static void DeviceRolePicker();
-    static void RadioPresetPicker();
+    static void deviceRolePicker();
+    static void radioPresetPicker();
    static void FrequencySlotPicker();
    static void handleMenuSwitch(OLEDDisplay *display);
    static void showConfirmationBanner(const char *message, std::function<void()> onConfirm);
    static void clockMenu();
    static void TZPicker();
-    static void TwelveHourPicker();
-    static void ClockFacePicker();
+    static void twelveHourPicker();
+    static void clockFacePicker();
    static void messageResponseMenu();
    static void messageViewModeMenu();
    static void replyMenu();
@@ -95,7 +96,7 @@ class menuHandler
    static void rebootMenu();
    static void shutdownMenu();
    static void NodePicker();
-    static void ManageNodeMenu();
+    static void manageNodeMenu();
    static void addFavoriteMenu();
    static void removeFavoriteMenu();
    static void traceRouteMenu();
@@ -106,15 +107,16 @@ class menuHandler
    static void screenOptionsMenu();
    static void powerMenu();
    static void nodeNameLengthMenu();
-    static void FrameToggles_menu();
-    static void DisplayUnits_menu();
+    static void frameTogglesMenu();
+    static void displayUnitsMenu();
+    static void messageBubblesMenu();
    static void textMessageMenu();

  private:
    static void saveUIConfig();
    static void keyVerificationInitMenu();
    static void keyVerificationFinalPrompt();
-    static void BluetoothToggleMenu();
+    static void bluetoothToggleMenu();
 };

 /* Generic Menu Options designations  */
--- a/src/graphics/draw/MessageRenderer.cpp
+++ b/src/graphics/draw/MessageRenderer.cpp
@@ -527,8 +527,12 @@ void drawTextMessageFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16
    constexpr int BUBBLE_MIN_W = 24;
    constexpr int BUBBLE_TEXT_INDENT = 2;

+    // Check if bubbles are enabled
+    const bool showBubbles = config.display.enable_message_bubbles;
+    const int textIndent = showBubbles ? (BUBBLE_PAD_X + BUBBLE_TEXT_INDENT) : LEFT_MARGIN;
+
    // Derived widths
-    const int leftTextWidth = SCREEN_WIDTH - LEFT_MARGIN - RIGHT_MARGIN - (BUBBLE_PAD_X * 2);
+    const int leftTextWidth = SCREEN_WIDTH - LEFT_MARGIN - RIGHT_MARGIN - (showBubbles ? (BUBBLE_PAD_X * 2) : 0);
    const int rightTextWidth = SCREEN_WIDTH - LEFT_MARGIN - RIGHT_MARGIN - SCROLLBAR_WIDTH;

    // Title string depending on mode
@@ -796,114 +800,105 @@ void drawTextMessageFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16
        }
    }

-    // Draw bubbles
-    for (size_t bi = 0; bi < blocks.size(); ++bi) {
-        const auto &b = blocks[bi];
-        if (b.start >= cachedLines.size() || b.end >= cachedLines.size() || b.start > b.end)
-            continue;
+    // Draw bubbles (only if enabled)
+    if (showBubbles) {
+        for (size_t bi = 0; bi < blocks.size(); ++bi) {
+            const auto &b = blocks[bi];
+            if (b.start >= cachedLines.size() || b.end >= cachedLines.size() || b.start > b.end)
+                continue;

-        int visualTop = lineTop[b.start];
+            int visualTop = lineTop[b.start];

-        int topY;
-        if (isHeader[b.start]) {
-            // Header start
-            constexpr int BUBBLE_PAD_TOP_HEADER = 1; // try 1 or 2
-            topY = visualTop - BUBBLE_PAD_TOP_HEADER;
-        } else {
-            // Body start
-            bool thisLineHasEmote = false;
-            for (int e = 0; e < numEmotes; ++e) {
-                if (cachedLines[b.start].find(emotes[e].label) != std::string::npos) {
-                    thisLineHasEmote = true;
-                    break;
+            int topY;
+            if (isHeader[b.start]) {
+                // Header start
+                constexpr int BUBBLE_PAD_TOP_HEADER = 1; // try 1 or 2
+                topY = visualTop - BUBBLE_PAD_TOP_HEADER;
+            } else {
+                // Body start
+                bool thisLineHasEmote = false;
+                for (int e = 0; e < numEmotes; ++e) {
+                    if (cachedLines[b.start].find(emotes[e].label) != std::string::npos) {
+                        thisLineHasEmote = true;
+                        break;
+                    }
                }
+                if (thisLineHasEmote) {
+                    constexpr int EMOTE_PADDING_ABOVE = 4;
+                    visualTop -= EMOTE_PADDING_ABOVE;
+                }
+                topY = visualTop - BUBBLE_PAD_Y;
            }
-            if (thisLineHasEmote) {
-                constexpr int EMOTE_PADDING_ABOVE = 4;
-                visualTop -= EMOTE_PADDING_ABOVE;
+            int visualBottom = getDrawnLinePixelBottom(lineTop[b.end], cachedLines[b.end], isHeader[b.end]);
+            int bottomY = visualBottom + BUBBLE_PAD_Y;
+
+            if (bi + 1 < blocks.size()) {
+                int nextHeaderIndex = (int)blocks[bi + 1].start;
+                int nextTop = lineTop[nextHeaderIndex];
+                int maxBottom = nextTop - 1 - bubbleGapY;
+                if (bottomY > maxBottom)
+                    bottomY = maxBottom;
            }
-            topY = visualTop - BUBBLE_PAD_Y;
-        }
-        int visualBottom = getDrawnLinePixelBottom(lineTop[b.end], cachedLines[b.end], isHeader[b.end]);
-        int bottomY = visualBottom + BUBBLE_PAD_Y;

-        if (bi + 1 < blocks.size()) {
-            int nextHeaderIndex = (int)blocks[bi + 1].start;
-            int nextTop = lineTop[nextHeaderIndex];
-            int maxBottom = nextTop - 1 - bubbleGapY;
-            if (bottomY > maxBottom)
-                bottomY = maxBottom;
-        }
+            if (bottomY <= topY + 2)
+                continue;

-        if (bottomY <= topY + 2)
-            continue;
+            if (bottomY < contentTop || topY > contentBottom - 1)
+                continue;

-        if (bottomY < contentTop || topY > contentBottom - 1)
-            continue;
+            int maxLineW = 0;

-        int maxLineW = 0;
-
-        for (size_t i = b.start; i <= b.end; ++i) {
-            int w = 0;
-            if (isHeader[i]) {
-                w = display->getStringWidth(cachedLines[i].c_str());
-                if (b.mine)
-                    w += 12; // room for ACK/NACK/relay mark
-            } else {
-                w = getRenderedLineWidth(display, cachedLines[i], emotes, numEmotes);
+            for (size_t i = b.start; i <= b.end; ++i) {
+                int w = 0;
+                if (isHeader[i]) {
+                    w = display->getStringWidth(cachedLines[i].c_str());
+                    if (b.mine)
+                        w += 12; // room for ACK/NACK/relay mark
+                } else {
+                    w = getRenderedLineWidth(display, cachedLines[i], emotes, numEmotes);
+                }
+                if (w > maxLineW)
+                    maxLineW = w;
            }
-            if (w > maxLineW)
-                maxLineW = w;
-        }
-
-        int bubbleW = std::max(BUBBLE_MIN_W, maxLineW + (BUBBLE_PAD_X * 2));
-        int bubbleH = (bottomY - topY) + 1;
-        int bubbleX = 0;
-        if (b.mine) {
-            bubbleX = rightEdge - bubbleW;
-        } else {
-            bubbleX = x;
-        }
-        if (bubbleX < x)
-            bubbleX = x;
-        if (bubbleX + bubbleW > rightEdge)
-            bubbleW = std::max(1, rightEdge - bubbleX);
-
-        if (bubbleW > 1 && bubbleH > 1) {
-            int x1 = bubbleX + bubbleW - 1;
-            int y1 = topY + bubbleH - 1;

+            int bubbleW = std::max(BUBBLE_MIN_W, maxLineW + (textIndent * 2));
+            int bubbleH = (bottomY - topY) + 1;
+            int bubbleX = 0;
            if (b.mine) {
-                // Send Message (Right side)
-                display->drawRect(x1 + 2 - bubbleW, y1 - bubbleH, bubbleW, bubbleH);
-                // Top Right Corner
-                display->drawRect(x1, topY, 2, 1);
-                display->drawRect(x1, topY, 1, 2);
-                // Bottom Right Corner
-                display->drawRect(x1 - 1, bottomY - 2, 2, 1);
-                display->drawRect(x1, bottomY - 3, 1, 2);
-                // Knock the corners off to make a bubble
-                display->setColor(BLACK);
-                display->drawRect(x1 - bubbleW, topY - 1, 1, 1);
-                display->drawRect(x1 - bubbleW, bottomY - 1, 1, 1);
-                display->setColor(WHITE);
+                bubbleX = rightEdge - bubbleW;
            } else {
-                // Received Message (Left Side)
-                display->drawRect(bubbleX, topY, bubbleW + 1, bubbleH);
-                // Top Left Corner
-                display->drawRect(bubbleX + 1, topY + 1, 2, 1);
-                display->drawRect(bubbleX + 1, topY + 1, 1, 2);
-                // Bottom Left Corner
-                display->drawRect(bubbleX + 1, bottomY - 1, 2, 1);
-                display->drawRect(bubbleX + 1, bottomY - 2, 1, 2);
-                // Knock the corners off to make a bubble
-                display->setColor(BLACK);
-                display->drawRect(bubbleX + bubbleW, topY, 1, 1);
-                display->drawRect(bubbleX + bubbleW, bottomY, 1, 1);
-                display->setColor(WHITE);
+                bubbleX = x;
+            }
+            if (bubbleX < x)
+                bubbleX = x;
+            if (bubbleX + bubbleW > rightEdge)
+                bubbleW = std::max(1, rightEdge - bubbleX);
+
+            // Draw rounded rectangle bubble
+            if (bubbleW > BUBBLE_RADIUS * 2 && bubbleH > BUBBLE_RADIUS * 2) {
+                const int r = BUBBLE_RADIUS;
+                const int bx = bubbleX;
+                const int by = topY;
+                const int bw = bubbleW;
+                const int bh = bubbleH;
+
+                // Draw the 4 corner arcs using drawCircleQuads
+                display->drawCircleQuads(bx + r, by + r, r, 0x2);                   // Top-left
+                display->drawCircleQuads(bx + bw - r - 1, by + r, r, 0x1);          // Top-right
+                display->drawCircleQuads(bx + r, by + bh - r - 1, r, 0x4);          // Bottom-left
+                display->drawCircleQuads(bx + bw - r - 1, by + bh - r - 1, r, 0x8); // Bottom-right
+
+                // Draw the 4 edges between corners
+                display->drawHorizontalLine(bx + r, by, bw - 2 * r);          // Top edge
+                display->drawHorizontalLine(bx + r, by + bh - 1, bw - 2 * r); // Bottom edge
+                display->drawVerticalLine(bx, by + r, bh - 2 * r);            // Left edge
+                display->drawVerticalLine(bx + bw - 1, by + r, bh - 2 * r);   // Right edge
+            } else if (bubbleW > 1 && bubbleH > 1) {
+                // Fallback to simple rectangle for very small bubbles
+                display->drawRect(bubbleX, topY, bubbleW, bubbleH);
            }
        }
-    }
+    } // end if (showBubbles)

    // Render visible lines
    int lineY = yOffset;
@@ -916,11 +911,11 @@ void drawTextMessageFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16
                int headerX;
                if (isMine[i]) {
                    // push header left to avoid overlap with scrollbar
-                    headerX = (SCREEN_WIDTH - SCROLLBAR_WIDTH - RIGHT_MARGIN) - w - BUBBLE_TEXT_INDENT;
+                    headerX = (SCREEN_WIDTH - SCROLLBAR_WIDTH - RIGHT_MARGIN) - w - (showBubbles ? textIndent : 0);
                    if (headerX < LEFT_MARGIN)
                        headerX = LEFT_MARGIN;
                } else {
-                    headerX = x + BUBBLE_PAD_X + BUBBLE_TEXT_INDENT;
+                    headerX = x + textIndent;
                }
                display->drawString(headerX, lineY, cachedLines[i].c_str());

@@ -960,14 +955,13 @@ void drawTextMessageFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16
                if (isMine[i]) {
                    // Calculate actual rendered width including emotes
                    int renderedWidth = getRenderedLineWidth(display, cachedLines[i], emotes, numEmotes);
-                    int rightX = (SCREEN_WIDTH - SCROLLBAR_WIDTH - RIGHT_MARGIN) - renderedWidth - BUBBLE_TEXT_INDENT;
+                    int rightX = (SCREEN_WIDTH - SCROLLBAR_WIDTH - RIGHT_MARGIN) - renderedWidth - (showBubbles ? textIndent : 0);
                    if (rightX < LEFT_MARGIN)
                        rightX = LEFT_MARGIN;

                    drawStringWithEmotes(display, rightX, lineY, cachedLines[i], emotes, numEmotes);
                } else {
-                    drawStringWithEmotes(display, x + BUBBLE_PAD_X + BUBBLE_TEXT_INDENT, lineY, cachedLines[i], emotes,
-                                         numEmotes);
+                    drawStringWithEmotes(display, x + textIndent, lineY, cachedLines[i], emotes, numEmotes);
                }
            }
        }
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -713,7 +713,6 @@ void setup()
    scannerToSensorsMap(i2cScanner, ScanI2C::DeviceType::ICM20948, meshtastic_TelemetrySensorType_ICM20948);
    scannerToSensorsMap(i2cScanner, ScanI2C::DeviceType::MAX30102, meshtastic_TelemetrySensorType_MAX30102);
    scannerToSensorsMap(i2cScanner, ScanI2C::DeviceType::SCD4X, meshtastic_TelemetrySensorType_SCD4X);
-
 #endif

 #ifdef HAS_SDCARD
@@ -929,6 +928,13 @@ void setup()
    service = new MeshService();
    service->init();

+    // Set osk_found for trackball/encoder devices BEFORE setupModules so CannedMessageModule can detect it
+#if defined(HAS_TRACKBALL) || (defined(INPUTDRIVER_ENCODER_TYPE) && INPUTDRIVER_ENCODER_TYPE == 2)
+#ifndef HAS_PHYSICAL_KEYBOARD
+    osk_found = true;
+#endif
+#endif
+
    // Now that the mesh service is created, create any modules
    setupModules();

@@ -1019,12 +1025,6 @@ void setup()
 #endif
 #endif

-#if defined(HAS_TRACKBALL) || (defined(INPUTDRIVER_ENCODER_TYPE) && INPUTDRIVER_ENCODER_TYPE == 2)
-#ifndef HAS_PHYSICAL_KEYBOARD
-    osk_found = true;
-#endif
-#endif
-
 #if defined(ARCH_ESP32) && !MESHTASTIC_EXCLUDE_WEBSERVER
    // Start web server thread.
    webServerThread = new WebServerThread();
--- a/src/mesh/NodeDB.cpp
+++ b/src/mesh/NodeDB.cpp
@@ -574,6 +574,10 @@ void NodeDB::installDefaultConfig(bool preserveKey = false)
    config.display.displaymode = meshtastic_Config_DisplayConfig_DisplayMode_COLOR;
 #endif

+#if defined(TFT_WIDTH) && defined(TFT_HEIGHT) && (TFT_WIDTH >= 200 || TFT_HEIGHT >= 200)
+    config.display.enable_message_bubbles = true;
+#endif
+
 #ifdef USERPREFS_CONFIG_DEVICE_ROLE
    // Restrict ROUTER*, LOST AND FOUND roles for security reasons
    if (IS_ONE_OF(USERPREFS_CONFIG_DEVICE_ROLE, meshtastic_Config_DeviceConfig_Role_ROUTER,
@@ -2213,8 +2217,8 @@ bool NodeDB::restorePreferences(meshtastic_AdminMessage_BackupLocation location,
    } else if (location == meshtastic_AdminMessage_BackupLocation_SD) {
        // TODO: After more mainline SD card support
    }
-    return success;
 #endif
+    return success;
 }

 /// Record an error that should be reported via analytics
--- a/src/mesh/PacketHistory.cpp
+++ b/src/mesh/PacketHistory.cpp
@@ -90,9 +90,9 @@ bool PacketHistory::wasSeenRecently(const meshtastic_MeshPacket *p, bool withUpd
    bool seenRecently = (found != NULL);        // If found -> the packet was seen recently

    // Check for hop_limit upgrade scenario
-    if (seenRecently && wasUpgraded && found->hop_limit < p->hop_limit) {
-        LOG_DEBUG("Packet History - Hop limit upgrade: packet 0x%08x from hop_limit=%d to hop_limit=%d", p->id, found->hop_limit,
-                  p->hop_limit);
+    if (seenRecently && wasUpgraded && getHighestHopLimit(*found) < p->hop_limit) {
+        LOG_DEBUG("Packet History - Hop limit upgrade: packet 0x%08x from hop_limit=%d to hop_limit=%d", p->id,
+                  getHighestHopLimit(*found), p->hop_limit);
        *wasUpgraded = true;
    } else if (wasUpgraded) {
        *wasUpgraded = false; // Initialize to false if not an upgrade
--- a/src/mesh/generated/meshtastic/config.pb.h
+++ b/src/mesh/generated/meshtastic/config.pb.h
@@ -505,6 +505,8 @@ typedef struct _meshtastic_Config_DisplayConfig {
    /* If false (default), the device will use short names for various display screens.
 If true, node names will show in long format */
    bool use_long_node_name;
+    /* If true, the device will display message bubbles on screen. */
+    bool enable_message_bubbles;
 } meshtastic_Config_DisplayConfig;

 /* Lora Config */
@@ -732,7 +734,7 @@ extern "C" {
 #define meshtastic_Config_PowerConfig_init_default {0, 0, 0, 0, 0, 0, 0, 0, 0}
 #define meshtastic_Config_NetworkConfig_init_default {0, "", "", "", 0, _meshtastic_Config_NetworkConfig_AddressMode_MIN, false, meshtastic_Config_NetworkConfig_IpV4Config_init_default, "", 0, 0}
 #define meshtastic_Config_NetworkConfig_IpV4Config_init_default {0, 0, 0, 0}
-#define meshtastic_Config_DisplayConfig_init_default {0, _meshtastic_Config_DisplayConfig_DeprecatedGpsCoordinateFormat_MIN, 0, 0, 0, _meshtastic_Config_DisplayConfig_DisplayUnits_MIN, _meshtastic_Config_DisplayConfig_OledType_MIN, _meshtastic_Config_DisplayConfig_DisplayMode_MIN, 0, 0, _meshtastic_Config_DisplayConfig_CompassOrientation_MIN, 0, 0}
+#define meshtastic_Config_DisplayConfig_init_default {0, _meshtastic_Config_DisplayConfig_DeprecatedGpsCoordinateFormat_MIN, 0, 0, 0, _meshtastic_Config_DisplayConfig_DisplayUnits_MIN, _meshtastic_Config_DisplayConfig_OledType_MIN, _meshtastic_Config_DisplayConfig_DisplayMode_MIN, 0, 0, _meshtastic_Config_DisplayConfig_CompassOrientation_MIN, 0, 0, 0}
 #define meshtastic_Config_LoRaConfig_init_default {0, _meshtastic_Config_LoRaConfig_ModemPreset_MIN, 0, 0, 0, 0, _meshtastic_Config_LoRaConfig_RegionCode_MIN, 0, 0, 0, 0, 0, 0, 0, 0, 0, {0, 0, 0}, 0, 0}
 #define meshtastic_Config_BluetoothConfig_init_default {0, _meshtastic_Config_BluetoothConfig_PairingMode_MIN, 0}
 #define meshtastic_Config_SecurityConfig_init_default {{0, {0}}, {0, {0}}, 0, {{0, {0}}, {0, {0}}, {0, {0}}}, 0, 0, 0, 0}
@@ -743,7 +745,7 @@ extern "C" {
 #define meshtastic_Config_PowerConfig_init_zero  {0, 0, 0, 0, 0, 0, 0, 0, 0}
 #define meshtastic_Config_NetworkConfig_init_zero {0, "", "", "", 0, _meshtastic_Config_NetworkConfig_AddressMode_MIN, false, meshtastic_Config_NetworkConfig_IpV4Config_init_zero, "", 0, 0}
 #define meshtastic_Config_NetworkConfig_IpV4Config_init_zero {0, 0, 0, 0}
-#define meshtastic_Config_DisplayConfig_init_zero {0, _meshtastic_Config_DisplayConfig_DeprecatedGpsCoordinateFormat_MIN, 0, 0, 0, _meshtastic_Config_DisplayConfig_DisplayUnits_MIN, _meshtastic_Config_DisplayConfig_OledType_MIN, _meshtastic_Config_DisplayConfig_DisplayMode_MIN, 0, 0, _meshtastic_Config_DisplayConfig_CompassOrientation_MIN, 0, 0}
+#define meshtastic_Config_DisplayConfig_init_zero {0, _meshtastic_Config_DisplayConfig_DeprecatedGpsCoordinateFormat_MIN, 0, 0, 0, _meshtastic_Config_DisplayConfig_DisplayUnits_MIN, _meshtastic_Config_DisplayConfig_OledType_MIN, _meshtastic_Config_DisplayConfig_DisplayMode_MIN, 0, 0, _meshtastic_Config_DisplayConfig_CompassOrientation_MIN, 0, 0, 0}
 #define meshtastic_Config_LoRaConfig_init_zero   {0, _meshtastic_Config_LoRaConfig_ModemPreset_MIN, 0, 0, 0, 0, _meshtastic_Config_LoRaConfig_RegionCode_MIN, 0, 0, 0, 0, 0, 0, 0, 0, 0, {0, 0, 0}, 0, 0}
 #define meshtastic_Config_BluetoothConfig_init_zero {0, _meshtastic_Config_BluetoothConfig_PairingMode_MIN, 0}
 #define meshtastic_Config_SecurityConfig_init_zero {{0, {0}}, {0, {0}}, 0, {{0, {0}}, {0, {0}}, {0, {0}}}, 0, 0, 0, 0}
@@ -811,6 +813,7 @@ extern "C" {
 #define meshtastic_Config_DisplayConfig_compass_orientation_tag 11
 #define meshtastic_Config_DisplayConfig_use_12h_clock_tag 12
 #define meshtastic_Config_DisplayConfig_use_long_node_name_tag 13
+#define meshtastic_Config_DisplayConfig_enable_message_bubbles_tag 14
 #define meshtastic_Config_LoRaConfig_use_preset_tag 1
 #define meshtastic_Config_LoRaConfig_modem_preset_tag 2
 #define meshtastic_Config_LoRaConfig_bandwidth_tag 3
@@ -957,7 +960,8 @@ X(a, STATIC,   SINGULAR, BOOL,     heading_bold,      9) \
 X(a, STATIC,   SINGULAR, BOOL,     wake_on_tap_or_motion,  10) \
 X(a, STATIC,   SINGULAR, UENUM,    compass_orientation,  11) \
 X(a, STATIC,   SINGULAR, BOOL,     use_12h_clock,    12) \
-X(a, STATIC,   SINGULAR, BOOL,     use_long_node_name,  13)
+X(a, STATIC,   SINGULAR, BOOL,     use_long_node_name,  13) \
+X(a, STATIC,   SINGULAR, BOOL,     enable_message_bubbles,  14)
 #define meshtastic_Config_DisplayConfig_CALLBACK NULL
 #define meshtastic_Config_DisplayConfig_DEFAULT NULL

@@ -1035,7 +1039,7 @@ extern const pb_msgdesc_t meshtastic_Config_SessionkeyConfig_msg;
 #define MESHTASTIC_MESHTASTIC_CONFIG_PB_H_MAX_SIZE meshtastic_Config_size
 #define meshtastic_Config_BluetoothConfig_size   10
 #define meshtastic_Config_DeviceConfig_size      100
-#define meshtastic_Config_DisplayConfig_size     34
+#define meshtastic_Config_DisplayConfig_size     36
 #define meshtastic_Config_LoRaConfig_size        85
 #define meshtastic_Config_NetworkConfig_IpV4Config_size 20
 #define meshtastic_Config_NetworkConfig_size     204
--- a/src/mesh/generated/meshtastic/deviceonly.pb.h
+++ b/src/mesh/generated/meshtastic/deviceonly.pb.h
@@ -361,7 +361,7 @@ extern const pb_msgdesc_t meshtastic_BackupPreferences_msg;
 /* Maximum encoded size of messages (where known) */
 /* meshtastic_NodeDatabase_size depends on runtime parameters */
 #define MESHTASTIC_MESHTASTIC_DEVICEONLY_PB_H_MAX_SIZE meshtastic_BackupPreferences_size
-#define meshtastic_BackupPreferences_size        2362
+#define meshtastic_BackupPreferences_size        2364
 #define meshtastic_ChannelFile_size              718
 #define meshtastic_DeviceState_size              1737
 #define meshtastic_NodeInfoLite_size             196
--- a/src/mesh/generated/meshtastic/localonly.pb.h
+++ b/src/mesh/generated/meshtastic/localonly.pb.h
@@ -193,7 +193,7 @@ extern const pb_msgdesc_t meshtastic_LocalModuleConfig_msg;

 /* Maximum encoded size of messages (where known) */
 #define MESHTASTIC_MESHTASTIC_LOCALONLY_PB_H_MAX_SIZE meshtastic_LocalModuleConfig_size
-#define meshtastic_LocalConfig_size              749
+#define meshtastic_LocalConfig_size              751
 #define meshtastic_LocalModuleConfig_size        758

 #ifdef __cplusplus
--- a/src/mesh/udp/UdpMulticastHandler.h
+++ b/src/mesh/udp/UdpMulticastHandler.h
@@ -22,10 +22,14 @@
 class UdpMulticastHandler final
 {
  public:
-    UdpMulticastHandler() { udpIpAddress = IPAddress(224, 0, 0, 69); }
+    UdpMulticastHandler() : isRunning(false) { udpIpAddress = IPAddress(224, 0, 0, 69); }

    void start()
    {
+        if (isRunning) {
+            LOG_DEBUG("UDP multicast already running");
+            return;
+        }
        if (udp.listenMulticast(udpIpAddress, UDP_MULTICAST_DEFAUL_PORT, 64)) {
 #if defined(ARCH_NRF52) || defined(ARCH_PORTDUINO)
            LOG_DEBUG("UDP Listening on IP: %u.%u.%u.%u:%u", udpIpAddress[0], udpIpAddress[1], udpIpAddress[2], udpIpAddress[3],
@@ -34,13 +38,29 @@ class UdpMulticastHandler final
            LOG_DEBUG("UDP Listening on IP: %s", WiFi.localIP().toString().c_str());
 #endif
            udp.onPacket([this](AsyncUDPPacket packet) { onReceive(packet); });
+            isRunning = true;
        } else {
            LOG_DEBUG("Failed to listen on UDP");
        }
    }

+    void stop()
+    {
+        if (!isRunning) {
+            return;
+        }
+        LOG_DEBUG("Stopping UDP multicast");
+#if defined(ARCH_ESP32) || defined(ARCH_NRF52)
+        udp.close();
+#endif
+        isRunning = false;
+    }
+
    void onReceive(AsyncUDPPacket packet)
    {
+        if (!isRunning) {
+            return;
+        }
        size_t packetLength = packet.length();
 #if defined(ARCH_NRF52)
        IPAddress ip = packet.remoteIP();
@@ -67,7 +87,7 @@ class UdpMulticastHandler final

    bool onSend(const meshtastic_MeshPacket *mp)
    {
-        if (!mp || !udp) {
+        if (!isRunning || !mp || !udp) {
            return false;
        }
 #if defined(ARCH_NRF52)
@@ -92,5 +112,6 @@ class UdpMulticastHandler final
  private:
    IPAddress udpIpAddress;
    AsyncUDP udp;
+    bool isRunning;
 };
 #endif // HAS_UDP_MULTICAST
--- a/src/mesh/wifi/WiFiAPClient.cpp
+++ b/src/mesh/wifi/WiFiAPClient.cpp
@@ -391,6 +391,11 @@ static void WiFiEvent(WiFiEvent_t event)
        LOG_INFO("Disconnected from WiFi access point");
 #ifdef WIFI_LED
        digitalWrite(WIFI_LED, LOW);
+#endif
+#if HAS_UDP_MULTICAST
+        if (udpHandler) {
+            udpHandler->stop();
+        }
 #endif
        if (!isReconnecting) {
            WiFi.disconnect(false, true);
@@ -417,6 +422,11 @@ static void WiFiEvent(WiFiEvent_t event)
        break;
    case ARDUINO_EVENT_WIFI_STA_LOST_IP:
        LOG_INFO("Lost IP address and IP address is reset to 0");
+#if HAS_UDP_MULTICAST
+        if (udpHandler) {
+            udpHandler->stop();
+        }
+#endif
        if (!isReconnecting) {
            WiFi.disconnect(false, true);
            syslog.disable();
--- a/src/meshUtils.cpp
+++ b/src/meshUtils.cpp
@@ -106,4 +106,15 @@ const std::string vformat(const char *const zcFormat, ...)
    std::vsnprintf(zc.data(), zc.size(), zcFormat, vaArgs);
    va_end(vaArgs);
    return std::string(zc.data(), iLen);
+}
+
+size_t pb_string_length(const char *str, size_t max_len)
+{
+    size_t len = 0;
+    for (size_t i = 0; i < max_len; i++) {
+        if (str[i] != '\0') {
+            len = i + 1;
+        }
+    }
+    return len;
 }
--- a/src/meshUtils.h
+++ b/src/meshUtils.h
@@ -35,4 +35,7 @@ bool isOneOf(int item, int count, ...);

 const std::string vformat(const char *const zcFormat, ...);

+// Get actual string length for nanopb char array fields.
+size_t pb_string_length(const char *str, size_t max_len);
+
 #define IS_ONE_OF(item, ...) isOneOf(item, sizeof((int[]){__VA_ARGS__}) / sizeof(int), __VA_ARGS__)
--- a/src/modules/AtakPluginModule.cpp
+++ b/src/modules/AtakPluginModule.cpp
@@ -6,6 +6,7 @@
 #include "configuration.h"
 #include "main.h"
 #include "mesh/compression/unishox2.h"
+#include "meshUtils.h"
 #include "meshtastic/atak.pb.h"

 AtakPluginModule *atakPluginModule;
@@ -70,16 +71,17 @@ void AtakPluginModule::alterReceivedProtobuf(meshtastic_MeshPacket &mp, meshtast
        auto compressed = cloneTAKPacketData(t);
        compressed.is_compressed = true;
        if (t->has_contact) {
-            auto length = unishox2_compress_lines(t->contact.callsign, strlen(t->contact.callsign), compressed.contact.callsign,
-                                                  sizeof(compressed.contact.callsign) - 1, USX_PSET_DFLT, NULL);
+            auto length = unishox2_compress_lines(
+                t->contact.callsign, pb_string_length(t->contact.callsign, sizeof(t->contact.callsign)),
+                compressed.contact.callsign, sizeof(compressed.contact.callsign) - 1, USX_PSET_DFLT, NULL);
            if (length < 0) {
                LOG_WARN("Compress overflow contact.callsign. Revert to uncompressed packet");
                return;
            }
            LOG_DEBUG("Compressed callsign: %d bytes", length);
-            length = unishox2_compress_lines(t->contact.device_callsign, strlen(t->contact.device_callsign),
-                                             compressed.contact.device_callsign, sizeof(compressed.contact.device_callsign) - 1,
-                                             USX_PSET_DFLT, NULL);
+            length = unishox2_compress_lines(
+                t->contact.device_callsign, pb_string_length(t->contact.device_callsign, sizeof(t->contact.device_callsign)),
+                compressed.contact.device_callsign, sizeof(compressed.contact.device_callsign) - 1, USX_PSET_DFLT, NULL);
            if (length < 0) {
                LOG_WARN("Compress overflow contact.device_callsign. Revert to uncompressed packet");
                return;
@@ -87,9 +89,11 @@ void AtakPluginModule::alterReceivedProtobuf(meshtastic_MeshPacket &mp, meshtast
            LOG_DEBUG("Compressed device_callsign: %d bytes", length);
        }
        if (t->which_payload_variant == meshtastic_TAKPacket_chat_tag) {
-            auto length = unishox2_compress_lines(t->payload_variant.chat.message, strlen(t->payload_variant.chat.message),
-                                                  compressed.payload_variant.chat.message,
-                                                  sizeof(compressed.payload_variant.chat.message) - 1, USX_PSET_DFLT, NULL);
+            auto length = unishox2_compress_lines(
+                t->payload_variant.chat.message,
+                pb_string_length(t->payload_variant.chat.message, sizeof(t->payload_variant.chat.message)),
+                compressed.payload_variant.chat.message, sizeof(compressed.payload_variant.chat.message) - 1, USX_PSET_DFLT,
+                NULL);
            if (length < 0) {
                LOG_WARN("Compress overflow chat.message. Revert to uncompressed packet");
                return;
@@ -98,9 +102,9 @@ void AtakPluginModule::alterReceivedProtobuf(meshtastic_MeshPacket &mp, meshtast

            if (t->payload_variant.chat.has_to) {
                compressed.payload_variant.chat.has_to = true;
-                length = unishox2_compress_lines(t->payload_variant.chat.to, strlen(t->payload_variant.chat.to),
-                                                 compressed.payload_variant.chat.to,
-                                                 sizeof(compressed.payload_variant.chat.to) - 1, USX_PSET_DFLT, NULL);
+                length = unishox2_compress_lines(
+                    t->payload_variant.chat.to, pb_string_length(t->payload_variant.chat.to, sizeof(t->payload_variant.chat.to)),
+                    compressed.payload_variant.chat.to, sizeof(compressed.payload_variant.chat.to) - 1, USX_PSET_DFLT, NULL);
                if (length < 0) {
                    LOG_WARN("Compress overflow chat.to. Revert to uncompressed packet");
                    return;
@@ -110,9 +114,11 @@ void AtakPluginModule::alterReceivedProtobuf(meshtastic_MeshPacket &mp, meshtast

            if (t->payload_variant.chat.has_to_callsign) {
                compressed.payload_variant.chat.has_to_callsign = true;
-                length = unishox2_compress_lines(t->payload_variant.chat.to_callsign, strlen(t->payload_variant.chat.to_callsign),
-                                                 compressed.payload_variant.chat.to_callsign,
-                                                 sizeof(compressed.payload_variant.chat.to_callsign) - 1, USX_PSET_DFLT, NULL);
+                length = unishox2_compress_lines(
+                    t->payload_variant.chat.to_callsign,
+                    pb_string_length(t->payload_variant.chat.to_callsign, sizeof(t->payload_variant.chat.to_callsign)),
+                    compressed.payload_variant.chat.to_callsign, sizeof(compressed.payload_variant.chat.to_callsign) - 1,
+                    USX_PSET_DFLT, NULL);
                if (length < 0) {
                    LOG_WARN("Compress overflow chat.to_callsign. Revert to uncompressed packet");
                    return;
@@ -134,18 +140,18 @@ void AtakPluginModule::alterReceivedProtobuf(meshtastic_MeshPacket &mp, meshtast
        auto uncompressed = cloneTAKPacketData(t);
        uncompressed.is_compressed = false;
        if (t->has_contact) {
-            auto length =
-                unishox2_decompress_lines(t->contact.callsign, strlen(t->contact.callsign), uncompressed.contact.callsign,
-                                          sizeof(uncompressed.contact.callsign) - 1, USX_PSET_DFLT, NULL);
+            auto length = unishox2_decompress_lines(
+                t->contact.callsign, pb_string_length(t->contact.callsign, sizeof(t->contact.callsign)),
+                uncompressed.contact.callsign, sizeof(uncompressed.contact.callsign) - 1, USX_PSET_DFLT, NULL);
            if (length < 0) {
                LOG_WARN("Decompress overflow contact.callsign. Bailing out");
                return;
            }
            LOG_DEBUG("Decompressed callsign: %d bytes", length);

-            length = unishox2_decompress_lines(t->contact.device_callsign, strlen(t->contact.device_callsign),
-                                               uncompressed.contact.device_callsign,
-                                               sizeof(uncompressed.contact.device_callsign) - 1, USX_PSET_DFLT, NULL);
+            length = unishox2_decompress_lines(
+                t->contact.device_callsign, pb_string_length(t->contact.device_callsign, sizeof(t->contact.device_callsign)),
+                uncompressed.contact.device_callsign, sizeof(uncompressed.contact.device_callsign) - 1, USX_PSET_DFLT, NULL);
            if (length < 0) {
                LOG_WARN("Decompress overflow contact.device_callsign. Bailing out");
                return;
@@ -153,9 +159,11 @@ void AtakPluginModule::alterReceivedProtobuf(meshtastic_MeshPacket &mp, meshtast
            LOG_DEBUG("Decompressed device_callsign: %d bytes", length);
        }
        if (uncompressed.which_payload_variant == meshtastic_TAKPacket_chat_tag) {
-            auto length = unishox2_decompress_lines(t->payload_variant.chat.message, strlen(t->payload_variant.chat.message),
-                                                    uncompressed.payload_variant.chat.message,
-                                                    sizeof(uncompressed.payload_variant.chat.message) - 1, USX_PSET_DFLT, NULL);
+            auto length = unishox2_decompress_lines(
+                t->payload_variant.chat.message,
+                pb_string_length(t->payload_variant.chat.message, sizeof(t->payload_variant.chat.message)),
+                uncompressed.payload_variant.chat.message, sizeof(uncompressed.payload_variant.chat.message) - 1, USX_PSET_DFLT,
+                NULL);
            if (length < 0) {
                LOG_WARN("Decompress overflow chat.message. Bailing out");
                return;
@@ -164,9 +172,9 @@ void AtakPluginModule::alterReceivedProtobuf(meshtastic_MeshPacket &mp, meshtast

            if (t->payload_variant.chat.has_to) {
                uncompressed.payload_variant.chat.has_to = true;
-                length = unishox2_decompress_lines(t->payload_variant.chat.to, strlen(t->payload_variant.chat.to),
-                                                   uncompressed.payload_variant.chat.to,
-                                                   sizeof(uncompressed.payload_variant.chat.to) - 1, USX_PSET_DFLT, NULL);
+                length = unishox2_decompress_lines(
+                    t->payload_variant.chat.to, pb_string_length(t->payload_variant.chat.to, sizeof(t->payload_variant.chat.to)),
+                    uncompressed.payload_variant.chat.to, sizeof(uncompressed.payload_variant.chat.to) - 1, USX_PSET_DFLT, NULL);
                if (length < 0) {
                    LOG_WARN("Decompress overflow chat.to. Bailing out");
                    return;
@@ -176,10 +184,11 @@ void AtakPluginModule::alterReceivedProtobuf(meshtastic_MeshPacket &mp, meshtast

            if (t->payload_variant.chat.has_to_callsign) {
                uncompressed.payload_variant.chat.has_to_callsign = true;
-                length =
-                    unishox2_decompress_lines(t->payload_variant.chat.to_callsign, strlen(t->payload_variant.chat.to_callsign),
-                                              uncompressed.payload_variant.chat.to_callsign,
-                                              sizeof(uncompressed.payload_variant.chat.to_callsign) - 1, USX_PSET_DFLT, NULL);
+                length = unishox2_decompress_lines(
+                    t->payload_variant.chat.to_callsign,
+                    pb_string_length(t->payload_variant.chat.to_callsign, sizeof(t->payload_variant.chat.to_callsign)),
+                    uncompressed.payload_variant.chat.to_callsign, sizeof(uncompressed.payload_variant.chat.to_callsign) - 1,
+                    USX_PSET_DFLT, NULL);
                if (length < 0) {
                    LOG_WARN("Decompress overflow chat.to_callsign. Bailing out");
                    return;
--- a/src/modules/KeyVerificationModule.cpp
+++ b/src/modules/KeyVerificationModule.cpp
@@ -123,7 +123,7 @@ bool KeyVerificationModule::sendInitialRequest(NodeNum remoteNode)
    // generate nonce
    updateState();
    if (currentState != KEY_VERIFICATION_IDLE) {
-        IF_SCREEN(graphics::menuHandler::menuQueue = graphics::menuHandler::throttle_message;)
+        IF_SCREEN(graphics::menuHandler::menuQueue = graphics::menuHandler::ThrottleMessage;)
        return false;
    }
    currentNonce = random();
@@ -259,7 +259,7 @@ void KeyVerificationModule::processSecurityNumber(uint32_t incomingNumber)
    p->priority = meshtastic_MeshPacket_Priority_HIGH;
    service->sendToMesh(p, RX_SRC_LOCAL, true);
    currentState = KEY_VERIFICATION_SENDER_AWAITING_USER;
-    IF_SCREEN(screen->requestMenu(graphics::menuHandler::key_verification_final_prompt);)
+    IF_SCREEN(screen->requestMenu(graphics::menuHandler::KeyVerificationFinalPrompt);)
    meshtastic_ClientNotification *cn = clientNotificationPool.allocZeroed();
    cn->level = meshtastic_LogRecord_Level_WARNING;
    sprintf(cn->message, "Final confirmation for outgoing manual key verification %s", message);
--- a/src/modules/Telemetry/AirQualityTelemetry.cpp
+++ b/src/modules/Telemetry/AirQualityTelemetry.cpp
@@ -10,7 +10,6 @@
 #include "PowerFSM.h"
 #include "RTC.h"
 #include "Router.h"
-#include "Sensor/AddI2CSensorTemplate.h"
 #include "UnitConversions.h"
 #include "graphics/ScreenFonts.h"
 #include "graphics/SharedUIDisplay.h"
@@ -20,7 +19,9 @@
 #include <Throttle.h>

 // Sensors
+#include "Sensor/AddI2CSensorTemplate.h"
 #include "Sensor/PMSA003ISensor.h"
+#include "Sensor/SEN5XSensor.h"

 void AirQualityTelemetryModule::i2cScanFinished(ScanI2C *i2cScanner)
 {
@@ -42,6 +43,7 @@ void AirQualityTelemetryModule::i2cScanFinished(ScanI2C *i2cScanner)

    // order by priority of metrics/values (low top, high bottom)
    addSensor<PMSA003ISensor>(i2cScanner, ScanI2C::DeviceType::PMSA003I);
+    addSensor<SEN5XSensor>(i2cScanner, ScanI2C::DeviceType::SEN5X);
 }

 int32_t AirQualityTelemetryModule::runOnce()
@@ -85,10 +87,27 @@ int32_t AirQualityTelemetryModule::runOnce()
        }

        // Wake up the sensors that need it
-        LOG_INFO("Waking up sensors");
+        LOG_INFO("Waking up sensors...");
        for (TelemetrySensor *sensor : sensors) {
-            if (!sensor->isActive()) {
-                return sensor->wakeUp();
+            if (!sensor->canSleep()) {
+                LOG_DEBUG("%s sensor doesn't have sleep feature. Skipping", sensor->sensorName);
+            } else if (((lastSentToMesh == 0) ||
+                        !Throttle::isWithinTimespanMs(lastSentToMesh - sensor->wakeUpTimeMs(),
+                                                      Default::getConfiguredOrDefaultMsScaled(
+                                                          moduleConfig.telemetry.air_quality_interval,
+                                                          default_telemetry_broadcast_interval_secs, numOnlineNodes))) &&
+                       airTime->isTxAllowedChannelUtil(config.device.role != meshtastic_Config_DeviceConfig_Role_SENSOR) &&
+                       airTime->isTxAllowedAirUtil()) {
+                if (!sensor->isActive()) {
+                    LOG_DEBUG("Waking up: %s", sensor->sensorName);
+                    return sensor->wakeUp();
+                } else {
+                    int32_t pendingForReadyMs = sensor->pendingForReadyMs();
+                    LOG_DEBUG("%s. Pending for ready %ums", sensor->sensorName, pendingForReadyMs);
+                    if (pendingForReadyMs) {
+                        return pendingForReadyMs;
+                    }
+                }
            }
        }

@@ -109,9 +128,18 @@ int32_t AirQualityTelemetryModule::runOnce()
        }

        // Send to sleep sensors that consume power
-        LOG_INFO("Sending sensors to sleep");
+        LOG_DEBUG("Sending sensors to sleep");
        for (TelemetrySensor *sensor : sensors) {
-            sensor->sleep();
+            if (sensor->isActive() && sensor->canSleep()) {
+                if (sensor->wakeUpTimeMs() < Default::getConfiguredOrDefaultMsScaled(moduleConfig.telemetry.air_quality_interval,
+                                                                                     default_telemetry_broadcast_interval_secs,
+                                                                                     numOnlineNodes)) {
+                    LOG_DEBUG("Disabling %s until next period", sensor->sensorName);
+                    sensor->sleep();
+                } else {
+                    LOG_DEBUG("Sensor stays enabled due to warm up period");
+                }
+            }
        }
    }
    return min(sendToPhoneIntervalMs, result);
@@ -158,8 +186,7 @@ void AirQualityTelemetryModule::drawFrame(OLEDDisplay *display, OLEDDisplayUiSta
    const auto &m = telemetry.variant.air_quality_metrics;

    // Check if any telemetry field has valid data
-    bool hasAny = m.has_pm10_standard || m.has_pm25_standard || m.has_pm100_standard || m.has_pm10_environmental ||
-                  m.has_pm25_environmental || m.has_pm100_environmental;
+    bool hasAny = m.has_pm10_standard || m.has_pm25_standard || m.has_pm100_standard;

    if (!hasAny) {
        display->drawString(x, currentY, "No Telemetry");
@@ -225,9 +252,10 @@ bool AirQualityTelemetryModule::handleReceivedProtobuf(const meshtastic_MeshPack
                 t->variant.air_quality_metrics.pm10_standard, t->variant.air_quality_metrics.pm25_standard,
                 t->variant.air_quality_metrics.pm100_standard);

-        LOG_INFO("                  | PM1.0(Environmental)=%i, PM2.5(Environmental)=%i, PM10.0(Environmental)=%i",
-                 t->variant.air_quality_metrics.pm10_environmental, t->variant.air_quality_metrics.pm25_environmental,
-                 t->variant.air_quality_metrics.pm100_environmental);
+        // TODO - Decide what to do with these
+        // LOG_INFO("                  | PM1.0(Environmental)=%i, PM2.5(Environmental)=%i, PM10.0(Environmental)=%i",
+        //          t->variant.air_quality_metrics.pm10_environmental, t->variant.air_quality_metrics.pm25_environmental,
+        //          t->variant.air_quality_metrics.pm100_environmental);
 #endif
        // release previous packet before occupying a new spot
        if (lastMeasurementPacket != nullptr)
@@ -247,10 +275,8 @@ bool AirQualityTelemetryModule::getAirQualityTelemetry(meshtastic_Telemetry *m)
    m->which_variant = meshtastic_Telemetry_air_quality_metrics_tag;
    m->variant.air_quality_metrics = meshtastic_AirQualityMetrics_init_zero;

-    // TODO - Should we check for sensor state here?
-    // If a sensor is sleeping, we should know and check to wake it up
    for (TelemetrySensor *sensor : sensors) {
-        LOG_INFO("Reading AQ sensors");
+        LOG_DEBUG("Reading %s", sensor->sensorName);
        valid = valid && sensor->getMetrics(m);
        hasSensor = true;
    }
@@ -291,12 +317,14 @@ bool AirQualityTelemetryModule::sendTelemetry(NodeNum dest, bool phoneOnly)
    meshtastic_Telemetry m = meshtastic_Telemetry_init_zero;
    m.which_variant = meshtastic_Telemetry_air_quality_metrics_tag;
    m.time = getTime();
+
    if (getAirQualityTelemetry(&m)) {
-        LOG_INFO("Send: pm10_standard=%u, pm25_standard=%u, pm100_standard=%u, \
-                    pm10_environmental=%u, pm25_environmental=%u, pm100_environmental=%u",
-                 m.variant.air_quality_metrics.pm10_standard, m.variant.air_quality_metrics.pm25_standard,
-                 m.variant.air_quality_metrics.pm100_standard, m.variant.air_quality_metrics.pm10_environmental,
-                 m.variant.air_quality_metrics.pm25_environmental, m.variant.air_quality_metrics.pm100_environmental);
+        LOG_INFO("Send: pm10_standard=%u, pm25_standard=%u, pm100_standard=%u", m.variant.air_quality_metrics.pm10_standard,
+                 m.variant.air_quality_metrics.pm25_standard, m.variant.air_quality_metrics.pm100_standard);
+        if (m.variant.air_quality_metrics.has_pm10_environmental)
+            LOG_INFO("pm10_environmental=%u, pm25_environmental=%u, pm100_environmental=%u",
+                     m.variant.air_quality_metrics.pm10_environmental, m.variant.air_quality_metrics.pm25_environmental,
+                     m.variant.air_quality_metrics.pm100_environmental);

        meshtastic_MeshPacket *p = allocDataProtobuf(m);
        p->to = dest;
@@ -331,6 +359,20 @@ bool AirQualityTelemetryModule::sendTelemetry(NodeNum dest, bool phoneOnly)
                LOG_DEBUG("Start next execution in 5s, then sleep");
                setIntervalFromNow(FIVE_SECONDS_MS);
            }
+
+            if (config.device.role == meshtastic_Config_DeviceConfig_Role_SENSOR && config.power.is_power_saving) {
+                meshtastic_ClientNotification *notification = clientNotificationPool.allocZeroed();
+                notification->level = meshtastic_LogRecord_Level_INFO;
+                notification->time = getValidTime(RTCQualityFromNet);
+                sprintf(notification->message, "Sending telemetry and sleeping for %us interval in a moment",
+                        Default::getConfiguredOrDefaultMs(moduleConfig.telemetry.air_quality_interval,
+                                                          default_telemetry_broadcast_interval_secs) /
+                            1000U);
+                service->sendClientNotification(notification);
+                sleepOnNextExecution = true;
+                LOG_DEBUG("Start next execution in 5s, then sleep");
+                setIntervalFromNow(FIVE_SECONDS_MS);
+            }
        }
        return true;
    }
--- a/src/modules/Telemetry/Sensor/PMSA003ISensor.cpp
+++ b/src/modules/Telemetry/Sensor/PMSA003ISensor.cpp
@@ -21,26 +21,29 @@ bool PMSA003ISensor::initDevice(TwoWire *bus, ScanI2C::FoundDevice *dev)
    _bus = bus;
    _address = dev->address.address;

-#if defined(PMSA003I_I2C_CLOCK_SPEED) && defined(CAN_RECLOCK_I2C)
-    uint32_t currentClock = reClockI2C(PMSA003I_I2C_CLOCK_SPEED, _bus);
-    if (!currentClock) {
-        LOG_WARN("PMSA003I can't be used at this clock speed");
-        return false;
-    }
-#endif
+#ifdef PMSA003I_I2C_CLOCK_SPEED
+#ifdef CAN_RECLOCK_I2C
+    uint32_t currentClock = reClockI2C(PMSA003I_I2C_CLOCK_SPEED, _bus, false);
+#elif !HAS_SCREEN
+    reClockI2C(PMSA003I_I2C_CLOCK_SPEED, _bus, true);
+#else
+    LOG_WARN("%s can't be used at this clock speed, with a screen", sensorName);
+    return false;
+#endif /* CAN_RECLOCK_I2C */
+#endif /* PMSA003I_I2C_CLOCK_SPEED */

    _bus->beginTransmission(_address);
    if (_bus->endTransmission() != 0) {
-        LOG_WARN("PMSA003I not found on I2C at 0x12");
+        LOG_WARN("%s not found on I2C at 0x12", sensorName);
        return false;
    }

 #if defined(PMSA003I_I2C_CLOCK_SPEED) && defined(CAN_RECLOCK_I2C)
-    reClockI2C(currentClock, _bus);
+    reClockI2C(currentClock, _bus, false);
 #endif

    status = 1;
-    LOG_INFO("PMSA003I Enabled");
+    LOG_INFO("%s Enabled", sensorName);

    initI2CSensor();
    return true;
@@ -49,30 +52,37 @@ bool PMSA003ISensor::initDevice(TwoWire *bus, ScanI2C::FoundDevice *dev)
 bool PMSA003ISensor::getMetrics(meshtastic_Telemetry *measurement)
 {
    if (!isActive()) {
-        LOG_WARN("PMSA003I is not active");
+        LOG_WARN("Can't get metrics. %s is not active", sensorName);
        return false;
    }

-#if defined(PMSA003I_I2C_CLOCK_SPEED) && defined(CAN_RECLOCK_I2C)
-    uint32_t currentClock = reClockI2C(PMSA003I_I2C_CLOCK_SPEED, _bus);
-#endif
+#ifdef PMSA003I_I2C_CLOCK_SPEED
+#ifdef CAN_RECLOCK_I2C
+    uint32_t currentClock = reClockI2C(PMSA003I_I2C_CLOCK_SPEED, _bus, false);
+#elif !HAS_SCREEN
+    reClockI2C(PMSA003I_I2C_CLOCK_SPEED, _bus, true);
+#else
+    LOG_WARN("%s can't be used at this clock speed, with a screen", sensorName);
+    return false;
+#endif /* CAN_RECLOCK_I2C */
+#endif /* PMSA003I_I2C_CLOCK_SPEED */

    _bus->requestFrom(_address, PMSA003I_FRAME_LENGTH);
    if (_bus->available() < PMSA003I_FRAME_LENGTH) {
-        LOG_WARN("PMSA003I read failed: incomplete data (%d bytes)", _bus->available());
+        LOG_WARN("%s read failed: incomplete data (%d bytes)", sensorName, _bus->available());
        return false;
    }

-#if defined(PMSA003I_I2C_CLOCK_SPEED) && defined(CAN_RECLOCK_I2C)
-    reClockI2C(currentClock, _bus);
-#endif
-
    for (uint8_t i = 0; i < PMSA003I_FRAME_LENGTH; i++) {
        buffer[i] = _bus->read();
    }

+#if defined(PMSA003I_I2C_CLOCK_SPEED) && defined(CAN_RECLOCK_I2C)
+    reClockI2C(currentClock, _bus, false);
+#endif
+
    if (buffer[0] != 0x42 || buffer[1] != 0x4D) {
-        LOG_WARN("PMSA003I frame header invalid: 0x%02X 0x%02X", buffer[0], buffer[1]);
+        LOG_WARN("%s frame header invalid: 0x%02X 0x%02X", sensorName, buffer[0], buffer[1]);
        return false;
    }

@@ -86,7 +96,7 @@ bool PMSA003ISensor::getMetrics(meshtastic_Telemetry *measurement)
    receivedChecksum = read16(buffer, PMSA003I_FRAME_LENGTH - 2);

    if (computedChecksum != receivedChecksum) {
-        LOG_WARN("PMSA003I checksum failed: computed 0x%04X, received 0x%04X", computedChecksum, receivedChecksum);
+        LOG_WARN("%s checksum failed: computed 0x%04X, received 0x%04X", sensorName, computedChecksum, receivedChecksum);
        return false;
    }

@@ -136,20 +146,58 @@ bool PMSA003ISensor::isActive()
    return state == State::ACTIVE;
 }

+int32_t PMSA003ISensor::wakeUpTimeMs()
+{
+#ifdef PMSA003I_ENABLE_PIN
+    return PMSA003I_WARMUP_MS;
+#endif
+    return 0;
+}
+
+int32_t PMSA003ISensor::pendingForReadyMs()
+{
+#ifdef PMSA003I_ENABLE_PIN
+
+    uint32_t now;
+    now = getTime();
+    uint32_t sincePmMeasureStarted = (now - pmMeasureStarted) * 1000;
+    LOG_DEBUG("%s: Since measure started: %ums", sensorName, sincePmMeasureStarted);
+
+    if (sincePmMeasureStarted < PMSA003I_WARMUP_MS) {
+        LOG_INFO("%s: not enough time passed since starting measurement", sensorName);
+        return PMSA003I_WARMUP_MS - sincePmMeasureStarted;
+    }
+    return 0;
+
+#endif
+    return 0;
+}
+
+bool PMSA003ISensor::canSleep()
+{
+#ifdef PMSA003I_ENABLE_PIN
+    return true;
+#endif
+    return false;
+}
+
 void PMSA003ISensor::sleep()
 {
 #ifdef PMSA003I_ENABLE_PIN
    digitalWrite(PMSA003I_ENABLE_PIN, LOW);
    state = State::IDLE;
+    pmMeasureStarted = 0;
 #endif
 }

 uint32_t PMSA003ISensor::wakeUp()
 {
 #ifdef PMSA003I_ENABLE_PIN
-    LOG_INFO("Waking up PMSA003I");
+    LOG_INFO("Waking up %s", sensorName);
    digitalWrite(PMSA003I_ENABLE_PIN, HIGH);
    state = State::ACTIVE;
+    pmMeasureStarted = getTime();
+
    return PMSA003I_WARMUP_MS;
 #endif
    // No need to wait for warmup if already active
--- a/src/modules/Telemetry/Sensor/PMSA003ISensor.h
+++ b/src/modules/Telemetry/Sensor/PMSA003ISensor.h
@@ -3,6 +3,7 @@
 #if !MESHTASTIC_EXCLUDE_AIR_QUALITY_SENSOR

 #include "../mesh/generated/meshtastic/telemetry.pb.h"
+#include "RTC.h"
 #include "TelemetrySensor.h"

 #define PMSA003I_I2C_CLOCK_SPEED 100000
@@ -19,6 +20,9 @@ class PMSA003ISensor : public TelemetrySensor
    virtual bool isActive() override;
    virtual void sleep() override;
    virtual uint32_t wakeUp() override;
+    virtual bool canSleep() override;
+    virtual int32_t wakeUpTimeMs() override;
+    virtual int32_t pendingForReadyMs() override;

  private:
    enum class State { IDLE, ACTIVE };
@@ -26,6 +30,7 @@ class PMSA003ISensor : public TelemetrySensor

    uint16_t computedChecksum = 0;
    uint16_t receivedChecksum = 0;
+    uint32_t pmMeasureStarted = 0;

    uint8_t buffer[PMSA003I_FRAME_LENGTH]{};
    TwoWire *_bus{};
--- a/src/modules/Telemetry/Sensor/SEN5XSensor.cpp
+++ b/src/modules/Telemetry/Sensor/SEN5XSensor.cpp
@@ -0,0 +1,957 @@
+#include "configuration.h"
+
+#if !MESHTASTIC_EXCLUDE_AIR_QUALITY_SENSOR
+
+#include "../detect/reClockI2C.h"
+#include "../mesh/generated/meshtastic/telemetry.pb.h"
+#include "FSCommon.h"
+#include "SEN5XSensor.h"
+#include "SPILock.h"
+#include "SafeFile.h"
+#include "TelemetrySensor.h"
+#include <float.h> // FLT_MAX
+#include <pb_decode.h>
+#include <pb_encode.h>
+
+SEN5XSensor::SEN5XSensor() : TelemetrySensor(meshtastic_TelemetrySensorType_SEN5X, "SEN5X") {}
+
+bool SEN5XSensor::getVersion()
+{
+    if (!sendCommand(SEN5X_GET_FIRMWARE_VERSION)) {
+        LOG_ERROR("SEN5X: Error sending version command");
+        return false;
+    }
+    delay(20); // From Sensirion Datasheet
+
+    uint8_t versionBuffer[12];
+    size_t charNumber = readBuffer(&versionBuffer[0], 3);
+    if (charNumber == 0) {
+        LOG_ERROR("SEN5X: Error getting data ready flag value");
+        return false;
+    }
+
+    firmwareVer = versionBuffer[0] + (versionBuffer[1] / 10);
+    hardwareVer = versionBuffer[3] + (versionBuffer[4] / 10);
+    protocolVer = versionBuffer[5] + (versionBuffer[6] / 10);
+
+    LOG_INFO("SEN5X Firmware Version: %0.2f", firmwareVer);
+    LOG_INFO("SEN5X Hardware Version: %0.2f", hardwareVer);
+    LOG_INFO("SEN5X Protocol Version: %0.2f", protocolVer);
+
+    return true;
+}
+
+bool SEN5XSensor::findModel()
+{
+    if (!sendCommand(SEN5X_GET_PRODUCT_NAME)) {
+        LOG_ERROR("SEN5X: Error asking for product name");
+        return false;
+    }
+    delay(50); // From Sensirion Datasheet
+
+    const uint8_t nameSize = 48;
+    uint8_t name[nameSize];
+    size_t charNumber = readBuffer(&name[0], nameSize);
+    if (charNumber == 0) {
+        LOG_ERROR("SEN5X: Error getting device name");
+        return false;
+    }
+
+    // We only check the last character that defines the model SEN5X
+    switch (name[4]) {
+    case 48:
+        model = SEN50;
+        LOG_INFO("SEN5X: found sensor model SEN50");
+        break;
+    case 52:
+        model = SEN54;
+        LOG_INFO("SEN5X: found sensor model SEN54");
+        break;
+    case 53:
+        model = SEN55;
+        LOG_INFO("SEN5X: found sensor model SEN55");
+        break;
+    }
+
+    return true;
+}
+
+bool SEN5XSensor::sendCommand(uint16_t command)
+{
+    uint8_t nothing;
+    return sendCommand(command, &nothing, 0);
+}
+
+bool SEN5XSensor::sendCommand(uint16_t command, uint8_t *buffer, uint8_t byteNumber)
+{
+    // At least we need two bytes for the command
+    uint8_t bufferSize = 2;
+
+    // Add space for CRC bytes (one every two bytes)
+    if (byteNumber > 0)
+        bufferSize += byteNumber + (byteNumber / 2);
+
+    uint8_t toSend[bufferSize];
+    uint8_t i = 0;
+    toSend[i++] = static_cast<uint8_t>((command & 0xFF00) >> 8);
+    toSend[i++] = static_cast<uint8_t>((command & 0x00FF) >> 0);
+
+    // Prepare buffer with CRC every third byte
+    uint8_t bi = 0;
+    if (byteNumber > 0) {
+        while (bi < byteNumber) {
+            toSend[i++] = buffer[bi++];
+            toSend[i++] = buffer[bi++];
+            uint8_t calcCRC = sen5xCRC(&buffer[bi - 2]);
+            toSend[i++] = calcCRC;
+        }
+    }
+
+#ifdef SEN5X_I2C_CLOCK_SPEED
+#ifdef CAN_RECLOCK_I2C
+    uint32_t currentClock = reClockI2C(SEN5X_I2C_CLOCK_SPEED, _bus, false);
+#elif !HAS_SCREEN
+    reClockI2C(SEN5X_I2C_CLOCK_SPEED, _bus, true);
+#else
+    LOG_WARN("%s can't be used at this clock speed, with a screen", sensorName);
+    return false;
+#endif /* CAN_RECLOCK_I2C */
+#endif /* SEN5X_I2C_CLOCK_SPEED */
+
+    // Transmit the data
+    // LOG_DEBUG("Beginning connection to SEN5X: 0x%x. Size: %u", address, bufferSize);
+    // Note: this delay is necessary to allow for long-buffers
+    delay(20);
+    _bus->beginTransmission(_address);
+    size_t writtenBytes = _bus->write(toSend, bufferSize);
+    uint8_t i2c_error = _bus->endTransmission();
+
+#if defined(SEN5X_I2C_CLOCK_SPEED) && defined(CAN_RECLOCK_I2C)
+    reClockI2C(currentClock, _bus, false);
+#endif
+
+    if (writtenBytes != bufferSize) {
+        LOG_ERROR("SEN5X: Error writting on I2C bus");
+        return false;
+    }
+
+    if (i2c_error != 0) {
+        LOG_ERROR("SEN5X: Error on I2C communication: %x", i2c_error);
+        return false;
+    }
+    return true;
+}
+
+uint8_t SEN5XSensor::readBuffer(uint8_t *buffer, uint8_t byteNumber)
+{
+#ifdef SEN5X_I2C_CLOCK_SPEED
+#ifdef CAN_RECLOCK_I2C
+    uint32_t currentClock = reClockI2C(SEN5X_I2C_CLOCK_SPEED, _bus, false);
+#elif !HAS_SCREEN
+    reClockI2C(SEN5X_I2C_CLOCK_SPEED, _bus, true);
+#else
+    LOG_WARN("%s can't be used at this clock speed, with a screen", sensorName);
+    return false;
+#endif /* CAN_RECLOCK_I2C */
+#endif /* SEN5X_I2C_CLOCK_SPEED */
+
+    size_t readBytes = _bus->requestFrom(_address, byteNumber);
+    if (readBytes != byteNumber) {
+        LOG_ERROR("SEN5X: Error reading I2C bus");
+        return 0;
+    }
+
+    uint8_t i = 0;
+    uint8_t receivedBytes = 0;
+    while (readBytes > 0) {
+        buffer[i++] = _bus->read(); // Just as a reminder: i++ returns i and after that increments.
+        buffer[i++] = _bus->read();
+        uint8_t recvCRC = _bus->read();
+        uint8_t calcCRC = sen5xCRC(&buffer[i - 2]);
+        if (recvCRC != calcCRC) {
+            LOG_ERROR("SEN5X: Checksum error while receiving msg");
+            return 0;
+        }
+        readBytes -= 3;
+        receivedBytes += 2;
+    }
+#if defined(SEN5X_I2C_CLOCK_SPEED) && defined(CAN_RECLOCK_I2C)
+    reClockI2C(currentClock, _bus, false);
+#endif
+
+    return receivedBytes;
+}
+
+uint8_t SEN5XSensor::sen5xCRC(uint8_t *buffer)
+{
+    // This code is based on Sensirion's own implementation
+    // https://github.com/Sensirion/arduino-core/blob/41fd02cacf307ec4945955c58ae495e56809b96c/src/SensirionCrc.cpp
+    uint8_t crc = 0xff;
+
+    for (uint8_t i = 0; i < 2; i++) {
+
+        crc ^= buffer[i];
+
+        for (uint8_t bit = 8; bit > 0; bit--) {
+            if (crc & 0x80)
+                crc = (crc << 1) ^ 0x31;
+            else
+                crc = (crc << 1);
+        }
+    }
+
+    return crc;
+}
+
+void SEN5XSensor::sleep()
+{
+    // TODO Check this works
+    idle(true);
+}
+
+bool SEN5XSensor::idle(bool checkState)
+{
+    // From the datasheet:
+    // By default, the VOC algorithm resets its state to initial
+    // values each time a measurement is started,
+    // even if the measurement was stopped only for a short
+    // time. So, the VOC index output value needs a long time
+    // until it is stable again. This can be avoided by
+    // restoring the previously memorized algorithm state before
+    // starting the measure mode
+
+    if (checkState) {
+        // If the stabilisation period is not passed for SEN54 or SEN55, don't go to idle
+        if (model != SEN50) {
+            // Get VOC state before going to idle mode
+            vocValid = false;
+            if (vocStateFromSensor()) {
+                vocValid = vocStateValid();
+                // Check if we have time, and store it
+                uint32_t now; // If time is RTCQualityNone, it will return zero
+                now = getValidTime(RTCQuality::RTCQualityDevice);
+                if (now) {
+                    // Check if state is valid (non-zero)
+                    vocTime = now;
+                }
+            }
+
+            if (vocStateStable() && vocValid) {
+                saveState();
+            } else {
+                LOG_INFO("SEN5X: Not stopping measurement, vocState is not stable yet!");
+                return true;
+            }
+        }
+    }
+
+    if (!oneShotMode) {
+        LOG_INFO("SEN5X: Not stopping measurement, continuous mode!");
+        return true;
+    }
+
+    // Switch to low-power based on the model
+    if (model == SEN50) {
+        if (!sendCommand(SEN5X_STOP_MEASUREMENT)) {
+            LOG_ERROR("SEN5X: Error stopping measurement");
+            return false;
+        }
+        state = SEN5X_IDLE;
+        LOG_INFO("SEN5X: Stop measurement mode");
+    } else {
+        if (!sendCommand(SEN5X_START_MEASUREMENT_RHT_GAS)) {
+            LOG_ERROR("SEN5X: Error switching to RHT/Gas measurement");
+            return false;
+        }
+        state = SEN5X_RHTGAS_ONLY;
+        LOG_INFO("SEN5X: Switch to RHT/Gas only measurement mode");
+    }
+
+    delay(200); // From Sensirion Datasheet
+    pmMeasureStarted = 0;
+    return true;
+}
+
+bool SEN5XSensor::vocStateRecent(uint32_t now)
+{
+    if (now) {
+        uint32_t passed = now - vocTime; // in seconds
+
+        // Check if state is recent, less than 10 minutes (600 seconds)
+        if (passed < SEN5X_VOC_VALID_TIME && (now > SEN5X_VOC_VALID_DATE)) {
+            return true;
+        }
+    }
+    return false;
+}
+
+bool SEN5XSensor::vocStateValid()
+{
+    if (!vocState[0] && !vocState[1] && !vocState[2] && !vocState[3] && !vocState[4] && !vocState[5] && !vocState[6] &&
+        !vocState[7]) {
+        LOG_DEBUG("SEN5X: VOC state is all 0, invalid");
+        return false;
+    } else {
+        LOG_DEBUG("SEN5X: VOC state is valid");
+        return true;
+    }
+}
+
+bool SEN5XSensor::vocStateToSensor()
+{
+    if (model == SEN50) {
+        return true;
+    }
+
+    if (!vocStateValid()) {
+        LOG_INFO("SEN5X: VOC state is invalid, not sending");
+        return true;
+    }
+
+    if (!sendCommand(SEN5X_STOP_MEASUREMENT)) {
+        LOG_ERROR("SEN5X: Error stoping measurement");
+        return false;
+    }
+    delay(200); // From Sensirion Datasheet
+
+    LOG_DEBUG("SEN5X: Sending VOC state to sensor");
+    LOG_DEBUG("[%u, %u, %u, %u, %u, %u, %u, %u]", vocState[0], vocState[1], vocState[2], vocState[3], vocState[4], vocState[5],
+              vocState[6], vocState[7]);
+
+    // Note: send command already takes into account the CRC
+    // buffer size increment needed
+    if (!sendCommand(SEN5X_RW_VOCS_STATE, vocState, SEN5X_VOC_STATE_BUFFER_SIZE)) {
+        LOG_ERROR("SEN5X: Error sending VOC's state command'");
+        return false;
+    }
+
+    return true;
+}
+
+bool SEN5XSensor::vocStateFromSensor()
+{
+    if (model == SEN50) {
+        return true;
+    }
+
+    LOG_INFO("SEN5X: Getting VOC state from sensor");
+    //  Ask VOCs state from the sensor
+    if (!sendCommand(SEN5X_RW_VOCS_STATE)) {
+        LOG_ERROR("SEN5X: Error sending VOC's state command'");
+        return false;
+    }
+
+    delay(20); // From Sensirion Datasheet
+
+    // Retrieve the data
+    // Allocate buffer to account for CRC
+    size_t receivedNumber = readBuffer(&vocState[0], SEN5X_VOC_STATE_BUFFER_SIZE + (SEN5X_VOC_STATE_BUFFER_SIZE / 2));
+    delay(20); // From Sensirion Datasheet
+
+    if (receivedNumber == 0) {
+        LOG_DEBUG("SEN5X: Error getting VOC's state");
+        return false;
+    }
+
+    // Print the state (if debug is on)
+    LOG_DEBUG("SEN5X: VOC state retrieved from sensor: [%u, %u, %u, %u, %u, %u, %u, %u]", vocState[0], vocState[1], vocState[2],
+              vocState[3], vocState[4], vocState[5], vocState[6], vocState[7]);
+
+    return true;
+}
+
+bool SEN5XSensor::loadState()
+{
+#ifdef FSCom
+    spiLock->lock();
+    auto file = FSCom.open(sen5XStateFileName, FILE_O_READ);
+    bool okay = false;
+    if (file) {
+        LOG_INFO("%s state read from %s", sensorName, sen5XStateFileName);
+        pb_istream_t stream = {&readcb, &file, meshtastic_SEN5XState_size};
+
+        if (!pb_decode(&stream, &meshtastic_SEN5XState_msg, &sen5xstate)) {
+            LOG_ERROR("Error: can't decode protobuf %s", PB_GET_ERROR(&stream));
+        } else {
+            lastCleaning = sen5xstate.last_cleaning_time;
+            lastCleaningValid = sen5xstate.last_cleaning_valid;
+            oneShotMode = sen5xstate.one_shot_mode;
+
+            if (model != SEN50) {
+                vocTime = sen5xstate.voc_state_time;
+                vocValid = sen5xstate.voc_state_valid;
+                // Unpack state
+                vocState[7] = (uint8_t)(sen5xstate.voc_state_array >> 56);
+                vocState[6] = (uint8_t)(sen5xstate.voc_state_array >> 48);
+                vocState[5] = (uint8_t)(sen5xstate.voc_state_array >> 40);
+                vocState[4] = (uint8_t)(sen5xstate.voc_state_array >> 32);
+                vocState[3] = (uint8_t)(sen5xstate.voc_state_array >> 24);
+                vocState[2] = (uint8_t)(sen5xstate.voc_state_array >> 16);
+                vocState[1] = (uint8_t)(sen5xstate.voc_state_array >> 8);
+                vocState[0] = (uint8_t)sen5xstate.voc_state_array;
+            }
+
+            // LOG_DEBUG("Loaded lastCleaning %u", lastCleaning);
+            // LOG_DEBUG("Loaded lastCleaningValid %u", lastCleaningValid);
+            // LOG_DEBUG("Loaded oneShotMode %s", oneShotMode ? "true" : "false");
+            // LOG_DEBUG("Loaded vocTime %u", vocTime);
+            // LOG_DEBUG("Loaded [%u, %u, %u, %u, %u, %u, %u, %u]",
+            // vocState[7], vocState[6], vocState[5], vocState[4], vocState[3], vocState[2], vocState[1], vocState[0]);
+            // LOG_DEBUG("Loaded %svalid VOC state", vocValid ? "" : "in");
+
+            okay = true;
+        }
+        file.close();
+    } else {
+        LOG_INFO("No %s state found (File: %s)", sensorName, sen5XStateFileName);
+    }
+    spiLock->unlock();
+    return okay;
+#else
+    LOG_ERROR("SEN5X: ERROR - Filesystem not implemented");
+#endif
+}
+
+bool SEN5XSensor::saveState()
+{
+#ifdef FSCom
+    auto file = SafeFile(sen5XStateFileName);
+
+    sen5xstate.last_cleaning_time = lastCleaning;
+    sen5xstate.last_cleaning_valid = lastCleaningValid;
+    sen5xstate.one_shot_mode = oneShotMode;
+
+    if (model != SEN50) {
+        sen5xstate.has_voc_state_time = true;
+        sen5xstate.has_voc_state_valid = true;
+        sen5xstate.has_voc_state_array = true;
+
+        sen5xstate.voc_state_time = vocTime;
+        sen5xstate.voc_state_valid = vocValid;
+        // Unpack state (8 bytes)
+        sen5xstate.voc_state_array = (((uint64_t)vocState[7]) << 56) | ((uint64_t)vocState[6] << 48) |
+                                     ((uint64_t)vocState[5] << 40) | ((uint64_t)vocState[4] << 32) |
+                                     ((uint64_t)vocState[3] << 24) | ((uint64_t)vocState[2] << 16) |
+                                     ((uint64_t)vocState[1] << 8) | ((uint64_t)vocState[0]);
+    }
+
+    bool okay = false;
+
+    LOG_INFO("%s: state write to %s", sensorName, sen5XStateFileName);
+    pb_ostream_t stream = {&writecb, static_cast<Print *>(&file), meshtastic_SEN5XState_size};
+
+    if (!pb_encode(&stream, &meshtastic_SEN5XState_msg, &sen5xstate)) {
+        LOG_ERROR("Error: can't encode protobuf %s", PB_GET_ERROR(&stream));
+    } else {
+        okay = true;
+    }
+
+    okay &= file.close();
+
+    if (okay)
+        LOG_INFO("%s: state write to %s successful", sensorName, sen5XStateFileName);
+
+    return okay;
+#else
+    LOG_ERROR("%s: ERROR - Filesystem not implemented", sensorName);
+#endif
+}
+
+bool SEN5XSensor::isActive()
+{
+    return state == SEN5X_MEASUREMENT || state == SEN5X_MEASUREMENT_2;
+}
+
+uint32_t SEN5XSensor::wakeUp()
+{
+
+    LOG_DEBUG("SEN5X: Waking up sensor");
+
+    if (!sendCommand(SEN5X_START_MEASUREMENT)) {
+        LOG_ERROR("SEN5X: Error starting measurement");
+        // TODO - what should this return?? Something actually on the default interval?
+        return DEFAULT_SENSOR_MINIMUM_WAIT_TIME_BETWEEN_READS;
+    }
+    delay(50); // From Sensirion Datasheet
+
+    // TODO - This is currently "problematic"
+    // If time is updated in between reads, there is no way to
+    // keep track of how long it has passed
+    pmMeasureStarted = getTime();
+    state = SEN5X_MEASUREMENT;
+    if (state == SEN5X_MEASUREMENT)
+        LOG_INFO("SEN5X: Started measurement mode");
+    return SEN5X_WARMUP_MS_1;
+}
+
+bool SEN5XSensor::vocStateStable()
+{
+    uint32_t now;
+    now = getTime();
+    uint32_t sinceFirstMeasureStarted = (now - rhtGasMeasureStarted);
+    LOG_DEBUG("sinceFirstMeasureStarted: %us", sinceFirstMeasureStarted);
+    return sinceFirstMeasureStarted > SEN5X_VOC_STATE_WARMUP_S;
+}
+
+bool SEN5XSensor::startCleaning()
+{
+    // Note: we only should enter here if we have a valid RTC with at least
+    // RTCQuality::RTCQualityDevice
+    state = SEN5X_CLEANING;
+
+    // Note that cleaning command can only be run when the sensor is in measurement mode
+    if (!sendCommand(SEN5X_START_MEASUREMENT)) {
+        LOG_ERROR("SEN5X: Error starting measurment mode");
+        return false;
+    }
+    delay(50); // From Sensirion Datasheet
+
+    if (!sendCommand(SEN5X_START_FAN_CLEANING)) {
+        LOG_ERROR("SEN5X: Error starting fan cleaning");
+        return false;
+    }
+    delay(20); // From Sensirion Datasheet
+
+    // This message will be always printed so the user knows the device it's not hung
+    LOG_INFO("SEN5X: Started fan cleaning it will take 10 seconds...");
+
+    uint16_t started = millis();
+    while (millis() - started < 10500) {
+        delay(500);
+    }
+    LOG_INFO("SEN5X: Cleaning done!!");
+
+    // Save timestamp in flash so we know when a week has passed
+    uint32_t now;
+    now = getValidTime(RTCQuality::RTCQualityDevice);
+    // If time is not RTCQualityNone, it will return non-zero
+    lastCleaning = now;
+    lastCleaningValid = true;
+    saveState();
+
+    idle();
+    return true;
+}
+
+bool SEN5XSensor::initDevice(TwoWire *bus, ScanI2C::FoundDevice *dev)
+{
+    state = SEN5X_NOT_DETECTED;
+    LOG_INFO("Init sensor: %s", sensorName);
+
+    _bus = bus;
+    _address = dev->address.address;
+
+    delay(50); // without this there is an error on the deviceReset function
+
+    if (!sendCommand(SEN5X_RESET)) {
+        LOG_ERROR("SEN5X: Error reseting device");
+        return false;
+    }
+    delay(200); // From Sensirion Datasheet
+
+    if (!findModel()) {
+        LOG_ERROR("SEN5X: error finding sensor model");
+        return false;
+    }
+
+    // Check the firmware version
+    if (!getVersion())
+        return false;
+    if (firmwareVer < 2) {
+        LOG_ERROR("SEN5X: error firmware is too old and will not work with this implementation");
+        return false;
+    }
+    delay(200); // From Sensirion Datasheet
+
+    // Detection succeeded
+    state = SEN5X_IDLE;
+    status = 1;
+
+    // Load state
+    loadState();
+
+    // Check if it is time to do a cleaning
+    uint32_t now;
+    int32_t passed;
+    now = getValidTime(RTCQuality::RTCQualityDevice);
+
+    // If time is not RTCQualityNone, it will return non-zero
+    if (now) {
+        if (lastCleaningValid) {
+
+            passed = now - lastCleaning; // in seconds
+
+            if (passed > ONE_WEEK_IN_SECONDS && (now > SEN5X_VOC_VALID_DATE)) {
+                // If current date greater than 01/01/2018 (validity check)
+                LOG_INFO("SEN5X: More than a week (%us) since last cleaning in epoch (%us). Trigger, cleaning...", passed,
+                         lastCleaning);
+                startCleaning();
+            } else {
+                LOG_INFO("SEN5X: Cleaning not needed (%ds passed). Last cleaning date (in epoch): %us", passed, lastCleaning);
+            }
+        } else {
+            // We assume the device has just been updated or it is new,
+            // so no need to trigger a cleaning.
+            // Just save the timestamp to do a cleaning one week from now.
+            // Otherwise, we will never trigger cleaning in some cases
+            lastCleaning = now;
+            lastCleaningValid = true;
+            LOG_INFO("SEN5X: No valid last cleaning date found, saving it now: %us", lastCleaning);
+            saveState();
+        }
+
+        if (model != SEN50) {
+            if (!vocValid) {
+                LOG_INFO("SEN5X: No valid VOC's state found");
+            } else {
+                // Check if state is recent
+                if (vocStateRecent(now)) {
+                    // If current date greater than 01/01/2018 (validity check)
+                    // Send it to the sensor
+                    LOG_INFO("SEN5X: VOC state is valid and recent");
+                    vocStateToSensor();
+                } else {
+                    LOG_INFO("SEN5X: VOC state is too old or date is invalid");
+                    LOG_DEBUG("SEN5X: vocTime %u, Passed %u, and now %u", vocTime, passed, now);
+                }
+            }
+        }
+    } else {
+        // TODO - Should this actually ignore? We could end up never cleaning...
+        LOG_INFO("SEN5X: Not enough RTCQuality, ignoring saved state. Trying again later");
+    }
+
+    idle(false);
+    rhtGasMeasureStarted = now;
+
+    initI2CSensor();
+    return true;
+}
+
+bool SEN5XSensor::readValues()
+{
+    if (!sendCommand(SEN5X_READ_VALUES)) {
+        LOG_ERROR("SEN5X: Error sending read command");
+        return false;
+    }
+    LOG_DEBUG("SEN5X: Reading PM Values");
+    delay(20); // From Sensirion Datasheet
+
+    uint8_t dataBuffer[16];
+    size_t receivedNumber = readBuffer(&dataBuffer[0], 24);
+    if (receivedNumber == 0) {
+        LOG_ERROR("SEN5X: Error getting values");
+        return false;
+    }
+
+    // Get the integers
+    uint16_t uint_pM1p0 = static_cast<uint16_t>((dataBuffer[0] << 8) | dataBuffer[1]);
+    uint16_t uint_pM2p5 = static_cast<uint16_t>((dataBuffer[2] << 8) | dataBuffer[3]);
+    uint16_t uint_pM4p0 = static_cast<uint16_t>((dataBuffer[4] << 8) | dataBuffer[5]);
+    uint16_t uint_pM10p0 = static_cast<uint16_t>((dataBuffer[6] << 8) | dataBuffer[7]);
+
+    int16_t int_humidity = static_cast<int16_t>((dataBuffer[8] << 8) | dataBuffer[9]);
+    int16_t int_temperature = static_cast<int16_t>((dataBuffer[10] << 8) | dataBuffer[11]);
+    int16_t int_vocIndex = static_cast<int16_t>((dataBuffer[12] << 8) | dataBuffer[13]);
+    int16_t int_noxIndex = static_cast<int16_t>((dataBuffer[14] << 8) | dataBuffer[15]);
+
+    // Convert values based on Sensirion Arduino lib
+    sen5xmeasurement.pM1p0 = !isnan(uint_pM1p0) ? uint_pM1p0 / 10 : UINT16_MAX;
+    sen5xmeasurement.pM2p5 = !isnan(uint_pM2p5) ? uint_pM2p5 / 10 : UINT16_MAX;
+    sen5xmeasurement.pM4p0 = !isnan(uint_pM4p0) ? uint_pM4p0 / 10 : UINT16_MAX;
+    sen5xmeasurement.pM10p0 = !isnan(uint_pM10p0) ? uint_pM10p0 / 10 : UINT16_MAX;
+    sen5xmeasurement.humidity = !isnan(int_humidity) ? int_humidity / 100.0f : FLT_MAX;
+    sen5xmeasurement.temperature = !isnan(int_temperature) ? int_temperature / 200.0f : FLT_MAX;
+    sen5xmeasurement.vocIndex = !isnan(int_vocIndex) ? int_vocIndex / 10.0f : FLT_MAX;
+    sen5xmeasurement.noxIndex = !isnan(int_noxIndex) ? int_noxIndex / 10.0f : FLT_MAX;
+
+    LOG_DEBUG("Got: pM1p0=%u, pM2p5=%u, pM4p0=%u, pM10p0=%u", sen5xmeasurement.pM1p0, sen5xmeasurement.pM2p5,
+              sen5xmeasurement.pM4p0, sen5xmeasurement.pM10p0);
+
+    if (model != SEN50) {
+        LOG_DEBUG("Got: humidity=%.2f, temperature=%.2f, vocIndex=%.2f", sen5xmeasurement.humidity, sen5xmeasurement.temperature,
+                  sen5xmeasurement.vocIndex);
+    }
+
+    if (model == SEN55) {
+        LOG_DEBUG("Got: noxIndex=%.2f", sen5xmeasurement.noxIndex);
+    }
+
+    return true;
+}
+
+bool SEN5XSensor::readPNValues(bool cumulative)
+{
+    if (!sendCommand(SEN5X_READ_PM_VALUES)) {
+        LOG_ERROR("SEN5X: Error sending read command");
+        return false;
+    }
+
+    LOG_DEBUG("SEN5X: Reading PN Values");
+    delay(20); // From Sensirion Datasheet
+
+    uint8_t dataBuffer[20];
+    size_t receivedNumber = readBuffer(&dataBuffer[0], 30);
+    if (receivedNumber == 0) {
+        LOG_ERROR("SEN5X: Error getting PN values");
+        return false;
+    }
+
+    // Get the integers
+    // uint16_t uint_pM1p0   = static_cast<uint16_t>((dataBuffer[0]   << 8) | dataBuffer[1]);
+    // uint16_t uint_pM2p5   = static_cast<uint16_t>((dataBuffer[2]   << 8) | dataBuffer[3]);
+    // uint16_t uint_pM4p0   = static_cast<uint16_t>((dataBuffer[4]   << 8) | dataBuffer[5]);
+    // uint16_t uint_pM10p0  = static_cast<uint16_t>((dataBuffer[6]   << 8) | dataBuffer[7]);
+    uint16_t uint_pN0p5 = static_cast<uint16_t>((dataBuffer[8] << 8) | dataBuffer[9]);
+    uint16_t uint_pN1p0 = static_cast<uint16_t>((dataBuffer[10] << 8) | dataBuffer[11]);
+    uint16_t uint_pN2p5 = static_cast<uint16_t>((dataBuffer[12] << 8) | dataBuffer[13]);
+    uint16_t uint_pN4p0 = static_cast<uint16_t>((dataBuffer[14] << 8) | dataBuffer[15]);
+    uint16_t uint_pN10p0 = static_cast<uint16_t>((dataBuffer[16] << 8) | dataBuffer[17]);
+    uint16_t uint_tSize = static_cast<uint16_t>((dataBuffer[18] << 8) | dataBuffer[19]);
+
+    // Convert values based on Sensirion Arduino lib
+    // Multiply by 100 for converting from #/cm3 to #/0.1l for PN values
+    sen5xmeasurement.pN0p5 = !isnan(uint_pN0p5) ? uint_pN0p5 / 10 * 100 : UINT32_MAX;
+    sen5xmeasurement.pN1p0 = !isnan(uint_pN1p0) ? uint_pN1p0 / 10 * 100 : UINT32_MAX;
+    sen5xmeasurement.pN2p5 = !isnan(uint_pN2p5) ? uint_pN2p5 / 10 * 100 : UINT32_MAX;
+    sen5xmeasurement.pN4p0 = !isnan(uint_pN4p0) ? uint_pN4p0 / 10 * 100 : UINT32_MAX;
+    sen5xmeasurement.pN10p0 = !isnan(uint_pN10p0) ? uint_pN10p0 / 10 * 100 : UINT32_MAX;
+    sen5xmeasurement.tSize = !isnan(uint_tSize) ? uint_tSize / 1000.0f : FLT_MAX;
+
+    // Remove accumuluative values:
+    // https://github.com/fablabbcn/smartcitizen-kit-2x/issues/85
+    if (!cumulative) {
+        sen5xmeasurement.pN10p0 -= sen5xmeasurement.pN4p0;
+        sen5xmeasurement.pN4p0 -= sen5xmeasurement.pN2p5;
+        sen5xmeasurement.pN2p5 -= sen5xmeasurement.pN1p0;
+        sen5xmeasurement.pN1p0 -= sen5xmeasurement.pN0p5;
+    }
+
+    LOG_DEBUG("Got: pN0p5=%u, pN1p0=%u, pN2p5=%u, pN4p0=%u, pN10p0=%u, tSize=%.2f", sen5xmeasurement.pN0p5,
+              sen5xmeasurement.pN1p0, sen5xmeasurement.pN2p5, sen5xmeasurement.pN4p0, sen5xmeasurement.pN10p0,
+              sen5xmeasurement.tSize);
+
+    return true;
+}
+
+uint8_t SEN5XSensor::getMeasurements()
+{
+    uint32_t now;
+    now = getTime();
+
+    // Try to get new data
+    if (!sendCommand(SEN5X_READ_DATA_READY)) {
+        LOG_ERROR("SEN5X: Error sending command data ready flag");
+        return 2;
+    }
+    delay(20); // From Sensirion Datasheet
+
+    uint8_t dataReadyBuffer[3];
+    size_t charNumber = readBuffer(&dataReadyBuffer[0], 3);
+    if (charNumber == 0) {
+        LOG_ERROR("SEN5X: Error getting device version value");
+        return 2;
+    }
+
+    bool dataReady = dataReadyBuffer[1];
+    uint32_t sinceLastDataPollMs = (now - lastDataPoll) * 1000;
+    // Check if data is ready, and if since last time we requested is less than SEN5X_POLL_INTERVAL
+    if (!dataReady && (sinceLastDataPollMs > SEN5X_POLL_INTERVAL)) {
+        LOG_INFO("SEN5X: Data is not ready");
+        return 1;
+    }
+
+    if (!readValues()) {
+        LOG_ERROR("SEN5X: Error getting readings");
+        return 2;
+    }
+
+    if (!readPNValues(false)) {
+        LOG_ERROR("SEN5X: Error getting PN readings");
+        return 2;
+    }
+
+    lastDataPoll = now;
+
+    return 0;
+}
+
+int32_t SEN5XSensor::wakeUpTimeMs()
+{
+    return SEN5X_WARMUP_MS_2;
+}
+
+int32_t SEN5XSensor::pendingForReadyMs()
+{
+    uint32_t now;
+    now = getTime();
+    uint32_t sincePmMeasureStarted = (now - pmMeasureStarted) * 1000;
+    LOG_DEBUG("SEN5X: Since measure started: %ums", sincePmMeasureStarted);
+
+    switch (state) {
+    case SEN5X_MEASUREMENT: {
+
+        if (sincePmMeasureStarted < SEN5X_WARMUP_MS_1) {
+            LOG_INFO("SEN5X: not enough time passed since starting measurement");
+            return SEN5X_WARMUP_MS_1 - sincePmMeasureStarted;
+        }
+
+        if (!pmMeasureStarted) {
+            pmMeasureStarted = now;
+        }
+
+        // Get PN values to check if we are above or below threshold
+        readPNValues(true);
+        lastDataPoll = now;
+
+        // If the reading is low (the tyhreshold is in #/cm3) and second warmUp hasn't passed we return to come back later
+        if ((sen5xmeasurement.pN4p0 / 100) < SEN5X_PN4P0_CONC_THD && sincePmMeasureStarted < SEN5X_WARMUP_MS_2) {
+            LOG_INFO("SEN5X: Concentration is low, we will ask again in the second warm up period");
+            state = SEN5X_MEASUREMENT_2;
+            // Report how many seconds are pending to cover the first warm up period
+            return SEN5X_WARMUP_MS_2 - sincePmMeasureStarted;
+        }
+        return 0;
+    }
+    case SEN5X_MEASUREMENT_2: {
+        if (sincePmMeasureStarted < SEN5X_WARMUP_MS_2) {
+            // Report how many seconds are pending to cover the first warm up period
+            return SEN5X_WARMUP_MS_2 - sincePmMeasureStarted;
+        }
+        return 0;
+    }
+    default: {
+        return -1;
+    }
+    }
+}
+
+bool SEN5XSensor::getMetrics(meshtastic_Telemetry *measurement)
+{
+    LOG_INFO("SEN5X: Attempting to get metrics");
+    if (!isActive()) {
+        LOG_INFO("SEN5X: not in measurement mode");
+        return false;
+    }
+
+    uint8_t response;
+    response = getMeasurements();
+
+    if (response == 0) {
+        if (sen5xmeasurement.pM1p0 != UINT16_MAX) {
+            measurement->variant.air_quality_metrics.has_pm10_standard = true;
+            measurement->variant.air_quality_metrics.pm10_standard = sen5xmeasurement.pM1p0;
+        }
+        if (sen5xmeasurement.pM2p5 != UINT16_MAX) {
+            measurement->variant.air_quality_metrics.has_pm25_standard = true;
+            measurement->variant.air_quality_metrics.pm25_standard = sen5xmeasurement.pM2p5;
+        }
+        if (sen5xmeasurement.pM4p0 != UINT16_MAX) {
+            measurement->variant.air_quality_metrics.has_pm40_standard = true;
+            measurement->variant.air_quality_metrics.pm40_standard = sen5xmeasurement.pM4p0;
+        }
+        if (sen5xmeasurement.pM10p0 != UINT16_MAX) {
+            measurement->variant.air_quality_metrics.has_pm100_standard = true;
+            measurement->variant.air_quality_metrics.pm100_standard = sen5xmeasurement.pM10p0;
+        }
+        if (sen5xmeasurement.pN0p5 != UINT32_MAX) {
+            measurement->variant.air_quality_metrics.has_particles_05um = true;
+            measurement->variant.air_quality_metrics.particles_05um = sen5xmeasurement.pN0p5;
+        }
+        if (sen5xmeasurement.pN1p0 != UINT32_MAX) {
+            measurement->variant.air_quality_metrics.has_particles_10um = true;
+            measurement->variant.air_quality_metrics.particles_10um = sen5xmeasurement.pN1p0;
+        }
+        if (sen5xmeasurement.pN2p5 != UINT32_MAX) {
+            measurement->variant.air_quality_metrics.has_particles_25um = true;
+            measurement->variant.air_quality_metrics.particles_25um = sen5xmeasurement.pN2p5;
+        }
+        if (sen5xmeasurement.pN4p0 != UINT32_MAX) {
+            measurement->variant.air_quality_metrics.has_particles_40um = true;
+            measurement->variant.air_quality_metrics.particles_40um = sen5xmeasurement.pN4p0;
+        }
+        if (sen5xmeasurement.pN10p0 != UINT32_MAX) {
+            measurement->variant.air_quality_metrics.has_particles_100um = true;
+            measurement->variant.air_quality_metrics.particles_100um = sen5xmeasurement.pN10p0;
+        }
+        if (sen5xmeasurement.tSize != FLT_MAX) {
+            measurement->variant.air_quality_metrics.has_particles_tps = true;
+            measurement->variant.air_quality_metrics.particles_tps = sen5xmeasurement.tSize;
+        }
+
+        if (model != SEN50) {
+            if (sen5xmeasurement.humidity != FLT_MAX) {
+                measurement->variant.air_quality_metrics.has_pm_humidity = true;
+                measurement->variant.air_quality_metrics.pm_humidity = sen5xmeasurement.humidity;
+            }
+            if (sen5xmeasurement.temperature != FLT_MAX) {
+                measurement->variant.air_quality_metrics.has_pm_temperature = true;
+                measurement->variant.air_quality_metrics.pm_temperature = sen5xmeasurement.temperature;
+            }
+            if (sen5xmeasurement.noxIndex != FLT_MAX) {
+                measurement->variant.air_quality_metrics.has_pm_voc_idx = true;
+                measurement->variant.air_quality_metrics.pm_voc_idx = sen5xmeasurement.vocIndex;
+            }
+        }
+
+        if (model == SEN55) {
+            if (sen5xmeasurement.noxIndex != FLT_MAX) {
+                measurement->variant.air_quality_metrics.has_pm_nox_idx = true;
+                measurement->variant.air_quality_metrics.pm_nox_idx = sen5xmeasurement.noxIndex;
+            }
+        }
+
+        return true;
+    } else if (response == 1) {
+        // TODO return because data was not ready yet
+        // Should this return false?
+        idle();
+        return false;
+    } else if (response == 2) {
+        // Return with error for non-existing data
+        idle();
+        return false;
+    }
+
+    return true;
+}
+
+void SEN5XSensor::setMode(bool setOneShot)
+{
+    oneShotMode = setOneShot;
+}
+
+AdminMessageHandleResult SEN5XSensor::handleAdminMessage(const meshtastic_MeshPacket &mp, meshtastic_AdminMessage *request,
+                                                         meshtastic_AdminMessage *response)
+{
+    AdminMessageHandleResult result;
+    result = AdminMessageHandleResult::NOT_HANDLED;
+
+    switch (request->which_payload_variant) {
+    case meshtastic_AdminMessage_sensor_config_tag:
+        if (!request->sensor_config.has_sen5x_config) {
+            result = AdminMessageHandleResult::NOT_HANDLED;
+            break;
+        }
+
+        // TODO - Add admin command to set temperature offset
+        // Check for temperature offset
+        // if (request->sensor_config.sen5x_config.has_set_temperature) {
+        //     this->setTemperature(request->sensor_config.sen5x_config.set_temperature);
+        // }
+
+        // Check for one-shot/continuous mode request
+        if (request->sensor_config.sen5x_config.has_set_one_shot_mode) {
+            this->setMode(request->sensor_config.sen5x_config.set_one_shot_mode);
+        }
+
+        result = AdminMessageHandleResult::HANDLED;
+        break;
+
+    default:
+        result = AdminMessageHandleResult::NOT_HANDLED;
+    }
+
+    return result;
+}
+#endif
--- a/src/modules/Telemetry/Sensor/SEN5XSensor.h
+++ b/src/modules/Telemetry/Sensor/SEN5XSensor.h
@@ -0,0 +1,170 @@
+#include "configuration.h"
+
+#if !MESHTASTIC_EXCLUDE_AIR_QUALITY_SENSOR
+
+#include "../mesh/generated/meshtastic/telemetry.pb.h"
+#include "RTC.h"
+#include "TelemetrySensor.h"
+#include "Wire.h"
+
+// Warm up times for SEN5X from the datasheet
+#ifndef SEN5X_WARMUP_MS_1
+#define SEN5X_WARMUP_MS_1 15000
+#endif
+
+#ifndef SEN5X_WARMUP_MS_2
+#define SEN5X_WARMUP_MS_2 30000
+#endif
+
+#ifndef SEN5X_POLL_INTERVAL
+#define SEN5X_POLL_INTERVAL 1000
+#endif
+
+#ifndef SEN5X_I2C_CLOCK_SPEED
+#define SEN5X_I2C_CLOCK_SPEED 100000
+#endif
+
+/*
+Time after which the sensor can go to sleep, as the warmup period has passed
+and the VOCs sensor will is allowed to stop (although needs to recover the state
+each time)
+*/
+#ifndef SEN5X_VOC_STATE_WARMUP_S
+/* Note for Testing 5' is enough
+Sensirion recommends 1h
+This can be bypassed completely if switching to low-power RHT/Gas mode and setting
+SEN5X_VOC_STATE_WARMUP_S 0
+*/
+#define SEN5X_VOC_STATE_WARMUP_S 3600
+#endif
+
+#define ONE_WEEK_IN_SECONDS 604800
+
+struct _SEN5XMeasurements {
+    uint16_t pM1p0;
+    uint16_t pM2p5;
+    uint16_t pM4p0;
+    uint16_t pM10p0;
+    uint32_t pN0p5;
+    uint32_t pN1p0;
+    uint32_t pN2p5;
+    uint32_t pN4p0;
+    uint32_t pN10p0;
+    float tSize;
+    float humidity;
+    float temperature;
+    float vocIndex;
+    float noxIndex;
+};
+
+class SEN5XSensor : public TelemetrySensor
+{
+  private:
+    TwoWire *_bus{};
+    uint8_t _address{};
+
+    bool getVersion();
+    float firmwareVer = -1;
+    float hardwareVer = -1;
+    float protocolVer = -1;
+    bool findModel();
+
+// Commands
+#define SEN5X_RESET 0xD304
+#define SEN5X_GET_PRODUCT_NAME 0xD014
+#define SEN5X_GET_FIRMWARE_VERSION 0xD100
+#define SEN5X_START_MEASUREMENT 0x0021
+#define SEN5X_START_MEASUREMENT_RHT_GAS 0x0037
+#define SEN5X_STOP_MEASUREMENT 0x0104
+#define SEN5X_READ_DATA_READY 0x0202
+#define SEN5X_START_FAN_CLEANING 0x5607
+#define SEN5X_RW_VOCS_STATE 0x6181
+
+#define SEN5X_READ_VALUES 0x03C4
+#define SEN5X_READ_RAW_VALUES 0x03D2
+#define SEN5X_READ_PM_VALUES 0x0413
+
+#define SEN5X_VOC_VALID_TIME 600
+#define SEN5X_VOC_VALID_DATE 1514764800
+
+    enum SEN5Xmodel { SEN5X_UNKNOWN = 0, SEN50 = 0b001, SEN54 = 0b010, SEN55 = 0b100 };
+    SEN5Xmodel model = SEN5X_UNKNOWN;
+
+    enum SEN5XState {
+        SEN5X_OFF,
+        SEN5X_IDLE,
+        SEN5X_RHTGAS_ONLY,
+        SEN5X_MEASUREMENT,
+        SEN5X_MEASUREMENT_2,
+        SEN5X_CLEANING,
+        SEN5X_NOT_DETECTED
+    };
+    SEN5XState state = SEN5X_OFF;
+    // Flag to work on one-shot (read and sleep), or continuous mode
+    bool oneShotMode = true;
+    void setMode(bool setOneShot);
+    bool vocStateValid();
+/* Sensirion recommends taking a reading after 15 seconds,
+if the Particle number reading is over 100#/cm3 the reading is OK,
+but if it is lower wait until 30 seconds and take it again.
+See: https://sensirion.com/resource/application_note/low_power_mode/sen5x
+*/
+#define SEN5X_PN4P0_CONC_THD 100
+
+    bool sendCommand(uint16_t command);
+    bool sendCommand(uint16_t command, uint8_t *buffer, uint8_t byteNumber = 0);
+    uint8_t readBuffer(uint8_t *buffer, uint8_t byteNumber); // Return number of bytes received
+    uint8_t sen5xCRC(uint8_t *buffer);
+    bool startCleaning();
+    uint8_t getMeasurements();
+    // bool readRawValues();
+    bool readPNValues(bool cumulative);
+    bool readValues();
+
+    uint32_t pmMeasureStarted = 0;
+    uint32_t rhtGasMeasureStarted = 0;
+    uint32_t lastDataPoll = 0;
+    _SEN5XMeasurements sen5xmeasurement{};
+
+    bool idle(bool checkState = true);
+
+  protected:
+    // Store status of the sensor in this file
+    const char *sen5XStateFileName = "/prefs/sen5X.dat";
+    meshtastic_SEN5XState sen5xstate = meshtastic_SEN5XState_init_zero;
+
+    bool loadState();
+    bool saveState();
+
+    // Cleaning State
+    uint32_t lastCleaning = 0;
+    bool lastCleaningValid = false;
+
+// VOC State
+#define SEN5X_VOC_STATE_BUFFER_SIZE 8
+    uint8_t vocState[SEN5X_VOC_STATE_BUFFER_SIZE]{};
+    uint32_t vocTime = 0;
+    bool vocValid = false;
+
+    bool vocStateFromSensor();
+    bool vocStateToSensor();
+    bool vocStateStable();
+    bool vocStateRecent(uint32_t now);
+
+  public:
+    SEN5XSensor();
+    virtual bool initDevice(TwoWire *bus, ScanI2C::FoundDevice *dev) override;
+    virtual bool getMetrics(meshtastic_Telemetry *measurement) override;
+
+    virtual bool isActive() override;
+    virtual void sleep() override;
+    virtual uint32_t wakeUp() override;
+    virtual bool canSleep() override { return true; }
+    virtual int32_t wakeUpTimeMs() override;
+    virtual int32_t pendingForReadyMs() override;
+
+    AdminMessageHandleResult handleAdminMessage(const meshtastic_MeshPacket &mp, meshtastic_AdminMessage *request,
+                                                meshtastic_AdminMessage *response) override;
+};
+
+#endif
--- a/src/modules/Telemetry/Sensor/TelemetrySensor.h
+++ b/src/modules/Telemetry/Sensor/TelemetrySensor.h
@@ -26,7 +26,6 @@ class TelemetrySensor
        this->status = 0;
    }

-    const char *sensorName;
    meshtastic_TelemetrySensorType sensorType = meshtastic_TelemetrySensorType_SENSOR_UNSET;
    unsigned status;
    bool initialized = false;
@@ -56,13 +55,18 @@ class TelemetrySensor
        return AdminMessageHandleResult::NOT_HANDLED;
    }

+    const char *sensorName;
    // TODO: delete after migration
    bool hasSensor() { return nodeTelemetrySensorsMap[sensorType].first > 0; }
+
    // Functions to sleep / wakeup sensors that support it
+    // These functions can save power consumption in cases like AQ
    virtual void sleep(){};
    virtual uint32_t wakeUp() { return 0; }
-    // Return active by default, override per sensor
-    virtual bool isActive() { return true; }
+    virtual bool isActive() { return true; }  // Return true by default, override per sensor
+    virtual bool canSleep() { return false; } // Return false by default, override per sensor
+    virtual int32_t wakeUpTimeMs() { return 0; }
+    virtual int32_t pendingForReadyMs() { return 0; }

 #if WIRE_INTERFACES_COUNT > 1
    // Set to true if Implementation only works first I2C port (Wire)
--- a/src/platform/esp32/main-esp32.cpp
+++ b/src/platform/esp32/main-esp32.cpp
@@ -24,6 +24,11 @@
 #include <nvs.h>
 #include <nvs_flash.h>

+// Weak empty variant shutdown prep function.
+// May be redefined by variant files.
+void variant_shutdown() __attribute__((weak));
+void variant_shutdown() {}
+
 #if !defined(CONFIG_IDF_TARGET_ESP32S2) && !MESHTASTIC_EXCLUDE_BLUETOOTH
 void setBluetoothEnable(bool enable)
 {
@@ -249,6 +254,7 @@ void cpuDeepSleep(uint32_t msecToWake)

 #endif // #end ESP32S3_WAKE_TYPE
 #endif
+    variant_shutdown();

    // We want RTC peripherals to stay on
    esp_sleep_pd_config(ESP_PD_DOMAIN_RTC_PERIPH, ESP_PD_OPTION_ON);
--- a/src/platform/nrf52/AsyncUDP.cpp
+++ b/src/platform/nrf52/AsyncUDP.cpp
@@ -36,6 +36,13 @@ bool AsyncUDP::writeTo(const uint8_t *data, size_t len, IPAddress ip, uint16_t p
    return udp.endPacket();
 }

+void AsyncUDP::close()
+{
+    udp.stop();
+    localPort = 0;
+    _onPacket = nullptr;
+}
+
 // AsyncUDPPacket
 AsyncUDPPacket::AsyncUDPPacket(EthernetUDP &source) : _udp(source), _remoteIP(source.remoteIP()), _remotePort(source.remotePort())
 {
--- a/src/platform/nrf52/AsyncUDP.h
+++ b/src/platform/nrf52/AsyncUDP.h
@@ -22,6 +22,7 @@ class AsyncUDP : public Print, private concurrency::OSThread

    bool listenMulticast(IPAddress multicastIP, uint16_t port, uint8_t ttl = 64);
    bool writeTo(const uint8_t *data, size_t len, IPAddress ip, uint16_t port);
+    void close();

    size_t write(uint8_t b) override;
    size_t write(const uint8_t *data, size_t len) override;
--- a/src/platform/nrf52/main-nrf52.cpp
+++ b/src/platform/nrf52/main-nrf52.cpp
@@ -46,7 +46,7 @@

 uint16_t getVDDVoltage();

-// Weak empty variant initialization function.
+// Weak empty variant shutdown prep function.
 // May be redefined by variant files.
 void variant_shutdown() __attribute__((weak));
 void variant_shutdown() {}
--- a/src/serialization/MeshPacketSerializer.cpp
+++ b/src/serialization/MeshPacketSerializer.cpp
@@ -149,18 +149,18 @@ std::string MeshPacketSerializer::JsonSerialize(const meshtastic_MeshPacket *mp,
                    if (decoded->variant.air_quality_metrics.has_pm100_standard) {
                        msgPayload["pm100"] = new JSONValue((unsigned int)decoded->variant.air_quality_metrics.pm100_standard);
                    }
-                    if (decoded->variant.air_quality_metrics.has_pm10_environmental) {
-                        msgPayload["pm10_e"] =
-                            new JSONValue((unsigned int)decoded->variant.air_quality_metrics.pm10_environmental);
-                    }
-                    if (decoded->variant.air_quality_metrics.has_pm25_environmental) {
-                        msgPayload["pm25_e"] =
-                            new JSONValue((unsigned int)decoded->variant.air_quality_metrics.pm25_environmental);
-                    }
-                    if (decoded->variant.air_quality_metrics.has_pm100_environmental) {
-                        msgPayload["pm100_e"] =
-                            new JSONValue((unsigned int)decoded->variant.air_quality_metrics.pm100_environmental);
-                    }
+                    // if (decoded->variant.air_quality_metrics.has_pm10_environmental) {
+                    //     msgPayload["pm10_e"] =
+                    //         new JSONValue((unsigned int)decoded->variant.air_quality_metrics.pm10_environmental);
+                    // }
+                    // if (decoded->variant.air_quality_metrics.has_pm25_environmental) {
+                    //     msgPayload["pm25_e"] =
+                    //         new JSONValue((unsigned int)decoded->variant.air_quality_metrics.pm25_environmental);
+                    // }
+                    // if (decoded->variant.air_quality_metrics.has_pm100_environmental) {
+                    //     msgPayload["pm100_e"] =
+                    //         new JSONValue((unsigned int)decoded->variant.air_quality_metrics.pm100_environmental);
+                    // }
                } else if (decoded->which_variant == meshtastic_Telemetry_power_metrics_tag) {
                    if (decoded->variant.power_metrics.has_ch1_voltage) {
                        msgPayload["voltage_ch1"] = new JSONValue(decoded->variant.power_metrics.ch1_voltage);
--- a/src/serialization/MeshPacketSerializer_nRF52.cpp
+++ b/src/serialization/MeshPacketSerializer_nRF52.cpp
@@ -120,15 +120,15 @@ std::string MeshPacketSerializer::JsonSerialize(const meshtastic_MeshPacket *mp,
                    if (decoded->variant.air_quality_metrics.has_pm100_standard) {
                        jsonObj["payload"]["pm100"] = (unsigned int)decoded->variant.air_quality_metrics.pm100_standard;
                    }
-                    if (decoded->variant.air_quality_metrics.has_pm10_environmental) {
-                        jsonObj["payload"]["pm10_e"] = (unsigned int)decoded->variant.air_quality_metrics.pm10_environmental;
-                    }
-                    if (decoded->variant.air_quality_metrics.has_pm25_environmental) {
-                        jsonObj["payload"]["pm25_e"] = (unsigned int)decoded->variant.air_quality_metrics.pm25_environmental;
-                    }
-                    if (decoded->variant.air_quality_metrics.has_pm100_environmental) {
-                        jsonObj["payload"]["pm100_e"] = (unsigned int)decoded->variant.air_quality_metrics.pm100_environmental;
-                    }
+                    // if (decoded->variant.air_quality_metrics.has_pm10_environmental) {
+                    //     jsonObj["payload"]["pm10_e"] = (unsigned int)decoded->variant.air_quality_metrics.pm10_environmental;
+                    // }
+                    // if (decoded->variant.air_quality_metrics.has_pm25_environmental) {
+                    //     jsonObj["payload"]["pm25_e"] = (unsigned int)decoded->variant.air_quality_metrics.pm25_environmental;
+                    // }
+                    // if (decoded->variant.air_quality_metrics.has_pm100_environmental) {
+                    //     jsonObj["payload"]["pm100_e"] = (unsigned int)decoded->variant.air_quality_metrics.pm100_environmental;
+                    // }
                } else if (decoded->which_variant == meshtastic_Telemetry_power_metrics_tag) {
                    if (decoded->variant.power_metrics.has_ch1_voltage) {
                        jsonObj["payload"]["voltage_ch1"] = decoded->variant.power_metrics.ch1_voltage;
--- a/test/TestUtil.cpp
+++ b/test/TestUtil.cpp
@@ -4,6 +4,13 @@

 #include "TestUtil.h"

+#if defined(ARDUINO)
+#include <Arduino.h>
+#else
+#include <chrono>
+#include <thread>
+#endif
+
 void initializeTestEnvironment()
 {
    concurrency::hasBeenSetup = true;
@@ -15,4 +22,13 @@ void initializeTestEnvironment()
    perhapsSetRTC(RTCQualityNTP, &tv);
 #endif
    concurrency::OSThread::setup();
+}
+
+void testDelay(unsigned long ms)
+{
+#if defined(ARDUINO)
+    ::delay(ms);
+#else
+    std::this_thread::sleep_for(std::chrono::milliseconds(ms));
+#endif
 }
--- a/test/TestUtil.h
+++ b/test/TestUtil.h
@@ -1,4 +1,7 @@
 #pragma once

 // Initialize testing environment.
-void initializeTestEnvironment();
+void initializeTestEnvironment();
+
+// Portable delay for tests (Arduino or host).
+void testDelay(unsigned long ms);
--- a/test/test_atak/test_main.cpp
+++ b/test/test_atak/test_main.cpp
@@ -0,0 +1,216 @@
+#include <string.h>
+#include <unity.h>
+
+#include "TestUtil.h"
+#include "meshUtils.h"
+
+void setUp(void)
+{
+    // set stuff up here
+}
+
+void tearDown(void)
+{
+    // clean stuff up here
+}
+
+/**
+ * Test normal string without embedded nulls
+ * Should behave the same as strlen() for regular strings
+ */
+void test_normal_string(void)
+{
+    char test_str[32] = "Hello World";
+    size_t expected = 11; // strlen("Hello World")
+    size_t result = pb_string_length(test_str, sizeof(test_str));
+    TEST_ASSERT_EQUAL_size_t(expected, result);
+}
+
+/**
+ * Test empty string
+ * Should return 0 for empty string
+ */
+void test_empty_string(void)
+{
+    char test_str[32] = "";
+    size_t expected = 0;
+    size_t result = pb_string_length(test_str, sizeof(test_str));
+    TEST_ASSERT_EQUAL_size_t(expected, result);
+}
+
+/**
+ * Test string with only trailing nulls
+ * Common case - string followed by null padding
+ */
+void test_trailing_nulls(void)
+{
+    char test_str[32] = {0};
+    strcpy(test_str, "Test");
+    // test_str is now: "Test\0\0\0\0..." (4 chars + 28 nulls)
+    size_t expected = 4;
+    size_t result = pb_string_length(test_str, sizeof(test_str));
+    TEST_ASSERT_EQUAL_size_t(expected, result);
+}
+
+/**
+ * Test string with embedded null byte
+ * This is the critical bug case - strlen() would truncate at first null
+ */
+void test_embedded_null(void)
+{
+    char test_str[32] = {0};
+    // Create string "ABC\0XYZ" (embedded null after C)
+    test_str[0] = 'A';
+    test_str[1] = 'B';
+    test_str[2] = 'C';
+    test_str[3] = '\0'; // embedded null
+    test_str[4] = 'X';
+    test_str[5] = 'Y';
+    test_str[6] = 'Z';
+    // Rest is already null from initialization
+
+    // strlen would return 3, but pb_string_length should return 7
+    size_t strlen_result = strlen(test_str);
+    size_t pb_result = pb_string_length(test_str, sizeof(test_str));
+
+    TEST_ASSERT_EQUAL_size_t(3, strlen_result); // strlen stops at first null
+    TEST_ASSERT_EQUAL_size_t(7, pb_result);     // pb_string_length finds last non-null
+}
+
+/**
+ * Test Android UID with embedded null bytes
+ * Real-world case from bug report: ANDROID-e7e455b40002429d
+ * The "00" in the UID represents 0x00 bytes that were truncating the string
+ */
+void test_android_uid_pattern(void)
+{
+    char test_str[32] = {0};
+    // Simulate "ANDROID-e7e455b4" + 0x00 + 0x00 + "2429d"
+    const char part1[] = "ANDROID-e7e455b4";
+    strcpy(test_str, part1);
+    size_t pos = strlen(part1);
+    test_str[pos] = '\0';     // embedded null
+    test_str[pos + 1] = '\0'; // another embedded null
+    strcpy(test_str + pos + 2, "2429d");
+
+    // The full UID should be 24 characters
+    size_t strlen_result = strlen(test_str);
+    size_t pb_result = pb_string_length(test_str, sizeof(test_str));
+
+    TEST_ASSERT_EQUAL_size_t(16, strlen_result); // strlen truncates to "ANDROID-e7e455b4"
+    TEST_ASSERT_EQUAL_size_t(23, pb_result);     // pb_string_length gets full length
+}
+
+/**
+ * Test string with multiple embedded nulls
+ * Edge case with several null bytes scattered through the string
+ */
+void test_multiple_embedded_nulls(void)
+{
+    char test_str[32] = {0};
+    // Create "A\0B\0C\0D" (3 embedded nulls)
+    test_str[0] = 'A';
+    test_str[1] = '\0';
+    test_str[2] = 'B';
+    test_str[3] = '\0';
+    test_str[4] = 'C';
+    test_str[5] = '\0';
+    test_str[6] = 'D';
+
+    size_t strlen_result = strlen(test_str);
+    size_t pb_result = pb_string_length(test_str, sizeof(test_str));
+
+    TEST_ASSERT_EQUAL_size_t(1, strlen_result); // strlen stops at first null
+    TEST_ASSERT_EQUAL_size_t(7, pb_result);     // pb_string_length finds all chars
+}
+
+/**
+ * Test buffer completely filled with non-null characters
+ * Edge case where string uses entire buffer
+ */
+void test_full_buffer(void)
+{
+    char test_str[8];
+    // Fill entire buffer with 'X'
+    memset(test_str, 'X', sizeof(test_str));
+
+    size_t result = pb_string_length(test_str, sizeof(test_str));
+    TEST_ASSERT_EQUAL_size_t(8, result);
+}
+
+/**
+ * Test buffer with all nulls
+ * Should return 0
+ */
+void test_all_nulls(void)
+{
+    char test_str[32] = {0};
+    size_t result = pb_string_length(test_str, sizeof(test_str));
+    TEST_ASSERT_EQUAL_size_t(0, result);
+}
+
+/**
+ * Test single character followed by nulls
+ * Minimal non-empty case
+ */
+void test_single_char(void)
+{
+    char test_str[32] = {0};
+    test_str[0] = 'X';
+
+    size_t result = pb_string_length(test_str, sizeof(test_str));
+    TEST_ASSERT_EQUAL_size_t(1, result);
+}
+
+/**
+ * Test callsign field typical size
+ * Test with typical ATAK callsign field size (64 bytes)
+ */
+void test_callsign_field_size(void)
+{
+    char test_str[64] = {0};
+    strcpy(test_str, "CALLSIGN-123");
+
+    size_t result = pb_string_length(test_str, sizeof(test_str));
+    TEST_ASSERT_EQUAL_size_t(12, result);
+}
+
+/**
+ * Test with data at end of buffer
+ * String with embedded null and data at very end
+ */
+void test_data_at_buffer_end(void)
+{
+    char test_str[10] = {0};
+    test_str[0] = 'A';
+    test_str[1] = '\0';
+    test_str[8] = 'Z'; // Data near end
+    test_str[9] = 'X'; // Data at end
+
+    size_t result = pb_string_length(test_str, sizeof(test_str));
+    TEST_ASSERT_EQUAL_size_t(10, result); // Should find the 'X' at position 9
+}
+
+void setup()
+{
+    // NOTE!!! Wait for >2 secs
+    // if board doesn't support software reset via Serial.DTR/RTS
+    testDelay(10);
+    testDelay(2000);
+
+    UNITY_BEGIN();
+    RUN_TEST(test_normal_string);
+    RUN_TEST(test_empty_string);
+    RUN_TEST(test_trailing_nulls);
+    RUN_TEST(test_embedded_null);
+    RUN_TEST(test_android_uid_pattern);
+    RUN_TEST(test_multiple_embedded_nulls);
+    RUN_TEST(test_full_buffer);
+    RUN_TEST(test_all_nulls);
+    RUN_TEST(test_single_char);
+    RUN_TEST(test_callsign_field_size);
+    RUN_TEST(test_data_at_buffer_end);
+    exit(UNITY_END());
+}
+
+void loop() {}
--- a/variants/esp32/betafpv_2400_tx_micro/platformio.ini
+++ b/variants/esp32/betafpv_2400_tx_micro/platformio.ini
@@ -16,4 +16,4 @@ upload_speed = 460800
 lib_deps =
  ${esp32_base.lib_deps}
  # renovate: datasource=custom.pio depName=NeoPixel packageName=adafruit/library/Adafruit NeoPixel
-  adafruit/Adafruit NeoPixel@1.15.2
+  adafruit/Adafruit NeoPixel@1.15.3
--- a/variants/esp32c3/heltec_hru_3601/platformio.ini
+++ b/variants/esp32c3/heltec_hru_3601/platformio.ini
@@ -7,4 +7,4 @@ build_flags =
  -I variants/esp32c3/heltec_hru_3601
 lib_deps = ${esp32c3_base.lib_deps}
  # renovate: datasource=custom.pio depName=NeoPixel packageName=adafruit/library/Adafruit NeoPixel
-  adafruit/Adafruit NeoPixel@1.15.2
+  adafruit/Adafruit NeoPixel@1.15.3
--- a/variants/esp32c6/m5stack_unitc6l/platformio.ini
+++ b/variants/esp32c6/m5stack_unitc6l/platformio.ini
@@ -24,7 +24,7 @@ build_unflags =
 lib_deps =
  ${esp32c6_base.lib_deps}
  # renovate: datasource=custom.pio depName=NeoPixel packageName=adafruit/library/Adafruit NeoPixel
-  adafruit/Adafruit NeoPixel@1.15.2
+  adafruit/Adafruit NeoPixel@1.15.3
  # renovate: datasource=custom.pio depName=NimBLE-Arduino packageName=h2zero/library/NimBLE-Arduino
  h2zero/NimBLE-Arduino@2.3.7
 build_flags = 
--- a/variants/esp32s3/ELECROW-ThinkNode-M5/platformio.ini
+++ b/variants/esp32s3/ELECROW-ThinkNode-M5/platformio.ini
@@ -34,3 +34,5 @@ lib_deps = ${esp32s3_base.lib_deps}
  https://github.com/meshtastic/GxEPD2/archive/a05c11c02862624266b61599b0d6ba93e33c6f24.zip
  # renovate: datasource=custom.pio depName=PCA9557-arduino packageName=maxpromer/library/PCA9557-arduino
  maxpromer/PCA9557-arduino@1.0.0
+  # renovate: datasource=custom.pio depName=SensorLib packageName=lewisxhe/library/SensorLib
+  lewisxhe/SensorLib@0.3.4
--- a/variants/esp32s3/ELECROW-ThinkNode-M5/variant.cpp
+++ b/variants/esp32s3/ELECROW-ThinkNode-M5/variant.cpp
@@ -1,12 +1,17 @@
 #include "variant.h"
 #include <PCA9557.h>

-PCA9557 io(0x18, &Wire);
+PCA9557 io(0x18, &Wire1);

 void earlyInitVariant()
 {
-    Wire.begin(48, 47);
+    Wire1.begin(48, 47);
    io.pinMode(PCA_PIN_EINK_EN, OUTPUT);
    io.pinMode(PCA_PIN_POWER_EN, OUTPUT);
    io.digitalWrite(PCA_PIN_POWER_EN, HIGH);
 }
+
+void variant_shutdown()
+{
+    io.digitalWrite(PCA_PIN_POWER_EN, LOW);
+}
--- a/variants/esp32s3/ELECROW-ThinkNode-M5/variant.h
+++ b/variants/esp32s3/ELECROW-ThinkNode-M5/variant.h
@@ -30,6 +30,9 @@
 #define I2C_SCL 1
 #define I2C_SDA 2

+// PCF8563 RTC Module
+#define PCF8563_RTC 0x51
+
 // GPS pins
 #define GPS_SWITH 10
 #define HAS_GPS 1
--- a/variants/esp32s3/diy/my_esp32s3_diy_eink/platformio.ini
+++ b/variants/esp32s3/diy/my_esp32s3_diy_eink/platformio.ini
@@ -13,7 +13,7 @@ lib_deps =
  # renovate: datasource=custom.pio depName=GxEPD2 packageName=zinggjm/library/GxEPD2
  zinggjm/GxEPD2@1.6.6
  # renovate: datasource=custom.pio depName=NeoPixel packageName=adafruit/library/Adafruit NeoPixel
-  adafruit/Adafruit NeoPixel@1.15.2
+  adafruit/Adafruit NeoPixel@1.15.3
 build_unflags =
  ${esp32s3_base.build_unflags}
  -DARDUINO_USB_MODE=1
--- a/variants/esp32s3/diy/my_esp32s3_diy_oled/platformio.ini
+++ b/variants/esp32s3/diy/my_esp32s3_diy_oled/platformio.ini
@@ -11,7 +11,7 @@ upload_speed = 921600
 lib_deps =
  ${esp32s3_base.lib_deps}
  # renovate: datasource=custom.pio depName=NeoPixel packageName=adafruit/library/Adafruit NeoPixel
-  adafruit/Adafruit NeoPixel@1.15.2
+  adafruit/Adafruit NeoPixel@1.15.3
 build_unflags =
  ${esp32s3_base.build_unflags}
  -DARDUINO_USB_MODE=1
--- a/variants/esp32s3/esp32-s3-pico/platformio.ini
+++ b/variants/esp32s3/esp32-s3-pico/platformio.ini
@@ -25,4 +25,4 @@ lib_deps = ${esp32s3_base.lib_deps}
  # renovate: datasource=custom.pio depName=GxEPD2 packageName=zinggjm/library/GxEPD2
  zinggjm/GxEPD2@1.6.6
  # renovate: datasource=custom.pio depName=NeoPixel packageName=adafruit/library/Adafruit NeoPixel
-  adafruit/Adafruit NeoPixel@1.15.2
+  adafruit/Adafruit NeoPixel@1.15.3
--- a/variants/esp32s3/heltec_sensor_hub/platformio.ini
+++ b/variants/esp32s3/heltec_sensor_hub/platformio.ini
@@ -11,4 +11,4 @@ build_flags =

 lib_deps = ${esp32s3_base.lib_deps}
  # renovate: datasource=custom.pio depName=NeoPixel packageName=adafruit/library/Adafruit NeoPixel
-  adafruit/Adafruit NeoPixel@1.15.2
+  adafruit/Adafruit NeoPixel@1.15.3
--- a/variants/esp32s3/unphone/platformio.ini
+++ b/variants/esp32s3/unphone/platformio.ini
@@ -41,7 +41,7 @@ lib_deps = ${esp32s3_base.lib_deps}
  # TODO renovate
  https://gitlab.com/hamishcunningham/unphonelibrary#meshtastic@9.0.0
  # renovate: datasource=custom.pio depName=NeoPixel packageName=adafruit/library/Adafruit NeoPixel
-  adafruit/Adafruit NeoPixel@1.15.2
+  adafruit/Adafruit NeoPixel@1.15.3

 [env:unphone-tft]
 board_level = extra
--- a/variants/nrf52840/ELECROW-ThinkNode-M3/platformio.ini
+++ b/variants/nrf52840/ELECROW-ThinkNode-M3/platformio.ini
@@ -24,5 +24,5 @@ lib_deps =
  ${nrf52840_base.lib_deps}
  # renovate: datasource=custom.pio depName=nRF52_PWM packageName=khoih-prog/library/nRF52_PWM
  khoih-prog/nRF52_PWM@1.0.1
-  ; # renovate: datasource=custom.pio depName=SensorLib packageName=lewisxhe/library/SensorLib
+  # renovate: datasource=custom.pio depName=SensorLib packageName=lewisxhe/library/SensorLib
  lewisxhe/SensorLib@0.3.4
--- a/variants/nrf52840/ELECROW-ThinkNode-M3/variant.h
+++ b/variants/nrf52840/ELECROW-ThinkNode-M3/variant.h
@@ -116,7 +116,6 @@ extern "C" {

 // PCF8563 RTC Module
 #define PCF8563_RTC 0x51
-#define HAS_RTC 1

 #ifdef __cplusplus
 }
--- a/variants/nrf52840/ELECROW-ThinkNode-M6/platformio.ini
+++ b/variants/nrf52840/ELECROW-ThinkNode-M6/platformio.ini
@@ -21,5 +21,5 @@ build_flags = ${nrf52840_base.build_flags}
 build_src_filter = ${nrf52_base.build_src_filter} +<../variants/nrf52840/ELECROW-ThinkNode-M6>
 lib_deps =
  ${nrf52840_base.lib_deps}
-  ; # renovate: datasource=custom.pio depName=SensorLib packageName=lewisxhe/library/SensorLib
+  # renovate: datasource=custom.pio depName=SensorLib packageName=lewisxhe/library/SensorLib
  lewisxhe/SensorLib@0.3.4
--- a/variants/nrf52840/ELECROW-ThinkNode-M6/variant.h
+++ b/variants/nrf52840/ELECROW-ThinkNode-M6/variant.h
@@ -121,7 +121,6 @@ static const uint8_t A0 = PIN_A0;

 // PCF8563 RTC Module
 #define PCF8563_RTC 0x51
-#define HAS_RTC 1

 // SPI
 #define SPI_INTERFACES_COUNT 1
--- a/variants/nrf52840/t-echo-plus/variant.h
+++ b/variants/nrf52840/t-echo-plus/variant.h
@@ -132,9 +132,6 @@ static const uint8_t A0 = PIN_A0;

 #define HAS_DRV2605 1

-// Battery / ADC already defined above
-#define HAS_RTC 1
-
 #define SERIAL_PRINT_PORT 0

 #ifdef __cplusplus
--- a/variants/stm32/wio-e5/platformio.ini
+++ b/variants/stm32/wio-e5/platformio.ini
@@ -17,5 +17,6 @@ build_flags =
  -DPIN_SERIAL2_RX=PA3
  -DHAS_GPS=1
  -DGPS_SERIAL_PORT=Serial2
+  -DMESHTASTIC_EXCLUDE_AIR_QUALITY_SENSOR=1

 upload_port = stlink
Author	SHA1	Message	Date
Ben Meadors	81bde47cd4	Move pb string length method and fix linker error	2026-02-08 10:14:40 -06:00
Ben Meadors	370f62a8c9	Refactor test utilities to use portable delay function and include necessary headers	2026-02-08 09:42:05 -06:00
Ben Meadors	a43ce34143	Apply suggestion from @Copilot Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>	2026-02-08 08:35:20 -06:00
niccellular	fa5631523e	Fix embedded null byte truncation in ATAK strings Fix bug where UIDs, callsigns, and messages containing embedded null bytes (0x00) are truncated during compression/decompression. The issue occurs because strlen() stops at the first null byte, but nanopb char arrays can contain embedded nulls that are valid data. This causes Android device UIDs like "ANDROID-e7e455b40002429d" to be truncated to "ANDROID-e7e455b4" (16 chars instead of 24), breaking direct messages and contact identification. The fix adds a pb_string_length() helper that scans for the actual string length by finding the last non-null character, rather than stopping at the first null. Added comprehensive unit tests to prevent regressions: - Normal strings without embedded nulls - Strings with embedded null bytes - Empty strings and edge cases - Android UID pattern testing - Multiple embedded nulls scenarios Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>	2026-02-08 08:54:15 -05:00
oscgonfer	7cbab4838c	Feat/add sen5x (#7245 ) * Move PMSA003I to separate class and update AQ telemetry * AirQualityTelemetry module not depend on PM sensor presence * Remove commented line * Fixes on PMS class * Add missing warmup period to wakeUp function * Fixes on compilation for different variants * Add functions to check for I2C bus speed and set it * Add ScreenFonts.h Co-authored-by: Hannes Fuchs <hannes.fuchs+git@0xef.de> * PMSA003I 1st round test * Fix I2C scan speed * Fix minor issues and bring back I2C SPEED def * Remove PMSA003I library as its no longer needed * Remove unused I2C speed functions and cleanup * Cleanup of SEN5X specific code added from switching branches * Remove SCAN_I2C_CLOCK_SPEED block as its not needed * Remove associated functions for setting I2C speed * Unify build epoch to add flag in platformio-custom.py (#7917) * Unify build_epoch replacement logic in platformio-custom * Missed one * Fix build error in rak_wismesh_tap_v2 (#7905) In the logs was: "No screen resolution defined in build_flags. Please define DISPLAY_SIZE." set according to similar devices. * Put guards in place around debug heap operations (#7955) * Put guards in place around debug heap operations * Add macros to clean up code * Add pointer as well * Cleanup * Fix memory leak in NextHopRouter: always free packet copy when removing from pending * Formatting * Only queue 2 client notification * Merge pull request #7965 from compumike/compumike/fix-nrf52-bluetooth-memory-leak Fix memory leak in `NRF52Bluetooth`: allocate `BluetoothStatus` on stack, not heap * Merge pull request #7964 from compumike/compumike/fix-nimble-bluetooth-memory-leak Fix memory leak in `NimbleBluetooth`: allocate `BluetoothStatus` on stack, not heap * Update protobufs (#7973) Co-authored-by: thebentern <9000580+thebentern@users.noreply.github.com> * T-Lora Pager: Support LR1121 and SX1280 models (#7956) * T-Lora Pager: Support LR1121 and SX1280 models * Remove ifdefs * Trunk * Trunk * Static memory pool allocation (#7966) * Static memory pool * Initializer * T-Lora Pager: Support LR1121 and SX1280 models (#7956) * T-Lora Pager: Support LR1121 and SX1280 models * Remove ifdefs --------- Co-authored-by: WillyJL <me@willyjl.dev> * Portduino dynamic alloc * Missed * Drop the limit * Update meshtastic-esp8266-oled-ssd1306 digest to 0cbc26b (#7977) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Fix json report crashes on esp32 (#7978) * Tweak maximums * Fix DRAM overflow on old esp32 targets * Guard bad time warning logs using GPS_DEBUG (#7897) In 2.7.7 / 2.7.8 we introduced some new checks for time accuracy. In combination, these result in a spamming of the logs when a bad time is found When the GPS is active, we're calling the GPS thread every 0.2secs. So this log could be printed 4,500 times in a no-lock scenario :) Reserve this experience for developers using GPS_DEBUG. Fixes https://github.com/meshtastic/firmware/issues/7896 * Scale probe buffer size based on current baud rate (#7975) * Scale probe buffer size based on current baud rate * Throttle bad time validation logging and fix time comparison logic * Remove comment * Missed the other instances * Copy pasta * Fix GPS gm_mktime memory leak (#7981) * Fix overflow of time value (#7984) * Fix overflow of time value * Revert "Fix overflow of time value" This reverts commit `0847969201`. * That got boogered up * Remove PMSA003 include from modules * Add flag to exclude air quality module * Rework PMSA003I to align with new I2C scanner * Reworks AQ telemetry to match new dynamic allocation method * Adds VBLE_I2C_CLOCK_SPEED build flag for sensors with different I2C speed requirements * Reworks PMSA003I * Move add sensor template to separate file * Split telemetry on screen options * Add variable I2C clock compile flag * Added to Seeed Xiao S3 as demo * Fix drawFrame in AQ module * Module settings override to i2cScan module function * Move to CAN_RECLOCK_I2C per architecture * Add reclock function in TelemetrySensor.cpp * Add flag in ESP32 common * Minor fix * Move I2C reclock function to src/detect * Fix uninitMemberVar errors and compile issue * Make sleep, wakeUp functions generic * Fix STM32 builds * Add exclude AQ sensor to builds that have environmental sensor excludes * Add includes to AddI2CSensorTemplate.h * SEN5X first pass * WIP Sen5X functions * Further (non-working) progress in SEN5X * WIP Sen5X functions * Changes on SEN5X library - removing pm_env as well * Small cleanup of SEN5X sensors * Minor change for SEN5X detection * Remove dup code * Enable PM sensor before sending telemetry. This enables the PM sensor for a predefined period to allow for warmup. Once telemetry is sent, the sensor shuts down again. * Small cleanups in SEN5X sensor * Add dynamic measurement interval for SEN5X * Only disable SEN5X if enough time after reading. * Idle for SEN5X on communication error * Cleanup of logs and remove unnecessary delays * Small TODO * Settle on uint16_t for SEN5X PM data * Make AQTelemetry sensors non-exclusive * Implementation of cleaning in FS prefs and cleanup * Remove unnecessary LOGS * Add cleaning date storage in FS * Report non-cumulative PN * Bring back detection code for SEN5X after branch rebase * Add placeholder for admin message * Add VOC measurements and persistence (WIP) * Adds VOC measurements and state * Still not working on VOC Index persistence * Should it stay in continuous mode? * Add one-shot mode config flag to SEN5X * Add nan checks on sensor data from SEN5X * Working implementation on VOCState * Adds initial timer for SEN55 to not sleep if VOCstate is not stable (1h) * Adds conditions for stability and sensor state * Fixes on VOC state and mode swtiching * Adds a new RHT/Gas only mode, with 3600s stabilization time * Fixes the VOCState buffer mismatch * Fixes SEN50/54/55 model mistake * Adapt SEN5X to new sensor list structure. Improve reclock. * Improve reClockI2C conditions for different variants * Add sleep, wakeUp, pendingForReady, hasSleep functions to PM sensors to save battery * Add SEN5X * Fix merge errors * Update library dependencies in platformio.ini * Fix unitialized variables in SEN5X constructor * Fix missing import * Cleanup of SEN5X class * Exclude AQ sensor from wio-e5 due to flash limitations * Fix I2C clock change logic * Fix trunk * Fix on condition in reclock * Add check on polling interval of sen5x --------- Co-authored-by: Hannes Fuchs <hannes.fuchs+git@0xef.de> Co-authored-by: Nashui-Yan <yannashui10@gmail.com> Co-authored-by: Ben Meadors <benmmeadors@gmail.com> Co-authored-by: Tom Fifield <tom@tomfifield.net> Co-authored-by: Mike Robbins <mrobbins@alum.mit.edu> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: thebentern <9000580+thebentern@users.noreply.github.com> Co-authored-by: WillyJL <me@willyjl.dev> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2026-02-08 07:08:09 -06:00
Ben Meadors	53231ae4b1	Added toggable config and default for larger screens to enable / hide bubbles on chat messages (#9560 ) * Added toggable config and default for largeer screens to enable / hide bubbles on chat messages * Refactor message bubble rendering logic for improved layout and consistency * Move osk_found initialization for trackball/encoder devices before module setup to fix missing keyboard for L1 * Utilize current checks for consistency * Reverted last changes --------- Co-authored-by: Jason P <applewiz@mac.com> Co-authored-by: HarukiToreda <116696711+HarukiToreda@users.noreply.github.com>	2026-02-07 15:41:31 -06:00
github-actions[bot]	5280caf9d8	Update protobufs (#9559 ) Co-authored-by: thebentern <9000580+thebentern@users.noreply.github.com>	2026-02-07 06:24:56 -06:00
Colby Dillion	ba016fd91a	Fix hop_limit upgrade detection (#9550 ) Co-authored-by: Ben Meadors <benmmeadors@gmail.com>	2026-02-07 06:19:25 -06:00
renovate[bot]	e2cf401ad3	Update meshtastic/device-ui digest to 6c75195 (#9553 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2026-02-07 06:16:30 -06:00
github-actions[bot]	f73d18384d	Upgrade trunk (#9547 ) Co-authored-by: vidplace7 <1779290+vidplace7@users.noreply.github.com>	2026-02-06 06:22:34 -06:00
github-actions[bot]	11bb2ee84e	Upgrade trunk (#9368 ) Co-authored-by: vidplace7 <1779290+vidplace7@users.noreply.github.com>	2026-02-05 05:53:48 -06:00
renovate[bot]	a324c4af10	Update meshtastic-esp8266-oled-ssd1306 digest to 21e484f (#9533 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Ben Meadors <benmmeadors@gmail.com>	2026-02-04 19:30:12 -06:00
renovate[bot]	5df5ab2790	Update Adafruit MPU6050 to v2.2.8 (#9534 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2026-02-04 17:19:11 -06:00
renovate[bot]	74ea6206d9	Update NeoPixel to v1.15.3 (#9530 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2026-02-04 17:13:44 -06:00
renovate[bot]	b238744445	Update Adafruit MPU6050 to v2.2.7 (#9525 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2026-02-04 17:12:01 -06:00
Ben Meadors	be5f0a9ade	Implement UDP multicast handler start/stop to ensure proper lifecycle (#9524 ) * Implement UDP multicast handler start/stop to ensure proper lifecycle * Add close method to AsyncUDP and improve UDP multicast handler lifecycle management * Guard portduino	2026-02-04 11:15:38 -06:00
Jason P	b008c7a170	Fix config.display.use_long_node_name not saving (#9522 )	2026-02-03 12:21:51 -06:00
Eric Sesterhenn	c8a9cdc148	Make sure we always return a value in NodeDB::restorePreferences() (#9516 ) In case FScom is not defined there is no return statement. This moves the return outside of the ifdef to make sure a defined value is returned.	2026-02-03 06:23:49 -06:00
Jonathan Bennett	644fa5b54e	Power off control pin on Thinknode m5 during deepsleep and add RTC (#9510 ) * Power off control pin on Thinknode m5 during deepsleep * Apply suggestion from @Copilot Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Finish HAS_RTC cleanup * Add RTC for Thinknode M5 * Don't double-init Wire * Specify the RTC chip directly rather than use SensorRtcHelper. Saves a bit of flash, and avoid mis-detection --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>	2026-02-03 06:07:33 -06:00