Browse Source

Patch delta endstop adjustment config

Scott Lahteine 8 years ago
parent
commit
48761f2021

+ 2
- 8
Marlin/Conditionals_post.h View File

@@ -706,14 +706,8 @@
706 706
   // Stepper pulse duration, in cycles
707 707
   #define STEP_PULSE_CYCLES ((MINIMUM_STEPPER_PULSE) * CYCLES_PER_MICROSECOND)
708 708
 
709
-  #ifndef DELTA_ENDSTOP_ADJ_X
710
-    #define DELTA_ENDSTOP_ADJ_X 0
711
-  #endif
712
-  #ifndef DELTA_ENDSTOP_ADJ_Y
713
-    #define DELTA_ENDSTOP_ADJ_Y 0
714
-  #endif
715
-  #ifndef DELTA_ENDSTOP_ADJ_Z
716
-    #define DELTA_ENDSTOP_ADJ_Z 0
709
+  #ifndef DELTA_ENDSTOP_ADJ
710
+    #define DELTA_ENDSTOP_ADJ { 0 }
717 711
   #endif
718 712
 
719 713
 #endif // CONDITIONALS_POST_H

+ 4
- 3
Marlin/configuration_store.cpp View File

@@ -589,9 +589,10 @@ void Config_ResetDefault() {
589 589
   #endif
590 590
 
591 591
   #if ENABLED(DELTA)
592
-    endstop_adj[X_AXIS] = DELTA_ENDSTOP_ADJ_X;
593
-    endstop_adj[Y_AXIS] = DELTA_ENDSTOP_ADJ_Y;
594
-    endstop_adj[Z_AXIS] = DELTA_ENDSTOP_ADJ_Z;
592
+    const float adj[ABC] = DELTA_ENDSTOP_ADJ;
593
+    endstop_adj[A_AXIS] = adj[A_AXIS];
594
+    endstop_adj[B_AXIS] = adj[B_AXIS];
595
+    endstop_adj[C_AXIS] = adj[C_AXIS];
595 596
     delta_radius =  DELTA_RADIUS;
596 597
     delta_diagonal_rod =  DELTA_DIAGONAL_ROD;
597 598
     delta_segments_per_second =  DELTA_SEGMENTS_PER_SECOND;

+ 2
- 0
Marlin/example_configurations/delta/biv2.5/Configuration.h View File

@@ -441,6 +441,8 @@
441 441
   // in ultralcd.cpp@lcd_delta_calibrate_menu()
442 442
   //#define DELTA_CALIBRATION_MENU
443 443
 
444
+  //#define DELTA_ENDSTOP_ADJ { 0, 0, 0 }
445
+
444 446
 #endif
445 447
 
446 448
 // Enable this option for Toshiba steppers

+ 2
- 0
Marlin/example_configurations/delta/generic/Configuration.h View File

@@ -441,6 +441,8 @@
441 441
   // in ultralcd.cpp@lcd_delta_calibrate_menu()
442 442
   //#define DELTA_CALIBRATION_MENU
443 443
 
444
+  //#define DELTA_ENDSTOP_ADJ { 0, 0, 0 }
445
+
444 446
 #endif
445 447
 
446 448
 // Enable this option for Toshiba steppers

+ 2
- 0
Marlin/example_configurations/delta/kossel_mini/Configuration.h View File

@@ -441,6 +441,8 @@
441 441
   // in ultralcd.cpp@lcd_delta_calibrate_menu()
442 442
   //#define DELTA_CALIBRATION_MENU
443 443
 
444
+  //#define DELTA_ENDSTOP_ADJ { 0, 0, 0 }
445
+
444 446
 #endif
445 447
 
446 448
 // Enable this option for Toshiba steppers

+ 2
- 0
Marlin/example_configurations/delta/kossel_pro/Configuration.h View File

@@ -430,6 +430,8 @@
430 430
   // in ultralcd.cpp@lcd_delta_calibrate_menu()
431 431
   //#define DELTA_CALIBRATION_MENU
432 432
 
433
+  //#define DELTA_ENDSTOP_ADJ { 0, 0, 0 }
434
+
433 435
 #endif
434 436
 
435 437
 // Enable this option for Toshiba steppers

+ 2
- 0
Marlin/example_configurations/delta/kossel_xl/Configuration.h View File

@@ -439,6 +439,8 @@
439 439
   // in ultralcd.cpp@lcd_delta_calibrate_menu()
440 440
   //#define DELTA_CALIBRATION_MENU
441 441
 
442
+  //#define DELTA_ENDSTOP_ADJ { 0, 0, 0 }
443
+
442 444
 #endif
443 445
 
444 446
 // Enable this option for Toshiba steppers

Loading…
Cancel
Save