Skip to content

Commit

Permalink
Merge pull request #358 from aceinnolab/hotfix/#357
Browse files Browse the repository at this point in the history 
Hotfix/#357
  • Loading branch information
@aceisace
aceisace authored Jul 5, 2024
2 parents 2965f4f + c45b74a commit 276298c
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 28 deletions.
4 changes: 2 additions & 2 deletions inkycal/display/drivers/10_in_3.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ def display(self, command):
def getbuffer(self, image):
"""ad-hoc"""
image = image.rotate(90, expand=True).transpose(Image.FLIP_LEFT_RIGHT)
image.convert('RGB').save(os.path.join(settings.IMAGE_FOLDER, 'canvas.bmp'), 'BMP')
command = f'sudo {settings.PARALLEL_DRIVER_PATH}/epd -{settings.VCOM} 0 {settings.IMAGE_FOLDER + "canvas.bmp"}'
image.convert("RGB").save(os.path.join(settings.IMAGE_FOLDER, "canvas.bmp"), "BMP")
command = f'sudo {settings.PARALLEL_DRIVER_PATH}/epd -{settings.VCOM} 0 {os.path.join(settings.IMAGE_FOLDER, "canvas.bmp")}'
print(command)
return command

Expand Down
4 changes: 2 additions & 2 deletions inkycal/display/drivers/7_in_8.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ def display(self, command):
def getbuffer(self, image):
"""ad-hoc"""
image = image.rotate(90, expand=True)
image.convert('RGB').save(os.path.join(settings.IMAGE_FOLDER, 'canvas.bmp'), 'BMP')
command = f'sudo {settings.PARALLEL_DRIVER_PATH}/epd -{settings.VCOM} 0 {settings.IMAGE_FOLDER + "canvas.bmp"}'
image.convert("RGB").save(os.path.join(settings.IMAGE_FOLDER, "canvas.bmp"), 'BMP')
command = f'sudo {settings.PARALLEL_DRIVER_PATH}/epd -{settings.VCOM} 0 {os.path.join(settings.IMAGE_FOLDER, "canvas.bmp")}'
print(command)
return command

Expand Down
8 changes: 3 additions & 5 deletions inkycal/display/drivers/9_in_7.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
9.7" driver class
Copyright by aceinnolab
"""
import os
from subprocess import run

from inkycal.settings import Settings
Expand All @@ -10,11 +11,8 @@
EPD_WIDTH = 1200
EPD_HEIGHT = 825


settings = Settings()

command = f'sudo {settings.PARALLEL_DRIVER_PATH}/epd -{settings.VCOM} 0 {settings.IMAGE_FOLDER + "canvas.bmp"}'


class EPD:

Expand All @@ -36,8 +34,8 @@ def display(self, command):
def getbuffer(self, image):
"""ad-hoc"""
image = image.rotate(90, expand=True)
image.convert('RGB').save(settings.IMAGE_FOLDER + 'canvas.bmp', 'BMP')
command = f'sudo {settings.PARALLEL_DRIVER_PATH}/epd -{settings.VCOM} 0 {settings.IMAGE_FOLDER + "canvas.bmp"}'
image.convert("RGB").save(os.path.join(settings.IMAGE_FOLDER, "canvas.bmp"), "BMP")
command = f'sudo {settings.PARALLEL_DRIVER_PATH}/epd -{settings.VCOM} 0 {os.path.join(settings.IMAGE_FOLDER, "canvas.bmp")}'
print(command)
return command

Expand Down
33 changes: 15 additions & 18 deletions inkycal/main.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -137,11 +137,8 @@ def __init__(self, settings_path: str or None = None, render: bool = True, use_p
except:
logger.exception(f"Exception: {traceback.format_exc()}.")

# Path to store images
self.image_folder = settings.IMAGE_FOLDER

# Remove old hashes
self._remove_hashes(self.image_folder)
self._remove_hashes(settings.IMAGE_FOLDER)

# set up cache
if not os.path.exists(os.path.join(settings.CACHE_PATH, CACHE_NAME)):
Expand Down Expand Up @@ -352,11 +349,11 @@ async def run(self, run_once=False):
self._calibration_check()
if self._calibration_state:
# After calibration, we have to forcefully rewrite the screen
self._remove_hashes(self.image_folder)
self._remove_hashes(settings.IMAGE_FOLDER)

if self.supports_colour:
im_black = Image.open(f"{self.image_folder}canvas.png")
im_colour = Image.open(f"{self.image_folder}canvas_colour.png")
im_black = Image.open(os.path.join(settings.IMAGE_FOLDER, "canvas.png"))
im_colour = Image.open(os.path.join(settings.IMAGE_FOLDER, "canvas_colour.png"))

# Flip the image by 180° if required
if self.settings['orientation'] == 180:
Expand All @@ -365,8 +362,8 @@ async def run(self, run_once=False):

# Render the image on the display
if not self.settings.get('image_hash', False) or self._needs_image_update([
(f"{self.image_folder}/canvas.png.hash", im_black),
(f"{self.image_folder}/canvas_colour.png.hash", im_colour)
(f"{settings.IMAGE_FOLDER}/canvas.png.hash", im_black),
(f"{settings.IMAGE_FOLDER}/canvas_colour.png.hash", im_colour)
]):
display.render(im_black, im_colour)

Expand All @@ -379,7 +376,7 @@ async def run(self, run_once=False):
im_black = upside_down(im_black)

if not self.settings.get('image_hash', False) or self._needs_image_update([
(f"{self.image_folder}/canvas.png.hash", im_black), ]):
(f"{settings.IMAGE_FOLDER}/canvas.png.hash", im_black), ]):
display.render(im_black)

logger.info(f'\nNo errors since {self.counter} display updates')
Expand Down Expand Up @@ -415,8 +412,8 @@ def _merge_bands():
returns the merged image
"""

