Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

👷 (linters): Upgrade clang-format to v15 #1371

Merged
merged 2 commits into from
Feb 1, 2024
Merged

👷 (linters): Upgrade clang-format to v15 #1371

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9b451be
:construction_worker: (linters): Upgrade to clang-format-17
ladislas Feb 1, 2024
52e6163
:art: (format): Format files w/ clang-format-17
ladislas Feb 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion .github/workflows/ci-linters.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
20 changes: 8 additions & 12 deletions libs/IMUKit/tests/IMUKit_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand All @@ -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);

Expand All @@ -101,19 +99,17 @@ 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);

const auto angles_initial = imukit.getEulerAngles();

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);

Expand Down
18 changes: 9 additions & 9 deletions tests/unit/headers/mbed/PinNamesTypes.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
Loading