freqy/protomolecule
3
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

calling the result a result to clear up confusion with Device struct

Browse Source
This commit is contained in:
kayos 2021-05-09 17:59:30 -07:00
parent 5b57e9d6ce
commit 863517198d
1 changed files with 21 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/scanStuff/scanStuff.go
View File

@ -32,29 +32,31 @@ func Scanners() {
//results := new(bluetooth.ScanResult)
log.Info().Str("ID", adapterId).Msg("Adapter in Use")
projVars.ScanAdapter.Scan(func(scanAdapter *bluetooth.Adapter, device bluetooth.ScanResult) {
lname := device.LocalName()
adbytes := device.AdvertisementPayload.Bytes()
rssi := device.RSSI
projVars.ScanAdapter.Scan(func(scanAdapter *bluetooth.Adapter, result bluetooth.ScanResult) {
payload := result.AdvertisementPayload
lname := result.LocalName()
adbytes := payload.Bytes()
//uuids := payload.ServiceUUIDs
rssi := result.RSSI
//Trying to extract the service UUIDs from advertisment packets
//srvcPld := projVars.ScanAdapter.SetConnectHandler(c func)
srvcPld := device.AdvertisementPayload.HasServiceUUID(projVars.SonosScanTest)
srvcPld := payload.HasServiceUUID(projVars.SonosScanTest)
// ** List of common Service UUIDS to search for **
//bluetooth.ServiceUUIDDeviceInformation
//bluetooth.ServiceUUIDGenericAttribute
if lname == projVars.ScanList[device.Address.String()] {
if lname == projVars.ScanList[result.Address.String()] {
//log.Debug().Str("lname", lname).Str("device_address", projVars.ScanList[device.Address.String()]).Msg("Skipping existing device")
return
}
//println(device.AdvertisementPayload.Bytes())
//println(result.AdvertisementPayload.Bytes())
log.Info().Str("address", device.Address.String()).
log.Info().Str("address", result.Address.String()).
Str("LocalName", lname).
Int16("RSSI", rssi).
Bool("Service UUID", srvcPld).
//Str("Device: ", ).
@ -70,38 +72,33 @@ func Scanners() {
log.Debug().Bytes("AdvertisementPayload_Bytes", adbytes).
Int("AdvertisementPayload_Length", len(adbytes)).
Bool("AdvertisementPayload_nil_check", nilcheck).Msg("AD_PAYLOAD")
Bool("AdvertisementPayload_nil_check", nilcheck).
Msg("AD_PAYLOAD")
//println(srvcPld)
//places captured devices into the eros DB
//log.Debug().Msg("Storing data with Eros")
eros.Remember(device.Address.String(), lname, adbytes)
eros.Remember(result.Address.String(), lname, adbytes)
//TODO: create localname fort devices that dont broadcast one * dust.OhNameMeZaddy() *
projVars.ScanList[device.Address.String()] = device.LocalName()
projVars.ScanList[result.Address.String()] = result.LocalName()
//Attempt to connect -- This should be put in bluestuff once its working
/*
scanAdapter.SetConnectHandler(func(device bluetooth.Addresser, connected bool) {
scanAdapter.Connect(device, bluetooth.ConnectionParams{})
scanAdapter.SetConnectHandler(func(result bluetooth.Addresser, connected bool) {
scanAdapter.Connect(result, bluetooth.ConnectionParams{})
})
*/
//projVars.ScanAdapter.Connect(device.Address, bluetooth.ConnectionParams{})
//projVars.ScanAdapter.Connect(result.Address, bluetooth.ConnectionParams{})
//fucking sanity check
//i := projVars.ScanList[device.Address.String()]
//i := projVars.ScanList[result.Address.String()]
//projVars.InitResults = append( projVars.ScanList[device.Address.String()], 1)
//TESTS and Stuff//
//color.Red(i)
//projVars.InitResults = append( projVars.ScanList[result.Address.String()], 1)
//test for data being placed
eros.Recall(device.Address.String())
//time.Sleep(3 * time.Minute)
//results = device
eros.Recall(result.Address.String())
//TODO: wait, then close adapter?