From 9b451be7586e303285ce9b81e7980b82a8228d8f Mon Sep 17 00:00:00 2001 From: Ladislas de Toldi Date: Thu, 1 Feb 2024 12:29:04 +0100 Subject: [PATCH 1/2] :construction_worker: (linters): Upgrade to clang-format-17 --- .github/workflows/ci-linters.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci-linters.yml b/.github/workflows/ci-linters.yml index a722b2a1c7..fa4d250f99 100644 --- a/.github/workflows/ci-linters.yml +++ b/.github/workflows/ci-linters.yml @@ -15,6 +15,14 @@ jobs: with: fetch-depth: 2 + - name: Install clang-format 17 + run: | + wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add - + sudo apt-add-repository "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-17 main" + sudo apt update -y + sudo apt install -y --no-install-recommends clang-format-17 + clang-format-17 --version + - name: Run clang-format run: | - python3 tools/run-clang-format.py --clang-format-executable=clang-format-14 -r --extension=h,hpp,c,cpp --color=always --style=file ./app ./drivers ./libs ./spikes ./tests + python3 tools/run-clang-format.py --clang-format-executable=clang-format-17 -r --extension=h,hpp,c,cpp --color=always --style=file ./app ./drivers ./libs ./spikes ./tests From 52e6163ea3b4d553e22b0edcb714af270c483f0a Mon Sep 17 00:00:00 2001 From: Ladislas de Toldi Date: Thu, 1 Feb 2024 12:31:06 +0100 Subject: [PATCH 2/2] :art: (format): Format files w/ clang-format-17 --- libs/IMUKit/tests/IMUKit_test.cpp | 20 ++++++++------------ tests/unit/headers/mbed/PinNamesTypes.h | 18 +++++++++--------- 2 files changed, 17 insertions(+), 21 deletions(-) diff --git a/libs/IMUKit/tests/IMUKit_test.cpp b/libs/IMUKit/tests/IMUKit_test.cpp index 242bc8a86c..04b1692468 100644 --- a/libs/IMUKit/tests/IMUKit_test.cpp +++ b/libs/IMUKit/tests/IMUKit_test.cpp @@ -70,9 +70,8 @@ TEST_F(IMUKitTest, onDataReady) imukit.onEulerAnglesReady(mock_callback.AsStdFunction()); - const auto data_initial = interface::LSM6DSOX::SensorData { - .xl = {.x = 0.F, .y = 0.F, .z = 0.F}, .gy = {.x = 0.F, .y = 0.F, .z = 0.F } - }; + const auto data_initial = + interface::LSM6DSOX::SensorData {.xl = {.x = 0.F, .y = 0.F, .z = 0.F}, .gy = {.x = 0.F, .y = 0.F, .z = 0.F}}; EXPECT_CALL(mock_callback, Call); @@ -82,9 +81,8 @@ TEST_F(IMUKitTest, onDataReady) spy_kernel_addElapsedTimeToTickCount(80ms); - const auto data_updated = interface::LSM6DSOX::SensorData { - .xl = {.x = 1.F, .y = 2.F, .z = 3.F}, .gy = {.x = 1.F, .y = 2.F, .z = 3.F } - }; + const auto data_updated = + interface::LSM6DSOX::SensorData {.xl = {.x = 1.F, .y = 2.F, .z = 3.F}, .gy = {.x = 1.F, .y = 2.F, .z = 3.F}}; EXPECT_CALL(mock_callback, Call); @@ -101,9 +99,8 @@ TEST_F(IMUKitTest, onDataReadyEmptyEulerAngleCallback) { imukit.onEulerAnglesReady({}); - const auto data_initial = interface::LSM6DSOX::SensorData { - .xl = {.x = 0.F, .y = 0.F, .z = 0.F}, .gy = {.x = 0.F, .y = 0.F, .z = 0.F } - }; + const auto data_initial = + interface::LSM6DSOX::SensorData {.xl = {.x = 0.F, .y = 0.F, .z = 0.F}, .gy = {.x = 0.F, .y = 0.F, .z = 0.F}}; mock_lsm6dox.call_drdy_callback(data_initial); @@ -111,9 +108,8 @@ TEST_F(IMUKitTest, onDataReadyEmptyEulerAngleCallback) spy_kernel_addElapsedTimeToTickCount(80ms); - const auto data_updated = interface::LSM6DSOX::SensorData { - .xl = {.x = 1.F, .y = 2.F, .z = 3.F}, .gy = {.x = 1.F, .y = 2.F, .z = 3.F } - }; + const auto data_updated = + interface::LSM6DSOX::SensorData {.xl = {.x = 1.F, .y = 2.F, .z = 3.F}, .gy = {.x = 1.F, .y = 2.F, .z = 3.F}}; mock_lsm6dox.call_drdy_callback(data_updated); diff --git a/tests/unit/headers/mbed/PinNamesTypes.h b/tests/unit/headers/mbed/PinNamesTypes.h index 26075bf272..83afd82ac5 100644 --- a/tests/unit/headers/mbed/PinNamesTypes.h +++ b/tests/unit/headers/mbed/PinNamesTypes.h @@ -93,21 +93,21 @@ extern "C" { #define STM_PIN_DEFINE(FUNC_OD, PUPD, AFNUM) \ ((int)(FUNC_OD) | ((STM_PIN_SPEED_MASK & STM_PIN_SPEED_MASK) << STM_PIN_SPEED_SHIFT) | \ - (((PUPD)&STM_PIN_PUPD_MASK) << STM_PIN_PUPD_SHIFT) | (((AFNUM)&STM_PIN_AFNUM_MASK) << STM_PIN_AFNUM_SHIFT)) + (((PUPD) & STM_PIN_PUPD_MASK) << STM_PIN_PUPD_SHIFT) | (((AFNUM) & STM_PIN_AFNUM_MASK) << STM_PIN_AFNUM_SHIFT)) #define STM_PIN_DEFINE_SPEED(FUNC_OD, PUPD, AFNUM, SPEEDV) \ - ((int)(FUNC_OD) | (((SPEEDV)&STM_PIN_SPEED_MASK) << STM_PIN_SPEED_SHIFT) | \ - (((PUPD)&STM_PIN_PUPD_MASK) << STM_PIN_PUPD_SHIFT) | (((AFNUM)&STM_PIN_AFNUM_MASK) << STM_PIN_AFNUM_SHIFT)) + ((int)(FUNC_OD) | (((SPEEDV) & STM_PIN_SPEED_MASK) << STM_PIN_SPEED_SHIFT) | \ + (((PUPD) & STM_PIN_PUPD_MASK) << STM_PIN_PUPD_SHIFT) | (((AFNUM) & STM_PIN_AFNUM_MASK) << STM_PIN_AFNUM_SHIFT)) #define STM_PIN_DEFINE_EXT(FUNC_OD, PUPD, AFNUM, CHAN, INV) \ ((int)(FUNC_OD) | ((STM_PIN_SPEED_MASK & STM_PIN_SPEED_MASK) << STM_PIN_SPEED_SHIFT) | \ - (((PUPD)&STM_PIN_PUPD_MASK) << STM_PIN_PUPD_SHIFT) | (((AFNUM)&STM_PIN_AFNUM_MASK) << STM_PIN_AFNUM_SHIFT) | \ - (((CHAN)&STM_PIN_CHAN_MASK) << STM_PIN_CHAN_SHIFT) | (((INV)&STM_PIN_INV_MASK) << STM_PIN_INV_SHIFT)) + (((PUPD) & STM_PIN_PUPD_MASK) << STM_PIN_PUPD_SHIFT) | (((AFNUM) & STM_PIN_AFNUM_MASK) << STM_PIN_AFNUM_SHIFT) | \ + (((CHAN) & STM_PIN_CHAN_MASK) << STM_PIN_CHAN_SHIFT) | (((INV) & STM_PIN_INV_MASK) << STM_PIN_INV_SHIFT)) #define STM_PIN_DEFINE_SPEED_EXT(FUNC_OD, PUPD, AFNUM, CHAN, INV, SPEEDV) \ - ((int)(FUNC_OD) | (((SPEEDV)&STM_PIN_SPEED_MASK) << STM_PIN_SPEED_SHIFT) | \ - (((PUPD)&STM_PIN_PUPD_MASK) << STM_PIN_PUPD_SHIFT) | (((AFNUM)&STM_PIN_AFNUM_MASK) << STM_PIN_AFNUM_SHIFT) | \ - (((CHAN)&STM_PIN_CHAN_MASK) << STM_PIN_CHAN_SHIFT) | (((INV)&STM_PIN_INV_MASK) << STM_PIN_INV_SHIFT)) + ((int)(FUNC_OD) | (((SPEEDV) & STM_PIN_SPEED_MASK) << STM_PIN_SPEED_SHIFT) | \ + (((PUPD) & STM_PIN_PUPD_MASK) << STM_PIN_PUPD_SHIFT) | (((AFNUM) & STM_PIN_AFNUM_MASK) << STM_PIN_AFNUM_SHIFT) | \ + (((CHAN) & STM_PIN_CHAN_MASK) << STM_PIN_CHAN_SHIFT) | (((INV) & STM_PIN_INV_MASK) << STM_PIN_INV_SHIFT)) /* * MACROS to support the legacy definition of PIN formats @@ -137,7 +137,7 @@ typedef enum // High nibble = port number (0=A, 1=B, 2=C, 3=D, 4=E, 5=F, 6=G, 7=H) // Low nibble = pin number #define STM_PORT(X) (((uint32_t)(X) >> 4) & 0xF) -#define STM_PIN(X) ((uint32_t)(X)&0xF) +#define STM_PIN(X) ((uint32_t)(X) & 0xF) /* Defines to be used by application */ typedef enum