From 2de2b36387ed55ec620767c6fd1583a4baa43d50 Mon Sep 17 00:00:00 2001 From: Marc Bonnici Date: Tue, 25 Jul 2017 16:19:08 +0100 Subject: [PATCH] Instrumentation: Fix conversion between microseconds and seconds --- devlib/instrument/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 @@ _measurement_types = [ 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'),