mirror of
https://github.com/MarlinFirmware/Marlin.git
synced 2024-11-27 13:56:24 +00:00
Auto-select power plugs for RAMPS derivatives
This commit is contained in:
parent
34c60f1b55
commit
cebd2bfff0
@ -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
|
||||||
|
@ -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
|
||||||
*/
|
*/
|
||||||
|
@ -114,10 +114,7 @@
|
|||||||
#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)
|
#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
|
||||||
@ -132,8 +129,6 @@
|
|||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
*/
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Hi Voltage PWM Pin Assignments
|
* Hi Voltage PWM Pin Assignments
|
||||||
*/
|
*/
|
||||||
|
Loading…
Reference in New Issue
Block a user