commit 3a31de180cd51f061396731de866762d79dfd89e
parent 00b7291b4d80af804470eebe0b15356330d304d7
Author: rbckman <rbckman@localhost.localdomain>
Date: Wed, 2 Nov 2016 22:49:01 +0200
Merge branch 'master' of https://github.com/rbckman/tarina
Diffstat:
2 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
# Tarina ♥ filmmaking #
-### The camera for filmmakers, vloggers, travellers & hackers ###
-You film, Tarina puts the pieces together and, voilá!, you have a movie! Shoot your films as takes, shots and scenes, and see your film come together on the go. Once you get it there’s no need for editing later. Tarina is built upon hardware easily changeable and is designed to be 3D printed. Running on a Gnu/Linux Raspbian distribution and with easy python coded interface.
+### DIY camera for filmmakers, vloggers, travellers & hackers ###
+You film, Tarina puts the pieces together and, voilá!, you have a movie! Shoot your films as takes, shots and scenes, and see your film come together on the go. Once you get it there’s no need for editing later. Tarina is designed to be taken apart & easily modded with allbody parts 3d printable. It's built using the Raspberry Pi, running on a Gnu/Linux Raspbian distribution and with an easy python coded interface.
## Hardware ##
[Raspberry Pi 3](https://www.raspberrypi.org/products/raspberry-pi-3-model-b/) and a [Pi Camera module v2.1 Sony IMX219 8-megapixel sensor](https://www.raspberrypi.org/products/camera-module-v2/), & [U-Geek Raspberry Pi 3.5 inch 800*480 TFT Screen](https://www.aliexpress.com/store/product/U-Geek-Raspberry-Pi-3-5-inch-800-480-TFT-Screen-HD-HighSpeed-LCD-Module-3/1954241_32672157641.html) & [USB via vt1620a Sound card](https://www.aliexpress.com/item/Professional-External-USB-Sound-Card-Adapter-Virtual-7-1-Channel-3D-Audio-with-3-5mm-Headset/32588038556.html?spm=2114.01010208.8.8.E8ZKLB) & [9000mAh li-ion Battery](https://www.aliexpress.com/item/3-7v-9000mAh-capacity-18650-Rechargeable-lithium-battery-pack-18650-jump-starter/32619902319.html?spm=2114.13010608.0.0.XcKleV) (10 hours filming) & [USB Mobile Power Charger Board Module 3.7V to 5V 1A/2A Booster Converter](http://www.ebay.com/itm/321977677010?_trksid=p2057872.m2749.l2649&ssPageName=STRK%3AMEBIDX%3AIT)
@@ -9,7 +9,7 @@ It should also work with Raspberry pi 2 and the pi camera module v1.3 and any ot
Build wiki and part list at http://tarina.org
-3d printable stls in [3d folder](https://bitbucket.org/rbckman/tarina)
+Ready to print stls in [3d folder](https://github.com/rbckman/tarina/tree/master/3d)
## Software ##
### Installing ###
@@ -32,18 +32,19 @@ sudo ./install.sh
## Couldn't have been done without these ##
Sending <3 to all
+Debian
+http://debian.org
+
Raspberry Pi
http://raspberrypi.org
-Adafruit
-https://learn.adafruit.com/adafruit-pitft-3-dot-5-touch-screen-for-raspberry-pi/overview
+Python programming language
+http://python.org
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
@@ -51,7 +52,7 @@ Libav-tools (ffmpeg)
GPac library with MP4Box
-Aplay
+aplay
The awesome wav player/recorder with VU meter
http://alsa.opensrc.org/Aplay
@@ -59,10 +60,16 @@ Omxplayer
Video player on the Raspberry pi
https://github.com/huceke/omxplayer
+Python-omxplayer-wrapper
+Will Price
+https://github.com/willprice/python-omxplayer-wrapper
+
Sox
Texy
https://www.raspberrypi.org/forums/viewtopic.php?t=48967
The Dispmanx library
-https://github.com/raspberrypi/userland/tree/master/host_applications/linux/apps/hello_pi
-\ No newline at end of file
+https://github.com/raspberrypi/userland/tree/master/host_applications/linux/apps/hello_pi
+
+### & many, many more projects! peace out...
diff --git a/tarina.py b/tarina.py
@@ -1,7 +1,7 @@
#/usr/bin/env python
# -*- coding: utf-8 -*-
-#Tarina - Raspberry pi filmmaking interface.
+#Tarina - The DIY camera for filmmakers, vloggers, travellers & hackers.
#Copyright (C) 2016 Robin Bäckman
#This program is free software: you can redistribute it and/or modify
@@ -38,10 +38,6 @@ from PIL import Image
#GPIO.setup(26, GPIO.IN, pull_up_down=GPIO.PUD_UP)
#GPIO.setup(22, GPIO.IN, pull_up_down=GPIO.PUD_UP)
-os.system('clear')
-
-print "Tarina Copyright (C) 2016 Robin Bäckman\nThis program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.\nThis is free software, and you are welcome to redistribute it\nunder certain conditions; type `show c' for details."
-
#--------------Save settings-----------------
def savesetting(brightness, contrast, saturation, shutter_speed, iso, awb_mode, awb_gains, awb_lock, miclevel, headphoneslevel, filmfolder, filmname, scene, shot, take, thefile, beeps, flip, renderedshots):
