combustion-inc · jmaha · Jun 27, 2023 · Jun 15, 2023 · Jun 15, 2023 · Jun 20, 2023
diff --git a/Sources/CombustionBLE/BleData/AdvertisingData.swift b/Sources/CombustionBLE/BleData/AdvertisingData.swift
@@ -30,7 +30,7 @@ import Foundation
 public enum CombustionProductType: UInt8 {
     case unknown = 0x00
     case probe = 0x01
-    case display = 0x02
+    case meatNetNode = 0x02
 }
 
 /// Struct containing advertising data received from device.

diff --git a/Sources/CombustionBLE/DFUManager.swift b/Sources/CombustionBLE/DFUManager.swift
@@ -28,6 +28,13 @@ import CoreBluetooth
 import Foundation
 import NordicDFU
 
+public enum DFUDeviceType {
+    case thermometer
+    case display
+    case charger
+    case unknown
+}
+
 class DFUManager {
 
     /// Singleton accessor for class
@@ -42,30 +49,21 @@ class DFUManager {
     // Dictionary of currently active DFUs. Key = DFU advertising name
     private var runningDFUs = [String: DFU]()
 
-    private var defaultDisplayFirmware: DFUFirmware?
-    private var defaultThermometerFirmware: DFUFirmware?
+    private var defaultFirmware: [DFUDeviceType: DFUFirmware] = [:]
 
     private enum Constants {
         static let THERMOMETER_DFU_NAME = "Thermom_DFU_"
         static let DISPLAY_DFU_NAME = "Display_DFU_"
+        static let CHARGER_DFU_NAME = "Charger_DFU_"
 
         static let RETRY_TIME_DELAY = 10 // seconds
     }
 
-    func setDisplayDFU(_ displayDFUFile: URL?) {
-        guard let dfuFile = displayDFUFile else { return }
+    func setDefaultDFUForType(dfuFile: URL?, dfuType: DFUDeviceType) {
+        guard let dfuFile = dfuFile else { return }
 
         do {
-            defaultDisplayFirmware = try DFUFirmware(urlToZipFile: dfuFile)
-        }
-        catch { }
-    }
-
-    func setThermometerDFU(_ thermometerDFUFile: URL?) {
-        guard let dfuFile = thermometerDFUFile else { return }
-
-        do {
-            defaultThermometerFirmware = try DFUFirmware(urlToZipFile: dfuFile)
+            defaultFirmware[dfuType] = try DFUFirmware(urlToZipFile: dfuFile)
         }
         catch { }
     }
@@ -74,13 +72,17 @@ class DFUManager {
         return runningDFUs[advertisingName]?.uniqueIdentifier
     }
 
-    static func bootloaderTypeFrom(advertisingName: String) -> CombustionProductType {
+    static func bootloaderTypeFrom(advertisingName: String) -> DFUDeviceType {
         if(advertisingName.contains(Constants.THERMOMETER_DFU_NAME)) {
-            return CombustionProductType.probe
+            return .thermometer
         }
 
         if(advertisingName.contains(Constants.DISPLAY_DFU_NAME)) {
-            return CombustionProductType.display
+            return .display
+        }
+
+        if(advertisingName.contains(Constants.CHARGER_DFU_NAME)) {
+            return .charger
         }
 
         return .unknown
@@ -115,7 +117,7 @@ class DFUManager {
 
         // Use advertising name to determine if device is Display or Thermometer
         // and restart DFU with the default file for each device type
-        if let firmware = firmwareForBootloader(device) {
+        if let firmware = defaultFirmware[device.type] {
             _ = runDfu(peripheral: peripheral,
                        device: device,
                        advertisingName: device.advertisingName,
@@ -136,12 +138,27 @@ class DFUManager {
     }
 
     private func dfuAdvertisingName(for device: Device) -> String {
-        let typeName = (device is Probe) ? Constants.THERMOMETER_DFU_NAME : Constants.DISPLAY_DFU_NAME
+        let typeName = deviceTypeAdvertisingName(for: device)
 
         // Add random value to advertising name
         return typeName + String(format: "%05d", arc4random_uniform(100000))
     }
 
+    private func deviceTypeAdvertisingName(for device: Device) -> String {
+        let typeName = (device is Probe) ? Constants.THERMOMETER_DFU_NAME : Constants.DISPLAY_DFU_NAME
+
+        if let node = device as? MeatNetNode {
+            if node.dfuType == .charger {
+                return Constants.CHARGER_DFU_NAME
+            }
+            else if(node.dfuType == .display) {
+                return Constants.DISPLAY_DFU_NAME
+            }
+        }
+
+        return Constants.THERMOMETER_DFU_NAME
+    }
+
     private func runDfu(peripheral: CBPeripheral,
                         device: Device,
                         advertisingName: String,
@@ -164,16 +181,4 @@ class DFUManager {
         return initiator.start(target: peripheral)
     }
 
-    private func firmwareForBootloader(_ device: BootloaderDevice) -> DFUFirmware? {
-        if device.advertisingName.contains(Constants.DISPLAY_DFU_NAME) {
-            return defaultDisplayFirmware
-        }
-
-        if device.advertisingName.contains(Constants.THERMOMETER_DFU_NAME) {
-            return defaultThermometerFirmware
-        }
-
-        return nil
-    }
-
 }
diff --git a/Sources/CombustionBLE/DeviceManager.swift b/Sources/CombustionBLE/DeviceManager.swift
@@ -109,12 +109,12 @@ public class DeviceManager : ObservableObject {
         }
     }
 
-    /// Returns list of displays
-    /// - returns: List of all kitchen timers
-    public func getDisplays() -> [Display] {
+    /// Returns list of MeatNet nodes
+    /// - returns: List of all MeatNet nodes
+    public func getDisplays() -> [MeatNetNode] {
         if meatNetEnabled {
             return Array(devices.values).compactMap { device in
-                return device as? Display
+                return device as? MeatNetNode
             }
         } else {
             return []
@@ -403,10 +403,10 @@ public class DeviceManager : ObservableObject {
         }
     }
 
-    /// Sends request to the device to read the probe model info.
+    /// Sends request to read the probe model info.
     ///
     /// - parameter probe: Probe for which to read model info.
-    public func readModelInfo(probe: Probe) {
+    public func readModelInfoForProbe(_ probe: Probe) {
         if let targetDevice = getBestRouteToProbe(serialNumber: probe.serialNumber) {
             if let targetProbe = targetDevice as? Probe, let bleIdentifier = targetProbe.bleIdentifier {
                 // If the best route is directly to the Probe, send it that way.
@@ -420,7 +420,12 @@ public class DeviceManager : ObservableObject {
         }
     }
 
-
+    /// Sends request to read the MeatNetNode model info.
+    ///
+    /// - parameter node: MeatNetNode for which to read model info.
+    public func readModelInfoForNode(_ node: MeatNetNode) {
+        BleManager.shared.readModelNumber(identifier: node.uniqueIdentifier)
+    }
 
     /// Sends a request to the device to read Over Temperature flag
     ///
@@ -440,16 +445,16 @@ public class DeviceManager : ObservableObject {
         }
     }
 
-    /// Set the DFU file to be used on displays with failed software upgrade.
+    /// Set the DFU file to be used on devices with failed software upgrade.
     /// A failed upgrade will occur if the user kills the application in the middle of
     /// the software upgrade process.  After this method is called, DFU will be initiated
     /// when a device with failed software upgrade is detected.
     ///
-    /// - displayDFUFile: Display DFU file
-    /// - thermometerDFUFile: Thermometer DFU file
-    public func restartFailedUpgradesWith(displayDFUFile: URL?, thermometerDFUFile: URL?) {
-        DFUManager.shared.setDisplayDFU(displayDFUFile)
-        DFUManager.shared.setThermometerDFU( thermometerDFUFile)
+    /// - dfuFiles: DFU files for each DFU type
+    public func restartFailedUpgradesWith(dfuFiles: [DFUDeviceType: URL]) {
+        for (type, dfuFile) in dfuFiles {
+            DFUManager.shared.setDefaultDFUForType(dfuFile: dfuFile, dfuType: type)
+        }
     }
 }
 
@@ -545,7 +550,7 @@ extension DeviceManager : BleManagerDelegate {
         case .probe:
             let _ = updateProbeWithAdvertising(advertising: advertising, isConnectable: isConnectable, rssi: rssi, identifier: identifier)
 
-        case .display:
+        case .meatNetNode:
             // If this advertising data was from a Node, attempt to find its Device entry by its BLE identifier.
             if(meatNetEnabled) {
                 let uniqueIdentifier = identifier.uuidString
@@ -561,7 +566,7 @@ extension DeviceManager : BleManagerDelegate {
                     }
 
                 } else {
-                    let node = Display(advertising, isConnectable: isConnectable, RSSI: rssi, identifier: identifier)
+                    let node = MeatNetNode(advertising, isConnectable: isConnectable, RSSI: rssi, identifier: identifier)
                     addDevice(device: node)
 
                     // If MeatNet is enabled, try to connect to all Nodes.
@@ -617,20 +622,12 @@ extension DeviceManager : BleManagerDelegate {
     func updateDeviceFwVersion(identifier: UUID, fwVersion: String) {
         if let device = findDeviceByBleIdentifier(bleIdentifier: identifier) {
             device.firmareVersion = fwVersion
-
-            // TODO : remove this at some point
-            // Prior to v0.8.0, the firmware did not support the Session ID command
-            // Therefore, add a hardcoded session for backwards compatibility
-            if(Version.isBefore(deviceFirmware: fwVersion, comparison: "v0.8.0")) {
-                let fakeSessionInfo = SessionInformation(sessionID: 0, samplePeriod: 1000)
-                updateDeviceWithSessionInformation(identifier: identifier, sessionInformation: fakeSessionInfo)
-            }
         }
     }
 
     func updateDeviceSerialNumber(identifier: UUID, serialNumber: String) {
-        if let timer = findDeviceByBleIdentifier(bleIdentifier: identifier) as? Display {
-            timer.serialNumberString = serialNumber
+        if let node = findDeviceByBleIdentifier(bleIdentifier: identifier) as? MeatNetNode {
+            node.serialNumberString = serialNumber
         }
     }
 
@@ -642,7 +639,7 @@ extension DeviceManager : BleManagerDelegate {
 
     func updateDeviceModelInfo(identifier: UUID, modelInfo: String) {
         if let device = findDeviceByBleIdentifier(bleIdentifier: identifier)  {
-            device.updateSkuAndLot(modelInfo: modelInfo)
+            device.updateWithModelInfo(modelInfo)
         }
     }
 
@@ -732,7 +729,7 @@ extension DeviceManager : BleManagerDelegate {
             }
         } else if let readModelInfoResponse = response as? NodeReadModelInfoResponse {
             if let probe = findProbeBySerialNumber(serialNumber: readModelInfoResponse.probeSerialNumber) {
-                probe.updateSkuAndLot(modelInfo: readModelInfoResponse.modelInfo)
+                probe.updateWithModelInfo(readModelInfoResponse.modelInfo)
             }
         } else if let sessionInfoResponse = response as? NodeReadSessionInfoResponse {
             if let probe = findProbeBySerialNumber(serialNumber: sessionInfoResponse.probeSerialNumber) {
@@ -742,7 +739,6 @@ extension DeviceManager : BleManagerDelegate {
             if let probe = findProbeBySerialNumber(serialNumber: readLogsResponse.probeSerialNumber) {
                 probe.processLogResponse(logResponse: readLogsResponse)
             }
-
         }
     }
 

diff --git a/Sources/CombustionBLE/BootloaderDevice.swift → ...bustionBLE/Devices/BootloaderDevice.swift b/Sources/CombustionBLE/BootloaderDevice.swift → ...bustionBLE/Devices/BootloaderDevice.swift
@@ -9,7 +9,7 @@ import Foundation
 
 
 public class BootloaderDevice : Device {
-    public let type: CombustionProductType
+    public let type: DFUDeviceType
 
     private(set) var advertisingName: String
 

diff --git a/Sources/CombustionBLE/Device.swift → Sources/CombustionBLE/Devices/Device.swift b/Sources/CombustionBLE/Device.swift → Sources/CombustionBLE/Devices/Device.swift
@@ -162,7 +162,7 @@ public class Device : ObservableObject {
     }
 
     /// Updates SKU and Lot number based on Model Info string.
-    func updateSkuAndLot(modelInfo: String) {
+    func updateWithModelInfo(_ modelInfo: String) {
         // Parse the SKU and lot number, which are delimited by a ':'
         let parts = modelInfo.components(separatedBy: ":")
         if parts.count == 2 {

diff --git a/Sources/CombustionBLE/MeatNetNode.swift → ...s/CombustionBLE/Devices/MeatNetNode.swift b/Sources/CombustionBLE/MeatNetNode.swift → ...s/CombustionBLE/Devices/MeatNetNode.swift
@@ -36,13 +36,14 @@ public class MeatNetNode: Device {
     /// Dictionary of Probes connected to this Node's Network
     @Published public var probes: [UInt32 : Probe] = [:]
 
+    /// DFU device type
+    @Published public internal(set) var dfuType: DFUDeviceType = .unknown
 
     init(_ advertising: AdvertisingData, isConnectable: Bool, RSSI: NSNumber, identifier: UUID) {
         super.init(uniqueIdentifier: identifier.uuidString, bleIdentifier: identifier, RSSI: RSSI)
         updateWithAdvertising(advertising, isConnectable: isConnectable, RSSI: RSSI)
     }
 
-
     func updateWithAdvertising(_ advertising: AdvertisingData, isConnectable: Bool, RSSI: NSNumber) {
         // Always update probe RSSI and isConnectable flag
         self.rssi = RSSI.intValue
@@ -60,5 +61,16 @@ public class MeatNetNode: Device {
         return probes[serialNumber]
     }
 
-
+    /// Special handling for MeatNetNode model info.  Need to decode model info string
+    /// to determine DFU type
+    override func updateWithModelInfo(_ modelInfo: String) {
+        super.updateWithModelInfo(modelInfo)
+
+        if(modelInfo.contains("Timer")) {
+            dfuType = .display
+        }
+        else if(modelInfo.contains("Charger")) {
+            dfuType = .charger
+        }
+    }
 }
diff --git a/Sources/CombustionBLE/Probe.swift → Sources/CombustionBLE/Devices/Probe.swift b/Sources/CombustionBLE/Probe.swift → Sources/CombustionBLE/Devices/Probe.swift
@@ -274,7 +274,7 @@ extension Probe {
 
         if manufacturingLot == nil || sku == nil {
             // Request the model info
-            DeviceManager.shared.readModelInfo(probe: self)
+            DeviceManager.shared.readModelInfoForProbe(self)
         }
     }
 

diff --git a/Sources/CombustionBLE/SimulatedProbe.swift → ...ombustionBLE/Devices/SimulatedProbe.swift b/Sources/CombustionBLE/SimulatedProbe.swift → ...ombustionBLE/Devices/SimulatedProbe.swift
diff --git a/Sources/CombustionBLE/Display.swift b/Sources/CombustionBLE/Display.swift