From 0d61ee5951d6b25e9957f1e0aae4cd560862d542 Mon Sep 17 00:00:00 2001 From: Brendan Jackman Date: Wed, 26 Apr 2017 16:17:43 +0100 Subject: [PATCH] daq: Rename sampling_rate->sample_rate_hz For consistency with the new Instrument.sample_rate_hz attribute. --- devlib/instrument/daq.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/devlib/instrument/daq.py b/devlib/instrument/daq.py index 40269c0..58d2f3e 100644 --- a/devlib/instrument/daq.py +++ b/devlib/instrument/daq.py @@ -27,7 +27,7 @@ class DaqInstrument(Instrument): device_id='Dev1', v_range=2.5, dv_range=0.2, - sampling_rate=10000, + sample_rate_hz=10000, channel_map=(0, 1, 2, 3, 4, 5, 6, 7, 16, 17, 18, 19, 20, 21, 22, 23), ): # pylint: disable=no-member @@ -51,11 +51,11 @@ class DaqInstrument(Instrument): self.device_config = DeviceConfiguration(device_id=device_id, v_range=v_range, dv_range=dv_range, - sampling_rate=sampling_rate, + sampling_rate=sample_rate_hz, resistor_values=resistor_values, channel_map=channel_map, labels=labels) - self.sample_rate_hz = sampling_rate + self.sample_rate_hz = sample_rate_hz for label in labels: for kind in ['power', 'voltage']: