Skip to content

Redo ESP32 partitions.csv parsing #62

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
earlephilhower merged 1 commit into from
Nov 3, 2024
Merged

Redo ESP32 partitions.csv parsing #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "arduino-littlefs-upload",
"displayName": "arduino-littlefs-upload",
"description": "Build and uploads LittleFS filesystems for the Arduino-Pico RP2040 core, ESP8266 core, or ESP32 core under Arduino IDE 2.2.1 or higher",
"version": "1.2.1",
"version": "1.3.0",
"engines": {
"vscode": "^1.82.0"
},
Expand Down
40 changes: 35 additions & 5 deletions src/extension.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,21 @@ function color(
}m${text}${resetStyle}`;
}


function fancyParseInt(str: string) : number {
var up = str.toUpperCase().trim();
if (up == "") {
return 0;
}
if (up.indexOf('0X') >= 0) {
return parseInt(str, 16);
} else if (up.indexOf('K') >= 0) {
return 1024 * parseInt(up.substring(0, up.indexOf('K')));
} else if (up.indexOf('M') >= 0) {
return 1024 * 1024 * parseInt(up.substring(0, up.indexOf('M')));
} else {
return parseInt(str);
}
}

// Execute a command and display it's output in the terminal
async function runCommand(exe : string, opts : any[]) {
Expand Down Expand Up @@ -253,17 +267,33 @@ export function activate(context: vscode.ExtensionContext) {
}
let partitionData = fs.readFileSync(partitionFile, 'utf8');
let partitionDataArray = partitionData.split("\n");
for (var i = 1; i < partitionDataArray.length; i++){
var lastend = 0x8000 + 0xc00;
for (var i = 0; i < partitionDataArray.length; i++){
var line = partitionDataArray[i];
if (line.indexOf('#') >= 0) {
line = line.substring(0, line.indexOf('#'));
}
var partitionEntry = partitionDataArray[i].split(",");
if (partitionEntry[0].includes("spiffs")) {
fsStart = parseInt(partitionEntry[3], 16); // Partition Offset
fsEnd = fsStart + parseInt(partitionEntry[4], 16); // Partition Length
if (partitionEntry.length > 4) {
var offset = fancyParseInt(partitionEntry[3]);
var length = fancyParseInt(partitionEntry[4]);
if (offset == 0) {
offset = lastend;
}
lastend = offset + length;
var parttype = partitionEntry[2].toUpperCase().trim();
if ((parttype == "SPIFFS") || (parttype == "LITTLEFS")) {
fsStart = offset;
fsEnd = length;
}
}
}
if (!fsStart || !fsEnd) {
writeEmitter.fire(red("\r\n\r\nERROR: Partition entry not found in csv file!\r\n"));
return;
}
writeEmitter.fire(blue(" Start: ") + green("0x" + fsStart.toString(16)) + "\r\n");
writeEmitter.fire(blue(" End: ") + green("0x" + fsEnd.toString(16)) + "\r\n");

uploadSpeed = Number(arduinoContext.boardDetails.buildProperties["upload.speed"]);
// Fixed for ESP32
Expand Down