From 8f2d2bac1977b6aecac4a9a6405865072ae3f94a Mon Sep 17 00:00:00 2001
From: fish <gcslyp@gmail.com>
Date: Tue, 19 Mar 2019 11:59:49 +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=E6=95=B0=E6=8D=AE=E5=BC=80=E5=85=B3,tcp=E6=8E=A5?=
 =?UTF-8?q?=E6=94=B6=E6=95=B0=E6=8D=AE=E6=9A=82=E6=97=B6=E6=89=93=E5=8D=B0?=
 =?UTF-8?q?=E4=B8=8D=E5=8F=91=E9=80=81=E7=BB=99=E4=BA=91=E7=AB=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 db/gateway.db  | Bin 73728 -> 73728 bytes
 loadconfig.go  |   1 +
 main.go        |   4 ++--
 serial_init.go |  39 ++++++++++++++++++++++-----------------
 worker.go      |   2 +-
 5 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/db/gateway.db b/db/gateway.db
index 4a556c4cec8f0dad47868aa487041bed053f435c..2e276bc71243c1d154d34f17eb52e26ccd277c7b 100644
GIT binary patch
delta 276
zcmZoTz|wGlWr8%L@kAMCR$~U;x0g1i%&-?S)-|-`<v+#1%)gg`{{jCy{=J(81=jOV
z-s{h+!oa{F##o-3Sdx*-!^kYnguyIg6qx+ZUyM;>GHXB}6Z`v#jTM_O1lX`JF+H99
zv2y3;<DnW%(v7@L0+I~+=8Wu&jO-u`B!$^II5>ovCMO07PhJ-x>c?aM*x1+sXdjb?
zgN5m#1|ZA+Mc``?EoEtc86s!q(98oAU|?|23+HkG(ogs7a`>^t;sB8Oym>9dS_kPE
uO(2_Lb3;TUJ13CA$p3+X|HEdkglGH$d~7TX9EwH;hL*YpAWttU*Z=@7n@Vv2

delta 169
zcmZoTz|wGlWr8%L%0wAwRuu+4jjW9+Gwg+obd4-{`A;!0^Y3NgzsmoPfA3~Nf%W{8
z_xkgy@IPkYW-L!lEXhdaVPuwOf-s91`571(xH*dxOEQboCcpC+V^p8a8W1?Kv1;>$
z02>x2=Ca8jD|c=_9;(4KxuAlRiQNy#Z`<4u(a6rp|AB##{{aL4gUwtC&-ev^1_^K|
R8W|W`=o$iDV!Ehc0{}K8G<X02

diff --git a/loadconfig.go b/loadconfig.go
index f02aac3..19bd69f 100644
--- a/loadconfig.go
+++ b/loadconfig.go
@@ -25,6 +25,7 @@ type Conf struct {
 	WEBSOCKETURL     []string                `json:"websocketurl"`
 	POST_TO_SERVER   string                  `json:"post_to_server"`
 	DEBUG            bool                    `json:"debug"`
+	OPENSERIAL            bool                    `json:"openserial"`
 }
 
 type Gateway_info struct {
diff --git a/main.go b/main.go
index ab35fa6..3d74da7 100644
--- a/main.go
+++ b/main.go
@@ -26,7 +26,7 @@ func main() {
         log.Printf("listen fail, err: %v\n", err)
         return
     }
- 
+
     for {
         conn, err := listener.Accept()
         if err != nil {
@@ -34,7 +34,7 @@ func main() {
             continue
         }
  //       go process(conn)
-	go handleConn(conn)   
+	go handleConn(conn)
  }
 
 //	select {}
diff --git a/serial_init.go b/serial_init.go
index 06a7fbf..3180bb6 100644
--- a/serial_init.go
+++ b/serial_init.go
@@ -21,25 +21,30 @@ func serial_run() {
 		port_arr = append(port_arr, ports_arr[i])
 	}
 	// 解析串口配置
-	for _, i := range port_arr {
-		var PARITY serial.Parity
-		switch conf.SERIALPORTS_LIST[i].PARITY {
-		case "N":
-			PARITY = 'N'
-		case "E":
-			PARITY = 'E'
+	if conf.OPENSERIAL{
+		for _, i := range port_arr {
+			var PARITY serial.Parity
+			switch conf.SERIALPORTS_LIST[i].PARITY {
+			case "N":
+				PARITY = 'N'
+			case "E":
+				PARITY = 'E'
+			}
+			// 打开串口
+			SERIAL_PORT[i], err = serial.OpenPort(&serial.Config{
+				Name:        conf.SERIALPORTS_LIST[i].COM,
+				Baud:        conf.SERIALPORTS_LIST[i].BAUDS,
+				Parity:      PARITY,
+				ReadTimeout: time.Millisecond * time.Duration(conf.SERIALPORTS_LIST[i].READTIMEOUT),
+
+				// ReadTimeout: time.Second * time.Duration(conf.SERIALPORTS_LIST[i].READTIMEOUT),
+
+			})
+			check(err)
+			defer SERIAL_PORT[i].Close()
 		}
-		// 打开串口
-		SERIAL_PORT[i], err = serial.OpenPort(&serial.Config{
-			Name:        conf.SERIALPORTS_LIST[i].COM,
-			Baud:        conf.SERIALPORTS_LIST[i].BAUDS,
-			Parity:      PARITY,
-			ReadTimeout: time.Millisecond * time.Duration(conf.SERIALPORTS_LIST[i].READTIMEOUT),
-			// ReadTimeout: time.Second * time.Duration(conf.SERIALPORTS_LIST[i].READTIMEOUT),
-		})
-		check(err)
-		defer SERIAL_PORT[i].Close()
 	}
+
 	if conf.DEBUG {
 		log.Println(SERIAL_PORT)
 	}
diff --git a/worker.go b/worker.go
index 615ef62..2310745 100644
--- a/worker.go
+++ b/worker.go
@@ -35,7 +35,7 @@ func yunhorn_ys_l_v1(data_buf []byte){
           log.Println(device)
       }
   
-      send_data(1005, device)
+   //   send_data(1005, device)
 
 }