change to property style access

Author: caternuson

adafruit_ht16k33/ht16k33.py

@@ -48,28 +48,38 @@ def __init__(self, i2c, address=0x70):
         self._write_cmd(_HT16K33_OSCILATOR_ON)
         self._blink_rate = None
         self._brightness = None
-        self.blink_rate(0)
-        self.brightness(15)
+        self.blink_rate = 0
+        self.brightness = 15 
 
     def _write_cmd(self, byte):
         self._temp[0] = byte
         with self.i2c_device:
             self.i2c_device.write(self._temp)
 
+    @property
+    def blink_rate(self):
+        return self._blink_rate
+
+    @blink_rate.setter
     def blink_rate(self, rate=None):
         """The blink rate. Range 0-3."""
-        if rate is None:
-            return self._blink_rate
+        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
         self._write_cmd(_HT16K33_BLINK_CMD |
                         _HT16K33_BLINK_DISPLAYON | rate << 1)
         return None
 
+    @property
+    def brightness(self):
+        return self._brightness
+
+    @brightness.setter
     def brightness(self, brightness):
         """The brightness. Range 0-15."""
-        if brightness is None:
-            return self._brightness
+        if not 0 <= brightness <= 15:
+            raise ValueError('Brightness must be an integer in the range: 0-15')
         brightness = brightness & 0x0F
         self._brightness = brightness
         self._write_cmd(_HT16K33_CMD_BRIGHTNESS | brightness)

adafruit_ht16k33/matrix.py

@@ -42,6 +42,13 @@ def pixel(self, x, y, color=None):
             y += 8
         return super()._pixel(y, x, color)
 
+    def __getitem__(self, key):
+        x, y = key
+        return self.pixel(x, y)
+
+    def __setitem__(self, key, value):
+        x, y = key
+        self.pixel(x, y, value)
 
 class Matrix8x8(HT16K33):
     """A single matrix."""
@@ -54,6 +61,13 @@ def pixel(self, x, y, color=None):
         x = (x - 1) % 8
         return super()._pixel(x, y, color)
 
+    def __getitem__(self, key):
+        x, y = key
+        return self.pixel(x, y)
+
+    def __setitem__(self, key, value):
+        x, y = key
+        self.pixel(x, y, value)
 
 class Matrix8x8x2(HT16K33):
     """A bi-color matrix."""
@@ -70,6 +84,14 @@ def pixel(self, x, y, color=None):
             return super()._pixel(y, x) | super()._pixel(y + 8, x) << 1
         return None
 
+    def __getitem__(self, key):
+        x, y = key
+        return self.pixel(x, y)
+
+    def __setitem__(self, key, value):
+        x, y = key
+        self.pixel(x, y, value)
+
     def fill(self, color):
         """Fill the whole display with the given color."""
         fill1 = 0xff if color & 0x01 else 0x00