Merge pull request #43 from facchinm/serialList_native

Serial list native

Author: facchinm

compile_webidebridge.sh

@@ -52,7 +52,7 @@ bootstrapPlatforms()
 	env CC_FOR_TARGET=o64-clang CGO_ENABLED=1 GOOS=darwin GOARCH=amd64 ./make.bash --no-clean
 	env CC_FOR_TARGET=gcc CGO_ENABLED=1 GOOS=linux GOARCH=amd64 ./make.bash --no-clean
 	env CC_FOR_TARGET=gcc CGO_ENABLED=1 GOOS=linux GOARCH=386 ./make.bash --no-clean
-	env CGO_ENABLED=0 GOOS=linux GOARCH=arm ./make.bash --no-clean
+	#env CGO_ENABLED=0 GOOS=linux GOARCH=arm ./make.bash --no-clean
 	env CC_FOR_TARGET=i686-w64-mingw32-gcc CGO_ENABLED=1 GOOS=windows GOARCH=386 ./make.bash --no-clean
 }
 
@@ -90,7 +90,7 @@ extractVersionFromMain
 compilePlatform darwin amd64 o64-clang 1
 #compilePlatformLinux linux 386 gcc
 compilePlatform linux amd64 gcc 1
-compilePlatform linux arm 0
+#compilePlatform linux arm 0
 compilePlatform windows 386 i686-w64-mingw32-gcc 1
 
 

seriallist.go

@@ -3,8 +3,9 @@
 package main
 
 import (
+	"fmt"
 	log "github.com/Sirupsen/logrus"
-	"github.com/facchinm/go-serial"
+	"github.com/facchinm/go-serial-native"
 	"regexp"
 )
 
@@ -16,6 +17,7 @@ type OsSerialPort struct {
 	Product      string
 	IdProduct    string
 	IdVendor     string
+	ISerial      string
 	NetworkPort  bool
 }
 
@@ -29,11 +31,19 @@ func GetList(network bool) ([]OsSerialPort, error) {
 	} else {
 
 		// will timeout in 2 seconds
-		ports, err := serial.GetPortsList()
-
 		arrPorts := []OsSerialPort{}
+		ports, err := serial.ListPorts()
+		if err != nil {
+			return arrPorts, err
+		}
+
 		for _, element := range ports {
-			arrPorts = append(arrPorts, OsSerialPort{Name: element})
+			vid, pid, _ := element.USBVIDPID()
+			vidString := fmt.Sprintf("0x%04X", vid)
+			pidString := fmt.Sprintf("0x%04X", pid)
+			if vid != 0 && pid != 0 {
+				arrPorts = append(arrPorts, OsSerialPort{Name: element.Name(), IdVendor: vidString, IdProduct: pidString, ISerial: element.USBSerialNumber()})
+			}
 		}
 
 		// see if we should filter the list
@@ -54,7 +64,6 @@ func GetList(network bool) ([]OsSerialPort, error) {
 			arrPorts = newarrPorts
 		}
 
-		arrPorts = associateVidPidWithPort(arrPorts)
 		return arrPorts, err
 		//log.Printf("Done doing GetList(). arrPorts:%v\n", arrPorts)
 	}