Added support for 128x64

.gitignore

@@ -1 +1,2 @@
 __pycache__
+/.vs

README.md

@@ -1,7 +1,7 @@
 I2C OLED Controller for Raspberry Pi
 ====================================
 
-Python library to enable 128x32 pixel OLED for Raspberry Pi (both 32 and 64-bit) that utilize the SSD1306 chipset. This works as a standalone service and can run on a standard Raspberry Pi running Raspian.
+Python library to enable 128x32 or 64 pixel OLED for Raspberry Pi (both 32 and 64-bit) that utilize the SSD1306 chipset. This works as a standalone service and can run on a standard Raspberry Pi running Raspian.
 
 **This addon leverages the original [Adafruit Python SSD1306](https://github.com/adafruit/Adafruit_Python_SSD1306) and [GPIO](https://github.com/adafruit/Adafruit_Python_GPIO) libraries, which have been deprecated. However, I have taken the nessassary parts out of this and bundled them into this I2C module avoiding the need for GPIO and relying on the Raspberry Pi's I2C setup.**
 
@@ -14,11 +14,13 @@ Python library to enable 128x32 pixel OLED for Raspberry Pi (both 32 and 64-bit)
 
 ## Some Teaser Screenshots
 
-| Welcome | HA Splash | CPU | Memory | Storage | Network | Exit Screen |
-|-----------|-----------|-----------|-----------|---------------|---------------|---------------|
-| ![Welcome][welcome-url] | ![Splash][splash-url] | ![CPU Stats][cpu-stats-url] | ![RAM Stats][ram-stats-url] | ![Storage Stats][storage-stats-url] | ![Network Stats][network-stats-url] | ![Exit][exit-url] |
+| Welcome | HA Splash | CPU | Memory | Storage | Network | Exit Screen |Stats Screen* |
+|-----------|-----------|-----------|-----------|---------------|---------------|---------------|---------------|
+| ![Welcome][welcome-url] | ![Splash][splash-url] | ![CPU Stats][cpu-stats-url] | ![RAM Stats][ram-stats-url] | ![Storage Stats][storage-stats-url] | ![Network Stats][network-stats-url] | ![Exit][exit-url] | ![Stats][stats-url] |
 |  | | ![CPU Stats][cpu-stats-url-icon] | ![RAM Stats][ram-stats-url-icon] | ![Storage Stats][storage-stats-url-icon] | ![Network Stats][network-stats-url-icon] | |
-|  | | ![CPU Stats][cpu-stats-url-compact] | ![RAM Stats][ram-stats-url-compact] | ![Storage Stats][storage-stats-url-compact] | ![Network Stats][network-stats-url-compact] | |
+|  | | ![CPU Stats][cpu-stats-url-compact] | ![RAM Stats][ram-stats-url-compact] | ![Storage Stats][storage-stats-url-compact] | ![Network Stats][network-stats-url-compact] | ![Stats][stats-url] |
+
+*Stats screen designed for 128x64 displays only
 
 ## Custom Screen & Static Text Variables
 
@@ -41,8 +43,9 @@ The following variables are supported
 | {datetime}             | Displays the current datetime based on the defined format specified in the ```DateTime_Format``` config option. |
 | {hostname}             | Displays the current hostname of the host device |
 | {ip}                   | Displays the host device IP |
-| {hassio.info.property} | Fetches a specified property from Home Assistants supervisor API (e.g. http://supervisor/os/info). You can state the namespace and property which will populate with the responding value. This must be fixed with hassio first, followed by the namespace (e.g. os, network etc), then the property e.g. hassio.os.latest_version will call http://supervisor/os/info and display the ```latest_version``` value. |
+| {hassio.info.property}* | Fetches a specified property from Home Assistants supervisor API (e.g. http://supervisor/os/info). You can state the namespace and property which will populate with the responding value. This must be fixed with hassio first, followed by the namespace (e.g. os, network etc), then the property e.g. hassio.os.latest_version will call http://supervisor/os/info and display the ```latest_version``` value. |
 
+*Some properties may not be available without setting up the API access in Home Assistant and inputting the supervisor token into configuration. This is not required for the basic screens.
 <br>
 <br>
 
@@ -56,9 +59,13 @@ The Home Assistant add-on that uses this can be accessed from [HomeAssistant_Add
 
 Hardware Setup
 ===============
-You can use 0.91 Inch 128x32 I2C module, as long as it is registered on /dev/i2c-1 which is the Rasperry Pi default.
+You can use 0.91 Inch 128x32 or 64 I2C module, as long as it is registered on /dev/i2c-1 which is the Rasperry Pi default.
 
-I purchased this [MakerHawk I2C OLED Display Module I2C Screen Module 0.91" 128x32 I2C](https://www.amazon.co.uk/gp/product/B07BDFXFRK/ref=ppx_yo_dt_b_asin_title_o07_s00?ie=UTF8&psc=1)
+Testing Hardware
+<br>
+[MakerHawk I2C OLED Display Module I2C Screen Module 0.91" 128X32 I2C](https://amzn.eu/d/cCNIybv)
+<br>
+[128x64 Pixels IIC 3.3V 5V White Character Screen Module](https://a.co/d/cTte8OO)
 
 | Pin | Details            |
 |:---:|--------------------|
@@ -165,6 +172,7 @@ python3 display.py --config /path/to/options.json
 
 | Name                 | Type    | Requirement  | Description                                            | Default             |
 | ---------------------| ------- | ------------ | -------------------------------------------------------| ------------------- |
+| Screen_Size     | string  | **Required** | The size of the screen you want to display. Currently only 128x32 and 128x64 are supported| `32`                 |
 | i2c_bus     | int  | **Required** | I2C bus number. /dev/i2c-[bus number]                  | `1`                 |
 | Temperature_Unit     | string  | **Required** | Display the CPU temperature in C or F                  | `C`                 |
 | Rotate     | int  | **Optional** | Rotates the screen by the number of degrees provided counter clockwise around its centre (e.g. 180 displays the screen upside down).     | 0                 |
@@ -264,3 +272,5 @@ I2C](https://www.amazon.co.uk/gp/product/B07BDFXFRK/)
 [ram-stats-url-icon]: /img/examples/icon/memory.png?raw=true
 [storage-stats-url-icon]: /img/examples/icon/storage.png?raw=true
 [network-stats-url-icon]: /img/examples/icon/network.png?raw=true
+
+[stats-url]: /img/examples/stats.png?raw=true

bin/Config.py

@@ -16,7 +16,8 @@ class Config:
         'storage',
         'memory',
         'cpu',
-        'static'
+        'static',
+        'stats'
     ]
     HASSIO_DEPENDENT_SCREENS = [
         'Splash'
@@ -38,7 +39,10 @@ class Config:
         'rotate': 'rotate',
         'show_icons': 'show_icons',
         'show_hint': 'show_hint',
-        'compact': 'compact'
+        'compact': 'compact',
+        'supervizor_token': 'supervizor_token',
+        'screen_size': 'screen_size',
+        'icon_stats': 'icon_stats'
     }
 
     logger = logging.getLogger('Config')
@@ -118,17 +122,19 @@ def _init_display(self):
             show_icons = self.get_option_value('show_icons')
             show_hint = self.get_option_value('show_hint')
             compact = self.get_option_value('compact')
+            size = self.get_option_value('screen_size')
+            icon_stats = self.get_option_value('icon_stats')
 
             self.display = Display(busnum=busnum, screenshot=screenshot,
-                                   rotate=rotate, show_icons=show_icons,
+                                   rotate=rotate, size = size, icon_stats=icon_stats, show_icons=show_icons,
                                    show_hint=show_hint, compact=compact)
 
         except Exception as e:
             raise Exception("Could not create display. Check your i2c bus with 'ls /dev/i2c-*'.")
 
     def _init_utils(self):
         if self.is_hassio_supported:
-            self.utils = HassioUtils
+            self.utils = HassioUtils()
         else:
             self.utils = Utils
 

bin/SSD1306.py

@@ -151,6 +151,47 @@ def image(self, image):
     def clear(self):
         """Clear contents of image buffer."""
         self._buffer = [0]*(self.width*self._pages)
+
+class SSD1306_128_64(SSD1306Base):
+    def __init__(self,  busnum=1, i2c_address=SSD1306_I2C_ADDRESS):
+        # Call base class constructor.
+        super(SSD1306_128_64, self).__init__(128, 64, i2c_address, busnum)
+
+    def _initialize(self):
+        # 128x64 pixel specific initialization.
+        self.command(SSD1306_DISPLAYOFF)                    # 0xAE
+        self.command(SSD1306_SETDISPLAYCLOCKDIV)            # 0xD5
+        self.command(0x80)                                  # the suggested ratio 0x80
+        self.command(SSD1306_SETMULTIPLEX)                  # 0xA8
+        self.command(0x3F)
+        self.command(SSD1306_SETDISPLAYOFFSET)              # 0xD3
+        self.command(0x0)                                   # no offset
+        self.command(SSD1306_SETSTARTLINE | 0x0)            # line #0
+        self.command(SSD1306_CHARGEPUMP)                    # 0x8D
+        if self._vccstate == SSD1306_EXTERNALVCC:
+            self.command(0x10)
+        else:
+            self.command(0x14)
+        self.command(SSD1306_MEMORYMODE)                    # 0x20
+        self.command(0x00)                                  # 0x0 act like ks0108
+        self.command(SSD1306_SEGREMAP | 0x1)
+        self.command(SSD1306_COMSCANDEC)
+        self.command(SSD1306_SETCOMPINS)                    # 0xDA
+        self.command(0x12)
+        self.command(SSD1306_SETCONTRAST)                   # 0x81
+        if self._vccstate == SSD1306_EXTERNALVCC:
+            self.command(0x9F)
+        else:
+            self.command(0xCF)
+        self.command(SSD1306_SETPRECHARGE)                  # 0xd9
+        if self._vccstate == SSD1306_EXTERNALVCC:
+            self.command(0x22)
+        else:
+            self.command(0xF1)
+        self.command(SSD1306_SETVCOMDETECT)                 # 0xDB
+        self.command(0x40)
+        self.command(SSD1306_DISPLAYALLON_RESUME)           # 0xA4
+        self.command(SSD1306_NORMALDISPLAY)                 # 0xA6
 
 class SSD1306_128_32(SSD1306Base):
     def __init__(self, busnum=1, i2c_address=SSD1306_I2C_ADDRESS):

bin/Screens.py

@@ -5,22 +5,26 @@
 from PIL import Image, ImageDraw, ImageFont, ImageOps
 
 from bin.Scroller import Scroller
-from bin.SSD1306 import SSD1306_128_32 as SSD1306
-from bin.Utils import Utils
+from bin.SSD1306 import SSD1306_128_64, SSD1306_128_32
+from bin.Utils import Utils, HassioUtils
+
+
 
 
 class Display:
     DEFAULT_BUSNUM = 1
     SCREENSHOT_PATH = "./img/examples/"
 
-    def __init__(self, busnum = None, screenshot = False, rotate = False, show_icons = True,
-                 compact = False, show_hint = False):
+    def __init__(self, busnum = None, screenshot = False, rotate = False, config = None, show_icons = True,
+                 compact = False, show_hint = False, size = '32', icon_stats = 'text'):
         self.logger = logging.getLogger('Display')
 
         if not isinstance(busnum, int):
             busnum = Display.DEFAULT_BUSNUM
-
-        self.display = SSD1306(busnum)
+        if size == '64':
+            self.display = SSD1306_128_64(busnum)
+        else:
+            self.display = SSD1306_128_32(busnum)
         self.clear()
         self.width = self.display.width
         self.height = self.display.height
@@ -29,6 +33,7 @@ def __init__(self, busnum = None, screenshot = False, rotate = False, show_icons
         self.compact = compact
         self.show_icons = show_icons
         self.show_hint = show_hint
+        self.icon_stats = icon_stats
         self.hint_right = True
 
         if self.show_icons and self.show_hint:
@@ -67,8 +72,9 @@ def capture_screenshot(self, name):
             self.image.save(path)
 
 class BaseScreen:
-    font_path = Utils.current_dir + "/fonts/DejaVuSans.ttf"
+    font_path = Utils.current_dir + "/fonts/PixelOperator.ttf"
     font_bold_path = Utils.current_dir + "/fonts/DejaVuSans-Bold.ttf"
+    font_icon = Utils.current_dir + "/fonts/lineawesome-webfont.ttf"
     fonts = {}
 
     def __init__(self, duration, display = Display(), utils = Utils(), config = None):
@@ -180,21 +186,25 @@ def display_hint(self):
        if (len(self.hint) > 2):
            draw.text((x_pos, 18), self.hint[2], font=font, fill=text_fill)
 
-    def font(self, size = None, is_bold = False):
+    def font(self, size = None, is_bold = False, is_icon = False):
         # default to the current screen's font size if none provided
         if not size:
            size = self.font_size
 
         suffix = None
         if is_bold:
             suffix = '_bold'
+        elif is_icon:
+            suffix = '_icon'
 
         key = 'font_{}{}'.format(str(size), suffix)
 
         if key not in BaseScreen.fonts:
             font = BaseScreen.font_path
             if is_bold:
                 font = BaseScreen.font_bold_path
+            elif is_icon:
+                font = BaseScreen.font_icon
 
             font = ImageFont.truetype(font, int(size))
             BaseScreen.fonts[key] = font
@@ -364,14 +374,14 @@ def render(self):
             Home Assistant screen. 
             If you're not using Home Assistant OS, disable this screen in the config
         '''
-        os_info = self.utils.hassos_get_info('os/info')
+        os_info = self.utils.hassos_get_info(self, 'os/info')
         os_version = os_info['data']['version']
         os_upgrade = os_info['data']['update_available']  
 
         if (os_upgrade == True):
             os_version = os_version + "*"
 
-        core_info = self.utils.hassos_get_info('core/info')
+        core_info = self.utils.hassos_get_info(self, 'core/info')
         core_version = core_info['data']['version']  
         core_upgrade = os_info['data']['update_available']
         if (core_upgrade == True):
@@ -502,3 +512,53 @@ def render(self):
 
         self.render_with_defaults()
 
+
+
+class StatsScreen(BaseScreen):
+    def set_temp_unit(self, unit):
+        unit = str(unit).upper()
+        if unit in ['C', 'F']:
+            self.temp_unit = unit
+
+    def get_temp(self):
+        temp =  float(Utils.shell_cmd("cat /sys/class/thermal/thermal_zone0/temp")) / 1000.00
+
+        if (hasattr(self, 'temp_unit') and self.temp_unit == 'F'):
+            temp = "%0.2f °F " % (temp * 9.0 / 5.0 + 32)
+        else:
+            temp = "%0.2f °C " % (temp)
+
+        return temp
+
+    def render(self):
+        self.display.prepare()
+
+        ipv4 = self.utils.get_ip()
+        core_stats = HassioUtils().hassos_get_info('core/stats', self.config)	
+        cpu = core_stats["data"]['cpu_percent']
+        temp = self.get_temp()
+        mem = Utils.shell_cmd("free -m | awk 'NR==2{printf \"Mem: %s/%sMB %.2f%%\", $3,$2,$3*100/$2 }'")
+        storage =  Utils.shell_cmd("df -h | awk '$NF==\"/\"{printf \"Disk: %d/%dGB %s\", $3,$2,$5}'")
+
+        if(self.display.icon_stats == 'text'):
+            self.display.draw.text((0, 0), "IP: " + ipv4, font=self.font(16), fill=255)
+            self.display.draw.text((0, 16), "CPU: " + str(cpu) + "LA", font=self.font(16), fill=255)
+            self.display.draw.text((80, 16), temp, font=self.font(16), fill=255)
+            self.display.draw.text((0, 32), mem, font=self.font(16), fill=255)
+            self.display.draw.text((0, 48), storage, font=self.font(16), fill=255)
+        else:
+            storage =  Utils.shell_cmd("df -h | awk '$NF==\"/\"{printf \"%d/%dGB\", $3,$2}'")
+            mem = Utils.shell_cmd("free -m | awk 'NR==2{printf \"%.2f%%\", $3*100/$2 }'")
+            self.display.draw.text((0, 3), chr(62609), font=self.font(18, is_bold=False, is_icon=True), fill=255)
+            self.display.draw.text((65, 3), chr(62776), font=self.font(18, is_bold=False, is_icon=True), fill=255)
+            self.display.draw.text((0, 23), chr(63426), font=self.font(18, is_bold=False, is_icon=True), fill=255)
+            self.display.draw.text((65, 23), chr(62171), font=self.font(18, is_bold=False, is_icon=True), fill=255)
+            self.display.draw.text((0, 43), chr(61931), font=self.font(18, is_bold=False, is_icon=True), fill=255)
+            self.display.draw.text((19, 3), str(temp), font=self.font(16), fill=255)  
+            self.display.draw.text((87, 3), str(mem), font=self.font(16), fill=255)
+            self.display.draw.text((19, 23), str(storage), font=self.font(16), fill=255)
+            self.display.draw.text((87, 23), str(cpu) + "LA", font=self.font(16), fill=255)
+            self.display.draw.text((19, 43), ipv4, font=self.font(16), fill=255)
+
+        self.display.show()
+        time.sleep(self.duration)

bin/Utils.py

@@ -70,13 +70,18 @@ def slugify(text):
 
 class HassioUtils(Utils):
     @staticmethod
-    def hassos_get_info(type):
+    def hassos_get_info(type, config = None):
         url = 'http://supervisor/{}'.format(type)
         Utils.logger.info("Requesting data from '" + url + "'")
-        cmd = 'curl -sSL -H "Authorization: Bearer $SUPERVISOR_TOKEN" -H "Content-Type: application/json" ' + url
+        token = '$SUPERVISOR_TOKEN'
+        if config is not None:
+            if config.has_option('supervizor_token'):
+                token = config.get_option_value('supervizor_token')
+        cmd = 'curl -sSL -H "Authorization: Bearer ' + token +'" -H "content-type: application/json" ' + url
         info = Utils.shell_cmd(cmd)
         return json.loads(info)
 
+
     @staticmethod
     def get_hostname(opt = ""):
         host_info = HassioUtils.hassos_get_info('host/info')
@@ -98,8 +103,8 @@ def compile_text(text, additional_replacements = {}):
             "{ip}": lambda prop: HassioUtils.get_ip()
         }
         text = Utils.compile_text(text, {**replacements, **additional_replacements})
-        regex = re.compile("{hassio\.[a-z]+\.[a-z\.]+}")
-        return regex.sub(lambda match: HassioUtils.get_hassio_info_property(match.string[match.start():match.end()][len("hassio\."):-1]), text)
+        regex = re.compile("{hassio\\.[a-z]+\\.[a-z\\.]+}")
+        return regex.sub(lambda match: HassioUtils.get_hassio_info_property(match.string[match.start():match.end()][len("hassio\\."):-1]), text)
 
     @staticmethod
     def get_hassio_info_property(properties_string):