Skip to content

Commit 5037f37

Browse files
committed
✨ Config updates
1 parent 5407a3f commit 5037f37

File tree

2 files changed

+53
-43
lines changed

2 files changed

+53
-43
lines changed

Marlin/Configuration.h

Lines changed: 30 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
*
5151
* Calibration Guides: https://reprap.org/wiki/Calibration
5252
* https://reprap.org/wiki/Triffid_Hunter%27s_Calibration_Guide
53-
* https://web.archive.org/web/20220907014303/https://sites.google.com/site/repraplogphase/calibration-of-your-reprap
53+
* https://web.archive.org/web/20220907014303/sites.google.com/site/repraplogphase/calibration-of-your-reprap
5454
* https://youtu.be/wAL9d7FgInk
5555
* https://teachingtechyt.github.io/calibration.html
5656
*
@@ -91,6 +91,8 @@
9191
#define MOTHERBOARD BOARD_RAMPS_14_EFB
9292
#endif
9393

94+
// @section serial
95+
9496
/**
9597
* Select the serial port on the board to use for communication with the host.
9698
* This allows the connection of wireless adapters (for instance) to non-default port pins.
@@ -667,7 +669,7 @@
667669
* MPCTEMP : Predictive Model temperature control. (~1.8K without auto-tune)
668670
*/
669671
#define PIDTEMP // See the PID Tuning Guide at https://reprap.org/wiki/PID_Tuning
670-
//#define MPCTEMP // ** EXPERIMENTAL ** See https://marlinfw.org/docs/features/model_predictive_control.html
672+
//#define MPCTEMP // See https://marlinfw.org/docs/features/model_predictive_control.html
671673

672674
#define PID_MAX 255 // Limit hotend current while PID is active (see PID_FUNCTIONAL_RANGE below); 255=full current
673675
#define PID_K1 0.95 // Smoothing factor within any PID loop
@@ -819,14 +821,16 @@
819821
// Lasko "MyHeat Personal Heater" (200w) modified with a Fotek SSR-10DA to control only the heating element
820822
// and placed inside the small Creality printer enclosure tent.
821823
//
822-
#define DEFAULT_chamberKp 37.04
823-
#define DEFAULT_chamberKi 1.40
824+
#define DEFAULT_chamberKp 37.04
825+
#define DEFAULT_chamberKi 1.40
824826
#define DEFAULT_chamberKd 655.17
825827
// M309 P37.04 I1.04 D655.17
826828

827829
// FIND YOUR OWN: "M303 E-2 C8 S50" to run autotune on the chamber at 50 degreesC for 8 cycles.
828830
#endif // PIDTEMPCHAMBER
829831

832+
// @section pid temp
833+
830834
#if ANY(PIDTEMP, PIDTEMPBED, PIDTEMPCHAMBER)
831835
//#define PID_OPENLOOP // Puts PID in open loop. M104/M140 sets the output power from 0 to PID_MAX
832836
//#define SLOW_PWM_HEATERS // PWM with very low frequency (roughly 0.125Hz=8s) and minimum state time of approximately 1s useful for heaters driven by a relay
@@ -882,7 +886,7 @@
882886
//============================= Mechanical Settings =========================
883887
//===========================================================================
884888

885-
// @section machine
889+
// @section kinematics
886890

887891
// Enable one of the options below for CoreXY, CoreXZ, or CoreYZ kinematics,
888892
// either in the usual order or reversed
@@ -1023,23 +1027,19 @@
10231027
#define DEFAULT_SEGMENTS_PER_SECOND 200
10241028

10251029
// Length of inner and outer support arms. Measure arm lengths precisely.
1026-
#define TPARA_LINKAGE_1 120 // (mm)
1027-
#define TPARA_LINKAGE_2 120 // (mm)
1030+
#define TPARA_LINKAGE_1 120 // (mm)
1031+
#define TPARA_LINKAGE_2 120 // (mm)
10281032

1029-
// SCARA tower offset (position of Tower relative to bed zero position)
1030-
// This needs to be reasonably accurate as it defines the printbed position in the SCARA space.
1031-
#define TPARA_OFFSET_X 0 // (mm)
1032-
#define TPARA_OFFSET_Y 0 // (mm)
1033-
#define TPARA_OFFSET_Z 0 // (mm)
1033+
// TPARA tower offset (position of Tower relative to bed zero position)
1034+
// This needs to be reasonably accurate as it defines the printbed position in the TPARA space.
1035+
#define TPARA_OFFSET_X 0 // (mm)
1036+
#define TPARA_OFFSET_Y 0 // (mm)
1037+
#define TPARA_OFFSET_Z 0 // (mm)
10341038

10351039
#define SCARA_FEEDRATE_SCALING // Convert XY feedrate from mm/s to degrees/s on the fly
10361040

10371041
// Radius around the center where the arm cannot reach
10381042
#define MIDDLE_DEAD_ZONE_R 0 // (mm)
1039-
1040-
// Calculated from Calibration Guide and M360 / M114. See https://www.morgan3dp.com/morgan-calibration-guide/
1041-
#define THETA_HOMING_OFFSET 0
1042-
#define PSI_HOMING_OFFSET 0
10431043
#endif
10441044

10451045
// @section machine
@@ -1585,8 +1585,8 @@
15851585
* probe Z Offset set with NOZZLE_TO_PROBE_OFFSET, M851, or the LCD.
15861586
* Only integer values >= 1 are valid here.
15871587
*
1588-
* Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle.
1589-
* But: `M851 Z+1` with a CLEARANCE of 2 => 2mm from bed to nozzle.
1588+
* Example: 'M851 Z-5' with a CLEARANCE of 4 => 9mm from bed to nozzle.
1589+
* But: 'M851 Z+1' with a CLEARANCE of 2 => 2mm from bed to nozzle.
15901590
*/
15911591
#define Z_CLEARANCE_DEPLOY_PROBE 10 // (mm) Z Clearance for Deploy/Stow
15921592
#define Z_CLEARANCE_BETWEEN_PROBES 5 // (mm) Z Clearance between probe points
@@ -1632,6 +1632,8 @@
16321632
#define PROBING_BED_TEMP 50
16331633
#endif
16341634

1635+
// @section stepper drivers
1636+
16351637
// For Inverting Stepper Enable Pins (Active Low) use 0, Non Inverting (Active High) use 1
16361638
// :{ 0:'Low', 1:'High' }
16371639
#define X_ENABLE_ON 0
@@ -1787,6 +1789,8 @@
17871789
#endif
17881790

17891791
/**
1792+
* @section filament runout sensors
1793+
*
17901794
* Filament Runout Sensors
17911795
* Mechanical or opto endstops are used to check for the presence of filament.
17921796
*
@@ -2065,7 +2069,7 @@
20652069
#if ENABLED(LCD_BED_TRAMMING)
20662070
#define BED_TRAMMING_INSET_LFRB { 30, 30, 30, 30 } // (mm) Left, Front, Right, Back insets
20672071
#define BED_TRAMMING_HEIGHT 0.0 // (mm) Z height of nozzle at tramming points
2068-
#define BED_TRAMMING_Z_HOP 4.0 // (mm) Z height of nozzle between tramming points
2072+
#define BED_TRAMMING_Z_HOP 4.0 // (mm) Z raise between tramming points
20692073
//#define BED_TRAMMING_INCLUDE_CENTER // Move to the center after the last corner
20702074
//#define BED_TRAMMING_USE_PROBE
20712075
#if ENABLED(BED_TRAMMING_USE_PROBE)
@@ -2254,9 +2258,9 @@
22542258
#define PREHEAT_2_TEMP_CHAMBER 35
22552259
#define PREHEAT_2_FAN_SPEED 0 // Value from 0 to 255
22562260

2257-
// @section motion
2258-
22592261
/**
2262+
* @section nozzle park
2263+
*
22602264
* Nozzle Park
22612265
*
22622266
* Park the nozzle at the given XYZ position on idle or G27.
@@ -2279,6 +2283,8 @@
22792283
#endif
22802284

22812285
/**
2286+
* @section nozzle clean
2287+
*
22822288
* Clean Nozzle Feature
22832289
*
22842290
* Adds the G12 command to perform a nozzle cleaning process.
@@ -2613,7 +2619,7 @@
26132619

26142620
//
26152621
// Original RADDS LCD Display+Encoder+SDCardReader
2616-
// https://web.archive.org/web/20200719145306/http://doku.radds.org/dokumentation/lcd-display/
2622+
// https://web.archive.org/web/20200719145306/doku.radds.org/dokumentation/lcd-display/
26172623
//
26182624
//#define RADDS_DISPLAY
26192625

@@ -2679,7 +2685,7 @@
26792685

26802686
//
26812687
// Elefu RA Board Control Panel
2682-
// https://web.archive.org/web/20140823033947/http://www.elefu.com/index.php?route=product/product&product_id=53
2688+
// https://web.archive.org/web/20140823033947/www.elefu.com/index.php?route=product/product&product_id=53
26832689
//
26842690
//#define RA_CONTROL_PANEL
26852691

@@ -2811,7 +2817,7 @@
28112817

28122818
//
28132819
// Cartesio UI
2814-
// https://web.archive.org/web/20180605050442/http://mauk.cc/webshop/cartesio-shop/electronics/user-interface
2820+
// https://web.archive.org/web/20180605050442/mauk.cc/webshop/cartesio-shop/electronics/user-interface
28152821
//
28162822
//#define CARTESIO_UI
28172823

Marlin/Configuration_adv.h

Lines changed: 23 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -423,7 +423,7 @@
423423
#define PID_FAN_SCALING_LIN_FACTOR (PID_FAN_SCALING_AT_FULL_SPEED-DEFAULT_Kf)/255.0
424424

425425
#else
426-
#define PID_FAN_SCALING_LIN_FACTOR (0) // Power loss due to cooling = Kf * (fan_speed)
426+
#define PID_FAN_SCALING_LIN_FACTOR (0) // Power-loss due to cooling = Kf * (fan_speed)
427427
#define DEFAULT_Kf 10 // A constant value added to the PID-tuner
428428
#define PID_FAN_SCALING_MIN_SPEED 10 // Minimum fan speed at which to enable PID_FAN_SCALING
429429
#endif
@@ -621,7 +621,7 @@
621621
/**
622622
* Use one of the PWM fans as a redundant part-cooling fan
623623
*/
624-
//#define REDUNDANT_PART_COOLING_FAN 2 // Index of the fan to sync with FAN 0.
624+
//#define REDUNDANT_PART_COOLING_FAN 1 // Index of the fan to sync with FAN 0.
625625

