summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/CMakeLists.txt5
-rw-r--r--src/components/alarm/AlarmController.cpp114
-rw-r--r--src/components/alarm/AlarmController.h67
-rw-r--r--src/displayapp/Apps.h1
-rw-r--r--src/displayapp/DisplayApp.cpp15
-rw-r--r--src/displayapp/DisplayApp.h3
-rw-r--r--src/displayapp/DisplayAppRecovery.cpp1
-rw-r--r--src/displayapp/DisplayAppRecovery.h2
-rw-r--r--src/displayapp/Messages.h1
-rw-r--r--src/displayapp/screens/Alarm.cpp343
-rw-r--r--src/displayapp/screens/Alarm.h65
-rw-r--r--src/displayapp/screens/ApplicationList.cpp2
-rw-r--r--src/main.cpp3
-rw-r--r--src/systemtask/Messages.h1
-rw-r--r--src/systemtask/SystemTask.cpp15
-rw-r--r--src/systemtask/SystemTask.h3
16 files changed, 1 insertions, 640 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 7d35e1a..6cef3e9 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -399,7 +399,6 @@ list(APPEND SOURCE_FILES
displayapp/screens/Notifications.cpp
displayapp/screens/List.cpp
displayapp/screens/Error.cpp
- displayapp/screens/Alarm.cpp
displayapp/screens/Styles.cpp
displayapp/Colors.cpp
@@ -447,7 +446,6 @@ list(APPEND SOURCE_FILES
components/firmwarevalidator/FirmwareValidator.cpp
components/motor/MotorController.cpp
components/settings/Settings.cpp
- components/alarm/AlarmController.cpp
drivers/Cst816s.cpp
FreeRTOS/port.c
FreeRTOS/port_cmsis_systick.c
@@ -504,7 +502,6 @@ list(APPEND RECOVERY_SOURCE_FILES
components/ble/ServiceDiscovery.cpp
components/firmwarevalidator/FirmwareValidator.cpp
components/settings/Settings.cpp
- components/alarm/AlarmController.cpp
drivers/Cst816s.cpp
FreeRTOS/port.c
FreeRTOS/port_cmsis_systick.c
@@ -565,7 +562,6 @@ set(INCLUDE_FILES
displayapp/screens/ApplicationList.h
displayapp/Apps.h
displayapp/screens/Notifications.h
- displayapp/screens/Alarm.h
displayapp/Colors.h
drivers/St7789.h
drivers/SpiNorFlash.h
@@ -599,7 +595,6 @@ set(INCLUDE_FILES
components/ble/ServiceDiscovery.h
components/ble/BleClient.h
components/settings/Settings.h
- components/alarm/AlarmController.h
drivers/Cst816s.h
FreeRTOS/portmacro.h
FreeRTOS/portmacro_cmsis.h
diff --git a/src/components/alarm/AlarmController.cpp b/src/components/alarm/AlarmController.cpp
deleted file mode 100644
index 28b328d..0000000
--- a/src/components/alarm/AlarmController.cpp
+++ /dev/null
@@ -1,114 +0,0 @@
-/* Copyright (C) 2021 mruss77, Florian
-
- This file is part of InfiniTime.
-
- InfiniTime is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published
- by the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- InfiniTime is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <https://www.gnu.org/licenses/>.
-*/
-#include "components/alarm/AlarmController.h"
-#include "systemtask/SystemTask.h"
-#include "app_timer.h"
-#include "task.h"
-#include <chrono>
-
-using namespace Pinetime::Controllers;
-using namespace std::chrono_literals;
-
-AlarmController::AlarmController(Controllers::DateTime& dateTimeController) : dateTimeController {dateTimeController} {
-}
-
-APP_TIMER_DEF(alarmAppTimer);
-
-namespace {
- void SetOffAlarm(void* p_context) {
- auto* controller = static_cast<Pinetime::Controllers::AlarmController*>(p_context);
- if (controller != nullptr) {
- controller->SetOffAlarmNow();
- }
- }
-}
-
-void AlarmController::Init(System::SystemTask* systemTask) {
- app_timer_create(&alarmAppTimer, APP_TIMER_MODE_SINGLE_SHOT, SetOffAlarm);
- this->systemTask = systemTask;
-}
-
-void AlarmController::SetAlarmTime(uint8_t alarmHr, uint8_t alarmMin) {
- hours = alarmHr;
- minutes = alarmMin;
-}
-
-void AlarmController::ScheduleAlarm() {
- // Determine the next time the alarm needs to go off and set the app_timer
- app_timer_stop(alarmAppTimer);
-
- auto now = dateTimeController.CurrentDateTime();
- alarmTime = now;
- time_t ttAlarmTime = std::chrono::system_clock::to_time_t(alarmTime);
- tm* tmAlarmTime = std::localtime(&ttAlarmTime);
-
- // If the time being set has already passed today,the alarm should be set for tomorrow
- if (hours < dateTimeController.Hours() || (hours == dateTimeController.Hours() && minutes <= dateTimeController.Minutes())) {
- tmAlarmTime->tm_mday += 1;
- // tm_wday doesn't update automatically
- tmAlarmTime->tm_wday = (tmAlarmTime->tm_wday + 1) % 7;
- }
-
- tmAlarmTime->tm_hour = hours;
- tmAlarmTime->tm_min = minutes;
- tmAlarmTime->tm_sec = 0;
-
- // if alarm is in weekday-only mode, make sure it shifts to the next weekday
- if (recurrence == RecurType::Weekdays) {
- if (tmAlarmTime->tm_wday == 0) { // Sunday, shift 1 day
- tmAlarmTime->tm_mday += 1;
- } else if (tmAlarmTime->tm_wday == 6) { // Saturday, shift 2 days
- tmAlarmTime->tm_mday += 2;
- }
- }
- tmAlarmTime->tm_isdst = -1; // use system timezone setting to determine DST
-
- // now can convert back to a time_point
- alarmTime = std::chrono::system_clock::from_time_t(std::mktime(tmAlarmTime));
- auto mSecToAlarm = std::chrono::duration_cast<std::chrono::milliseconds>(alarmTime - now).count();
- app_timer_start(alarmAppTimer, APP_TIMER_TICKS(mSecToAlarm), this);
-
- state = AlarmState::Set;
-}
-
-uint32_t AlarmController::SecondsToAlarm() {
- return std::chrono::duration_cast<std::chrono::seconds>(alarmTime - dateTimeController.CurrentDateTime()).count();
-}
-
-void AlarmController::DisableAlarm() {
- app_timer_stop(alarmAppTimer);
- state = AlarmState::Not_Set;
-}
-
-void AlarmController::SetOffAlarmNow() {
- state = AlarmState::Alerting;
- systemTask->PushMessage(System::Messages::SetOffAlarm);
-}
-
-void AlarmController::StopAlerting() {
- systemTask->PushMessage(System::Messages::StopRinging);
-
- // Alarm state is off unless this is a recurring alarm
- if (recurrence == RecurType::None) {
- state = AlarmState::Not_Set;
- } else {
- state = AlarmState::Set;
- // set next instance
- ScheduleAlarm();
- }
-}
diff --git a/src/components/alarm/AlarmController.h b/src/components/alarm/AlarmController.h
deleted file mode 100644
index f39fbde..0000000
--- a/src/components/alarm/AlarmController.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/* Copyright (C) 2021 mruss77, Florian
-
- This file is part of InfiniTime.
-
- InfiniTime is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published
- by the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- InfiniTime is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <https://www.gnu.org/licenses/>.
-*/
-#pragma once
-
-#include <cstdint>
-#include "components/datetime/DateTimeController.h"
-
-namespace Pinetime {
- namespace System {
- class SystemTask;
- }
- namespace Controllers {
- class AlarmController {
- public:
- AlarmController(Controllers::DateTime& dateTimeController);
-
- void Init(System::SystemTask* systemTask);
- void SetAlarmTime(uint8_t alarmHr, uint8_t alarmMin);
- void ScheduleAlarm();
- void DisableAlarm();
- void SetOffAlarmNow();
- uint32_t SecondsToAlarm();
- void StopAlerting();
- enum class AlarmState { Not_Set, Set, Alerting };
- enum class RecurType { None, Daily, Weekdays };
- uint8_t Hours() const {
- return hours;
- }
- uint8_t Minutes() const {
- return minutes;
- }
- AlarmState State() const {
- return state;
- }
- RecurType Recurrence() const {
- return recurrence;
- }
- void SetRecurrence(RecurType recurType) {
- recurrence = recurType;
- }
-
- private:
- Controllers::DateTime& dateTimeController;
- System::SystemTask* systemTask = nullptr;
- uint8_t hours = 7;
- uint8_t minutes = 0;
- std::chrono::time_point<std::chrono::system_clock, std::chrono::nanoseconds> alarmTime;
- AlarmState state = AlarmState::Not_Set;
- RecurType recurrence = RecurType::None;
- };
- }
-}
diff --git a/src/displayapp/Apps.h b/src/displayapp/Apps.h
index f189fc5..929cfaf 100644
--- a/src/displayapp/Apps.h
+++ b/src/displayapp/Apps.h
@@ -10,7 +10,6 @@ namespace Pinetime {
FirmwareValidation,
NotificationsPreview,
Notifications,
- Alarm,
QuickSettings,
Settings,
SettingTimeFormat,
diff --git a/src/displayapp/DisplayApp.cpp b/src/displayapp/DisplayApp.cpp
index 603d29f..5600782 100644
--- a/src/displayapp/DisplayApp.cpp
+++ b/src/displayapp/DisplayApp.cpp
@@ -1,6 +1,5 @@
#include "displayapp/DisplayApp.h"
#include <libraries/log/nrf_log.h>
-#include "displayapp/screens/Alarm.h"
#include "components/battery/BatteryController.h"
#include "components/ble/BleController.h"
#include "components/datetime/DateTimeController.h"
@@ -74,7 +73,6 @@ DisplayApp::DisplayApp(Drivers::St7789& lcd,
Controllers::Settings& settingsController,
Pinetime::Controllers::MotorController& motorController,
Pinetime::Controllers::MotionController& motionController,
- Pinetime::Controllers::AlarmController& alarmController,
Pinetime::Controllers::BrightnessController& brightnessController,
Pinetime::Controllers::TouchHandler& touchHandler)
: lcd {lcd},
@@ -88,7 +86,6 @@ DisplayApp::DisplayApp(Drivers::St7789& lcd,
settingsController {settingsController},
motorController {motorController},
motionController {motionController},
- alarmController {alarmController},
brightnessController {brightnessController},
touchHandler {touchHandler} {
}
@@ -179,14 +176,6 @@ void DisplayApp::Refresh() {
case Messages::NewNotification:
LoadApp(Apps::NotificationsPreview);
break;
- case Messages::AlarmTriggered:
- if (currentApp == Apps::Alarm) {
- auto* alarm = static_cast<Screens::Alarm*>(currentScreen.get());
- alarm->SetAlerting();
- } else {
- LoadApp(Apps::Alarm);
- }
- break;
case Messages::TouchEvent: {
if (state != States::Running) {
break;
@@ -331,10 +320,6 @@ void DisplayApp::LoadApp(Apps app) {
this, notificationManager, systemTask->nimble().alertService(), motorController, *systemTask, Screens::Notifications::Modes::Preview);
ReturnApp(Apps::Clock);
break;
- case Apps::Alarm:
- currentScreen = std::make_unique<Screens::Alarm>(this, alarmController, settingsController, *systemTask);
- break;
-
// Settings
case Apps::QuickSettings:
currentScreen = std::make_unique<Screens::QuickSettings>(
diff --git a/src/displayapp/DisplayApp.h b/src/displayapp/DisplayApp.h
index fca1cfd..ad28499 100644
--- a/src/displayapp/DisplayApp.h
+++ b/src/displayapp/DisplayApp.h
@@ -13,7 +13,6 @@
#include "components/firmwarevalidator/FirmwareValidator.h"
#include "components/settings/Settings.h"
#include "displayapp/screens/Screen.h"
-#include "components/alarm/AlarmController.h"
#include "touchhandler/TouchHandler.h"
#include "displayapp/Messages.h"
@@ -55,7 +54,6 @@ namespace Pinetime {
Controllers::Settings& settingsController,
Pinetime::Controllers::MotorController& motorController,
Pinetime::Controllers::MotionController& motionController,
- Pinetime::Controllers::AlarmController& alarmController,
Pinetime::Controllers::BrightnessController& brightnessController,
Pinetime::Controllers::TouchHandler& touchHandler);
void Start(System::BootErrors error);
@@ -78,7 +76,6 @@ namespace Pinetime {
Pinetime::Controllers::Settings& settingsController;
Pinetime::Controllers::MotorController& motorController;
Pinetime::Controllers::MotionController& motionController;
- Pinetime::Controllers::AlarmController& alarmController;
Pinetime::Controllers::BrightnessController &brightnessController;
Pinetime::Controllers::TouchHandler& touchHandler;
diff --git a/src/displayapp/DisplayAppRecovery.cpp b/src/displayapp/DisplayAppRecovery.cpp
index 4a3ddf6..a33308f 100644
--- a/src/displayapp/DisplayAppRecovery.cpp
+++ b/src/displayapp/DisplayAppRecovery.cpp
@@ -20,7 +20,6 @@ DisplayApp::DisplayApp(Drivers::St7789& lcd,
Controllers::Settings& settingsController,
Pinetime::Controllers::MotorController& motorController,
Pinetime::Controllers::MotionController& motionController,
- Pinetime::Controllers::AlarmController& alarmController,
Pinetime::Controllers::BrightnessController& brightnessController,
Pinetime::Controllers::TouchHandler& touchHandler)
: lcd {lcd}, bleController {bleController} {
diff --git a/src/displayapp/DisplayAppRecovery.h b/src/displayapp/DisplayAppRecovery.h
index b358c11..8f25cbe 100644
--- a/src/displayapp/DisplayAppRecovery.h
+++ b/src/displayapp/DisplayAppRecovery.h
@@ -32,7 +32,6 @@ namespace Pinetime {
class TouchHandler;
class MotorController;
class TimerController;
- class AlarmController;
class BrightnessController;
}
@@ -54,7 +53,6 @@ namespace Pinetime {
Controllers::Settings& settingsController,
Pinetime::Controllers::MotorController& motorController,
Pinetime::Controllers::MotionController& motionController,
- Pinetime::Controllers::AlarmController& alarmController,
Pinetime::Controllers::BrightnessController& brightnessController,
Pinetime::Controllers::TouchHandler& touchHandler);
void Start();
diff --git a/src/displayapp/Messages.h b/src/displayapp/Messages.h
index 2891d90..c27c5e5 100644
--- a/src/displayapp/Messages.h
+++ b/src/displayapp/Messages.h
@@ -18,7 +18,6 @@ namespace Pinetime {
UpdateTimeOut,
DimScreen,
RestoreBrightness,
- AlarmTriggered,
Clock,
};
}
diff --git a/src/displayapp/screens/Alarm.cpp b/src/displayapp/screens/Alarm.cpp
deleted file mode 100644
index 879e50d..0000000
--- a/src/displayapp/screens/Alarm.cpp
+++ /dev/null
@@ -1,343 +0,0 @@
-/* Copyright (C) 2021 mruss77, Florian
-
- This file is part of InfiniTime.
-
- InfiniTime is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published
- by the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- InfiniTime is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <https://www.gnu.org/licenses/>.
-*/
-#include "displayapp/screens/Alarm.h"
-#include "displayapp/screens/Screen.h"
-#include "displayapp/screens/Symbols.h"
-
-using namespace Pinetime::Applications::Screens;
-using Pinetime::Controllers::AlarmController;
-
-static void btnEventHandler(lv_obj_t* obj, lv_event_t event) {
- auto* screen = static_cast<Alarm*>(obj->user_data);
- screen->OnButtonEvent(obj, event);
-}
-
-static void StopAlarmTaskCallback(lv_task_t* task) {
- auto* screen = static_cast<Alarm*>(task->user_data);
- screen->StopAlerting();
-}
-
-Alarm::Alarm(DisplayApp* app,
- Controllers::AlarmController& alarmController,
- Pinetime::Controllers::Settings& settingsController,
- System::SystemTask& systemTask)
- : Screen(app), alarmController {alarmController}, settingsController {settingsController}, systemTask {systemTask} {
-
- time = lv_label_create(lv_scr_act(), nullptr);
- lv_obj_set_style_local_text_font(time, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &jetbrains_mono_76);
- lv_obj_set_style_local_text_color(time, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_GRAY);
-
- alarmHours = alarmController.Hours();
- alarmMinutes = alarmController.Minutes();
- lv_label_set_text_fmt(time, "%02hhu:%02hhu", alarmHours, alarmMinutes);
-
- lv_obj_align(time, lv_scr_act(), LV_ALIGN_CENTER, 0, -25);
-
- lblampm = lv_label_create(lv_scr_act(), nullptr);
- lv_obj_set_style_local_text_font(lblampm, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &jetbrains_mono_bold_20);
- lv_obj_set_style_local_text_color(lblampm, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_GRAY);
- lv_label_set_text_static(lblampm, " ");
- lv_label_set_align(lblampm, LV_LABEL_ALIGN_CENTER);
- lv_obj_align(lblampm, lv_scr_act(), LV_ALIGN_CENTER, 0, 30);
-
- btnHoursUp = lv_btn_create(lv_scr_act(), nullptr);
- btnHoursUp->user_data = this;
- lv_obj_set_event_cb(btnHoursUp, btnEventHandler);
- lv_obj_set_size(btnHoursUp, 60, 40);
- lv_obj_align(btnHoursUp, lv_scr_act(), LV_ALIGN_IN_LEFT_MID, 20, -85);
- txtHrUp = lv_label_create(btnHoursUp, nullptr);
- lv_label_set_text_static(txtHrUp, "+");
-
- btnHoursDown = lv_btn_create(lv_scr_act(), nullptr);
- btnHoursDown->user_data = this;
- lv_obj_set_event_cb(btnHoursDown, btnEventHandler);
- lv_obj_set_size(btnHoursDown, 60, 40);
- lv_obj_align(btnHoursDown, lv_scr_act(), LV_ALIGN_IN_LEFT_MID, 20, 35);
- txtHrDown = lv_label_create(btnHoursDown, nullptr);
- lv_label_set_text_static(txtHrDown, "-");
-
- btnMinutesUp = lv_btn_create(lv_scr_act(), nullptr);
- btnMinutesUp->user_data = this;
- lv_obj_set_event_cb(btnMinutesUp, btnEventHandler);
- lv_obj_set_size(btnMinutesUp, 60, 40);
- lv_obj_align(btnMinutesUp, lv_scr_act(), LV_ALIGN_IN_RIGHT_MID, -20, -85);
- txtMinUp = lv_label_create(btnMinutesUp, nullptr);
- lv_label_set_text_static(txtMinUp, "+");
-
- btnMinutesDown = lv_btn_create(lv_scr_act(), nullptr);
- btnMinutesDown->user_data = this;
- lv_obj_set_event_cb(btnMinutesDown, btnEventHandler);
- lv_obj_set_size(btnMinutesDown, 60, 40);
- lv_obj_align(btnMinutesDown, lv_scr_act(), LV_ALIGN_IN_RIGHT_MID, -20, 35);
- txtMinDown = lv_label_create(btnMinutesDown, nullptr);
- lv_label_set_text_static(txtMinDown, "-");
-
- btnStop = lv_btn_create(lv_scr_act(), nullptr);
- btnStop->user_data = this;
- lv_obj_set_event_cb(btnStop, btnEventHandler);
- lv_obj_set_size(btnStop, 115, 50);
- lv_obj_align(btnStop, lv_scr_act(), LV_ALIGN_IN_BOTTOM_LEFT, 0, 0);
- lv_obj_set_style_local_bg_color(btnStop, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_RED);
- txtStop = lv_label_create(btnStop, nullptr);
- lv_label_set_text_static(txtStop, Symbols::stop);
- lv_obj_set_hidden(btnStop, true);
-
- btnRecur = lv_btn_create(lv_scr_act(), nullptr);
- btnRecur->user_data = this;
- lv_obj_set_event_cb(btnRecur, btnEventHandler);
- lv_obj_set_size(btnRecur, 115, 50);
- lv_obj_align(btnRecur, lv_scr_act(), LV_ALIGN_IN_BOTTOM_RIGHT, 0, 0);
- txtRecur = lv_label_create(btnRecur, nullptr);
- SetRecurButtonState();
-
- btnInfo = lv_btn_create(lv_scr_act(), nullptr);
- btnInfo->user_data = this;
- lv_obj_set_event_cb(btnInfo, btnEventHandler);
- lv_obj_set_size(btnInfo, 50, 40);
- lv_obj_align(btnInfo, lv_scr_act(), LV_ALIGN_CENTER, 0, -85);
- txtInfo = lv_label_create(btnInfo, nullptr);
- lv_label_set_text_static(txtInfo, "i");
-
- enableSwitch = lv_switch_create(lv_scr_act(), nullptr);
- enableSwitch->user_data = this;
- lv_obj_set_event_cb(enableSwitch, btnEventHandler);
- lv_obj_set_size(enableSwitch, 100, 50);
- // Align to the center of 115px from edge
- lv_obj_align(enableSwitch, lv_scr_act(), LV_ALIGN_IN_BOTTOM_LEFT, 7, 0);
-
- UpdateAlarmTime();
-
- if (alarmController.State() == Controllers::AlarmController::AlarmState::Alerting) {
- SetAlerting();
- } else {
- SetSwitchState(LV_ANIM_OFF);
- }
-}
-
-Alarm::~Alarm() {
- if (alarmController.State() == AlarmController::AlarmState::Alerting) {
- StopAlerting();
- }
- lv_obj_clean(lv_scr_act());
-}
-
-void Alarm::OnButtonEvent(lv_obj_t* obj, lv_event_t event) {
- using Pinetime::Controllers::AlarmController;
- if (event == LV_EVENT_CLICKED) {
- if (obj == btnStop) {
- StopAlerting();
- return;
- }
- if (obj == btnInfo) {
- ShowInfo();
- return;
- }
- if (obj == btnMessage) {
- HideInfo();
- return;
- }
- if (obj == enableSwitch) {
- if (lv_switch_get_state(enableSwitch)) {
- alarmController.ScheduleAlarm();
- } else {
- alarmController.DisableAlarm();
- }
- return;
- }
- // If any other button was pressed, disable the alarm
- // this is to make it clear that the alarm won't be set until it is turned back on
- if (alarmController.State() == AlarmController::AlarmState::Set) {
- alarmController.DisableAlarm();
- lv_switch_off(enableSwitch, LV_ANIM_ON);
- }
- if (obj == btnMinutesUp) {
- if (alarmMinutes >= 59) {
- alarmMinutes = 0;
- } else {
- alarmMinutes++;
- }
- UpdateAlarmTime();
- return;
- }
- if (obj == btnMinutesDown) {
- if (alarmMinutes == 0) {
- alarmMinutes = 59;
- } else {
- alarmMinutes--;
- }
- UpdateAlarmTime();
- return;
- }
- if (obj == btnHoursUp) {
- if (alarmHours >= 23) {
- alarmHours = 0;
- } else {
- alarmHours++;
- }
- UpdateAlarmTime();
- return;
- }
- if (obj == btnHoursDown) {
- if (alarmHours == 0) {
- alarmHours = 23;
- } else {
- alarmHours--;
- }
- UpdateAlarmTime();
- return;
- }
- if (obj == btnRecur) {
- ToggleRecurrence();
- }
- }
-}
-
-bool Alarm::OnButtonPushed() {
- if (txtMessage != nullptr && btnMessage != nullptr) {
- HideInfo();
- return true;
- }
- if (alarmController.State() == AlarmController::AlarmState::Alerting) {
- StopAlerting();
- return true;
- }
- return false;
-}
-
-bool Alarm::OnTouchEvent(Pinetime::Applications::TouchEvents event) {
- // Don't allow closing the screen by swiping while the alarm is alerting
- return alarmController.State() == AlarmController::AlarmState::Alerting && event == TouchEvents::SwipeDown;
-}
-
-void Alarm::UpdateAlarmTime() {
- if (settingsController.GetClockType() == Controllers::Settings::ClockType::H12) {
- switch (alarmHours) {
- case 0:
- lv_label_set_text_static(lblampm, "AM");
- lv_label_set_text_fmt(time, "%02d:%02d", 12, alarmMinutes);
- break;
- case 1 ... 11:
- lv_label_set_text_static(lblampm, "AM");
- lv_label_set_text_fmt(time, "%02d:%02d", alarmHours, alarmMinutes);
- break;
- case 12:
- lv_label_set_text_static(lblampm, "PM");
- lv_label_set_text_fmt(time, "%02d:%02d", 12, alarmMinutes);
- break;
- case 13 ... 23:
- lv_label_set_text_static(lblampm, "PM");
- lv_label_set_text_fmt(time, "%02d:%02d", alarmHours - 12, alarmMinutes);
- break;
- }
- } else {
- lv_label_set_text_fmt(time, "%02d:%02d", alarmHours, alarmMinutes);
- }
- alarmController.SetAlarmTime(alarmHours, alarmMinutes);
-}
-
-void Alarm::SetAlerting() {
- lv_obj_set_hidden(enableSwitch, true);
- lv_obj_set_hidden(btnStop, false);
- taskStopAlarm = lv_task_create(StopAlarmTaskCallback, pdMS_TO_TICKS(60 * 1000), LV_TASK_PRIO_MID, this);
- systemTask.PushMessage(System::Messages::DisableSleeping);
-}
-
-void Alarm::StopAlerting() {
- alarmController.StopAlerting();
- SetSwitchState(LV_ANIM_OFF);
- if (taskStopAlarm != nullptr) {
- lv_task_del(taskStopAlarm);
- taskStopAlarm = nullptr;
- }
- systemTask.PushMessage(System::Messages::EnableSleeping);
- lv_obj_set_hidden(enableSwitch, false);
- lv_obj_set_hidden(btnStop, true);
-}
-
-void Alarm::SetSwitchState(lv_anim_enable_t anim) {
- switch (alarmController.State()) {
- case AlarmController::AlarmState::Set:
- lv_switch_on(enableSwitch, anim);
- break;
- case AlarmController::AlarmState::Not_Set:
- lv_switch_off(enableSwitch, anim);
- break;
- default:
- break;
- }
-}
-
-void Alarm::ShowInfo() {
- btnMessage = lv_btn_create(lv_scr_act(), nullptr);
- btnMessage->user_data = this;
- lv_obj_set_event_cb(btnMessage, btnEventHandler);
- lv_obj_set_height(btnMessage, 200);
- lv_obj_set_width(btnMessage, 150);
- lv_obj_align(btnMessage, lv_scr_act(), LV_ALIGN_CENTER, 0, 0);
- txtMessage = lv_label_create(btnMessage, nullptr);
- lv_obj_set_style_local_bg_color(btnMessage, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_NAVY);
-
- if (alarmController.State() == AlarmController::AlarmState::Set) {
- auto timeToAlarm = alarmController.SecondsToAlarm();
-
- auto daysToAlarm = timeToAlarm / 86400;
- auto hrsToAlarm = (timeToAlarm % 86400) / 3600;
- auto minToAlarm = (timeToAlarm % 3600) / 60;
- auto secToAlarm = timeToAlarm % 60;
-
- lv_label_set_text_fmt(
- txtMessage, "Time to\nalarm:\n%2lu Days\n%2lu Hours\n%2lu Minutes\n%2lu Seconds", daysToAlarm, hrsToAlarm, minToAlarm, secToAlarm);
- } else {
- lv_label_set_text(txtMessage, "Alarm\nis not\nset.");
- }
-}
-
-void Alarm::HideInfo() {
- lv_obj_del(btnMessage);
- txtMessage = nullptr;
- btnMessage = nullptr;
-}
-
-void Alarm::SetRecurButtonState() {
- using Pinetime::Controllers::AlarmController;
- switch (alarmController.Recurrence()) {
- case AlarmController::RecurType::None:
- lv_label_set_text(txtRecur, "ONCE");
- break;
- case AlarmController::RecurType::Daily:
- lv_label_set_text(txtRecur, "DAILY");
- break;
- case AlarmController::RecurType::Weekdays:
- lv_label_set_text(txtRecur, "MON-FRI");
- }
-}
-
-void Alarm::ToggleRecurrence() {
- using Pinetime::Controllers::AlarmController;
- switch (alarmController.Recurrence()) {
- case AlarmController::RecurType::None:
- alarmController.SetRecurrence(AlarmController::RecurType::Daily);
- break;
- case AlarmController::RecurType::Daily:
- alarmController.SetRecurrence(AlarmController::RecurType::Weekdays);
- break;
- case AlarmController::RecurType::Weekdays:
- alarmController.SetRecurrence(AlarmController::RecurType::None);
- }
- SetRecurButtonState();
-}
diff --git a/src/displayapp/screens/Alarm.h b/src/displayapp/screens/Alarm.h
deleted file mode 100644
index f74dd68..0000000
--- a/src/displayapp/screens/Alarm.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/* Copyright (C) 2021 mruss77, Florian
-
- This file is part of InfiniTime.
-
- InfiniTime is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published
- by the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- InfiniTime is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <https://www.gnu.org/licenses/>.
-*/
-#pragma once
-
-#include "displayapp/screens/Screen.h"
-#include "systemtask/SystemTask.h"
-#include "displayapp/LittleVgl.h"
-#include "components/alarm/AlarmController.h"
-
-namespace Pinetime {
- namespace Applications {
- namespace Screens {
- class Alarm : public Screen {
- public:
- Alarm(DisplayApp* app,
- Controllers::AlarmController& alarmController,
- Pinetime::Controllers::Settings& settingsController,
- System::SystemTask& systemTask);
- ~Alarm() override;
- void SetAlerting();
- void OnButtonEvent(lv_obj_t* obj, lv_event_t event);
- bool OnButtonPushed() override;
- bool OnTouchEvent(TouchEvents event) override;
- void StopAlerting();
-
- private:
- uint8_t alarmHours;
- uint8_t alarmMinutes;
- Controllers::AlarmController& alarmController;
- Controllers::Settings& settingsController;
- System::SystemTask& systemTask;
-
- lv_obj_t *time, *lblampm, *btnStop, *txtStop, *btnMinutesUp, *btnMinutesDown, *btnHoursUp, *btnHoursDown, *txtMinUp,
- *txtMinDown, *txtHrUp, *txtHrDown, *btnRecur, *txtRecur, *btnInfo, *txtInfo, *enableSwitch;
- lv_obj_t* txtMessage = nullptr;
- lv_obj_t* btnMessage = nullptr;
- lv_task_t* taskStopAlarm = nullptr;
-
- enum class EnableButtonState { On, Off, Alerting };
- void SetRecurButtonState();
- void SetSwitchState(lv_anim_enable_t anim);
- void SetAlarm();
- void ShowInfo();
- void HideInfo();
- void ToggleRecurrence();
- void UpdateAlarmTime();
- };
- };
- };
-}
diff --git a/src/displayapp/screens/ApplicationList.cpp b/src/displayapp/screens/ApplicationList.cpp
index 5daafd1..b7c8ebd 100644
--- a/src/displayapp/screens/ApplicationList.cpp
+++ b/src/displayapp/screens/ApplicationList.cpp
@@ -36,7 +36,7 @@ bool ApplicationList::OnTouchEvent(Pinetime::Applications::TouchEvents event) {
std::unique_ptr<Screen> ApplicationList::CreateScreen1() {
std::array<Screens::Tile::Applications, 6> applications {{
- {Symbols::clock, Apps::Alarm},
+ {Symbols::clock},
}};
return std::make_unique<Screens::Tile>(0, 1, app, settingsController, batteryController, dateTimeController, applications);
diff --git a/src/main.cpp b/src/main.cpp
index 062e64c..8022595 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -103,7 +103,6 @@ Pinetime::Drivers::Watchdog watchdog;
Pinetime::Drivers::WatchdogView watchdogView(watchdog);
Pinetime::Controllers::NotificationManager notificationManager;
Pinetime::Controllers::MotionController motionController;
-Pinetime::Controllers::AlarmController alarmController {dateTimeController};
Pinetime::Controllers::TouchHandler touchHandler(touchPanel, lvgl);
Pinetime::Controllers::ButtonHandler buttonHandler;
Pinetime::Controllers::BrightnessController brightnessController {};
@@ -119,7 +118,6 @@ Pinetime::Applications::DisplayApp displayApp(lcd,
settingsController,
motorController,
motionController,
- alarmController,
brightnessController,
touchHandler);
@@ -132,7 +130,6 @@ Pinetime::System::SystemTask systemTask(spi,
batteryController,
bleController,
dateTimeController,
- alarmController,
watchdog,
notificationManager,
motorController,
diff --git a/src/systemtask/Messages.h b/src/systemtask/Messages.h
index 20af7d3..4e818d0 100644
--- a/src/systemtask/Messages.h
+++ b/src/systemtask/Messages.h
@@ -23,7 +23,6 @@ namespace Pinetime {
OnNewHour,
OnNewHalfHour,
OnChargingEvent,
- SetOffAlarm,
StopRinging,
MeasureBatteryTimerExpired,
BatteryPercentageUpdated,
diff --git a/src/systemtask/SystemTask.cpp b/src/systemtask/SystemTask.cpp
index c1f178f..68fc8f0 100644
--- a/src/systemtask/SystemTask.cpp
+++ b/src/systemtask/SystemTask.cpp
@@ -55,7 +55,6 @@ SystemTask::SystemTask(Drivers::SpiMaster& spi,
Controllers::Battery& batteryController,
Controllers::Ble& bleController,
Controllers::DateTime& dateTimeController,
- Controllers::AlarmController& alarmController,
Drivers::Watchdog& watchdog,
Pinetime::Controllers::NotificationManager& notificationManager,
Pinetime::Controllers::MotorController& motorController,
@@ -74,7 +73,6 @@ SystemTask::SystemTask(Drivers::SpiMaster& spi,
batteryController {batteryController},
bleController {bleController},
dateTimeController {dateTimeController},
- alarmController {alarmController},
watchdog {watchdog},
notificationManager {notificationManager},
motorController {motorController},
@@ -134,7 +132,6 @@ void SystemTask::Work() {
batteryController.Register(this);
motorController.Init();
motionSensor.SoftReset();
- alarmController.Init(this);
// Reset the TWI device because the motion sensor chip most probably crashed it...
twiMaster.Sleep();
@@ -263,9 +260,6 @@ void SystemTask::Work() {
case Messages::OnNewTime:
ReloadIdleTimer();
displayApp.PushMessage(Pinetime::Applications::Display::Messages::UpdateDateTime);
- if (alarmController.State() == Controllers::AlarmController::AlarmState::Set) {
- alarmController.ScheduleAlarm();
- }
break;
case Messages::OnNewNotification:
if (settingsController.GetNotificationStatus() == Pinetime::Controllers::Settings::Notification::ON) {
@@ -277,13 +271,6 @@ void SystemTask::Work() {
displayApp.PushMessage(Pinetime::Applications::Display::Messages::NewNotification);
}
break;
- case Messages::SetOffAlarm:
- if (isSleeping && !isWakingUp) {
- GoToRunning();
- }
- motorController.StartRinging();
- displayApp.PushMessage(Pinetime::Applications::Display::Messages::AlarmTriggered);
- break;
case Messages::StopRinging:
motorController.StopRinging();
break;
@@ -355,10 +342,8 @@ void SystemTask::Work() {
stepCounterMustBeReset = true;
break;
case Messages::OnNewHour:
- using Pinetime::Controllers::AlarmController;
break;
case Messages::OnNewHalfHour:
- using Pinetime::Controllers::AlarmController;
break;
case Messages::OnChargingEvent:
batteryController.ReadPowerState();
diff --git a/src/systemtask/SystemTask.h b/src/systemtask/SystemTask.h
index 8fc48f1..600d13e 100644
--- a/src/systemtask/SystemTask.h
+++ b/src/systemtask/SystemTask.h
@@ -15,7 +15,6 @@
#include "components/ble/NimbleController.h"
#include "components/ble/NotificationManager.h"
#include "components/motor/MotorController.h"
-#include "components/alarm/AlarmController.h"
#include "touchhandler/TouchHandler.h"
#include "buttonhandler/ButtonHandler.h"
#include "buttonhandler/ButtonActions.h"
@@ -58,7 +57,6 @@ namespace Pinetime {
Controllers::Battery& batteryController,
Controllers::Ble& bleController,
Controllers::DateTime& dateTimeController,
- Controllers::AlarmController& alarmController,
Drivers::Watchdog& watchdog,
Pinetime::Controllers::NotificationManager& notificationManager,
Pinetime::Controllers::MotorController& motorController,
@@ -98,7 +96,6 @@ namespace Pinetime {
Pinetime::Controllers::Ble& bleController;
Pinetime::Controllers::DateTime& dateTimeController;
- Pinetime::Controllers::AlarmController& alarmController;
QueueHandle_t systemTasksMsgQueue;
std::atomic<bool> isSleeping {false};
std::atomic<bool> isGoingToSleep {false};
generated by cgit v0.10.2 at 2026-01-09 05:11:24 (GMT)