Fix and test workflow

This commit is contained in:
Riku Isokoski 2022-05-08 22:21:10 +03:00
parent c94e0d53bb
commit 09b852d8f0
2 changed files with 3 additions and 3 deletions

View File

@ -442,7 +442,7 @@ void SystemTask::Work() {
displayApp.PushMessage(Pinetime::Applications::Display::Messages::ShowPairingKey); displayApp.PushMessage(Pinetime::Applications::Display::Messages::ShowPairingKey);
break; break;
case Messages::BleRadioEnableToggle: case Messages::BleRadioEnableToggle:
if(settingsController.GetBleRadioEnabled()) { if (settingsController.GetBleRadioEnabled()) {
nimbleController.EnableRadio(); nimbleController.EnableRadio();
} else { } else {
nimbleController.DisableRadio(); nimbleController.DisableRadio();
@ -481,7 +481,7 @@ void SystemTask::UpdateMotion() {
} }
if (state == SystemTaskState::Sleeping && !(settingsController.isWakeUpModeOn(Pinetime::Controllers::Settings::WakeUpMode::RaiseWrist) || 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; return;
} }

View File

@ -17,7 +17,7 @@ do
*.cpp|*.h) *.cpp|*.h)
echo Checking "$file" echo Checking "$file"
clang-format -i "$file" clang-format -i "$file"
if ! git diff --quiet "$basebranch"...HEAD if ! git diff --quiet
then then
printf "\033[31mError:\033[0m Formatting error in %s\n" "$file" printf "\033[31mError:\033[0m Formatting error in %s\n" "$file"
CHANGED=1 CHANGED=1