add custom offset for flash binaries (#957)

espressif · May 4, 2023 · 46484f6 · 46484f6
1 parent e8da6fb
commit 46484f6
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 12 deletions.
diff --git a/src/espIdf/partition-table/partitionFlasher.ts b/src/espIdf/partition-table/partitionFlasher.ts
@@ -21,6 +21,7 @@ import { Progress, ProgressLocation, Uri, window } from "vscode";
 import { readParameter } from "../../idfConfiguration";
 import { Logger } from "../../logger/logger";
 import { appendIdfAndToolsToPath, spawn } from "../../utils";
+import { OutputChannel } from "../../logger/outputChannel";
 
 export async function flashBinaryToPartition(
   offset: string,
@@ -50,7 +51,7 @@ export async function flashBinaryToPartition(
           "esptool.py"
         );
 
-        await spawn(
+        const flashingOutput = await spawn(
           pythonBinPath,
           [esptoolPath, "-p", serialPort, "write_flash", offset, binPath],
           {
@@ -64,7 +65,7 @@ export async function flashBinaryToPartition(
       } catch (error) {
         let msg = error.message
           ? error.message
-          : "Error getting partitions from device";
+          : "Error flashing binary to device";
         Logger.errorNotify(msg, error);
       }
     }

diff --git a/src/extension.ts b/src/extension.ts
@@ -2188,26 +2188,46 @@ export async function activate(context: vscode.ExtensionContext) {
       if (!binPath) {
         return;
       }
+      let items = [];
       const partitionsInDevice = partitionTableTreeDataProvider.getChildren();
       if (!partitionsInDevice) {
         vscode.window.showInformationMessage("No partition found");
-        return;
-      }
-      let items = [];
-      for (let devicePartition of partitionsInDevice) {
-        const item = {
-          label: devicePartition.name,
-          target: devicePartition.offset,
-          description: devicePartition.description,
-        };
-        items.push(item);
+      } else {
+        for (let devicePartition of partitionsInDevice) {
+          const item = {
+            label: devicePartition.name,
+            target: devicePartition.offset,
+            description: devicePartition.description,
+          };
+          items.push(item);
+        }
       }
+      items.push({
+        label: "Custom offset",
+        target: "custom",
+        description: "Enter a custom offset",
+      });
       const partitionAction = await vscode.window.showQuickPick(items, {
         placeHolder: "Select a partition to use",
       });
       if (!partitionAction) {
         return;
       }
+      if (partitionAction.target === "custom") {
+        const customOffset = await vscode.window.showInputBox({
+          placeHolder: "Enter custom partition table offset",
+          value: "",
+          validateInput: (text) => {
+            return /^(0x[0-9a-fA-F]+|[0-9]+)$/i.test(text)
+              ? null
+              : "The value is not a valid hexadecimal number";
+          },
+        });
+        if (!customOffset) {
+          return;
+        }
+        partitionAction.target = customOffset;
+      }
       await flashBinaryToPartition(
         partitionAction.target,
         binPath.fsPath,

diff --git a/src/utils.ts b/src/utils.ts
@@ -138,6 +138,7 @@ export function spawn(
   let buff = Buffer.alloc(0);
   const sendToOutputChannel = (data: Buffer) => {
     buff = Buffer.concat([buff, data]);
+    OutputChannel.append(data.toString());
   };
   return new Promise((resolve, reject) => {
     options.cwd = options.cwd || path.resolve(path.join(__dirname, ".."));