Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions Database/lights.json
Original file line number Diff line number Diff line change
Expand Up @@ -1710,6 +1710,10 @@
"cctRange": {
"min": 32,
"max": 56
},
"commandPatterns": {
"power": "{cmdtag} {powertag} {size} {state:uint8:enum(1=on,2=off)} {checksum}",
"cct": "{cmdtag} {ccttag} {size} {brr:uint8:range(0,100)} {cct:uint8:range(32,56)} 0x32 0x00 0x00 {checksum}"
}
},
{
Expand Down Expand Up @@ -1947,6 +1951,26 @@
"newRGBLightCommand": true,
"fxPreset": "fx17_mac"
},
{
"type": 75,
"name": "Neewer FS150C",
"image": "",
"link": "",
"supportRGB": true,
"supportCCTGM": false,
"supportMusic": true,
"support17FX": false,
"support9FX": false,
"cctRange": {
"min": 25,
"max": 75
},
"commandPatterns": {
"power": "{cmdtag} {powertag} {size} {state:uint8:enum(1=on,2=off)} {checksum}",
"cct": "{cmdtag} {ccttag} {size} {brr:uint8:range(0,100)} {cct:uint8:range(25,75)} 0x32 0x00 0x00 {checksum}",
"hsi": "{cmdtag} {hsitag} {size} {hue:uint16_le:range(0,360)} {sat:uint8:range(0,100)} {brr:uint8:range(0,100)} {checksum}"
}
},
{
"type": 87,
"name": "Neewer HS60C",
Expand Down
12 changes: 12 additions & 0 deletions NeewerLite/NeewerLite/Model/NeewerLight.swift
Original file line number Diff line number Diff line change
Expand Up @@ -1148,6 +1148,18 @@ class NeewerLight: NSObject, ObservableNeewerLightProtocol {
public func setBRR100LightValues(_ brr: CGFloat) {
var cmd: Data = Data()
if lightMode == .CCTMode {
// Prefer a pattern-based command if one is available, same as
// setCCTLightValues() and the .HSIMode branch just below. Without
// this check, a brightness-only change (e.g. from a Stream Deck
// dial or the MCP server's set_brightness, which call this
// function directly rather than setCCTLightValues) always fell
// back to the legacy command below even on lights whose working
// command is pattern-based — updating the in-memory value (and
// so the GUI slider) while the light itself ignored the packet.
if findCommandPatternFromDB("cct") != nil {
setCCTLightValues(brr: brr, cct: CGFloat(cctValue.value), gmm: CGFloat(gmmValue.value))
return
}
if supportRGB {
cmd = getCCTLightCommand(brightness: brr, correlatedColorTemperature: CGFloat(cctValue.value))
} else {
Expand Down
2 changes: 2 additions & 0 deletions NeewerLite/NeewerLite/Model/NeewerLightConstant.swift
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,8 @@ class NeewerLightConstant {
return "BH-30S RGB"
case "20230025":
return "RGB1200"
case "20230029":
return "FS150C"
case "20230031":
return "TL120C"
case "20230042":
Expand Down