im1_path = os.path.join(settings.image_folder, "canvas.png")
im2_path = os.path.join(settings.image_folder, "canvas_colour.png")
im1_path = os.path.join(settings.IMAGE_FOLDER, "canvas.png")
im2_path = os.path.join(settings.IMAGE_FOLDER, "canvas_colour.png")

# If there is an image for black and colour, merge them
if os.path.exists(im1_path) and os.path.exists(im2_path):
Expand Down Expand Up @@ -454,8 +451,8 @@ def _assemble(self):
for number in range(1, self._module_number):

# get the path of the current module's generated images
im1_path = f"{self.image_folder}module{number}_black.png"
im2_path = f"{self.image_folder}module{number}_colour.png"
im1_path = os.path.join(settings.IMAGE_FOLDER, f"module{number}_black.png")
im2_path = os.path.join(settings.IMAGE_FOLDER, f"module{number}_colour.png")

# Check if there is an image for the black band
if os.path.exists(im1_path):
Expand Down Expand Up @@ -525,8 +522,8 @@ def _assemble(self):
im_black = self._optimize_im(im_black)
im_colour = self._optimize_im(im_colour)

im_black.save(self.image_folder + 'canvas.png', 'PNG')
im_colour.save(self.image_folder + 'canvas_colour.png', 'PNG')
im_black.save(os.path.join(settings.IMAGE_FOLDER, "canvas.png"), "PNG")
im_colour.save(os.path.join(settings.IMAGE_FOLDER, "canvas_colour.png"), 'PNG')

# Additionally, combine the two images with color
def clear_white(img):
Expand Down Expand Up @@ -614,8 +611,8 @@ def process_module(self, number) -> bool or Exception:
black, colour = module.generate_image()
if self.show_border:
draw_border_2(im=black, xy=(1, 1), size=(black.width - 2, black.height - 2), radius=5)
black.save(f"{self.image_folder}module{number}_black.png", "PNG")
colour.save(f"{self.image_folder}module{number}_colour.png", "PNG")
black.save(os.path.join(settings.IMAGE_FOLDER, f"module{number}_black.png"), "PNG")
colour.save(os.path.join(settings.IMAGE_FOLDER, f"module{number}_colour.png"), "PNG")
return True
except Exception:
logger.exception(f"Error in module {number}!")
Expand Down
2 changes: 1 addition & 1 deletion inkycal/settings.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ class Settings:
INKYCAL_LOG_PATH = os.path.join(LOG_PATH, "inkycal.log")
FONT_PATH = os.path.join(basedir, "../fonts")
IMAGE_FOLDER = os.path.join(basedir, "../image_folder")
PARALLEL_DRIVER_PATH = os.path.join(basedir, "inkycal", "display", "drivers", "parallel_drivers")
PARALLEL_DRIVER_PATH = os.path.join(basedir, "display", "drivers", "parallel_drivers")
TEMPORARY_FOLDER = os.path.join(basedir, "tmp")
VCOM = "2.0"

0 comments on commit 276298c

Please sign in to comment.