fix a crash (#56)

* fix a crash

* fix hue shift issue due to precision loss.

Author: keefo

NeewerLite/NeewerLite/Model/NeewerLight.swift

@@ -431,10 +431,10 @@ class NeewerLight: NSObject, ObservableNeewerLightProtocol {
     }
 
     // Set RBG light in HSV Mode
-    public func setRGBLightValues(brr: CGFloat, hue: CGFloat, sat: CGFloat) {
+    public func setRGBLightValues(brr: CGFloat, hue: CGFloat, hue360: CGFloat, sat: CGFloat) {
         var cmd: Data = Data()
         // Logger.debug("hue: \(hue) sat: \(sat)")
-        cmd = getRGBLightValue(brightness: brr, hue: hue, satruation: sat)
+        cmd = getRGBLightValue(brightness: brr, hue: hue, hue360: hue360, satruation: sat)
 
         lightMode = .HSIMode
 
@@ -483,7 +483,11 @@ class NeewerLight: NSObject, ObservableNeewerLightProtocol {
         if data.prefix(upTo: BleUpdate.channelUpdatePrefix.count) == BleUpdate.channelUpdatePrefix
             && data.count == BleUpdate.channelUpdatePrefix.count + 2 {
             // data[3] range in [0,1,2,3,4,5,6,7,8]
-            channel.value = UInt8(data[3]+1).clamped(to: 1...maxChannel) // only 1-maxChannel channel a allowed.
+            if maxChannel >= 1 {
+                channel.value = UInt8(data[3]+1).clamped(to: 1...maxChannel) // only 1-maxChannel channel a allowed.
+            } else {
+                channel.value = UInt8(data[3]+1).clamped(to: 1...30)
+            }
         } else {
             Logger.info("handleNotifyValueUpdate \(data.hexEncodedString())")
         }
@@ -661,7 +665,7 @@ class NeewerLight: NSObject, ObservableNeewerLightProtocol {
                 cmd = getCCTOnlyLightValue(brightness: brr, correlatedColorTemperature: CGFloat(cctValue.value))
             }
         } else if lightMode == .HSIMode {
-            cmd = getRGBLightValue(brightness: brr, hue: CGFloat(hueValue.value) / 360.0, satruation: CGFloat(satValue.value) / 100.0)
+            cmd = getRGBLightValue(brightness: brr, hue: CGFloat(hueValue.value) / 360.0, hue360: CGFloat(hueValue.value), satruation: CGFloat(satValue.value) / 100.0)
         } else {
             cmd = getSceneValue(channel.value, brightness: CGFloat(brr))
         }
@@ -671,7 +675,7 @@ class NeewerLight: NSObject, ObservableNeewerLightProtocol {
         write(data: cmd as Data, to: characteristic)
     }
 
-    private func getRGBLightValue(brightness brr: CGFloat, hue theHue: CGFloat, satruation sat: CGFloat ) -> Data {
+    private func getRGBLightValue(brightness brr: CGFloat, hue theHue: CGFloat, hue360 theHue360: CGFloat, satruation sat: CGFloat ) -> Data {
         var ratio = 100.0
         if brr > 1.0 {
             ratio = 1.0
@@ -680,6 +684,7 @@ class NeewerLight: NSObject, ObservableNeewerLightProtocol {
         let newBrrValue: Int = Int(brr * ratio).clamped(to: 0...100)
         let newSatValue: Int = Int(sat * 100.0).clamped(to: 0...100)
         let newHueValue = Int(theHue * 360.0).clamped(to: 0...360)
+        let newHue360Value = Int(theHue360).clamped(to: 0...360)
 
         // Red  7886 0400 0064 643F
         // Blue 7886 04E7 0064 64B0
@@ -701,7 +706,7 @@ class NeewerLight: NSObject, ObservableNeewerLightProtocol {
         bArr[6] = newBrrValue // brightness
 
         brrValue.value = newBrrValue
-        hueValue.value = newHueValue
+        hueValue.value = newHue360Value
         satValue.value = newSatValue
 
         let bArr1: [UInt8] = appendCheckSum(bArr)

NeewerLite/NeewerLite/Views/CollectionViewItem.swift

@@ -386,7 +386,7 @@ class CollectionViewItem: NSCollectionViewItem, NSTextFieldDelegate, NSTabViewDe
             guard let safeSelf = self else { return }
             if let safeDev = safeSelf.device {
                 if safeDev.supportRGB {
-                    safeDev.setRGBLightValues(brr: CGFloat(safeDev.brrValue.value) / 100.0, hue: hue, sat: sat)
+                    safeDev.setRGBLightValues(brr: CGFloat(safeDev.brrValue.value) / 100.0, hue: hue, hue360: hue * 360.0, sat: sat)
                 }
             }
         }
@@ -1434,7 +1434,7 @@ class CollectionViewItem: NSCollectionViewItem, NSTextFieldDelegate, NSTabViewDe
                 Logger.debug("brr: \(brr) hue: \(hue) sat: \(sat)")
                 let val = getHSIValuesFromView()
                 let brrValue = brr != nil ? brr! : val.brr
-                let hueVal = CGFloat(hue) / 360.0
+                let hueVal = Double(hue) / 360.0
                 if let wheel = getHSIWheelFromView() {
                     let color = NSColor(calibratedHue: hueVal, saturation: sat, brightness: brrValue, alpha: 1)
                     wheel.setViewColor(color)
@@ -1444,7 +1444,7 @@ class CollectionViewItem: NSCollectionViewItem, NSTextFieldDelegate, NSTabViewDe
                     brrSlide.currentValue = brrValue * brrSlide.maxValue
                     brrSlide.pauseNotify = false
                 }
-                dev.setRGBLightValues(brr: brrValue, hue: hueVal, sat: sat)
+                dev.setRGBLightValues(brr: brrValue, hue: hueVal, hue360: hue, sat: sat)
             }
         }
     }
@@ -1487,7 +1487,7 @@ class CollectionViewItem: NSCollectionViewItem, NSTextFieldDelegate, NSTabViewDe
                         // HSI mode
                         if dev.supportRGB {
                             let val = getHSIValuesFromView()
-                            dev.setRGBLightValues(brr: CGFloat(val.brr) / 100.0, hue: val.hue, sat: val.sat)
+                            dev.setRGBLightValues(brr: CGFloat(val.brr) / 100.0, hue: val.hue, hue360: val.hue * 360.0, sat: val.sat)
                         }
                     } else if idf == TabId.scene.rawValue || tabViewItem?.label == "FX" {
                         // scene mode

NeewerLite/NeewerLiteTests/NeewerLiteTests.swift

@@ -110,6 +110,11 @@ class NeewerLiteTests: XCTestCase {
         XCTAssertEqual(name.projectName, "RGB176 A1")
         XCTAssertEqual(NeewerLightConstant.getLightType(nickName: name.nickName, str: "", projectName: name.projectName), 20, "")
 
+        name = NeewerLightConstant.getLightNames(rawName: "NEEWER-RGB176", identifier: "DEE0BA8C-D9B4-B7DB-0FD2-F0CC23BACB1C")
+        XCTAssertEqual(name.nickName, "RGB176-BACB1C")
+        XCTAssertEqual(name.projectName, "RGB176")
+        XCTAssertEqual(NeewerLightConstant.getLightType(nickName: name.nickName, str: "", projectName: name.projectName), 5, "")
+
         name = NeewerLightConstant.getLightNames(rawName: "NEEWER-RGB530", identifier: "DEE0BA8C-D9B4-B7DB-0FD2-2531C7E4B053")
         XCTAssertEqual(name.nickName, "RGB530-E4B053")
         XCTAssertEqual(name.projectName, "RGB530")