Skip to content

Commit

Permalink
📝 Update PID_PARAMS_PER_HOTEND comment (MarlinFirmware#22694)
Browse files Browse the repository at this point in the history
Co-authored-by: Scott Lahteine <[email protected]>
  • Loading branch information
2 people authored and ptoal committed Jan 12, 2022
1 parent 86a7852 commit e02e358
Showing 1 changed file with 16 additions and 8 deletions.
24 changes: 16 additions & 8 deletions Marlin/Configuration.h
Original file line number Diff line number Diff line change
Expand Up @@ -597,11 +597,19 @@
// Set/get with gcode: M301 E[extruder number, 0-2]

#if ENABLED(PID_PARAMS_PER_HOTEND)
<<<<<<< HEAD
// Specify between 1 and HOTENDS values per array.
// If fewer than EXTRUDER values are provided, the last element will be repeated.
#define DEFAULT_Kp_LIST { 24.87, 24.87 }
#define DEFAULT_Ki_LIST { 1.50, 1.50 }
#define DEFAULT_Kd_LIST { 102.90, 102.90 }
=======
// Specify up to one value per hotend here, according to your setup.
// If there are fewer values, the last one applies to the remaining hotends.
#define DEFAULT_Kp_LIST { 22.20, 22.20 }
#define DEFAULT_Ki_LIST { 1.08, 1.08 }
#define DEFAULT_Kd_LIST { 114.00, 114.00 }
>>>>>>> e1056378f1 (📝 Update PID_PARAMS_PER_HOTEND comment (#22694))
#else
#define DEFAULT_Kp 35.17
#define DEFAULT_Ki 2.66
Expand Down Expand Up @@ -1076,13 +1084,13 @@
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.
*/
//#define Z_PROBE_SERVO_NR 0 // Defaults to SERVO 0 connector.
//#define Z_SERVO_ANGLES { 70, 0 } // Z Servo Deploy and Stow angles
#define Z_PROBE_SERVO_NR 0 // Defaults to SERVO 0 connector.
#define Z_SERVO_ANGLES { 10, 90 } // Z Servo Deploy and Stow angles

/**
* The BLTouch probe uses a Hall effect sensor and emulates a servo.
*/
//#define BLTOUCH
#define BLTOUCH

/**
* Touch-MI Probe by hotends.fr
Expand Down Expand Up @@ -1174,7 +1182,7 @@
* | [-] |
* O-- FRONT --+
*/
#define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
#define NOZZLE_TO_PROBE_OFFSET { -31, -47, -1.6 }

// Most probes should stay away from the edges of the bed, but
// with NOZZLE_AS_PROBE this can be negative for a wider probing area.
Expand Down Expand Up @@ -1530,7 +1538,7 @@
* With an LCD controller the process is guided step-by-step.
*/
//#define AUTO_BED_LEVELING_3POINT
//#define AUTO_BED_LEVELING_LINEAR
#define AUTO_BED_LEVELING_LINEAR
//#define AUTO_BED_LEVELING_BILINEAR
//#define AUTO_BED_LEVELING_UBL
//#define MESH_BED_LEVELING
Expand Down Expand Up @@ -1570,7 +1578,7 @@
// The height can be set with M420 Z<height>
#define ENABLE_LEVELING_FADE_HEIGHT
#if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
#define DEFAULT_LEVELING_FADE_HEIGHT 10.0 // (mm) Default fade height.
#define DEFAULT_LEVELING_FADE_HEIGHT 5.0 // (mm) Default fade height.
#endif

// For Cartesian machines, instead of dividing moves on mesh boundaries,
Expand Down Expand Up @@ -1729,7 +1737,7 @@
* - Allows Z homing only when XY positions are known and trusted.
* - If stepper drivers sleep, XY homing may be required again before Z homing.
*/
//#define Z_SAFE_HOMING
#define Z_SAFE_HOMING

#if ENABLED(Z_SAFE_HOMING)
#define Z_SAFE_HOMING_X_POINT X_CENTER // X point for Z homing
Expand Down Expand Up @@ -2928,7 +2936,7 @@
* Set this manually if there are extra servos needing manual control.
* Set to 0 to turn off servo support.
*/
//#define NUM_SERVOS 3 // Servo index starts with 0 for M280 command
#define NUM_SERVOS 1 // Servo index starts with 0 for M280 command

// (ms) Delay before the next move will start, to give the servo time to reach its target angle.
// 300ms is a good value but you can try less delay.
Expand Down

0 comments on commit e02e358

Please sign in to comment.