jessikitty/Marlin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

adjustments

Browse Source
This commit is contained in:
Scott Lahteine
2025-05-03 15:47:24 -05:00
parent 7f8de10a81
commit 4c15b7222f
5 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Marlin/Configuration.h
+1 -1
View File
@@ -260,7 +260,7 @@
#define SWITCHING_NOZZLE_SERVO_ANGLES { 0, 90 } // A pair of angles for { E0, E1 }.
// For Dual Servo use two pairs: { { lower, raise }, { lower, raise } }
#define SWITCHING_NOZZLE_SERVO_DWELL 2500 // Dwell time to wait for servo to make physical move
#define SWITCHING_NOZZLE_PARK_TO_PROBE // Retract active tool head while probing to avoid nozzle interference
//#define SWITCHING_NOZZLE_PARK_TO_PROBE // Retract active toolhead while probing to avoid nozzle interference
#endif
// Switch nozzles by bumping the toolhead. Requires EVENT_GCODE_TOOLCHANGE_#.
Marlin/src/inc/Conditionals-1-axes.h
+1 -1
View File
@@ -87,7 +87,7 @@
#endif
/**
* Multi-Material-Unit supported models
* Multi-Material-Unit supported models
*/
#ifdef MMU_MODEL
#define HAS_MMU 1
Marlin/src/inc/Conditionals-3-etc.h
+4
View File
@@ -69,6 +69,10 @@
#endif
#undef UNUSED_TEMP_SENSOR
#if !HAS_HOTEND
#undef PREHEAT_1_TEMP_HOTEND
#undef PREHEAT_2_TEMP_HOTEND
#endif
#if !TEMP_SENSOR_BED
#undef TEMP_SENSOR_BED
#undef THERMAL_PROTECTION_BED
Marlin/src/inc/SanityCheck.h
+1 -1
View File
@@ -737,7 +737,7 @@ static_assert(COUNT(arm) == LOGICAL_AXES, "AXIS_RELATIVE_MODES must contain " _L
#elif !defined(SWITCHING_NOZZLE_SERVO_NR)
#error "SWITCHING_NOZZLE requires SWITCHING_NOZZLE_SERVO_NR."
#elif ALL(SWITCHING_NOZZLE_PARK_TO_PROBE, NOZZLE_AS_PROBE)
#error " SWITCHING_NOZZLE_PARK_TO_PROBE cannot be used with NOZZLE_AS_PROBE,"
#error "SWITCHING_NOZZLE_PARK_TO_PROBE cannot be used with NOZZLE_AS_PROBE."
#elif SWITCHING_NOZZLE_SERVO_NR == 0 && !PIN_EXISTS(SERVO0)
#error "SERVO0_PIN must be defined for your SWITCHING_NOZZLE."
#elif SWITCHING_NOZZLE_SERVO_NR == 1 && !PIN_EXISTS(SERVO1)
Marlin/src/module/probe.cpp
+1 -1
View File
@@ -406,7 +406,7 @@ FORCE_INLINE void probe_specific_action(const bool deploy) {
#endif // PAUSE_BEFORE_DEPLOY_STOW
#if ENABLED(SWITCHING_NOZZLE, SWITCHING_NOZZLE_PARK_TO_PROBE) && DISABLED(NOZZLE_AS_PROBE)
#if ENABLED(SWITCHING_NOZZLE_PARK_TO_PROBE)
servo[SWITCHING_NOZZLE_SERVO_NR].move(servo_angles[SWITCHING_NOZZLE_SERVO_NR][deploy ? 1 : 0]);
#endif