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

Merge remote-tracking branch 'origin/MK3' into MK3-michal

Browse source
This commit is contained in:
michalprusa 2017-07-07 07:58:35 +02:00
commit 7f4d5bdfbf
2 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Firmware/Marlin_main.cpp
View file

@ -2006,6 +2006,7 @@ void homeaxis(int axis) {
plan_buffer_line(destination[X_AXIS], destination[Y_AXIS], destination[Z_AXIS], destination[E_AXIS], feedrate/60, active_extruder); plan_buffer_line(destination[X_AXIS], destination[Y_AXIS], destination[Z_AXIS], destination[E_AXIS], feedrate/60, active_extruder);
#ifdef HAVE_TMC2130_DRIVERS #ifdef HAVE_TMC2130_DRIVERS
sg_homing_delay = 0;
tmc2130_axis_stalled[axis] = false; tmc2130_axis_stalled[axis] = false;
#endif #endif
st_synchronize(); st_synchronize();
@ -2016,6 +2017,7 @@ void homeaxis(int axis) {
plan_buffer_line(destination[X_AXIS], destination[Y_AXIS], destination[Z_AXIS], destination[E_AXIS], feedrate/60, active_extruder); plan_buffer_line(destination[X_AXIS], destination[Y_AXIS], destination[Z_AXIS], destination[E_AXIS], feedrate/60, active_extruder);
#ifdef HAVE_TMC2130_DRIVERS #ifdef HAVE_TMC2130_DRIVERS
sg_homing_delay = 0;
tmc2130_axis_stalled[axis] = false; tmc2130_axis_stalled[axis] = false;
#endif #endif
st_synchronize(); st_synchronize();
@ -2030,6 +2032,7 @@ void homeaxis(int axis) {
plan_buffer_line(destination[X_AXIS], destination[Y_AXIS], destination[Z_AXIS], destination[E_AXIS], feedrate/60, active_extruder); plan_buffer_line(destination[X_AXIS], destination[Y_AXIS], destination[Z_AXIS], destination[E_AXIS], feedrate/60, active_extruder);
#ifdef HAVE_TMC2130_DRIVERS #ifdef HAVE_TMC2130_DRIVERS
sg_homing_delay = 0;
tmc2130_axis_stalled[axis] = false; tmc2130_axis_stalled[axis] = false;
#endif #endif
st_synchronize(); st_synchronize();

16
Firmware/swspi.h
View file

@ -14,10 +14,18 @@
#endif //SWSPI_RPI #endif //SWSPI_RPI
#ifdef SWSPI_AVR #ifdef SWSPI_AVR
#define SWSPI_MISO 16 #if (MOTHERBOARD == BOARD_EINY_0_3a)
#define SWSPI_MOSI 16 #define SWSPI_MISO 16 //RX2
#define SWSPI_SCK 17 #define SWSPI_MOSI 16 //RX2
#define SWSPI_CS 20 #define SWSPI_SCK 17 //TX2
#define SWSPI_CS 20 //SDA
#endif //(MOTHERBOARD == BOARD_EINY_0_3a)
#if (MOTHERBOARD == BOARD_EINY_0_4a)
#define SWSPI_MISO 62 //PK0
#define SWSPI_MOSI 62 //PK0
#define SWSPI_SCK 21 //SCL
#define SWSPI_CS 20 //SDA
#endif //(MOTHERBOARD == BOARD_EINY_0_4a)
#endif //SWSPI_AVR #endif //SWSPI_AVR
#define SWSPI_POL 1 //polarity #define SWSPI_POL 1 //polarity