Mediadev

README.md

@@ -23,6 +23,8 @@ sudo apt-get update
 
 sudo apt-get upgrade
 
+sudo apt install libsdl2-2.0-0 libsdl2-gfx-1.0-0 libsdl2-image-2.0-0 libsdl2-mixer-2.0-0 libsdl2-net-2.0-0 libsdl2-ttf-2.0-0
+
 sudo apt-get install libatlas-base-dev libsdl2-dev libopenjp2-7-dev libtiff5 python3-pandas python3-psutil
 
 pip3 install --upgrade colour luma.lcd luma.emulator adafruit-circuitpython-bme680 sense-hat adafruit-circuitpython-mpr121 pygame==2.0.0

display.py

@@ -1,70 +1,63 @@
-
-# -*- coding: utf-8 -*-
-# Originally found: https://github.com/rm-hull/luma.examples/blob/master/examples/demo_opts.py
-# Modified for PicorderOS
-# Copyright (c) 2014-18 Richard Hull and contributors
-# See LICENSE.rst for details.
-
 print("Unified Display Module loading")
 import sys
 import logging
-
-from luma.core import cmdline, error
-
-
-# logging
-logging.basicConfig(
-    level=logging.DEBUG,
-    format='%(asctime)-15s - %(message)s'
-)
-# ignore PIL debug messages
-logging.getLogger('PIL').setLevel(logging.ERROR)
-
-
-def display_settings(device, args):
-    """
-    Display a short summary of the settings.
-    :rtype: str
-    """
-    iface = ''
-    display_types = cmdline.get_display_types()
-    if args.display not in display_types['emulator']:
-        iface = 'Interface: {}\n'.format(args.interface)
-
-    lib_name = cmdline.get_library_for_display_type(args.display)
-    if lib_name is not None:
-        lib_version = cmdline.get_library_version(lib_name)
-    else:
-        lib_name = lib_version = 'unknown'
-
-    import luma.core
-    version = 'luma.{} {} (luma.core {})'.format(
-        lib_name, lib_version, luma.core.__version__)
-
-    return 'Version: {}\nDisplay: {}\n{}Dimensions: {} x {}\n{}'.format(
-        version, args.display, iface, device.width, device.height, '-' * 60)
-
-
-def get_device(actual_args=None):
-    """
-    Create device from command-line arguments and return it.
-    """
-    if actual_args is None:
-        actual_args = sys.argv[1:]
-    parser = cmdline.create_parser(description='luma.examples arguments')
-    args = parser.parse_args(actual_args)
-
-    if args.config:
-        # load config from file
-        config = cmdline.load_config(args.config)
-        args = parser.parse_args(config + actual_args)
-
-    # create device
-    try:
-        device = cmdline.create_device(args)
-        print(display_settings(device, args))
-        return device
-
-    except error.Error as e:
-        parser.error(e)
-        return None
+from objects import *
+
+if configure.display == 1:
+	from luma.core.interface.serial import spi
+	from luma.core.render import canvas
+	from luma.lcd.device import st7735
+	from luma.emulator.device import pygame
+
+	# Raspberry Pi hardware SPI config:
+	DC = 23
+	RST = 24
+	SPI_PORT = 0
+	SPI_DEVICE = 0
+
+	if not configure.pc:
+		serial = spi(port = SPI_PORT, device = SPI_DEVICE, gpio_DC = DC, gpio_RST = RST)
+		device = st7735(serial, width = 160, height = 128, mode = "RGB")
+	else:
+		device = pygame(width = 160, height = 128)
+
+# for TFT24T screens
+elif configure.display == 2:
+	# Details pulled from https://github.com/BehindTheSciences/ili9341_SPI_TouchScreen_LCD_Raspberry-Pi/blob/master/BTS-ili9341-touch-calibration.py
+	from lib_tft24T import TFT24T
+	import RPi.GPIO as GPIO
+	GPIO.setmode(GPIO.BCM)
+	GPIO.setwarnings(False)
+	import spidev
+	DC = 24
+	RST = 25
+	LED = 15
+	PEN = 26
+	device = TFT24T(spidev.SpiDev(), GPIO)
+	# Initialize display and touch.
+	TFT.initLCD(DC, RST, LED)
+
+class GenericDisplay(object):
+
+	def __init__(self):
+
+		# lib_tft24 screens require us to create a drawing surface for the screen
+		# and add to it.
+		if configure.display == 2:
+			self.surface = device.draw()
+
+
+	# Display takes a PILlow based drawobject and pushes it to screen.
+	def display(self,frame):
+
+		# the following is only for screens that use Luma.LCD
+		if configure.display == 1:
+			device.display(frame)
+
+		# the following is only for TFT24T screens
+		elif configure.display == 2:
+			 # Resize the image and rotate it so it's 240x320 pixels.
+			frame = frame.rotate(90,0,1).resize((240, 320))
+			# Draw the image on the display hardware.
+			self.surface.pasteimage(frame,(0,0))
+			device.display()

input.py

@@ -119,10 +119,11 @@
 
 if configure.input_pcf8575:
 	from pcf8575 import PCF8575
-	i2c_port_num = 0
+	i2c_port_num = 1
 	pcf_address = 0x20
 	pcf = PCF8575(i2c_port_num, pcf_address)
 
+	button_table = [-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1,0,3,2,4]
 
 # the input class receives and relays control events for user interaction
 class Inputs(object):
@@ -190,7 +191,7 @@ def read(self):
 			# if the alert pin is brought LOW
 			if GPIO.input(configure.ALERTPIN) == 0 and configure.eventready[0] == False:
 
-				print("touch received")
+				#print("touch received")
 
 				# collect the event list from the chip
 				reading = cap1208.get_input_status()
@@ -401,24 +402,29 @@ def read(self):
 		if configure.input_pcf8575:
 
 			if not configure.eventready[0]:
-				print("button state = ", pcf.port)
-				for this, button in enumerate(pcf.port):
+				this_frame = list(pcf.port)
+
+				for this, button in enumerate(this_frame):
+
 					# if an item is pressed
 					if not button:
 
 						#if it wasn't pressed last time
 						if not self.pressed[this]:
 
 							# mark it in the pressed list
-							print("pad press registered")
-							self.pressed[this] = True
+							print("pad press registered at ", this)
+							print("raising an event at address ", button_table[this])
+
+							self.pressed[button_table[this]] = True
 							configure.eventready[0] = True
 							configure.beep_ready[0] = True
 					else:
-						self.pressed[this] = False
+						self.pressed[button_table[this]] = False
 
 		configure.eventlist[0] = self.pressed
 
+
 	def keypress(self):
 		pygame.event.get()
 		#pygame.time.wait(50)