add fixes
This commit is contained in:
parent
45f87ca66a
commit
3b7c0d54b2
6 changed files with 13 additions and 1 deletions
|
|
@ -4,7 +4,7 @@ import subprocess
|
|||
import os
|
||||
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)
|
||||
|
||||
|
|
@ -13,7 +13,11 @@ 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)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue