From 1dedc3da9dc4a82248c64c3a5bf3cba5e330cfcb Mon Sep 17 00:00:00 2001 From: sommersoft Date: Thu, 14 Jun 2018 16:53:35 -0500 Subject: [PATCH 1/2] fix rate and brightness value checks to catch negative values --- adafruit_trellis.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/adafruit_trellis.py b/adafruit_trellis.py index d1350d7..fde66db 100644 --- a/adafruit_trellis.py +++ b/adafruit_trellis.py @@ -172,7 +172,7 @@ def blink_rate(self): @blink_rate.setter def blink_rate(self, rate): - if 0 < rate > 3: + if not 0 < rate > 3: raise ValueError('Blink rate must be an integer in the range: 0-3') rate = rate & 0x03 self._blink_rate = rate @@ -188,7 +188,7 @@ def brightness(self): @brightness.setter def brightness(self, brightness): - if 0 < brightness > 15: + if not 0 < brightness > 15: raise ValueError('Brightness must be an integer in the range: 0-15') brightness = brightness & 0x0F self._brightness = brightness From a00df838e5dea90fc1fd710f124247585cf7850e Mon Sep 17 00:00:00 2001 From: sommersoft Date: Thu, 14 Jun 2018 17:50:01 -0500 Subject: [PATCH 2/2] review fixes; tested both with the full range of values. catches below and above range as errors. --- adafruit_trellis.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/adafruit_trellis.py b/adafruit_trellis.py index fde66db..f2a2180 100644 --- a/adafruit_trellis.py +++ b/adafruit_trellis.py @@ -172,7 +172,7 @@ def blink_rate(self): @blink_rate.setter def blink_rate(self, rate): - if not 0 < rate > 3: + if not 0 <= rate <= 3: raise ValueError('Blink rate must be an integer in the range: 0-3') rate = rate & 0x03 self._blink_rate = rate @@ -188,7 +188,7 @@ def brightness(self): @brightness.setter def brightness(self, brightness): - if not 0 < brightness > 15: + if not 0 <= brightness <= 15: raise ValueError('Brightness must be an integer in the range: 0-15') brightness = brightness & 0x0F self._brightness = brightness