Merge pull request #3 from RBEGamer/master

added power off and gitignore

.gitignore

@@ -1,3 +1,12 @@
-
+OP_1_Backup_Library/
+.DS_Store
+*.pyc
+.DS_Store
+.idea/misc.xml
+.idea/modules.xml
+.idea/OP1_File_Organizer.iml
+.idea/workspace.xml
+.idea/misc.xml
+.idea/modules.xml
+.idea/OP1_File_Organizer.iml
 .DS_Store
-*.pyc

Menu_Page_Router.py

@@ -3,6 +3,7 @@
 import time
 from os.path import basename, isdir
 from shutil import rmtree
+from subprocess import call
 
 from PIL import Image, ImageDraw
 from smbus2 import smbus2
@@ -157,6 +158,13 @@ def actionRouter(self, event):
             except:
                 print("Error")
             self.renderPage(-1, 1)
+        # ========= POWER OFF ====================
+        if event == "act_POWER_OFF":
+            image = Image.new('1', (128, 64))
+            image.paste(Image.open(workDir + "/Assets/Img/PowerOff.png").convert("1"))
+            displayImage(image)
+            time.sleep(1.0)
+            call("sudo shutdown -h now", shell=True)
 
         if event == "checkStorage":
             if check_OP_1_Connection() and config["OP_1_Mounted_Dir"] != "":

OP_1_Connection.py

@@ -124,14 +124,13 @@ def check_OP_1_Connection():
 
 
 def unmount_OP_1():
-    if config["OP_1_Mounted_Dir"] != "":
+    if is_mounted():
         unmountDisplay = Image.new('1', (128, 64))
         draw = ImageDraw.Draw(unmountDisplay)
         draw.text((30, 25), "Ejecting!", font=getFont(), fill='white')
         displayImage(unmountDisplay)
 
-        cmd = "sudo umount " + config["OP_1_Mounted_Dir"]
-        os.system(cmd)
+        unmountdevice(config["OP_1_Mounted_Dir"])
 
         config["OP_1_Mounted_Dir"] = ""
         config["USB_Mount_Path"] = ""

menu_structure.py

@@ -18,7 +18,7 @@
     ["Mount OP1", "act_ESC_Mount_OP_1"],
     ["Eject OP-1", "act_ESC_Eject_OP_1"]
     ["MIDI Host", MIDI],
-    ["Remove All User Data", "Remove all Data"]
+    ["Power Off System", "act_POWER_OFF"],
 ]
 
 # PresetPage = [
@@ -71,6 +71,5 @@
     ["Patches", PatchesPage],
     ["SSH Transfer", SSHPage],
     ["Utilities", Utilities],
-    ["Eject", "act_ESC_Eject_OP_1"]
 ]
 

run.py

@@ -27,10 +27,6 @@ def start():
     pg.renderPage(0, currentCursor)
 
     while 1:         
-        if not is_connected():
-            print("Disconnected, try to reconnect")
-            do_mount()
-            time.sleep(1)
 
         key = checkKeyInterrupt()