Only inhibit sleep if motion notifications are enabled, not just Bluetooth

Author: apilat

.gitignore

@@ -47,3 +47,6 @@ Testing/Temporary/
 #build files
 src/nRF5_SDK_15.3.0_59ac345
 src/arm-none-eabi
+
+# clangd
+.cache/

src/components/ble/MotionService.cpp

@@ -119,3 +119,7 @@ void MotionService::UnsubscribeNotification(uint16_t connectionHandle, uint16_t
   else if (attributeHandle == motionValuesHandle)
     motionValuesNoficationEnabled = false;
 }
+
+bool MotionService::IsMotionNotificationSubscribed() const {
+  return motionValuesNoficationEnabled;
+}

src/components/ble/MotionService.h

@@ -22,6 +22,7 @@ namespace Pinetime {
 
       void SubscribeNotification(uint16_t connectionHandle, uint16_t attributeHandle);
       void UnsubscribeNotification(uint16_t connectionHandle, uint16_t attributeHandle);
+      bool IsMotionNotificationSubscribed() const;
 
     private:
       Pinetime::System::SystemTask& system;

src/components/motion/MotionController.cpp

@@ -85,3 +85,7 @@ void MotionController::Init(Pinetime::Drivers::Bma421::DeviceTypes types) {
 void MotionController::SetService(Pinetime::Controllers::MotionService* service) {
   this->service = service;
 }
+
+Pinetime::Controllers::MotionService* MotionController::GetService() const {
+  return this->service;
+}

src/components/motion/MotionController.h

@@ -50,6 +50,7 @@ namespace Pinetime {
 
       void Init(Pinetime::Drivers::Bma421::DeviceTypes types);
       void SetService(Pinetime::Controllers::MotionService* service);
+      Pinetime::Controllers::MotionService* GetService() const;
 
     private:
       uint32_t nbSteps;
@@ -69,4 +70,4 @@ namespace Pinetime {
       uint32_t lastShakeTime = 0;
     };
   }
-}
+}

src/systemtask/SystemTask.cpp

@@ -468,9 +468,9 @@ void SystemTask::UpdateMotion() {
     return;
   }
 
-  if (state == SystemTaskState::Sleeping &&
-      !(settingsController.isWakeUpModeOn(Pinetime::Controllers::Settings::WakeUpMode::RaiseWrist) ||
-        settingsController.isWakeUpModeOn(Pinetime::Controllers::Settings::WakeUpMode::Shake) || bleController.IsConnected())) {
+  if (state == SystemTaskState::Sleeping && !(settingsController.isWakeUpModeOn(Pinetime::Controllers::Settings::WakeUpMode::RaiseWrist) ||
+                                              settingsController.isWakeUpModeOn(Pinetime::Controllers::Settings::WakeUpMode::Shake) ||
+                                              motionController.GetService()->IsMotionNotificationSubscribed())) {
     return;
   }