|
@@ -1638,6 +1638,9 @@ static void setup_for_endstop_move() {
|
1638
|
1638
|
}
|
1639
|
1639
|
|
1640
|
1640
|
static void stow_z_probe(bool doRaise = true) {
|
|
1641
|
+ #if !(HAS_SERVO_ENDSTOPS && (Z_RAISE_AFTER_PROBING > 0))
|
|
1642
|
+ UNUSED(doRaise);
|
|
1643
|
+ #endif
|
1641
|
1644
|
#if ENABLED(DEBUG_LEVELING_FEATURE)
|
1642
|
1645
|
if (DEBUGGING(LEVELING)) {
|
1643
|
1646
|
print_xyz("stow_z_probe > current_position", current_position);
|
|
@@ -1912,11 +1915,13 @@ static void setup_for_endstop_move() {
|
1912
|
1915
|
|
1913
|
1916
|
#endif // AUTO_BED_LEVELING_FEATURE
|
1914
|
1917
|
|
1915
|
|
-static void axis_unhomed_error() {
|
1916
|
|
- LCD_MESSAGEPGM(MSG_YX_UNHOMED);
|
1917
|
|
- SERIAL_ECHO_START;
|
1918
|
|
- SERIAL_ECHOLNPGM(MSG_YX_UNHOMED);
|
1919
|
|
-}
|
|
1918
|
+#if ENABLED(Z_PROBE_SLED) || ENABLED(Z_SAFE_HOMING) || ENABLED(AUTO_BED_LEVELING_FEATURE)
|
|
1919
|
+ static void axis_unhomed_error() {
|
|
1920
|
+ LCD_MESSAGEPGM(MSG_YX_UNHOMED);
|
|
1921
|
+ SERIAL_ECHO_START;
|
|
1922
|
+ SERIAL_ECHOLNPGM(MSG_YX_UNHOMED);
|
|
1923
|
+ }
|
|
1924
|
+#endif
|
1920
|
1925
|
|
1921
|
1926
|
#if ENABLED(Z_PROBE_SLED)
|
1922
|
1927
|
|
|
@@ -2300,6 +2305,8 @@ void unknown_command_error() {
|
2300
|
2305
|
SERIAL_ECHO_START;
|
2301
|
2306
|
SERIAL_ECHOLNPGM(MSG_BUSY_PAUSED_FOR_INPUT);
|
2302
|
2307
|
break;
|
|
2308
|
+ default:
|
|
2309
|
+ break;
|
2303
|
2310
|
}
|
2304
|
2311
|
}
|
2305
|
2312
|
next_busy_signal_ms = ms + 10000UL; // "busy: ..." message every 10s
|
|
@@ -3820,7 +3827,7 @@ inline void gcode_M42() {
|
3820
|
3827
|
}
|
3821
|
3828
|
|
3822
|
3829
|
double sum = 0.0, mean = 0.0, sigma = 0.0, sample_set[50];
|
3823
|
|
- uint8_t verbose_level = 1, n_samples = 10, n_legs = 0, schizoid_flag = 0;
|
|
3830
|
+ int8_t verbose_level = 1, n_samples = 10, n_legs = 0, schizoid_flag = 0;
|
3824
|
3831
|
|
3825
|
3832
|
if (code_seen('V')) {
|
3826
|
3833
|
verbose_level = code_value_short();
|
|
@@ -5476,7 +5483,7 @@ inline void gcode_M400() { st_synchronize(); }
|
5476
|
5483
|
if (delay_index2 == -1) { //initialize the ring buffer if it has not been done since startup
|
5477
|
5484
|
int temp_ratio = widthFil_to_size_ratio();
|
5478
|
5485
|
|
5479
|
|
- for (delay_index1 = 0; delay_index1 < COUNT(measurement_delay); ++delay_index1)
|
|
5486
|
+ for (delay_index1 = 0; delay_index1 < (int)COUNT(measurement_delay); ++delay_index1)
|
5480
|
5487
|
measurement_delay[delay_index1] = temp_ratio - 100; //subtract 100 to scale within a signed byte
|
5481
|
5488
|
|
5482
|
5489
|
delay_index1 = delay_index2 = 0;
|
|
@@ -5525,7 +5532,7 @@ inline void gcode_M410() { quickStop(); }
|
5525
|
5532
|
* M421: Set a single Mesh Bed Leveling Z coordinate
|
5526
|
5533
|
*/
|
5527
|
5534
|
inline void gcode_M421() {
|
5528
|
|
- float x, y, z;
|
|
5535
|
+ float x = 0, y = 0, z = 0;
|
5529
|
5536
|
bool err = false, hasX, hasY, hasZ;
|
5530
|
5537
|
if ((hasX = code_seen('X'))) x = code_value();
|
5531
|
5538
|
if ((hasY = code_seen('Y'))) y = code_value();
|
|
@@ -5688,7 +5695,10 @@ inline void gcode_M503() {
|
5688
|
5695
|
return;
|
5689
|
5696
|
}
|
5690
|
5697
|
|
5691
|
|
- float lastpos[NUM_AXIS], fr60 = feedrate / 60;
|
|
5698
|
+ float lastpos[NUM_AXIS];
|
|
5699
|
+ #if ENABLED(DELTA)
|
|
5700
|
+ float fr60 = feedrate / 60;
|
|
5701
|
+ #endif
|
5692
|
5702
|
|
5693
|
5703
|
for (int i = 0; i < NUM_AXIS; i++)
|
5694
|
5704
|
lastpos[i] = destination[i] = current_position[i];
|
|
@@ -5745,7 +5755,9 @@ inline void gcode_M503() {
|
5745
|
5755
|
disable_e3();
|
5746
|
5756
|
delay(100);
|
5747
|
5757
|
LCD_ALERTMESSAGEPGM(MSG_FILAMENTCHANGE);
|
5748
|
|
- millis_t next_tick = 0;
|
|
5758
|
+ #if DISABLED(AUTO_FILAMENT_CHANGE)
|
|
5759
|
+ millis_t next_tick = 0;
|
|
5760
|
+ #endif
|
5749
|
5761
|
KEEPALIVE_STATE(PAUSED_FOR_USER);
|
5750
|
5762
|
while (!lcd_clicked()) {
|
5751
|
5763
|
#if DISABLED(AUTO_FILAMENT_CHANGE)
|