try and tidy up sending by setting time in the 'sending' event rather than by adding to the program code

Author: gfwilliams

bin/espruino-cli.js

@@ -473,49 +473,51 @@ function sendCode(callback) {
         }
       }
     }
-    Espruino.callProcessor("transformForEspruino", code, function(code) {
-      if (args.outputHEX) {
-        log("Writing hex output to "+args.outputHEX);
-        var storage = {}
-        var hadCode = false;
-        for (let storageName in args.storageContents) {
-          let storageContent = args.storageContents[storageName];
-          if (storageContent.code) {
-            storage[storageName] = code;
-            hadCode = true;
-          } else {
-            storage[storageName] = storageContent.data;
+    Espruino.callProcessor("sending", null, function() {
+      Espruino.callProcessor("transformForEspruino", code, function(code) {
+        if (args.outputHEX) {
+          log("Writing hex output to "+args.outputHEX);
+          var storage = {}
+          var hadCode = false;
+          for (let storageName in args.storageContents) {
+            let storageContent = args.storageContents[storageName];
+            if (storageContent.code) {
+              storage[storageName] = code;
+              hadCode = true;
+            } else {
+              storage[storageName] = storageContent.data;
+            }
           }
-        }
-        // add code in default place
-        if (!hadCode) storage[".bootcde"]=code;
-        require("fs").writeFileSync(args.outputHEX, toIntelHex(storage));
-      } else {
-        // if not creating a hex, we just add the code needed to upload
-        // files to the beginning of what we upload
-        for (let storageName in args.storageContents) {
-          let storageContent = args.storageContents[storageName];
-          if (!storageContent.code) {
-            code = Espruino.Core.Utils.getUploadFileCode(storageName, storageContent.data)+"\n" + code;
+          // add code in default place
+          if (!hadCode) storage[".bootcde"]=code;
+          require("fs").writeFileSync(args.outputHEX, toIntelHex(storage));
+        } else {
+          // if not creating a hex, we just add the code needed to upload
+          // files to the beginning of what we upload
+          for (let storageName in args.storageContents) {
+            let storageContent = args.storageContents[storageName];
+            if (!storageContent.code) {
+              code = Espruino.Core.Utils.getUploadFileCode(storageName, storageContent.data)+"\n" + code;
+            }
           }
         }
-      }
-      if (args.outputJS) {
-        log("Writing output to "+args.outputJS);
-        require("fs").writeFileSync(args.outputJS, code, "binary");
-      }
-      if (!args.nosend)
-        Espruino.Core.CodeWriter.writeToEspruino(code, function() {
-          if (args.sleepAfterUpload) {
-            log("Upload Complete. Sleeping for "+args.sleepAfterUpload+"s");
-            setTimeout(callback, args.sleepAfterUpload*1000);
-          } else {
-            log("Upload Complete");
-            callback();
-          }
-        });
-      else
-        callback();
+        if (args.outputJS) {
+          log("Writing output to "+args.outputJS);
+          require("fs").writeFileSync(args.outputJS, code, "binary");
+        }
+        if (!args.nosend)
+          Espruino.Core.CodeWriter.writeToEspruino(code, function() {
+            if (args.sleepAfterUpload) {
+              log("Upload Complete. Sleeping for "+args.sleepAfterUpload+"s");
+              setTimeout(callback, args.sleepAfterUpload*1000);
+            } else {
+              log("Upload Complete");
+              callback();
+            }
+          });
+        else
+          callback();
+      });
     });
   } else {
     callback();

espruino.js

@@ -20,7 +20,7 @@
    *
    *   jsCodeChanged        - called when the code in JS editor changes with {code, editor}
    *   xmlCodeChanged       - called when the code in the blockly editor changes with {code}
-   *   sending              - sending code to Espruino (no data)
+   *   sending              - sending code to Espruino (no data). Called before code is requested and transformed (but after connection)
    *   sendModeChanged      - called when the send mode (RAM/Flash/Storage) changes
    *   transformForEspruino - transform code ready to be sent to Espruino
    *   transformModuleForEspruino({code,name})

plugins/setTime.js

@@ -23,13 +23,14 @@
       onChange : function(newValue) {  }
     });
 
-   // When code is sent to Espruino, append code to set the current time
-   Espruino.addProcessor("transformForEspruino", function(code, callback) {
+   // Just before code is sent to Espruino, write code that will set the current time and timezone
+   Espruino.addProcessor("sending", function(_, callback) {
      if (Espruino.Config.SET_TIME_ON_WRITE) {
        var time = new Date();
-       code = "setTime("+(time.getTime()/1000)+");E.setTimeZone("+(-time.getTimezoneOffset()/60)+")\n"+code;
-     }
-     callback(code);
+       var code = "\x10setTime("+(time.getTime()/1000)+");E.setTimeZone("+(-time.getTimezoneOffset()/60)+")\n";
+       Espruino.Core.Serial.write(code, false, callback);
+     } else
+       callback();
    });
   }