From bab37dcfaee9943d6b266ba31494306212257dc6 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Mon, 4 May 2020 17:44:01 -0500
Subject: [PATCH] Add templated j_move_axis
---
Marlin/src/lcd/extui_malyan_lcd.cpp | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
diff --git a/Marlin/src/lcd/extui_malyan_lcd.cpp b/Marlin/src/lcd/extui_malyan_lcd.cpp
index 85101ae8d9..53cef9915b 100644
--- a/Marlin/src/lcd/extui_malyan_lcd.cpp
+++ b/Marlin/src/lcd/extui_malyan_lcd.cpp
@@ -206,18 +206,19 @@ void process_lcd_eb_command(const char* command) {
* {J:E}{J:X+200}{J:E}
* X, Y, Z, A (extruder)
*/
-void process_lcd_j_command(const char* command) {
- auto move_axis = [command](const auto axis) {
- const float dist = atof(command + 1) / 10.0;
- ExtUI::setAxisPosition_mm(ExtUI::getAxisPosition_mm(axis) + dist, axis);
- };
+template<typename T>
+void j_move_axis(const char* command, const T axis) {
+ const float dist = atof(command + 1) / 10.0;
+ ExtUI::setAxisPosition_mm(ExtUI::getAxisPosition_mm(axis) + dist, axis);
+};
+void process_lcd_j_command(const char* command) {
switch (command[0]) {
case 'E': break;
- case 'A': move_axis(ExtUI::extruder_t::E0); break;
- case 'Y': move_axis(ExtUI::axis_t::Y); break;
- case 'Z': move_axis(ExtUI::axis_t::Z); break;
- case 'X': move_axis(ExtUI::axis_t::X); break;
+ case 'A': j_move_axis<ExtUI::extruder_t>(command, ExtUI::extruder_t::E0); break;
+ case 'Y': j_move_axis<ExtUI::axis_t>(command, ExtUI::axis_t::Y); break;
+ case 'Z': j_move_axis<ExtUI::axis_t>(command, ExtUI::axis_t::Z); break;
+ case 'X': j_move_axis<ExtUI::axis_t>(command, ExtUI::axis_t::X); break;
default: DEBUG_ECHOLNPAIR("UNKNOWN J COMMAND ", command);
}
}
--
GitLab