tarina

commit 99d7b88b7599cc32848ae7966d0a7787ba28f7c2
parent 8b1f0c35adf8c6cf571e741c3c4052267dc59a35
Author: rob <rob@tarina.org>
Date:   Sat,  1 Jul 2023 20:23:05 +0100

add fps selection

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

1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/tarina.py b/tarina.py
@@ -260,14 +260,14 @@ def main():
                 if cammode == 'film':
                     cammode = 'picture'
                     vumetermessage('changing to picture mode')
+
                 elif cammode == 'picture':
                     cammode = 'film'
                     vumetermessage('changing to film mode')
                 camera.stop_preview()
                 camera.close()
                 camera = startcamera(lens,fps)
-                fps=10
-                flip = 'no'
+                loadfilmsettings = True
             #PICTURE
             elif pressed == 'picture':
                 if os.path.isdir(foldername) == False:
@@ -969,7 +969,7 @@ def main():
                 if camera_model == 'imx477':
                     if fps_selected < len(fps_selection)-1:
                         fps_selected+=1
-                        fps_selection=[8,15,24.985,35,49]
+                        fps_selection=[5,8,10,11,12,13,14,15,24.985,35,49]
                         fps=fps_selection[fps_selected]
                         camera.framerate = fps
             elif menu[selected] == 'Q:':
@@ -1113,7 +1113,7 @@ def main():
                 if camera_model == 'imx477':
                     if fps_selected > 0:
                         fps_selected-=1
-                        fps_selection=[5,15,24.985,35,49]
+                        fps_selection=[5,8,10,11,12,13,14,15,24.985,35,49]
                         fps=fps_selection[fps_selected]
                         camera.framerate = fps
             elif menu[selected] == 'Q:':
@@ -1158,6 +1158,7 @@ def main():
                 serverstate=filmsettings[20]
                 plughw=filmsettings[21]
                 channels=filmsettings[22]
+                cammode=filmsettings[23]
                 logger.info('film settings loaded & applied')
                 time.sleep(0.2)
             except: