scott/InfiniTime
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases 1 Wiki Activity

Ran clang-format

Browse source
This commit is contained in:
Stephanie 2021-10-31 11:53:13 -04:00 committed by JF
parent a65f173e3c
commit e0013e7304
3 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/components/motion/MotionController.cpp
View file

@ -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) {

4
src/components/motion/MotionController.h
View file

@ -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;
}

3
src/displayapp/screens/Steps.cpp
View file

@ -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();
}