thomas
/
marlin
Watch 1
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

Added support for delta tower angle corrections.

Jimmy Envall 7 years ago
parent
98c9de11e1
commit
f78d44e91a
8 changed files with 59 additions and 6 deletions
Split View Show Diff Stats
  1. 3
    4
      Marlin/Conditionals_post.h
  2. 0
    0
      Marlin/Marlin_main.cpp
  3. 1
    2
      Marlin/configuration_store.cpp
  4. 11
    0
      Marlin/example_configurations/delta/flsun_kossel_mini/Configuration.h
  5. 11
    0
      Marlin/example_configurations/delta/generic/Configuration.h
  6. 11
    0
      Marlin/example_configurations/delta/kossel_mini/Configuration.h
  7. 11
    0
      Marlin/example_configurations/delta/kossel_pro/Configuration.h
  8. 11
    0
      Marlin/example_configurations/delta/kossel_xl/Configuration.h

+ 3
- 4
Marlin/Conditionals_post.h View File 

@@ -658,6 +658,9 @@
658 658 
    * Delta radius/rod trimmers/angle trimmers
659 659 
    */
660 660 
   #if ENABLED(DELTA)
661 
+    #ifndef DELTA_ENDSTOP_ADJ
662 
+      #define DELTA_ENDSTOP_ADJ { 0 }
663 
+    #endif
661 664 
     #ifndef DELTA_RADIUS_TRIM_TOWER_1
662 665 
       #define DELTA_RADIUS_TRIM_TOWER_1 0.0
663 666 
     #endif
 
@@ -757,10 +760,6 @@
757 760 
   // Stepper pulse duration, in cycles
758 761 
   #define STEP_PULSE_CYCLES ((MINIMUM_STEPPER_PULSE) * CYCLES_PER_MICROSECOND)
759 762
760 
-  #ifndef DELTA_ENDSTOP_ADJ
761 
-    #define DELTA_ENDSTOP_ADJ { 0 }
762 
-  #endif
763 
-
764 763 
   #if ENABLED(SDCARD_SORT_ALPHA)
765 764 
     #define HAS_FOLDER_SORTING (FOLDER_SORTING || ENABLED(SDSORT_GCODE))
766 765 
   #endif

+ 0
- 0
Marlin/Marlin_main.cpp View File


+ 1
- 2
Marlin/configuration_store.cpp View File 

@@ -42,7 +42,7 @@
42 42 
 #define EEPROM_OFFSET 100
43 43
44 44 
 /**
45 
- * V31 EEPROM Layout:
45 
+ * V32 EEPROM Layout:
46 46 
  *
47 47 
  *  100  Version                                    (char x4)
48 48 
  *  104  EEPROM Checksum                            (uint16_t)
 
@@ -147,7 +147,6 @@
147 147 
  *
148 148 
  *  574                                Minimum end-point
149 149 
  * 1895 (574 + 36 + 9 + 288 + 988)     Maximum end-point
150 
- *
151 150 
  */
152 151 
 #include "Marlin.h"
153 152 
 #include "language.h"

+ 11
- 0
Marlin/example_configurations/delta/flsun_kossel_mini/Configuration.h View File 

@@ -478,6 +478,17 @@
478 478
479 479 
   //#define DELTA_ENDSTOP_ADJ { 0, 0, 0 }
480 480
481 
+  // Trim adjustments for individual towers
482 
+  #define DELTA_RADIUS_TRIM_TOWER_1 0.0
483 
+  #define DELTA_RADIUS_TRIM_TOWER_2 0.0
484 
+  #define DELTA_RADIUS_TRIM_TOWER_3 0.0
485 
+  #define DELTA_DIAGONAL_ROD_TRIM_TOWER_1 0.0
486 
+  #define DELTA_DIAGONAL_ROD_TRIM_TOWER_2 0.0
487 
+  #define DELTA_DIAGONAL_ROD_TRIM_TOWER_3 0.0
488 
+  #define DELTA_TOWER_ANGLE_TRIM_1 0.0
489 
+  #define DELTA_TOWER_ANGLE_TRIM_2 0.0
490 
+  #define DELTA_TOWER_ANGLE_TRIM_3 0.0
491 
+
481 492 
 #endif
482 493
483 494 
 // Enable this option for Toshiba steppers

+ 11
- 0
Marlin/example_configurations/delta/generic/Configuration.h View File 

@@ -465,6 +465,17 @@
465 465
466 466 
   //#define DELTA_ENDSTOP_ADJ { 0, 0, 0 }
