added suspend indicator to logging page

Author: madgrizzle

Background/LogStreamer.py

@@ -16,23 +16,31 @@ def start(self, _app):
         self.app = _app
         self.app.data.console_queue.put("Starting Log Streamer")
 
+        timeSinceLastLoggerState = time.time()
         with self.app.app_context():
             while True:
                 # this sleep function is needed to keep it non-blocking.
                 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 there is new data to be read
+                loggerState = self.app.data.logger.getLoggerState()
+                while (not self.app.data.alog_streamer_queue.empty() or not self.app.data.log_streamer_queue.empty()):
                     # process a line from the alog queue
                     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", )
+                            socketio.emit("message", {"log": "alog", "data": message, "state": loggerState,
+                                                      "dataFormat": "text"}, namespace="/MaslowCNCLogs", )
+                            timeSinceLastLoggerState = time.time()
                     # process a line from the log queue
                     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", )
-
+                            socketio.emit("message", {"log": "log", "data": message, "state": loggerState,
+                                                      "dataFormat": "text"}, namespace="/MaslowCNCLogs", )
+                            timeSinceLastLoggerState = time.time()
+                currentTime = time.time()
+                if currentTime - timeSinceLastLoggerState > 5:
+                    socketio.emit("message", {"log": "state", "state": loggerState, "dataFormat":"text"},
+                                  namespace="/MaslowCNCLogs", )
+                    timeSinceLastLoggerState = currentTime
 

DataStructures/logger.py

@@ -55,6 +55,13 @@ def __init__(self):
     def resetIdler(self):
         self.idler = time.time()
 
+    def getLoggerState(self):
+        '''
+        Returns the state of the logger
+        :return:
+        '''
+        return self.suspendLogging
+
     def setLoggingTimeout(self, timeOut):
         self.loggingTimeout = timeOut
 
@@ -82,7 +89,7 @@ def writeToLog(self, message):
 
         """
         if self.loggingTimeout == -1: #get setting for suspend time
-            self.loggingTimeout = self.data.config.get("WebControl Settings","loggingTimeout")
+            self.loggingTimeout = self.data.config.get("WebControl Settings", "loggingTimeout")
         currentTime = time.time()
         logTime = "{:0.2f}".format(currentTime-self.logStartTime)
         dateTime = datetime.datetime.fromtimestamp(currentTime).strftime('%Y-%m-%d %H:%M:%S')

static/scripts/logs.js

@@ -3,6 +3,7 @@ var alogMessages = [];
 var logMessages = [];
 var alogEnabled = true;
 var logEnabled = true;
+var loggingState = false;
 
 $(document).ready(function(){
   namespace = '/MaslowCNCLogs'; // change to an empty string to use the global namespace
@@ -42,11 +43,19 @@ function setListeners(){
         case 'alog':
             if (alogEnabled)
                 processalog(msg.data);
+                processLoggingState(msg.state);
             break;
         case 'log':
             if (logEnabled)
                 processlog(msg.data);
+                processLoggingState(msg.state);
             break;
+        case 'state':
+            if (loggingState != msg.state){
+                processLoggingState(msg.state);
+                break;
+            }
+
         default:
             console.log("!!!!!!");
             console.log("uncaught action:"+msg.command);
@@ -66,6 +75,8 @@ function processalog(data){
     $('#alogMessages').append(document.createTextNode(data));
     $('#alogMessages').append("<br>");
     $('#alogMessages').scrollBottom();
+
+
 }
 
 function processlog(data){
@@ -82,6 +93,20 @@ function processlog(data){
     $('#logMessages').scrollBottom();
 }
 
+function processLoggingState(data){
+    if (data)
+    {
+        $("#loggingState").text("Logging Suspended");
+        $("#loggingState").removeClass('alert-success').addClass('alert-secondary');
+    }
+    else
+    {
+        $("#loggingState").text("Logging Active");
+        $("#loggingState").removeClass('alert-secondary').addClass('alert-success');
+    }
+}
+
+
 $.fn.scrollBottom = function() {
     return $(this).scrollTop($(this)[0].scrollHeight);
 };

templates/gettingStarted.html

@@ -40,7 +40,7 @@ <h4>4) Set Sprockets Vertical</h4>
         </figure>
         <p>4c) Extend left chain. Press 'Extend Left Chain to xxxx mm' where xxxx is the distance set in Step 2.&nbsp; <span style="text-decoration: underline; color: #ff0000;">Warning: This is one spot where the chains can get wrapped around the sprocket.&nbsp; Grab hold of the end of the chain and apply tension to it as it feeds off the sprocket so it doesn't wrap</span>.</p>
         <p>4d) Extend right chain. Press 'Extend Right Chain to xxxx mm' where xxxx is the distance set in Step 2.&nbsp; <span style="text-decoration: underline;"><span style="color: #ff0000; text-decoration: underline;">Warning: Same as above.</span></span></p>
-        <p>4e) Connect Sled.&nbsp; Connected up your sled to the extended chains.</p>
+        <p>4e) Connect Sled.&nbsp; Connect up your sled to the extended chains.</p>
         <p>4f) Mark chains.&nbsp; Take a marker, nail polish, something, and mark the specific chain link that is on top of the top tooth.&nbsp; If the 'Extend Chain Distance' is a multiple of 6.35 mm, there should be a tooth perfectly vertical after extending the chains.&nbsp; Mark this because if you ever have to reset the chains, you need to know which link is this one.</p>
         <h4>5) Calibrate</h4>
         <p>5a) If using stock firwmare, go to 'Actions-&gt;Triangular Calibration.'&nbsp; If using holey calibration firmware, go to 'Actions-&gt;Holey Calibration'</p>

templates/logs.html

@@ -16,6 +16,9 @@
 </head>
 
 <div>
+  <div class="row">
+    <div id="loggingState" class="alert alert-success">Waiting for Status...</div>
+  </div>
   <div class="row">
     <div class="col-6">
       <div class="row">