zach
/
VoronV0_klipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Feat: Add input shaper and ADXL

This commit is contained in:
Zach Schimke 2022-06-26 23:52:34 -07:00
parent 2e51d3df5d
commit 1bf178c1d7
2 changed files with 28 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
input_shaper.cfg
View File

@ -1,26 +1,21 @@
## Input Shaping ## Input Shaping
[input_shaper] #[input_shaper]
shaper_freq_x: 35 #shaper_freq_x: 35
shaper_freq_y: 149.8 #shaper_freq_y: 149.8
shaper_type_x: zv #shaper_type_x: zv
shaper_type_y: zv #shaper_type_y: zv
[adxl345] [adxl345]
cs_pin: rpi:None spi_bus: spi1
axes_map: z,y,x #spi_software_sclk_pin: SPI1-SCK
#spi_software_mosi_pin: SPI1-MOSI
#spi_software_miso_pin: SPI1-MISO
cs_pin: PD9 #SPI1-CS
[resonance_tester] [resonance_tester]
accel_chip: adxl345 accel_chip: adxl345
probe_points: probe_points:
50,50,20 60,60,20 # Dead Center
50,300,20
300 ,50,20
300,300,20
175,175,20 # Dead Center
min_freq: 5
max_freq: 120
accel_per_hz: 75
hz_per_sec: 1
##################################################################### #####################################################################
@ -54,41 +49,41 @@ gcode:
G1 X{ midx - 25 } Y{ midy } Z20 G1 X{ midx - 25 } Y{ midy } Z20
M400 M400
G4 P300 G4 P300
ACCELEROMETER_MEASURE CHIP=rpiaccel RATE=3200 OUTPUT=/tmp/accel-x-input-shaper.csv ACCELEROMETER_MEASURE CHIP=adxl345 RATE=3200 OUTPUT=/tmp/accel-x-input-shaper.csv
G1 X{ midx + 25 } Y{ midy } F6000 G1 X{ midx + 25 } Y{ midy } F6000
M400 M400
G4 P300 G4 P300
ACCELEROMETER_MEASURE CHIP=rpiaccel RATE=0 OUTPUT=/tmp/accel-x-input-shaper.csv ACCELEROMETER_MEASURE CHIP=adxl345 RATE=0 OUTPUT=/tmp/accel-x-input-shaper.csv
#Y Vibration - With Input Shaper #Y Vibration - With Input Shaper
G1 X{ midx } Y{ midy - 25 } Z20 G1 X{ midx } Y{ midy - 25 } Z20
M400 M400
G4 P300 G4 P300
ACCELEROMETER_MEASURE CHIP=rpiaccel RATE=3200 OUTPUT=/tmp/accel-y-input-shaper.csv ACCELEROMETER_MEASURE CHIP=adxl345 RATE=3200 OUTPUT=/tmp/accel-y-input-shaper.csv
G1 X{ midx } Y{ midy + 25 } F6000 G1 X{ midx } Y{ midy + 25 } F6000
M400 M400
G4 P300 G4 P300
ACCELEROMETER_MEASURE CHIP=rpiaccel RATE=0 OUTPUT=/tmp/accel-y-input-shaper.csv ACCELEROMETER_MEASURE CHIP=adxl345 RATE=0 OUTPUT=/tmp/accel-y-input-shaper.csv
#B Vibration - With Input Shaper #B Vibration - With Input Shaper
G1 X{ midx - 25 } Y{ midy - 25 } Z20 G1 X{ midx - 25 } Y{ midy - 25 } Z20
M400 M400
G4 P300 G4 P300
ACCELEROMETER_MEASURE CHIP=rpiaccel RATE=3200 OUTPUT=/tmp/accel-b-input-shaper.csv ACCELEROMETER_MEASURE CHIP=adxl345 RATE=3200 OUTPUT=/tmp/accel-b-input-shaper.csv
G1 X{ midx + 25 } Y{ midy + 25 } F6000 G1 X{ midx + 25 } Y{ midy + 25 } F6000
M400 M400
G4 P300 G4 P300
ACCELEROMETER_MEASURE CHIP=rpiaccel RATE=0 OUTPUT=/tmp/accel-b-input-shaper.csv ACCELEROMETER_MEASURE CHIP=adxl345 RATE=0 OUTPUT=/tmp/accel-b-input-shaper.csv
#A Vibration - With Input Shaper #A Vibration - With Input Shaper
G1 X{ midx + 25 } Y{ midy - 25 } Z20 G1 X{ midx + 25 } Y{ midy - 25 } Z20
M400 M400
G4 P300 G4 P300
ACCELEROMETER_MEASURE CHIP=rpiaccel RATE=3200 OUTPUT=/tmp/accel-a-input-shaper.csv ACCELEROMETER_MEASURE CHIP=adxl345 RATE=3200 OUTPUT=/tmp/accel-a-input-shaper.csv
G1 X{ midx - 25 } Y{ midy + 25 } F6000 G1 X{ midx - 25 } Y{ midy + 25 } F6000
M400 M400
G4 P300 G4 P300
ACCELEROMETER_MEASURE CHIP=rpiaccel RATE=0 OUTPUT=/tmp/accel-a-input-shaper.csv ACCELEROMETER_MEASURE CHIP=adxl345 RATE=0 OUTPUT=/tmp/accel-a-input-shaper.csv
SET_INPUT_SHAPER SHAPER_FREQ_X=0 SHAPER_FREQ_Y=0 SET_INPUT_SHAPER SHAPER_FREQ_X=0 SHAPER_FREQ_Y=0
@ -96,41 +91,41 @@ gcode:
G1 X{ midx - 25 } Y{ midy } Z20 G1 X{ midx - 25 } Y{ midy } Z20
M400 M400
G4 P300 G4 P300
ACCELEROMETER_MEASURE CHIP=rpiaccel RATE=3200 OUTPUT=/tmp/accel-x-stock.csv ACCELEROMETER_MEASURE CHIP=adxl345 RATE=3200 OUTPUT=/tmp/accel-x-stock.csv
G1 X{ midx + 25 } Y{ midy } F6000 G1 X{ midx + 25 } Y{ midy } F6000
M400 M400
G4 P300 G4 P300
ACCELEROMETER_MEASURE CHIP=rpiaccel RATE=0 OUTPUT=/tmp/accel-x-stock.csv ACCELEROMETER_MEASURE CHIP=adxl345 RATE=0 OUTPUT=/tmp/accel-x-stock.csv
#Y Vibration - Stock #Y Vibration - Stock
G1 X{ midx } Y{ midy - 25 } Z20 G1 X{ midx } Y{ midy - 25 } Z20
M400 M400
G4 P300 G4 P300
ACCELEROMETER_MEASURE CHIP=rpiaccel RATE=3200 OUTPUT=/tmp/accel-y-stock.csv ACCELEROMETER_MEASURE CHIP=adxl345 RATE=3200 OUTPUT=/tmp/accel-y-stock.csv
G1 X{ midx } Y{ midy + 25 } F6000 G1 X{ midx } Y{ midy + 25 } F6000
M400 M400
G4 P300 G4 P300
ACCELEROMETER_MEASURE CHIP=rpiaccel RATE=0 OUTPUT=/tmp/accel-y-stock.csv ACCELEROMETER_MEASURE CHIP=adxl345 RATE=0 OUTPUT=/tmp/accel-y-stock.csv
#B Vibration - Stock #B Vibration - Stock
G1 X{ midx - 25 } Y{ midy - 25 } Z20 G1 X{ midx - 25 } Y{ midy - 25 } Z20
M400 M400
G4 P300 G4 P300
ACCELEROMETER_MEASURE CHIP=rpiaccel RATE=3200 OUTPUT=/tmp/accel-b-stock.csv ACCELEROMETER_MEASURE CHIP=adxl345 RATE=3200 OUTPUT=/tmp/accel-b-stock.csv
G1 X{ midx + 25 } Y{ midy + 25 } F6000 G1 X{ midx + 25 } Y{ midy + 25 } F6000
M400 M400
G4 P300 G4 P300
ACCELEROMETER_MEASURE CHIP=rpiaccel RATE=0 OUTPUT=/tmp/accel-b-stock.csv ACCELEROMETER_MEASURE CHIP=adxl345 RATE=0 OUTPUT=/tmp/accel-b-stock.csv
#A Vibration - Stock #A Vibration - Stock
G1 X{ midx + 25 } Y{ midy - 25 } Z20 G1 X{ midx + 25 } Y{ midy - 25 } Z20
M400 M400
G4 P300 G4 P300
ACCELEROMETER_MEASURE CHIP=rpiaccel RATE=3200 OUTPUT=/tmp/accel-a-stock.csv ACCELEROMETER_MEASURE CHIP=adxl345 RATE=3200 OUTPUT=/tmp/accel-a-stock.csv
G1 X{ midx - 25 } Y{ midy + 25 } F6000 G1 X{ midx - 25 } Y{ midy + 25 } F6000
M400 M400
G4 P300 G4 P300
ACCELEROMETER_MEASURE CHIP=rpiaccel RATE=0 OUTPUT=/tmp/accel-a-stock.csv ACCELEROMETER_MEASURE CHIP=adxl345 RATE=0 OUTPUT=/tmp/accel-a-stock.csv
# Restore user's input shaper frequency parameters # Restore user's input shaper frequency parameters
SET_INPUT_SHAPER SHAPER_FREQ_X={ initShapeX } SHAPER_FREQ_Y={ initShapeY } SET_INPUT_SHAPER SHAPER_FREQ_X={ initShapeX } SHAPER_FREQ_Y={ initShapeY }

2
printer.cfg
View File

@ -27,7 +27,7 @@
# Calibration # Calibration
##################################################################### #####################################################################
[include bed_screws.cfg] [include bed_screws.cfg]
#[include input_shaper.cfg] [include input_shaper.cfg]
##################################################################### #####################################################################
# Display # Display