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

[2.0.x] LIN_ADVANCE v1.5 (#9712)

Browse Source
This commit is contained in:
Scott Lahteine
2018-02-23 00:53:29 -06:00
committed by GitHub
parent 90fa423737
commit 2bd252b501
52 changed files with 890 additions and 1671 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Marlin/src/inc/Conditionals_LCD.h
View File

@@ -399,7 +399,6 @@
* HOTENDS - Number of hotends, whether connected or separate
* E_STEPPERS - Number of actual E stepper motors
* E_MANUAL - Number of E steppers for LCD move options
* TOOL_E_INDEX - Index to use when getting/setting the tool state
*
*/
#if ENABLED(SINGLENOZZLE) || ENABLED(MIXING_EXTRUDER) // One hotend, one thermistor, no XY offset
@@ -426,24 +425,19 @@
#if EXTRUDERS > 4
#define E_STEPPERS 3
#define E_MANUAL 3
#define TOOL_E_INDEX current_block->active_extruder
#elif EXTRUDERS > 2
#define E_STEPPERS 2
#define E_MANUAL 2
#define TOOL_E_INDEX current_block->active_extruder
#else
#define E_STEPPERS 1
#define TOOL_E_INDEX 0
#endif
#define E_MANUAL E_STEPPERS
#elif ENABLED(MIXING_EXTRUDER)
#define E_STEPPERS MIXING_STEPPERS
#define E_MANUAL 1
#define TOOL_E_INDEX 0
#else
#define E_STEPPERS EXTRUDERS
#define E_MANUAL EXTRUDERS
#define TOOL_E_INDEX current_block->active_extruder
#endif
/**

6
Marlin/src/inc/SanityCheck.h
View File

@@ -223,6 +223,8 @@
#error "MIN_RETRACT is now MIN_AUTORETRACT and MAX_AUTORETRACT. Please update your Configuration_adv.h."
#elif defined(ADVANCE)
#error "ADVANCE was removed in Marlin 1.1.6. Please use LIN_ADVANCE."
#elif defined(LIN_ADVANCE_E_D_RATIO)
#error "LIN_ADVANCE (1.5) no longer uses LIN_ADVANCE_E_D_RATIO. Check your configuration."
#elif defined(NEOPIXEL_RGBW_LED)
#error "NEOPIXEL_RGBW_LED is now NEOPIXEL_LED. Please update your configuration."
#elif defined(UBL_MESH_INSET)
@@ -552,10 +554,6 @@ static_assert(X_MAX_LENGTH >= X_BED_SIZE && Y_MAX_LENGTH >= Y_BED_SIZE,
#endif
#endif
#if ENABLED(LIN_ADVANCE) && !IS_CARTESIAN
#error "Sorry! LIN_ADVANCE is only compatible with Cartesian."
#endif
/**
* Parking Extruder requirements
*/