iicd/Inkycal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixing some issues with 9.7" E-Paper displays

Browse Source 
test() saves assembled images now.
If the 9.7" E-Paper is selected, the images are now flipped correctly.
This commit is contained in:
Ace 2020-11-25 14:24:29 +01:00
parent 578f48d24d
commit bcc512d1cc
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
inkycal/display/display.py
View File

@ -84,10 +84,6 @@ class Display:
if self.supports_colour == False: if self.supports_colour == False:
print('Initialising..', end = '') print('Initialising..', end = '')
epaper.init() epaper.init()
# For the 9.7" ePaper, the image needs to be flipped by 90 deg first
# The other displays flip the image automatically
if self.model_name == "9_in_7":
im_black.rotate(90, expand=True)
print('Updating display......', end = '') print('Updating display......', end = '')
epaper.display(epaper.getbuffer(im_black)) epaper.display(epaper.getbuffer(im_black))
print('Done') print('Done')

16
inkycal/main.py
View File

@ -64,7 +64,7 @@ class Inkycal:
# Check if render was set correctly # Check if render was set correctly
if render not in [True, False]: if render not in [True, False]:
raise Exception('render must be True or False, not "{}"'.format(render)) raise Exception(f'render must be True or False, not "{render}"')
self.render = render self.render = render
# load settings file - throw an error if file could not be found # load settings file - throw an error if file could not be found
@ -182,6 +182,9 @@ class Inkycal:
# store module numbers in here # store module numbers in here
errors = [] errors = []
# short info for info-section
self.info = f"{arrow.now().format('D MMM @ HH:mm')} "
for number in range(1, self._module_number): for number in range(1, self._module_number):
name = eval(f"self.module_{number}.name") name = eval(f"self.module_{number}.name")
generate_im = f'black,colour=self.module_{number}.generate_image()' generate_im = f'black,colour=self.module_{number}.generate_image()'
@ -193,8 +196,10 @@ class Inkycal:
print(f'generating image(s) for {name}...') print(f'generating image(s) for {name}...')
try: try:
exec(full_command) exec(full_command)
self.info += f"module {number}: OK "
except Exception as Error: except Exception as Error:
errors.append(number) errors.append(number)
self.info += f"module {number}: Error! "
print('Error!') print('Error!')
print(traceback.format_exc()) print(traceback.format_exc())
@ -202,6 +207,8 @@ class Inkycal:
print('Error/s in modules:',*errors) print('Error/s in modules:',*errors)
del errors del errors
self._assemble()
def run(self): def run(self):
"""Runs main programm in nonstop mode. """Runs main programm in nonstop mode.
@ -423,6 +430,13 @@ class Inkycal:
im_black = self._optimize_im(im_black) im_black = self._optimize_im(im_black)
im_colour = self._optimize_im(im_colour) im_colour = self._optimize_im(im_colour)
# For the 9.7" ePaper, the image needs to be flipped by 90 deg first
# The other displays flip the image automatically
if self.settings["model"] == "9_in_7":
print('flipping images for 9.7" epaper')
im_black = im_black.rotate(90, expand=True)
im_colour = im_colour.rotate(90, expand=True)
im_black.save(self.image_folder+'/canvas.png', 'PNG') im_black.save(self.image_folder+'/canvas.png', 'PNG')
im_colour.save(self.image_folder+'/canvas_colour.png', 'PNG') im_colour.save(self.image_folder+'/canvas_colour.png', 'PNG')