From be191b46efa4256f1b9fb9c3a49524decc79ba4c Mon Sep 17 00:00:00 2001 From: Jonny Bergdahl Date: Fri, 22 Jan 2021 18:00:52 +0100 Subject: [PATCH 1/4] Changed for Big Sur support --- make.sh | 8 ++++---- src/ESP32FS.java | 4 +--- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/make.sh b/make.sh index 0fa059a..fed683b 100755 --- a/make.sh +++ b/make.sh @@ -5,9 +5,9 @@ if [[ -z "$INSTALLDIR" ]]; then 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 /Applications/Arduino.app/ -name pde.jar` +core_path=`find /Applications/Arduino.app/ -name arduino-core.jar` +lib_path=`find /Applications/Arduino.app/ -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 +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 index e1bb586..77308fe 100644 --- a/src/ESP32FS.java +++ b/src/ESP32FS.java @@ -202,15 +202,13 @@ private void createAndUpload(){ String toolExtension = ".py"; if(PreferencesData.get("runtime.os").contentEquals("windows")) { toolExtension = ".exe"; - } else if(PreferencesData.get("runtime.os").contentEquals("macosx")) { - toolExtension = ""; } String pythonCmd; if(PreferencesData.get("runtime.os").contentEquals("windows")) pythonCmd = "python.exe"; else - pythonCmd = "python"; + pythonCmd = "python3"; String mkspiffsCmd; if(PreferencesData.get("runtime.os").contentEquals("windows")) From 2800b79970d09b3ab39fa4e774ee59bfcb92e036 Mon Sep 17 00:00:00 2001 From: Jonny Bergdahl Date: Sat, 30 Jan 2021 18:37:12 +0100 Subject: [PATCH 2/4] Updated docs --- README.md | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/README.md b/README.md index 5e8788a..a267e25 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,28 @@ +# Note + +This is just a quick and fast hack to get this plugin to work under macOS Big Sur. It fixes the following error. +``` +ValueError: dlsym(RTLD_DEFAULT, kIOMasterPortDefault): symbol not found +``` + +Download the plugin at [https://github.com/bergdahl/arduino-esp32fs-plugin/releases/tag/2.0.6.BigSur](https://github.com/bergdahl/arduino-esp32fs-plugin/releases/tag/2.0.6.BigSur) and follow the original instructions below. + +## Changes +I changed the call to `esptool` to use the command `python3 esptool.py` instead as +newer versions of the `esptool` tool seems to be Python only. Python version 2 is obsolete but still default on macOS, which is why I used `python3` to call the script. + +If you done an in-place upgrade of macOS you also need to upgrade to the latest version of the `pyserial` package as well; +``` +pip3 install --upgrade pyserial +``` + +In case you use newer boards like the ESP32S2, you may also need to upgrade the `esptool.py` file in the board support folder. You can find the existong file under a folder named like `/Users/ -Your user Name- /Library/Arduino15/packages/esp32/tools/esptool_py/2.6.1`. Just replace esptool.py with the latest one. + +You can find the latest version of `esptool` here - [https://github.com/espressif/esptool](https://github.com/espressif/esptool]). + +--- +# - Original README below - + # Arduino ESP32 filesystem uploader - Arduino plugin which packs sketch data folder into SPIFFS, LittleFS or FatFS filesystem image, From c6533c1b822cd89aa344f1b249d2bfc5d88696b3 Mon Sep 17 00:00:00 2001 From: Jonny Bergdahl Date: Tue, 2 Feb 2021 09:42:07 +0100 Subject: [PATCH 3/4] Revert README --- README.md | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/README.md b/README.md index a267e25..5e8788a 100644 --- a/README.md +++ b/README.md @@ -1,28 +1,3 @@ -# Note - -This is just a quick and fast hack to get this plugin to work under macOS Big Sur. It fixes the following error. -``` -ValueError: dlsym(RTLD_DEFAULT, kIOMasterPortDefault): symbol not found -``` - -Download the plugin at [https://github.com/bergdahl/arduino-esp32fs-plugin/releases/tag/2.0.6.BigSur](https://github.com/bergdahl/arduino-esp32fs-plugin/releases/tag/2.0.6.BigSur) and follow the original instructions below. - -## Changes -I changed the call to `esptool` to use the command `python3 esptool.py` instead as -newer versions of the `esptool` tool seems to be Python only. Python version 2 is obsolete but still default on macOS, which is why I used `python3` to call the script. - -If you done an in-place upgrade of macOS you also need to upgrade to the latest version of the `pyserial` package as well; -``` -pip3 install --upgrade pyserial -``` - -In case you use newer boards like the ESP32S2, you may also need to upgrade the `esptool.py` file in the board support folder. You can find the existong file under a folder named like `/Users/ -Your user Name- /Library/Arduino15/packages/esp32/tools/esptool_py/2.6.1`. Just replace esptool.py with the latest one. - -You can find the latest version of `esptool` here - [https://github.com/espressif/esptool](https://github.com/espressif/esptool]). - ---- -# - Original README below - - # Arduino ESP32 filesystem uploader - Arduino plugin which packs sketch data folder into SPIFFS, LittleFS or FatFS filesystem image, From da81c4951bde4ef65783eeb51fd9cb5545ca5db4 Mon Sep 17 00:00:00 2001 From: Jonny Bergdahl Date: Tue, 2 Feb 2021 09:42:07 +0100 Subject: [PATCH 4/4] Revert README --- README.md | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/README.md b/README.md index a267e25..5e8788a 100644 --- a/README.md +++ b/README.md @@ -1,28 +1,3 @@ -# Note - -This is just a quick and fast hack to get this plugin to work under macOS Big Sur. It fixes the following error. -``` -ValueError: dlsym(RTLD_DEFAULT, kIOMasterPortDefault): symbol not found -``` - -Download the plugin at [https://github.com/bergdahl/arduino-esp32fs-plugin/releases/tag/2.0.6.BigSur](https://github.com/bergdahl/arduino-esp32fs-plugin/releases/tag/2.0.6.BigSur) and follow the original instructions below. - -## Changes -I changed the call to `esptool` to use the command `python3 esptool.py` instead as -newer versions of the `esptool` tool seems to be Python only. Python version 2 is obsolete but still default on macOS, which is why I used `python3` to call the script. - -If you done an in-place upgrade of macOS you also need to upgrade to the latest version of the `pyserial` package as well; -``` -pip3 install --upgrade pyserial -``` - -In case you use newer boards like the ESP32S2, you may also need to upgrade the `esptool.py` file in the board support folder. You can find the existong file under a folder named like `/Users/ -Your user Name- /Library/Arduino15/packages/esp32/tools/esptool_py/2.6.1`. Just replace esptool.py with the latest one. - -You can find the latest version of `esptool` here - [https://github.com/espressif/esptool](https://github.com/espressif/esptool]). - ---- -# - Original README below - - # Arduino ESP32 filesystem uploader - Arduino plugin which packs sketch data folder into SPIFFS, LittleFS or FatFS filesystem image,