Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: dl9rdz/arduino-esp32fs-plugin
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1.0mod
Choose a base ref
...
head repository: dl9rdz/arduino-esp32fs-plugin
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on Mar 6, 2023

  1. Add support for all chips

    me-no-dev committed Mar 6, 2023
    Copy the full SHA
    f8fc175 View commit details
  2. Update make.sh

    me-no-dev committed Mar 6, 2023
    Copy the full SHA
    9ef3bcd View commit details

Commits on Sep 20, 2023

  1. Copy the full SHA
    387bbe0 View commit details
Showing with 11 additions and 6 deletions.
  1. +8 −4 make.sh
  2. +3 −2 src/ESP32FS.java
12 changes: 8 additions & 4 deletions make.sh
Original file line number Diff line number Diff line change
@@ -3,11 +3,15 @@
if [[ -z "$INSTALLDIR" ]]; then
INSTALLDIR="$HOME/Documents/Arduino"
fi
if [[ -z "$IDEDIR" ]]; then
IDEDIR="/Applications/Arduino.app/Contents/Java/"
#IDEDIR="../../../"
fi
echo "INSTALLDIR: $INSTALLDIR"

pde_path=`find ../../../ -name pde.jar`
core_path=`find ../../../ -name arduino-core.jar`
lib_path=`find ../../../ -name commons-codec-1.7.jar`
pde_path=`find $IDEDIR -name pde.jar`
core_path=`find $IDEDIR -name arduino-core.jar`
lib_path=`find $IDEDIR -name commons-codec-1.7.jar`
if [[ -z "$core_path" || -z "$pde_path" ]]; then
echo "Some java libraries have not been built yet (did you run ant build?)"
return 1
@@ -19,7 +23,7 @@ echo "lib_path: $lib_path"
set -e

mkdir -p bin
javac -target 1.8 -cp "$pde_path:$core_path:$lib_path" \
/Library/Java/JavaVirtualMachines/openlogic-openjdk-8.jdk/Contents/Home/bin/javac -target 1.8 -cp "$pde_path:$core_path:$lib_path" \
-d bin src/ESP32FS.java

pushd bin
5 changes: 3 additions & 2 deletions src/ESP32FS.java
Original file line number Diff line number Diff line change
@@ -364,6 +364,7 @@ private void createAndUpload(){
else
sysExec(new String[]{espota.getAbsolutePath(), "-i", serialPort, "-p", "3232", "-s", "-f", imagePath});
} else {
String mcu = BaseNoGui.getBoardPreferences().get("build.mcu");
String flashMode = BaseNoGui.getBoardPreferences().get("build.flash_mode");
String flashFreq = BaseNoGui.getBoardPreferences().get("build.flash_freq");
System.out.println("[SPIFFS] address: "+spiStart);
@@ -373,9 +374,9 @@ private void createAndUpload(){
System.out.println("[SPIFFS] freq : "+flashFreq);
System.out.println();
if(esptool.getAbsolutePath().endsWith(".py"))
sysExec(new String[]{pythonCmd, esptool.getAbsolutePath(), "--chip", "esp32", "--baud", uploadSpeed, "--port", serialPort, "--before", "default_reset", "--after", "hard_reset", "write_flash", "-z", "--flash_mode", flashMode, "--flash_freq", flashFreq, "--flash_size", "detect", ""+spiStart, imagePath});
sysExec(new String[]{pythonCmd, esptool.getAbsolutePath(), "--chip", mcu, "--baud", uploadSpeed, "--port", serialPort, "--before", "default_reset", "--after", "hard_reset", "write_flash", "-z", "--flash_mode", flashMode, "--flash_freq", flashFreq, "--flash_size", "detect", ""+spiStart, imagePath});
else
sysExec(new String[]{esptool.getAbsolutePath(), "--chip", "esp32", "--baud", uploadSpeed, "--port", serialPort, "--before", "default_reset", "--after", "hard_reset", "write_flash", "-z", "--flash_mode", flashMode, "--flash_freq", flashFreq, "--flash_size", "detect", ""+spiStart, imagePath});
sysExec(new String[]{esptool.getAbsolutePath(), "--chip", mcu, "--baud", uploadSpeed, "--port", serialPort, "--before", "default_reset", "--after", "hard_reset", "write_flash", "-z", "--flash_mode", flashMode, "--flash_freq", flashFreq, "--flash_size", "detect", ""+spiStart, imagePath});
}
}