RomanNum3ral
/
Solaar
mirror of https://github.com/pwr-Solaar/Solaar.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

settings: fix bug in LEDZoneSetting when effect is not implemented

This commit is contained in:
Peter F. Patel-Schneider 2024-03-24 09:40:01 -04:00
parent c81809bd39
commit c8288a6b69
2 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
lib/logitech_receiver/hidpp20.py
View File

@ -909,6 +909,7 @@ class LEDParam:
intensity = "intensity" intensity = "intensity"
ramp = "ramp" ramp = "ramp"
form = "form" form = "form"
saturation = "saturation"
LEDRampChoices = _NamedInts(default=0, yes=1, no=2) LEDRampChoices = _NamedInts(default=0, yes=1, no=2)
@ -920,19 +921,23 @@ LEDParamSize = {
LEDParam.intensity: 1, LEDParam.intensity: 1,
LEDParam.ramp: 1, LEDParam.ramp: 1,
LEDParam.form: 1, LEDParam.form: 1,
LEDParam.saturation: 1,
} }
# not implemented from x8070 Wave=4, Stars=5, Press=6, Audio=7 # not implemented from x8070 Wave=4, Stars=5, Press=6, Audio=7
# not implemented from x8071 Custom=12, Kitt=13, Decomposition=14, FrameActive=15, FramePassive=16, # not implemented from x8071 Custom=12, Kitt=13, HSVPulsing=20, WaveC=22, RippleC=23, SignatureActive=24, SignaturePassive=25
# HSVPulsing=20, CycleC=21, WaveC=22, RippleC=23, SignatureActive=24, SignaturePassive=25
LEDEffects = { LEDEffects = {
0x0: [_NamedInt(0x0, _("Disabled")), {}], 0x00: [_NamedInt(0x00, _("Disabled")), {}],
0x1: [_NamedInt(0x1, _("Static")), {LEDParam.color: 0, LEDParam.ramp: 3}], 0x01: [_NamedInt(0x01, _("Static")), {LEDParam.color: 0, LEDParam.ramp: 3}],
0x2: [_NamedInt(0x2, _("Pulse")), {LEDParam.color: 0, LEDParam.speed: 3}], 0x02: [_NamedInt(0x02, _("Pulse")), {LEDParam.color: 0, LEDParam.speed: 3}],
0x3: [_NamedInt(0x3, _("Cycle")), {LEDParam.period: 5, LEDParam.intensity: 7}], 0x03: [_NamedInt(0x03, _("Cycle")), {LEDParam.period: 5, LEDParam.intensity: 7}],
0x8: [_NamedInt(0x8, _("Boot")), {}], 0x08: [_NamedInt(0x08, _("Boot")), {}],
0x9: [_NamedInt(0x9, _("Demo")), {}], 0x09: [_NamedInt(0x09, _("Demo")), {}],
0xA: [_NamedInt(0xA, _("Breathe")), {LEDParam.color: 0, LEDParam.period: 3, LEDParam.form: 5, LEDParam.intensity: 6}], 0x0A: [_NamedInt(0x0A, _("Breathe")), {LEDParam.color: 0, LEDParam.period: 3, LEDParam.form: 5, LEDParam.intensity: 6}],
0xB: [_NamedInt(0xB, _("Ripple")), {LEDParam.color: 0, LEDParam.period: 4}], 0x0B: [_NamedInt(0x0B, _("Ripple")), {LEDParam.color: 0, LEDParam.period: 4}],
0x0E: [_NamedInt(0x0E, _("Decomposition")), {LEDParam.period: 6, LEDParam.intensity: 8}],
0x0F: [_NamedInt(0x0F, _("Signature1")), {LEDParam.period: 5, LEDParam.intensity: 7}],
0x10: [_NamedInt(0x10, _("Signature2")), {LEDParam.period: 5, LEDParam.intensity: 7}],
0x15: [_NamedInt(0x15, _("CycleS")), {LEDParam.saturation: 1, LEDParam.period: 6, LEDParam.intensity: 8}],
} }

4
lib/logitech_receiver/settings_templates.py
View File

@ -1539,7 +1539,7 @@ class LEDZoneSetting(_Setting):
setting = cls(device, rw, validator) setting = cls(device, rw, validator)
setting.name = cls.name + str(int(zone.location)) setting.name = cls.name + str(int(zone.location))
setting.label = _("LEDs") + " " + str(hidpp20.LEDZoneLocations[zone.location]) setting.label = _("LEDs") + " " + str(hidpp20.LEDZoneLocations[zone.location])
choices = [hidpp20.LEDEffects[e.ID][0] for e in zone.effects] choices = [hidpp20.LEDEffects[e.ID][0] for e in zone.effects if e.ID in hidpp20.LEDEffects]
ID_field = {"name": "ID", "kind": _KIND.choice, "label": None, "choices": choices} ID_field = {"name": "ID", "kind": _KIND.choice, "label": None, "choices": choices}
setting.possible_fields = [ID_field] + cls.possible_fields setting.possible_fields = [ID_field] + cls.possible_fields
setting.fields_map = hidpp20.LEDEffects setting.fields_map = hidpp20.LEDEffects
@ -1578,6 +1578,8 @@ SETTINGS = [
Backlight3, Backlight3,
LEDControl, LEDControl,
LEDZoneSetting, LEDZoneSetting,
RGBControl,
RGBEffectSetting,
BrightnessControl, BrightnessControl,
FnSwap, # simple FnSwap, # simple
NewFnSwap, # simple NewFnSwap, # simple