View difference between Paste ID: AAFHwFLr and dczbWQ0T

 # Pi Supply Soft Shutdown Script
-# Version 1.1
+# Version 1.2
 # Nathan Bookham 2013
 # Stephen Longhurst 2013
 
 # Import the modules to send commands to the system and access GPIO pins
 from subprocess import call
 import RPi.GPIO as gpio
-# Define a variable to store the pin number
+
-soft_shutdown_pin = 7 # Default pin for Pi Supply is 7
+# Define variables to store the pin numbers
 soft_shutdown_pin = 16 # Default pin for Pi Supply is 7
 keep_powered_pin = 18 # Default pin for Pi Supply is 8
 
-    call('halt', shell=False)
+
 def shutdown():
-gpio.setmode(gpio.BOARD) # Set pin numbering to board numbering
+    # Cleanup GPIO
-gpio.setup(soft_shutdown_pin, gpio.IN) # Set up pin 7 as an input
+    gpio.cleanup()
 
-gpio.wait_for_edge(soft_shutdown_pin, gpio.RISING) # Wait for input from button
+    # Shutdown with halt and power off in 1 minute
     call(['shutdown', '-hP','+1'], shell=False)
-shutdown() # Run the shutdown function
+
 # Set pin numbering to board numbering
 gpio.setmode(gpio.BOARD)
 
 # Setup the input Pin to wait on
 gpio.setup(soft_shutdown_pin, gpio.IN)
 
 # Pin to pull high to keep the Pi Supply giving us power
 gpio.setup(keep_powered_pin, gpio.OUT, initial=gpio.HIGH)
 
 # Run the shutdown function
 shutdown()