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

🐛 Fix redundant heater / sensor pin assignments (#22309)

InsanityAutomation 4 years ago
parent
9642a36895
commit
0d5db6aa75
No account linked to committer's email address
7 changed files with 8 additions and 8 deletions
Unified View Show Diff Stats
  1. 1
    1
      Marlin/src/pins/linux/pins_RAMPS_LINUX.h
  2. 2
    2
      Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h
  3. 1
    1
      Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h
  4. 1
    1
      Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h
  5. 1
    1
      Marlin/src/pins/ramps/pins_RAMPS.h
  6. 1
    1
      Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h
  7. 1
    1
      Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h

+ 1
- 1
Marlin/src/pins/linux/pins_RAMPS_LINUX.h View File

192 
 #else                                             // Non-specific are "EFB" (i.e., "EFBF" or "EFBE")
 192 
 #else                                             // Non-specific are "EFB" (i.e., "EFBF" or "EFBE")
193 
   #define FAN_PIN                   RAMPS_D9_PIN
 193 
   #define FAN_PIN                   RAMPS_D9_PIN
194 
   #define HEATER_BED_PIN            RAMPS_D8_PIN
 194 
   #define HEATER_BED_PIN            RAMPS_D8_PIN
195 
-  #if HOTENDS == 1
195 
+  #if HOTENDS == 1 && DISABLED(HEATERS_PARALLEL)
196 
     #define FAN1_PIN                MOSFET_D_PIN
 196 
     #define FAN1_PIN                MOSFET_D_PIN
197 
   #else
 197 
   #else
198 
     #define HEATER_1_PIN            MOSFET_D_PIN
 198 
     #define HEATER_1_PIN            MOSFET_D_PIN

+ 2
- 2
Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h View File

65 
   #define TEMP_BED_PIN                  P0_23_A0  // A0 (T0) - (67) - TEMP_BED_PIN
 65 
   #define TEMP_BED_PIN                  P0_23_A0  // A0 (T0) - (67) - TEMP_BED_PIN
66 
 #endif
 66 
 #endif
67
67
68 
-#if HOTENDS == 1
68 
+#if HOTENDS == 1 && TEMP_SENSOR_REDUNDANT_SOURCE != 1
69 
   #if TEMP_SENSOR_PROBE
 69 
   #if TEMP_SENSOR_PROBE
70 
     #define TEMP_PROBE_PIN            TEMP_1_PIN
 70 
     #define TEMP_PROBE_PIN            TEMP_1_PIN
71 
   #elif TEMP_SENSOR_CHAMBER
 71 
   #elif TEMP_SENSOR_CHAMBER
92 
 #ifndef HEATER_0_PIN
 92 
 #ifndef HEATER_0_PIN
93 
   #define HEATER_0_PIN                     P2_07
 93 
   #define HEATER_0_PIN                     P2_07
94 
 #endif
 94 
 #endif
95 
-#if HOTENDS == 1
95 
+#if HOTENDS == 1 && DISABLED(HEATERS_PARALLEL)
96 
   #ifndef FAN1_PIN
 96 
   #ifndef FAN1_PIN
97 
     #define FAN1_PIN                       P2_04
 97 
     #define FAN1_PIN                       P2_04
98 
   #endif
 98 
   #endif

+ 1
- 1
Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h View File

202 
 //
 202 
 //
203 
 #define HEATER_BED_PIN                     P2_05
 203 
 #define HEATER_BED_PIN                     P2_05
204 
 #define HEATER_0_PIN                       P2_07
 204 
 #define HEATER_0_PIN                       P2_07
205 
-#if HOTENDS == 1
205 
+#if HOTENDS == 1 && DISABLED(HEATERS_PARALLEL)
206 
   #ifndef FAN1_PIN
 206 
   #ifndef FAN1_PIN
207 
     #define FAN1_PIN                       P2_06
 207 
     #define FAN1_PIN                       P2_06
208 
   #endif
 208 
   #endif

+ 1
- 1
Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h View File

217 
   #define FAN1_PIN                  RAMPS_D8_PIN
 217 
   #define FAN1_PIN                  RAMPS_D8_PIN
218 
 #elif DISABLED(IS_RAMPS_SF)                       // Not Spindle, Fan (i.e., "EFBF" or "EFBE")
 218 
 #elif DISABLED(IS_RAMPS_SF)                       // Not Spindle, Fan (i.e., "EFBF" or "EFBE")
219 
   #define HEATER_BED_PIN            RAMPS_D8_PIN
 219 
   #define HEATER_BED_PIN            RAMPS_D8_PIN
220 
-  #if HOTENDS == 1
220 
+  #if HOTENDS == 1 && DISABLED(HEATERS_PARALLEL)
221 
     #define FAN1_PIN                MOSFET_D_PIN
 221 
     #define FAN1_PIN                MOSFET_D_PIN
222 
   #else
 222 
   #else
223 
     #define HEATER_1_PIN            MOSFET_D_PIN
 223 
     #define HEATER_1_PIN            MOSFET_D_PIN

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

219 
   #define FAN1_PIN                  RAMPS_D8_PIN
 219 
   #define FAN1_PIN                  RAMPS_D8_PIN
220 
 #elif DISABLED(IS_RAMPS_SF)                       // Not Spindle, Fan (i.e., "EFBF" or "EFBE")
 220 
 #elif DISABLED(IS_RAMPS_SF)                       // Not Spindle, Fan (i.e., "EFBF" or "EFBE")
221 
   #define HEATER_BED_PIN            RAMPS_D8_PIN
 221 
   #define HEATER_BED_PIN            RAMPS_D8_PIN
222 
-  #if HOTENDS == 1
222 
+  #if HOTENDS == 1 && DISABLED(HEATERS_PARALLEL)
223 
     #define FAN1_PIN                MOSFET_D_PIN
 223 
     #define FAN1_PIN                MOSFET_D_PIN
224 
   #else
 224 
   #else
225 
     #define HEATER_1_PIN            MOSFET_D_PIN
 225 
     #define HEATER_1_PIN            MOSFET_D_PIN

+ 1
- 1
Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h View File

105 
 #ifndef HEATER_0_PIN
 105 
 #ifndef HEATER_0_PIN
106 
   #define HEATER_0_PIN                      PC3
 106 
   #define HEATER_0_PIN                      PC3
107 
 #endif
 107 
 #endif
108 
-#if HOTENDS == 1
108 
+#if HOTENDS == 1 && DISABLED(HEATERS_PARALLEL)
109 
   #ifndef FAN1_PIN
 109 
   #ifndef FAN1_PIN
110 
     #define FAN1_PIN                        PB0
 110 
     #define FAN1_PIN                        PB0
111 
   #endif
 111 
   #endif

+ 1
- 1
Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h View File

210 
 #define TEMP_0_PIN                          PA2   // TH0
 210 
 #define TEMP_0_PIN                          PA2   // TH0
211 
 #define TEMP_1_PIN                          PA3   // TH1
 211 
 #define TEMP_1_PIN                          PA3   // TH1
212
212
213 
-#if HOTENDS == 1
213 
+#if HOTENDS == 1 && DISABLED(HEATERS_PARALLEL)
214 
   #if TEMP_SENSOR_PROBE
 214 
   #if TEMP_SENSOR_PROBE
215 
     #define TEMP_PROBE_PIN            TEMP_1_PIN
 215 
     #define TEMP_PROBE_PIN            TEMP_1_PIN
216 
   #elif TEMP_SENSOR_CHAMBER
 216 
   #elif TEMP_SENSOR_CHAMBER

Write Preview
Loading…
Cancel
Save