修改波特率设置

app/src/main/cpp/SensorsProtocol.cpp

@@ -1074,15 +1074,10 @@ void testComm()
 	for (;;)
 	{
 #if COLLECT_DATA
-<<<<<<< HEAD
       Collect_sensor_data();
-=======
-
-		Collect_sensor_data();
->>>>>>> cf0f3f52d373254ad85da3aa96b1e8c8f7c34070
 #else
 		sleep(15);
-		CameraPhotoCmd(time(NULL), 1, 0, 6, 1, "/dev/ttyS1",38400, 1);
+		CameraPhotoCmd(time(NULL), 1, 0, 6, 1, "/dev/ttyS0",38400, 1);
 		sleep(5);
 
 		CameraPhotoCmd(time(NULL), 1, 10017, 0, 2, "/dev/ttyS1",38400, 1);
@@ -3389,6 +3384,7 @@ int Gm_OpenCameraSerial(SIO_PARAM_SERIAL_DEF *pPortParam, char *serfile, unsigne
 {
 	int	fd = -1;
 	char szbuf[512];
+	unsigned  int serbaud;
 
 	memset(szbuf, 0, sizeof(szbuf));
 	if (pPortParam->fd <= 0)
@@ -3403,7 +3399,8 @@ int Gm_OpenCameraSerial(SIO_PARAM_SERIAL_DEF *pPortParam, char *serfile, unsigne
 		sprintf(szbuf, "摄像机打开串口%s成功！fd=%d", serfile, fd);
 		DebugLog(0, szbuf, 'I');
 		pPortParam->fd = fd;
-		Gm_SetCameraSerialPortParam(fd, baud);
+		serbaud = getBaudrate(baud);
+		Gm_SetCameraSerialPortParam(fd, serbaud);
 		return 0;
 	}
 	sprintf(szbuf, "摄像机串口%s已经打开！fd=%d", serfile, pPortParam->fd);
@@ -3627,65 +3624,30 @@ int GM_StartSerialCameraPhoto(uint8_t channel, int cmdidx, u_char bImageSize, in
 
 	flag = Gm_OpenCameraSerial(&cameraport, serfile, baud);
 
-#if 0
+#if 1
-	// 初始化串口使用状态
-	for (i = 0; i < MAX_SERIAL_DEV_NUM; i++)
-	{
-		if (0 == devparam[i].IsNoInsta)
-		{
-			srdt.ms_dev[i].IsNeedSerial = 0;
-			continue;
-		}
 		memset(szbuf, 0, sizeof(szbuf));
-		switch (devparam[i].ProtocolIdx)
-		{
-			case	SERIALCAMERA_PROTOCOL:		/* 串口摄像机协议*/
-			case	PELCO_P_PROTOCOL:		    /* 摄像机协议*/
-			case	PELCO_D_PROTOCOL:		    /* 摄像机协议*/
-				if ((1 > devparam[i].CameraChannel) || (devparam[i].CameraChannel > MAX_CHANNEL_NUM))
-				{
-					srdt.ms_dev[i].IsNeedSerial = 0;
-					break;
-				}
-				if (channel == devparam[i].CameraChannel)
-				{
-					;
-				}
-				else
-					break;
-				if (0 == srdt.ms_dev[i].IsNeedSerial)
         srdt.iLastGetPhotoNo = -1;
-				else
-					srdt.iLastGetPhotoNo = srdt.ms_dev[i].SerialCmdidx;
-				srdt.ms_dev[i].IsNeedSerial = 1;
         if (0 == cmdidx)
-					srdt.ms_dev[i].image.state = SER_STARTSAMPLE;
+            cameraport.image.state = SER_STARTSAMPLE;
         if ((0 == cmdidx) && (srdt.presetno > 0))
         {
-					srdt.ms_dev[i].SerialCmdidx = 10017;
+            cameraport.SerialCmdidx = 10017;
             srdt.iLastGetPhotoNo = cmdidx;
         }
         else
-					srdt.ms_dev[i].SerialCmdidx = cmdidx;
+            cameraport.SerialCmdidx = cmdidx;
-				srdt.ms_dev[i].FirstCmdTimeCnt = get_msec();
+        cameraport.FirstCmdTimeCnt = get_msec();
         srdt.sendphotocmdcnt = 0;
-				sprintf(szbuf, "摄像机");
+        //sprintf(szbuf, "摄像机");
-				flag = 1;
+        //flag = 1;
-				break;
+		//if (1 == srdt.ms_dev[i].IsNeedSerial)
-			default:
+		//{
-				if (1 == srdt.ms_dev[i].IsNeedSerial)
+			//sprintf(logbuf, "装置%d, IsNoInsta=%d, 类型：%s", i + 1, devparam[i].IsNoInsta, szbuf);
-					break;
+			//DebugLog(8, logbuf, 'I');
-				srdt.ms_dev[i].IsNeedSerial = 0;
+			//Gm_OpenSensorsPower();
-				break;
+            //Gm_OpenCameraSerial(&cameraport);
-		}
+		//}
-		if (1 == srdt.ms_dev[i].IsNeedSerial)
+
-		{
-			sprintf(logbuf, "装置%d, IsNoInsta=%d, 类型：%s", i + 1, devparam[i].IsNoInsta, szbuf);
-			DebugLog(8, logbuf, 'I');
-			Gm_OpenSensorsPower();
-			Gm_OpenSerialPort(i);
-		}
-	}
 #endif
 	if(-1 == flag)
 		return -1;
@@ -3708,7 +3670,7 @@ int GM_StartSerialCameraPhoto(uint8_t channel, int cmdidx, u_char bImageSize, in
 			}
 		}
 	}
-	//return;
+	return 0;
 }
 #endif