MPCNC/Firmware2
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Merge pull request #6277 from thinkyhead/pr_roxy3d_rcbugfix

Browse Source 
Unify UBL Command Parsing
This commit is contained in:
Scott Lahteine 2017-04-08 20:17:46 -05:00 committed by GitHub
commit d3b4d84586
1 changed files with 31 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
Marlin/ubl_G29.cpp
View File

@ -674,7 +674,7 @@
if (ELAPSED(millis(), nxt)) { if (ELAPSED(millis(), nxt)) {
SERIAL_PROTOCOLLNPGM("\nZ-Offset Adjustment Stopped."); SERIAL_PROTOCOLLNPGM("\nZ-Offset Adjustment Stopped.");
do_blocking_move_to_z(Z_CLEARANCE_DEPLOY_PROBE); do_blocking_move_to_z(Z_CLEARANCE_DEPLOY_PROBE);
lcd_setstatuspgm(PSTR("Z-Offset Stopped")); LCD_MESSAGEPGM("Z-Offset Stopped");
restore_ubl_active_state_and_leave(); restore_ubl_active_state_and_leave();
goto LEAVE; goto LEAVE;
} }
@ -693,7 +693,7 @@
#if ENABLED(ULTRA_LCD) #if ENABLED(ULTRA_LCD)
lcd_reset_alert_level(); lcd_reset_alert_level();
lcd_setstatuspgm(PSTR("")); LCD_MESSAGEPGM("");
lcd_quick_feedback(); lcd_quick_feedback();
#endif #endif
@ -997,51 +997,49 @@
bool g29_parameter_parsing() { bool g29_parameter_parsing() {
#if ENABLED(ULTRA_LCD) #if ENABLED(ULTRA_LCD)
lcd_setstatuspgm(PSTR("Doing G29 UBL!")); LCD_MESSAGEPGM("Doing G29 UBL!");
lcd_quick_feedback(); lcd_quick_feedback();
#endif #endif
x_pos = current_position[X_AXIS]; x_flag = code_seen('X') && code_has_value();
y_pos = current_position[Y_AXIS]; y_flag = code_seen('Y') && code_has_value();
x_flag = 0; x_pos = x_flag ? code_value_float() : current_position[X_AXIS];
y_flag = 0; y_pos = y_flag ? code_value_float() : current_position[Y_AXIS];
repeat_flag = 0; repeat_flag = code_seen('R') ? code_value_bool() : false;
bool err_flag = false;
g29_verbose_level = code_seen('V') ? code_value_int() : 0; g29_verbose_level = code_seen('V') ? code_value_int() : 0;
if (!WITHIN(g29_verbose_level, 0, 4)) { if (!WITHIN(g29_verbose_level, 0, 4)) {
SERIAL_PROTOCOLLNPGM("Invalid Verbose Level specified. (0-4)\n"); SERIAL_PROTOCOLLNPGM("Invalid Verbose Level specified. (0-4)\n");
return UBL_ERR; err_flag = true;
} }
if (code_seen('G')) { if (code_seen('G')) {
grid_size_G = 3; grid_size_G = code_has_value() ? code_value_int() : 3;
if (code_has_value())
grid_size_G = code_value_int();
if (!WITHIN(grid_size_G, 2, 10)) { if (!WITHIN(grid_size_G, 2, 10)) {
SERIAL_PROTOCOLLNPGM("Invalid grid probe points specified.\n"); SERIAL_PROTOCOLLNPGM("Invalid grid probe points specified.\n");
return UBL_ERR; err_flag = true;
} }
} }
x_flag = code_seen('X') && code_has_value();
x_pos = x_flag ? code_value_float() : current_position[X_AXIS];
if (!WITHIN(RAW_X_POSITION(x_pos), X_MIN_POS, X_MAX_POS)) {
SERIAL_PROTOCOLLNPGM("Invalid X location specified.\n");
return UBL_ERR;
}
y_flag = code_seen('Y') && code_has_value();
y_pos = y_flag ? code_value_float() : current_position[Y_AXIS];
if (!WITHIN(RAW_Y_POSITION(y_pos), Y_MIN_POS, Y_MAX_POS)) {
SERIAL_PROTOCOLLNPGM("Invalid Y location specified.\n");
return UBL_ERR;
}
if (x_flag != y_flag) { if (x_flag != y_flag) {
SERIAL_PROTOCOLLNPGM("Both X & Y locations must be specified.\n"); SERIAL_PROTOCOLLNPGM("Both X & Y locations must be specified.\n");
return UBL_ERR; err_flag = true;
} }
if (!WITHIN(RAW_X_POSITION(x_pos), X_MIN_POS, X_MAX_POS)) {
SERIAL_PROTOCOLLNPGM("Invalid X location specified.\n");
err_flag = true;
}
if (!WITHIN(RAW_Y_POSITION(y_pos), Y_MIN_POS, Y_MAX_POS)) {
SERIAL_PROTOCOLLNPGM("Invalid Y location specified.\n");
err_flag = true;
}
if (err_flag) return UBL_ERR;
if (code_seen('A')) { // Activate the Unified Bed Leveling System if (code_seen('A')) { // Activate the Unified Bed Leveling System
ubl.state.active = 1; ubl.state.active = 1;
SERIAL_PROTOCOLLNPGM("Unified Bed Leveling System activated.\n"); SERIAL_PROTOCOLLNPGM("Unified Bed Leveling System activated.\n");
@ -1069,7 +1067,6 @@
} }
#endif #endif
repeat_flag = code_seen('R');
repetition_cnt = repeat_flag ? (code_has_value() ? code_value_int() : 9999) : 1; repetition_cnt = repeat_flag ? (code_has_value() ? code_value_int() : 9999) : 1;
if (repetition_cnt < 1) { if (repetition_cnt < 1) {
SERIAL_PROTOCOLLNPGM("Invalid Repetition count.\n"); SERIAL_PROTOCOLLNPGM("Invalid Repetition count.\n");
@ -1124,7 +1121,7 @@
ubl_state_recursion_chk++; ubl_state_recursion_chk++;
if (ubl_state_recursion_chk != 1) { if (ubl_state_recursion_chk != 1) {
SERIAL_ECHOLNPGM("save_ubl_active_state_and_disabled() called multiple times in a row."); SERIAL_ECHOLNPGM("save_ubl_active_state_and_disabled() called multiple times in a row.");
lcd_setstatuspgm(PSTR("save_UBL_active() error")); LCD_MESSAGEPGM("save_UBL_active() error");
lcd_quick_feedback(); lcd_quick_feedback();
return; return;
} }
@ -1135,7 +1132,7 @@
void restore_ubl_active_state_and_leave() { void restore_ubl_active_state_and_leave() {
if (--ubl_state_recursion_chk) { if (--ubl_state_recursion_chk) {
SERIAL_ECHOLNPGM("restore_ubl_active_state_and_leave() called too many times."); SERIAL_ECHOLNPGM("restore_ubl_active_state_and_leave() called too many times.");
lcd_setstatuspgm(PSTR("restore_UBL_active() error")); LCD_MESSAGEPGM("restore_UBL_active() error");
lcd_quick_feedback(); lcd_quick_feedback();
return; return;
} }
@ -1374,9 +1371,7 @@
save_ubl_active_state_and_disable(); save_ubl_active_state_and_disable();
memset(not_done, 0xFF, sizeof(not_done)); memset(not_done, 0xFF, sizeof(not_done));
#if ENABLED(ULTRA_LCD) LCD_MESSAGEPGM("Fine Tuning Mesh");
lcd_setstatuspgm(PSTR("Fine Tuning Mesh"));
#endif
do_blocking_move_to_z(Z_CLEARANCE_DEPLOY_PROBE); do_blocking_move_to_z(Z_CLEARANCE_DEPLOY_PROBE);
do_blocking_move_to_xy(lx, ly); do_blocking_move_to_xy(lx, ly);
@ -1434,7 +1429,7 @@
lcd_return_to_status(); lcd_return_to_status();
//SERIAL_PROTOCOLLNPGM("\nFine Tuning of Mesh Stopped."); //SERIAL_PROTOCOLLNPGM("\nFine Tuning of Mesh Stopped.");
do_blocking_move_to_z(Z_CLEARANCE_DEPLOY_PROBE); do_blocking_move_to_z(Z_CLEARANCE_DEPLOY_PROBE);
lcd_setstatuspgm(PSTR("Mesh Editing Stopped")); LCD_MESSAGEPGM("Mesh Editing Stopped");
while (ubl_lcd_clicked()) idle(); while (ubl_lcd_clicked()) idle();
@ -1461,9 +1456,7 @@
do_blocking_move_to_xy(lx, ly); do_blocking_move_to_xy(lx, ly);
#if ENABLED(ULTRA_LCD) LCD_MESSAGEPGM("Done Editing Mesh");
lcd_setstatuspgm(PSTR("Done Editing Mesh"));
#endif
SERIAL_ECHOLNPGM("Done Editing Mesh"); SERIAL_ECHOLNPGM("Done Editing Mesh");
} }