zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge pull request #4505 from thinkyhead/rc_auto_select_dplugs

Browse source 
Auto-select power plugs for RAMPS derivatives
This commit is contained in:
Scott Lahteine 2016-08-02 12:56:52 -07:00 committed by GitHub
parent 1967e4216e 593b37519a
commit 7cceb15925
6 changed files with 43 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
Marlin/Conditionals_LCD.h
View file

@ -267,4 +267,42 @@
#define BOOTSCREEN_TIMEOUT 2500 #define BOOTSCREEN_TIMEOUT 2500
#endif #endif
/**
* Extruders have some combination of stepper motors and hotends
* so we separate these concepts into the defines:
*
* EXTRUDERS - Number of Selectable Tools
* HOTENDS - Number of hotends, whether connected or separate
* E_STEPPERS - Number of actual E stepper motors
* TOOL_E_INDEX - Index to use when getting/setting the tool state
*
*/
#if ENABLED(SINGLENOZZLE) // One hotend, multi-extruder
#define HOTENDS 1
#define E_STEPPERS EXTRUDERS
#define E_MANUAL EXTRUDERS
#define TOOL_E_INDEX current_block->active_extruder
#undef TEMP_SENSOR_1_AS_REDUNDANT
#undef HOTEND_OFFSET_X
#undef HOTEND_OFFSET_Y
#elif ENABLED(SWITCHING_EXTRUDER) // One E stepper, unified E axis, two hotends
#define HOTENDS EXTRUDERS
#define E_STEPPERS 1
#define E_MANUAL 1
#define TOOL_E_INDEX 0
#ifndef HOTEND_OFFSET_Z
#define HOTEND_OFFSET_Z { 0 }
#endif
#elif ENABLED(MIXING_EXTRUDER) // Multi-stepper, unified E axis, one hotend
#define HOTENDS 1
#define E_STEPPERS MIXING_STEPPERS
#define E_MANUAL 1
#define TOOL_E_INDEX 0
#else // One stepper, E axis, and hotend per tool
#define HOTENDS EXTRUDERS
#define E_STEPPERS EXTRUDERS
#define E_MANUAL EXTRUDERS
#define TOOL_E_INDEX current_block->active_extruder
#endif
#endif //CONDITIONALS_LCD_H #endif //CONDITIONALS_LCD_H

38
Marlin/Conditionals_post.h
View file

@ -325,44 +325,6 @@
#define HAS_PID_HEATING (ENABLED(PIDTEMP) || ENABLED(PIDTEMPBED)) #define HAS_PID_HEATING (ENABLED(PIDTEMP) || ENABLED(PIDTEMPBED))
#define HAS_PID_FOR_BOTH (ENABLED(PIDTEMP) && ENABLED(PIDTEMPBED)) #define HAS_PID_FOR_BOTH (ENABLED(PIDTEMP) && ENABLED(PIDTEMPBED))
/**
* Extruders have some combination of stepper motors and hotends
* so we separate these concepts into the defines:
*
* EXTRUDERS - Number of Selectable Tools
* HOTENDS - Number of hotends, whether connected or separate
* E_STEPPERS - Number of actual E stepper motors
* TOOL_E_INDEX - Index to use when getting/setting the tool state
*
*/
#if ENABLED(SINGLENOZZLE) // One hotend, multi-extruder
#define HOTENDS 1
#define E_STEPPERS EXTRUDERS
#define E_MANUAL EXTRUDERS
#define TOOL_E_INDEX current_block->active_extruder
#undef TEMP_SENSOR_1_AS_REDUNDANT
#undef HOTEND_OFFSET_X
#undef HOTEND_OFFSET_Y
#elif ENABLED(SWITCHING_EXTRUDER) // One E stepper, unified E axis, two hotends
#define HOTENDS EXTRUDERS
#define E_STEPPERS 1
#define E_MANUAL 1
#define TOOL_E_INDEX 0
#ifndef HOTEND_OFFSET_Z
#define HOTEND_OFFSET_Z { 0 }
#endif
#elif ENABLED(MIXING_EXTRUDER) // Multi-stepper, unified E axis, one hotend
#define HOTENDS 1
#define E_STEPPERS MIXING_STEPPERS
#define E_MANUAL 1
#define TOOL_E_INDEX 0
#else // One stepper, E axis, and hotend per tool
#define HOTENDS EXTRUDERS
#define E_STEPPERS EXTRUDERS
#define E_MANUAL EXTRUDERS
#define TOOL_E_INDEX current_block->active_extruder
#endif
/** /**
* Default hotend offsets, if not defined * Default hotend offsets, if not defined
*/ */

