Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

color_mode is not unpacked to an enum #72

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

color_mode is not unpacked to an enum #72

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9c7df28
color_mode is not unpacked to an enum
trajano May 11, 2024
4dd7301
Handle cases when direction still comes in as garbage
trajano May 11, 2024
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
12 changes: 9 additions & 3 deletions openrgb/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,9 @@ class ModeDirections(IntEnum):


class ModeColors(IntEnum):
"""
Partial list of color_mode values. This is not a comprehensive set so do not use this to unpack.
"""
NONE = 0
PER_LED = 1
MODE_SPECIFIC = 2
Expand Down Expand Up @@ -245,7 +248,7 @@ class ModeData:
speed: Optional[int]
brightness: Optional[int]
direction: Optional[ModeDirections]
color_mode: ModeColors
color_mode: int
colors: Optional[list[RGBColor]]

def validate(self, version: int):
Expand Down Expand Up @@ -329,7 +332,7 @@ def unpack(cls, data: Iterator[int], version: int, index: int = 0) -> ModeData:
else:
brightness = None
direction = parse_var('I', data)
color_mode = ModeColors(parse_var('I', data))
color_mode = parse_var('I', data)
num_colors = parse_var('H', data)

colors = []
Expand All @@ -338,7 +341,10 @@ def unpack(cls, data: Iterator[int], version: int, index: int = 0) -> ModeData:
if (ModeFlags.HAS_DIRECTION_HV in flags
or ModeFlags.HAS_DIRECTION_UD in flags
or ModeFlags.HAS_DIRECTION_LR in flags):
direction = ModeDirections(direction)
try:
direction = ModeDirections(direction)
except ValueError:
direction = None
else:
direction = None
if ModeFlags.HAS_SPEED not in flags:
Expand Down