Skip to content

Commit

Permalink
Cleanup of old includes, add comments
Browse files Browse the repository at this point in the history
  • Loading branch information
@thinkyhead
thinkyhead committed Jan 30, 2020
1 parent a5f7233 commit 38c2fb1
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 15 deletions.
2 changes: 1 addition & 1 deletion Marlin/Configuration_adv.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -819,7 +819,7 @@
// probing on a screwhead or hollow washer, probe near the edges.
//#define CALIBRATION_MEASURE_AT_TOP_EDGES

// Define pin which is read during calibration
// Define the pin to read during calibration
#ifndef CALIBRATION_PIN
#define CALIBRATION_PIN -1 // Override in pins.h or set to -1 to use your Z endstop
#define CALIBRATION_PIN_INVERTING false // Set to true to invert the pin
Expand Down
6 changes: 2 additions & 4 deletions Marlin/src/gcode/lcd/M0_M1.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@
*
*/

#include "../../inc/MarlinConfig.h"
#include "../../inc/MarlinConfigPre.h"

#if HAS_RESUME_CONTINUE

#include "../../inc/MarlinConfig.h"
#include "../gcode.h"
#include "../../module/stepper.h"

#if HAS_LCD_MENU
#include "../../lcd/ultralcd.h"
Expand All @@ -35,8 +35,6 @@
#include "../../lcd/extensible_ui/ui_api.h"
#endif

#include "../../sd/cardreader.h"

#if HAS_LEDS_OFF_FLAG
#include "../../feature/leds/printer_event_leds.h"
#endif
Expand Down
20 changes: 10 additions & 10 deletions Marlin/src/pins/rambo/pins_EINSY_RETRO.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
#error "You must set ([XYZ]|E0)_DRIVER_TYPE to TMC2130 in Configuration.h for EinsyRetro."
#endif

// TMC2130 Diag Pins (currently just for reference)
// TMC2130 Diag Pins
#define X_DIAG_PIN 64
#define Y_DIAG_PIN 69
#define Z_DIAG_PIN 68
Expand All @@ -55,27 +55,27 @@

#if DISABLED(SENSORLESS_HOMING)

#define X_MIN_PIN 12
#define Y_MIN_PIN 11
#define Z_MIN_PIN 10
#define X_MAX_PIN 81
#define Y_MAX_PIN 57
#define X_MIN_PIN 12 // X-
#define Y_MIN_PIN 11 // Y-
#define Z_MIN_PIN 10 // Z-
#define X_MAX_PIN 81 // X+
#define Y_MAX_PIN 57 // Y+

#else

#if X_HOME_DIR < 0
#define X_MIN_PIN X_DIAG_PIN
#define X_MAX_PIN 81
#define X_MAX_PIN 81 // X+
#else
#define X_MIN_PIN 12
#define X_MIN_PIN 12 // X-
#define X_MAX_PIN X_DIAG_PIN
#endif

#if Y_HOME_DIR < 0
#define Y_MIN_PIN Y_DIAG_PIN
#define Y_MAX_PIN 57
#define Y_MAX_PIN 57 // Y+
#else
#define Y_MIN_PIN 11
#define Y_MIN_PIN 11 // Y-
#define Y_MAX_PIN Y_DIAG_PIN
#endif

Expand Down

1 comment on commit 38c2fb1

@ManuelMcLure
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change causes a build failure:

Marlin\src\gcode\lcd\M0_M1.cpp: In static member function 'static void GcodeSuite::M0_M1()':
Marlin\src\gcode\lcd\M0_M1.cpp:65:3: error: 'planner' was not declared in this scope
   planner.synchronize();
   ^~~~~~~
Marlin\src\gcode\lcd\M0_M1.cpp:65:3: note: suggested alternative: 'parser'
   planner.synchronize();
   ^~~~~~~
   parser

Please sign in to comment.