Upgrade to clang-format 17 (#364)

catsystems · Oct 29, 2023 · 1fe3520 · 1fe3520
1 parent dfb9dd8
commit 1fe3520
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 6 deletions.
diff --git a/.clang-format b/.clang-format
@@ -179,5 +179,6 @@ WhitespaceSensitiveMacros:
   - STRINGIZE
   - PP_STRINGIZE
   - BOOST_PP_STRINGIZE
+InsertNewlineAtEOF: true 
 ...
 
diff --git a/.github/workflows/merge-criteria.yml b/.github/workflows/merge-criteria.yml
@@ -63,7 +63,7 @@ jobs:
     - name: Run clang-format
       uses: jidicula/[email protected]
       with:
-        clang-format-version: '13'
+        clang-format-version: '17'
         check-path: '${{ matrix.project }}/src'
         exclude-regex: '(lib|telemetry/src/st|ground_station/src/format)'
 

diff --git a/flight_computer/src/cli/cli.cpp b/flight_computer/src/cli/cli.cpp
@@ -466,4 +466,4 @@ void cli_print_var_range(const cli_value_t *var) {
       cli_print_linef("Allowed values: OFF, ON");
     } break;
   }
-}
+}
diff --git a/flight_computer/src/config/globals.cpp b/flight_computer/src/config/globals.cpp
@@ -41,4 +41,4 @@ volatile recorder_status_e global_recorder_status = REC_OFF;
 event_action_map_elem_t* event_action_map = nullptr;
 
 char telemetry_code_version[20] = {};
-// NOLINTEND(cppcoreguidelines-avoid-non-const-global-variables)
+// NOLINTEND(cppcoreguidelines-avoid-non-const-global-variables)
diff --git a/flight_computer/src/control/orientation_filter.cpp b/flight_computer/src/control/orientation_filter.cpp
@@ -42,4 +42,4 @@ void quaternion_kinematics(orientation_filter_t* filter, vf32_t angular_vel) {
 
   /* Normalize Prediction */
   normalize_q(filter->estimate_data);
-}
+}
diff --git a/ground_station/src/hmi/bmp.hpp b/ground_station/src/hmi/bmp.hpp
@@ -561,4 +561,4 @@ const unsigned char usb_logo[] PROGMEM = {
     0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
diff --git a/ground_station/src/utils.cpp b/ground_station/src/utils.cpp
@@ -296,4 +296,4 @@ DRESULT disk_ioctl(BYTE pdrv,  // Physical drive nmuber (0..)
       return RES_PARERR;
   }
 }
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -466,4 +466,4 @@ void cli_print_var_range(const cli_value_t *var) { @@
           cli_print_linef("Allowed values: OFF, ON");
         } break;
       }
-    }
+    }