Merge branch 'marlin-1.1.5-einsyrambo' of ssh://code.alephobjects.com/diffusion/MARLIN/marlin into marlin-1.1.5-einsyrambo

master
Marcio Teixeira 7 years ago
commit d093e34f80

@ -357,7 +357,9 @@
#endif #endif
// When G28 is called, this option will make Y home before X // When G28 is called, this option will make Y home before X
//#define HOME_Y_BEFORE_X #if defined(LULZBOT_HOME_Y_BEFORE_X)
#define HOME_Y_BEFORE_X
#endif
// @section machine // @section machine

@ -4032,7 +4032,6 @@ inline void gcode_G28(const bool always_home_all) {
#endif #endif
#if ENABLED(HOME_Y_BEFORE_X) #if ENABLED(HOME_Y_BEFORE_X)
// Home Y // Home Y
if (home_all || homeY) { if (home_all || homeY) {
HOMEAXIS(Y); HOMEAXIS(Y);

@ -154,6 +154,7 @@ void Endstops::report_state() {
#define ENDSTOP_HIT_TEST_Y() _ENDSTOP_HIT_TEST(Y,'Y') #define ENDSTOP_HIT_TEST_Y() _ENDSTOP_HIT_TEST(Y,'Y')
#define ENDSTOP_HIT_TEST_Z() _ENDSTOP_HIT_TEST(Z,'Z') #define ENDSTOP_HIT_TEST_Z() _ENDSTOP_HIT_TEST(Z,'Z')
#if !defined(LULZBOT_SUPPRESS_CHATTY_ENDSTOPS)
SERIAL_ECHO_START(); SERIAL_ECHO_START();
SERIAL_ECHOPGM(MSG_ENDSTOPS_HIT); SERIAL_ECHOPGM(MSG_ENDSTOPS_HIT);
ENDSTOP_HIT_TEST_X(); ENDSTOP_HIT_TEST_X();
@ -165,6 +166,7 @@ void Endstops::report_state() {
if (TEST(endstop_hit_bits, Z_MIN_PROBE)) _ENDSTOP_HIT_ECHO(P, 'P'); if (TEST(endstop_hit_bits, Z_MIN_PROBE)) _ENDSTOP_HIT_ECHO(P, 'P');
#endif #endif
SERIAL_EOL(); SERIAL_EOL();
#endif
#if ENABLED(ULTRA_LCD) #if ENABLED(ULTRA_LCD)
lcd_status_printf_P(0, PSTR(MSG_LCD_ENDSTOPS " %c %c %c %c"), chrX, chrY, chrZ, chrP); lcd_status_printf_P(0, PSTR(MSG_LCD_ENDSTOPS " %c %c %c %c"), chrX, chrY, chrZ, chrP);

@ -126,7 +126,6 @@
// TMC2130 Driver objects and inits // TMC2130 Driver objects and inits
// //
#if ENABLED(HAVE_TMC2130) #if ENABLED(HAVE_TMC2130)
#include <SPI.h> #include <SPI.h>
#include <TMC2130Stepper.h> #include <TMC2130Stepper.h>
#include "enum.h" #include "enum.h"

Loading…
Cancel
Save