This commit is contained in:
elektroll 2018-08-11 20:43:31 +02:00
parent 3b7c0d54b2
commit 89f1295eb4
5 changed files with 2 additions and 13 deletions

View file

2
effects/Gotham.sh2 Normal file
View file

@ -0,0 +1,2 @@
#!/bin/bash
convert /home/elektroll/git/PiMo/cam.jpg -modulate 120,10,100 -fill '#222b6d' -colorize 20 -gamma 0.5 /home/elektroll/git/PiMo/DCIM/$(x="$(ls -v /home/elektroll/git/PiMo/DCIM/| tail -n 1 | sed 's/.jpg//g')"; echo $x+1 | bc).jpg

View file

@ -1,7 +1,3 @@
#!/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
>>>>>>> 45f87ca66a1f5f1055aadf6095918a1859c3e690

View file

@ -1,6 +1,2 @@
#!/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
>>>>>>> 45f87ca66a1f5f1055aadf6095918a1859c3e690

View file

@ -13,11 +13,6 @@ GPIO.setup(18, GPIO.IN, pull_up_down=GPIO.PUD_UP)
while True:
input_state = GPIO.input(18)
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(["raspistill","-n", "-w", "1251", "-h", "1039", "-vf", "-hf", "-ISO", "200", "-t", "1","-o", "cam.jpg"])
>>>>>>> 45f87ca66a1f5f1055aadf6095918a1859c3e690
os.system(random.choice(shell_list))
time.sleep(0.2)