引入mqtt 引入cjson

Comm/netsend.c

@@ -6,9 +6,9 @@
 
 
 // 网络上报线程
-void net_task(void)
+void net_task (void)
 {
-	
+
 }
 
 
@@ -24,7 +24,7 @@ void netWriteSluiceUp (void)
 	tx_size = _651PacketDataSluiceUp (data);
 	NetPacket_t packet;
 	packet.data_size = PP_AddHeader (0x4E, data, tx_size, packet.data);
-	NET_FifoWritebuffer(packet.data,packet.data_size);
+	NET_FifoWritebuffer (packet.data, packet.data_size);
 	//FifoWrite (&g_NetFifo, (char *) &packet, sizeof (packet));
 	//	FifoWrite (&g_NetFifo, (unsigned char *) tx_data, tx_size);
 }
@@ -49,7 +49,7 @@ void netWriteFlowReq (void)
 
 // E0  升级应答  E2 配置应答
 // 应答E0 回复发送的数据
-void netWriteAck (uint8_t funccode,int k)
+void netWriteAck (uint8_t funccode, int k)
 {
 	NetPacket_t packet;
 	if (k == 1)
@@ -60,7 +60,7 @@ void netWriteAck (uint8_t funccode,int k)
 	{
 		packet.data_size = PP_AddHeader (0xE0, "{\"result\":\"error\"}", strlen ("{\"result\":\"error\"}"), packet.data);
 	}
-	NET_FifoWritebuffer(packet.data,packet.data_size);
+	NET_FifoWritebuffer (packet.data, packet.data_size);
 	//FifoWrite (&g_NetFifo, (char *) &packet, sizeof (packet));
 }
 
@@ -92,7 +92,7 @@ void NETSendSluiceAck (void)
 	tx_size = _651PacketDataSluiceAck (data);
 	NetPacket_t packet;
 	packet.data_size = PP_AddHeader (0x4E, data, tx_size, packet.data);
-	NET_FifoWritebuffer(packet.data,packet.data_size);
+	NET_FifoWritebuffer (packet.data, packet.data_size);
 }
 
 
@@ -102,7 +102,7 @@ void NETSendLog (char *data)
 {
 	NetPacket_t packet;
 	packet.data_size = PP_AddHeader (0xEF, data, strlen (data), packet.data);
-	NET_FifoWritebuffer(packet.data,packet.data_size);
+	NET_FifoWritebuffer (packet.data, packet.data_size);
 
 }
 
@@ -117,7 +117,7 @@ void NETSendRegist (void)
 	sprintf (data, "{\"iccid\":\"%s\",\"version\":\"%s\"}", "1234567890", "V1.0.1");
 	NetPacket_t packet;
 	packet.data_size = PP_AddHeader (0xE4, data, strlen (data), packet.data);
-	NET_FifoWritebuffer(packet.data,packet.data_size);
+	NET_FifoWritebuffer (packet.data, packet.data_size);
 }
 
 void netWriteUnifData (void)
@@ -127,21 +127,21 @@ void netWriteUnifData (void)
 	tx_size = PP_PacketUnifData (data);
 	NetPacket_t packet;
 	packet.data_size = PP_AddHeader (0x31, data, tx_size, packet.data);
-	NET_FifoWritebuffer(packet.data,packet.data_size);
+	NET_FifoWritebuffer (packet.data, packet.data_size);
 }
 
-void netWriteHeartData(void)
+void netWriteHeartData (void)
 {
-	
+
 	char data[128];
 	int tx_size = 0;
 	tx_size = PP_PacketUnifData (data);
 	NetPacket_t packet;
 	packet.data_size = PP_AddHeader (0x2F, data, 4, packet.data);
-	NET_FifoWritebuffer(packet.data,packet.data_size);
+	NET_FifoWritebuffer (packet.data, packet.data_size);
 
 }
-	
+
 
 
 
@@ -156,7 +156,7 @@ void netWritebaseParams (void)
 	int tx_size = 0;
 	tx_size = Json651PacketBaseInfo (data, 512);
 	packet.data_size = PP_AddHeader (0xE3, data, strlen (data), packet.data);
-	NET_FifoWritebuffer(packet.data,packet.data_size);
+	NET_FifoWritebuffer (packet.data, packet.data_size);
 	//packet.data_size = PP_AddHeader(0xE3, data, strlen(data), packet.data);
 	log_d ("tx_size = %d\r\n", tx_size);
 	log_d ("data = %s\r\n", data);
@@ -172,7 +172,7 @@ void netWriteInterfaceParams (void)
 	int tx_size = 0;
 	tx_size = Json651PacketInterfaceInfo (data, 512);
 	packet.data_size = PP_AddHeader (0xE3, data, strlen (data), packet.data);
-	NET_FifoWritebuffer(packet.data,packet.data_size);
+	NET_FifoWritebuffer (packet.data, packet.data_size);
 	log_d ("tx_size = %d\r\n", tx_size);
 	log_d ("data = %s\r\n", data);
 }
@@ -192,7 +192,7 @@ void netWriteSluiceParams (void)
 	int tx_size = 0;
 	tx_size = Json651PacketSluiceInfo (data, 512);
 	packet.data_size = PP_AddHeader (0xE3, data, strlen (data), packet.data);
-	NET_FifoWritebuffer(packet.data,packet.data_size);
+	NET_FifoWritebuffer (packet.data, packet.data_size);
 	log_d ("tx_size = %d\r\n", tx_size);
 	log_d ("data = %s\r\n", data);
 }
@@ -209,7 +209,7 @@ void netWriteWaterParams (void)
 	int tx_size = 0;
 	tx_size = Json651PacketWaterInfo (data, 512);
 	packet.data_size = PP_AddHeader (0xE3, data, strlen (data), packet.data);
-	NET_FifoWritebuffer(packet.data,packet.data_size);
+	NET_FifoWritebuffer (packet.data, packet.data_size);
 	log_d ("tx_size = %d\r\n", tx_size);
 	log_d ("data = %s\r\n", data);
 }