Merge pull request #532 from codexmas/ServoEndstops

Fix for ugly code compilation errors in SERVO_ENDSTOP checks
12 years ago · d77f5ee722
parent ecf3ab5de4 fde17d5720
commit d77f5ee722
1 changed files with 9 additions and 5 deletions
--- a/Marlin/Marlin_main.cpp
+++ b/Marlin/Marlin_main.cpp
@ -687,8 +687,10 @@ static void homeaxis(int axis) {
      0) {

    // Engage Servo endstop if enabled
-    #ifdef SERVO_ENDSTOPS[axis] > -1
+    #ifdef SERVO_ENDSTOPS
+      if (SERVO_ENDSTOPS[axis] > -1) {
        servos[servo_endstops[axis]].write(servo_endstop_angles[axis * 2]);
+      }
    #endif
      
    current_position[axis] = 0;
@ -715,8 +717,10 @@ static void homeaxis(int axis) {
    endstops_hit_on_purpose();

    // Retract Servo endstop if enabled
-    #ifdef SERVO_ENDSTOPS[axis] > -1
+    #ifdef SERVO_ENDSTOPS
+      if (SERVO_ENDSTOPS[axis] > -1) {
        servos[servo_endstops[axis]].write(servo_endstop_angles[axis * 2 + 1]);
+      }
    #endif
  }
 }