Merge pull request #39 from ElectronicCats/experimental

fix: LoRa RSSI and SNR bytes

Author: JahazielLem

pycatsniffer_bv3/Modules/Packets.py

@@ -34,9 +34,7 @@ def __init__(self, packet_bytes: bytes) -> None:
         self.unpack()
 
     def unpack(self) -> None:
-        (
-            self.start_of_frame,
-        ) = struct.unpack_from("<H", self.packet_bytes)
+        (self.start_of_frame,) = struct.unpack_from("<H", self.packet_bytes)
         self.packet_length = struct.unpack(">H", self.packet_bytes[2:4])[0]
         self.bytes_payload = self.packet_bytes[4:-2]
         (self.end_of_frame,) = struct.unpack_from("<H", self.packet_bytes[-2:])
@@ -69,12 +67,9 @@ def __init__(self, packet_bytes: bytes) -> None:
 
     def unpack(self) -> None:
         super().unpack()
-        self.payload = self.bytes_payload[:-2]
-        (self.rssi,) = struct.unpack_from(">h", self.bytes_payload[-2:])
-        # rssi_convertion = ((self.rssi / 32767.0) * (0 - (-120))) + (-120)
-        # self.rssi = rssi_convertion
-        # self.rssi = self.bytes_payload[-2:]
-        # self.snr = self.bytes_payload[-1:]
+        self.payload = self.bytes_payload[:-8]
+        (self.rssi,) = struct.unpack_from("<f", self.bytes_payload[-8:])
+        (self.snr,) = struct.unpack_from("<f", self.bytes_payload[-4:])
 
     def digiest(self) -> str:
         return (

pycatsniffer_bv3/Modules/Protocols.py

@@ -234,7 +234,7 @@ def set_badwidth(self, badwidth_index: int) -> None:
     spacing=125,
     channel_range=[(0, 433), (1, 434), (2, 435)],
     pcap_header=148,
-    profile="Default"
+    profile="Default",
 )
 
 

pycatsniffer_bv3/Modules/SnifferCollector.py

@@ -230,9 +230,9 @@ def handle_sniffer_data(self):
                                     + int(self.lora_spreading_factor).to_bytes(
                                         1, "little"
                                     )
-                                    + int(self.lora_coding_rate).to_bytes(2, "little")
-                                    # + int(self.sniffer_data.rssi).to_bytes(2, "little")
-                                    + struct.pack("<h", int(self.sniffer_data.rssi))
+                                    + int(self.lora_coding_rate).to_bytes(1, "little")
+                                    + struct.pack("<f", self.sniffer_data.rssi)
+                                    + struct.pack("<f", self.sniffer_data.snr)
                                     + self.sniffer_data.payload
                                 )
                             else: