.github/workflows/update-os.yml

@@ -24,8 +24,7 @@ jobs:
           TINDIE_USERNAME: ${{ secrets.TINDIE_USERNAME }}
         with:
           # Set the base_image to the desired Raspberry Pi OS version
-          # note: version 2023-12-11 seems to have issues with the kernel and gpio
+          base_image: https://downloads.raspberrypi.com/raspios_lite_armhf/images/raspios_lite_armhf-2023-12-11/2023-12-11-raspios-bookworm-armhf-lite.img.xz
-          base_image: https://downloads.raspberrypi.com/raspios_lite_armhf/images/raspios_lite_armhf-2023-05-03/2023-05-03-raspios-bullseye-armhf-lite.img.xz
           image_additional_mb: 3072 # enlarge free space to 3 GB
           optimize_image: true
           commands: |

README.md

@@ -98,7 +98,8 @@ display!**
 
 ## Configuring the Raspberry Pi
 
-Flash Raspberry Pi OS on your microSD card (min. 4GB) with [Raspberry Pi Imager](https://rptl.io/imager). Please use this version of [Raspberry Pi OS - bookworm](https://downloads.raspberrypi.com/raspios_lite_armhf/images/raspios_lite_armhf-2023-05-03/2023-05-03-raspios-bullseye-armhf-lite.img.xz) as the latest release is known to have some issues with the latest kernel update.
+Flash Raspberry Pi OS on your microSD card (min. 4GB) with [Raspberry Pi Imager](https://rptl.io/imager).
+Use the following settings:
 
 | option                    |            value            |
 |:--------------------------|:---------------------------:|

docs/_static/searchtools.js

@@ -178,7 +178,7 @@ const Search = {
 
   htmlToText: (htmlString, anchor) => {
     const htmlElement = new DOMParser().parseFromString(htmlString, 'text/html');
-    for (const removalQuery of [".headerlink", "script", "style"]) {
+    for (const removalQuery of [".headerlinks", "script", "style"]) {
       htmlElement.querySelectorAll(removalQuery).forEach((el) => { el.remove() });
     }
     if (anchor) {
@@ -328,14 +328,13 @@ const Search = {
     for (const [title, foundTitles] of Object.entries(allTitles)) {
       if (title.toLowerCase().trim().includes(queryLower) && (queryLower.length >= title.length/2)) {
         for (const [file, id] of foundTitles) {
-          const score = Math.round(Scorer.title * queryLower.length / title.length);
+          let score = Math.round(100 * queryLower.length / title.length)
-          const boost = titles[file] === title ? 1 : 0;  // add a boost for document titles
           normalResults.push([
             docNames[file],
             titles[file] !== title ? `${titles[file]} > ${title}` : title,
             id !== null ? "#" + id : "",
             null,
-            score + boost,
+            score,
             filenames[file],
           ]);
         }

inkycal/display/drivers/epd_13_in_3.py

@@ -1,527 +0,0 @@
-"""
-* | File        :	  epd13in3k.py
-* | Author      :   Waveshare team
-* | Function    :   Electronic paper driver
-* | Info        :
-*----------------
-* | This version:   V1.0
-* | Date        :   2023-09-08
-# | Info        :   python demo
------------------------------------------------------------------------------
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to  whom the Software is
-furished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS OR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-"""
-
-import logging
-
-from inkycal.display.drivers import epdconfig
-
-# Display resolution
-EPD_WIDTH = 960
-EPD_HEIGHT = 680
-
-GRAY1 = 0xff  # white
-GRAY2 = 0xC0
-GRAY3 = 0x80  # gray
-GRAY4 = 0x00  # Blackest
-
-logger = logging.getLogger(__name__)
-
-
-class EPD:
-    def __init__(self):
-        self.reset_pin = epdconfig.RST_PIN
-        self.dc_pin = epdconfig.DC_PIN
-        self.busy_pin = epdconfig.BUSY_PIN
-        self.cs_pin = epdconfig.CS_PIN
-        self.width = EPD_WIDTH
-        self.height = EPD_HEIGHT
-        self.GRAY1 = GRAY1  # white
-        self.GRAY2 = GRAY2
-        self.GRAY3 = GRAY3  # gray
-        self.GRAY4 = GRAY4  # Blackest
-
-        self.Lut_Partial = [
-            0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x2A, 0x88, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x15, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x01, 0x01, 0x01, 0x00,
-            0x0A, 0x00, 0x05, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x01, 0x01,
-            0x22, 0x22, 0x22, 0x22, 0x22,
-            0x17, 0x41, 0xA8, 0x32, 0x18,
-            0x00, 0x00, ]
-
-        self.LUT_DATA_4Gray = [
-            0x80, 0x48, 0x4A, 0x22, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x0A, 0x48, 0x68, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x88, 0x48, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0xA8, 0x48, 0x45, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x07, 0x23, 0x17, 0x02, 0x00,
-            0x05, 0x01, 0x05, 0x01, 0x02,
-            0x08, 0x02, 0x01, 0x04, 0x04,
-            0x00, 0x02, 0x00, 0x02, 0x01,
-            0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x01,
-            0x22, 0x22, 0x22, 0x22, 0x22,
-            0x17, 0x41, 0xA8, 0x32, 0x30,
-            0x00, 0x00, ]
-
-        if (epdconfig.module_init() != 0):
-            return -1
-
-    # Hardware reset
-    def reset(self):
-        epdconfig.digital_write(self.reset_pin, 1)
-        epdconfig.delay_ms(20)
-        epdconfig.digital_write(self.reset_pin, 0)
-        epdconfig.delay_ms(2)
-        epdconfig.digital_write(self.reset_pin, 1)
-        epdconfig.delay_ms(20)
-
-    def send_command(self, command):
-        epdconfig.digital_write(self.dc_pin, 0)
-        epdconfig.digital_write(self.cs_pin, 0)
-        epdconfig.spi_writebyte([command])
-        epdconfig.digital_write(self.cs_pin, 1)
-
-    def send_data(self, data):
-        epdconfig.digital_write(self.dc_pin, 1)
-        epdconfig.digital_write(self.cs_pin, 0)
-        epdconfig.spi_writebyte([data])
-        epdconfig.digital_write(self.cs_pin, 1)
-
-    def send_data2(self, data):
-        epdconfig.digital_write(self.dc_pin, 1)
-        epdconfig.digital_write(self.cs_pin, 0)
-        epdconfig.SPI.writebytes2(data)
-        epdconfig.digital_write(self.cs_pin, 1)
-
-    def ReadBusy(self):
-        logger.debug("e-Paper busy")
-        busy = epdconfig.digital_read(self.busy_pin)
-        while (busy == 1):
-            busy = epdconfig.digital_read(self.busy_pin)
-            epdconfig.delay_ms(20)
-        epdconfig.delay_ms(20)
-        logger.debug("e-Paper busy release")
-
-    def TurnOnDisplay(self):
-        self.send_command(0x22)  # Display Update Control
-        self.send_data(0xF7)
-        self.send_command(0x20)  # Activate Display Update Sequence
-        self.ReadBusy()
-
-    def TurnOnDisplay_Part(self):
-        self.send_command(0x22)  # Display Update Control
-        self.send_data(0xCF)
-        self.send_command(0x20)  # Activate Display Update Sequence
-        self.ReadBusy()
-
-    def TurnOnDisplay_4GRAY(self):
-        self.send_command(0x22)  # Display Update Control
-        self.send_data(0xC7)
-        self.send_command(0x20)  # Activate Display Update Sequence
-        self.ReadBusy()
-
-    def Lut(self, LUT):
-        self.send_command(0x32)
-        for i in range(105):
-            self.send_data(LUT[i])
-
-        self.send_command(0x03)
-        self.send_data(LUT[105])
-
-        self.send_command(0x04)
-        self.send_data(LUT[106])
-        self.send_data(LUT[107])
-        self.send_data(LUT[108])
-
-        self.send_command(0x2C)
-        self.send_data(LUT[109])
-
-    def init(self):
-
-        # EPD hardware init start
-        self.reset()
-        self.ReadBusy()
-
-        self.send_command(0x12)  # SWRESET
-        self.ReadBusy()
-
-        self.send_command(0x0C)
-        self.send_data(0xAE)
-        self.send_data(0xC7)
-        self.send_data(0xC3)
-        self.send_data(0xC0)
-        self.send_data(0x80)
-
-        self.send_command(0x01)
-        self.send_data(0xA7)
-        self.send_data(0x02)
-        self.send_data(0x00)
-
-        self.send_command(0x11)
-        self.send_data(0x03)
-
-        self.send_command(0x44)
-        self.send_data(0x00)
-        self.send_data(0x00)
-        self.send_data(0xBF)
-        self.send_data(0x03)
-
-        self.send_command(0x45)
-        self.send_data(0x00)
-        self.send_data(0x00)
-        self.send_data(0xA7)
-        self.send_data(0x02)
-
-        self.send_command(0x3C)
-        self.send_data(0x05)
-
-        self.send_command(0x18)
-        self.send_data(0x80)
-
-        self.send_command(0x4E)
-        self.send_data(0x00)
-        self.send_data(0x00)
-
-        self.send_command(0x4F)
-        self.send_data(0x00)
-        self.send_data(0x00)
-
-        # EPD hardware init end
-        return 0
-
-    def init_Part(self):
-        self.reset()
-
-        self.send_command(0x3C)
-        self.send_data(0x80)
-
-        self.Lut(self.Lut_Partial)
-
-        self.send_command(0x37)
-        self.send_data(0x00)
-        self.send_data(0x00)
-        self.send_data(0x00)
-        self.send_data(0x00)
-        self.send_data(0x00)
-        self.send_data(0x40)
-        self.send_data(0x00)
-        self.send_data(0x00)
-        self.send_data(0x00)
-        self.send_data(0x00)
-
-        self.send_command(0x3C)
-        self.send_data(0x80)
-
-        self.send_command(0x22)
-        self.send_data(0xC0)
-        self.send_command(0x20)
-
-        self.ReadBusy()
-
-    def init_4GRAY(self):
-        self.reset()
-
-        self.ReadBusy()
-        self.send_command(0x12)
-        self.ReadBusy()
-
-        self.send_command(0x0C)
-        self.send_data(0xAE)
-        self.send_data(0xC7)
-        self.send_data(0xC3)
-        self.send_data(0xC0)
-        self.send_data(0x80)
-
-        self.send_command(0x01)
-        self.send_data(0xA7)
-        self.send_data(0x02)
-        self.send_data(0x00)
-
-        self.send_command(0x11)
-        self.send_data(0x03)
-
-        self.send_command(0x44)
-        self.send_data(0x00)
-        self.send_data(0x00)
-        self.send_data(0xBF)
-        self.send_data(0x03)
-
-        self.send_command(0x45)
-        self.send_data(0x00)
-        self.send_data(0x00)
-        self.send_data(0xA7)
-        self.send_data(0x02)
-
-        self.send_command(0x3C)
-        self.send_data(0x00)
-
-        self.send_command(0x18)
-        self.send_data(0x80)
-
-        self.send_command(0x4E)
-        self.send_data(0x00)
-        self.send_data(0x00)
-
-        self.send_command(0x4F)
-        self.send_data(0x00)
-        self.send_data(0x00)
-
-        self.Lut(self.LUT_DATA_4Gray)
-
-        self.ReadBusy()
-
-    def getbuffer(self, image):
-        # logger.debug("bufsiz = ",int(self.width/8) * self.height)
-        buf = [0xFF] * (int(self.width / 8) * self.height)
-        image_monocolor = image.convert('1')
-        imwidth, imheight = image_monocolor.size
-        pixels = image_monocolor.load()
-        # logger.debug("imwidth = %d, imheight = %d",imwidth,imheight)
-        if imwidth == self.width and imheight == self.height:
-            logger.debug("Horizontal")
-            for y in range(imheight):
-                for x in range(imwidth):
-                    # Set the bits for the column of pixels at the current position.
-                    if pixels[x, y] == 0:
-                        buf[int((x + y * self.width) / 8)] &= ~(0x80 >> (x % 8))
-        elif imwidth == self.height and imheight == self.width:
-            logger.debug("Vertical")
-            for y in range(imheight):
-                for x in range(imwidth):
-                    newx = y
-                    newy = self.height - x - 1
-                    if pixels[x, y] == 0:
-                        buf[int((newx + newy * self.width) / 8)] &= ~(0x80 >> (y % 8))
-        return buf
-
-    def getbuffer_4Gray(self, image):
-        # logger.debug("bufsiz = ",int(self.width/8) * self.height)
-        buf = [0xFF] * (int(self.width / 4) * self.height)
-        image_monocolor = image.convert('L')
-        imwidth, imheight = image_monocolor.size
-        pixels = image_monocolor.load()
-        i = 0
-        # logger.debug("imwidth = %d, imheight = %d",imwidth,imheight)
-        if (imwidth == self.width and imheight == self.height):
-            logger.debug("Vertical")
-            for y in range(imheight):
-                for x in range(imwidth):
-                    # Set the bits for the column of pixels at the current position.
-                    if (pixels[x, y] == 0xC0):
-                        pixels[x, y] = 0x80
-                    elif (pixels[x, y] == 0x80):
-                        pixels[x, y] = 0x40
-                    i = i + 1
-                    if (i % 4 == 0):
-                        buf[int((x + (y * self.width)) / 4)] = (
-                                (pixels[x - 3, y] & 0xc0) | (pixels[x - 2, y] & 0xc0) >> 2 | (
-                                pixels[x - 1, y] & 0xc0) >> 4 | (pixels[x, y] & 0xc0) >> 6)
-
-        elif (imwidth == self.height and imheight == self.width):
-            logger.debug("Horizontal")
-            for x in range(imwidth):
-                for y in range(imheight):
-                    newx = y
-                    newy = self.height - x - 1
-                    if (pixels[x, y] == 0xC0):
-                        pixels[x, y] = 0x80
-                    elif (pixels[x, y] == 0x80):
-                        pixels[x, y] = 0x40
-                    i = i + 1
-                    if (i % 4 == 0):
-                        buf[int((newx + (newy * self.width)) / 4)] = (
-                                (pixels[x, y - 3] & 0xc0) | (pixels[x, y - 2] & 0xc0) >> 2 | (
-                                pixels[x, y - 1] & 0xc0) >> 4 | (pixels[x, y] & 0xc0) >> 6)
-        return buf
-
-    def Clear(self):
-        buf = [0xFF] * (int(self.width / 8) * self.height)
-        self.send_command(0x24)
-        self.send_data2(buf)
-
-        self.TurnOnDisplay()
-
-    def display(self, image):
-        self.send_command(0x24)
-        self.send_data2(image)
-
-        self.TurnOnDisplay()
-
-    def display_Base(self, image):
-        self.send_command(0x24)
-        self.send_data2(image)
-
-        self.send_command(0x26)
-        self.send_data2(image)
-
-        self.TurnOnDisplay()
-
-    def display_Base_color(self, color):
-        if (self.width % 8 == 0):
-            Width = self.width // 8
-        else:
-            Width = self.width // 8 + 1
-        Height = self.height
-        self.send_command(0x24)  # Write Black and White image to RAM
-        for j in range(Height):
-            for i in range(Width):
-                self.send_data(color)
-
-        self.send_command(0x26)  # Write Black and White image to RAM
-        for j in range(Height):
-            for i in range(Width):
-                self.send_data(color)
-        # self.TurnOnDisplay()
-
-    def display_Partial(self, Image, Xstart, Ystart, Xend, Yend):
-        if ((Xstart % 8 + Xend % 8 == 8 & Xstart % 8 > Xend % 8) | Xstart % 8 + Xend % 8 == 0 | (
-                Xend - Xstart) % 8 == 0):
-            Xstart = Xstart // 8
-            Xend = Xend // 8
-        else:
-            Xstart = Xstart // 8
-            if Xend % 8 == 0:
-                Xend = Xend // 8
-            else:
-                Xend = Xend // 8 + 1
-
-        if (self.width % 8 == 0):
-            Width = self.width // 8
-        else:
-            Width = self.width // 8 + 1
-        Height = self.height
-
-        Xend -= 1
-        Yend -= 1
-
-        self.send_command(0x44)
-        self.send_data((Xstart * 8) & 0xff)
-        self.send_data((Xstart >> 5) & 0x01)
-        self.send_data((Xend * 8) & 0xff)
-        self.send_data((Xend >> 5) & 0x01)
-        self.send_command(0x45)
-        self.send_data(Ystart & 0xff)
-        self.send_data((Ystart >> 8) & 0x01)
-        self.send_data(Yend & 0xff)
-        self.send_data((Yend >> 8) & 0x01)
-
-        self.send_command(0x4E)
-        self.send_data((Xstart * 8) & 0xff)
-        self.send_data((Xstart >> 5) & 0x01)
-        self.send_command(0x4F)
-        self.send_data(Ystart & 0xff)
-        self.send_data((Ystart >> 8) & 0x01)
-
-        self.send_command(0x24)
-        for j in range(Height):
-            for i in range(Width):
-                if ((j > Ystart - 1) & (j < (Yend + 1)) & (i > Xstart - 1) & (i < (Xend + 1))):
-                    self.send_data(Image[i + j * Width])
-        self.TurnOnDisplay_Part()
-
-    def display_4Gray(self, image):
-        self.send_command(0x24)
-        for i in range(0, 81600):
-            temp3 = 0
-            for j in range(0, 2):
-                temp1 = image[i * 2 + j]
-                for k in range(0, 2):
-                    temp2 = temp1 & 0xC0
-                    if (temp2 == 0xC0):
-                        temp3 |= 0x00
-                    elif (temp2 == 0x00):
-                        temp3 |= 0x01
-                    elif (temp2 == 0x80):
-                        temp3 |= 0x01
-                    else:  # 0x40
-                        temp3 |= 0x00
-                    temp3 <<= 1
-
-                    temp1 <<= 2
-                    temp2 = temp1 & 0xC0
-                    if (temp2 == 0xC0):
-                        temp3 |= 0x00
-                    elif (temp2 == 0x00):
-                        temp3 |= 0x01
-                    elif (temp2 == 0x80):
-                        temp3 |= 0x01
-                    else:  # 0x40
-                        temp3 |= 0x00
-                    if (j != 1 or k != 1):
-                        temp3 <<= 1
-                    temp1 <<= 2
-            self.send_data(temp3)
-
-        self.send_command(0x26)
-        for i in range(0, 81600):
-            temp3 = 0
-            for j in range(0, 2):
-                temp1 = image[i * 2 + j]
-                for k in range(0, 2):
-                    temp2 = temp1 & 0xC0
-                    if (temp2 == 0xC0):
-                        temp3 |= 0x00
-                    elif (temp2 == 0x00):
-                        temp3 |= 0x01
-                    elif (temp2 == 0x80):
-                        temp3 |= 0x00
-                    else:  # 0x40
-                        temp3 |= 0x01
-                    temp3 <<= 1
-
-                    temp1 <<= 2
-                    temp2 = temp1 & 0xC0
-                    if (temp2 == 0xC0):
-                        temp3 |= 0x00
-                    elif (temp2 == 0x00):
-                        temp3 |= 0x01
-                    elif (temp2 == 0x80):
-                        temp3 |= 0x00
-                    else:  # 0x40
-                        temp3 |= 0x01
-                    if (j != 1 or k != 1):
-                        temp3 <<= 1
-                    temp1 <<= 2
-            self.send_data(temp3)
-
-        self.TurnOnDisplay_4GRAY()
-
-    def sleep(self):
-        self.send_command(0x10)  # DEEP_SLEEP
-        self.send_data(0x03)
-
-        epdconfig.delay_ms(2000)
-        epdconfig.module_exit()

inkycal/display/drivers/epd_13_in_3_colour.py

@@ -1,299 +0,0 @@
-"""
-* | File        :	  epd13in3b.py
-* | Author      :   Waveshare team
-* | Function    :   Electronic paper driver
-* | Info        :
-*----------------
-* | This version:   V1.0
-* | Date        :   2024-04-08
-# | Info        :   python demo
------------------------------------------------------------------------------
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to  whom the Software is
-furished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS OR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-"""
-
-import logging
-
-from inkycal.display.drivers import epdconfig
-
-# Display resolution
-EPD_WIDTH = 960
-EPD_HEIGHT = 680
-
-GRAY1 = 0xff  # white
-GRAY2 = 0xC0
-GRAY3 = 0x80  # gray
-GRAY4 = 0x00  # Blackest
-
-logger = logging.getLogger(__name__)
-
-
-class EPD:
-    def __init__(self):
-        self.reset_pin = epdconfig.RST_PIN
-        self.dc_pin = epdconfig.DC_PIN
-        self.busy_pin = epdconfig.BUSY_PIN
-        self.cs_pin = epdconfig.CS_PIN
-        self.width = EPD_WIDTH
-        self.height = EPD_HEIGHT
-        if (epdconfig.module_init() != 0):
-            return -1
-
-    # Hardware reset
-    def reset(self):
-        epdconfig.digital_write(self.reset_pin, 1)
-        epdconfig.delay_ms(20)
-        epdconfig.digital_write(self.reset_pin, 0)
-        epdconfig.delay_ms(2)
-        epdconfig.digital_write(self.reset_pin, 1)
-        epdconfig.delay_ms(20)
-
-    def send_command(self, command):
-        epdconfig.digital_write(self.dc_pin, 0)
-        epdconfig.digital_write(self.cs_pin, 0)
-        epdconfig.spi_writebyte([command])
-        epdconfig.digital_write(self.cs_pin, 1)
-
-    def send_data(self, data):
-        epdconfig.digital_write(self.dc_pin, 1)
-        epdconfig.digital_write(self.cs_pin, 0)
-        epdconfig.spi_writebyte([data])
-        epdconfig.digital_write(self.cs_pin, 1)
-
-    def send_data2(self, data):
-        epdconfig.digital_write(self.dc_pin, 1)
-        epdconfig.digital_write(self.cs_pin, 0)
-        epdconfig.SPI.writebytes2(data)
-        epdconfig.digital_write(self.cs_pin, 1)
-
-    def ReadBusy(self):
-        logger.debug("e-Paper busy")
-        busy = epdconfig.digital_read(self.busy_pin)
-        while (busy == 1):
-            busy = epdconfig.digital_read(self.busy_pin)
-            epdconfig.delay_ms(20)
-        epdconfig.delay_ms(20)
-        logger.debug("e-Paper busy release")
-
-    def TurnOnDisplay(self):
-        self.send_command(0x22)  # Display Update Control
-        self.send_data(0xF7)
-        self.send_command(0x20)  # Activate Display Update Sequence
-        self.ReadBusy()
-
-    def TurnOnDisplay_Part(self):
-        self.send_command(0x22)  # Display Update Control
-        self.send_data(0xFF)
-        self.send_command(0x20)  # Activate Display Update Sequence
-        self.ReadBusy()
-
-    def init(self):
-        # EPD hardware init start
-        self.reset()
-        self.ReadBusy()
-
-        self.send_command(0x12)  # SWRESET
-        self.ReadBusy()
-
-        self.send_command(0x0C)
-        self.send_data(0xAE)
-        self.send_data(0xC7)
-        self.send_data(0xC3)
-        self.send_data(0xC0)
-        self.send_data(0x80)
-
-        self.send_command(0x01)
-        self.send_data(0xA7)
-        self.send_data(0x02)
-        self.send_data(0x00)
-
-        self.send_command(0x11)
-        self.send_data(0x03)
-
-        self.send_command(0x44)
-        self.send_data(0x00)
-        self.send_data(0x00)
-        self.send_data(0xBF)
-        self.send_data(0x03)
-
-        self.send_command(0x45)
-        self.send_data(0x00)
-        self.send_data(0x00)
-        self.send_data(0xA7)
-        self.send_data(0x02)
-
-        self.send_command(0x3C)
-        self.send_data(0x01)
-
-        self.send_command(0x18)
-        self.send_data(0x80)
-
-        self.send_command(0x4E)
-        self.send_data(0x00)
-        self.send_data(0x00)
-
-        self.send_command(0x4F)
-        self.send_data(0x00)
-        self.send_data(0x00)
-        self.ReadBusy()
-
-        # EPD hardware init end
-        return 0
-
-    def getbuffer(self, image):
-        # logger.debug("bufsiz = ",int(self.width/8) * self.height)
-        buf = [0xFF] * (int(self.width / 8) * self.height)
-        image_monocolor = image.convert('1')
-        imwidth, imheight = image_monocolor.size
-        pixels = image_monocolor.load()
-        # logger.debug("imwidth = %d, imheight = %d",imwidth,imheight)
-        if imwidth == self.width and imheight == self.height:
-            logger.debug("Horizontal")
-            for y in range(imheight):
-                for x in range(imwidth):
-                    # Set the bits for the column of pixels at the current position.
-                    if pixels[x, y] == 0:
-                        buf[int((x + y * self.width) / 8)] &= ~(0x80 >> (x % 8))
-        elif imwidth == self.height and imheight == self.width:
-            logger.debug("Vertical")
-            for y in range(imheight):
-                for x in range(imwidth):
-                    newx = y
-                    newy = self.height - x - 1
-                    if pixels[x, y] == 0:
-                        buf[int((newx + newy * self.width) / 8)] &= ~(0x80 >> (y % 8))
-        return buf
-
-    def Clear(self):
-        self.send_command(0x24)
-        self.send_data2([0xFF] * (int(self.width / 8) * self.height))
-        self.send_command(0x26)
-        self.send_data2([0x00] * (int(self.width / 8) * self.height))
-
-        self.TurnOnDisplay()
-
-    def Clear_Base(self):
-        self.send_command(0x24)
-        self.send_data2([0xFF] * (int(self.width / 8) * self.height))
-        self.send_command(0x26)
-        self.send_data2([0x00] * (int(self.width / 8) * self.height))
-
-        self.TurnOnDisplay()
-        self.send_command(0x26)
-        self.send_data2([0xFF] * (int(self.width / 8) * self.height))
-
-    def display(self, blackimage, ryimage):
-        if (self.width % 8 == 0):
-            Width = self.width // 8
-        else:
-            Width = self.width // 8 + 1
-        Height = self.height
-        if (blackimage != None):
-            self.send_command(0x24)
-            self.send_data2(blackimage)
-        if (ryimage != None):
-            for j in range(Height):
-                for i in range(Width):
-                    ryimage[i + j * Width] = ~ryimage[i + j * Width]
-            self.send_command(0x26)
-            self.send_data2(ryimage)
-
-        self.TurnOnDisplay()
-
-    def display_Base(self, blackimage, ryimage):
-        if (self.width % 8 == 0):
-            Width = self.width // 8
-        else:
-            Width = self.width // 8 + 1
-        Height = self.height
-        if (blackimage != None):
-            self.send_command(0x24)
-            self.send_data2(blackimage)
-        if (ryimage != None):
-            for j in range(Height):
-                for i in range(Width):
-                    ryimage[i + j * Width] = ~ryimage[i + j * Width]
-            self.send_command(0x26)
-            self.send_data2(ryimage)
-
-        self.TurnOnDisplay()
-
-        self.send_command(0x26)
-        self.send_data2(blackimage)
-
-    def display_Partial(self, Image, Xstart, Ystart, Xend, Yend):
-        if ((Xstart % 8 + Xend % 8 == 8 & Xstart % 8 > Xend % 8) | Xstart % 8 + Xend % 8 == 0 | (
-                Xend - Xstart) % 8 == 0):
-            Xstart = Xstart // 8
-            Xend = Xend // 8
-        else:
-            Xstart = Xstart // 8
-            if Xend % 8 == 0:
-                Xend = Xend // 8
-            else:
-                Xend = Xend // 8 + 1
-
-        if (self.width % 8 == 0):
-            Width = self.width // 8
-        else:
-            Width = self.width // 8 + 1
-        Height = self.height
-
-        Xend -= 1
-        Yend -= 1
-
-        self.send_command(0x3C)
-        self.send_data(0x80)
-
-        self.send_command(0x44)
-        self.send_data((Xstart * 8) & 0xff)
-        self.send_data((Xstart >> 5) & 0x01)
-        self.send_data((Xend * 8) & 0xff)
-        self.send_data((Xend >> 5) & 0x01)
-        self.send_command(0x45)
-        self.send_data(Ystart & 0xff)
-        self.send_data((Ystart >> 8) & 0x01)
-        self.send_data(Yend & 0xff)
-        self.send_data((Yend >> 8) & 0x01)
-
-        self.send_command(0x4E)
-        self.send_data((Xstart * 8) & 0xff)
-        self.send_data((Xstart >> 5) & 0x01)
-        self.send_command(0x4F)
-        self.send_data(Ystart & 0xff)
-        self.send_data((Ystart >> 8) & 0x01)
-
-        self.send_command(0x24)
-        for j in range(Height):
-            for i in range(Width):
-                if ((j > Ystart - 1) & (j < (Yend + 1)) & (i > Xstart - 1) & (i < (Xend + 1))):
-                    self.send_data(Image[i + j * Width])
-        self.TurnOnDisplay_Part()
-
-        self.send_command(0x26)
-        for j in range(Height):
-            for i in range(Width):
-                if ((j > Ystart - 1) & (j < (Yend + 1)) & (i > Xstart - 1) & (i < (Xend + 1))):
-                    self.send_data(Image[i + j * Width])
-
-    def sleep(self):
-        self.send_command(0x10)  # DEEP_SLEEP
-        self.send_data(0x03)
-
-        epdconfig.delay_ms(2000)
-        epdconfig.module_exit()

inkycal/display/supported_models.py

@@ -1,6 +1,4 @@
 supported_models = {
-    "epd_13_in_3": (960, 680),
-    "epd_13_in_3_colour": (960, 680),
     "epd_12_in_48": (1304, 984),
     "epd_7_in_5_colour": (640, 384),
     "9_in_7": (1200, 825),

inkycal/main.py

@@ -6,7 +6,6 @@ Copyright by aceinnolab
 import asyncio
 import glob
 import hashlib
-import os.path
 
 import numpy
 
@@ -73,16 +72,13 @@ class Inkycal:
                     f"No settings.json file could be found in the specified location: {settings_path}")
 
         else:
-            found = False
+            logger.info("Looking for settings.json file in /boot folder...")
-            for location in settings.SETTINGS_JSON_PATHS:
+            try:
-                if os.path.exists(location):
+                with open('/boot/settings.json', mode="r") as settings_file:
-                    logger.info(f"Found settings.json file in {location}")
+                    self.settings = json.load(settings_file)
-                    with open(location, mode="r") as settings_file:
+
-                        self.settings = json.load(settings_file)
+            except FileNotFoundError:
-                    found = True
+                raise SettingsFileNotFoundError
-                    break
-            if not found:
-                raise SettingsFileNotFoundError(f"No settings.json file could be found in {settings.SETTINGS_JSON_PATHS} and no explicit path was specified.")
 
         self.disable_calibration = self.settings.get('disable_calibration', False)
         if self.disable_calibration:

inkycal/modules/inkycal_webshot.py

@@ -8,6 +8,7 @@ from htmlwebshot import WebShot
 from inkycal.custom import *
 from inkycal.modules.inky_image import Inkyimage as Images, image_to_palette
 from inkycal.modules.template import inkycal_module
+from tests import Config
 
 logger = logging.getLogger(__name__)
 
@@ -88,7 +89,7 @@ class Webshot(inkycal_module):
         """Generate image for this module"""
 
         # Create tmp path
-        tmpFolder = "temp"
+        tmpFolder = Config.TEMP_PATH
 
         if not os.path.exists(tmpFolder):
             print(f"Creating tmp directory {tmpFolder}")

inkycal/settings.py

@@ -18,5 +18,3 @@ class Settings:
     PARALLEL_DRIVER_PATH = os.path.join(basedir, "display", "drivers", "parallel_drivers")
     TEMPORARY_FOLDER = os.path.join(basedir, "tmp")
     VCOM = "2.0"
-    # /boot/settings.json is path on older releases, while the latter is more the more recent ones
-    SETTINGS_JSON_PATHS = ["/boot/settings.json", "/boot/firmware/settings.json"]

tests/test_inkycal_weather.py

@@ -30,7 +30,7 @@ tests = [
             "forecast_interval": "daily",
             "units": "metric",
             "hour_format": "12",
-            "use_beaufort": False,
+            "use_beaufort": True,
             "padding_x": 10,
             "padding_y": 10,
             "fontsize": 12,