Abstracted 7-seg displays and fixed colon on big seg

Author: makermelissa

adafruit_ht16k33/segments.py

@@ -325,29 +325,16 @@ def _scroll_marquee(self, text: str, delay: float) -> None:
             self.show()
 
 
-class Seg7x4(Seg14x4):
-    """Numeric 7-segment display. It has the same methods as the alphanumeric display, but only
-    supports displaying a limited set of characters.
-
-    :param I2C i2c: The I2C bus object
-    :param int address: The I2C address for the display
-    :param bool auto_write: True if the display should immediately change when set. If False,
-        `show` must be called explicitly.
-    """
-
+class _AbstractSeg7x4(Seg14x4):
     POSITIONS = (0, 2, 6, 8)  #  The positions of characters.
 
     def __init__(
         self,
         i2c: I2C,
         address: int = 0x70,
-        auto_write: bool = True,
-        char_dict: Optional[Dict[str, int]] = None,
+        auto_write: bool = True
     ) -> None:
         super().__init__(i2c, address, auto_write)
-        # Use colon for controling two-dots indicator at the center (index 0)
-        self._colon = Colon(self)
-        self._chardict = char_dict
 
     def scroll(self, count: int = 1) -> None:
         """Scroll the display by specified number of places.
@@ -430,6 +417,27 @@ def set_digit_raw(self, index: int, bitmask: int) -> None:
         if self._auto_write:
             self.show()
 
+class Seg7x4(_AbstractSeg7x4):
+    """Numeric 7-segment display. It has the same methods as the alphanumeric display, but only
+    supports displaying a limited set of characters.
+
+    :param I2C i2c: The I2C bus object
+    :param int address: The I2C address for the display
+    :param bool auto_write: True if the display should immediately change when set. If False,
+        `show` must be called explicitly.
+    """
+    def __init__(
+        self,
+        i2c: I2C,
+        address: int = 0x70,
+        auto_write: bool = True,
+        char_dict: Optional[Dict[str, int]] = None,
+    ) -> None:
+        super().__init__(i2c, address, auto_write)
+        # Use colon for controling two-dots indicator at the center (index 0)
+        self._colon = Colon(self)
+        self._chardict = char_dict
+
     @property
     def colon(self) -> bool:
         """Simplified colon accessor"""
@@ -440,7 +448,7 @@ def colon(self, turn_on: bool) -> None:
         self._colon[0] = turn_on
 
 
-class BigSeg7x4(Seg7x4):
+class BigSeg7x4(_AbstractSeg7x4):
     """Numeric 7-segment display. It has the same methods as the alphanumeric display, but only
     supports displaying a limited set of characters.
 
@@ -460,7 +468,7 @@ def __init__(
         super().__init__(i2c, address, auto_write)
         # Use colon for controling two-dots indicator at the center (index 0)
         # or the two-dots indicators at the left (index 1)
-        self.colon = Colon(self, 2)
+        self.colons = Colon(self, 2)
         self._chardict = char_dict
 
     def _setindicator(self, index: int, value: bool) -> None:
@@ -514,7 +522,6 @@ def ampm(self) -> bool:
     def ampm(self, value: bool) -> None:
         self._setindicator(3, value)
 
-
 class Colon:
     """Helper class for controlling the colons. Not intended for direct use."""