Skip to content

Commit cbaff4b

Browse files
committed
🔧 Config updates
1 parent a18045a commit cbaff4b

13 files changed

+2980
-2801
lines changed

Marlin/Configuration.h

+141-110
Large diffs are not rendered by default.

Marlin/Configuration_adv.h

+179-164
Large diffs are not rendered by default.

Marlin/config.ini

+5-5
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ preheat_1_temp_hotend = 180
8282
bang_max = 255
8383
pidtemp = on
8484
pid_k1 = 0.95
85-
pid_max = BANG_MAX
85+
pid_max = 255
8686
pid_functional_range = 10
8787

8888
default_kp = 22.20
@@ -140,10 +140,10 @@ invert_x_step_pin = false
140140
invert_y_step_pin = false
141141
invert_z_step_pin = false
142142

143-
disable_x = false
144-
disable_y = false
145-
disable_z = false
146-
disable_e = false
143+
disable_x = off
144+
disable_y = off
145+
disable_z = off
146+
disable_e = off
147147

148148
proportional_font_ratio = 1.0
149149
default_nominal_filament_dia = 1.75

Marlin/src/HAL/AVR/inc/SanityCheck.h

+7-7
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,13 @@
3333
* Check for common serial pin conflicts
3434
*/
3535
#define CHECK_SERIAL_PIN(N) ( \
36-
X_STOP_PIN == N || Y_STOP_PIN == N || Z_STOP_PIN == N \
37-
|| X_MIN_PIN == N || Y_MIN_PIN == N || Z_MIN_PIN == N \
38-
|| X_MAX_PIN == N || Y_MAX_PIN == N || Z_MAX_PIN == N \
39-
|| X_STEP_PIN == N || Y_STEP_PIN == N || Z_STEP_PIN == N \
40-
|| X_DIR_PIN == N || Y_DIR_PIN == N || Z_DIR_PIN == N \
41-
|| X_ENA_PIN == N || Y_ENA_PIN == N || Z_ENA_PIN == N \
42-
|| BTN_EN1 == N || BTN_EN2 == N \
36+
X_STOP_PIN == N || Y_STOP_PIN == N || Z_STOP_PIN == N \
37+
|| X_MIN_PIN == N || Y_MIN_PIN == N || Z_MIN_PIN == N \
38+
|| X_MAX_PIN == N || Y_MAX_PIN == N || Z_MAX_PIN == N \
39+
|| X_STEP_PIN == N || Y_STEP_PIN == N || Z_STEP_PIN == N \
40+
|| X_DIR_PIN == N || Y_DIR_PIN == N || Z_DIR_PIN == N \
41+
|| X_ENA_PIN == N || Y_ENA_PIN == N || Z_ENA_PIN == N \
42+
|| BTN_EN1 == N || BTN_EN2 == N || LCD_PINS_EN == N \
4343
)
4444
#if SERIAL_IN_USE(0)
4545
// D0-D1. No known conflicts.

Marlin/src/inc/Changes.h

+643
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)