tarina

commit 57bdc334a2e2939e9ed9333127ed02f33fdcb386
parent 16f5d2c97b7ca45dd9dfa38c05f922cdfc89a3d7
Author: rbckman <rbckman@localhost.localdomain>
Date:   Thu, 16 Mar 2017 17:10:30 +0200

Merge branch 'master' of https://github.com/rbckman/tarina

Diffstat:
M
README.md
 | 
6
++++--
M
tarina.py
 | 
2
+-

2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-<img src="https://raw.githubusercontent.com/rbckman/tarina/master/tarina-proto3.png" width="100%">
+<img src="https://raw.githubusercontent.com/rbckman/tarina/master/tarina-proto3.png" width="100%"><br>
 # Tarina #
 ### DIY camera for filmmakers, vloggers, travellers & hackers ###
 Shoot your films as takes, shots and scenes, and see your film come together in-camera. Once you get it there’s no need for editing later. Tarina is designed to be taken apart & is easily modded with all body parts 3d printable. It's built using the Raspberry Pi, running on a Gnu/Linux Raspbian distribution and with an easy python coded interface.
@@ -39,7 +39,9 @@ You'r ready to rumble (run as sudo):
 ```
 sudo python tarina.py
 ```
-## Couldn't have been done without##
+## Couldn't have been done without ##
+
+Gnu/Linux/Debian 
 
 Raspberry Pi
 http://raspberrypi.org
diff --git a/tarina.py b/tarina.py
@@ -999,7 +999,7 @@ def getbutton(lastbutton, buttonpressed, buttontime, holdbutton):
     if readbus == 255 and readbus2 == 245:
         buttonpressed = False
     if float(time.time() - buttontime) > 0.15 and buttonpressed == True:
-        if holdbutton == 'up' or holdbutton == 'down' or holdbutton == 'right' or holdbutton == 'left':
+        if holdbutton == 'up' or holdbutton == 'down' or holdbutton == 'right' or holdbutton == 'left' or holdbutton == 'shutdown':
             pressed = holdbutton
     return pressed, buttonpressed, buttontime, holdbutton