Merge branch 'release/v0.0.7'

.drone.yml

@@ -24,7 +24,7 @@ steps:
     commands:
     - OOS=linux GOARCH=amd64 CGO_ENABLED=1 go build -o tele-recv-linux
     - GOOS=windows GOARCH=amd64 CGO_ENABLED=1 CXX=x86_64-w64-mingw32-g++ CC=x86_64-w64-mingw32-gcc go build -o tele-recv-win64.exe
-    - tar cvzf tele-recv-linux-0.0.6.tar.gz tele-recv-linux tele-recv-win64.exe telegram.yaml
+    - tar cvzf tele-recv-0.0.7.tar.gz tele-recv-linux tele-recv-win64.exe telegram.yaml
 
   - name: release
     image: plugins/gitea-release
@@ -34,9 +34,9 @@ steps:
     settings:
       api_key: fe1e1a8dd77de7452a3f473984c7ac6fe6c5abaf
       base_url: https://gitea.int.it2000.com.cn
-      title: 0.0.6
+      title: 0.0.7
       files:
-        - tele-recv-linux-0.0.6.tar.gz
+        - tele-recv-0.0.7.tar.gz
       checksum:
         - sha256
     when:

cmd/root.go

@@ -35,8 +35,6 @@ var (
 	cfgFile  string
 	device   string
 	baudrate int
-	bytesize byte
-	stopbits byte
 	lograw   bool
 
 	dbFile string
@@ -107,8 +105,6 @@ func initConfig() {
 		logger.Info("Using config file ", zap.String("path", viper.ConfigFileUsed()))
 		device = viper.GetString("serial.device")
 		baudrate = viper.GetInt("serial.baudrate")
-		bytesize = byte(viper.GetInt("serial.bytesize"))
-		stopbits = byte(viper.GetInt("serial.stopbits"))
 		lograw = viper.GetBool("serial.lograw")
 		dbFile = viper.GetString("sqlite.file")
 		dbInit = viper.GetBool("sqlite.init")

telegram.yaml

@@ -1,9 +1,9 @@
 serial:
   device: ttyS1
   baudrate: 9600
-  bytesize: 8
+  #bytesize: 8
   # 1, 2, 15
-  stopbits: 1
+  #stopbits: 1
   lograw: true
 
 

utils/serial.go

@@ -10,8 +10,6 @@ import (
 var (
 	device   string
 	baudrate int
-	bytesize byte
-	stopbits byte
 	// port       *serial.Port
 	sp         *serial.SerialPort
 	portOpened = false
@@ -24,9 +22,7 @@ const readDuration = 500 * time.Millisecond
 func OpenPort(device string, baudrate int, bytesize byte, stopbits byte) error {
 	Log.Info("opening serial device ",
 		zap.String("port", device),
-		zap.Int("baudrate", baudrate),
+		zap.Int("baudrate", baudrate))
-		zap.Int("bytesize", int(bytesize)),
-		zap.Int("stopbits", int(stopbits)))
 	sp = serial.New()
 	sp.EOL('\r')
 	sp.Verbose = false
@@ -36,21 +32,6 @@ func OpenPort(device string, baudrate int, bytesize byte, stopbits byte) error {
 		portOpened = true
 	}
 	return err
-
-	// config := &serial.Config{Name: device,
-	// 	Baud:        baudrate,
-	// 	Size:        bytesize,
-	// 	StopBits:    serial.StopBits(stopbits),
-	// 	ReadTimeout: readDuration}
-	// var err error
-	// port, err = serial.OpenPort(config)
-	// if err != nil {
-	// 	Log.Fatal("error in open serial port ", zap.Error(err))
-	// 	return err
-	// }
-	// Log.Info("opened ", zap.String("port", device))
-	// portOpened = true
-	// return nil
 }
 
 //ReadPort read byte array from port