From f1cfe67f724f25cec0fe877aa7bdc994ae66b3f0 Mon Sep 17 00:00:00 2001 From: jxjajs Date: Thu, 5 Dec 2024 09:14:01 +0800 Subject: [PATCH] =?UTF-8?q?=E6=81=A2=E5=A4=8D=E4=B8=B2=E5=8F=A3=E6=8B=8D?= =?UTF-8?q?=E7=85=A7=E4=BB=8E1=E5=BC=80=E5=A7=8B=E5=8F=96=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/cpp/SensorsProtocol.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/app/src/main/cpp/SensorsProtocol.cpp b/app/src/main/cpp/SensorsProtocol.cpp index a1147bd9..70147713 100644 --- a/app/src/main/cpp/SensorsProtocol.cpp +++ b/app/src/main/cpp/SensorsProtocol.cpp @@ -2012,9 +2012,9 @@ void CameraPhotoPortDataProcess(int devno) DebugLog(devparam[devno].commid, szbuf, 'V'); curserial->RevCmdFlag = 1; pPortParam->FirstCmdTimeCnt = get_msec(); - if ((iNo == pPortParam->SerialCmdidx-1) && (0xFF > rtumsg.MsgData[i + 2])) + if ((iNo == pPortParam->SerialCmdidx) && (0xFF > rtumsg.MsgData[i + 2])) { - if (iNo == srdt.imagepacketnum-1) + if (iNo == srdt.imagepacketnum) { /* 检查是否有漏包*/ for (pidx = 0; pidx < srdt.imagepacketnum; pidx++) { @@ -2055,15 +2055,14 @@ void CameraPhotoPortDataProcess(int devno) pPortParam->SerialCmdidx = -1; } else - pPortParam->SerialCmdidx = iNo+1; -// pPortParam->SerialCmdidx = iNo + 1; + pPortParam->SerialCmdidx = iNo + 1; } srdt.errorPhotoNoCnt = 0; break; } srdt.errorPhotoNoCnt++; sprintf(szbuf, "问询第%d包图片摄像机应答第%d包,连续错误%d次!", - pPortParam->SerialCmdidx-2, iNo, srdt.errorPhotoNoCnt); + pPortParam->SerialCmdidx, iNo, srdt.errorPhotoNoCnt); DebugLog(devparam[devno].commid, szbuf, 'E'); if (srdt.errorPhotoNoCnt > 5) { @@ -2509,7 +2508,7 @@ int FindNextCameraPhotoCommand(int devidx) return 1; default: imagesize = 0xFF; - packetsize = (uint16_t)srdt.ms_dev[devidx].SerialCmdidx-1; + packetsize = (uint16_t)srdt.ms_dev[devidx].SerialCmdidx; cmdidx = 0x11; #if 0 if (0 == srdt.IsSleep)