CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allowing #define DELTA_TOWER_ANGLE_TRIM[C_AXIS]

Browse Source 
More consistent with M665 where C-value is allowed as well, then
normalized
This commit is contained in:
LVD-AC 2017-04-22 10:39:48 +02:00 committed by teemuatlut
parent 244f67590e
commit dcf30a69d6
9 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/Conditionals_post.h
View File

@ -698,7 +698,7 @@
#define DELTA_ENDSTOP_ADJ { 0.0, 0.0, 0.0 } #define DELTA_ENDSTOP_ADJ { 0.0, 0.0, 0.0 }
#endif #endif
#ifndef DELTA_TOWER_ANGLE_TRIM #ifndef DELTA_TOWER_ANGLE_TRIM
#define DELTA_TOWER_ANGLE_TRIM {0.0, 0.0} #define DELTA_TOWER_ANGLE_TRIM {0.0, 0.0, 0.0}
#endif #endif
#ifndef DELTA_RADIUS_TRIM_TOWER #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}

4
Marlin/Marlin_main.cpp
View File

@ -7524,8 +7524,8 @@ inline void gcode_M205() {
if (code_seen('X')) delta_tower_angle_trim[A_AXIS] = code_value_linear_units(); if (code_seen('X')) delta_tower_angle_trim[A_AXIS] = code_value_linear_units();
if (code_seen('Y')) delta_tower_angle_trim[B_AXIS] = code_value_linear_units(); if (code_seen('Y')) delta_tower_angle_trim[B_AXIS] = code_value_linear_units();
if (code_seen('Z')) { // rotate all 3 axis for Z = 0 if (code_seen('Z')) { // rotate all 3 axis for Z = 0
delta_tower_angle_trim[A_AXIS] += code_value_linear_units(); delta_tower_angle_trim[A_AXIS] -= code_value_linear_units();
delta_tower_angle_trim[B_AXIS] = code_value_linear_units(); delta_tower_angle_trim[B_AXIS] -= code_value_linear_units();
} }
recalc_delta_settings(delta_radius, delta_diagonal_rod); recalc_delta_settings(delta_radius, delta_diagonal_rod);
} }

5
Marlin/configuration_store.cpp
View File

