aboutsummaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorDmitry Butyugin <dmbutyugin@google.com>2021-04-03 23:45:42 +0200
committerKevinOConnor <kevin@koconnor.net>2021-04-07 19:05:23 -0400
commit165d2fc2281798452c3f192b58fd2712e84bf1dd (patch)
tree95c65b39c4a16dba4748c8fc5fc8065ea00aea11 /scripts
parentbf01d6d1f8a95add76e5f8d93e7adf2da8658191 (diff)
downloadkutter-165d2fc2281798452c3f192b58fd2712e84bf1dd.tar.gz
kutter-165d2fc2281798452c3f192b58fd2712e84bf1dd.tar.xz
kutter-165d2fc2281798452c3f192b58fd2712e84bf1dd.zip
resonance_tester: Fixed multi-point resonance testing
Signed-off-by: Dmitry Butyugin <dmbutyugin@google.com>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/calibrate_shaper.py4
-rwxr-xr-xscripts/graph_accelerometer.py4
2 files changed, 4 insertions, 4 deletions
diff --git a/scripts/calibrate_shaper.py b/scripts/calibrate_shaper.py
index bd2d4308..5bbc9eea 100755
--- a/scripts/calibrate_shaper.py
+++ b/scripts/calibrate_shaper.py
@@ -45,12 +45,12 @@ def calibrate_shaper(datas, csv_output, max_smoothing):
if isinstance(datas[0], CalibrationData):
calibration_data = datas[0]
for data in datas[1:]:
- calibration_data.join(data)
+ calibration_data.add_data(data)
else:
# Process accelerometer data
calibration_data = helper.process_accelerometer_data(datas[0])
for data in datas[1:]:
- calibration_data.join(helper.process_accelerometer_data(data))
+ calibration_data.add_data(helper.process_accelerometer_data(data))
calibration_data.normalize_to_frequencies()
shaper, all_shapers = helper.find_best_shaper(
calibration_data, max_smoothing, print)
diff --git a/scripts/graph_accelerometer.py b/scripts/graph_accelerometer.py
index 93dd413b..472530d3 100755
--- a/scripts/graph_accelerometer.py
+++ b/scripts/graph_accelerometer.py
@@ -82,7 +82,7 @@ def calc_specgram(data, axis):
def plot_frequency(datas, lognames, max_freq):
calibration_data = calc_freq_response(datas[0], max_freq)
for data in datas[1:]:
- calibration_data.join(calc_freq_response(data, max_freq))
+ calibration_data.add_data(calc_freq_response(data, max_freq))
freqs = calibration_data.freq_bins
psd = calibration_data.psd_sum[freqs <= max_freq]
px = calibration_data.psd_x[freqs <= max_freq]
@@ -158,7 +158,7 @@ def write_frequency_response(datas, output):
helper = ShaperCalibrate(printer=None)
calibration_data = helper.process_accelerometer_data(datas[0])
for data in datas[1:]:
- calibration_data.join(helper.process_accelerometer_data(data))
+ calibration_data.add_data(helper.process_accelerometer_data(data))
helper.save_calibration_data(output, calibration_data)
def write_specgram(psd, freq_bins, time, output):