@@ -27,47 +27,46 @@ func GetList(network bool) ([]OsSerialPort, error) {
27
27
if network {
28
28
netportList , err := GetNetworkList ()
29
29
return netportList , err
30
- } else {
30
+ }
31
31
32
- // will timeout in 2 seconds
33
- arrPorts := []OsSerialPort {}
34
- ports , err := enumerator .GetDetailedPortsList ()
35
- if err != nil {
36
- return arrPorts , err
37
- }
32
+ // will timeout in 2 seconds
33
+ arrPorts := []OsSerialPort {}
34
+ ports , err := enumerator .GetDetailedPortsList ()
35
+ if err != nil {
36
+ return arrPorts , err
37
+ }
38
38
39
- for _ , element := range ports {
40
- if element .IsUSB {
41
- vid := element .VID
42
- pid := element .PID
43
- vidString := fmt .Sprintf ("0x%s" , vid )
44
- pidString := fmt .Sprintf ("0x%s" , pid )
45
- if vid != "0000" && pid != "0000" {
46
- arrPorts = append (arrPorts , OsSerialPort {Name : element .Name , IdVendor : vidString , IdProduct : pidString , ISerial : element .SerialNumber })
47
- }
39
+ for _ , element := range ports {
40
+ if element .IsUSB {
41
+ vid := element .VID
42
+ pid := element .PID
43
+ vidString := fmt .Sprintf ("0x%s" , vid )
44
+ pidString := fmt .Sprintf ("0x%s" , pid )
45
+ if vid != "0000" && pid != "0000" {
46
+ arrPorts = append (arrPorts , OsSerialPort {Name : element .Name , IdVendor : vidString , IdProduct : pidString , ISerial : element .SerialNumber })
48
47
}
49
48
}
49
+ }
50
50
51
- // see if we should filter the list
52
- if len (* regExpFilter ) > 0 {
53
- // yes, user asked for a filter
54
- reFilter := regexp .MustCompile ("(?i)" + * regExpFilter )
55
-
56
- newarrPorts := []OsSerialPort {}
57
- for _ , element := range arrPorts {
58
- // if matches regex, include
59
- if reFilter .MatchString (element .Name ) {
60
- newarrPorts = append (newarrPorts , element )
61
- } else {
62
- log .Debug ("serial port did not match. port: %v\n " , element )
63
- }
51
+ // see if we should filter the list
52
+ if len (* regExpFilter ) > 0 {
53
+ // yes, user asked for a filter
54
+ reFilter := regexp .MustCompile ("(?i)" + * regExpFilter )
64
55
56
+ newarrPorts := []OsSerialPort {}
57
+ for _ , element := range arrPorts {
58
+ // if matches regex, include
59
+ if reFilter .MatchString (element .Name ) {
60
+ newarrPorts = append (newarrPorts , element )
61
+ } else {
62
+ log .Debug ("serial port did not match. port: %v\n " , element )
65
63
}
66
- arrPorts = newarrPorts
67
- }
68
64
69
- return arrPorts , err
65
+ }
66
+ arrPorts = newarrPorts
70
67
}
68
+
69
+ return arrPorts , err
71
70
}
72
71
73
72
func findPortByName (portname string ) (* serport , bool ) {
0 commit comments