From baf3b914601b5b24cf82402289fd6a8cb8c64e59 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Fri, 28 Apr 2017 16:05:39 -0500 Subject: [PATCH] DELTA_TOWER_ANGLE_TRIM only needs AB --- Marlin/Conditionals_post.h | 6 +++--- Marlin/configuration_store.cpp | 2 +- .../delta/FLSUN/auto_calibrate/Configuration.h | 2 +- .../delta/FLSUN/kossel_mini/Configuration.h | 2 +- Marlin/example_configurations/delta/generic/Configuration.h | 2 +- .../delta/kossel_mini/Configuration.h | 2 +- .../example_configurations/delta/kossel_pro/Configuration.h | 2 +- .../example_configurations/delta/kossel_xl/Configuration.h | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Marlin/Conditionals_post.h b/Marlin/Conditionals_post.h index 4b4dc4d941..6252ac5d3f 100644 --- a/Marlin/Conditionals_post.h +++ b/Marlin/Conditionals_post.h @@ -698,13 +698,13 @@ #define DELTA_ENDSTOP_ADJ { 0.0, 0.0, 0.0 } #endif #ifndef DELTA_TOWER_ANGLE_TRIM - #define DELTA_TOWER_ANGLE_TRIM {0.0, 0.0, 0.0} + #define DELTA_TOWER_ANGLE_TRIM { 0.0, 0.0 } // C always 0.0 #endif #ifndef DELTA_RADIUS_TRIM_TOWER - #define DELTA_RADIUS_TRIM_TOWER {0.0, 0.0, 0.0} + #define DELTA_RADIUS_TRIM_TOWER { 0.0, 0.0, 0.0 } #endif #ifndef DELTA_DIAGONAL_ROD_TRIM_TOWER - #define DELTA_DIAGONAL_ROD_TRIM_TOWER {0.0, 0.0, 0.0} + #define DELTA_DIAGONAL_ROD_TRIM_TOWER { 0.0, 0.0, 0.0 } #endif #endif diff --git a/Marlin/configuration_store.cpp b/Marlin/configuration_store.cpp index 57a5e068a4..3d2ca2bb4a 100644 --- a/Marlin/configuration_store.cpp +++ b/Marlin/configuration_store.cpp @@ -1066,7 +1066,7 @@ void MarlinSettings::reset() { #if ENABLED(DELTA) const float adj[ABC] = DELTA_ENDSTOP_ADJ, - dta[ABC] = DELTA_TOWER_ANGLE_TRIM; + dta[2] = DELTA_TOWER_ANGLE_TRIM; COPY(endstop_adj, adj); delta_radius = DELTA_RADIUS; delta_diagonal_rod = DELTA_DIAGONAL_ROD; diff --git a/Marlin/example_configurations/delta/FLSUN/auto_calibrate/Configuration.h b/Marlin/example_configurations/delta/FLSUN/auto_calibrate/Configuration.h index ccd039df89..186161b874 100644 --- a/Marlin/example_configurations/delta/FLSUN/auto_calibrate/Configuration.h +++ b/Marlin/example_configurations/delta/FLSUN/auto_calibrate/Configuration.h @@ -491,7 +491,7 @@ // Trim adjustments for individual towers // tower angle corrections for X and Y tower / rotate XYZ so Z tower angle = 0 // measured in degrees anticlockwise looking from above the printer - #define DELTA_TOWER_ANGLE_TRIM { 0.00, 0.00, 0.00 } // get these from auto calibrate + #define DELTA_TOWER_ANGLE_TRIM { 0.00, 0.00 } // get these from auto calibrate // delta radius and diaginal rod adjustments measured in mm //#define DELTA_RADIUS_TRIM_TOWER {0.0, 0.0, 0.0} diff --git a/Marlin/example_configurations/delta/FLSUN/kossel_mini/Configuration.h b/Marlin/example_configurations/delta/FLSUN/kossel_mini/Configuration.h index 72721737b1..167deb36a4 100644 --- a/Marlin/example_configurations/delta/FLSUN/kossel_mini/Configuration.h +++ b/Marlin/example_configurations/delta/FLSUN/kossel_mini/Configuration.h @@ -489,7 +489,7 @@ // Trim adjustments for individual towers // tower angle corrections for X and Y tower / rotate XYZ so Z tower angle = 0 // measured in degrees anticlockwise looking from above the printer - #define DELTA_TOWER_ANGLE_TRIM { 0.00, 0.00, 0.00 } // get these from auto calibrate + #define DELTA_TOWER_ANGLE_TRIM { 0.00, 0.00 } // get these from auto calibrate // delta radius and diaginal rod adjustments measured in mm //#define DELTA_RADIUS_TRIM_TOWER {0.0, 0.0, 0.0} diff --git a/Marlin/example_configurations/delta/generic/Configuration.h b/Marlin/example_configurations/delta/generic/Configuration.h index d9c3750daf..310498f218 100644 --- a/Marlin/example_configurations/delta/generic/Configuration.h +++ b/Marlin/example_configurations/delta/generic/Configuration.h @@ -476,7 +476,7 @@ // Trim adjustments for individual towers // tower angle corrections for X and Y tower / rotate XYZ so Z tower angle = 0 // measured in degrees anticlockwise looking from above the printer - #define DELTA_TOWER_ANGLE_TRIM { 0.00, 0.00, 0.00 } // get these from auto calibrate + #define DELTA_TOWER_ANGLE_TRIM { 0.00, 0.00 } // get these from auto calibrate // delta radius and diaginal rod adjustments measured in mm //#define DELTA_RADIUS_TRIM_TOWER {0.0, 0.0, 0.0} diff --git a/Marlin/example_configurations/delta/kossel_mini/Configuration.h b/Marlin/example_configurations/delta/kossel_mini/Configuration.h index 21f69f539b..77f49f3148 100644 --- a/Marlin/example_configurations/delta/kossel_mini/Configuration.h +++ b/Marlin/example_configurations/delta/kossel_mini/Configuration.h @@ -478,7 +478,7 @@ // Trim adjustments for individual towers // tower angle corrections for X and Y tower / rotate XYZ so Z tower angle = 0 // measured in degrees anticlockwise looking from above the printer - #define DELTA_TOWER_ANGLE_TRIM { 0.00, 0.00, 0.00 } // get these from auto calibrate + #define DELTA_TOWER_ANGLE_TRIM { 0.00, 0.00 } // get these from auto calibrate // delta radius and diaginal rod adjustments measured in mm //#define DELTA_RADIUS_TRIM_TOWER {0.0, 0.0, 0.0} diff --git a/Marlin/example_configurations/delta/kossel_pro/Configuration.h b/Marlin/example_configurations/delta/kossel_pro/Configuration.h index 40231832c5..d708179755 100644 --- a/Marlin/example_configurations/delta/kossel_pro/Configuration.h +++ b/Marlin/example_configurations/delta/kossel_pro/Configuration.h @@ -465,7 +465,7 @@ // Trim adjustments for individual towers // tower angle corrections for X and Y tower / rotate XYZ so Z tower angle = 0 // measured in degrees anticlockwise looking from above the printer - #define DELTA_TOWER_ANGLE_TRIM { 0.00, 0.00, 0.00 } // get these from auto calibrate + #define DELTA_TOWER_ANGLE_TRIM { 0.00, 0.00 } // get these from auto calibrate // delta radius and diaginal rod adjustments measured in mm //#define DELTA_RADIUS_TRIM_TOWER {0.0, 0.0, 0.0} diff --git a/Marlin/example_configurations/delta/kossel_xl/Configuration.h b/Marlin/example_configurations/delta/kossel_xl/Configuration.h index 70b10e4330..b71e8bf73e 100644 --- a/Marlin/example_configurations/delta/kossel_xl/Configuration.h +++ b/Marlin/example_configurations/delta/kossel_xl/Configuration.h @@ -483,7 +483,7 @@ // Trim adjustments for individual towers // tower angle corrections for X and Y tower / rotate XYZ so Z tower angle = 0 // measured in degrees anticlockwise looking from above the printer - #define DELTA_TOWER_ANGLE_TRIM { 0.00, 0.00, 0.00 } // get these from auto calibrate + #define DELTA_TOWER_ANGLE_TRIM { 0.00, 0.00 } // get these from auto calibrate // delta radius and diaginal rod adjustments measured in mm //#define DELTA_RADIUS_TRIM_TOWER {0.0, 0.0, 0.0}