xymp
/
TermApp
3
0
Fork 0
Code Issues Pull Requests 4 Packages Projects Releases Wiki Activity

格式修改

Browse Source
N938
jxjajs 6 months ago
parent 30b57fcce5
commit 9767036d54
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File

19
app/src/main/cpp/SensorsProtocol.cpp
Unescape Escape View File

@ -1268,11 +1268,11 @@ void GM_StartSerialComm()
srdt.ms_dev[i].IsNeedSerial = 0; srdt.ms_dev[i].IsNeedSerial = 0;
continue; continue;
} }
memset(weatherpntmsg, 0, sizeof(AI_DEF)*WEATHER_DATA_NUM);
memset(szbuf, 0, sizeof(szbuf));
switch (devparam[i].ProtocolIdx) switch (devparam[i].ProtocolIdx)
{ {
case WEATHER_PROTOCOL: // 气象 case WEATHER_PROTOCOL: // 气象
memset(weatherpntmsg, 0, sizeof(AI_DEF)*WEATHER_DATA_NUM);
memset(szbuf, 0, sizeof(szbuf));
sprintf(szbuf, "%s", "气象"); sprintf(szbuf, "%s", "气象");
srdt.ms_dev[i].IsNeedSerial = 1; srdt.ms_dev[i].IsNeedSerial = 1;
srdt.ms_dev[i].FirstCmdTimeCnt = get_msec(); srdt.ms_dev[i].FirstCmdTimeCnt = get_msec();
@ -1281,8 +1281,8 @@ void GM_StartSerialComm()
{ {
srdt.ms_dev[i].aiValue[j].AiState = SER_STARTSAMPLE; srdt.ms_dev[i].aiValue[j].AiState = SER_STARTSAMPLE;
weatherpntmsg[j].AiState = SER_STARTSAMPLE; weatherpntmsg[j].AiState = SER_STARTSAMPLE;
sprintf(szbuf, "init weather_state%d=%d", j, weatherpntmsg[j].AiState); sprintf(logbuf, "init weather_state%d=%d", j, weatherpntmsg[j].AiState);
DebugLog(8, szbuf, 'I'); DebugLog(8, logbuf, 'I');
} }
break; break;
case RALLY_PROTOCOL: /* 拉力*/ case RALLY_PROTOCOL: /* 拉力*/
@ -1294,6 +1294,8 @@ void GM_StartSerialComm()
srdt.ms_dev[i].aiValue[j].AiState = SER_STARTSAMPLE; srdt.ms_dev[i].aiValue[j].AiState = SER_STARTSAMPLE;
break; break;
case WIND_PROTOCOL: /* 风速风向*/ case WIND_PROTOCOL: /* 风速风向*/
memset(weatherpntmsg, 0, sizeof(AI_DEF)*WEATHER_DATA_NUM);
memset(szbuf, 0, sizeof(szbuf));
sprintf(szbuf, "%s", "风速风向"); sprintf(szbuf, "%s", "风速风向");
srdt.ms_dev[i].IsNeedSerial = 1; srdt.ms_dev[i].IsNeedSerial = 1;
srdt.ms_dev[i].FirstCmdTimeCnt = get_msec(); srdt.ms_dev[i].FirstCmdTimeCnt = get_msec();
@ -1301,8 +1303,8 @@ void GM_StartSerialComm()
{ {
srdt.ms_dev[i].aiValue[j].AiState = SER_STARTSAMPLE; srdt.ms_dev[i].aiValue[j].AiState = SER_STARTSAMPLE;
weatherpntmsg[j].AiState = SER_STARTSAMPLE; weatherpntmsg[j].AiState = SER_STARTSAMPLE;
sprintf(szbuf, "init weather_state%d=%d", j, weatherpntmsg[j].AiState); sprintf(logbuf, "init weather_state%d=%d", j, weatherpntmsg[j].AiState);
DebugLog(8, szbuf, 'I'); DebugLog(8, logbuf, 'I');
} }
break; break;
case SLANT_PROTOCOL: /* 倾角*/ case SLANT_PROTOCOL: /* 倾角*/
@ -1325,11 +1327,6 @@ void GM_StartSerialComm()
break; break;
} }
// 测试查询传感器电源状态 // 测试查询传感器电源状态
for (j = 0; j < WEATHER_DATA_NUM; j++)
{
sprintf(logbuf, "pro weather_state%d=%d", j, weatherpntmsg[j].AiState);
DebugLog(8, logbuf, 'I');
}
#if 0 #if 0
LOGE("12V state=%d", getInt(CMD_SET_12V_EN_STATE)); LOGE("12V state=%d", getInt(CMD_SET_12V_EN_STATE));
LOGE("3.3V state= %d", getInt(CMD_SET_CAM_3V3_EN_STATE)); LOGE("3.3V state= %d", getInt(CMD_SET_CAM_3V3_EN_STATE));

Write Preview
Loading…
Cancel
Save