tarina

commit 6014f72b40934e5c289494804834ce49ffca70ba
parent 47c3a700166454752c8f016ae6bc8420338f41ff
Author: rob <rob@tarina.org>
Date:   Tue, 18 Jun 2019 09:33:13 +0300

added bitrate

Diffstat:
M
README.md
 | 
2
+-
M
tarina.py
 | 
12
++++++++----

2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/README.md b/README.md
@@ -21,7 +21,7 @@ The parts are built around the world by different manufacturers. They've been ch
 [Adafruit Powerboost 1000C](https://www.ebay.com/itm/Adafruit-PowerBoost-1000-Charger-Rechargeable-5V-Lipo-USB-Boost-1A-1000C-A/282083284436?epid=2256108887&hash=item41ad7955d4%3Ag%3ALesAAOSwkQZbYXrn&_sacat=0&_nkw=powerboost+1000c&_from=R40&rt=nc&_trksid=m570.l1313)<br>
 [Buttons](http://www.ebay.com/itm/151723036469?_trksid=p2057872.m2749.l2649&ssPageName=STRK%3AMEBIDX%3AIT) connected to a [MCP23017-E/SP DIP-28 16 Bit I / O Expander I2C](http://www.ebay.com/sch/sis.html?_nkw=5Pcs+MCP23017+E+SP+DIP+28+16+Bit+I+O+Expander+I2C+TOP+GM&_trksid=p2047675.m4100)
 
-[Complete part list & Build instructions](docs/tarina-manual.md)
+Check [MANUAL](docs/tarina-manual.md) for complete part list & build instructions
 
 [Ready to print 3d designs](https://github.com/rbckman/tarina/tree/master/3d)
 
diff --git a/tarina.py b/tarina.py
@@ -521,7 +521,7 @@ def timelapse(beeps,camera,foldername,filename):
                     if recording == False and t > between:
                         if beeps > 0:
                             buzz(150)
-                        camera.start_recording(foldername + 'timelapse/' + filename + '_' + str(n).zfill(3) + '.h264', format='h264', quality=23)
+                        camera.start_recording(foldername + 'timelapse/' + filename + '_' + str(n).zfill(3) + '.h264', format='h264', quality=24, bitrate=15000000)
                         if sound == True:
                             os.system(tarinafolder + '/alsa-utils-1.1.3/aplay/arecord -D hw:0 -f S16_LE -c 1 -r 44100 -vv /dev/shm/' + filename + '_' + str(n).zfill(3) + '.wav &')
                         files.append(foldername + 'timelapse/' + filename + '_' + str(n).zfill(3))
@@ -1831,7 +1831,7 @@ def main():
     diskleft = str(int(disk.f_bavail * disk.f_frsize / 1024 / 1024 / 1024)) + 'Gb'
 
     #START INTERFACE
-    screen = startinterface()
+    startinterface()
     camera = startcamera(lens)
 
     #LOAD FILM AND SCENE SETTINGS
@@ -1953,7 +1953,7 @@ def main():
                                 run_command(cmd)
                             except Exception as e: logger.warning(e)
                             time.sleep(10)
-                            screen = startinterface()
+                            startinterface()
                             camera = startcamera(lens)
                             loadfilmsettings = True
                         selectedaction = 0
@@ -1966,7 +1966,11 @@ def main():
             #UPDATE
             elif pressed == 'middle' and menu[selected] == 'UPDATE':
                 if webz_on() == True:
+                    stopinterface(camera)
                     tarinaversion, tarinavername = update(tarinaversion, tarinavername)
+                    startinterface()
+                    camera = startcamera(lens)
+                    loadfilmsettings = True
                     selectedaction = 0
 
             #WIFI
@@ -2148,7 +2152,7 @@ def main():
                 if os.path.isdir(foldername) == False:
                     os.makedirs(foldername)
                 os.system(tarinafolder + '/alsa-utils-1.1.3/aplay/arecord -D hw:0 -f S16_LE -c 1 -r44100 -vv /dev/shm/' + filename + '.wav &') 
-                camera.start_recording(foldername + filename + '.h264', format='h264', quality=23)
+                camera.start_recording(foldername + filename + '.h264', format='h264', quality=24, bitrate=15000000)
                 starttime = time.time()
                 recording = True
             elif recording == True and float(time.time() - starttime) > 0.2: