Skip to content

Commit

Permalink
etc
Browse files Browse the repository at this point in the history
  • Loading branch information
thinkyhead committed Sep 12, 2024
1 parent c1c6169 commit e7f6ca5
Show file tree
Hide file tree
Showing 2 changed files with 39 additions and 40 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -658,7 +658,7 @@
#define HEATER_5_MAXTEMP 275
#define HEATER_6_MAXTEMP 275
#define HEATER_7_MAXTEMP 275
#define BED_MAXTEMP 125
#define BED_MAXTEMP 150
#define CHAMBER_MAXTEMP 60

/**
Expand All @@ -684,7 +684,7 @@
* PIDTEMP : PID temperature control (~4.1K)
* MPCTEMP : Predictive Model temperature control. (~1.8K without auto-tune)
*/
// #define PIDTEMP // See the PID Tuning Guide at https://reprap.org/wiki/PID_Tuning
//#define PIDTEMP // See the PID Tuning Guide at https://reprap.org/wiki/PID_Tuning
//#define MPCTEMP // See https://marlinfw.org/docs/features/model_predictive_control.html

#define PID_MAX 255 // Limit hotend current while PID is active (see PID_FUNCTIONAL_RANGE below); 255=full current
Expand All @@ -695,17 +695,16 @@
//#define PID_PARAMS_PER_HOTEND // Use separate PID parameters for each extruder (useful for mismatched extruders)
// Set/get with G-code: M301 E[extruder number, 0-2]

// Creality Ender-3 Pro
#if ENABLED(PID_PARAMS_PER_HOTEND)
// 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 { 21.73, 21.73 }
#define DEFAULT_Ki_LIST { 1.54, 1.54 }
#define DEFAULT_Kd_LIST { 76.55, 76.55 }
#define DEFAULT_Kp_LIST { 22.20, 22.20 }
#define DEFAULT_Ki_LIST { 1.08, 1.08 }
#define DEFAULT_Kd_LIST { 114.00, 114.00 }
#else
#define DEFAULT_Kp 21.73
#define DEFAULT_Ki 1.54
#define DEFAULT_Kd 76.55
#define DEFAULT_Kp 22.20
#define DEFAULT_Ki 1.08
#define DEFAULT_Kd 114.00
#endif
#else
#define BANG_MAX 255 // Limit hotend current while in bang-bang mode; 255=full current
Expand Down Expand Up @@ -788,15 +787,17 @@
*
* With this option disabled, bang-bang will be used. BED_LIMIT_SWITCHING enables hysteresis.
*/
#define PIDTEMPBED
//#define PIDTEMPBED

#if ENABLED(PIDTEMPBED)
//#define MIN_BED_POWER 0
//#define PID_BED_DEBUG // Print Bed PID debug data to the serial port.

#define DEFAULT_bedKp 50.71
#define DEFAULT_bedKi 9.88
#define DEFAULT_bedKd 173.43
// 120V 250W silicone heater into 4mm borosilicate (MendelMax 1.5+)
// from FOPDT model - kp=.39 Tp=405 Tdead=66, Tc set to 79.2, aggressive factor of .15 (vs .1, 1, 10)
#define DEFAULT_bedKp 10.00
#define DEFAULT_bedKi .023
#define DEFAULT_bedKd 305.4

// FIND YOUR OWN: "M303 E-1 C8 S90" to run autotune on the bed at 90 degreesC for 8 cycles.
#else
Expand Down Expand Up @@ -872,15 +873,15 @@
*
* *** IT IS HIGHLY RECOMMENDED TO LEAVE THIS OPTION ENABLED! ***
*/
// #define PREVENT_COLD_EXTRUSION
// #define EXTRUDE_MINTEMP 170
//#define PREVENT_COLD_EXTRUSION
//#define EXTRUDE_MINTEMP 170

/**
* Prevent a single extrusion longer than EXTRUDE_MAXLENGTH.
* Note: For Bowden Extruders make this large enough to allow load/unload.
*/
// #define PREVENT_LENGTHY_EXTRUDE
// #define EXTRUDE_MAXLENGTH 600
//#define PREVENT_LENGTHY_EXTRUDE
//#define EXTRUDE_MAXLENGTH 200

//===========================================================================
//======================== Thermal Runaway Protection =======================
Expand Down Expand Up @@ -1295,9 +1296,9 @@
* M204 I Angular Acceleration
* M204 J Angular Travel Acceleration
*/
#define DEFAULT_ACCELERATION 50 // X, Y, Z ... and E acceleration for printing moves
#define DEFAULT_RETRACT_ACCELERATION 50 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 50 // X, Y, Z ... acceleration for travel (non printing) moves
#define DEFAULT_ACCELERATION 50 // X, Y, Z ... and E acceleration for printing moves
#define DEFAULT_RETRACT_ACCELERATION 50 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 50 // X, Y, Z ... acceleration for travel (non printing) moves
#if ENABLED(AXIS4_ROTATES)
#define DEFAULT_ANGULAR_ACCELERATION 3000 // I, J, K acceleration for rotational-only printing moves
#define DEFAULT_ANGULAR_TRAVEL_ACCELERATION 3000 // I, J, K acceleration for rotational-only travel (non printing) moves
Expand Down Expand Up @@ -1810,7 +1811,7 @@
*/
//#define Z_IDLE_HEIGHT Z_HOME_POS

