diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..1800114 --- /dev/null +++ b/.gitignore @@ -0,0 +1,174 @@ +# Byte-compiled / optimized / DLL files +__pycache__/ +*.py[cod] +*$py.class + +# C extensions +*.so + +# Distribution / packaging +.Python +build/ +develop-eggs/ +dist/ +downloads/ +eggs/ +.eggs/ +lib/ +lib64/ +parts/ +sdist/ +var/ +wheels/ +share/python-wheels/ +*.egg-info/ +.installed.cfg +*.egg +MANIFEST + +# PyInstaller +# Usually these files are written by a python script from a template +# before PyInstaller builds the exe, so as to inject date/other infos into it. +*.manifest +*.spec + +# Installer logs +pip-log.txt +pip-delete-this-directory.txt + +# Unit test / coverage reports +htmlcov/ +.tox/ +.nox/ +.coverage +.coverage.* +.cache +nosetests.xml +coverage.xml +*.cover +*.py,cover +.hypothesis/ +.pytest_cache/ +cover/ + +# Translations +*.mo +*.pot + +# Django stuff: +*.log +local_settings.py +db.sqlite3 +db.sqlite3-journal + +# Flask stuff: +instance/ +.webassets-cache + +# Scrapy stuff: +.scrapy + +# Sphinx documentation +docs/_build/ + +# PyBuilder +.pybuilder/ +target/ + +# Jupyter Notebook +.ipynb_checkpoints + +# IPython +profile_default/ +ipython_config.py + +# pyenv +# For a library or package, you might want to ignore these files since the code is +# intended to run in multiple environments; otherwise, check them in: +# .python-version + +# pipenv +# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control. +# However, in case of collaboration, if having platform-specific dependencies or dependencies +# having no cross-platform support, pipenv may install dependencies that don't work, or not +# install all needed dependencies. +#Pipfile.lock + +# UV +# Similar to Pipfile.lock, it is generally recommended to include uv.lock in version control. +# This is especially recommended for binary packages to ensure reproducibility, and is more +# commonly ignored for libraries. +#uv.lock + +# poetry +# Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control. +# This is especially recommended for binary packages to ensure reproducibility, and is more +# commonly ignored for libraries. +# https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control +#poetry.lock + +# pdm +# Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control. +#pdm.lock +# pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it +# in version control. +# https://pdm.fming.dev/latest/usage/project/#working-with-version-control +.pdm.toml +.pdm-python +.pdm-build/ + +# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm +__pypackages__/ + +# Celery stuff +celerybeat-schedule +celerybeat.pid + +# SageMath parsed files +*.sage.py + +# Environments +.env +.venv +env/ +venv/ +ENV/ +env.bak/ +venv.bak/ + +# Spyder project settings +.spyderproject +.spyproject + +# Rope project settings +.ropeproject + +# mkdocs documentation +/site + +# mypy +.mypy_cache/ +.dmypy.json +dmypy.json + +# Pyre type checker +.pyre/ + +# pytype static type analyzer +.pytype/ + +# Cython debug symbols +cython_debug/ + +# PyCharm +# JetBrains specific template is maintained in a separate JetBrains.gitignore that can +# be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore +# and can be added to the global gitignore or merged into this file. For a more nuclear +# option (not recommended) you can uncomment the following to ignore the entire idea folder. +#.idea/ + +# Ruff stuff: +.ruff_cache/ + +# PyPI configuration file +.pypirc \ No newline at end of file diff --git a/assets/test.bmp b/assets/test.bmp new file mode 100644 index 0000000..f63723c Binary files /dev/null and b/assets/test.bmp differ diff --git a/display/display.py b/display/display.py index 81951f9..a288e5f 100644 --- a/display/display.py +++ b/display/display.py @@ -23,13 +23,13 @@ class DisplayHelper: # Updates the display with the grayscale and red images # start displaying on eink display # self.epd.clear() - self.epd.display(img) + self.epd.display(self.epd.getbuffer(img)) self.logger.info('E-Ink display update complete.') def calibrate(self, cycles=1): # Calibrates the display to prevent ghosting - white = Image.new('1', (self.screenwidth, self.screenheight), 'white') - black = Image.new('1', (self.screenwidth, self.screenheight), 'black') + white = Image.new('1', (self.epd.screenwidth, self.screenheight), 255) + black = Image.new('1', (self.screenwidth, self.screenheight), 0) for _ in range(cycles): self.epd.display(self.epd.getbuffer(black)) self.epd.display(self.epd.getbuffer(white)) @@ -41,3 +41,8 @@ class DisplayHelper: # send E-Ink display to deep sleep self.epd.sleep() self.logger.info('E-Ink display entered deep sleep.') + + def clear(self): + # clear E-Ink display + self.epd.Clear(0xFF) + self.logger.info('E-Ink display entered deep sleep.') diff --git a/raspagenda.py b/raspagenda.py index 704b466..57f8501 100644 --- a/raspagenda.py +++ b/raspagenda.py @@ -15,6 +15,8 @@ import sys from display.display import DisplayHelper import json import logging +from PIL import Image,ImageDraw,ImageFont +import time def main(): @@ -30,11 +32,29 @@ def main(): imageHeight = config['imageHeight'] # Height of image to be generated for display. rotateAngle = config['rotateAngle'] # If image is rendered in portrait orientation, angle to rotate to fit screen - print(config) - displayService = DisplayHelper(screenWidth, screenHeight) - displayService.calibrate(cycles=1) # to calibrate in production - displayService.sleep() # go to sleep + if isDisplayConected: + from display.display import DisplayHelper + + displayService = DisplayHelper(screenWidth, screenHeight) + + image = Image.open('assets/test.bmp') + draw = ImageDraw.Draw(image) + draw.rectangle([(0,0),(50,50)],outline = 0) + draw.rectangle([(55,0),(100,50)],fill = 0) + draw.line([(0,0),(50,50)], fill = 0,width = 1) + draw.line([(0,50),(50,0)], fill = 0,width = 1) + draw.chord((10, 60, 50, 100), 0, 360, fill = 0) + draw.ellipse((55, 60, 95, 100), outline = 0) + draw.pieslice((55, 60, 95, 100), 90, 180, outline = 0) + draw.pieslice((55, 60, 95, 100), 270, 360, fill = 0) + draw.polygon([(110,0),(110,50),(150,25)],outline = 0) + draw.polygon([(190,0),(190,50),(150,25)],fill = 0) + + + displayService.update(image) # go to sleep + displayService.clear() + displayService.sleep() # go to sleep if __name__ == "__main__":