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

Modify E-stepping macros for use in LINEAR_ADVANCE (#10885)

Browse Source
This commit is contained in:
Scott Lahteine
2018-05-28 19:34:08 -05:00
committed by GitHub
parent 8f14ef855d
commit 4299e5dc8b
2 changed files with 57 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

128
Marlin/src/module/stepper.cpp
View File

@@ -259,7 +259,7 @@ volatile int32_t Stepper::endstops_trigsteps[XYZ];
#endif
#if DISABLED(MIXING_EXTRUDER)
#define E_APPLY_STEP(v,Q) E_STEP_WRITE(v)
#define E_APPLY_STEP(v,Q) E_STEP_WRITE(current_block->active_extruder, v)
#endif
/**
@@ -315,11 +315,11 @@ void Stepper::set_directions() {
#if DISABLED(LIN_ADVANCE)
if (motor_direction(E_AXIS)) {
REV_E_DIR();
REV_E_DIR(current_block->active_extruder);
count_direction[E_AXIS] = -1;
}
else {
NORM_E_DIR();
NORM_E_DIR(current_block->active_extruder);
count_direction[E_AXIS] = 1;
}
#endif // !LIN_ADVANCE
@@ -1423,7 +1423,7 @@ void Stepper::stepper_pulse_phase_isr() {
// Step mixing steppers (proportionally)
counter_m[j] += current_block->steps[E_AXIS];
// Step when the counter goes over zero
if (counter_m[j] >= 0) En_STEP_WRITE(j, !INVERT_E_STEP_PIN);
if (counter_m[j] >= 0) E_STEP_WRITE(j, !INVERT_E_STEP_PIN);
}
#else // !MIXING_EXTRUDER
PULSE_START(E);
@@ -1465,7 +1465,7 @@ void Stepper::stepper_pulse_phase_isr() {
MIXING_STEPPERS_LOOP(j) {
if (counter_m[j] >= 0) {
counter_m[j] -= current_block->mix_event_count[j];
En_STEP_WRITE(j, INVERT_E_STEP_PIN);
E_STEP_WRITE(j, INVERT_E_STEP_PIN);
}
}
#else // !MIXING_EXTRUDER
@@ -1774,61 +1774,6 @@ uint32_t Stepper::stepper_block_phase_isr() {
uint32_t Stepper::advance_isr() {
uint32_t interval;
#if ENABLED(MK2_MULTIPLEXER) // For SNMM even-numbered steppers are reversed
#define SET_E_STEP_DIR(INDEX) do{ if (e_steps) E0_DIR_WRITE(e_steps < 0 ? !INVERT_E## INDEX ##_DIR ^ TEST(INDEX, 0) : INVERT_E## INDEX ##_DIR ^ TEST(INDEX, 0)); }while(0)
#elif ENABLED(DUAL_X_CARRIAGE) || ENABLED(DUAL_NOZZLE_DUPLICATION_MODE)
#define SET_E_STEP_DIR(INDEX) do{ if (e_steps) { if (e_steps < 0) REV_E_DIR(); else NORM_E_DIR(); } }while(0)
#elif ENABLED(SWITCHING_EXTRUDER)
#if EXTRUDERS > 4
#define SET_E_STEP_DIR(INDEX) do{ if (e_steps) { switch (INDEX) { \
case 0: case 1: E0_DIR_WRITE(!INVERT_E0_DIR ^ TEST(INDEX, 0) ^ (e_steps < 0)); break; \
case 2: case 3: E1_DIR_WRITE(!INVERT_E1_DIR ^ TEST(INDEX, 0) ^ (e_steps < 0)); break; \
case 4: E2_DIR_WRITE(!INVERT_E2_DIR ^ TEST(INDEX, 0) ^ (e_steps < 0)); \
} } }while(0)
#elif EXTRUDERS > 2
#define SET_E_STEP_DIR(INDEX) do{ if (e_steps) { switch (INDEX) { \
case 0: case 1: E0_DIR_WRITE(!INVERT_E0_DIR ^ TEST(INDEX, 0) ^ (e_steps < 0)); break; \
case 2: case 3: E1_DIR_WRITE(!INVERT_E1_DIR ^ TEST(INDEX, 0) ^ (e_steps < 0)); break; \
} } }while(0)
#else
#define SET_E_STEP_DIR(INDEX) do{ if (e_steps) E0_DIR_WRITE(!INVERT_E0_DIR ^ TEST(INDEX, 0) ^ (e_steps < 0)); }while(0)
#endif
#else
#define SET_E_STEP_DIR(INDEX) do{ if (e_steps) E## INDEX ##_DIR_WRITE(!INVERT_E## INDEX ##_DIR ^ (e_steps < 0)); }while(0)
#endif
#if ENABLED(DUAL_X_CARRIAGE) || ENABLED(DUAL_NOZZLE_DUPLICATION_MODE)
#define START_E_PULSE(INDEX) do{ if (e_steps) E_STEP_WRITE(!INVERT_E_STEP_PIN); }while(0)
#define STOP_E_PULSE(INDEX) do{ if (e_steps) { e_steps < 0 ? ++e_steps : --e_steps; E_STEP_WRITE(INVERT_E_STEP_PIN); } }while(0)
#elif ENABLED(SWITCHING_EXTRUDER)
#if EXTRUDERS > 4
#define START_E_PULSE(INDEX) do{ if (e_steps) { switch (INDEX) { \
case 0: case 1: E0_STEP_WRITE(!INVERT_E_STEP_PIN); break; \
case 2: case 3: E1_STEP_WRITE(!INVERT_E_STEP_PIN); break; \
case 4: E2_STEP_WRITE(!INVERT_E_STEP_PIN); } \
} }while(0)
#define STOP_E_PULSE(INDEX) do{ if (e_steps) { \
e_steps < 0 ? ++e_steps : --e_steps; \
switch (INDEX) { \
case 0: case 1: E0_STEP_WRITE( INVERT_E_STEP_PIN); break; \
case 2: case 3: E1_STEP_WRITE( INVERT_E_STEP_PIN); break; \
case 4: E2_STEP_WRITE( INVERT_E_STEP_PIN); } \
} }while(0)
#elif EXTRUDERS > 2
#define START_E_PULSE(INDEX) do{ if (e_steps) { if (INDEX < 2) E0_STEP_WRITE(!INVERT_E_STEP_PIN); else E1_STEP_WRITE(!INVERT_E_STEP_PIN); } }while(0)
#define STOP_E_PULSE(INDEX) do{ if (e_steps) { \
e_steps < 0 ? ++e_steps : --e_steps; \
if (INDEX < 2) E0_STEP_WRITE(INVERT_E_STEP_PIN); else E1_STEP_WRITE(INVERT_E_STEP_PIN); \
} }while(0)
#else
#define START_E_PULSE(INDEX) do{ if (e_steps) E0_STEP_WRITE(!INVERT_E_STEP_PIN); }while(0)
#define STOP_E_PULSE(INDEX) do{ if (e_steps) { e_steps < 0 ? ++e_steps : --e_steps; E0_STEP_WRITE(INVERT_E_STEP_PIN); }while(0)
#endif
#else
#define START_E_PULSE(INDEX) do{ if (e_steps) E## INDEX ##_STEP_WRITE(!INVERT_E_STEP_PIN); }while(0)
#define STOP_E_PULSE(INDEX) do { if (e_steps) { e_steps < 0 ? ++e_steps : --e_steps; E## INDEX ##_STEP_WRITE(INVERT_E_STEP_PIN); } }while(0)
#endif
if (use_advance_lead) {
if (step_events_completed > LA_decelerate_after && current_adv_steps > final_adv_steps) {
e_steps--;
@@ -1847,21 +1792,10 @@ uint32_t Stepper::stepper_block_phase_isr() {
else
interval = ADV_NEVER;
switch (LA_active_extruder) {
case 0: SET_E_STEP_DIR(0); break;
#if EXTRUDERS > 1
case 1: SET_E_STEP_DIR(1); break;
#if EXTRUDERS > 2
case 2: SET_E_STEP_DIR(2); break;
#if EXTRUDERS > 3
case 3: SET_E_STEP_DIR(3); break;
#if EXTRUDERS > 4
case 4: SET_E_STEP_DIR(4); break;
#endif // EXTRUDERS > 4
#endif // EXTRUDERS > 3
#endif // EXTRUDERS > 2
#endif // EXTRUDERS > 1
}
if (e_steps >= 0)
NORM_E_DIR(LA_active_extruder);
else
REV_E_DIR(LA_active_extruder);
// Step E stepper if we have steps
while (e_steps) {
@@ -1870,21 +1804,7 @@ uint32_t Stepper::stepper_block_phase_isr() {
hal_timer_t pulse_start = HAL_timer_get_count(PULSE_TIMER_NUM);
#endif
switch (LA_active_extruder) {
case 0: START_E_PULSE(0); break;
#if EXTRUDERS > 1
case 1: START_E_PULSE(1); break;
#if EXTRUDERS > 2
case 2: START_E_PULSE(2); break;
#if EXTRUDERS > 3
case 3: START_E_PULSE(3); break;
#if EXTRUDERS > 4
case 4: START_E_PULSE(4); break;
#endif // EXTRUDERS > 4
#endif // EXTRUDERS > 3
#endif // EXTRUDERS > 2
#endif // EXTRUDERS > 1
}
E_STEP_WRITE(LA_active_extruder, !INVERT_E_STEP_PIN);
// For minimum pulse time wait before stopping pulses
#if EXTRA_CYCLES_E > 20
@@ -1894,21 +1814,9 @@ uint32_t Stepper::stepper_block_phase_isr() {
DELAY_NS(EXTRA_CYCLES_E * NANOSECONDS_PER_CYCLE);
#endif
switch (LA_active_extruder) {
case 0: STOP_E_PULSE(0); break;
#if EXTRUDERS > 1
case 1: STOP_E_PULSE(1); break;
#if EXTRUDERS > 2
case 2: STOP_E_PULSE(2); break;
#if EXTRUDERS > 3
case 3: STOP_E_PULSE(3); break;
#if EXTRUDERS > 4
case 4: STOP_E_PULSE(4); break;
#endif // EXTRUDERS > 4
#endif // EXTRUDERS > 3
#endif // EXTRUDERS > 2
#endif // EXTRUDERS > 1
}
e_steps < 0 ? ++e_steps : --e_steps;
E_STEP_WRITE(LA_active_extruder, INVERT_E_STEP_PIN);
// For minimum pulse time wait before looping
#if EXTRA_CYCLES_E > 20
@@ -2061,19 +1969,19 @@ void Stepper::init() {
AXIS_INIT(Z, Z);
#endif
#if HAS_E0_STEP
#if E_STEPPERS > 0 && HAS_E0_STEP
E_AXIS_INIT(0);
#endif
#if HAS_E1_STEP
#if E_STEPPERS > 1 && HAS_E1_STEP
E_AXIS_INIT(1);
#endif
#if HAS_E2_STEP
#if E_STEPPERS > 2 && HAS_E2_STEP
E_AXIS_INIT(2);
#endif
#if HAS_E3_STEP
#if E_STEPPERS > 3 && HAS_E3_STEP
E_AXIS_INIT(3);
#endif
#if HAS_E4_STEP
#if E_STEPPERS > 4 && HAS_E4_STEP
E_AXIS_INIT(4);
#endif