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

修改接收

Browse Source
main
jxjajs 6 months ago
parent e84e3f802c
commit a346f1906f
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File

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

@ -1930,20 +1930,20 @@ void CameraPhotoPortDataProcess(SIO_PARAM_SERIAL_DEF *curserial)
packsize = rtumsg.MsgData[i + 3] + rtumsg.MsgData[i + 2] * 256; packsize = rtumsg.MsgData[i + 3] + rtumsg.MsgData[i + 2] * 256;
memmove(&curserial->image.buf[iNo - 1], &rtumsg.MsgData[i + 4], packsize); memmove(&curserial->image.buf[iNo - 1], &rtumsg.MsgData[i + 4], packsize);
curserial->image.ilen[iNo - 1] = packsize; curserial->image.ilen[iNo - 1] = packsize;
sprintf(szbuf, "收到第%d(总%d包)包长=%d", iNo, srdt.imagepacketnum, packsize); sprintf(szbuf, "收到第%d(总%d包)包长=%d", iNo, curserial->image.imagenum, packsize);
DebugLog(0, szbuf, 'V'); DebugLog(0, szbuf, 'V');
curserial->RevCmdFlag = 1; curserial->RevCmdFlag = 1;
curserial->FirstCmdTimeCnt = get_msec(); curserial->FirstCmdTimeCnt = get_msec();
if (iNo == curserial->SerialCmdidx) if (iNo == curserial->SerialCmdidx)
{ {
if (iNo == srdt.imagepacketnum) if (iNo == curserial->image.imagenum)
{ /* 检查是否有漏包*/ { /* 检查是否有漏包*/
for (pidx = 0; pidx < srdt.imagepacketnum; pidx++) for (pidx = 0; pidx < curserial->image.imagenum; pidx++)
{ {
if (curserial->image.ilen[pidx] < 1) if (curserial->image.ilen[pidx] < 1)
break; break;
} }
if (pidx < srdt.imagepacketnum) if (pidx < curserial->image.imagenum)
{ {
iNo = pidx; iNo = pidx;
recvend = 0; recvend = 0;
@ -1975,7 +1975,7 @@ void CameraPhotoPortDataProcess(SIO_PARAM_SERIAL_DEF *curserial)
} }
else else
{ {
if ((iNo > srdt.imagepacketnum) || (0 >= srdt.imagepacketnum)) if ((iNo > curserial->image.imagenum) || (0 >= curserial->image.imagenum))
{ {
curserial->SerialCmdidx = -1; curserial->SerialCmdidx = -1;
} }
@ -3560,7 +3560,7 @@ void SendCameraCmdFormPollCmdBuf(SIO_PARAM_SERIAL_DEF *pPortParam)
pPortParam->m_iRevStatus = 0; pPortParam->m_iRevStatus = 0;
if (pPortParam->fd < 0) if (pPortParam->fd < 0)
return; return;
len = GM_SerialComSend(&pPortParam->PollCmd[2], pPortParam->cmdlen - 2, pPortParam->fd); len = GM_CameraComSend(&pPortParam->PollCmd[2], pPortParam->cmdlen - 2, pPortParam->fd);
if (len < 1) if (len < 1)
{ {
sprintf(buf, "摄像机串口, 发送命令失败!"); sprintf(buf, "摄像机串口, 发送命令失败!");

18
app/src/main/cpp/native-lib.cpp
Unescape Escape View File

@ -900,42 +900,42 @@ extern "C" JNIEXPORT void JNICALL
Java_com_xinyingpower_testcomm_MainActivity_turnLeft( Java_com_xinyingpower_testcomm_MainActivity_turnLeft(
JNIEnv* env, JNIEnv* env,
jobject /*this*/) { jobject /*this*/) {
CameraPhotoCmd(0, 1, MOVE_LEFT, 0, 0, "/dev/ttyS0", 38400, 0); CameraPhotoCmd(0, 1, MOVE_LEFT, 0, 0, "/dev/ttyS1", 38400, 0);
} }
extern "C" JNIEXPORT void JNICALL extern "C" JNIEXPORT void JNICALL
Java_com_xinyingpower_testcomm_MainActivity_turnRight( Java_com_xinyingpower_testcomm_MainActivity_turnRight(
JNIEnv* env, JNIEnv* env,
jobject /*this*/) { jobject /*this*/) {
CameraPhotoCmd(0, 1, MOVE_RIGHT, 0, 0, "/dev/ttyS0", 38400, 0); CameraPhotoCmd(0, 1, MOVE_RIGHT, 0, 0, "/dev/ttyS1", 38400, 0);
} }
extern "C" JNIEXPORT void JNICALL extern "C" JNIEXPORT void JNICALL
Java_com_xinyingpower_testcomm_MainActivity_turnUp( Java_com_xinyingpower_testcomm_MainActivity_turnUp(
JNIEnv* env, JNIEnv* env,
jobject /*this*/) { jobject /*this*/) {
CameraPhotoCmd(0, 1, MOVE_UP, 0, 0, "/dev/ttyS0", 38400, 0); CameraPhotoCmd(0, 1, MOVE_UP, 0, 0, "/dev/ttyS1", 38400, 0);
} }
extern "C" JNIEXPORT void JNICALL extern "C" JNIEXPORT void JNICALL
Java_com_xinyingpower_testcomm_MainActivity_turnDown( Java_com_xinyingpower_testcomm_MainActivity_turnDown(
JNIEnv* env, JNIEnv* env,
jobject /*this*/) { jobject /*this*/) {
CameraPhotoCmd(0, 1, MOVE_DOWN, 0, 0, "/dev/ttyS0", 38400, 0); CameraPhotoCmd(0, 1, MOVE_DOWN, 0, 0, "/dev/ttyS1", 38400, 0);
} }
extern "C" JNIEXPORT void JNICALL extern "C" JNIEXPORT void JNICALL
Java_com_xinyingpower_testcomm_MainActivity_zoomIn( Java_com_xinyingpower_testcomm_MainActivity_zoomIn(
JNIEnv* env, JNIEnv* env,
jobject /*this*/) { jobject /*this*/) {
CameraPhotoCmd(0, 1, ZOOM_TELE, 0, 0, "/dev/ttyS0", 38400, 0); CameraPhotoCmd(0, 1, ZOOM_TELE, 0, 0, "/dev/ttyS1", 38400, 0);
} }
extern "C" JNIEXPORT void JNICALL extern "C" JNIEXPORT void JNICALL
Java_com_xinyingpower_testcomm_MainActivity_zoomOut( Java_com_xinyingpower_testcomm_MainActivity_zoomOut(
JNIEnv* env, JNIEnv* env,
jobject /*this*/) { jobject /*this*/) {
CameraPhotoCmd(0, 1, ZOOM_WIDE, 0, 0, "/dev/ttyS0", 38400, 0); CameraPhotoCmd(0, 1, ZOOM_WIDE, 0, 0, "/dev/ttyS1", 38400, 0);
} }
extern "C" JNIEXPORT void JNICALL extern "C" JNIEXPORT void JNICALL
@ -944,7 +944,7 @@ Java_com_xinyingpower_testcomm_MainActivity_setSpeed(
jobject /*this*/, jint speed) { jobject /*this*/, jint speed) {
//CameraPhotoCmd(0, 1, ZOOM_WIDE, 0, 0); //CameraPhotoCmd(0, 1, ZOOM_WIDE, 0, 0);
CameraPhotoCmd(time(NULL), 1, 0, (u_char)(speed/10), speed%10, "/dev/ttyS0", 38400, 0); CameraPhotoCmd(time(NULL), 1, 0, (u_char)(speed/10), speed%10, "/dev/ttyS1", 38400, 0);
return; return;
CameraPhotoCmd(0, 1, OPEN_TOTAL, 0, 0, "/dev/ttyS0", 38400, 1); CameraPhotoCmd(0, 1, OPEN_TOTAL, 0, 0, "/dev/ttyS0", 38400, 1);
usleep(200000); usleep(200000);
@ -956,14 +956,14 @@ extern "C" JNIEXPORT void JNICALL
Java_com_xinyingpower_testcomm_MainActivity_setPreset( Java_com_xinyingpower_testcomm_MainActivity_setPreset(
JNIEnv* env, JNIEnv* env,
jobject /*this*/, jint preset) { jobject /*this*/, jint preset) {
CameraPhotoCmd(0, 1, SAVE_PRESETNO, 0, preset, "/dev/ttyS0", 38400, 0); CameraPhotoCmd(0, 1, SAVE_PRESETNO, 0, preset, "/dev/ttyS1", 38400, 0);
} }
extern "C" JNIEXPORT void JNICALL extern "C" JNIEXPORT void JNICALL
Java_com_xinyingpower_testcomm_MainActivity_gotoPreset( Java_com_xinyingpower_testcomm_MainActivity_gotoPreset(
JNIEnv* env, JNIEnv* env,
jobject /*this*/, jint preset) { jobject /*this*/, jint preset) {
CameraPhotoCmd(0, 1, MOVE_PRESETNO, 0, preset, "/dev/ttyS0", 38400, 0); CameraPhotoCmd(0, 1, MOVE_PRESETNO, 0, preset, "/dev/ttyS1", 38400, 0);
} }
extern "C" JNIEXPORT void JNICALL extern "C" JNIEXPORT void JNICALL

Write Preview
Loading…
Cancel
Save