Allow override via preferences.txt for partition scheme

philip-peterson · philip-peterson · commit ea89bb410fe4 · 2020-10-06T23:23:21.000-04:00
diff --git a/make.sh b/make.sh
@@ -19,7 +19,7 @@ echo "lib_path: $lib_path"
 set -e
 
 mkdir -p bin
-javac -target 1.8 -cp "$pde_path:$core_path:$lib_path" \
+javac -source 1.8 -target 1.8 -cp "$pde_path:$core_path:$lib_path" \
       -d bin src/ESP32FS.java
 
 pushd bin
diff --git a/src/ESP32FS.java b/src/ESP32FS.java
@@ -219,7 +219,14 @@ private void createAndUpload(){
       return;
     }
 
+    String boardId = BaseNoGui.getTargetBoard().getId();
+    String customPartitionScheme = PreferencesData.get("custom_PartitionScheme");
+    if (customPartitionScheme != null && customPartitionScheme.startsWith(boardId)) {
+      partitions = customPartitionScheme.substring(boardId.length() + 1);
+    }
+
     File partitionsFile = new File(platform.getFolder() + "/tools/partitions", partitions + ".csv");
+    System.out.println("Using partition file : " + partitionsFile);
     if (!partitionsFile.exists() || !partitionsFile.isFile()) {
       System.err.println();
       editor.statusError("SPIFFS Error: partitions file " + partitions + ".csv not found!");
