From a346f1906fa3431057a0795fc280c32d752901fc Mon Sep 17 00:00:00 2001
From: jxjajs <jgswsh@163.com>
Date: Fri, 6 Dec 2024 11:51:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=A5=E6=94=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/cpp/SensorsProtocol.cpp | 12 ++++++------
 app/src/main/cpp/native-lib.cpp      | 18 +++++++++---------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/app/src/main/cpp/SensorsProtocol.cpp b/app/src/main/cpp/SensorsProtocol.cpp
index 253b24f..6faa7c9 100644
--- a/app/src/main/cpp/SensorsProtocol.cpp
+++ b/app/src/main/cpp/SensorsProtocol.cpp
@@ -1930,20 +1930,20 @@ void CameraPhotoPortDataProcess(SIO_PARAM_SERIAL_DEF *curserial)
 			packsize = rtumsg.MsgData[i + 3] + rtumsg.MsgData[i + 2] * 256;
 			memmove(&curserial->image.buf[iNo - 1], &rtumsg.MsgData[i + 4], 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');
 			curserial->RevCmdFlag = 1;
 			curserial->FirstCmdTimeCnt = get_msec();
 			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)
 							break;
 					}
-					if (pidx < srdt.imagepacketnum)
+					if (pidx < curserial->image.imagenum)
 					{
 						iNo = pidx;
 						recvend = 0;
@@ -1975,7 +1975,7 @@ void CameraPhotoPortDataProcess(SIO_PARAM_SERIAL_DEF *curserial)
 				}
 				else
 				{
-					if ((iNo > srdt.imagepacketnum) || (0 >= srdt.imagepacketnum))
+					if ((iNo > curserial->image.imagenum) || (0 >= curserial->image.imagenum))
 					{
 						curserial->SerialCmdidx = -1;
 					}
@@ -3560,7 +3560,7 @@ void SendCameraCmdFormPollCmdBuf(SIO_PARAM_SERIAL_DEF *pPortParam)
 	pPortParam->m_iRevStatus = 0;
 	if (pPortParam->fd < 0)
 		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)
 	{
 		sprintf(buf, "摄像机串口, 发送命令失败!");
diff --git a/app/src/main/cpp/native-lib.cpp b/app/src/main/cpp/native-lib.cpp
index 4a83cb8..9a4ec0e 100644
--- a/app/src/main/cpp/native-lib.cpp
+++ b/app/src/main/cpp/native-lib.cpp
@@ -900,42 +900,42 @@ extern "C" JNIEXPORT void JNICALL
 Java_com_xinyingpower_testcomm_MainActivity_turnLeft(
         JNIEnv* env,
         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
 Java_com_xinyingpower_testcomm_MainActivity_turnRight(
         JNIEnv* env,
         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
 Java_com_xinyingpower_testcomm_MainActivity_turnUp(
         JNIEnv* env,
         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
 Java_com_xinyingpower_testcomm_MainActivity_turnDown(
         JNIEnv* env,
         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
 Java_com_xinyingpower_testcomm_MainActivity_zoomIn(
         JNIEnv* env,
         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
 Java_com_xinyingpower_testcomm_MainActivity_zoomOut(
         JNIEnv* env,
         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
@@ -944,7 +944,7 @@ Java_com_xinyingpower_testcomm_MainActivity_setSpeed(
         jobject /*this*/, jint speed) {
 
     //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;
     CameraPhotoCmd(0, 1, OPEN_TOTAL, 0, 0, "/dev/ttyS0", 38400, 1);
     usleep(200000);
@@ -956,14 +956,14 @@ extern "C" JNIEXPORT void JNICALL
 Java_com_xinyingpower_testcomm_MainActivity_setPreset(
         JNIEnv* env,
         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
 Java_com_xinyingpower_testcomm_MainActivity_gotoPreset(
         JNIEnv* env,
         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