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

修改标志

Browse Source
N938
jxjajs 6 months ago
parent 821dd34c18
commit a43965639a
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File

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

@ -1281,6 +1281,8 @@ void GM_StartSerialComm()
{
srdt.ms_dev[i].aiValue[j].AiState = SER_STARTSAMPLE;
weatherpntmsg[j].AiState = SER_STARTSAMPLE;
sprintf(szbuf, "init weather_state%d=%d", j, weatherpntmsg[j].AiState);
DebugLog(8, szbuf, 'I');
}
break;
case RALLY_PROTOCOL: /* 拉力*/
@ -1299,6 +1301,8 @@ void GM_StartSerialComm()
{
srdt.ms_dev[i].aiValue[j].AiState = SER_STARTSAMPLE;
weatherpntmsg[j].AiState = SER_STARTSAMPLE;
sprintf(szbuf, "init weather_state%d=%d", j, weatherpntmsg[j].AiState);
DebugLog(8, szbuf, 'I');
}
break;
case SLANT_PROTOCOL: /* 倾角*/
@ -1492,12 +1496,17 @@ void GM_IsCloseSensors()
else if (SER_SAMPLE == srdt.ms_dev[i].aiValue[j].AiState)
srdt.ms_dev[i].aiValue[j].AiState = SAMPLINGSUCCESS;
}
for (j = 0; j < WEATHER_DATA_NUM; j++)
{
if (SER_STARTSAMPLE == weatherpntmsg[j].AiState)
weatherpntmsg[j].AiState = SER_SAMPLEFAIL;
else if (SER_SAMPLE == weatherpntmsg[j].AiState)
weatherpntmsg[j].AiState = SAMPLINGSUCCESS;
if((devparam[i].ProtocolIdx == WIND_PROTOCOL) || (WEATHER_PROTOCOL == devparam[i].ProtocolIdx))
{
for (j = 0; j < WEATHER_DATA_NUM; j++)
{
if (SER_STARTSAMPLE == weatherpntmsg[j].AiState)
weatherpntmsg[j].AiState = SER_SAMPLEFAIL;
else if (SER_SAMPLE == weatherpntmsg[j].AiState)
weatherpntmsg[j].AiState = SAMPLINGSUCCESS;
sprintf(buf, "over weather_state%d=%d", j, weatherpntmsg[j].AiState);
DebugLog(8, buf, 'I');
}
}
}
break;
@ -3774,7 +3783,7 @@ int GetWeatherData(Data_DEF *data, int datano)
sprintf(szbuf, "大气压");
break;
case OpticalRadiationNo:
sprintf(szbuf, "大气压");
sprintf(szbuf, "日照");
break;
default:
sprintf(szbuf, "未知");

Write Preview
Loading…
Cancel
Save