diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..a5d8f72 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +bin/ +dist/ diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..b778104 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,31 @@ +sudo: false + +language: java + +os: + - linux + +addons: + apt: + packages: + - ant + +jdk: + - oraclejdk8 + +script: + - export SRC=$PWD + - cd $HOME + - export TAG=1.6.12 + - wget https://github.com/arduino/Arduino/archive/$TAG.zip + - unzip $TAG.zip + - rm $TAG.zip + - export arduino_dir=Arduino-$TAG + - pushd $arduino_dir/build + - echo "" | ant build + - pushd shared/tools + - mkdir -p ESP32FS + - rsync -a $SRC/ ESP32FS/ + - pushd ESP32FS + - ./make.sh + - popd && popd && popd diff --git a/LICENSE.txt b/LICENSE.txt new file mode 100644 index 0000000..d159169 --- /dev/null +++ b/LICENSE.txt @@ -0,0 +1,339 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. diff --git a/README.md b/README.md index 4c62430..88c5cb0 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,40 @@ -# arduino-esp32fs-plugin -Arduino plugin for uploading files to ESP32 file system +# Arduino ESP32 filesystem uploader + +Arduino plugin which packs sketch data folder into SPIFFS filesystem image, +and uploads the image to ESP32 flash memory. +
+Tested with the following Arduino IDE versions: 1.6.5-r2, +1.6.6 + + + +## Installation +- Make sure you use one of the supported versions of Arduino IDE and have ESP32 core installed. +- Download the tool archive from [releases page](https://github.com/esp32/arduino-esp32fs-plugin/releases/latest). +- In your Arduino sketchbook directory, create tools directory if it doesn't exist yet. +- Unpack the tool into tools directory (the path will look like `/Arduino/tools/ESP32FS/tool/esp32fs.jar)`. +- Restart Arduino IDE. + +On the OS X create the tools directory in ~/Documents/Arduino/ and unpack the files there + +## Usage +- Open a sketch (or create a new one and save it). +- Go to sketch directory (choose Sketch > Show Sketch Folder). +- Create a directory named `data` and any files you want in the file system there. +- Make sure you have selected a board, port, and closed Serial Monitor. +- Select *Tools > ESP32 Sketch Data Upload* menu item. This should start uploading the files into ESP32 flash file system. + When done, IDE status bar will display SPIFFS Image Uploaded message. Might take a few minutes for large file system sizes. + +## Screenshot + +![Screenshot](screenshot.png) + +## Credits and license + +- Copyright (c) 2015 Hristo Gochkov (hristo at espressif dot com) +- Licensed under GPL v2 ([text](LICENSE)) +- Maintained by Hristo Gochkov (hristo at espressif dot com) + +## Issues and suggestions + +File issues here on github, or ask your questions on the [esp32.com forum](http://esp32.com). diff --git a/make.sh b/make.sh new file mode 100755 index 0000000..0fa059a --- /dev/null +++ b/make.sh @@ -0,0 +1,37 @@ +#!/usr/bin/env bash + +if [[ -z "$INSTALLDIR" ]]; then + INSTALLDIR="$HOME/Documents/Arduino" +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` +if [[ -z "$core_path" || -z "$pde_path" ]]; then + echo "Some java libraries have not been built yet (did you run ant build?)" + return 1 +fi +echo "pde_path: $pde_path" +echo "core_path: $core_path" +echo "lib_path: $lib_path" + +set -e + +mkdir -p bin +javac -target 1.8 -cp "$pde_path:$core_path:$lib_path" \ + -d bin src/ESP32FS.java + +pushd bin +mkdir -p $INSTALLDIR/tools +rm -rf $INSTALLDIR/tools/ESP32FS +mkdir -p $INSTALLDIR/tools/ESP32FS/tool +zip -r $INSTALLDIR/tools/ESP32FS/tool/esp32fs.jar * +popd + +dist=$PWD/dist +rev=$(git describe --tags) +mkdir -p $dist +pushd $INSTALLDIR/tools +zip -r $dist/ESP32FS-$rev.zip ESP32FS/ +popd diff --git a/src/ESP32FS.java b/src/ESP32FS.java new file mode 100644 index 0000000..eb75aa9 --- /dev/null +++ b/src/ESP32FS.java @@ -0,0 +1,380 @@ +/* -*- mode: java; c-basic-offset: 2; indent-tabs-mode: nil -*- */ + +/* + Tool to put the contents of the sketch's "data" subfolder + into an SPIFFS partition image and upload it to an ESP32 MCU + + Copyright (c) 2015 Hristo Gochkov (hristo at espressif dot com) + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software Foundation, + Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +*/ + +package com.esp32.mkspiffs; + +import java.io.File; +import java.io.FileReader; +import java.io.BufferedReader; +import java.io.InputStreamReader; +import java.io.IOException; + +import java.text.SimpleDateFormat; +import java.util.Date; +import java.lang.reflect.Field; +import java.lang.reflect.InvocationTargetException; +import javax.swing.JOptionPane; + +import processing.app.PreferencesData; +import processing.app.Editor; +import processing.app.Base; +import processing.app.BaseNoGui; +import processing.app.Platform; +import processing.app.Sketch; +import processing.app.tools.Tool; +import processing.app.helpers.ProcessUtils; +import processing.app.debug.TargetPlatform; + +import org.apache.commons.codec.digest.DigestUtils; +import processing.app.helpers.FileUtils; + +import cc.arduino.files.DeleteFilesOnShutdown; + +/** + * Example Tools menu entry. + */ +public class ESP32FS implements Tool { + Editor editor; + + + public void init(Editor editor) { + this.editor = editor; + } + + + public String getMenuTitle() { + return "ESP32 Sketch Data Upload"; + } + + private int listenOnProcess(String[] arguments){ + try { + final Process p = ProcessUtils.exec(arguments); + Thread thread = new Thread() { + public void run() { + try { + InputStreamReader reader = new InputStreamReader(p.getInputStream()); + int c; + while ((c = reader.read()) != -1) + System.out.print((char) c); + reader.close(); + + reader = new InputStreamReader(p.getErrorStream()); + while ((c = reader.read()) != -1) + System.err.print((char) c); + reader.close(); + } catch (Exception e){} + } + }; + thread.start(); + int res = p.waitFor(); + thread.join(); + return res; + } catch (Exception e){ + return -1; + } + } + + private void sysExec(final String[] arguments){ + Thread thread = new Thread() { + public void run() { + try { + if(listenOnProcess(arguments) != 0){ + editor.statusError("SPIFFS Upload failed!"); + } else { + editor.statusNotice("SPIFFS Image Uploaded"); + } + } catch (Exception e){ + editor.statusError("SPIFFS Upload failed!"); + } + } + }; + thread.start(); + } + + private String getBuildFolderPath(Sketch s) { + // first of all try the getBuildPath() function introduced with IDE 1.6.12 + // see commit arduino/Arduino#fd1541eb47d589f9b9ea7e558018a8cf49bb6d03 + try { + String buildpath = s.getBuildPath().getAbsolutePath(); + return buildpath; + } + catch (IOException er) { + editor.statusError(er); + } + catch (Exception er) { + try { + File buildFolder = FileUtils.createTempFolder("build", DigestUtils.md5Hex(s.getMainFilePath()) + ".tmp"); + return buildFolder.getAbsolutePath(); + } + catch (IOException e) { + editor.statusError(e); + } + catch (Exception e) { + // Arduino 1.6.5 doesn't have FileUtils.createTempFolder + // String buildPath = BaseNoGui.getBuildFolder().getAbsolutePath(); + java.lang.reflect.Method method; + try { + method = BaseNoGui.class.getMethod("getBuildFolder"); + File f = (File) method.invoke(null); + return f.getAbsolutePath(); + } catch (SecurityException ex) { + editor.statusError(ex); + } catch (IllegalAccessException ex) { + editor.statusError(ex); + } catch (InvocationTargetException ex) { + editor.statusError(ex); + } catch (NoSuchMethodException ex) { + editor.statusError(ex); + } + } + } + return ""; + } + + private long parseInt(String value){ + if(value.startsWith("0x")) return Long.parseLong(value.substring(2), 16); + else return Integer.parseInt(value); + } + + private long getIntPref(String name){ + String data = BaseNoGui.getBoardPreferences().get(name); + if(data == null || data.contentEquals("")) return 0; + return parseInt(data); + } + + private void createAndUpload(){ + long spiStart = 0, spiSize = 0, spiPage = 256, spiBlock = 4096; + String partitions = ""; + + if(!PreferencesData.get("target_platform").contentEquals("esp32")){ + System.err.println(); + editor.statusError("SPIFFS Not Supported on "+PreferencesData.get("target_platform")); + return; + } + + TargetPlatform platform = BaseNoGui.getTargetPlatform(); + + 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"; + + String mkspiffsCmd; + if(PreferencesData.get("runtime.os").contentEquals("windows")) + mkspiffsCmd = "mkspiffs.exe"; + else + mkspiffsCmd = "mkspiffs"; + + String espotaCmd = "espota.py"; + if(PreferencesData.get("runtime.os").contentEquals("windows")) + espotaCmd = "espota.exe"; + + Boolean isNetwork = false; + File espota = new File(platform.getFolder()+"/tools"); + File esptool = new File(platform.getFolder()+"/tools"); + String serialPort = PreferencesData.get("serial.port"); + + if(!BaseNoGui.getBoardPreferences().containsKey("build.partitions")){ + System.err.println(); + editor.statusError("Partitions Not Defined for "+BaseNoGui.getBoardPreferences().get("name")); + return; + } + + try { + partitions = BaseNoGui.getBoardPreferences().get("build.partitions"); + if(partitions == null || partitions.contentEquals("")){ + editor.statusError("Partitions Not Found for "+BaseNoGui.getBoardPreferences().get("name")); + return; + } + } catch(Exception e){ + editor.statusError(e); + return; + } + + File 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!"); + return; + } + + try { + BufferedReader partitionsReader = new BufferedReader(new FileReader(partitionsFile)); + String partitionsLine = ""; + while ((partitionsLine = partitionsReader.readLine()) != null) { + if(partitionsLine.contains("spiffs")) { + partitionsLine = partitionsLine.substring(partitionsLine.indexOf(",")+1); + partitionsLine = partitionsLine.substring(partitionsLine.indexOf(",")+1); + partitionsLine = partitionsLine.substring(partitionsLine.indexOf(",")+1); + while(partitionsLine.startsWith(" ")) partitionsLine = partitionsLine.substring(1); + String pStart = partitionsLine.substring(0, partitionsLine.indexOf(",")); + partitionsLine = partitionsLine.substring(partitionsLine.indexOf(",")+1); + while(partitionsLine.startsWith(" ")) partitionsLine = partitionsLine.substring(1); + String pSize = partitionsLine.substring(0, partitionsLine.indexOf(",")); + spiStart = parseInt(pStart); + spiSize = parseInt(pSize); + } + } + if(spiSize == 0){ + System.err.println(); + editor.statusError("SPIFFS Error: partition size could not be found!"); + return; + } + } catch(Exception e){ + editor.statusError(e); + return; + } + + File tool = new File(platform.getFolder() + "/tools", mkspiffsCmd); + if (!tool.exists() || !tool.isFile()) { + tool = new File(platform.getFolder() + "/tools/mkspiffs", mkspiffsCmd); + if (!tool.exists()) { + tool = new File(PreferencesData.get("runtime.tools.mkspiffs.path"), mkspiffsCmd); + if (!tool.exists()) { + System.err.println(); + editor.statusError("SPIFFS Error: mkspiffs not found!"); + return; + } + } + } + + //make sure the serial port or IP is defined + if (serialPort == null || serialPort.isEmpty()) { + System.err.println(); + editor.statusError("SPIFFS Error: serial port not defined!"); + return; + } + + //find espota if IP else find esptool + if(serialPort.split("\\.").length == 4){ + isNetwork = true; + espota = new File(platform.getFolder()+"/tools", espotaCmd); + if(!espota.exists() || !espota.isFile()){ + System.err.println(); + editor.statusError("SPIFFS Error: espota not found!"); + return; + } + } else { + String esptoolCmd = "esptool"+toolExtension; + esptool = new File(platform.getFolder()+"/tools", esptoolCmd); + if(!esptool.exists() || !esptool.isFile()){ + esptool = new File(platform.getFolder()+"/tools/esptool", esptoolCmd); + if(!esptool.exists()){ + esptool = new File(PreferencesData.get("runtime.tools.esptool.path"), esptoolCmd); + if (!esptool.exists()) { + System.err.println(); + editor.statusError("SPIFFS Error: esptool not found!"); + return; + } + } + } + } + + //load a list of all files + int fileCount = 0; + File dataFolder = new File(editor.getSketch().getFolder(), "data"); + if (!dataFolder.exists()) { + dataFolder.mkdirs(); + } + if(dataFolder.exists() && dataFolder.isDirectory()){ + File[] files = dataFolder.listFiles(); + if(files.length > 0){ + for(File file : files){ + if((file.isDirectory() || file.isFile()) && !file.getName().startsWith(".")) fileCount++; + } + } + } + + String dataPath = dataFolder.getAbsolutePath(); + String toolPath = tool.getAbsolutePath(); + String sketchName = editor.getSketch().getName(); + String imagePath = getBuildFolderPath(editor.getSketch()) + "/" + sketchName + ".spiffs.bin"; + String uploadSpeed = BaseNoGui.getBoardPreferences().get("upload.speed"); + + Object[] options = { "Yes", "No" }; + String title = "SPIFFS Create"; + String message = "No files have been found in your data folder!\nAre you sure you want to create an empty SPIFFS image?"; + + if(fileCount == 0 && JOptionPane.showOptionDialog(editor, message, title, JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE, null, options, options[1]) != JOptionPane.YES_OPTION){ + System.err.println(); + editor.statusError("SPIFFS Warning: mkspiffs canceled!"); + return; + } + + editor.statusNotice("SPIFFS Creating Image..."); + System.out.println("[SPIFFS] data : "+dataPath); + System.out.println("[SPIFFS] start : "+spiStart); + System.out.println("[SPIFFS] size : "+(spiSize/1024)); + System.out.println("[SPIFFS] page : "+spiPage); + System.out.println("[SPIFFS] block : "+spiBlock); + + try { + if(listenOnProcess(new String[]{toolPath, "-c", dataPath, "-p", spiPage+"", "-b", spiBlock+"", "-s", spiSize+"", imagePath}) != 0){ + System.err.println(); + editor.statusError("SPIFFS Create Failed!"); + return; + } + } catch (Exception e){ + editor.statusError(e); + editor.statusError("SPIFFS Create Failed!"); + return; + } + + editor.statusNotice("SPIFFS Uploading Image..."); + System.out.println("[SPIFFS] upload : "+imagePath); + + if(isNetwork){ + System.out.println("[SPIFFS] IP : "+serialPort); + System.out.println(); + if(espota.getAbsolutePath().endsWith(".py")) + sysExec(new String[]{pythonCmd, espota.getAbsolutePath(), "-i", serialPort, "-p", "3232", "-s", "-f", imagePath}); + else + sysExec(new String[]{espota.getAbsolutePath(), "-i", serialPort, "-p", "3232", "-s", "-f", imagePath}); + } else { + 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); + System.out.println("[SPIFFS] mode : "+flashMode); + 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}); + 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}); + } + } + + public void run() { + createAndUpload(); + } +}