From 6376c84f4f1945289c8600a2891ae97d0855ac40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Boisselier?= Date: Mon, 16 Dec 2024 23:06:33 +0100 Subject: [PATCH] fix res_tester missing --- shaketune/commands/axes_shaper_calibration.py | 2 +- shaketune/commands/compare_belts_responses.py | 2 +- shaketune/helpers/resonance_test.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/shaketune/commands/axes_shaper_calibration.py b/shaketune/commands/axes_shaper_calibration.py index 4c17586..20b89d9 100644 --- a/shaketune/commands/axes_shaper_calibration.py +++ b/shaketune/commands/axes_shaper_calibration.py @@ -119,7 +119,7 @@ def axes_shaper_calibration(gcmd, config, st_process: ShakeTuneProcess) -> None: # Then do the actual measurements ConsoleOutput.print(f'Measuring {config["label"]}...') accelerometer.start_recording(measurements_manager, name=config['label'], append_time=True) - vibrate_axis(toolhead, gcode, config['direction'], min_freq, max_freq, hz_per_sec, accel_per_hz) + vibrate_axis(toolhead, gcode, config['direction'], min_freq, max_freq, hz_per_sec, accel_per_hz, res_tester) accelerometer.stop_recording() accelerometer.wait_for_samples() toolhead.dwell(0.5) diff --git a/shaketune/commands/compare_belts_responses.py b/shaketune/commands/compare_belts_responses.py index 7b0aefc..92d9a0e 100644 --- a/shaketune/commands/compare_belts_responses.py +++ b/shaketune/commands/compare_belts_responses.py @@ -122,7 +122,7 @@ def compare_belts_responses(gcmd, config, st_process: ShakeTuneProcess) -> None: for config in filtered_config: ConsoleOutput.print(f'Measuring {config["label"]}...') accelerometer.start_recording(measurements_manager, name=config['label'], append_time=True) - vibrate_axis(toolhead, gcode, config['direction'], min_freq, max_freq, hz_per_sec, accel_per_hz) + vibrate_axis(toolhead, gcode, config['direction'], min_freq, max_freq, hz_per_sec, accel_per_hz, res_tester) accelerometer.stop_recording() accelerometer.wait_for_samples() toolhead.dwell(0.5) diff --git a/shaketune/helpers/resonance_test.py b/shaketune/helpers/resonance_test.py index 148e94e..2538da7 100644 --- a/shaketune/helpers/resonance_test.py +++ b/shaketune/helpers/resonance_test.py @@ -307,7 +307,7 @@ def _project_distance(distance, normalized_direction): ) -def vibrate_axis(toolhead, gcode, axis_direction, min_freq, max_freq, hz_per_sec, accel_per_hz, res_tester=None): +def vibrate_axis(toolhead, gcode, axis_direction, min_freq, max_freq, hz_per_sec, accel_per_hz, res_tester): manager = ResonanceTestManager(toolhead, gcode, res_tester) manager.vibrate_axis(axis_direction, min_freq, max_freq, hz_per_sec, accel_per_hz)