First upload to hardware.

Having issue with homing and failed on running script MarlinFirmware#4 from host.
BobLWeiss · Oct 17, 2013 · df5fe54 · df5fe54
1 parent d8aabf2
commit df5fe54
Show file tree

Hide file tree

Showing 9 changed files with 98 additions and 55 deletions.
diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
@@ -321,8 +321,15 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
 #define Y_HOME_DIR 1
 #define Z_HOME_DIR 1
 
+//Manual homing switch locations:
+// For deltabots this means top and center of the cartesian print volume.
+#define MANUAL_X_HOME_POS 0
+#define MANUAL_Y_HOME_POS 0
+#define MANUAL_Z_HOME_POS 160.7  // For delta: Distance between nozzle and print surface after homing.
+
 #define min_software_endstops true // If true, axis won't move to coordinates less than HOME_POS.
 #define max_software_endstops true  // If true, axis won't move to coordinates greater than the defined lengths below.
+
 // Travel limits after homing
 #define X_MAX_POS 80
 #define X_MIN_POS -80
@@ -340,13 +347,6 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
 #define MANUAL_HOME_POSITIONS  // If defined, MANUAL_*_HOME_POS below will be used
 #define BED_CENTER_AT_0_0  // If defined, the center of the bed is at (X=0, Y=0)
 
-//Manual homing switch locations:
-// For deltabots this means top and center of the cartesian print volume.
-#define MANUAL_X_HOME_POS 0
-#define MANUAL_Y_HOME_POS 0
-// Actually 191, but setting this to 181 provides some safety margin for small errors.
-#define MANUAL_Z_HOME_POS 160.275  // For delta: Distance between nozzle and print surface after homing.
-
 #define AUTOLEVEL_GRID 24  // Distance between autolevel Z probing points, should be less than print surface radius/3.
 
 //// MOVEMENT SETTINGS
@@ -359,16 +359,16 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
 #define DEFAULT_AXIS_STEPS_PER_UNIT   {100, 100, 100, 92.59} //EzStruder - 16 Microsteps
 //#define DEFAULT_AXIS_STEPS_PER_UNIT   {100, 100, 100, 98.34} // PG35L - Half Step
 
-#define DEFAULT_MAX_FEEDRATE          {200, 200, 200, 200}    // (mm/sec)
+#define DEFAULT_MAX_FEEDRATE          {150, 150, 150, 80}    // (mm/sec)
 //#define DEFAULT_MAX_FEEDRATE          {500, 500, 500, 60}    // (mm/sec)
 
-#define DEFAULT_MAX_ACCELERATION      {9000,9000,9000,9000}    // X, Y, Z, E maximum start speed for accelerated moves. E default values are good for skeinforge 40+, for older versions raise them a lot.
+#define DEFAULT_MAX_ACCELERATION      {9000,9000,9000,1500}    // X, Y, Z, E maximum start speed for accelerated moves. E default values are good for skeinforge 40+, for older versions raise them a lot.
 //#define DEFAULT_MAX_ACCELERATION      {2000,2000,2000,400}    // X, Y, Z, E maximum start speed for accelerated moves. E default values are good for skeinforge 40+, for older versions raise them a lot.
 
-#define DEFAULT_ACCELERATION          3000    // X, Y, Z and E max acceleration in mm/s^2 for printing moves
+#define DEFAULT_ACCELERATION          9000    // X, Y, Z and E max acceleration in mm/s^2 for printing moves
 //#define DEFAULT_ACCELERATION          600    // X, Y, Z and E max acceleration in mm/s^2 for printing moves
 
-#define DEFAULT_RETRACT_ACCELERATION  3000   // X, Y, Z and E max acceleration in mm/s^2 for retracts
+#define DEFAULT_RETRACT_ACCELERATION  5000   // X, Y, Z and E max acceleration in mm/s^2 for retracts
 //#define DEFAULT_RETRACT_ACCELERATION  400   // X, Y, Z and E max acceleration in mm/s^2 for retracts
 
 
@@ -393,15 +393,18 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
 // M500 - stores paramters in EEPROM
 // M501 - reads parameters from EEPROM (if you need reset them after you changed them temporarily).
 // M502 - reverts to the default "factory settings".  You still need to store them in EEPROM afterwards if you want to.
+
 //define this to enable eeprom support
