Skip to content

Commit

Permalink
handle switching between slow/fast write, and IMPORTANTLY bodge firmw…
Browse files Browse the repository at this point in the history 
…are updater 1v43 so USB runs reliably
  • Loading branch information
@gfwilliams
gfwilliams committed Jan 7, 2014
1 parent 101074d commit 476c675
Show file tree
Hide file tree
Showing 3 changed files with 66 additions and 26 deletions.
70 changes: 54 additions & 16 deletions js/espruino_flasher.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,17 +67,24 @@ THE SOFTWARE.
var iPoll = setInterval(function() {
console.log("Sending... 0x7F");
Espruino.Serial.write("\x7f", false);
}, 200);
}, 70);
dataReceived = function (c) {
dataReceived = undefined;
console.log("got "+c);
if (c==ACK || c==NACK) {
clearTimeout(iTimeout);
clearInterval(iPoll);
if (!Espruino.Status.hasProgress())
Espruino.Status.setStatus("Initialised.");
console.log("Initialised.");
callback(undefined);
console.log("Initialised. Just waiting for a bit...");
// wait for random extra data...
dataReceived = function(c){
console.log("Already ACKed but got "+c);
};
setTimeout(function() {
dataReceived = undefined;
// finally call callback
bodgeClock(callback);
}, 500);
}
};
};
Expand Down Expand Up @@ -120,7 +127,7 @@ THE SOFTWARE.
if (dataCount == count) {
clearTimeout(iTimeout);
dataReceived = undefined;
callback(0,data);
callback(undefined,data);
}
};
};
Expand Down Expand Up @@ -148,21 +155,21 @@ THE SOFTWARE.
// send read command
sendCommand(0x11, function(err) {
if (err) {
console.log("Error sending command.");
console.log("Error sending command ("+err+").");
callback(err);
return;
}
// send address
sendData([(addr>>24)&0xFF,(addr>>16)&0xFF,(addr>>8)&0xFF,addr&0xFF], function(err) {
if (err) {
console.log("Error sending address.");
console.log("Error sending address. ("+err+")");
callback(err);
return;
}
// send amount of bytes we want
sendData([readBytes-1], function(err) {
if (err) {
console.log("Error while reading.");
console.log("Error while reading. ("+err+")");
callback(err);
return;
}
Expand All @@ -182,13 +189,34 @@ THE SOFTWARE.
});
};

var bodgeClock = function(callback) {
/* 1v43 bootloader ran APB1 at 9Mhz, which isn't enough for
some STM32 silicon, which has a bug. Instead, set the APB1 clock
using the bootloader write command, which will fix it up enough for
flashing. */
var RCC_CFGR = 0x40021004;
readData(function(err, data) {
if (err) return callback(err);
var word = (data[3]<<24) | (data[2]<<16) | (data[1]<<8) | data[0];
console.log("RCC->CFGR = "+word);
var newword = (word&0xFFFFF8FF) | 0x00000400;
if (newword==word) {
console.log("RCC->CFGR is correct");
callback(undefined);
} else {
console.log("Setting RCC->CFGR to "+newword);
writeData(callback, RCC_CFGR, [newword&0xFF, (newword>>8)&0xFF, (newword>>16)&0xFF, (newword>>24)&0xFF]);
}
}, RCC_CFGR, 4);
}

var writeData = function(callback, addr, data) {
if (data.length>256) callback("Writing too much data");
console.log("Writing "+data.length+" bytes at 0x"+addr.toString(16)+"...");
// send write command
sendCommand(0x31, function(err) {
if (err) {
console.log("Error sending command. retrying...");
console.log("Error sending command ("+err+"). retrying...");
initialiseChip(function (err) {
if (err) callback(err);
else writeData(callback, addr, data);
Expand All @@ -198,7 +226,7 @@ THE SOFTWARE.
// send address
sendData([(addr>>24)&0xFF,(addr>>16)&0xFF,(addr>>8)&0xFF,addr&0xFF], function(err) {
if (err) {
console.log("Error sending address. retrying...");
console.log("Error sending address ("+err+"). retrying...");
initialiseChip(function (err) {
if (err) callback(err);
else writeData(callback, addr, data);
Expand All @@ -211,7 +239,7 @@ THE SOFTWARE.
// send data
sendData(sData, function(err) {
if (err) {
console.log("Error while writing. retrying...");
console.log("Error while writing ("+err+"). retrying...");
initialiseChip(function (err) {
if (err) callback(err);
else writeData(callback, addr, data);
Expand Down Expand Up @@ -290,19 +318,25 @@ THE SOFTWARE.
bytesReceived = [];
}
});
var hadSlowWrite = Espruino.Serial.isSlowWrite();
Espruino.Serial.setSlowWrite(false);
var finish = function(err) {
Espruino.Serial.setSlowWrite(hadSlowWrite);
callback(err);
};
// initialise
initialiseChip(function (err) {
if (err) { callback(err); return; }
if (err) { finish(err); return; }
eraseChip(function (err) {
if (err) { callback(err); return; }
if (err) { finish(err); return; }
writeAllData(binary, function (err) {
if (err) { callback(err); return; }
callback();
if (err) { finish(err); return; }
finish();
});
});
/*readAllData(binary.byteLength, function(err,chipData) {
if (err) {
callback(err);
finish(err);
return;
}
var errors = 0;
Expand All @@ -329,6 +363,10 @@ THE SOFTWARE.
console.log("FIRMWARE: Current "+Espruino.Process.Env.VERSION+", Available "+boardInfo.info.binary_version);
var vCurrent = Espruino.General.versionToFloat(Espruino.Process.Env.VERSION);
var vAvailable = Espruino.General.versionToFloat(boardInfo.info.binary_version);
if (vCurrent > 1.43) {
console.log("Firmware >1.43 supports faster writes");
Espruino.Serial.setSlowWrite(false);
}
if (vAvailable > vCurrent) {
console.log("New Firmware "+boardInfo.info.binary_version+" available");
Espruino.Status.setStatus("New Firmware "+boardInfo.info.binary_version+' available. Click <div style="display: inline-block" class="ui-state-default"><span class="ui-icon ui-icon-info"></span></div> to update');
Expand Down
21 changes: 11 additions & 10 deletions js/espruino_serial.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ Author: Gordon Williams (gw@pur3.co.uk)
var connectionDisconnectCallback;

// For throttled write
var slowWrite = true;
var writeData = undefined;
var writeInterval = undefined;

Expand Down Expand Up @@ -94,19 +95,14 @@ Author: Gordon Williams (gw@pur3.co.uk)
if (!isConnected()) return; // throw data away
if (showStatus===undefined) showStatus=true;

/*var d = [];
for (var i=0;i<data.length;i++) d.push(data.charCodeAt(i));
console.log("Write "+data.length+" bytes - "+JSON.stringify(d));*/

/* Here we queue data up to write out. We do this slowly because somehow
characters get lost otherwise (compared to if we used other terminal apps
like minicom) */
/* Here we queue data up to write out. We do this slowly because on older
versions of Espruino, sometimes characters get lost if we send too quickly. */
if (writeData == undefined)
writeData = data;
else
writeData += data;

var blockSize = 50;
var blockSize = slowWrite ? 30 : 1024;

showStatus &= writeData.length>blockSize;
if (showStatus) {
Expand Down Expand Up @@ -139,7 +135,7 @@ Author: Gordon Williams (gw@pur3.co.uk)
sender(); // send data instantly
// if there was any more left, do it after a delay
if (writeData!=undefined) {
writeInterval = setInterval(sender, 100);
writeInterval = setInterval(sender, 60);
} else {
if (showStatus)
Espruino.Status.setStatus("Sent");
Expand All @@ -163,6 +159,11 @@ Author: Gordon Williams (gw@pur3.co.uk)
"isConnected": isConnected,
"startListening": startListening,
"write": writeSerial,
"close": closeSerial
"close": closeSerial,
"isSlowWrite": function() { return slowWrite; },
"setSlowWrite": function(isOn) {
console.log("Set Slow Write = "+isOn);
slowWrite = isOn;
}
};
})();
1 change: 1 addition & 0 deletions js/terminal.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,7 @@ Author: Gordon Williams (gw@pur3.co.uk)
return;
}
Espruino.Status.setStatus("Connecting");
Espruino.Serial.setSlowWrite(true);
setConnectedState(false);
Espruino.Serial.open(serialPort, function(cInfo) {
if (cInfo!=undefined) {
Expand Down

0 comments on commit 476c675

Please sign in to comment.