commit 2de2b36387ed55ec620767c6fd1583a4baa43d50
author Marc Bonnici <marc.bonnici@arm.com> Tue Jul 25 16:19:08 2017 +0100
committer Marc Bonnici <marc.bonnici@arm.com> Fri Aug 18 13:32:10 2017 +0100
tree 1013409f1267d0fbe5fab55e797bfab172a47aaa
parent 4d95656e499e9a416215762e30a8150293fbd671

Instrumentation: Fix conversion between microseconds and seconds

devlib/instrument/__init__.py

diff --git a/devlib/instrument/__init__.py b/devlib/instrument/__init__.py
index 044c7d4..dd5b1f5 100644
--- a/devlib/instrument/__init__.py
+++ b/devlib/instrument/__init__.py
@@ -75,12 +75,12 @@
     MeasurementType('unknown', None),
     MeasurementType('time', 'seconds',
         conversions={
-            'time_us': lambda x: x * 1000,
+            'time_us': lambda x: x * 1000000,
         }
     ),
     MeasurementType('time_us', 'microseconds',
         conversions={
-            'time': lambda x: x / 1000,
+            'time': lambda x: x / 1000000,
         }
     ),
     MeasurementType('temperature', 'degrees'),