Added BAD message

Author: ty22117

base_station_main.py

@@ -47,7 +47,7 @@
 # The system will recommend disconnecting after missing TIMEOUT PINGs.
 # Exact timing depends on CHECK_FOR_TIMEOUTS_INTERVAL variable in base_station_tick()
 """
-from constants import TIMEOUT
+from constants import TIMEOUT, bUEs
 
 
 # Internal imports
@@ -195,15 +195,15 @@ def message_listener(self):
                     else:
                         logger.error(f"Got a connection request from {bue_id} but it is already listed as connected")
 
-                if message_body.startswith("ACK"):
+                elif message_body.startswith("ACK"):
                     logger.bind(bue_id=bue_id).info(f"Received ACK from {bue_id}")
 
-                if message_body.startswith("PING"):  # Looks like <origin id>,PING,<lat>,<long>
+                elif message_body.startswith("PING"):  # Looks like <origin id>,PING,<lat>,<long>
                     header, lat, long = message_body.split(",")
                     print(f"header: {header}, lat: {lat}, long: {long}", flush=True)
                     self.ping_bue(bue_id, lat, long)
 
-                if message_body.startswith("UPD"):  # 40,55,UPD:LAT,LONG,STDOUT: [helloworld.py STDOUT] TyGoodTest,-42,8
+                elif message_body.startswith("UPD"):  # 40,55,UPD:LAT,LONG,STDOUT: [helloworld.py STDOUT] TyGoodTest,-42,8
                     if not bue_id in self.testing_bues:
                         self.testing_bues.append(bue_id)
                     header, lat, long, stdout = message_body.split(",")
@@ -219,21 +219,24 @@ def message_listener(self):
                     if stdout != "":
                         self.stdout_history.append(stdout)
 
-                if message_body.startswith("FAIL"):
+                elif message_body.startswith("FAIL"):
                     logger.bind(bue_id=bue_id).error(f"Received FAIL from {bue_id}")
                     self.testing_bues.remove(bue_id)
 
-                if message_body.startswith("DONE"):
+                elif message_body.startswith("DONE"):
                     logger.bind(bue_id=bue_id).info(f"Received DONE from {bue_id}")
                     self.testing_bues.remove(bue_id)
 
-                if message_body.startswith("PREPR"):
+                elif message_body.startswith("PREPR"):
                     logger.bind(bue_id=bue_id).info(f"Received PREPR from {bue_id}")
                     self.testing_bues.append(bue_id)
 
-                if message_body.startswith("CANCD"):
+                elif message_body.startswith("CANCD"):
                     logger.bind(bue_id=bue_id).info(f"Received CANCD from {bue_id}")
                     self.testing_bues.remove(bue_id)
+                elif message_body.startswith("BAD"):
+                    logger.bind(bue_id=bue_id).info(f"Received BAD from {bue_id}")
+                    self.stdout_history.append(f"Received a BAD from {bUEs[str(bue_id)]}")
 
                 else:
                     logger.info(f"Received undefined message {message}")

ota.py

@@ -69,16 +69,13 @@ def read_from_port(self):
                 # Extract components: +RCV=origin,length,message_with_crc,rssi,snr
                 origin = parts[0][5:]
                 message_with_crc_part = ",".join(parts[2:-2])
-                # print(parts)
-                # print(f"Message with CRC Part: {message_with_crc_part}")
 
                 valid_crc, original_message = self.verify_crc(message_with_crc_part)
 
                 if not valid_crc:  # Bad checksum
+                    self.send_ota_message(origin, "BAD")
                     continue
 
-                # print("!!!!!!!!!!!")
-
                 self.recv_msgs.put(f"{origin},{original_message}")
             except Exception as e:
                 print(f"OTA encountered some error: {e}")