626626
/**
627627
* Extruder cooling fans
@@ -959,7 +959,6 @@
959959
*/
960960
//#define BLTOUCH_HS_MODE true
961961

962-
963962
#endif // BLTOUCH
964963

965964
// @section calibration
@@ -1086,14 +1085,14 @@
10861085
//#define INPUT_SHAPING_Y
10871086
#if EITHER(INPUT_SHAPING_X, INPUT_SHAPING_Y)
10881087
#if ENABLED(INPUT_SHAPING_X)
1089-
#define SHAPING_FREQ_X 40 // (Hz) The default dominant resonant frequency on the X axis.
1090-
#define SHAPING_ZETA_X 0.15f // Damping ratio of the X axis (range: 0.0 = no damping to 1.0 = critical damping).
1088+
#define SHAPING_FREQ_X 40.0 // (Hz) The default dominant resonant frequency on the X axis.
1089+
#define SHAPING_ZETA_X 0.15 // Damping ratio of the X axis (range: 0.0 = no damping to 1.0 = critical damping).
10911090
#endif
10921091
#if ENABLED(INPUT_SHAPING_Y)
1093-
#define SHAPING_FREQ_Y 40 // (Hz) The default dominant resonant frequency on the Y axis.
1094-
#define SHAPING_ZETA_Y 0.15f // Damping ratio of the Y axis (range: 0.0 = no damping to 1.0 = critical damping).
1092+
#define SHAPING_FREQ_Y 40.0 // (Hz) The default dominant resonant frequency on the Y axis.
1093+
#define SHAPING_ZETA_Y 0.15 // Damping ratio of the Y axis (range: 0.0 = no damping to 1.0 = critical damping).
10951094
#endif
1096-
//#define SHAPING_MIN_FREQ 20 // By default the minimum of the shaping frequencies. Override to affect SRAM usage.
1095+
//#define SHAPING_MIN_FREQ 20.0 // (Hz) By default the minimum of the shaping frequencies. Override to affect SRAM usage.
10971096
//#define SHAPING_MAX_STEPRATE 10000 // By default the maximum total step rate of the shaped axes. Override to affect SRAM usage.
10981097
//#define SHAPING_MENU // Add a menu to the LCD to set shaping parameters.
10991098
#endif
@@ -1135,8 +1134,8 @@
11351134
#define DISABLE_IDLE_E // Shut down all idle extruders
11361135

11371136
// Default Minimum Feedrates for printing and travel moves
1138-
#define DEFAULT_MINIMUMFEEDRATE 0.0 // (mm/s. °/s for rotational-only moves) Minimum feedrate. Set with M205 S.
1139-
#define DEFAULT_MINTRAVELFEEDRATE 0.0 // (mm/s. °/s for rotational-only moves) Minimum travel feedrate. Set with M205 T.
1137+
#define DEFAULT_MINIMUMFEEDRATE 0.0 // (mm/s) Minimum feedrate. Set with M205 S.
1138+
#define DEFAULT_MINTRAVELFEEDRATE 0.0 // (mm/s) Minimum travel feedrate. Set with M205 T.
11401139

11411140
// Minimum time that a segment needs to take as the buffer gets emptied
11421141
#define DEFAULT_MINSEGMENTTIME 20000 // (µs) Set with M205 B.
@@ -1395,6 +1394,10 @@
13951394
#if HAS_MARLINUI_MENU
13961395

