From 2e4afd06581e8be4152a09658aa1039f0ce93528 Mon Sep 17 00:00:00 2001 From: Emanuel Merino Date: Sun, 13 Jul 2025 15:08:18 -0400 Subject: [PATCH 1/4] Update .travis.yml --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index b778104..aafbed6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,7 @@ sudo: false language: java os: - - linux + - macOS addons: apt: @@ -11,12 +11,12 @@ addons: - ant jdk: - - oraclejdk8 + - jdk24 script: - export SRC=$PWD - cd $HOME - - export TAG=1.6.12 + - export TAG=1.0.1 - wget https://github.com/arduino/Arduino/archive/$TAG.zip - unzip $TAG.zip - rm $TAG.zip From 155e7656f4441cd54d603730e11bec88103fc3a9 Mon Sep 17 00:00:00 2001 From: Emanuel Merino Date: Sun, 13 Jul 2025 15:17:30 -0400 Subject: [PATCH 2/4] Update make.sh --- make.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/make.sh b/make.sh index 843a4ed..89fd2be 100755 --- a/make.sh +++ b/make.sh @@ -23,7 +23,7 @@ echo "lib_path: $lib_path" set -e mkdir -p bin -/Library/Java/JavaVirtualMachines/openlogic-openjdk-8.jdk/Contents/Home/bin/javac -target 1.8 -cp "$pde_path:$core_path:$lib_path" \ +/Library/Java/JavaVirtualMachines/jdk-24.jdk/Contents/Home/bin/javac -target 1.8 -cp "$pde_path:$core_path:$lib_path" \ -d bin src/ESP32FS.java pushd bin From d7bfee15b6dfc95bfc3f21184c3d4ac1e340d4c9 Mon Sep 17 00:00:00 2001 From: Emanuel Merino Date: Sun, 13 Jul 2025 15:18:46 -0400 Subject: [PATCH 3/4] Update make.sh --- make.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/make.sh b/make.sh index 89fd2be..be051fa 100755 --- a/make.sh +++ b/make.sh @@ -23,7 +23,7 @@ echo "lib_path: $lib_path" set -e mkdir -p bin -/Library/Java/JavaVirtualMachines/jdk-24.jdk/Contents/Home/bin/javac -target 1.8 -cp "$pde_path:$core_path:$lib_path" \ +/Library/Java/JavaVirtualMachines/jdk-24.jdk/Contents/Home/bin/javac -target 24 -cp "$pde_path:$core_path:$lib_path" \ -d bin src/ESP32FS.java pushd bin From 22d76841e4d8aaa45d897209db5c9b8ae0cf4cb0 Mon Sep 17 00:00:00 2001 From: Emanuel Merino Date: Sun, 13 Jul 2025 15:57:22 -0400 Subject: [PATCH 4/4] Update ESP32FS.java --- src/ESP32FS.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ESP32FS.java b/src/ESP32FS.java index 7c03d2f..20caef1 100644 --- a/src/ESP32FS.java +++ b/src/ESP32FS.java @@ -360,8 +360,8 @@ private void createAndUpload(){ 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"); + String flashMode = BaseNoGui.getBoardPreferences().get("build.flash-mode"); + String flashFreq = BaseNoGui.getBoardPreferences().get("build.flash-freq"); System.out.println("[SPIFFS] address: "+spiStart); System.out.println("[SPIFFS] port : "+serialPort); System.out.println("[SPIFFS] speed : "+uploadSpeed);