pio and ports fixes

Author: akaJes

.gitignore

@@ -38,4 +38,5 @@ bower_components
 # Optional REPL history
 .node_repl_history
 
-**/test
+**/test
+package-lock.json

README.md

@@ -53,7 +53,10 @@ some hints for [Windows-Installation](https://github.com/akaJes/marlin-config/wi
 * [git](https://git-scm.com/downloads)
 * [node.js](https://nodejs.org/en/download/)
 * [PlatformIO](http://docs.platformio.org/en/latest/installation.html) (optional)
-
+## Hints
+### Linux users issue about access to USB serial ports
+Warning! Please install `99-platformio-udev.rules` and check that your board's PID and VID are listed in the rules.
+https://raw.githubusercontent.com/platformio/platformio/develop/scripts/99-platformio-udev.rules
 ## Using
 open terminal in an empty folder or in a folder with Marlin repository and type
 

app/console.js

@@ -3,7 +3,6 @@ var sio = require('socket.io');
 var fs = require('fs');
 var path = require('path');
 var SerialPort = require('serialport');
-var linuxList = require('./linux-list');
 var promisify = require('./helpers').promisify;
 
 var ports={};
@@ -128,7 +127,7 @@ exports.changes=()=>new Promise((done,fail)=>{
 var portsList=[];
 exports.changesPoll=()=>{
   var poller=begin=>{
-    return (process.platform=='linux'?linuxList:promisify(SerialPort.list))()
+    return ((SerialPort.list))()
     .catch(a=>a)
     .then(ports=>{
       var aPorts=ports.map(p=>p.comName);

app/linux-list.js

@@ -22,13 +22,11 @@ exports.list=name=>new Promise((done,fail)=>{
 })
 var tty2html = require('tty2html');
 
-var env = Object.create( process.env );
-env.PLATFORMIO_FORCE_COLOR = true;
-
-var compile=(commands,res)=>{
+var compile=(commands, res, cwd)=>{
+  var env = Object.assign({}, process.env, { PLATFORMIO_FORCE_COLOR: true});
   var verbose=0;
   res.writeHead(200, { "Content-Type": "text/event-stream", "Cache-control": "no-cache" });
-  var cmd = spawn('platformio',commands,  { env:env });
+  var cmd = spawn('platformio', commands, {env: env, cwd: cwd || process.cwd() });
   var mw=tty2html()
   mw.pipe(res);
   cmd.stdout.pipe(mw);

app/pio.js

@@ -395,6 +395,7 @@ var pioEnv = (file) =>
   promisify(fs.readFile)(file, 'utf8')
   .then(a=>a.split(/\r\n?|\n/))
   .then(a=>a.map(i=>i.match(/\[env\:(.*)\]/)).filter(i=>i).map(i=>i[1]))
+
 app.get('/version/:screen', function (req, res) {
   res.set('Content-Type', 'text/plain');
     visitor.screenview({
@@ -419,20 +420,15 @@ function pioRoot(){
   return seek4File('platformio.ini', ['', 'Marlin'])
 }
 app.get('/pio/:env', function (req, res) {
-  params=['run'];
-  if (req.params.env!='Default')
-    params.push('-e',req.params.env);
-  pioRoot()
-  .then(root=>
-    pio.run(params,res)
-  );
+  var params = ['run'];
+  if (req.params.env != 'Default')
+    params.push('-e', req.params.env);
+  pioRoot().then(file => pio.run(params, res, path.dirname(file)));
 });
-function atob(b64string){
+function atob(b64string) {
   if ( process.version<"v6.0.0" )
-    // Node 5.10+
     return Buffer.from(b64string, 'base64');
   else
-    // older Node versions
     return new Buffer(b64string, 'base64');
 }
 
@@ -444,24 +440,17 @@ app.get('/pio/:env/:port', function (req, res) {
     params.push('-e',req.params.env);
   if (close)
     params.push('--upload-port',port)
-  console.log(params); //if removed - process hangs :)
+  console.log(); //if removed - process hangs :)
   (close&&serial_enabled?serial.close(port):Promise.resolve(true))
   .then(pioRoot)
-  .then(root=>{
-    var cmd=pio.run(params,res);
+  .then(file => {
+    var cmd = pio.run(params, res, path.dirname(file));
     req.on('close',function(){
       cmd.kill('SIGINT');
       console.error('flash killed')
     })
   });
 });
-app.get('/pio-flash', function (req, res) {
-  git.root()
-  .then(root=>{
-    process.chdir(path.join(root,'Marlin'))
-    pio.run(['run','-t','upload'],res);
-  });
-});
 
 /* SNIPPETS */
 

app/server.js

@@ -1,6 +1,6 @@
 {
   "name": "marlin-conf",
-  "version": "2.7.12",
+  "version": "2.7.14",
   "description": "configuration tool for Marlin project",
   "main": "./index.js",
   "scripts": {

builder.js

@@ -638,7 +638,7 @@ $(function(){
       var source = new EventSource("/ports");
       source.addEventListener('list', function(event) {
         var list= JSON.parse(event.data);
-        $('template._ports').siblings().remove();
+        ports.find('.dropdown-divider').nextAll().remove();
         list.forEach(function(p){
           createPort(p)
         });
@@ -704,7 +704,7 @@ $(function(){
       _add($('template._alert'))
       .find('p').html(`to install PlatformIO use guide from 
 <strong><a target="_blank" href="http://docs.platformio.org/en/latest/installation.html">Official site</a></strong>
-<br>Linux/Mac hint:  <code>sudo pip install -U platformio</code>`)
+<br>Linux/Mac hint:  <code>sudo apt install python-pip</code> <code>sudo pip install -U platformio</code>`)
     }
     proc.log=function(text){ p.append(text); p.prop('scrollTop',p.prop('scrollHeight')); }
     var cmd;