Fix invalid RSSI byte used for TIC parsing. (#142)

* Adjust TIC parsing * Adjust linting for py10
Danielhiversen · Jun 28, 2022 · 02a41ee · 02a41ee
1 parent 212d7af
commit 02a41ee
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 4 deletions.
diff --git a/RFXtrx/__init__.py b/RFXtrx/__init__.py
@@ -937,7 +937,7 @@ def receive_blocking(self, data=None):
         """ Emulate a receive by parsing the given data """
         return self.receive(data)
 
-    def send(self, data):  # pylint: disable=R0201
+    def send(self, data):
         """ Emulate a send by doing nothing (except printing debug info if
             requested) """
         pkt = bytearray(data)

diff --git a/RFXtrx/lowlevel.py b/RFXtrx/lowlevel.py
@@ -2264,7 +2264,7 @@ def load_receive(self, data):
                 self.currentwatt = None
             self.state_byte = data[20]
             self.teleinfo_ok = not (data[20] & 0x04) == 0x04
-            self.rssi_byte = data[17]
+            self.rssi_byte = data[21]
         elif self.subtype == 0x02:
             # Cartelectronic Encoder
             self.counter1 = ((data[8] * pow(2, 24)) + (data[9] << 16) +

diff --git a/pylintrc b/pylintrc
@@ -7,7 +7,6 @@ reports=no
 
 disable=
   locally-disabled,
-  redefined-variable-type
 
 
 [MESSAGES CONTROL]

diff --git a/tests/test_base.py b/tests/test_base.py
@@ -215,7 +215,7 @@ def test_format_packet(self):
                        0x79]
         event = core.transport.parse(bytes_array)
         self.assertEqual(RFXtrx.SensorEvent, type(event))
-        self.assertEqual(event.__str__(),"<class 'RFXtrx.SensorEvent'> device=[<class 'RFXtrx.RFXtrxDevice'> type='CARTELECTRONIC_TIC' id='77d200686'] values=[('Battery numeric', 0), ('Contract type', 17), ('Count', 0), ('Counter value', 3838665), ('Energy usage', 330), ('Rssi numeric', 0), ('Sensor Status', True)]")
+        self.assertEqual(event.__str__(),"<class 'RFXtrx.SensorEvent'> device=[<class 'RFXtrx.RFXtrxDevice'> type='CARTELECTRONIC_TIC' id='77d200686'] values=[('Battery numeric', 9), ('Contract type', 17), ('Count', 0), ('Counter value', 3838665), ('Energy usage', 330), ('Rssi numeric', 7), ('Sensor Status', True)]")
 
         #Cartelectronic Encoder
         bytes_array = [0x11, 0x60, 0x02, 0x5f, 0x3f, 0xfe, 0x61, 0xa3, 0x00, 0x00, 0x47, 0xd4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x69]