Merge pull request #220 from jpoirier/development

dongle handling: remove misleading conflict msg, stricter string check
cyoung · Jan 26, 2016 · 30a14d0 · 30a14d0
2 parents 2dfe38a + e371039
commit 30a14d0
Showing 1 changed file with 2 additions and 14 deletions.
diff --git a/main/sdr.go b/main/sdr.go
@@ -377,17 +377,11 @@ func sdrWatcher() {
 			}
 
 			if UATDev == nil {
-				// log.Println("\tUATDev == nil")
-				// preference check based on stratux
-				// hardware serial when it exists.
-				// manufact, product, serial, err
 				_, _, serial, err := rtl.GetDeviceUsbStrings(id)
 				if err != nil {
 					serial = ""
 				}
-				if strings.HasPrefix(serial, "stratux:1090") {
-					log.Println("Settings conflict: 978UAT set via WebUI but hardware serial says stratux:1090")
-				} else {
+				if strings.Compare(serial, "stratux:1090") != 0 {
 					UATDev = &UAT{indexID: id, serial: serial}
 					if err := UATDev.sdrConfig(); err != nil {
 						log.Printf("UATDev = &UAT{indexID: id} failed: %s\n", err)
@@ -425,17 +419,11 @@ func sdrWatcher() {
 			}
 
 			if ESDev == nil {
-				// log.Println("\tESDev == nil")
-				// preference check based on stratux
-				// hardware serial when it exists.
-				// manufact, product, serial, err
 				_, _, serial, err := rtl.GetDeviceUsbStrings(id)
 				if err != nil {
 					serial = ""
 				}
-				if strings.HasPrefix(serial, "stratux:978") {
-					log.Println("Settings conflict: 1090ES set via WebUI but hardware serial says stratux:978")
-				} else {
+				if strings.Compare(serial, "stratux:978") != 0 {
 					ESDev = &ES{indexID: id, serial: serial}
 					if err := ESDev.sdrConfig(); err != nil {
 						log.Printf("ESDev = &ES{indexID: id} failed: %s\n", err)