diff --git a/modules/common b/modules/common index a710405b..a48579ef 160000 --- a/modules/common +++ b/modules/common @@ -1 +1 @@ -Subproject commit a710405b4bc11bdad6bccfc50e0e495f21c8394f +Subproject commit a48579ef93b187e0a6b72ca941108866e270f089 diff --git a/modules/flight_interface/flight_interface.py b/modules/flight_interface/flight_interface.py index 581e7fd9..df857245 100644 --- a/modules/flight_interface/flight_interface.py +++ b/modules/flight_interface/flight_interface.py @@ -104,7 +104,7 @@ def run(self, message: bytes | None) -> "tuple[bool, odometry_and_time.OdometryA self.__logger.info(str(odometry_and_time_object), True) if message: - self.controller.send_statustext_msg(message) + self.controller.send_statustext_msg(str(message, encoding="utf-8")) return True, odometry_and_time_object diff --git a/tests/integration/test_communications_to_ground_station.py b/tests/integration/test_communications_to_ground_station.py index e8e72a81..e9856d5b 100644 --- a/tests/integration/test_communications_to_ground_station.py +++ b/tests/integration/test_communications_to_ground_station.py @@ -15,7 +15,7 @@ from modules.flight_interface import flight_interface_worker -MAVLINK_CONNECTION_ADDRESS = "tcp:localhost:14550" +MAVLINK_CONNECTION_ADDRESS = "tcp:localhost:5762" FLIGHT_INTERFACE_TIMEOUT = 30.0 # seconds FLIGHT_INTERFACE_BAUD_RATE = 57600 # symbol rate FLIGHT_INTERFACE_WORKER_PERIOD = 0.1 # seconds @@ -30,9 +30,9 @@ def apply_communications_test( """ gps_coordinates = [ position_global.PositionGlobal.create(43.47321268948186, -80.53950244232878, 10), # E7 - position_global.PositionGlobal.create(37.7749, 122.4194, 30), # San Francisco - position_global.PositionGlobal.create(40.7128, 74.0060, -5.6), # New York - position_global.PositionGlobal.create(51.5072, 0.1276, 20.1), # London UK + position_global.PositionGlobal.create(37.752254, -122.454425, 30), # San Francisco + position_global.PositionGlobal.create(40.772927, -73.972933, -5.6), # New York + position_global.PositionGlobal.create(51.507479, -0.127764, 20.1), # London UK ] # Place the GPS coordinates @@ -61,10 +61,6 @@ def apply_communications_test( # Wait for processing time.sleep(10) - # Verify that stuff is sending - print( - "TEST OPERATOR ACTION REQUIRED: Open mission planner's MAVLink inspector or the groundside repo (https://github.com/UWARG/statustext-parser-2025) to check for MAVLink messages" - ) return True @@ -125,4 +121,8 @@ def main() -> int: if result_main < 0: print(f"ERROR: Status code: {result_main}") + # Verify that stuff is sending + print( + "TEST OPERATOR ACTION REQUIRED: Open mission planner's MAVLink inspector or the groundside repo (https://github.com/UWARG/statustext-parser-2025) to check for MAVLink messages" + ) print("Done!")