diff --git a/assets/fonts/Better VCR 9.0.1.ttf b/assets/fonts/Better VCR 9.0.1.ttf new file mode 100644 index 0000000..2d0c9f9 Binary files /dev/null and b/assets/fonts/Better VCR 9.0.1.ttf differ diff --git a/assets/fonts/pixel_operator/LICENSE.txt b/assets/fonts/pixel_operator/LICENSE.txt new file mode 100644 index 0000000..354f1e0 --- /dev/null +++ b/assets/fonts/pixel_operator/LICENSE.txt @@ -0,0 +1,121 @@ +Creative Commons Legal Code + +CC0 1.0 Universal + + CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE + LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN + ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS + INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES + REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS + PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM + THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED + HEREUNDER. + +Statement of Purpose + +The laws of most jurisdictions throughout the world automatically confer +exclusive Copyright and Related Rights (defined below) upon the creator +and subsequent owner(s) (each and all, an "owner") of an original work of +authorship and/or a database (each, a "Work"). + +Certain owners wish to permanently relinquish those rights to a Work for +the purpose of contributing to a commons of creative, cultural and +scientific works ("Commons") that the public can reliably and without fear +of later claims of infringement build upon, modify, incorporate in other +works, reuse and redistribute as freely as possible in any form whatsoever +and for any purposes, including without limitation commercial purposes. +These owners may contribute to the Commons to promote the ideal of a free +culture and the further production of creative, cultural and scientific +works, or to gain reputation or greater distribution for their Work in +part through the use and efforts of others. + +For these and/or other purposes and motivations, and without any +expectation of additional consideration or compensation, the person +associating CC0 with a Work (the "Affirmer"), to the extent that he or she +is an owner of Copyright and Related Rights in the Work, voluntarily +elects to apply CC0 to the Work and publicly distribute the Work under its +terms, with knowledge of his or her Copyright and Related Rights in the +Work and the meaning and intended legal effect of CC0 on those rights. + +1. Copyright and Related Rights. A Work made available under CC0 may be +protected by copyright and related or neighboring rights ("Copyright and +Related Rights"). Copyright and Related Rights include, but are not +limited to, the following: + + i. the right to reproduce, adapt, distribute, perform, display, + communicate, and translate a Work; + ii. moral rights retained by the original author(s) and/or performer(s); +iii. publicity and privacy rights pertaining to a person's image or + likeness depicted in a Work; + iv. rights protecting against unfair competition in regards to a Work, + subject to the limitations in paragraph 4(a), below; + v. rights protecting the extraction, dissemination, use and reuse of data + in a Work; + vi. database rights (such as those arising under Directive 96/9/EC of the + European Parliament and of the Council of 11 March 1996 on the legal + protection of databases, and under any national implementation + thereof, including any amended or successor version of such + directive); and +vii. other similar, equivalent or corresponding rights throughout the + world based on applicable law or treaty, and any national + implementations thereof. + +2. Waiver. To the greatest extent permitted by, but not in contravention +of, applicable law, Affirmer hereby overtly, fully, permanently, +irrevocably and unconditionally waives, abandons, and surrenders all of +Affirmer's Copyright and Related Rights and associated claims and causes +of action, whether now known or unknown (including existing as well as +future claims and causes of action), in the Work (i) in all territories +worldwide, (ii) for the maximum duration provided by applicable law or +treaty (including future time extensions), (iii) in any current or future +medium and for any number of copies, and (iv) for any purpose whatsoever, +including without limitation commercial, advertising or promotional +purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each +member of the public at large and to the detriment of Affirmer's heirs and +successors, fully intending that such Waiver shall not be subject to +revocation, rescission, cancellation, termination, or any other legal or +equitable action to disrupt the quiet enjoyment of the Work by the public +as contemplated by Affirmer's express Statement of Purpose. + +3. Public License Fallback. Should any part of the Waiver for any reason +be judged legally invalid or ineffective under applicable law, then the +Waiver shall be preserved to the maximum extent permitted taking into +account Affirmer's express Statement of Purpose. In addition, to the +extent the Waiver is so judged Affirmer hereby grants to each affected +person a royalty-free, non transferable, non sublicensable, non exclusive, +irrevocable and unconditional license to exercise Affirmer's Copyright and +Related Rights in the Work (i) in all territories worldwide, (ii) for the +maximum duration provided by applicable law or treaty (including future +time extensions), (iii) in any current or future medium and for any number +of copies, and (iv) for any purpose whatsoever, including without +limitation commercial, advertising or promotional purposes (the +"License"). The License shall be deemed effective as of the date CC0 was +applied by Affirmer to the Work. Should any part of the License for any +reason be judged legally invalid or ineffective under applicable law, such +partial invalidity or ineffectiveness shall not invalidate the remainder +of the License, and in such case Affirmer hereby affirms that he or she +will not (i) exercise any of his or her remaining Copyright and Related +Rights in the Work or (ii) assert any associated claims and causes of +action with respect to the Work, in either case contrary to Affirmer's +express Statement of Purpose. + +4. Limitations and Disclaimers. + + a. No trademark or patent rights held by Affirmer are waived, abandoned, + surrendered, licensed or otherwise affected by this document. + b. Affirmer offers the Work as-is and makes no representations or + warranties of any kind concerning the Work, express, implied, + statutory or otherwise, including without limitation warranties of + title, merchantability, fitness for a particular purpose, non + infringement, or the absence of latent or other defects, accuracy, or + the present or absence of errors, whether or not discoverable, all to + the greatest extent permissible under applicable law. + c. Affirmer disclaims responsibility for clearing rights of other persons + that may apply to the Work or any use thereof, including without + limitation any person's Copyright and Related Rights in the Work. + Further, Affirmer disclaims responsibility for obtaining any necessary + consents, permissions or other rights required for any use of the + Work. + d. Affirmer understands and acknowledges that Creative Commons is not a + party to this document and has no duty or obligation with respect to + this CC0 or use of the Work. diff --git a/assets/fonts/pixel_operator/PixelOperator-Bold.ttf b/assets/fonts/pixel_operator/PixelOperator-Bold.ttf new file mode 100644 index 0000000..745734f Binary files /dev/null and b/assets/fonts/pixel_operator/PixelOperator-Bold.ttf differ diff --git a/assets/fonts/pixel_operator/PixelOperator.ttf b/assets/fonts/pixel_operator/PixelOperator.ttf new file mode 100644 index 0000000..34fe947 Binary files /dev/null and b/assets/fonts/pixel_operator/PixelOperator.ttf differ diff --git a/assets/fonts/pixel_operator/PixelOperator8-Bold.ttf b/assets/fonts/pixel_operator/PixelOperator8-Bold.ttf new file mode 100644 index 0000000..10225eb Binary files /dev/null and b/assets/fonts/pixel_operator/PixelOperator8-Bold.ttf differ diff --git a/assets/fonts/pixel_operator/PixelOperator8.ttf b/assets/fonts/pixel_operator/PixelOperator8.ttf new file mode 100644 index 0000000..f9146ac Binary files /dev/null and b/assets/fonts/pixel_operator/PixelOperator8.ttf differ diff --git a/assets/fonts/pixel_operator/PixelOperatorHB.ttf b/assets/fonts/pixel_operator/PixelOperatorHB.ttf new file mode 100644 index 0000000..d63fa39 Binary files /dev/null and b/assets/fonts/pixel_operator/PixelOperatorHB.ttf differ diff --git a/assets/fonts/pixel_operator/PixelOperatorHB8.ttf b/assets/fonts/pixel_operator/PixelOperatorHB8.ttf new file mode 100644 index 0000000..5283cb5 Binary files /dev/null and b/assets/fonts/pixel_operator/PixelOperatorHB8.ttf differ diff --git a/assets/fonts/pixel_operator/PixelOperatorHBSC.ttf b/assets/fonts/pixel_operator/PixelOperatorHBSC.ttf new file mode 100644 index 0000000..b8fa149 Binary files /dev/null and b/assets/fonts/pixel_operator/PixelOperatorHBSC.ttf differ diff --git a/assets/fonts/pixel_operator/PixelOperatorMono-Bold.ttf b/assets/fonts/pixel_operator/PixelOperatorMono-Bold.ttf new file mode 100644 index 0000000..215d4a2 Binary files /dev/null and b/assets/fonts/pixel_operator/PixelOperatorMono-Bold.ttf differ diff --git a/assets/fonts/pixel_operator/PixelOperatorMono.ttf b/assets/fonts/pixel_operator/PixelOperatorMono.ttf new file mode 100644 index 0000000..1c1edcc Binary files /dev/null and b/assets/fonts/pixel_operator/PixelOperatorMono.ttf differ diff --git a/assets/fonts/pixel_operator/PixelOperatorMono8-Bold.ttf b/assets/fonts/pixel_operator/PixelOperatorMono8-Bold.ttf new file mode 100644 index 0000000..fc5b82b Binary files /dev/null and b/assets/fonts/pixel_operator/PixelOperatorMono8-Bold.ttf differ diff --git a/assets/fonts/pixel_operator/PixelOperatorMono8.ttf b/assets/fonts/pixel_operator/PixelOperatorMono8.ttf new file mode 100644 index 0000000..9e871ea Binary files /dev/null and b/assets/fonts/pixel_operator/PixelOperatorMono8.ttf differ diff --git a/assets/fonts/pixel_operator/PixelOperatorMonoHB.ttf b/assets/fonts/pixel_operator/PixelOperatorMonoHB.ttf new file mode 100644 index 0000000..55410fb Binary files /dev/null and b/assets/fonts/pixel_operator/PixelOperatorMonoHB.ttf differ diff --git a/assets/fonts/pixel_operator/PixelOperatorMonoHB8.ttf b/assets/fonts/pixel_operator/PixelOperatorMonoHB8.ttf new file mode 100644 index 0000000..1e10e3b Binary files /dev/null and b/assets/fonts/pixel_operator/PixelOperatorMonoHB8.ttf differ diff --git a/assets/fonts/pixel_operator/PixelOperatorSC-Bold.ttf b/assets/fonts/pixel_operator/PixelOperatorSC-Bold.ttf new file mode 100644 index 0000000..a44caaf Binary files /dev/null and b/assets/fonts/pixel_operator/PixelOperatorSC-Bold.ttf differ diff --git a/assets/fonts/pixel_operator/PixelOperatorSC.ttf b/assets/fonts/pixel_operator/PixelOperatorSC.ttf new file mode 100644 index 0000000..06783f8 Binary files /dev/null and b/assets/fonts/pixel_operator/PixelOperatorSC.ttf differ diff --git a/assets/wavesharefont.ttc b/assets/fonts/wavesharefont.ttc similarity index 100% rename from assets/wavesharefont.ttc rename to assets/fonts/wavesharefont.ttc diff --git a/assets/output.bmp b/assets/output.bmp index a59ea67..869e9de 100644 Binary files a/assets/output.bmp and b/assets/output.bmp differ diff --git a/assets/test-fonts.bmp b/assets/test-fonts.bmp new file mode 100644 index 0000000..345f567 Binary files /dev/null and b/assets/test-fonts.bmp differ diff --git a/assets/test.bmp b/assets/test.bmp deleted file mode 100644 index f63723c..0000000 Binary files a/assets/test.bmp and /dev/null differ diff --git a/assets/test2.bmp b/assets/test2.bmp deleted file mode 100644 index a702753..0000000 Binary files a/assets/test2.bmp and /dev/null differ diff --git a/assets/test3.bmp b/assets/test3.bmp deleted file mode 100644 index 9c8570e..0000000 Binary files a/assets/test3.bmp and /dev/null differ diff --git a/assets/test4.bmp b/assets/test4.bmp deleted file mode 100644 index 75792e1..0000000 Binary files a/assets/test4.bmp and /dev/null differ diff --git a/display/__init__.py b/display/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/raspagenda.py b/raspagenda.py index 4018f9d..1643f22 100644 --- a/raspagenda.py +++ b/raspagenda.py @@ -13,7 +13,6 @@ import os import sys -from display.display import DisplayHelper import json import logging from PIL import Image,ImageDraw,ImageFont @@ -45,21 +44,26 @@ def main(): # Drawing on the image font15 = ImageFont.truetype(os.path.join(assets, 'wavesharefont.ttc'), 15) font24 = ImageFont.truetype(os.path.join(assets, 'wavesharefont.ttc'), 24) + font8 = ImageFont.truetype(os.path.join(os.path.join(assets, 'pixel_operator'), 'PixelOperator8.ttf'), 8) + font16 = ImageFont.truetype(os.path.join(os.path.join(assets, 'pixel_operator'), 'PixelOperator.ttf'), 16) + font16_bold = ImageFont.truetype(os.path.join(os.path.join(assets, 'pixel_operator'), 'PixelOperator-Bold.ttf'), 16) + + #image = Image.open('assets/test4.bmp') image = Image.new('1', (imageWidth, imageHeight), 255) # 255: clear the frame draw = ImageDraw.Draw(image) - draw.text((0, 0), time, font = font15, fill = 0) # draw the current time in the top left corner + draw.text((0, 0), time, font = font16_bold, fill = 0) # draw the current time in the top left corner - draw.line([(0,20),(250,20)], fill = 0,width = 2) - draw.line([(125,20),(125,122)], fill = 0,width = 2) + draw.line([(0,16),(250,16)], fill = 0,width = 2) + draw.line([(125,16),(125,122)], fill = 0,width = 2) cal_icon = Image.open(os.path.join(assets, "cal-icon.bmp")) image.paste(cal_icon, (129,24)) - draw.text((160, 26), 'Agenda', font = font15, fill = 0) + draw.text((160, 26), 'Agenda', font = font16_bold, fill = 0) # draw.line([(0,50),(50,0)], fill = 0,width = 1) # draw.chord((10, 60, 50, 100), 0, 360, fill = 0) diff --git a/test/test.py b/test/test.py deleted file mode 100644 index f66f82b..0000000 --- a/test/test.py +++ /dev/null @@ -1 +0,0 @@ -print("ḧello") \ No newline at end of file diff --git a/test/test_fonts.py b/test/test_fonts.py new file mode 100644 index 0000000..d7521fc --- /dev/null +++ b/test/test_fonts.py @@ -0,0 +1,102 @@ +#!/usr/bin python3 +# -*- coding: utf-8 -*- +""" +This project is designed for the WaveShare 12.48" eInk display. Modifications will be needed for other displays, +especially the display drivers and how the image is being rendered on the display. Also, this is the first project that +I posted on GitHub so please go easy on me. There are still many parts of the code (especially with timezone +conversions) that are not tested comprehensively, since my calendar/events are largely based on the timezone I'm in. +There will also be work needed to adjust the calendar rendering for different screen sizes, such as modifying of the +CSS stylesheets in the "render" folder. +""" +import datetime as dt +import os +import sys + + +import json +import logging +from PIL import Image,ImageDraw,ImageFont + + +def main(): + # Basic configuration settings (user replaceable) + # config.json is in the root folder + configFile = open(os.path.join(os.path.dirname(os.path.dirname(os.path.realpath(__file__))), 'config.json')) + config = json.load(configFile) + + + isDisplayConected = config['isDisplayConected'] # set to true when debugging rendering without displaying to screen + screenWidth = config['screenWidth'] # Width of E-Ink display. Default is landscape. Need to rotate image to fit. + screenHeight = config['screenHeight'] # Height of E-Ink display. Default is landscape. Need to rotate image to fit. + imageWidth = config['imageWidth'] # Width of image to be generated for display. + 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 + hourFormat = config['hourFormat'] # The format the hour will be displayed. eg. 13:02 or 01:02 PM + + # Set the hour, this is important to see what time the e-Paper has been syncronized + if hourFormat == "12h": + time = dt.datetime.now().strftime("%I:%M %p") + else: + time = dt.datetime.now().strftime("%H:%M") + + + assets = os.path.join(os.path.dirname(os.path.dirname(os.path.realpath(__file__))), 'assets') + fontsdir = os.path.join(assets, 'fonts') + # Drawing on the image + font15 = ImageFont.truetype(os.path.join(fontsdir, 'wavesharefont.ttc'), 15) + font24 = ImageFont.truetype(os.path.join(fontsdir, 'wavesharefont.ttc'), 24) + + # pixel_operator fonts + font8 = ImageFont.truetype(os.path.join(os.path.join(fontsdir, 'pixel_operator'), 'PixelOperator8.ttf'), 8) + font8_bold = ImageFont.truetype(os.path.join(os.path.join(fontsdir, 'pixel_operator'), 'PixelOperator8-Bold.ttf'), 8) + font16 = ImageFont.truetype(os.path.join(os.path.join(fontsdir, 'pixel_operator'), 'PixelOperator.ttf'), 16) + font16_bold = ImageFont.truetype(os.path.join(os.path.join(fontsdir, 'pixel_operator'), 'PixelOperator-Bold.ttf'), 16) + + font16_2 = ImageFont.truetype(os.path.join(fontsdir, 'Better VCR 9.0.1.ttf'), 16) + font8_2 = ImageFont.truetype(os.path.join(fontsdir, 'Better VCR 9.0.1.ttf'), 12) + + + + image = Image.new('1', (imageWidth, imageHeight), 255) # 255: clear the frame + draw = ImageDraw.Draw(image) + + fonts8 = [font8, font8_bold, font8_2] + fonts16 = [font16, font16_bold, font16_2] + y = 0 + for font in fonts8: + draw.text((0, y), f"Lore Ipso sum {time}", font = font, fill = 0) # draw the current time in the top left corner + y += 12 + if y >= screenHeight: + break + + for font in fonts16: + draw.text((0, y), f"Lore Ipso sum {time}", font = font, fill = 0) # draw the current time in the top left corner + y += 16 + if y >= screenHeight: + break + + + # 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) + # draw.rectangle([(0,0),(50,50)],outline = 0) + + image.save(os.path.join(assets, 'test-fonts.bmp')) + + + + if isDisplayConected: + from display.display import DisplayHelper + + displayService = DisplayHelper(screenWidth, screenHeight) + displayService.update(image.rotate(rotateAngle)) # go to sleep + displayService.clear() + displayService.sleep() # go to sleep + + +if __name__ == "__main__": + main()