Merge pull request #44 from madgrizzle/homeRework

Home rework

Author: madgrizzle

Actions/actions.py

@@ -0,0 +1,29 @@
+from __main__ import socketio
+
+import time
+
+
+class LogStreamer:
+    app = None
+
+    def start(self, _app):
+        self.app = _app
+        self.app.data.console_queue.put("starting log streamer")
+
+        with self.app.app_context():
+            while True:
+                time.sleep(0.001)
+                while (
+                        not self.app.data.alog_streamer_queue.empty() or not self.app.data.log_streamer_queue.empty()):  # if there is new data to be read
+                    if not self.app.data.alog_streamer_queue.empty():
+                        message = self.app.data.alog_streamer_queue.get()
+                        if message != "":
+                            socketio.emit("message", {"log": "alog", "data": message, "dataFormat": "text"},
+                                          namespace="/MaslowCNCLogs", )
+                    if not self.app.data.log_streamer_queue.empty():
+                        message = self.app.data.log_streamer_queue.get()
+                        if message != "":
+                            socketio.emit("message", {"log": "log", "data": message, "dataFormat": "text"},
+                                          namespace="/MaslowCNCLogs", )
+
+

Background/LogStreamer.py

@@ -17,7 +17,7 @@ def start(self):
             # check for available update file
             if time.time()-self.data.lastChecked > 60*60:
                 self.data.lastChecked = time.time()
-                self.data.actions.checkForLatestPyRelease()
+                self.data.releaseManager.checkForLatestPyRelease()
             while (
                 not self.data.message_queue.empty()
             ):  # if there is new data to be read

Background/UIProcessor.py

@@ -17,6 +17,7 @@
 from Background.WebMCPProcessor import ConsoleProcessor
 from Background.webcamVideoStream import WebcamVideoStream
 from Boards.boardManager import BoardManager
+from ReleaseManager.releaseManager import ReleaseManager
 
 class NonVisibleWidgets(MakesmithInitFuncs):
     """
@@ -40,6 +41,7 @@ class NonVisibleWidgets(MakesmithInitFuncs):
     camera = WebcamVideoStream()
     gpioActions = GPIOActions()
     boardManager = BoardManager()
+    releaseManager = ReleaseManager()
 
     def setUpData(self, data):
         """
@@ -69,6 +71,7 @@ def setUpData(self, data):
         data.camera = self.camera
         data.gpioActions = self.gpioActions
         data.boardManager = self.boardManager
+        data.releaseManager = self.releaseManager
 
         if hasattr(sys, '_MEIPASS'):
             data.platform = "PYINSTALLER"
@@ -122,6 +125,7 @@ def setUpData(self, data):
         self.gpioActions.setup()
         self.boardManager.setUpData(data)
         self.boardManager.initializeNewBoard()
+        self.releaseManager.setUpData(data)
 
         #set up kinematics with current settings
         self.holeyKinematics.initializeSettings()

Background/messageProcessor.py

@@ -110,7 +110,11 @@ def sendNextLine(self):
                 line = self.data.gcode[self.data.gcodeIndex]
                 filtersparsed = re.sub(r'\(([^)]*)\)', '', line)  # replace mach3 style gcode comments with newline
                 line = re.sub(r';([^.]*)?', '',filtersparsed)  # replace standard ; initiated gcode comments with newline
+                # put gcode home shift here
+
+
                 if not line.isspace(): # if all spaces, don't send.  likely a comment.
+                    line = self.data.gcodeFile.moveLine(line)
                     self._write(line)
                     if line.find("G20") != -1:
                         if self.data.units != "INCHES":

Connection/nonVisibleWidgets.py

