From 75177c54a98bdbe0c08f9c35990ae26346189faf Mon Sep 17 00:00:00 2001
From: fish <gcslyp@gmail.com>
Date: Tue, 4 Jun 2019 21:08:38 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=B8=8D=E5=BF=85=E8=A6=81?=
 =?UTF-8?q?=E7=9A=84=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 loadconfig.go | 46 ----------------------------------------------
 tcpserver.go  |  6 +-----
 worker.go     |  6 +++++-
 3 files changed, 6 insertions(+), 52 deletions(-)

diff --git a/loadconfig.go b/loadconfig.go
index 5c1b0ed..c161704 100644
--- a/loadconfig.go
+++ b/loadconfig.go
@@ -149,52 +149,6 @@ func init() {
 
 	DEVICEDATAS.Unlock()
 
-	demoDevice.ID = "deb03e28-ddcb-4e5d-aa31-d870a1f0f09b"
-	demoDevice.VERSION = "yunhorn_kgl_c8_v1"
-	demoDevice.DATA = make(map[string]interface{})
-	for a := 0; a < 8; a++ {
-		demoDevice.DATA["data"+strconv.Itoa(a+1)] = 0
-	}
-
-	demoDevice.ONLINE = true
-	log.Println("init demoDevice success:", demoDevice)
-
-	//airDevice.DATA = make(map[string]interface{})
-	//airDevice.DATA["data"] = 0
-
-	var device2 Device
-	device2.Lock()
-	device2.ID = demoDevice.ID
-	device2.VERSION = demoDevice.VERSION
-	device2.ONLINE = demoDevice.ONLINE
-	device2.DATA = make(map[string]interface{})
-
-	device2.DATA["data7"] = 0
-	device2.DATA["data8"] = 0
-
-	device2.Unlock()
-	//DEVICEDATAS.DATA[demoDevice.VERSION+"_1"] = device2
-
-	//femaledemoDevice.ID = "8E146028-E1B1-4AC9-8F47-01376A22CB35"
-	// femaledemoDevice.VERSION = "yunhorn_kgl_c8_v1"
-	// femaledemoDevice.DATA = make(map[string]interface{})
-	// femaledemoDevice.ONLINE = true
-	// femaledemoDevice.DATA["data1"] = 0
-
-	//3是男厕
-	// DEVICEDATAS.DATA[demoDevice.VERSION+"_3"] = femaledemoDevice
-
-	//2是女厕  配置演示使用
-	// maledemoDevice.ID = "7BB22E6A-ED0D-4161-8370-6B722D3683B7"
-	// maledemoDevice.VERSION = "yunhorn_kgl_c8_v1"
-	// maledemoDevice.DATA = make(map[string]interface{})
-	// maledemoDevice.ONLINE = true
-	// maledemoDevice.DATA["data1"] = 0
-	// maledemoDevice.DATA["data2"] = 0
-	//3是男厕
-	// DEVICEDATAS.DATA[demoDevice.VERSION+"_2"] = maledemoDevice
-
-
 	go dbdata_init()
 
 }
diff --git a/tcpserver.go b/tcpserver.go
index 70c58da..d0a013f 100644
--- a/tcpserver.go
+++ b/tcpserver.go
@@ -212,9 +212,6 @@ func readConn(conn net.Conn, readChan chan<- []byte, stopChan chan<- bool) {
 					}
 
 					log.Println("yunhorndeug.push.data.tcp:",buffer.String(),addrs,dataType,values)
-					// log.Println("yunhorndeug.push.data.tcp.addr",addrs)
-					// log.Println("yunhorndeug.push.data.tcp.type",dataType)
-					// log.Println("yunhorndeug.push.data.tcp.values",values)
 
 					_,ok := loraNodeMap.Load(buffer.String())
 					if !ok{
@@ -226,9 +223,8 @@ func readConn(conn net.Conn, readChan chan<- []byte, stopChan chan<- bool) {
 						buffer = new(bytes.Buffer)
 
 						go record_log(data[i-4:i+end])
-					// if(dataType ==1 || dataType ==2 || dataType == 4 ){
+						
 					 	go dealDatav3(data[i-4:i+end])
-					// }
 
 				}
     }
diff --git a/worker.go b/worker.go
index 5264f1f..b3af0d6 100644
--- a/worker.go
+++ b/worker.go
@@ -26,7 +26,7 @@ type Device struct {
 }
 
 //处理通过tcp发送过来的数据
-
+//广州板子版
 func yunhorn_wireless(data_buf []byte) {
 	//至少5个字节数据
 	log.Println("wireless.tcp.data.len:", len(data_buf))
@@ -77,6 +77,8 @@ func yunhorn_xdy_l_v1(data_buf []byte) {
 
 }
 
+
+//打印原始数据进log
 func record_log(data_buf []byte){
 	time := today
 	folder := conf.RECORD_LOG_PATH+"/"+time
@@ -127,6 +129,7 @@ func yunhorn_lora_l_v1(data_buf []byte) {
 	}
 }
 
+//发送心跳包
 func yunhorn_hb_dpark_v1(){
 
 	log.Println("begin yunhorn_hb_dpark_v1")
@@ -275,6 +278,7 @@ func yunhorn_lorawan_l_v1(s *serial.Port) {
 	}
 }
 
+//空气质量数据  有线
 func yunhorn_kgl_l_v1(data_buf []byte) {
 	log.Println(data_buf)
 	var device Device