3DPrinting/Prusa-Firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'prusa3d/MK3' into MK3_dev

Browse source
This commit is contained in:
Marek Bel 2018-08-09 21:26:33 +02:00
commit d94a1c5952
9 changed files with 197 additions and 694 deletions
Firmware
stepper.cpp

6
Firmware/stepper.cpp
View file

@ -526,7 +526,7 @@ FORCE_INLINE void stepper_next_block()
#ifndef LIN_ADVANCE
WRITE(E0_DIR_PIN,
#ifdef SNMM
(snmm_extruder == 0 || snmm_extruder == 2) ? !INVERT_E0_DIR :
(mmu_extruder == 0 || mmu_extruder == 2) ? !INVERT_E0_DIR :
#endif // SNMM
INVERT_E0_DIR);
#endif /* LIN_ADVANCE */
@ -535,7 +535,7 @@ FORCE_INLINE void stepper_next_block()
#ifndef LIN_ADVANCE
WRITE(E0_DIR_PIN,
#ifdef SNMM
(snmm_extruder == 0 || snmm_extruder == 2) ? INVERT_E0_DIR :
(mmu_extruder == 0 || mmu_extruder == 2) ? INVERT_E0_DIR :
#endif // SNMM
!INVERT_E0_DIR);
#endif /* LIN_ADVANCE */
@ -876,7 +876,7 @@ FORCE_INLINE void isr() {
bool neg = e_steps < 0;
bool dir =
#ifdef SNMM
(neg == (snmm_extruder & 1))
(neg == (mmu_extruder & 1))
#else
neg
#endif