Merge pull request #143 from madgrizzle/master

Update to latest stable from madgrizzle repo

Author: madgrizzle

Connection/serialPortThread.py

@@ -177,6 +177,8 @@ def managePause(self, line):
             self.data.uploadFlag = -1
             self.data.pausedUnits = self.data.units
             self.data.ui_queue1.put("Action", "setAsResume", "")
+            # clear machine out of pause mode
+            self.data.quick_queue.put("~")
 
     def manageToolChange(self, line):
         if line.find("M6 ") != -1 or line.find("M06") != -1:

DataStructures/data.py

@@ -38,7 +38,7 @@ class Data:
     Version Updater
     '''
     lastChecked = -1
-    pyInstallCurrentVersion = 0.9335
+    pyInstallCurrentVersion = 0.94
     pyInstallUpdateAvailable = False
     pyInstallUpdateBrowserUrl = ""
     pyInstallUpdateVersion = 0
@@ -187,7 +187,7 @@ class Data:
     """
     bufferSize = 127
 
-    pausedzval = 0.0
+    pausedzval = None
     pausedPositioningMode = 0
     pausedUnits = "INCHES"
 

HelpManager/helpManager.py

@@ -27,7 +27,7 @@ def checkForUpdatedHelp(self):
     def getHelpPages(self):
         return None
         g = Github()
-        self.repo = g.get_repo("madgrizzle/WebControl")
+        self.repo = g.get_repo("WebControlCNC/WebControl")
         contents = self.repo.get_contents("docs")
         pages = []
         while contents:

ReleaseManager/releaseManager.py

@@ -41,7 +41,7 @@ def checkForLatestPyRelease(self):
             try:
                 enableExperimental = self.data.config.getValue("WebControl Settings", "experimentalReleases")
                 g = Github()
-                repo = g.get_repo("madgrizzle/WebControl")
+                repo = g.get_repo("WebControlCNC/WebControl")
                 self.releases = repo.get_releases()
                 latestVersionGithub = 0
                 self.latestRelease = None

main.py

@@ -7,8 +7,8 @@
 import os
 import sys
 
-monkey.patch_all()
 
+monkey.patch_all()
 
 import schedule
 import time

templates/base.html

@@ -80,7 +80,7 @@
           </a>
           <div class="dropdown-menu" aria-labelledby="navbarDropdown4">
             <a class="dropdown-item" href="#" onclick="requestPage('gettingStarted');">Getting Started</a>
-            <a class="dropdown-item" href="https://madgrizzle.github.io/WebControl/" target="_blank">Online Help</a>
+            <a class="dropdown-item" href="https://webcontrolcnc.github.io/WebControl/" target="_blank">Online Help</a>
             <a class="dropdown-item" href="#" onclick="requestPage('help');">Offline Help</a>
             <a class="dropdown-item" href="#" onclick="requestPage('about');">About</a>
             <span id="updateBadge" class="badge badge-pill badge-primary" style="float:left;margin-bottom:-10px;"></span>