Merge a56d152 into 5f297b3

gisce · Mar 9, 2020 · 6372f9a · 6372f9a
2 parents 5f297b3 + a56d152
commit 6372f9a
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/iec870ree/app_asdu.py b/iec870ree/app_asdu.py
@@ -594,10 +594,10 @@ def from_hex(self, data):
         self.RES1 = bitstring.BitArray(reversed(reversed_bits.read(2))).uint
         self.SU = reversed_bits.read(1).uint
         self.dayofmonth = bitstring.BitArray(reversed(reversed_bits.read(5)))\
-                                   .uint
+                                   .uint or 1
         self.dayofweek = bitstring.BitArray(reversed(reversed_bits.read(3)))\
                                   .uint
-        self.month = bitstring.BitArray(reversed(reversed_bits.read(4))).uint
+        self.month = bitstring.BitArray(reversed(reversed_bits.read(4))).uint or 1
         self.ETI = bitstring.BitArray(reversed(reversed_bits.read(2))).uint
         self.PTI = bitstring.BitArray(reversed(reversed_bits.read(2))).uint
         self.year = bitstring.BitArray(reversed(reversed_bits.read(7))).uint
@@ -654,9 +654,9 @@ def from_hex(self, data):
         self.hour = bitstring.BitArray(reversed(reversed_bits.read(5))).uint
         self.RES1 = bitstring.BitArray(reversed(reversed_bits.read(2))).uint
         self.SU = reversed_bits.read(1).uint
-        self.dayofmonth = bitstring.BitArray(reversed(reversed_bits.read(5))).uint
+        self.dayofmonth = bitstring.BitArray(reversed(reversed_bits.read(5))).uint or 1
         self.dayofweek = bitstring.BitArray(reversed(reversed_bits.read(3))).uint
-        self.month = bitstring.BitArray(reversed(reversed_bits.read(4))).uint
+        self.month = bitstring.BitArray(reversed(reversed_bits.read(4))).uint or 1
         self.ETI = bitstring.BitArray(reversed(reversed_bits.read(2))).uint
         self.PTI = bitstring.BitArray(reversed(reversed_bits.read(2))).uint
         self.year = bitstring.BitArray(reversed(reversed_bits.read(7))).uint