|
@@ -222,6 +222,8 @@ static void prusa_stat_temperatures();
|
|
|
static void prusa_stat_printinfo();
|
|
|
static void lcd_farm_no();
|
|
|
static void lcd_menu_extruder_info();
|
|
|
+static void lcd_menu_xyz_y_min();
|
|
|
+static void lcd_menu_xyz_skew();
|
|
|
#if defined(TMC2130) || defined(PAT9125)
|
|
|
static void lcd_menu_fails_stats();
|
|
|
#endif //TMC2130 or PAT9125
|
|
@@ -1582,7 +1584,7 @@ static void lcd_menu_extruder_info()
|
|
|
if (lcd_clicked())
|
|
|
{
|
|
|
lcd_quick_feedback();
|
|
|
- lcd_return_to_status();
|
|
|
+ menu_action_back();
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -1686,7 +1688,7 @@ static void lcd_menu_debug()
|
|
|
if (lcd_clicked())
|
|
|
{
|
|
|
lcd_quick_feedback();
|
|
|
- lcd_return_to_status();
|
|
|
+ menu_action_back();
|
|
|
}
|
|
|
}
|
|
|
#endif /* DEBUG_BUILD */
|
|
@@ -1703,7 +1705,7 @@ static void lcd_menu_temperatures()
|
|
|
if (lcd_clicked())
|
|
|
{
|
|
|
lcd_quick_feedback();
|
|
|
- lcd_return_to_status();
|
|
|
+ menu_action_back();
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -1721,7 +1723,7 @@ static void lcd_menu_voltages()
|
|
|
if (lcd_clicked())
|
|
|
{
|
|
|
lcd_quick_feedback();
|
|
|
- lcd_return_to_status();
|
|
|
+ menu_action_back();
|
|
|
}
|
|
|
}
|
|
|
#endif //defined VOLT_BED_PIN || defined VOLT_PWR_PIN
|
|
@@ -1733,7 +1735,7 @@ static void lcd_menu_belt_status()
|
|
|
if (lcd_clicked())
|
|
|
{
|
|
|
lcd_quick_feedback();
|
|
|
- lcd_return_to_status();
|
|
|
+ menu_action_back();
|
|
|
}
|
|
|
}
|
|
|
#endif //TMC2130
|
|
@@ -1831,7 +1833,7 @@ static void lcd_support_menu()
|
|
|
}
|
|
|
#ifndef MK1BP
|
|
|
MENU_ITEM(back, PSTR("------------"), 0);
|
|
|
- if (!IS_SD_PRINTING && !is_usb_printing && (lcd_commands_type != LCD_COMMAND_V2_CAL)) MENU_ITEM(function, MSG_XYZ_DETAILS, lcd_service_mode_show_result);
|
|
|
+ if (!IS_SD_PRINTING && !is_usb_printing && (lcd_commands_type != LCD_COMMAND_V2_CAL)) MENU_ITEM(submenu, MSG_XYZ_DETAILS, lcd_menu_xyz_y_min);
|
|
|
MENU_ITEM(submenu, MSG_INFO_EXTRUDER, lcd_menu_extruder_info);
|
|
|
|
|
|
#ifdef TMC2130
|
|
@@ -2285,62 +2287,60 @@ static void lcd_move_e()
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-void lcd_service_mode_show_result() {
|
|
|
- float angleDiff;
|
|
|
- lcd_set_custom_characters_degree();
|
|
|
- count_xyz_details();
|
|
|
- angleDiff = eeprom_read_float((float*)(EEPROM_XYZ_CAL_SKEW));
|
|
|
- lcd_update_enable(false);
|
|
|
- lcd_implementation_clear();
|
|
|
- lcd_printPGM(MSG_Y_DISTANCE_FROM_MIN);
|
|
|
- lcd_print_at_PGM(0, 1, MSG_LEFT);
|
|
|
- lcd_print_at_PGM(0, 2, MSG_RIGHT);
|
|
|
-
|
|
|
- for (int i = 0; i < 2; i++) {
|
|
|
- if(distance_from_min[i] < 200) {
|
|
|
- lcd_print_at_PGM(11, i + 1, PSTR(""));
|
|
|
- lcd.print(distance_from_min[i]);
|
|
|
- lcd_print_at_PGM((distance_from_min[i] < 0) ? 17 : 16, i + 1, PSTR("mm"));
|
|
|
- } else lcd_print_at_PGM(11, i + 1, PSTR("N/A"));
|
|
|
- }
|
|
|
- delay_keep_alive(500);
|
|
|
- KEEPALIVE_STATE(PAUSED_FOR_USER);
|
|
|
- while (!lcd_clicked()) {
|
|
|
- delay_keep_alive(100);
|
|
|
- }
|
|
|
- delay_keep_alive(500);
|
|
|
- lcd_implementation_clear();
|
|
|
-
|
|
|
-
|
|
|
- lcd_printPGM(MSG_MEASURED_SKEW);
|
|
|
- if (angleDiff < 100) {
|
|
|
- lcd.setCursor(15, 0);
|
|
|
- lcd.print(angleDiff * 180 / M_PI);
|
|
|
- lcd.print(LCD_STR_DEGREE);
|
|
|
- }else lcd_print_at_PGM(16, 0, PSTR("N/A"));
|
|
|
- lcd_print_at_PGM(0, 1, PSTR("--------------------"));
|
|
|
- lcd_print_at_PGM(0, 2, MSG_SLIGHT_SKEW);
|
|
|
- lcd_print_at_PGM(15, 2, PSTR(""));
|
|
|
- lcd.print(bed_skew_angle_mild * 180 / M_PI);
|
|
|
- lcd.print(LCD_STR_DEGREE);
|
|
|
- lcd_print_at_PGM(0, 3, MSG_SEVERE_SKEW);
|
|
|
- lcd_print_at_PGM(15, 3, PSTR(""));
|
|
|
- lcd.print(bed_skew_angle_extreme * 180 / M_PI);
|
|
|
- lcd.print(LCD_STR_DEGREE);
|
|
|
- delay_keep_alive(500);
|
|
|
- while (!lcd_clicked()) {
|
|
|
- delay_keep_alive(100);
|
|
|
- }
|
|
|
- KEEPALIVE_STATE(NOT_BUSY);
|
|
|
- delay_keep_alive(500);
|
|
|
- lcd_set_custom_characters_arrows();
|
|
|
- lcd_return_to_status();
|
|
|
- lcd_update_enable(true);
|
|
|
- lcd_update(2);
|
|
|
+static void lcd_menu_xyz_y_min()
|
|
|
+{
|
|
|
+ lcd.setCursor(0,0);
|
|
|
+ lcd_printPGM(MSG_Y_DISTANCE_FROM_MIN);
|
|
|
+ lcd_print_at_PGM(0, 1, PSTR("--------------------"));
|
|
|
+ lcd_print_at_PGM(0, 2, MSG_LEFT);
|
|
|
+ lcd_print_at_PGM(0, 3, MSG_RIGHT);
|
|
|
+
|
|
|
+ DistanceMin distanceMin = count_xyz_details();
|
|
|
+
|
|
|
+ for (int i = 0; i < 2; i++) {
|
|
|
+ if(distanceMin.d[i] < 200) {
|
|
|
+ lcd_print_at_PGM(11, i + 2, PSTR(""));
|
|
|
+ lcd.print(distanceMin.d[i]);
|
|
|
+ lcd_print_at_PGM((distanceMin.d[i] < 0) ? 17 : 16, i + 2, PSTR("mm"));
|
|
|
+ } else lcd_print_at_PGM(11, i + 2, PSTR("N/A"));
|
|
|
+ }
|
|
|
+ if (lcd_clicked())
|
|
|
+ {
|
|
|
+ lcd_quick_feedback();
|
|
|
+ lcd_set_custom_characters_degree();
|
|
|
+ lcd_goto_menu(lcd_menu_xyz_skew);
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
+static void lcd_menu_xyz_skew()
|
|
|
+{
|
|
|
+ float angleDiff;
|
|
|
+ angleDiff = eeprom_read_float((float*)(EEPROM_XYZ_CAL_SKEW));
|
|
|
|
|
|
+ lcd.setCursor(0,0);
|
|
|
+ lcd_printPGM(MSG_MEASURED_SKEW);
|
|
|
+ if (angleDiff < 100) {
|
|
|
+ lcd.setCursor(15, 0);
|
|
|
+ lcd.print(angleDiff * 180 / M_PI);
|
|
|
+ lcd.print(LCD_STR_DEGREE);
|
|
|
+ }else lcd_print_at_PGM(16, 0, PSTR("N/A"));
|
|
|
+ lcd_print_at_PGM(0, 1, PSTR("--------------------"));
|
|
|
+ lcd_print_at_PGM(0, 2, MSG_SLIGHT_SKEW);
|
|
|
+ lcd_print_at_PGM(15, 2, PSTR(""));
|
|
|
+ lcd.print(bed_skew_angle_mild * 180 / M_PI);
|
|
|
+ lcd.print(LCD_STR_DEGREE);
|
|
|
+ lcd_print_at_PGM(0, 3, MSG_SEVERE_SKEW);
|
|
|
+ lcd_print_at_PGM(15, 3, PSTR(""));
|
|
|
+ lcd.print(bed_skew_angle_extreme * 180 / M_PI);
|
|
|
+ lcd.print(LCD_STR_DEGREE);
|
|
|
|
|
|
+ if (lcd_clicked())
|
|
|
+ {
|
|
|
+ lcd_set_custom_characters_arrows();
|
|
|
+ lcd_quick_feedback();
|
|
|
+ menu_action_back();
|
|
|
+ }
|
|
|
+}
|
|
|
|
|
|
// Save a single axis babystep value.
|
|
|
void EEPROM_save_B(int pos, int* value)
|