diff options
| -rw-r--r-- | src/components/datetime/DateTimeController.cpp | 6 | ||||
| -rw-r--r-- | src/displayapp/screens/settings/SettingChimes.cpp | 2 | ||||
| -rw-r--r-- | src/systemtask/Messages.h | 2 | ||||
| -rw-r--r-- | src/systemtask/SystemTask.cpp | 10 |
4 files changed, 9 insertions, 11 deletions
diff --git a/src/components/datetime/DateTimeController.cpp b/src/components/datetime/DateTimeController.cpp index 8605176..8bf5fb9 100644 --- a/src/components/datetime/DateTimeController.cpp +++ b/src/components/datetime/DateTimeController.cpp @@ -89,12 +89,12 @@ void DateTime::UpdateTime(uint32_t systickCounter) { isHourAlreadyNotified = false; } - if ((!(minute%12)) && !isHalfHourAlreadyNotified) { + if ((!(minute%5)) && !isHalfHourAlreadyNotified) { isHalfHourAlreadyNotified = true; if (systemTask != nullptr) { - systemTask->PushMessage(System::Messages::OnNewHalfHour); + systemTask->PushMessage(System::Messages::OnChime); } - } else if (!!(minute%12)) { + } else if (!!(minute%5)) { isHalfHourAlreadyNotified = false; } diff --git a/src/displayapp/screens/settings/SettingChimes.cpp b/src/displayapp/screens/settings/SettingChimes.cpp index 543b5e0..2a39eef 100644 --- a/src/displayapp/screens/settings/SettingChimes.cpp +++ b/src/displayapp/screens/settings/SettingChimes.cpp @@ -62,7 +62,7 @@ SettingChimes::SettingChimes(Pinetime::Applications::DisplayApp* app, Pinetime:: optionsTotal++; cbOption[optionsTotal] = lv_checkbox_create(container1, nullptr); - lv_checkbox_set_text_static(cbOption[optionsTotal], " Every 30 mins"); + lv_checkbox_set_text_static(cbOption[optionsTotal], " Every 5 mins"); cbOption[optionsTotal]->user_data = this; lv_obj_set_event_cb(cbOption[optionsTotal], event_handler); SetRadioButtonStyle(cbOption[optionsTotal]); diff --git a/src/systemtask/Messages.h b/src/systemtask/Messages.h index 4e818d0..c2a18e2 100644 --- a/src/systemtask/Messages.h +++ b/src/systemtask/Messages.h @@ -21,7 +21,7 @@ namespace Pinetime { DisableSleeping, OnNewDay, OnNewHour, - OnNewHalfHour, + OnChime, OnChargingEvent, StopRinging, MeasureBatteryTimerExpired, diff --git a/src/systemtask/SystemTask.cpp b/src/systemtask/SystemTask.cpp index f357d61..7a0d151 100644 --- a/src/systemtask/SystemTask.cpp +++ b/src/systemtask/SystemTask.cpp @@ -343,23 +343,21 @@ void SystemTask::Work() { stepCounterMustBeReset = true; break; case Messages::OnNewHour: - using Pinetime::Controllers::AlarmController; if (settingsController.GetChimeOption() == Controllers::Settings::ChimesOption::Hours) { if (isSleeping && !isWakingUp) { GoToRunning(); displayApp.PushMessage(Pinetime::Applications::Display::Messages::Clock); } - motorController.RunForDuration(30); + motorController.RunForDuration(22); } break; - case Messages::OnNewHalfHour: - using Pinetime::Controllers::AlarmController; + case Messages::OnChime: if (settingsController.GetChimeOption() == Controllers::Settings::ChimesOption::HalfHours) { - if (isSleeping && !isWakingUp) { + if (false && isSleeping && !isWakingUp) { GoToRunning(); displayApp.PushMessage(Pinetime::Applications::Display::Messages::Clock); } - motorController.RunForDuration(10); + motorController.RunForDuration(11); } break; case Messages::OnChargingEvent: |