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

Merge pull request #116 from bjackman/instrument-sample-rate

Browse Source 
Add sample_rate_hz attribute to CONTINUOUS instruments
This commit is contained in:
setrofim 2017-04-26 16:22:33 +01:00 committed by GitHub
commit b5ecf63638
5 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
devlib/instrument/__init__.py
View File

@ -170,6 +170,7 @@ class Instrument(object):
self.logger = logging.getLogger(self.__class__.__name__) self.logger = logging.getLogger(self.__class__.__name__)
self.channels = collections.OrderedDict() self.channels = collections.OrderedDict()
self.active_channels = [] self.active_channels = []
self.sample_rate_hz = None
# channel management # channel management

5
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,10 +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 = sample_rate_hz
for label in labels: for label in labels:
for kind in ['power', 'voltage']: for kind in ['power', 'voltage']:

1
devlib/instrument/energy_probe.py
View File

@ -51,6 +51,7 @@ class EnergyProbeInstrument(Instrument):
self.command = None self.command = None
self.raw_output_directory = None self.raw_output_directory = None
self.process = None self.process = None
self.sample_rate_hz = 10000 # Determined empirically
for label in self.labels: for label in self.labels:
for kind in self.attributes: for kind in self.attributes:

1
devlib/platform/arm.py
View File

@ -236,6 +236,7 @@ class JunoEnergyInstrument(Instrument):
for chan in self._channels: for chan in self._channels:
self.channels[chan.name] = chan self.channels[chan.name] = chan
self.on_target_file = self.target.tempfile('energy', '.csv') self.on_target_file = self.target.tempfile('energy', '.csv')
self.sample_rate_hz = 10 # DEFAULT_PERIOD is 100[ms] in readenergy.c
self.command = '{} -o {}'.format(self.binary, self.on_target_file) self.command = '{} -o {}'.format(self.binary, self.on_target_file)
self.command2 = '{}'.format(self.binary) self.command2 = '{}'.format(self.binary)

6
doc/instrumentation.rst
View File

@ -146,6 +146,12 @@ Instrument
.. note:: This method is only implemented by :class:`Instrument`\ s that .. note:: This method is only implemented by :class:`Instrument`\ s that
support ``CONTINUOUS`` measurment. support ``CONTINUOUS`` measurment.
.. attribute:: Instrument.sample_rate_hz
Sample rate of the instrument in Hz. Assumed to be the same for all channels.
.. note:: This attribute is only provided by :class:`Instrument`\ s that
support ``CONTINUOUS`` measurment.
Instrument Channel Instrument Channel
~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~