Browse Source

Demo and test multiple PID defaults (#19413)

Jason Smith 4 years ago
parent
commit
9d5a9621de
No account linked to committer's email address
2 changed files with 15 additions and 19 deletions
  1. 11
    18
      Marlin/Configuration.h
  2. 4
    1
      buildroot/tests/BIGTREE_GTR_V1_0-tests

+ 11
- 18
Marlin/Configuration.h View File

486
   //#define PID_AUTOTUNE_MENU     // Add PID auto-tuning to the "Advanced Settings" menu. (~250 bytes of PROGMEM)
486
   //#define PID_AUTOTUNE_MENU     // Add PID auto-tuning to the "Advanced Settings" menu. (~250 bytes of PROGMEM)
487
   //#define PID_PARAMS_PER_HOTEND // Uses separate PID parameters for each extruder (useful for mismatched extruders)
487
   //#define PID_PARAMS_PER_HOTEND // Uses separate PID parameters for each extruder (useful for mismatched extruders)
488
                                   // Set/get with gcode: M301 E[extruder number, 0-2]
488
                                   // Set/get with gcode: M301 E[extruder number, 0-2]
489
-
490
-  // If you are using a pre-configured hotend then you can use one of the value sets by uncommenting it
491
-
492
-  // Ultimaker
493
-  #define DEFAULT_Kp 22.2
494
-  #define DEFAULT_Ki 1.08
495
-  #define DEFAULT_Kd 114
496
-
497
-  // MakerGear
498
-  //#define DEFAULT_Kp 7.0
499
-  //#define DEFAULT_Ki 0.1
500
-  //#define DEFAULT_Kd 12
501
-
502
-  // Mendel Parts V9 on 12V
503
-  //#define DEFAULT_Kp 63.0
504
-  //#define DEFAULT_Ki 2.25
505
-  //#define DEFAULT_Kd 440
506
-
489
+  #if ENABLED(PID_PARAMS_PER_HOTEND)
490
+    // Specify between 1 and HOTENDS values per array.
491
+    // If fewer than EXTRUDER values are provided, the last element will be repeated.
492
+    #define DEFAULT_Kp_LIST {  22.20,  20.0 }
493
+    #define DEFAULT_Ki_LIST {   1.08,   1.0 }
494
+    #define DEFAULT_Kd_LIST { 114.00, 112.0 }
495
+  #else
496
+    #define DEFAULT_Kp  22.20
497
+    #define DEFAULT_Ki   1.08
498
+    #define DEFAULT_Kd 114.00
499
+  #endif
507
 #endif // PIDTEMP
500
 #endif // PIDTEMP
508
 
501
 
509
 //===========================================================================
502
 //===========================================================================

+ 4
- 1
buildroot/tests/BIGTREE_GTR_V1_0-tests View File

36
 opt_set TEMP_SENSOR_4 1
36
 opt_set TEMP_SENSOR_4 1
37
 opt_set TEMP_SENSOR_5 1
37
 opt_set TEMP_SENSOR_5 1
38
 opt_set NUM_Z_STEPPER_DRIVERS 3
38
 opt_set NUM_Z_STEPPER_DRIVERS 3
39
-opt_enable TOOLCHANGE_FILAMENT_SWAP TOOLCHANGE_MIGRATION_FEATURE TOOLCHANGE_FS_INIT_BEFORE_SWAP TOOLCHANGE_FS_PRIME_FIRST_USED
39
+opt_set DEFAULT_Kp_LIST "{ 22.2, 20.0, 21.0, 19.0, 18.0, 17.0 }"
40
+opt_set DEFAULT_Ki_LIST "{ 1.08 }"
41
+opt_set DEFAULT_Kd_LIST "{ 114.0, 112.0, 110.0, 108.0 }"
42
+opt_enable TOOLCHANGE_FILAMENT_SWAP TOOLCHANGE_MIGRATION_FEATURE TOOLCHANGE_FS_INIT_BEFORE_SWAP TOOLCHANGE_FS_PRIME_FIRST_USED PID_PARAMS_PER_HOTEND
40
 exec_test $1 $2 "BigTreeTech GTR 6 Extruders Triple Z"
43
 exec_test $1 $2 "BigTreeTech GTR 6 Extruders Triple Z"
41
 
44
 
42
 # clean up
45
 # clean up

Loading…
Cancel
Save