Skip to content

Commit 15c0ffc

Browse files
attilabodythinkyhead
authored andcommitted
🐛 Fix Robin Nano v3 filament runout pins (MarlinFirmware#23344)
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
1 parent edbc4af commit 15c0ffc

7 files changed

+13
-15
lines changed

Marlin/src/pins/mega/pins_OVERLORD.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
#define Z_MIN_PROBE_PIN 46 // JP4, Tfeed1
5050
#endif
5151

52-
#if ENABLED(FILAMENT_RUNOUT_SENSOR)
52+
#ifndef FIL_RUNOUT_PIN
5353
#define FIL_RUNOUT_PIN 44 // JP3, Tfeed2
5454
#endif
5555

Marlin/src/pins/pins_postprocess.h

+5-2
Original file line numberDiff line numberDiff line change
@@ -546,14 +546,17 @@
546546
#undef K_MAX_PIN
547547
#endif
548548

549-
// Filament Sensor first pin alias
550549
#if HAS_FILAMENT_SENSOR
551-
#define FIL_RUNOUT1_PIN FIL_RUNOUT_PIN
550+
#define FIL_RUNOUT1_PIN FIL_RUNOUT_PIN // Filament Sensor first pin alias
552551
#else
553552
#undef FIL_RUNOUT_PIN
554553
#undef FIL_RUNOUT1_PIN
555554
#endif
556555

556+
#if NUM_RUNOUT_SENSORS < 2
557+
#undef FIL_RUNOUT2_PIN
558+
#endif
559+
557560
#ifndef LCD_PINS_D4
558561
#define LCD_PINS_D4 -1
559562
#endif

Marlin/src/pins/ramps/pins_FORMBOT_TREX3.h

-1
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,6 @@
134134
#define FAN_PIN 9
135135
#define FAN1_PIN 12
136136

137-
#define NUM_RUNOUT_SENSORS 2
138137
#define FIL_RUNOUT_PIN 22
139138
#define FIL_RUNOUT2_PIN 21
140139

Marlin/src/pins/sam/pins_RURAMPS4D_11.h

+2-4
Original file line numberDiff line numberDiff line change
@@ -121,10 +121,8 @@
121121
#define Z_MIN_PROBE_PIN 49
122122
#endif
123123

124-
#if HAS_FILAMENT_SENSOR
125-
#ifndef FIL_RUNOUT_PIN
126-
#define FIL_RUNOUT_PIN Y_MIN_PIN
127-
#endif
124+
#ifndef FIL_RUNOUT_PIN
125+
#define FIL_RUNOUT_PIN Y_MIN_PIN
128126
#endif
129127

130128
//

Marlin/src/pins/sam/pins_RURAMPS4D_13.h

+2-4
Original file line numberDiff line numberDiff line change
@@ -109,10 +109,8 @@
109109
#define Z_MIN_PROBE_PIN 49
110110
#endif
111111

112-
#if HAS_FILAMENT_SENSOR
113-
#ifndef FIL_RUNOUT_PIN
114-
#define FIL_RUNOUT_PIN Y_MIN_PIN
115-
#endif
112+
#ifndef FIL_RUNOUT_PIN
113+
#define FIL_RUNOUT_PIN Y_MIN_PIN
116114
#endif
117115

118116
//

Marlin/src/pins/sanguino/pins_MELZI_CREALITY.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
#if SERVO0_PIN == BEEPER_PIN
6969
#undef BEEPER_PIN
7070
#endif
71-
#elif ENABLED(FILAMENT_RUNOUT_SENSOR)
71+
#elif HAS_FILAMENT_SENSOR
7272
#ifndef FIL_RUNOUT_PIN
7373
#define FIL_RUNOUT_PIN 27
7474
#endif

Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3_common.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -145,10 +145,10 @@
145145
#endif
146146

147147
#ifndef FIL_RUNOUT_PIN
148-
#define FIL_RUNOUT_PIN MT_DET_1_PIN
148+
#define FIL_RUNOUT_PIN PA4
149149
#endif
150150
#ifndef FIL_RUNOUT2_PIN
151-
#define FIL_RUNOUT2_PIN MT_DET_2_PIN
151+
#define FIL_RUNOUT2_PIN PE6
152152
#endif
153153

154154
#ifndef POWER_LOSS_PIN

0 commit comments

Comments
 (0)