优化后端和前端
This commit is contained in:
minghanchen
@@ -183,6 +183,9 @@ class NativeCanRuntime:
|
||||
"zone": target,
|
||||
},
|
||||
"parameters": dict(action.get("parameters", {})),
|
||||
"parse_source": str(
|
||||
action.get("parse_source", "local_rule")
|
||||
),
|
||||
"timeout_ms": (
|
||||
20_000
|
||||
if capability_name
|
||||
@@ -417,6 +420,8 @@ class NativeCanRuntime:
|
||||
return f"seat driver massage strength {strength}"
|
||||
return f"seat driver massage mode {parameters['mode']}"
|
||||
if capability == "seat.set_driver_axis_native":
|
||||
if parameters["direction"] == "stop":
|
||||
return f"seat driver {parameters['axis']} stop"
|
||||
return (
|
||||
f"seat driver {parameters['axis']} {parameters['direction']} "
|
||||
f"{parameters.get('duration_ms', 500)}"
|
||||
@@ -1129,15 +1134,30 @@ class NativeCanExecutor:
|
||||
"feedback ID and a target-value match contract"
|
||||
)
|
||||
special_handler = command["signals"].get("special_handler")
|
||||
if special_handler == "window_position":
|
||||
feedback_required = self.feedback_required
|
||||
if not feedback_required and special_handler in {
|
||||
None,
|
||||
"shade_preset",
|
||||
}:
|
||||
# Wireless MQTT uses the state topic as an asynchronous
|
||||
# source of truth. Fixed frames and self-terminating
|
||||
# shade presets must not hold the HTTP request open
|
||||
# while waiting for the same state stream synchronously.
|
||||
sent_frames = self._send_command(bus, command)
|
||||
feedback = None
|
||||
elif special_handler == "window_position":
|
||||
sent_frames, feedback = self._execute_window_position(bus, command)
|
||||
elif special_handler == "driver_seat_axis":
|
||||
sent_frames, feedback = self._execute_driver_seat_axis(
|
||||
bus, command
|
||||
bus,
|
||||
command,
|
||||
wait_for_feedback=feedback_required,
|
||||
)
|
||||
elif special_handler == "driver_seat_memory_recall":
|
||||
sent_frames, feedback = self._execute_driver_seat_memory(
|
||||
bus, command
|
||||
bus,
|
||||
command,
|
||||
wait_for_completion=feedback_required,
|
||||
)
|
||||
elif special_handler == "shade_preset":
|
||||
sent_frames, feedback = self._execute_shade_preset(
|
||||
@@ -1151,7 +1171,6 @@ class NativeCanExecutor:
|
||||
sent_frames = self._send_command(bus, command)
|
||||
feedback = self._wait_feedback(bus, command)
|
||||
feedback_match = self._feedback_matches(command, feedback)
|
||||
feedback_required = self.feedback_required
|
||||
verified = feedback is not None and feedback_match is True
|
||||
delivered = bool(sent_frames)
|
||||
succeeded = verified or (delivered and not feedback_required)
|
||||
@@ -1167,17 +1186,26 @@ class NativeCanExecutor:
|
||||
publication_start:
|
||||
]
|
||||
)
|
||||
delivery_status = "submitted"
|
||||
if not feedback_required and delivered:
|
||||
delivery_status = (
|
||||
"published"
|
||||
if mqtt_messages
|
||||
and all(
|
||||
message.get("delivery_status") == "published"
|
||||
for message in mqtt_messages
|
||||
)
|
||||
else "queued"
|
||||
)
|
||||
results.append(
|
||||
{
|
||||
"ref": operation["id"],
|
||||
"domain": function_config["spec"]["domain"],
|
||||
"status": "succeeded" if succeeded else "failed",
|
||||
"message": (
|
||||
"MQTT 白名单控制帧已发布，并收到匹配的车辆状态反馈。"
|
||||
if not feedback_required and feedback_match is True
|
||||
else "MQTT 白名单控制帧已发布；已收到状态帧，但目标值尚未确认。"
|
||||
if not feedback_required and feedback is not None
|
||||
else "MQTT 白名单控制帧已发布；车辆状态反馈尚未确认。"
|
||||
"MQTT 白名单控制帧已由 Broker 确认；车辆效果以状态话题回读为准。"
|
||||
if not feedback_required and delivery_status == "published"
|
||||
else "MQTT 白名单控制帧已进入客户端发布队列；车辆效果以状态话题回读为准。"
|
||||
if not feedback_required
|
||||
else "CAN 盒已提交车端控制帧并观察到匹配反馈。"
|
||||
if feedback_match is True
|
||||
@@ -1197,11 +1225,7 @@ class NativeCanExecutor:
|
||||
"feedback_match": feedback_match,
|
||||
"feedback_state": self._feedback_state(feedback),
|
||||
"feedback_required": feedback_required,
|
||||
"delivery_status": (
|
||||
"published"
|
||||
if not feedback_required and delivered
|
||||
else "submitted"
|
||||
),
|
||||
"delivery_status": delivery_status,
|
||||
"physical_effect_confirmed": verified,
|
||||
"control_gate": (
|
||||
"compiled_action_and_frame_whitelist"
|
||||
@@ -1260,7 +1284,11 @@ class NativeCanExecutor:
|
||||
return sent
|
||||
|
||||
def _execute_driver_seat_axis(
|
||||
self, bus: CanBus, command: dict[str, Any]
|
||||
self,
|
||||
bus: CanBus,
|
||||
command: dict[str, Any],
|
||||
*,
|
||||
wait_for_feedback: bool = True,
|
||||
) -> tuple[list[CanFrame], CanFrame | None]:
|
||||
"""Send bounded motion and attempt all three stop frames in a finally path."""
|
||||
|
||||
@@ -1313,10 +1341,14 @@ class NativeCanExecutor:
|
||||
f"{len(stop_errors)}/3 forced-stop frame(s) failed"
|
||||
)
|
||||
raise RuntimeError("; ".join(details))
|
||||
return sent, self._wait_feedback(bus, command)
|
||||
return sent, self._wait_feedback(bus, command) if wait_for_feedback else None
|
||||
|
||||
def _execute_driver_seat_memory(
|
||||
self, bus: CanBus, command: dict[str, Any]
|
||||
self,
|
||||
bus: CanBus,
|
||||
command: dict[str, Any],
|
||||
*,
|
||||
wait_for_completion: bool = True,
|
||||
) -> tuple[list[CanFrame], CanFrame | None]:
|
||||
"""Require fresh initialization, then replay the learned 16/15 sequence."""
|
||||
|
||||
@@ -1366,8 +1398,12 @@ class NativeCanExecutor:
|
||||
)
|
||||
if index + 1 < len(sequence):
|
||||
time.sleep(int(special["period_ms"]) / 1_000)
|
||||
feedback = self._wait_for_id(
|
||||
bus, 0x494, int(special["post_status_timeout_ms"])
|
||||
feedback = (
|
||||
self._wait_for_id(
|
||||
bus, 0x494, int(special["post_status_timeout_ms"])
|
||||
)
|
||||
if wait_for_completion
|
||||
else None
|
||||
)
|
||||
return sent, feedback
|
||||
|
||||
|
||||
Reference in New Issue
Block a user