From 7ceeddc76323e921f06e707717090d88df9e915f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20Elio=20Petten=C3=B2?= Date: Sun, 15 Jan 2017 13:10:23 +0000 Subject: Wrap the meter information to a namedtuple, instead of a string. This matches the gdef MeterInfo message, and produces a similar (though not identical) string as before. Importantly, it allows providing semantic information. --- glucometerutils/drivers/freestyle_optium.py | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) (limited to 'glucometerutils/drivers/freestyle_optium.py') diff --git a/glucometerutils/drivers/freestyle_optium.py b/glucometerutils/drivers/freestyle_optium.py index 8a20657..0b20946 100644 --- a/glucometerutils/drivers/freestyle_optium.py +++ b/glucometerutils/drivers/freestyle_optium.py @@ -127,22 +127,18 @@ class Device(object): # the commands and not replying to them. raise exceptions.ConnectionFailed() - def get_information_string(self): - """Returns a single string with all the identification information. + def get_meter_info(self): + """Fetch and parses the device information. Returns: - A string including the serial number, software version, date and time and - default unit. + A common.MeterInfo object. """ - return ('Freestyle Optium glucometer\n' - 'Serial number: %s\n' - 'Software version: %s\n' - 'Time: %s\n' - 'Default unit: %s' % ( - self.get_serial_number(), - self.get_version(), - self.get_datetime(), - self.get_glucose_unit())) + return common.MeterInfo( + 'Freestyle Optium glucometer', + serial_number=self.get_serial_number(), + version_info=( + 'Software version: ' + self.get_version(),), + native_unit=self.get_glucose_unit()) def get_version(self): """Returns an identifier of the firmware version of the glucometer. -- cgit v1.2.3