bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Add templated j_move_axis

Browse Source
This commit is contained in:
Scott Lahteine 2020-05-04 17:44:01 -05:00
parent 0080305fa6
commit bab37dcfae
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Marlin/src/lcd/extui_malyan_lcd.cpp
View File

@ -206,18 +206,19 @@ void process_lcd_eb_command(const char* command) {
* {J:E}{J:X+200}{J:E} * {J:E}{J:X+200}{J:E}
* X, Y, Z, A (extruder) * X, Y, Z, A (extruder)
*/ */
void process_lcd_j_command(const char* command) { template<typename T>
auto move_axis = [command](const auto axis) { void j_move_axis(const char* command, const T axis) {
const float dist = atof(command + 1) / 10.0; const float dist = atof(command + 1) / 10.0;
ExtUI::setAxisPosition_mm(ExtUI::getAxisPosition_mm(axis) + dist, axis); ExtUI::setAxisPosition_mm(ExtUI::getAxisPosition_mm(axis) + dist, axis);
}; };
void process_lcd_j_command(const char* command) {
switch (command[0]) { switch (command[0]) {
case 'E': break; case 'E': break;
case 'A': move_axis(ExtUI::extruder_t::E0); break; case 'A': j_move_axis<ExtUI::extruder_t>(command, ExtUI::extruder_t::E0); break;
case 'Y': move_axis(ExtUI::axis_t::Y); break; case 'Y': j_move_axis<ExtUI::axis_t>(command, ExtUI::axis_t::Y); break;
case 'Z': move_axis(ExtUI::axis_t::Z); break; case 'Z': j_move_axis<ExtUI::axis_t>(command, ExtUI::axis_t::Z); break;
case 'X': move_axis(ExtUI::axis_t::X); break; case 'X': j_move_axis<ExtUI::axis_t>(command, ExtUI::axis_t::X); break;
default: DEBUG_ECHOLNPAIR("UNKNOWN J COMMAND ", command); default: DEBUG_ECHOLNPAIR("UNKNOWN J COMMAND ", command);
} }
} }