diff options
Diffstat (limited to 'glucometerutils/drivers')
| -rw-r--r-- | glucometerutils/drivers/accuchek_reports.py | 12 | ||||
| -rw-r--r-- | glucometerutils/drivers/freestyle_optium.py | 22 | ||||
| -rw-r--r-- | glucometerutils/drivers/otultra2.py | 22 | ||||
| -rw-r--r-- | glucometerutils/drivers/otultraeasy.py | 17 | ||||
| -rw-r--r-- | glucometerutils/drivers/otverio2015.py | 18 | ||||
| -rw-r--r-- | glucometerutils/drivers/sdcodefree.py | 4 |
6 files changed, 39 insertions, 56 deletions
diff --git a/glucometerutils/drivers/accuchek_reports.py b/glucometerutils/drivers/accuchek_reports.py index 941491e..f200471 100644 --- a/glucometerutils/drivers/accuchek_reports.py +++ b/glucometerutils/drivers/accuchek_reports.py @@ -68,13 +68,11 @@ class Device(object): def disconnect(self): self.report.close() - def get_information_string(self): - return ('%s glucometer\n' - 'Serial number: %s\n' - 'Default unit: %s' % ( - self.get_model(), - self.get_serial_number(), - self.get_glucose_unit())) + def get_meter_info(self): + return common.MeterInfo( + '%s glucometer' % self.get_model(), + serial_number=self.get_serial_number(), + native_unit=self.get_glucose_unit()) def get_model(self): # $device/MODEL/Reports/*.csv 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. diff --git a/glucometerutils/drivers/otultra2.py b/glucometerutils/drivers/otultra2.py index 9647947..b484f6b 100644 --- a/glucometerutils/drivers/otultra2.py +++ b/glucometerutils/drivers/otultra2.py @@ -159,22 +159,18 @@ class Device(object): line = self.serial_.readline().decode('ascii') return _validate_and_strip_checksum(line) - 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 ('OneTouch Ultra 2 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( + 'OneTouch Ultra 2 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. diff --git a/glucometerutils/drivers/otultraeasy.py b/glucometerutils/drivers/otultraeasy.py index f7d0270..4a61fe6 100644 --- a/glucometerutils/drivers/otultraeasy.py +++ b/glucometerutils/drivers/otultraeasy.py @@ -231,16 +231,13 @@ class Device(object): result = self._read_response() return result - def get_information_string(self): - return ('OneTouch Ultra Easy 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())) + def get_meter_info(self): + return common.MeterInfo( + 'OneTouch Ultra Easy glucometer', + serial_number=self.get_serial_number(), + version_info=( + 'Software version: ' + self.get_version(),), + native_unit=self.get_glucose_unit()) def get_version(self): result = self._send_command(_READ_VERSION) diff --git a/glucometerutils/drivers/otverio2015.py b/glucometerutils/drivers/otverio2015.py index e794e92..3e4c81b 100644 --- a/glucometerutils/drivers/otverio2015.py +++ b/glucometerutils/drivers/otverio2015.py @@ -132,17 +132,13 @@ class Device(object): def disconnect(self): return - def get_information_string(self): - return ('OneTouch %s glucometer\n' - 'Serial number: %s\n' - 'Software version: %s\n' - 'Time: %s\n' - 'Default unit: %s\n' % ( - self._query_string(_QUERY_KEY_MODEL), - self.get_serial_number(), - self.get_version(), - self.get_datetime(), - self.get_glucose_unit())) + def get_meter_info(self): + return common.MeterInfo( + 'OneTouch %s glucometer' % self._query_string(_QUERY_KEY_MODEL), + serial_number=self.get_serial_number(), + version_info=( + 'Software version: ' + self.get_version(),), + native_unit=self.get_glucose_unit()) def _query_string(self, query_key): response = self._send_message(_QUERY_REQUEST + query_key, 3) diff --git a/glucometerutils/drivers/sdcodefree.py b/glucometerutils/drivers/sdcodefree.py index ec232dd..e7ce753 100644 --- a/glucometerutils/drivers/sdcodefree.py +++ b/glucometerutils/drivers/sdcodefree.py @@ -141,8 +141,8 @@ class Device(object): if response != _DISCONNECTED_PACKET: raise exceptions.InvalidResponse(response=response) - def get_information_string(self): - return ('SD CodeFree glucometer\n') + def get_meter_info(self): + return common.MeterInfo('SD CodeFree glucometer') def get_version(self): raise NotImplementedError |