From 4d432a471c27cf3e311d7caadf5a9f6e1afe8cca Mon Sep 17 00:00:00 2001
From: Paul Kendall <pkendall64@gmail.com>
Date: Sat, 9 Jul 2022 08:11:24 +1200
Subject: [PATCH] Minor fixes and cleanup

---
 ESPLoader.js      | 22 ++++++++++------------
 package-lock.json |  1 +
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/ESPLoader.js b/ESPLoader.js
index 6dfd655..ebd25a1 100644
--- a/ESPLoader.js
+++ b/ESPLoader.js
@@ -735,13 +735,14 @@ class ESPLoader {
     ESP_MEM_END = 0x06;
     ESP_MEM_DATA = 0x07;
     ESP_WRITE_REG = 0x09;
+    ESP_READ_REG = 0x0A;
+
+    ESP_SPI_ATTACH = 0x0D;
+    ESP_CHANGE_BAUDRATE = 0x0F;
     ESP_FLASH_DEFL_BEGIN = 0x10;
     ESP_FLASH_DEFL_DATA  = 0x11;
     ESP_FLASH_DEFL_END   = 0x12;
     ESP_SPI_FLASH_MD5    = 0x13;
-    ESP_READ_REG = 0x0A;
-    ESP_SPI_ATTACH = 0x0D;
-    ESP_CHANGE_BAUDRATE = 0x0F;
 
     // Only Stub supported commands
     ESP_ERASE_FLASH = 0xD0;
@@ -1032,7 +1033,7 @@ class ESPLoader {
     }
 
     check_command = async ({op_description="", op=null, data=[], chk=0, timeout=3000} = {}) => {
-        console.log("check_command " + op) ;
+        console.log("check_command " + op_description) ;
         var resp = await this.command({op:op, data:data, chk:chk, timeout:timeout});
         if (resp[1].length > 4) {
             return resp[1];
@@ -1043,11 +1044,11 @@ class ESPLoader {
 
     mem_begin = async (size, blocks, blocksize, offset) => {
         /* XXX: Add check to ensure that STUB is not getting overwritten */
-        console.log("mem_begin " + size + " " + blocks + " " + blocksize + " " + offset);
+        console.log("mem_begin " + size + " " + blocks + " " + blocksize + " " + offset.toString(16));
         var pkt = this._appendArray(this._int_to_bytearray(size), this._int_to_bytearray(blocks));
         pkt = this._appendArray(pkt, this._int_to_bytearray(blocksize));
         pkt = this._appendArray(pkt, this._int_to_bytearray(offset));
-        await this.check_command({op_description: "write to target RAM", op: this.ESP_MEM_BEGIN, data: pkt});
+        await this.check_command({op_description: "enter RAM download mode", op: this.ESP_MEM_BEGIN, data: pkt});
     }
 
     checksum = function (data) {
@@ -1090,7 +1091,6 @@ class ESPLoader {
     }
 
     flash_begin = async (size, offset) => {
-
         var num_blocks = Math.floor((size + this.FLASH_WRITE_SIZE - 1) / this.FLASH_WRITE_SIZE);
         var erase_size = this.chip.get_erase_size(offset, size);
 
@@ -1116,7 +1116,7 @@ class ESPLoader {
         if (size != 0 && this.IS_STUB == false) {
             this.log("Took "+((t2-t1)/1000)+"."+((t2-t1)%1000)+"s to erase flash block");
         }
-
+        return num_blocks;
     }
 
     flash_defl_begin = async (size, compsize, offset) => {
@@ -1220,8 +1220,8 @@ class ESPLoader {
                 var SPI_DATA_LEN_REG = SPI_USR1_REG;
                 var SPI_MOSI_BITLEN_S = 17;
                 var SPI_MISO_BITLEN_S = 8;
-                mosi_mask = (mosi_bits === 0) ? 0 : (mosi_bits - 1);
-                miso_mask = (miso_bits === 0) ? 0 : (miso_bits - 1);
+                var mosi_mask = (mosi_bits === 0) ? 0 : (mosi_bits - 1);
+                var miso_mask = (miso_bits === 0) ? 0 : (miso_bits - 1);
                 var val = (miso_mask << SPI_MISO_BITLEN_S) | (mosi_mask << SPI_MOSI_BITLEN_S);
                 await this.write_reg({addr:SPI_DATA_LEN_REG, value:val});
             };
@@ -1399,7 +1399,6 @@ class ESPLoader {
 
         await this.change_baud();
         return chip;
-
     }
 
     flash_size_bytes = function(flash_size) {
@@ -1590,4 +1589,3 @@ class ESPLoader {
 
 
 export { ESPLoader };
-
diff --git a/package-lock.json b/package-lock.json
index f9531c3..e92a16e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4,6 +4,7 @@
   "requires": true,
   "packages": {
     "": {
+      "name": "esptool-js",
       "dependencies": {
         "crypto-js": "^4.0.0",
         "xterm": "^4.13.0"