1
Marlin/pins_FELIX2.h
View file

@ -30,6 +30,7 @@
#define BOARD_NAME "Felix 2.0+" #define BOARD_NAME "Felix 2.0+"
// Power outputs EFBF or EFBE
#define MOSFET_D_PIN 7 #define MOSFET_D_PIN 7
#include "pins_RAMPS.h" #include "pins_RAMPS.h"

1
Marlin/pins_MKS_13.h
View file

@ -35,6 +35,7 @@
#define BOARD_NAME "MKS > v1.3" #define BOARD_NAME "MKS > v1.3"
// Power outputs EFBF or EFBE
#define MOSFET_D_PIN 7 #define MOSFET_D_PIN 7
#include "pins_RAMPS.h" #include "pins_RAMPS.h"

1
Marlin/pins_MKS_BASE.h
View file

@ -30,6 +30,7 @@
#define BOARD_NAME "MKS BASE 1.0" #define BOARD_NAME "MKS BASE 1.0"
// Power outputs EFBF or EFBE
#define MOSFET_D_PIN 7 #define MOSFET_D_PIN 7
#include "pins_RAMPS.h" #include "pins_RAMPS.h"

9
Marlin/pins_RAMPS.h
View file

@ -114,11 +114,8 @@
#define SLED_PIN -1 #define SLED_PIN -1
#endif #endif
/*
// Augmentation for auto-assigning RAMPS plugs // Augmentation for auto-assigning RAMPS plugs
#if DISABLED(IS_RAMPS_EEB) && DISABLED(IS_RAMPS_EEF) && DISABLED(IS_RAMPS_EFB) && DISABLED(IS_RAMPS_EFF) && DISABLED(IS_RAMPS_SF) && !PIN_EXISTS(MOSFET_D)
#if DISABLED(IS_RAMPS_EEB) && DISABLED(IS_RAMPS_EEF) && DISABLED(IS_RAMPS_EFB) && DISABLED(IS_RAMPS_EFF) && DISABLED(IS_RAMPS_SF)
#if HOTENDS > 1 #if HOTENDS > 1
#if TEMP_SENSOR_BED #if TEMP_SENSOR_BED
#define IS_RAMPS_EEB #define IS_RAMPS_EEB
@ -132,8 +129,6 @@
#endif #endif
#endif #endif
*/
/** /**
* Hi Voltage PWM Pin Assignments * Hi Voltage PWM Pin Assignments
*/ */
@ -168,7 +163,7 @@
#define CONTROLLERFAN_PIN -1 #define CONTROLLERFAN_PIN -1
#elif ENABLED(IS_RAMPS_SF) // Spindle, Fan #elif ENABLED(IS_RAMPS_SF) // Spindle, Fan
#define FAN_PIN RAMPS_D8_PIN #define FAN_PIN RAMPS_D8_PIN
#else // Non-specific are "EFB" by legacy #else // Non-specific are "EFB" (i.e., "EFBF" or "EFBE")
#define FAN_PIN RAMPS_D9_PIN #define FAN_PIN RAMPS_D9_PIN
#define HEATER_BED_PIN RAMPS_D8_PIN #define HEATER_BED_PIN RAMPS_D8_PIN
#if HOTENDS == 1 #if HOTENDS == 1