Skip to content

Commit

Permalink
Bug 64 lost settings (Zealandia-Systems#65)
Browse files Browse the repository at this point in the history
* Couple of bug fixes.

* Revert code that was accidentally removed.
  • Loading branch information
smohekey authored Oct 27, 2022
1 parent 3bf39f2 commit 4ef7956
Show file tree
Hide file tree
Showing 7 changed files with 1,900 additions and 697 deletions.
6 changes: 5 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,9 @@
"ranges": "cpp",
"superlusupport": "cpp",
"charconv": "cpp"
}
},
"cSpell.words": [
"Changzou",
"Fuling"
]
}
10 changes: 5 additions & 5 deletions Configuration.h
Original file line number Diff line number Diff line change
Expand Up @@ -789,7 +789,7 @@
*/
#define DEFAULT_MAX_FEEDRATE \
{ \
15000, 15000, 10000, 20000 \
208.33333333333333, 208.33333333333333, 133.33333333333333, 333.33333333333333 \
}

//#define LIMITED_MAX_FR_EDITING // Limit edit via M203 or LCD to DEFAULT_MAX_FEEDRATE * 2
Expand All @@ -808,7 +808,7 @@
*/
#define DEFAULT_MAX_ACCELERATION \
{ \
1500, 1500, 1000, 1000 \
1000, 1000, 1000, 1000 \
}

//#define LIMITED_MAX_ACCEL_EDITING // Limit edit via M201 or LCD to DEFAULT_MAX_ACCELERATION * 2
Expand All @@ -827,9 +827,9 @@
* M204 R Retract Acceleration
* M204 T Travel Acceleration
*/
#define DEFAULT_ACCELERATION 1500 // X, Y, Z and E acceleration for printing moves
#define DEFAULT_RETRACT_ACCELERATION 1500 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 1500 // X, Y, Z acceleration for travel (non printing) moves
#define DEFAULT_ACCELERATION 100 // X, Y, Z and E acceleration for printing moves
#define DEFAULT_RETRACT_ACCELERATION 100 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 100 // X, Y, Z acceleration for travel (non printing) moves

/**
* Default Jerk limits (mm/s)
Expand Down
1,927 changes: 1,561 additions & 366 deletions src/marlin/core/types.h

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/marlin/gcode/probe/G38.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ void GcodeSuite::G38(const int8_t subcode) {
feedrate_mm_s = parser.seenval('F') ? parser.value_feedrate() : (homing_feedrate((AxisEnum) i) * 0.5);
float retract = parser.seenval('R') ? parser.value_float() : 5;

if (!run_probe((AxisEnum) i, WORK_PROBE, v, retract))
if (!run_probe((AxisEnum) i, WORK_PROBE, v, retract) && error_on_fail)
SERIAL_ERROR_MSG("Failed to reach target");

endstops.enable_work_probe((AxisEnum) i, false);
Expand Down
Loading

0 comments on commit 4ef7956

Please sign in to comment.