Attila BODY
3 years ago
No account linked to committer's email address
|
@@ -49,7 +49,7 @@
|
49
|
49
|
#define Z_MIN_PROBE_PIN 46 // JP4, Tfeed1
|
50
|
50
|
#endif
|
51
|
51
|
|
52
|
|
-#if ENABLED(FILAMENT_RUNOUT_SENSOR)
|
|
52
|
+#ifndef FIL_RUNOUT_PIN
|
53
|
53
|
#define FIL_RUNOUT_PIN 44 // JP3, Tfeed2
|
54
|
54
|
#endif
|
55
|
55
|
|
|
@@ -546,14 +546,17 @@
|
546
|
546
|
#undef K_MAX_PIN
|
547
|
547
|
#endif
|
548
|
548
|
|
549
|
|
-// Filament Sensor first pin alias
|
550
|
549
|
#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
|
552
|
551
|
#else
|
553
|
552
|
#undef FIL_RUNOUT_PIN
|
554
|
553
|
#undef FIL_RUNOUT1_PIN
|
555
|
554
|
#endif
|
556
|
555
|
|
|
556
|
+#if NUM_RUNOUT_SENSORS < 2
|
|
557
|
+ #undef FIL_RUNOUT2_PIN
|
|
558
|
+#endif
|
|
559
|
+
|
557
|
560
|
#ifndef LCD_PINS_D4
|
558
|
561
|
#define LCD_PINS_D4 -1
|
559
|
562
|
#endif
|
|
@@ -134,7 +134,6 @@
|
134
|
134
|
#define FAN_PIN 9
|
135
|
135
|
#define FAN1_PIN 12
|
136
|
136
|
|
137
|
|
-#define NUM_RUNOUT_SENSORS 2
|
138
|
137
|
#define FIL_RUNOUT_PIN 22
|
139
|
138
|
#define FIL_RUNOUT2_PIN 21
|
140
|
139
|
|
|
@@ -121,10 +121,8 @@
|
121
|
121
|
#define Z_MIN_PROBE_PIN 49
|
122
|
122
|
#endif
|
123
|
123
|
|
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
|
128
|
126
|
#endif
|
129
|
127
|
|
130
|
128
|
//
|
|
@@ -109,10 +109,8 @@
|
109
|
109
|
#define Z_MIN_PROBE_PIN 49
|
110
|
110
|
#endif
|
111
|
111
|
|
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
|
116
|
114
|
#endif
|
117
|
115
|
|
118
|
116
|
//
|
|
@@ -68,7 +68,7 @@
|
68
|
68
|
#if SERVO0_PIN == BEEPER_PIN
|
69
|
69
|
#undef BEEPER_PIN
|
70
|
70
|
#endif
|
71
|
|
-#elif ENABLED(FILAMENT_RUNOUT_SENSOR)
|
|
71
|
+#elif HAS_FILAMENT_SENSOR
|
72
|
72
|
#ifndef FIL_RUNOUT_PIN
|
73
|
73
|
#define FIL_RUNOUT_PIN 27
|
74
|
74
|
#endif
|
|
@@ -145,10 +145,10 @@
|
145
|
145
|
#endif
|
146
|
146
|
|
147
|
147
|
#ifndef FIL_RUNOUT_PIN
|
148
|
|
- #define FIL_RUNOUT_PIN MT_DET_1_PIN
|
|
148
|
+ #define FIL_RUNOUT_PIN PA4
|
149
|
149
|
#endif
|
150
|
150
|
#ifndef FIL_RUNOUT2_PIN
|
151
|
|
- #define FIL_RUNOUT2_PIN MT_DET_2_PIN
|
|
151
|
+ #define FIL_RUNOUT2_PIN PE6
|
152
|
152
|
#endif
|
153
|
153
|
|
154
|
154
|
#ifndef POWER_LOSS_PIN
|