13971396
#if HAS_BED_PROBE
1397+
1398+
// Show Deploy / Stow Probe options in the Motion menu.
1399+
#define PROBE_DEPLOY_STOW_MENU
1400+
13981401
// Add calibration in the Probe Offsets menu to compensate for X-axis twist.
13991402
//#define X_AXIS_TWIST_COMPENSATION
14001403
#if ENABLED(X_AXIS_TWIST_COMPENSATION)
@@ -1409,8 +1412,6 @@
14091412
#define XATC_Z_OFFSETS { 0, 0, 0 } // Z offsets for X axis sample points
14101413
#endif
14111414

1412-
// Show Deploy / Stow Probe options in the Motion menu.
1413-
#define PROBE_DEPLOY_STOW_MENU
14141415
#endif
14151416

14161417
// Include a page of printer information in the LCD Main Menu
@@ -1434,7 +1435,7 @@
14341435

14351436
#if EITHER(HAS_DISPLAY, DWIN_LCD_PROUI)
14361437
// The timeout to return to the status screen from sub-menus
1437-
//#define LCD_TIMEOUT_TO_STATUS 15000 // (ms)
1438+
#define LCD_TIMEOUT_TO_STATUS 60000 // (ms)
14381439

14391440
#if ENABLED(SHOW_BOOTSCREEN)
14401441
#define BOOTSCREEN_TIMEOUT 3000 // (ms) Total Duration to display the boot screen(s)
@@ -2490,7 +2491,7 @@
24902491

24912492
/**
24922493
* Set the number of proportional font spaces required to fill up a typical character space.
2493-
* This can help to better align the output of commands like `G29 O` Mesh Output.
2494+
* This can help to better align the output of commands like 'G29 O' Mesh Output.
24942495
*
24952496
* For clients that use a fixed-width font (like OctoPrint), leave this set to 1.0.
24962497
* Otherwise, adjust according to your client and font.
@@ -2732,7 +2733,7 @@
27322733

27332734
#if AXIS_IS_TMC_CONFIG(X)
27342735
#define X_CURRENT 800 // (mA) RMS current. Multiply by 1.414 for peak current.
2735-
#define X_CURRENT_HOME X_CURRENT // (mA) RMS current for sensorless homing
2736+
#define X_CURRENT_HOME X_CURRENT // (mA) RMS current for homing. (Typically lower than *_CURRENT.)
27362737
#define X_MICROSTEPS 16 // 0..256
27372738
#define X_RSENSE 0.11 // Multiplied x1000 for TMC26X
27382739
#define X_CHAIN_POS -1 // -1..0: Not chained. 1: MCU MOSI connected. 2: Next in chain, ...
@@ -3288,7 +3289,7 @@
32883289
//#define PHOTOGRAPH_PIN 23
32893290

32903291
// Canon Hack Development Kit
3291-
// https://web.archive.org/web/20200920094805/https://captain-slow.dk/2014/03/09/3d-printing-timelapses/
3292+
// https://web.archive.org/web/20200920094805/captain-slow.dk/2014/03/09/3d-printing-timelapses/
32923293
//#define CHDK_PIN 4
32933294

32943295
// Optional second move with delay to trigger the camera shutter
@@ -3320,7 +3321,7 @@
33203321
* Add the M3, M4, and M5 commands to turn the spindle/laser on and off, and
33213322
* to set spindle speed, spindle direction, and laser power.
33223323
*
3323-
* SuperPid is a router/spindle speed controller used in the CNC milling community.
3324+
* SuperPID is a router/spindle speed controller used in the CNC milling community.
33243325
* Marlin can be used to turn the spindle on and off. It can also be used to set
33253326
* the spindle speed from 5,000 to 30,000 RPM.
33263327
*
@@ -3668,7 +3669,9 @@
36683669

36693670
// @section reporting
36703671

3671-
// Extra options for the M114 "Current Position" report
3672+
/**
3673+
* Extra options for the M114 "Current Position" report
3674+
*/
36723675
//#define M114_DETAIL // Use 'M114` for details to check planner calculations
36733676
//#define M114_REALTIME // Real current position based on forward kinematics
36743677
//#define M114_LEGACY // M114 used to synchronize on every call. Enable if needed.
@@ -4005,7 +4008,8 @@
40054008

40064009
/**
40074010
* Instant freeze / unfreeze functionality
4008-
* Potentially useful for emergency stop that allows being resumed.
4011+
* Potentially useful for rapid stop that allows being resumed. Halts stepper movement.
4012+
* Note this does NOT pause spindles, lasers, fans, heaters or any other auxiliary device.
40094013
* @section interface
40104014
*/
40114015
//#define FREEZE_FEATURE

0 commit comments

Comments
 (0)