sascha/devlib
1
0
Fork 0
mirror of https://github.com/ARM-software/devlib.git synced 2025-01-31 02:00:45 +00:00
Code Issues Releases Wiki Activity

daq: Rename sampling_rate->sample_rate_hz

Browse Source 
For consistency with the new Instrument.sample_rate_hz attribute.
This commit is contained in:
Brendan Jackman 2017-04-26 16:17:43 +01:00
parent fc81477cf8
commit 0d61ee5951
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
devlib/instrument/daq.py
View File

@ -27,7 +27,7 @@ class DaqInstrument(Instrument):
device_id='Dev1', device_id='Dev1',
v_range=2.5, v_range=2.5,
dv_range=0.2, 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), channel_map=(0, 1, 2, 3, 4, 5, 6, 7, 16, 17, 18, 19, 20, 21, 22, 23),
): ):
# pylint: disable=no-member # pylint: disable=no-member
@ -51,11 +51,11 @@ class DaqInstrument(Instrument):
self.device_config = DeviceConfiguration(device_id=device_id, self.device_config = DeviceConfiguration(device_id=device_id,
v_range=v_range, v_range=v_range,
dv_range=dv_range, dv_range=dv_range,
sampling_rate=sampling_rate, sampling_rate=sample_rate_hz,
resistor_values=resistor_values, resistor_values=resistor_values,
channel_map=channel_map, channel_map=channel_map,
labels=labels) labels=labels)
self.sample_rate_hz = sampling_rate self.sample_rate_hz = sample_rate_hz
for label in labels: for label in labels:
for kind in ['power', 'voltage']: for kind in ['power', 'voltage']: