h3n3/klipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

resonance_tester: Apply input shaper params on SHAPER_CALIBRATE

Browse Source 
Signed-off-by: Dmitry Butyugin <dmbutyugin@google.com>
This commit is contained in:
Dmitry Butyugin
2023-04-19 23:11:10 +02:00
committed by KevinOConnor
parent 16c53992d6
commit 624d360a34
4 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
klippy/extras/resonance_tester.py
View File

@@ -287,6 +287,8 @@ class ResonanceTester:
if not self.is_valid_name_suffix(name_suffix):
raise gcmd.error("Invalid NAME parameter")
input_shaper = self.printer.lookup_object('input_shaper', None)
# Setup shaper calibration
helper = shaper_calibrate.ShaperCalibrate(self.printer)
@@ -306,6 +308,9 @@ class ResonanceTester:
"Recommended shaper_type_%s = %s, shaper_freq_%s = %.1f Hz"
% (axis_name, best_shaper.name,
axis_name, best_shaper.freq))
if input_shaper is not None:
helper.apply_params(input_shaper, axis_name,
best_shaper.name, best_shaper.freq)
helper.save_params(configfile, axis_name,
best_shaper.name, best_shaper.freq)
csv_name = self.save_calibration_data(

12
klippy/extras/shaper_calibrate.py
View File

@@ -334,6 +334,18 @@ class ShaperCalibrate:
configfile.set('input_shaper', 'shaper_freq_'+axis,
'%.1f' % (shaper_freq,))
def apply_params(self, input_shaper, axis, shaper_name, shaper_freq):
if axis == 'xy':
self.apply_params(input_shaper, 'x', shaper_name, shaper_freq)
self.apply_params(input_shaper, 'y', shaper_name, shaper_freq)
return
gcode = self.printer.lookup_object("gcode")
axis = axis.upper()
input_shaper.cmd_SET_INPUT_SHAPER(gcode.create_gcode_command(
"SET_INPUT_SHAPER", "SET_INPUT_SHAPER", {
"SHAPER_TYPE_" + axis: shaper_name,
"SHAPER_FREQ_" + axis: shaper_freq}))
def save_calibration_data(self, output, calibration_data, shapers=None):
try:
with open(output, "w") as csvfile: