|
@@ -1014,7 +1014,7 @@ void servo_init() {
|
1014
|
1014
|
#if ENABLED(NEOPIXEL_RGBW_LED)
|
1015
|
1015
|
|
1016
|
1016
|
const uint32_t color = pixels.Color(r, g, b, w);
|
1017
|
|
- static int nextLed = 0;
|
|
1017
|
+ static uint16_t nextLed = 0;
|
1018
|
1018
|
|
1019
|
1019
|
if (!isSequence)
|
1020
|
1020
|
set_neopixel_color(color);
|
|
@@ -5602,12 +5602,14 @@ void home_all_axes() { gcode_G28(true); }
|
5602
|
5602
|
|
5603
|
5603
|
bool G38_pass_fail = false;
|
5604
|
5604
|
|
5605
|
|
- // Get direction of move and retract
|
5606
|
|
- float retract_mm[XYZ];
|
5607
|
|
- LOOP_XYZ(i) {
|
5608
|
|
- float dist = destination[i] - current_position[i];
|
5609
|
|
- retract_mm[i] = FABS(dist) < G38_MINIMUM_MOVE ? 0 : home_bump_mm((AxisEnum)i) * (dist > 0 ? -1 : 1);
|
5610
|
|
- }
|
|
5605
|
+ #if ENABLED(PROBE_DOUBLE_TOUCH)
|
|
5606
|
+ // Get direction of move and retract
|
|
5607
|
+ float retract_mm[XYZ];
|
|
5608
|
+ LOOP_XYZ(i) {
|
|
5609
|
+ float dist = destination[i] - current_position[i];
|
|
5610
|
+ retract_mm[i] = FABS(dist) < G38_MINIMUM_MOVE ? 0 : home_bump_mm((AxisEnum)i) * (dist > 0 ? -1 : 1);
|
|
5611
|
+ }
|
|
5612
|
+ #endif
|
5611
|
5613
|
|
5612
|
5614
|
stepper.synchronize(); // wait until the machine is idle
|
5613
|
5615
|
|
|
@@ -5671,7 +5673,7 @@ void home_all_axes() { gcode_G28(true); }
|
5671
|
5673
|
// If any axis has enough movement, do the move
|
5672
|
5674
|
LOOP_XYZ(i)
|
5673
|
5675
|
if (FABS(destination[i] - current_position[i]) >= G38_MINIMUM_MOVE) {
|
5674
|
|
- if (!parser.seenval('F')) feedrate_mm_s = homing_feedrate(i);
|
|
5676
|
+ if (!parser.seenval('F')) feedrate_mm_s = homing_feedrate((AxisEnum)i);
|
5675
|
5677
|
// If G38.2 fails throw an error
|
5676
|
5678
|
if (!G38_run_probe() && is_38_2) {
|
5677
|
5679
|
SERIAL_ERROR_START();
|