Update GUI 2.1.0: logs history tab, drone panel attitude, linear twist overview
This commit is contained in:
+34
-22
@@ -19,6 +19,10 @@ from enum import Enum
|
||||
from PyQt6.QtCore import QObject, QTimer, pyqtSignal
|
||||
|
||||
|
||||
def _log(level, message):
|
||||
print(f"[{level}] {message}")
|
||||
|
||||
|
||||
class MissionState(Enum):
|
||||
"""整體任務狀態"""
|
||||
IDLE = "idle"
|
||||
@@ -109,7 +113,7 @@ class MissionExecutor(QObject):
|
||||
|
||||
def start(self, planned_waypoints):
|
||||
if self.state == MissionState.RUNNING:
|
||||
print("任務已在執行中")
|
||||
_log("WARN", "任務已在執行中")
|
||||
return
|
||||
|
||||
self.tasks.clear()
|
||||
@@ -132,31 +136,34 @@ class MissionExecutor(QObject):
|
||||
f"rendezvous WP={sorted(self.rendezvous_indices)}"
|
||||
if self.rendezvous_indices else "無 rendezvous (各自跑)"
|
||||
)
|
||||
print(f"任務啟動: {len(self.tasks)} 架無人機, "
|
||||
f"共 {total_wps} 個航點, "
|
||||
f"到達半徑={self.arrival_radius}m, "
|
||||
f"tick 週期={self._interval_ms}ms, "
|
||||
f"barrier timeout={self.barrier_timeout_sec}s, "
|
||||
f"{rv_info}")
|
||||
_log(
|
||||
"INFO",
|
||||
f"任務已啟動: {len(self.tasks)} 架無人機, "
|
||||
f"共 {total_wps} 個航點, "
|
||||
f"到達半徑={self.arrival_radius}m, "
|
||||
f"tick 週期={self._interval_ms}ms, "
|
||||
f"barrier timeout={self.barrier_timeout_sec}s, "
|
||||
f"{rv_info}",
|
||||
)
|
||||
|
||||
def pause(self):
|
||||
if self.state == MissionState.RUNNING:
|
||||
self._timer.stop()
|
||||
self.state = MissionState.PAUSED
|
||||
print("任務暫停")
|
||||
_log("INFO", "任務已暫停")
|
||||
|
||||
def resume(self):
|
||||
if self.state == MissionState.PAUSED:
|
||||
self._timer.start(self._interval_ms)
|
||||
self.state = MissionState.RUNNING
|
||||
print("任務恢復")
|
||||
_log("INFO", "任務已恢復")
|
||||
|
||||
def stop(self):
|
||||
self._timer.stop()
|
||||
self.tasks.clear()
|
||||
self.rendezvous_indices = set()
|
||||
self.state = MissionState.IDLE
|
||||
print("任務停止")
|
||||
_log("INFO", "任務已停止")
|
||||
|
||||
# ------------------------------------------------------------------ 控制迴圈
|
||||
|
||||
@@ -197,7 +204,7 @@ class MissionExecutor(QObject):
|
||||
# rendezvous 點 → 不推進,進入 barrier 等待
|
||||
task.status = TaskStatus.WAITING_AT_BARRIER
|
||||
task.waiting_since = now
|
||||
print(f" {task.drone_id} → 抵達 barrier WP {task.wp_index},等待同伴")
|
||||
_log("INFO", f"{task.drone_id} 抵達 barrier WP {task.wp_index},等待同伴")
|
||||
self.task_status_changed.emit(
|
||||
task.drone_id, task.status.value,
|
||||
f"waiting at WP {task.wp_index}"
|
||||
@@ -236,7 +243,7 @@ class MissionExecutor(QObject):
|
||||
self._timer.stop()
|
||||
self.state = MissionState.IDLE
|
||||
self.mission_completed.emit()
|
||||
print("===== 任務全部完成 =====")
|
||||
_log("INFO", "任務全部完成")
|
||||
|
||||
def _advance_waypoint(self, task, arrived_distance):
|
||||
"""把 task 推進一個航點,重置發送旗標。不處理 barrier 邏輯。"""
|
||||
@@ -248,14 +255,20 @@ class MissionExecutor(QObject):
|
||||
self.drone_waypoint_reached.emit(
|
||||
task.drone_id, task.wp_index, task.total_waypoints
|
||||
)
|
||||
print(f" {task.drone_id} → DONE "
|
||||
f"({task.total_waypoints}/{task.total_waypoints})")
|
||||
_log(
|
||||
"INFO",
|
||||
f"{task.drone_id} 已完成所有航點 "
|
||||
f"({task.total_waypoints}/{task.total_waypoints})",
|
||||
)
|
||||
return
|
||||
self.drone_waypoint_reached.emit(
|
||||
task.drone_id, task.wp_index, task.total_waypoints
|
||||
)
|
||||
print(f" {task.drone_id} → WP {task.wp_index}/{task.total_waypoints} "
|
||||
f"(到達距離: {arrived_distance:.1f}m)")
|
||||
_log(
|
||||
"INFO",
|
||||
f"{task.drone_id} 前往 WP {task.wp_index}/{task.total_waypoints} "
|
||||
f"(到達距離: {arrived_distance:.1f}m)",
|
||||
)
|
||||
|
||||
def _check_barriers(self, now):
|
||||
"""檢查每個有人在等的 barrier 能不能釋放。"""
|
||||
@@ -289,14 +302,13 @@ class MissionExecutor(QObject):
|
||||
oldest_wait = min(t.waiting_since for t in waiting_tasks)
|
||||
if now - oldest_wait >= self.barrier_timeout_sec:
|
||||
force_reason = f"timeout {self.barrier_timeout_sec:.0f}s"
|
||||
print(f"⚠️ barrier WP {barrier_idx} {force_reason},強制放行")
|
||||
_log("WARN", f"barrier WP {barrier_idx} {force_reason},強制放行")
|
||||
else:
|
||||
continue # 還沒到齊、也還沒 timeout → 繼續等
|
||||
|
||||
# 釋放:把所有在此 barrier 等待的機一起推進
|
||||
tag = "全員到齊" if force_reason is None else force_reason
|
||||
print(f"✅ barrier WP {barrier_idx} 釋放 ({tag}),"
|
||||
f"推進 {len(waiting_tasks)} 架")
|
||||
_log("INFO", f"barrier WP {barrier_idx} 已釋放 ({tag}),推進 {len(waiting_tasks)} 架")
|
||||
for task in waiting_tasks:
|
||||
task.status = TaskStatus.NORMAL
|
||||
msg = f"barrier WP {barrier_idx} released ({tag})"
|
||||
@@ -324,7 +336,7 @@ class MissionExecutor(QObject):
|
||||
return
|
||||
|
||||
task.fail_count += 1
|
||||
print(f"⚠️ {drone_id} 發送失敗 {task.fail_count}/{self.MAX_RETRY}: {message}")
|
||||
_log("WARN", f"{drone_id} 發送失敗 {task.fail_count}/{self.MAX_RETRY}: {message}")
|
||||
|
||||
if task.fail_count < self.MAX_RETRY:
|
||||
task.status = TaskStatus.RETRYING
|
||||
@@ -339,13 +351,13 @@ class MissionExecutor(QObject):
|
||||
drone_id, task.status.value,
|
||||
f"fallback LOITER after {self.MAX_RETRY} fails: {message}"
|
||||
)
|
||||
print(f"❌ {drone_id} 連續失敗 {self.MAX_RETRY} 次 → 切換 LOITER")
|
||||
_log("ERROR", f"{drone_id} 連續失敗 {self.MAX_RETRY} 次,切換至 LOITER")
|
||||
self._fallback_to_loiter(drone_id)
|
||||
|
||||
def _fallback_to_loiter(self, drone_id):
|
||||
"""用 monitor.set_mode 切 LOITER。set_mode 是 coroutine,透過 event loop 派送。"""
|
||||
if self.monitor is None:
|
||||
print(f"⚠️ 無 monitor,無法將 {drone_id} 切到 LOITER")
|
||||
_log("WARN", f"無 monitor,無法將 {drone_id} 切換至 LOITER")
|
||||
return
|
||||
try:
|
||||
loop = asyncio.get_event_loop()
|
||||
|
||||
Reference in New Issue
Block a user