From 9767036d54f10bebe5349c7efef0367c7e0dac44 Mon Sep 17 00:00:00 2001 From: jxjajs Date: Wed, 11 Dec 2024 20:42:31 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/cpp/SensorsProtocol.cpp | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/app/src/main/cpp/SensorsProtocol.cpp b/app/src/main/cpp/SensorsProtocol.cpp index 7cecd872..2837a248 100644 --- a/app/src/main/cpp/SensorsProtocol.cpp +++ b/app/src/main/cpp/SensorsProtocol.cpp @@ -1268,11 +1268,11 @@ void GM_StartSerialComm() srdt.ms_dev[i].IsNeedSerial = 0; continue; } - memset(weatherpntmsg, 0, sizeof(AI_DEF)*WEATHER_DATA_NUM); - memset(szbuf, 0, sizeof(szbuf)); switch (devparam[i].ProtocolIdx) { case WEATHER_PROTOCOL: // 气象 + memset(weatherpntmsg, 0, sizeof(AI_DEF)*WEATHER_DATA_NUM); + memset(szbuf, 0, sizeof(szbuf)); sprintf(szbuf, "%s", "气象"); srdt.ms_dev[i].IsNeedSerial = 1; srdt.ms_dev[i].FirstCmdTimeCnt = get_msec(); @@ -1281,8 +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'); + sprintf(logbuf, "init weather_state%d=%d", j, weatherpntmsg[j].AiState); + DebugLog(8, logbuf, 'I'); } break; case RALLY_PROTOCOL: /* 拉力*/ @@ -1294,6 +1294,8 @@ void GM_StartSerialComm() srdt.ms_dev[i].aiValue[j].AiState = SER_STARTSAMPLE; break; case WIND_PROTOCOL: /* 风速风向*/ + memset(weatherpntmsg, 0, sizeof(AI_DEF)*WEATHER_DATA_NUM); + memset(szbuf, 0, sizeof(szbuf)); sprintf(szbuf, "%s", "风速风向"); srdt.ms_dev[i].IsNeedSerial = 1; srdt.ms_dev[i].FirstCmdTimeCnt = get_msec(); @@ -1301,8 +1303,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'); + sprintf(logbuf, "init weather_state%d=%d", j, weatherpntmsg[j].AiState); + DebugLog(8, logbuf, 'I'); } break; case SLANT_PROTOCOL: /* 倾角*/ @@ -1325,11 +1327,6 @@ void GM_StartSerialComm() 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 LOGE("12V state=%d", getInt(CMD_SET_12V_EN_STATE)); LOGE("3.3V state= %d", getInt(CMD_SET_CAM_3V3_EN_STATE));