0x90/Marlin
12
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

🩹 Refine MKS boards with a dedicated FAN port (#25567)

Browse source
This commit is contained in:
Scott Lahteine 2023-03-25 17:35:32 -05:00 committed by GitHub
parent 8d3142911c
commit 01296788dc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 30 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
Marlin/src/pins/mega/pins_MIGHTYBOARD_REVE.h
View file

@ -146,39 +146,34 @@
//#define TEMP_1_MOSI_PIN TEMP_0_MOSI_PIN //#define TEMP_1_MOSI_PIN TEMP_0_MOSI_PIN
// //
// FET Pin Mapping - FET 1 is closest to the input power connector // FET Pin Mapping - FET A is closest to the input power connector
// //
#define MOSFET_1_PIN 6 // Plug EX1 Pin 1-2 -> PH3 #15 -> Logical 06 #define MOSFET_A_PIN 6 // Plug EX1 Pin 1-2 -> PH3 #15 -> Logical 06
#define MOSFET_2_PIN 7 // Plug EX1 Pin 3-4 -> PH4 #16 -> Logical 07 #define MOSFET_B_PIN 11 // Plug EX2 1-2 -> PB5 #24 -> Logical 11
#define MOSFET_3_PIN 11 // Plug EX2 1-2 -> PB5 #24 -> Logical 11 #define MOSFET_C_PIN 45 // Plug HBD 1-2 -> PL4 #39 -> Logical 45
#define MOSFET_4_PIN 12 // Plug EX2 3-4 -> PB6 #25 -> Logical 12 #define MOSFET_D_PIN 7 // Plug EX1 Pin 3-4 -> PH4 #16 -> Logical 07
#define MOSFET_5_PIN 45 // Plug HBD 1-2 -> PL4 #39 -> Logical 45 #define MOSFET_E_PIN 12 // Plug EX2 3-4 -> PB6 #25 -> Logical 12
#define MOSFET_6_PIN 44 // Plug Extra 1-2 -> PL5 #40 -> Logical 44 (FET not soldered in all boards) #define MOSFET_F_PIN 44 // Plug Extra 1-2 -> PL5 #40 -> Logical 44 (FET not soldered in all boards)
// //
// Heaters / Fans (24V) // Heaters / Fans (24V)
// //
#define HEATER_0_PIN MOSFET_1_PIN // EX1 #define HEATER_0_PIN MOSFET_A_PIN // EX1
#define HEATER_1_PIN MOSFET_3_PIN // EX2 #define HEATER_1_PIN MOSFET_B_PIN // EX2
#define HEATER_BED_PIN MOSFET_5_PIN // HBP #define HEATER_BED_PIN MOSFET_C_PIN // HBP
// EX1 FAN (Automatic Fans are disabled by default in Configuration_adv.h - comment that out for auto fans)
#ifndef E0_AUTO_FAN_PIN #ifndef E0_AUTO_FAN_PIN
#define E0_AUTO_FAN_PIN MOSFET_2_PIN #define E0_AUTO_FAN_PIN MOSFET_D_PIN
#else #elif !defined(FAN_PIN)
#ifndef FAN_PIN #define FAN_PIN MOSFET_D_PIN
#define FAN_PIN MOSFET_2_PIN
#endif #endif
#endif
// EX2 FAN (Automatic Fans are disabled by default in Configuration_adv.h - comment that out for auto fans)
#ifndef E1_AUTO_FAN_PIN #ifndef E1_AUTO_FAN_PIN
#define E1_AUTO_FAN_PIN MOSFET_4_PIN #define E1_AUTO_FAN_PIN MOSFET_E_PIN
#else #elif !defined(FAN1_PIN)
#ifndef FAN1_PIN #define FAN1_PIN MOSFET_E_PIN
#define FAN1_PIN MOSFET_4_PIN
#endif
#endif #endif
// //

1
Marlin/src/pins/ramps/pins_BIQU_KFB_2.h
View file

@ -35,7 +35,6 @@
// //
// Heaters / Fans // Heaters / Fans
// //
// Power outputs BEEF or BEFF
#define MOSFET_D_PIN 7 #define MOSFET_D_PIN 7
#include "pins_RAMPS.h" #include "pins_RAMPS.h"

1
Marlin/src/pins/ramps/pins_FELIX2.h
View file

@ -35,7 +35,6 @@
// //
// Heaters / Fans // Heaters / Fans
// //
// Power outputs EFBF or EFBE
#define MOSFET_D_PIN 7 #define MOSFET_D_PIN 7
#include "pins_RAMPS.h" #include "pins_RAMPS.h"

5
Marlin/src/pins/ramps/pins_MKS_BASE_14.h
View file

@ -33,11 +33,6 @@
#define BOARD_INFO_NAME "MKS BASE 1.4" #define BOARD_INFO_NAME "MKS BASE 1.4"
#define MKS_BASE_VERSION 14 #define MKS_BASE_VERSION 14
//
// Heaters / Fans
//
#define FAN_PIN 9 // PH6 ** Pin18 ** PWM9
// Other Mods // Other Mods
#define SERVO3_PIN 12 // PB6 ** Pin25 ** D12 #define SERVO3_PIN 12 // PB6 ** Pin25 ** D12

9
Marlin/src/pins/ramps/pins_MKS_BASE_common.h
View file

@ -34,8 +34,8 @@
// //
// Heaters / Fans // Heaters / Fans
// //
// Power outputs EFBF or EFBE #define MOSFET_B_PIN 7
#define MOSFET_D_PIN 7 #define FAN_PIN 9
// //
// M3/M4/M5 - Spindle/Laser Control // M3/M4/M5 - Spindle/Laser Control
@ -50,12 +50,9 @@
#define CASE_LIGHT_PIN 2 #define CASE_LIGHT_PIN 2
#endif #endif
#endif
// //
// Microstepping pins // Microstepping pins
// // |===== 1.4 =====|===== 1.5+ =====|
#if MKS_BASE_VERSION >= 14 // |===== 1.4 =====|===== 1.5+ =====|
#define X_MS1_PIN 5 // PE3 | Pin 5 | PWM5 | | D3 | SERVO2_PIN #define X_MS1_PIN 5 // PE3 | Pin 5 | PWM5 | | D3 | SERVO2_PIN
#define X_MS2_PIN 6 // PH3 | Pin 15 | PWM6 | Pin 14 | D6 | SERVO1_PIN #define X_MS2_PIN 6 // PH3 | Pin 15 | PWM6 | Pin 14 | D6 | SERVO1_PIN
#define Y_MS1_PIN 59 // PF5 | Pin 92 | A5 | | | #define Y_MS1_PIN 59 // PF5 | Pin 92 | A5 | | |

2
Marlin/src/pins/ramps/pins_MKS_GEN_13.h
View file

@ -42,8 +42,6 @@
// //
// Heaters / Fans // Heaters / Fans
// //
// Power outputs EFBF or EFBE
//
#define MOSFET_B_PIN 7 #define MOSFET_B_PIN 7
#define FAN_PIN 9 #define FAN_PIN 9

11
Marlin/src/pins/ramps/pins_MKS_GEN_L.h
View file

@ -37,14 +37,11 @@
// //
// Heaters / Fans // Heaters / Fans
// //
// Power outputs EFBF or EFBE
#define MOSFET_D_PIN 7
// Hotend, Hotend, Bed + Fan on D9 #define MOSFET_A_PIN 9 // HE0
#if FET_ORDER_EEB #define MOSFET_B_PIN 8 // HE1
#define MOSFET_B_PIN 7 #define MOSFET_C_PIN 10 // HBED
#define FAN_PIN 9 #define FAN_PIN 7
#endif
// //
// CS Pins wired to avoid conflict with the LCD // CS Pins wired to avoid conflict with the LCD

4
Marlin/src/pins/ramps/pins_MKS_GEN_L_V2.h
View file

@ -37,8 +37,8 @@
// //
// Heaters / Fans // Heaters / Fans
// //
// Power outputs EFBF or EFBE #define MOSFET_B_PIN 7
#define MOSFET_D_PIN 7 #define FAN_PIN 9
// //
// CS Pins wired to avoid conflict with the LCD // CS Pins wired to avoid conflict with the LCD

1
Marlin/src/pins/ramps/pins_MKS_GEN_L_V21.h
View file

@ -37,7 +37,6 @@
// //
// Heaters / Fans // Heaters / Fans
// //
// Power outputs EFBF or EFBE
#define MOSFET_B_PIN 7 #define MOSFET_B_PIN 7
#define FAN_PIN 9 #define FAN_PIN 9

2
Marlin/src/pins/ramps/pins_RAMPS_CREALITY.h
View file

@ -32,7 +32,7 @@
// //
// Heaters / Fans // Heaters / Fans
// //
#define MOSFET_B_PIN 7 // For HEATER_1_PIN ("EEF" or "EEB") #define MOSFET_B_PIN 7
#define FAN_PIN 9 #define FAN_PIN 9
#define FIL_RUNOUT_PIN 2 #define FIL_RUNOUT_PIN 2

2
Marlin/src/pins/ramps/pins_ZRIB_V52.h
View file

@ -39,8 +39,6 @@
// //
// Heaters / Fans // Heaters / Fans
// //
#define HEATER_1_PIN 7
#define FAN_PIN 9 // PH6 ** Pin18 ** PWM9
#define FAN1_PIN 6 #define FAN1_PIN 6
// //