@@ -38,7 +38,7 @@ class Data:
     Version Updater
     '''
     lastChecked = -1
-    pyInstallCurrentVersion = 0.913
+    pyInstallCurrentVersion = 0.914
     pyInstallUpdateAvailable = False
     pyInstallUpdateBrowserUrl = ""
     pyInstallUpdateVersion = 0
@@ -139,6 +139,8 @@ class Data:
     message_queue = LoggingQueue(logger)
     ui_controller_queue = queue.Queue()
     ui_queue1 = UIQueue()
+    alog_streamer_queue = queue.Queue(1000)  # used for sending log to client screen.. limit to 1000 "items"
+    log_streamer_queue = queue.Queue(1000) # used for sending log to client screen.. limit to 1000 "items"
     console_queue = queue.Queue() # used for printing to terminal
     mcp_queue = queue.Queue () # used for sending messages to WebMCP(if enabled)
     webMCPActive = False  # start false until WebMCP connects

Connection/serialPortThread.py

@@ -58,6 +58,14 @@ def resetIdler(self):
     def setLoggingTimeout(self, timeOut):
         self.loggingTimeout = timeOut
 
+    def addToMessageBuffer(self,message):
+        self.messageBuffer += message
+        self.data.log_streamer_queue.put(message)
+
+    def addToaMessageBuffer(self,message):
+        self.amessageBuffer += message
+        self.data.alog_streamer_queue.put(message)
+
     def writeToLog(self, message):
 
         """
@@ -75,26 +83,26 @@ def writeToLog(self, message):
         dateTime = datetime.datetime.fromtimestamp(currentTime).strftime('%Y-%m-%d %H:%M:%S')
         if self.loggingTimeout > 0 and self.data.uploadFlag == 0 and currentTime-self.idler > self.loggingTimeout:
             if not self.suspendLogging:
-                self.messageBuffer += logTime + ": " + "Logging suspended due to user idle time > "+str(self.loggingTimeout)+" seconds\n"
+                self.addToMessageBuffer(logTime + ": " + "Logging suspended due to user idle time > "+str(self.loggingTimeout)+" seconds\n")
                 self.suspendLogging = True
         else:
             if self.suspendLogging:
-                self.messageBuffer += logTime + ": " + "Logging resumed due to user activity\n"
+                self.addToMessageBuffer(logTime + ": " + "Logging resumed due to user activity\n")
                 self.suspendLogging = False
 
         if message[0] != "<" and message[0] != "[":
             try:
                 tmessage = message.rstrip('\r\n')
-                self.amessageBuffer += logTime+": " + tmessage+"\n"
+                self.addToaMessageBuffer(logTime+": " + tmessage+"\n")
                 if not self.suspendLogging:
-                    self.messageBuffer += logTime+": " + tmessage+"\n"
+                    self.addToMessageBuffer(logTime+": " + tmessage+"\n")
             except:
                 pass
         else:
             try:
                 if not self.suspendLogging:
                     tmessage = message.rstrip('\r\n')
-                    self.messageBuffer += logTime+": "+ tmessage+"\n"
+                    self.addToMessageBuffer(logTime+": "+ tmessage+"\n")
             except:
                 pass
 

DataStructures/data.py

@@ -56,8 +56,7 @@ def saveFile(self, fileName, directory):
             gfile = open(fileToWrite, "w+")
             print(fileToWrite)
             for line in self.data.gcode:
-                newLine = self.data.gcodeFile.moveLine(line, True, homeX, homeY)
-                gfile.write(newLine+'\n')
+                gfile.write(line+'\n')
             #gfile = open(directory+fileName, "w+")
             #gfile.writelines(map(lambda s: s+ '\n', self.data.gcode))
             print("Closing File")
@@ -73,7 +72,9 @@ def saveFile(self, fileName, directory):
 
 
     def loadUpdateFile(self, gcode=""):
-        #print(gcode)
+        gcodeLoad = False
+        if gcode=="":
+            gcodeLoad = True
         if self.data.units == "MM":
             self.canvasScaleFactor = self.MILLIMETERS
         else:
@@ -174,6 +175,7 @@ def loadUpdateFile(self, gcode=""):
             return False
         self.updateGcode()
         self.data.gcodeFile.isChanged = True
+        self.data.actions.sendGCodePositionUpdate(self.data.gcodeIndex, recalculate=True)
         return True
 
     def isClose(self, a, b):
@@ -248,12 +250,7 @@ def drawLine(self, gCodeLine, command):
                     self.addPoint3D(xTarget, yTarget, zTarget)
 
                 else:
-                    if (
-                        len(self.line3D) == 0
-                        or self.line3D[-1].dashed
-                        or self.line3D[-1].type != "line"
-                    ):
-
+                    if (len(self.line3D) == 0 or self.line3D[-1].dashed or self.line3D[-1].type != "line"):  #test123
                         self.line3D.append( Line() )
                         self.line3D[-1].type = "line"
                         self.addPoint3D(self.xPosition, self.yPosition, self.zPosition)
@@ -393,22 +390,13 @@ def clearGcodeFile(self):
 
 
 
-    def moveLine(self, gCodeLine, dehome = False, homeX=0, homeY=0):
+    def moveLine(self, gCodeLine):
 
         originalLine = gCodeLine
-        if dehome:
-            shiftX = -homeX
-            shiftY = -homeY
-        else:
-            shiftX = self.data.gcodeShift[0]
-            shiftY = self.data.gcodeShift[1]
-
-        #print("original:"+gCodeLine)
-        #first check for full comment lines
+        shiftX = self.data.gcodeShift[0]
+        shiftY = self.data.gcodeShift[1]
         if len(gCodeLine) > 0:
             if gCodeLine[0] == '(' or gCodeLine[0] == ';':
-                #comment lines
-                #print("comment:"+originalLine)
                 return originalLine
         #next check for comment after line and if exist, split on first occurrence and retain the comment portion
         findexA = gCodeLine.find('(')
@@ -425,7 +413,6 @@ def moveLine(self, gCodeLine, dehome = False, homeX=0, homeY=0):
             #print("comment:"+comment)
             gCodeLine = gCodeLine[:findex]
 
-
         #This test should always pass so taking it out
         #if gCodeLine.find("(") == -1 and gCodeLine.find(";") == -1:
         if True:
@@ -495,9 +482,6 @@ def loadNextLine(self):
         """
 
         try:
-            self.data.gcode[self.lineNumber] = self.moveLine(
-                self.data.gcode[self.lineNumber]
-            )  # move the line if the gcode has been moved
             fullString = self.data.gcode[self.lineNumber]
         except:
             return  # we have reached the end of the file
@@ -622,10 +606,12 @@ def updateGcode(self):
         else:
             scaleFactor = 1/25.4;
         #before, gcode shift = home X
-        #self.xPosition = self.data.gcodeShift[0] * scaleFactor
-        #self.yPosition = self.data.gcodeShift[1] * scaleFactor
-        self.xPosition = float(self.data.config.getValue("Advanced Settings", "homeX")) * scaleFactor
-        self.yPosition = float(self.data.config.getValue("Advanced Settings", "homeY")) * scaleFactor
+        #old #self.xPosition = self.data.gcodeShift[0] * scaleFactor
+        #old #self.yPosition = self.data.gcodeShift[1] * scaleFactor
+        #self.xPosition = float(self.data.config.getValue("Advanced Settings", "homeX")) * scaleFactor #test123
+        #self.yPosition = float(self.data.config.getValue("Advanced Settings", "homeY")) * scaleFactor #test123
+        self.xPosition = 0
+        self.yPosition = 0
         self.zPosition = 0
 
         self.prependString = "G00 "