mirror of
https://github.com/Klipper3d/klipper.git
synced 2026-03-06 01:54:42 -07:00
Merge branch 'master' into feature/adxl355-upstream
This commit is contained in:
commit
f9e8191e9f
292 changed files with 10589 additions and 5405 deletions
|
|
@ -126,8 +126,6 @@ max_accel:
|
|||
# decelerate to zero at each corner. The value specified here may be
|
||||
# changed at runtime using the SET_VELOCITY_LIMIT command. The
|
||||
# default is 5mm/s.
|
||||
#max_accel_to_decel:
|
||||
# This parameter is deprecated and should no longer be used.
|
||||
```
|
||||
|
||||
### [stepper]
|
||||
|
|
@ -740,16 +738,17 @@ max_velocity:
|
|||
max_accel:
|
||||
#minimum_cruise_ratio:
|
||||
#square_corner_velocity:
|
||||
#max_accel_to_decel:
|
||||
#max_z_velocity:
|
||||
#max_z_accel:
|
||||
|
||||
```
|
||||
|
||||
Then a user must define the following three carriages: `[carriage x]`,
|
||||
`[carriage y]`, and `[carriage z]`, e.g.
|
||||
Then a user must define three primary carriages for X, Y, and Z axes, e.g.:
|
||||
```
|
||||
[carriage x]
|
||||
[carriage carriage_x]
|
||||
axis:
|
||||
# Axis of a carriage, either x, y, or z. This parameter must be provided,
|
||||
# unless a carriage name is x, y, or z itself.
|
||||
endstop_pin:
|
||||
# Endstop switch detection pin. If this endstop pin is on a
|
||||
# different mcu than the stepper motor(s) moving this carriage,
|
||||
|
|
@ -791,7 +790,8 @@ for instance
|
|||
carriages:
|
||||
# A string describing the carriages the stepper moves. All defined
|
||||
# carriages can be specified here, as well as their linear combinations,
|
||||
# e.g. x, x+y, y-0.5*z, x-z, etc. This parameter must be provided.
|
||||
# e.g. carriage_x, carriage_x+carriage_y, carriage_y-0.5*carriage_z,
|
||||
# carriage_x-carriage_z, etc. This parameter must be provided.
|
||||
step_pin:
|
||||
dir_pin:
|
||||
enable_pin:
|
||||
|
|
@ -803,28 +803,29 @@ microsteps:
|
|||
```
|
||||
See [stepper](#stepper) section for more information on the regular
|
||||
stepper parameters. The `carriages` parameter defines how the stepper
|
||||
affects the motion of the carriages. For example, `x+y` indicates that
|
||||
the motion of the stepper in the positive direction by the distance `d`
|
||||
moves the carriages `x` and `y` by the same distance `d` in the positive
|
||||
direction, while `x-0.5*y` means the motion of the stepper in the positive
|
||||
direction by the distance `d` moves the carriage `x` by the distance `d`
|
||||
in the positive direction, but the carriage `y` will travel distance `d/2`
|
||||
in the negative direction.
|
||||
affects the motion of the carriages. For example, `carriage_x+carriage_y`
|
||||
indicates that the motion of the stepper in the positive direction by the
|
||||
distance `d` moves the carriages `carriage_x` and `carriage_y` by the same
|
||||
distance `d` in the positive direction, while `carriage_x-0.5*carriage_y`
|
||||
means the motion of the stepper in the positive direction by the distance
|
||||
`d` moves the carriage `carriage_x` by the distance `d` in the positive
|
||||
direction, but the carriage `carriage_y` will travel distance `d/2` in
|
||||
the negative direction.
|
||||
|
||||
More than a single stepper motor can be defined to drive the same axis
|
||||
or belt. For example, on a CoreXY AWD setups two motors driving the same
|
||||
belt can be defined as
|
||||
```
|
||||
[carriage x]
|
||||
[carriage carriage_x]
|
||||
endstop_pin: ...
|
||||
...
|
||||
|
||||
[carriage y]
|
||||
[carriage carriage_y]
|
||||
endstop_pin: ...
|
||||
...
|
||||
|
||||
[stepper a0]
|
||||
carriages: x-y
|
||||
carriages: carriage_x-carriage_y
|
||||
step_pin: ...
|
||||
dir_pin: ...
|
||||
enable_pin: ...
|
||||
|
|
@ -832,7 +833,7 @@ rotation_distance: ...
|
|||
...
|
||||
|
||||
[stepper a1]
|
||||
carriages: x-y
|
||||
carriages: carriage_x-carriage_y
|
||||
step_pin: ...
|
||||
dir_pin: ...
|
||||
enable_pin: ...
|
||||
|
|
@ -845,7 +846,7 @@ sharing the same `carriages` and corresponding endstops.
|
|||
There are situations when a user wants to have more than one endstop
|
||||
per axis. Examples of such configurations include Y axis driven by
|
||||
two independent stepper motors with belts attached to both ends of the
|
||||
X beam, with effectively two carriages on Y axis each having an
|
||||
X gantry, with effectively two carriages on Y axis each having an
|
||||
independent endstop, and multi-stepper Z axis with each stepper having
|
||||
its own endstop (not to be confused with the configurations with
|
||||
multiple Z motors but only a single endstop). These configurations
|
||||
|
|
@ -863,12 +864,12 @@ endstop_pin:
|
|||
|
||||
and the corresponding stepper motors, for example:
|
||||
```
|
||||
[extra_carriage y1]
|
||||
primary_carriage: y
|
||||
[extra_carriage carriage_y1]
|
||||
primary_carriage: carriage_y
|
||||
endstop_pin: ...
|
||||
|
||||
[stepper sy1]
|
||||
carriages: y1
|
||||
carriages: carriage_y1
|
||||
...
|
||||
```
|
||||
Notably, an `[extra_carriage]` does not define parameters such as
|
||||
|
|
@ -1783,17 +1784,22 @@ the [command reference](G-Codes.md#input_shaper).
|
|||
# input shapers, this parameter can be set from different
|
||||
# considerations. The default value is 0, which disables input
|
||||
# shaping for Y axis.
|
||||
#shaper_freq_z: 0
|
||||
# A frequency (in Hz) of the input shaper for Z axis. The default
|
||||
# value is 0, which disables input shaping for Z axis.
|
||||
#shaper_type: mzv
|
||||
# A type of the input shaper to use for both X and Y axes. Supported
|
||||
# A type of the input shaper to use for all axes. Supported
|
||||
# shapers are zv, mzv, zvd, ei, 2hump_ei, and 3hump_ei. The default
|
||||
# is mzv input shaper.
|
||||
#shaper_type_x:
|
||||
#shaper_type_y:
|
||||
# If shaper_type is not set, these two parameters can be used to
|
||||
# configure different input shapers for X and Y axes. The same
|
||||
#shaper_type_z:
|
||||
# If shaper_type is not set, these parameters can be used to
|
||||
# configure different input shapers for X, Y, and Z axes. The same
|
||||
# values are supported as for shaper_type parameter.
|
||||
#damping_ratio_x: 0.1
|
||||
#damping_ratio_y: 0.1
|
||||
#damping_ratio_z: 0.1
|
||||
# Damping ratios of vibrations of X and Y axes used by input shapers
|
||||
# to improve vibration suppression. Default value is 0.1 which is a
|
||||
# good all-round value for most printers. In most circumstances this
|
||||
|
|
@ -1946,6 +1952,39 @@ Support for LIS3DH accelerometers.
|
|||
# See the "adxl345" section for information on this parameter.
|
||||
```
|
||||
|
||||
### [bmi160]
|
||||
|
||||
BMI160 accelerometer. This sensor can be queried via I2C or SPI bus.
|
||||
```
|
||||
[bmi160]
|
||||
#i2c_address:
|
||||
# Default is 105 (0x69). If SA0 is tied to GND, use 104 (0x68).
|
||||
# Only used for I2C.
|
||||
#i2c_mcu:
|
||||
#i2c_bus:
|
||||
#i2c_speed:
|
||||
# See the "common I2C settings" section for a description of the
|
||||
# above parameters. Only used for I2C.
|
||||
#cs_pin:
|
||||
#spi_speed:
|
||||
#spi_bus:
|
||||
#spi_software_sclk_pin:
|
||||
#spi_software_mosi_pin:
|
||||
#spi_software_miso_pin:
|
||||
# See the "common SPI settings" section for a description of the
|
||||
# above parameters. Only used for SPI.
|
||||
#axes_map: x, y, z
|
||||
# See the "adxl345" section for information on this parameter.
|
||||
```
|
||||
|
||||
**Important:** Many BMI160 modules use ambiguous pin labels. For SPI:
|
||||
- Use **SCL** for clock (not SCX)
|
||||
- Use **SDA** for MOSI (not SDX)
|
||||
- Use **SA0** for MISO
|
||||
- Use **CS** for chip select
|
||||
|
||||
The pins labeled SCX/SDX are for the auxiliary magnetometer bus.
|
||||
|
||||
### [mpu9250]
|
||||
|
||||
Support for MPU-9250, MPU-9255, MPU-6515, MPU-6050, and MPU-6500
|
||||
|
|
@ -2001,6 +2040,10 @@ section of the measuring resonances guide for more information on
|
|||
# and on the toolhead (for X axis). These parameters have the same
|
||||
# format as 'accel_chip' parameter. Only 'accel_chip' or these two
|
||||
# parameters must be provided.
|
||||
#accel_chip_z:
|
||||
# A name of the accelerometer chip to use for measurements of Z axis.
|
||||
# This parameter has the same format as 'accel_chip'. The default is
|
||||
# not to configure an accelerometer for Z axis.
|
||||
#max_smoothing:
|
||||
# Maximum input shaper smoothing to allow for each axis during shaper
|
||||
# auto-calibration (with 'SHAPER_CALIBRATE' command). By default no
|
||||
|
|
@ -2011,16 +2054,20 @@ section of the measuring resonances guide for more information on
|
|||
# during the calibration. The default is 50.
|
||||
#min_freq: 5
|
||||
# Minimum frequency to test for resonances. The default is 5 Hz.
|
||||
#max_freq: 133.33
|
||||
# Maximum frequency to test for resonances. The default is 133.33 Hz.
|
||||
#max_freq: 135
|
||||
# Maximum frequency to test for resonances. The default is 135 Hz.
|
||||
#max_freq_z: 100
|
||||
# Maximum frequency to test Z axis for resonances. The default is 100 Hz.
|
||||
#accel_per_hz: 60
|
||||
# This parameter is used to determine which acceleration to use to
|
||||
# test a specific frequency: accel = accel_per_hz * freq. Higher the
|
||||
# value, the higher is the energy of the oscillations. Can be set to
|
||||
# a lower than the default value if the resonances get too strong on
|
||||
# the printer. However, lower values make measurements of
|
||||
# high-frequency resonances less precise. The default value is 75
|
||||
# (mm/sec).
|
||||
# the printer. However, lower values make measurements of high-frequency
|
||||
# resonances less precise. The default value is 60 (mm/sec).
|
||||
#accel_per_hz_z: 15
|
||||
# This parameter has the same meaning as accel_per_hz, but applies to
|
||||
# Z axis specifically. The default is 15 (mm/sec).
|
||||
#hz_per_sec: 1
|
||||
# Determines the speed of the test. When testing all frequencies in
|
||||
# range [min_freq, max_freq], each second the frequency increases by
|
||||
|
|
@ -2029,6 +2076,8 @@ section of the measuring resonances guide for more information on
|
|||
# (Hz/sec == sec^-2).
|
||||
#sweeping_accel: 400
|
||||
# An acceleration of slow sweeping moves. The default is 400 mm/sec^2.
|
||||
#sweeping_accel_z: 50
|
||||
# Same as sweeping_accel above, but for Z axis. The default is 50 mm/sec^2.
|
||||
#sweeping_period: 1.2
|
||||
# A period of slow sweeping moves. Setting this parameter to 0
|
||||
# disables slow sweeping moves. Avoid setting it to a too small
|
||||
|
|
@ -2308,6 +2357,16 @@ sensor_type: ldc1612
|
|||
#samples_tolerance:
|
||||
#samples_tolerance_retries:
|
||||
# See the "probe" section for information on these parameters.
|
||||
#tap_threshold:
|
||||
# Noise cutoff/stop trigger threshold (in Hz). Specify this value to
|
||||
# enable support for "METHOD=tap" probe commands. See Eddy_Probe.md
|
||||
# for more information. Larger values make the tap detection less
|
||||
# sensitive. That is, larger values make it less likely the toolhead
|
||||
# will incorrectly stop early due to noise, while increasing the
|
||||
# risk of the toolhead not correctly stopping when it first contacts
|
||||
# the bed. If this value is specified then one may override its
|
||||
# value at run-time using the "TAP_THRESHOLD" parameter on probe
|
||||
# commands. The default is to not enable support for "tap" probing.
|
||||
```
|
||||
|
||||
### [axis_twist_compensation]
|
||||
|
|
@ -2467,10 +2526,16 @@ Please note that in this case the `[dual_carriage]` configuration deviates
|
|||
from the configuration described above:
|
||||
```
|
||||
[dual_carriage my_dc_carriage]
|
||||
primary_carriage:
|
||||
# Defines the matching primary carriage of this dual carriage and
|
||||
# the corresponding IDEX axis. Valid choices are x, y, z.
|
||||
# This parameter must be provided.
|
||||
#primary_carriage:
|
||||
# Defines the matching carriage on the same gantry as this dual carriage and
|
||||
# the corresponding dual axis. Must match a name of a defined `[carriage]` or
|
||||
# another independent `[dual_carriage]`. If not set, which is a default,
|
||||
# defines a dual carriage independent of a `[carriage]` with the same axis
|
||||
# as this one (e.g. on a different gantry).
|
||||
#axis:
|
||||
# Axis of a carriage, either x or y. If 'primary_carriage' is defined, then
|
||||
# this parameter defaults to the 'axis' parameter of that primary carriage,
|
||||
# otherwise this parameter must be defined.
|
||||
#safe_distance:
|
||||
# The minimum distance (in mm) to enforce between the dual and the primary
|
||||
# carriages. If a G-Code command is executed that will bring the carriages
|
||||
|
|
@ -2479,7 +2544,8 @@ primary_carriage:
|
|||
# position_min and position_max for the dual and primary carriages. If set
|
||||
# to 0 (or safe_distance is unset and position_min and position_max are
|
||||
# identical for the primary and dual carriages), the carriages proximity
|
||||
# checks will be disabled.
|
||||
# checks will be disabled. Only valid for a dual_carriage with a defined
|
||||
# 'primary_carriage'.
|
||||
endstop_pin:
|
||||
#position_min:
|
||||
position_endstop:
|
||||
|
|
@ -2497,18 +2563,18 @@ on the regular `carriage` parameters.
|
|||
Then a user must define one or more stepper motors moving the dual carriage
|
||||
(and other carriages as appropriate), for instance
|
||||
```
|
||||
[carriage x]
|
||||
[carriage carriage_x]
|
||||
...
|
||||
|
||||
[carriage y]
|
||||
[carriage carriage_y]
|
||||
...
|
||||
|
||||
[dual_carriage u]
|
||||
primary_carriage: x
|
||||
[dual_carriage carriage_u]
|
||||
primary_carriage: carriage_x
|
||||
...
|
||||
|
||||
[stepper dc_stepper]
|
||||
carriages: u-y
|
||||
carriages: carriage_u-carriage_y
|
||||
...
|
||||
```
|
||||
|
||||
|
|
@ -2524,14 +2590,14 @@ example above:
|
|||
[delayed_gcode init_shaper]
|
||||
initial_duration: 0.1
|
||||
gcode:
|
||||
SET_DUAL_CARRIAGE CARRIAGE=u
|
||||
SET_INPUT_SHAPER SHAPER_TYPE_X=<dual_carriage_x_shaper> SHAPER_FREQ_X=<dual_carriage_x_freq> SHAPER_TYPE_Y=<y_shaper> SHAPER_FREQ_Y=<y_freq>
|
||||
SET_DUAL_CARRIAGE CARRIAGE=x
|
||||
SET_INPUT_SHAPER SHAPER_TYPE_X=<primary_carriage_x_shaper> SHAPER_FREQ_X=<primary_carriage_x_freq> SHAPER_TYPE_Y=<y_shaper> SHAPER_FREQ_Y=<y_freq>
|
||||
SET_DUAL_CARRIAGE CARRIAGE=carriage_u
|
||||
SET_INPUT_SHAPER SHAPER_TYPE_X=<carriage_u_shaper> SHAPER_FREQ_X=<carriage_x_freq> SHAPER_TYPE_Y=<carriage_y_shaper> SHAPER_FREQ_Y=<carriage_y_freq>
|
||||
SET_DUAL_CARRIAGE CARRIAGE=carriage_x
|
||||
SET_INPUT_SHAPER SHAPER_TYPE_X=<carriage_x_shaper> SHAPER_FREQ_X=<carriage_x_freq> SHAPER_TYPE_Y=<carriage_y_shaper> SHAPER_FREQ_Y=<carriage_y_freq>
|
||||
```
|
||||
Note that `SHAPER_TYPE_Y` and `SHAPER_FREQ_Y` must be the same in both
|
||||
commands in this case, since the same motors drive Y axis when either
|
||||
of the `x` and `u` carriages are active.
|
||||
of the `carriage_x` and `carriage_u` carriages are active.
|
||||
|
||||
It is worth noting that `generic_cartesian` kinematic can support two
|
||||
dual carriages for X and Y axes. For reference, see for instance a
|
||||
|
|
@ -2960,7 +3026,7 @@ sensor_type: BME280
|
|||
|
||||
### AHT10/AHT20/AHT21 temperature sensor
|
||||
|
||||
AHT10/AHT20/AHT21 two wire interface (I2C) environmental sensors.
|
||||
AHT10/AHT15/AHT20/AHT21/AHT30 two wire interface (I2C) environmental sensors.
|
||||
Note that these sensors are not intended for use with extruders and
|
||||
heater beds, but rather for monitoring ambient temperature (C) and
|
||||
relative humidity. See
|
||||
|
|
@ -2968,8 +3034,9 @@ relative humidity. See
|
|||
that may be used to report humidity in addition to temperature.
|
||||
|
||||
```
|
||||
sensor_type: AHT10
|
||||
# Also use AHT10 for AHT20 and AHT21 sensors.
|
||||
sensor_type: AHT1X
|
||||
# Must be "AHT1X" , "AHT2X", "AHT3X"
|
||||
# Some AHT20 sensors can use "AHT1X"
|
||||
#i2c_address:
|
||||
# Default is 56 (0x38). Some AHT10 sensors give the option to use
|
||||
# 57 (0x39) by moving a resistor.
|
||||
|
|
@ -3507,11 +3574,6 @@ PCA9632 LED support. The PCA9632 is used on the FlashForge Dreamer.
|
|||
#i2c_speed:
|
||||
# See the "common I2C settings" section for a description of the
|
||||
# above parameters.
|
||||
#scl_pin:
|
||||
#sda_pin:
|
||||
# Alternatively, if the pca9632 is not connected to a hardware I2C
|
||||
# bus, then one may specify the "clock" (scl_pin) and "data"
|
||||
# (sda_pin) pins. The default is to use hardware I2C.
|
||||
#color_order: RGBW
|
||||
# Set the pixel order of the LED (using a string containing the
|
||||
# letters R, G, B, W). The default is RGBW.
|
||||
|
|
@ -3635,6 +3697,20 @@ pin:
|
|||
# These options are deprecated and should no longer be specified.
|
||||
```
|
||||
|
||||
### [static_pwm_clock]
|
||||
|
||||
Static configurable output pin (one may define any number of
|
||||
sections with an "static_pwm_clock" prefix).
|
||||
Pins configured here will be set up as clock output pins.
|
||||
Generally used to provide clock input to other hardware on the board.
|
||||
```
|
||||
[static_pwm_clock my_pin]
|
||||
pin:
|
||||
# The pin to configure as an output. This parameter must be provided.
|
||||
#frequency: 100
|
||||
# Target output frequency.
|
||||
```
|
||||
|
||||
### [pwm_tool]
|
||||
|
||||
Pulse width modulation digital output pins capable of high speed
|
||||
|
|
@ -4427,16 +4503,21 @@ prefix).
|
|||
|
||||
### [mcp4018]
|
||||
|
||||
Statically configured MCP4018 digipot connected via two gpio "bit
|
||||
banging" pins (one may define any number of sections with an "mcp4018"
|
||||
prefix).
|
||||
Statically configured MCP4018 digipot connected via i2c (one may
|
||||
define any number of sections with an "mcp4018" prefix).
|
||||
|
||||
```
|
||||
[mcp4018 my_digipot]
|
||||
scl_pin:
|
||||
# The SCL "clock" pin. This parameter must be provided.
|
||||
sda_pin:
|
||||
# The SDA "data" pin. This parameter must be provided.
|
||||
#i2c_address: 47
|
||||
# The i2c address that the chip is using on the i2c bus. The default
|
||||
# is 47.
|
||||
#i2c_mcu:
|
||||
#i2c_bus:
|
||||
#i2c_software_scl_pin:
|
||||
#i2c_software_sda_pin:
|
||||
#i2c_speed:
|
||||
# See the "common I2C settings" section for a description of the
|
||||
# above parameters.
|
||||
wiper:
|
||||
# The value to statically set the given MCP4018 "wiper" to. This is
|
||||
# typically set to a number between 0.0 and 1.0 with 1.0 being the
|
||||
|
|
@ -4977,8 +5058,8 @@ detection_length: 7.0
|
|||
# a state change on the switch_pin
|
||||
# Default is 7 mm.
|
||||
extruder:
|
||||
# The name of the extruder section this sensor is associated with.
|
||||
# This parameter must be provided.
|
||||
# The name of the extruder or extruder_stepper section this sensor
|
||||
# is associated with. This parameter must be provided.
|
||||
switch_pin:
|
||||
#pause_on_runout:
|
||||
#runout_gcode:
|
||||
|
|
@ -5210,7 +5291,7 @@ sensor_type:
|
|||
# load cell will be igfiltered outnored. This option requires the SciPy
|
||||
# library. Default: None
|
||||
#buzz_filter_delay: 2
|
||||
# The delay, or 'order', of the buzz filter. This controle the number of
|
||||
# The delay, or 'order', of the buzz filter. This controls the number of
|
||||
# samples required to make a trigger detection. Can be 1 or 2, the default
|
||||
# is 2.
|
||||
#notch_filter_frequencies: 50, 60
|
||||
|
|
@ -5344,7 +5425,7 @@ chip: ADS1115
|
|||
# scales all values read from the ADC. Options are: 6.144V, 4.096V, 2.048V,
|
||||
# 1.024V, 0.512V, 0.256V
|
||||
#adc_voltage: 3.3
|
||||
# The suppy voltage for the device. This allows additional software scaling
|
||||
# The supply voltage for the device. This allows additional software scaling
|
||||
# for all values read from the ADC.
|
||||
i2c_mcu: host
|
||||
i2c_bus: i2c.1
|
||||
|
|
@ -5363,7 +5444,7 @@ sensor_pin: my_ads1x1x:AIN0
|
|||
# A combination of the name of the ads1x1x chip and the pin. Possible
|
||||
# pin values are AIN0, AIN1, AIN2 and AIN3 for single ended lines and
|
||||
# DIFF01, DIFF03, DIFF13 and DIFF23 for differential between their
|
||||
# correspoding lines. For example
|
||||
# corresponding lines. For example
|
||||
# DIFF03 measures the differential between line 0 and 3. Only specific
|
||||
# combinations for the differentials are allowed.
|
||||
```
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue