From d4a24b911205c3187e8169fbd1adefb56f4d588a Mon Sep 17 00:00:00 2001
From: fish <gcslyp@gmail.com>
Date: Wed, 20 Mar 2019 09:47:22 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=B8=B2=E5=8F=A3=E6=89=93?=
 =?UTF-8?q?=E5=BC=80=E5=BC=80=E5=85=B3openserial?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 conf/gateway.conf |  25 +++++++++++++++++++++----
 db/gateway.db     | Bin 73728 -> 73728 bytes
 main.go           |   1 +
 worker.go         |   4 +++-
 4 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/conf/gateway.conf b/conf/gateway.conf
index e8776c8..1517024 100644
--- a/conf/gateway.conf
+++ b/conf/gateway.conf
@@ -4,7 +4,23 @@
 		"version": "yunhorn_gw_c_v1",
 		"location": [113.960347, 22.54143],
 		"单位": "深圳市云兴科技",
-		"config": [{
+		"config": [
+
+		{
+				"id": "deb03e28-ddcb-4e5d-aa31-d870a1f0f09b",
+				"version": "yunhorn_kgl_c8_v1",
+				"data": [
+					["女厕位", 1],
+					["女厕位", 2],
+					["女厕位", 3],
+					["女厕位", 4],
+					["女厕位", 5],
+					["女厕位", 6],
+					["男厕位", 7],
+					["男厕位", 8]
+				]
+			},
+		{
 				"id": "EC13C2D9-6A93-4894-BB5B-89BDAA786D8A",
 				"version": "yunhorn_kgl_c8_v1",
 				"data": [
@@ -14,8 +30,8 @@
 					["男厕位", 4],
 					["男厕位", 5],
 					["男厕位", 6],
-					["男厕位", 7],
-					["男厕位", 8]
+					["纸巾卷", 7],
+					["纸巾抽", 8]
 				]
 			}, {
 				"id": "82BF7B5E-EC0D-4DB6-807F-B097C3C84073",
@@ -173,5 +189,6 @@
 	"iconurl": "http://192.168.3.188/icons/",
 	"websocketurl": ["192.168.3.216:8080", "/echo"],
 	"post_to_server": "https://smartoilets.cn/socketServer/statis/push",
-	"debug": true
+	"debug": true,
+	"openserial":false
 }
diff --git a/db/gateway.db b/db/gateway.db
index 2257ebaadc2c6fe832f4f0c9aab2e16ef0da0471..540f0442fffd7e307b0fe3b5183769f0d671ef5f 100644
GIT binary patch
delta 494
zcmZoTz|wGlWr8$g|3n#Q#{P{7^X!?73^qBu<!2O|{LWvDS&#ATWcGkicD8ud*Q{BL
z(+vd}b0=R2_{&_@BsN(!O3#PO{^rb?3m6y}Sgah(O%F8yS@y5`V-$e2fQ<c{GiMF}
zSuzfW8ec(-XVVur{FwCz$YOZ5W9741)2tlWxojJN+(zBT+{uMK8#eFn7GPol3M5Sa
zSQ*1!*CZ;*AgMk1V6<qxvyXqMOJrtpex5#rsaKGfZe#!0*w_K6o>dCneqL#q{n8Gl
znqWsd*i5N<08|WiNB@%pAST!yX%0LPrxrGeNHQpEGqN)>va>UCZ~z&?>>L~%!c3EW
zqh;!);NDeouz-5^Md0fOph3LC4wao?TjapTPnnhg6n);jmSMVsIK-0$O~R54^6JQj
zOF|51XK?m$bqtDkag2mBK;DDf$1Lw)X?n;AWRd-|v^0>>Knv?nLM(i`ujA>SjSfE$
Wc3yW-gE(vRr7#^yV5BZ8*Z=_ifS1$&

delta 107
zcmZoTz|wGlWr8$g_(U0J#_){^^X!=nEjKy5<!2O{{LWvDS&PYSGJ8Pi#Kw}z7XtoH
zPH0k`yewXQa%7+(OQUXM?&QLr4V(9O3ox-TFfg8&{IPN;6K6e`;y41N{5D?-(~$(4
IxTs(Q0A`CR+W-In

diff --git a/main.go b/main.go
index 3d74da7..1d332f9 100644
--- a/main.go
+++ b/main.go
@@ -13,6 +13,7 @@ func main() {
 	go gw_router()
 	go serial_run()
 	c := cron.New()
+	send_data(1001)
 	c.AddFunc("0, *, *, *, *, *", func() {
 		send_data(1001)
 	})
diff --git a/worker.go b/worker.go
index 16158e6..8504b1c 100644
--- a/worker.go
+++ b/worker.go
@@ -6,6 +6,7 @@ import (
     "log"
     "strconv"
     "sync"
+    "math/rand"
 )
 
 type Devicedatas struct {
@@ -41,12 +42,13 @@ func yunhorn_ys_l_v1(data_buf []byte){
 	device.VERSION=demoDevice.VERSION
 	device.ONLINE=demoDevice.ONLINE
   demoDevice.DATA["data"+strconv.Itoa(7)]=data_int[0]
+  demoDevice.DATA["data"+strconv.Itoa(8)]=rand.Intn(2)
 	device.DATA=demoDevice.DATA
 
 	if conf.DEBUG {
       log.Println(device)
   }
-     send_data(1005, device)
+   send_data(1005, device)
 
 }