Skip to content

Commit cfa8c79

Browse files
committed
Handle sleepSteps internally in motionController
Renamed to ignoreSteps in motionController, gets rid of the `settingsController.sleepSteps` variable
1 parent 1997c09 commit cfa8c79

File tree

4 files changed

+9
-5
lines changed

4 files changed

+9
-5
lines changed

src/components/motion/MotionController.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ void MotionController::Update(int16_t x, int16_t y, int16_t z, uint32_t nbSteps)
6767

6868
if (settingsController.isSleepOptionOn(Settings::SleepOption::IgnoreSteps) &&
6969
settingsController.GetNotificationStatus() == Pinetime::Controllers::Settings::Notification::Sleep) {
70-
settingsController.sleepSteps += deltaSteps;
70+
ignoreSteps += deltaSteps;
7171
}
7272
}
7373

src/components/motion/MotionController.h

+7-2
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ namespace Pinetime {
3636
}
3737

3838
uint32_t NbSteps() const {
39-
if (nbSteps > settingsController.sleepSteps) {
40-
return nbSteps - settingsController.sleepSteps;
39+
if (nbSteps > ignoreSteps) {
40+
return nbSteps - ignoreSteps;
4141
}
4242
return 0;
4343
}
@@ -46,6 +46,10 @@ namespace Pinetime {
4646
currentTripSteps = 0;
4747
}
4848

49+
void ResetIgnoreSteps() {
50+
ignoreSteps = 0;
51+
}
52+
4953
uint32_t GetTripSteps() const {
5054
return currentTripSteps;
5155
}
@@ -75,6 +79,7 @@ namespace Pinetime {
7579
private:
7680
uint32_t nbSteps = 0;
7781
uint32_t currentTripSteps = 0;
82+
uint32_t ignoreSteps = 0;
7883

7984
TickType_t lastTime = 0;
8085
TickType_t time = 0;

src/components/settings/Settings.h

-1
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,6 @@ namespace Pinetime {
270270
}
271271

272272
bool sleepDisabledBle = false;
273-
uint32_t sleepSteps = 0;
274273

275274
void setSleepOption(SleepOption option, bool enabled) {
276275
if (enabled != isSleepOptionOn(option)) {

src/systemtask/SystemTask.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,6 @@ void SystemTask::Work() {
321321
// We might be sleeping (with TWI device disabled.
322322
// Remember we'll have to reset the counter next time we're awake
323323
stepCounterMustBeReset = true;
324-
settingsController.sleepSteps = 0;
325324
break;
326325
case Messages::OnNewHour:
327326
case Messages::OnNewHalfHour:
@@ -447,6 +446,7 @@ void SystemTask::UpdateMotion() {
447446

448447
if (stepCounterMustBeReset) {
449448
motionSensor.ResetStepCounter();
449+
motionController.ResetIgnoreSteps();
450450
stepCounterMustBeReset = false;
451451
}
452452

0 commit comments

Comments
 (0)