Merge pull request #6278 from thinkyhead/pr_delta_angles

Followup to additional delta trim options

Marlin/Conditionals_post.h

@@ -658,6 +658,9 @@
    * Delta radius/rod trimmers/angle trimmers
    */
   #if ENABLED(DELTA)
+    #ifndef DELTA_ENDSTOP_ADJ
+      #define DELTA_ENDSTOP_ADJ { 0 }
+    #endif
     #ifndef DELTA_RADIUS_TRIM_TOWER_1
       #define DELTA_RADIUS_TRIM_TOWER_1 0.0
     #endif
@@ -757,10 +760,6 @@
   // Stepper pulse duration, in cycles
   #define STEP_PULSE_CYCLES ((MINIMUM_STEPPER_PULSE) * CYCLES_PER_MICROSECOND)
 
-  #ifndef DELTA_ENDSTOP_ADJ
-    #define DELTA_ENDSTOP_ADJ { 0 }
-  #endif
-
   #if ENABLED(SDCARD_SORT_ALPHA)
     #define HAS_FOLDER_SORTING (FOLDER_SORTING || ENABLED(SDSORT_GCODE))
   #endif

Marlin/configuration_store.cpp

@@ -42,7 +42,7 @@
 #define EEPROM_OFFSET 100
 
 /**
- * V31 EEPROM Layout:
+ * V32 EEPROM Layout:
  *
  *  100  Version                                    (char x4)
  *  104  EEPROM Checksum                            (uint16_t)
@@ -147,7 +147,6 @@
  *
  *  574                                Minimum end-point
  * 1895 (574 + 36 + 9 + 288 + 988)     Maximum end-point
- *
  */
 #include "Marlin.h"
 #include "language.h"

Marlin/example_configurations/delta/flsun_kossel_mini/Configuration.h

@@ -478,6 +478,17 @@
 
   //#define DELTA_ENDSTOP_ADJ { 0, 0, 0 }
 
+  // Trim adjustments for individual towers
+  #define DELTA_RADIUS_TRIM_TOWER_1 0.0
+  #define DELTA_RADIUS_TRIM_TOWER_2 0.0
+  #define DELTA_RADIUS_TRIM_TOWER_3 0.0
+  #define DELTA_DIAGONAL_ROD_TRIM_TOWER_1 0.0
+  #define DELTA_DIAGONAL_ROD_TRIM_TOWER_2 0.0
+  #define DELTA_DIAGONAL_ROD_TRIM_TOWER_3 0.0
+  #define DELTA_TOWER_ANGLE_TRIM_1 0.0
+  #define DELTA_TOWER_ANGLE_TRIM_2 0.0
+  #define DELTA_TOWER_ANGLE_TRIM_3 0.0
+
 #endif
 
 // Enable this option for Toshiba steppers

Marlin/example_configurations/delta/generic/Configuration.h

@@ -465,6 +465,17 @@
 
   //#define DELTA_ENDSTOP_ADJ { 0, 0, 0 }
 
+  // Trim adjustments for individual towers
+  #define DELTA_RADIUS_TRIM_TOWER_1 0.0
+  #define DELTA_RADIUS_TRIM_TOWER_2 0.0
+  #define DELTA_RADIUS_TRIM_TOWER_3 0.0
+  #define DELTA_DIAGONAL_ROD_TRIM_TOWER_1 0.0
+  #define DELTA_DIAGONAL_ROD_TRIM_TOWER_2 0.0
+  #define DELTA_DIAGONAL_ROD_TRIM_TOWER_3 0.0
+  #define DELTA_TOWER_ANGLE_TRIM_1 0.0
+  #define DELTA_TOWER_ANGLE_TRIM_2 0.0
+  #define DELTA_TOWER_ANGLE_TRIM_3 0.0
+
 #endif
 
 // Enable this option for Toshiba steppers

Marlin/example_configurations/delta/kossel_mini/Configuration.h

@@ -465,6 +465,17 @@
 
   //#define DELTA_ENDSTOP_ADJ { 0, 0, 0 }
 
+  // Trim adjustments for individual towers
+  #define DELTA_RADIUS_TRIM_TOWER_1 0.0
+  #define DELTA_RADIUS_TRIM_TOWER_2 0.0
+  #define DELTA_RADIUS_TRIM_TOWER_3 0.0
+  #define DELTA_DIAGONAL_ROD_TRIM_TOWER_1 0.0
+  #define DELTA_DIAGONAL_ROD_TRIM_TOWER_2 0.0
+  #define DELTA_DIAGONAL_ROD_TRIM_TOWER_3 0.0
+  #define DELTA_TOWER_ANGLE_TRIM_1 0.0
+  #define DELTA_TOWER_ANGLE_TRIM_2 0.0
+  #define DELTA_TOWER_ANGLE_TRIM_3 0.0
+
 #endif
 
 // Enable this option for Toshiba steppers

Marlin/example_configurations/delta/kossel_pro/Configuration.h

@@ -452,6 +452,17 @@
 
   //#define DELTA_ENDSTOP_ADJ { 0, 0, 0 }
 
+  // Trim adjustments for individual towers
+  #define DELTA_RADIUS_TRIM_TOWER_1 0.0
+  #define DELTA_RADIUS_TRIM_TOWER_2 0.0
+  #define DELTA_RADIUS_TRIM_TOWER_3 0.0
+  #define DELTA_DIAGONAL_ROD_TRIM_TOWER_1 0.0
+  #define DELTA_DIAGONAL_ROD_TRIM_TOWER_2 0.0
+  #define DELTA_DIAGONAL_ROD_TRIM_TOWER_3 0.0
+  #define DELTA_TOWER_ANGLE_TRIM_1 0.0
+  #define DELTA_TOWER_ANGLE_TRIM_2 0.0
+  #define DELTA_TOWER_ANGLE_TRIM_3 0.0
+
 #endif
 
 // Enable this option for Toshiba steppers

Marlin/example_configurations/delta/kossel_xl/Configuration.h

@@ -470,6 +470,17 @@
 
   //#define DELTA_ENDSTOP_ADJ { 0, 0, 0 }
 
+  // Trim adjustments for individual towers
+  #define DELTA_RADIUS_TRIM_TOWER_1 0.0
+  #define DELTA_RADIUS_TRIM_TOWER_2 0.0
+  #define DELTA_RADIUS_TRIM_TOWER_3 0.0
+  #define DELTA_DIAGONAL_ROD_TRIM_TOWER_1 0.0
+  #define DELTA_DIAGONAL_ROD_TRIM_TOWER_2 0.0
+  #define DELTA_DIAGONAL_ROD_TRIM_TOWER_3 0.0
+  #define DELTA_TOWER_ANGLE_TRIM_1 0.0
+  #define DELTA_TOWER_ANGLE_TRIM_2 0.0
+  #define DELTA_TOWER_ANGLE_TRIM_3 0.0
+
 #endif
 
 // Enable this option for Toshiba steppers