-#define EEPROM_SETTINGS
+//#define EEPROM_SETTINGS
+
+
 //to disable EEPROM Serial responses and decrease program space by ~1700 byte: comment this out:
 // please keep turned on if you can.
 #define EEPROM_CHITCHAT
 
 // Preheat Constants
 #define PLA_PREHEAT_HOTEND_TEMP 210
-#define PLA_PREHEAT_HPB_TEMP 70
+#define PLA_PREHEAT_HPB_TEMP 60
 #define PLA_PREHEAT_FAN_SPEED 255   // Insert Value between 0 and 255
 
 #define ABS_PREHEAT_HOTEND_TEMP 240

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
@@ -194,9 +194,9 @@
 #endif //DUAL_X_CARRIAGE
 
 //homing hits the endstop, then retracts by this distance, before it tries to slowly bump again:
-#define X_HOME_RETRACT_MM 5 
-#define Y_HOME_RETRACT_MM 5 
-#define Z_HOME_RETRACT_MM 5 
+#define X_HOME_RETRACT_MM 10
+#define Y_HOME_RETRACT_MM 10
+#define Z_HOME_RETRACT_MM 10
 //#define QUICK_HOME  //if this is defined, if both x and y are to be homed, a diagonal move will be performed initially.
 
 #define AXIS_RELATIVE_MODES {false, false, false, false}
@@ -212,8 +212,8 @@
 //default stepper release if idle
 #define DEFAULT_STEPPER_DEACTIVE_TIME 60
 
-#define DEFAULT_MINIMUMFEEDRATE       0.0     // minimum feedrate
-#define DEFAULT_MINTRAVELFEEDRATE     0.0
+#define DEFAULT_MINIMUMFEEDRATE       25.0     // minimum feedrate
+#define DEFAULT_MINTRAVELFEEDRATE     50.0
 
 // Feedrates for manual moves along X, Y, Z, E from panel
 #ifdef ULTIPANEL

diff --git a/Marlin/Marlin.atsuo b/Marlin/Marlin.atsuo
diff --git a/Marlin/Marlin.cppproj b/Marlin/Marlin.cppproj
@@ -28,15 +28,15 @@
     <BootSegment>0</BootSegment>
     <AsfFrameworkConfig>
       <framework-data>
-  <options />
-  <configurations />
-  <files />
-  <documentation help="" />
-  <offline-documentation help="" />
-  <dependencies>
-    <content-extension eid="atmel.asf" uuidref="Atmel.ASF" version="3.3.0" />
-  </dependencies>
-</framework-data>
+        <options />
+        <configurations />
+        <files />
+        <documentation help="" />
+        <offline-documentation help="" />
+        <dependencies>
+          <content-extension eid="atmel.asf" uuidref="Atmel.ASF" version="3.3.0" />
+        </dependencies>
+      </framework-data>
     </AsfFrameworkConfig>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
@@ -53,12 +53,22 @@
           <ListValues>
             <Value>C:\Program Files (x86)\Arduino\hardware\arduino\cores\arduino</Value>
             <Value>C:\Program Files (x86)\Arduino\hardware\arduino\variants\mega</Value>
+            <Value>C:\Users\rweis\Documents\Arduino\libraries\Adafruit_MAX31855</Value>
+            <Value>C:\Users\rweis\Documents\Arduino\libraries\Adafruit_MAX31855\utility</Value>
             <Value>C:\Users\rweis\Documents\Arduino\libraries\Adafruit_NeoPixel</Value>
             <Value>C:\Users\rweis\Documents\Arduino\libraries\Adafruit_NeoPixel\utility</Value>
-            <Value>C:\Users\rweis\Documents\Arduino\libraries\ADXL345</Value>
-            <Value>C:\Users\rweis\Documents\Arduino\libraries\ADXL345\utility</Value>
+            <Value>C:\Users\rweis\Documents\Arduino\libraries\Adxl345</Value>
+            <Value>C:\Users\rweis\Documents\Arduino\libraries\Adxl345\utility</Value>
+            <Value>C:\Users\rweis\Documents\Arduino\libraries\ADXL345_2</Value>
+            <Value>C:\Users\rweis\Documents\Arduino\libraries\ADXL345_2\utility</Value>
+            <Value>C:\Users\rweis\Documents\Arduino\libraries\ArduCAM_Touch</Value>
+            <Value>C:\Users\rweis\Documents\Arduino\libraries\ArduCAM_Touch\utility</Value>
+            <Value>C:\Users\rweis\Documents\Arduino\libraries\Gameduino</Value>
+            <Value>C:\Users\rweis\Documents\Arduino\libraries\Gameduino\utility</Value>
             <Value>C:\Users\rweis\Documents\Arduino\libraries\LiquidCrystal</Value>
             <Value>C:\Users\rweis\Documents\Arduino\libraries\LiquidCrystal\utility</Value>
+            <Value>C:\Users\rweis\Documents\Arduino\libraries\MAX31855</Value>
+            <Value>C:\Users\rweis\Documents\Arduino\libraries\MAX31855\utility</Value>
             <Value>C:\Users\rweis\Documents\Arduino\libraries\SdFat</Value>
             <Value>C:\Users\rweis\Documents\Arduino\libraries\SdFat\utility</Value>
             <Value>C:\Users\rweis\Documents\Arduino\libraries\SPI</Value>
@@ -141,12 +151,22 @@
           <ListValues>
             <Value>C:\Program Files (x86)\Arduino\hardware\arduino\cores\arduino</Value>
             <Value>C:\Program Files (x86)\Arduino\hardware\arduino\variants\mega</Value>
+            <Value>C:\Users\rweis\Documents\Arduino\libraries\Adafruit_MAX31855</Value>
+            <Value>C:\Users\rweis\Documents\Arduino\libraries\Adafruit_MAX31855\utility</Value>
             <Value>C:\Users\rweis\Documents\Arduino\libraries\Adafruit_NeoPixel</Value>
             <Value>C:\Users\rweis\Documents\Arduino\libraries\Adafruit_NeoPixel\utility</Value>
-            <Value>C:\Users\rweis\Documents\Arduino\libraries\ADXL345</Value>
-            <Value>C:\Users\rweis\Documents\Arduino\libraries\ADXL345\utility</Value>
+            <Value>C:\Users\rweis\Documents\Arduino\libraries\Adxl345</Value>
+            <Value>C:\Users\rweis\Documents\Arduino\libraries\Adxl345\utility</Value>
+            <Value>C:\Users\rweis\Documents\Arduino\libraries\ADXL345_2</Value>
+            <Value>C:\Users\rweis\Documents\Arduino\libraries\ADXL345_2\utility</Value>
+            <Value>C:\Users\rweis\Documents\Arduino\libraries\ArduCAM_Touch</Value>
+            <Value>C:\Users\rweis\Documents\Arduino\libraries\ArduCAM_Touch\utility</Value>
+            <Value>C:\Users\rweis\Documents\Arduino\libraries\Gameduino</Value>
+            <Value>C:\Users\rweis\Documents\Arduino\libraries\Gameduino\utility</Value>
             <Value>C:\Users\rweis\Documents\Arduino\libraries\LiquidCrystal</Value>
             <Value>C:\Users\rweis\Documents\Arduino\libraries\LiquidCrystal\utility</Value>
+            <Value>C:\Users\rweis\Documents\Arduino\libraries\MAX31855</Value>
+            <Value>C:\Users\rweis\Documents\Arduino\libraries\MAX31855\utility</Value>
             <Value>C:\Users\rweis\Documents\Arduino\libraries\SdFat</Value>
             <Value>C:\Users\rweis\Documents\Arduino\libraries\SdFat\utility</Value>
             <Value>C:\Users\rweis\Documents\Arduino\libraries\SPI</Value>
@@ -244,12 +264,22 @@
           <ListValues>
             <Value>C:\Program Files (x86)\Arduino\hardware\arduino\cores\arduino</Value>
             <Value>C:\Program Files (x86)\Arduino\hardware\arduino\variants\mega</Value>
+            <Value>C:\Users\rweis\Documents\Arduino\libraries\Adafruit_MAX31855</Value>
+            <Value>C:\Users\rweis\Documents\Arduino\libraries\Adafruit_MAX31855\utility</Value>
             <Value>C:\Users\rweis\Documents\Arduino\libraries\Adafruit_NeoPixel</Value>
             <Value>C:\Users\rweis\Documents\Arduino\libraries\Adafruit_NeoPixel\utility</Value>
