diff options
author | Riku Isokoski <riksu9000@gmail.com> | 2021-07-25 19:30:27 +0300 |
---|---|---|
committer | Riku Isokoski <riksu9000@gmail.com> | 2021-07-25 19:30:27 +0300 |
commit | 2e8bc634dcae6e304b8f94e2633644fd55b64450 (patch) | |
tree | 7098aaa514c1f7600447235e21721319bcb33ae7 /src/displayapp/screens/Motion.cpp | |
parent | 12b14176ec965f2553e4cad16e291d54704128f3 (diff) | |
parent | 7b75ca591d31ccd8883a1a1ff83cfd271959dbaa (diff) |
Merge branch 'develop' into fit_more_tasks
Diffstat (limited to 'src/displayapp/screens/Motion.cpp')
-rw-r--r-- | src/displayapp/screens/Motion.cpp | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/displayapp/screens/Motion.cpp b/src/displayapp/screens/Motion.cpp index a8bb3c18..43a5575e 100644 --- a/src/displayapp/screens/Motion.cpp +++ b/src/displayapp/screens/Motion.cpp @@ -32,11 +32,10 @@ Motion::Motion(Pinetime::Applications::DisplayApp* app, Controllers::MotionContr lv_label_set_align(label, LV_LABEL_ALIGN_CENTER); lv_obj_align(label, NULL, LV_ALIGN_IN_TOP_MID, 0, 10); lv_label_set_recolor(label, true); - + labelStep = lv_label_create(lv_scr_act(), NULL); lv_obj_align(labelStep, chart, LV_ALIGN_IN_BOTTOM_LEFT, 0, 0); lv_label_set_text(labelStep, "Steps ---"); - } Motion::~Motion() { @@ -50,13 +49,12 @@ bool Motion::Refresh() { lv_label_set_text_fmt(labelStep, "Steps %lu", motionController.NbSteps()); - lv_label_set_text_fmt(label, "X #FF0000 %d# Y #008000 %d# Z #FFFF00 %d#", motionController.X() / 0x10, motionController.Y() / 0x10, motionController.Z() / 0x10); + lv_label_set_text_fmt(label, + "X #FF0000 %d# Y #008000 %d# Z #FFFF00 %d#", + motionController.X() / 0x10, + motionController.Y() / 0x10, + motionController.Z() / 0x10); lv_obj_align(label, NULL, LV_ALIGN_IN_TOP_MID, 0, 10); return running; } - -bool Motion::OnButtonPushed() { - running = false; - return true; -} |