From 4819131ff81532c06c5eccc4c70135e72ca3f7c9 Mon Sep 17 00:00:00 2001 From: Arkadiusz Bulski Date: Fri, 16 Feb 2018 08:24:25 +0100 Subject: construct-code is (almost) uptodate --- glucometerutils/support/construct_extras.py | 4 ++-- glucometerutils/support/freestyle.py | 2 +- glucometerutils/support/lifescan_binary_protocol.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'glucometerutils/support') diff --git a/glucometerutils/support/construct_extras.py b/glucometerutils/support/construct_extras.py index cb42105..6d4e302 100644 --- a/glucometerutils/support/construct_extras.py +++ b/glucometerutils/support/construct_extras.py @@ -23,11 +23,11 @@ class Timestamp(construct.Adapter): super(Timestamp, self).__init__(subcon) self.epoch = epoch - def _encode(self, obj, context): + def _encode(self, obj, context, path): assert isinstance(obj, datetime.datetime) epoch_date = datetime.datetime.utcfromtimestamp(self.epoch) delta = obj - epoch_date return int(delta.total_seconds()) - def _decode(self, obj, context): + def _decode(self, obj, context, path): return datetime.datetime.utcfromtimestamp(obj + self.epoch) diff --git a/glucometerutils/support/freestyle.py b/glucometerutils/support/freestyle.py index 50f5319..9b7d72e 100644 --- a/glucometerutils/support/freestyle.py +++ b/glucometerutils/support/freestyle.py @@ -26,7 +26,7 @@ from glucometerutils.support import hiddevice _INIT_SEQUENCE = (0x04, 0x05, 0x15, 0x01) _FREESTYLE_MESSAGE = construct.Struct( - 'hid_report' / construct.Const(construct.Byte, 0), + 'hid_report' / construct.Const(0, construct.Byte), 'message_type' / construct.Byte, 'command' / construct.Padded( 63, # command can only be up to 62 bytes, but one is used for length. diff --git a/glucometerutils/support/lifescan_binary_protocol.py b/glucometerutils/support/lifescan_binary_protocol.py index caa9b63..6579ab0 100644 --- a/glucometerutils/support/lifescan_binary_protocol.py +++ b/glucometerutils/support/lifescan_binary_protocol.py @@ -33,7 +33,7 @@ def LifeScanPacket(command_prefix, include_link_control): else: link_control_construct = construct.Const(b'\x00') - command_prefix_construct = construct.Const(construct.Byte, command_prefix) + command_prefix_construct = construct.Const(command_prefix, construct.Byte) return construct.Struct( construct.RawCopy( -- cgit v1.2.3