Skip to content
This repository has been archived by the owner on Oct 1, 2022. It is now read-only.

Commit

Permalink
Fix conflict of variable name for home location for MKS and adjustment
Browse files Browse the repository at this point in the history 
Fix conflict of variable name for home location for MKS and adjustment
  • Loading branch information
Timothy Hoogland committed Jul 8, 2019
1 parent 4433798 commit ac26a1c
Show file tree
Hide file tree
Showing 2 changed files with 51 additions and 51 deletions.
6 changes: 3 additions & 3 deletions TH3DUF_R2/Configuration.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -801,13 +801,13 @@
//===========================================================================

// HOME OFFSET ADJUSTMENT --------------------------
// If you need to adjust your XY home offsets from defaults then you can uncomment the HOME_ADJUST line below and enter your
// If you need to adjust your XY home offsets from defaults then you can uncomment the HOME_ADJUST_LOCATION line below and enter your
// custom XY offsets. This is provided for convenience and is unsupported with included product support.
// How to use - measure (home XY then jog using the LCD 1mm at a time) the X and Y distance the nozzle is off
// the build plate and then put those as NEGATIVE values below, positive values will NOT work (move your endstops to fix a positve offset).
//#define HOME_ADJUST
#define X_HOME_LOCATION -10
#define Y_HOME_LOCATION -10
#define X_HOME_ADJUST_LOCATION -10
#define Y_HOME_ADJUST_LOCATION -10

// LINEAR ADVANCE ----------------------------------
// See here on how to use Linear Advance: http://marlinfw.org/docs/features/lin_advance.html
Expand Down
96 changes: 48 additions & 48 deletions TH3DUF_R2/Configuration_backend.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -232,8 +232,8 @@
#define REVERSE_MENU_DIRECTION

#if ENABLED(HOME_ADJUST)
#define X_MIN_POS X_HOME_LOCATION
#define Y_MIN_POS Y_HOME_LOCATION
#define X_MIN_POS X_HOME_ADJUST_LOCATION
#define Y_MIN_POS Y_HOME_ADJUST_LOCATION
#else
#define X_MIN_POS 0
#define Y_MIN_POS 0
Expand Down Expand Up @@ -450,8 +450,8 @@
#define Z_MAX_POS 310

#if ENABLED(HOME_ADJUST)
#define X_MIN_POS X_HOME_LOCATION
#define Y_MIN_POS Y_HOME_LOCATION
#define X_MIN_POS X_HOME_ADJUST_LOCATION
#define Y_MIN_POS Y_HOME_ADJUST_LOCATION
#else
#define X_MIN_POS 0
#define Y_MIN_POS 0
Expand Down Expand Up @@ -519,8 +519,8 @@
#define Z_MAX_POS 420

#if ENABLED(HOME_ADJUST)
#define X_MIN_POS X_HOME_LOCATION
#define Y_MIN_POS Y_HOME_LOCATION
#define X_MIN_POS X_HOME_ADJUST_LOCATION
#define Y_MIN_POS Y_HOME_ADJUST_LOCATION
#else
#define X_MIN_POS -6
#define Y_MIN_POS 0
Expand Down Expand Up @@ -586,8 +586,8 @@
#define Z_MAX_POS 420

#if ENABLED(HOME_ADJUST)
#define X_MIN_POS X_HOME_LOCATION
#define Y_MIN_POS Y_HOME_LOCATION
#define X_MIN_POS X_HOME_ADJUST_LOCATION
#define Y_MIN_POS Y_HOME_ADJUST_LOCATION
#else
#define X_MIN_POS 0
#define Y_MIN_POS 0
Expand Down Expand Up @@ -665,8 +665,8 @@
#define Z_MAX_POS 410

#if ENABLED(HOME_ADJUST)
#define X_MIN_POS X_HOME_LOCATION
#define Y_MIN_POS Y_HOME_LOCATION
#define X_MIN_POS X_HOME_ADJUST_LOCATION
#define Y_MIN_POS Y_HOME_ADJUST_LOCATION
#else
#define X_MIN_POS 0
#define Y_MIN_POS 0
Expand Down Expand Up @@ -743,8 +743,8 @@
#define Z_MAX_POS 400

#if ENABLED(HOME_ADJUST)
#define X_MIN_POS X_HOME_LOCATION
#define Y_MIN_POS Y_HOME_LOCATION
#define X_MIN_POS X_HOME_ADJUST_LOCATION
#define Y_MIN_POS Y_HOME_ADJUST_LOCATION
#else
#define X_MIN_POS 0
#define Y_MIN_POS 0
Expand Down Expand Up @@ -828,8 +828,8 @@
#define Z_MAX_POS 300

#if ENABLED(HOME_ADJUST)
#define X_MIN_POS X_HOME_LOCATION
#define Y_MIN_POS Y_HOME_LOCATION
#define X_MIN_POS X_HOME_ADJUST_LOCATION
#define Y_MIN_POS Y_HOME_ADJUST_LOCATION
#else
#define X_MIN_POS 0
#define Y_MIN_POS 0
Expand Down Expand Up @@ -929,8 +929,8 @@
#endif

#if ENABLED(HOME_ADJUST)
#define X_MIN_POS X_HOME_LOCATION
#define Y_MIN_POS Y_HOME_LOCATION
#define X_MIN_POS X_HOME_ADJUST_LOCATION
#define Y_MIN_POS Y_HOME_ADJUST_LOCATION
#else
#define X_MIN_POS -7
#define Y_MIN_POS -5
Expand Down Expand Up @@ -1003,8 +1003,8 @@
#define Z_MAX_POS 380

#if ENABLED(HOME_ADJUST)
#define X_MIN_POS X_HOME_LOCATION
#define Y_MIN_POS Y_HOME_LOCATION
#define X_MIN_POS X_HOME_ADJUST_LOCATION
#define Y_MIN_POS Y_HOME_ADJUST_LOCATION
#else
#define X_MIN_POS 0
#define Y_MIN_POS 0
Expand Down Expand Up @@ -1074,8 +1074,8 @@
#define Z_MAX_POS 170

#if ENABLED(HOME_ADJUST)
#define X_MIN_POS X_HOME_LOCATION
#define Y_MIN_POS Y_HOME_LOCATION
#define X_MIN_POS X_HOME_ADJUST_LOCATION
#define Y_MIN_POS Y_HOME_ADJUST_LOCATION
#else
#define X_MIN_POS 0
#define Y_MIN_POS 0
Expand Down Expand Up @@ -1137,8 +1137,8 @@
#define Z_MAX_POS 500

#if ENABLED(HOME_ADJUST)
#define X_MIN_POS X_HOME_LOCATION
#define Y_MIN_POS Y_HOME_LOCATION
#define X_MIN_POS X_HOME_ADJUST_LOCATION
#define Y_MIN_POS Y_HOME_ADJUST_LOCATION
#else
#define X_MIN_POS 0
#define Y_MIN_POS 0
Expand Down Expand Up @@ -1205,8 +1205,8 @@
#define Z_MAX_POS 100

#if ENABLED(HOME_ADJUST)
#define X_MIN_POS X_HOME_LOCATION
#define Y_MIN_POS Y_HOME_LOCATION
#define X_MIN_POS X_HOME_ADJUST_LOCATION
#define Y_MIN_POS Y_HOME_ADJUST_LOCATION
#else
#define X_MIN_POS 0
#define Y_MIN_POS 0
Expand Down Expand Up @@ -1276,8 +1276,8 @@
#define Z_MAX_POS 180

#if ENABLED(HOME_ADJUST)
#define X_MIN_POS X_HOME_LOCATION
#define Y_MIN_POS Y_HOME_LOCATION
#define X_MIN_POS X_HOME_ADJUST_LOCATION
#define Y_MIN_POS Y_HOME_ADJUST_LOCATION
#else
#define X_MIN_POS 0
#define Y_MIN_POS 0
Expand Down Expand Up @@ -1419,8 +1419,8 @@
#endif

#if ENABLED(HOME_ADJUST)
#define X_MIN_POS X_HOME_LOCATION
#define Y_MIN_POS Y_HOME_LOCATION
#define X_MIN_POS X_HOME_ADJUST_LOCATION
#define Y_MIN_POS Y_HOME_ADJUST_LOCATION
#else
#define X_MIN_POS 0
#define Y_MIN_POS 0
Expand Down Expand Up @@ -1582,8 +1582,8 @@
#endif

#if ENABLED(HOME_ADJUST)
#define X_MIN_POS X_HOME_LOCATION
#define Y_MIN_POS Y_HOME_LOCATION
#define X_MIN_POS X_HOME_ADJUST_LOCATION
#define Y_MIN_POS Y_HOME_ADJUST_LOCATION
#else
#define X_MIN_POS 0
#define Y_MIN_POS 0
Expand Down Expand Up @@ -1649,8 +1649,8 @@
#endif

#if ENABLED(HOME_ADJUST)
#define X_MIN_POS X_HOME_LOCATION
#define Y_MIN_POS Y_HOME_LOCATION
#define X_MIN_POS X_HOME_ADJUST_LOCATION
#define Y_MIN_POS Y_HOME_ADJUST_LOCATION
#else
#define X_MIN_POS 0
#define Y_MIN_POS 0
Expand Down Expand Up @@ -1709,8 +1709,8 @@
#endif

#if ENABLED(HOME_ADJUST)
#define X_MIN_POS X_HOME_LOCATION
#define Y_MIN_POS Y_HOME_LOCATION
#define X_MIN_POS X_HOME_ADJUST_LOCATION
#define Y_MIN_POS Y_HOME_ADJUST_LOCATION
#else
#define X_MIN_POS 0
#define Y_MIN_POS 0
Expand Down Expand Up @@ -1772,8 +1772,8 @@
#endif

#if ENABLED(HOME_ADJUST)
#define X_MIN_POS X_HOME_LOCATION
#define Y_MIN_POS Y_HOME_LOCATION
#define X_MIN_POS X_HOME_ADJUST_LOCATION
#define Y_MIN_POS Y_HOME_ADJUST_LOCATION
#else
#define X_MIN_POS 0
#define Y_MIN_POS 0
Expand Down Expand Up @@ -1853,8 +1853,8 @@

#if ENABLED(A2_SMALL_BED)
#if ENABLED(HOME_ADJUST)
#define X_MIN_POS X_HOME_LOCATION
#define Y_MIN_POS Y_HOME_LOCATION
#define X_MIN_POS X_HOME_ADJUST_LOCATION
#define Y_MIN_POS Y_HOME_ADJUST_LOCATION
#else
#define X_MIN_POS 0
#define Y_MIN_POS 0
Expand Down Expand Up @@ -1883,8 +1883,8 @@

#if ENABLED(A2_LARGE_BED)
#if ENABLED(HOME_ADJUST)
#define X_MIN_POS X_HOME_LOCATION
#define Y_MIN_POS Y_HOME_LOCATION
#define X_MIN_POS X_HOME_ADJUST_LOCATION
#define Y_MIN_POS Y_HOME_ADJUST_LOCATION
#else
#define X_MIN_POS 0
#define Y_MIN_POS 0
Expand Down Expand Up @@ -1912,8 +1912,8 @@

#if ENABLED(ANET_A6)
#if ENABLED(HOME_ADJUST)
#define X_MIN_POS X_HOME_LOCATION
#define Y_MIN_POS Y_HOME_LOCATION
#define X_MIN_POS X_HOME_ADJUST_LOCATION
#define Y_MIN_POS Y_HOME_ADJUST_LOCATION
#else
#define X_MIN_POS 0
#define Y_MIN_POS 0
Expand Down Expand Up @@ -1942,8 +1942,8 @@

#if ENABLED(ANET_A8)
#if ENABLED(HOME_ADJUST)
#define X_MIN_POS X_HOME_LOCATION
#define Y_MIN_POS Y_HOME_LOCATION
#define X_MIN_POS X_HOME_ADJUST_LOCATION
#define Y_MIN_POS Y_HOME_ADJUST_LOCATION
#else
#define X_MIN_POS -33
#define Y_MIN_POS -10
Expand Down Expand Up @@ -1974,8 +1974,8 @@

#if ENABLED(ANET_E10)
#if ENABLED(HOME_ADJUST)
#define X_MIN_POS X_HOME_LOCATION
#define Y_MIN_POS Y_HOME_LOCATION
#define X_MIN_POS X_HOME_ADJUST_LOCATION
#define Y_MIN_POS Y_HOME_ADJUST_LOCATION
#else
#define X_MIN_POS -2
#define Y_MIN_POS -8
Expand Down Expand Up @@ -2004,8 +2004,8 @@

#if ENABLED(ANET_E12)
#if ENABLED(HOME_ADJUST)
#define X_MIN_POS X_HOME_LOCATION
#define Y_MIN_POS Y_HOME_LOCATION
#define X_MIN_POS X_HOME_ADJUST_LOCATION
#define Y_MIN_POS Y_HOME_ADJUST_LOCATION
#else
#define X_MIN_POS -2
#define Y_MIN_POS -8
Expand Down

0 comments on commit ac26a1c

Please sign in to comment.