Skip to content

Commit 97aab6f

Browse files
committed
Merge branch 'Surion79_Testing' into Benoit_tests
2 parents f5e6066 + bb2145d commit 97aab6f

File tree

5 files changed

+143
-1
lines changed

5 files changed

+143
-1
lines changed
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
[include generics/adxl345_software_spi.cfg]
2+
3+
# https://github.com/FYSETC/Nozzle-Input-Shaper
4+
# stm32f042
5+
6+
# You need to override the following to be able to set the proper serial in your overrides.cfg file
7+
[mcu adxl]
8+
serial: /dev/serial/by-id/xxx
9+
10+
[adxl345]
11+
cs_pin: NIS:PA4
12+
spi_software_sclk_pin: adxl:PA5
13+
spi_software_mosi_pin: adxl:PA7
14+
spi_software_miso_pin: adxl:PA6
15+
axes_map: x,y,z
16+
17+
[resonance_tester]
18+
accel_chip: adxl345
19+
probe_points:
20+
-1,-1,-1
21+
22+
# Include the IS calibration macros to unlock them when
23+
# an accelerometer is installed on the machine
24+
[include ../../../macros/helpers/resonance_override.cfg]
25+
[include ../../../scripts/K-ShakeTune/K-SnT_*.cfg]
26+
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
[include generics/adxl345_software_spi.cfg]
2+
3+
# As it's a toolhead ADXL, we add some default pins overrides from here
4+
[adxl345]
5+
cs_pin: toolhead:MCU_ADXL_CS
6+
spi_software_sclk_pin: toolhead:MCU_ADXL_SCK
7+
spi_software_mosi_pin: toolhead:MCU_ADXL_MOSI
8+
spi_software_miso_pin: toolhead:MCU_ADXL_MISO
Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
[board_pins mcu_manufacturer]
2+
aliases:
3+
MCU_XM_STEP=PC0 , MCU_XM_DIR=PC1 , MCU_XM_ENABLE=PC3 ,
4+
MCU_YM_STEP=PC14 , MCU_YM_DIR=PC13 , MCU_YM_ENABLE=PC15 ,
5+
MCU_ZM_STEP=PB4 , MCU_ZM_DIR=PB5 , MCU_ZM_ENABLE=PC2 ,
6+
MCU_EM_STEP=PB2 , MCU_EM_DIR=PA15 , MCU_EM_ENABLE=PD2 ,
7+
MCU_TMCUART=PB3 , MCU_TMCTX=PA2 ,
8+
9+
MCU_XSTOP=PA2 , MCU_YSTOP=PA3 , MCU_ZSTOP=PC4 ,
10+
MCU_E0STOP=PA1 ,
11+
12+
MCU_HE0=PC7 ,
13+
MCU_BED=PC8 ,
14+
15+
MCU_TH0=PC5 ,
16+
MCU_THB=PB0 ,
17+
MCU_TH2=PB1 ,
18+
19+
MCU_FAN0=PA14 , MCU_FAN1=PA13 , MCU_FAN2=PA8 ,
20+
21+
# Z-Probe Header
22+
MCU_SERVOS=PA0, MCU_PROBE=PC4 ,
23+
24+
# PI Header
25+
MCU_Pi_PWR_UART_TX1=PA9 ,
26+
MCU_Pi_PWR_UART_RX1=PA10 ,
27+
28+
# ?? Header
29+
MCU_P2_DP=PA11 ,
30+
MCU_P2_DM=PA12 ,
31+
32+
# EXP1 header
33+
EXP1_1=<GND> , EXP1_2=<5V> ,
34+
EXP1_3=PB7 , EXP1_4=PB6 ,
35+
EXP1_5=PB14 , EXP1_6=PB13 , # Slot in the socket on this side
36+
EXP1_7=PB12 , EXP1_8=PB15 ,
37+
EXP1_9=PC6 , EXP1_10=PB10 ,
38+
39+
# EXP2 header
40+
EXP2_1=<GND> , EXP2_2=<5V> ,
41+
EXP2_3=<RST> , EXP2_4=PC12 ,
42+
EXP2_5=PA7 , EXP2_6=PC11 , # Slot in the socket on this side
43+
EXP2_7=PA4 , EXP2_8=PC10 ,
44+
EXP2_9=PA5 ,EXP2_10=PA6 ,
45+
46+
# EXP3 header
47+
EXP3_1=PB10 , EXP3_2=PC6 ,
48+
EXP3_3=PC10 , EXP3_4=PB14 ,
49+
EXP3_5=PC11 , EXP3_6=PB13 , # Slot in the socket on this side
50+
EXP3_7=PB12 , EXP3_8=PB15 ,
51+
EXP3_9=<GND> , EXP3_10=<5V>
Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
2+
#------------------------------------#
3+
#### Fystec Cheetah V3 definition ####
4+
#------------------------------------#
5+
6+
# https://github.com/FYSETC/Cheetah_V3.0
7+
[mcu]
8+
##--------------------------------------------------------------------
9+
serial: /dev/serial/by-id/change-me-to-the-correct-mcu-path
10+
##--------------------------------------------------------------------
11+
12+
[include config/mcu_definitions/main/Fysetc_Cheetah_v3.x.cfg] # Do not remove this line
13+
[board_pins Cheetah_v3_mcu]
14+
mcu: mcu
15+
restart_method: command
16+
aliases:
17+
X_STEP=MCU_XM_STEP , X_DIR=MCU_XM_DIR , X_ENABLE=MCU_XM_ENABLE ,
18+
Y_STEP=MCU_YM_STEP , Y_DIR=MCU_YM_DIR , Y_ENABLE=MCU_YM_ENABLE ,
19+
Z_STEP=MCU_ZM_STEP , Z_DIR=MCU_ZM_DIR , Z_ENABLE=MCU_ZM_ENABLE ,
20+
E_STEP=MCU_EM_STEP , E_DIR=MCU_EM_DIR , E_ENABLE=MCU_EM_ENABLE ,
21+
22+
TMCUART=MCU_TMCUART , TMCTX=MCU_TMCTX ,
23+
24+
X_STOP=MCU_XSTOP , Y_STOP=MCU_YSTOP , Z_STOP=MCU_ZSTOP ,
25+
RUNOUT_SENSOR=MCU_E0STOP ,
26+
PROBE_INPUT=MCU_PROBE ,
27+
SERVO_PIN=MCU_SERVOS ,
28+
29+
E_HEATER=MCU_HE0 , E_TEMPERATURE=MCU_TH0 ,
30+
BED_HEATER=MCU_BED , BED_TEMPERATURE=MCU_THB ,
31+
32+
PART_FAN=MCU_FAN0 , E_FAN=MCU_FAN1 , CONTROLLER_FAN=MCU_FAN2 ,
33+
34+
35+
[tmc2209 stepper_x]
36+
uart_pin: TMCUART
37+
#tx_pin: TMCTX
38+
uart_address: 0
39+
40+
[tmc2209 stepper_y]
41+
uart_pin: TMCUART
42+
#tx_pin: TMCTX
43+
uart_address: 1
44+
45+
[tmc2209 stepper_z]
46+
uart_pin: TMCUART
47+
#tx_pin: TMCTX
48+
uart_address: 2
49+
50+
# Comment this section if you are using a toolhead with its own MCU
51+
[tmc2209 extruder]
52+
uart_pin: TMCUART
53+
#tx_pin: TMCTX
54+
uart_address: 3
55+

