tarina

commit 95be9e4d197e818dcaccdf9be6483d5a58e0e7cc
parent 1d885fcd0acdcca447695b729665ed22da9e1d63
Author: rbckman <rob@tarina.org>
Date:   Thu,  2 Nov 2023 21:22:13 +0000

Merge branch 'master' of https://git.tarina.org/tarina

Diffstat:
M
tarina.py
 | 
12
+++++++-----

1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/tarina.py b/tarina.py
@@ -308,16 +308,18 @@ def main():
                 overlay = displayimage(camera, p_imagename, overlay, 3)
                 while holdbutton == 'peak':
                     pressed, buttonpressed, buttontime, holdbutton, event, keydelay = getbutton(pressed, buttonpressed, buttontime, holdbutton)
-                    #writemessage('peaking ' + str(peakshot))
+                    vumetermessage('peaking ' + str(peakshot))
+                    time.sleep(0.03)
                 overlay = removeimage(camera, overlay)
             #SHOWHELP
             elif pressed == 'showhelp':
                 vumetermessage('Button layout')
                 overlay = removeimage(camera, overlay)
                 overlay = displayimage(camera, tarinafolder+'/extras/buttons.png', overlay, 4)
-                while holdbutton == 'showhelp':
+                while holdbutton == 'showhelp' or pressed == 'H':
                     pressed, buttonpressed, buttontime, holdbutton, event, keydelay = getbutton(pressed, buttonpressed, buttontime, holdbutton)
                     vumetermessage('Button layout')
+                    time.sleep(0.03)
                 overlay = removeimage(camera, overlay)
                 updatethumb =  True
             #TIMELAPSE
@@ -4547,15 +4549,15 @@ def getbutton(lastbutton, buttonpressed, buttontime, holdbutton):
             pressed = 'view'
         elif event == 'KEY_DELETE' or (readbus == 223 and readbus2 == 247):
             pressed = 'remove'
-        elif (readbus2 == 245 and readbus == 191):
+        elif event == 'E' or (readbus2 == 245 and readbus == 191):
             pressed = 'peak'
         elif (readbus2 == 245 and readbus == 223):
             pressed = 'screen'
-        elif (readbus2 == 245 and readbus == 127):
+        elif event == 'A' or (readbus2 == 245 and readbus == 127):
             pressed = 'showmenu'
         elif (readbus2 == 245 and readbus == 239):
             pressed = 'changemode'
-        elif (readbus2 == 245 and readbus == 247):
+        elif event == 'H' or (readbus2 == 245 and readbus == 247):
             pressed = 'showhelp'
         elif event == 'I' or event == 'P' or (readbus2 == 245 and readbus == 253):
             pressed = 'insert'