Skip to content

Alarm: Add button to set alarm time to current time #2333

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tituscmd wants to merge 12 commits into
base: main
Choose a base branch
from
Open

Alarm: Add button to set alarm time to current time #2333

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
c73f016
Merge pull request #26 from InfiniTimeOrg/main
tituscmd Jan 21, 2025
ec4b3a7
Merge branch 'InfiniTimeOrg:main' into main
tituscmd Apr 10, 2025
d653c17
Merge branch 'InfiniTimeOrg:main' into main
tituscmd May 13, 2025
fede286
Merge branch 'InfiniTimeOrg:main' into main
tituscmd May 20, 2025
5e35637
Merge branch 'InfiniTimeOrg:main' into main
tituscmd Jun 10, 2025
4e6092f
Add button to set the time of the alarm to the current time 1/2
tituscmd Jun 30, 2025
1427bc2
Add button to set the time of the alarm to the current time 2/2
tituscmd Jun 30, 2025
371ec4d
remove line to set label to a custom font that doesnt exist in this b…
tituscmd Jun 30, 2025
382fbc6
Merge branch 'main' into alarm_setcurrenttime
tituscmd Jun 30, 2025
56a65ac
formatting
tituscmd Jun 30, 2025
dbaaf41
Merge branch 'alarm_setcurrenttime' of github.com:tituscmd/InfiniTime…
tituscmd Jun 30, 2025
43e0ba1
Merge branch 'main' into alarm_setcurrenttime
tituscmd Jul 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 34 additions & 2 deletions src/displayapp/screens/Alarm.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,9 @@ static void StopAlarmTaskCallback(lv_task_t* task) {
Alarm::Alarm(Controllers::AlarmController& alarmController,
Controllers::Settings::ClockType clockType,
System::SystemTask& systemTask,
Controllers::MotorController& motorController)
: alarmController {alarmController}, wakeLock(systemTask), motorController {motorController} {
Controllers::MotorController& motorController,
Controllers::DateTime& dateTimeController)
: dateTimeController {dateTimeController}, alarmController {alarmController}, wakeLock(systemTask), motorController {motorController} {

hourCounter.Create();
lv_obj_align(hourCounter.GetObject(), nullptr, LV_ALIGN_IN_TOP_LEFT, 0, 0);
Expand Down Expand Up @@ -107,6 +108,18 @@ Alarm::Alarm(Controllers::AlarmController& alarmController,
lv_obj_t* txtInfo = lv_label_create(btnInfo, nullptr);
lv_label_set_text_static(txtInfo, "i");

btnCurrentTime = lv_btn_create(lv_scr_act(), nullptr);
btnCurrentTime->user_data = this;
lv_obj_set_event_cb(btnCurrentTime, btnEventHandler);
lv_obj_set_size(btnCurrentTime, 50, 50);
lv_obj_align(btnCurrentTime, lv_scr_act(), LV_ALIGN_IN_TOP_MID, 0, 135);
lv_obj_set_style_local_bg_color(btnCurrentTime, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, bgColor);
lv_obj_set_style_local_border_width(btnCurrentTime, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 4);
lv_obj_set_style_local_border_color(btnCurrentTime, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_BLACK);

lv_obj_t* btnClock = lv_label_create(btnCurrentTime, nullptr);
lv_label_set_text_static(btnClock, Symbols::clock);

enableSwitch = lv_switch_create(lv_scr_act(), nullptr);
enableSwitch->user_data = this;
lv_obj_set_event_cb(enableSwitch, btnEventHandler);
Expand Down Expand Up @@ -149,6 +162,10 @@ void Alarm::OnButtonEvent(lv_obj_t* obj, lv_event_t event) {
ShowInfo();
return;
}
if (obj == btnCurrentTime) {
SetCurrentTime();
return;
}
if (obj == btnMessage) {
HideInfo();
return;
Expand Down Expand Up @@ -205,6 +222,7 @@ void Alarm::SetAlerting() {
lv_obj_set_hidden(enableSwitch, true);
lv_obj_set_hidden(btnRecur, true);
lv_obj_set_hidden(btnInfo, true);
lv_obj_set_hidden(btnCurrentTime, true);
hourCounter.HideControls();
minuteCounter.HideControls();
lv_obj_set_hidden(btnStop, false);
Expand All @@ -226,6 +244,7 @@ void Alarm::StopAlerting() {
hourCounter.ShowControls();
minuteCounter.ShowControls();
lv_obj_set_hidden(btnInfo, false);
lv_obj_set_hidden(btnCurrentTime, false);
lv_obj_set_hidden(btnRecur, false);
lv_obj_set_hidden(enableSwitch, false);
}
Expand Down Expand Up @@ -304,3 +323,16 @@ void Alarm::ToggleRecurrence() {
}
SetRecurButtonState();
}

void Alarm::SetCurrentTime() {
uint8_t hour = dateTimeController.Hours();
uint8_t minute = dateTimeController.Minutes();

hourCounter.SetValue(hour);
minuteCounter.SetValue(minute);
alarmController.SetAlarmTime(hour, minute);

if (lblampm != nullptr) {
lv_label_set_text_static(lblampm, hour >= 12 ? "PM" : "AM");
}
}
10 changes: 7 additions & 3 deletions src/displayapp/screens/Alarm.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,21 +33,24 @@ namespace Pinetime {
explicit Alarm(Controllers::AlarmController& alarmController,
Controllers::Settings::ClockType clockType,
System::SystemTask& systemTask,
Controllers::MotorController& motorController);
Controllers::MotorController& motorController,
Controllers::DateTime& dateTimeController);
~Alarm() override;
void SetAlerting();
void OnButtonEvent(lv_obj_t* obj, lv_event_t event);
bool OnButtonPushed() override;
bool OnTouchEvent(TouchEvents event) override;
void OnValueChanged();
void StopAlerting();
void SetCurrentTime();

private:
Controllers::DateTime& dateTimeController;
Controllers::AlarmController& alarmController;
System::WakeLock wakeLock;
Controllers::MotorController& motorController;

lv_obj_t *btnStop, *txtStop, *btnRecur, *txtRecur, *btnInfo, *enableSwitch;
lv_obj_t *btnStop, *txtStop, *btnRecur, *txtRecur, *btnInfo, *enableSwitch, *btnCurrentTime;
lv_obj_t* lblampm = nullptr;
lv_obj_t* txtMessage = nullptr;
lv_obj_t* btnMessage = nullptr;
Expand Down Expand Up @@ -76,7 +79,8 @@ namespace Pinetime {
return new Screens::Alarm(controllers.alarmController,
controllers.settingsController.GetClockType(),
*controllers.systemTask,
controllers.motorController);
controllers.motorController,
controllers.dateTimeController);
};

static bool IsAvailable(Pinetime::Controllers::FS& /*filesystem*/) {
Expand Down