#define Z_CLEARANCE_FOR_HOMING 0 // (mm) Minimal Z height before homing (G28) for Z clearance above the bed, clamps, ...
#define Z_CLEARANCE_FOR_HOMING 0 // (mm) Minimal Z height before homing (G28) for Z clearance above the bed, clamps, ...
// You'll need this much clearance above Z_MAX_POS to avoid grinding.

#define Z_AFTER_HOMING 0 // (mm) Height to move to after homing (if Z was homed)
Expand Down Expand Up @@ -2431,19 +2432,17 @@
//
// Preheat Constants - Up to 10 are supported without changes
//
// #define PREHEAT_1_LABEL "PLA"
// #define PREHEAT_1_TEMP_HOTEND 185
// #define PREHEAT_1_TEMP_BED 45
// #define PREHEAT_1_TEMP_CHAMBER 35
// #define PREHEAT_1_FAN_SPEED 255 // Value from 0 to 255

// #define PREHEAT_2_LABEL "ABS"
// #define PREHEAT_2_TEMP_HOTEND 240
// #define PREHEAT_2_TEMP_BED 110
// #define PREHEAT_2_TEMP_CHAMBER 35
// #define PREHEAT_2_FAN_SPEED 255 // Value from 0 to 255

// @section motion
//#define PREHEAT_1_LABEL "PLA"
//#define PREHEAT_1_TEMP_HOTEND 180
//#define PREHEAT_1_TEMP_BED 70
//#define PREHEAT_1_TEMP_CHAMBER 35
//#define PREHEAT_1_FAN_SPEED 0 // Value from 0 to 255

//#define PREHEAT_2_LABEL "ABS"
//#define PREHEAT_2_TEMP_HOTEND 240
//#define PREHEAT_2_TEMP_BED 110
//#define PREHEAT_2_TEMP_CHAMBER 35
//#define PREHEAT_2_FAN_SPEED 0 // Value from 0 to 255

/**
* @section nozzle park
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -871,7 +871,7 @@
#endif

#if HAS_Y2_STEPPER
#define INVERT_Y2_VS_Y_DIR // Y2 direction signal is the opposite of Y
#define INVERT_Y2_VS_Y_DIR // Y2 direction signal is the opposite of Y
//#define Y_DUAL_ENDSTOPS // Y2 has its own endstop
#if ENABLED(Y_DUAL_ENDSTOPS)
//#define Y2_STOP_PIN Y_MAX_PIN // Y2 endstop pin override
Expand Down Expand Up @@ -3443,10 +3443,10 @@

#if ANY(SENSORLESS_HOMING, SENSORLESS_PROBING)
// TMC2209: 0...255. TMC2130: -64...63
// #define X_STALL_SENSITIVITY 75
// #define X2_STALL_SENSITIVITY X_STALL_SENSITIVITY
// #define Y_STALL_SENSITIVITY 75
// #define Y2_STALL_SENSITIVITY Y_STALL_SENSITIVITY
//#define X_STALL_SENSITIVITY 75
//#define X2_STALL_SENSITIVITY X_STALL_SENSITIVITY
//#define Y_STALL_SENSITIVITY 75
//#define Y2_STALL_SENSITIVITY Y_STALL_SENSITIVITY
//#define Z_STALL_SENSITIVITY 8
//#define Z2_STALL_SENSITIVITY Z_STALL_SENSITIVITY
//#define Z3_STALL_SENSITIVITY Z_STALL_SENSITIVITY
Expand Down Expand Up @@ -4060,7 +4060,7 @@
#define CUSTOM_MENU_MAIN_TITLE "Postion Options"
#define CUSTOM_MENU_MAIN_SCRIPT_DONE "User Script Done"
//#define CUSTOM_MENU_MAIN_SCRIPT_AUDIBLE_FEEDBACK
#define CUSTOM_MENU_MAIN_SCRIPT_RETURN // Return to status screen after a script
#define CUSTOM_MENU_MAIN_SCRIPT_RETURN // Return to status screen after a script
#define CUSTOM_MENU_MAIN_ONLY_IDLE // Only show custom menu when the machine is idle

#define MAIN_MENU_ITEM_1_DESC "Define Origin"
Expand Down

0 comments on commit e7f6ca5

Please sign in to comment.