work on windows shutdown

Author: madgrizzle

Actions/actions.py

@@ -234,8 +234,12 @@ def processAction(self, msg):
 
     def shutdown(self):
         try:
-            self.data.ui_queue1.put("WebMCP","shutdown","")
-            return True
+            print(self.data.platform)
+            if self.data.platform == "WIN":
+                os._exit(0)
+            else:
+                self.data.ui_queue1.put("WebMCP", "shutdown", "")
+                return True
         except Exception as e:
             self.data.console_queue.put(str(e))
             return False
@@ -968,9 +972,9 @@ def processSettingRequest(self, section, setting):
 
     def upgradeFirmware(self, version):
         try:
-            if hasattr(sys, '_MEIPASS'):
-                home = os.path.join(sys._MEIPASS)
-                print(home)
+            if self.data.platform == "WIN":
+                home = os.path.join(self.data.platformHome)
+                #print(home)
             else:
                 home = ""
             if version == 0:

Connection/nonVisibleWidgets.py

@@ -1,3 +1,5 @@
+import sys
+import os
 from DataStructures.makesmithInitFuncs import MakesmithInitFuncs
 from Connection.serialPort import SerialPort
 from File.gcodeFile import GCodeFile
@@ -66,6 +68,10 @@ def setUpData(self, data):
         data.gpioActions = self.gpioActions
         data.boardManager = self.boardManager
 
+        if hasattr(sys, '_MEIPASS'):
+            data.platform = "WIN"
+            data.platformHome = sys._MEIPASS
+
         self.serialPort.setUpData(data)
         self.gcodeFile.setUpData(data)
         self.importFile.setUpData(data)

DataStructures/data.py

@@ -181,6 +181,8 @@ class Data:
     shutdown = False
 
     hostAddress = "-"
+    platform = "RPI"
+    platformHome = ""
 
     def __init__(self):
         """

config/config.py

@@ -573,21 +573,21 @@ def computeSettings(self, section, key, value, doAll=False):
                     self.setValue("Computed Settings", "fPWMComputed", 3, True)
 
     def parseFirmwareVersions(self):
-        home = ""
+        home = "."
         if hasattr(sys, '_MEIPASS'):
             home = os.path.join(sys._MEIPASS)
             print(self.home)
-        path = home+"firmware/madgrizzle/*.hex"
+        path = home+"/firmware/madgrizzle/*.hex"
         for filename in glob.glob(path):
             version = filename.split("-")
             version = version[1].split(".hex")
             self.data.customFirmwareVersion = version[0]
-        path = home+"firmware/maslowcnc/*.hex"
+        path = home+"/firmware/maslowcnc/*.hex"
         for filename in glob.glob(path):
             version = filename.split("-")
             version = version[1].split(".hex")
             self.data.stockFirmwareVersion = version[0]
-        path = home+"firmware/holey/*.hex"
+        path = home+"/firmware/holey/*.hex"
         for filename in glob.glob(path):
             version = filename.split("-")
             version = version[1].split(".hex")