Start working on parsing

Author: EliasJRH

Dockerfile

@@ -1,28 +1,24 @@
 # Python-slim base image
 FROM python:3.11-slim
 
-MAINTAINER Jacob Terkuc
+LABEL MAINTAINER="Jacob Terkuc"
+LABEL MAINTAINER="Elias Hawa"
 
 # Update and upgrade packages
 RUN apt-get update && apt-get upgrade -y && pip install --upgrade pip
 
-# Install Virtual Env
-RUN pip install virtualenv
-
 # Set the working directory in the container
 WORKDIR /app/ground-station
 
 # Copy files
-COPY . .
-
-# Set up VENV and "source"
-ENV VIRTUAL_ENV=/app/ground-station
-RUN python3 -m venv $VIRTUAL_ENV
-ENV PATH="$VIRTUAL_ENV/bin:$PATH"
+COPY requirements.txt .
 
 # Install any needed packages specified in requirements.txt
 RUN pip install -r requirements.txt
 
+# Copy files
+COPY . .
+
 # Expose port 33845
 EXPOSE 33845/udp
 

modules/misc/config.py

@@ -66,7 +66,7 @@ class RadioParameters:
     preamble_len: int = 6
     cyclic_redundancy: bool = True
     iqi: bool = False
-    sync_word: str = "0x43"
+    # sync_word: str = "0x43"
 
     def __post_init__(self):
         if self.frequency not in range(*LF_RANGE) and self.frequency not in range(*HF_RANGE):
@@ -83,9 +83,9 @@ def __post_init__(self):
         if self.preamble_len not in range(*PREAMBLE_RANGE):
             raise ValueError(f"Preamble length '{self.preamble_len}' not within allowed range of {PREAMBLE_RANGE}")
 
-        if int(self.sync_word, 16) not in range(*SYNC_RANGE):
-            raise ValueError(f"Sync word '{self.sync_word}' not within allowed range of {SYNC_RANGE}")
-        self.sync_word = self.sync_word[2:]  # Remove 0x
+        # if int(self.sync_word, 16) not in range(*SYNC_RANGE):
+        #     raise ValueError(f"Sync word '{self.sync_word}' not within allowed range of {SYNC_RANGE}")
+        # self.sync_word = self.sync_word[2:]  # Remove 0x
 
     @classmethod
     def from_json(cls, data: JSON) -> Self:
@@ -103,7 +103,7 @@ def from_json(cls, data: JSON) -> Self:
             preamble_len=data.get("preamble_len", 6),
             cyclic_redundancy=data.get("cyclic_redundancy", True),
             iqi=data.get("iqi", False),
-            sync_word=data.get("sync_word", "0x43"),
+            # sync_word=data.get("sync_word", "0x43"),
         )
 
     def __iter__(self):
@@ -116,7 +116,7 @@ def __iter__(self):
         yield "preamble_len", self.preamble_len
         yield "cyclic_redundancy", self.cyclic_redundancy
         yield "iqi", self.iqi
-        yield "sync_word", self.sync_word
+        # yield "sync_word", self.sync_word
 
 
 @dataclass

modules/serial/rn2483_radio.py

@@ -36,7 +36,7 @@
     "preamble_len": "prlen",
     "cyclic_redundancy": "crc",
     "iqi": "iqi",
-    "sync_word": "sync",
+    # "sync_word": "sync",
 }
 
 

modules/telemetry/v2/block.py

@@ -62,12 +62,11 @@ class BlockHeader:
 #Parse packet header
 def parse_packet_header(header_bytes: bytes) -> PacketHeader:
     try: 
+        logger.info(header_bytes)
         callsign_bytes = header_bytes[:18]
-        callsign = ''
-        for c in callsign_bytes:
-            callsign += chr(c) 
-        timestamp, num_blocks, packet_num = struct.unpack("<HBB", header_bytes[18:])
-        return PacketHeader(callsign.decode("hex"), timestamp, num_blocks, packet_num)
+        callsign = bytes.fromhex(callsign_bytes) 
+        timestamp, num_blocks, packet_num = struct.unpack("<HBB", bytes(header_bytes[18:]))
+        return PacketHeader(callsign, timestamp, num_blocks, packet_num)
     except ValueError as e:
         raise InvalidHeaderFieldValueError(e)