From f78d44e91a15cd8bf0ef9addd717fa4372278ddf Mon Sep 17 00:00:00 2001 From: Jimmy Envall Date: Mon, 27 Feb 2017 21:39:00 +0200 Subject: [PATCH] Added support for delta tower angle corrections. --- Marlin/Conditionals_post.h | 7 +++---- Marlin/Marlin_main.cpp | 0 Marlin/configuration_store.cpp | 3 +-- .../delta/flsun_kossel_mini/Configuration.h | 11 +++++++++++ .../delta/generic/Configuration.h | 11 +++++++++++ .../delta/kossel_mini/Configuration.h | 11 +++++++++++ .../delta/kossel_pro/Configuration.h | 11 +++++++++++ .../delta/kossel_xl/Configuration.h | 11 +++++++++++ 8 files changed, 59 insertions(+), 6 deletions(-) mode change 100755 => 100644 Marlin/Marlin_main.cpp diff --git a/Marlin/Conditionals_post.h b/Marlin/Conditionals_post.h index a0f7233bb..e96ffb7b9 100644 --- a/Marlin/Conditionals_post.h +++ b/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 diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp old mode 100755 new mode 100644 diff --git a/Marlin/configuration_store.cpp b/Marlin/configuration_store.cpp index ec8f9d1fb..5f190ef26 100644 --- a/Marlin/configuration_store.cpp +++ b/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" diff --git a/Marlin/example_configurations/delta/flsun_kossel_mini/Configuration.h b/Marlin/example_configurations/delta/flsun_kossel_mini/Configuration.h index 3313a4d8d..addc89a7c 100644 --- a/Marlin/example_configurations/delta/flsun_kossel_mini/Configuration.h +++ b/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 diff --git a/Marlin/example_configurations/delta/generic/Configuration.h b/Marlin/example_configurations/delta/generic/Configuration.h index 56f507ce0..39957c1ac 100644 --- a/Marlin/example_configurations/delta/generic/Configuration.h +++ b/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 diff --git a/Marlin/example_configurations/delta/kossel_mini/Configuration.h b/Marlin/example_configurations/delta/kossel_mini/Configuration.h index 250f7a0e0..faaa5c12c 100644 --- a/Marlin/example_configurations/delta/kossel_mini/Configuration.h +++ b/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 diff --git a/Marlin/example_configurations/delta/kossel_pro/Configuration.h b/Marlin/example_configurations/delta/kossel_pro/Configuration.h index d4a30a7f1..83d21af57 100644 --- a/Marlin/example_configurations/delta/kossel_pro/Configuration.h +++ b/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 diff --git a/Marlin/example_configurations/delta/kossel_xl/Configuration.h b/Marlin/example_configurations/delta/kossel_xl/Configuration.h index d7b96be0b..7152cdc95 100644 --- a/Marlin/example_configurations/delta/kossel_xl/Configuration.h +++ b/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