Skip to content

Commit e55a76f

Browse files
FintasticManRiksu9000
authored andcommitted
raisewake: Change names in line with the style guide
1 parent 49ad5be commit e55a76f

3 files changed

Lines changed: 9 additions & 9 deletions

File tree

src/components/motion/MotionController.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,22 +29,22 @@ void MotionController::Update(int16_t x, int16_t y, int16_t z, uint32_t nbSteps)
2929
this->nbSteps = nbSteps;
3030
}
3131

32-
bool MotionController::Should_RaiseWake(bool isSleeping) {
32+
bool MotionController::ShouldRaiseWake(bool isSleeping) {
3333
if ((x + 335) <= 670 && z < 0) {
34-
if (not isSleeping) {
34+
if (!isSleeping) {
3535
if (y <= 0) {
3636
return false;
3737
}
38-
lastYForWakeUp = 0;
38+
lastYForRaiseWake = 0;
3939
return false;
4040
}
4141

4242
if (y >= 0) {
43-
lastYForWakeUp = 0;
43+
lastYForRaiseWake = 0;
4444
return false;
4545
}
46-
if (y + 230 < lastYForWakeUp) {
47-
lastYForWakeUp = y;
46+
if (y + 230 < lastYForRaiseWake) {
47+
lastYForRaiseWake = y;
4848
return true;
4949
}
5050
}

src/components/motion/MotionController.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ namespace Pinetime {
4444
}
4545

4646
bool ShouldShakeWake(uint16_t thresh);
47-
bool Should_RaiseWake(bool isSleeping);
47+
bool ShouldRaiseWake(bool isSleeping);
4848

4949
int32_t CurrentShakeSpeed() const {
5050
return accumulatedSpeed;
@@ -76,7 +76,7 @@ namespace Pinetime {
7676
TickType_t time = 0;
7777

7878
int16_t x = 0;
79-
int16_t lastYForWakeUp = 0;
79+
int16_t lastYForRaiseWake = 0;
8080
int16_t lastY = 0;
8181
int16_t y = 0;
8282
int16_t lastZ = 0;

src/systemtask/SystemTask.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -468,7 +468,7 @@ void SystemTask::UpdateMotion() {
468468

469469
if (settingsController.GetNotificationStatus() != Controllers::Settings::Notification::Sleep) {
470470
if ((settingsController.isWakeUpModeOn(Pinetime::Controllers::Settings::WakeUpMode::RaiseWrist) &&
471-
motionController.Should_RaiseWake(state == SystemTaskState::Sleeping)) ||
471+
motionController.ShouldRaiseWake(state == SystemTaskState::Sleeping)) ||
472472
(settingsController.isWakeUpModeOn(Pinetime::Controllers::Settings::WakeUpMode::Shake) &&
473473
motionController.ShouldShakeWake(settingsController.GetShakeThreshold()))) {
474474
GoToRunning();

0 commit comments

Comments
 (0)