tarina

commit 3e2a51f90a6e7195f97fdbb96c08f4e83c5d7ee9
parent a2311577b521c20a2893e84996fbd1927b56063b
Author: rbckman <robinbackman@gmail.com>
Date:   Thu,  9 Aug 2018 23:06:11 +0300

remove atx power module, added support for adafruit powerboost 1000c

Diffstat:
M
random/robsi2cbuttons.py
 | 
10
+++++-----
M
tarina.py
 | 
10
+++++-----

2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/random/robsi2cbuttons.py b/random/robsi2cbuttons.py
@@ -44,11 +44,11 @@ while True:
         print "rightdown"
     elif readbus2 == 244:
         print "remove"
-    elif readbus2 == 247:
-        print "shutdown"
-        bus.write_byte_data(DEVICE,OLATA,0)
-        os.system('sudo shutdown -h now')
-        time.sleep(15)
+    #elif readbus2 == 247:
+    #    print "shutdown"
+        #bus.write_byte_data(DEVICE,OLATA,0)
+        #os.system('sudo shutdown -h now')
+        #time.sleep(15)
     print readbus
     print readbus2
     bus.write_byte_data(DEVICE,OLATA,0xC)
diff --git a/tarina.py b/tarina.py
@@ -1058,14 +1058,14 @@ def getbutton(lastbutton, buttonpressed, buttontime, holdbutton):
             pressed = 'retake'
         elif event == ord('q') or readbus == 223:
             pressed = 'view'
-        elif event == ord('z') or readbus2 == 244:
+        elif event == ord('z') or readbus2 == 246:
             pressed = 'delete'
-        elif readbus2 == 247:
-            pressed = 'shutdown'
+        #elif readbus2 == 247:
+        #    pressed = 'shutdown'
         buttontime = time.time()
         holdbutton = pressed
         buttonpressed = True
-    if readbus == 255 and readbus2 == 245:
+    if readbus == 255 and readbus2 == 247:
         buttonpressed = False
     if float(time.time() - buttontime) > 0.15 and buttonpressed == True:
         if holdbutton == 'up' or holdbutton == 'down' or holdbutton == 'right' or holdbutton == 'left' or holdbutton == 'shutdown':
@@ -1221,7 +1221,7 @@ def main():
                     backlight = True
 
             #SHUTDOWN
-            elif pressed == 'shutdown' and recording == False:
+            elif pressed == 'shutdown_nono' and recording == False:
                 writemessage('Hold down 3 seconds to shutdown')
                 shutdownbutton = time.time()
                 time.sleep(1)