Skip to content

Commit 0122cd3

Browse files
Frix-xFrix-x
authored
Merge pull request #293 from Frix-x/develop
v4.1.1
2 parents 2133a2d + aea8cf6 commit 0122cd3

File tree

13 files changed

+152
-9
lines changed

13 files changed

+152
-9
lines changed

‎config/hardware/axis/X/TMC/TMC5160.cfg

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
# X TMC5160 definition
2+
3+
[gcode_macro _USER_VARIABLES]
4+
variable_x_driver: "tmc5160"
5+
gcode:
6+
7+
[tmc5160 stepper_x]
8+
cs_pin: X_TMCUART
9+
spi_software_sclk_pin: DRIVER_SPI_SCK
10+
spi_software_mosi_pin: DRIVER_SPI_MOSI
11+
spi_software_miso_pin: DRIVER_SPI_MISO
12+
interpolate: True
13+
run_current: 0.8
14+
sense_resistor: 0.110
15+
stealthchop_threshold: 0

‎config/hardware/axis/Y/TMC/TMC5160.cfg

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
# Y TMC5160 definition
2+
3+
[gcode_macro _USER_VARIABLES]
4+
variable_y_driver: "tmc5160"
5+
gcode:
6+
7+
[tmc5160 stepper_y]
8+
cs_pin: Y_TMCUART
9+
spi_software_sclk_pin: DRIVER_SPI_SCK
10+
spi_software_mosi_pin: DRIVER_SPI_MOSI
11+
spi_software_miso_pin: DRIVER_SPI_MISO
12+
interpolate: True
13+
run_current: 0.8
14+
sense_resistor: 0.110
15+
stealthchop_threshold: 0

‎config/mcu_definitions/main/BTT_Octopus_Max.cfg

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,9 @@ aliases:
3232
MCU_NEOPIXEL2=PE9 ,
3333
MCU_PS_ON=PF13 ,
3434
MCU_POWER_DET=PF12 ,
35-
MCU_FWS0=PC0 , MCU_FWS1=PF10
35+
MCU_FWS0=PC0 , MCU_FWS1=PF10 ,
36+
37+
MCU_SPI4_MOSI=PE14 , MCU_SPI4_MISO=PE13 , MCU_SPI4_SCK=PE12 ,
3638

3739
# EXP1 header
3840
EXP1_1=PG2 , EXP1_2=PD15 ,

‎config/mcu_definitions/main/BTT_SKR_3.cfg

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
[board_pins mcu_manufacturer]
2+
aliases:
3+
MCU_XM_STEP=PD4 , MCU_XM_DIR=PD3 , MCU_XM_ENABLE=PD6 , MCU_XM_UART=PD5 ,
4+
MCU_YM_STEP=PA15 , MCU_YM_DIR=PA8 , MCU_YM_ENABLE=PD1 , MCU_YM_UART=PD0 ,
5+
MCU_ZM_STEP=PE2 , MCU_ZM_DIR=PE3 , MCU_ZM_ENABLE=PE0 , MCU_ZM_UART=PE1 ,
6+
MCU_E0M_STEP=PD15 , MCU_E0M_DIR=PD14 , MCU_E0M_ENABLE=PC7 , MCU_E0M_UART=PC6 ,
7+
MCU_E1M_STEP=PD11 , MCU_E1M_DIR=PD10 , MCU_E1M_ENABLE=PD13 , MCU_E1M_UART=PD12 ,
8+
9+
MCU_MOTSPI_MISO=PE15 , MCU_MOTSPI_MOSI=PE13 , MCU_MOTSPI_SCK=PE14 ,
10+
11+
MCU_XSTOP=PC1 , MCU_YSTOP=PC3 , MCU_ZSTOP=PC0 ,
12+
MCU_E0DET=PC2 , MCU_E1DET=PA0 , MCU_PWRDET=PC15 ,
13+
14+
MCU_HE0=PB3 , MCU_HE1=PB4 ,
15+
MCU_BED=PD7 ,
16+
17+
MCU_PSON=PE4 ,
18+
19+
MCU_TB=PA1 , MCU_TH0=PA2 , MCU_TH1=PA3 ,
20+
21+
MCU_FAN0=PB7 , MCU_FAN1=PB6 , MCU_FAN2=PB5 ,
22+
23+
MCU_RGB=PE6 ,
24+
25+
MCU_SERVOS=PE5 , MCU_PROBE=PC13 ,
26+
27+
# EXP1 header
28+
EXP1_1=PC5 , EXP1_2=PB0 ,
29+
EXP1_3=PB1 , EXP1_4=PE8 ,
30+
EXP1_5=PE9 , EXP1_6=PE10 , # Key in the socket on this side
31+
EXP1_7=PE11 , EXP1_8=PE12 ,
32+
EXP1_9=<GND> , EXP1_10=<5V> ,
33+
34+
# EXP2 header
35+
EXP2_1=PA6 , EXP2_2=PA5 ,
36+
EXP2_3=PE7 , EXP2_4=PA4 ,
37+
EXP2_5=PB2 , EXP2_6=PA7 , # Key in the socket on this side
38+
EXP2_7=PC4 , EXP2_8=<RST> ,
39+
EXP2_9=<GND> , EXP2_10=<NC> ,
40+
41+
# TFT header
42+
MCU_TFT_1=<5V> ,
43+
MCU_TFT_2=<GND> ,
44+
MCU_TFT_3=PA9 ,
45+
MCU_TFT_4=PA10 ,
46+
MCU_TFT_5=<RST> ,
47+
48+
# Mini-SD
49+
MCU_MINISD_DATA1=PC9 , MCU_MINISD_DATA0=PC8 , MCU_MINISD_CLK=PC12 , MCU_MINISD_CMD=PD2 , MCU_MINISD_DATA3=PC11 , MCU_MINISD_DATA2=PC10 ,
50+
51+
# WIFI
52+
MCU_WIFI_GND=<GND> , MCU_WIFI_VCC=<3.3V> ,
53+
MCU_WIFI_IO15=PB12 , MCU_WIFI_IO13=PB15 ,
54+
MCU_WIFI_IO2=<NC> , MCU_WIFI_IO12=PB14 ,
55+
MCU_WIFI_IO0=PB10 , MCU_WIFI_IO14=PB13 ,
56+
MCU_WIFI_IO4=PB11 , MCU_WIFI_IO16=<NC> ,
57+
MCU_WIFI_IO5=<NC> , MCU_WIFI_EN=<NC> ,
58+
MCU_WIFI_RXD=PD8 , MCU_WIFI_ADC=<NC> ,
59+
MCU_WIFI_TXD=PD9 , MCU_WIFI_RST=PC14 ,

‎macros/base/homing/homing_override.cfg

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ gcode:
55
{% set verbose = printer["gcode_macro _USER_VARIABLES"].verbose %}
66
{% set kinematics = printer["configfile"].config["printer"]["kinematics"] %}
77
{% set probe_type_enabled = printer["gcode_macro _USER_VARIABLES"].probe_type_enabled %}
8-
{% set homing_zhop = printer["gcode_macro _USER_VARIABLES"].homing_zhop|float %}
8+
{% set homing_zhop = printer["gcode_macro _USER_VARIABLES"].homing_zhop|float|abs %}
99
{% set homing_travel_speed = printer["gcode_macro _USER_VARIABLES"].homing_travel_speed * 60 %}
1010
{% set homing_travel_accel = printer["gcode_macro _USER_VARIABLES"].homing_travel_accel %}
1111
{% set sensorless_homing_enabled = printer["gcode_macro _USER_VARIABLES"].sensorless_homing_enabled %}
@@ -86,9 +86,15 @@ gcode:
8686
{% if ('z' in printer.toolhead.homed_axes) %}
8787
{% if (printer.toolhead.position.z < homing_zhop) %}
8888
{% if verbose %}
89-
{ action_respond_info("Z too low, performing ZHOP") }
89+
{ action_respond_info("Z too low, performing ZHOP to rehome Z") }
9090
{% endif %}
91+
G91
9192
G0 Z{homing_zhop} F{z_drop_speed}
93+
G90
94+
{% else %}
95+
{% if verbose %}
96+
{ action_respond_info("Z already safe, no ZHOP needed to rehome Z") }
97+
{% endif %}
9298
{% endif %}
9399
{% elif ('xy' in printer.toolhead.homed_axes) %}
94100
{% if verbose %}
@@ -348,6 +354,8 @@ gcode:
348354
[gcode_macro _GOTO_Z_PROBE]
349355
description: Move to z probe avoiding the probe dock
350356
gcode:
357+
{% set verbose = printer["gcode_macro _USER_VARIABLES"].verbose %}
358+
351359
# If the auto z calibration plugin is enabled, then we use the z endstop coordinates set in its config section [z_calibration]
352360
# Else we fall back on the variable_zendstop_position set in the variables.cfg file
353361
{% set zcalib_plugin_enabled = printer["gcode_macro _USER_VARIABLES"].zcalib_plugin_enabled %}
@@ -386,9 +394,10 @@ gcode:
386394

