From 06f2ecbd95e53785255983cfab529e3977e32d3b Mon Sep 17 00:00:00 2001 From: Aleksander Nowakowski Date: Wed, 25 Oct 2023 14:59:52 +0200 Subject: [PATCH 1/3] Typos --- Source/McuManager.swift | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Source/McuManager.swift b/Source/McuManager.swift index 41cf6df..eb3c2a1 100644 --- a/Source/McuManager.swift +++ b/Source/McuManager.swift @@ -202,9 +202,9 @@ open class McuManager { /// /// - parameter date: The date. /// - parameter timeZone: Optional timezone for the given date. If left out - /// or nil, the timzone will be set to the system time zone. + /// or nil, the timezone will be set to the system time zone. /// - /// - returns: The datetime string. + /// - returns: The date-time string. public static func dateToString(date: Date, timeZone: TimeZone? = nil) -> String { let RFC3339DateFormatter = DateFormatter() RFC3339DateFormatter.locale = Locale(identifier: "en_US_POSIX") @@ -416,7 +416,7 @@ public class McuMgrGroupReturnCode: CBORMappable { case .Basic: error = BasicManagerError(rawValue: rc) default: - // Passthrough to McuMgr 'RC' Errors for Unkwnon + // Passthrough to McuMgr 'RC' Errors for Unknown // or Unsupported values. error = McuManagerError.returnCodeValue(rc) } From d7bb1d63606df7db3b1d08d96a5b5eeeebbcfc8c Mon Sep 17 00:00:00 2001 From: Aleksander Nowakowski Date: Wed, 25 Oct 2023 15:00:35 +0200 Subject: [PATCH 2/3] Error name fixed --- .../Example/View Controllers/Manager/DeviceController.swift | 2 +- Source/McuManager.swift | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Example/Example/View Controllers/Manager/DeviceController.swift b/Example/Example/View Controllers/Manager/DeviceController.swift index 75252ef..6e3d3b8 100644 --- a/Example/Example/View Controllers/Manager/DeviceController.swift +++ b/Example/Example/View Controllers/Manager/DeviceController.swift @@ -100,7 +100,7 @@ class DeviceController: UITableViewController, UITextFieldDelegate { if let messageText = self?.messageSent.text { self?.send(message: messageText) } - } catch McuManagerError.mtuValueHasNotchanged { + } catch McuManagerError.mtuValueHasNotChanged { // If MTU value did not change, try reassembly. if let messageText = self?.messageSent.text, let bleTransport = self?.defaultManager.transporter as? McuMgrBleTransport, diff --git a/Source/McuManager.swift b/Source/McuManager.swift index eb3c2a1..f6ece8c 100644 --- a/Source/McuManager.swift +++ b/Source/McuManager.swift @@ -220,7 +220,7 @@ open class McuManager { throw McuManagerError.mtuValueOutsideOfValidRange(mtu) } guard self.mtu != mtu else { - throw McuManagerError.mtuValueHasNotchanged(mtu) + throw McuManagerError.mtuValueHasNotChanged(mtu) } self.mtu = mtu @@ -272,7 +272,7 @@ public typealias McuMgrCallback = (T?, Error?) -> Void public enum McuManagerError: Error, LocalizedError { case mtuValueOutsideOfValidRange(_ newValue: Int) - case mtuValueHasNotchanged(_ newValue: Int) + case mtuValueHasNotChanged(_ newValue: Int) case returnCode(_ rc: McuMgrReturnCode) case returnCodeValue(_ rc: UInt64) @@ -280,7 +280,7 @@ public enum McuManagerError: Error, LocalizedError { switch self { case .mtuValueOutsideOfValidRange(let newMtu): return "New MTU Value \(newMtu) is outside valid range of \(McuManager.ValidMTURange.lowerBound)...\(McuManager.ValidMTURange.upperBound)" - case .mtuValueHasNotchanged(let newMtu): + case .mtuValueHasNotChanged(let newMtu): return "MTU Value already set to \(newMtu)" case .returnCode(let rc): return "Remote Error: \(rc)" From 60742900f1651ab34ec2ce1acf8640587a3cee07 Mon Sep 17 00:00:00 2001 From: Aleksander Nowakowski Date: Wed, 25 Oct 2023 23:04:18 +0200 Subject: [PATCH 3/3] Adding McuMgr params, bootloader info and app info to Device Status --- Example/Example/Base.lproj/Main.storyboard | 774 +++++++++++++----- .../Example/Util/BootloaderMode+String.swift | 26 + .../Example/Util/PeripheralState+String.swift | 23 + .../Manager/BaseViewController.swift | 99 ++- .../Manager/DeviceController.swift | 41 +- .../Manager/FilesController.swift | 38 +- .../Manager/ImageController.swift | 37 +- .../Manager/LogsStatsController.swift | 35 +- .../Widgets/ConnectionStateLabel.swift | 28 - .../project.pbxproj | 12 +- 10 files changed, 853 insertions(+), 260 deletions(-) create mode 100644 Example/Example/Util/BootloaderMode+String.swift create mode 100644 Example/Example/Util/PeripheralState+String.swift delete mode 100644 Example/Example/View Controllers/Manager/Widgets/ConnectionStateLabel.swift diff --git a/Example/Example/Base.lproj/Main.storyboard b/Example/Example/Base.lproj/Main.storyboard index 74971cf..b35a816 100644 --- a/Example/Example/Base.lproj/Main.storyboard +++ b/Example/Example/Base.lproj/Main.storyboard @@ -1,9 +1,9 @@ - - + + - + @@ -14,11 +14,11 @@ - + - + - + @@ -57,13 +57,13 @@ - + - + - + @@ -136,7 +136,7 @@