tarina

commit 9dcf54cb573a092bb9a8c7de5770f17f8c3ed2de
parent 01a32a3ba9f699fb495a19153cb08f58b3ce522d
Author: Robin Bäckman <robinbackman@gmail.com>
Date:   Tue,  9 Aug 2016 22:04:15 +0300

added install instructions to README

Diffstat:
M
README
 | 
28
+++++++++++++++++++---------
M
tarina.py
 | 
10
++++++++--

2 files changed, 27 insertions(+), 11 deletions(-)
diff --git a/README b/README
@@ -1,6 +1,4 @@
-Tarina
-
-DIY filmmaking device for Raspberry pi
+Tarina - filmmaking interface for Raspberry pi
 
 video + sound recorder for the Raspberry Pi using the Pi Camera and Adafruit Pitft screen and C-Media USB Audio VIA VT1620A.
 adafruit kernel with the 3.5 tft https://learn.adafruit.com/adafruit-pitft-3-dot-5-touch-screen-for-raspberry-pi/easy-install
@@ -14,20 +12,24 @@ Lens I'm trying out now
 Blender file and printable stls in 3d folder
 
 
-
 ---------------||Installing||-----------------
 
-cd /home/pi && git clone https://bitbucket.org/rbckman/tarina.git
+1. sudo apt-get install git python-picamera python-imaging python-pexpect libav-tools gpac omxplayer sox cpufrequtils
 
-sudo apt-get update && sudo apt-get install python-pip 
+2. git clone https://rbckman@bitbucket.org/rbckman/tarina.git 
 
+3. put this line in the end of /etc/fstab
+tmpfs   /mnt/tmp    tmpfs   defaults    0 0
 
----------------||Configurations||---------------------
+4. python tarina.py
 
+more install instructions in INSTALL file
+
+---------------||Configurations||---------------------
 
 Booting to Tarina
 
-Raspbian Wheezy (with init)
+Raspbian Wheezy (init)
 
 1. nano /etc/inittab
 2. comment out line 54
@@ -43,7 +45,7 @@ if [ $(tty) == /dev/tty1 ]; then
    python tarina.py > /dev/tty2 2>err.log
 fi
 
-Raspbian Sid instructions (with systemd) soon...
+Raspbian Jessie instructions (systemd)
 
 
 ---------------||Couldn't have been done without these||-----------------------
@@ -59,9 +61,15 @@ Picamera python module
 Dave Jones, for the awesome picamera python module
 http://picamera.readthedocs.org
 
+Python programming language
+
 Tasanakorn for fbcp so you can preview on the pitft
 https://github.com/tasanakorn/rpi-fbcp
 
+Libav-tools (ffmpeg)
+
+GPac library with MP4Box
+
 Aplay
 The awesome wav player/recorder with VU meter
 http://alsa.opensrc.org/Aplay
@@ -70,6 +78,8 @@ Omxplayer
 Video player on the Raspberry pi
 https://github.com/huceke/omxplayer
 
+Sox
+
 Texy
 https://www.raspberrypi.org/forums/viewtopic.php?t=48967
 
diff --git a/tarina.py b/tarina.py
@@ -1288,7 +1288,10 @@ def main():
                 elif selected == 7:
                     camera.saturation = min(camera.saturation + 1, 99)
                 elif selected == 1:
-                    camera.shutter_speed = min(camera.shutter_speed + 210, 50000)
+                    if camera.shutter_speed < 5000:
+                        camera.shutter_speed = min(camera.shutter_speed + 50, 50000)
+                    else:
+                        camera.shutter_speed = min(camera.shutter_speed + 210, 50000)
                 elif selected == 2:
                     camera.iso = min(camera.iso + 100, 1600)
                 elif selected == 9:
@@ -1371,7 +1374,10 @@ def main():
                 elif selected == 7:
                     camera.saturation = max(camera.saturation - 1, -100)
                 elif selected == 1:
-                    camera.shutter_speed = max(camera.shutter_speed - 210, 200)
+                    if camera.shutter_speed < 5000:
+                        camera.shutter_speed = max(camera.shutter_speed - 50, 20)
+                    else:
+                        camera.shutter_speed = max(camera.shutter_speed - 200, 200)
                 elif selected == 2:
                     camera.iso = max(camera.iso - 100, 100)
                 elif selected == 9: