Skip to content
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

Chime vibration patterns and 15 minute option #2227

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

Chime vibration patterns and 15 minute option #2227

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
66e4b16
chimes: Add chime option for every quarter hour
zischknall Jan 15, 2025
5621869
chimes: Different vibration patterns for each time of hour
zischknall Jan 15, 2025
8be6e88
chimes: fix formatting
zischknall Jan 16, 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
Prev Previous commit
Next Next commit
chimes: Different vibration patterns for each time of hour
  • Loading branch information
@zischknall
zischknall committed Jan 15, 2025

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
GPG key ID: B5690EEEBB952194
Verified
Learn about vigilant mode
commit 5621869ec83240c6cd9a415a7c994740457c4437
23 changes: 16 additions & 7 deletions src/components/datetime/DateTimeController.cpp
View file
Original file line number Diff line number Diff line change
@@ -117,22 +117,31 @@ void DateTime::UpdateTime(uint32_t systickCounter, bool forceUpdate) {
isHourAlreadyNotified = false;
}

if ((minute == 0 || minute == 30) && !isHalfHourAlreadyNotified) {
if (minute == 15 && !isQuarterHourAlreadyNotified) {
isQuarterHourAlreadyNotified = true;
if (systemTask != nullptr) {
systemTask->PushMessage(System::Messages::OnNewQuarterHour);
}
} else if (minute != 15) {
isQuarterHourAlreadyNotified = false;
}

if (minute == 30 && !isHalfHourAlreadyNotified) {
isHalfHourAlreadyNotified = true;
if (systemTask != nullptr) {
systemTask->PushMessage(System::Messages::OnNewHalfHour);
}
} else if (minute != 0 && minute != 30) {
} else if (minute != 30) {
isHalfHourAlreadyNotified = false;
}

if ((minute == 0 || minute == 15 || minute == 30 || minute == 45) && !isQuarterHourAlreadyNotified) {
isQuarterHourAlreadyNotified = true;
if (minute == 45 && !isThreeQuarterHourAlreadyNotified) {
isThreeQuarterHourAlreadyNotified = true;
if (systemTask != nullptr) {
systemTask->PushMessage(System::Messages::OnNewQuarterHour);
systemTask->PushMessage(System::Messages::OnNewThreeQuarterHour);
}
} else if (minute != 0 && minute != 15 && minute != 30 && minute != 45) {
isQuarterHourAlreadyNotified = false;
} else if (minute != 45) {
isThreeQuarterHourAlreadyNotified = false;
}

// Notify new day to SystemTask
3 changes: 2 additions & 1 deletion src/components/datetime/DateTimeController.h
View file
Original file line number Diff line number Diff line change
@@ -153,8 +153,9 @@ namespace Pinetime {

bool isMidnightAlreadyNotified = false;
bool isHourAlreadyNotified = true;
bool isHalfHourAlreadyNotified = true;
bool isQuarterHourAlreadyNotified = true;
bool isHalfHourAlreadyNotified = true;
bool isThreeQuarterHourAlreadyNotified = true;
System::SystemTask* systemTask = nullptr;
Controllers::Settings& settingsController;
};
28 changes: 26 additions & 2 deletions src/displayapp/DisplayApp.cpp
View file
Original file line number Diff line number Diff line change
@@ -471,9 +471,33 @@ void DisplayApp::Refresh() {
case Messages::BleRadioEnableToggle:
PushMessageToSystemTask(System::Messages::BleRadioEnableToggle);
break;
case Messages::Chime:
case Messages::FullHourChime:
LoadNewScreen(Apps::Clock, DisplayApp::FullRefreshDirections::None);
motorController.RunForDuration(35);
motorController.RunForDuration(100);
vTaskDelay(pdMS_TO_TICKS(500));
motorController.RunForDuration(100);
vTaskDelay(pdMS_TO_TICKS(500));
motorController.RunForDuration(100);
vTaskDelay(pdMS_TO_TICKS(500));
motorController.RunForDuration(100);
break;
case Messages::QuarterHourChime:
LoadNewScreen(Apps::Clock, DisplayApp::FullRefreshDirections::None);
motorController.RunForDuration(100);
break;
case Messages::HalfHourChime:
LoadNewScreen(Apps::Clock, DisplayApp::FullRefreshDirections::None);
motorController.RunForDuration(100);
vTaskDelay(pdMS_TO_TICKS(500));
motorController.RunForDuration(100);
break;
case Messages::ThreeQuarterHourChime:
LoadNewScreen(Apps::Clock, DisplayApp::FullRefreshDirections::None);
motorController.RunForDuration(100);
vTaskDelay(pdMS_TO_TICKS(500));
motorController.RunForDuration(100);
vTaskDelay(pdMS_TO_TICKS(500));
motorController.RunForDuration(100);
break;
case Messages::OnChargingEvent:
motorController.RunForDuration(15);
5 changes: 4 additions & 1 deletion src/displayapp/Messages.h
View file
Original file line number Diff line number Diff line change
@@ -22,7 +22,10 @@ namespace Pinetime {
NotifyDeviceActivity,
ShowPairingKey,
AlarmTriggered,
Chime,
FullHourChime,
QuarterHourChime,
HalfHourChime,
ThreeQuarterHourChime,
BleRadioEnableToggle,
OnChargingEvent,
};
3 changes: 2 additions & 1 deletion src/systemtask/Messages.h
View file
Original file line number Diff line number Diff line change
@@ -21,8 +21,9 @@ namespace Pinetime {
DisableSleeping,
OnNewDay,
OnNewHour,
OnNewHalfHour,
OnNewQuarterHour,
OnNewHalfHour,
OnNewThreeQuarterHour,
OnChargingEvent,
OnPairing,
SetOffAlarm,
22 changes: 16 additions & 6 deletions src/systemtask/SystemTask.cpp
View file
Original file line number Diff line number Diff line change
@@ -323,25 +323,35 @@ void SystemTask::Work() {
case Messages::OnNewHour:
using Pinetime::Controllers::AlarmController;
if (settingsController.GetNotificationStatus() != Controllers::Settings::Notification::Sleep &&
settingsController.GetChimeOption() == Controllers::Settings::ChimesOption::Hours && !alarmController.IsAlerting()) {
settingsController.GetChimeOption() != Controllers::Settings::ChimesOption::None && !alarmController.IsAlerting()) {
GoToRunning();
displayApp.PushMessage(Pinetime::Applications::Display::Messages::Chime);
displayApp.PushMessage(Pinetime::Applications::Display::Messages::FullHourChime);
}
break;
case Messages::OnNewQuarterHour:
using Pinetime::Controllers::AlarmController;
if (settingsController.GetNotificationStatus() != Controllers::Settings::Notification::Sleep &&
settingsController.GetChimeOption() == Controllers::Settings::ChimesOption::QuarterHours && !alarmController.IsAlerting()) {
GoToRunning();
displayApp.PushMessage(Pinetime::Applications::Display::Messages::QuarterHourChime);
}
break;
case Messages::OnNewHalfHour:
using Pinetime::Controllers::AlarmController;
if (settingsController.GetNotificationStatus() != Controllers::Settings::Notification::Sleep &&
settingsController.GetChimeOption() == Controllers::Settings::ChimesOption::HalfHours && !alarmController.IsAlerting()) {
(settingsController.GetChimeOption() == Controllers::Settings::ChimesOption::HalfHours ||
settingsController.GetChimeOption() == Controllers::Settings::ChimesOption::QuarterHours) &&
!alarmController.IsAlerting()) {
GoToRunning();
displayApp.PushMessage(Pinetime::Applications::Display::Messages::Chime);
displayApp.PushMessage(Pinetime::Applications::Display::Messages::HalfHourChime);
}
break;
case Messages::OnNewQuarterHour:
case Messages::OnNewThreeQuarterHour:
using Pinetime::Controllers::AlarmController;
if (settingsController.GetNotificationStatus() != Controllers::Settings::Notification::Sleep &&
settingsController.GetChimeOption() == Controllers::Settings::ChimesOption::QuarterHours && !alarmController.IsAlerting()) {
GoToRunning();
displayApp.PushMessage(Pinetime::Applications::Display::Messages::Chime);
displayApp.PushMessage(Pinetime::Applications::Display::Messages::ThreeQuarterHourChime);
}
break;
case Messages::OnChargingEvent:
Loading