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

删除反复读取传感器波特率

Browse Source
hdrplus
XI.CHEN 6 months ago
parent 385ae48185
commit bd706d1cf4
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File

2
app/src/main/cpp/PhoneDevice.cpp
Unescape Escape View File

@ -1706,7 +1706,7 @@ bool CPhoneDevice::TakePhoto(const IDevice::PHOTO_INFO& photoInfo, const vector<
OpenPTZSensors(photoInfo.selfTestingTime); OpenPTZSensors(photoInfo.selfTestingTime);
} }
CameraPhotoCmd(ts, photoInfo.channel, 0, photoInfo.resolution, 0); CameraPhotoCmd(ts, photoInfo.channel, 0, photoInfo.resolution, 0);
XYLOG(XYLOG_SEVERITY_INFO, "Takeing photo over"); XYLOG(XYLOG_SEVERITY_INFO, "Taking photo over");
res = TakePTZPhotoCb(3, photoInfo); res = TakePTZPhotoCb(3, photoInfo);
} }
else if (mPhotoInfo.usingSysCamera == 1) else if (mPhotoInfo.usingSysCamera == 1)

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

@ -695,6 +695,7 @@ void Gm_OpenSerialPort(int devidx)
sprintf(szbuf, "装置%d 打开串口%d %s成功！fd=%d", devidx + 1, devparam[devidx].commid + 1, devparam[devidx].pathname, fd); sprintf(szbuf, "装置%d 打开串口%d %s成功！fd=%d", devidx + 1, devparam[devidx].commid + 1, devparam[devidx].pathname, fd);
DebugLog(devparam[devidx].commid, szbuf, 'I'); DebugLog(devparam[devidx].commid, szbuf, 'I');
serialport[devparam[devidx].commid].fd = fd; serialport[devparam[devidx].commid].fd = fd;
Gm_SetSerialPortParam(devparam[devidx].commid);
return; return;
} }
sprintf(szbuf, "装置%d 串口%d %s已经打开！fd=%d", devidx + 1, devparam[devidx].commid + 1, devparam[devidx].pathname, serialport[devparam[devidx].commid].fd); sprintf(szbuf, "装置%d 串口%d %s已经打开！fd=%d", devidx + 1, devparam[devidx].commid + 1, devparam[devidx].pathname, serialport[devparam[devidx].commid].fd);
@ -2220,9 +2221,9 @@ void SendCmdFormPollCmdBuf(int port)
serialport[devparam[srdt.curdevidx[port]].commid].m_iRevStatus = 0; serialport[devparam[srdt.curdevidx[port]].commid].m_iRevStatus = 0;
if (serialport[port].fd < 0) if (serialport[port].fd < 0)
return; return;
ret = Gm_SetSerialPortParam(port); //ret = Gm_SetSerialPortParam(port);
if (ret < 0) //if (ret < 0)
return; // return;
len = GM_SerialComSend(&pPortParam->PollCmd[2], pPortParam->cmdlen - 2, port); len = GM_SerialComSend(&pPortParam->PollCmd[2], pPortParam->cmdlen - 2, port);
if (len < 1) if (len < 1)
{ {
@ -2751,7 +2752,7 @@ void Gm_SendPelco_pCommand(uint32_t cmdtype)
commandbuf[len] = (uint8_t)Gm_Pelco_pXORCheck(commandbuf, len); commandbuf[len] = (uint8_t)Gm_Pelco_pXORCheck(commandbuf, len);
len++; len++;
serialport[srdt.camerauseserial].cmdlen = len; serialport[srdt.camerauseserial].cmdlen = len;
Gm_SetSerialPortParam(srdt.camerauseserial); //Gm_SetSerialPortParam(srdt.camerauseserial);
//unsigned char sendbuf[] = {0x68,0x00,0x00,0x68,0x0ff,0x02,0x01,0x16}; //unsigned char sendbuf[] = {0x68,0x00,0x00,0x68,0x0ff,0x02,0x01,0x16};
//len = GM_SerialComSend(sendbuf, sizeof(sendbuf), srdt.camerauseserial); //len = GM_SerialComSend(sendbuf, sizeof(sendbuf), srdt.camerauseserial);
@ -2803,7 +2804,7 @@ void Gm_SendPelco_DCommand(uint32_t cmdtype)
#endif #endif
len++; len++;
serialport[srdt.camerauseserial].cmdlen = len; serialport[srdt.camerauseserial].cmdlen = len;
Gm_SetSerialPortParam(srdt.camerauseserial); //Gm_SetSerialPortParam(srdt.camerauseserial);
len = GM_SerialComSend(commandbuf, len, srdt.camerauseserial); len = GM_SerialComSend(commandbuf, len, srdt.camerauseserial);
if (len < 1) if (len < 1)
{ {

Write Preview
Loading…
Cancel
Save