From 18aca9d5f740cb724b96bc8a8ea100769760500c Mon Sep 17 00:00:00 2001 From: xinfengkun Date: Fri, 17 Jan 2025 14:54:38 +0800 Subject: [PATCH] =?UTF-8?q?[6100][data-center]M1=E6=96=B9=E5=90=91?= =?UTF-8?q?=E7=9B=98=E9=A9=BE=E9=A9=B6=E7=8A=B6=E6=80=81=E8=BD=AC=E4=B8=BA?= =?UTF-8?q?=E9=9D=9E=E8=87=AA=E5=8A=A8=E9=A9=BE=E9=A9=B6=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../autopilot/adapter/MoGoAdasListenerImpl.kt | 22 +++++++++---------- 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasListenerImpl.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasListenerImpl.kt index 8780f7e7c6..0c209f2d37 100644 --- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasListenerImpl.kt +++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasListenerImpl.kt @@ -824,18 +824,16 @@ class MoGoAdasListenerImpl : OnAdasListener { autopilotMode: Int ) { CallerFsm2024ListenerManager.invokeFSM2024State(fsmState) -// val mode: Int = if (fsmState.functionState != Fsm2024.State.ACTIVE) { -// 0//人工驾驶 -// } else { -// if (fsmState.activeMode == Fsm2024.ActiveMode.PILOT_ACTIVE) { -// 1//自动驾驶 -// } else if (fsmState.activeMode == Fsm2024.ActiveMode.PARALLEL_ACTIVE || fsmState.activeMode.number == 6) { -// 6//远程驾驶 -// } else { -// 0//人工驾驶 -// } -// } - updateAutoPilotStatus(2, autopilotState, autopilotMode) + //M1方向盘驾驶状态转为非自动驾驶状态 + var mode = autopilotMode + if (autopilotMode == 9) { + mode = 0 + } + var state = autopilotState + if (autopilotState == 10) { + state = 1 + } + updateAutoPilotStatus(2, state, mode) } /**