Parcourir la source

Allowing #define DELTA_TOWER_ANGLE_TRIM[C_AXIS]

More consistent with M665 where C-value is allowed as well, then
normalized
LVD-AC il y a 8 ans
Parent
révision
dcf30a69d6

+ 1
- 1
Marlin/Conditionals_post.h Voir le fichier

@@ -698,7 +698,7 @@
698 698
       #define DELTA_ENDSTOP_ADJ { 0.0, 0.0, 0.0 }
699 699
     #endif
700 700
     #ifndef DELTA_TOWER_ANGLE_TRIM
701
-      #define DELTA_TOWER_ANGLE_TRIM {0.0, 0.0}
701
+      #define DELTA_TOWER_ANGLE_TRIM {0.0, 0.0, 0.0}
702 702
     #endif
703 703
     #ifndef DELTA_RADIUS_TRIM_TOWER
704 704
       #define DELTA_RADIUS_TRIM_TOWER {0.0, 0.0, 0.0}

+ 2
- 2
Marlin/Marlin_main.cpp Voir le fichier

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

+ 3
- 2
Marlin/configuration_store.cpp Voir le fichier

@@ -1066,13 +1066,14 @@ void MarlinSettings::reset() {
1066 1066
 
1067 1067
   #if ENABLED(DELTA)
1068 1068
     const float adj[ABC] = DELTA_ENDSTOP_ADJ,
1069
-                dta[2] = DELTA_TOWER_ANGLE_TRIM;
1069
+                dta[3] = DELTA_TOWER_ANGLE_TRIM;
1070 1070
     COPY(endstop_adj, adj);
1071 1071
     delta_radius = DELTA_RADIUS;
1072 1072
     delta_diagonal_rod = DELTA_DIAGONAL_ROD;
1073 1073
     delta_segments_per_second = DELTA_SEGMENTS_PER_SECOND;
1074 1074
     delta_calibration_radius = DELTA_CALIBRATION_RADIUS;
1075
-    COPY(delta_tower_angle_trim, dta);
1075
+    delta_tower_angle_trim[A_AXIS] = dta[A_AXIS] - dta[C_AXIS];
1076
+    delta_tower_angle_trim[B_AXIS] = dta[B_AXIS] - dta[C_AXIS];
1076 1077
     home_offset[Z_AXIS] = 0;
1077 1078
 
1078 1079
   #elif ENABLED(Z_DUAL_ENDSTOPS)

+ 1
- 1
Marlin/example_configurations/delta/FLSUN/auto_calibrate/Configuration.h Voir le fichier

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

+ 1
- 1
Marlin/example_configurations/delta/FLSUN/kossel_mini/Configuration.h Voir le fichier

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

+ 1
- 1
Marlin/example_configurations/delta/generic/Configuration.h Voir le fichier

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

+ 1
- 1
Marlin/example_configurations/delta/kossel_mini/Configuration.h Voir le fichier

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

+ 1
- 1
Marlin/example_configurations/delta/kossel_pro/Configuration.h Voir le fichier

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

+ 1
- 1
Marlin/example_configurations/delta/kossel_xl/Configuration.h Voir le fichier

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

Chargement…
Annuler
Enregistrer