summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/components/motion/MotionController.cpp16
-rw-r--r--src/components/motion/MotionController.h4
-rw-r--r--src/displayapp/screens/Steps.cpp3
3 files changed, 14 insertions, 9 deletions
diff --git a/src/components/motion/MotionController.cpp b/src/components/motion/MotionController.cpp
index f2b36ad0..97a8feb2 100644
--- a/src/components/motion/MotionController.cpp
+++ b/src/components/motion/MotionController.cpp
@@ -16,7 +16,7 @@ void MotionController::Update(int16_t x, int16_t y, int16_t z, uint32_t nbSteps)
this->z = z;
int32_t deltaSteps = nbSteps - this->nbSteps;
this->nbSteps = nbSteps;
- if(deltaSteps > 0){
+ if (deltaSteps > 0) {
currentTripSteps += deltaSteps;
}
}
@@ -47,10 +47,16 @@ void MotionController::IsSensorOk(bool isOk) {
isSensorOk = isOk;
}
void MotionController::Init(Pinetime::Drivers::Bma421::DeviceTypes types) {
- switch(types){
- case Drivers::Bma421::DeviceTypes::BMA421: this->deviceType = DeviceTypes::BMA421; break;
- case Drivers::Bma421::DeviceTypes::BMA425: this->deviceType = DeviceTypes::BMA425; break;
- default: this->deviceType = DeviceTypes::Unknown; break;
+ switch (types) {
+ case Drivers::Bma421::DeviceTypes::BMA421:
+ this->deviceType = DeviceTypes::BMA421;
+ break;
+ case Drivers::Bma421::DeviceTypes::BMA425:
+ this->deviceType = DeviceTypes::BMA425;
+ break;
+ default:
+ this->deviceType = DeviceTypes::Unknown;
+ break;
}
}
void MotionController::SetService(Pinetime::Controllers::MotionService* service) {
diff --git a/src/components/motion/MotionController.h b/src/components/motion/MotionController.h
index 3de03d19..3eac7176 100644
--- a/src/components/motion/MotionController.h
+++ b/src/components/motion/MotionController.h
@@ -8,7 +8,7 @@ namespace Pinetime {
namespace Controllers {
class MotionController {
public:
- enum class DeviceTypes{
+ enum class DeviceTypes {
Unknown,
BMA421,
BMA425,
@@ -28,7 +28,7 @@ namespace Pinetime {
uint32_t NbSteps() const {
return nbSteps;
}
-
+
void ResetTrip() {
currentTripSteps = 0;
}
diff --git a/src/displayapp/screens/Steps.cpp b/src/displayapp/screens/Steps.cpp
index 3ab28e43..3e7f8201 100644
--- a/src/displayapp/screens/Steps.cpp
+++ b/src/displayapp/screens/Steps.cpp
@@ -85,7 +85,7 @@ void Steps::Refresh() {
lv_label_set_text_fmt(lSteps, "%li", stepsCount);
lv_obj_align(lSteps, nullptr, LV_ALIGN_CENTER, 0, -40);
- if (currentTripSteps < 100000){
+ if (currentTripSteps < 100000) {
lv_label_set_text_fmt(tripLabel, "Trip: %5li", currentTripSteps);
} else {
lv_label_set_text_fmt(tripLabel, "Trip: 99999+");
@@ -101,4 +101,3 @@ void Steps::lapBtnEventHandler(lv_event_t event) {
motionController.ResetTrip();
Refresh();
}
-