summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRiku Isokoski <riksu9000@gmail.com>2022-05-08 19:21:10 (GMT)
committerRiku Isokoski <riksu9000@gmail.com>2022-05-08 19:27:42 (GMT)
commit09b852d8f0c4d66327ca402ee50dc36c5453b748 (patch)
treeb09ffde2d2e761693c36696bce73090f40c2cb46
parentc94e0d53bbb0612b11d1d8d06ebcedc242ed45c0 (diff)
Fix and test workflow
-rw-r--r--src/systemtask/SystemTask.cpp4
-rwxr-xr-xtests/test-format.sh2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/systemtask/SystemTask.cpp b/src/systemtask/SystemTask.cpp
index e54ebcc..a429c42 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 ed20a4f..7196e26 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