Update clang format to 18 (#2891)

* move to clang-format-18
* clang-format-18 indendation

.github/workflows/check_formatting.yml

@@ -19,5 +19,6 @@ jobs:
       - name: clang-format Check
         uses: jidicula/clang-format-action@v4.11.0
         with:
+          clang-format-version: '18'
           check-path: ${{ matrix.path }}
           fallback-style: Chromium

firmware/application/apps/ais_app.hpp

@@ -159,7 +159,7 @@ class AISAppView : public View {
     ~AISAppView();
 
     void set_parent_rect(const Rect new_parent_rect) override;
-    void paint(Painter&) override{};
+    void paint(Painter&) override {};
 
     void focus() override;
 

firmware/application/apps/ble_comm_app.hpp

@@ -59,7 +59,7 @@ class BLECommView : public View {
     ~BLECommView();
 
     void set_parent_rect(const Rect new_parent_rect) override;
-    void paint(Painter&) override{};
+    void paint(Painter&) override {};
 
     void focus() override;
 

firmware/application/apps/ble_rx_app.hpp

@@ -209,7 +209,7 @@ class BLERxView : public View {
     ~BLERxView();
 
     void set_parent_rect(const Rect new_parent_rect) override;
-    void paint(Painter&) override{};
+    void paint(Painter&) override {};
 
     void focus() override;
 

firmware/application/apps/ble_tx_app.hpp

@@ -105,7 +105,7 @@ class BLETxView : public View {
     ~BLETxView();
 
     void set_parent_rect(const Rect new_parent_rect) override;
-    void paint(Painter&) override{};
+    void paint(Painter&) override {};
 
     void focus() override;
 

firmware/application/apps/ui_recon.cpp

@@ -1086,8 +1086,8 @@ void ReconView::on_statistics_update(const ChannelStatistics& statistics) {
                     if (stepper < 0) stepper++;
                     if (stepper > 0) stepper--;
                 }  // if( recon || stepper != 0 || index_stepper != 0 )
-            }      // if (frequency_list.size() > 0 )
+            }  // if (frequency_list.size() > 0 )
-        }          /* on_statistics_updates */
+        } /* on_statistics_updates */
     }
     handle_retune();
     recon_redraw();

firmware/application/clock_manager.cpp

