completed boards v3 porting

Author: Stefania

README.md

@@ -48,8 +48,11 @@ daemon.writeSerial('port-name', 'message');
 // Close serial monitor
 daemon.closeSerialMonitor('port-name');
 
-// Upload hex
-daemon.upload(target, sketchName, compilationResult);
+// Upload sketch on serial target (desktop agent and chrome app)
+daemon.uploadSerial(target, sketchName, compilationResult, verbose);
+
+// Upload sketch on network target (daesktop agent only)
+daemon.uploadNetwork(target, sketchName, compilationResult);
 
 // Upload progress
 daemon.uploading.subscribe(upload => {

package.json

@@ -25,6 +25,7 @@
     "babel-core": "^6.26.3",
     "babel-eslint": "^8.2.3",
     "babel-loader": "^7.1.4",
+    "babel-plugin-transform-object-rest-spread": "^6.26.0",
     "babel-preset-env": "^1.7.0",
     "babel-preset-es2015": "^6.24.1",
     "babel-preset-react": "^6.24.1",

src/board-configuration.js

@@ -146,24 +146,7 @@ export default class BoardConfiguration {
       network: false
     };
 
-    const file = {
-      name: compiledSketch.name + board.upload[0].ext,
-      data: compiledSketch.hex
-    };
-
-    const uploadData = {
-      files: [file],
-      commandline: board.upload[0].commandline,
-      signature: board.upload[0].options.signature,
-      extrafiles: [],
-      options: {
-        wait_for_upload_port: (board.upload[0].options.wait_for_upload_port === true || board.upload[0].options.wait_for_upload_port === 'true'),
-        use_1200bps_touch: (board.upload[0].options.use_1200bps_touch === true || board.upload[0].options.use_1200bps_touch === 'true'),
-        params_verbose: '-v'
-      }
-    };
-
-    this.daemon.upload(uploadTarget, uploadData);
+    this.daemon.upload(uploadTarget, compiledSketch.name, compiledSketch);
   }
 
   /**

src/chrome-app-daemon.js

@@ -231,22 +231,24 @@ export default class ChromeOsDaemon extends Daemon {
    * @param {Object} target = {
    *   board: "name of the board",
    *   port: "port of the board",
-   * }
-   * @param {Object} data = {
-   *  commandline: "commandline to execute",
-   *  files: [
-   *   {name: "Name of a file to upload on the device", data: 'base64data'}
-   *  ],
+   *   commandline: "commandline to execute",
+   *   data: "compiled sketch"
    * }
    */
-  _upload(payload) {
-    const currPayload = payload;
+  _upload({
+    board, port, commandline, data
+  }) {
     try {
       window.oauth.token().then(token => {
-        currPayload.token = token.token;
         this.channel.postMessage({
           command: 'upload',
-          data: currPayload
+          data: {
+            board,
+            port,
+            commandline,
+            data,
+            token: token.token
+          }
         });
       });
     }

src/daemon.js

@@ -99,19 +99,17 @@ export default class Daemon {
   }
 
   /**
-   * Upload a sketch to serial, network or cloud target
-   * Do not send commandline and signature for network upload
+   * Upload a sketch to serial target
+   * Fetch commandline from boards API for serial upload
    * @param {Object} target
    * @param {string} sketchName
    * @param {Object} compilationResult
+   * @param {boolean} verbose
    */
-  upload(target, sketchName, compilationResult, verbose = true) {
-    const isNetworkDevice = target.extra && target.extra.network;
-    if (!isNetworkDevice) {
-      this.closeSerialMonitor(target.port);
-    }
+  uploadSerial(target, sketchName, compilationResult, verbose = true) {
     this.uploading.next({ status: this.UPLOAD_IN_PROGRESS });
 
+    this.closeSerialMonitor(target.port);
 
     // Fetch command line for the board
     fetch(`https://builder.arduino.cc/v3/boards/${target.board}/compute`, {
@@ -129,15 +127,12 @@ export default class Daemon {
 
         const uploadPayload = {
           ...target,
+          commandline: uploadCommandInfo.commandline,
           filename: `${sketchName}.${ext}`,
           hex: compilationResult[ext], // For desktop agent
-          data: compilationResult[ext], // For chromeOS plugin, consider to align this
+          data: compilationResult[ext] // For chromeOS plugin, consider to align this
         };
 
-        if (!isNetworkDevice) {
-          uploadPayload.commandline = uploadCommandInfo.commandline;
-        }
-
         this._upload(uploadPayload, uploadCommandInfo);
       });
   }

src/socket-daemon.js

@@ -393,13 +393,27 @@ export default class SocketDaemon extends Daemon {
 
   /**
    * Perform an upload via http on the daemon
-   * @param {Object} uploadPayload common payload properties defined in parent
+   * @param {Object} data
+   */
+  daemonUpload(data) {
+    fetch(`${this.pluginURL}/upload`, {
+      method: 'POST',
+      headers: {
+        'Content-Type': 'text/plain; charset=utf-8'
+      },
+      body: JSON.stringify(data)
+    })
+      .catch(error => {
+        this.uploading.next({ status: this.UPLOAD_ERROR, err: error });
+      });
+  }
+
+  /**
+   * Upload compiled sketch to serial target
+   * @param {Object} uploadPayload payload properties defined in parent
    * @param {Object} uploadCommandInfo = {
    *  commandline: "commandline to execute, for serial upload",
       signature: "signature of the commandline",
-   *  files: [
-   *   {name: "Name of a file to upload on the device", data: 'base64data'}
-   *  ],
    *  options: {
    *    wait_for_upload_port: true or false,
    *    use_1200bps_touch: true or false,
@@ -437,22 +451,54 @@ export default class SocketDaemon extends Daemon {
       this.serialMonitorOpened.pipe(filter(open => !open))
         .pipe(first())
         .subscribe(() => {
-          fetch(`${this.pluginURL}/upload`, {
-            method: 'POST',
-            headers: {
-              'Content-Type': 'text/plain; charset=utf-8'
-            },
-            body: JSON.stringify(socketParameters)
-          })
-            .catch(error => {
-              this.uploading.next({ status: this.UPLOAD_ERROR, err: error });
-            });
+          this.daemonUpload(socketParameters);
         });
     });
 
     this.downloadingError.subscribe(error => this.uploading.next({ status: this.UPLOAD_ERROR, err: error }));
   }
 
+  /**
+   * Upload compiled sketch to network target
+   * @param {Object} target = {
+   *    board: 'fqbn',
+   *    port: 'ip address',
+   *    extra: {},
+   * }
+   * @param {string} sketchName
+   * @param {Object} compilationResult
+   */
+  uploadNetwork(target, sketchName, compilationResult) {
+    this.uploading.next({ status: this.UPLOAD_IN_PROGRESS });
+
+    const uploadPayload = {
+      ...target,
+      filename: `${sketchName}.hex`,
+      hex: compilationResult.hex,
+    };
+    this.daemonUpload(uploadPayload);
+  }
+
+  /**
+   * Upload file to network target (arduino-connector)
+   * @param {Object} target
+   * @param {string} sketchName
+   * @param {Object} encodedFile
+   * @param {Object} commandData {commandline: '', signature: ''}
+   */
+  uploadConnector(target, sketchName, encodedFile, commandData) {
+    this.uploading.next({ status: this.UPLOAD_IN_PROGRESS });
+
+    const uploadPayload = {
+      ...target,
+      commandline: commandData.commandline,
+      signature: commandData.signature,
+      filename: sketchName,
+      hex: encodedFile
+    };
+    this.daemonUpload(uploadPayload);
+  }
+
   /**
    * Download tool
    * @param {string} toolName