tasmota-webserial-esptool 6.0.2 → 6.1.1

package/js/utilities.js

@@ -6,7 +6,7 @@ function toByteArray(str) {
   let byteArray = [];
   for (let i = 0; i < str.length; i++) {
     let charcode = str.charCodeAt(i);
-    if (charcode <= 0xFF) {
+    if (charcode <= 0xff) {
       byteArray.push(charcode);
     }
   }
@@ -17,132 +17,166 @@ function fromByteArray(byteArray) {
   return String.fromCharCode.apply(String, byteArray);
 }
 
-function crc32(data, value=0) {
+function crc32(data, value = 0) {
   if (data instanceof Array) {
     data = fromByteArray(data);
   }
   let table = [];
-  for(let entry, c = 0; c < 256; c++) {
+  for (let entry, c = 0; c < 256; c++) {
     entry = c;
-    for(let k = 0; k < 8; k++) {
-      entry = 1 & entry ? 3988292384^entry >>> 1 : entry >>> 1;
+    for (let k = 0; k < 8; k++) {
+      entry = 1 & entry ? 3988292384 ^ (entry >>> 1) : entry >>> 1;
     }
     table[c] = entry;
   }
   let n = -1 - value;
-  for(let t = 0; t < data.length; t++) {
-    n = n >>> 8^table[255 & (n^data.charCodeAt(t))];
+  for (let t = 0; t < data.length; t++) {
+    n = (n >>> 8) ^ table[255 & (n ^ data.charCodeAt(t))];
   }
   return (-1 ^ n) >>> 0;
 }
 
 function zipLongest() {
-    var args = [].slice.call(arguments);
-    var longest = args.reduce(function(a,b){
-        return a.length > b.length ? a : b
-    }, []);
+  var args = [].slice.call(arguments);
+  var longest = args.reduce(function (a, b) {
+    return a.length > b.length ? a : b;
+  }, []);
 
-    return longest.map(function(_,i){
-        return args.map(function(array){return array[i]})
+  return longest.map(function (_, i) {
+    return args.map(function (array) {
+      return array[i];
     });
+  });
 }
 
 class struct {
-    static lut = {
-      "b": {u: DataView.prototype.getInt8, p: DataView.prototype.setInt8, bytes: 1},
-      "B": {u: DataView.prototype.getUint8, p: DataView.prototype.setUint8, bytes: 1},
-      "h": {u: DataView.prototype.getInt16, p: DataView.prototype.setInt16, bytes: 2},
-      "H": {u: DataView.prototype.getUint16, p: DataView.prototype.setUint16, bytes: 2},
-      "i": {u: DataView.prototype.getInt32, p: DataView.prototype.setInt32, bytes: 4},
-      "I": {u: DataView.prototype.getUint32, p: DataView.prototype.setUint32, bytes: 4},
-      "q": {u: DataView.prototype.getInt64, p: DataView.prototype.setInt64, bytes: 8},
-      "Q": {u: DataView.prototype.getUint64, p: DataView.prototype.setUint64, bytes: 8},
-    }
-
-    static pack(...args) {
-        let format = args[0];
-        let pointer = 0;
-        let data = args.slice(1);
-        if (format.replace(/[<>]/, '').length != data.length) {
-            throw("Pack format to Argument count mismatch");
-            return;
-        }
-        let bytes = [];
-        let littleEndian = true;
-        for (let i = 0; i < format.length; i++) {
-            if (format[i] == "<") {
-                littleEndian = true;
-            } else if (format[i] == ">") {
-                littleEndian = false;
-            } else {
-                pushBytes(format[i], data[pointer]);
-                pointer++;
-            }
-        }
+  static lut = {
+    b: {
+      u: DataView.prototype.getInt8,
+      p: DataView.prototype.setInt8,
+      bytes: 1,
+    },
+    B: {
+      u: DataView.prototype.getUint8,
+      p: DataView.prototype.setUint8,
+      bytes: 1,
+    },
+    h: {
+      u: DataView.prototype.getInt16,
+      p: DataView.prototype.setInt16,
+      bytes: 2,
+    },
+    H: {
+      u: DataView.prototype.getUint16,
+      p: DataView.prototype.setUint16,
+      bytes: 2,
+    },
+    i: {
+      u: DataView.prototype.getInt32,
+      p: DataView.prototype.setInt32,
+      bytes: 4,
+    },
+    I: {
+      u: DataView.prototype.getUint32,
+      p: DataView.prototype.setUint32,
+      bytes: 4,
+    },
+    q: {
+      u: DataView.prototype.getInt64,
+      p: DataView.prototype.setInt64,
+      bytes: 8,
+    },
+    Q: {
+      u: DataView.prototype.getUint64,
+      p: DataView.prototype.setUint64,
+      bytes: 8,
+    },
+  };
 
-        function pushBytes(formatChar, value) {
-            if (!(formatChar in struct.lut)) {
-                throw("Unhandled character '" + formatChar + "' in pack format");
-            }
-            let dataSize = struct.lut[formatChar].bytes;
-            let view = new DataView(new ArrayBuffer(dataSize));
-            let dataViewFn = struct.lut[formatChar].p.bind(view);
-            dataViewFn(0, value, littleEndian);
-            for (let i = 0; i < dataSize; i++) {
-                bytes.push(view.getUint8(i));
-            }
-        }
+  static pack(...args) {
+    let format = args[0];
+    let pointer = 0;
+    let data = args.slice(1);
+    if (format.replace(/[<>]/, "").length != data.length) {
+      throw "Pack format to Argument count mismatch";
+      return;
+    }
+    let bytes = [];
+    let littleEndian = true;
+    for (let i = 0; i < format.length; i++) {
+      if (format[i] == "<") {
+        littleEndian = true;
+      } else if (format[i] == ">") {
+        littleEndian = false;
+      } else {
+        pushBytes(format[i], data[pointer]);
+        pointer++;
+      }
+    }
 
-        return bytes;
-    };
+    function pushBytes(formatChar, value) {
+      if (!(formatChar in struct.lut)) {
+        throw "Unhandled character '" + formatChar + "' in pack format";
+      }
+      let dataSize = struct.lut[formatChar].bytes;
+      let view = new DataView(new ArrayBuffer(dataSize));
+      let dataViewFn = struct.lut[formatChar].p.bind(view);
+      dataViewFn(0, value, littleEndian);
+      for (let i = 0; i < dataSize; i++) {
+        bytes.push(view.getUint8(i));
+      }
+    }
 
-    static unpack(format, bytes) {
-        let pointer = 0;
-        let data = [];
-        let littleEndian = true;
+    return bytes;
+  }
 
-        for (let c of format) {
-            if (c == "<") {
-                littleEndian = true;
-            } else if (c == ">") {
-                littleEndian = false;
-            } else {
-                pushData(c);
-            }
-        }
+  static unpack(format, bytes) {
+    let pointer = 0;
+    let data = [];
+    let littleEndian = true;
 
-        function pushData(formatChar) {
-            if (!(formatChar in struct.lut)) {
-                throw("Unhandled character '" + formatChar + "' in unpack format");
-            }
-            let dataSize = struct.lut[formatChar].bytes;
-            let view = new DataView(new ArrayBuffer(dataSize));
-            for (let i = 0; i < dataSize; i++) {
-              view.setUint8(i, bytes[pointer + i] & 0xFF);
-            }
-            let dataViewFn = struct.lut[formatChar].u.bind(view);
-            data.push(dataViewFn(0, littleEndian));
-            pointer += dataSize;
-        }
+    for (let c of format) {
+      if (c == "<") {
+        littleEndian = true;
+      } else if (c == ">") {
+        littleEndian = false;
+      } else {
+        pushData(c);
+      }
+    }
 
-        return data;
-    };
+    function pushData(formatChar) {
+      if (!(formatChar in struct.lut)) {
+        throw "Unhandled character '" + formatChar + "' in unpack format";
+      }
+      let dataSize = struct.lut[formatChar].bytes;
+      let view = new DataView(new ArrayBuffer(dataSize));
+      for (let i = 0; i < dataSize; i++) {
+        view.setUint8(i, bytes[pointer + i] & 0xff);
+      }
+      let dataViewFn = struct.lut[formatChar].u.bind(view);
+      data.push(dataViewFn(0, littleEndian));
+      pointer += dataSize;
+    }
 
-    static calcsize(format) {
-        let size = 0;
-        for (let i = 0; i < format.length; i++) {
-            if (format[i] != "<" && format[i] != ">") {
-                size += struct.lut[format[i]].bytes;
-            }
-        }
+    return data;
+  }
 
-        return size;
+  static calcsize(format) {
+    let size = 0;
+    for (let i = 0; i < format.length; i++) {
+      if (format[i] != "<" && format[i] != ">") {
+        size += struct.lut[format[i]].bytes;
+      }
     }
+
+    return size;
+  }
 }
 
 function* makeFileIterator(content) {
-    for (let line of content.split(/\r?\n/)) {
-        yield line.trim();
-    }
-    return '';
+  for (let line of content.split(/\r?\n/)) {
+    yield line.trim();
+  }
+  return "";
 }

package/license.md

@@ -9,4 +9,3 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of
 The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tasmota-webserial-esptool",
-  "version": "6.0.2",
+  "version": "6.1.1",
   "description": "Flash ESP devices using WebSerial",
   "main": "dist/index.js",
   "repository": {
@@ -18,19 +18,19 @@
   },
   "devDependencies": {
     "@rollup/plugin-json": "^6.0.0",
-    "@rollup/plugin-node-resolve": "^15.0.2",
+    "@rollup/plugin-node-resolve": "^15.2.1",
     "@rollup/plugin-terser": "^0.4.3",
-    "@rollup/plugin-typescript": "^11.1.1",
+    "@rollup/plugin-typescript": "^11.1.3",
     "@types/pako": "^2.0.0",
     "@types/w3c-web-serial": "^1.0.3",
-    "prettier": "^2.8.8",
-    "rollup": "^3.23.0",
-    "serve": "^14.2.0",
-    "typescript": "^5.0.4"
+    "prettier": "^3.0.3",
+    "rollup": "^3.29.2",
+    "serve": "^14.2.1",
+    "typescript": "^5.2.2"
   },
   "dependencies": {
-    "@types/node": "^20.2.3",
+    "@types/node": "^20.6.2",
     "pako": "^2.1.0",
-    "tslib": "^2.5.2"
+    "tslib": "^2.6.2"
   }
 }

package/rollup.config.js

@@ -20,7 +20,7 @@ if (process.env.NODE_ENV === "production") {
       output: {
         comments: false,
       },
-    })
+    }),
   );
 }
 

package/script/build

@@ -4,5 +4,9 @@ set -e
 cd "$(dirname "$0")/.."
 
 rm -rf dist
+rm -rf js/modules
+mkdir js/modules
 NODE_ENV=production npm exec -- tsc
 NODE_ENV=production npm exec -- rollup -c
+cp dist/web/*.js js/modules/
+mv js/modules/index.js js/modules/esptool.js

package/src/const.ts

@@ -102,6 +102,18 @@ export const ESP32S3_SPI_W0_OFFS = 0x58;
 export const ESP32S3_UART_DATE_REG_ADDR = 0x60000080;
 export const ESP32S3_BOOTLOADER_FLASH_OFFSET = 0x0;
 
+export const ESP32C2_SPI_REG_BASE = 0x60002000;
+export const ESP32C2_BASEFUSEADDR = 0x60008800;
+export const ESP32C2_MACFUSEADDR = 0x60008800 + 0x044;
+export const ESP32C2_SPI_USR_OFFS = 0x18;
+export const ESP32C2_SPI_USR1_OFFS = 0x1c;
+export const ESP32C2_SPI_USR2_OFFS = 0x20;
+export const ESP32C2_SPI_MOSI_DLEN_OFFS = 0x24;
+export const ESP32C2_SPI_MISO_DLEN_OFFS = 0x28;
+export const ESP32C2_SPI_W0_OFFS = 0x58;
+export const ESP32C2_UART_DATE_REG_ADDR = 0x6000007c;
+export const ESP32C2_BOOTLOADER_FLASH_OFFSET = 0x0;
+
 export const ESP32C3_SPI_REG_BASE = 0x60002000;
 export const ESP32C3_BASEFUSEADDR = 0x60008800;
 export const ESP32C3_MACFUSEADDR = 0x60008800 + 0x044;
@@ -114,6 +126,30 @@ export const ESP32C3_SPI_W0_OFFS = 0x58;
 export const ESP32C3_UART_DATE_REG_ADDR = 0x6000007c;
 export const ESP32C3_BOOTLOADER_FLASH_OFFSET = 0x0;
 
+export const ESP32C6_SPI_REG_BASE = 0x60003000;
+export const ESP32C6_BASEFUSEADDR = 0x600b0800;
+export const ESP32C6_MACFUSEADDR = 0x600b0800 + 0x044;
+export const ESP32C6_SPI_USR_OFFS = 0x18;
+export const ESP32C6_SPI_USR1_OFFS = 0x1c;
+export const ESP32C6_SPI_USR2_OFFS = 0x20;
+export const ESP32C6_SPI_MOSI_DLEN_OFFS = 0x24;
+export const ESP32C6_SPI_MISO_DLEN_OFFS = 0x28;
+export const ESP32C6_SPI_W0_OFFS = 0x58;
+export const ESP32C6_UART_DATE_REG_ADDR = 0x6000007c;
+export const ESP32C6_BOOTLOADER_FLASH_OFFSET = 0x0;
+
+export const ESP32H2_SPI_REG_BASE = 0x60002000;
+export const ESP32H2_BASEFUSEADDR = 0x6001a000;
+export const ESP32H2_MACFUSEADDR = 0x6001a000 + 0x044;
+export const ESP32H2_SPI_USR_OFFS = 0x18;
+export const ESP32H2_SPI_USR1_OFFS = 0x1c;
+export const ESP32H2_SPI_USR2_OFFS = 0x20;
+export const ESP32H2_SPI_MOSI_DLEN_OFFS = 0x24;
+export const ESP32H2_SPI_MISO_DLEN_OFFS = 0x28;
+export const ESP32H2_SPI_W0_OFFS = 0x58;
+export const ESP32H2_UART_DATE_REG_ADDR = 0x6000007c;
+export const ESP32H2_BOOTLOADER_FLASH_OFFSET = 0x0;
+
 export interface SpiFlashAddresses {
   regBase: number;
   baseFuse: number;
@@ -129,7 +165,7 @@ export interface SpiFlashAddresses {
 }
 
 export const SYNC_PACKET = toByteArray(
-  "\x07\x07\x12 UUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUU"
+  "\x07\x07\x12 UUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUU",
 );
 export const CHIP_DETECT_MAGIC_REG_ADDR = 0x40001000;
 // These values for the families are made up; nothing that esptool uses.
@@ -137,6 +173,7 @@ export const CHIP_FAMILY_ESP8266 = 0x8266;
 export const CHIP_FAMILY_ESP32 = 0x32;
 export const CHIP_FAMILY_ESP32S2 = 0x3252;
 export const CHIP_FAMILY_ESP32S3 = 0x3253;
+export const CHIP_FAMILY_ESP32C2 = 0x32c2;
 export const CHIP_FAMILY_ESP32C3 = 0x32c3;
 export const CHIP_FAMILY_ESP32C6 = 0x32c6;
 export const CHIP_FAMILY_ESP32H2 = 0x3272;
@@ -145,6 +182,7 @@ export type ChipFamily =
   | typeof CHIP_FAMILY_ESP32
   | typeof CHIP_FAMILY_ESP32S2
   | typeof CHIP_FAMILY_ESP32S3
+  | typeof CHIP_FAMILY_ESP32C2
   | typeof CHIP_FAMILY_ESP32C3
   | typeof CHIP_FAMILY_ESP32C6
   | typeof CHIP_FAMILY_ESP32H2;
@@ -162,10 +200,15 @@ export const CHIP_DETECT_MAGIC_VALUES: ChipInfo = {
   0x000007c6: { name: "ESP32-S2", family: CHIP_FAMILY_ESP32S2 },
   0x9: { name: "ESP32-S3", family: CHIP_FAMILY_ESP32S3 },
   0xeb004136: { name: "ESP32-S3(beta2)", family: CHIP_FAMILY_ESP32S3 },
+  0x6f51306f: { name: "ESP32-C2", family: CHIP_FAMILY_ESP32C2 },
+  0x7c41a06f: { name: "ESP32-C2", family: CHIP_FAMILY_ESP32C2 },
   0x6921506f: { name: "ESP32-C3", family: CHIP_FAMILY_ESP32C3 },
   0x1b31506f: { name: "ESP32-C3", family: CHIP_FAMILY_ESP32C3 },
-  0xca26cc22: { name: "ESP32-H2", family: CHIP_FAMILY_ESP32H2 },
+  0x4881606f: { name: "ESP32-C3", family: CHIP_FAMILY_ESP32C3 },
+  0x4361606f: { name: "ESP32-C3", family: CHIP_FAMILY_ESP32C3 },
+  0xd7b73e80: { name: "ESP32-H2", family: CHIP_FAMILY_ESP32H2 },
   0x0da1806f: { name: "ESP32-C6(beta)", family: CHIP_FAMILY_ESP32C6 },
+  0x2ce0806f: { name: "ESP32-C6", family: CHIP_FAMILY_ESP32C6 },
 };
 
 // Commands supported by ESP8266 ROM bootloader
@@ -217,7 +260,7 @@ export const timeoutPerMb = (secondsPerMb: number, sizeBytes: number) => {
 };
 
 export const getSpiFlashAddresses = (
-  chipFamily: ChipFamily
+  chipFamily: ChipFamily,
 ): SpiFlashAddresses => {
   switch (chipFamily) {
     case CHIP_FAMILY_ESP32:
@@ -276,6 +319,20 @@ export const getSpiFlashAddresses = (
         uartDateReg: ESP8266_UART_DATE_REG_ADDR,
         flashOffs: ESP8266_BOOTLOADER_FLASH_OFFSET,
       };
+    case CHIP_FAMILY_ESP32C2:
+      return {
+        regBase: ESP32C2_SPI_REG_BASE,
+        baseFuse: ESP32C2_BASEFUSEADDR,
+        macFuse: ESP32C2_MACFUSEADDR,
+        usrOffs: ESP32C2_SPI_USR_OFFS,
+        usr1Offs: ESP32C2_SPI_USR1_OFFS,
+        usr2Offs: ESP32C2_SPI_USR2_OFFS,
+        mosiDlenOffs: ESP32C2_SPI_MOSI_DLEN_OFFS,
+        misoDlenOffs: ESP32C2_SPI_MISO_DLEN_OFFS,
+        w0Offs: ESP32C2_SPI_W0_OFFS,
+        uartDateReg: ESP32C2_UART_DATE_REG_ADDR,
+        flashOffs: ESP32C2_BOOTLOADER_FLASH_OFFSET,
+      };
     case CHIP_FAMILY_ESP32C3:
       return {
         regBase: ESP32C3_SPI_REG_BASE,
@@ -290,6 +347,34 @@ export const getSpiFlashAddresses = (
         uartDateReg: ESP32C3_UART_DATE_REG_ADDR,
         flashOffs: ESP32C3_BOOTLOADER_FLASH_OFFSET,
       };
+    case CHIP_FAMILY_ESP32C6:
+      return {
+        regBase: ESP32C6_SPI_REG_BASE,
+        baseFuse: ESP32C6_BASEFUSEADDR,
+        macFuse: ESP32C6_MACFUSEADDR,
+        usrOffs: ESP32C6_SPI_USR_OFFS,
+        usr1Offs: ESP32C6_SPI_USR1_OFFS,
+        usr2Offs: ESP32C6_SPI_USR2_OFFS,
+        mosiDlenOffs: ESP32C6_SPI_MOSI_DLEN_OFFS,
+        misoDlenOffs: ESP32C6_SPI_MISO_DLEN_OFFS,
+        w0Offs: ESP32C6_SPI_W0_OFFS,
+        uartDateReg: ESP32C6_UART_DATE_REG_ADDR,
+        flashOffs: ESP32C6_BOOTLOADER_FLASH_OFFSET,
+      };
+    case CHIP_FAMILY_ESP32H2:
+      return {
+        regBase: ESP32H2_SPI_REG_BASE,
+        baseFuse: ESP32H2_BASEFUSEADDR,
+        macFuse: ESP32H2_MACFUSEADDR,
+        usrOffs: ESP32H2_SPI_USR_OFFS,
+        usr1Offs: ESP32H2_SPI_USR1_OFFS,
+        usr2Offs: ESP32H2_SPI_USR2_OFFS,
+        mosiDlenOffs: ESP32H2_SPI_MOSI_DLEN_OFFS,
+        misoDlenOffs: ESP32H2_SPI_MISO_DLEN_OFFS,
+        w0Offs: ESP32H2_SPI_W0_OFFS,
+        uartDateReg: ESP32H2_UART_DATE_REG_ADDR,
+        flashOffs: ESP32H2_BOOTLOADER_FLASH_OFFSET,
+      };
     default:
       return {
         regBase: -1,