Moved reset logic to a single reset_lib.py which is accessed trhough bot manual_reset.py and the reset.py daemon function.

Author: jasbur

Reset Device/manual_reset.py

@@ -0,0 +1,3 @@
+import reset_lib
+
+reset_lib.reset_to_host_mode()

Reset Device/manual_reset.py.template

@@ -3,6 +3,7 @@
 import time
 import fileinput
 import subprocess
+import reset_lib
 
 GPIO.setmode(GPIO.BCM)
 GPIO.setup(18, GPIO.IN, pull_up_down=GPIO.PUD_DOWN)
@@ -33,16 +34,7 @@
         print(counter)
 
         if counter == 9:
-            os.system('aplay [[project_dir]]/Reset\ Device/button_chime.wav')
-            os.system('sudo rm -f /etc/wpa_supplicant/wpa_supplicant.conf')
-            os.system('rm -f /home/pi/Projects/RaspiWifi/tmp/*')
-            os.system('sudo cp -r [[project_dir]]/Reset\ Device/static_files/dhcpd.conf /etc/dhcp/')
-            os.system('sudo cp -r [[project_dir]]/Reset\ Device/static_files/hostapd.conf /etc/hostapd/')
-            os.system('sudo cp -r [[project_dir]]/Reset\ Device/static_files/interfaces.aphost /etc/network/interfaces')
-            os.system('sudo cp -r [[project_dir]]/Reset\ Device/static_files/isc-dhcp-server.aphost /etc/default/isc-dhcp-server')
-            os.system('rm /etc/cron.raspiwifi/apclient_bootstrapper')
-            os.system('sudo cp -r [[project_dir]]/Reset\ Device/static_files/aphost_bootstrapper /etc/cron.raspiwifi/')
-            os.system('sudo reboot')
+            reset_lib.reset_to_host_mode()
 
         if GPIO.input(18) == 0:
             counter = 0

Reset Device/reset.py.template Reset Device/reset.py

@@ -0,0 +1,13 @@
+import os
+
+def reset_to_host_mode():
+    os.system('aplay [[project_dir]]/Reset\ Device/button_chime.wav')
+    os.system('sudo rm -f /etc/wpa_supplicant/wpa_supplicant.conf')
+    os.system('rm -f /home/pi/Projects/RaspiWifi/tmp/*')
+    os.system('sudo cp -r [[project_dir]]/Reset\ Device/static_files/dhcpd.conf /etc/dhcp/')
+    os.system('sudo cp -r [[project_dir]]/Reset\ Device/static_files/hostapd.conf /etc/hostapd/')
+    os.system('sudo cp -r [[project_dir]]/Reset\ Device/static_files/interfaces.aphost /etc/network/interfaces')
+    os.system('sudo cp -r [[project_dir]]/Reset\ Device/static_files/isc-dhcp-server.aphost /etc/default/isc-dhcp-server')
+    os.system('rm /etc/cron.raspiwifi/apclient_bootstrapper')
+    os.system('sudo cp -r [[project_dir]]/Reset\ Device/static_files/aphost_bootstrapper /etc/cron.raspiwifi/')
+    os.system('sudo reboot')

Reset Device/reset_lib.py.template

@@ -6,7 +6,7 @@
 
 def install_prereqs():
 	project_path = os.path.dirname(os.path.abspath(__file__))
-	
+
 	os.system('clear')
 	os.system('apt update')
 	os.system('clear')
@@ -22,8 +22,7 @@ def update_config_paths():
 
 	os.system('sudo cp -a Reset\ Device/static_files/apclient_bootstrapper.template Reset\ Device/static_files/apclient_bootstrapper')
 	os.system('sudo cp -a Reset\ Device/static_files/aphost_bootstrapper.template Reset\ Device/static_files/aphost_bootstrapper')
-	os.system('sudo cp -a Reset\ Device/reset.py.template Reset\ Device/reset.py')
-	os.system('sudo cp -a Reset\ Device/manual_reset.py.template Reset\ Device/manual_reset.py')
+	os.system('sudo cp -a Reset\ Device/reset_lib.py.template Reset\ Device/reset_lib.py')
 
 	with fileinput.FileInput("Reset Device/static_files/aphost_bootstrapper", inplace=True) as file:
 		for line in file:
@@ -35,12 +34,7 @@ def update_config_paths():
 			print(line.replace("[[project_dir]]", project_path), end='')
 		file.close
 
-	with fileinput.FileInput("Reset Device/reset.py", inplace=True) as file:
-		for line in file:
-			print(line.replace("[[project_dir]]", project_path), end='')
-		file.close
-		
-	with fileinput.FileInput("Reset Device/manual_reset.py", inplace=True) as file:
+	with fileinput.FileInput("Reset Device/reset_lib.py", inplace=True) as file:
 		for line in file:
 			print(line.replace("[[project_dir]]", project_path), end='')
 		file.close