bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

🎨 Refactor MOSFET pins layout (#22983)

Browse Source
This commit is contained in:
Scott Lahteine
2021-10-19 05:59:48 -05:00
parent aa198e41dd
commit ed78f7f4e6
23 changed files with 175 additions and 289 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Marlin/src/pins/ramps/pins_3DRAG.h
View File

@ -62,8 +62,8 @@
//
// Heaters / Fans
//
#define RAMPS_D8_PIN 9
#define RAMPS_D9_PIN 8
#define MOSFET_B_PIN 8
#define MOSFET_C_PIN 9
#define MOSFET_D_PIN 12
//

6
Marlin/src/pins/ramps/pins_BQ_ZUM_MEGA_3D.h
View File

@ -68,9 +68,9 @@
//
// Heaters / Fans
//
#define RAMPS_D8_PIN 10
#define RAMPS_D9_PIN 12
#define RAMPS_D10_PIN 9
#define MOSFET_A_PIN 9
#define MOSFET_B_PIN 12
#define MOSFET_C_PIN 10
#define MOSFET_D_PIN 7
//

17
Marlin/src/pins/ramps/pins_FORMBOT_RAPTOR.h
View File

@ -121,23 +121,6 @@
#define TEMP_0_CS_PIN 66 // Don't use 49 (SD_DETECT_PIN)
#endif
//
// Augmentation for auto-assigning RAMPS plugs
//
#if NONE(IS_RAMPS_EEB, IS_RAMPS_EEF, IS_RAMPS_EFB, IS_RAMPS_EFF, IS_RAMPS_SF) && !PIN_EXISTS(MOSFET_D)
#if HAS_MULTI_HOTEND
#if TEMP_SENSOR_BED
#define IS_RAMPS_EEB
#else
#define IS_RAMPS_EEF
#endif
#elif TEMP_SENSOR_BED
#define IS_RAMPS_EFB
#else
#define IS_RAMPS_EFF
#endif
#endif
//
// Heaters / Fans
//

17
Marlin/src/pins/ramps/pins_FORMBOT_TREX2PLUS.h
View File

@ -118,23 +118,6 @@
#define TEMP_0_CS_PIN 66 // Don't use 49 (SD_DETECT_PIN)
#endif
//
// Augmentation for auto-assigning RAMPS plugs
//
#if NONE(IS_RAMPS_EEB, IS_RAMPS_EEF, IS_RAMPS_EFB, IS_RAMPS_EFF, IS_RAMPS_SF) && !PIN_EXISTS(MOSFET_D)
#if HAS_MULTI_HOTEND
#if TEMP_SENSOR_BED
#define IS_RAMPS_EEB
#else
#define IS_RAMPS_EEF
#endif
#elif TEMP_SENSOR_BED
#define IS_RAMPS_EFB
#else
#define IS_RAMPS_EFF
#endif
#endif
//
// Heaters / Fans
//

1
Marlin/src/pins/ramps/pins_K8600.h
View File

@ -59,7 +59,6 @@
//
// Other RAMPS pins
//
#define IS_RAMPS_EFB // Override autodetection. Bed will be undefined.
#include "pins_RAMPS.h"
//

1
Marlin/src/pins/ramps/pins_LONGER3D_LKx_PRO.h
View File

@ -116,5 +116,4 @@
//
// Other RAMPS 1.3 pins
//
#define IS_RAMPS_EFB // Override autodetection. Bed will be undefined.
#include "pins_RAMPS_13.h" // ... RAMPS

71
Marlin/src/pins/ramps/pins_RAMPS.h
View File

@ -189,52 +189,35 @@
#define TEMP_0_CS_PIN 66 // Don't use 53 if using Display/SD card (SDSS) or 49 (SD_DETECT_PIN)
#endif
//
// Augmentation for auto-assigning RAMPS plugs
//
#if NONE(IS_RAMPS_EEB, IS_RAMPS_EEF, IS_RAMPS_EFB, IS_RAMPS_EFF, IS_RAMPS_SF) && !PIN_EXISTS(MOSFET_D)
#if HAS_MULTI_HOTEND
#if TEMP_SENSOR_BED
#define IS_RAMPS_EEB
#else
#define IS_RAMPS_EEF
#endif
#elif TEMP_SENSOR_BED
#define IS_RAMPS_EFB
#else
#define IS_RAMPS_EFF
#endif
#endif
//
// Heaters / Fans
//
#ifndef MOSFET_A_PIN
#define MOSFET_A_PIN 10
#endif
#ifndef MOSFET_B_PIN
#define MOSFET_B_PIN 9
#endif
#ifndef MOSFET_C_PIN
#define MOSFET_C_PIN 8
#endif
#ifndef MOSFET_D_PIN
#define MOSFET_D_PIN -1
#endif
#ifndef RAMPS_D8_PIN
#define RAMPS_D8_PIN 8
#endif
#ifndef RAMPS_D9_PIN
#define RAMPS_D9_PIN 9
#endif
#ifndef RAMPS_D10_PIN
#define RAMPS_D10_PIN 10
#endif
#define HEATER_0_PIN RAMPS_D10_PIN
#define HEATER_0_PIN MOSFET_A_PIN
#if ENABLED(IS_RAMPS_EFB) // Hotend, Fan, Bed
#define HEATER_BED_PIN RAMPS_D8_PIN
#elif ENABLED(IS_RAMPS_EEF) // Hotend, Hotend, Fan
#define HEATER_1_PIN RAMPS_D9_PIN
#elif ENABLED(IS_RAMPS_EEB) // Hotend, Hotend, Bed
#define HEATER_1_PIN RAMPS_D9_PIN
#define HEATER_BED_PIN RAMPS_D8_PIN
#elif ENABLED(IS_RAMPS_EFF) // Hotend, Fan, Fan
#define FAN1_PIN RAMPS_D8_PIN
#elif DISABLED(IS_RAMPS_SF) // Not Spindle, Fan (i.e., "EFBF" or "EFBE")
#define HEATER_BED_PIN RAMPS_D8_PIN
#if FET_ORDER_EFB // Hotend, Fan, Bed
#define HEATER_BED_PIN MOSFET_C_PIN
#elif FET_ORDER_EEF // Hotend, Hotend, Fan
#define HEATER_1_PIN MOSFET_B_PIN
#elif FET_ORDER_EEB // Hotend, Hotend, Bed
#define HEATER_1_PIN MOSFET_B_PIN
#define HEATER_BED_PIN MOSFET_C_PIN
#elif FET_ORDER_EFF // Hotend, Fan, Fan
#define FAN1_PIN MOSFET_C_PIN
#elif DISABLED(FET_ORDER_SF) // Not Spindle, Fan (i.e., "EFBF" or "EFBE")
#define HEATER_BED_PIN MOSFET_C_PIN
#if EITHER(HAS_MULTI_HOTEND, HEATERS_PARALLEL)
#define HEATER_1_PIN MOSFET_D_PIN
#else
@ -243,14 +226,14 @@
#endif
#ifndef FAN_PIN
#if EITHER(IS_RAMPS_EFB, IS_RAMPS_EFF) // Hotend, Fan, Bed or Hotend, Fan, Fan
#define FAN_PIN RAMPS_D9_PIN
#elif EITHER(IS_RAMPS_EEF, IS_RAMPS_SF) // Hotend, Hotend, Fan or Spindle, Fan
#define FAN_PIN RAMPS_D8_PIN
#elif ENABLED(IS_RAMPS_EEB) // Hotend, Hotend, Bed
#if EITHER(FET_ORDER_EFB, FET_ORDER_EFF) // Hotend, Fan, Bed or Hotend, Fan, Fan
#define FAN_PIN MOSFET_B_PIN
#elif EITHER(FET_ORDER_EEF, FET_ORDER_SF) // Hotend, Hotend, Fan or Spindle, Fan
#define FAN_PIN MOSFET_C_PIN
#elif FET_ORDER_EEB // Hotend, Hotend, Bed
#define FAN_PIN 4 // IO pin. Buffer needed
#else // Non-specific are "EFB" (i.e., "EFBF" or "EFBE")
#define FAN_PIN RAMPS_D9_PIN
#define FAN_PIN MOSFET_B_PIN
#endif
#endif

2
Marlin/src/pins/ramps/pins_RAMPS_ENDER_4.h
View File

@ -36,6 +36,6 @@
#if ENABLED(CASE_LIGHT_ENABLE)
#undef FAN_PIN
#ifndef CASE_LIGHT_PIN
#define CASE_LIGHT_PIN RAMPS_D9_PIN
#define CASE_LIGHT_PIN MOSFET_B_PIN
#endif
#endif

4
Marlin/src/pins/ramps/pins_RAMPS_PLUS.h
View File

@ -41,8 +41,8 @@
#define BOARD_INFO_NAME "RAMPS 1.4 Plus"
#define RAMPS_D8_PIN 10
#define RAMPS_D10_PIN 8
#define MOSFET_A_PIN 8
#define MOSFET_C_PIN 10
//
// Steppers

4
Marlin/src/pins/ramps/pins_RIGIDBOARD.h
View File

@ -51,8 +51,8 @@
//
// MOSFET changes
//
#define RAMPS_D9_PIN 8 // FAN (by default)
#define RAMPS_D10_PIN 9 // EXTRUDER 1
#define MOSFET_A_PIN 9 // EXTRUDER 1
#define MOSFET_B_PIN 8 // FAN (by default)
#define MOSFET_D_PIN 12 // EXTRUDER 2 or FAN
#include "pins_RAMPS.h"

8
Marlin/src/pins/ramps/pins_SAINSMART_2IN1.h
View File

@ -34,9 +34,9 @@
//
// Heaters / Fans
//
#define RAMPS_D10_PIN 9 // E
#define RAMPS_D9_PIN 7 // F PART FAN in front of board next to Extruder heat
// RAMPS_D8_PIN 8 // B
#define MOSFET_D_PIN 10 // F / E
#define MOSFET_A_PIN 9 // E
#define MOSFET_B_PIN 7 // F PART FAN in front of board next to Extruder heat
// MOSFET_C_PIN 8 // B
#define MOSFET_D_PIN 10 // F / E
#include "pins_RAMPS.h"

3
Marlin/src/pins/ramps/pins_TRIGORILLA_13.h
View File

@ -27,8 +27,7 @@
#define BOARD_INFO_NAME "Anycubic RAMPS 1.3"
#define IS_RAMPS_EFB
#define RAMPS_D9_PIN 44
#define MOSFET_B_PIN 44
#define E1_STEP_PIN -1
#define E1_DIR_PIN -1

72
Marlin/src/pins/ramps/pins_TRIGORILLA_14.h
View File

@ -27,16 +27,6 @@
#define BOARD_INFO_NAME "Anycubic RAMPS 1.4"
// Board labeled pins:
#define TG_HEATER_BED_PIN 8
#define TG_HEATER_0_PIN 10
#define TG_HEATER_1_PIN 45 // Anycubic Kossel: Unused
#define TG_FAN0_PIN 9 // Anycubic Kossel: Usually the part cooling fan
#define TG_FAN1_PIN 7 // Anycubic Kossel: Unused
#define TG_FAN2_PIN 44 // Anycubic Kossel: Hotend fan
//
// Servos
//
@ -47,45 +37,45 @@
#define SERVO3_PIN 6
#endif
// Remap MOSFET pins to common usages:
#define RAMPS_D10_PIN TG_HEATER_0_PIN // HEATER_0_PIN is always RAMPS_D10_PIN in pins_RAMPS.h
#if HAS_MULTI_HOTEND // EEF and EEB
#define RAMPS_D9_PIN TG_HEATER_1_PIN
#if !TEMP_SENSOR_BED
// EEF
#define RAMPS_D8_PIN TG_FAN0_PIN
#else
// EEB
#define RAMPS_D8_PIN TG_HEATER_BED_PIN
#define FAN_PIN TG_FAN0_PIN // Override pin 4 in pins_RAMPS.h
#endif
#elif TEMP_SENSOR_BED
// EFB (Anycubic Kossel default)
#define RAMPS_D9_PIN TG_FAN0_PIN
#if ENABLED(ANYCUBIC_LCD_CHIRON)
#define RAMPS_D8_PIN TG_HEATER_1_PIN // Heated bed is connected to HEATER1 output
#else
#define RAMPS_D8_PIN TG_HEATER_BED_PIN
#endif
//
// PWM FETS
//
#if EITHER(FET_ORDER_EEF, FET_ORDER_EEB)
#define MOSFET_B_PIN 45 // HEATER1
#elif FET_ORDER_EFB
#define MOSFET_B_PIN 9 // FAN0
#else
// EFF
#define RAMPS_D9_PIN TG_FAN1_PIN
#define RAMPS_D8_PIN TG_FAN0_PIN
#define MOSFET_B_PIN 7 // FAN1
#endif
#if HAS_MULTI_HOTEND || TEMP_SENSOR_BED // EEF, EEB, EFB
#define FAN1_PIN TG_FAN1_PIN
#if FET_ORDER_EEB
#define MOSFET_C_PIN 8 // BED
#elif FET_ORDER_EFB
#if DISABLED(ANYCUBIC_LCD_CHIRON)
#define MOSFET_C_PIN 8
#else
#define MOSFET_C_PIN 45
#endif
#else // EEF, EFF
#define MOSFET_C_PIN 9
#endif
#define FAN2_PIN TG_FAN2_PIN
#if FET_ORDER_EEB
#define FAN_PIN 9 // Override pin 4 in pins_RAMPS.h
#endif
//
// Heaters / Fans
//
#if ANY(FET_ORDER_EEF, FET_ORDER_EEB, FET_ORDER_EFB)
#define FAN1_PIN 7
#endif
#define FAN2_PIN 44
#ifndef E0_AUTO_FAN_PIN
#define E0_AUTO_FAN_PIN TG_FAN2_PIN // Used in Anycubic Kossel example config
#define E0_AUTO_FAN_PIN 44 // Used in Anycubic Kossel example config
#endif
#if ENABLED(ANYCUBIC_LCD_I3MEGA)
#define CONTROLLER_FAN_PIN TG_FAN1_PIN
#define CONTROLLER_FAN_PIN 7
#endif
//

2
Marlin/src/pins/ramps/pins_VORON.h
View File

@ -28,7 +28,7 @@
#define BOARD_INFO_NAME "VORON Design v2"
#define RAMPS_D8_PIN 11
#define MOSFET_C_PIN 11
#include "pins_RAMPS.h"

3
Marlin/src/pins/ramps/pins_ZRIB_V52.h
View File

@ -32,11 +32,11 @@
#define BOARD_INFO_NAME "ZRIB V5.2"
#define MKS_BASE_VERSION 14
#define IS_RAMPS_EFB
//
// Heaters / Fans
//
#define HEATER_1_PIN 7
#define FAN_PIN 9 // PH6 ** Pin18 ** PWM9
#define FAN1_PIN 6
@ -46,7 +46,6 @@
#define E2_STEP_PIN 4
#define E2_DIR_PIN 5
#define E2_ENABLE_PIN 22
#define HEATER_1_PIN 7
#include "pins_MKS_BASE_common.h" // ... RAMPS