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

Renamed confusing variables and general cleanup

Browse source
This commit is contained in:
Stephanie 2021-10-23 13:41:10 -04:00 committed by JF
parent 7eff1dbcc6
commit a65f173e3c
4 changed files with 18 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -14,7 +14,7 @@ void MotionController::Update(int16_t x, int16_t y, int16_t z, uint32_t nbSteps)
this->x = x; this->x = x;
this->y = y; this->y = y;
this->z = z; this->z = z;
deltaSteps = nbSteps - this->nbSteps; int32_t deltaSteps = nbSteps - this->nbSteps;
this->nbSteps = nbSteps; this->nbSteps = nbSteps;
if(deltaSteps > 0){ if(deltaSteps > 0){
currentTripSteps += deltaSteps; currentTripSteps += deltaSteps;

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

@ -51,7 +51,6 @@ namespace Pinetime {
private: private:
uint32_t nbSteps; uint32_t nbSteps;
int32_t deltaSteps = 0;
uint32_t currentTripSteps = 0; uint32_t currentTripSteps = 0;
int16_t x; int16_t x;
int16_t y; int16_t y;

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

@ -54,23 +54,21 @@ Steps::Steps(Pinetime::Applications::DisplayApp* app,
lv_obj_set_pos(backgroundLabel, 0, 0); lv_obj_set_pos(backgroundLabel, 0, 0);
lv_label_set_text_static(backgroundLabel, ""); lv_label_set_text_static(backgroundLabel, "");
btnTrip = lv_btn_create(lv_scr_act(), nullptr); resetBtn = lv_btn_create(lv_scr_act(), nullptr);
btnTrip->user_data = this; resetBtn->user_data = this;
lv_obj_set_event_cb(btnTrip, lap_event_handler); lv_obj_set_event_cb(resetBtn, lap_event_handler);
lv_obj_set_height(btnTrip, 50); lv_obj_set_height(resetBtn, 50);
lv_obj_set_width(btnTrip, 115); lv_obj_set_width(resetBtn, 115);
lv_obj_align(btnTrip, lv_scr_act(), LV_ALIGN_IN_BOTTOM_MID, 0, 0); lv_obj_align(resetBtn, lv_scr_act(), LV_ALIGN_IN_BOTTOM_MID, 0, 0);
lv_obj_set_style_local_bg_color(btnTrip, LV_BTN_PART_MAIN, LV_STATE_DISABLED, lv_color_hex(0x080808)); resetButtonLabel = lv_label_create(resetBtn, nullptr);
txtTrip = lv_label_create(btnTrip, nullptr); lv_label_set_text(resetButtonLabel, "Reset");
lv_obj_set_style_local_text_color(btnTrip, LV_BTN_PART_MAIN, LV_STATE_DISABLED, lv_color_hex(0x888888));
lv_label_set_text(txtTrip, "Reset");
currentTripSteps = motionController.GetTripSteps(); currentTripSteps = motionController.GetTripSteps();
tripText = lv_label_create(lv_scr_act(), nullptr); tripLabel = lv_label_create(lv_scr_act(), nullptr);
lv_obj_set_style_local_text_color(tripText, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_YELLOW); lv_obj_set_style_local_text_color(tripLabel, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_YELLOW);
lv_label_set_text_fmt(tripText, "Trip: %5li", currentTripSteps); lv_label_set_text_fmt(tripLabel, "Trip: %5li", currentTripSteps);
lv_obj_align(tripText, lstepsGoal, LV_ALIGN_IN_LEFT_MID, 0, 20); lv_obj_align(tripLabel, lstepsGoal, LV_ALIGN_IN_LEFT_MID, 0, 20);
taskRefresh = lv_task_create(RefreshTaskCallback, 100, LV_TASK_PRIO_MID, this); taskRefresh = lv_task_create(RefreshTaskCallback, 100, LV_TASK_PRIO_MID, this);
} }
@ -88,9 +86,9 @@ void Steps::Refresh() {
lv_obj_align(lSteps, nullptr, LV_ALIGN_CENTER, 0, -40); lv_obj_align(lSteps, nullptr, LV_ALIGN_CENTER, 0, -40);
if (currentTripSteps < 100000){ if (currentTripSteps < 100000){
lv_label_set_text_fmt(tripText, "Trip: %5li", currentTripSteps); lv_label_set_text_fmt(tripLabel, "Trip: %5li", currentTripSteps);
} else { } else {
lv_label_set_text_fmt(tripText, "Trip: 99999+"); lv_label_set_text_fmt(tripLabel, "Trip: 99999+");
} }
lv_arc_set_value(stepsArc, int16_t(500 * stepsCount / settingsController.GetStepsGoal())); lv_arc_set_value(stepsArc, int16_t(500 * stepsCount / settingsController.GetStepsGoal()));
} }

6
src/displayapp/screens/Steps.h
View file

@ -31,9 +31,9 @@ namespace Pinetime {
lv_obj_t* lSteps; lv_obj_t* lSteps;
lv_obj_t* lStepsIcon; lv_obj_t* lStepsIcon;
lv_obj_t* stepsArc; lv_obj_t* stepsArc;
lv_obj_t* btnTrip; lv_obj_t* resetBtn;
lv_obj_t* txtTrip; lv_obj_t* resetButtonLabel;
lv_obj_t* tripText; lv_obj_t* tripLabel;
uint32_t stepsCount; uint32_t stepsCount;