Merge branch 'master' of https://github.com/rikkuness/EspruinoTools into packetsend

Author: rikkuness

core/flasher.js

@@ -362,7 +362,7 @@
       console.log("Downloaded "+binary.byteLength+" bytes");
       flashBinaryToDevice(binary, flashOffset, callback, statusCallback);
     });
-  };
+  }
 
 
   function resetDevice(callback) {
@@ -417,9 +417,7 @@
         }, 2000/*timeout*/);
       });
     });
-  };
-
-
+  }
 
   Espruino.Core.Flasher = {
     init : init,

core/flasherESP8266.js

@@ -13,7 +13,7 @@
 (function(){
 
   const BLOCK_SIZE = 0x400;
-  var uart;
+  // var uart;
   var uartLine = "";
   var packetHandler;
 
@@ -166,7 +166,7 @@ function unsetupEspruino(options) {
 function cmdSync(options) {
   console.log("Syncing...");
   return new Promise((resolve,reject)=>{
-    var success = false;
+    // var success = false;
     var interval;
     packetHandler = function(d) {
       if (d.cmd==8) {

core/modules.js

@@ -126,20 +126,20 @@
     console.log("loadModule("+fullModuleName+")");
 
     var urls = []; // Array of where to look for this module
-    var modName; // Simple name of the module
+    // var modName; // Simple name of the module
     if(Espruino.Core.Utils.isURL(fullModuleName)) {
-      modName = fullModuleName.substr(fullModuleName.lastIndexOf("/") + 1).split(".")[0];
+      // modName = fullModuleName.substr(fullModuleName.lastIndexOf("/") + 1).split(".")[0];
       urls = [ fullModuleName ];
     } else {
-      modName = fullModuleName;
+      // modName = fullModuleName;
       Espruino.Config.MODULE_URL.split("|").forEach(function (url) {
         url = url.trim();
         if (url.length!=0)
         Espruino.Config.MODULE_EXTENSIONS.split("|").forEach(function (extension) {
           urls.push(url + "/" + fullModuleName + extension);
         })
       });
-    };
+    }
 
     // Recursively go through all the urls
     (function download(urls) {
@@ -234,7 +234,7 @@
         callback(loadedModuleData.join("\n") + "\n" + code);
       });
     }
-  };
+  }
 
 
   Espruino.Core.Modules = {

core/serial.js

@@ -286,20 +286,6 @@ To add a new serial device, you must add an object to
     });
   };
 
-  var str2ab=function(str) {
-    var buf=new ArrayBuffer(str.length);
-    var bufView=new Uint8Array(buf);
-    for (var i=0; i<str.length; i++) {
-      var ch = str.charCodeAt(i);
-      if (ch>=256) {
-        console.warn("serial> Attempted to send non-8 bit character - code "+ch);
-        ch = "?".charCodeAt(0);
-      }
-      bufView[i] = ch;
-    }
-    return buf;
-  };
-
   var closeSerial=function() {
     if (currentDevice) {
       currentDevice.close();

core/serial_chrome_serial.js

@@ -30,7 +30,7 @@ Author: Gordon Williams (gw@pur3.co.uk)
   }
 
   var connectionInfo;
-  var connectedPort; // unused?
+  // var connectedPort; // unused?
   var connectionDisconnectCallback;
   var connectionReadCallback;
 
@@ -65,7 +65,7 @@ Author: Gordon Williams (gw@pur3.co.uk)
           openCallback(undefined);
         } else {
           connectionInfo = cInfo;
-          connectedPort = serialPort;
+          // connectedPort = serialPort;
           console.log(cInfo);
           openCallback(cInfo);
         }

core/serial_web_audio.js

@@ -218,7 +218,7 @@
         connectionReadCallback(arr.buffer);
       }, 10);
     }
-  };
+  }
 
   // ----------------------------------------------------------
 

core/serial_web_serial.js

@@ -109,9 +109,11 @@
         flowControl: "none",
         rtscts: false });
     }).then(function () {
+      var getReaderSuccess = false;
       function readLoop() {
         serialPortReader = serialPort.readable.getReader();
         serialPortReader.read().then(function ({ value, done }) {
+          getReaderSuccess = true;
           serialPortReader.releaseLock();
           serialPortReader = undefined;
           if (value) {
@@ -130,8 +132,19 @@
             readLoop();
           }
         }).catch(function(e) {
-          serialPortReader.releaseLock();
-          console.log("Serial> serialPortReader rejected", e);
+          if (getReaderSuccess == false && e == "BreakError: Break received") {
+            // This fixes a longstanding issue (since 2017) that affected ESP32 devices.
+            // Espruino Web IDE, sometimes did not connect to an ESP32 device, especially the first time you tried. 
+            // The workaround was to use another tool to connect to the ESP32, like minicom or cutecom
+            // and once connected using one of these tools, you tried again using Espruino Web IDE.
+            console.log("Condition break received and ignored");
+            console.log("Retrying the read loop...");
+            getReaderSuccess = true;
+            readLoop();
+          } else {
+            serialPortReader.releaseLock();
+            console.log("Serial> serialPortReader rejected", e);
+          }
         });
       }
       serialPort.addEventListener("disconnect", (event) => {

core/terminal.js

@@ -335,7 +335,7 @@
       callback(data);
     });
 
-  };
+  }
 
   /* check for any terminal-inline-image and if they are still BMP
   then convert them to PNG using canvas */
@@ -430,7 +430,7 @@
       if (i in elements)
         elements[i].remove();
     // now write this to the screen
-    var t = [];
+    // var t = [];
     for (var y in termText) {
       var line = termText[y];
       if (y == termCursorY) {
@@ -485,7 +485,7 @@
       var x = Math.min(pos.left, terminal.offsetWidth);
       var y = Math.min(pos.top-tPos.top, terminal.height-terminalfocus.offsetHeight);
       terminalfocus.style.left=x+"px";
-      terminalfocus.style.top=(pos.top-tPos.top)+"px";
+      terminalfocus.style.top=y+"px";
     }
   };
 
@@ -495,8 +495,6 @@
     return str.substr(0,s+1);
   }
 
-
-
   var handleReceivedCharacter = function (/*char*/ch) {
     function isUTF8StartChar(ch) {
       return (ch>=0xC2) && (ch<=0xF4);
@@ -612,7 +610,7 @@
     var old = onInputData;
     onInputData = callback;
     return old;
-  };
+  }
 
   /// Called when data comes OUT of Espruino INTO the terminal
   function outputDataHandler(readData) {
@@ -632,7 +630,7 @@
         displayData = [];
         displayTimeout = null;
       }, 50);
-  };
+  }
 
   var receivedData = "";
   function searchData(bytes){
@@ -661,36 +659,36 @@
     });
     // Ensure that data from Espruino goes to this terminal
     Espruino.Core.Serial.startListening(Espruino.Core.Terminal.outputDataHandler);
-  };
+  }
 
   /// Get the current terminal line that we're on
   function getCurrentLine() {
     return termText.length-1;
-  };
+  }
 
   /// Set extra text to display before a certain terminal line
   function setExtraText(line, text) {
     if (termExtraText[line] != text) {
       termExtraText[line] = text;
       updateTerminal();
     }
-  };
+  }
 
   /// Clear all extra text that is to be displayed
   function clearExtraText() {
     termExtraText = {};
     updateTerminal();
-  };
+  }
 
   /// Does the terminal have focus?
   function hasFocus() {
     return document.querySelector("#terminal").classList.contains("focus");
-  };
+  }
 
   /// Give the terminal focus
   function focus() {
     document.getElementById("terminalfocus").focus();
-  };
+  }
 
   // Is the terminal actually visible, or is it so small it can't be seen?
   function isVisible() {
@@ -713,15 +711,15 @@
     while (line < termText.length && termText[line].substr(0,1)==":")
       text += "\n"+termText[line++].substr(1);
     return { line : startLine, text : text };
-  };
+  }
 
   /** Get the Nth from latest line of text in the terminal (unlike getInputLine) */
   function getTerminalLine(n) {
     if (n===undefined) n=0;
     var line = termText.length-(1+n);
     if (line<0) return undefined;
     return termText[line];
-  };
+  }
 
   /** Add a notification to the terminal (as HTML). If options.buttonclick is set
   then the first <button> inside the notification text