Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update settings.cpp + fix some things as proper nouns #27422

Open
wants to merge 11 commits into
base: bugfix-2.1.x
Choose a base branch
from
Open

Update settings.cpp + fix some things as proper nouns #27422

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
bf43a36
fix i2c/power loss recovery - proper noun
classicrocker883 Sep 16, 2024
8d5b7c6
settings.cpp
classicrocker883 Sep 16, 2024
f3ccf50
power-loss
classicrocker883 Sep 17, 2024
e0fb2e7
M200-5
classicrocker883 Sep 17, 2024
28f66cf
revert language.h
classicrocker883 Sep 17, 2024
f569267
Merge branch 'bugfix-2.1.x' of https://github.com/MarlinFirmware/Marl…
classicrocker883 Sep 17, 2024
916ed0c
rename to Z-Probe Offset
classicrocker883 Sep 17, 2024
16ed4f5
Update - rename to *-Axis
classicrocker883 Sep 19, 2024
fc406c4
more fixes to Z-Offset, *-Axis
classicrocker883 Sep 21, 2024
bb10d7e
more *-Offset, Probe Z-Offset
classicrocker883 Sep 21, 2024
ebbbaa8
Merge branch 'bugfix-2.1.x' of https://github.com/MarlinFirmware/Marl…
classicrocker883 Oct 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 32 additions & 32 deletions Marlin/Configuration.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,15 +328,15 @@

#if ANY(SWITCHING_TOOLHEAD, MAGNETIC_SWITCHING_TOOLHEAD, ELECTROMAGNETIC_SWITCHING_TOOLHEAD)
#define SWITCHING_TOOLHEAD_Y_POS 235 // (mm) Y position of the toolhead dock
#define SWITCHING_TOOLHEAD_Y_SECURITY 10 // (mm) Security distance Y axis
#define SWITCHING_TOOLHEAD_Y_CLEAR 60 // (mm) Minimum distance from dock for unobstructed X axis
#define SWITCHING_TOOLHEAD_Y_SECURITY 10 // (mm) Security distance Y-Axis
#define SWITCHING_TOOLHEAD_Y_CLEAR 60 // (mm) Minimum distance from dock for unobstructed X-Axis
#define SWITCHING_TOOLHEAD_X_POS { 215, 0 } // (mm) X positions for parking the extruders
#if ENABLED(SWITCHING_TOOLHEAD)
#define SWITCHING_TOOLHEAD_SERVO_NR 2 // Index of the servo connector
#define SWITCHING_TOOLHEAD_SERVO_ANGLES { 0, 180 } // (degrees) Angles for Lock, Unlock
#elif ENABLED(MAGNETIC_SWITCHING_TOOLHEAD)
#define SWITCHING_TOOLHEAD_Y_RELEASE 5 // (mm) Security distance Y axis
#define SWITCHING_TOOLHEAD_X_SECURITY { 90, 150 } // (mm) Security distance X axis (T0,T1)
#define SWITCHING_TOOLHEAD_Y_RELEASE 5 // (mm) Security distance Y-Axis
#define SWITCHING_TOOLHEAD_X_SECURITY { 90, 150 } // (mm) Security distance X-Axis (T0,T1)
//#define PRIME_BEFORE_REMOVE // Prime the nozzle before release from the dock
#if ENABLED(PRIME_BEFORE_REMOVE)
#define SWITCHING_TOOLHEAD_PRIME_MM 20 // (mm) Extruder prime length
Expand Down Expand Up @@ -372,9 +372,9 @@
// Offset of the extruders (uncomment if using more than one and relying on firmware to position when changing).
// The offset has to be X=0, Y=0 for the extruder 0 hotend (default extruder).
// For the other hotends it is their distance from the extruder 0 hotend.
//#define HOTEND_OFFSET_X { 0.0, 20.00 } // (mm) relative X-offset for each nozzle
//#define HOTEND_OFFSET_Y { 0.0, 5.00 } // (mm) relative Y-offset for each nozzle
//#define HOTEND_OFFSET_Z { 0.0, 0.00 } // (mm) relative Z-offset for each nozzle
//#define HOTEND_OFFSET_X { 0.0, 20.00 } // (mm) relative X-Offset for each nozzle
//#define HOTEND_OFFSET_Y { 0.0, 5.00 } // (mm) relative Y-Offset for each nozzle
//#define HOTEND_OFFSET_Z { 0.0, 0.00 } // (mm) relative Z-Offset for each nozzle

// @section multi-material

Expand Down Expand Up @@ -1138,7 +1138,7 @@
//#define POLAR
#if ENABLED(POLAR)
#define DEFAULT_SEGMENTS_PER_SECOND 180 // If movement is choppy try lowering this value
#define PRINTABLE_RADIUS 82.0f // (mm) Maximum travel of X axis
#define PRINTABLE_RADIUS 82.0f // (mm) Maximum travel of X-Axis

// Movements fall inside POLAR_FAST_RADIUS are assigned the highest possible feedrate
// to compensate unwanted deposition related to the near-origin motion problem.
Expand Down Expand Up @@ -1383,7 +1383,7 @@
//#define S_CURVE_ACCELERATION

//===========================================================================
//============================= Z Probe Options =============================
//============================= Z-Probe Options =============================
//===========================================================================
// @section probes

Expand All @@ -1398,7 +1398,7 @@
*/
#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN

// Force the use of the probe for Z-axis homing
// Force the use of the probe for Z-Axis homing
//#define USE_PROBE_FOR_Z_HOMING

/**
Expand Down Expand Up @@ -1472,7 +1472,7 @@
/**
* Touch-MI Probe by hotends.fr
*
* This probe is deployed and activated by moving the X-axis to a magnet at the edge of the bed.
* This probe is deployed and activated by moving the X-Axis to a magnet at the edge of the bed.
* By default, the magnet is assumed to be on the left and activated by a home. If the magnet is
* on the right, enable and set TOUCH_MI_DEPLOY_XPOS to the deploy position.
*
Expand Down Expand Up @@ -1515,9 +1515,9 @@

// A sled-mounted probe like those designed by Charles Bell.
//#define Z_PROBE_SLED
//#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like.
//#define SLED_DOCKING_OFFSET 5 // The extra distance the X-Axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like.

// A probe deployed by moving the x-axis, such as the Wilson II's rack-and-pinion probe designed by Marty Rice.
// A probe deployed by moving the X-Axis, such as the Wilson II's rack-and-pinion probe designed by Marty Rice.
//#define RACK_AND_PINION_PROBE
#if ENABLED(RACK_AND_PINION_PROBE)
#define Z_PROBE_DEPLOY_X X_MIN_POS
Expand Down Expand Up @@ -1561,8 +1561,8 @@
//#define SENSORLESS_PROBING

/**
* Allen key retractable z-probe as seen on many Kossel delta printers - https://reprap.org/wiki/Kossel#Autolevel_probe
* Deploys by touching z-axis belt. Retracts by pushing the probe down.
* Allen key retractable Z-Probe as seen on many Kossel delta printers - https://reprap.org/wiki/Kossel#Autolevel_probe
* Deploys by touching Z-Axis belt. Retracts by pushing the probe down.
*/
//#define Z_PROBE_ALLEN_KEY
#if ENABLED(Z_PROBE_ALLEN_KEY)
Expand Down Expand Up @@ -1599,16 +1599,16 @@
* Use a caliper or ruler to measure the distance from the tip of
* the Nozzle to the center-point of the Probe in the X and Y axes.
*
* Z offset
* - For the Z offset use your best known value and adjust at runtime.
* - Common probes trigger below the nozzle and have negative values for Z offset.
* Z-Offset
* - For the Z-Offset use your best known value and adjust at runtime.
* - Common probes trigger below the nozzle and have negative values for Z-Offset.
* - Probes triggering above the nozzle height are uncommon but do exist. When using
* probes such as this, carefully set Z_CLEARANCE_DEPLOY_PROBE and Z_CLEARANCE_BETWEEN_PROBES
* to avoid collisions during probing.
*
* Tune and Adjust
* - Probe Offsets can be tuned at runtime with 'M851', LCD menus, babystepping, etc.
* - PROBE_OFFSET_WIZARD (Configuration_adv.h) can be used for setting the Z offset.
* - PROBE_OFFSET_WIZARD (Configuration_adv.h) can be used for setting the Z-Offset.
*
* Assuming the typical work area orientation:
* - Probe to RIGHT of the Nozzle has a Positive X offset
Expand Down Expand Up @@ -1644,7 +1644,7 @@
// with NOZZLE_AS_PROBE this can be negative for a wider probing area.
#define PROBING_MARGIN 10

// X and Y axis travel speed (mm/min) between probes.
// X and Y-Axis travel speed (mm/min) between probes.
// Leave undefined to use the average of the current XY homing feedrate.
#define XY_PROBE_FEEDRATE (133*60)

Expand Down Expand Up @@ -1711,7 +1711,7 @@
*
* Use these settings to specify the distance (mm) to raise the probe (or
* lower the bed). The values set here apply over and above any (negative)
* probe Z Offset set with NOZZLE_TO_PROBE_OFFSET, M851, or the LCD.
* Probe Z-Offset set with NOZZLE_TO_PROBE_OFFSET, M851, or the LCD.
* Only integer values >= 1 are valid here.
*
* Example: 'M851 Z-5' with a CLEARANCE of 4 => 9mm from bed to nozzle.
Expand All @@ -1725,7 +1725,7 @@

#define Z_PROBE_LOW_POINT -2 // (mm) Farthest distance below the trigger-point to go before stopping

// For M851 provide ranges for adjusting the X, Y, and Z probe offsets
// For M851 provide ranges for adjusting the X, Y, and Z-Probe offsets
//#define PROBE_OFFSET_XMIN -50 // (mm)
//#define PROBE_OFFSET_XMAX 50 // (mm)
//#define PROBE_OFFSET_YMIN -50 // (mm)
Expand Down Expand Up @@ -2104,7 +2104,7 @@

/**
* Commands to execute at the end of G29 probing.
* Useful to retract or move the Z probe out of the way.
* Useful to retract or move the Z-Probe out of the way.
*/
//#define EVENT_GCODE_AFTER_G29 "G1 Z10 F12000\nG1 X15 Y330\nG1 Z0.5\nG1 Z10"

Expand Down Expand Up @@ -2178,7 +2178,7 @@
#define GRID_MAX_POINTS_X 3
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X

// Probe along the Y axis, advancing X after each column
// Probe along the Y-Axis, advancing X after each column
//#define PROBE_Y_FIRST

#if ENABLED(AUTO_BED_LEVELING_BILINEAR)
Expand Down Expand Up @@ -2264,7 +2264,7 @@
//#define LCD_BED_LEVELING

#if ENABLED(LCD_BED_LEVELING)
#define MESH_EDIT_Z_STEP 0.025 // (mm) Step size while manually probing Z axis.
#define MESH_EDIT_Z_STEP 0.025 // (mm) Step size while manually probing Z-Axis.
#define LCD_PROBE_Z_RANGE 4 // (mm) Z Range centered on Z_MIN_POS for LCD Z adjustment
//#define MESH_EDIT_MENU // Add a menu to edit mesh points
#endif
Expand Down Expand Up @@ -2322,9 +2322,9 @@
//#define MANUAL_W_HOME_POS 0

/**
* Use "Z Safe Homing" to avoid homing with a Z probe outside the bed area.
* Use "Z Safe Homing" to avoid homing with a Z-Probe outside the bed area.
*
* - Moves the Z probe (or nozzle) to a defined XY point before Z homing.
* - Moves the Z-Probe (or nozzle) to a defined XY point before Z homing.
* - Allows Z homing only when XY positions are known and trusted.
* - If stepper drivers sleep, XY homing may be required again before Z homing.
*/
Expand Down Expand Up @@ -2475,7 +2475,7 @@
*
* Park the nozzle at the given XYZ position on idle or G27.
*
* The "P" parameter controls the action applied to the Z axis:
* The "P" parameter controls the action applied to the Z-Axis:
*
* P0 (Default) If Z is below park Z raise the nozzle.
* P1 Raise the nozzle always to Z-park height.
Expand All @@ -2488,8 +2488,8 @@
#define NOZZLE_PARK_POINT { (X_MIN_POS + 10), (Y_MAX_POS - 10), 20 }
#define NOZZLE_PARK_MOVE 0 // Park motion: 0 = XY Move, 1 = X Only, 2 = Y Only, 3 = X before Y, 4 = Y before X
#define NOZZLE_PARK_Z_RAISE_MIN 2 // (mm) Always raise Z by at least this distance
#define NOZZLE_PARK_XY_FEEDRATE 100 // (mm/s) X and Y axes feedrate (also used for delta Z axis)
#define NOZZLE_PARK_Z_FEEDRATE 5 // (mm/s) Z axis feedrate (not used for delta printers)
#define NOZZLE_PARK_XY_FEEDRATE 100 // (mm/s) X and Y axes feedrate (also used for delta Z-Axis)
#define NOZZLE_PARK_Z_FEEDRATE 5 // (mm/s) Z-Axis feedrate (not used for delta printers)
#endif

/**
Expand Down Expand Up @@ -2563,7 +2563,7 @@
// For a purge/clean station that's always at the gantry height (thus no Z move)
//#define NOZZLE_CLEAN_NO_Z

// For a purge/clean station mounted on the X axis
// For a purge/clean station mounted on the X-Axis
//#define NOZZLE_CLEAN_NO_Y

// Require a minimum hotend temperature for cleaning
Expand Down Expand Up @@ -3185,7 +3185,7 @@
//#define U8GLIB_SH1106_EINSTART

//
// Overlord OLED display/controller with i2c buzzer and LEDs
// Overlord OLED display/controller with I2C buzzer and LEDs
//
//#define OVERLORD_OLED

Expand Down
Loading