Skip to content
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

Jump to bottom

make use of custom partitions.csv if it exists #34

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

make use of custom partitions.csv if it exists #34

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e5a022c
make use of custom partitions.csv if it exists
dl9rdz Sep 26, 2021
387bbe0
Merge remote-tracking branch 'menodev/master'
hr-ru Sep 20, 2023
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
7 changes: 6 additions & 1 deletion src/ESP32FS.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,12 @@ private void createAndUpload(){
return;
}

File partitionsFile = new File(platform.getFolder() + "/tools/partitions", partitions + ".csv");
// A custom partitions.csv in the sketch folder overrides the board preferences
// This is hard coded in https://github.com/espressif/arduino-esp32/blob/master/platform.txt
File partitionsFile = new File(editor.getSketch().getFolder(), "partitions.csv");
if (!partitionsFile.exists() || !partitionsFile.isFile()) {
partitionsFile = new File(platform.getFolder() + "/tools/partitions", partitions + ".csv");
}
if (!partitionsFile.exists() || !partitionsFile.isFile()) {
System.err.println();
editor.statusError("SPIFFS Error: partitions file " + partitions + ".csv not found!");
Expand Down