WIP #575: actually get !! and // to work in pronterface

printrun/pronsole.py

@@ -1244,12 +1244,12 @@ class pronsole(cmd.Cmd):
 
     def recvcb(self, l):
         l = l.rstrip()
+        for listener in self.recvlisteners:
+            listener(l)
         if not self.recvcb_actions(l):
             report_type = self.recvcb_report(l)
             if report_type & REPORT_TEMP:
                 self.status.update_tempreading(l)
-            for listener in self.recvlisteners:
-                listener(l)
             if l != "ok" and not self.sdlisting \
                and not self.monitoring and (report_type == REPORT_NONE or report_type & REPORT_MANUAL):
                 if l[:5] == "echo:":

printrun/pronterface.py

@@ -1700,17 +1700,16 @@ Printrun. If not, see <http://www.gnu.org/licenses/>."""
 
     def recvcb(self, l):
         l = l.rstrip()
-        if l.startswith("!!"):
-            return
-        report_type = self.recvcb_report(l)
-        isreport = report_type != REPORT_NONE
-        if report_type & REPORT_POS:
-            self.update_pos()
-        elif report_type & REPORT_TEMP:
-            wx.CallAfter(self.tempdisp.SetLabel, self.tempreadings.strip().replace("ok ", ""))
-            self.update_tempdisplay()
-        if not self.p.loud and (l not in ["ok", "wait"] and not isreport):
-            wx.CallAfter(self.addtexttolog, l + "\n")
+        if not self.recvcb_actions(l):
+            report_type = self.recvcb_report(l)
+            isreport = report_type != REPORT_NONE
+            if report_type & REPORT_POS:
+                self.update_pos()
+            elif report_type & REPORT_TEMP:
+                wx.CallAfter(self.tempdisp.SetLabel, self.tempreadings.strip().replace("ok ", ""))
+                self.update_tempdisplay()
+            if not self.p.loud and (l not in ["ok", "wait"] and not isreport):
+                wx.CallAfter(self.addtexttolog, l + "\n")
         for listener in self.recvlisteners:
             listener(l)