From 56a5f8ab12d9066601de884b9f373d1859db8b25 Mon Sep 17 00:00:00 2001 From: Sergei Trofimov Date: Mon, 11 Dec 2017 17:14:00 +0000 Subject: [PATCH] platforms/arm: JunoEnergyInstrument fixes - Make sure commands are updated after installing readenergy binary during setup. - Add the missing channels argument to reset(). - Set the sample rate for the MeasurementCsv inside get_data(). --- devlib/platform/arm.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/devlib/platform/arm.py b/devlib/platform/arm.py index 7d3ced2..199bb2f 100644 --- a/devlib/platform/arm.py +++ b/devlib/platform/arm.py @@ -245,9 +245,11 @@ class JunoEnergyInstrument(Instrument): def setup(self): self.binary = self.target.install(os.path.join(PACKAGE_BIN_DIRECTORY, self.target.abi, self.binname)) + self.command = '{} -o {}'.format(self.binary, self.on_target_file) + self.command2 = '{}'.format(self.binary) - def reset(self, sites=None, kinds=None): - super(JunoEnergyInstrument, self).reset(sites, kinds) + def reset(self, sites=None, kinds=None, channels=None): + super(JunoEnergyInstrument, self).reset(sites, kinds, channels) self.target.killall(self.binname, as_root=True) def start(self): @@ -282,7 +284,7 @@ class JunoEnergyInstrument(Instrument): write_row = [row[c] for c in select_columns] writer.writerow(write_row) - return MeasurementsCsv(output_file, self.active_channels) + return MeasurementsCsv(output_file, self.active_channels, sample_rate_hz=10) def take_measurement(self): result = []