387395

388396
{% if avoid_dock == true %}
389-
# avoid Y
397+
{% if verbose %}
398+
{ action_respond_info("Avoiding probe dock to home Z...") }
399+
{% endif %}
390400
G0 Y{probe_dock_location_y - probe_dock_margin_y} F{homing_travel_speed}
391-
#go z endstop X
392401
G0 X{z_endstop_x} F{homing_travel_speed}
393402
{% endif %}
394403

‎macros/base/probing/dockable_probe.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@ gcode:
298298
variable_probe_state: 0
299299
gcode:
300300
Query_Probe
301-
_SET_PROBE_STATE action={ ACTION }
301+
_SET_PROBE_STATE action={ params.ACTION }
302302

303303

304304
# due to how templates are evaluated, we have query endstops in one

‎macros/helpers/prime_line.cfg

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,9 @@ gcode:
7171

7272
G91
7373
M83
74-
G1 Z5 F{Sz}
74+
{% if (printer.toolhead.position.z < 5) %}
75+
G1 Z5 F{Sz}
76+
{% endif %}
7577

7678
# Starting position
7779
G90

‎user_templates/mcu.cfg

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,12 @@
2323
# [include config/hardware/axis/X/TMC/TMC2209.cfg]
2424
# [include config/hardware/axis/X/TMC/TMC2209_V0specific.cfg] # Should only be used for early LDO V0 kits to mitigate the known VFAs issue
2525
# [include config/hardware/axis/X/TMC/TMC2240.cfg]
26+
# [include config/hardware/axis/X/TMC/TMC5160.cfg]
2627
### 2. Y Drivers -------------------------------------------------------------------------
2728
# [include config/hardware/axis/Y/TMC/TMC2209.cfg]
2829
# [include config/hardware/axis/Y/TMC/TMC2209_V0specific.cfg] # Should only be used for early LDO V0 kits to mitigate the known VFAs issue
2930
# [include config/hardware/axis/Y/TMC/TMC2240.cfg]
31+
# [include config/hardware/axis/Y/TMC/TMC5160.cfg]
3032
### 3. Z Drivers -------------------------------------------------------------------------
3133
# [include config/hardware/axis/Z/TMC/TMC2209_1-Motor.cfg]
3234
# [include config/hardware/axis/Z/TMC/TMC2209_3-Motors.cfg]

‎user_templates/mcu_defaults/main/BTT_Manta_M8P_v1.0.cfg

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,3 +51,4 @@ aliases:
5151
LIGHT_NEOPIXEL=MCU_RGB2 ,
5252

5353
SERVO_PIN=MCU_PROBE1 ,
54+

‎user_templates/mcu_defaults/main/BTT_Manta_M8P_v1.1.cfg

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,3 +51,4 @@ aliases:
5151
LIGHT_NEOPIXEL=MCU_RGB2 ,
5252

5353
SERVO_PIN=MCU_PROBE1 ,
54+

‎user_templates/mcu_defaults/main/BTT_Octopus_Max.cfg

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,10 @@ aliases:
2626

2727
E_STEP=MCU_MOTOR6_STEP , E_DIR=MCU_MOTOR6_DIR , E_ENABLE=MCU_MOTOR6_ENABLE , E_TMCUART=MCU_MOTOR6_UART ,
2828

29+
DRIVER_SPI_MOSI=MCU_SPI4_MOSI , # Used in case of SPI drivers such as TMC2240 or TMC5160
30+
DRIVER_SPI_MISO=MCU_SPI4_MISO , # Used in case of SPI drivers such as TMC2240 or TMC5160
31+
DRIVER_SPI_SCK=MCU_SPI4_SCK , # Used in case of SPI drivers such as TMC2240 or TMC5160
32+
2933
X_STOP=MCU_STOP0 , Y_STOP=MCU_STOP1 , Z_STOP=MCU_STOP2 ,
3034
PROBE_INPUT=MCU_STOP7 ,
3135
RUNOUT_SENSOR=MCU_FWS0 ,
@@ -45,3 +49,4 @@ aliases:
4549
STATUS_NEOPIXEL=MCU_NEOPIXEL ,
4650

4751
SERVO_PIN=MCU_SERVOS ,
52+

‎user_templates/mcu_defaults/main/BTT_SKR_3.cfg

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
#-------------------------------------#
2+
#### BTT SKR3 definition ####
3+
#-------------------------------------#
4+
5+
[mcu]
6+
##--------------------------------------------------------------------
7+
serial: /dev/serial/by-id/change-me-to-the-correct-mcu-path
8+
# canbus_uuid: change-me-to-the-correct-canbus-id
9+
##--------------------------------------------------------------------
10+
11+
[include config/mcu_definitions/main/BTT_SKR_3.cfg] # Do not remove this line
12+
[board_pins SKR_3_mcu]
13+
mcu: mcu
14+
aliases:
15+
X_STEP=MCU_XM_STEP , X_DIR=MCU_XM_DIR , X_ENABLE=MCU_XM_ENABLE , X_TMCUART=MCU_XM_UART ,
16+
Y_STEP=MCU_YM_STEP , Y_DIR=MCU_YM_DIR , Y_ENABLE=MCU_YM_ENABLE , Y_TMCUART=MCU_YM_UART ,
17+
Z_STEP=MCU_ZM_STEP , Z_DIR=MCU_ZM_DIR , Z_ENABLE=MCU_ZM_ENABLE , Z_TMCUART=MCU_ZM_UART ,
18+
E_STEP=MCU_E0M_STEP , E_DIR=MCU_E0M_DIR , E_ENABLE=MCU_E0M_ENABLE , E_TMCUART=MCU_E0M_UART ,
19+
20+
X_STOP=MCU_XSTOP , Y_STOP=MCU_YSTOP , Z_STOP=MCU_ZSTOP ,
21+
RUNOUT_SENSOR=MCU_E0DET ,
22+
PROBE_INPUT=MCU_PROBE ,
23+
SERVO_PIN=MCU_SERVOS ,
24+
25+
E_HEATER=MCU_HE0 , E_TEMPERATURE=MCU_TH0 ,
26+
BED_HEATER=MCU_BED , BED_TEMPERATURE=MCU_TH1 ,
27+
28+
PART_FAN=MCU_FAN0 , E_FAN=MCU_FAN1 , CONTROLLER_FAN=MCU_FAN2 ,
29+
30+
STATUS_NEOPIXEL=MCU_RGB ,
31+
# LIGHT_NEOPIXEL=MCU_RGB ,
32+

‎user_templates/mcu_defaults/main/BTT_SKR_Pico_v1.0.cfg

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ aliases:
3030
CONTROLLER_FAN=MCU_FAN3 ,
3131

3232
STATUS_NEOPIXEL=MCU_RGB ,
33-
33+
3434
[tmc2209 stepper_x]
3535
uart_pin: TMCUART
3636
tx_pin: TMCTX
@@ -46,7 +46,7 @@ uart_pin: TMCUART
4646
tx_pin: TMCTX
4747
uart_address: 1
4848

49-
# comment this section if you are using a toolhead with own mcu
49+
# comment this section if you are using a toolhead with own mcu OR if you use an MMU with Happy_Hare V2
5050
[tmc2209 extruder]
5151
uart_pin: TMCUART
5252
tx_pin: TMCTX

0 commit comments

Comments
 (0)