From 4f22cc2f4b5d8b42b31b9606b6c004e8e36d53a4 Mon Sep 17 00:00:00 2001
From: fish <gcslyp@gmail.com>
Date: Thu, 21 Mar 2019 18:20:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=97=A5=E5=BF=97=E6=89=93?=
 =?UTF-8?q?=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 conf/gateway.conf |  1 -
 worker.go         | 18 +++++++++++-------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/conf/gateway.conf b/conf/gateway.conf
index 9f830e7..575d3c2 100644
--- a/conf/gateway.conf
+++ b/conf/gateway.conf
@@ -5,7 +5,6 @@
 		"location": [113.960347, 22.54143],
 		"单位": "深圳市云兴科技",
 		"config": [
-
 		{
 				"id": "deb03e28-ddcb-4e5d-aa31-d870a1f0f09b",
 				"version": "yunhorn_kgl_c8_v1",
diff --git a/worker.go b/worker.go
index 54ef0fa..d6eb632 100644
--- a/worker.go
+++ b/worker.go
@@ -33,7 +33,7 @@ func yunhorn_lora_l_v1(data_buf []byte) {
 	// log.Println(binary.BigEndian.Uint16(append([]byte{0x00}, k))
 	// }
 
-	// log.Println("ys_l_v1_data:",data_buf)
+	log.Println("ys_l_v1_data:",data_buf)
 	data_int := Bytes2Bits(data_buf[3:4])
 	data_int0 := Bytes2Bits(data_buf[0:1])
 	data_int1 := Bytes2Bits(data_buf[1:2])
@@ -68,14 +68,14 @@ func yunhorn_ys_l_v1(data_buf []byte) {
 	// log.Println(binary.BigEndian.Uint16(append([]byte{0x00}, k))
 	// }
 
-	// log.Println("ys_l_v1_data:",data_buf)
+	log.Println("ys_l_v1_data:",data_buf)
 	data_int := Bytes2Bits(data_buf[3:4])
 	data_int0 := Bytes2Bits(data_buf[0:1])
 	data_int1 := Bytes2Bits(data_buf[1:2])
-	data_int2 := Bytes2Bits(data_buf[2:3])
+	data_type := Bytes2Bits(data_buf[2:3])
 
-	log.Println("data_int:", data_int[0])
-	log.Printf("ADRH:%d,ADRL:%d,dataType:%d,", data_int0[0], data_int1[0], data_int2[0])
+	log.Println("data_int:", data_int)
+	log.Printf("ADRH:%d,ADRL:%d,dataType:%d,", data_int0[0], data_int1[0], data_type[0])
 	var device Device
 	device.ID = demoDevice.ID
 	device.VERSION = demoDevice.VERSION
@@ -85,8 +85,12 @@ func yunhorn_ys_l_v1(data_buf []byte) {
 	demoDevice.DATA["data"+strconv.Itoa(2)] = rand.Intn(2)
 	demoDevice.DATA["data"+strconv.Itoa(3)] = rand.Intn(2)
 
-	demoDevice.DATA["data"+strconv.Itoa(7)] = data_int[0]
-	demoDevice.DATA["data"+strconv.Itoa(8)] = rand.Intn(2)
+  //485
+  if(data_type[0]==2){
+    demoDevice.DATA["data"+strconv.Itoa(8)] = rand.Intn(2)
+  }else{
+    demoDevice.DATA["data"+strconv.Itoa(7)] = data_int[0]
+  }
 	device.DATA = demoDevice.DATA
 
 	if conf.DEBUG {