Skip to content

Commit

Permalink
🔧 Config updates
Browse files Browse the repository at this point in the history
  • Loading branch information
thinkyhead committed Feb 8, 2024
1 parent a18045a commit cbaff4b
Show file tree
Hide file tree
Showing 13 changed files with 2,980 additions and 2,801 deletions.
251 changes: 141 additions & 110 deletions Marlin/Configuration.h

Large diffs are not rendered by default.

343 changes: 179 additions & 164 deletions Marlin/Configuration_adv.h

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions Marlin/config.ini
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ preheat_1_temp_hotend = 180
bang_max = 255
pidtemp = on
pid_k1 = 0.95
pid_max = BANG_MAX
pid_max = 255
pid_functional_range = 10

default_kp = 22.20
Expand Down Expand Up @@ -140,10 +140,10 @@ invert_x_step_pin = false
invert_y_step_pin = false
invert_z_step_pin = false

disable_x = false
disable_y = false
disable_z = false
disable_e = false
disable_x = off
disable_y = off
disable_z = off
disable_e = off

proportional_font_ratio = 1.0
default_nominal_filament_dia = 1.75
Expand Down
14 changes: 7 additions & 7 deletions Marlin/src/HAL/AVR/inc/SanityCheck.h
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,13 @@
* Check for common serial pin conflicts
*/
#define CHECK_SERIAL_PIN(N) ( \
X_STOP_PIN == N || Y_STOP_PIN == N || Z_STOP_PIN == N \
|| X_MIN_PIN == N || Y_MIN_PIN == N || Z_MIN_PIN == N \
|| X_MAX_PIN == N || Y_MAX_PIN == N || Z_MAX_PIN == N \
|| X_STEP_PIN == N || Y_STEP_PIN == N || Z_STEP_PIN == N \
|| X_DIR_PIN == N || Y_DIR_PIN == N || Z_DIR_PIN == N \
|| X_ENA_PIN == N || Y_ENA_PIN == N || Z_ENA_PIN == N \
|| BTN_EN1 == N || BTN_EN2 == N \
X_STOP_PIN == N || Y_STOP_PIN == N || Z_STOP_PIN == N \
|| X_MIN_PIN == N || Y_MIN_PIN == N || Z_MIN_PIN == N \
|| X_MAX_PIN == N || Y_MAX_PIN == N || Z_MAX_PIN == N \
|| X_STEP_PIN == N || Y_STEP_PIN == N || Z_STEP_PIN == N \
|| X_DIR_PIN == N || Y_DIR_PIN == N || Z_DIR_PIN == N \
|| X_ENA_PIN == N || Y_ENA_PIN == N || Z_ENA_PIN == N \
|| BTN_EN1 == N || BTN_EN2 == N || LCD_PINS_EN == N \
)
#if SERIAL_IN_USE(0)
// D0-D1. No known conflicts.
Expand Down
643 changes: 643 additions & 0 deletions Marlin/src/inc/Changes.h

Large diffs are not rendered by default.

Loading

0 comments on commit cbaff4b

Please sign in to comment.