Disable negative Int deserialize for known positive values

Author: brefra

plugwise/messages/responses.py

@@ -229,7 +229,7 @@ def __init__(self):
         self.unknown1 = Int(0, length=2)
         self.network_is_online = Int(0, length=2)
         self.circle_plus_mac = String(None, length=16)
-        self.network_id = Int(0, length=4)
+        self.network_id = Int(0, 4, False)
         self.unknown2 = Int(0, length=2)
         self.params += [
             self.unknown1,
@@ -257,7 +257,7 @@ def __init__(self):
         super().__init__()
         self.in_RSSI = Int(0, length=2)
         self.out_RSSI = Int(0, length=2)
-        self.ping_ms = Int(0, length=4)
+        self.ping_ms = Int(0, 4, False)
         self.params += [
             self.in_RSSI,
             self.out_RSSI,
@@ -302,7 +302,7 @@ class CirclePlusScanResponse(NodeResponse):
     def __init__(self):
         super().__init__()
         self.node_mac = String(None, length=16)
-        self.node_address = Int(0, length=2)
+        self.node_address = Int(0, 2, False)
         self.params += [self.node_mac, self.node_address]
 
 
@@ -383,7 +383,7 @@ def __init__(self):
         super().__init__()
 
         self.time = RealClockTime()
-        self.day_of_week = Int(0, length=2)
+        self.day_of_week = Int(0, 2, False)
         self.date = RealClockDate()
         self.params += [self.time, self.day_of_week, self.date]
 
@@ -400,7 +400,7 @@ class CircleClockResponse(NodeResponse):
     def __init__(self):
         super().__init__()
         self.time = Time()
-        self.day_of_week = Int(0, 2)
+        self.day_of_week = Int(0, 2, False)
         self.unknown = Int(0, 2)
         self.unknown2 = Int(0, 4)
         self.params += [self.time, self.day_of_week, self.unknown, self.unknown2]
@@ -458,7 +458,7 @@ class NodeAwakeResponse(NodeResponse):
 
     def __init__(self):
         super().__init__()
-        self.awake_type = Int(0, length=2)
+        self.awake_type = Int(0, 2, False)
         self.params += [self.awake_type]
 
 
@@ -475,7 +475,7 @@ class NodeSwitchGroupResponse(NodeResponse):
 
     def __init__(self):
         super().__init__()
-        self.group = Int(0, length=2)
+        self.group = Int(0, 2, False)
         self.power_state = Int(0, length=2)
         self.params += [
             self.group,
@@ -526,7 +526,7 @@ class NodeAckResponse(NodeResponse):
 
     def __init__(self):
         super().__init__()
-        self.ack_id = Int(0, length=2)
+        self.ack_id = Int(0, 2, False)
 
 
 class SenseReportResponse(NodeResponse):

plugwise/util.py

@@ -171,18 +171,20 @@ class String(BaseType):
 
 
 class Int(BaseType):
-    def __init__(self, value, length=2):
+    def __init__(self, value, length=2, negative=True):
         self.value = value
         self.length = length
+        self.negative = negative
 
     def serialize(self):
         fmt = "%%0%dX" % self.length
         return bytes(fmt % self.value, UTF8_DECODE)
 
     def deserialize(self, val):
         self.value = int(val, 16)
-        mask = 1 << (self.length * 4 - 1)
-        self.value = -(self.value & mask) + (self.value & ~mask)
+        if self.negative:
+            mask = 1 << (self.length * 4 - 1)
+            self.value = -(self.value & mask) + (self.value & ~mask)
 
 
 class SInt(BaseType):
@@ -232,36 +234,33 @@ class DateTime(CompositeType):
     def __init__(self, year=0, month=0, minutes=0):
         CompositeType.__init__(self)
         self.year = Year2k(year - PLUGWISE_EPOCH, 2)
-        self.month = Int(month, 2)
-        self.minutes = Int(minutes, 4)
+        self.month = Int(month, 2, False)
+        self.minutes = Int(minutes, 4, False)
         self.contents += [self.year, self.month, self.minutes]
 
     def deserialize(self, val):
         CompositeType.deserialize(self, val)
         minutes = self.minutes.value
-        hours = minutes // 60
-        days = hours // 24
-        hours -= days * 24
-        minutes -= (days * 24 * 60) + (hours * 60)
-        try:
+        if minutes == 65535:
+            self.value = None
+        else:
+            hours = minutes // 60
+            days = hours // 24
+            hours -= days * 24
+            minutes -= (days * 24 * 60) + (hours * 60)
             self.value = datetime.datetime(
                 self.year.value, self.month.value, days + 1, hours, minutes
             )
-        except ValueError:
-            # debug(
-            #    "encountered value error while attempting to construct datetime object"
-            # )
-            self.value = None
 
 
 class Time(CompositeType):
     """time value as used in the clock info response"""
 
     def __init__(self, hour=0, minute=0, second=0):
         CompositeType.__init__(self)
-        self.hour = Int(hour, 2)
-        self.minute = Int(minute, 2)
-        self.second = Int(second, 2)
+        self.hour = Int(hour, 2, False)
+        self.minute = Int(minute, 2, False)
+        self.second = Int(second, 2, False)
         self.contents += [self.hour, self.minute, self.second]
 
     def deserialize(self, val):