Browse Source

Fix compile error with Z_DUAL_ENDSTOPS

Scott Lahteine 10 years ago
parent
commit
d867c18535
2 changed files with 9 additions and 5 deletions
  1. 4
    0
      Marlin/pins_RAMPS_13.h
  2. 5
    5
      Marlin/stepper.cpp

+ 4
- 0
Marlin/pins_RAMPS_13.h View File

40
 #define Y2_DIR_PIN         34
40
 #define Y2_DIR_PIN         34
41
 #define Y2_ENABLE_PIN      30
41
 #define Y2_ENABLE_PIN      30
42
 
42
 
43
+#undef Z2_STEP_PIN
44
+#undef Z2_DIR_PIN
45
+#undef Z2_ENABLE_PIN
46
+
43
 #define Z2_STEP_PIN        36
47
 #define Z2_STEP_PIN        36
44
 #define Z2_DIR_PIN         34
48
 #define Z2_DIR_PIN         34
45
 #define Z2_ENABLE_PIN      30
49
 #define Z2_ENABLE_PIN      30

+ 5
- 5
Marlin/stepper.cpp View File

105
   static bool old_z_max_endstop = false;
105
   static bool old_z_max_endstop = false;
106
 #endif
106
 #endif
107
 #ifdef Z_DUAL_ENDSTOPS
107
 #ifdef Z_DUAL_ENDSTOPS
108
-  #if HAS_Z2_MIN
108
+  // #if HAS_Z2_MIN
109
     static bool old_z2_min_endstop = false;
109
     static bool old_z2_min_endstop = false;
110
-  #endif
111
-  #if HAS_Z2_MAX
110
+  // #endif
111
+  // #if HAS_Z2_MAX
112
     static bool old_z2_max_endstop = false;
112
     static bool old_z2_max_endstop = false;
113
-  #endif
113
+  // #endif
114
 #endif
114
 #endif
115
 
115
 
116
 #ifdef Z_PROBE_ENDSTOP // No need to check for valid pin, SanityCheck.h already does this.
116
 #ifdef Z_PROBE_ENDSTOP // No need to check for valid pin, SanityCheck.h already does this.
117
-static bool old_z_probe_endstop = false;
117
+  static bool old_z_probe_endstop = false;
118
 #endif
118
 #endif
119
 
119
 
120
 static bool check_endstops = true;
120
 static bool check_endstops = true;

Loading…
Cancel
Save