Old

README.md

@@ -1,100 +1,10 @@
-![alt text](infowindow.jpg)
+I've personalised the project for my own use.
 
+I'm using the HD version of the screen, the existing code did not work for this.
+I've therefore updated to use with the latest drivers 
 
-# Infowindow
-Rapsberry pi powered e-ink display for displaying information in an always on state. There are several other iterations
-of this project online, but they didnt do quite what I wanted them to. This is my version. Also keeping up my python
-skills as they dont get used as much as they used to!
+I've removed the weather functions as these were not useful to me.
 
-The functionality is not meant to be an "end all solution for calendaring and Todo lists" The intent is to provide an
-*always  on* display to show me what is coming up next. I can then check in browser, phone, etc for details and updates
-to the data. In your face reminder.
-<div align="center">
-  <a href="#features">Features</a> |
-  <a href="#installation">Installation</a> | 
-  <a href="#configuration">Configuration</a> | 
-  <a href="#running">Running</a> | 
-</div>
-
-## Features
-* **Calendar**
-  * Google Calendar is the only calendar currently supported
-* **Todo List**
-  * Todoist
-  * Teamwork.com
-* **Weather**
-  * Open Weather Map current data only. Future plan for forecast data.
-
-## Installation
-### Raspberry Pi setup
-Activate SPI on your Raspberry Pi by using the `raspi-config` tool under Interface Options and reboot.
-
-### Get software
-Clone this repo onto your raspberry pi. Does not really matter where it is, but good option is in the `pi` users home
-directory: `/home/pi/InfoWindow`
-
-### Setup python modules
-Run `pip install -r requirements.txt`. This should install all required modules. I stuck to basic standard modules for
-ease of installation.
-
-## Configuration
-You will need to configure a few things such as API Keys and location. Copy config.json-sample to config.json. Edit
-config.json to add your api keys and other information.
-
-## Optional: Increase lifetime of your SD-Card
-If you want to increase the lifetime of the SD-Card, add the following line to `/etc/fstab` and reboot: 
-
-`tmpfs    /tmp    tmpfs    defaults,noatime,nosuid,size=100m    0 0`
-
-With this line, the `/tmp` folder will be held in RAM and will not be written to the SD-Card.
-
-## Optional: Screen saver 
-Always displaying the same colors at the same spots might have some negative effect on your E-Ink screen. To remedy
-this, there is a simple additional script, which displays all three colors on the whole screen: I recommend to let
-this run once every night, i.e. at 1 minute past 5 with:
-* Run `crontab -e`
-* insert `1 5 * * * /usr/bin/python /home/pi/InfoWindow/screensaver.py > /dev/null 2>&1`
-
-### General
-* rotation: 0 - This is the rotation of the display in degrees. Leave at zero if you use it as a desktop display. Change
-to 180 if you have it mounted and hanging from a shelf.
-* timeformat: 12h / 24h
-* charset: utf-8 (or something else). I.e. to get äöü working, use latin1
-
-### Todo (Module)
-Todoist is the current active module in this code. It only requires `api_key`. Teamwork also requires a 'site' key. If
-using google tasks, leave this as null `todo: null`
-* api_key: Enter your todoist API key.
-
-### Weather (Module)
-Open Weather Map is where the data is coming from in the default module. This requires a few keys.
-* api_key: Get your api key from OWM website.
-* city: Look at OWM docs to figure what your city name is. Mine is "Sacramento,US"
-* units: This can either be `imperial` or `metric`
-
-### Google calendar and ToDo list (Modules)
-To use the google APIs, you first have to login to the [google cloud console](https://console.cloud.google.com/apis/).
-In the google cloud console, do the following things:
-1) Create a project and give it a name, i.e. `infowindow` and switch to the context of this project if not already
-   active.
-2) Create a [new oauth consent screen](https://console.cloud.google.com/apis/credentials/consent) (just enter a name
-   should be enough).
-3) Create a [new oauth 2.0 client id](https://console.cloud.google.com/apis/credentials). Choosing type `other` should
-   work just fine. Finally, download the json file provided by the google cloud console and store it in the repo
-   directory (i.e. `/home/pi/InfoWindow/google_secret.json`) on the Raspberry Pi.  
-
-#### Calendar
-There are are additional sections in the config for this module:
-* additional: A list of additional calendar names (summary) to fetch. To use i.e. birthdays, add "Contacts" (also if
-              you use google in german.
-* ignored: A list of events to be removed from the calendar display.
-
-## Running
-### First Run
-You should run the script manually the first time so that Googles auth modules can run interactivly. Once that has
-completed you will want to add this to CRON so it runs every few minutes automatically.
-
-### Cron Run (Normal use)
-* Run `crontab -e`
-* insert `*/6 * * * * /usr/bin/python /home/pi/InfoWindow/infowindow.py --cron` 
+I have added in a todo module to work with "Grocy"
 
+I've left 3 columns each to be used with any todo or calendar app

clearScreen.py

@@ -1,3 +1,24 @@
-from mod_infowindow import infowindow
-iw = infowindow.InfoWindow()
-iw.display()
+#!/usr/bin/python
+# -*- coding:utf-8 -*-
+import sys
+import os
+picdir = os.path.join(os.path.dirname(os.path.dirname(os.path.realpath(__file__))), 'pic')
+libdir = os.path.join(os.path.dirname(os.path.dirname(os.path.realpath(__file__))), 'lib')
+if os.path.exists(libdir):
+    sys.path.append(libdir)
+
+import logging
+from driver import epd7in5b
+import time
+from PIL import Image,ImageDraw,ImageFont
+import traceback
+
+logging.basicConfig(level=logging.DEBUG)
+
+logging.info("epd7in5b_HD Demo")
+
+epd = epd7in5b.EPD()
+
+logging.info("init and Clear")
+epd.init()
+epd.Clear()

config.json-sample

@@ -1,22 +1,22 @@
 {
     "general": {
-        "rotation": 180,
+        "rotation": 0,
         "timeformat": "12h",
-        "charset": "latin1",
+        "charset": "utf-8",
         "cell_spacing": 2
     },
     "todo": {
-        "api_key": "1234"
+        "api_key": ""
     },
     "calendar": {
-        "additional": ["Contacts", "Birthdays"],
-        "ignored": ["Buy ticket!"],
-        "today_text_color": "red",
+        "include": [""],
+        "ignored": [""],
+        "today_text_color": "black",
         "today_background_color": "white"
     },
-    "weather": {
-        "api_key": "1234",
-        "city": "Sacramento,US",
-        "units": "imperial"
+    "grocy": {
+            "api_key": "",
+            "server": "",
+            "port": ""
     }
 }

driver/epd7in5b-old.py

@@ -0,0 +1,212 @@
+##
+ #  @filename   :   epd7in5.py
+ #  @brief      :   Implements for Dual-color e-paper library
+ #  @author     :   Yehui from Waveshare
+ #
+ #  Copyright (C) Waveshare     July 10 2017
+ #
+ # Permission is hereby granted, free of charge, to any person obtaining a copy
+ # of this software and associated documnetation 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 epdif
+from PIL import Image
+import RPi.GPIO as GPIO
+import logging
+
+# Display resolution
+EPD_WIDTH       = 640
+EPD_HEIGHT      = 384
+
+# EPD7IN5 commands
+PANEL_SETTING                               = 0x00
+POWER_SETTING                               = 0x01
+POWER_OFF                                   = 0x02
+POWER_OFF_SEQUENCE_SETTING                  = 0x03
+POWER_ON                                    = 0x04
+POWER_ON_MEASURE                            = 0x05
+BOOSTER_SOFT_START                          = 0x06
+DEEP_SLEEP                                  = 0x07
+DATA_START_TRANSMISSION_1                   = 0x10
+DATA_STOP                                   = 0x11
+DISPLAY_REFRESH                             = 0x12
+IMAGE_PROCESS                               = 0x13
+LUT_FOR_VCOM                                = 0x20
+LUT_BLUE                                    = 0x21
+LUT_WHITE                                   = 0x22
+LUT_GRAY_1                                  = 0x23
+LUT_GRAY_2                                  = 0x24
+LUT_RED_0                                   = 0x25
+LUT_RED_1                                   = 0x26
+LUT_RED_2                                   = 0x27
+LUT_RED_3                                   = 0x28
+LUT_XON                                     = 0x29
+PLL_CONTROL                                 = 0x30
+TEMPERATURE_SENSOR_COMMAND                  = 0x40
+TEMPERATURE_CALIBRATION                     = 0x41
+TEMPERATURE_SENSOR_WRITE                    = 0x42
+TEMPERATURE_SENSOR_READ                     = 0x43
+VCOM_AND_DATA_INTERVAL_SETTING              = 0x50
+LOW_POWER_DETECTION                         = 0x51
+TCON_SETTING                                = 0x60
+TCON_RESOLUTION                             = 0x61
+SPI_FLASH_CONTROL                           = 0x65
+REVISION                                    = 0x70
+GET_STATUS                                  = 0x71
+AUTO_MEASUREMENT_VCOM                       = 0x80
+READ_VCOM_VALUE                             = 0x81
+VCM_DC_SETTING                              = 0x82
+
+class EPD:
+    def __init__(self):
+        self.reset_pin = epdif.RST_PIN
+        self.dc_pin = epdif.DC_PIN
+        self.busy_pin = epdif.BUSY_PIN
+        self.width = EPD_WIDTH
+        self.height = EPD_HEIGHT
+
+    def digital_write(self, pin, value):
+        epdif.epd_digital_write(pin, value)
+
+    def digital_read(self, pin):
+        return epdif.epd_digital_read(pin)
+
+    def delay_ms(self, delaytime):
+        epdif.epd_delay_ms(delaytime)
+
+    def send_command(self, command):
+        self.digital_write(self.dc_pin, GPIO.LOW)
+        # the parameter type is list but not int
+        # so use [command] instead of command
+        epdif.spi_transfer([command])
+
+    def send_data(self, data):
+        self.digital_write(self.dc_pin, GPIO.HIGH)
+        # the parameter type is list but not int
+        # so use [data] instead of data
+        epdif.spi_transfer([data])
+
+    def init(self):
+        if (epdif.epd_init() != 0):
+            return -1
+        self.reset()
+        self.send_command(POWER_SETTING)
+        self.send_data(0x37)
+        self.send_data(0x00)
+        self.send_command(PANEL_SETTING)
+        self.send_data(0xCF)
+        self.send_data(0x08)
+        self.send_command(BOOSTER_SOFT_START)
+        self.send_data(0xc7)
+        self.send_data(0xcc)
+        self.send_data(0x28)
+        self.send_command(POWER_ON)
+        self.wait_until_idle()
+        self.send_command(PLL_CONTROL)
+        self.send_data(0x3c)
+        self.send_command(TEMPERATURE_CALIBRATION)
+        self.send_data(0x00)
+        self.send_command(VCOM_AND_DATA_INTERVAL_SETTING)
+        self.send_data(0x77)
+        self.send_command(TCON_SETTING)
+        self.send_data(0x22)
+        self.send_command(TCON_RESOLUTION)
+        self.send_data(0x02)     #source 640
+        self.send_data(0x80)
+        self.send_data(0x01)     #gate 384
+        self.send_data(0x80)
+        self.send_command(VCM_DC_SETTING)
+        self.send_data(0x1E)      #decide by LUT file
+        self.send_command(0xe5)           #FLASH MODE
+        self.send_data(0x03)
+
+    def wait_until_idle(self):
+        while(self.digital_read(self.busy_pin) == 0):      # 0: busy, 1: idle
+            #logging.debug("DRIVER: (wait_until_idle)")
+            #self.delay_ms(100)
+            self.delay_ms(50)
+
+    def reset(self):
+        self.digital_write(self.reset_pin, GPIO.LOW)         # module reset
+        self.delay_ms(200)
+        self.digital_write(self.reset_pin, GPIO.HIGH)
+        self.delay_ms(200)    
+
+    def get_frame_buffer(self, image):
+        buf = [0x00] * int(self.width * self.height / 4)
+        # Set buffer to value of Python Imaging Library image.
+        # Image must be in mode L.
+        image_grayscale = image.convert('L')
+        imwidth, imheight = image_grayscale.size
+        if imwidth != self.width or imheight != self.height:
+            raise ValueError('Image must be same dimensions as display \
+                ({0}x{1}).' .format(self.width, self.height))
+
+        pixels = image_grayscale.load()
+        for y in range(self.height):
+            for x in range(self.width):
+                # Set the bits for the column of pixels at the current position.
+                if pixels[x, y] < 64:           # black
+                    buf[int((x + y * self.width) / 4)] &= ~(0xC0 >> (x % 4 * 2))
+                elif pixels[x, y] < 192:     # convert gray to red
+                    buf[int((x + y * self.width) / 4)] &= ~(0xC0 >> (x % 4 * 2))
+                    buf[int((x + y * self.width) / 4)] |= 0x40 >> (x % 4 * 2)
+                else:                           # white
+                    buf[int((x + y * self.width) / 4)] |= 0xC0 >> (x % 4 * 2)
+        return buf
+
+    def display_frame(self, frame_buffer):
+        self.send_command(DATA_START_TRANSMISSION_1)
+        logging.debug("DRIVER: ENTERING FOR LOOP")
+        for i in range(0, int(self.width / 4 * self.height)):
+            temp1 = frame_buffer[i]
+            j = 0
+            while (j < 4):
+                if ((temp1 & 0xC0) == 0xC0):
+                    temp2 = 0x03
+                elif ((temp1 & 0xC0) == 0x00):
+                    temp2 = 0x00
+                else:
+                    temp2 = 0x04
+                temp2 = (temp2 << 4) & 0xFF
+                temp1 = (temp1 << 2) & 0xFF
+                j += 1
+                if((temp1 & 0xC0) == 0xC0):
+                    temp2 |= 0x03
+                elif ((temp1 & 0xC0) == 0x00):
+                    temp2 |= 0x00
+                else:
+                    temp2 |= 0x04
+                temp1 = (temp1 << 2) & 0xFF
+                self.send_data(temp2)
+                j += 1
+        logging.debug("SENDING DISPLAY_REFRESH COMMAND")
+        self.send_command(DISPLAY_REFRESH)
+        logging.debug("DELAY 100 MS")
+        self.delay_ms(100)
+        logging.debug("WAIT UNTIL IDLE")
+        self.wait_until_idle()
+
+    def sleep(self):
+        self.send_command(POWER_OFF)
+        self.wait_until_idle()
+        self.send_command(DEEP_SLEEP)
+        self.send_data(0xa5)
+
+### END OF FILE ###
+