Kasiandra/pimo-scripts
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

add fixes

Browse source
This commit is contained in:
elektroll 2018-08-11 20:34:19 +02:00
parent 45f87ca66a
commit 3b7c0d54b2
6 changed files with 13 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
cam.jpg
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 132 KiB

After

Width:  |  Height:  |  Size: 633 KiB

Before After
Before After

4
effects/Vignette-1.sh
View file

@ -1,3 +1,7 @@
#!/bin/bash #!/bin/bash
<<<<<<< HEAD
composite -gravity center -resize 1251x1039 /home/pi/effects/grad_vignette_1.png /home/pi/cam.jpg /home/pi/DCIM/$(x="$(ls -v /home/pi/DCIM/| tail -n 1 | sed 's/.jpg//g')"; echo $x | awk '{printf $1 + 1}').jpg
=======
composite -gravity center -resize 3908x2602 grad_vignette_1.png /home/pi/cam.jpg /home/pi/DCIM/$(x="$(ls -v /home/pi/DCIM/| tail -n 1 | sed 's/.jpg//g')"; echo $x | awk '{printf $1 + 1}').jpg composite -gravity center -resize 3908x2602 grad_vignette_1.png /home/pi/cam.jpg /home/pi/DCIM/$(x="$(ls -v /home/pi/DCIM/| tail -n 1 | sed 's/.jpg//g')"; echo $x | awk '{printf $1 + 1}').jpg
>>>>>>> 45f87ca66a1f5f1055aadf6095918a1859c3e690

4
effects/Vignette-2.sh
View file

@ -1,2 +1,6 @@
#!/bin/bash #!/bin/bash
<<<<<<< HEAD
composite -gravity center -resize 1251x1039 /home/pi/effects/grad_vignette_2.png /home/pi/cam.jpg /home/pi/DCIM/$(x="$(ls -v /home/pi/DCIM/| tail -n 1 | sed 's/.jpg//g')"; echo $x | awk '{printf $1 + 1}').jpg
=======
composite -gravity center -resize 3908x2602 grad_vignette_2.png /home/pi/cam.jpg /home/pi/DCIM/$(x="$(ls -v /home/pi/DCIM/| tail -n 1 | sed 's/.jpg//g')"; echo $x | awk '{printf $1 + 1}').jpg composite -gravity center -resize 3908x2602 grad_vignette_2.png /home/pi/cam.jpg /home/pi/DCIM/$(x="$(ls -v /home/pi/DCIM/| tail -n 1 | sed 's/.jpg//g')"; echo $x | awk '{printf $1 + 1}').jpg
>>>>>>> 45f87ca66a1f5f1055aadf6095918a1859c3e690

BIN
effects/grad_vignette_1.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 566 KiB

After

Width:  |  Height:  |  Size: 183 KiB

Before After
Before After

BIN
effects/grad_vignette_2.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 562 KiB

After

Width:  |  Height:  |  Size: 177 KiB

Before After
Before After

6
switch.py
View file

@ -4,7 +4,7 @@ import subprocess
import os import os
import random import random
shell_list = ['/home/pi/effects/Gotham.sh', '/home/pi/effects/Lomo.sh', '/home/pi/effects/Lomo-vignette.sh', '/home/pi/effects/Nashville.sh', '/home/pi/effects/Redstone.sh', '/home/pi/effects/Toaster.sh', '/home/pi/effects/Vignette-1.sh', '/home/pi/effects/Vignette-2.sh', '/home/pi/effects/Vintage.sh'] shell_list = ['/home/pi/effects/Gotham.sh', '/home/pi/effects/Lomo.sh', '/home/pi/effects/Nashville.sh', '/home/pi/effects/Redstone.sh', '/home/pi/effects/Toaster.sh', '/home/pi/effects/Vignette-1.sh', '/home/pi/effects/Vignette-2.sh', '/home/pi/effects/Vintage.sh']
GPIO.setmode(GPIO.BCM) GPIO.setmode(GPIO.BCM)
@ -13,7 +13,11 @@ GPIO.setup(18, GPIO.IN, pull_up_down=GPIO.PUD_UP)
while True: while True:
input_state = GPIO.input(18) input_state = GPIO.input(18)
if input_state == False: if input_state == False:
<<<<<<< HEAD
subprocess.call(["raspistill","-n", "-w", "1251", "-h", "1039", "-ISO", "200", "-t", "1","-o", "cam.jpg"])
=======
subprocess.call(["touch","/home/pi/DCIM/0.jpg"]) subprocess.call(["touch","/home/pi/DCIM/0.jpg"])
subprocess.call(["raspistill","-n", "-w", "1251", "-h", "1039", "-vf", "-hf", "-ISO", "200", "-t", "1","-o", "cam.jpg"]) subprocess.call(["raspistill","-n", "-w", "1251", "-h", "1039", "-vf", "-hf", "-ISO", "200", "-t", "1","-o", "cam.jpg"])
>>>>>>> 45f87ca66a1f5f1055aadf6095918a1859c3e690
os.system(random.choice(shell_list)) os.system(random.choice(shell_list))
time.sleep(0.2) time.sleep(0.2)