|
@@ -564,12 +564,15 @@ static uint8_t target_extruder;
|
564
|
564
|
|
565
|
565
|
// these are the default values, can be overriden with M665
|
566
|
566
|
float delta_radius = DELTA_RADIUS,
|
567
|
|
- delta_tower1_x = -SIN_60 * (delta_radius + DELTA_RADIUS_TRIM_TOWER_1), // front left tower
|
568
|
|
- delta_tower1_y = -COS_60 * (delta_radius + DELTA_RADIUS_TRIM_TOWER_1),
|
569
|
|
- delta_tower2_x = SIN_60 * (delta_radius + DELTA_RADIUS_TRIM_TOWER_2), // front right tower
|
570
|
|
- delta_tower2_y = -COS_60 * (delta_radius + DELTA_RADIUS_TRIM_TOWER_2),
|
571
|
|
- delta_tower3_x = 0, // back middle tower
|
572
|
|
- delta_tower3_y = (delta_radius + DELTA_RADIUS_TRIM_TOWER_3),
|
|
567
|
+ delta_tower_angle_trim_1 = DELTA_TOWER_ANGLE_TRIM_1,
|
|
568
|
+ delta_tower_angle_trim_2 = DELTA_TOWER_ANGLE_TRIM_2,
|
|
569
|
+ delta_tower_angle_trim_3 = DELTA_TOWER_ANGLE_TRIM_3,
|
|
570
|
+ delta_tower1_x = -sin( (60 - delta_tower_angle_trim_1) * PI/180) * (delta_radius + DELTA_RADIUS_TRIM_TOWER_1), // front left tower
|
|
571
|
+ delta_tower1_y = -cos( (60 - delta_tower_angle_trim_1) * PI/180) * (delta_radius + DELTA_RADIUS_TRIM_TOWER_1),
|
|
572
|
+ delta_tower2_x = sin( (60 + delta_tower_angle_trim_2) * PI/180) * (delta_radius + DELTA_RADIUS_TRIM_TOWER_2), // front right tower
|
|
573
|
+ delta_tower2_y = -cos( (60 + delta_tower_angle_trim_2) * PI/180) * (delta_radius + DELTA_RADIUS_TRIM_TOWER_2),
|
|
574
|
+ delta_tower3_x = -sin( ( delta_tower_angle_trim_3) * PI/180), // back middle tower
|
|
575
|
+ delta_tower3_y = cos( ( delta_tower_angle_trim_3) * PI/180) * (delta_radius + DELTA_RADIUS_TRIM_TOWER_3),
|
573
|
576
|
delta_diagonal_rod = DELTA_DIAGONAL_ROD,
|
574
|
577
|
delta_diagonal_rod_trim_tower_1 = DELTA_DIAGONAL_ROD_TRIM_TOWER_1,
|
575
|
578
|
delta_diagonal_rod_trim_tower_2 = DELTA_DIAGONAL_ROD_TRIM_TOWER_2,
|
|
@@ -6337,6 +6340,9 @@ inline void gcode_M205() {
|
6337
|
6340
|
if (code_seen('A')) delta_diagonal_rod_trim_tower_1 = code_value_linear_units();
|
6338
|
6341
|
if (code_seen('B')) delta_diagonal_rod_trim_tower_2 = code_value_linear_units();
|
6339
|
6342
|
if (code_seen('C')) delta_diagonal_rod_trim_tower_3 = code_value_linear_units();
|
|
6343
|
+ if (code_seen('I')) delta_tower_angle_trim_1 = code_value_linear_units();
|
|
6344
|
+ if (code_seen('J')) delta_tower_angle_trim_2 = code_value_linear_units();
|
|
6345
|
+ if (code_seen('K')) delta_tower_angle_trim_3 = code_value_linear_units();
|
6340
|
6346
|
recalc_delta_settings(delta_radius, delta_diagonal_rod);
|
6341
|
6347
|
}
|
6342
|
6348
|
/**
|
|
@@ -9140,12 +9146,12 @@ void ok_to_send() {
|
9140
|
9146
|
* settings have been changed (e.g., by M665).
|
9141
|
9147
|
*/
|
9142
|
9148
|
void recalc_delta_settings(float radius, float diagonal_rod) {
|
9143
|
|
- delta_tower1_x = -SIN_60 * (radius + DELTA_RADIUS_TRIM_TOWER_1); // front left tower
|
9144
|
|
- delta_tower1_y = -COS_60 * (radius + DELTA_RADIUS_TRIM_TOWER_1);
|
9145
|
|
- delta_tower2_x = SIN_60 * (radius + DELTA_RADIUS_TRIM_TOWER_2); // front right tower
|
9146
|
|
- delta_tower2_y = -COS_60 * (radius + DELTA_RADIUS_TRIM_TOWER_2);
|
9147
|
|
- delta_tower3_x = 0.0; // back middle tower
|
9148
|
|
- delta_tower3_y = (radius + DELTA_RADIUS_TRIM_TOWER_3);
|
|
9149
|
+ delta_tower1_x = -sin( (60 - delta_tower_angle_trim_1) * PI/180) * (delta_radius + DELTA_RADIUS_TRIM_TOWER_1), // front left tower
|
|
9150
|
+ delta_tower1_y = -cos( (60 - delta_tower_angle_trim_1) * PI/180) * (delta_radius + DELTA_RADIUS_TRIM_TOWER_1),
|
|
9151
|
+ delta_tower2_x = sin( (60 + delta_tower_angle_trim_2) * PI/180) * (delta_radius + DELTA_RADIUS_TRIM_TOWER_2), // front right tower
|
|
9152
|
+ delta_tower2_y = -cos( (60 + delta_tower_angle_trim_2) * PI/180) * (delta_radius + DELTA_RADIUS_TRIM_TOWER_2),
|
|
9153
|
+ delta_tower3_x = -sin( ( delta_tower_angle_trim_3) * PI/180), // back middle tower
|
|
9154
|
+ delta_tower3_y = cos( ( delta_tower_angle_trim_3) * PI/180) * (delta_radius + DELTA_RADIUS_TRIM_TOWER_3),
|
9149
|
9155
|
delta_diagonal_rod_2_tower_1 = sq(diagonal_rod + delta_diagonal_rod_trim_tower_1);
|
9150
|
9156
|
delta_diagonal_rod_2_tower_2 = sq(diagonal_rod + delta_diagonal_rod_trim_tower_2);
|
9151
|
9157
|
delta_diagonal_rod_2_tower_3 = sq(diagonal_rod + delta_diagonal_rod_trim_tower_3);
|