@@ -244,8 +244,7 @@ static void portapack_tcxo_enable() {
     /* Delay >10ms at 96MHz clock speed for reference oscillator to start. */
     /* Delay an additional 1ms (arbitrary) for the clock generator to detect a signal. */
     volatile uint32_t delay = 240000 + 24000;
-    while (delay--)
+    while (delay--);
-        ;
 }
 
 static void portapack_tcxo_disable() {
@@ -329,8 +328,7 @@ void ClockManager::init_clock_generator() {
                                  : (ref_pll == ClockControl::MultiSynthSource::PLLB)
                                      ? 0x40
                                      : 0x20;
-    while ((clock_generator.device_status() & device_status_mask) != 0)
+    while ((clock_generator.device_status() & device_status_mask) != 0);
-        ;
 
     clock_generator.set_clock_control(
         clock_generator_output_mcu_clkin,
@@ -377,8 +375,7 @@ ClockManager::Reference ClockManager::choose_reference() {
     if (hackrf_r9) {
         gpio_r9_clkin_en.write(1);
         volatile uint32_t delay = 240000 + 24000;
-        while (delay--)
+        while (delay--);
-            ;
     }
     const auto detected_reference = detect_reference_source();
 
@@ -513,8 +510,7 @@ void ClockManager::start_frequency_monitor_measurement(const cgu::CLK_SEL clk_se
 
 void ClockManager::wait_For_frequency_monitor_measurement_done() {
     // FREQ_MON mechanism fails to finish if there's no clock present on selected input?!
-    while (LPC_CGU->FREQ_MON.MEAS == 1)
+    while (LPC_CGU->FREQ_MON.MEAS == 1);
-        ;
 }
 
 uint32_t ClockManager::get_frequency_monitor_measurement_in_hertz() {
@@ -559,8 +555,7 @@ void ClockManager::start_audio_pll() {
     });
 
     cgu::pll0audio::power_up();
-    while (!cgu::pll0audio::is_locked())
+    while (!cgu::pll0audio::is_locked());
-        ;
     cgu::pll0audio::clock_enable();
 
     set_base_audio_clock_divider(1);
@@ -577,8 +572,7 @@ void ClockManager::set_base_audio_clock_divider(const size_t divisor) {
 void ClockManager::stop_audio_pll() {
     cgu::pll0audio::clock_disable();
     cgu::pll0audio::power_down();
-    while (cgu::pll0audio::is_locked())
+    while (cgu::pll0audio::is_locked());
-        ;
 }
 
 void ClockManager::enable_clock_output(bool enable) {

firmware/application/debug.cpp

@@ -139,13 +139,11 @@ void runtime_error(uint8_t source) {
     led.off();
 
     // wait for DFU button release if pressed, so we don't immediately jump into stack dump
-    while (swizzled_switches() & (1 << (int)Switch::Dfu))
+    while (swizzled_switches() & (1 << (int)Switch::Dfu));
-        ;
 
     while (true) {
         volatile size_t n = 1000000U;
-        while (n--)
+        while (n--);
-            ;
         led.toggle();
 
         // Stack dump will cover entire screen, so wait for DFU button press to attempt it
@@ -225,8 +223,7 @@ void draw_stack_dump() {
         // Out of room on the screen or end of stack - allow Up/Down paging.
         // First wait for button release from previous press.
         // NOTE: can't call swizzle_switches() with interrupted enabled!
-        while (swizzled_switches() & ((1 << (int)Switch::Right) | (1 << (int)Switch::Left) | (1 << (int)Switch::Down) | (1 << (int)Switch::Up) | (1 << (int)Switch::Sel) | (1 << (int)Switch::Dfu)))
+        while (swizzled_switches() & ((1 << (int)Switch::Right) | (1 << (int)Switch::Left) | (1 << (int)Switch::Down) | (1 << (int)Switch::Up) | (1 << (int)Switch::Sel) | (1 << (int)Switch::Dfu)));
-            ;
 
         painter.draw_string({border, portapack::display.height() - border - 8}, *Theme::getInstance()->bg_darkest_small, "Use UP/DOWN key");
 

firmware/application/debug.hpp

@@ -41,8 +41,7 @@ extern uint32_t __process_stack_end__;
 
 inline uint32_t get_free_stack_space() {
     uint32_t* p;
-    for (p = &__process_stack_base__; *p == CRT0_STACKS_FILL_PATTERN && p < &__process_stack_end__; p++)
+    for (p = &__process_stack_base__; *p == CRT0_STACKS_FILL_PATTERN && p < &__process_stack_end__; p++);
-        ;
     auto stack_space_left = p - &__process_stack_base__;
 
     return stack_space_left;

firmware/application/external/ert/ert_app.hpp

@@ -118,7 +118,7 @@ class ERTAppView : public View {
 
     // Prevent painting of region covered entirely by a child.
     // TODO: Add flag to View that specifies view does not need to be cleared before painting.
-    void paint(Painter&) override{};
+    void paint(Painter&) override {};
 
     void focus() override;
 

firmware/application/external/tetris/ui_tetris.cpp

@@ -598,8 +598,7 @@ void pause_game() {
     joystick.detach();
     locate((INFO_LEFT + SCREEN_WIDTH) / 2 - 25, 200);
     printf("PAUSED");
-    while ((get_switches_state().to_ulong() & 0x10) == 0)
+    while ((get_switches_state().to_ulong() & 0x10) == 0);
-        ;
     fillrect(INFO_LEFT, 195, SCREEN_WIDTH, 210, Black);
     joystick.attach(&ReadJoystickForFigure, 0.3);
     game.attach(&PlayGame, delays[level]);

firmware/application/external/tpmsrx/tpms_app.hpp

@@ -99,7 +99,7 @@ class TPMSAppView : public View {
 
     // Prevent painting of region covered entirely by a child.
     // TODO: Add flag to View that specifies view does not need to be cleared before painting.
-    void paint(Painter&) override{};
+    void paint(Painter&) override {};
 
     void focus() override;
 

firmware/application/file.hpp

@@ -315,7 +315,7 @@ class File {
     template <typename T>
     using Result = Result<T, Error>;
 
-    File(){};
+    File() {};
     ~File();
 
     File(File&& other) {

firmware/application/hw/si5351.hpp

@@ -361,8 +361,7 @@ class Si5351 {
     }
 
     void wait_for_device_ready() {
-        while (device_status() & 0x80)
+        while (device_status() & 0x80);
-            ;
     }
 
     bool plla_loss_of_signal() {

firmware/application/portapack.cpp

@@ -322,8 +322,7 @@ static void shutdown_base() {
     });
 
     cgu::pll1::enable();
-    while (!cgu::pll1::is_locked())
+    while (!cgu::pll1::is_locked());
-        ;
 
     set_clock_config(clock_config_pll1_boot);
 
@@ -361,15 +360,13 @@ static void set_cpu_clock_speed() {
     });
 
     cgu::pll1::enable();
-    while (!cgu::pll1::is_locked())
+    while (!cgu::pll1::is_locked());
-        ;
 
     set_clock_config(clock_config_pll1_step);
 
     /* Delay >50us at 90-110MHz clock speed */
     volatile uint32_t delay = 1400;
-    while (delay--)
+    while (delay--);
-        ;
 
     set_clock_config(clock_config_pll1);
 

firmware/baseband/baseband_processor.hpp

@@ -34,7 +34,7 @@ class BasebandProcessor {
 
     virtual void execute(const buffer_c8_t& buffer) = 0;
 
-    virtual void on_message(const Message* const){};
+    virtual void on_message(const Message* const) {};
 
    protected:
     void feed_channel_stats(const buffer_c16_t& channel);

firmware/baseband/debug.hpp

@@ -30,8 +30,7 @@ extern uint32_t __process_stack_end__;
 
 inline uint32_t get_free_stack_space() {
     uint32_t* p;
-    for (p = &__process_stack_base__; *p == CRT0_STACKS_FILL_PATTERN && p < &__process_stack_end__; p++)
+    for (p = &__process_stack_base__; *p == CRT0_STACKS_FILL_PATTERN && p < &__process_stack_end__; p++);
-        ;
     auto stack_space_left = p - &__process_stack_base__;
 
     return stack_space_left;

firmware/baseband/fxpt_atan2.cpp

@@ -76,7 +76,7 @@ static inline int16_t q15_mul(const int16_t j, const int16_t k) {
 	return intermediate >> 15;
 #elif 0  // biased rounding
     return (intermediate + 0x4000) >> 15;
-#else    // unbiased rounding
+#else  // unbiased rounding
     return (intermediate + ((intermediate & 0x7FFF) == 0x4000 ? 0 : 0x4000)) >> 15;
 #endif
 }

firmware/baseband/proc_ook.cpp

@@ -108,8 +108,7 @@ inline size_t OOKProcessor::duval_algo_step() {
         for (unsigned int j = 0; j < w - idx; j++)
             v[idx + j] = v[j];
 
-        for (idx = w; (idx > 0) && (v[idx - 1] >= duval_symbols - 1); idx--)
+        for (idx = w; (idx > 0) && (v[idx - 1] >= duval_symbols - 1); idx--);
-            ;
 
         if (idx)
             v[idx - 1]++;

firmware/baseband/sd_over_usb/scsi.c

@@ -45,8 +45,7 @@ void usb_send_bulk(void* const data, const uint32_t maximum_length) {
         usb_bulk_block_cb,
         NULL);
 
-    while (!usb_bulk_block_done)
+    while (!usb_bulk_block_done);
-        ;
 }
 
 void usb_receive_bulk(void* const data, const uint32_t maximum_length) {
@@ -59,8 +58,7 @@ void usb_receive_bulk(void* const data, const uint32_t maximum_length) {
         usb_bulk_block_cb,
         NULL);
 
-    while (!usb_bulk_block_done)
+    while (!usb_bulk_block_done);
-        ;
 }
 
 void usb_send_csw(msd_cbw_t* msd_cbw_data, uint8_t status) {

firmware/baseband/sd_over_usb/sd_over_usb.c

@@ -118,8 +118,7 @@ void usb_transfer(void) {
             scsi_bulk_transfer_complete,
             NULL);
 
-        while (!transfer_complete)
+        while (!transfer_complete);
-            ;
 
         msd_cbw_t* msd_cbw_data = (msd_cbw_t*)&usb_bulk_buffer[0x4000];
 

firmware/common/bmpfile.cpp

@@ -173,7 +173,7 @@ bool BMPFile::read_next_px(ui::Color& px, bool seek = true) {
             //*a = (val >> 15) & 0x01;            // 1-bit alpha
             uint8_t r = (val >> 10) & 0x1F;  // 5-bit red
             uint8_t g = (val >> 5) & 0x1F;   // 5-bit green
-            uint8_t b = (val)&0x1F;          // 5-bit blue
+            uint8_t b = (val) & 0x1F;        // 5-bit blue
             // expand
             r = (r << 3) | (r >> 2);
             g = (g << 3) | (g >> 2);
@@ -217,7 +217,7 @@ bool BMPFile::read_next_px_cnt(ui::Color* px, uint32_t count, bool seek) {
                     //*a = (val >> 15) & 0x01;            // 1-bit alpha
                     uint8_t r = (val >> 10) & 0x1F;  // 5-bit red
                     uint8_t g = (val >> 5) & 0x1F;   // 5-bit green
-                    uint8_t b = (val)&0x1F;          // 5-bit blue
+                    uint8_t b = (val) & 0x1F;        // 5-bit blue
                     // expand
                     r = (r << 3) | (r >> 2);
                     g = (g << 3) | (g >> 2);

firmware/common/i2cdevmanager.hpp

@@ -40,7 +40,7 @@ namespace i2cdev {
 // The device class. You'll derive your from this. Override init() and update();
 class I2cDev {
    public:
-    virtual ~I2cDev(){};
+    virtual ~I2cDev() {};
     virtual bool init(uint8_t addr) = 0;  // returns true if it is that that device we are looking for.
     virtual void update() = 0;            // override this, and you'll be able to query your device and broadcast the result to the system
 

firmware/common/manchester.hpp

@@ -47,7 +47,7 @@ class ManchesterBase {
 
     virtual size_t symbols_count() const;
 
-    virtual ~ManchesterBase(){};
+    virtual ~ManchesterBase() {};
 
    protected:
     const baseband::Packet& packet;

firmware/common/message_queue.hpp

@@ -55,8 +55,7 @@ class MessageQueue {
         const bool result = push(message);
         if (result) {
             // TODO: More graceful method of waiting for empty? Maybe sleep for a bit?
-            while (!is_empty())
+            while (!is_empty());
-                ;
         }
         return result;
     }

firmware/common/random.hpp

@@ -28,8 +28,8 @@
 #define MATRIX_A 0x9908b0dfUL /* constant vector a */
 #define UMASK 0x80000000UL    /* most significant w-r bits */
 #define LMASK 0x7fffffffUL    /* least significant r bits */
-#define MIXBITS(u, v) (((u)&UMASK) | ((v)&LMASK))
+#define MIXBITS(u, v) (((u) & UMASK) | ((v) & LMASK))
-#define TWIST(u, v) ((MIXBITS(u, v) >> 1) ^ ((v)&1UL ? MATRIX_A : 0UL))
+#define TWIST(u, v) ((MIXBITS(u, v) >> 1) ^ ((v) & 1UL ? MATRIX_A : 0UL))
 
 /* initializes state[N] with a seed */
 extern void init_genrand(unsigned long s);

firmware/common/sstv.hpp

@@ -28,7 +28,7 @@ namespace sstv {
 #define SSTV_SAMPLERATE 3072000
 #define SSTV_DELTA_COEF ((1ULL << 32) / SSTV_SAMPLERATE)
 
-#define SSTV_F2D(f) (uint32_t)((f)*SSTV_DELTA_COEF)
+#define SSTV_F2D(f) (uint32_t)((f) * SSTV_DELTA_COEF)
 #define SSTV_MS2S(d) (uint32_t)((d) / 1000.0 * (float)SSTV_SAMPLERATE)
 
 #define SSTV_VIS_SS SSTV_F2D(1200)

firmware/common/ui.hpp

@@ -36,29 +36,29 @@ namespace ui {
 // default font width
 #define UI_POS_DEFAULT_WIDTH 8
 // px position of the linenum-th character (Y)
-#define UI_POS_Y(linenum) ((int)((linenum)*UI_POS_DEFAULT_HEIGHT))
+#define UI_POS_Y(linenum) ((int)((linenum) * UI_POS_DEFAULT_HEIGHT))
 // px position of the linenum-th character from the bottom of the screen (Y) (please calculate the +1 line top-bar to it too if that is visible!)
-#define UI_POS_Y_BOTTOM(linenum) ((int)(screen_height - (linenum)*UI_POS_DEFAULT_HEIGHT))
+#define UI_POS_Y_BOTTOM(linenum) ((int)(screen_height - (linenum) * UI_POS_DEFAULT_HEIGHT))
 // px position of the linenum-th character from the left of the screen (X)
-#define UI_POS_X(charnum) ((int)((charnum)*UI_POS_DEFAULT_WIDTH))
+#define UI_POS_X(charnum) ((int)((charnum) * UI_POS_DEFAULT_WIDTH))
 // px position of the linenum-th character from the right of the screen (X)
-#define UI_POS_X_RIGHT(charnum) ((int)(screen_width - ((charnum)*UI_POS_DEFAULT_WIDTH)))
+#define UI_POS_X_RIGHT(charnum) ((int)(screen_width - ((charnum) * UI_POS_DEFAULT_WIDTH)))
 // px position of the left character from the center of the screen (X)  (for N character wide string)
-#define UI_POS_X_CENTER(charnum) ((int)((screen_width / 2) - ((charnum)*UI_POS_DEFAULT_WIDTH / 2)))
+#define UI_POS_X_CENTER(charnum) ((int)((screen_width / 2) - ((charnum) * UI_POS_DEFAULT_WIDTH / 2)))
 // px position of the currcol in a table with colnum number of columns, where one coloumn is charnum characters wide maximum
 #define UI_POS_X_TABLE(colnum, currcol) ((currcol) * (screen_width / (colnum)))
 // px width of N characters
-#define UI_POS_WIDTH(charnum) ((int)((charnum)*UI_POS_DEFAULT_WIDTH))
+#define UI_POS_WIDTH(charnum) ((int)((charnum) * UI_POS_DEFAULT_WIDTH))
 // px width of the screen
 #define UI_POS_MAXWIDTH (screen_width)
 // px height of N line
-#define UI_POS_HEIGHT(linecount) ((int)((linecount)*UI_POS_DEFAULT_HEIGHT))
+#define UI_POS_HEIGHT(linecount) ((int)((linecount) * UI_POS_DEFAULT_HEIGHT))
 // px height of the screen's percent
 #define UI_POS_HEIGHT_PERCENT(percent) ((int)(screen_height * (percent) / 100))
 // remaining px from the linenum-th line to the bottom of the screen. (please calculate the +1 line top-bar to it too if that is visible!)
-#define UI_POS_HEIGHT_REMAINING(linenum) ((int)(screen_height - ((linenum)*UI_POS_DEFAULT_HEIGHT)))
+#define UI_POS_HEIGHT_REMAINING(linenum) ((int)(screen_height - ((linenum) * UI_POS_DEFAULT_HEIGHT)))
 // remaining px from the charnum-th character to the right of the screen
-#define UI_POS_WIDTH_REMAINING(charnum) ((int)(screen_width - ((charnum)*UI_POS_DEFAULT_WIDTH)))
+#define UI_POS_WIDTH_REMAINING(charnum) ((int)(screen_width - ((charnum) * UI_POS_DEFAULT_WIDTH)))
 // px width of the screen's percent
 #define UI_POS_WIDTH_PERCENT(percent) ((int)(screen_width * (percent) / 100))
 // px width of the screen

firmware/common/ui_painter.hpp

@@ -65,7 +65,7 @@ class Widget;
 
 class Painter {
    public:
-    Painter(){};
+    Painter() {};
 
     Painter(const Painter&) = delete;
     Painter(Painter&&) = delete;

firmware/common/wm8731.hpp

@@ -343,8 +343,8 @@ class WM8731 : public audio::Codec {
         headphone_mute();
     }
 
-    void speaker_enable(){};
+    void speaker_enable() {};
-    void speaker_disable(){};
+    void speaker_disable() {};
     bool speaker_disable_supported() const override {
         return false;
     }

format-code.sh

@@ -1,2 +1,2 @@
 #!/bin/sh
-find firmware/common firmware/baseband firmware/application firmware/test/application firmware/test/baseband -iname '*.h' -o -iname '*.hpp' -o -iname '*.cpp' -o -iname '*.c' | xargs clang-format-13 -style=file -i
+find firmware/common firmware/baseband firmware/application firmware/test/application firmware/test/baseband -iname '*.h' -o -iname '*.hpp' -o -iname '*.cpp' -o -iname '*.c' | xargs clang-format-18 -style=file -i