diff options
| author | Riku Isokoski <riksu9000@gmail.com> | 2021-08-03 09:16:40 (GMT) |
|---|---|---|
| committer | Riku Isokoski <riksu9000@gmail.com> | 2021-08-03 09:16:40 (GMT) |
| commit | 10b5d30ec31fcd98343eee46c135659004fae19f (patch) | |
| tree | caae74e1dd3b1eec1c6c6376cb7760d03f6992a9 /src/displayapp/screens/Motion.cpp | |
| parent | fc93bdbbbac9b19530db18f17817ffe2c17260c4 (diff) | |
| parent | 514481ef7f9c71ad816b31d979c6ab39ce9380dd (diff) | |
Merge branch 'develop' into refresh_rework
Diffstat (limited to 'src/displayapp/screens/Motion.cpp')
| -rw-r--r-- | src/displayapp/screens/Motion.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/displayapp/screens/Motion.cpp b/src/displayapp/screens/Motion.cpp index 108b942..2f1f7c2 100644 --- a/src/displayapp/screens/Motion.cpp +++ b/src/displayapp/screens/Motion.cpp @@ -52,11 +52,10 @@ void 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); } - -bool Motion::OnButtonPushed() { - running = false; - return true; -} |
