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/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/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/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/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/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/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;
     }

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