2026.7.1小更新

This commit is contained in:
2026-07-01 08:45:49 +08:00
parent 11ddba12d9
commit 0bbffa85ab
+2 -7
View File
@@ -329,7 +329,6 @@ class MissionManager:
B) 未解锁 → 发 ARM 指令 B) 未解锁 → 发 ARM 指令
C) 已解锁但非 OFFBOARD → 进入 ARMING 等待后续 TAKEOFF 序列 C) 已解锁但非 OFFBOARD → 进入 ARMING 等待后续 TAKEOFF 序列
""" """
global need_homeLog
try: try:
drone = state["drone"] drone = state["drone"]
armed = drone.get("armed", False) armed = drone.get("armed", False)
@@ -340,9 +339,8 @@ class MissionManager:
logger.info("[INIT] mode=%s armed=%s alt_rel=%.1fm", logger.info("[INIT] mode=%s armed=%s alt_rel=%.1fm",
mode, armed, alt_rel) mode, armed, alt_rel)
if not home.get("valid", False) and need_homeLog: if not home.get("valid", False):
logger.warning("[INIT] home.valid=false,等待起飞点有效...") logger.warning("[INIT] home.valid=false,等待起飞点有效...")
need_homeLog = False
return return
# A) 已在 OFFBOARD + 已解锁 → 直接巡航 # A) 已在 OFFBOARD + 已解锁 → 直接巡航
@@ -379,11 +377,9 @@ class MissionManager:
""" """
[ARMING] 等待解锁确认,成功后进入 TAKEOFF [ARMING] 等待解锁确认,成功后进入 TAKEOFF
""" """
global need_homeLog
try: try:
armed = state["drone"].get("armed", False) armed = state["drone"].get("armed", False)
home = state.get("home", {}) home = state.get("home", {})
need_homeLog = True
if not armed: if not armed:
elapsed = time.time() - self._state_start_time elapsed = time.time() - self._state_start_time
@@ -395,9 +391,8 @@ class MissionManager:
logger.info("[ARMING] 等待解锁... (%.1fs)", elapsed) logger.info("[ARMING] 等待解锁... (%.1fs)", elapsed)
return return
if not home.get("valid", False) and need_homeLog: if not home.get("valid", False):
logger.warning("[ARMING] home.valid=false,等待起飞点有效...") logger.warning("[ARMING] home.valid=false,等待起飞点有效...")
need_homeLog = False
return return
# ---- 解锁成功 → 起飞 ---- # ---- 解锁成功 → 起飞 ----