diff options
| author | s-ol <s+removethis@s-ol.nu> | 2024-11-26 22:56:15 +0000 |
|---|---|---|
| committer | s-ol <s+removethis@s-ol.nu> | 2024-11-26 23:09:32 +0000 |
| commit | 7f517bfa1329f798cee4591a3a53e836fdf6f5a1 (patch) | |
| tree | 07e840e3dd41764e0b2fdf95355535b141ab753c | |
| parent | simulator: better error tracebacks (diff) | |
| download | firmware-7f517bfa1329f798cee4591a3a53e836fdf6f5a1.tar.gz firmware-7f517bfa1329f798cee4591a3a53e836fdf6f5a1.zip | |
update for colorsys 3.0.0
| -rw-r--r-- | hex33board/core.py | 3 | ||||
| -rw-r--r-- | hex33board/menu.py | 3 | ||||
| -rw-r--r-- | hex33board/rgb.py | 3 | ||||
| -rw-r--r-- | hex33board/util.py | 10 | ||||
| -rw-r--r-- | requirements.txt | 2 |
5 files changed, 16 insertions, 5 deletions
diff --git a/hex33board/core.py b/hex33board/core.py index b333c7d..f0d208e 100644 --- a/hex33board/core.py +++ b/hex33board/core.py @@ -2,11 +2,12 @@ from __future__ import annotations import displayio from micropython import const -from colorsys import hsv_to_rgb from adafruit_ticks import ticks_ms, ticks_diff from adafruit_midi.note_on import NoteOn from adafruit_midi.note_off import NoteOff +from .util import hsv_to_rgb + try: import synthio except: diff --git a/hex33board/menu.py b/hex33board/menu.py index 274529e..0cbd404 100644 --- a/hex33board/menu.py +++ b/hex33board/menu.py @@ -2,12 +2,11 @@ from __future__ import annotations from adafruit_display_text import label from adafruit_display_shapes import rect -from colorsys import hsv_to_rgb import displayio import json import os -from .util import FONT_10, led_map +from .util import FONT_10, led_map, hsv_to_rgb from .core import Mode, Key BLUE = hsv_to_rgb(0.48, 1.0, 1.0) diff --git a/hex33board/rgb.py b/hex33board/rgb.py index 3189a06..2a3bdf8 100644 --- a/hex33board/rgb.py +++ b/hex33board/rgb.py @@ -1,8 +1,9 @@ from __future__ import annotations -from colorsys import hsv_to_rgb from adafruit_ticks import ticks_diff +from .util import hsv_to_rgb + class RGBEffect: keyboard: Keyboard diff --git a/hex33board/util.py b/hex33board/util.py index 45bd18e..6d5b407 100644 --- a/hex33board/util.py +++ b/hex33board/util.py @@ -1,6 +1,7 @@ from __future__ import annotations from adafruit_bitmap_font import bitmap_font +from colorsys import hsv_to_rgb as hsv_to_rgb_float FONT_10 = bitmap_font.load_font("fonts/bitbuntu.pcf") @@ -9,3 +10,12 @@ led_map.extend(range(15, 3, -1)) led_map.extend(range(16, 28)) led_map.extend(range(39, 27, -1)) led_map.extend(range(40, 52)) + + +def hsv_to_rgb(h, s, v): + (r, g, b) = hsv_to_rgb_float(h, s, v) + return ( + int(r * 255), + int(g * 255), + int(b * 255), + ) diff --git a/requirements.txt b/requirements.txt index e68af82..2a19ff3 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,4 +4,4 @@ adafruit_display_text==2.22.3 adafruit_ticks==1.0.9 adafruit_midi==1.4.8 neopixel==6.3.0 -colorsys +colorsys==3.0.0 |