Skip to content

Commit

Permalink
Added Setting to select pushes required to stop alarm
Browse files Browse the repository at this point in the history 
Also added setting for natural awake, will implement next
  • Loading branch information
@cyberneel
cyberneel committed Dec 6, 2024
1 parent 2fc156b commit b8d27b9
Show file tree
Hide file tree
Showing 4 changed files with 91 additions and 56 deletions.
7 changes: 6 additions & 1 deletion src/components/infinisleep/InfiniSleepController.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,11 @@ void InfiniSleepController::Init(System::SystemTask* systemTask) {

LoadSettingsFromFile();
LoadPrevSessionData();
if (infiniSleepSettings.pushesToStopAlarm == 0) {
infiniSleepSettings.pushesToStopAlarm = PUSHES_TO_STOP_ALARM;
settingsChanged = true;
}
pushesLeftToStopWakeAlarm = infiniSleepSettings.pushesToStopAlarm;
if (wakeAlarm.isEnabled) {
NRF_LOG_INFO("[InfiniSleepController] Loaded wake alarm was enabled, scheduling");
ScheduleWakeAlarm();
Expand Down Expand Up @@ -106,7 +111,7 @@ void InfiniSleepController::ScheduleWakeAlarm() {
xTimerStop(wakeAlarmTimer, 0);
xTimerStop(gradualWakeTimer, 0);

pushesLeftToStopWakeAlarm = PUSHES_TO_STOP_ALARM;
pushesLeftToStopWakeAlarm = infiniSleepSettings.pushesToStopAlarm;

gradualWakeStep = 9;

Expand Down
2 changes: 2 additions & 0 deletions src/components/infinisleep/InfiniSleepController.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,8 @@ namespace Pinetime {
uint8_t sleepCycleDuration = SLEEP_CYCLE_DURATION;
uint8_t desiredCycles = DESIRED_CYCLES;
uint8_t motorStrength = 100;
bool naturalWake = false;
uint8_t pushesToStopAlarm = PUSHES_TO_STOP_ALARM;
};

InfiniSleepSettings infiniSleepSettings;
Expand Down
136 changes: 82 additions & 54 deletions src/displayapp/screens/Sleep.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ static void SnoozeAlarmTaskCallback(lv_task_t* task) {

static void PressesToStopAlarmTimeoutCallback(lv_task_t* task) {
auto* screen = static_cast<Sleep*>(task->user_data);
screen->infiniSleepController.pushesLeftToStopWakeAlarm = PUSHES_TO_STOP_ALARM;
screen->infiniSleepController.pushesLeftToStopWakeAlarm = screen->infiniSleepController.infiniSleepSettings.pushesToStopAlarm;
screen->UpdateDisplay();
}

Expand Down Expand Up @@ -206,8 +206,8 @@ void Sleep::DrawAlarmScreen() {
txtStop = lv_label_create(btnStop, nullptr);
lv_label_set_text_fmt(txtStop,
"Stop: %d/%d",
PUSHES_TO_STOP_ALARM - infiniSleepController.pushesLeftToStopWakeAlarm,
PUSHES_TO_STOP_ALARM);
infiniSleepController.infiniSleepSettings.pushesToStopAlarm - infiniSleepController.pushesLeftToStopWakeAlarm,
infiniSleepController.infiniSleepSettings.pushesToStopAlarm);
lv_obj_set_hidden(btnStop, true);

static constexpr lv_color_t bgColor = Colors::bgAlt;
Expand Down Expand Up @@ -362,40 +362,46 @@ void Sleep::DrawInfoScreen() {
}

void Sleep::DrawSettingsScreen() {
lv_obj_t* lblSettings = lv_label_create(lv_scr_act(), nullptr);
lv_label_set_text_static(lblSettings, "Settings");
lv_obj_align(lblSettings, lv_scr_act(), LV_ALIGN_IN_TOP_MID, 0, 10);

struct Setting {
const char* name;
bool enabled;
int offsetAfter = 30;
};

const Setting settings[] = {
//{"Body Tracking", infiniSleepController.BodyTrackingEnabled()},
// {"Heart Rate\nTracking", infiniSleepController.HeartRateTrackingEnabled(), 60},
{"Gradual Wake", infiniSleepController.GradualWakeEnabled()},
//{"Smart Alarm\n(alpha)", infiniSleepController.SmartAlarmEnabled()}
};

int y_offset = 30;
for (const auto& setting : settings) {

lv_obj_t* checkbox = lv_checkbox_create(lv_scr_act(), nullptr);
checkbox->user_data = const_cast<char*>(setting.name);
lv_checkbox_set_text_static(checkbox, const_cast<char*>(setting.name));

if (setting.enabled) {
lv_checkbox_set_checked(checkbox, true);
} else {
lv_checkbox_set_checked(checkbox, false);
// lv_obj_t* lblSettings = lv_label_create(lv_scr_act(), nullptr);
// lv_label_set_text_static(lblSettings, "Settings");
// lv_obj_align(lblSettings, lv_scr_act(), LV_ALIGN_IN_TOP_MID, 0, 10);

int y_offset = 10;

lv_obj_t* lblWakeMode = lv_label_create(lv_scr_act(), nullptr);
lv_label_set_text_static(lblWakeMode, "Wake\nMode");
lv_obj_align(lblWakeMode, lv_scr_act(), LV_ALIGN_IN_TOP_LEFT, 10, y_offset);

lv_obj_t* btnWakeMode = lv_btn_create(lv_scr_act(), nullptr);
lv_obj_set_size(btnWakeMode, 100, 50);
lv_obj_align(btnWakeMode, lv_scr_act(), LV_ALIGN_IN_TOP_LEFT, 130, y_offset);
btnWakeMode->user_data = this;
lv_obj_set_event_cb(btnWakeMode, [](lv_obj_t* obj, lv_event_t e) {
if (e == LV_EVENT_CLICKED) {
auto* screen = static_cast<Sleep*>(obj->user_data);
auto& settings = screen->infiniSleepController.infiniSleepSettings;
if (settings.graddualWake) {
settings.graddualWake = false;
settings.naturalWake = true;
} else if (settings.naturalWake) {
settings.naturalWake = false;
settings.graddualWake = false;
} else if (!settings.graddualWake && !settings.naturalWake) {
settings.graddualWake = true;
}
screen->infiniSleepController.SetSettingsChanged();
const char* mode = settings.graddualWake ? "Grad." : settings.naturalWake ? "Nat." : "Off";
lv_label_set_text_static(lv_obj_get_child(obj, nullptr), mode);
}
lv_obj_align(checkbox, lv_scr_act(), LV_ALIGN_IN_TOP_LEFT, 10, y_offset);
});
const char* mode = infiniSleepController.infiniSleepSettings.graddualWake ? "Grad."
: infiniSleepController.infiniSleepSettings.naturalWake ? "Nat."
: "Off";
lv_obj_t* lblWakeModeValue = lv_label_create(btnWakeMode, nullptr);
lv_label_set_text_static(lblWakeModeValue, mode);
lv_obj_align(lblWakeModeValue, nullptr, LV_ALIGN_CENTER, 0, 0);

lv_obj_set_event_cb(checkbox, settingsToggleEventHandler);
y_offset += setting.offsetAfter; // Increase the offset to provide better spacing
}
y_offset += 60; // Adjust the offset for the next UI element

lv_obj_t* lblCycles = lv_label_create(lv_scr_act(), nullptr);
lv_label_set_text_static(lblCycles, "Desired\nCycles");
Expand Down Expand Up @@ -425,9 +431,20 @@ void Sleep::DrawSettingsScreen() {

y_offset += 60; // Adjust the offset for the next UI element

lv_obj_t* lblMotorStrength = lv_label_create(lv_scr_act(), nullptr);
lv_label_set_text_static(lblMotorStrength, "Vibration\nStrength");
lv_obj_align(lblMotorStrength, lv_scr_act(), LV_ALIGN_IN_TOP_LEFT, 10, y_offset);
lv_obj_t* btnTestMotorGradual = lv_btn_create(lv_scr_act(), nullptr);
lv_obj_set_size(btnTestMotorGradual, 110, 50);
lv_obj_align(btnTestMotorGradual, lv_scr_act(), LV_ALIGN_IN_TOP_LEFT, 10, y_offset);
btnTestMotorGradual->user_data = this;
lv_obj_set_event_cb(btnTestMotorGradual, [](lv_obj_t* obj, lv_event_t e) {
if (e == LV_EVENT_CLICKED) {
auto* screen = static_cast<Sleep*>(obj->user_data);
screen->motorController.GradualWakeBuzz();
}
});

lv_obj_t* lblMotorStrength = lv_label_create(btnTestMotorGradual, nullptr);
lv_label_set_text_static(lblMotorStrength, "Motor\nPower");
lv_obj_align(lblMotorStrength, lv_scr_act(), LV_ALIGN_IN_TOP_LEFT, 0, 0);

lv_obj_t* btnMotorStrength = lv_btn_create(lv_scr_act(), nullptr);
lv_obj_set_size(btnMotorStrength, 100, 50);
Expand All @@ -438,37 +455,44 @@ void Sleep::DrawSettingsScreen() {
auto* screen = static_cast<Sleep*>(obj->user_data);
uint8_t value = screen->infiniSleepController.infiniSleepSettings.motorStrength;
value += 25;
if (value > 200) value = 100;
if (value > 200)
value = 100;
screen->infiniSleepController.infiniSleepSettings.motorStrength = value;
screen->infiniSleepController.SetSettingsChanged();
lv_label_set_text_fmt(lv_obj_get_child(obj, nullptr), "%d%", value);
lv_label_set_text_fmt(lv_obj_get_child(obj, nullptr), "%d", value);
screen->motorController.infiniSleepMotorStrength = value;
}
});

lv_obj_t* lblMotorStrengthValue = lv_label_create(btnMotorStrength, nullptr);
lv_label_set_text_fmt(lblMotorStrengthValue, "%d%", infiniSleepController.infiniSleepSettings.motorStrength);
lv_label_set_text_fmt(lblMotorStrengthValue, "%d", infiniSleepController.infiniSleepSettings.motorStrength);
motorController.infiniSleepMotorStrength = infiniSleepController.infiniSleepSettings.motorStrength;
lv_obj_align(lblMotorStrengthValue, nullptr, LV_ALIGN_CENTER, 0, 0);

y_offset += 60; // Adjust the offset for the next UI element

lv_obj_t* btnTestMotorGradual = lv_btn_create(lv_scr_act(), nullptr);
lv_obj_set_size(btnTestMotorGradual, 220, 50);
lv_obj_align(btnTestMotorGradual, lv_scr_act(), LV_ALIGN_IN_TOP_LEFT, 10, y_offset);
btnTestMotorGradual->user_data = this;
lv_obj_set_event_cb(btnTestMotorGradual, [](lv_obj_t* obj, lv_event_t e) {
lv_obj_t* lblPushesToStop = lv_label_create(lv_scr_act(), nullptr);
lv_label_set_text_static(lblPushesToStop, "Pushes\nto Stop");
lv_obj_align(lblPushesToStop, lv_scr_act(), LV_ALIGN_IN_TOP_LEFT, 10, y_offset);

lv_obj_t* btnPushesToStop = lv_btn_create(lv_scr_act(), nullptr);
lv_obj_set_size(btnPushesToStop, 100, 50);
lv_obj_align(btnPushesToStop, lv_scr_act(), LV_ALIGN_IN_TOP_LEFT, 130, y_offset);
btnPushesToStop->user_data = this;
lv_obj_set_event_cb(btnPushesToStop, [](lv_obj_t* obj, lv_event_t e) {
if (e == LV_EVENT_CLICKED) {
auto* screen = static_cast<Sleep*>(obj->user_data);
screen->motorController.GradualWakeBuzz();
int value = screen->infiniSleepController.infiniSleepSettings.pushesToStopAlarm;
value = (value % 10) + 1; // Cycle through values 1 to 10
screen->infiniSleepController.infiniSleepSettings.pushesToStopAlarm = value;
screen->infiniSleepController.SetSettingsChanged();
lv_label_set_text_fmt(lv_obj_get_child(obj, nullptr), "%d", value);
}
});

lv_obj_t* txtTestMotorGradual = lv_label_create(btnTestMotorGradual, nullptr);
lv_label_set_text_static(txtTestMotorGradual, "Test Motor");
lv_obj_align(txtTestMotorGradual, nullptr, LV_ALIGN_CENTER, 0, 0);

y_offset += 70; // Adjust the offset for the next UI element
lv_obj_t* lblPushesToStopValue = lv_label_create(btnPushesToStop, nullptr);
lv_label_set_text_fmt(lblPushesToStopValue, "%d", infiniSleepController.infiniSleepSettings.pushesToStopAlarm);
lv_obj_align(lblPushesToStopValue, nullptr, LV_ALIGN_CENTER, 0, 0);
}

void Sleep::OnButtonEvent(lv_obj_t* obj, lv_event_t event) {
Expand Down Expand Up @@ -658,7 +682,9 @@ void Sleep::SetAlerting() {
lv_obj_set_hidden(iconSuggestedAlarm, true);
NRF_LOG_INFO("Alarm is alerting");
taskSnoozeWakeAlarm = lv_task_create(SnoozeAlarmTaskCallback, 120 * 1000, LV_TASK_PRIO_MID, this);
motorController.StartWakeAlarm();
if (infiniSleepController.infiniSleepSettings.graddualWake) {
motorController.StartWakeAlarm();
}
wakeLock.Lock();
alreadyAlerting = true;
}
Expand All @@ -675,7 +701,9 @@ void Sleep::RedrawSetAlerting() {

void Sleep::StopAlerting(bool setSwitch) {
infiniSleepController.StopAlerting();
motorController.StopWakeAlarm();
if (infiniSleepController.infiniSleepSettings.graddualWake) {
motorController.StopWakeAlarm();
}
if (setSwitch) {
SetSwitchState(LV_ANIM_OFF);
}
Expand Down
2 changes: 1 addition & 1 deletion src/systemtask/SystemTask.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ void SystemTask::Work() {
GoToRunning();
break;
case Messages::GoToSleep:
infiniSleepController.pushesLeftToStopWakeAlarm = PUSHES_TO_STOP_ALARM;
infiniSleepController.pushesLeftToStopWakeAlarm = infiniSleepController.infiniSleepSettings.pushesToStopAlarm;
GoToSleep();
break;
case Messages::OnNewTime:
Expand Down

0 comments on commit b8d27b9

Please sign in to comment.