Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Z crash and update to 3.13.1 #4358

Merged
merged 2 commits into from
Aug 31, 2023
Merged

Fix Z crash and update to 3.13.1 #4358

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c9de941
Force-move-Z after searching for XY calibration points
Aug 31, 2023
5581b78
Update to FW3.13.1
3d-gussner Aug 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Firmware/Configuration.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,16 @@ extern const char _sPrinterMmuName[] PROGMEM;
// Firmware version
#define FW_MAJOR 3
#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_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
#define FW_VERSION STR(FW_MAJOR) "." STR(FW_MINOR) "." STR(FW_REVISION)
#else
#define FW_VERSION STR(FW_MAJOR) "." STR(FW_MINOR) "." STR(FW_REVISION) "-" STR(FW_FLAVOR) "" STR(FW_FLAVERSION)
#endif

#define FW_COMMIT_NR 6873
#define FW_COMMIT_NR 6876

// FW_VERSION_UNKNOWN means this is an unofficial build.
// The firmware should only be checked into github with this symbol.
Expand Down
22 changes: 14 additions & 8 deletions Firmware/mesh_bed_calibration.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2790,16 +2790,22 @@ BedSkewOffsetDetectionResultType improve_bed_offset_and_skew(int8_t method, int8
#endif //NEW_XYZCAL

bool sample_z() {
bool sampled = true;
//make space
raise_z(150);
lcd_show_fullscreen_message_and_wait_P(_T(MSG_PLACE_STEEL_SHEET));
bool sampled = true;
// make some space for the sheet
// Avoid calling raise_z(), because a false triggering stallguard may prevent the Z from moving.
// 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.
// 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;
lcd_show_fullscreen_message_and_wait_P(_T(MSG_PLACE_STEEL_SHEET));

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()
Expand Down