@ -1066,13 +1066,14 @@ void MarlinSettings::reset() {
#if ENABLED(DELTA) #if ENABLED(DELTA)
const float adj[ABC] = DELTA_ENDSTOP_ADJ, const float adj[ABC] = DELTA_ENDSTOP_ADJ,
dta[2] = DELTA_TOWER_ANGLE_TRIM; dta[3] = DELTA_TOWER_ANGLE_TRIM;
COPY(endstop_adj, adj); COPY(endstop_adj, adj);
delta_radius = DELTA_RADIUS; delta_radius = DELTA_RADIUS;
delta_diagonal_rod = DELTA_DIAGONAL_ROD; delta_diagonal_rod = DELTA_DIAGONAL_ROD;
delta_segments_per_second = DELTA_SEGMENTS_PER_SECOND; delta_segments_per_second = DELTA_SEGMENTS_PER_SECOND;
delta_calibration_radius = DELTA_CALIBRATION_RADIUS; delta_calibration_radius = DELTA_CALIBRATION_RADIUS;
COPY(delta_tower_angle_trim, dta); delta_tower_angle_trim[A_AXIS] = dta[A_AXIS] - dta[C_AXIS];
delta_tower_angle_trim[B_AXIS] = dta[B_AXIS] - dta[C_AXIS];
home_offset[Z_AXIS] = 0; home_offset[Z_AXIS] = 0;
#elif ENABLED(Z_DUAL_ENDSTOPS) #elif ENABLED(Z_DUAL_ENDSTOPS)

2
Marlin/example_configurations/delta/FLSUN/auto_calibrate/Configuration.h
View File

@ -488,7 +488,7 @@
// Trim adjustments for individual towers // Trim adjustments for individual towers
// tower angle corrections for X and Y tower / rotate XYZ so Z tower angle = 0 // tower angle corrections for X and Y tower / rotate XYZ so Z tower angle = 0
// measured in degrees anticlockwise looking from above the printer // measured in degrees anticlockwise looking from above the printer
#define DELTA_TOWER_ANGLE_TRIM { -0.00, -0.00 } // get these from auto calibrate #define DELTA_TOWER_ANGLE_TRIM { 0.00, 0.00, 0.00 } // get these from auto calibrate
// delta radius and diaginal rod adjustments measured in mm // delta radius and diaginal rod adjustments measured in mm
//#define DELTA_RADIUS_TRIM_TOWER {0.0, 0.0, 0.0} //#define DELTA_RADIUS_TRIM_TOWER {0.0, 0.0, 0.0}

2
Marlin/example_configurations/delta/FLSUN/kossel_mini/Configuration.h
View File

@ -489,7 +489,7 @@
// Trim adjustments for individual towers // Trim adjustments for individual towers
// tower angle corrections for X and Y tower / rotate XYZ so Z tower angle = 0 // tower angle corrections for X and Y tower / rotate XYZ so Z tower angle = 0
// measured in degrees anticlockwise looking from above the printer // measured in degrees anticlockwise looking from above the printer
#define DELTA_TOWER_ANGLE_TRIM { -0.00, -0.00 } // get these from auto calibrate #define DELTA_TOWER_ANGLE_TRIM { 0.00, 0.00, 0.00 } // get these from auto calibrate
// delta radius and diaginal rod adjustments measured in mm // delta radius and diaginal rod adjustments measured in mm
//#define DELTA_RADIUS_TRIM_TOWER {0.0, 0.0, 0.0} //#define DELTA_RADIUS_TRIM_TOWER {0.0, 0.0, 0.0}

2
Marlin/example_configurations/delta/generic/Configuration.h
View File

@ -480,7 +480,7 @@
// Trim adjustments for individual towers // Trim adjustments for individual towers
// tower angle corrections for X and Y tower / rotate XYZ so Z tower angle = 0 // tower angle corrections for X and Y tower / rotate XYZ so Z tower angle = 0
// measured in degrees anticlockwise looking from above the printer // measured in degrees anticlockwise looking from above the printer
#define DELTA_TOWER_ANGLE_TRIM { -0.00, -0.00 } // get these from auto calibrate #define DELTA_TOWER_ANGLE_TRIM { 0.00, 0.00, 0.00 } // get these from auto calibrate
// delta radius and diaginal rod adjustments measured in mm // delta radius and diaginal rod adjustments measured in mm
//#define DELTA_RADIUS_TRIM_TOWER {0.0, 0.0, 0.0} //#define DELTA_RADIUS_TRIM_TOWER {0.0, 0.0, 0.0}

2
Marlin/example_configurations/delta/kossel_mini/Configuration.h
View File

@ -478,7 +478,7 @@
// Trim adjustments for individual towers // Trim adjustments for individual towers
// tower angle corrections for X and Y tower / rotate XYZ so Z tower angle = 0 // tower angle corrections for X and Y tower / rotate XYZ so Z tower angle = 0
// measured in degrees anticlockwise looking from above the printer // measured in degrees anticlockwise looking from above the printer
#define DELTA_TOWER_ANGLE_TRIM { -0.00, -0.00 } // get these from auto calibrate #define DELTA_TOWER_ANGLE_TRIM { 0.00, 0.00, 0.00 } // get these from auto calibrate
// delta radius and diaginal rod adjustments measured in mm // delta radius and diaginal rod adjustments measured in mm
//#define DELTA_RADIUS_TRIM_TOWER {0.0, 0.0, 0.0} //#define DELTA_RADIUS_TRIM_TOWER {0.0, 0.0, 0.0}

2
Marlin/example_configurations/delta/kossel_pro/Configuration.h
View File

@ -467,7 +467,7 @@
// Trim adjustments for individual towers // Trim adjustments for individual towers
// tower angle corrections for X and Y tower / rotate XYZ so Z tower angle = 0 // tower angle corrections for X and Y tower / rotate XYZ so Z tower angle = 0
// measured in degrees anticlockwise looking from above the printer // measured in degrees anticlockwise looking from above the printer
#define DELTA_TOWER_ANGLE_TRIM { -0.00, -0.00 } // get these from auto calibrate #define DELTA_TOWER_ANGLE_TRIM { 0.00, 0.00, 0.00 } // get these from auto calibrate
// delta radius and diaginal rod adjustments measured in mm // delta radius and diaginal rod adjustments measured in mm
//#define DELTA_RADIUS_TRIM_TOWER {0.0, 0.0, 0.0} //#define DELTA_RADIUS_TRIM_TOWER {0.0, 0.0, 0.0}

2
Marlin/example_configurations/delta/kossel_xl/Configuration.h
View File

@ -483,7 +483,7 @@
// Trim adjustments for individual towers // Trim adjustments for individual towers
// tower angle corrections for X and Y tower / rotate XYZ so Z tower angle = 0 // tower angle corrections for X and Y tower / rotate XYZ so Z tower angle = 0
// measured in degrees anticlockwise looking from above the printer // measured in degrees anticlockwise looking from above the printer
#define DELTA_TOWER_ANGLE_TRIM { -0.00, -0.00 } // get these from auto calibrate #define DELTA_TOWER_ANGLE_TRIM { 0.00, 0.00, 0.00 } // get these from auto calibrate
// delta radius and diaginal rod adjustments measured in mm // delta radius and diaginal rod adjustments measured in mm
//#define DELTA_RADIUS_TRIM_TOWER {0.0, 0.0, 0.0} //#define DELTA_RADIUS_TRIM_TOWER {0.0, 0.0, 0.0}