It works like a charm now :)
Merged two projects and allowed them to use common functions for inter-operativity.
This commit is contained in:
1
clock/api/__init__.py
Normal file
1
clock/api/__init__.py
Normal file
@@ -0,0 +1 @@
|
||||
# Placeholder
|
11
clock/api/clouds.pbm
Normal file
11
clock/api/clouds.pbm
Normal file
@@ -0,0 +1,11 @@
|
||||
P1
|
||||
# Cloud - non-standard p1!
|
||||
16 8
|
||||
0000000000000000
|
||||
0000001111001000
|
||||
0000001001000000
|
||||
0000010000100000
|
||||
0000010000100000
|
||||
0000001001000000
|
||||
0000001111001000
|
||||
0000000000000000
|
92
clock/api/converter.py
Normal file
92
clock/api/converter.py
Normal file
@@ -0,0 +1,92 @@
|
||||
from PIL import Image, ImageDraw, ImageFont
|
||||
import numpy as np
|
||||
import datetime
|
||||
|
||||
"""Two colors: 1 main color and 1 accent color. These are labeled in the matrix as 1 and 2"""
|
||||
|
||||
def text_converter(text, height):
|
||||
"""Converts a text to a pixel-matrix
|
||||
returns: np.array((16, x))"""
|
||||
|
||||
font = ImageFont.truetype("verdanab.ttf", height)
|
||||
size = font.getsize(text)
|
||||
img = Image.new("1",size,"black")
|
||||
draw = ImageDraw.Draw(img)
|
||||
draw.text((0, 0), text, "white", font=font)
|
||||
pixels = np.array(img, dtype=np.uint8)
|
||||
return pixels
|
||||
|
||||
|
||||
digits = {
|
||||
1 : [[0,0,1],[0,0,1],[0,0,1],[0,0,1],[0,0,1]],
|
||||
2 : [[1,1,1],[0,0,1],[1,1,1],[1,0,0],[1,1,1]],
|
||||
3 : [[1,1,1],[0,0,1],[1,1,1],[0,0,1],[1,1,1]],
|
||||
4 : [[1,0,1],[1,0,1],[1,1,1],[0,0,1],[0,0,1]],
|
||||
5 : [[1,1,1],[1,0,0],[1,1,1],[0,0,1],[1,1,1]],
|
||||
6 : [[1,1,1],[1,0,0],[1,1,1],[1,0,1],[1,1,1]],
|
||||
7 : [[1,1,1],[0,0,1],[0,0,1],[0,0,1],[0,0,1]],
|
||||
8 : [[1,1,1],[1,0,1],[1,1,1],[1,0,1],[1,1,1]],
|
||||
9 : [[1,1,1],[1,0,1],[1,1,1],[0,0,1],[1,1,1]],
|
||||
0 : [[1,1,1],[1,0,1],[1,0,1],[1,0,1],[1,1,1]]
|
||||
}
|
||||
|
||||
##place of numbers, invariable
|
||||
digit_position = [[2,4], [2,10], [9,4], [9,10]]
|
||||
|
||||
def time_converter():
|
||||
"""Converts 4-digit time to a pixel-matrix
|
||||
returns: np.array((16, 16))"""
|
||||
time = datetime.datetime.now().strftime("%H%M")
|
||||
pixels = np.zeros((16,16),dtype=np.uint8)
|
||||
time = "0" * (4 - len(str(time))) + str(time)
|
||||
time_split = [int(i) for i in time]
|
||||
|
||||
for i in range(4):
|
||||
x = digit_position[i][0]
|
||||
y = digit_position[i][1]
|
||||
number = digits[time_split[i]]
|
||||
pixels[x: x + 5, y: y + 3] = np.array(number)
|
||||
|
||||
return pixels
|
||||
|
||||
|
||||
days = np.append(np.zeros((15,16)), np.array([0,1,0,1,0,1,0,1,0,1,0,1,1,0,1,1])).reshape((16,16))
|
||||
def date_converter():
|
||||
today = datetime.datetime.today()
|
||||
weekday = datetime.datetime.weekday(today)
|
||||
# size of the reduced array according to weekday
|
||||
size = [2,4,6,8,10,13,16]
|
||||
|
||||
pixels = days.copy() #base color background
|
||||
lrow = np.append(pixels[15,:size[weekday]], [0 for i in range(16 - size[weekday])])
|
||||
lrow = np.append(np.zeros((15,16)), lrow).reshape((16,16))
|
||||
pixels += lrow
|
||||
return pixels
|
||||
|
||||
def weather_converter(name):
|
||||
result = np.zeros((16,16))
|
||||
return result
|
||||
equiv = {
|
||||
"clouds" : "clouds.pbm",
|
||||
"sun" : "sun.pbm",
|
||||
"mix" : "mix.pbm",
|
||||
"rain" : "rain.pbm",
|
||||
"snow" : "snow.pbm",
|
||||
}
|
||||
if name in equiv:
|
||||
fname = equiv[name]
|
||||
else:
|
||||
return np.zeros((8,16))
|
||||
|
||||
f = open(fname,"r")
|
||||
f.readline()
|
||||
f.readline()
|
||||
f.readline()
|
||||
|
||||
result = np.zeros((16,16))#should be 8x16
|
||||
for i in range(8):
|
||||
l = f.readline()[:-1]
|
||||
for ind,bit in enumerate(l):
|
||||
result[i][ind] = bit
|
||||
|
||||
return result
|
1
clock/api/hat/__init__.py
Normal file
1
clock/api/hat/__init__.py
Normal file
@@ -0,0 +1 @@
|
||||
# Placeholder
|
110
clock/api/hat/sim.py
Normal file
110
clock/api/hat/sim.py
Normal file
@@ -0,0 +1,110 @@
|
||||
import sys
|
||||
import colorsys
|
||||
import pygame.gfxdraw
|
||||
import time
|
||||
import pygame
|
||||
import numpy
|
||||
|
||||
class UnicornHat(object):
|
||||
def __init__(self, width, height):
|
||||
# Compat with old library
|
||||
|
||||
# Set some defaults
|
||||
self.rotation(0)
|
||||
self.pixel_size = 20
|
||||
self.height = height
|
||||
self.width = width
|
||||
self.pixels = numpy.zeros((self.height,self.width,3), dtype=int)
|
||||
|
||||
self.window_width = self.width * self.pixel_size
|
||||
self.window_height = self.height * self.pixel_size
|
||||
|
||||
# Init pygame and off we go
|
||||
pygame.init()
|
||||
pygame.display.set_caption("Unicorn HAT simulator")
|
||||
self.screen = pygame.display.set_mode([self.window_width, self.window_height])
|
||||
self.clear()
|
||||
|
||||
|
||||
def set_pixel(self, x, y, r, g, b):
|
||||
self.pixels[x][y] = int(r), int(g), int(b)
|
||||
|
||||
|
||||
def set_matrix(self, matrix):
|
||||
self.pixels = matrix
|
||||
self.show()
|
||||
|
||||
|
||||
def draw(self):
|
||||
for event in pygame.event.get(): # User did something
|
||||
if event.type == pygame.QUIT:
|
||||
print("Exiting...")
|
||||
sys.exit()
|
||||
|
||||
for i in range(self.height):
|
||||
for j in range(self.width):
|
||||
self.draw_led(i,j)
|
||||
|
||||
|
||||
def draw_led(self,i, j):
|
||||
p = self.pixel_size
|
||||
w_x = int(j * p + p / 2)
|
||||
#w_y = int((self.height - 1 - y) * p + p / 2)
|
||||
w_y = int(i * p + p / 2)
|
||||
r = int(p / 4)
|
||||
color = self.pixels[i,j,:]
|
||||
pygame.gfxdraw.aacircle(self.screen, w_x, w_y, r, color)
|
||||
pygame.gfxdraw.filled_circle(self.screen, w_x, w_y, r, color)
|
||||
|
||||
|
||||
def show(self):
|
||||
self.clear()
|
||||
self.draw()
|
||||
pygame.display.flip()
|
||||
#time.sleep(5)
|
||||
|
||||
|
||||
def get_shape(self):
|
||||
return (self.width, self.height)
|
||||
|
||||
|
||||
def set_brightness(self, *args):
|
||||
pass
|
||||
|
||||
|
||||
def rotation(self, r):
|
||||
self._rotation = int(round(r/90.0)) % 3
|
||||
|
||||
|
||||
def clear(self):
|
||||
self.screen.fill((0, 0, 0))
|
||||
|
||||
|
||||
def get_rotation(self):
|
||||
return self._rotation * 90
|
||||
|
||||
|
||||
def set_layout(self, *args):
|
||||
pass
|
||||
|
||||
|
||||
def off(self):
|
||||
print("Closing window")
|
||||
#pygame.quit()
|
||||
|
||||
|
||||
|
||||
"""
|
||||
# SD hats works as expected
|
||||
#unicornhat = UnicornHatSim(8,8)
|
||||
#unicornphat = UnicornHatSim(8, 4)
|
||||
|
||||
# Unicornhat HD seems to be the other way around (not that there's anything wrong with that), so we rotate it 180°
|
||||
# unicornhathd = UnicornHatSim(16, 16, 180)
|
||||
"""
|
||||
# twohats = UnicornHat(32, 16)
|
||||
#
|
||||
# for i in range(16):
|
||||
# twohats.set_pixel(i,i, 200,200,200)
|
||||
# twohats.show()
|
||||
# time.sleep(1)
|
152
clock/api/hat/unicorn.py
Normal file
152
clock/api/hat/unicorn.py
Normal file
@@ -0,0 +1,152 @@
|
||||
import colorsys
|
||||
import time
|
||||
import numpy
|
||||
|
||||
import RPi.GPIO as GPIO
|
||||
|
||||
|
||||
class UnicornHat(object):
|
||||
def __init__(self, width, height, rotation_offset = 0):
|
||||
self.PIN_CLK = 11
|
||||
##################################
|
||||
# GPIO Pins for the actual signal. The other ones are for signal clocks and resets.
|
||||
self.PINS_DAT = [10, 22]
|
||||
##################################
|
||||
self.PIN_CS = 8
|
||||
|
||||
GPIO.setmode(GPIO.BCM)
|
||||
GPIO.setwarnings(False)
|
||||
GPIO.setup(self.PIN_CS, GPIO.OUT, initial=GPIO.HIGH)
|
||||
GPIO.setup(self.PIN_CLK, GPIO.OUT, initial=GPIO.LOW)
|
||||
GPIO.setup(self.PINS_DAT, GPIO.OUT, initial=GPIO.LOW)
|
||||
|
||||
self.SOF = 0x72
|
||||
self.DELAY = 1.0/120
|
||||
self.WIDTH = width #32
|
||||
self.HEIGHT = height #16
|
||||
|
||||
self.rotation = 1
|
||||
self.brightness = 1
|
||||
self.buffer = numpy.zeros((self.HEIGHT,self.WIDTH,3), dtype=int)
|
||||
|
||||
self.reset_clock()
|
||||
|
||||
def reset_clock(self):
|
||||
GPIO.output(self.PIN_CS, GPIO.LOW)
|
||||
time.sleep(0.000001)
|
||||
GPIO.output(self.PIN_CS, GPIO.HIGH)
|
||||
|
||||
def spi_write(self, buf1, buf2):
|
||||
GPIO.output(self.PIN_CS, GPIO.LOW)
|
||||
|
||||
self.spi_write_byte(self.SOF, self.SOF)
|
||||
|
||||
for x in range(len(buf1)):
|
||||
b1, b2= buf1[x], buf2[x]
|
||||
self.spi_write_byte(b1, b2)
|
||||
time.sleep(0.0000001)
|
||||
|
||||
GPIO.output(self.PIN_CS, GPIO.HIGH)
|
||||
|
||||
def spi_write_byte(self, b1, b2):
|
||||
for x in range(8):
|
||||
GPIO.output(self.PINS_DAT[0], b1 & 0b10000000)
|
||||
GPIO.output(self.PINS_DAT[1], b2 & 0b10000000)
|
||||
GPIO.output(self.PIN_CLK, GPIO.HIGH)
|
||||
b1 <<= 1
|
||||
b2 <<= 1
|
||||
time.sleep(0.00000001)
|
||||
GPIO.output(self.PIN_CLK, GPIO.LOW)
|
||||
|
||||
def set_brightness(self, b):
|
||||
"""Set the display brightness between 0.0 and 1.0.
|
||||
:param b: Brightness from 0.0 to 1.0 (default 1)
|
||||
"""
|
||||
self.brightness = b
|
||||
|
||||
def rotation(self, r):
|
||||
"""Set the display rotation in degrees.
|
||||
Actual rotation will be snapped to the nearest 90 degrees.
|
||||
"""
|
||||
self.rotation = int(round(r/90.0))
|
||||
|
||||
def get_rotation(self):
|
||||
"""Returns the display rotation in degrees."""
|
||||
return self.rotation * 90
|
||||
|
||||
def set_layout(self, pixel_map=None):
|
||||
"""Does nothing, for library compatibility with Unicorn HAT."""
|
||||
pass
|
||||
|
||||
def set_all(self, r, g, b):
|
||||
self.buffer[:] = r, g, b
|
||||
|
||||
def set_pixel(self, x, y, r, g, b):
|
||||
"""Set a single pixel to RGB colour.
|
||||
:param x: Horizontal position from 0 to width
|
||||
:param y: Veritcal position from 0 to height
|
||||
:param r: Amount of red from 0 to 255
|
||||
:param g: Amount of green from 0 to 255
|
||||
:param b: Amount of blue from 0 to 255
|
||||
"""
|
||||
self.buffer[y][x] = r, g, b
|
||||
|
||||
|
||||
def set_matrix(self, matrix):
|
||||
self.buffer = matrix
|
||||
self.show()
|
||||
|
||||
|
||||
def set_pixel_hsv(self, x, y, h, s=1.0, v=1.0):
|
||||
"""set a single pixel to a colour using HSV.
|
||||
:param x: Horizontal position from 0 to 15
|
||||
:param y: Veritcal position from 0 to 15
|
||||
:param h: Hue from 0.0 to 1.0 ( IE: degrees around hue wheel/360.0 )
|
||||
:param s: Saturation from 0.0 to 1.0
|
||||
:param v: Value (also known as brightness) from 0.0 to 1.0
|
||||
"""
|
||||
|
||||
r, g, b = [int(n*255) for n in colorsys.hsv_to_rgb(h, s, v)]
|
||||
self.set_pixel(x, y, r, g, b)
|
||||
|
||||
def get_pixel(self, x, y):
|
||||
return tuple(self.buffer[x][y])
|
||||
|
||||
def shade_pixels(self, shader):
|
||||
for x in range(self.WIDTH):
|
||||
for y in range(self.HEIGHT):
|
||||
r, g, b = shader(x, y)
|
||||
self.set_pixel(x, y, r, g, b)
|
||||
|
||||
def get_pixels(self):
|
||||
return self.buffer
|
||||
|
||||
def get_shape(self):
|
||||
"""Return the shape (width, height) of the display."""
|
||||
|
||||
return self.WIDTH, self.HEIGHT
|
||||
|
||||
def clear(self):
|
||||
"""Clear the buffer."""
|
||||
self.buffer.fill(0)
|
||||
|
||||
def off(self):
|
||||
"""Clear the buffer and immediately update Unicorn HAT HD.
|
||||
Turns off all pixels.
|
||||
"""
|
||||
self.clear()
|
||||
self.show()
|
||||
|
||||
def show(self):
|
||||
"""Output the contents of the buffer to Unicorn HAT HD."""
|
||||
##########################################################
|
||||
## Change to desire
|
||||
buff1 = numpy.rot90(self.buffer[:self.HEIGHT,:16],1)
|
||||
buff2 = numpy.rot90(self.buffer[:self.HEIGHT,16:32],1)
|
||||
##########################################################
|
||||
|
||||
buff1, buff2 = [(x.reshape(768) * self.brightness).astype(numpy.uint8).tolist() for x in (buff1, buff2)]
|
||||
|
||||
self.spi_write(buff1, buff2)
|
||||
|
||||
time.sleep(self.DELAY)
|
106
clock/api/led_out.py
Normal file
106
clock/api/led_out.py
Normal file
@@ -0,0 +1,106 @@
|
||||
import time
|
||||
import numpy as np
|
||||
|
||||
from clock.api import converter
|
||||
try:
|
||||
from clock.api.hat import unicorn as HAT
|
||||
except ImportError:
|
||||
print("Using the simulator")
|
||||
from clock.api.hat import sim as HAT
|
||||
|
||||
|
||||
|
||||
class OutputHandler():
|
||||
def __init__(self, width, height):
|
||||
"""width is presumed to be larger than height"""
|
||||
self.width = width
|
||||
self.height = height
|
||||
self.output = HAT.UnicornHat(width, height)
|
||||
self.primary = [230, 230, 230]
|
||||
self.secondary = [10, 200, 10]
|
||||
self.red = [200, 10, 10]
|
||||
self.weather_string = ""
|
||||
self.weather_matrix = []
|
||||
|
||||
|
||||
def set_matrix(self, matrix, quadrant, colors = []):
|
||||
"""assumes 1 for primary, 2 for secondary color (everything beyond is treated as an error)
|
||||
quadrant: 1,2,3,4 : 4|1
|
||||
___
|
||||
3|2
|
||||
"""
|
||||
|
||||
# reshape to the main size: (eg 32x16) (always aligns the given matrix on top left.)
|
||||
|
||||
c1 = self.primary
|
||||
c2 = self.secondary
|
||||
c3 = self.red
|
||||
if len(colors) == 1:
|
||||
c1 = colors[0]
|
||||
if len(colors) == 2:
|
||||
c2 = colors[1]
|
||||
if len(colors) == 3:
|
||||
c3 = colors[2]
|
||||
if len(colors) > 3:
|
||||
print("Too many colors")
|
||||
|
||||
result = np.zeros((self.height, self.width))
|
||||
if quadrant == 1:
|
||||
result[:matrix.shape[0], self.width-matrix.shape[1]:] = matrix
|
||||
elif quadrant == 2:
|
||||
result[self.height-matrix.shape[0]:, self.width-matrix.shape[1]:] = matrix
|
||||
elif quadrant == 3:
|
||||
result[self.height-matrix.shape[0]:, :matrix.shape[1]] = matrix
|
||||
else: # 4 or more
|
||||
result[:matrix.shape[0], :matrix.shape[1]] = matrix
|
||||
|
||||
# add depth (rgb values)
|
||||
r3 = np.zeros((self.height,self.width,3),dtype=int)
|
||||
for i in range(self.height):
|
||||
for j in range(self.width):
|
||||
t = int(result[i, j])
|
||||
if t == 0:
|
||||
r3[i, j, :] = [0,0,0]
|
||||
elif t == 1:
|
||||
r3[i, j, :] = c1
|
||||
elif t == 2:
|
||||
r3[i, j, :] = c2
|
||||
else:
|
||||
r3[i, j, :] = c3
|
||||
self.output.set_matrix(r3)
|
||||
|
||||
|
||||
def clock_face(self,weather):
|
||||
hour = converter.time_converter()
|
||||
day = converter.date_converter()
|
||||
face1 = hour + day
|
||||
|
||||
if self.weather_matrix == [] or weather != self.weather_string:
|
||||
self.weather_matrix = converter.weather_converter("clouds")
|
||||
self.weather_string = weather
|
||||
|
||||
face2 = self.weather_matrix
|
||||
|
||||
face = np.zeros((max(face1.shape[0],face2.shape[0]),face1.shape[1]+face2.shape[1]))
|
||||
face[:face1.shape[0],:face1.shape[1]] = face1
|
||||
face[:face2.shape[0],face1.shape[1]:] = face2
|
||||
self.set_matrix(face, 4)
|
||||
|
||||
|
||||
def text_scroll(self, text, speed, color):
|
||||
pixels = converter.text_converter(text, 12)
|
||||
sleep_time = 1 / speed
|
||||
if color == "":
|
||||
colors = []
|
||||
else:
|
||||
colors = [color]
|
||||
|
||||
frames = pixels.shape[1] - self.width
|
||||
if frames <= 0:
|
||||
frames = 1
|
||||
|
||||
for i in range(frames):
|
||||
visible = pixels[:,i:self.width+i]
|
||||
self.set_matrix(visible,4,colors)
|
||||
time.sleep(sleep_time)
|
||||
time.sleep(10 * sleep_time)
|
Reference in New Issue
Block a user