fixed conflict

This commit is contained in:
lixiaopeng
2022-08-16 15:32:41 +08:00
parent 16417621c2
commit a1d9fed999
47 changed files with 97 additions and 8464 deletions

View File

@@ -432,7 +432,7 @@ class MoGoAutopilotProvider :
* 向左变道
*/
override fun sendOperatorChangeLaneLeft() {
Log.d("liyz", "MoGoAutopilotProvider sendOperatorChangeLaneLeft -------> ")
// Log.d("liyz", "MoGoAutopilotProvider sendOperatorChangeLaneLeft -------> ")
AdasManager.getInstance().sendOperatorCmdChangeLaneLeft()
}
@@ -440,7 +440,7 @@ class MoGoAutopilotProvider :
* 向右变道
*/
override fun sendOperatorChangeLaneRight() {
Log.d("liyz", "MoGoAutopilotProvider sendOperatorChangeLaneRight -------> ")
// Log.d("liyz", "MoGoAutopilotProvider sendOperatorChangeLaneRight -------> ")
AdasManager.getInstance().sendOperatorCmdChangeLaneRight()
}
@@ -448,7 +448,7 @@ class MoGoAutopilotProvider :
* 发送设置加速度 acc>0加速 acc<0减速 acc=0复位
*/
override fun sendOperatorSetAcceleratedSpeed(cc: Double) {
Log.d("liyz", "MoGoAutopilotProvider sendOperatorSetAcceleratedSpeed cc $cc ")
// Log.d("liyz", "MoGoAutopilotProvider sendOperatorSetAcceleratedSpeed cc $cc ")
AdasManager.getInstance().sendOperatorCmdSetAcceleratedSpeed(cc)
}
@@ -456,7 +456,7 @@ class MoGoAutopilotProvider :
* 鸣笛 value 1: honk 2: stop honking
*/
override fun sendOperatorSetHorn(value: Double) {
Log.d("liyz", "MoGoAutopilotProvider sendOperatorSetHorn value $value ")
// Log.d("liyz", "MoGoAutopilotProvider sendOperatorSetHorn value $value ")
AdasManager.getInstance().sendOperatorCmdSetHorn(value)
}