btach/MarlinFirmware
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

🐛 Fix E DIR init (#27770)

Browse source 
Followup to add72fd045
This commit is contained in:
ellensp 2025-03-30 14:58:16 +13:00 • committed by GitHub
parent 849e432d62
commit aad10ea1c7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 137 additions and 113 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Marlin/src/module/stepper.cpp
View file

@ -2958,11 +2958,19 @@ void Stepper::init() {
TERN_(HAS_Z3_DIR, Z3_DIR_INIT());
TERN_(HAS_Z4_DIR, Z4_DIR_INIT());
TERN_(HAS_I_DIR, I_DIR_INIT());
TERN_(HAS_K_DIR, K_DIR_INIT());
TERN_(HAS_J_DIR, J_DIR_INIT());
TERN_(HAS_K_DIR, K_DIR_INIT());
TERN_(HAS_U_DIR, U_DIR_INIT());
TERN_(HAS_V_DIR, V_DIR_INIT());
TERN_(HAS_W_DIR, W_DIR_INIT());
TERN_(HAS_E0_DIR, E0_DIR_INIT());
TERN_(HAS_E1_DIR, E1_DIR_INIT());
TERN_(HAS_E2_DIR, E2_DIR_INIT());
TERN_(HAS_E3_DIR, E3_DIR_INIT());
TERN_(HAS_E4_DIR, E4_DIR_INIT());
TERN_(HAS_E5_DIR, E5_DIR_INIT());
TERN_(HAS_E6_DIR, E6_DIR_INIT());
TERN_(HAS_E7_DIR, E7_DIR_INIT());
// Init Enable Pins - steppers default to disabled.
#if HAS_X_ENABLE

16
Marlin/src/module/stepper/indirection.h
View file

@ -353,6 +353,7 @@ void reset_stepper_drivers(); // Called by settings.load / settings.reset
#endif
// E0 Stepper
#if E_STEPPERS > 0
#ifndef E0_ENABLE_INIT
#define E0_ENABLE_INIT() SET_OUTPUT(E0_ENABLE_PIN)
#define E0_ENABLE_WRITE(STATE) WRITE(E0_ENABLE_PIN,STATE)
@ -368,8 +369,10 @@ void reset_stepper_drivers(); // Called by settings.load / settings.reset
#define E0_STEP_WRITE(STATE) WRITE(E0_STEP_PIN,STATE)
#endif
#define E0_STEP_READ() bool(READ(E0_STEP_PIN))
#endif
// E1 Stepper
#if E_STEPPERS > 1 || ENABLED(E_DUAL_STEPPER_DRIVERS)
#ifndef E1_ENABLE_INIT
#define E1_ENABLE_INIT() SET_OUTPUT(E1_ENABLE_PIN)
#define E1_ENABLE_WRITE(STATE) WRITE(E1_ENABLE_PIN,STATE)
@ -385,8 +388,10 @@ void reset_stepper_drivers(); // Called by settings.load / settings.reset
#define E1_STEP_WRITE(STATE) WRITE(E1_STEP_PIN,STATE)
#endif
#define E1_STEP_READ() bool(READ(E1_STEP_PIN))
#endif
// E2 Stepper
#if E_STEPPERS > 2
#ifndef E2_ENABLE_INIT
#define E2_ENABLE_INIT() SET_OUTPUT(E2_ENABLE_PIN)
#define E2_ENABLE_WRITE(STATE) WRITE(E2_ENABLE_PIN,STATE)
@ -402,8 +407,10 @@ void reset_stepper_drivers(); // Called by settings.load / settings.reset
#define E2_STEP_WRITE(STATE) WRITE(E2_STEP_PIN,STATE)
#endif
#define E2_STEP_READ() bool(READ(E2_STEP_PIN))
#endif
// E3 Stepper
#if E_STEPPERS > 3
#ifndef E3_ENABLE_INIT
#define E3_ENABLE_INIT() SET_OUTPUT(E3_ENABLE_PIN)
#define E3_ENABLE_WRITE(STATE) WRITE(E3_ENABLE_PIN,STATE)
@ -419,8 +426,10 @@ void reset_stepper_drivers(); // Called by settings.load / settings.reset
#define E3_STEP_WRITE(STATE) WRITE(E3_STEP_PIN,STATE)
#endif
#define E3_STEP_READ() bool(READ(E3_STEP_PIN))
#endif
// E4 Stepper
#if E_STEPPERS > 4
#ifndef E4_ENABLE_INIT
#define E4_ENABLE_INIT() SET_OUTPUT(E4_ENABLE_PIN)
#define E4_ENABLE_WRITE(STATE) WRITE(E4_ENABLE_PIN,STATE)
@ -436,8 +445,10 @@ void reset_stepper_drivers(); // Called by settings.load / settings.reset
#define E4_STEP_WRITE(STATE) WRITE(E4_STEP_PIN,STATE)
#endif
#define E4_STEP_READ() bool(READ(E4_STEP_PIN))
#endif
// E5 Stepper
#if E_STEPPERS > 5
#ifndef E5_ENABLE_INIT
#define E5_ENABLE_INIT() SET_OUTPUT(E5_ENABLE_PIN)
#define E5_ENABLE_WRITE(STATE) WRITE(E5_ENABLE_PIN,STATE)
@ -453,8 +464,10 @@ void reset_stepper_drivers(); // Called by settings.load / settings.reset
#define E5_STEP_WRITE(STATE) WRITE(E5_STEP_PIN,STATE)
#endif
#define E5_STEP_READ() bool(READ(E5_STEP_PIN))
#endif
// E6 Stepper
#if E_STEPPERS > 6
#ifndef E6_ENABLE_INIT
#define E6_ENABLE_INIT() SET_OUTPUT(E6_ENABLE_PIN)
#define E6_ENABLE_WRITE(STATE) WRITE(E6_ENABLE_PIN,STATE)
@ -470,8 +483,10 @@ void reset_stepper_drivers(); // Called by settings.load / settings.reset
#define E6_STEP_WRITE(STATE) WRITE(E6_STEP_PIN,STATE)
#endif
#define E6_STEP_READ() bool(READ(E6_STEP_PIN))
#endif
// E7 Stepper
#if E_STEPPERS > 7
#ifndef E7_ENABLE_INIT
#define E7_ENABLE_INIT() SET_OUTPUT(E7_ENABLE_PIN)
#define E7_ENABLE_WRITE(STATE) WRITE(E7_ENABLE_PIN,STATE)
@ -487,6 +502,7 @@ void reset_stepper_drivers(); // Called by settings.load / settings.reset
#define E7_STEP_WRITE(STATE) WRITE(E7_STEP_PIN,STATE)
#endif
#define E7_STEP_READ() bool(READ(E7_STEP_PIN))
#endif
/**
* Extruder indirection for the single E axis