Support uno wifi rev2

README.md

@@ -1,5 +1,16 @@
 ## stk500
-Fully javascript stk500v1 programmer. Allows you to program Arduinos straight from node (or browser for that matter -- see [browserdude](github.com/jacobrosenthal/browserdude). No more avrdude system calls or using the arduino IDE.
+Fully javascript stk500v1 programmer. 
+
+## NOTE
+Version 2.1.0 is a patched version to support Arduino Uno WiFi Rev2, which
+requires a differents start address when uploading a sketch.
+Updated by [Christian Sarnataro](c.sarnataro@arduino.cc) in the context of [IOT-1813](https://arduino.atlassian.net/browse/IOT-1813).
+
+A proper PR against the origin repo is on our roadmap.
+
+
+### Intro
+Allows you to program Arduinos straight from node (or browser for that matter -- see [browserdude](github.com/jacobrosenthal/browserdude). No more avrdude system calls or using the arduino IDE.
 
 Huge thanks to Pinoccio for their stk500v2 browser implementation (for Arduino Megas, etc) from which I stole whole lines of code. We're working to unify our programmers with some sort of overarching module. For now see [js-stk500](https://github.com/Pinoccio/js-stk500) to program Arduino Mega and Pinoccio's
 

index.js → index.cjs

@@ -1,6 +1,6 @@
 var async = require("async");
-var Statics = require('./lib/statics');
-var sendCommand = require('./lib/sendCommand');
+var Statics = require('./lib/statics.cjs');
+var sendCommand = require('./lib/sendCommand.cjs');
 
 var stk500 = function (opts) {
   this.opts = opts || {};
@@ -185,9 +185,28 @@ stk500.prototype.loadPage = function (stream, writeBytes, timeout, done) {
   });
 };
 
-stk500.prototype.upload = function (stream, hex, pageSize, timeout, done) {
+stk500.prototype.upload = function () {
 	this.log("program");
 
+  var stream, hex, pageSize, timeout, dontShiftPageAddr, done;
+  // to make it backward compatible, i.e. without the `dontShiftPageAddr` argument and
+  // with the callback `done` as last parameter, to be used in `async.sequence`
+  if (arguments.length === 6) {
+    stream = arguments[0];
+    hex = arguments[1];
+    pageSize = arguments[2];
+    timeout = arguments[3];
+    dontShiftPageAddr = arguments[4];
+    done = arguments[5];
+  } else {
+    stream = arguments[0];
+    hex = arguments[1];
+    pageSize = arguments[2];
+    timeout = arguments[3];
+    dontShiftPageAddr = undefined;
+    done = arguments[4];
+  }
+
 	var pageaddr = 0;
 	var writeBytes;
 	var useaddr;
@@ -201,7 +220,11 @@ stk500.prototype.upload = function (stream, hex, pageSize, timeout, done) {
 			self.log("program page");
       async.series([
       	function(cbdone){
-      		useaddr = pageaddr >> 1;
+          if (dontShiftPageAddr) {
+            useaddr = pageaddr;
+          } else {
+            useaddr = pageaddr >> 1;
+          }
       		cbdone();
       	},
       	function(cbdone){
@@ -339,7 +362,7 @@ stk500.prototype.bootload = function (stream, hex, opt, done) {
     this.verifySignature.bind(this, stream, opt.signature, opt.timeout),
     this.setOptions.bind(this, stream, parameters, opt.timeout),
     this.enterProgrammingMode.bind(this, stream, opt.timeout),
-    this.upload.bind(this, stream, hex, opt.pageSize, opt.timeout),
+    this.upload.bind(this, stream, hex, opt.pageSize, opt.timeout, opt.dontShiftPageAddr),
     this.verify.bind(this, stream, hex, opt.pageSize, opt.timeout),
     this.exitProgrammingMode.bind(this, stream, opt.timeout)
   ], function(error){

lib/receiveData.js → lib/receiveData.cjs

@@ -1,4 +1,4 @@
-var Statics = require('./statics');
+var Statics = require('./statics.cjs');
 
 var startingBytes = [
   Statics.Resp_STK_INSYNC

lib/sendCommand.js → lib/sendCommand.cjs

@@ -1,5 +1,5 @@
-var receiveData = require('./receiveData');
-var Statics = require('./statics');
+var receiveData = require('./receiveData.cjs');
+var Statics = require('./statics.cjs');
 
 module.exports = function (stream, opt, callback) {
   var timeout = opt.timeout || 0;