Additional Archim 2 cleanup

drunken-octopus · Jan 14, 2021 · 0a41173 · 0a41173
1 parent a0213dc
commit 0a41173
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 6 deletions.
diff --git a/Marlin/src/pins/sam/pins_ARCHIM2.h b/Marlin/src/pins/sam/pins_ARCHIM2.h
@@ -234,7 +234,9 @@
   #define FAN1_PIN                             8  // D8 PC22 FET_PWM5 ("HTR3" header)
 #endif
 
-#define CONTROLLER_FAN_PIN                     5  // D5 PC25 FET_PWM2 ("FAN2" header)
+#ifndef CONTROLLER_FAN_PIN
+  #define CONTROLLER_FAN_PIN                   5  // D5 PC25 FET_PWM2 ("FAN2" header)
+#endif
 
 #if ENABLED(CASE_LIGHT_ENABLE)
   #undef  HEATER_1_PIN
@@ -320,5 +322,3 @@
   #define BTN_EN2                             13  // D13 PB27_TIOB0
   #define BTN_ENC                             16  // D16 PA13_TXD1 // the click
 #endif
-
-#endif
diff --git a/config/examples/AlephObjects/standard/Quiver_TAZPro/Quiver_DualExtruder/Configuration_adv.h b/config/examples/AlephObjects/standard/Quiver_TAZPro/Quiver_DualExtruder/Configuration_adv.h
@@ -397,7 +397,7 @@
  */
 #define USE_CONTROLLER_FAN // <-- changed
 #if ENABLED(USE_CONTROLLER_FAN)
-  #define CONTROLLER_FAN_PIN FAN1_PIN // <-- changed:  Set a custom pin for the controller fan
+  //#define CONTROLLER_FAN_PIN -1        // Set a custom pin for the controller fan
   //#define CONTROLLER_FAN_USE_Z_ONLY    // With this option only the Z axis is considered
   //#define CONTROLLER_FAN_IGNORE_Z      // Ignore Z stepper. Useful when stepper timeout is disabled.
   #define CONTROLLERFAN_SPEED_MIN      0 // (0-255) Minimum speed. (If set below this value the fan is turned off.)

diff --git a/...xamples/AlephObjects/standard/Quiver_TAZPro/Quiver_DualExtruder/Configuration_summary.txt b/...xamples/AlephObjects/standard/Quiver_TAZPro/Quiver_DualExtruder/Configuration_summary.txt
@@ -35,7 +35,6 @@
 #define CLASSIC_JERK
 #define CONTROLLERFAN_SPEED_ACTIVE 255
 #define CONTROLLERFAN_SPEED_IDLE 120
-#define CONTROLLER_FAN_PIN FAN1_PIN
 #define CURA_LE_RUNOUT_HANDLING_WORKAROUND
 #define CUSTOM_MACHINE_NAME "TAZ Pro"
 #define DEFAULT_ACCELERATION 500

diff --git a/config/examples/build-config.py b/config/examples/build-config.py
@@ -592,7 +592,6 @@ def ENABLED(str):
 
     if USE_ARCHIM2:
         MARLIN["MOTHERBOARD"]                            = 'BOARD_ARCHIM2'
-        MARLIN["CONTROLLER_FAN_PIN"]                     = 'FAN1_PIN'
         MARLIN["SERIAL_PORT"]                            = -1
         if USE_REPRAP_LCD_DISPLAY or "SynDaver_AXI" in PRINTER:
             MARLIN["SERIAL_PORT_2"]                      = 0