user_templates/printer.cfg

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,15 +195,17 @@
195195
# [include config/hardware/accelerometers/adxl345_usb.cfg] # For KUBSA, ...
196196
# [include config/hardware/accelerometers/adxl345_usb_rampon.cfg] # For KUBSA with Rampon firmware, ...
197197
# [include config/hardware/accelerometers/adxl345_usb_rp2040_spi1.cfg] # For Fysetc PortableInputShaper, ...
198+
# [include config/hardware/accelerometers/adxl345_Fystec_NIS.cfg] # For USB Nozzle Input Shapers
198199
# [include config/hardware/accelerometers/adxl345_skr.cfg] # For ADXL plugged in SKRv1.4 (not a conventional way)
199200

200201
# [include config/hardware/accelerometers/adxl345_sb2040.cfg] # For ADXL plugged in Mellow Fly-SB2040 boards
201202
# [include config/hardware/accelerometers/adxl345_ebb.cfg] # For ADXL plugged in BTT EBB36 or EBB42 boards
202203
# [include config/hardware/accelerometers/adxl345_sht.cfg] # For ADXL plugged in Mellow SHT36 or SHT42 boards
203204
# [include config/hardware/accelerometers/adxl345_BTT_SB22xx.cfg] # For ADXL plugged in BTT SB2209 or SB2240 boards
204205
# [include config/hardware/accelerometers/adxl345_Fysetc_SB_Can_TH.cfg] # For ADXL plugged in Fysetc SB Can TH boards
206+
# [include config/hardware/accelerometers/adxl345_nitehawk_sb.cfg] # For built in ADXL sensor on the Nitehawk SB board
205207

206-
# [include config/hardware/accelerometers/lis2dw_usb_rp2040_spi1.cfg] # For BTT S2DW V1.0, ...
208+
# [include config/hardware/accelerometers/lis2dw_usb_rp2040_spi1.cfg] # For BTT S2DW V1.0, ...
207209

208210
# [include config/hardware/accelerometers/beacon_accelerometer.cfg] # For Beacon Rev H make sure Beacon. Do not forget to include the beacon_virtual_probe in the PROBE section!
209211
# ----------------------------------------------------------------------------------------

0 commit comments

Comments
 (0)