From 92ae2070016d06c7065391d48399fbdff437bcf8 Mon Sep 17 00:00:00 2001
From: freqyXin <maxine.filcher@hotmail.com>
Date: Wed, 14 Apr 2021 17:30:52 -0700
Subject: [PATCH] fixing dumb scans

---
 main.go                    |  4 ++--
 src/scanStuff/scanStuff.go | 22 ++++++++++++++--------
 src/vars/projVars.go       |  2 +-
 3 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/main.go b/main.go
index bc96117..81f217c 100644
--- a/main.go
+++ b/main.go
@@ -33,10 +33,10 @@ func main() {
 	//var foundDevice bluetooth.ScanResult
 
 	//turn the stuff on
-	dust.Must("BLE stack", projVars.Adapter.Enable())
+	dust.Must("BLE stack", projVars.ScanAdapter.Enable())
 
 	println("Scanning")
-	err := projVars.Adapter.Scan(func(adapter *bluetooth.Adapter, result bluetooth.ScanResult) {
+	err := projVars.ScanAdapter.Scan(func(adapter *bluetooth.Adapter, result bluetooth.ScanResult) {
 
 		if result.Address.String() == *projVars.Target {
 
diff --git a/src/scanStuff/scanStuff.go b/src/scanStuff/scanStuff.go
index 98e0873..e67bfde 100644
--- a/src/scanStuff/scanStuff.go
+++ b/src/scanStuff/scanStuff.go
@@ -12,29 +12,35 @@ import (
 func Scanners() {
 
 	//create list of devices in the AO
+	println("Creating Device Map")
 	dust.FirstList()
 
+	println("Enabling Adapter")
 	// Enable BLE interface.
 	dust.Must("enable BLE stack", projVars.ScanAdapter.Enable())
 
 	//TODO: only scan a device once, skip if its in the map
 	// Start scanning.
 	println("scanning...")
+
 	err := projVars.ScanAdapter.Scan(func(scanAdapter *bluetooth.Adapter, device bluetooth.ScanResult) {
-		if projVars.ScanList[device.LocalName()] != "" {
+
+		if projVars.ScanList[device.Address.String()] == "" {
 			//could create a more
 			//color.Yellow("Device Already in Mapped")
 		} else {
 
-			color.Cyan("found device:")
-			println(device.Address.String(), device.RSSI, device.LocalName())
+			if device.LocalName() != projVars.ScanList[device.Address.String()] {
+				color.Cyan("found device:")
+				println(device.Address.String(), device.RSSI, device.LocalName())
 
-			//TODO: create localname for devices that dont broadcast one
-			projVars.ScanList[device.LocalName()] = device.Address.String()
+				//TODO: create localname for devices that dont broadcast one
+				projVars.ScanList[device.Address.String()] = device.LocalName()
 
-			//fucking sanity check
-			i := projVars.ScanList[device.LocalName()]
-			color.Red(i)
+				//fucking sanity check
+				i := projVars.ScanList[device.Address.String()]
+				color.Red(i)
+			}
 		}
 	})
 
diff --git a/src/vars/projVars.go b/src/vars/projVars.go
index 52572ec..cdbe929 100644
--- a/src/vars/projVars.go
+++ b/src/vars/projVars.go
@@ -10,7 +10,7 @@ import (
 var ScanList map[string]string
 
 //the BLE adapter --duh
-var Adapter = bluetooth.DefaultAdapter
+//var Adapter = bluetooth.DefaultAdapter
 var ScanAdapter = bluetooth.DefaultAdapter
 
 //Device to be targeted --not fully implemented