josh
/
Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3929 from leptun/MK3_disable_M47

This commit is contained in:
Alex Voinea 2023-01-18 09:31:22 +02:00 committed by GitHub
parent d83c0f6c40 0c352ac2d1
commit 3767dd299a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Firmware/Marlin_main.cpp
View File

@ -5643,13 +5643,13 @@ void process_commands()
/*! /*!
### M47 - Show end stops dialog on the display <a href="https://reprap.org/wiki/G-code#M47:_Show_end_stops_dialog_on_the_display">M47: Show end stops dialog on the display</a> ### M47 - Show end stops dialog on the display <a href="https://reprap.org/wiki/G-code#M47:_Show_end_stops_dialog_on_the_display">M47: Show end stops dialog on the display</a>
*/ */
#ifndef TMC2130
case 47: case 47:
KEEPALIVE_STATE(PAUSED_FOR_USER); KEEPALIVE_STATE(PAUSED_FOR_USER);
lcd_diag_show_end_stops(); lcd_diag_show_end_stops();
KEEPALIVE_STATE(IN_HANDLER); KEEPALIVE_STATE(IN_HANDLER);
break; break;
#endif //!TMC2130
#if 0 #if 0
case 48: // M48: scan the bed induction sensor points, print the sensor trigger coordinates to the serial line for visualization on the PC. case 48: // M48: scan the bed induction sensor points, print the sensor trigger coordinates to the serial line for visualization on the PC.
{ {

7
Firmware/ultralcd.cpp
View File

@ -3357,6 +3357,7 @@ void lcd_temp_cal_show_result(bool result) {
lcd_update(2); lcd_update(2);
} }
#ifndef TMC2130
static void lcd_show_end_stops() { static void lcd_show_end_stops() {
lcd_puts_at_P(0, 0, (PSTR("End stops diag"))); lcd_puts_at_P(0, 0, (PSTR("End stops diag")));
lcd_puts_at_P(0, 1, (READ(X_MIN_PIN) ^ (bool)X_MIN_ENDSTOP_INVERTING) ? (PSTR("X1")) : (PSTR("X0"))); lcd_puts_at_P(0, 1, (READ(X_MIN_PIN) ^ (bool)X_MIN_ENDSTOP_INVERTING) ? (PSTR("X1")) : (PSTR("X0")));
@ -3364,16 +3365,11 @@ static void lcd_show_end_stops() {
lcd_puts_at_P(0, 3, (READ(Z_MIN_PIN) ^ (bool)Z_MIN_ENDSTOP_INVERTING) ? (PSTR("Z1")) : (PSTR("Z0"))); lcd_puts_at_P(0, 3, (READ(Z_MIN_PIN) ^ (bool)Z_MIN_ENDSTOP_INVERTING) ? (PSTR("Z1")) : (PSTR("Z0")));
} }
#ifndef TMC2130
static void menu_show_end_stops() { static void menu_show_end_stops() {
lcd_show_end_stops(); lcd_show_end_stops();
if (LCD_CLICKED) menu_back(); if (LCD_CLICKED) menu_back();
} }
#endif // not defined TMC2130
// Lets the user move the Z carriage up to the end stoppers.
// When done, it sets the current Z to Z_MAX_POS and returns true.
// Otherwise the Z calibration is not changed and false is returned.
void lcd_diag_show_end_stops() void lcd_diag_show_end_stops()
{ {
lcd_clear(); lcd_clear();
@ -3389,6 +3385,7 @@ void lcd_diag_show_end_stops()
lcd_clear(); lcd_clear();
lcd_return_to_status(); lcd_return_to_status();
} }
#endif // not defined TMC2130
static void lcd_print_state(uint8_t state) static void lcd_print_state(uint8_t state)
{ {

5
Firmware/ultralcd.h
View File

@ -94,12 +94,11 @@ extern uint8_t lcd_show_multiscreen_message_yes_no_and_wait_P(const char *msg, b
#ifndef TMC2130 #ifndef TMC2130
extern bool lcd_calibrate_z_end_stop_manual(bool only_z); extern bool lcd_calibrate_z_end_stop_manual(bool only_z);
extern void lcd_diag_show_end_stops();
#endif #endif
// Show the result of the calibration process on the LCD screen. // Show the result of the calibration process on the LCD screen.
extern void lcd_bed_calibration_show_result(BedSkewOffsetDetectionResultType result, uint8_t point_too_far_mask); extern void lcd_bed_calibration_show_result(BedSkewOffsetDetectionResultType result, uint8_t point_too_far_mask);
extern void lcd_diag_show_end_stops();
#define LCD_MESSAGEPGM(x) lcd_setstatuspgm(PSTR(x)) #define LCD_MESSAGEPGM(x) lcd_setstatuspgm(PSTR(x))