Merge branch 'refs/heads/dev_robotaxi-d_240715_6.4.4_pnc_park' into dev_robotaxi-d_240729_6.6.0
# Conflicts: # OCH/common/biz/src/main/java/com/mogo/och/biz/login/model/LoginModel.kt # OCH/facade/src/main/java/com/mogo/och/facade/route/FacadeProvider.kt # core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/FunctionBuildConfig.kt # gradle.properties # libraries/mogo-adas-data/src/main/proto/message_pad.proto # libraries/mogo-adas-data/src/main/proto/personal/adas_constants.proto # settings.gradle
This commit is contained in:
@@ -628,6 +628,34 @@ class MoGoAutopilotControlProvider :
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 会车开关
|
||||
* isEnable = true 开启
|
||||
* isEnable = false 关闭
|
||||
* @return boolean
|
||||
*/
|
||||
override fun sendParkVehCross(isEnable: Boolean): Boolean {
|
||||
return if (isEnable) {
|
||||
AdasManager.getInstance().sendParkVehCross(1) > -1
|
||||
} else {
|
||||
AdasManager.getInstance().sendParkVehCross(0) > -1
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 超车开关
|
||||
* isEnable = true 开启
|
||||
* isEnable = false 关闭
|
||||
* @return boolean
|
||||
*/
|
||||
override fun sendParkVehOvertake(isEnable: Boolean): Boolean {
|
||||
return if (isEnable) {
|
||||
AdasManager.getInstance().sendParkVehOvertake(1) > -1
|
||||
} else {
|
||||
AdasManager.getInstance().sendParkVehOvertake(0) > -1
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 变道绕障的目标障碍物速度阈值
|
||||
* @param speed 速度阈值 m/s
|
||||
|
||||
Reference in New Issue
Block a user