Skip to content

Commit 96c75ed

Browse files
committed
🔧 Supporting changes
1 parent 6f89d88 commit 96c75ed

26 files changed

+472
-195
lines changed

Marlin/Configuration.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -849,6 +849,8 @@
849849
// FIND YOUR OWN: "M303 E-2 C8 S50" to run autotune on the chamber at 50 degreesC for 8 cycles.
850850
#endif // PIDTEMPCHAMBER
851851

852+
// @section pid temp
853+
852854
#if ANY(PIDTEMP, PIDTEMPBED, PIDTEMPCHAMBER)
853855
//#define PID_OPENLOOP // Puts PID in open loop. M104/M140 sets the output power from 0 to PID_MAX
854856
//#define SLOW_PWM_HEATERS // PWM with very low frequency (roughly 0.125Hz=8s) and minimum state time of approximately 1s useful for heaters driven by a relay

Marlin/Configuration_adv.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,7 @@
304304
* If you get false positives for "Thermal Runaway", increase
305305
* THERMAL_PROTECTION_HYSTERESIS and/or THERMAL_PROTECTION_PERIOD
306306
*/
307-
#if ENABLED(THERMAL_PROTECTION_HOTENDS)
307+
#if ALL(HAS_HOTEND, THERMAL_PROTECTION_HOTENDS)
308308
#define THERMAL_PROTECTION_PERIOD 40 // (seconds)
309309
#define THERMAL_PROTECTION_HYSTERESIS 4 // (°C)
310310

@@ -335,7 +335,7 @@
335335
/**
336336
* Thermal Protection parameters for the bed are just as above for hotends.
337337
*/
338-
#if ENABLED(THERMAL_PROTECTION_BED)
338+
#if TEMP_SENSOR_BED && ENABLED(THERMAL_PROTECTION_BED)
339339
#define THERMAL_PROTECTION_BED_PERIOD 20 // (seconds)
340340
#define THERMAL_PROTECTION_BED_HYSTERESIS 2 // (°C)
341341

@@ -349,7 +349,7 @@
349349
/**
350350
* Thermal Protection parameters for the heated chamber.
351351
*/
352-
#if ENABLED(THERMAL_PROTECTION_CHAMBER)
352+
#if TEMP_SENSOR_CHAMBER && ENABLED(THERMAL_PROTECTION_CHAMBER)
353353
#define THERMAL_PROTECTION_CHAMBER_PERIOD 20 // (seconds)
354354
#define THERMAL_PROTECTION_CHAMBER_HYSTERESIS 2 // (°C)
355355

@@ -363,7 +363,7 @@
363363
/**
364364
* Thermal Protection parameters for the laser cooler.
365365
*/
366-
#if ENABLED(THERMAL_PROTECTION_COOLER)
366+
#if TEMP_SENSOR_COOLER && ENABLED(THERMAL_PROTECTION_COOLER)
367367
#define THERMAL_PROTECTION_COOLER_PERIOD 10 // (seconds)
368368
#define THERMAL_PROTECTION_COOLER_HYSTERESIS 3 // (°C)
369369

Marlin/src/gcode/bedlevel/G26.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -132,11 +132,11 @@
132132
#endif
133133

134134
#ifndef G26_XY_FEEDRATE
135-
#define G26_XY_FEEDRATE (PLANNER_XY_FEEDRATE() / 3.0)
135+
#define G26_XY_FEEDRATE (PLANNER_XY_FEEDRATE_MM_S / 3.0)
136136
#endif
137137

138138
#ifndef G26_XY_FEEDRATE_TRAVEL
139-
#define G26_XY_FEEDRATE_TRAVEL (PLANNER_XY_FEEDRATE() / 1.5)
139+
#define G26_XY_FEEDRATE_TRAVEL (PLANNER_XY_FEEDRATE_MM_S / 1.5)
140140
#endif
141141

142142
#if CROSSHAIRS_SIZE >= INTERSECTION_CIRCLE_RADIUS
@@ -783,7 +783,7 @@ void GcodeSuite::G26() {
783783

784784
g26.recover_filament(destination);
785785

786-
{ REMEMBER(fr, feedrate_mm_s, PLANNER_XY_FEEDRATE() * 0.1f);
786+
{ REMEMBER(fr, feedrate_mm_s, PLANNER_XY_FEEDRATE_MM_S * 0.1f);
787787
plan_arc(endpoint, arc_offset, false, 0); // Draw a counter-clockwise arc
788788
destination = current_position;
789789
}

Marlin/src/gcode/bedlevel/G42.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,12 @@
2727
#include "../gcode.h"
2828
#include "../../MarlinCore.h" // for IsRunning()
2929
#include "../../module/motion.h"
30-
#include "../../module/probe.h" // for probe.offset
3130
#include "../../feature/bedlevel/bedlevel.h"
3231

32+
#if HAS_PROBE_XY_OFFSET
33+
#include "../../module/probe.h" // for probe.offset
34+
#endif
35+
3336
/**
3437
* G42: Move X & Y axes to mesh coordinates (I & J)
3538
*

Marlin/src/gcode/bedlevel/M420.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,10 @@
2727
#include "../gcode.h"
2828
#include "../../feature/bedlevel/bedlevel.h"
2929
#include "../../module/planner.h"
30-
#include "../../module/probe.h"
30+
31+
#if ENABLED(MARLIN_DEV_MODE)
32+
#include "../../module/probe.h"
33+
#endif
3134

3235
#if ENABLED(EEPROM_SETTINGS)
3336
#include "../../module/settings.h"

Marlin/src/gcode/calibrate/G28.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,9 @@
4040
#include "../../feature/tmc_util.h"
4141
#endif
4242

43-
#include "../../module/probe.h"
43+
#if HAS_BED_PROBE
44+
#include "../../module/probe.h"
45+
#endif
4446

4547
#if ENABLED(BLTOUCH)
4648
#include "../../feature/bltouch.h"

0 commit comments

Comments
 (0)