Watchfaces: Assume motionsensor is ok

Riksu9000 · Riksu9000 · commit 348d3de60bc6 · 2023-04-16T14:15:49.000Z
The watch face shouldn't and doesn't start before the sensor is ready.
diff --git a/src/displayapp/screens/WatchFaceCasioStyleG7710.cpp b/src/displayapp/screens/WatchFaceCasioStyleG7710.cpp
@@ -305,8 +305,7 @@ void WatchFaceCasioStyleG7710::Refresh() {
   }
 
   stepCount = motionController.NbSteps();
-  motionSensorOk = motionController.IsSensorOk();
-  if (stepCount.IsUpdated() || motionSensorOk.IsUpdated()) {
+  if (stepCount.IsUpdated()) {
     lv_label_set_text_fmt(stepValue, "%lu", stepCount.Get());
     lv_obj_realign(stepValue);
     lv_obj_realign(stepIcon);
diff --git a/src/displayapp/screens/WatchFaceCasioStyleG7710.h b/src/displayapp/screens/WatchFaceCasioStyleG7710.h
@@ -45,7 +45,6 @@ namespace Pinetime {
         Utility::DirtyValue<bool> bleState {};
         Utility::DirtyValue<bool> bleRadioEnabled {};
         Utility::DirtyValue<std::chrono::time_point<std::chrono::system_clock, std::chrono::minutes>> currentDateTime {};
-        Utility::DirtyValue<bool> motionSensorOk {};
         Utility::DirtyValue<uint32_t> stepCount {};
         Utility::DirtyValue<uint8_t> heartbeat {};
         Utility::DirtyValue<bool> heartbeatRunning {};
diff --git a/src/displayapp/screens/WatchFaceDigital.cpp b/src/displayapp/screens/WatchFaceDigital.cpp
@@ -148,8 +148,7 @@ void WatchFaceDigital::Refresh() {
   }
 
   stepCount = motionController.NbSteps();
-  motionSensorOk = motionController.IsSensorOk();
-  if (stepCount.IsUpdated() || motionSensorOk.IsUpdated()) {
+  if (stepCount.IsUpdated()) {
     lv_label_set_text_fmt(stepValue, "%lu", stepCount.Get());
     lv_obj_realign(stepValue);
     lv_obj_realign(stepIcon);
diff --git a/src/displayapp/screens/WatchFaceDigital.h b/src/displayapp/screens/WatchFaceDigital.h
@@ -45,7 +45,6 @@ namespace Pinetime {
         Utility::DirtyValue<bool> bleState {};
         Utility::DirtyValue<bool> bleRadioEnabled {};
         Utility::DirtyValue<std::chrono::time_point<std::chrono::system_clock, std::chrono::minutes>> currentDateTime {};
-        Utility::DirtyValue<bool> motionSensorOk {};
         Utility::DirtyValue<uint32_t> stepCount {};
         Utility::DirtyValue<uint8_t> heartbeat {};
         Utility::DirtyValue<bool> heartbeatRunning {};
diff --git a/src/displayapp/screens/WatchFaceInfineat.cpp b/src/displayapp/screens/WatchFaceInfineat.cpp
@@ -452,8 +452,7 @@ void WatchFaceInfineat::Refresh() {
   }
 
   stepCount = motionController.NbSteps();
-  motionSensorOk = motionController.IsSensorOk();
-  if (stepCount.IsUpdated() || motionSensorOk.IsUpdated()) {
+  if (stepCount.IsUpdated()) {
     lv_label_set_text_fmt(stepValue, "%lu", stepCount.Get());
     lv_obj_align(stepValue, lv_scr_act(), LV_ALIGN_IN_BOTTOM_MID, 10, 0);
     lv_obj_align(stepIcon, stepValue, LV_ALIGN_OUT_LEFT_MID, -5, 0);
diff --git a/src/displayapp/screens/WatchFaceInfineat.h b/src/displayapp/screens/WatchFaceInfineat.h
@@ -51,7 +51,6 @@ namespace Pinetime {
         Utility::DirtyValue<bool> bleState {};
         Utility::DirtyValue<bool> bleRadioEnabled {};
         Utility::DirtyValue<std::chrono::time_point<std::chrono::system_clock, std::chrono::minutes>> currentDateTime {};
-        Utility::DirtyValue<bool> motionSensorOk {};
         Utility::DirtyValue<uint32_t> stepCount {};
         Utility::DirtyValue<bool> notificationState {};
         using days = std::chrono::duration<int32_t, std::ratio<86400>>; // TODO: days is standard in c++20
diff --git a/src/displayapp/screens/WatchFacePineTimeStyle.cpp b/src/displayapp/screens/WatchFacePineTimeStyle.cpp
@@ -499,8 +499,7 @@ void WatchFacePineTimeStyle::Refresh() {
   }
 
   stepCount = motionController.NbSteps();
-  motionSensorOk = motionController.IsSensorOk();
-  if (stepCount.IsUpdated() || motionSensorOk.IsUpdated()) {
+  if (stepCount.IsUpdated()) {
     lv_gauge_set_value(stepGauge, 0, (stepCount.Get() / (settingsController.GetStepsGoal() / 100)) % 100);
     lv_obj_realign(stepGauge);
     lv_label_set_text_fmt(stepValue, "%luK", (stepCount.Get() / 1000));
diff --git a/src/displayapp/screens/WatchFacePineTimeStyle.h b/src/displayapp/screens/WatchFacePineTimeStyle.h
@@ -56,7 +56,6 @@ namespace Pinetime {
         Utility::DirtyValue<bool> bleState {};
         Utility::DirtyValue<bool> bleRadioEnabled {};
         Utility::DirtyValue<std::chrono::time_point<std::chrono::system_clock, std::chrono::nanoseconds>> currentDateTime {};
-        Utility::DirtyValue<bool> motionSensorOk {};
         Utility::DirtyValue<uint32_t> stepCount {};
         Utility::DirtyValue<bool> notificationState {};
 
diff --git a/src/displayapp/screens/WatchFaceTerminal.cpp b/src/displayapp/screens/WatchFaceTerminal.cpp
@@ -145,8 +145,7 @@ void WatchFaceTerminal::Refresh() {
   }
 
   stepCount = motionController.NbSteps();
-  motionSensorOk = motionController.IsSensorOk();
-  if (stepCount.IsUpdated() || motionSensorOk.IsUpdated()) {
+  if (stepCount.IsUpdated()) {
     lv_label_set_text_fmt(stepValue, "[STEP]#ee3377 %lu steps#", stepCount.Get());
   }
 }
diff --git a/src/displayapp/screens/WatchFaceTerminal.h b/src/displayapp/screens/WatchFaceTerminal.h
@@ -40,7 +40,6 @@ namespace Pinetime {
         Utility::DirtyValue<bool> bleState {};
         Utility::DirtyValue<bool> bleRadioEnabled {};
         Utility::DirtyValue<std::chrono::time_point<std::chrono::system_clock, std::chrono::seconds>> currentDateTime {};
-        Utility::DirtyValue<bool> motionSensorOk {};
         Utility::DirtyValue<uint32_t> stepCount {};
         Utility::DirtyValue<uint8_t> heartbeat {};
         Utility::DirtyValue<bool> heartbeatRunning {};

Original file line number	Diff line number	Diff line change
`@@ -305,8 +305,7 @@ void WatchFaceCasioStyleG7710::Refresh() {`
`305`	`305`	`}`
`306`	`306`
`307`	`307`	`stepCount = motionController.NbSteps();`
`308`		`- motionSensorOk = motionController.IsSensorOk();`
`309`		`- if (stepCount.IsUpdated() \|\| motionSensorOk.IsUpdated()) {`
	`308`	`+ if (stepCount.IsUpdated()) {`
`310`	`309`	`lv_label_set_text_fmt(stepValue, "%lu", stepCount.Get());`
`311`	`310`	`lv_obj_realign(stepValue);`
`312`	`311`	`lv_obj_realign(stepIcon);`
Original file line number	Diff line number	Diff line change
`@@ -148,8 +148,7 @@ void WatchFaceDigital::Refresh() {`
`148`	`148`	`}`
`149`	`149`
`150`	`150`	`stepCount = motionController.NbSteps();`
`151`		`- motionSensorOk = motionController.IsSensorOk();`
`152`		`- if (stepCount.IsUpdated() \|\| motionSensorOk.IsUpdated()) {`
	`151`	`+ if (stepCount.IsUpdated()) {`
`153`	`152`	`lv_label_set_text_fmt(stepValue, "%lu", stepCount.Get());`
`154`	`153`	`lv_obj_realign(stepValue);`
`155`	`154`	`lv_obj_realign(stepIcon);`
Original file line number	Diff line number	Diff line change
`@@ -452,8 +452,7 @@ void WatchFaceInfineat::Refresh() {`
`452`	`452`	`}`
`453`	`453`
`454`	`454`	`stepCount = motionController.NbSteps();`
`455`		`- motionSensorOk = motionController.IsSensorOk();`
`456`		`- if (stepCount.IsUpdated() \|\| motionSensorOk.IsUpdated()) {`
	`455`	`+ if (stepCount.IsUpdated()) {`
`457`	`456`	`lv_label_set_text_fmt(stepValue, "%lu", stepCount.Get());`
`458`	`457`	`lv_obj_align(stepValue, lv_scr_act(), LV_ALIGN_IN_BOTTOM_MID, 10, 0);`
`459`	`458`	`lv_obj_align(stepIcon, stepValue, LV_ALIGN_OUT_LEFT_MID, -5, 0);`
Original file line number	Diff line number	Diff line change
`@@ -499,8 +499,7 @@ void WatchFacePineTimeStyle::Refresh() {`
`499`	`499`	`}`
`500`	`500`
`501`	`501`	`stepCount = motionController.NbSteps();`
`502`		`- motionSensorOk = motionController.IsSensorOk();`
`503`		`- if (stepCount.IsUpdated() \|\| motionSensorOk.IsUpdated()) {`
	`502`	`+ if (stepCount.IsUpdated()) {`
`504`	`503`	`lv_gauge_set_value(stepGauge, 0, (stepCount.Get() / (settingsController.GetStepsGoal() / 100)) % 100);`
`505`	`504`	`lv_obj_realign(stepGauge);`
`506`	`505`	`lv_label_set_text_fmt(stepValue, "%luK", (stepCount.Get() / 1000));`
Original file line number	Diff line number	Diff line change
`@@ -145,8 +145,7 @@ void WatchFaceTerminal::Refresh() {`
`145`	`145`	`}`
`146`	`146`
`147`	`147`	`stepCount = motionController.NbSteps();`
`148`		`- motionSensorOk = motionController.IsSensorOk();`
`149`		`- if (stepCount.IsUpdated() \|\| motionSensorOk.IsUpdated()) {`
	`148`	`+ if (stepCount.IsUpdated()) {`
`150`	`149`	`lv_label_set_text_fmt(stepValue, "[STEP]#ee3377 %lu steps#", stepCount.Get());`
`151`	`150`	`}`
`152`	`151`	`}`