From 87adad82798da61889b4c860a817779e8309b66d Mon Sep 17 00:00:00 2001
From: Garth Vander Houwen <garthvh@yahoo.com>
Date: Mon, 5 Dec 2022 19:32:58 -0800
Subject: [PATCH] Remove old DFU code

---
 Meshtastic/Helpers/BLEManager.swift | 42 ++---------------------------
 1 file changed, 2 insertions(+), 40 deletions(-)

diff --git a/Meshtastic/Helpers/BLEManager.swift b/Meshtastic/Helpers/BLEManager.swift
index 20a45809..e0d43975 100644
--- a/Meshtastic/Helpers/BLEManager.swift
+++ b/Meshtastic/Helpers/BLEManager.swift
@@ -52,20 +52,6 @@ class BLEManager: NSObject, CBPeripheralDelegate, ObservableObject {
 	let FROMRADIO_UUID = CBUUID(string: "0x2C55E69E-4993-11ED-B878-0242AC120002")
 	let EOL_FROMRADIO_UUID = CBUUID(string: "0x8BA2BCC2-EE02-4A55-A531-C525C5E454D5")
 	let FROMNUM_UUID = CBUUID(string: "0xED9DA18C-A800-4F66-A670-AA7547E34453")
-	
-	// Meshtastic DFU details
-	let DFUSERVICE_UUID = CBUUID(string : "cb0b9a0b-a84c-4c0d-bdbb-442e3144ee30")
-	let DFUSIZE_UUID = CBUUID(string: "e74dd9c0-a301-4a6f-95a1-f0e1dbea8e1e")
-	let DFUDATA_UUID = CBUUID(string: "e272ebac-d463-4b98-bc84-5cc1a39ee517")
-	let DFUCRC32_UUID = CBUUID(string: "4826129c-c22a-43a3-b066-ce8f0d5bacc6")
-	let DFURESULT_UUID = CBUUID(string: "5e134862-7411-4424-ac4a-210937432c77")
-	let DFUREGION_UUID = CBUUID(string: "5e134862-7411-4424-ac4a-210937432c67")
-
-	var DFUSIZE_characteristic: CBCharacteristic?
-	var DFUDATA_characteristic: CBCharacteristic?
-	var DFUCRC32_characteristic: CBCharacteristic?
-	var DFURESULT_characteristic: CBCharacteristic?
-	var DFUREGION_characteristic: CBCharacteristic?
 
 	//private var meshLoggingEnabled: Bool = true
 	let meshLog = documentsFolder.appendingPathComponent("meshlog.txt")
@@ -204,7 +190,7 @@ class BLEManager: NSObject, CBPeripheralDelegate, ObservableObject {
 			return
 		}
 		// Discover Services
-		peripheral.discoverServices([meshtasticServiceCBUUID, DFUSERVICE_UUID])
+		peripheral.discoverServices([meshtasticServiceCBUUID])
 		MeshLogger.log("✅ BLE Connected: \(peripheral.name ?? "Unknown")")
 	}
 
@@ -262,17 +248,13 @@ class BLEManager: NSObject, CBPeripheralDelegate, ObservableObject {
 			if service.uuid == meshtasticServiceCBUUID {
 				peripheral.discoverCharacteristics([TORADIO_UUID, FROMRADIO_UUID, FROMNUM_UUID], for: service)
 				MeshLogger.log("✅ BLE Service for Meshtastic discovered by \(peripheral.name ?? "Unknown")")
-			}  else if (service.uuid == DFUSERVICE_UUID) {
-				peripheral.discoverCharacteristics([DFUDATA_UUID, DFUSIZE_UUID, DFUREGION_UUID, DFURESULT_UUID, DFUCRC32_UUID], for: service)
-				MeshLogger.log("✅ BLE Service for Meshtastic DFU discovered by \(peripheral.name ?? "Unknown")")
-		   }
+			}
 		}
 	}
 
 	// MARK: Discover Characteristics Event
 	func peripheral(_ peripheral: CBPeripheral, didDiscoverCharacteristicsFor service: CBService, error: Error?) {
 		
-		
 		if let e = error {
 			MeshLogger.log("🚫 BLE Discover Characteristics error for \(peripheral.name ?? "Unknown") \(e) disconnecting device")
 			// Try and stop crashes when this error occurs
@@ -298,26 +280,6 @@ class BLEManager: NSObject, CBPeripheralDelegate, ObservableObject {
 				MeshLogger.log("✅ BLE did discover FROMNUM (Notify) characteristic for Meshtastic by \(peripheral.name ?? "Unknown")")
 				FROMNUM_characteristic = characteristic
 				peripheral.setNotifyValue(true, for: characteristic)
-				
-			case DFUSIZE_UUID:
-				MeshLogger.log("✅ BLE did discover DFU Size characteristic for Meshtastic DFU by \(peripheral.name ?? "Unknown")")
-				DFUSIZE_characteristic = characteristic
-
-			case DFUDATA_UUID:
-				MeshLogger.log("✅ BLE did discover DFU Data characteristic for Meshtastic DFU by \(peripheral.name ?? "Unknown")")
-				DFUDATA_characteristic = characteristic
-
-			case DFUCRC32_UUID:
-				MeshLogger.log("✅ BLE did discover DFU CRC32 characteristic for Meshtastic DFU by \(peripheral.name ?? "Unknown")")
-				DFUCRC32_characteristic = characteristic
-				
-			case DFURESULT_UUID:
-				MeshLogger.log("✅ BLE did discover DFU Result characteristic for Meshtastic DFU by \(peripheral.name ?? "Unknown")")
-				DFURESULT_characteristic = characteristic
-				
-			case DFUREGION_UUID:
-				MeshLogger.log("✅ BLE did discover DFU Region characteristic for Meshtastic DFU by \(peripheral.name ?? "Unknown")")
-				DFUREGION_characteristic = characteristic
 
 			default:
 				break