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

恢复串口拍照从1开始取包

Browse Source
hdrplus
jxjajs 7 months ago
parent 8c9ff7f2ba
commit f1cfe67f72
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File

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

@ -2012,9 +2012,9 @@ void CameraPhotoPortDataProcess(int devno)
DebugLog(devparam[devno].commid, szbuf, 'V'); DebugLog(devparam[devno].commid, szbuf, 'V');
curserial->RevCmdFlag = 1; curserial->RevCmdFlag = 1;
pPortParam->FirstCmdTimeCnt = get_msec(); 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++) for (pidx = 0; pidx < srdt.imagepacketnum; pidx++)
{ {
@ -2055,15 +2055,14 @@ void CameraPhotoPortDataProcess(int devno)
pPortParam->SerialCmdidx = -1; pPortParam->SerialCmdidx = -1;
} }
else else
pPortParam->SerialCmdidx = iNo+1; pPortParam->SerialCmdidx = iNo + 1;
// pPortParam->SerialCmdidx = iNo + 1;
} }
srdt.errorPhotoNoCnt = 0; srdt.errorPhotoNoCnt = 0;
break; break;
} }
srdt.errorPhotoNoCnt++; srdt.errorPhotoNoCnt++;
sprintf(szbuf, "问询第%d包图片摄像机应答第%d包,连续错误%d次!", sprintf(szbuf, "问询第%d包图片摄像机应答第%d包,连续错误%d次!",
pPortParam->SerialCmdidx-2, iNo, srdt.errorPhotoNoCnt); pPortParam->SerialCmdidx, iNo, srdt.errorPhotoNoCnt);
DebugLog(devparam[devno].commid, szbuf, 'E'); DebugLog(devparam[devno].commid, szbuf, 'E');
if (srdt.errorPhotoNoCnt > 5) if (srdt.errorPhotoNoCnt > 5)
{ {
@ -2509,7 +2508,7 @@ int FindNextCameraPhotoCommand(int devidx)
return 1; return 1;
default: default:
imagesize = 0xFF; imagesize = 0xFF;
packetsize = (uint16_t)srdt.ms_dev[devidx].SerialCmdidx-1; packetsize = (uint16_t)srdt.ms_dev[devidx].SerialCmdidx;
cmdidx = 0x11; cmdidx = 0x11;
#if 0 #if 0
if (0 == srdt.IsSleep) if (0 == srdt.IsSleep)

Write Preview
Loading…
Cancel
Save