commit d4368d3a9e21aa89d99b0e13a44cc72f29115e00
parent fec46b212f15f581442f0b7dd3c9e714c80d24b1
Author: rob <rob@tarina.org>
Date: Thu, 28 Dec 2023 09:39:10 +0200
merge
Diffstat:
5 files changed, 28 insertions(+), 18 deletions(-)
diff --git a/INSTALL.md b/INSTALL.md
@@ -1,10 +0,0 @@
-## Tarina install instructions ##
-
-Run the automatic install script with sudo:
-```
-sudo ./install.sh
-```
-you are done! now reboot & Tarina will start at bootup:
-```
-sudo reboot
-```
diff --git a/README.md b/README.md
@@ -1,20 +1,32 @@
Gonzo Pi
=============
+<<<<<<< HEAD
Go Gonzo with the Ultimate Filmmaking Device!
How to build and use it here [https://github.com/rbckman/gonzopi_build](https://github.com/rbckman/gonzopi_build)
+=======
+Turn a Raspberry Pi to the Ultimate Filmmaking Device!
+
+Demonstration of the device here [https://github.com/rbckman/gonzopi_build](https://github.com/rbckman/gonzopi_build)
+
+No, need to build custom case, or buttons, this will work with a Raspberry Pi and any of it's camera modules, usb keyboards and usb audio cards, a regular hdmi display should also be fine.
+
+If you want to build it, there's a complete guide here [https://github.com/rbckman/gonzopi_build/blob/master/gonzopi-manual.md#building-repairing-and-modding](https://github.com/rbckman/gonzopi_build/blob/master/gonzopi-manual.md#building-repairing-and-modding)
+
+If you want to order a prebuilt device contact go(at)gonzopi.org (only preorders now)
+>>>>>>> 32c849051bc25683e63d0f3dc05db5d2835d809e
Software
--------
- glue selected clips together and/or cutting them.
-- making timelapses, voiceover, music track recording, slo-mo recording, fast-forward recording
+- making timelapses, stop-motion, voiceover, music track recording, slo-mo recording, fast-forward recording
- cut and copy and move clips around
- backup to usb harddrive or your own server
- upload or stream to youtube or your own server
- auto correction can easily be switched on or off for shutter, iso and colors so *operator* is in full control also for audio levels
-- connect many Tarinas together for multicamera shooting
+- connect many GonzoPis together for multicamera shooting
- stream a film a take or a scene through the network
-- control the camera with silent physical buttons or a usb-wireless-keyboard or through https or ssh or ports, you choose.
+- control the camera with silent physical buttons or a usb-wireless-keyboard or through a built in apache2 web server or ssh or ports, you choose how to go gonzo just the way you like it
### Buttons
![Buttons](/extras/buttons.png)
@@ -45,5 +57,5 @@ Connect
-------
Matrix [#tarina:matrix.tarina.org](https://riot.im/app/#/room/#tarina:matrix.tarina.org)
-Mail rob(at)tarina.org
+Mail rob(at)gonzopi.org
diff --git a/VERSION b/VERSION
@@ -1,2 +1,2 @@
-1.43
+1.44
Jackson
diff --git a/extras/gonzopi-gui.jpeg b/extras/gonzopi-gui.jpeg
Binary files differ.
diff --git a/gonzopi.py b/gonzopi.py
@@ -1325,7 +1325,10 @@ def main():
flip = 'yes'
time.sleep(0.2)
elif menu[selected] == 'LENGTH:':
- reclenght = reclenght + 1
+ if reclenght < 1:
+ reclenght = reclenght + 0.2
+ else:
+ reclenght = int(reclenght + 1)
time.sleep(0.1)
elif menu[selected] == 'MIC:':
if miclevel < 100:
@@ -1483,9 +1486,14 @@ def main():
flip = 'yes'
time.sleep(0.2)
elif menu[selected] == 'LENGTH:':
- if reclenght > 0:
- reclenght = reclenght - 1
+ if reclenght > 1:
+ reclenght = int(reclenght - 1)
+ time.sleep(0.1)
+ elif reclenght > 0.3:
+ reclenght = reclenght - 0.2
time.sleep(0.1)
+ else:
+ reclenght = 0
elif menu[selected] == 'MIC:':
if miclevel > 0:
miclevel = miclevel - 2