Skip to content

Commit 7f50658

Browse files
moonglowmoonglow
committed
*sync with upstream repo
1 parent cf819b9 commit 7f50658

48 files changed

Lines changed: 2084 additions & 573 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Marlin/Marlin/Configuration.h‎

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,6 @@
303303

304304
#define PARKING_EXTRUDER_PARKING_X { -78, 184 } // X positions for parking the extruders
305305
#define PARKING_EXTRUDER_GRAB_DISTANCE 1 // (mm) Distance to move beyond the parking point to grab the extruder
306-
//#define MANUAL_SOLENOID_CONTROL // Manual control of docking solenoids with M380 S / M381
307306

308307
#if ENABLED(PARKING_EXTRUDER)
309308

@@ -1409,24 +1408,24 @@
14091408
// @section extruder
14101409
// For direct drive extruder v9 set to true, for geared extruder set to false.
14111410
#if ANY(FF_DREAMER_MACHINE, FF_INVENTOR_MACHINE)
1412-
#if ENABLED(FF_EXTRUDER_SWAP)
1413-
#if ENABLED(FF_DREAMER_OLD_MB)
1414-
#define INVERT_E0_DIR true
1415-
#else
1416-
#define INVERT_E0_DIR false
1417-
#endif
1418-
#define INVERT_E1_DIR false
1419-
#else
1420-
#define INVERT_E0_DIR false
1421-
#if ENABLED(FF_DREAMER_OLD_MB)
1422-
#define INVERT_E1_DIR true
1423-
#else
1424-
#define INVERT_E1_DIR false
1425-
#endif
1426-
#endif
1411+
#if ENABLED(FF_EXTRUDER_SWAP)
1412+
#define INVERT_E0_DIR false
1413+
#if ENABLED(FF_DREAMER_OLD_MB)
1414+
#define INVERT_E1_DIR true
1415+
#else
1416+
#define INVERT_E1_DIR false
1417+
#endif
1418+
#else
1419+
#define INVERT_E1_DIR false
1420+
#if ENABLED(FF_DREAMER_OLD_MB)
1421+
#define INVERT_E0_DIR true
1422+
#else
1423+
#define INVERT_E0_DIR false
1424+
#endif
1425+
#endif
14271426
#else
1428-
#define INVERT_E0_DIR true
1429-
#define INVERT_E1_DIR true
1427+
#define INVERT_E0_DIR true
1428+
#define INVERT_E1_DIR true
14301429
#endif
14311430
#define INVERT_E2_DIR false
14321431
#define INVERT_E3_DIR false

‎Marlin/Marlin/src/core/boards.h‎

Lines changed: 31 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -346,16 +346,17 @@
346346
#define BOARD_CREALITY_V431_D 4046 // Creality v4.3.1d (STM32F103RE)
347347
#define BOARD_CREALITY_V452 4047 // Creality v4.5.2 (STM32F103RE)
348348
#define BOARD_CREALITY_V453 4048 // Creality v4.5.3 (STM32F103RE)
349-
#define BOARD_TRIGORILLA_PRO 4049 // Trigorilla Pro (STM32F103ZET6)
350-
#define BOARD_FLY_MINI 4050 // FLYmaker FLY MINI (STM32F103RCT6)
351-
#define BOARD_FLSUN_HISPEED 4051 // FLSUN HiSpeedV1 (STM32F103VET6)
352-
#define BOARD_BEAST 4052 // STM32F103RET6 Libmaple-based controller
353-
#define BOARD_MINGDA_MPX_ARM_MINI 4053 // STM32F103ZET6 Mingda MD-16
354-
#define BOARD_GTM32_PRO_VD 4054 // STM32F103VET6 controller
355-
#define BOARD_ZONESTAR_ZM3E2 4055 // Zonestar ZM3E2 (STM32F103RCT6)
356-
#define BOARD_ZONESTAR_ZM3E4 4056 // Zonestar ZM3E4 V1 (STM32F103VCT6)
357-
#define BOARD_ZONESTAR_ZM3E4V2 4057 // Zonestar ZM3E4 V2 (STM32F103VCT6)
358-
#define BOARD_ERYONE_ERY32_MINI 4058 // Eryone Ery32 mini (STM32F103VET6)
349+
#define BOARD_CREALITY_V24S1 4049 // Creality v2.4.S1 (STM32F103RE) v101 as found in the Ender 7
350+
#define BOARD_TRIGORILLA_PRO 4050 // Trigorilla Pro (STM32F103ZET6)
351+
#define BOARD_FLY_MINI 4051 // FLYmaker FLY MINI (STM32F103RCT6)
352+
#define BOARD_FLSUN_HISPEED 4052 // FLSUN HiSpeedV1 (STM32F103VET6)
353+
#define BOARD_BEAST 4053 // STM32F103RET6 Libmaple-based controller
354+
#define BOARD_MINGDA_MPX_ARM_MINI 4054 // STM32F103ZET6 Mingda MD-16
355+
#define BOARD_GTM32_PRO_VD 4055 // STM32F103VET6 controller
356+
#define BOARD_ZONESTAR_ZM3E2 4056 // Zonestar ZM3E2 (STM32F103RCT6)
357+
#define BOARD_ZONESTAR_ZM3E4 4057 // Zonestar ZM3E4 V1 (STM32F103VCT6)
358+
#define BOARD_ZONESTAR_ZM3E4V2 4058 // Zonestar ZM3E4 V2 (STM32F103VCT6)
359+
#define BOARD_ERYONE_ERY32_MINI 4059 // Eryone Ery32 mini (STM32F103VET6)
359360

360361
//
361362
// ARM Cortex-M4F
@@ -385,25 +386,26 @@
385386
#define BOARD_BTT_GTR_V1_0 4214 // BigTreeTech GTR v1.0 (STM32F407IGT)
386387
#define BOARD_BTT_OCTOPUS_V1_0 4215 // BigTreeTech Octopus v1.0 (STM32F446ZET6)
387388
#define BOARD_BTT_OCTOPUS_V1_1 4216 // BigTreeTech Octopus v1.1 (STM32F446ZET6)
388-
#define BOARD_LERDGE_K 4217 // Lerdge K (STM32F407ZG)
389-
#define BOARD_LERDGE_S 4218 // Lerdge S (STM32F407VE)
390-
#define BOARD_LERDGE_X 4219 // Lerdge X (STM32F407VE)
391-
#define BOARD_VAKE403D 4220 // VAkE 403D (STM32F446VET6)
392-
#define BOARD_FYSETC_S6 4221 // FYSETC S6 (STM32F446VET6)
393-
#define BOARD_FYSETC_S6_V2_0 4222 // FYSETC S6 v2.0 (STM32F446VET6)
394-
#define BOARD_FYSETC_SPIDER 4223 // FYSETC Spider (STM32F446VET6)
395-
#define BOARD_FLYF407ZG 4224 // FLYmaker FLYF407ZG (STM32F407ZG)
396-
#define BOARD_MKS_ROBIN2 4225 // MKS_ROBIN2 (STM32F407ZE)
397-
#define BOARD_MKS_ROBIN_PRO_V2 4226 // MKS Robin Pro V2 (STM32F407VE)
398-
#define BOARD_MKS_ROBIN_NANO_V3 4227 // MKS Robin Nano V3 (STM32F407VG)
399-
#define BOARD_MKS_MONSTER8 4228 // MKS Monster8 (STM32F407VGT6)
400-
#define BOARD_ANET_ET4 4229 // ANET ET4 V1.x (STM32F407VGT6)
401-
#define BOARD_ANET_ET4P 4230 // ANET ET4P V1.x (STM32F407VGT6)
402-
#define BOARD_FYSETC_CHEETAH_V20 4231 // FYSETC Cheetah V2.0
403-
#define BOARD_TH3D_EZBOARD_LITE_V2 4232 // TH3D EZBoard Lite v2.0
404-
#define BOARD_INDEX_REV03 4233 // Index PnP Controller REV03 (STM32F407VET6/VGT6)
405-
#define BOARD_MKS_ROBIN_NANO_V1_3_F4 4234 // MKS Robin Nano V1.3 and MKS Robin Nano-S V1.3 (STM32F407VET6)
406-
#define BOARD_MKS_EAGLE 4235 // MKS Eagle (STM32F407VET6)
389+
#define BOARD_BTT_OCTOPUS_PRO_V1_0 4217 // BigTreeTech Octopus Pro v1.0 (STM32F446ZET6/STM32F429ZGT6)
390+
#define BOARD_LERDGE_K 4218 // Lerdge K (STM32F407ZG)
391+
#define BOARD_LERDGE_S 4219 // Lerdge S (STM32F407VE)
392+
#define BOARD_LERDGE_X 4220 // Lerdge X (STM32F407VE)
393+
#define BOARD_VAKE403D 4221 // VAkE 403D (STM32F446VET6)
394+
#define BOARD_FYSETC_S6 4222 // FYSETC S6 (STM32F446VET6)
395+
#define BOARD_FYSETC_S6_V2_0 4223 // FYSETC S6 v2.0 (STM32F446VET6)
396+
#define BOARD_FYSETC_SPIDER 4224 // FYSETC Spider (STM32F446VET6)
397+
#define BOARD_FLYF407ZG 4225 // FLYmaker FLYF407ZG (STM32F407ZG)
398+
#define BOARD_MKS_ROBIN2 4226 // MKS_ROBIN2 (STM32F407ZE)
399+
#define BOARD_MKS_ROBIN_PRO_V2 4227 // MKS Robin Pro V2 (STM32F407VE)
400+
#define BOARD_MKS_ROBIN_NANO_V3 4228 // MKS Robin Nano V3 (STM32F407VG)
401+
#define BOARD_MKS_MONSTER8 4229 // MKS Monster8 (STM32F407VGT6)
402+
#define BOARD_ANET_ET4 4230 // ANET ET4 V1.x (STM32F407VGT6)
403+
#define BOARD_ANET_ET4P 4231 // ANET ET4P V1.x (STM32F407VGT6)
404+
#define BOARD_FYSETC_CHEETAH_V20 4232 // FYSETC Cheetah V2.0
405+
#define BOARD_TH3D_EZBOARD_LITE_V2 4233 // TH3D EZBoard Lite v2.0
406+
#define BOARD_INDEX_REV03 4234 // Index PnP Controller REV03 (STM32F407VET6/VGT6)
407+
#define BOARD_MKS_ROBIN_NANO_V1_3_F4 4235 // MKS Robin Nano V1.3 and MKS Robin Nano-S V1.3 (STM32F407VET6)
408+
#define BOARD_MKS_EAGLE 4236 // MKS Eagle (STM32F407VET6)
407409
#define BOARD_FF_MOTHERBOARD 4250 // FlashForge board ( STM32F407ZG )
408410

409411
//

‎Marlin/Marlin/src/feature/leds/leds.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -170,9 +170,9 @@ void LEDLights::set_color(const LEDColor &incol
170170

171171
#if ENABLED(NEO2_COLOR_PRESETS)
172172
const LEDColor LEDLights2::defaultLEDColor = LEDColor(
173-
LED_USER_PRESET_RED, LED_USER_PRESET_GREEN, LED_USER_PRESET_BLUE
174-
OPTARG(HAS_WHITE_LED2, LED_USER_PRESET_WHITE)
175-
OPTARG(NEOPIXEL_LED, LED_USER_PRESET_BRIGHTNESS)
173+
NEO2_USER_PRESET_RED, NEO2_USER_PRESET_GREEN, NEO2_USER_PRESET_BLUE
174+
OPTARG(HAS_WHITE_LED2, NEO2_USER_PRESET_WHITE)
175+
OPTARG(NEOPIXEL_LED, NEO2_USER_PRESET_BRIGHTNESS)
176176
);
177177
#endif
178178

‎Marlin/Marlin/src/feature/probe_temp_comp.cpp‎

Lines changed: 36 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424

2525
#if ENABLED(PROBE_TEMP_COMPENSATION)
2626

27+
//#define DEBUG_PTC // Print extra debug output with 'M871'
28+
2729
#include "probe_temp_comp.h"
2830
#include <math.h>
2931

@@ -79,9 +81,17 @@ void ProbeTempComp::print_offsets() {
7981
" temp: ", temp,
8082
"C; Offset: ", i < 0 ? 0.0f : sensor_z_offsets[s][i], " um"
8183
);
82-
temp += cali_info[s].temp_res;
84+
temp += cali_info[s].temp_resolution;
8385
}
8486
}
87+
#if ENABLED(DEBUG_PTC)
88+
float meas[4] = { 0, 0, 0, 0 };
89+
compensate_measurement(TSI_PROBE, 27.5, meas[0]);
90+
compensate_measurement(TSI_PROBE, 32.5, meas[1]);
91+
compensate_measurement(TSI_PROBE, 77.5, meas[2]);
92+
compensate_measurement(TSI_PROBE, 82.5, meas[3]);
93+
SERIAL_ECHOLNPGM("DEBUG_PTC 27.5:", meas[0], " 32.5:", meas[1], " 77.5:", meas[2], " 82.5:", meas[3]);
94+
#endif
8595
}
8696

