Merge branch 'test' of http://git.ringzle.com:3000/haitaowang1001/dtu_lan_gateway into test

app/System/source/task.c

@@ -34,10 +34,10 @@ int commd = 1;
 
 /*
 *********************************************************************************************************
-*	º¯ Êý Ãû: void data_task(void *pdata)
-*	¹¦ÄÜ˵Ã÷: Ö÷ÒªÊÇdata_task´¦ÀíỊ̈߳¬ÓÅÏȼ¶¸ß¡£ÆäÔËÐÐÂß¼­Êǽ«nandflashÖеÄÊý¾Ý½âÎö³öÀ´ÂÖѯ·¢ËÍÊý¾Ý
-*	ÐÎ    ²Î£ºÎÞ
-*	·µ »Ø Öµ: ÎÞ
+*	函 数 �: void data_task(void *pdata)
+*	功能说明: 主�是data_task处�线程，优先级高。其�行逻辑是将nandflash中的数�解�出�轮询��数�
+*	形    �：无
+*	返 回 值: 无
 *********************************************************************************************************
 */
 
@@ -61,6 +61,7 @@ void data_task(void *pdata)
 //	Config_485_Port(get->baudrate, get->dataBits, get->stopBit, get->parity, get->flowControl);
 	 
 	while (current_device!=NULL)
+<<<<<<< HEAD
 	{
 		uint8_t err;
 		StringInfo *message=NULL; //½ÓÊÕ¶ÓÁÐÏûÏ¢½á¹¹Ìå
@@ -118,10 +119,53 @@ void data_task(void *pdata)
 			commd = 1;	
 		}	
 				OSTimeDly(1000);
+=======
+	{		
+		char buf[1000];	// 接收modbus读�的数�	
+		READ_MODBUS_DATA(current_device, buf);		
+		if(current_device->nextDevice!=NULL) 
+		{
+			current_device=current_device->nextDevice;		
+		}
+		else
+		{		 
+			sprintf(buf + strlen(buf) - 1, "}");
+				time1 = OSTimeGet();
+				if( jsoncunt || time2  <= time1 - 10000)
+				{
+					memset(pubJsonStringCopy,0, strlen(pubJsonStringCopy));
+					memcpy(pubJsonStringCopy + strlen(pubJsonStringCopy), buf, strlen(buf));//备份上一次的数�
+					sprintf(pubJsonString,"{\"DEVICEID\":\"%s\",\"data\":[%s]",get->deviceId, buf);									
+					int msg = MBOX_USER_PUBLISHQOS2;	
+					if(mqtt_connectFlag==1) OSMboxPost(mqtt_sendMseeageMbox, &msg);
+					current_device=get->device_params;
+					jsoncunt = 0;
+					time2 = OSTimeGet();
+				}//10s进行一次
+				
+				else
+				{
+					if(strcmp(buf,pubJsonStringCopy))
+					{
+						memset(string, 0 , strlen(string));
+						findDifference(buf, pubJsonStringCopy, string);	
+						memset(pubJsonString,0, strlen(pubJsonString));
+						sprintf(pubJsonString,"{\"deviceId\":\"%s\",\"data\":[{%s}]}",get->deviceId, string);
+						memset(pubJsonStringCopy,0, strlen(pubJsonStringCopy));
+						sprintf(pubJsonStringCopy, buf, strlen(buf));
+					
+						int msg = MBOX_USER_PUBLISHQOS2;	
+						if(mqtt_connectFlag==1) OSMboxPost(mqtt_sendMseeageMbox, &msg);	
+					}
+			}	
+			memset(buf,0,strlen(buf));	
+			current_device=get->device_params;
+		}			
+>>>>>>> a918534a9b4aa4cabe8f4f2913d8348b30404274
 	}
 }
 
-	#if 0   //²âÊÔ´úÂë²»¾­¹ýת·¢Ö±½Ó½øÐÐÏàÓ¦µÄ½âÎö
+	#if 0   //测试代���过转�直接进行相应的解�
 			SlaveProtocolAnalysis(string,bufferLength);
 			data_acquisition();
 			uint8_t node_string[256];