-            <Value>C:\Users\rweis\Documents\Arduino\libraries\ADXL345</Value>
-            <Value>C:\Users\rweis\Documents\Arduino\libraries\ADXL345\utility</Value>
+            <Value>C:\Users\rweis\Documents\Arduino\libraries\Adxl345</Value>
+            <Value>C:\Users\rweis\Documents\Arduino\libraries\Adxl345\utility</Value>
+            <Value>C:\Users\rweis\Documents\Arduino\libraries\ADXL345_2</Value>
+            <Value>C:\Users\rweis\Documents\Arduino\libraries\ADXL345_2\utility</Value>
+            <Value>C:\Users\rweis\Documents\Arduino\libraries\ArduCAM_Touch</Value>
+            <Value>C:\Users\rweis\Documents\Arduino\libraries\ArduCAM_Touch\utility</Value>
+            <Value>C:\Users\rweis\Documents\Arduino\libraries\Gameduino</Value>
+            <Value>C:\Users\rweis\Documents\Arduino\libraries\Gameduino\utility</Value>
             <Value>C:\Users\rweis\Documents\Arduino\libraries\LiquidCrystal</Value>
             <Value>C:\Users\rweis\Documents\Arduino\libraries\LiquidCrystal\utility</Value>
+            <Value>C:\Users\rweis\Documents\Arduino\libraries\MAX31855</Value>
+            <Value>C:\Users\rweis\Documents\Arduino\libraries\MAX31855\utility</Value>
             <Value>C:\Users\rweis\Documents\Arduino\libraries\SdFat</Value>
             <Value>C:\Users\rweis\Documents\Arduino\libraries\SdFat\utility</Value>
             <Value>C:\Users\rweis\Documents\Arduino\libraries\SPI</Value>
@@ -332,12 +362,22 @@
           <ListValues>
             <Value>C:\Program Files (x86)\Arduino\hardware\arduino\cores\arduino</Value>
             <Value>C:\Program Files (x86)\Arduino\hardware\arduino\variants\mega</Value>
+            <Value>C:\Users\rweis\Documents\Arduino\libraries\Adafruit_MAX31855</Value>
+            <Value>C:\Users\rweis\Documents\Arduino\libraries\Adafruit_MAX31855\utility</Value>
             <Value>C:\Users\rweis\Documents\Arduino\libraries\Adafruit_NeoPixel</Value>
             <Value>C:\Users\rweis\Documents\Arduino\libraries\Adafruit_NeoPixel\utility</Value>
-            <Value>C:\Users\rweis\Documents\Arduino\libraries\ADXL345</Value>
-            <Value>C:\Users\rweis\Documents\Arduino\libraries\ADXL345\utility</Value>
+            <Value>C:\Users\rweis\Documents\Arduino\libraries\Adxl345</Value>
+            <Value>C:\Users\rweis\Documents\Arduino\libraries\Adxl345\utility</Value>
+            <Value>C:\Users\rweis\Documents\Arduino\libraries\ADXL345_2</Value>
+            <Value>C:\Users\rweis\Documents\Arduino\libraries\ADXL345_2\utility</Value>
+            <Value>C:\Users\rweis\Documents\Arduino\libraries\ArduCAM_Touch</Value>
+            <Value>C:\Users\rweis\Documents\Arduino\libraries\ArduCAM_Touch\utility</Value>
+            <Value>C:\Users\rweis\Documents\Arduino\libraries\Gameduino</Value>
+            <Value>C:\Users\rweis\Documents\Arduino\libraries\Gameduino\utility</Value>
             <Value>C:\Users\rweis\Documents\Arduino\libraries\LiquidCrystal</Value>
             <Value>C:\Users\rweis\Documents\Arduino\libraries\LiquidCrystal\utility</Value>
+            <Value>C:\Users\rweis\Documents\Arduino\libraries\MAX31855</Value>
+            <Value>C:\Users\rweis\Documents\Arduino\libraries\MAX31855\utility</Value>
             <Value>C:\Users\rweis\Documents\Arduino\libraries\SdFat</Value>
             <Value>C:\Users\rweis\Documents\Arduino\libraries\SdFat\utility</Value>
             <Value>C:\Users\rweis\Documents\Arduino\libraries\SPI</Value>

diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp
@@ -1415,27 +1415,27 @@ void process_commands()
     SERIAL_PROTOCOLLN(MSG_M119_REPORT);
       #if defined(X_MIN_PIN) && X_MIN_PIN > -1
         SERIAL_PROTOCOLPGM(MSG_X_MIN);
-        SERIAL_PROTOCOLLN(((READ(X_MIN_PIN)^X_ENDSTOPS_INVERTING)?MSG_ENDSTOP_HIT:MSG_ENDSTOP_OPEN));
+        SERIAL_PROTOCOLLN(((READ(X_MIN_PIN)^X_MIN_ENDSTOP_INVERTING)?MSG_ENDSTOP_HIT:MSG_ENDSTOP_OPEN));
       #endif
       #if defined(X_MAX_PIN) && X_MAX_PIN > -1
         SERIAL_PROTOCOLPGM(MSG_X_MAX);
-        SERIAL_PROTOCOLLN(((READ(X_MAX_PIN)^X_ENDSTOPS_INVERTING)?MSG_ENDSTOP_HIT:MSG_ENDSTOP_OPEN));
+        SERIAL_PROTOCOLLN(((READ(X_MAX_PIN)^X_MAX_ENDSTOP_INVERTING)?MSG_ENDSTOP_HIT:MSG_ENDSTOP_OPEN));
       #endif
       #if defined(Y_MIN_PIN) && Y_MIN_PIN > -1
         SERIAL_PROTOCOLPGM(MSG_Y_MIN);
-        SERIAL_PROTOCOLLN(((READ(Y_MIN_PIN)^Y_ENDSTOPS_INVERTING)?MSG_ENDSTOP_HIT:MSG_ENDSTOP_OPEN));
+        SERIAL_PROTOCOLLN(((READ(Y_MIN_PIN)^Y_MIN_ENDSTOP_INVERTING)?MSG_ENDSTOP_HIT:MSG_ENDSTOP_OPEN));
       #endif
       #if defined(Y_MAX_PIN) && Y_MAX_PIN > -1
         SERIAL_PROTOCOLPGM(MSG_Y_MAX);
-        SERIAL_PROTOCOLLN(((READ(Y_MAX_PIN)^Y_ENDSTOPS_INVERTING)?MSG_ENDSTOP_HIT:MSG_ENDSTOP_OPEN));
+        SERIAL_PROTOCOLLN(((READ(Y_MAX_PIN)^Y_MAX_ENDSTOP_INVERTING)?MSG_ENDSTOP_HIT:MSG_ENDSTOP_OPEN));
       #endif
       #if defined(Z_MIN_PIN) && Z_MIN_PIN > -1
         SERIAL_PROTOCOLPGM(MSG_Z_MIN);
-        SERIAL_PROTOCOLLN(((READ(Z_MIN_PIN)^Z_ENDSTOPS_INVERTING)?MSG_ENDSTOP_HIT:MSG_ENDSTOP_OPEN));
+        SERIAL_PROTOCOLLN(((READ(Z_MIN_PIN)^Z_MIN_ENDSTOP_INVERTING)?MSG_ENDSTOP_HIT:MSG_ENDSTOP_OPEN));
       #endif
       #if defined(Z_MAX_PIN) && Z_MAX_PIN > -1
         SERIAL_PROTOCOLPGM(MSG_Z_MAX);
-        SERIAL_PROTOCOLLN(((READ(Z_MAX_PIN)^Z_ENDSTOPS_INVERTING)?MSG_ENDSTOP_HIT:MSG_ENDSTOP_OPEN));
+        SERIAL_PROTOCOLLN(((READ(Z_MAX_PIN)^Z_MAX_ENDSTOP_INVERTING)?MSG_ENDSTOP_HIT:MSG_ENDSTOP_OPEN));
       #endif
       break;
       //TODO: update for all axis, use for loop

diff --git a/Marlin/Visual Micro/Compile.vmps.xml b/Marlin/Visual Micro/Compile.vmps.xml
diff --git a/Marlin/Visual Micro/Configuration.Debug.vmps.xml b/Marlin/Visual Micro/Configuration.Debug.vmps.xml
diff --git a/Marlin/pins.h b/Marlin/pins.h
@@ -316,9 +316,9 @@
 
   #define LARGE_FLASH        true
 
-  #define X_STEP_PIN         54
-  #define X_DIR_PIN          55
-  #define X_ENABLE_PIN       38
+  #define X_STEP_PIN         36
+  #define X_DIR_PIN          34
+  #define X_ENABLE_PIN       30
   #define X_MIN_PIN           3
   #define X_MAX_PIN           2
 
@@ -342,9 +342,9 @@
   #define E0_DIR_PIN         28
   #define E0_ENABLE_PIN      24
 
-  #define E1_STEP_PIN        36
-  #define E1_DIR_PIN         34
-  #define E1_ENABLE_PIN      30
+  #define E1_STEP_PIN        54
+  #define E1_DIR_PIN         55
+  #define E1_ENABLE_PIN      38
 
   #define SDPOWER            -1
   #define SDSS               53

diff --git a/Marlin/stepper.cpp b/Marlin/stepper.cpp
@@ -354,7 +354,7 @@ ISR(TIMER1_COMPA_vect)
       CHECK_ENDSTOPS
       {
         #if defined(X_MIN_PIN) && X_MIN_PIN > -1
-          bool x_min_endstop=(READ(X_MIN_PIN) != X_ENDSTOPS_INVERTING);
+          bool x_min_endstop=(READ(X_MIN_PIN) != X_MIN_ENDSTOP_INVERTING);
           if(x_min_endstop && old_x_min_endstop && (current_block->steps_x > 0)) {
             endstops_trigsteps[X_AXIS] = count_position[X_AXIS];
             endstop_x_hit=true;
@@ -373,7 +373,7 @@ ISR(TIMER1_COMPA_vect)
       CHECK_ENDSTOPS 
       {
         #if defined(X_MAX_PIN) && X_MAX_PIN > -1
-          bool x_max_endstop=(READ(X_MAX_PIN) != X_ENDSTOPS_INVERTING);
+          bool x_max_endstop=(READ(X_MAX_PIN) != X_MAX_ENDSTOP_INVERTING);
           if(x_max_endstop && old_x_max_endstop && (current_block->steps_x > 0)){
             endstops_trigsteps[X_AXIS] = count_position[X_AXIS];
             endstop_x_hit=true;
@@ -392,7 +392,7 @@ ISR(TIMER1_COMPA_vect)
       CHECK_ENDSTOPS
       {
         #if defined(Y_MIN_PIN) && Y_MIN_PIN > -1
-          bool y_min_endstop=(READ(Y_MIN_PIN) != Y_ENDSTOPS_INVERTING);
+          bool y_min_endstop=(READ(Y_MIN_PIN) !=Y_MIN_ENDSTOP_INVERTING);
           if(y_min_endstop && old_y_min_endstop && (current_block->steps_y > 0)) {
             endstops_trigsteps[Y_AXIS] = count_position[Y_AXIS];
             endstop_y_hit=true;
@@ -410,7 +410,7 @@ ISR(TIMER1_COMPA_vect)
       CHECK_ENDSTOPS
       {
         #if defined(Y_MAX_PIN) && Y_MAX_PIN > -1
-          bool y_max_endstop=(READ(Y_MAX_PIN) != Y_ENDSTOPS_INVERTING);
+          bool y_max_endstop=(READ(Y_MAX_PIN) != Y_MAX_ENDSTOP_INVERTING);
           if(y_max_endstop && old_y_max_endstop && (current_block->steps_y > 0)){
             endstops_trigsteps[Y_AXIS] = count_position[Y_AXIS];
             endstop_y_hit=true;
@@ -453,7 +453,7 @@ ISR(TIMER1_COMPA_vect)
       CHECK_ENDSTOPS
       {
         #if defined(Z_MIN_PIN) && Z_MIN_PIN > -1
-          bool z_min_endstop=(READ(Z_MIN_PIN) != Z_ENDSTOPS_INVERTING);
+          bool z_min_endstop=(READ(Z_MIN_PIN) != Z_MIN_ENDSTOP_INVERTING);
           if(z_min_endstop && old_z_min_endstop && (current_block->steps_z > 0)) {
             endstops_trigsteps[Z_AXIS] = count_position[Z_AXIS];
             endstop_z_hit=true;
@@ -474,7 +474,7 @@ ISR(TIMER1_COMPA_vect)
       CHECK_ENDSTOPS
       {
         #if defined(Z_MAX_PIN) && Z_MAX_PIN > -1
-          bool z_max_endstop=(READ(Z_MAX_PIN) != Z_ENDSTOPS_INVERTING);
+          bool z_max_endstop=(READ(Z_MAX_PIN) != Z_MAX_ENDSTOP_INVERTING);
           if(z_max_endstop && old_z_max_endstop && (current_block->steps_z > 0)) {
             endstops_trigsteps[Z_AXIS] = count_position[Z_AXIS];
             endstop_z_hit=true;