Committing before I get too deep into DFU stuff!

Updates:
- cleaned up lots of comments and debug stuff
- set device selection menu to filter by the hash generated by CoreBluetooth to prune out devices that advertise noisily (like my TV, which beacons pretty much nonstop and clutters up the menu)

Author: xan-m

Infini-iOS/BLEManager.swift

@@ -12,6 +12,7 @@ struct Peripheral: Identifiable {
 	let id: Int
 	let name: String
 	let rssi: Int
+	let peripheralHash: Int
 }
 
 // declare some CBUUIDs for easier reference
@@ -94,19 +95,20 @@ class BLEManager: NSObject, ObservableObject, CBCentralManagerDelegate {
 			peripheralName = "Unknown"
 		}
 
-		let newPeripheral = Peripheral(id: peripherals.count, name: peripheralName, rssi: RSSI.intValue)
-		print(newPeripheral)
-		
-		// ************************* remove if statement from code! but holy fuck this TV is the noisiest BLE advertiser in the world what the actual fuck *****************************
-		/*
-		P.S. I'd love to figure out how to filter by a unique ID other than the name, but all I can seem to find online is that MAC address and other hardware flag things I think would be helpful to filter by are not advertised over BLE, so I don't know what to do about it.
-		A unique identifier would be super helpful for flagging your pinetime in the app so you can have the app automatically connect and skip the process of scanning and selecting a pinetime.
-		For now I'm going to selfishly block my TV, and anyone else who touches this can either modify the if statement below to suit their TV or remove it.
-		*/
-		
-		if newPeripheral.name != "[TV] Samsung 8 Series (50)" {
+		let newPeripheral = Peripheral(id: peripheralDictionary.count, name: peripheralName, rssi: RSSI.intValue, peripheralHash: peripheral.hash)
+
+		// compare peripheral hashes to make sure we're only adding each device once -- super helpful if you have a very noisy BLE advertiser nearby!
+		if !peripherals.contains(where: {$0.peripheralHash == newPeripheral.peripheralHash}) {
+			// I think there's probably a way to get rid of this array someday, but for now it's useful for displaying the device names. You cant have a Peripheral struct as a key in the peripheralDictionary, so there has to be some way to pass the names to the UI, and the peripherals array seems like it.
 			peripherals.append(newPeripheral)
-			peripheralDictionary[newPeripheral.id] = peripheral
+			peripheralDictionary[newPeripheral.peripheralHash] = peripheral
+			
+			print(newPeripheral, "added to list")
+			/*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*
+			TODO: hey alpha testers! Please send me a message/comment/email/toot/whatever with the peripheralHash of your PineTime! While the hash is valuable for weeding out repeat broadcasters, I'm not sure what exactly is hashed, and if that would be unique between two of the same device. If it's just a hash of "InfiniTime" + $INFINITIMEUUID, then there will be unintended collisions and this won't solve anything for people that have more than one InfiniTime watch to sync.
+			
+			I'm getting the same value each time I run the app (138271609), let's hope yours is different!
+			*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*/
 		}
 	}
 

Infini-iOS/ContentView.swift

@@ -45,8 +45,8 @@ struct ContentView: View {
 				List(bleManager.peripherals) { peripheral in
 					HStack {
 						Button(action: {
-							self.bleManager.deviceToConnect = peripheral.id
-							self.bleManager.connect(peripheral: self.bleManager.peripheralDictionary[peripheral.id]!)
+							self.bleManager.deviceToConnect = peripheral.peripheralHash
+							self.bleManager.connect(peripheral: self.bleManager.peripheralDictionary[peripheral.peripheralHash]!)
 						}) {
 							Text(peripheral.name)
 						}

README.md

@@ -21,12 +21,11 @@ This is a proof-of-concept, barely-functional iOS application to interact with y
 - Figure out how to control music from watch
 - Optional auto-connect: save some device-specific characteristic (MAC address? Serial number?) to the app, and allow users to automatically connect to their device. I know I probably won't want to connect to anything other than my own pinetime with very few exceptions, so it'd save me a few taps if it just snagged my watch automatically when I open the app.
 - Learn anything whatsoever about making an app design in SwiftUI that isn't a horrific clusterwhoops 
-- Send notifications to the phone, probably. Might be nice to get a buzz on your phone if the watch disconnects for some reason?
-- Options menu: I think it'd be nice to have user-configurable options. I was thinking things like:
-  - "send notification to watch when watch battery falls below [x]"
-  - "send notification to watch when phone battery falls below [x]"
-  - "turn on/off watch notifications"
-  - etc. I guess my ideas are all based on adding/subtracting notifications...
+- Send notifications to the phone, probably. Might be nice to get a buzz on your phone if the watch disconnects for some reason
+- User-configurable settings:
+  - select device for autoconnect
+  - enable/disable notifications
+  - taking suggestions
 - Clean everything up. Still tons of commented lines and code blocks from debugging and trial and error stuff that I should really remove. Probably should add a few more explanatory comments here and there too, mostly for my own benefit...
 - I mean, there's the navigation thing? I guess poke at that. I'm not super sure that's a priority for me at all, but if that's something that people want I can definitely look into it sooner.