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

Merge pull request #4358 from 3d-gussner/MK3_3131_fix_Z_crash 

Fix Z crash and update to 3.13.1
This commit is contained in:
3d-gussner 2023-08-31 09:42:07 +02:00 committed by GitHub
parent e58a902629 5581b78eaa
commit 044a9a4f3e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Firmware/Configuration.h
View File

@ -15,16 +15,16 @@ extern const char _sPrinterMmuName[] PROGMEM;
// Firmware version // Firmware version
#define FW_MAJOR 3 #define FW_MAJOR 3
#define FW_MINOR 13 #define FW_MINOR 13
#define FW_REVISION 0 #define FW_REVISION 1
//#define FW_FLAVOR RC //uncomment if DEBUG, DEVEL, ALPHA, BETA or RC //#define FW_FLAVOR RC //uncomment if DEBUG, DEVEL, ALPHA, BETA or RC
#define FW_FLAVERSION 1 //uncomment if FW_FLAVOR is defined and versioning is needed. Limited to max 8. //#define FW_FLAVERSION 1 //uncomment if FW_FLAVOR is defined and versioning is needed. Limited to max 8.
#ifndef FW_FLAVOR #ifndef FW_FLAVOR
#define FW_VERSION STR(FW_MAJOR) "." STR(FW_MINOR) "." STR(FW_REVISION) #define FW_VERSION STR(FW_MAJOR) "." STR(FW_MINOR) "." STR(FW_REVISION)
#else #else
#define FW_VERSION STR(FW_MAJOR) "." STR(FW_MINOR) "." STR(FW_REVISION) "-" STR(FW_FLAVOR) "" STR(FW_FLAVERSION) #define FW_VERSION STR(FW_MAJOR) "." STR(FW_MINOR) "." STR(FW_REVISION) "-" STR(FW_FLAVOR) "" STR(FW_FLAVERSION)
#endif #endif
#define FW_COMMIT_NR 6873 #define FW_COMMIT_NR 6876
// FW_VERSION_UNKNOWN means this is an unofficial build. // FW_VERSION_UNKNOWN means this is an unofficial build.
// The firmware should only be checked into github with this symbol. // The firmware should only be checked into github with this symbol.

22
Firmware/mesh_bed_calibration.cpp
View File

@ -2790,16 +2790,22 @@ canceled:
#endif //NEW_XYZCAL #endif //NEW_XYZCAL
bool sample_z() { bool sample_z() {
bool sampled = true; bool sampled = true;
//make space // make some space for the sheet
raise_z(150); // Avoid calling raise_z(), because a false triggering stallguard may prevent the Z from moving.
lcd_show_fullscreen_message_and_wait_P(_T(MSG_PLACE_STEEL_SHEET)); // The extruder then may ram the sheet hard if not going down from some ~150mm height
current_position[Z_AXIS] = 0.F;
destination[Z_AXIS] = 150.F;
plan_buffer_line_destinationXYZE(homing_feedrate[Z_AXIS] / 60);
// Sample Z heights for the mesh bed leveling. lcd_show_fullscreen_message_and_wait_P(_T(MSG_PLACE_STEEL_SHEET));
// In addition, store the results into an eeprom, to be used later for verification of the bed leveling process.
if (!sample_mesh_and_store_reference()) sampled = false;
return sampled; // Sample Z heights for the mesh bed leveling.
// In addition, store the results into an eeprom, to be used later for verification of the bed leveling process.
if (!sample_mesh_and_store_reference())
sampled = false;
return sampled;
} }
void go_home_with_z_lift() void go_home_with_z_lift()