diff --git a/apps/espruinoctrl/README.md b/apps/espruinoctrl/README.md
index a7bca662c..7b2e434e7 100644
--- a/apps/espruinoctrl/README.md
+++ b/apps/espruinoctrl/README.md
@@ -17,7 +17,7 @@ showing available Espruino devices is popped up.
device being connected to. Use this if you want to print data - eg: `print(E.getBattery())`
When done, click 'Upload'. Your changes will be saved to local storage
-so they'll be remembered next time you upload from the same device.s
+so they'll be remembered next time you upload from the same device.
## Usage
diff --git a/apps/espruinoprog/ChangeLog b/apps/espruinoprog/ChangeLog
new file mode 100644
index 000000000..5560f00bc
--- /dev/null
+++ b/apps/espruinoprog/ChangeLog
@@ -0,0 +1 @@
+0.01: New App!
diff --git a/apps/espruinoprog/README.md b/apps/espruinoprog/README.md
new file mode 100644
index 000000000..a8f15d3e9
--- /dev/null
+++ b/apps/espruinoprog/README.md
@@ -0,0 +1,42 @@
+# Espruino Programmer
+
+Finds Bluetooth devices with a specific name (eg `Puck.js`), connects and uploads code. Great for programming many devices at once!
+
+**WARNING:** This will reprogram **any matching Espruino device within range** while
+the app is running. Unless you are careful to remove other devices from the area or
+turn them off, you could find some of your devices unexpectedly get programmed!
+
+## Customising
+
+Click on the Customise button in the app loader to set up the programmer.
+
+* First you need to choose the kind of devices you want to upload to. This is
+the text that should match the Bluetooth advertising name. So `Puck.js` for Puck.js
+devices, or `Bangle.js` for Bangles.
+* Now paste in the code you want to write to the device. This is automatically
+written to flash (`.bootcde`). See https://www.espruino.com/Saving#save-on-send-to-flash-
+for more information.
+* Now enter the code that should be sent **after** programming. This code
+should make the device so it doesn't advertise on Bluetooth with the Bluetooth
+name you entered for the first item. It may also help if it indicates to you that
+the device is programmed properly.
+ * You could turn advertising off with `NRF.sleep()`
+ * You could change the advertising name with `NRF.setAdvertising({},{name:"Ok"});`
+ * On a Bangle, you could turn it off with `Bangle.off()`
+* Finally scroll down and click `Upload`
+* Now you can run the new `Programmer` app on the Bangle.
+
+## Usage
+
+Just run the app, and as soon as it starts it'll start scanning for
+devices to upload to!
+
+To stop scanning, long-press the button to return to the clock.
+
+## Notes
+
+* Right now the Espruino Tools used here are unaware of the device they're writing to,
+and as a result they don't use Storage and so the size of the files you can
+write to the device are quite limited. You should be find with up to 4k of code.
+* Currently, code is not minified before upload (so you need to supply pre-minified
+ code if you want that)
diff --git a/apps/espruinoprog/app-icon.js b/apps/espruinoprog/app-icon.js
new file mode 100644
index 000000000..532c60eea
--- /dev/null
+++ b/apps/espruinoprog/app-icon.js
@@ -0,0 +1 @@
+require("heatshrink").decompress(atob("mEw4cA/4AB7wJB8/5uX+7uUgH41lSKf4AKpMkyQCCggEDAQVtCAMCCNWUx9JufSrmkCJeKqsiytICJtFkWRCJWAEaARCI5BkEoAGBymJ9eSvXkCJZ9JCLI1DyM9uQRLNYWRpRZMR5ARWAwSPCuWR9MuCJZZIgARGPouTCIcSA4OQAoMW7dt2wCEEZECCI1oCJAADrZyBAAcDuQRByOABQkKDAvbtwRBxu24AMFAAcGCIY/B7AQIhpOC3MjKIVsCJe3jYRCwiPEkARBQg227ieDAQO0CJPhCKHJCK1N0ARI28JCIjUDEY4OBzWRfAoRG3ARBygRH3oPBswRB4QjFfAYgCt9pYoJoEkmbCJONCI1ACJGSiQRE7TXDCIuQEYkmCIhpDEYSCFCIj2DCIOTrYRE6ARDAH4AHA"))
diff --git a/apps/espruinoprog/app.js b/apps/espruinoprog/app.js
new file mode 100644
index 000000000..b939d4007
--- /dev/null
+++ b/apps/espruinoprog/app.js
@@ -0,0 +1,90 @@
+var uart; // require("ble_uart")
+var device; // BluetoothDevice
+var uploadTimeout; // a timeout used during upload - if we disconnect, kill this
+Bangle.loadWidgets();
+
+var json = require("Storage").readJSON("espruinoprog.json",1);
+/*var json = { // for example
+ namePrefix : "Puck.js ",
+ code : "E.setBootCode('digitalPulse(LED2,1,100);')",
+ post : "LED.set();NRF.sleep()",
+};*/
+
+if ("object" != typeof json) {
+ E.showAlert("JSON not found","Programmer").then(() => load());
+ throw new Error("JSON not found");
+ // stops execution
+}
+
+// Set up terminal
+var R = Bangle.appRect;
+var termg = Graphics.createArrayBuffer(R.w, R.h, 1, {msb:true});
+termg.setFont("6x8");
+var term;
+
+function showTerminal() {
+ E.showMenu(); // clear anything that was drawn
+ if (term) term.print(""); // redraw terminal
+}
+
+function scanAndConnect() {
+ termg.clear();
+ term = require("VT100").connect(termg, {
+ charWidth : 6,
+ charHeight : 8
+ });
+ term.print = str => {
+ for (var i of str) term.char(i);
+ g.reset().drawImage(termg,R.x,R.y);
+ };
+ term.print(`\r\nScanning...\r\n`);
+ NRF.requestDevice({ filters: [{ namePrefix: json.namePrefix }] }).then(function(dev) {
+ term.print(`Found ${dev.name||dev.id.substr(0,17)}\r\n`);
+ device = dev;
+
+ term.print(`Connect to ${dev.name||dev.id.substr(0,17)}...\r\n`);
+ device.removeAllListeners();
+ device.on('gattserverdisconnected', function(reason) {
+ if (!uart) return;
+ term.print(`\r\nDISCONNECTED (${reason})\r\n`);
+ uart = undefined;
+ device = undefined;
+ if (uploadTimeout) clearTimeout(uploadTimeout);
+ uploadTimeout = undefined;
+ setTimeout(scanAndConnect, 1000);
+ });
+ require("ble_uart").connect(device).then(function(u) {
+ uart = u;
+ term.print("Connected...\r\n");
+ uart.removeAllListeners();
+ uart.on('data', function(d) { term.print(d); });
+ uart.write(json.code+"\n").then(() => {
+ term.print("\r\nUpload Complete...\r\n");
+ // main upload completed - wait a bit
+ uploadTimeout = setTimeout(function() {
+ term.print("\r\nFinal Upload...\r\n");
+ // now upload the code to run after...
+ uart.write(json.post+"\n").then(() => {
+ term.print("\r\nDone.\r\n");
+ // now wait and disconnect (if not already done!)
+ uploadTimeout = setTimeout(function() {
+ term.print("\r\nDisconnecting...\r\n");
+ if (uart) uart.disconnect();
+ }, 500);
+ });
+ }, 1000);
+ });
+ });
+ }).catch(err => {
+ if (err.toString().startsWith("No device found")) {
+ // expected - try again
+ scanAndConnect();
+ } else
+ term.print(`\r\ERROR ${err.toString()}\r\n`);
+ });
+}
+
+// now start
+Bangle.drawWidgets();
+showTerminal();
+scanAndConnect();
diff --git a/apps/espruinoprog/app.png b/apps/espruinoprog/app.png
new file mode 100644
index 000000000..b2b435f04
Binary files /dev/null and b/apps/espruinoprog/app.png differ
diff --git a/apps/espruinoprog/custom.html b/apps/espruinoprog/custom.html
new file mode 100644
index 000000000..c994aaea7
--- /dev/null
+++ b/apps/espruinoprog/custom.html
@@ -0,0 +1,145 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+