From cf0fc121bae37a543e65b9c80b9706965387e149 Mon Sep 17 00:00:00 2001 From: Brian Ignacio Date: Wed, 19 Feb 2025 17:38:38 +0800 Subject: [PATCH 1/4] add app bootloader partition table build flash cmds --- package.json | 30 +++++++++++ src/build/buildCmd.ts | 7 +-- src/build/buildTask.ts | 6 ++- src/config.ts | 6 +++ src/espIdf/partition-table/tree.ts | 74 +++++++++++++------------ src/extension.ts | 44 ++++++++++++--- src/flash/flashModel.ts | 2 + src/flash/flashModelBuilder.ts | 28 +++++++++- src/flash/flashTask.ts | 86 +++++++++++++++++++++++++++++- src/flash/uartFlash.ts | 5 +- 10 files changed, 238 insertions(+), 50 deletions(-) diff --git a/package.json b/package.json index 4a77b2de4..db65f7b68 100644 --- a/package.json +++ b/package.json @@ -1273,6 +1273,36 @@ "title": "%espIdf.buildDevice.title%", "category": "ESP-IDF" }, + { + "command": "espIdf.buildApp", + "title": "Build App", + "category": "ESP-IDF" + }, + { + "command": "espIdf.flashAppUart", + "title": "Flash App only", + "category": "ESP-IDF" + }, + { + "command": "espIdf.buildBootloader", + "title": "Build Bootloader", + "category": "ESP-IDF" + }, + { + "command": "espIdf.flashBootloaderUart", + "title": "Flash Bootloader Only", + "category": "ESP-IDF" + }, + { + "command": "espIdf.buildPartitionTable", + "title": "Build Partition Table", + "category": "ESP-IDF" + }, + { + "command": "espIdf.flashPartitionTableUart", + "title": "Flash Partition Table Only", + "category": "ESP-IDF" + }, { "command": "espIdf.flashDevice", "title": "%espIdf.flashDevice.title%", diff --git a/src/build/buildCmd.ts b/src/build/buildCmd.ts index 954251a9e..9a98fcaf3 100644 --- a/src/build/buildCmd.ts +++ b/src/build/buildCmd.ts @@ -34,7 +34,8 @@ import { OutputChannel } from "../logger/outputChannel"; export async function buildCommand( workspace: vscode.Uri, cancelToken: vscode.CancellationToken, - flashType: ESP.FlashType + flashType: ESP.FlashType, + buildType?: ESP.BuildType ) { let continueFlag = true; const buildTask = new BuildTask(workspace); @@ -57,13 +58,13 @@ export async function buildCommand( }); try { await customTask.addCustomTask(CustomTaskType.PreBuild); - await buildTask.build(); + await buildTask.build(buildType); await TaskManager.runTasks(); const enableSizeTask = (await readParameter( "idf.enableSizeTaskAfterBuildTask", workspace )) as boolean; - if (enableSizeTask) { + if (enableSizeTask && typeof buildType === undefined) { const sizeTask = new IdfSizeTask(workspace); await sizeTask.getSizeInfo(); } diff --git a/src/build/buildTask.ts b/src/build/buildTask.ts index 2916a1e3a..43a7b55a5 100644 --- a/src/build/buildTask.ts +++ b/src/build/buildTask.ts @@ -31,6 +31,7 @@ import { TaskManager } from "../taskManager"; import { selectedDFUAdapterId } from "../flash/dfu"; import { getVirtualEnvPythonPath } from "../pythonManager"; import { getIdfTargetFromSdkconfig } from "../workspaceConfig"; +import { ESP } from "../config"; export class BuildTask { public static isBuilding: boolean; @@ -64,7 +65,7 @@ export class BuildTask { } } - public async build() { + public async build(buildType?: ESP.BuildType) { try { await this.saveBeforeBuild(); } catch (error) { @@ -204,6 +205,9 @@ export class BuildTask { (idfConf.readParameter("idf.ninjaArgs", this.currentWorkspace) as Array< string >) || []; + if (buildType && buildArgs.indexOf(buildType) === -1) { + buildArgs.push(buildType); + } const ninjaCommand = "ninja"; const buildExecution = new vscode.ProcessExecution( ninjaCommand, diff --git a/src/config.ts b/src/config.ts index bc2294314..9f3aac03f 100644 --- a/src/config.ts +++ b/src/config.ts @@ -34,6 +34,12 @@ export namespace ESP { "esp_idf_project_configuration.json"; } + export enum BuildType { + App = "app", + Bootloader = "bootloader", + PartitionTable = "partition-table", + } + export enum FlashType { JTAG = "JTAG", UART = "UART", diff --git a/src/espIdf/partition-table/tree.ts b/src/espIdf/partition-table/tree.ts index 0fa4c213a..430859e95 100644 --- a/src/espIdf/partition-table/tree.ts +++ b/src/espIdf/partition-table/tree.ts @@ -88,11 +88,15 @@ export class PartitionTreeDataProvider const partitionTableOffsetOption = await window.showQuickPick( [ { - label: `Use sdkconfig offset`, + label: `Use current project partition table file`, + target: "project", + }, + { + label: `Read from current serial port using sdkconfig partition table offset`, target: "sdkconfig", }, { - label: `Specify partition table offset`, + label: `Read from current serial port using custom partition table offset`, target: "custom", }, ], @@ -122,8 +126,8 @@ export class PartitionTreeDataProvider } } - ensureDir(join(workspace.fsPath, "partition_table")); - const partTableBin = join( + await ensureDir(join(workspace.fsPath, "partition_table")); + let partTableBin = join( workspace.fsPath, "partition_table", "partitionTable.bin" @@ -149,37 +153,39 @@ export class PartitionTreeDataProvider "gen_esp32part.py" ); - await spawn( - pythonBinPath, - [ - esptoolPath, - "-p", - serialPort, - "read_flash", - partitionTableOffset, - this.PARTITION_TABLE_SIZE, - partTableBin, - ], - { - cwd: workspace.fsPath, - env: modifiedEnv, - } - ); + if (partitionTableOffsetOption.target.indexOf("project") === -1) { + await spawn( + pythonBinPath, + [ + esptoolPath, + "-p", + serialPort, + "read_flash", + partitionTableOffset, + this.PARTITION_TABLE_SIZE, + partTableBin, + ], + { + cwd: workspace.fsPath, + env: modifiedEnv, + } + ); + } else { + const buildPath = readParameter("idf.buildPath", workspace); + partTableBin = join(buildPath, "partition_table", "partition-table.bin"); + } - await spawn( - pythonBinPath, - [ - genEsp32PartPath, - "-o", - partitionTableOffset, - partTableBin, - partTableCsv, - ], - { - cwd: workspace.fsPath, - env: modifiedEnv, - } - ); + const genEsp32Args = [genEsp32PartPath]; + + if (partitionTableOffset) { + genEsp32Args.push("-o", partitionTableOffset); + } + genEsp32Args.push(partTableBin, partTableCsv); + + await spawn(pythonBinPath, genEsp32Args, { + cwd: workspace.fsPath, + env: modifiedEnv, + }); const csvData = await readFile(partTableCsv); let csvItems = CSV2JSON(csvData.toString()); this.partitionItems = this.createPartitionItemNode(csvItems); diff --git a/src/extension.ts b/src/extension.ts index 67790a829..23e088357 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -1830,6 +1830,28 @@ export async function activate(context: vscode.ExtensionContext) { registerIDFCommand("espIdf.buildFlashMonitor", buildFlashAndMonitor); registerIDFCommand("espIdf.monitorQemu", createQemuMonitor); + registerIDFCommand("espIdf.buildApp", () => + build(undefined, ESP.BuildType.App) + ); + registerIDFCommand("espIdf.flashAppUart", async () => { + const isEncrypted = await isFlashEncryptionEnabled(workspaceRoot); + return flash(isEncrypted, ESP.FlashType.UART, ESP.BuildType.App); + }); + registerIDFCommand("espIdf.buildBootloader", () => + build(undefined, ESP.BuildType.Bootloader) + ); + registerIDFCommand("espIdf.flashBootloaderUart", async () => { + const isEncrypted = await isFlashEncryptionEnabled(workspaceRoot); + return flash(isEncrypted, ESP.FlashType.UART, ESP.BuildType.Bootloader); + }); + registerIDFCommand("espIdf.buildPartitionTable", () => + build(undefined, ESP.BuildType.PartitionTable) + ); + registerIDFCommand("espIdf.flashPartitionTableUart", async () => { + const isEncrypted = await isFlashEncryptionEnabled(workspaceRoot); + return flash(isEncrypted, ESP.FlashType.UART, ESP.BuildType.PartitionTable); + }); + registerIDFCommand("espIdf.menuconfig.start", async () => { PreCheck.perform([openFolderCheck], () => { try { @@ -3965,7 +3987,7 @@ function registerTreeProvidersForIDFExplorer(context: vscode.ExtensionContext) { ); } -const build = (flashType?: ESP.FlashType) => { +const build = (flashType?: ESP.FlashType, buildType?: ESP.BuildType) => { PreCheck.perform([openFolderCheck], async () => { const notificationMode = idfConf.readParameter( "idf.notificationMode", @@ -3992,14 +4014,15 @@ const build = (flashType?: ESP.FlashType) => { workspaceRoot ) as ESP.FlashType; } - await buildCommand(workspaceRoot, cancelToken, flashType); + await buildCommand(workspaceRoot, cancelToken, flashType, buildType); } ); }); }; const flash = ( encryptPartitions: boolean = false, - flashType?: ESP.FlashType + flashType?: ESP.FlashType, + partitionToUse?: ESP.BuildType ) => { PreCheck.perform([openFolderCheck], async () => { // Re route to ESP-IDF Web extension if using Codespaces or Browser @@ -4032,7 +4055,14 @@ const flash = ( workspaceRoot ) as ESP.FlashType; } - if (await startFlashing(cancelToken, flashType, encryptPartitions)) { + if ( + await startFlashing( + cancelToken, + flashType, + encryptPartitions, + partitionToUse + ) + ) { OutputChannel.appendLine( "Flash has finished. You can monitor your device with 'ESP-IDF: Monitor command'" ); @@ -4201,7 +4231,8 @@ async function selectFlashMethod() { async function startFlashing( cancelToken: vscode.CancellationToken, flashType: ESP.FlashType, - encryptPartitions: boolean + encryptPartitions: boolean, + partitionToUse?: ESP.BuildType ) { if (!flashType) { flashType = await selectFlashMethod(); @@ -4267,7 +4298,8 @@ async function startFlashing( port, workspaceRoot, flashType, - encryptPartitions + encryptPartitions, + partitionToUse ); } } diff --git a/src/flash/flashModel.ts b/src/flash/flashModel.ts index c37f0f160..cd088fe10 100644 --- a/src/flash/flashModel.ts +++ b/src/flash/flashModel.ts @@ -20,6 +20,8 @@ export interface FlashModel { after: string; app: FlashSection; + bootloader: FlashSection; + partitionTable: FlashSection; baudRate: string; before: string; chip: string; diff --git a/src/flash/flashModelBuilder.ts b/src/flash/flashModelBuilder.ts index 50c35a9d0..74571eeb4 100644 --- a/src/flash/flashModelBuilder.ts +++ b/src/flash/flashModelBuilder.ts @@ -29,7 +29,31 @@ export async function createFlashModel( app: { address: flashArgsJson.app ? flashArgsJson.app.offset : undefined, binFilePath: flashArgsJson.app ? flashArgsJson.app.file : undefined, - encrypted: flashArgsJson.app ? flashArgsJson.app.encrypted : undefined, + encrypted: flashArgsJson.app + ? flashArgsJson.app.encrypted.indexOf("true") !== -1 + : undefined, + } as FlashSection, + bootloader: { + address: flashArgsJson.bootloader + ? flashArgsJson.bootloader.offset + : undefined, + binFilePath: flashArgsJson.bootloader + ? flashArgsJson.bootloader.file + : undefined, + encrypted: flashArgsJson.bootloader + ? flashArgsJson.bootloader.encrypted.indexOf("true") !== -1 + : undefined, + } as FlashSection, + partitionTable: { + address: flashArgsJson["partition-table"] + ? flashArgsJson["partition-table"].offset + : undefined, + binFilePath: flashArgsJson["partition-table"] + ? flashArgsJson["partition-table"].file + : undefined, + encrypted: flashArgsJson["partition-table"] + ? flashArgsJson["partition-table"].encrypted.indexOf("true") !== -1 + : undefined, } as FlashSection, after: flashArgsJson.extra_esptool_args.after, before: flashArgsJson.extra_esptool_args.before, @@ -53,7 +77,7 @@ export async function createFlashModel( flashModel.flashSections.push({ address: fileKey, binFilePath: flashArgsJson.flash_files[fileKey], - encrypted: false + encrypted: false, } as FlashSection); } }); diff --git a/src/flash/flashTask.ts b/src/flash/flashTask.ts index d6b529a3c..4164ca8c6 100644 --- a/src/flash/flashTask.ts +++ b/src/flash/flashTask.ts @@ -84,7 +84,7 @@ export class FlashTask { } } - public async flash(flashType: ESP.FlashType) { + public async flash(flashType: ESP.FlashType, partitionToUse?: ESP.BuildType) { if (FlashTask.isFlashing) { throw new Error("ALREADY_FLASHING"); } @@ -110,7 +110,30 @@ export class FlashTask { }; switch (flashType) { case "UART": - flashExecution = this._flashExecution(pythonBinPath); + if (!partitionToUse) { + flashExecution = this._flashExecution(pythonBinPath); + } else { + switch (partitionToUse) { + case "app": + flashExecution = this._partitionFlashExecution( + pythonBinPath, + "app" + ); + break; + case "bootloader": + flashExecution = this._partitionFlashExecution( + pythonBinPath, + "bootloader" + ); + break; + case "partition-table": + flashExecution = this._partitionFlashExecution( + pythonBinPath, + "partitionTable" + ); + break; + } + } break; case "DFU": flashExecution = await this._dfuFlashing(pythonBinPath); @@ -171,6 +194,65 @@ export class FlashTask { return new vscode.ProcessExecution(cmd, args, this.processOptions); } + public _partitionFlashExecution( + pythonBinPath: string, + sectionToUse: "app" | "bootloader" | "partitionTable" + ) { + this.flashing(true); + const flasherArgs = this.getSingleBinFlasherArgs( + this.flashScriptPath, + sectionToUse + ); + return new vscode.ProcessExecution( + pythonBinPath, + flasherArgs, + this.processOptions + ); + } + + public getSingleBinFlasherArgs( + toolPath: string, + sectionToUse: "app" | "bootloader" | "partitionTable", + replacePathSep: boolean = false + ) { + const flasherArgs = [ + toolPath, + "-p", + this.model.port, + "-b", + this.model.baudRate, + "--before", + this.model.before, + "--after", + this.model.after, + ]; + if (this.model.chip) { + flasherArgs.push("--chip", this.model.chip); + } + if (typeof this.model.stub !== undefined && !this.model.stub) { + flasherArgs.push("--no-stub"); + } + flasherArgs.push( + "write_flash", + "--flash_mode", + this.model.mode, + "--flash_freq", + this.model.frequency, + "--flash_size", + this.model.size + ); + + if (this.model[sectionToUse].encrypted) { + flasherArgs.push("--encrypt-files"); + } + + let binPath = replacePathSep + ? this.model[sectionToUse].binFilePath.replace(/\//g, "\\") + : this.model[sectionToUse].binFilePath; + flasherArgs.push(this.model[sectionToUse].address, binPath); + return flasherArgs; + } + public getFlasherArgs(toolPath: string, replacePathSep: boolean = false) { const flasherArgs = [ toolPath, diff --git a/src/flash/uartFlash.ts b/src/flash/uartFlash.ts index 89f1aca86..d42bec988 100644 --- a/src/flash/uartFlash.ts +++ b/src/flash/uartFlash.ts @@ -34,7 +34,8 @@ export async function flashCommand( port: string, workspace: Uri, flashType: ESP.FlashType, - encryptPartitions: boolean + encryptPartitions: boolean, + partitionToUse?: ESP.BuildType ) { let continueFlag = true; const buildPath = readParameter("idf.buildPath", workspace) as string; @@ -70,7 +71,7 @@ export async function flashCommand( FlashTask.isFlashing = false; }); await customTask.addCustomTask(CustomTaskType.PreFlash); - await flashTask.flash(flashType); + await flashTask.flash(flashType, partitionToUse); await customTask.addCustomTask(CustomTaskType.PostFlash); await TaskManager.runTasks(); if (!cancelToken.isCancellationRequested) { From 0c6408367510ee19db75ab7b9a8bc50680b75768 Mon Sep 17 00:00:00 2001 From: Brian Ignacio Date: Thu, 20 Feb 2025 17:54:35 +0800 Subject: [PATCH 2/4] add read partition from flash --- src/espIdf/partition-table/partitionReader.ts | 121 ++++++++++++++++++ src/extension.ts | 12 ++ 2 files changed, 133 insertions(+) create mode 100644 src/espIdf/partition-table/partitionReader.ts diff --git a/src/espIdf/partition-table/partitionReader.ts b/src/espIdf/partition-table/partitionReader.ts new file mode 100644 index 000000000..5f1d8f1bb --- /dev/null +++ b/src/espIdf/partition-table/partitionReader.ts @@ -0,0 +1,121 @@ +/* + * Project: ESP-IDF VSCode Extension + * File Created: Thursday, 20th February 2025 11:05:27 am + * Copyright 2025 Espressif Systems (Shanghai) CO LTD + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +import { dirname, join } from "path"; +import { Progress, ProgressLocation, Uri, window } from "vscode"; +import { NotificationMode, readParameter } from "../../idfConfiguration"; +import { Logger } from "../../logger/logger"; +import { appendIdfAndToolsToPath, spawn } from "../../utils"; +import { getVirtualEnvPythonPath } from "../../pythonManager"; +import { ensureDir } from "fs-extra"; + +export async function readPartition( + name: string, + offset: string, + size: string, + workspaceFolder: Uri +) { + const notificationMode = readParameter( + "idf.notificationMode", + workspaceFolder + ) as string; + const progressLocation = + notificationMode === NotificationMode.All || + notificationMode === NotificationMode.Notifications + ? ProgressLocation.Notification + : ProgressLocation.Window; + await window.withProgress( + { + cancellable: false, + location: progressLocation, + title: "ESP-IDF: Reading partition from device to binary", + }, + async (progress: Progress<{ message: string; increment: number }>) => { + try { + const modifiedEnv = await appendIdfAndToolsToPath(workspaceFolder); + const serialPort = readParameter("idf.port", workspaceFolder); + const idfPath = readParameter("idf.espIdfPath", workspaceFolder); + const pythonBinPath = await getVirtualEnvPythonPath(workspaceFolder); + const esptoolPath = join( + idfPath, + "components", + "esptool_py", + "esptool", + "esptool.py" + ); + let resultBinaryPath = join( + workspaceFolder.fsPath, + "partitionsFromDevice", + `${name}.bin` + ); + + await ensureDir(dirname(resultBinaryPath)); + + const parsedSize = parsePartitionSize(size); + + await spawn( + pythonBinPath, + [esptoolPath, "-p", serialPort, "read_flash", offset, parsedSize, resultBinaryPath], + { + cwd: workspaceFolder.fsPath, + env: modifiedEnv, + } + ); + window.showInformationMessage(`Device partition @${offset} saved as ${resultBinaryPath}`); + } catch (error) { + let msg = error.message + ? error.message + : "Error reading partition from device to binary"; + Logger.errorNotify(msg, error, "readPartition"); + } + } + ); +} + +export function parsePartitionSize(size: string): string { + // Regular expression to match the size pattern (e.g., 24K, 1M) + const regex = /^(\d+)([KMGT]?B?)$/i; + const match = size.match(regex); + + if (!match) { + throw new Error('Invalid size format'); + } + + // Extract the numeric value and the unit + const value = parseInt(match[1], 10); + const unit = match[2].toUpperCase(); + + // Define the multiplier based on the unit + const multipliers: { [key: string]: number } = { + 'K': 1024, + 'KB': 1024, + 'M': 1024 ** 2, + 'MB': 1024 ** 2, + 'G': 1024 ** 3, + 'GB': 1024 ** 3, + 'T': 1024 ** 4, + 'TB': 1024 ** 4, + '': 1, // No unit defaults to bytes + 'B': 1 // Byte unit + }; + + // Calculate the size in bytes + const bytes = value * (multipliers[unit] || 1); + + // Convert to hexadecimal string prefixed with '0x' + return '0x' + bytes.toString(16).toUpperCase(); +} diff --git a/src/extension.ts b/src/extension.ts index 23e088357..516d44c78 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -173,6 +173,7 @@ import { } from "./cmdTreeView/cmdStore"; import { IdfSetup } from "./views/setup/types"; import { asyncRemoveEspIdfSettings } from "./uninstall"; +import { readPartition } from "./espIdf/partition-table/partitionReader"; // Global variables shared by commands let workspaceRoot: vscode.Uri; @@ -2671,6 +2672,10 @@ export async function activate(context: vscode.ExtensionContext) { PreCheck.perform([openFolderCheck], async () => { const partitionAction = await vscode.window.showQuickPick( [ + { + label: vscode.l10n.t("Read partition from device"), + target: "readPartition", + }, { label: vscode.l10n.t(`Flash binary to this partition`), target: "flashBinaryToPartition", @@ -2701,6 +2706,13 @@ export async function activate(context: vscode.ExtensionContext) { workspaceRoot ); } + } else if (partitionAction.target === "readPartition") { + await readPartition( + partitionNode.name, + partitionNode.offset, + partitionNode.size, + workspaceRoot + ); } }); } From 7a296595ebcc838e87db11d9a48356a967d403a9 Mon Sep 17 00:00:00 2001 From: Brian Ignacio Date: Fri, 21 Feb 2025 18:28:43 +0800 Subject: [PATCH 3/4] add partition table and bootloader to device partition explorer --- package.json | 8 +- src/espIdf/partition-table/partitionReader.ts | 25 +-- src/espIdf/partition-table/tree.ts | 168 +++++++++--------- src/extension.ts | 8 +- 4 files changed, 105 insertions(+), 104 deletions(-) diff --git a/package.json b/package.json index db65f7b68..0d0a8c89c 100644 --- a/package.json +++ b/package.json @@ -408,6 +408,11 @@ "group": "navigation", "when": "view == idfPartitionExplorer" }, + { + "command": "esp.webview.open.partition-table", + "group": "navigation@2", + "when": "view == idfPartitionExplorer" + }, { "command": "espIdf.apptrace.customize", "when": "view == idfAppTracer" @@ -1511,7 +1516,8 @@ }, { "command": "esp.webview.open.partition-table", - "title": "%esp.webview.open.partition-table.title%" + "title": "%esp.webview.open.partition-table.title%", + "icon": "$(output)" }, { "command": "espIdf.jtag_flash", diff --git a/src/espIdf/partition-table/partitionReader.ts b/src/espIdf/partition-table/partitionReader.ts index 5f1d8f1bb..69cdaf209 100644 --- a/src/espIdf/partition-table/partitionReader.ts +++ b/src/espIdf/partition-table/partitionReader.ts @@ -88,34 +88,37 @@ export async function readPartition( export function parsePartitionSize(size: string): string { // Regular expression to match the size pattern (e.g., 24K, 1M) - const regex = /^(\d+)([KMGT]?B?)$/i; + const regex = /^(\d+)([KM]?)$/i; const match = size.match(regex); if (!match) { throw new Error('Invalid size format'); } - - // Extract the numeric value and the unit const value = parseInt(match[1], 10); const unit = match[2].toUpperCase(); // Define the multiplier based on the unit const multipliers: { [key: string]: number } = { 'K': 1024, - 'KB': 1024, 'M': 1024 ** 2, - 'MB': 1024 ** 2, - 'G': 1024 ** 3, - 'GB': 1024 ** 3, - 'T': 1024 ** 4, - 'TB': 1024 ** 4, '': 1, // No unit defaults to bytes - 'B': 1 // Byte unit }; - // Calculate the size in bytes const bytes = value * (multipliers[unit] || 1); // Convert to hexadecimal string prefixed with '0x' return '0x' + bytes.toString(16).toUpperCase(); } + +export function formatAsPartitionSize(bytes: number): string { + if (bytes >= 1024 * 1024) { + // For megabytes, divide by (1024*1024) and remove any trailing zeros if not needed. + const mb = bytes / (1024 * 1024); + return `${Math.ceil(mb)}M`; + } else if (bytes >= 1024) { + const kb = bytes / 1024; + return `${Math.ceil(kb)}K`; + } else { + return bytes.toString(); + } +} diff --git a/src/espIdf/partition-table/tree.ts b/src/espIdf/partition-table/tree.ts index 430859e95..2b1358c5a 100644 --- a/src/espIdf/partition-table/tree.ts +++ b/src/espIdf/partition-table/tree.ts @@ -16,7 +16,7 @@ * limitations under the License. */ -import { ensureDir, readFile } from "fs-extra"; +import { ensureDir, pathExists, readFile, stat } from "fs-extra"; import { EOL } from "os"; import { join } from "path"; import { @@ -40,6 +40,8 @@ import { } from "../../utils"; import { CSV2JSON } from "../../views/partition-table/util"; import { getVirtualEnvPythonPath } from "../../pythonManager"; +import { createFlashModel } from "../../flash/flashModelBuilder"; +import { formatAsPartitionSize } from "./partitionReader"; export class PartitionItem extends TreeItem { name: string; @@ -81,71 +83,68 @@ export class PartitionTreeDataProvider public async populatePartitionItems(workspace: Uri) { this.partitionItems = Array(0); try { - const modifiedEnv = await appendIdfAndToolsToPath(workspace); const serialPort = readParameter("idf.port", workspace) as string; const idfPath = readParameter("idf.espIdfPath", workspace); + const buildPath = readParameter("idf.buildPath", workspace); + const flashBaudRate = readParameter("idf.flashBaudRate", workspace); + const modifiedEnv = await appendIdfAndToolsToPath(workspace); const pythonBinPath = await getVirtualEnvPythonPath(workspace); - const partitionTableOffsetOption = await window.showQuickPick( - [ - { - label: `Use current project partition table file`, - target: "project", - }, - { - label: `Read from current serial port using sdkconfig partition table offset`, - target: "sdkconfig", - }, - { - label: `Read from current serial port using custom partition table offset`, - target: "custom", - }, - ], - { placeHolder: "Select partition table offset to use" } - ); - if (!partitionTableOffsetOption) { + + const flasherArgsPath = join(buildPath, "flasher_args.json"); + + const flasherArgsExists = await pathExists(flasherArgsPath); + if (!flasherArgsExists) { + window.showInformationMessage( + `${flasherArgsPath} doesn't exist. Build first.` + ); return; } - let partitionTableOffset = ""; - if (partitionTableOffsetOption.target.indexOf("sdkconfig") !== -1) { - partitionTableOffset = await getConfigValueFromSDKConfig( - "CONFIG_PARTITION_TABLE_OFFSET", - workspace + + const flasherArgsModel = await createFlashModel( + flasherArgsPath, + serialPort, + flashBaudRate + ); + let partitionTableOffset = flasherArgsModel.partitionTable.address; + + const partitionTableItem: PartitionItem = { + name: "partition_table", + type: "partition_table", + subtype: "primary", + offset: partitionTableOffset, + size: "3K", + flag: undefined, + error: undefined, + }; + + const bootloaderFile = join(buildPath, "bootloader", "bootloader.bin"); + const bootloaderFileExists = await pathExists(bootloaderFile); + if (!bootloaderFileExists) { + window.showInformationMessage( + `${bootloaderFile} doesn't exist. Build first.` ); - } else if (partitionTableOffsetOption.target.indexOf("custom") !== -1) { - partitionTableOffset = await 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 (partitionTableOffset === undefined) { - return; - } + return; } + const bootloaderStats = await stat(bootloaderFile); + const bootloaderSize = formatAsPartitionSize(bootloaderStats.size); + + const bootloaderItem: PartitionItem = { + name: "bootloader", + type: "bootloader", + subtype: "primary", + offset: flasherArgsModel.bootloader.address, + size: bootloaderSize, + flag: undefined, + error: undefined, + }; await ensureDir(join(workspace.fsPath, "partition_table")); - let partTableBin = join( - workspace.fsPath, - "partition_table", - "partitionTable.bin" - ); const partTableCsv = join( workspace.fsPath, "partition_table", "partitionTable.csv" ); - const esptoolPath = join( - idfPath, - "components", - "esptool_py", - "esptool", - "esptool.py" - ); - const genEsp32PartPath = join( idfPath, "components", @@ -153,42 +152,41 @@ export class PartitionTreeDataProvider "gen_esp32part.py" ); - if (partitionTableOffsetOption.target.indexOf("project") === -1) { - await spawn( - pythonBinPath, - [ - esptoolPath, - "-p", - serialPort, - "read_flash", - partitionTableOffset, - this.PARTITION_TABLE_SIZE, - partTableBin, - ], - { - cwd: workspace.fsPath, - env: modifiedEnv, - } - ); - } else { - const buildPath = readParameter("idf.buildPath", workspace); - partTableBin = join(buildPath, "partition_table", "partition-table.bin"); - } - - const genEsp32Args = [genEsp32PartPath]; + const partTableBin = join( + buildPath, + "partition_table", + "partition-table.bin" + ); - if (partitionTableOffset) { - genEsp32Args.push("-o", partitionTableOffset); + const partitionTableExists = await pathExists(partTableBin); + if (!partitionTableExists) { + window.showInformationMessage( + `${partTableBin} doesn't exist. Build first.` + ); + return; } - genEsp32Args.push(partTableBin, partTableCsv); - await spawn(pythonBinPath, genEsp32Args, { - cwd: workspace.fsPath, - env: modifiedEnv, - }); + await spawn( + pythonBinPath, + [ + genEsp32PartPath, + "-o", + partitionTableOffset, + partTableBin, + partTableCsv, + ], + { + cwd: workspace.fsPath, + env: modifiedEnv, + } + ); const csvData = await readFile(partTableCsv); let csvItems = CSV2JSON(csvData.toString()); - this.partitionItems = this.createPartitionItemNode(csvItems); + this.partitionItems = this.createPartitionItemNode([ + bootloaderItem, + partitionTableItem, + ...csvItems, + ]); } catch (error) { let msg = error.message ? error.message @@ -220,9 +218,9 @@ export class PartitionTreeDataProvider arguments: [partitionTableNode], }; partitionTableNode.iconPath = new ThemeIcon("file-binary"); - partitionTableNode.description = `Offset (${item.offset.toUpperCase()}) size: (${ - item.size - })`; + partitionTableNode.description = `Offset (${item.offset + .toUpperCase() + .replace("0X", "0x")}) size: (${item.size})`; partitionItems.push(partitionTableNode); } return partitionItems; diff --git a/src/extension.ts b/src/extension.ts index 516d44c78..dde5ec1b3 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -2680,19 +2680,13 @@ export async function activate(context: vscode.ExtensionContext) { label: vscode.l10n.t(`Flash binary to this partition`), target: "flashBinaryToPartition", }, - { - label: vscode.l10n.t("Open partition table editor"), - target: "openPartitionTableEditor", - }, ], { placeHolder: vscode.l10n.t("Select an action to use") } ); if (!partitionAction) { return; } - if (partitionAction.target === "openPartitionTableEditor") { - vscode.commands.executeCommand("esp.webview.open.partition-table"); - } else if (partitionAction.target === "flashBinaryToPartition") { + if (partitionAction.target === "flashBinaryToPartition") { const selectedFile = await vscode.window.showOpenDialog({ canSelectFolders: false, canSelectFiles: true, From 571ecb752b1aa8f6ea1d99d63dcd184c5f2c7f8a Mon Sep 17 00:00:00 2001 From: Brian Ignacio Date: Thu, 6 Mar 2025 17:23:06 +0800 Subject: [PATCH 4/4] add translations --- l10n/bundle.l10n.es.json | 1 + l10n/bundle.l10n.pt.json | 1 + l10n/bundle.l10n.ru.json | 1 + l10n/bundle.l10n.zh-CN.json | 1 + package.json | 12 ++++++------ package.nls.es.json | 6 ++++++ package.nls.json | 6 ++++++ package.nls.pt.json | 6 ++++++ package.nls.ru.json | 6 ++++++ package.nls.zh-CN.json | 12 +++++++++--- src/espIdf/partition-table/tree.ts | 13 ++++++++++--- 11 files changed, 53 insertions(+), 12 deletions(-) diff --git a/l10n/bundle.l10n.es.json b/l10n/bundle.l10n.es.json index 06572d418..633f98760 100644 --- a/l10n/bundle.l10n.es.json +++ b/l10n/bundle.l10n.es.json @@ -135,6 +135,7 @@ "Error encountered while calling idf_size.py": "Error encontrado al llamar a idf_size.py", "Select the available serial port where your device is connected.": "Seleccione el puerto serie disponible donde está conectado su dispositivo.", "Port has been updated to ": "El puerto ha sido actualizado a ", + "{buildFile} doesn't exist. Build first.": "{buildFile} no existe. Compile primero.", "SDK Configuration editor": "Editor de configuración del SDK", "Save": "Ahorrar", "Discard": "Desechar", diff --git a/l10n/bundle.l10n.pt.json b/l10n/bundle.l10n.pt.json index 5dfb64f34..9f791a78d 100644 --- a/l10n/bundle.l10n.pt.json +++ b/l10n/bundle.l10n.pt.json @@ -135,6 +135,7 @@ "Error encountered while calling idf_size.py": "Erro encontrado ao chamar idf_size.py", "Select the available serial port where your device is connected.": "Selecione a porta serial disponível onde seu dispositivo está conectado.", "Port has been updated to ": "A porta foi atualizada para ", + "{buildFile} doesn't exist. Build first.": "{buildFile} {buildFile} não existe. Crie primeiro.", "SDK Configuration editor": "Editor de configuração do SDK", "Save": "Salvar", "Discard": "Descartar", diff --git a/l10n/bundle.l10n.ru.json b/l10n/bundle.l10n.ru.json index 48cd8e27e..9942da307 100644 --- a/l10n/bundle.l10n.ru.json +++ b/l10n/bundle.l10n.ru.json @@ -135,6 +135,7 @@ "Error encountered while calling idf_size.py": "Ошибка при вызове idf_size.py", "Select the available serial port where your device is connected.": "Выберите доступный последовательный порт, к которому подключено ваше устройство.", "Port has been updated to ": "Порт обновлен до ", + "{buildFile} doesn't exist. Build first.": "{buildFile} не существует. Сначала выполните сборку.", "SDK Configuration editor": "Редактор конфигурации SDK", "Save": "Сохранить", "Discard": "Отменить", diff --git a/l10n/bundle.l10n.zh-CN.json b/l10n/bundle.l10n.zh-CN.json index a60713862..734ae2bfb 100644 --- a/l10n/bundle.l10n.zh-CN.json +++ b/l10n/bundle.l10n.zh-CN.json @@ -135,6 +135,7 @@ "Error encountered while calling idf_size.py": "调用 idf_size.py 时出错", "Select the available serial port where your device is connected.": "为设备选择可用的串口。", "Port has been updated to ": "端口已更新为 ", + "{buildFile} doesn't exist. Build first.": "{buildFile}不存在，请先进行生成。", "SDK Configuration editor": "SDK 配置编辑器", "Save": "保存", "Discard": "丢弃", diff --git a/package.json b/package.json index 0d0a8c89c..d76e9476c 100644 --- a/package.json +++ b/package.json @@ -1280,32 +1280,32 @@ }, { "command": "espIdf.buildApp", - "title": "Build App", + "title": "%espIdf.buildApp.title%", "category": "ESP-IDF" }, { "command": "espIdf.flashAppUart", - "title": "Flash App only", + "title": "%espIdf.flashAppUart.title%", "category": "ESP-IDF" }, { "command": "espIdf.buildBootloader", - "title": "Build Bootloader", + "title": "%espIdf.buildBootloader.title%", "category": "ESP-IDF" }, { "command": "espIdf.flashBootloaderUart", - "title": "Flash Bootloader Only", + "title": "%espIdf.flashBootloaderUart.title%", "category": "ESP-IDF" }, { "command": "espIdf.buildPartitionTable", - "title": "Build Partition Table", + "title": "%espIdf.buildPartitionTable.title%", "category": "ESP-IDF" }, { "command": "espIdf.flashPartitionTableUart", - "title": "Flash Partition Table Only", + "title": "%espIdf.flashPartitionTableUart.title%", "category": "ESP-IDF" }, { diff --git a/package.nls.es.json b/package.nls.es.json index 3bbdf463f..6889b6972 100644 --- a/package.nls.es.json +++ b/package.nls.es.json @@ -18,8 +18,11 @@ "espIdf.apptrace.archive.showReport.title": "Mostrar informe de rastreo", "espIdf.apptrace.customize.title": "Personalizar parámetros para rastreo de aplicaciones", "espIdf.apptrace.title": "Rastreo de aplicaciones", + "espIdf.buildApp.title": "Aplicación de compilación solo", + "espIdf.buildBootloader.title": "Construir cargador de arranque solamente", "espIdf.buildDevice.title": "Construir su proyecto", "espIdf.buildFlashMonitor.title": "Construir, Flashear y Arrancar un Monitor en su Dispositivo", + "espIdf.buildPartitionTable.title": "Construir tabla de partición", "espIdf.clearDocsSearchResult.title": "Limpiar resultados de búsqueda de ESP-IDF", "espIdf.clearSavedIdfSetups.title": "Limpiar configuraciones de ESP-IDF guardadas", "espIdf.cmakeListsEditor.start.title": "Editor CMakeLists.txt", @@ -36,11 +39,14 @@ "espIdf.efuse.clearResults.title": "Limpiar resumen de efuse", "espIdf.eraseFlash.title": "Borrar memoria Flash del dispositivo", "espIdf.examples.title": "Mostrar proyectos de ejemplo", + "espIdf.flashAppUart.title": "Solo aplicación Flash (UART)", "espIdf.flashAndEncryptDevice.title": "Encriptar y Flashear su Proyecto", + "espIdf.flashBootloaderUart.title": "SOLO ROBAJE DE BOOTOLA FLASH (UART)", "espIdf.flashBinaryToPartition.title": "Flashear binario a partición...", "espIdf.flashDFU.title": "Flashear (DFU) su Proyecto", "espIdf.flashDevice.title": "Flashear su Proyecto", "espIdf.flashUart.title": "Flashear (UART) su Proyecto", + "espIdf.flashPartitionTableUart.title": "Tabla de partición flash (UART)", "espIdf.fullClean.title": "Limpieza completa del proyecto", "espIdf.genCoverage.title": "Agregar cobertura de editor", "espIdf.getCoverageReport.title": "Obtener informe de cobertura HTML para proyecto", diff --git a/package.nls.json b/package.nls.json index e734e6a19..190417944 100644 --- a/package.nls.json +++ b/package.nls.json @@ -18,8 +18,11 @@ "espIdf.apptrace.archive.showReport.title": "Show Trace Report", "espIdf.apptrace.customize.title": "Customize Parameters for App Trace", "espIdf.apptrace.title": "App Trace", + "espIdf.buildApp.title": "Build App Only", + "espIdf.buildBootloader.title": "Build Bootloader Only", "espIdf.buildDevice.title": "Build Your Project", "espIdf.buildFlashMonitor.title": "Build, Flash and Start a Monitor on Your Device", + "espIdf.buildPartitionTable.title": "Build Partition Table", "espIdf.clearDocsSearchResult.title": "Clear ESP-IDF Search Results", "espIdf.clearSavedIdfSetups.title": "Clear Saved ESP-IDF Setups", "espIdf.cmakeListsEditor.start.title": "CMakeLists.txt Editor", @@ -36,10 +39,13 @@ "espIdf.efuse.clearResults.title": "Clear eFuse Summary", "espIdf.eraseFlash.title": "Erase Flash Memory from Device", "espIdf.examples.title": "Show Example Projects", + "espIdf.flashAppUart.title": "Flash App Only (UART)", "espIdf.flashAndEncryptDevice.title": "Encrypt and Flash Your Project", "espIdf.flashBinaryToPartition.title": "Flash Binary to Partition...", + "espIdf.flashBootloaderUart.title": "Flash Bootloader Only (UART)", "espIdf.flashDFU.title": "Flash (DFU) Your Project", "espIdf.flashDevice.title": "Flash Your Project", + "espIdf.flashPartitionTableUart.title": "Flash Partition Table (UART)", "espIdf.flashUart.title": "Flash (UART) Your Project", "espIdf.fullClean.title": "Full Clean Project", "espIdf.genCoverage.title": "Add Editor Coverage", diff --git a/package.nls.pt.json b/package.nls.pt.json index e63485649..bf62699db 100644 --- a/package.nls.pt.json +++ b/package.nls.pt.json @@ -18,8 +18,11 @@ "espIdf.apptrace.archive.showReport.title": "Mostrar relatório de rastreamento", "espIdf.apptrace.customize.title": "Personalize parâmetros para rastreamento de aplicativos", "espIdf.apptrace.title": "Rastreamento de aplicativo", + "espIdf.buildApp.title": "Crie apenas aplicativo", + "espIdf.buildBootloader.title": "Construa apenas o carregador de inicialização", "espIdf.buildDevice.title": "Construa seu projeto", "espIdf.buildFlashMonitor.title": "Crie, atualize e inicie um monitor no seu dispositivo", + "espIdf.buildPartitionTable.title": "Tabela de partição de construção", "espIdf.clearDocsSearchResult.title": "Limpar resultados da pesquisa ESP-IDF", "espIdf.clearSavedIdfSetups.title": "Limpar configurações ESP-IDF salvas", "espIdf.cmakeListsEditor.start.title": "Editor CMakeLists.txt", @@ -36,10 +39,13 @@ "espIdf.efuse.clearResults.title": "Limpar resumo do eFuse", "espIdf.eraseFlash.title": "Apagar memória flash do dispositivo", "espIdf.examples.title": "Mostrar exemplos de projetos", + "espIdf.flashAppUart.title": "Apenas aplicativo flash (UART)", "espIdf.flashAndEncryptDevice.title": "Criptografe e atualize seu projeto", "espIdf.flashBinaryToPartition.title": "Flash binário para partição...", + "espIdf.flashBootloaderUart.title": "Flash Bootloader apenas (UART)", "espIdf.flashDFU.title": "Flash (DFU) seu projeto", "espIdf.flashDevice.title": "Atualize seu projeto", + "espIdf.flashPartitionTableUart.title": "Tabela de partição flash (UART)", "espIdf.flashUart.title": "Flash (UART) seu projeto", "espIdf.fullClean.title": "Projeto Totalmente Limpo", "espIdf.genCoverage.title": "Adicionar cobertura do editor", diff --git a/package.nls.ru.json b/package.nls.ru.json index 5b8546ac8..68f204fd3 100644 --- a/package.nls.ru.json +++ b/package.nls.ru.json @@ -18,8 +18,11 @@ "espIdf.apptrace.archive.showReport.title": "Показать отчет трассировки", "espIdf.apptrace.customize.title": "Пользовательские параметры Трассировщика приложения", "espIdf.apptrace.title": "Трассировка приложения", + "espIdf.buildApp.title": "Создайте только приложение", + "espIdf.buildBootloader.title": "Постройте только загрузчик", "espIdf.buildDevice.title": "Собрать проект", "espIdf.buildFlashMonitor.title": "Собрать, прошить устойство и запустить монитор", + "espIdf.buildPartitionTable.title": "Построить таблицу перегородков", "espIdf.clearDocsSearchResult.title": "Очистить результаты поиска ESP-IDF", "espIdf.clearSavedIdfSetups.title": "Очистить сохраненные настройки ESP-IDF", "espIdf.cmakeListsEditor.start.title": "Редактор CMakeLists.txt", @@ -37,11 +40,14 @@ "espIdf.eraseFlash.title": "Очистить Flash-память устройства", "espIdf.examples.title": "Показать примеры проектов", "espIdf.flashAndEncryptDevice.title": "Зашифровать и прошить проект", + "espIdf.flashAppUart.title": "Только приложение Flash (UART)", + "espIdf.flashBootloaderUart.title": "Только Flash Bootloader (UART)", "espIdf.flashBinaryToPartition.title": "Прошить бинарник в раздел...", "espIdf.flashDFU.title": "Прошить (DFU) проект", "espIdf.flashDevice.title": "Прошить проект", "espIdf.flashUart.title": "Прошить (UART) проект", "espIdf.fullClean.title": "Полная очистка проекта", + "espIdf.flashPartitionTableUart.title": "Таблица раздела Flash (UART)", "espIdf.genCoverage.title": "Добавить покрытие редактора", "espIdf.getCoverageReport.title": "Получить HTML-отчет о покрытии проекта", "espIdf.getEspAdf.title": "Установить ESP-ADF", diff --git a/package.nls.zh-CN.json b/package.nls.zh-CN.json index ff067e441..2a8753e5a 100644 --- a/package.nls.zh-CN.json +++ b/package.nls.zh-CN.json @@ -12,14 +12,17 @@ "esp.rainmaker.backend.remove_node.title": "移除此节点", "esp.rainmaker.backend.sync.title": "同步 ESP-Rainmaker 云服务器", "esp.rainmaker.backend.update_node_param.title": "为设备更新参数", - "esp.webview.open.partition-table.title": "ESP-IDF：打开分区表编辑器 UI", + "esp.webview.open.partition-table.title": "ESP-IDF 打开分区表编辑器 UI", "espIdf.addArduinoAsComponentToCurFolder.title": "添加 Arduino ESP32 为 ESP-IDF 组件", "espIdf.apptrace.archive.refresh.title": "刷新跟踪存档列表", "espIdf.apptrace.archive.showReport.title": "显示跟踪报告", "espIdf.apptrace.customize.title": "自定义应用程序跟踪参数", "espIdf.apptrace.title": "应用程序跟踪", + "espIdf.buildApp.title": "仅构建应用程序", + "espIdf.buildBootloader.title": "仅构建引导加载程序", "espIdf.buildDevice.title": "构建项目", "espIdf.buildFlashMonitor.title": "构建、烧录项目并监视设备", + "espIdf.buildPartitionTable.title": "构建分区表", "espIdf.clearDocsSearchResult.title": "清除 ESP-IDF 搜索结果", "espIdf.clearSavedIdfSetups.title": "清除已保存的 ESP-IDF 设置", "espIdf.cmakeListsEditor.start.title": "CMakeLists.txt 编辑器", @@ -32,15 +35,18 @@ "espIdf.customTask.title": "执行自定义任务", "espIdf.disposeConfserverProcess.title": "清理当前 SDK 配置编辑器服务器进程", "espIdf.doctorCommand.title": "诊断命令", - "espIdf.troubleshootPanel.title": "ESP-IDF：故障排除表", + "espIdf.troubleshootPanel.title": "ESP-IDF 故障排除表", "espIdf.efuse.clearResults.title": "清除 eFuse 摘要", "espIdf.eraseFlash.title": "擦除设备 flash 数据", "espIdf.examples.title": "展示示例项目", "espIdf.flashAndEncryptDevice.title": "加密并烧录项目", + "espIdf.flashAppUart.title": "仅Flash AppUART", "espIdf.flashBinaryToPartition.title": "将二进制文件烧录到分区…", + "espIdf.flashBootloaderUart.title": "仅Flash Boot Loader UART", "espIdf.flashDFU.title": "通过 DFU 接口烧录项目", "espIdf.flashDevice.title": "烧录项目", "espIdf.flashUart.title": "通过 UART 接口烧录项目", + "espIdf.flashPartitionTableUart.title": "闪存分区表 UART", "espIdf.fullClean.title": "彻底清理项目", "espIdf.genCoverage.title": "添加编辑器覆盖率功能", "espIdf.getCoverageReport.title": "生成 HTML 格式的代码覆盖率报告", @@ -50,7 +56,7 @@ "espIdf.getEspMdf.title": "安装 ESP-MDF", "espIdf.getEspRainmaker.title": "安装 ESP-Rainmaker", "espIdf.heaptrace.title": "堆跟踪", - "espIdf.idfReconfigureTask.title": "ESP-IDF: 运行 idf.py reconfigure 任务", + "espIdf.idfReconfigureTask.title": "ESP-IDF: 运行 idf.py reconfigure 任务", "espIdf.importProject.title": "导入 ESP-IDF 项目", "espIdf.installEspMatterPyReqs.title": "安装 ESP-Matter Python 包", "espIdf.installPyReqs.title": "安装 ESP-IDF 扩展 Python 包", diff --git a/src/espIdf/partition-table/tree.ts b/src/espIdf/partition-table/tree.ts index 2b1358c5a..5a77bdab4 100644 --- a/src/espIdf/partition-table/tree.ts +++ b/src/espIdf/partition-table/tree.ts @@ -23,6 +23,7 @@ import { Disposable, Event, EventEmitter, + l10n, ThemeIcon, TreeDataProvider, TreeItem, @@ -95,7 +96,9 @@ export class PartitionTreeDataProvider const flasherArgsExists = await pathExists(flasherArgsPath); if (!flasherArgsExists) { window.showInformationMessage( - `${flasherArgsPath} doesn't exist. Build first.` + l10n.t(`{buildFile} doesn't exist. Build first.`, { + flasherArgsPath, + }) ); return; } @@ -121,7 +124,9 @@ export class PartitionTreeDataProvider const bootloaderFileExists = await pathExists(bootloaderFile); if (!bootloaderFileExists) { window.showInformationMessage( - `${bootloaderFile} doesn't exist. Build first.` + l10n.t(`{buildFile} doesn't exist. Build first.`, { + bootloaderFile, + }) ); return; } @@ -161,7 +166,9 @@ export class PartitionTreeDataProvider const partitionTableExists = await pathExists(partTableBin); if (!partitionTableExists) { window.showInformationMessage( - `${partTableBin} doesn't exist. Build first.` + l10n.t(`{buildFile} doesn't exist. Build first.`, { + partTableBin, + }) ); return; }