增加多合一气象传感器处理

app/src/main/cpp/PhoneDevice.cpp

@@ -3909,8 +3909,8 @@ int CPhoneDevice::GetIceData(IDevice::ICE_INFO *iceInfo, IDevice::ICE_TAIL *iceT
                 iceTail->instantaneous_winddirection = 0xff;
                 XYLOG(XYLOG_SEVERITY_INFO, "地址%d,风速风向传感器未启用",
                       sensorParam[num].devaddr);
-                break;
+                continue;
-            } else if (sensorParam[num].SensorsType == WIND_PROTOCOL &&
+            } else if ((sensorParam[num].SensorsType == WIND_PROTOCOL || sensorParam[num].SensorsType == MUTIWEATHER_PROTOCOL) &&
                        sensorParam[num].IsNoInsta == 1) {
                 GetWindSpeedData(&airt);
                 if (airt.AiState == 255 || airt.AiState == -1) {
@@ -3978,8 +3978,8 @@ int CPhoneDevice::GetIceData(IDevice::ICE_INFO *iceInfo, IDevice::ICE_TAIL *iceT
                 iceTail->humidity = 0xff;
                 XYLOG(XYLOG_SEVERITY_INFO, "地址%d,温湿度传感器未启用",
                       sensorParam[num].devaddr);
-                break;
+                continue;
-            } else if (sensorParam[num].SensorsType == WEATHER_PROTOCOL && sensorParam[num].IsNoInsta == 1) {
+            } else if ((sensorParam[num].SensorsType == WEATHER_PROTOCOL || sensorParam[num].SensorsType == MUTIWEATHER_PROTOCOL) && sensorParam[num].IsNoInsta == 1) {
                 GetAirTempData(&airt);
                 if (airt.AiState == 255 || airt.AiState == -1) {
                     iceTail->air_temperature = 0xff;
@@ -4078,8 +4078,8 @@ int CPhoneDevice::GetWData(IDevice::WEATHER_INFO *weatherInfo, D_SENSOR_PARAM *s
                 weatherInfo->avg_winddirection_10min = 0xff;
                 XYLOG(XYLOG_SEVERITY_INFO, "地址%d,风速风向传感器未启用",
                       sensorParam[num].devaddr);
-                break;
+                continue;
-            } else if (sensorParam[num].SensorsType == WIND_PROTOCOL && sensorParam[num].IsNoInsta == 1)
+            } else if ((sensorParam[num].SensorsType == WIND_PROTOCOL || sensorParam[num].SensorsType == MUTIWEATHER_PROTOCOL) && sensorParam[num].IsNoInsta == 1)
             {
                 GetWindSpeedData(&airt);
                 if (airt.AiState == 255 || airt.AiState == -1)
@@ -4215,8 +4215,8 @@ int CPhoneDevice::GetWData(IDevice::WEATHER_INFO *weatherInfo, D_SENSOR_PARAM *s
                 weatherInfo->humidity = 0xff;
                 XYLOG(XYLOG_SEVERITY_INFO, "地址%d,温湿度传感器未启用",
                       sensorParam[num].devaddr);
-                break;
+                continue;
-            } else if (sensorParam[num].SensorsType == WEATHER_PROTOCOL &&
+            } else if ((sensorParam[num].SensorsType == WEATHER_PROTOCOL || sensorParam[num].SensorsType == MUTIWEATHER_PROTOCOL) &&
                        sensorParam[num].IsNoInsta == 1)
             {
                 GetAirTempData(&airt);

app/src/main/cpp/SensorsProtocol.cpp

@@ -1020,6 +1020,9 @@ void Gm_InitSerialComm(SENSOR_PARAM *sensorParam, char *filedir)
 			case RESERVE5_PROTOCOL:
 				sprintf(szbuf, "传感器%d接的是加密芯片", i + 1);
 				break;
+			case MUTIWEATHER_PROTOCOL:
+				sprintf(szbuf, "传感器%d接的是多合一气象传感器", i + 1);
+				break;
 			default:
 				sprintf(szbuf, "传感器%d没有接!", i + 1);
 				break;
@@ -1180,6 +1183,7 @@ void FindDevUseSerialCommNo()
 		{
 			case	WEATHER_PROTOCOL:
 			case	WIND_PROTOCOL:
+			case	MUTIWEATHER_PROTOCOL:
 				//memset(devparam[i].pathname, 0, sizeof(devparam[i].pathname));
 				/* 目前还不确定具体串口分配，暂时默认使用串口1</dev/ttyS0>*/
 				//sprintf(devparam[i].pathname, "/dev/swk3");
@@ -1271,6 +1275,7 @@ void GM_StartSerialComm()
 		switch (devparam[i].ProtocolIdx)
 		{
 			case	WEATHER_PROTOCOL:	// 气象
+			case	MUTIWEATHER_PROTOCOL:
                 memset(weatherpntmsg, 0, sizeof(AI_DEF)*WEATHER_DATA_NUM);
                 memset(szbuf, 0, sizeof(szbuf));
 				sprintf(szbuf, "%s", "气象");
@@ -1433,6 +1438,7 @@ void Gm_FindAllSensorsCommand()
 				case	RALLY_PROTOCOL:		    /* 拉力*/
 				case	WIND_PROTOCOL:				/* 风速风向*/
 				case	SLANT_PROTOCOL:	/* 倾角*/
+				case	MUTIWEATHER_PROTOCOL:
 					flag = FindNextShxyProtocolCommand(curidx);
 					break;
 				case	RESERVE2_PROTOCOL:
@@ -1480,6 +1486,7 @@ void GM_IsCloseSensors()
 			case	RALLY_PROTOCOL:		    /* 拉力*/
 			case	WIND_PROTOCOL:			/* 风速风向*/
 			case	SLANT_PROTOCOL:			/* 倾角*/
+			case	MUTIWEATHER_PROTOCOL:
 				if ((lctime - srdt.ms_dev[i].FirstCmdTimeCnt > 50 * 1000) || (lctime - srdt.ms_dev[i].FirstCmdTimeCnt < 0))
 				{
 					srdt.ms_dev[i].FirstCmdTimeCnt = lctime;
@@ -1498,7 +1505,7 @@ void GM_IsCloseSensors()
 						else if (SER_SAMPLE == srdt.ms_dev[i].aiValue[j].AiState)
 							srdt.ms_dev[i].aiValue[j].AiState = SAMPLINGSUCCESS;
 					}
-                    if((devparam[i].ProtocolIdx == WIND_PROTOCOL) || (WEATHER_PROTOCOL == devparam[i].ProtocolIdx))
+                    if((devparam[i].ProtocolIdx == WIND_PROTOCOL) || (WEATHER_PROTOCOL == devparam[i].ProtocolIdx)|| (MUTIWEATHER_PROTOCOL == devparam[i].ProtocolIdx))
                     {
                         for (j = 0; j < WEATHER_DATA_NUM; j++)
                         {
@@ -1606,6 +1613,7 @@ void SerialDataProcess(int devidx, u_char *buf, int len)
 		case	RALLY_PROTOCOL:		/* 拉力*/
 		case	WIND_PROTOCOL:				/* 风速风向*/
 		case	SLANT_PROTOCOL:			/* 倾角*/
+		case	MUTIWEATHER_PROTOCOL:
 			ShxyProtocolRecvData(devidx, buf, len);
 			break;
 		case	RESERVE2_PROTOCOL:			/* 意科电池电量读取协议*/

app/src/main/cpp/SensorsProtocol.h

@@ -38,6 +38,7 @@
 #define	PELCO_P_PROTOCOL			5			/* 摄像机Pelco_P协议序号*/
 #define	PELCO_D_PROTOCOL			6			/* 摄像机Pelco_D协议序号*/
 #define	SERIALCAMERA_PROTOCOL	    8			/* 串口摄像机协议序号*/
+#define MUTIWEATHER_PROTOCOL        9           /*多合一气象*/
 #define	RESERVE2_PROTOCOL			17			/* 备用2协议序号*/
 #define	RESERVE4_PROTOCOL			19			/* 备用4协议序号*/
 #define	RESERVE5_PROTOCOL			20			/* 备用5协议序号*/