yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0' into dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0

Browse Source
This commit is contained in:
yangyakun
2023-02-08 17:23:21 +08:00
parent 3caf13d71b 8109320ecf
commit 93a3ccb09b
3 changed files with 36 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasChannel.java
View File

@@ -1284,21 +1284,21 @@ public class AdasChannel implements IAdasNetCommApi, FpgaSocket.IWebSocketConnec
.build());
}
/**
* 金旅M1顶灯控制
*
* @param switch1Cmd //0: default, 1: 开启顶灯1, 2: 关闭顶灯1
* @param switch2Cmd //0: default, 1: 开启顶灯2, 2: 关闭顶灯2
* @return boolean
*/
@Override
public boolean sendRoboBusJinlvM1MainLampCmd(int switch1Cmd, int switch2Cmd) {
public boolean sendRoboBusJinlvM1MainLamp1Cmd(int switchCmd) {
return sendRoboBusJinlvM1TaskCmd(SpecialVehicleTaskCmdOuterClass.RoboBusJinlvM1Cmd.newBuilder()
.setMainLamp1Cmd(switch1Cmd)
.setMainLamp2Cmd(switch2Cmd)
.setMainLamp1Cmd(switchCmd)
.build());
}
@Override
public boolean sendRoboBusJinlvM1MainLamp2Cmd(int switchCmd) {
return sendRoboBusJinlvM1TaskCmd(SpecialVehicleTaskCmdOuterClass.RoboBusJinlvM1Cmd.newBuilder()
.setMainLamp2Cmd(switchCmd)
.build());
}
/**
* 金旅M1小灯(氛围灯)控制
*

20
libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasManager.java
View File

@@ -663,15 +663,25 @@ public class AdasManager implements IAdasNetCommApi {
}
/**
* 金旅M1顶灯控制
* 金旅M1顶灯1控制
*
* @param switch1Cmd //0: default, 1: 开启顶灯1, 2: 关闭顶灯1
* @param switch2Cmd //0: default, 1: 开启顶灯2, 2: 关闭顶灯2
* @param switchCmd //0: default, 1: 开启顶灯, 2: 关闭顶灯
* @return boolean
*/
@Override
public boolean sendRoboBusJinlvM1MainLampCmd(int switch1Cmd, int switch2Cmd) {
return mChannel != null && mChannel.sendRoboBusJinlvM1MainLampCmd(switch1Cmd, switch2Cmd);
public boolean sendRoboBusJinlvM1MainLamp1Cmd(int switchCmd) {
return mChannel != null && mChannel.sendRoboBusJinlvM1MainLamp1Cmd(switchCmd);
}
/**
* 金旅M1顶灯2控制
*
* @param switchCmd //0: default, 1: 开启顶灯, 2: 关闭顶灯
* @return boolean
*/
@Override
public boolean sendRoboBusJinlvM1MainLamp2Cmd(int switchCmd) {
return mChannel != null && mChannel.sendRoboBusJinlvM1MainLamp2Cmd(switchCmd);
}
/**

15
libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/IAdasNetCommApi.java
View File

@@ -366,13 +366,20 @@ public interface IAdasNetCommApi {
boolean sendRoboBusJinlvM1HeaderCmd(int switchCmd, int windSpeedCmd);
/**
* 金旅M1顶灯控制
* 金旅M1顶灯1控制
*
* @param switch1Cmd //0: default, 1: 开启顶灯1, 2: 关闭顶灯1
* @param switch2Cmd //0: default, 1: 开启顶灯2, 2: 关闭顶灯2
* @param switchCmd //0: default, 1: 开启顶灯, 2: 关闭顶灯
* @return boolean
*/
boolean sendRoboBusJinlvM1MainLampCmd(int switch1Cmd, int switch2Cmd);
boolean sendRoboBusJinlvM1MainLamp1Cmd(int switchCmd);
/**
* 金旅M1顶灯2控制
*
* @param switchCmd //0: default, 1: 开启顶灯, 2: 关闭顶灯
* @return boolean
*/
boolean sendRoboBusJinlvM1MainLamp2Cmd(int switchCmd);
/**
* 金旅M1小灯(氛围灯)控制