From 9b465c27662a8cdf68a52d02b823fc7d51cae051 Mon Sep 17 00:00:00 2001 From: Marc Bonnici Date: Fri, 18 Aug 2017 09:59:23 +0100 Subject: [PATCH] Instruments: Add millisecond MeasurementType and conversion Allows for reporting times in milliseconds as used with the acmecape instrument. --- devlib/instrument/__init__.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/devlib/instrument/__init__.py b/devlib/instrument/__init__.py index dd5b1f5..f1a89e0 100644 --- a/devlib/instrument/__init__.py +++ b/devlib/instrument/__init__.py @@ -76,11 +76,19 @@ _measurement_types = [ MeasurementType('time', 'seconds', conversions={ 'time_us': lambda x: x * 1000000, + 'time_ms': lambda x: x * 1000, } ), MeasurementType('time_us', 'microseconds', conversions={ 'time': lambda x: x / 1000000, + 'time_ms': lambda x: x / 1000, + } + ), + MeasurementType('time_ms', 'milliseconds', + conversions={ + 'time': lambda x: x / 1000, + 'time_us': lambda x: x * 1000, } ), MeasurementType('temperature', 'degrees'),