tarina

commit 3b15563352e9bf7e3eb52bb7a36d3537e5d10e4f
parent 94c3cb4205a1890dc4e65aa7302ef36d4313d7e9
Author: rbckman <rob@tarina.org>
Date:   Fri, 13 Nov 2020 11:28:07 +0200

better camera version control, install picamerax

Diffstat:
M
install.sh
 | 
3
++-
M
tarina.py
 | 
6
+++---

2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/install.sh b/install.sh
@@ -52,7 +52,8 @@ sudo pip3 install omxplayer-wrapper
 echo "installing blessed..."
 sudo pip3 install blessed
 echo "installing rwb27s openflexure microscope fork of picamera with lens shading correction..."
-sudo pip3 --no-cache-dir install https://github.com/chrisruk/picamera/archive/hq-camera-new-framerates.zip --upgrade
+#sudo pip3 --no-cache-dir install https://github.com/chrisruk/picamera/archive/hq-camera-new-framerates.zip --upgrade
+sudo pip3 install --upgrade picamerax
 echo "installing web.py for the tarina webserver..."
 sudo pip3 install web.py==0.61
 
diff --git a/tarina.py b/tarina.py
@@ -1135,7 +1135,8 @@ def getfilms(filmfolder):
 
 #-------------Load tarina config---------------
 
-def getconfig(version):
+def getconfig():
+    version = camera.revision
     home = os.path.expanduser('~')
     configfile = home + '/.tarina/config.ini'
     configdir = os.path.dirname(configfile)
@@ -2632,8 +2633,7 @@ def startcamera(lens):
     #npzfile = np.load('lenses/' + lens)
     #lensshade = npzfile['lens_shading_table']
     #camera.framerate = 24.999
-    v = camera.revision
-    camera_model, camera_revision = getconfig(v)
+    camera_model, camera_revision = getconfig()
     # v1 = 'ov5647'
     # v2 = ? 
     logger.info("picamera version is: " + camera_model + ' ' + camera_revision)