@@ -132,10 +176,10 @@ void data_task(void *pdata)
  
 /*
 *********************************************************************************************************
-*	º¯ Êý Ãû: int READ_MODBUS_DATA(DEVICE_PARAMS *device)
-*	¹¦ÄÜ˵Ã÷: ¶ÁÈ¡µ±Ç°½ÚµãÉϵÄmodbusÊý¾Ý
-*	ÐÎ    ²Î£ºDEVICE_PARAMS *device  µ±Ç°É豸
-*	·µ »Ø Öµ:  1 £º³É¹¦  0£ºÊ§°Ü
+*	函 数 �: int READ_MODBUS_DATA(DEVICE_PARAMS *device)
+*	功能说明: 读�当�节点上的modbus数�
+*	形    �：DEVICE_PARAMS *device  当�设备
+*	返 回 值:  1 ：�功  0：失败
 *********************************************************************************************************
 */
 
@@ -151,7 +195,7 @@ int READ_DATA(DEVICE_PARAMS *device, char* buf)
 			if (current_device->protocol == MODBUS_READ)
 			{
 				protocol_485=1;
-				uint16_t data[currentModbusParams->registerByteNum /2]; // modbus¼Ä´æÆ÷³¤¶È
+				uint16_t data[currentModbusParams->registerByteNum /2]; // modbus寄存器长度
 				mmodbus_set16bitOrder(current_device->MDBbigLittleFormat);
 				if (currentModbusParams->functionCode == 0x03 | currentModbusParams->functionCode == 0x01)
 				{
@@ -199,10 +243,10 @@ int READ_DATA(DEVICE_PARAMS *device, char* buf)
 }
 	/*
 *********************************************************************************************************
-*	º¯ Êý Ãû:void WRITE_MODBUS_DATA(char* cJSONstring)
-*	¹¦ÄÜ˵Ã÷: ½ÓÊÕmqttÊý¾Ý²¢Ð´Èëmodbus¼Ä´æÆ÷
-*	ÐÎ    ²Î£ºchar* cJSONstring mqtt½ÓÊÕµ½µÄÊý¾Ý
-*	·µ »Ø Öµ: ÎÞ
+*	函 数 �:void WRITE_MODBUS_DATA(char* cJSONstring)
+*	功能说明: 接收mqtt数�并写入modbus寄存器
+*	形    �：char* cJSONstring mqtt接收到的数�
+*	返 回 值: 无
 *********************************************************************************************************
 */
 void WRITE_MODBUS_DATA(char* cJSONstring)
@@ -273,7 +317,12 @@ void WRITE_MODBUS_DATA(char* cJSONstring)
 }
 
 
+<<<<<<< HEAD
 // ±È½ÏÁ½¸ö JSONItem Êý×飬ÕÒµ½±ä»¯µÄ²¿·Ö
+=======
+
+// 比较两个 JSONItem 数组，找到�化的部分
+>>>>>>> a918534a9b4aa4cabe8f4f2913d8348b30404274
 void  findDifference(char* buf, char* pubJsonStringCopy, char* string) 
 {
     const char* delimiter = "{}";
@@ -283,7 +332,7 @@ void  findDifference(char* buf, char* pubJsonStringCopy, char* string)
 		char* data2 = malloc(strlen(pubJsonStringCopy) + 1);	;
 		memcpy(data1, buf, strlen(buf));
 		memcpy(data2, pubJsonStringCopy, strlen(pubJsonStringCopy));
-    // ÀûÓÃstrtok_rº¯Êý·Ö¸î×Ö·û´®£¬²¢ÖðÒ»±È½Ï
+    // 利用strtok_r函数分割字符串，并�一比较
     char* token1 = strtok_r((char*)data1, delimiter, &saveptr1);
     char* token2 = strtok_r((char*)data2, delimiter, &saveptr2);
 
@@ -295,7 +344,7 @@ void  findDifference(char* buf, char* pubJsonStringCopy, char* string)
         token2 = strtok_r(NULL, delimiter, &saveptr2);
     }
 
-//    // Èç¹ûÓÐÊ£Óà×Ö·û´®Î´±È½Ï£¬Ôò´òÓ¡Ê£Óà×Ö·û´®
+//    // 如果有剩余字符串未比较，则打�剩余字符串
 //    while (token1 != NULL) {
 //        sprintf(string + strlen(string),"%s,", token1);
 //        token1 = strtok_r(NULL, delimiter, &saveptr1);