467 467
468 
+  // Trim adjustments for individual towers
469 
+  #define DELTA_RADIUS_TRIM_TOWER_1 0.0
470 
+  #define DELTA_RADIUS_TRIM_TOWER_2 0.0
471 
+  #define DELTA_RADIUS_TRIM_TOWER_3 0.0
472 
+  #define DELTA_DIAGONAL_ROD_TRIM_TOWER_1 0.0
473 
+  #define DELTA_DIAGONAL_ROD_TRIM_TOWER_2 0.0
474 
+  #define DELTA_DIAGONAL_ROD_TRIM_TOWER_3 0.0
475 
+  #define DELTA_TOWER_ANGLE_TRIM_1 0.0
476 
+  #define DELTA_TOWER_ANGLE_TRIM_2 0.0
477 
+  #define DELTA_TOWER_ANGLE_TRIM_3 0.0
478 
+
468 479 
 #endif
469 480
470 481 
 // Enable this option for Toshiba steppers

+ 11
- 0
Marlin/example_configurations/delta/kossel_mini/Configuration.h View File 

@@ -465,6 +465,17 @@
465 465
466 466 
   //#define DELTA_ENDSTOP_ADJ { 0, 0, 0 }
467 467
468 
+  // Trim adjustments for individual towers
469 
+  #define DELTA_RADIUS_TRIM_TOWER_1 0.0
470 
+  #define DELTA_RADIUS_TRIM_TOWER_2 0.0
471 
+  #define DELTA_RADIUS_TRIM_TOWER_3 0.0
472 
+  #define DELTA_DIAGONAL_ROD_TRIM_TOWER_1 0.0
473 
+  #define DELTA_DIAGONAL_ROD_TRIM_TOWER_2 0.0
474 
+  #define DELTA_DIAGONAL_ROD_TRIM_TOWER_3 0.0
475 
+  #define DELTA_TOWER_ANGLE_TRIM_1 0.0
476 
+  #define DELTA_TOWER_ANGLE_TRIM_2 0.0
477 
+  #define DELTA_TOWER_ANGLE_TRIM_3 0.0
478 
+
468 479 
 #endif
469 480
470 481 
 // Enable this option for Toshiba steppers

+ 11
- 0
Marlin/example_configurations/delta/kossel_pro/Configuration.h View File 

@@ -452,6 +452,17 @@
452 452
453 453 
   //#define DELTA_ENDSTOP_ADJ { 0, 0, 0 }
454 454
455 
+  // Trim adjustments for individual towers
456 
+  #define DELTA_RADIUS_TRIM_TOWER_1 0.0
457 
+  #define DELTA_RADIUS_TRIM_TOWER_2 0.0
458 
+  #define DELTA_RADIUS_TRIM_TOWER_3 0.0
459 
+  #define DELTA_DIAGONAL_ROD_TRIM_TOWER_1 0.0
460 
+  #define DELTA_DIAGONAL_ROD_TRIM_TOWER_2 0.0
461 
+  #define DELTA_DIAGONAL_ROD_TRIM_TOWER_3 0.0
462 
+  #define DELTA_TOWER_ANGLE_TRIM_1 0.0
463 
+  #define DELTA_TOWER_ANGLE_TRIM_2 0.0
464 
+  #define DELTA_TOWER_ANGLE_TRIM_3 0.0
465 
+
455 466 
 #endif
456 467
457 468 
 // Enable this option for Toshiba steppers

+ 11
- 0
Marlin/example_configurations/delta/kossel_xl/Configuration.h View File 

@@ -470,6 +470,17 @@
470 470
471 471 
   //#define DELTA_ENDSTOP_ADJ { 0, 0, 0 }
472 472
473 
+  // Trim adjustments for individual towers
474 
+  #define DELTA_RADIUS_TRIM_TOWER_1 0.0
475 
+  #define DELTA_RADIUS_TRIM_TOWER_2 0.0
476 
+  #define DELTA_RADIUS_TRIM_TOWER_3 0.0
477 
+  #define DELTA_DIAGONAL_ROD_TRIM_TOWER_1 0.0
478 
+  #define DELTA_DIAGONAL_ROD_TRIM_TOWER_2 0.0
479 
+  #define DELTA_DIAGONAL_ROD_TRIM_TOWER_3 0.0
480 
+  #define DELTA_TOWER_ANGLE_TRIM_1 0.0
481 
+  #define DELTA_TOWER_ANGLE_TRIM_2 0.0
482 
+  #define DELTA_TOWER_ANGLE_TRIM_3 0.0
483 
+
473 484 
 #endif
474 485
475 486 
 // Enable this option for Toshiba steppers

Write Preview
Loading…
Cancel
Save