Skip to content

Fix motion service not updating when sleeping #1970

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

Merged
FintasticMan merged 2 commits into from
Jan 23, 2024
Merged

Fix motion service not updating when sleeping #1970

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fbd787d
Keep updating motion during sleep when Bluetooth is on
apilat Jun 29, 2022
4971651
Only inhibit sleep if motion notifications are enabled, not just Blue…
apilat Jun 30, 2022
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
4 changes: 4 additions & 0 deletions src/components/ble/MotionService.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,3 +120,7 @@ void MotionService::UnsubscribeNotification(uint16_t attributeHandle) {
else if (attributeHandle == motionValuesHandle)
motionValuesNoficationEnabled = false;
}

bool MotionService::IsMotionNotificationSubscribed() const {
return motionValuesNoficationEnabled;
}
1 change: 1 addition & 0 deletions src/components/ble/MotionService.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ namespace Pinetime {

void SubscribeNotification(uint16_t attributeHandle);
void UnsubscribeNotification(uint16_t attributeHandle);
bool IsMotionNotificationSubscribed() const;

private:
NimbleController& nimble;
Expand Down
4 changes: 4 additions & 0 deletions src/components/motion/MotionController.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,10 @@ namespace Pinetime {
this->service = service;
}

Pinetime::Controllers::MotionService* GetService() const {
return service;
}

private:
uint32_t nbSteps = 0;
uint32_t currentTripSteps = 0;
Expand Down
3 changes: 2 additions & 1 deletion src/systemtask/SystemTask.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -418,7 +418,8 @@ void SystemTask::UpdateMotion() {
}

if (state == SystemTaskState::Sleeping && !(settingsController.isWakeUpModeOn(Pinetime::Controllers::Settings::WakeUpMode::RaiseWrist) ||
settingsController.isWakeUpModeOn(Pinetime::Controllers::Settings::WakeUpMode::Shake))) {
settingsController.isWakeUpModeOn(Pinetime::Controllers::Settings::WakeUpMode::Shake) ||
motionController.GetService()->IsMotionNotificationSubscribed())) {
return;
}

Expand Down