Bladeren bron

Add delta auto-calibration and configuration for Flsun AC

LVD-AC 8 jaren geleden
bovenliggende
commit
03bda24d19

+ 8
- 0
Marlin/Conditionals_post.h Bestand weergeven

@@ -721,6 +721,14 @@
721 721
     #ifndef DELTA_TOWER_ANGLE_TRIM_3
722 722
       #define DELTA_TOWER_ANGLE_TRIM_3 0.0
723 723
     #endif
724
+    #if ENABLED(DELTA_AUTO_CALIBRATION)
725
+      #ifndef H_FACTOR
726
+        #define H_FACTOR 1.00
727
+      #endif
728
+      #ifndef R_FACTOR
729
+        #define R_FACTOR -2.25
730
+      #endif
731
+    #endif
724 732
   #endif
725 733
 
726 734
   /**

+ 7
- 0
Marlin/SanityCheck.h Bestand weergeven

@@ -392,6 +392,13 @@
392 392
 #endif
393 393
 
394 394
 /**
395
+ * Delta Auto calibration
396
+ */
397
+#if ENABLED(DELTA_AUTO_CALIBRATION) && ENABLED(NO_WORKSPACE_OFFSETS)
398
+  #error "To use DELTA_AUTO_CALIBRATION you must disable NO_WORKSPACE_OFFSETS."
399
+#endif
400
+
401
+/**
395 402
  * Allow only one bed leveling option to be defined
396 403
  */
397 404
 static_assert(1 >= 0

+ 1743
- 0
Marlin/example_configurations/delta/FLSUN/auto_calibrate/Configuration.h
Diff onderdrukt omdat het te groot bestand
Bestand weergeven


+ 1137
- 0
Marlin/example_configurations/delta/FLSUN/auto_calibrate/Configuration_adv.h
Diff onderdrukt omdat het te groot bestand
Bestand weergeven


Marlin/example_configurations/delta/flsun_kossel_mini/Configuration.h → Marlin/example_configurations/delta/FLSUN/kossel_mini/Configuration.h Bestand weergeven

@@ -1,4 +1,4 @@
1
-/**
1
+/**
2 2
  * Marlin 3D Printer Firmware
3 3
  * Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4 4
  *
@@ -463,16 +463,24 @@
463 463
   // Horizontal distance bridged by diagonal push rods when effector is centered.
464 464
   #define DELTA_RADIUS (DELTA_SMOOTH_ROD_OFFSET-(DELTA_EFFECTOR_OFFSET)-(DELTA_CARRIAGE_OFFSET))
465 465
 
466
+  // height from z=0.00 to home position
467
+  #define DELTA_HEIGHT 280 // get this value from auto calibrate
468
+
466 469
   // Print surface diameter/2 minus unreachable space (avoid collisions with vertical towers).
467 470
   #define DELTA_PRINTABLE_RADIUS 85.0
468 471
 
469 472
   // Delta calibration menu
470 473
   // uncomment to add three points calibration menu option.
471 474
   // See http://minow.blogspot.com/index.html#4918805519571907051
472
-  // If needed, adjust the X, Y, Z calibration coordinates
473
-  // in ultralcd.cpp@lcd_delta_calibrate_menu()
474 475
   //#define DELTA_CALIBRATION_MENU
475 476
 
477
+  // G33 Delta Auto-Calibration (Enable EEPROM_SETTINGS to store results)
478
+  //#define DELTA_AUTO_CALIBRATION
479
+  #if ENABLED(DELTA_AUTO_CALIBRATION)
480
+    #define DELTA_CALIBRATION_DEFAULT_POINTS 3 // set the default number of probe points : n*n (1-4)
481
+    #define DELTA_CALIBRATION_RADIUS (DELTA_PRINTABLE_RADIUS - 15) // set the radius for the calibration probe points
482
+  #endif
483
+
476 484
   // After homing move down to a height where XY movement is unconstrained
477 485
   //#define DELTA_HOME_TO_SAFE_ZONE
478 486
 
@@ -1080,7 +1088,7 @@
1080 1088
 // For DELTA this is the top-center of the Cartesian print volume.
1081 1089
 //#define MANUAL_X_HOME_POS 0
1082 1090
 //#define MANUAL_Y_HOME_POS 0
1083
-#define MANUAL_Z_HOME_POS (286.5 - 6.5) // Distance between the nozzle to printbed after homing
1091
+#define MANUAL_Z_HOME_POS DELTA_HEIGHT // Distance between the nozzle to printbed after homing
1084 1092
 
1085 1093
 // Use "Z Safe Homing" to avoid homing with a Z probe outside the bed area.
1086 1094
 //

Marlin/example_configurations/delta/flsun_kossel_mini/Configuration_adv.h → Marlin/example_configurations/delta/FLSUN/kossel_mini/Configuration_adv.h Bestand weergeven

@@ -432,6 +432,25 @@
432 432
 #define DIGIPOT_I2C_MOTOR_CURRENTS {1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0}  //  AZTEEG_X3_PRO
433 433
 
434 434
 //===========================================================================
435
+//============================== Delta Settings =============================
436
+//===========================================================================
437
+
438
+#if ENABLED(DELTA_AUTO_CALIBRATION)
439
+  /**
440
+   * Set the height short (H-10) with M665 Hx.xx.
441
+   * Set the delta_radius offset (R-5, R-10, R+5, R+10) with M665 Rx.xx.
442
+   * Run G33 Cx V3 (C2, C-2) with different values for C and R
443
+   * Take the average for R_FACTOR and maximum for H_FACTOR.
444
+   * Run the tests with default values!!!
445
+   */
446
+  //#define DELTA_CALIBRATE_EXPERT_MODE
447
+
448
+  // Remove the comments of the folling 2 lines to overide default values
449
+  #define H_FACTOR  1.02 //  1.0 < H_FACTOR <  1.11, default  1.00
450
+  #define R_FACTOR -3.95 // -6.7 < R_FACTOR < -2.25, default -2.25
451
+#endif
452
+
453
+//===========================================================================
435 454
 //=============================Additional Features===========================
436 455
 //===========================================================================
437 456
 

+ 12
- 2
Marlin/example_configurations/delta/generic/Configuration.h Bestand weergeven

@@ -1,4 +1,4 @@
1
-/**
1
+/**
2 2
  * Marlin 3D Printer Firmware
3 3
  * Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4 4
  *
@@ -453,6 +453,9 @@
453 453
   // Horizontal distance bridged by diagonal push rods when effector is centered.
454 454
   #define DELTA_RADIUS (DELTA_SMOOTH_ROD_OFFSET-(DELTA_EFFECTOR_OFFSET)-(DELTA_CARRIAGE_OFFSET))
455 455
 
456
+  // height from z=0.00 to home position
457
+  #define DELTA_HEIGHT 250 // get this value from auto calibrate
458
+
456 459
   // Print surface diameter/2 minus unreachable space (avoid collisions with vertical towers).
457 460
   #define DELTA_PRINTABLE_RADIUS 140.0
458 461
 
@@ -460,6 +463,13 @@
460 463
   // See http://minow.blogspot.com/index.html#4918805519571907051
461 464
   //#define DELTA_CALIBRATION_MENU
462 465
 
466
+  // G33 Delta Auto-Calibration (Enable EEPROM_SETTINGS to store results)
467
+  //#define DELTA_AUTO_CALIBRATION
468
+  #if ENABLED(DELTA_AUTO_CALIBRATION)
469
+    #define DELTA_CALIBRATION_DEFAULT_POINTS 3 // set the default number of probe points : n*n (1-4)
470
+    #define DELTA_CALIBRATION_RADIUS (DELTA_PRINTABLE_RADIUS - 15) // set the radius for the calibration probe points
471
+  #endif
472
+
463 473
   // After homing move down to a height where XY movement is unconstrained
464 474
   #define DELTA_HOME_TO_SAFE_ZONE
465 475
 
@@ -1067,7 +1077,7 @@
1067 1077
 // For DELTA this is the top-center of the Cartesian print volume.
1068 1078
 //#define MANUAL_X_HOME_POS 0
1069 1079
 //#define MANUAL_Y_HOME_POS 0
1070
-#define MANUAL_Z_HOME_POS 250 // Distance between the nozzle to printbed after homing
1080
+#define MANUAL_Z_HOME_POS DELTA_HEIGHT // Distance between the nozzle to printbed after homing
1071 1081
 
1072 1082
 // Use "Z Safe Homing" to avoid homing with a Z probe outside the bed area.
1073 1083
 //

+ 3
- 2
Marlin/example_configurations/delta/generic/Configuration_adv.h Bestand weergeven

@@ -439,12 +439,13 @@
439 439
   /**
440 440
    * Set the height short (H-10) with M665 Hx.xx.
441 441
    * Set the delta_radius offset (R-5, R-10, R+5, R+10) with M665 Rx.xx.
442
-   * Run G33 Cx V3 with different values (C2, C-2).
442
+   * Run G33 Cx V3 (C2, C-2) with different values for C and R
443 443
    * Take the average for R_FACTOR and maximum for H_FACTOR.
444
-   * If R_FACTOR is too low accuracy is reduced. Too high reduces iteration speed.
445 444
    * Run the tests with default values!!!
446 445
    */
447 446
   //#define DELTA_CALIBRATE_EXPERT_MODE
447
+
448
+  // Remove the comments of the folling 2 lines to overide default values
448 449
   //#define H_FACTOR  1.02 //  1.0 < H_FACTOR <  1.11, default  1.00
449 450
   //#define R_FACTOR -3.95 // -6.7 < R_FACTOR < -2.25, default -2.25
450 451
 #endif

+ 12
- 2
Marlin/example_configurations/delta/kossel_mini/Configuration.h Bestand weergeven

@@ -1,4 +1,4 @@
1
-/**
1
+/**
2 2
  * Marlin 3D Printer Firmware
3 3
  * Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4 4
  *
@@ -453,6 +453,9 @@
453 453
   // Horizontal distance bridged by diagonal push rods when effector is centered.
454 454
   #define DELTA_RADIUS (DELTA_SMOOTH_ROD_OFFSET-(DELTA_EFFECTOR_OFFSET)-(DELTA_CARRIAGE_OFFSET))
455 455
 
456
+  // height from z=0.00 to home position
457
+  #define DELTA_HEIGHT 250 // get this value from auto calibrate
458
+
456 459
   // Print surface diameter/2 minus unreachable space (avoid collisions with vertical towers).
457 460
   #define DELTA_PRINTABLE_RADIUS 90.0
458 461
 
@@ -460,6 +463,13 @@
460 463
   // See http://minow.blogspot.com/index.html#4918805519571907051
461 464
   //#define DELTA_CALIBRATION_MENU
462 465
 
466
+  // G33 Delta Auto-Calibration (Enable EEPROM_SETTINGS to store results)
467
+  //#define DELTA_AUTO_CALIBRATION
468
+  #if ENABLED(DELTA_AUTO_CALIBRATION)
469
+    #define DELTA_CALIBRATION_DEFAULT_POINTS 3 // set the default number of probe points : n*n (1-4)
470
+    #define DELTA_CALIBRATION_RADIUS (DELTA_PRINTABLE_RADIUS - 15) // set the radius for the calibration probe points
471
+  #endif
472
+
463 473
   // After homing move down to a height where XY movement is unconstrained
464 474
   #define DELTA_HOME_TO_SAFE_ZONE
465 475
 
@@ -1063,7 +1073,7 @@
1063 1073
 // For DELTA this is the top-center of the Cartesian print volume.
1064 1074
 //#define MANUAL_X_HOME_POS 0
1065 1075
 //#define MANUAL_Y_HOME_POS 0
1066
-#define MANUAL_Z_HOME_POS 250 // Distance between the nozzle to printbed after homing
1076
+#define MANUAL_Z_HOME_POS DELTA_HEIGHT // Distance between the nozzle to printbed after homing
1067 1077
 
1068 1078
 // Use "Z Safe Homing" to avoid homing with a Z probe outside the bed area.
1069 1079
 //

+ 3
- 2
Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h Bestand weergeven

@@ -439,12 +439,13 @@
439 439
   /**
440 440
    * Set the height short (H-10) with M665 Hx.xx.
441 441
    * Set the delta_radius offset (R-5, R-10, R+5, R+10) with M665 Rx.xx.
442
-   * Run G33 Cx V3 with different values (C2, C-2).
442
+   * Run G33 Cx V3 (C2, C-2) with different values for C and R
443 443
    * Take the average for R_FACTOR and maximum for H_FACTOR.
444
-   * If R_FACTOR is too low accuracy is reduced. Too high reduces iteration speed.
445 444
    * Run the tests with default values!!!
446 445
    */
447 446
   //#define DELTA_CALIBRATE_EXPERT_MODE
447
+
448
+  // Remove the comments of the folling 2 lines to overide default values
448 449
   //#define H_FACTOR  1.02 //  1.0 < H_FACTOR <  1.11, default  1.00
449 450
   //#define R_FACTOR -3.95 // -6.7 < R_FACTOR < -2.25, default -2.25
450 451
 #endif

+ 12
- 2
Marlin/example_configurations/delta/kossel_pro/Configuration.h Bestand weergeven

@@ -1,4 +1,4 @@
1
-/**
1
+/**
2 2
  * Marlin 3D Printer Firmware
3 3
  * Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4 4
  *
@@ -440,6 +440,9 @@
440 440
   // Horizontal distance bridged by diagonal push rods when effector is centered.
441 441
   #define DELTA_RADIUS (DELTA_SMOOTH_ROD_OFFSET-(DELTA_EFFECTOR_OFFSET)-(DELTA_CARRIAGE_OFFSET))
442 442
 
443
+  // height from z=0.00 to home position
444
+  #define DELTA_HEIGHT 277 // get this value from auto calibrate
445
+
443 446
   // Print surface diameter/2 minus unreachable space (avoid collisions with vertical towers).
444 447
   #define DELTA_PRINTABLE_RADIUS 127.0
445 448
 
@@ -447,6 +450,13 @@
447 450
   // See http://minow.blogspot.com/index.html#4918805519571907051
448 451
   //#define DELTA_CALIBRATION_MENU
449 452
 
453
+  // G33 Delta Auto-Calibration (Enable EEPROM_SETTINGS to store results)
454
+  //#define DELTA_AUTO_CALIBRATION
455
+  #if ENABLED(DELTA_AUTO_CALIBRATION)
456
+    #define DELTA_CALIBRATION_DEFAULT_POINTS 3 // set the default number of probe points : n*n (1-4)
457
+    #define DELTA_CALIBRATION_RADIUS (DELTA_PRINTABLE_RADIUS - 15) // set the radius for the calibration probe points
458
+  #endif
459
+
450 460
   // After homing move down to a height where XY movement is unconstrained
451 461
   #define DELTA_HOME_TO_SAFE_ZONE
452 462
 
@@ -1071,7 +1081,7 @@
1071 1081
 // For DELTA this is the top-center of the Cartesian print volume.
1072 1082
 //#define MANUAL_X_HOME_POS 0
1073 1083
 //#define MANUAL_Y_HOME_POS 0
1074
-#define MANUAL_Z_HOME_POS 277 // Distance between the nozzle to printbed after homing
1084
+#define MANUAL_Z_HOME_POS DELTA_HEIGHT // Distance between the nozzle to printbed after homing
1075 1085
 
1076 1086
 // Use "Z Safe Homing" to avoid homing with a Z probe outside the bed area.
1077 1087
 //

+ 20
- 0
Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h Bestand weergeven

@@ -437,6 +437,26 @@
437 437
 #define DIGIPOT_I2C_MOTOR_CURRENTS {1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0}  //  AZTEEG_X3_PRO
438 438
 
439 439
 //===========================================================================
440
+//============================== Delta Settings =============================
441
+//===========================================================================
442
+
443
+#if ENABLED(DELTA_AUTO_CALIBRATION)
444
+  /**
445
+   * Set the height short (H-10) with M665 Hx.xx.
446
+   * Set the delta_radius offset (R-5, R-10, R+5, R+10) with M665 Rx.xx.
447
+   * Run G33 Cx V3 (C2, C-2) with different values for C and R
448
+   * Take the average for R_FACTOR and maximum for H_FACTOR.
449
+   * Run the tests with default values!!!
450
+   */
451
+  //#define DELTA_CALIBRATE_EXPERT_MODE
452
+
453
+  // Remove the comments of the folling 2 lines to overide default values
454
+  //#define H_FACTOR  1.02 //  1.0 < H_FACTOR <  1.11, default  1.00
455
+  //#define R_FACTOR -3.95 // -6.7 < R_FACTOR < -2.25, default -2.25
456
+#endif
457
+
458
+
459
+//===========================================================================
440 460
 //=============================Additional Features===========================
441 461
 //===========================================================================
442 462
 

+ 12
- 2
Marlin/example_configurations/delta/kossel_xl/Configuration.h Bestand weergeven

@@ -1,4 +1,4 @@
1
-/**
1
+/**
2 2
  * Marlin 3D Printer Firmware
3 3
  * Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4 4
  *
@@ -458,6 +458,9 @@
458 458
   // Horizontal distance bridged by diagonal push rods when effector is centered.
459 459
   #define DELTA_RADIUS (DELTA_SMOOTH_ROD_OFFSET-(DELTA_EFFECTOR_OFFSET)-(DELTA_CARRIAGE_OFFSET) + 1)
460 460
 
461
+  // height from z=0.00 to home position
462
+  #define DELTA_HEIGHT 380 // get this value from auto calibrate
463
+
461 464
   // Print surface diameter/2 minus unreachable space (avoid collisions with vertical towers).
462 465
   #define DELTA_PRINTABLE_RADIUS 140.0
463 466
 
@@ -465,6 +468,13 @@
465 468
   // See http://minow.blogspot.com/index.html#4918805519571907051
466 469
   //#define DELTA_CALIBRATION_MENU
467 470
 
471
+  // G33 Delta Auto-Calibration (Enable EEPROM_SETTINGS to store results)
472
+  //#define DELTA_AUTO_CALIBRATION
473
+  #if ENABLED(DELTA_AUTO_CALIBRATION)
474
+    #define DELTA_CALIBRATION_DEFAULT_POINTS 3 // set the default number of probe points : n*n (1-4)
475
+    #define DELTA_CALIBRATION_RADIUS (DELTA_PRINTABLE_RADIUS - 15) // set the radius for the calibration probe points
476
+  #endif
477
+
468 478
   // After homing move down to a height where XY movement is unconstrained
469 479
   #define DELTA_HOME_TO_SAFE_ZONE
470 480
 
@@ -1078,7 +1088,7 @@
1078 1088
 // For DELTA this is the top-center of the Cartesian print volume.
1079 1089
 //#define MANUAL_X_HOME_POS 0
1080 1090
 //#define MANUAL_Y_HOME_POS 0
1081
-#define MANUAL_Z_HOME_POS 381.4 // Distance between the nozzle to printbed after homing
1091
+#define MANUAL_Z_HOME_POS DELTA_HEIGHT // Distance between the nozzle to printbed after homing
1082 1092
 
1083 1093
 // Use "Z Safe Homing" to avoid homing with a Z probe outside the bed area.
1084 1094
 //

+ 20
- 1
Marlin/example_configurations/delta/kossel_xl/Configuration_adv.h Bestand weergeven

@@ -1,4 +1,4 @@
1
-/**
1
+/**
2 2
  * Marlin 3D Printer Firmware
3 3
  * Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4 4
  *
@@ -432,6 +432,25 @@
432 432
 #define DIGIPOT_I2C_MOTOR_CURRENTS {1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0}  //  AZTEEG_X3_PRO
433 433
 
434 434
 //===========================================================================
435
+//============================== Delta Settings =============================
436
+//===========================================================================
437
+
438
+#if ENABLED(DELTA_AUTO_CALIBRATION)
439
+  /**
440
+   * Set the height short (H-10) with M665 Hx.xx.
441
+   * Set the delta_radius offset (R-5, R-10, R+5, R+10) with M665 Rx.xx.
442
+   * Run G33 Cx V3 (C2, C-2) with different values for C and R
443
+   * Take the average for R_FACTOR and maximum for H_FACTOR.
444
+   * Run the tests with default values!!!
445
+   */
446
+  //#define DELTA_CALIBRATE_EXPERT_MODE
447
+
448
+  // Remove the comments of the folling 2 lines to overide default values
449
+  //#define H_FACTOR  1.02 //  1.0 < H_FACTOR <  1.11, default  1.00
450
+  //#define R_FACTOR -3.95 // -6.7 < R_FACTOR < -2.25, default -2.25
451
+#endif
452
+
453
+//===========================================================================
435 454
 //=============================Additional Features===========================
436 455
 //===========================================================================
437 456
 

Laden…
Annuleren
Opslaan