thomas
/
marlin
Watch 1
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

🐛 Fix Robin Nano v3 filament runout pins (#23344) 

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
Attila BODY 3 years ago
parent
ca0215ba64
commit
80a537cd13
No account linked to committer's email address
7 changed files with 13 additions and 15 deletions
Unified View Show Diff Stats
  1. 1
    1
      Marlin/src/pins/mega/pins_OVERLORD.h
  2. 5
    2
      Marlin/src/pins/pins_postprocess.h
  3. 0
    1
      Marlin/src/pins/ramps/pins_FORMBOT_TREX3.h
  4. 2
    4
      Marlin/src/pins/sam/pins_RURAMPS4D_11.h
  5. 2
    4
      Marlin/src/pins/sam/pins_RURAMPS4D_13.h
  6. 1
    1
      Marlin/src/pins/sanguino/pins_MELZI_CREALITY.h
  7. 2
    2
      Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3_common.h

+ 1
- 1
Marlin/src/pins/mega/pins_OVERLORD.h View File

49 
   #define Z_MIN_PROBE_PIN                     46  // JP4, Tfeed1
 49 
   #define Z_MIN_PROBE_PIN                     46  // JP4, Tfeed1
50 
 #endif
 50 
 #endif
51
51
52 
-#if ENABLED(FILAMENT_RUNOUT_SENSOR)
52 
+#ifndef FIL_RUNOUT_PIN
53 
   #define FIL_RUNOUT_PIN                      44  // JP3, Tfeed2
 53 
   #define FIL_RUNOUT_PIN                      44  // JP3, Tfeed2
54 
 #endif
 54 
 #endif
55
55

+ 5
- 2
Marlin/src/pins/pins_postprocess.h View File

546 
   #undef K_MAX_PIN
 546 
   #undef K_MAX_PIN
547 
 #endif
 547 
 #endif
548
548
549 
-// Filament Sensor first pin alias
550 
 #if HAS_FILAMENT_SENSOR
 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 
 #else
 551 
 #else
553 
   #undef FIL_RUNOUT_PIN
 552 
   #undef FIL_RUNOUT_PIN
554 
   #undef FIL_RUNOUT1_PIN
 553 
   #undef FIL_RUNOUT1_PIN
555 
 #endif
 554 
 #endif
556
555
556 
+#if NUM_RUNOUT_SENSORS < 2
557 
+  #undef FIL_RUNOUT2_PIN
558 
+#endif
559 
+
557 
 #ifndef LCD_PINS_D4
 560 
 #ifndef LCD_PINS_D4
558 
   #define LCD_PINS_D4 -1
 561 
   #define LCD_PINS_D4 -1
559 
 #endif
 562 
 #endif

+ 0
- 1
Marlin/src/pins/ramps/pins_FORMBOT_TREX3.h View File

134 
 #define FAN_PIN                                9
 134 
 #define FAN_PIN                                9
135 
 #define FAN1_PIN                              12
 135 
 #define FAN1_PIN                              12
136
136
137 
-#define NUM_RUNOUT_SENSORS                     2
138 
 #define FIL_RUNOUT_PIN                        22
 137 
 #define FIL_RUNOUT_PIN                        22
139 
 #define FIL_RUNOUT2_PIN                       21
 138 
 #define FIL_RUNOUT2_PIN                       21
140
139

+ 2
- 4
Marlin/src/pins/sam/pins_RURAMPS4D_11.h View File

121 
   #define Z_MIN_PROBE_PIN                     49
 121 
   #define Z_MIN_PROBE_PIN                     49
122 
 #endif
 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 
 #endif
 126 
 #endif
129
127
130 
 //
 128 
 //

+ 2
- 4
Marlin/src/pins/sam/pins_RURAMPS4D_13.h View File

109 
   #define Z_MIN_PROBE_PIN                     49
 109 
   #define Z_MIN_PROBE_PIN                     49
110 
 #endif
 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 
 #endif
 114 
 #endif
117
115
118 
 //
 116 
 //

+ 1
- 1
Marlin/src/pins/sanguino/pins_MELZI_CREALITY.h View File

68 
   #if SERVO0_PIN == BEEPER_PIN
 68 
   #if SERVO0_PIN == BEEPER_PIN
69 
     #undef BEEPER_PIN
 69 
     #undef BEEPER_PIN
70 
   #endif
 70 
   #endif
71 
-#elif ENABLED(FILAMENT_RUNOUT_SENSOR)
71 
+#elif HAS_FILAMENT_SENSOR
72 
   #ifndef FIL_RUNOUT_PIN
 72 
   #ifndef FIL_RUNOUT_PIN
73 
     #define FIL_RUNOUT_PIN                    27
 73 
     #define FIL_RUNOUT_PIN                    27
74 
   #endif
 74 
   #endif

+ 2
- 2
Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3_common.h View File

145 
 #endif
 145 
 #endif
146
146
147 
 #ifndef FIL_RUNOUT_PIN
 147 
 #ifndef FIL_RUNOUT_PIN
148 
-  #define FIL_RUNOUT_PIN            MT_DET_1_PIN
148 
+  #define FIL_RUNOUT_PIN                    PA4
149 
 #endif
 149 
 #endif
150 
 #ifndef FIL_RUNOUT2_PIN
 150 
 #ifndef FIL_RUNOUT2_PIN
151 
-  #define FIL_RUNOUT2_PIN           MT_DET_2_PIN
151 
+  #define FIL_RUNOUT2_PIN                   PE6
152 
 #endif
 152 
 #endif
153
153
154 
 #ifndef POWER_LOSS_PIN
 154 
 #ifndef POWER_LOSS_PIN

Write Preview
Loading…
Cancel
Save