will/InfiniTime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

motioncontroller: Fix clang-tidy warnings

Browse Source 
Also move one-line functions to header.
This commit is contained in:
Finlay Davidson 2023-03-05 15:24:06 +01:00 committed by Riku Isokoski
parent 76e79df375
commit 49ad5be742
2 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/components/motion/MotionController.cpp
View File

@ -23,10 +23,10 @@ void MotionController::Update(int16_t x, int16_t y, int16_t z, uint32_t nbSteps)
this->z = z; this->z = z;
int32_t deltaSteps = nbSteps - this->nbSteps; int32_t deltaSteps = nbSteps - this->nbSteps;
this->nbSteps = nbSteps;
if (deltaSteps > 0) { if (deltaSteps > 0) {
currentTripSteps += deltaSteps; currentTripSteps += deltaSteps;
} }
this->nbSteps = nbSteps;
} }
bool MotionController::Should_RaiseWake(bool isSleeping) { bool MotionController::Should_RaiseWake(bool isSleeping) {
@ -61,10 +61,6 @@ bool MotionController::ShouldShakeWake(uint16_t thresh) {
return accumulatedSpeed > thresh; return accumulatedSpeed > thresh;
} }
void MotionController::IsSensorOk(bool isOk) {
isSensorOk = isOk;
}
void MotionController::Init(Pinetime::Drivers::Bma421::DeviceTypes types) { void MotionController::Init(Pinetime::Drivers::Bma421::DeviceTypes types) {
switch (types) { switch (types) {
case Drivers::Bma421::DeviceTypes::BMA421: case Drivers::Bma421::DeviceTypes::BMA421:
@ -78,7 +74,3 @@ void MotionController::Init(Pinetime::Drivers::Bma421::DeviceTypes types) {
break; break;
} }
} }
void MotionController::SetService(Pinetime::Controllers::MotionService* service) {
this->service = service;
}

17
src/components/motion/MotionController.h
View File

@ -50,7 +50,9 @@ namespace Pinetime {
return accumulatedSpeed; return accumulatedSpeed;
} }
void IsSensorOk(bool isOk); void IsSensorOk(bool isOk) {
isSensorOk = isOk;
}
bool IsSensorOk() const { bool IsSensorOk() const {
return isSensorOk; return isSensorOk;
@ -61,21 +63,24 @@ namespace Pinetime {
} }
void Init(Pinetime::Drivers::Bma421::DeviceTypes types); void Init(Pinetime::Drivers::Bma421::DeviceTypes types);
void SetService(Pinetime::Controllers::MotionService* service);
void SetService(Pinetime::Controllers::MotionService* service) {
this->service = service;
}
private: private:
uint32_t nbSteps; uint32_t nbSteps = 0;
uint32_t currentTripSteps = 0; uint32_t currentTripSteps = 0;
TickType_t lastTime = 0; TickType_t lastTime = 0;
TickType_t time = 0; TickType_t time = 0;
int16_t x; int16_t x = 0;
int16_t lastYForWakeUp = 0; int16_t lastYForWakeUp = 0;
int16_t lastY = 0; int16_t lastY = 0;
int16_t y; int16_t y = 0;
int16_t lastZ = 0; int16_t lastZ = 0;
int16_t z; int16_t z = 0;
int32_t accumulatedSpeed = 0; int32_t accumulatedSpeed = 0;
bool isSensorOk = false; bool isSensorOk = false;