8797
void ProbeTempComp::prepare_new_calibration(const_float_t init_meas_z) {
@@ -111,7 +121,7 @@ bool ProbeTempComp::finish_calibration(const TempSensorID tsi) {
111121

112122
const uint8_t measurements = cali_info[tsi].measurements;
113123
const celsius_t start_temp = cali_info[tsi].start_temp,
114-
res_temp = cali_info[tsi].temp_res;
124+
res_temp = cali_info[tsi].temp_resolution;
115125
int16_t * const data = sensor_z_offsets[tsi];
116126

117127
// Extrapolate
@@ -156,46 +166,45 @@ bool ProbeTempComp::finish_calibration(const TempSensorID tsi) {
156166
}
157167

158168
void ProbeTempComp::compensate_measurement(const TempSensorID tsi, const celsius_t temp, float &meas_z) {
159-
if (WITHIN(temp, cali_info[tsi].start_temp, cali_info[tsi].end_temp))
160-
meas_z -= get_offset_for_temperature(tsi, temp);
161-
}
162-
163-
float ProbeTempComp::get_offset_for_temperature(const TempSensorID tsi, const celsius_t temp) {
164169
const uint8_t measurements = cali_info[tsi].measurements;
165170
const celsius_t start_temp = cali_info[tsi].start_temp,
166-
res_temp = cali_info[tsi].temp_res;
171+
end_temp = cali_info[tsi].end_temp,
172+
res_temp = cali_info[tsi].temp_resolution;
167173
const int16_t * const data = sensor_z_offsets[tsi];
168174

169-
auto point = [&](uint8_t i) -> xy_float_t {
170-
return xy_float_t({ static_cast<float>(start_temp) + i * res_temp, static_cast<float>(data[i]) });
175+
// Given a data index, return { celsius, zoffset } in the form { x, y }
176+
auto tpoint = [&](uint8_t i) -> xy_float_t {
177+
return xy_float_t({ static_cast<float>(start_temp) + i * res_temp, i ? static_cast<float>(data[i - 1]) : 0.0f });
171178
};
172179

180+
// Interpolate Z based on a temperature being within a given range
173181
auto linear_interp = [](const_float_t x, xy_float_t p1, xy_float_t p2) {
174-
return (p2.y - p1.y) / (p2.x - p2.y) * (x - p1.x) + p1.y;
182+
// zoffs1 + zoffset_per_toffset * toffset
183+
return p1.y + (p2.y - p1.y) / (p2.x - p1.x) * (x - p1.x);
175184
};
176185

177-
// Linear interpolation
178-
uint8_t idx = static_cast<uint8_t>((temp - start_temp) / res_temp);
179-
180186
// offset in µm
181187
float offset = 0.0f;
182188

183-
#if !defined(PTC_LINEAR_EXTRAPOLATION) || PTC_LINEAR_EXTRAPOLATION <= 0
184-
if (idx < 0)
189+
#if PTC_LINEAR_EXTRAPOLATION
190+
if (temp < start_temp)
191+
offset = linear_interp(temp, tpoint(0), tpoint(PTC_LINEAR_EXTRAPOLATION));
192+
else if (temp >= end_temp)
193+
offset = linear_interp(temp, tpoint(measurements - PTC_LINEAR_EXTRAPOLATION), tpoint(measurements));
194+
#else
195+
if (temp < start_temp)
185196
offset = 0.0f;
186-
else if (idx > measurements - 2)
197+
else if (temp >= end_temp)
187198
offset = static_cast<float>(data[measurements - 1]);
188-
#else
189-
if (idx < 0)
190-
offset = linear_interp(temp, point(0), point(PTC_LINEAR_EXTRAPOLATION));
191-
else if (idx > measurements - 2)
192-
offset = linear_interp(temp, point(measurements - PTC_LINEAR_EXTRAPOLATION - 1), point(measurements - 1));
193199
#endif
194-
else
195-
offset = linear_interp(temp, point(idx), point(idx + 1));
200+
else {
201+
// Linear interpolation
202+
const int8_t idx = static_cast<int8_t>((temp - start_temp) / res_temp);
203+
offset = linear_interp(temp, tpoint(idx), tpoint(idx + 1));
204+
}
196205

197-
// return offset in mm
198-
return offset / 1000.0f;
206+
// convert offset to mm and apply it
207+
meas_z -= offset / 1000.0f;
199208
}
200209

201210
bool ProbeTempComp::linear_regression(const TempSensorID tsi, float &k, float &d) {
@@ -204,7 +213,7 @@ bool ProbeTempComp::linear_regression(const TempSensorID tsi, float &k, float &d
204213
if (!WITHIN(calib_idx, 2, cali_info[tsi].measurements)) return false;
205214

206215
const celsius_t start_temp = cali_info[tsi].start_temp,
207-
res_temp = cali_info[tsi].temp_res;
216+
res_temp = cali_info[tsi].temp_resolution;
208217
const int16_t * const data = sensor_z_offsets[tsi];
209218

210219
float sum_x = start_temp,

‎Marlin/Marlin/src/feature/probe_temp_comp.h‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ enum TempSensorID : uint8_t {
3333
};
3434

3535
typedef struct {
36-
uint8_t measurements; // Max. number of measurements to be stored (35 - 80°C)
37-
celsius_t temp_res, // Resolution in °C between measurements
38-
start_temp, // Base measurement; z-offset == 0
36+
uint8_t measurements; // Max. number of measurements to be stored (35 - 80°C)
37+
celsius_t temp_resolution, // Resolution in °C between measurements
38+
start_temp, // Base measurement; z-offset == 0
3939
end_temp;
4040
} temp_calib_t;
4141

@@ -135,8 +135,6 @@ class ProbeTempComp {
135135
*/
136136
static float init_measurement;
137137

138-
static float get_offset_for_temperature(const TempSensorID tsi, const celsius_t temp);
139-
140138
/**
141139
* Fit a linear function in measured temperature offsets
142140
* to allow generating values of higher temperatures.

‎Marlin/Marlin/src/feature/solenoid.cpp‎

Lines changed: 5 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -34,28 +34,12 @@
3434
#include "../module/tool_change.h"
3535
#endif
3636

37-
#define HAS_SOLENOID(N) (HAS_SOLENOID_##N && (ENABLED(MANUAL_SOLENOID_CONTROL) || N < EXTRUDERS))
38-
3937
// Used primarily with MANUAL_SOLENOID_CONTROL
4038
static void set_solenoid(const uint8_t num, const bool active) {
4139
const uint8_t value = active ? PE_MAGNET_ON_STATE : !PE_MAGNET_ON_STATE;
40+
#define _SOL_CASE(N) case N: TERN_(HAS_SOLENOID_##N, OUT_WRITE(SOL##N##_PIN, value)); break;
4241
switch (num) {
43-
case 0: OUT_WRITE(SOL0_PIN, value); break;
44-
#if HAS_SOLENOID(1)
45-
case 1: OUT_WRITE(SOL1_PIN, value); break;
46-
#endif
47-
#if HAS_SOLENOID(2)
48-
case 2: OUT_WRITE(SOL2_PIN, value); break;
49-
#endif
50-
#if HAS_SOLENOID(3)
51-
case 3: OUT_WRITE(SOL3_PIN, value); break;
52-
#endif
53-
#if HAS_SOLENOID(4)
54-
case 4: OUT_WRITE(SOL4_PIN, value); break;
55-
#endif
56-
#if HAS_SOLENOID(5)
57-
case 5: OUT_WRITE(SOL5_PIN, value); break;
58-
#endif
42+
REPEAT(8, _SOL_CASE)
5943
default: SERIAL_ECHO_MSG(STR_INVALID_SOLENOID); break;
6044
}
6145

@@ -67,25 +51,11 @@ static void set_solenoid(const uint8_t num, const bool active) {
6751

6852
void enable_solenoid(const uint8_t num) { set_solenoid(num, true); }
6953
void disable_solenoid(const uint8_t num) { set_solenoid(num, false); }
70-
void enable_solenoid_on_active_extruder() { enable_solenoid(active_extruder); }
54+
void enable_solenoid_on_active_extruder() { }
7155

7256
void disable_all_solenoids() {
73-
disable_solenoid(0);
74-
#if HAS_SOLENOID(1)
75-
disable_solenoid(1);
76-
#endif
77-
#if HAS_SOLENOID(2)
78-
disable_solenoid(2);
79-
#endif
80-
#if HAS_SOLENOID(3)
81-
disable_solenoid(3);
82-
#endif
83-
#if HAS_SOLENOID(4)
84-
disable_solenoid(4);
85-
#endif
86-
#if HAS_SOLENOID(5)
87-
disable_solenoid(5);
88-
#endif
57+
#define _SOL_DISABLE(N) TERN_(HAS_SOLENOID_##N, disable_solenoid(N));
58+
REPEAT(8, _SOL_DISABLE)
8959
}
9060

9161
#endif // EXT_SOLENOID || MANUAL_SOLENOID_CONTROL

‎Marlin/Marlin/src/gcode/calibrate/G28.cpp‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ void GcodeSuite::G28() {
264264
reset_stepper_timeout();
265265

266266
#define HAS_CURRENT_HOME(N) (defined(N##_CURRENT_HOME) && N##_CURRENT_HOME != N##_CURRENT)
267-
#if HAS_CURRENT_HOME(X) || HAS_CURRENT_HOME(X2) || HAS_CURRENT_HOME(Y) || HAS_CURRENT_HOME(Y2) || (ENABLED(DELTA) && HAS_CURRENT_HOME(Z))
267+
#if HAS_CURRENT_HOME(X) || HAS_CURRENT_HOME(X2) || HAS_CURRENT_HOME(Y) || HAS_CURRENT_HOME(Y2) || HAS_CURRENT_HOME(I) || HAS_CURRENT_HOME(J) || HAS_CURRENT_HOME(K) || (ENABLED(DELTA) && HAS_CURRENT_HOME(Z))
268268
#define HAS_HOMING_CURRENT 1
269269
#endif
270270

@@ -292,6 +292,21 @@ void GcodeSuite::G28() {
292292
stepperY2.rms_current(Y2_CURRENT_HOME);
293293
if (DEBUGGING(LEVELING)) debug_current(PSTR("Y2"), tmc_save_current_Y2, Y2_CURRENT_HOME);
294294
#endif
295+
#if HAS_CURRENT_HOME(I)
296+
const int16_t tmc_save_current_I = stepperI.getMilliamps();
297+
stepperI.rms_current(I_CURRENT_HOME);
298+
if (DEBUGGING(LEVELING)) debug_current(F(AXIS4_STR), tmc_save_current_I, I_CURRENT_HOME);
299+
#endif
300+
#if HAS_CURRENT_HOME(J)
301+
const int16_t tmc_save_current_J = stepperJ.getMilliamps();
302+
stepperJ.rms_current(J_CURRENT_HOME);
303+
if (DEBUGGING(LEVELING)) debug_current(F(AXIS5_STR), tmc_save_current_J, J_CURRENT_HOME);
304+
#endif
305+
#if HAS_CURRENT_HOME(K)
306+
const int16_t tmc_save_current_K = stepperK.getMilliamps();
307+
stepperK.rms_current(K_CURRENT_HOME);
308+
if (DEBUGGING(LEVELING)) debug_current(F(AXIS6_STR), tmc_save_current_K, K_CURRENT_HOME);
309+
#endif
295310
#if HAS_CURRENT_HOME(Z) && ENABLED(DELTA)
296311
const int16_t tmc_save_current_Z = stepperZ.getMilliamps();
297312
stepperZ.rms_current(Z_CURRENT_HOME);

‎Marlin/Marlin/src/gcode/calibrate/G76_M192_M871.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ void GcodeSuite::G76() {
121121
temp_comp.prepare_new_calibration(measured_z);
122122
else
123123
temp_comp.push_back_new_measurement(sid, measured_z);
124-
targ += cali_info_init[sid].temp_res;
124+
targ += cali_info_init[sid].temp_resolution;
125125
}
126126
return measured_z;
127127
};

‎Marlin/Marlin/src/gcode/feature/L6470/M906.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ void GcodeSuite::M906() {
280280

281281
#if E_STEPPERS
282282
case E_AXIS: {
283-
const int8_t target_e_stepper = get_target_e_stepper_from_command();
283+
const int8_t target_e_stepper = get_target_e_stepper_from_command(0);
284284
if (target_e_stepper < 0) return;
285285
switch (target_e_stepper) {
286286
#if AXIS_IS_L64XX(E0)

‎Marlin/Marlin/src/gcode/feature/trinamic/M569.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ static void say_stealth_status() {
133133
*/
134134
void GcodeSuite::M569() {
135135
if (parser.seen('S'))
136-
set_stealth_status(parser.value_bool(), get_target_e_stepper_from_command());
136+
set_stealth_status(parser.value_bool(), get_target_e_stepper_from_command(0));
137137
else
138138
say_stealth_status();
139139
}

0 commit comments

Comments
 (0)