From 08db942dc6be293fbe0b8fc27e652da5f06bc0ec Mon Sep 17 00:00:00 2001 From: Garth Vander Houwen Date: Wed, 19 Oct 2022 07:33:46 -0700 Subject: [PATCH] Update protos --- Meshtastic/Helpers/BLEManager.swift | 10 +--------- Meshtastic/Protobufs/deviceonly.pb.swift | 10 ++++++++++ 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/Meshtastic/Helpers/BLEManager.swift b/Meshtastic/Helpers/BLEManager.swift index 0fb69f5a..e1240147 100644 --- a/Meshtastic/Helpers/BLEManager.swift +++ b/Meshtastic/Helpers/BLEManager.swift @@ -324,14 +324,12 @@ class BLEManager: NSObject, ObservableObject, CBCentralManagerDelegate, CBPeriph func peripheral(_ peripheral: CBPeripheral, didDiscoverCharacteristicsFor service: CBService, error: Error?) { if let e = error { - MeshLogger.log("🚫 BLE didDiscoverCharacteristicsFor error by \(peripheral.name ?? "Unknown") \(e)") } - + guard let characteristics = service.characteristics else { return } for characteristic in characteristics { - switch characteristic.uuid { case TORADIO_UUID: @@ -339,13 +337,11 @@ class BLEManager: NSObject, ObservableObject, CBCentralManagerDelegate, CBPeriph TORADIO_characteristic = characteristic case FROMRADIO_UUID: - MeshLogger.log("✅ BLE did discover FROMRADIO characteristic for Meshtastic by \(peripheral.name ?? "Unknown")") FROMRADIO_characteristic = characteristic peripheral.readValue(for: FROMRADIO_characteristic) case FROMNUM_UUID: - MeshLogger.log("✅ BLE did discover FROMNUM (Notify) characteristic for Meshtastic by \(peripheral.name ?? "Unknown")") FROMNUM_characteristic = characteristic peripheral.setNotifyValue(true, for: characteristic) @@ -367,7 +363,6 @@ class BLEManager: NSObject, ObservableObject, CBCentralManagerDelegate, CBPeriph DFURESULT_characteristic = characteristic case DFUREGION_UUID: - MeshLogger.log("✅ BLE did discover DFU Region characteristic for Meshtastic DFU by \(peripheral.name ?? "Unknown")") DFUREGION_characteristic = characteristic @@ -376,7 +371,6 @@ class BLEManager: NSObject, ObservableObject, CBCentralManagerDelegate, CBPeriph } } if (![FROMNUM_characteristic, TORADIO_characteristic].contains(nil)) { - sendWantConfig() } } @@ -394,7 +388,6 @@ class BLEManager: NSObject, ObservableObject, CBCentralManagerDelegate, CBPeriph meshPacket.priority = MeshPacket.Priority.reliable meshPacket.wantAck = true - var dataMessage = DataMessage() dataMessage.payload = try! adminPacket.serializedData() dataMessage.portnum = PortNum.adminApp @@ -937,7 +930,6 @@ class BLEManager: NSObject, ObservableObject, CBCentralManagerDelegate, CBPeriph context!.rollback() let nsError = error as NSError MeshLogger.log("💥 Error Inserting New Core Data MessageEntity: \(nsError)") - print() } } return false diff --git a/Meshtastic/Protobufs/deviceonly.pb.swift b/Meshtastic/Protobufs/deviceonly.pb.swift index 6c263ad2..7e5e0d33 100644 --- a/Meshtastic/Protobufs/deviceonly.pb.swift +++ b/Meshtastic/Protobufs/deviceonly.pb.swift @@ -216,6 +216,10 @@ struct OEMStore { /// Use this font for the OEM text. var oemText: String = String() + /// + /// The default device encryption key, 16 or 32 byte + var oemAesKey: Data = Data() + var unknownFields = SwiftProtobuf.UnknownStorage() init() {} @@ -408,6 +412,7 @@ extension OEMStore: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationB 3: .standard(proto: "oem_icon_bits"), 4: .standard(proto: "oem_font"), 5: .standard(proto: "oem_text"), + 6: .standard(proto: "oem_aes_key"), ] mutating func decodeMessage(decoder: inout D) throws { @@ -421,6 +426,7 @@ extension OEMStore: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationB case 3: try { try decoder.decodeSingularBytesField(value: &self.oemIconBits) }() case 4: try { try decoder.decodeSingularEnumField(value: &self.oemFont) }() case 5: try { try decoder.decodeSingularStringField(value: &self.oemText) }() + case 6: try { try decoder.decodeSingularBytesField(value: &self.oemAesKey) }() default: break } } @@ -442,6 +448,9 @@ extension OEMStore: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationB if !self.oemText.isEmpty { try visitor.visitSingularStringField(value: self.oemText, fieldNumber: 5) } + if !self.oemAesKey.isEmpty { + try visitor.visitSingularBytesField(value: self.oemAesKey, fieldNumber: 6) + } try unknownFields.traverse(visitor: &visitor) } @@ -451,6 +460,7 @@ extension OEMStore: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationB if lhs.oemIconBits != rhs.oemIconBits {return false} if lhs.oemFont != rhs.oemFont {return false} if lhs.oemText != rhs.oemText {return false} + if lhs.oemAesKey != rhs.oemAesKey {return false} if lhs.unknownFields != rhs.unknownFields {return false} return true }