macos fixes

Author: akaJes

.DS_Store

@@ -83,7 +83,7 @@ module.exports.init=(http,p,speed)=>{
 exports.list=()=>new Promise((done,fail)=>{
   SerialPort.list(function (err, ps){
     if (err) return fail(err);
-    done(ps.filter(i=>i.manufacturer).map(i=>{
+    done(ps.filter(i=>i.manufacturer||/cu\.serial/.test(i.comName)).map(i=>{
       var m;
       i.status='closed';
       if (m=i.comName.match(/(\w+)$/)){
@@ -94,7 +94,7 @@ exports.list=()=>new Promise((done,fail)=>{
         }
       }
       return i;
-    }));
+    })||[]);
   });
 });
 exports.changes=()=>new Promise((done,fail)=>{

app/console.js

@@ -2,6 +2,7 @@ var fs = require('fs');
 var which = require('which');
 var exec  = require('child_process').exec;
 var spawn  = require('child_process').spawn;
+require('fix-path')();
 
 exports.isPIO=()=>new Promise((done,fail)=>which('platformio',(err, resolvedPath)=>err?fail(err):done(resolvedPath)));
 

app/pio.js

@@ -43,7 +43,7 @@ var isElectron=module.parent&&module.parent.filename.indexOf('index.js')>=0;
 
 var baseCfg='Marlin';
 var serial;
-var serial_enabled = !(isElectron&&process.platform=='darwin');
+var serial_enabled = true; //!(isElectron&&process.platform=='darwin');
 if (serial_enabled)
   serial = require('./console');
 

app/server.js

@@ -1,12 +1,12 @@
 {
   "name": "marlin-conf",
-  "version": "2.7.8",
+  "version": "2.7.9",
   "description": "configuration tool for Marlin project",
   "main": "./index.js",
   "scripts": {
     "start": "electron . -G ~/TEST",
     "build": "build --dir",
-    "build-dev": "build -l --x64",
+    "build-dev": "build -m --x64",
     "dist": "node builder.js",
     "test": "echo \"Error: no test specified\" && exit 1",
     "lint": "eslint .",
@@ -57,6 +57,7 @@
     "cropper": "^3.0.0-rc.2",
     "electron-debug": "^1.2.0",
     "express": "^4.15.2",
+    "fix-path": "^2.1.0",
     "font-awesome": "^4.7.0",
     "formidable": "^1.1.1",
     "get-port": "^3.1.0",

package.json

@@ -30,22 +30,24 @@ function changePort(p){
   .eq(2).find('a.btn').text(p.speed)
 }
 function removeTab(name){
-  $('#'+name).remove();
-  $('a[href$='+name+']').remove();
+  var id=name.replace(/\./g,'-')
+  $('#'+id).remove();
+  $('a[href$='+id+']').remove();
 }
 function createTab(name,url){
+    var id=name.replace(/\./g,'-')
     var tab,tmpl;
     if(!$('#'+name).length){
       _add($('template.port-body'))
-      .attr('id',name);
+      .attr('id',id);
       tmpl=_add($('template._port-tab'));
-      tab=tmpl.find('a').attr('href','#'+name)
+      tab=tmpl.find('a').attr('href','#'+id)
       tab.find('>span').text(name)
-      tmpl.find('a button').on('click',function(){ removeConsole(name); })
+      tmpl.find('a button').on('click',function(){ removeConsole(id); })
     }else
-      tab=$('a[href$='+name+']');
+      tab=$('a[href$='+id+']');
     tab.tab('show')
-    return tmpl&&$('#'+name);
+    return tmpl&&$('#'+id);
 }
 
 function removeConsole(port,force){