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

Save some PROGMEM with constexpr (#11798)

Browse Source 
When possible, make `active_extruder` a `constexpr` to save some PROGMEM.
This commit is contained in:
Scott Lahteine
2018-09-10 23:09:26 -05:00
committed by GitHub
parent 4f883d5971
commit d882717d98
9 changed files with 43 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Marlin/src/module/stepper.h
View File

@ -254,8 +254,11 @@ class Stepper {
static bool abort_current_block; // Signals to the stepper that current block should be aborted
#if DISABLED(MIXING_EXTRUDER)
static uint8_t last_moved_extruder; // Last-moved extruder, as set when the last movement was fetched from planner
// Last-moved extruder, as set when the last movement was fetched from planner
#if EXTRUDERS < 2
static constexpr uint8_t last_moved_extruder = 0;
#elif DISABLED(MIXING_EXTRUDER)
static uint8_t last_moved_extruder;
#endif
#if ENABLED(X_DUAL_ENDSTOPS)
@ -293,8 +296,10 @@ class Stepper {
advance_divisor_m;
#define MIXING_STEPPERS_LOOP(VAR) \
for (uint8_t VAR = 0; VAR < MIXING_STEPPERS; VAR++)
#elif EXTRUDERS > 1
static uint8_t active_extruder;
#else
static int8_t active_extruder; // Active extruder
static constexpr uint8_t active_extruder = 0;
#endif
#if ENABLED(S_CURVE_ACCELERATION)
@ -385,7 +390,7 @@ class Stepper {
// The extruder associated to the last movement
FORCE_INLINE static uint8_t movement_extruder() {
return
#if ENABLED(MIXING_EXTRUDER)
#if ENABLED(MIXING_EXTRUDER) || EXTRUDERS < 2
0
#else
last_moved_extruder