Skip to content

Commit 48427e0

Browse files
authored
Merge pull request #55 from grandinquisitor/main
Correct math on fade time
2 parents 9f1202c + eaddff7 commit 48427e0

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

adafruit_is31fl3731/__init__.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -244,9 +244,9 @@ def fade(
244244
default), the breath feature is used for fading. if fade_in is None, then
245245
fade_in = fade_out. If fade_out is None, then fade_out = fade_in
246246
247-
:param fade_in: int positive number; 0->100
248-
:param fade-out: int positive number; 0->100
249-
:param pause: int breath register 2 pause value
247+
:param fade_in: fade time in ms, range = 26 to 3328
248+
:param fade-out: fade time in ms, range = 26 to 3328
249+
:param pause: pause time in ms, range = 3.5 to 448
250250
"""
251251
if fade_in is None and fade_out is None:
252252
self._register(_CONFIG_BANK, _BREATH2_REGISTER, 0)
@@ -261,13 +261,14 @@ def fade(
261261
if fade_out != 0:
262262
fade_out = int(math.log(fade_out / 26, 2))
263263
if pause != 0:
264-
pause = int(math.log(pause / 26, 2))
264+
pause = int(math.log(pause / 3.5, 2))
265265
if not 0 <= fade_in <= 7:
266266
raise ValueError("Fade in out of range")
267267
if not 0 <= fade_out <= 7:
268268
raise ValueError("Fade out out of range")
269269
if not 0 <= pause <= 7:
270270
raise ValueError("Pause out of range")
271+
271272
self._register(_CONFIG_BANK, _BREATH1_REGISTER, fade_out << 4 | fade_in)
272273
self._register(_CONFIG_BANK, _BREATH2_REGISTER, 1 << 4 | pause)
273274

0 commit comments

Comments
 (0)