diff --git a/asset/saved_video/ground_station_record.mp4 b/asset/saved_video/ground_station_record.mp4 index f0cd945..0eaf214 100644 Binary files a/asset/saved_video/ground_station_record.mp4 and b/asset/saved_video/ground_station_record.mp4 differ diff --git a/config.json b/config.json index d8e8174..a181426 100644 --- a/config.json +++ b/config.json @@ -16,6 +16,9 @@ "connection_string": "/dev/ttyUSB0", "baud_rate": 57600 }, + "fc_info":{ + "type": "ardupilot" + }, "pid_y": { "kp": 1.0, "ki": 0.02, diff --git a/drone_controller/mission_manager.py b/drone_controller/mission_manager.py index f80b167..760b016 100644 --- a/drone_controller/mission_manager.py +++ b/drone_controller/mission_manager.py @@ -85,7 +85,7 @@ class MissionManager: print(f"[INIT] 起始点坐标: ({self.home_x:.2f}, {self.home_y:.2f}, {self.home_z:.2f})") print("[INIT] 正在下发 GUIDED/OFFBOARD 模式并尝试解锁...") - target_mode = 'GUIDED' if 'guided' in self.drone.current_mode.lower() or True else 'OFFBOARD' + target_mode = "OFFBOARD" if "OFFBOARD" in self.drone.master.mode_mapping() else "GUIDED" self.drone.set_mode(target_mode) self.drone.arm() self.state = MissionState.ARMING diff --git a/infer_camera_modular.py b/infer_camera_modular.py index 101a6d2..06df56f 100644 --- a/infer_camera_modular.py +++ b/infer_camera_modular.py @@ -250,6 +250,7 @@ class UAVControlLoop: def start_uav(self): """ 连接并解锁无人机 """ self.uav.connect() + self.uav.print_status() if not self.uav.is_armed and self.uav.current_mode not in ['GUIDED', 'OFFBOARD']: self.uav.arm() @@ -324,14 +325,15 @@ def main(): # 启动无人机连接 controller.start_uav() + print("🚀 NPU 精准推理 [JSON配置动态加载版] 主循环启动...") try: while True: ret, frame = streamer.read_frame() if not ret: - print("❌ 未能读取到摄像头数据,退出中...") - break + time.sleep(0.005) + continue orig_shape = frame.shape[:2]