tarina

commit 683ab85083002a22d11f7f61af30871c27680df4
parent 02572e33cf820f43a9a0337d3817bc0a46b0bc05
Author: rbckman <rob@tarina.org>
Date:   Wed,  2 Sep 2020 12:11:42 +0100

working on hq camera module

Diffstat:
M
install.sh
 | 
2
+-
M
tarina.py
 | 
12
+++++++-----

2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/install.sh b/install.sh
@@ -52,7 +52,7 @@ 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/rbckman/picamera/archive/master.zip --upgrade
+sudo pip3 --no-cache-dir install https://github.com/chrisruk/picamera/archive/hq-camera-new-framerates.zip --upgrade
 echo "installing web.py for the tarina webserver..."
 sudo pip3 install web.py==0.40-dev1
 
diff --git a/tarina.py b/tarina.py
@@ -1159,9 +1159,9 @@ def getconfig(version):
         holdbutton = ''
         selected = 0
         header = 'What revision of ' + version + ' sensor are you using?'
-        menu = 'rev.C', 'rev.D'
+        menu = 'rev.C', 'rev.D', 'hq-camera'
         while True:
-            settings = '', ''
+            settings = '', '', ''
             writemenu(menu,settings,selected,header)
             pressed, buttonpressed, buttontime, holdbutton, event, keydelay = getbutton(pressed, buttonpressed, buttontime, holdbutton)
             if pressed == 'right':
@@ -2585,11 +2585,11 @@ def stopinterface(camera):
 
 def startcamera(lens):
     camera = picamera.PiCamera()
-    camera.resolution = (1920, 816) #tested modes 1920x816, 1296x552/578, v2 1640x698, 1640x1232
+    camera.resolution = (2028, 863) #tested modes 1920x816, 1296x552/578, v2 1640x698, 1640x1232
     #lensshade = ''
     #npzfile = np.load('lenses/' + lens)
     #lensshade = npzfile['lens_shading_table']
-    table = read_table('lenses/' + lens)
+    #table = read_table('lenses/' + lens)
     #camera.framerate = 24.999
     v = camera.revision
     camera_model, camera_revision = getconfig(v)
@@ -2608,12 +2608,14 @@ def startcamera(lens):
         # ov5647 Rev D"
         if camera_revision == 'rev.D':
             camera.framerate = 23.15
+    else:
+        camera.framerate = 24.999
     camera.crop = (0, 0, 1.0, 1.0)
     camera.video_stabilization = True
     camera.led = False
     #lens_shading_table = np.zeros(camera._lens_shading_table_shape(), dtype=np.uint8) + 32
     #camera.lens_shading_table = lens_shading_table
-    camera.lens_shading_table = table
+    #camera.lens_shading_table = table
     camera.start_preview()
     camera.awb_mode = 'auto'
     return camera