From 5659c4be5c91d082c49a077ed417e4cc90377a32 Mon Sep 17 00:00:00 2001
From: Jordan-Fielding <107819004+Jordan-Fielding@users.noreply.github.com>
Date: Tue, 5 Jul 2022 14:25:45 +1000
Subject: [PATCH] Python GPIO Changes

---
 .idea/BugMotion.iml |  3 +++
 .idea/other.xml     |  7 +++++++
 main.py             | 45 ++++++++++++++++++++++-----------------------
 3 files changed, 32 insertions(+), 23 deletions(-)
 create mode 100644 .idea/other.xml

diff --git a/.idea/BugMotion.iml b/.idea/BugMotion.iml
index 2cdb1e3..77e413b 100644
--- a/.idea/BugMotion.iml
+++ b/.idea/BugMotion.iml
@@ -8,4 +8,7 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
+  <component name="PyDocumentationSettings">
+    <option name="renderExternalDocumentation" value="true" />
+  </component>
 </module>
\ No newline at end of file
diff --git a/.idea/other.xml b/.idea/other.xml
new file mode 100644
index 0000000..640fd80
--- /dev/null
+++ b/.idea/other.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="PySciProjectComponent">
+    <option name="PY_SCI_VIEW" value="true" />
+    <option name="PY_SCI_VIEW_SUGGESTED" value="true" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/main.py b/main.py
index 3285770..d6c4eff 100644
--- a/main.py
+++ b/main.py
@@ -1,31 +1,30 @@
-import RPi.GPIO as GPIO
-import time
-from picamera import PiCamera
+import RPi.GPIO as GPIO #Used to Import the LED
+import time #Used to allow wait times
+from picamera import PiCamera #Used to import the Camera
+from gpiozero import MotionSensor #Used to import the MotionSensor
 
-camera = PiCamera()
+pir = MotionSensor(4)
+camera = PiCamera() #Camera Initialization
 GPIO.setwarnings(False)
-GPIO.setmode(GPIO.BOARD)
-GPIO.setup(11, GPIO.IN)         #Read output from PIR motion sensor
-GPIO.setup(13, GPIO.OUT)         #LED output pin
+GPIO.setmode(GPIO.BCM) #Setting the GPIO Mode
+GPIO.setup(22, GPIO.OUT) #LED output pin
 
-i=GPIO.input(11)
 
-time.sleep(2) # to stabilize sensor
+
+time.sleep(2) # to stabilize sensor and Camera
 while True:
-    #ts = time.time()
-    #st = datetime.datetime.fromtimestamp(ts).strftime('%Y-%m-%d_%H:%M:%S')
-    if i==0:                 #When output from motion sensor is LOW
-        print ("No bugs detected",i)
-        GPIO.output(13, 0)  #Turn OFF LED
-        time.sleep(2)
-    if i==1:               #When output from motion sensor is HIGH
-        print("bugs detected",i)
-        GPIO.output(13, 1)  #Turn ON LED
-        camera.capture('/home/pi/Pictures/img.jpg')
-        print("Photo Saved")
-        #os.system('libcamera-jpeg -o /home/pi/Pictures/image_Time_{}.jpg'.format(st))
-        camera.close()  #Capture an Image
-        time.sleep(2)
+
+    pir.wait_for_motion()
+    print("Bug detected")
+    GPIO.output(22, 1)
+    file_name = "/home/qldcomp/Pictures/img_" + str(time.time()) + ".jpg"
+    camera.capture_sequence(file_name)
+    pir.wait_for_no_motion()
+    time.sleep(1)
+    GPIO.output(22, 0)
+    print("Bug Not Detected")
+
+