chore: trunk fmt --all (#11938)

Whitespace and comment-alignment only: the output of `trunk fmt --all` on
develop @ d49cf21c3 with the pinned clang-format@20.1.0 and prettier. 48
files had drifted; trunk-action only checks the files a PR touches, so the
drift never fails CI and instead lands as noise in the next PR to edit any of
them. No code change.

.github/workflows/update_protobufs.yml

@@ -85,4 +85,3 @@ jobs:
           add-paths: |
             protobufs
             src/mesh
-

src/DebugConfiguration.h

@@ -125,7 +125,7 @@ extern "C" void logLegacy(const char *level, const char *fmt, ...);
 
 #define LOG_PRIMASK 0x07 /* mask to extract priority part (internal) */
                          /* extract priority */
-#define LOG_PRI(p) ((p)&LOG_PRIMASK)
+#define LOG_PRI(p) ((p) & LOG_PRIMASK)
 #define LOG_MAKEPRI(fac, pri) (((fac) << 3) | (pri))
 
 /* facility codes */
@@ -155,7 +155,7 @@ extern "C" void logLegacy(const char *level, const char *fmt, ...);
 #define LOG_NFACILITIES 24 /* current number of facilities */
 #define LOG_FACMASK 0x03f8 /* mask to extract facility part */
                            /* facility of pri */
-#define LOG_FAC(p) (((p)&LOG_FACMASK) >> 3)
+#define LOG_FAC(p) (((p) & LOG_FACMASK) >> 3)
 
 #define LOG_MASK(pri) (1 << (pri))             /* mask for one priority */
 #define LOG_UPTO(pri) ((1 << ((pri) + 1)) - 1) /* all priorities through pri */

src/PowerFSM.cpp

@@ -29,7 +29,7 @@
 #endif
 #if MESHTASTIC_EXCLUDE_POWER_FSM
 FakeFsm powerFSM;
-void PowerFSM_setup(){};
+void PowerFSM_setup() {};
 #else
 /// Should we behave as if we have AC power now?
 static bool isPowered()

src/graphics/EInkDynamicDisplay.cpp

@@ -128,7 +128,7 @@ void EInkDynamicDisplay::endOrDetach()
     else if (previousRefresh == FAST)
         EInkDisplay::endUpdate(); // Still block while updating, but EInkDisplay needs us to call endUpdate() ourselves.
 
-        // Fallback - If using an unmodified version of GxEPD2 for some reason
+    // Fallback - If using an unmodified version of GxEPD2 for some reason
 #else
     if (previousRefresh == FULL || previousRefresh == FAST) { // If refresh wasn't skipped (on unspecified..)
         LOG_WARN(

src/graphics/Panel_sdl.hpp

@@ -105,7 +105,7 @@ struct Panel_sdl : public Panel_FrameBufferBase {
     void setScaling(uint_fast8_t scaling_x, uint_fast8_t scaling_y);
     void setFrameImage(const void *frame_image, int frame_width, int frame_height, int inner_x, int inner_y);
     void setFrameRotation(uint_fast16_t frame_rotaion);
-    void setBrightness(uint8_t brightness) override{};
+    void setBrightness(uint8_t brightness) override {};
 
     static volatile void gpio_hi(uint32_t pin) { _gpio_dummy_values[pin & (EMULATED_GPIO_MAX - 1)] = 1; }
     static volatile void gpio_lo(uint32_t pin) { _gpio_dummy_values[pin & (EMULATED_GPIO_MAX - 1)] = 0; }

src/graphics/draw/ClockRenderer.cpp

@@ -186,7 +186,7 @@ void drawDigitalClockFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int1
 #ifdef DISPLAY_FORCE_SMALL_FONTS
         float screenwidth_target_ratio = 0.70f; // Target 70% of display width (adjustable)
 #elif defined(BICOLOR_OLED_DISPLAY)
-        float screenwidth_target_ratio = 0.60f;     // Forced for BICOLOR_OLED_DISPLAY due to two color display
+        float screenwidth_target_ratio = 0.60f; // Forced for BICOLOR_OLED_DISPLAY due to two color display
 #else
         float screenwidth_target_ratio = 0.80f; // Target 80% of display width (adjustable)
 #endif

src/graphics/draw/UIRenderer.cpp

@@ -2134,7 +2134,7 @@ void UIRenderer::drawNavigationBar(OLEDDisplay *display, OLEDDisplayUiState *sta
     if (totalIcons == 0)
         return;
 
-        // Compact panels: briefly show current frame's icon+title centered, then nothing.
+    // Compact panels: briefly show current frame's icon+title centered, then nothing.
 #if defined(OLED_COMPACT_UI)
     if (compactPanel) {
         const bool introVisible = millis() - lastFrameChangeTime <= ICON_DISPLAY_DURATION_MS_COMPACT;

src/graphics/emotes.cpp

@@ -37,7 +37,7 @@ const Emote emotes[] = {
     {"\U0001F606", smiling_closed_eyes, smiling_closed_eyes_width, smiling_closed_eyes_height}, // 😆 Smiling Closed Eyes
     {"\U0001F605", haha, haha_width, haha_height},                                              // 😅 Smiling with Sweat
     {"\U0001F604", grinning_smiling_eyes_2, grinning_smiling_eyes_2_width,
-     grinning_smiling_eyes_2_height}, // 😄 Grinning Face with Smiling Eyes
+     grinning_smiling_eyes_2_height},                                                        // 😄 Grinning Face with Smiling Eyes
     {"\U0001F62D", loudly_crying_face, loudly_crying_face_width, loudly_crying_face_height}, // 😭 Loudly Crying Face
     {"\U0001F92E", vomiting, vomiting_width, vomiting_height},                               // 🤮 Face Vomiting
     {"\U0001F60E", cool, cool_width, cool_height},                                           // 😎 Smiling Face with Sunglasses

src/graphics/niche/InkHUD/docs/README.md

@@ -790,7 +790,7 @@ This mapping of emoji to control characters is fairly arbitrary. Selection was i
 | `0x05`     | 👋                                             |
 | `0x06`     | ☀                                              |
 | ~~`0x07`~~ | (bell char, unused)                            |
-| `0x08`     | 🌧                                             |
+| `0x08`     | 🌧                                              |
 | `0x09`     | ☁                                              |
 | ~~`0x0A`~~ | (line feed, unused)                            |
 | `0x0B`     | ♥                                              |

src/graphics/niche/Inputs/TwoButton.h

@@ -70,7 +70,7 @@ class TwoButton : protected concurrency::OSThread
         volatile uint32_t irqAtMillis;      // millis() when button went down
 
         // Per-button event callbacks
-        static void noop(){};
+        static void noop() {};
         std::function<void()> onDown = noop;
         std::function<void()> onUp = noop;
         std::function<void()> onShortPress = noop;

src/graphics/niche/Inputs/TwoButtonExtended.h

@@ -82,7 +82,7 @@ class TwoButtonExtended : protected concurrency::OSThread
         volatile uint32_t irqAtMillis;      // millis() when button went down
 
         // Per-button event callbacks
-        static void noop(){};
+        static void noop() {};
         std::function<void()> onDown = noop;
         std::function<void()> onUp = noop;
         std::function<void()> onPress = noop;

src/input/STC8HKeyboard.h

@@ -19,7 +19,7 @@
 class STC8HKeyboard
 {
   public:
-    STC8HKeyboard(){};
+    STC8HKeyboard() {};
 
     void begin(uint8_t addr, TwoWire *wire);
 

src/input/i2cButton.cpp

@@ -26,7 +26,7 @@ extern void i2c_read_byte(uint8_t addr, uint8_t reg, uint8_t *value);
 extern void i2c_write_byte(uint8_t addr, uint8_t reg, uint8_t value);
 
 #define PI4IO_M_ADDR 0x43
-#define getbit(x, y) ((x) >> (y)&0x01)
+#define getbit(x, y) ((x) >> (y) & 0x01)
 #define PI4IO_REG_IRQ_STA 0x13
 #define PI4IO_REG_IN_STA 0x0F
 #define PI4IO_REG_CHIP_RESET 0x01

src/mesh/LR20x0Band.h

@@ -9,8 +9,7 @@ constexpr bool isLr20x0HighBand(float frequencyMHz)
 
 constexpr bool isLr20x0BandHop(float previousMHz, float requestedMHz)
 {
-    return previousMHz > 0.0f && requestedMHz > 0.0f &&
-           isLr20x0HighBand(previousMHz) != isLr20x0HighBand(requestedMHz);
+    return previousMHz > 0.0f && requestedMHz > 0.0f && isLr20x0HighBand(previousMHz) != isLr20x0HighBand(requestedMHz);
 }
 
 // Path taken by LR20x0Interface::reconfigure() for a frequency change.
@@ -18,6 +17,5 @@ enum class Lr20x0ReconfigurePath : uint8_t { Incremental, FullBegin };
 
 constexpr Lr20x0ReconfigurePath lr20x0ReconfigurePath(float previousMHz, float requestedMHz)
 {
-    return isLr20x0BandHop(previousMHz, requestedMHz) ? Lr20x0ReconfigurePath::FullBegin
-                                                      : Lr20x0ReconfigurePath::Incremental;
+    return isLr20x0BandHop(previousMHz, requestedMHz) ? Lr20x0ReconfigurePath::FullBegin : Lr20x0ReconfigurePath::Incremental;
 }

src/mesh/LR20x0Interface.cpp

@@ -190,8 +190,8 @@ template <typename T> bool LR20x0Interface<T>::init()
     if (res == RADIOLIB_ERR_CHIP_NOT_FOUND || res == RADIOLIB_ERR_SPI_CMD_FAILED)
         return false;
 
-        // Some basic info about the module's explicit firmware version - no other info available
-        // Currently requires radiolib godmode
+    // Some basic info about the module's explicit firmware version - no other info available
+    // Currently requires radiolib godmode
 
 #if RADIOLIB_GODMODE
     if (res == RADIOLIB_ERR_NONE) {
@@ -217,8 +217,8 @@ template <typename T> bool LR20x0Interface<T>::init()
     if (res == RADIOLIB_ERR_NONE)
         res = lora.setCRC(2);
 
-        // Standard DCDC ramp timing from RadioLib workarounds (register 0x00F20024)
-        // Currently requires radiolib godmode
+    // Standard DCDC ramp timing from RadioLib workarounds (register 0x00F20024)
+    // Currently requires radiolib godmode
 #if RADIOLIB_GODMODE
     if (res == RADIOLIB_ERR_NONE) {
         uint8_t rampTimes[4] = {15, 15, 15, 15}; // Standard case for all conditions

src/mesh/LoRaFEMInterface.cpp

@@ -214,7 +214,7 @@ void LoRaFEMInterface::setRxModeEnable(void)
         }
     }
 #elif defined(USE_GC1109_PA)
-    digitalWrite(LORA_GC1109_PA_EN, HIGH);    // CSD=1: Chip enabled
+    digitalWrite(LORA_GC1109_PA_EN, HIGH); // CSD=1: Chip enabled
     digitalWrite(LORA_GC1109_PA_TX_EN, LOW);
 #elif defined(USE_KCT8103L_PA)
     enableFEMPower();

src/mesh/MeshModule.h

@@ -219,7 +219,7 @@ class MeshModule
     bool _requestingFocus = false;
     void requestFocus() { _requestingFocus = true; }
 #else
-    void requestFocus(){}; // No-op
+    void requestFocus() {}; // No-op
 #endif
 
   private:

src/mesh/PacketHistory.h

@@ -23,7 +23,7 @@ class PacketHistory
         uint8_t hop_limit;                // bit 0-2: Highest hop limit observed for this packet,
                                           // bit 3-5: our hop limit when we first transmitted it
         uint8_t relayed_by[NUM_RELAYERS]; // Array of nodes that relayed this packet
-    };                                    // 4B + 4B + 4B + 1B + 1B + 6B = 20B
+    }; // 4B + 4B + 4B + 1B + 1B + 6B = 20B
     static_assert(sizeof(PacketRecord) == 20,
                   "PacketRecord size feeds the boot-cache budget math in mesh-pb-constants.h - update both together");
 

src/mesh/ProtobufModule.h

@@ -33,7 +33,7 @@ template <class T> class ProtobufModule : protected SinglePortModule
 
     /** Called to make changes to a particular incoming message
      */
-    virtual void alterReceivedProtobuf(meshtastic_MeshPacket &mp, T *decoded){};
+    virtual void alterReceivedProtobuf(meshtastic_MeshPacket &mp, T *decoded) {};
 
     /**
      * Return a mesh packet which has been preinited with a particular protobuf data payload and port number.

src/mesh/RadioInterface.cpp

@@ -100,10 +100,17 @@ Observable<uint32_t> RadioInterface::loraRxPacketObservable;
 
 #define RDEF(name, freq_start, freq_end, duty_cycle, power_limit, frequency_switching, wide_lora, profile_ptr, default_preset,   \
              override_slot)                                                                                                      \
-    {                                                                                                                            \
-        meshtastic_Config_LoRaConfig_RegionCode_##name, freq_start, freq_end, duty_cycle, power_limit, frequency_switching,      \
-            wide_lora, &profile_ptr, default_preset, override_slot, #name                                                        \
-    }
+    {meshtastic_Config_LoRaConfig_RegionCode_##name,                                                                             \
+     freq_start,                                                                                                                 \
+     freq_end,                                                                                                                   \
+     duty_cycle,                                                                                                                 \
+     power_limit,                                                                                                                \
+     frequency_switching,                                                                                                        \
+     wide_lora,                                                                                                                  \
+     &profile_ptr,                                                                                                               \
+     default_preset,                                                                                                             \
+     override_slot,                                                                                                              \
+     #name}
 
 const RegionInfo regions[] = {
     /*

src/mesh/WarmNodeStore.h

@@ -94,7 +94,7 @@ inline bool warmXeddsaSignedOf(const WarmNodeEntry &e)
 #define WARM_FLASH_PAGE_SIZE 4096u
 #define WARM_FLASH_PAGES 3u
 #define WARM_FLASH_REGION_BASE (0xED000u - WARM_FLASH_PAGES * WARM_FLASH_PAGE_SIZE) // 0xEA000
-#define WARM_FLASH_PAGE_ADDR(i) (WARM_FLASH_REGION_BASE + (i)*WARM_FLASH_PAGE_SIZE)
+#define WARM_FLASH_PAGE_ADDR(i) (WARM_FLASH_REGION_BASE + (i) * WARM_FLASH_PAGE_SIZE)
 #endif
 
 class WarmNodeStore

src/mesh/api/PacketAPI.h

@@ -13,7 +13,7 @@ class PacketAPI : public PhoneAPI, public concurrency::OSThread
 {
   public:
     static PacketAPI *create(PacketServer *_server);
-    virtual ~PacketAPI(){};
+    virtual ~PacketAPI() {};
     virtual int32_t runOnce();
     // Check the current underlying physical queue to see if the client is fetching packets
     bool checkIsConnected() override;

src/modules/ExternalNotificationModule.h

@@ -33,7 +33,7 @@ class rtttl
     explicit rtttl() {}
     static bool isPlaying() { return false; }
     static void play() {}
-    static void begin(byte a, const char *b){};
+    static void begin(byte a, const char *b) {};
     static void stop() {}
     static bool done() { return true; }
 };

src/modules/Telemetry/EnvironmentTelemetry.cpp

@@ -417,8 +417,8 @@ int32_t EnvironmentTelemetryModule::runOnce()
                 result = ina3221Sensor.runOnce();
             if (max17048Sensor.hasSensor())
                 result = max17048Sensor.runOnce();
-                // this only works on the wismesh hub with the solar option. This is not an I2C sensor, so we don't need the
-                // sensormap here.
+            // this only works on the wismesh hub with the solar option. This is not an I2C sensor, so we don't need the
+            // sensormap here.
 #ifdef HAS_RAKPROT
             if (rak9154Sensor.hasSensor())
                 result = rak9154Sensor.runOnce();

src/modules/Telemetry/Sensor/HM330XSensor.cpp

@@ -5,7 +5,7 @@
 #include "../mesh/generated/meshtastic/telemetry.pb.h"
 #include "HM330XSensor.h"
 
-HM330XSensor::HM330XSensor() : TelemetrySensor(meshtastic_TelemetrySensorType_HM330X, "HM330X"){};
+HM330XSensor::HM330XSensor() : TelemetrySensor(meshtastic_TelemetrySensorType_HM330X, "HM330X") {};
 
 bool HM330XSensor::initDevice(TwoWire *bus, ScanI2C::FoundDevice *dev)
 {

src/modules/Telemetry/Sensor/INA3221Sensor.cpp

@@ -7,7 +7,7 @@
 #include "TelemetrySensor.h"
 #include <INA3221.h>
 
-INA3221Sensor::INA3221Sensor() : TelemetrySensor(meshtastic_TelemetrySensorType_INA3221, "INA3221"){};
+INA3221Sensor::INA3221Sensor() : TelemetrySensor(meshtastic_TelemetrySensorType_INA3221, "INA3221") {};
 
 int32_t INA3221Sensor::runOnce()
 {

src/modules/Telemetry/Sensor/SFA30Sensor.cpp

@@ -5,7 +5,7 @@
 #include "../mesh/generated/meshtastic/telemetry.pb.h"
 #include "SFA30Sensor.h"
 
-SFA30Sensor::SFA30Sensor() : TelemetrySensor(meshtastic_TelemetrySensorType_SFA30, "SFA30"){};
+SFA30Sensor::SFA30Sensor() : TelemetrySensor(meshtastic_TelemetrySensorType_SFA30, "SFA30") {};
 
 bool SFA30Sensor::initDevice(TwoWire *bus, ScanI2C::FoundDevice *dev)
 {

src/modules/Telemetry/Sensor/TelemetrySensor.h

@@ -66,7 +66,7 @@ class TelemetrySensor
 
     // Functions to sleep / wakeup sensors that support it
     // These functions can save power consumption in cases like AQ
-    virtual void sleep(){};
+    virtual void sleep() {};
     virtual uint32_t wakeUp() { return 0; }
     virtual bool isActive() { return true; }  // Return true by default, override per sensor
     virtual bool canSleep() { return false; } // Return false by default, override per sensor

src/motion/BHI260APSensor.cpp

@@ -46,8 +46,7 @@ bool BHI260APSensor::init()
         InterruptConfig intConfig;
         sensor.configureInterrupt(intConfig);
         pinMode(BHI260AP_INT, INPUT);
-        attachInterrupt(
-            BHI260AP_INT, [] { BHI_IRQ = true; }, RISING);
+        attachInterrupt(BHI260AP_INT, [] { BHI_IRQ = true; }, RISING);
 #endif
 
         // Wrist tilt wakes the screen. Not every firmware image ships it and SensorAnyMotion

src/motion/BMA423Sensor.cpp

@@ -47,8 +47,7 @@ bool BMA423Sensor::init()
 
 #ifdef BMA4XX_INT
     pinMode(BMA4XX_INT, INPUT);
-    attachInterrupt(
-        BMA4XX_INT, [] { BMA_IRQ = true; }, RISING);
+    attachInterrupt(BMA4XX_INT, [] { BMA_IRQ = true; }, RISING);
 #endif
 
     LOG_DEBUG("BMA423 init ok");

src/motion/MotionSensor.h

@@ -23,7 +23,7 @@ class MotionSensor
 {
   public:
     explicit MotionSensor(ScanI2C::FoundDevice foundDevice);
-    virtual ~MotionSensor(){};
+    virtual ~MotionSensor() {};
 
     // Get the device type
     ScanI2C::DeviceType deviceType();
@@ -42,7 +42,7 @@ class MotionSensor
     // Refer to /src/concurrency/OSThread.h for more information
     inline virtual int32_t runOnce() { return MOTION_SENSOR_CHECK_INTERVAL_MS; };
 
-    virtual void calibrate(uint16_t forSeconds){};
+    virtual void calibrate(uint16_t forSeconds) {};
 
     // Latest samples published by the compass-fusion drivers (accel from the IMU, mag from the magnetometer).
     // Public so an optional on-screen sensor debug readout can read them. Return false if nothing published yet.

src/motion/STK8XXXSensor.cpp

@@ -14,8 +14,7 @@ bool STK8XXXSensor::init()
         STK_IRQ = false;
         sensor.STK8xxx_Anymotion_init();
         pinMode(STK8XXX_INT, INPUT_PULLUP);
-        attachInterrupt(
-            digitalPinToInterrupt(STK8XXX_INT), [] { STK_IRQ = true; }, RISING);
+        attachInterrupt(digitalPinToInterrupt(STK8XXX_INT), [] { STK_IRQ = true; }, RISING);
 
         LOG_DEBUG("STK8XXX init ok");
         return true;

src/platform/nrf52/NRF52Bluetooth.cpp

@@ -62,7 +62,7 @@ BLECharacteristic::write_authorize_cb_t QuiescingBLEDfu::libraryCb;
 } // namespace
 static QuiescingBLEDfu bledfu; // DFU software update helper service
 #else
-static BLEDfuSecure bledfusecure;                                             // DFU software update helper service
+static BLEDfuSecure bledfusecure; // DFU software update helper service
 #endif
 
 // This scratch buffer is used for various bluetooth reads/writes - but it is safe because only one bt operation can be in

src/platform/nrf52/main-nrf52.cpp

@@ -508,8 +508,8 @@ void cpuDeepSleep(uint32_t msecToWake)
     if (Serial)       // Another check in case of disabled default serial, does nothing bad
         Serial.end(); // This may cause crashes as debug messages continue to flow.
 
-        // This causes troubles with waking up on nrf52 (on pro-micro in particular):
-        // we have no Serial1 in use on nrf52, check Serial and GPS modules.
+    // This causes troubles with waking up on nrf52 (on pro-micro in particular):
+    // we have no Serial1 in use on nrf52, check Serial and GPS modules.
 #ifdef PIN_SERIAL1_RX
     if (Serial1) // A straightforward solution to the wake from deepsleep problem
         Serial1.end();

src/platform/nrf52/softdevice/ble.h

@@ -139,7 +139,7 @@ enum BLE_COMMON_OPTS {
  * parameter. If that value has not been configured for any connections then @ref BLE_GATT_ATT_MTU_DEFAULT must be used instead.
  */
 #define BLE_EVT_LEN_MAX(ATT_MTU)                                                                                                 \
-    (offsetof(ble_evt_t, evt.gattc_evt.params.prim_srvc_disc_rsp.services) + ((ATT_MTU)-1) / 4 * sizeof(ble_gattc_service_t))
+    (offsetof(ble_evt_t, evt.gattc_evt.params.prim_srvc_disc_rsp.services) + ((ATT_MTU) - 1) / 4 * sizeof(ble_gattc_service_t))
 
 /** @defgroup BLE_USER_MEM_TYPES User Memory Types
  * @{ */

src/platform/nrf52/softdevice/nrf_nvic.h

@@ -336,7 +336,7 @@ __STATIC_INLINE uint32_t sd_nvic_DisableIRQ(IRQn_Type IRQn)
     }
 
     if (nrf_nvic_state.__cr_flag) {
-        nrf_nvic_state.__irq_masks[(uint32_t)((int32_t)IRQn) >> 5] &= ~(1UL << ((uint32_t)(IRQn)&0x1F));
+        nrf_nvic_state.__irq_masks[(uint32_t)((int32_t)IRQn) >> 5] &= ~(1UL << ((uint32_t)(IRQn) & 0x1F));
     } else {
         NVIC_DisableIRQ(IRQn);
     }

src/platform/portduino/architecture.h

@@ -25,11 +25,11 @@
 #endif
 #ifndef HAS_TRACKBALL
 #define HAS_TRACKBALL 1
-#define TB_DOWN (uint8_t) portduino_config.tbDownPin.pin
-#define TB_UP (uint8_t) portduino_config.tbUpPin.pin
-#define TB_LEFT (uint8_t) portduino_config.tbLeftPin.pin
-#define TB_RIGHT (uint8_t) portduino_config.tbRightPin.pin
-#define TB_PRESS (uint8_t) portduino_config.tbPressPin.pin
+#define TB_DOWN (uint8_t)portduino_config.tbDownPin.pin
+#define TB_UP (uint8_t)portduino_config.tbUpPin.pin
+#define TB_LEFT (uint8_t)portduino_config.tbLeftPin.pin
+#define TB_RIGHT (uint8_t)portduino_config.tbRightPin.pin
+#define TB_PRESS (uint8_t)portduino_config.tbPressPin.pin
 #endif
 
 // HUB75 RGB-matrix panel support on Raspberry Pi (Portduino) turns on automatically when the

src/platform/stm32wl/STM32_LittleFS.h

@@ -76,12 +76,8 @@ class STM32_LittleFS
      * code. User should not call these directly
      *------------------------------------------------------------------*/
     lfs_t *_getFS(void) { return &_lfs; }
-    void _lockFS(void)
-    { /* no-op */
-    }
-    void _unlockFS(void)
-    { /* no-op */
-    }
+    void _lockFS(void) { /* no-op */ }
+    void _unlockFS(void) { /* no-op */ }
 
   protected:
     bool _mounted;

test/support/userprefs_event_channel.h

@@ -3,10 +3,7 @@
 
 #pragma once
 
-#define USERPREFS_CHANNEL_0_PSK                                                                                                  \
-    {                                                                                                                            \
-        0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f                           \
-    }
+#define USERPREFS_CHANNEL_0_PSK {0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f}
 #define USERPREFS_CHANNEL_0_NAME ""
 #define USERPREFS_CHANNEL_0_PRECISION 0
 #define USERPREFS_CHANNEL_0_IS_MUTED false

test/test_userprefs_channels/userprefs_fixture.h

@@ -7,10 +7,7 @@
 
 // Every field set, with is_muted and uplink on but downlink off, so a test can tell an applied
 // value from a zeroed one.
-#define USERPREFS_CHANNEL_0_PSK                                                                                                  \
-    {                                                                                                                            \
-        1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16                                                                    \
-    }
+#define USERPREFS_CHANNEL_0_PSK {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16}
 #define USERPREFS_CHANNEL_0_NAME "Ops"
 #define USERPREFS_CHANNEL_0_PRECISION 14
 #define USERPREFS_CHANNEL_0_IS_MUTED true
@@ -18,10 +15,7 @@
 #define USERPREFS_CHANNEL_0_DOWNLINK_ENABLED false
 
 // Name longer than ChannelSettings.name (char[12]); the switch this table replaces used strcpy().
-#define USERPREFS_CHANNEL_2_PSK                                                                                                  \
-    {                                                                                                                            \
-        1                                                                                                                        \
-    }
+#define USERPREFS_CHANNEL_2_PSK {1}
 #define USERPREFS_CHANNEL_2_NAME "LongerThanTwelve"
 #define USERPREFS_CHANNEL_2_PRECISION 0
 #define USERPREFS_CHANNEL_2_IS_MUTED false
@@ -29,20 +23,14 @@
 #define USERPREFS_CHANNEL_2_DOWNLINK_ENABLED false
 
 // The index the old switch could not reach at all.
-#define USERPREFS_CHANNEL_3_PSK                                                                                                  \
-    {                                                                                                                            \
-        16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1                                                                    \
-    }
+#define USERPREFS_CHANNEL_3_PSK {16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1}
 #define USERPREFS_CHANNEL_3_NAME "Three"
 #define USERPREFS_CHANNEL_3_PRECISION 0
 #define USERPREFS_CHANNEL_3_IS_MUTED false
 #define USERPREFS_CHANNEL_3_UPLINK_ENABLED false
 #define USERPREFS_CHANNEL_3_DOWNLINK_ENABLED false
 
-#define USERPREFS_CHANNEL_4_PSK                                                                                                  \
-    {                                                                                                                            \
-        1                                                                                                                        \
-    }
+#define USERPREFS_CHANNEL_4_PSK {1}
 #define USERPREFS_CHANNEL_4_NAME "Four"
 #define USERPREFS_CHANNEL_4_PRECISION 0
 #define USERPREFS_CHANNEL_4_IS_MUTED false

variants/esp32c6/m5stack_unitc6l/variant.cpp

@@ -20,7 +20,7 @@
 #define setbit(x, y) x |= (0x01 << y)
 #define clrbit(x, y) x &= ~(0x01 << y)
 #define reversebit(x, y) x ^= (0x01 << y)
-#define getbit(x, y) ((x) >> (y)&0x01)
+#define getbit(x, y) ((x) >> (y) & 0x01)
 
 void i2c_read_byte(uint8_t addr, uint8_t reg, uint8_t *value)
 {

variants/esp32s3/picomputer-s3/variant.h

@@ -54,11 +54,5 @@
 
 #define INPUTBROKER_MATRIX_TYPE 1
 
-#define KEYS_COLS                                                                                                                \
-    {                                                                                                                            \
-        44, 47, 17, 15, 13, 41                                                                                                   \
-    }
-#define KEYS_ROWS                                                                                                                \
-    {                                                                                                                            \
-        12, 16, 42, 18, 14, 7                                                                                                    \
-    }
+#define KEYS_COLS {44, 47, 17, 15, 13, 41}
+#define KEYS_ROWS {12, 16, 42, 18, 14, 7}

variants/esp32s3/tracksenger/internal/variant.h

@@ -81,12 +81,6 @@
 
 #define INPUTBROKER_MATRIX_TYPE 1
 
-#define KEYS_COLS                                                                                                                \
-    {                                                                                                                            \
-        44, 45, 46, 4, 5, 6                                                                                                      \
-    }
-#define KEYS_ROWS                                                                                                                \
-    {                                                                                                                            \
-        26, 37, 17, 16, 15, 7                                                                                                    \
-    }
+#define KEYS_COLS {44, 45, 46, 4, 5, 6}
+#define KEYS_ROWS {26, 37, 17, 16, 15, 7}
 // #end keyboard

variants/esp32s3/tracksenger/lcd/variant.h

@@ -105,12 +105,6 @@
 
 #define INPUTBROKER_MATRIX_TYPE 1
 
-#define KEYS_COLS                                                                                                                \
-    {                                                                                                                            \
-        44, 45, 46, 4, 5, 6                                                                                                      \
-    }
-#define KEYS_ROWS                                                                                                                \
-    {                                                                                                                            \
-        26, 37, 17, 16, 15, 7                                                                                                    \
-    }
+#define KEYS_COLS {44, 45, 46, 4, 5, 6}
+#define KEYS_ROWS {26, 37, 17, 16, 15, 7}
 // #end keyboard

variants/esp32s3/tracksenger/oled/variant.h

@@ -81,12 +81,6 @@
 
 #define INPUTBROKER_MATRIX_TYPE 1
 
-#define KEYS_COLS                                                                                                                \
-    {                                                                                                                            \
-        44, 45, 46, 4, 5, 6                                                                                                      \
-    }
-#define KEYS_ROWS                                                                                                                \
-    {                                                                                                                            \
-        26, 37, 17, 16, 15, 7                                                                                                    \
-    }
+#define KEYS_COLS {44, 45, 46, 4, 5, 6}
+#define KEYS_ROWS {26, 37, 17, 16, 15, 7}
 // #end keyboard

variants/nrf52840/muzi_base/variant.h

@@ -133,34 +133,31 @@ extern "C" {
 #define USERPREFS_OEM_IMAGE_DATA                                                                                                 \
     {                                                                                                                            \
         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0, 0xFF, 0xFF, 0x7F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0, 0xFF,  \
-            0xFF, 0x7F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0, 0xFF, 0xFF, 0x7F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,    \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,    \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0, 0x03, 0x3C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,    \
-            0xF7, 0x0F, 0xFF, 0x00, 0xF0, 0xFF, 0x0F, 0xC0, 0xFF, 0x07, 0x78, 0xFF, 0x9F, 0xFF, 0x01, 0xF0, 0xFF, 0x0F, 0xC0,    \
-            0xFF, 0x03, 0x78, 0x3F, 0xFE, 0xF3, 0x01, 0xF0, 0xFF, 0x0F, 0x00, 0xE0, 0x03, 0x78, 0x1F, 0xFC, 0xC0, 0x03, 0xF0,    \
-            0xFF, 0x0F, 0x00, 0xE0, 0x01, 0x78, 0x0F, 0xF8, 0x80, 0x03, 0xF0, 0xFF, 0x0F, 0x00, 0xF0, 0x00, 0x78, 0x0F, 0x78,    \
-            0x80, 0x03, 0xF0, 0xFF, 0x0F, 0x00, 0x70, 0x00, 0x78, 0x07, 0x70, 0x80, 0x03, 0xF0, 0xFF, 0x0F, 0x00, 0x78, 0x00,    \
-            0x78, 0x07, 0x70, 0x80, 0x03, 0xF0, 0xFF, 0x0F, 0x00, 0x3C, 0x00, 0x78, 0x07, 0x70, 0x80, 0x03, 0xF0, 0xFF, 0x0F,    \
-            0x00, 0x1C, 0x00, 0x78, 0x07, 0x70, 0x80, 0x03, 0xF0, 0xFF, 0x0F, 0x00, 0x1E, 0x00, 0x78, 0x07, 0x70, 0x80, 0x03,    \
-            0xE0, 0xFF, 0x0F, 0x00, 0x0F, 0x00, 0x78, 0x07, 0x70, 0x80, 0x03, 0xE0, 0xFF, 0x07, 0x80, 0x07, 0x00, 0x78, 0x07,    \
-            0x70, 0x80, 0x03, 0xC0, 0xFF, 0x07, 0x80, 0x07, 0x00, 0x78, 0x07, 0x70, 0x80, 0x03, 0xC0, 0xFF, 0x03, 0xC0, 0xFF,    \
-            0x07, 0x78, 0x07, 0x70, 0x80, 0x03, 0x00, 0xFF, 0x01, 0xE0, 0xFF, 0x07, 0x78, 0x07, 0x70, 0x80, 0x03, 0x00, 0x7C,    \
-            0x00, 0xF0, 0xFF, 0x07, 0x78, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,    \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,    \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,    \
-            0xFF, 0xFF, 0x7F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x7F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,    \
-            0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x7F, 0xE3, 0xE7, 0xC7, 0x1F, 0xF8, 0x0F, 0xF0, 0xE7, 0xE3, 0x07, 0x7C, 0xC7, 0xE7,    \
-            0xC3, 0x0F, 0xE0, 0x07, 0xE0, 0xC7, 0xE1, 0x03, 0x70, 0xC7, 0xC3, 0xE3, 0x87, 0xC1, 0x07, 0xC0, 0xC7, 0xF8, 0xE3,    \
-            0x71, 0xC7, 0xC3, 0xE3, 0xE3, 0xC7, 0xC7, 0xC7, 0x47, 0xF8, 0xF3, 0x7F, 0x8F, 0xC3, 0xF1, 0xE3, 0x8F, 0xC7, 0x8F,    \
-            0x27, 0xFC, 0xE3, 0x7F, 0x8F, 0x81, 0xF1, 0xF1, 0x8F, 0xC7, 0xCF, 0x07, 0xFE, 0x03, 0x7E, 0x8F, 0x99, 0xF1, 0xF1,    \
-            0x8F, 0x07, 0xC0, 0x07, 0xFF, 0x07, 0x78, 0x9F, 0x99, 0xF9, 0xF1, 0x8F, 0x07, 0xE0, 0x07, 0xFE, 0x3F, 0x70, 0x1F,    \
-            0x18, 0xF8, 0xF3, 0x8F, 0x07, 0xF0, 0x27, 0xFC, 0xFF, 0x71, 0x3F, 0x18, 0xF8, 0xE3, 0xC7, 0xC7, 0xF1, 0x47, 0xF8,    \
-            0xF3, 0x63, 0x3F, 0x3C, 0xFC, 0xC3, 0xC3, 0xC7, 0xE3, 0xC7, 0xF0, 0xE1, 0x71, 0x3F, 0x3C, 0xFC, 0x07, 0xE0, 0xC7,    \
-            0xC7, 0xC7, 0xE1, 0x03, 0x70, 0x7F, 0x7E, 0xFE, 0x0F, 0xF0, 0xC7, 0x87, 0xC7, 0xC3, 0x07, 0x78, 0xFF, 0xFF, 0xFF,    \
-            0x7F, 0xFC, 0xFF, 0xFF, 0xFF, 0xFF, 0x1F, 0x7E, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x7F,    \
-            0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x7F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,    \
-            0xFF, 0xFF, 0x7F                                                                                                     \
-    }
+        0xFF, 0x7F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0, 0xFF, 0xFF, 0x7F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  \
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  \
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0, 0x03, 0x3C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF7, 0x0F, 0xFF,  \
+        0x00, 0xF0, 0xFF, 0x0F, 0xC0, 0xFF, 0x07, 0x78, 0xFF, 0x9F, 0xFF, 0x01, 0xF0, 0xFF, 0x0F, 0xC0, 0xFF, 0x03, 0x78, 0x3F,  \
+        0xFE, 0xF3, 0x01, 0xF0, 0xFF, 0x0F, 0x00, 0xE0, 0x03, 0x78, 0x1F, 0xFC, 0xC0, 0x03, 0xF0, 0xFF, 0x0F, 0x00, 0xE0, 0x01,  \
+        0x78, 0x0F, 0xF8, 0x80, 0x03, 0xF0, 0xFF, 0x0F, 0x00, 0xF0, 0x00, 0x78, 0x0F, 0x78, 0x80, 0x03, 0xF0, 0xFF, 0x0F, 0x00,  \
+        0x70, 0x00, 0x78, 0x07, 0x70, 0x80, 0x03, 0xF0, 0xFF, 0x0F, 0x00, 0x78, 0x00, 0x78, 0x07, 0x70, 0x80, 0x03, 0xF0, 0xFF,  \
+        0x0F, 0x00, 0x3C, 0x00, 0x78, 0x07, 0x70, 0x80, 0x03, 0xF0, 0xFF, 0x0F, 0x00, 0x1C, 0x00, 0x78, 0x07, 0x70, 0x80, 0x03,  \
+        0xF0, 0xFF, 0x0F, 0x00, 0x1E, 0x00, 0x78, 0x07, 0x70, 0x80, 0x03, 0xE0, 0xFF, 0x0F, 0x00, 0x0F, 0x00, 0x78, 0x07, 0x70,  \
+        0x80, 0x03, 0xE0, 0xFF, 0x07, 0x80, 0x07, 0x00, 0x78, 0x07, 0x70, 0x80, 0x03, 0xC0, 0xFF, 0x07, 0x80, 0x07, 0x00, 0x78,  \
+        0x07, 0x70, 0x80, 0x03, 0xC0, 0xFF, 0x03, 0xC0, 0xFF, 0x07, 0x78, 0x07, 0x70, 0x80, 0x03, 0x00, 0xFF, 0x01, 0xE0, 0xFF,  \
+        0x07, 0x78, 0x07, 0x70, 0x80, 0x03, 0x00, 0x7C, 0x00, 0xF0, 0xFF, 0x07, 0x78, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  \
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  \
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF,  \
+        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x7F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x7F, 0xFF,  \
+        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x7F, 0xE3, 0xE7, 0xC7, 0x1F, 0xF8, 0x0F, 0xF0, 0xE7, 0xE3, 0x07,  \
+        0x7C, 0xC7, 0xE7, 0xC3, 0x0F, 0xE0, 0x07, 0xE0, 0xC7, 0xE1, 0x03, 0x70, 0xC7, 0xC3, 0xE3, 0x87, 0xC1, 0x07, 0xC0, 0xC7,  \
+        0xF8, 0xE3, 0x71, 0xC7, 0xC3, 0xE3, 0xE3, 0xC7, 0xC7, 0xC7, 0x47, 0xF8, 0xF3, 0x7F, 0x8F, 0xC3, 0xF1, 0xE3, 0x8F, 0xC7,  \
+        0x8F, 0x27, 0xFC, 0xE3, 0x7F, 0x8F, 0x81, 0xF1, 0xF1, 0x8F, 0xC7, 0xCF, 0x07, 0xFE, 0x03, 0x7E, 0x8F, 0x99, 0xF1, 0xF1,  \
+        0x8F, 0x07, 0xC0, 0x07, 0xFF, 0x07, 0x78, 0x9F, 0x99, 0xF9, 0xF1, 0x8F, 0x07, 0xE0, 0x07, 0xFE, 0x3F, 0x70, 0x1F, 0x18,  \
+        0xF8, 0xF3, 0x8F, 0x07, 0xF0, 0x27, 0xFC, 0xFF, 0x71, 0x3F, 0x18, 0xF8, 0xE3, 0xC7, 0xC7, 0xF1, 0x47, 0xF8, 0xF3, 0x63,  \
+        0x3F, 0x3C, 0xFC, 0xC3, 0xC3, 0xC7, 0xE3, 0xC7, 0xF0, 0xE1, 0x71, 0x3F, 0x3C, 0xFC, 0x07, 0xE0, 0xC7, 0xC7, 0xC7, 0xE1,  \
+        0x03, 0x70, 0x7F, 0x7E, 0xFE, 0x0F, 0xF0, 0xC7, 0x87, 0xC7, 0xC3, 0x07, 0x78, 0xFF, 0xFF, 0xFF, 0x7F, 0xFC, 0xFF, 0xFF,  \
+        0xFF, 0xFF, 0x1F, 0x7E, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x7F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,  \
+        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x7F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x7F}
 
 // QSPI Pins
 #define PIN_QSPI_SCK (0 + 3)