From 09b852d8f0c4d66327ca402ee50dc36c5453b748 Mon Sep 17 00:00:00 2001 From: Riku Isokoski Date: Sun, 8 May 2022 22:21:10 +0300 Subject: [PATCH] Fix and test workflow --- src/systemtask/SystemTask.cpp | 4 ++-- tests/test-format.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/systemtask/SystemTask.cpp b/src/systemtask/SystemTask.cpp index e54ebccb..a429c42e 100644 --- a/src/systemtask/SystemTask.cpp +++ b/src/systemtask/SystemTask.cpp @@ -442,7 +442,7 @@ void SystemTask::Work() { displayApp.PushMessage(Pinetime::Applications::Display::Messages::ShowPairingKey); break; case Messages::BleRadioEnableToggle: - if(settingsController.GetBleRadioEnabled()) { + if (settingsController.GetBleRadioEnabled()) { nimbleController.EnableRadio(); } else { nimbleController.DisableRadio(); @@ -481,7 +481,7 @@ void SystemTask::UpdateMotion() { } if (state == SystemTaskState::Sleeping && !(settingsController.isWakeUpModeOn(Pinetime::Controllers::Settings::WakeUpMode::RaiseWrist) || - settingsController.isWakeUpModeOn(Pinetime::Controllers::Settings::WakeUpMode::Shake))) { + settingsController.isWakeUpModeOn(Pinetime::Controllers::Settings::WakeUpMode::Shake))) { return; } diff --git a/tests/test-format.sh b/tests/test-format.sh index ed20a4f2..7196e260 100755 --- a/tests/test-format.sh +++ b/tests/test-format.sh @@ -17,7 +17,7 @@ do *.cpp|*.h) echo Checking "$file" clang-format -i "$file" - if ! git diff --quiet "$basebranch"...HEAD + if ! git diff --quiet then printf "\033[31mError:\033[0m Formatting error in %s\n" "$file" CHANGED=1