NordicSemiconductor · philips77 · Mar 7, 2023 · Mar 7, 2023
diff --git a/Example/Pods/Pods.xcodeproj/project.pbxproj b/Example/Pods/Pods.xcodeproj/project.pbxproj
diff --git a/Example/Tests/NormalBehaviorTest.swift b/Example/Tests/NormalBehaviorTest.swift
@@ -108,9 +108,9 @@ class NormalBehaviorTest: XCTestCase {
         // The `onLedStateDidChange` handler will be called after the initial state has been read.
         let ledEnabled = XCTestExpectation(description: "LED Enabled")
         let ledObserver = target!.onLedStateDidChange { isOn in
-            if isOn {
+            if isOn == true {
                 ledEnabled.fulfill()
-            } else {
+            } else if isOn == false {
                 // Simulate toggling the switch.
                 blinkyViewController.ledToggleSwitch.setOn(true, animated: true)
                 blinkyViewController.ledToggleSwitchDidChange(blinkyViewController.ledToggleSwitch)
@@ -123,7 +123,7 @@ class NormalBehaviorTest: XCTestCase {
         let buttonPressed = XCTestExpectation(description: "Button pressed")
         let buttonReleased = XCTestExpectation(description: "Button released")
         let buttonObserver = target!.onButtonStateDidChange { isPressed in
-            if isPressed {
+            if isPressed == true {
                 // Simulate releasing the BTN1 on DK.
                 blinky.simulateValueUpdate(Data([0x00]), for: .buttonCharacteristic)
                 buttonPressed.fulfill()

diff --git a/Example/Tests/ResetTest.swift b/Example/Tests/ResetTest.swift
@@ -108,12 +108,12 @@ class ResetTest: XCTestCase {
         buttonPressed.isInverted = true
 
         let ledObserver = target!.onLedStateDidChange { isOn in
-            if !isOn {
+            if isOn == false {
                 ledDisabled.fulfill()
             }
         }
         let buttonObserver = target!.onButtonStateDidChange { isPressed in
-            if isPressed {
+            if isPressed == true {
                 buttonPressed.fulfill()
             } else {
                 buttonReleased.fulfill()

diff --git a/Example/nRFBlinky/Models/BlinkyPeripheral.swift b/Example/nRFBlinky/Models/BlinkyPeripheral.swift
@@ -115,7 +115,7 @@ class BlinkyPeripheral: NSObject, CBPeripheralDelegate {
                 basePeripheral.readValue(for: ledCharacteristic)
             } else {
                 print("Can't read LED state")
-                post(.ledState(of: self, didChangeTo: false))
+                post(.ledState(of: self, didChangeTo: nil))
             }
         }
     }
@@ -381,6 +381,8 @@ class BlinkyPeripheral: NSObject, CBPeripheralDelegate {
             print("Writing value failed: \(error.localizedDescription)")
         }
         // LED value has been written, let's read it to confirm.
-        readLEDValue()
+        if characteristic.properties.contains(.read) {
+            readLEDValue()
+        }
     }
 }
diff --git a/Example/nRFBlinky/Models/BlinkyPeripheralEvents.swift b/Example/nRFBlinky/Models/BlinkyPeripheralEvents.swift
@@ -68,15 +68,15 @@ extension Notification {
     }
 
     static func ledState(of blinkyPeripheral: BlinkyPeripheral,
-                         didChangeTo isOn: Bool) -> Notification {
+                         didChangeTo isOn: Bool?) -> Notification {
         return Notification(name: .ledState, object: blinkyPeripheral,
-                            userInfo: ["isOn": isOn])
+                            userInfo: isOn.map { ["isOn": $0] } ?? nil )
     }
 
     static func buttonState(of blinkyPeripheral: BlinkyPeripheral,
-                            didChangeTo isPressed: Bool) -> Notification {
+                            didChangeTo isPressed: Bool?) -> Notification {
         return Notification(name: .buttonState, object: blinkyPeripheral,
-                            userInfo: ["isPressed": isPressed])
+                            userInfo: isPressed.map { ["isPressed": $0] } ?? nil)
     }
 
 }
@@ -139,19 +139,19 @@ extension BlinkyPeripheral {
         }
     }
 
-    func onLedStateDidChange(do action: @escaping (Bool) -> ()) -> NSObjectProtocol {
+    func onLedStateDidChange(do action: @escaping (Bool?) -> ()) -> NSObjectProtocol {
         return on(.ledState) { notification in
-            if let userInfo = notification.userInfo,
-               let isOn = userInfo["isOn"] as? Bool {
+            if let userInfo = notification.userInfo {
+                let isOn = userInfo["isOn"] as? Bool
                 action(isOn)
             }
         }
     }
 
-    func onButtonStateDidChange(do action: @escaping (Bool) -> ()) -> NSObjectProtocol {
+    func onButtonStateDidChange(do action: @escaping (Bool?) -> ()) -> NSObjectProtocol {
         return on(.buttonState) { notification in
-            if let userInfo = notification.userInfo,
-               let isPressed = userInfo["isPressed"] as? Bool {
+            if let userInfo = notification.userInfo {
+                let isPressed = userInfo["isPressed"] as? Bool
                 action(isPressed)
             }
         }

diff --git a/Example/nRFBlinky/UI/de.lproj/Localizable.strings b/Example/nRFBlinky/UI/de.lproj/Localizable.strings
@@ -9,5 +9,6 @@
 "OFF" = "AUS";
 "PRESSED" = "GEDRÜCKT";
 "RELEASED" = "LOSGELASSEN";
+"UNKNOWN" = "UNBEKANNT";
 "Reading..." = "Lese...";
 "Unknown Device" = "Unbekanntes Gerät";
diff --git a/Example/nRFBlinky/UI/en.lproj/Localizable.strings b/Example/nRFBlinky/UI/en.lproj/Localizable.strings
@@ -9,5 +9,6 @@
 "OFF" = "OFF";
 "PRESSED" = "PRESSED";
 "RELEASED" = "RELEASED";
+"UNKNOWN" = "UNKNOWN";
 "Reading..." = "Reading...";
 "Unknown Device" = "Unknown Device";
diff --git a/Example/nRFBlinky/UI/es.lproj/Localizable.strings b/Example/nRFBlinky/UI/es.lproj/Localizable.strings
@@ -9,5 +9,6 @@
 "OFF" = "APAGADO";
 "PRESSED" = "PULSADO";
 "RELEASED" = "LIBRE";
+"UNKNOWN" = "DESCONOCIDO";
 "Reading..." = "Leyendo...";
 "Unknown Device" = "Dispositivo Desconocido";
diff --git a/Example/nRFBlinky/UI/es.lproj/Main.strings b/Example/nRFBlinky/UI/es.lproj/Main.strings
@@ -38,7 +38,7 @@
 /* Class = "UILabel"; text = "2. Make sure the coin cell battery has power."; ObjectID = "rmw-BF-cDo"; */
 "rmw-BF-cDo.text" = "2. Asegúrate de que la pila de botón da corriente.";
 
-/* Class = "UILabel"; text = "OFF"; ObjectID = "sXe-8K-21Q"; */
+/* Class = "UILabel"; text = "UNKNOWN"; ObjectID = "sXe-8K-21Q"; */
 "sXe-8K-21Q.text" = "DESCONOCIDO";
 
 /* Class = "UILabel"; text = "<Peripheral Name>"; ObjectID = "ufl-Iw-mhn"; */

diff --git a/Example/nRFBlinky/UI/fi.lproj/Localizable.strings b/Example/nRFBlinky/UI/fi.lproj/Localizable.strings
@@ -9,5 +9,6 @@
 "OFF" = "SAMMUTA";
 "PRESSED" = "PAINETTU";
 "RELEASED" = "VAPAUTETTU";
+"UNKNOWN" = "TUNTEMATON";
 "Reading..." = "Lukee...";
 "Unknown Device" = "Tuntematon laite";
diff --git a/Example/nRFBlinky/UI/fr.lproj/Localizable.strings b/Example/nRFBlinky/UI/fr.lproj/Localizable.strings
@@ -9,5 +9,6 @@
 "OFF" = "OFF";
 "PRESSED" = "APPUYÉ";
 "RELEASED" = "RELACHÉ";
+"UNKNOWN" = "INCONNU";
 "Reading..." = "Lecture en cours...";
 "Unknown Device" = "Appareil Inconnu";
diff --git a/Example/nRFBlinky/UI/fr.lproj/Main.strings b/Example/nRFBlinky/UI/fr.lproj/Main.strings
@@ -38,7 +38,7 @@
 /* Class = "UILabel"; text = "2. Make sure the coin cell battery has power."; ObjectID = "rmw-BF-cDo"; */
 "rmw-BF-cDo.text" = "2. Assurez-vous que la pile bouton n'est pas déchargée.";
 
-/* Class = "UILabel"; text = "OFF"; ObjectID = "sXe-8K-21Q"; */
+/* Class = "UILabel"; text = "UNKNOWN"; ObjectID = "sXe-8K-21Q"; */
 "sXe-8K-21Q.text" = "INCONNU";
 
 /* Class = "UILabel"; text = "Nordic Blinky"; ObjectID = "ufl-Iw-mhn"; */

diff --git a/Example/nRFBlinky/UI/it.lproj/Localizable.strings b/Example/nRFBlinky/UI/it.lproj/Localizable.strings
@@ -9,5 +9,6 @@
 "OFF" = "SPENTO";
 "PRESSED" = "PREMUTO";
 "RELEASED" = "ALZATO";
+"UNKNOWN" = "SCONOSCIUTO";
 "Reading..." = "Lettura...";
 "Unknown Device" = "Dispositivo sconosciuto";
diff --git a/Example/nRFBlinky/UI/it.lproj/Main.strings b/Example/nRFBlinky/UI/it.lproj/Main.strings
@@ -38,7 +38,7 @@
 /* Class = "UILabel"; text = "2. Make sure the coin cell battery has power."; ObjectID = "rmw-BF-cDo"; */
 "rmw-BF-cDo.text" = "2. Assicurarsi che la batteria sia carica.";
 
-/* Class = "UILabel"; text = "OFF"; ObjectID = "sXe-8K-21Q"; */
+/* Class = "UILabel"; text = "UNKNOWN"; ObjectID = "sXe-8K-21Q"; */
 "sXe-8K-21Q.text" = "SCONOSCIUTO";
 
 /* Class = "UILabel"; text = "Nordic Blinky"; ObjectID = "ufl-Iw-mhn"; */

diff --git a/Example/nRFBlinky/UI/ko.lproj/Localizable.strings b/Example/nRFBlinky/UI/ko.lproj/Localizable.strings
@@ -9,5 +9,6 @@
 "OFF" = "꺼짐";
 "PRESSED" = "활성화됨";
 "RELEASED" = "비활성화됨";
+"UNKNOWN" = "알 수 없음";
 "Reading..." = "읽는 중...";
 "Unknown Device" = "알 수 없는 기기";
diff --git a/Example/nRFBlinky/UI/ko.lproj/Main.strings b/Example/nRFBlinky/UI/ko.lproj/Main.strings
@@ -38,7 +38,7 @@
 /* Class = "UILabel"; text = "2. Make sure the coin cell battery has power."; ObjectID = "rmw-BF-cDo"; */
 "rmw-BF-cDo.text" = "2. Coin cell의 배터리가 충분한지 확인하세요.";
 
-/* Class = "UILabel"; text = "OFF"; ObjectID = "sXe-8K-21Q"; */
+/* Class = "UILabel"; text = "UNKNOWN"; ObjectID = "sXe-8K-21Q"; */
 "sXe-8K-21Q.text" = "알 수 없음";
 
 /* Class = "UILabel"; text = "Nordic Blinky"; ObjectID = "ufl-Iw-mhn"; */

diff --git a/Example/nRFBlinky/UI/mr.lproj/Localizable.strings b/Example/nRFBlinky/UI/mr.lproj/Localizable.strings
@@ -9,5 +9,6 @@
 "OFF" = "बंद";
 "PRESSED" = "दाबले";
 "RELEASED" = "सोडले";
+"UNKNOWN" = "अज्ञात";
 "Reading..." = "वाचले जात आहे...";
 "Unknown Device" = "अज्ञात उपकरण";
diff --git a/Example/nRFBlinky/UI/nb.lproj/Localizable.strings b/Example/nRFBlinky/UI/nb.lproj/Localizable.strings
@@ -9,5 +9,6 @@
 "OFF" = "AV";
 "PRESSED" = "NEDTRYKKET";
 "RELEASED" = "INAKTIV";
+"UNKNOWN" = "UKJENT";
 "Reading..." = "Leser...";
 "Unknown Device" = "Ukjent Enhet";
diff --git a/Example/nRFBlinky/UI/nb.lproj/Main.strings b/Example/nRFBlinky/UI/nb.lproj/Main.strings
@@ -38,7 +38,7 @@
 /* Class = "UILabel"; text = "2. Make sure the coin cell battery has power."; ObjectID = "rmw-BF-cDo"; */
 "rmw-BF-cDo.text" = "2. Sørg for at det er strøm i batteriet.";
 
-/* Class = "UILabel"; text = "OFF"; ObjectID = "sXe-8K-21Q"; */
+/* Class = "UILabel"; text = "UNKNOWN"; ObjectID = "sXe-8K-21Q"; */
 "sXe-8K-21Q.text" = "UKJENT";
 
 /* Class = "UILabel"; text = "Nordic Blinky"; ObjectID = "ufl-Iw-mhn"; */

diff --git a/Example/nRFBlinky/UI/pl.lproj/Localizable.strings b/Example/nRFBlinky/UI/pl.lproj/Localizable.strings
@@ -9,6 +9,7 @@
 "OFF" = "WYŁĄCZONE";
 "PRESSED" = "WCIŚNIĘTY";
 "RELEASED" = "ZWOLNIONY";
+"UNKNOWN" = "NIEZNANY";
 "Reading..." = "Pobieranie...";
 "Unknown Device" = "Nieznane urządzenie";
 
diff --git a/Example/nRFBlinky/UI/pl.lproj/Main.strings b/Example/nRFBlinky/UI/pl.lproj/Main.strings
@@ -38,7 +38,7 @@
 /* Class = "UILabel"; text = "2. Make sure the coin cell battery has power."; ObjectID = "rmw-BF-cDo"; */
 "rmw-BF-cDo.text" = "2. Upewnij się, że bateria nie jest wyczerpana.";
 
-/* Class = "UILabel"; text = "OFF"; ObjectID = "sXe-8K-21Q"; */
+/* Class = "UILabel"; text = "UNKNOWN"; ObjectID = "sXe-8K-21Q"; */
 "sXe-8K-21Q.text" = "NIEZNANY";
 
 /* Class = "UILabel"; text = "Nordic Blinky"; ObjectID = "ufl-Iw-mhn"; */

diff --git a/Example/nRFBlinky/UI/pt-BR.lproj/Localizable.strings b/Example/nRFBlinky/UI/pt-BR.lproj/Localizable.strings
@@ -9,5 +9,6 @@
 "OFF" = "DESLIGADO";
 "PRESSED" = "PRESSIONADO";
 "RELEASED" = "LIBERADO";
+"UNKNOWN" = "DESCONHECIDO";
 "Reading..." = "Lendo...";
 "Unknown Device" = "Dispositivo desconhecido";
diff --git a/Example/nRFBlinky/UI/ro.lproj/Localizable.strings b/Example/nRFBlinky/UI/ro.lproj/Localizable.strings
@@ -9,5 +9,6 @@
 "OFF" = "OPRIT";
 "PRESSED" = "APASAT";
 "RELEASED" = "NEAPĂSAT";
+"UNKNOWN" = "NECUNOSCUT";
 "Reading..." = "Se actualizează starea...";
 "Unknown Device" = "Dispozitiv necunoscut";
diff --git a/Example/nRFBlinky/UI/ro.lproj/Main.strings b/Example/nRFBlinky/UI/ro.lproj/Main.strings
@@ -38,8 +38,8 @@
 /* Class = "UILabel"; text = "2. Make sure the coin cell battery has power."; ObjectID = "rmw-BF-cDo"; */
 "rmw-BF-cDo.text" = "2. Asigura-te că bateria de tip moneda e încărcată.";
 
-/* Class = "UILabel"; text = "OFF"; ObjectID = "sXe-8K-21Q"; */
-"sXe-8K-21Q.text" = "OPRIT";
+/* Class = "UILabel"; text = "UNKNOWN"; ObjectID = "sXe-8K-21Q"; */
+"sXe-8K-21Q.text" = "NECUNOSCUT";
 
 /* Class = "UILabel"; text = "Nordic Blinky"; ObjectID = "ufl-Iw-mhn"; */
 "ufl-Iw-mhn.text" = "Nordic Blinky";
diff --git a/Example/nRFBlinky/UI/ru.lproj/Localizable.strings b/Example/nRFBlinky/UI/ru.lproj/Localizable.strings
@@ -9,5 +9,6 @@
 "OFF" = "ВЫКЛЮЧЕНО";
 "PRESSED" = "НАЖАТА";
 "RELEASED" = "ОТПУЩЕНА";
+"UNKNOWN" = "НЕИЗВЕСТНО";
 "Reading..." = "Чтение...";
 "Unknown Device" = "Неизвестное устройство";
diff --git a/Example/nRFBlinky/UI/ru.lproj/Main.strings b/Example/nRFBlinky/UI/ru.lproj/Main.strings
@@ -38,7 +38,7 @@
 /* Class = "UILabel"; text = "2. Make sure the coin cell battery has power."; ObjectID = "rmw-BF-cDo"; */
 "rmw-BF-cDo.text" = "2. Убедитесь, что таблетка (миниатюрный элемент питания) имеет заряд.";
 
-/* Class = "UILabel"; text = "OFF"; ObjectID = "sXe-8K-21Q"; */
+/* Class = "UILabel"; text = "UNKNOWN"; ObjectID = "sXe-8K-21Q"; */
 "sXe-8K-21Q.text" = "НЕИЗВЕСТНО";
 
 /* Class = "UILabel"; text = "Nordic Blinky"; ObjectID = "ufl-Iw-mhn"; */

diff --git a/Example/nRFBlinky/UI/uk.lproj/Localizable.strings b/Example/nRFBlinky/UI/uk.lproj/Localizable.strings
@@ -9,5 +9,6 @@
 "OFF" = "ВИМКНЕНО";
 "PRESSED" = "НАТИСНУТО";
 "RELEASED" = "ВIДПУЩЕНО";
+"UNKNOWN" = "НЕВІДОМО";
 "Reading..." = "Читання...";
 "Unknown Device" = "Невідомий пристрій";
diff --git a/Example/nRFBlinky/UI/uk.lproj/Main.strings b/Example/nRFBlinky/UI/uk.lproj/Main.strings
@@ -38,7 +38,7 @@
 /* Class = "UILabel"; text = "2. Make sure the coin cell battery has power."; ObjectID = "rmw-BF-cDo"; */
 "rmw-BF-cDo.text" = "2. Переконайтеся, що батарейка (мініатюрний елемент живлення) має заряд.";
 
-/* Class = "UILabel"; text = "OFF"; ObjectID = "sXe-8K-21Q"; */
+/* Class = "UILabel"; text = "UNKNOWN"; ObjectID = "sXe-8K-21Q"; */
 "sXe-8K-21Q.text" = "НЕВІДОМО";
 
 /* Class = "UILabel"; text = "Nordic Blinky"; ObjectID = "ufl-Iw-mhn"; */

diff --git a/Example/nRFBlinky/UI/vi.lproj/Localizable.strings b/Example/nRFBlinky/UI/vi.lproj/Localizable.strings
@@ -9,5 +9,6 @@
 "OFF" = "TẮT";
 "PRESSED" = "ĐÃ ẤN";
 "RELEASED" = "ĐÃ NHẢ";
+"UNKNOWN" = "KHÔNG XÁC ĐỊNH";
 "Reading..." = "Đang đọc...";
 "Unknown Device" = "Thiết bị chưa nhận dạng";
diff --git a/Example/nRFBlinky/UI/zh-Hans.lproj/Localizable.strings b/Example/nRFBlinky/UI/zh-Hans.lproj/Localizable.strings
@@ -9,5 +9,6 @@
 "OFF" = "关";
 "PRESSED" = "按下";
 "RELEASED" = "释放";
+"UNKNOWN" = "未知状态";
 "Reading..." = "读取...";
 "Unknown Device" = "未知设备";
diff --git a/Example/nRFBlinky/ViewControllers/BlinkyView/BlinkyViewController.swift b/Example/nRFBlinky/ViewControllers/BlinkyView/BlinkyViewController.swift
@@ -164,24 +164,31 @@ private extension BlinkyViewController {
         }
     }
 
-    func ledStateChanged(isOn: Bool) {
+    func ledStateChanged(isOn: Bool?) {
         DispatchQueue.main.async {
-            if isOn {
+            switch isOn {
+            case true:
                 self.ledStateLabel.text = "ON".localized
                 self.ledToggleSwitch.setOn(true, animated: true)
-            } else {
+            case false:
                 self.ledStateLabel.text = "OFF".localized
                 self.ledToggleSwitch.setOn(false, animated: true)
+            default:
+                self.ledStateLabel.text = "UNKNOWN".localized
+                self.ledToggleSwitch.setOn(false, animated: true)
             }
         }
     }
 
-    func buttonStateChanged(isPressed: Bool) {
+    func buttonStateChanged(isPressed: Bool?) {
         DispatchQueue.main.async {
-            if isPressed {
+            switch isPressed {
+            case true:
                 self.buttonStateLabel.text = "PRESSED".localized
-            } else {
+            case false:
                 self.buttonStateLabel.text = "RELEASED".localized
+            default:
+                self.buttonStateLabel.text = "UNKNOWN".localized
             }
             self.buttonTapHapticFeedback()
         }