From cdb42cc9a7efd43fb53708d27f9243804a574f5a Mon Sep 17 00:00:00 2001 From: Matt Janot-Schuler Date: Fri, 4 Sep 2026 17:33:07 +0000 Subject: [PATCH] Fix CB120B detection: map NW-20230112 to the CB120B profile (type 70) The CB120B advertises as NW-20230112&. getProjectName had no case for 20230112, so the light resolved to an empty project name and fell through to light type 0, which has no database profile. It then received legacy 0x82/0x83 CCT packets (clamped to 3200-5600K) that the light ignores, so only power on/off worked. Database/lights.json has carried a CB120B profile as type 70 since #90, but the CB120B branch in getLightType pointed at type 84, which has no profile. - getProjectName: add 20230112 -> CB120B - getLightType: route CB120B to type 70 (the database profile) - getProjectName(idx): return CB120B for 70 - add a unit test for the NW-20230112 name Verified on hardware: type 70's CCT packet (78 87 05 brr cct 32 00 00 chk) drives a CB120B correctly across 2700-6500K and 0-100%. --- NeewerLite/NeewerLite/Model/NeewerLightConstant.swift | 7 +++++-- NeewerLite/NeewerLiteTests/NeewerLiteTests.swift | 6 ++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/NeewerLite/NeewerLite/Model/NeewerLightConstant.swift b/NeewerLite/NeewerLite/Model/NeewerLightConstant.swift index 864bb0b..a2d70ba 100644 --- a/NeewerLite/NeewerLite/Model/NeewerLightConstant.swift +++ b/NeewerLite/NeewerLite/Model/NeewerLightConstant.swift @@ -160,7 +160,7 @@ class NeewerLightConstant { return "MS150" case 82: return "CB300C" - case 84: + case 70: return "CB120B" case 83: return "AP150C-2" @@ -230,6 +230,8 @@ class NeewerLightConstant { return "FS150 5600K" case "20230064": return "TL60 RGB" + case "20230112": + return "CB120B" default: return "" } @@ -587,7 +589,8 @@ class NeewerLightConstant { return lightType } if nickName.contains("CB120B") { - lightType = 84 + // Database profile is type 70 (Database/lights.json); 84 has no profile. + lightType = 70 return lightType } if nickName.contains("AP150C-2") { diff --git a/NeewerLite/NeewerLiteTests/NeewerLiteTests.swift b/NeewerLite/NeewerLiteTests/NeewerLiteTests.swift index d887bb3..a4cd7e2 100644 --- a/NeewerLite/NeewerLiteTests/NeewerLiteTests.swift +++ b/NeewerLite/NeewerLiteTests/NeewerLiteTests.swift @@ -26,6 +26,12 @@ class NeewerLiteTests: XCTestCase { XCTAssertEqual(name.projectName, "RGB660 PRO") XCTAssertEqual(NeewerLightConstant.getLightType(nickName: name.nickName, rawname: "", projectName: name.projectName), 3, "") + // CB120B advertises as NW-20230112&; must resolve to database profile type 70. + name = NeewerLightConstant.getLightNames(rawName: "NW-20230112&03440600", identifier: "09418809-75CF-237B-661C-622A217457D1") + XCTAssertEqual(name.nickName, "CB120B-7457D1") + XCTAssertEqual(name.projectName, "CB120B") + XCTAssertEqual(NeewerLightConstant.getLightType(nickName: name.nickName, rawname: "NW-20230112&03440600", projectName: name.projectName), 70, "") + name = NeewerLightConstant.getLightNames(rawName: "GR18C-953999", identifier: "DEE0BA8C-D9B4-B7DB-0FD2-2531C7E4B053") XCTAssertEqual(name.nickName, "GR18C-953999-E4B053") XCTAssertEqual(name.projectName, "GR18C-953999")