v1.0.59 /activate and improved gcode upload api - activates gcode editor tab

app/index.html

@@ -533,8 +533,8 @@
 
             <nav data-role="ribbonmenu">
               <ul class="tabs-holder">
-                <li><a href="#tab-one"><i class="fas fa-fw fa-terminal"></i> Serial Console</a></li>
-                <li><a href="#tab-two"><i class="far fa-fw fa-edit"></i> GCODE Editor</a></li>
+                <li><a href="#tab-one" id="consoletab"><i class="fas fa-fw fa-terminal"></i> Serial Console</a></li>
+                <li><a href="#tab-two" id="gcodeeditortab"><i class="far fa-fw fa-edit"></i> GCODE Editor</a></li>
 
               </ul>
 

app/js/websocket.js

@@ -98,10 +98,18 @@ function initSocket() {
   socket.on('gcodeupload', function(data) {
     printLog("Received new GCODE from API")
     editor.session.setValue(data);
+    $('#controlTab').click()
     $('#gcodeeditortab').click()
     // gcodeeditortab
   });
 
+  socket.on('integrationpopup', function(data) {
+    printLog("Integration called from " + data)
+    // editor.session.setValue(data);
+    $('#controlTab').click()
+    $('#consoletab').click()
+    // gcodeeditortab
+  });
 
   socket.on('updatedata', function(data) {
     // console.log(data.length, data)

index.js

@@ -497,6 +497,29 @@ app.get('/api/version', (req, res) => {
   res.send(JSON.stringify(data), null, 2);
 })
 
+app.get('/activate', (req, res) => {
+  console.log(req.hostname)
+  res.header("Access-Control-Allow-Origin", "*");
+  res.header("Access-Control-Allow-Headers", "Origin, X-Requested-With, Content-Type, Accept");
+  res.send('Host: ' + req.hostname + ' asked to activate OpenBuildsMachineDriver v' + require('./package').version);
+  if (jogWindow === null) {
+    createJogWindow();
+    jogWindow.show()
+    // workaround from https://github.com/electron/electron/issues/2867#issuecomment-261067169 to make window pop over for focus
+    jogWindow.setAlwaysOnTop(true);
+    jogWindow.focus();
+    jogWindow.setAlwaysOnTop(false);
+  } else {
+    jogWindow.show()
+    jogWindow.setAlwaysOnTop(true);
+    jogWindow.focus();
+    jogWindow.setAlwaysOnTop(false);
+  }
+  setTimeout(function() {
+    io.sockets.emit('gcodeupload', req.hostname);
+  }, 1500);
+})
+
 // Upload
 app.get('/upload', (req, res) => {
   res.header("Access-Control-Allow-Origin", "*");

package.json

@@ -1,6 +1,6 @@
 {
   "name": "OpenBuildsMachineDriver",
-  "version": "1.0.58",
+  "version": "1.0.59",
   "license": "AGPL-3.0",
   "description": "Machine Interface Driver for OpenBuilds",
   "author": "github.com/openbuilds <webmaster@openbuilds.com>",