great cleanup phase 1

remove friendly names and unused code

Author: facchinm

altbuild.sh

@@ -2,9 +2,6 @@ package main
 
 import (
 	log "github.com/Sirupsen/logrus"
-	//"regexp"
-	//"strconv"
-	//"time"
 )
 
 type BufferflowDefault struct {

bufferflow_default.go

@@ -75,15 +75,15 @@ compilePlatform()
 	fi
 	echo createZipEmbeddableFileArduino $GOOS $GOARCH $NAME
 	createZipEmbeddableFileArduino $GOOS $GOARCH $NAME
-	GOOS=$GOOS GOARCH=$GOARCH go-selfupdate $NAME $VERSION
+	#GOOS=$GOOS GOARCH=$GOARCH go-selfupdate $NAME $VERSION
 	rm -rf $NAME*
 }
 
 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
 
 

compile_webidebridge.sh

@@ -53,7 +53,7 @@ func GetNetworkList() ([]OsSerialPort, error) {
 	SavedNetworkPorts = Filter(SavedNetworkPorts, func(port OsSerialPort) bool {
 		any := true
 		for _, p := range newPorts {
-			if p.Name == port.Name && p.FriendlyName == port.FriendlyName {
+			if p.Name == port.Name {
 				any = false
 				return any
 			}
@@ -125,13 +125,7 @@ func getPorts() ([]OsSerialPort, error) {
 	arrPorts := []OsSerialPort{}
 	go func(results chan *bonjour.ServiceEntry, exitCh chan<- bool) {
 		for e := range results {
-			var boardInfosSlice []string
-			for _, element := range e.Text {
-				if strings.Contains(element, "board=yun") {
-					boardInfosSlice = append(boardInfosSlice, "arduino:avr:yun")
-				}
-			}
-			arrPorts = append(arrPorts, OsSerialPort{Name: e.AddrIPv4.String(), FriendlyName: e.Instance, NetworkPort: true, RelatedNames: boardInfosSlice})
+			arrPorts = append(arrPorts, OsSerialPort{Name: e.AddrIPv4.String(), IdVendor: strings.Join(e.Text[:], " "), NetworkPort: true})
 		}
 		timeout <- true
 	}(results, resolver.Exit)

discovery.go

@@ -199,14 +199,6 @@ func checkCmd(m []byte) {
 	} else if strings.HasPrefix(sl, "list") {
 		go spList(false)
 		go spList(true)
-		// log.Println("Stack info", runtime.NumGoroutine())
-		// if runtime.NumGoroutine() > 30 {
-		// 	output := make([]byte, 1<<16)
-		// 	runtime.Stack(output, true)
-		// 	log.Println(output)
-		// 	log.Fatal("Crash because something is going wrong")
-		// }
-		//go getListViaWmiPnpEntity()
 	} else if strings.HasPrefix(sl, "bufferalgorithm") {
 		go spBufferAlgorithms()
 	} else if strings.HasPrefix(sl, "log") {

hub.go

@@ -6,19 +6,17 @@ package main
 import (
 	"flag"
 	log "github.com/Sirupsen/logrus"
-	"go/build"
-	"os"
-	"path/filepath"
-	//"net/http/pprof"
-	"github.com/kardianos/osext"
-	//"github.com/sanbornm/go-selfupdate/selfupdate" #included in update.go to change heavily
-	//"github.com/sanderhahn/gozip"
 	"github.com/gin-gonic/gin"
 	"github.com/itsjamie/gin-cors"
+	"github.com/kardianos/osext"
 	"github.com/vharitonsky/iniflags"
+	"go/build"
+	"os"
+	"path/filepath"
 	"runtime/debug"
 	"text/template"
 	"time"
+	//"github.com/sanbornm/go-selfupdate/selfupdate" #included in update.go to change heavily
 )
 
 var (
@@ -60,8 +58,6 @@ var (
 	appName   = flag.String("appName", "", "")
 )
 
-var globalConfigMap map[string]interface{}
-
 type NullWriter int
 
 func (NullWriter) Write([]byte) (int, error) { return 0, nil }
@@ -156,9 +152,6 @@ func main() {
 			// }
 		}
 
-		createGlobalConfigMap(&globalConfigMap)
-
-		//getList()
 		f := flag.Lookup("addr")
 		log.Println("Version:" + version)
 

main.go

@@ -3,17 +3,9 @@
 package main
 
 import (
-	//"bufio"
 	"encoding/json"
 	"fmt"
-	//"path/filepath"
-	//"github.com/kballard/go-shellquote"
-	//"github.com/johnlauer/goserial"
-	//"github.com/mikepb/go-serial"
-	//"github.com/facchinm/go-serial"
-	//"github.com/kardianos/osext"
 	log "github.com/Sirupsen/logrus"
-	//"os"
 	"regexp"
 	"runtime/debug"
 	"strconv"
@@ -91,12 +83,10 @@ type SpPortList struct {
 
 type SpPortItem struct {
 	Name            string
-	Friendly        string
 	SerialNumber    string
 	DeviceClass     string
 	IsOpen          bool
 	IsPrimary       bool
-	RelatedNames    []string
 	Baud            int
 	BufferAlgorithm string
 	Ver             string
@@ -518,12 +508,10 @@ func spListDual(network bool) {
 		*/
 		spl.Ports[ctr] = SpPortItem{
 			Name:            item.Name,
-			Friendly:        item.FriendlyName,
 			SerialNumber:    item.SerialNumber,
 			DeviceClass:     item.DeviceClass,
 			IsOpen:          false,
 			IsPrimary:       false,
-			RelatedNames:    item.RelatedNames,
 			Baud:            0,
 			BufferAlgorithm: "",
 			Ver:             version,
@@ -554,18 +542,6 @@ func spListDual(network bool) {
 	}
 }
 
-func spListOld() {
-	ls := "{\"serialports\" : [\n"
-	list, _ := getList()
-	for _, item := range list {
-		ls += "{ \"name\" : \"" + item.Name + "\", \"friendly\" : \"" + item.FriendlyName + "\" },\n"
-	}
-	ls = strings.TrimSuffix(ls, "},\n")
-	ls += "}\n"
-	ls += "]}\n"
-	h.broadcastSys <- []byte(ls)
-}
-
 func spErr(err string) {
 	log.Println("Sending err back: ", err)
 	//h.broadcastSys <- []byte(err)

serial.go

@@ -5,14 +5,11 @@ package main
 import (
 	log "github.com/Sirupsen/logrus"
 	"github.com/facchinm/go-serial"
-	//"os"
 	"regexp"
 )
 
 type OsSerialPort struct {
 	Name         string
-	FriendlyName string
-	RelatedNames []string // for some devices there are 2 or more ports, i.e. TinyG v9 has 2 serial ports
 	SerialNumber string
 	DeviceClass  string
 	Manufacturer string
@@ -36,7 +33,7 @@ func GetList(network bool) ([]OsSerialPort, error) {
 
 		arrPorts := []OsSerialPort{}
 		for _, element := range ports {
-			arrPorts = append(arrPorts, OsSerialPort{Name: element, FriendlyName: element})
+			arrPorts = append(arrPorts, OsSerialPort{Name: element})
 		}
 
 		// see if we should filter the list
@@ -49,8 +46,6 @@ func GetList(network bool) ([]OsSerialPort, error) {
 				// if matches regex, include
 				if reFilter.MatchString(element.Name) {
 					newarrPorts = append(newarrPorts, element)
-				} else if reFilter.MatchString(element.FriendlyName) {
-					newarrPorts = append(newarrPorts, element)
 				} else {
 					log.Debug("serial port did not match. port: %v\n", element)
 				}

seriallist.go

@@ -1,18 +1,8 @@
 package main
 
 import (
-	//"fmt"
-	//"github.com/tarm/goserial"
-	log "github.com/Sirupsen/logrus"
-	"os"
-	"strings"
-	//"encoding/binary"
-	//"strconv"
-	//"syscall"
-	//"fmt"
-	//"bufio"
-	"io/ioutil"
 	"os/exec"
+	"strings"
 )
 
 // execute system_profiler SPUSBDataType | grep "Vendor ID: 0x2341" -A5 -B2
@@ -32,6 +22,7 @@ func associateVidPidWithPort(ports []OsSerialPort) []OsSerialPort {
 
 	for index, _ := range ports {
 		port_hash := strings.Trim(ports[index].Name, "/dev/tty.usbmodem")
+		port_hash = strings.Trim(port_hash, "/dev/tty.usbserial-")
 
 		usbcmd := exec.Command("system_profiler", "SPUSBDataType")
 		grepcmd := exec.Command("grep", "Location ID: 0x"+port_hash[:len(port_hash)-1], "-B6")
@@ -65,48 +56,3 @@ func associateVidPidWithPort(ports []OsSerialPort) []OsSerialPort {
 	}
 	return ports
 }
-
-func getList() ([]OsSerialPort, os.SyscallError) {
-	//return getListViaWmiPnpEntity()
-	return getListViaTtyList()
-}
-
-func getListViaTtyList() ([]OsSerialPort, os.SyscallError) {
-	var err os.SyscallError
-
-	log.Println("getting serial list on darwin")
-
-	// make buffer of 100 max serial ports
-	// return a slice
-	list := make([]OsSerialPort, 100)
-
-	files, _ := ioutil.ReadDir("/dev/")
-	ctr := 0
-	for _, f := range files {
-		if strings.HasPrefix(f.Name(), "tty.") {
-			// it is a legitimate serial port
-			list[ctr].Name = "/dev/" + f.Name()
-			list[ctr].FriendlyName = f.Name()
-			log.Println("Added serial port to list: ", list[ctr])
-			ctr++
-		}
-		// stop-gap in case going beyond 100 (which should never happen)
-		// i mean, really, who has more than 100 serial ports?
-		if ctr > 99 {
-			ctr = 99
-		}
-		//fmt.Println(f.Name())
-		//fmt.Println(f.)
-	}
-	/*
-		list := make([]OsSerialPort, 3)
-		list[0].Name = "tty.serial1"
-		list[0].FriendlyName = "tty.serial1"
-		list[1].Name = "tty.serial2"
-		list[1].FriendlyName = "tty.serial2"
-		list[2].Name = "tty.Bluetooth-Modem"
-		list[2].FriendlyName = "tty.Bluetooth-Modem"
-	*/
-
-	return list[0:ctr], err
-}