├── .gitignore ├── .travis.yml ├── LICENSE.txt ├── README.md ├── make.sh ├── screenshot.png └── src └── ESP8266FS.java /.gitignore: -------------------------------------------------------------------------------- 1 | bin/ 2 | dist/ 3 | -------------------------------------------------------------------------------- /.travis.yml: -------------------------------------------------------------------------------- 1 | sudo: false 2 | 3 | language: java 4 | 5 | os: 6 | - linux 7 | 8 | addons: 9 | apt: 10 | packages: 11 | - ant 12 | 13 | jdk: 14 | - oraclejdk8 15 | 16 | script: 17 | - export SRC=$PWD 18 | - cd $HOME 19 | - export TAG=1.6.12 20 | - wget https://github.com/arduino/Arduino/archive/$TAG.zip 21 | - unzip $TAG.zip 22 | - rm $TAG.zip 23 | - export arduino_dir=Arduino-$TAG 24 | - pushd $arduino_dir/build 25 | - echo "" | ant build 26 | - pushd shared/tools 27 | - mkdir -p ESP8266FS 28 | - rsync -a $SRC/ ESP8266FS/ 29 | - pushd ESP8266FS 30 | - ./make.sh 31 | - popd && popd && popd 32 | -------------------------------------------------------------------------------- /LICENSE.txt: -------------------------------------------------------------------------------- 1 | GNU GENERAL PUBLIC LICENSE 2 | Version 2, June 1991 3 | 4 | Copyright (C) 1989, 1991 Free Software Foundation, Inc., 5 | 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA 6 | Everyone is permitted to copy and distribute verbatim copies 7 | of this license document, but changing it is not allowed. 8 | 9 | Preamble 10 | 11 | The licenses for most software are designed to take away your 12 | freedom to share and change it. By contrast, the GNU General Public 13 | License is intended to guarantee your freedom to share and change free 14 | software--to make sure the software is free for all its users. This 15 | General Public License applies to most of the Free Software 16 | Foundation's software and to any other program whose authors commit to 17 | using it. (Some other Free Software Foundation software is covered by 18 | the GNU Lesser General Public License instead.) You can apply it to 19 | your programs, too. 20 | 21 | When we speak of free software, we are referring to freedom, not 22 | price. Our General Public Licenses are designed to make sure that you 23 | have the freedom to distribute copies of free software (and charge for 24 | this service if you wish), that you receive source code or can get it 25 | if you want it, that you can change the software or use pieces of it 26 | in new free programs; and that you know you can do these things. 27 | 28 | To protect your rights, we need to make restrictions that forbid 29 | anyone to deny you these rights or to ask you to surrender the rights. 30 | These restrictions translate to certain responsibilities for you if you 31 | distribute copies of the software, or if you modify it. 32 | 33 | For example, if you distribute copies of such a program, whether 34 | gratis or for a fee, you must give the recipients all the rights that 35 | you have. You must make sure that they, too, receive or can get the 36 | source code. And you must show them these terms so they know their 37 | rights. 38 | 39 | We protect your rights with two steps: (1) copyright the software, and 40 | (2) offer you this license which gives you legal permission to copy, 41 | distribute and/or modify the software. 42 | 43 | Also, for each author's protection and ours, we want to make certain 44 | that everyone understands that there is no warranty for this free 45 | software. If the software is modified by someone else and passed on, we 46 | want its recipients to know that what they have is not the original, so 47 | that any problems introduced by others will not reflect on the original 48 | authors' reputations. 49 | 50 | Finally, any free program is threatened constantly by software 51 | patents. We wish to avoid the danger that redistributors of a free 52 | program will individually obtain patent licenses, in effect making the 53 | program proprietary. To prevent this, we have made it clear that any 54 | patent must be licensed for everyone's free use or not licensed at all. 55 | 56 | The precise terms and conditions for copying, distribution and 57 | modification follow. 58 | 59 | GNU GENERAL PUBLIC LICENSE 60 | TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION 61 | 62 | 0. This License applies to any program or other work which contains 63 | a notice placed by the copyright holder saying it may be distributed 64 | under the terms of this General Public License. The "Program", below, 65 | refers to any such program or work, and a "work based on the Program" 66 | means either the Program or any derivative work under copyright law: 67 | that is to say, a work containing the Program or a portion of it, 68 | either verbatim or with modifications and/or translated into another 69 | language. (Hereinafter, translation is included without limitation in 70 | the term "modification".) Each licensee is addressed as "you". 71 | 72 | Activities other than copying, distribution and modification are not 73 | covered by this License; they are outside its scope. The act of 74 | running the Program is not restricted, and the output from the Program 75 | is covered only if its contents constitute a work based on the 76 | Program (independent of having been made by running the Program). 77 | Whether that is true depends on what the Program does. 78 | 79 | 1. You may copy and distribute verbatim copies of the Program's 80 | source code as you receive it, in any medium, provided that you 81 | conspicuously and appropriately publish on each copy an appropriate 82 | copyright notice and disclaimer of warranty; keep intact all the 83 | notices that refer to this License and to the absence of any warranty; 84 | and give any other recipients of the Program a copy of this License 85 | along with the Program. 86 | 87 | You may charge a fee for the physical act of transferring a copy, and 88 | you may at your option offer warranty protection in exchange for a fee. 89 | 90 | 2. You may modify your copy or copies of the Program or any portion 91 | of it, thus forming a work based on the Program, and copy and 92 | distribute such modifications or work under the terms of Section 1 93 | above, provided that you also meet all of these conditions: 94 | 95 | a) You must cause the modified files to carry prominent notices 96 | stating that you changed the files and the date of any change. 97 | 98 | b) You must cause any work that you distribute or publish, that in 99 | whole or in part contains or is derived from the Program or any 100 | part thereof, to be licensed as a whole at no charge to all third 101 | parties under the terms of this License. 102 | 103 | c) If the modified program normally reads commands interactively 104 | when run, you must cause it, when started running for such 105 | interactive use in the most ordinary way, to print or display an 106 | announcement including an appropriate copyright notice and a 107 | notice that there is no warranty (or else, saying that you provide 108 | a warranty) and that users may redistribute the program under 109 | these conditions, and telling the user how to view a copy of this 110 | License. (Exception: if the Program itself is interactive but 111 | does not normally print such an announcement, your work based on 112 | the Program is not required to print an announcement.) 113 | 114 | These requirements apply to the modified work as a whole. If 115 | identifiable sections of that work are not derived from the Program, 116 | and can be reasonably considered independent and separate works in 117 | themselves, then this License, and its terms, do not apply to those 118 | sections when you distribute them as separate works. But when you 119 | distribute the same sections as part of a whole which is a work based 120 | on the Program, the distribution of the whole must be on the terms of 121 | this License, whose permissions for other licensees extend to the 122 | entire whole, and thus to each and every part regardless of who wrote it. 123 | 124 | Thus, it is not the intent of this section to claim rights or contest 125 | your rights to work written entirely by you; rather, the intent is to 126 | exercise the right to control the distribution of derivative or 127 | collective works based on the Program. 128 | 129 | In addition, mere aggregation of another work not based on the Program 130 | with the Program (or with a work based on the Program) on a volume of 131 | a storage or distribution medium does not bring the other work under 132 | the scope of this License. 133 | 134 | 3. You may copy and distribute the Program (or a work based on it, 135 | under Section 2) in object code or executable form under the terms of 136 | Sections 1 and 2 above provided that you also do one of the following: 137 | 138 | a) Accompany it with the complete corresponding machine-readable 139 | source code, which must be distributed under the terms of Sections 140 | 1 and 2 above on a medium customarily used for software interchange; or, 141 | 142 | b) Accompany it with a written offer, valid for at least three 143 | years, to give any third party, for a charge no more than your 144 | cost of physically performing source distribution, a complete 145 | machine-readable copy of the corresponding source code, to be 146 | distributed under the terms of Sections 1 and 2 above on a medium 147 | customarily used for software interchange; or, 148 | 149 | c) Accompany it with the information you received as to the offer 150 | to distribute corresponding source code. (This alternative is 151 | allowed only for noncommercial distribution and only if you 152 | received the program in object code or executable form with such 153 | an offer, in accord with Subsection b above.) 154 | 155 | The source code for a work means the preferred form of the work for 156 | making modifications to it. For an executable work, complete source 157 | code means all the source code for all modules it contains, plus any 158 | associated interface definition files, plus the scripts used to 159 | control compilation and installation of the executable. However, as a 160 | special exception, the source code distributed need not include 161 | anything that is normally distributed (in either source or binary 162 | form) with the major components (compiler, kernel, and so on) of the 163 | operating system on which the executable runs, unless that component 164 | itself accompanies the executable. 165 | 166 | If distribution of executable or object code is made by offering 167 | access to copy from a designated place, then offering equivalent 168 | access to copy the source code from the same place counts as 169 | distribution of the source code, even though third parties are not 170 | compelled to copy the source along with the object code. 171 | 172 | 4. You may not copy, modify, sublicense, or distribute the Program 173 | except as expressly provided under this License. Any attempt 174 | otherwise to copy, modify, sublicense or distribute the Program is 175 | void, and will automatically terminate your rights under this License. 176 | However, parties who have received copies, or rights, from you under 177 | this License will not have their licenses terminated so long as such 178 | parties remain in full compliance. 179 | 180 | 5. You are not required to accept this License, since you have not 181 | signed it. However, nothing else grants you permission to modify or 182 | distribute the Program or its derivative works. These actions are 183 | prohibited by law if you do not accept this License. Therefore, by 184 | modifying or distributing the Program (or any work based on the 185 | Program), you indicate your acceptance of this License to do so, and 186 | all its terms and conditions for copying, distributing or modifying 187 | the Program or works based on it. 188 | 189 | 6. Each time you redistribute the Program (or any work based on the 190 | Program), the recipient automatically receives a license from the 191 | original licensor to copy, distribute or modify the Program subject to 192 | these terms and conditions. You may not impose any further 193 | restrictions on the recipients' exercise of the rights granted herein. 194 | You are not responsible for enforcing compliance by third parties to 195 | this License. 196 | 197 | 7. If, as a consequence of a court judgment or allegation of patent 198 | infringement or for any other reason (not limited to patent issues), 199 | conditions are imposed on you (whether by court order, agreement or 200 | otherwise) that contradict the conditions of this License, they do not 201 | excuse you from the conditions of this License. If you cannot 202 | distribute so as to satisfy simultaneously your obligations under this 203 | License and any other pertinent obligations, then as a consequence you 204 | may not distribute the Program at all. For example, if a patent 205 | license would not permit royalty-free redistribution of the Program by 206 | all those who receive copies directly or indirectly through you, then 207 | the only way you could satisfy both it and this License would be to 208 | refrain entirely from distribution of the Program. 209 | 210 | If any portion of this section is held invalid or unenforceable under 211 | any particular circumstance, the balance of the section is intended to 212 | apply and the section as a whole is intended to apply in other 213 | circumstances. 214 | 215 | It is not the purpose of this section to induce you to infringe any 216 | patents or other property right claims or to contest validity of any 217 | such claims; this section has the sole purpose of protecting the 218 | integrity of the free software distribution system, which is 219 | implemented by public license practices. Many people have made 220 | generous contributions to the wide range of software distributed 221 | through that system in reliance on consistent application of that 222 | system; it is up to the author/donor to decide if he or she is willing 223 | to distribute software through any other system and a licensee cannot 224 | impose that choice. 225 | 226 | This section is intended to make thoroughly clear what is believed to 227 | be a consequence of the rest of this License. 228 | 229 | 8. If the distribution and/or use of the Program is restricted in 230 | certain countries either by patents or by copyrighted interfaces, the 231 | original copyright holder who places the Program under this License 232 | may add an explicit geographical distribution limitation excluding 233 | those countries, so that distribution is permitted only in or among 234 | countries not thus excluded. In such case, this License incorporates 235 | the limitation as if written in the body of this License. 236 | 237 | 9. The Free Software Foundation may publish revised and/or new versions 238 | of the General Public License from time to time. Such new versions will 239 | be similar in spirit to the present version, but may differ in detail to 240 | address new problems or concerns. 241 | 242 | Each version is given a distinguishing version number. If the Program 243 | specifies a version number of this License which applies to it and "any 244 | later version", you have the option of following the terms and conditions 245 | either of that version or of any later version published by the Free 246 | Software Foundation. If the Program does not specify a version number of 247 | this License, you may choose any version ever published by the Free Software 248 | Foundation. 249 | 250 | 10. If you wish to incorporate parts of the Program into other free 251 | programs whose distribution conditions are different, write to the author 252 | to ask for permission. For software which is copyrighted by the Free 253 | Software Foundation, write to the Free Software Foundation; we sometimes 254 | make exceptions for this. Our decision will be guided by the two goals 255 | of preserving the free status of all derivatives of our free software and 256 | of promoting the sharing and reuse of software generally. 257 | 258 | NO WARRANTY 259 | 260 | 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY 261 | FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN 262 | OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES 263 | PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED 264 | OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 265 | MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS 266 | TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE 267 | PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, 268 | REPAIR OR CORRECTION. 269 | 270 | 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING 271 | WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR 272 | REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, 273 | INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING 274 | OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED 275 | TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY 276 | YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER 277 | PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE 278 | POSSIBILITY OF SUCH DAMAGES. 279 | 280 | END OF TERMS AND CONDITIONS 281 | 282 | How to Apply These Terms to Your New Programs 283 | 284 | If you develop a new program, and you want it to be of the greatest 285 | possible use to the public, the best way to achieve this is to make it 286 | free software which everyone can redistribute and change under these terms. 287 | 288 | To do so, attach the following notices to the program. It is safest 289 | to attach them to the start of each source file to most effectively 290 | convey the exclusion of warranty; and each file should have at least 291 | the "copyright" line and a pointer to where the full notice is found. 292 | 293 | 294 | Copyright (C) 295 | 296 | This program is free software; you can redistribute it and/or modify 297 | it under the terms of the GNU General Public License as published by 298 | the Free Software Foundation; either version 2 of the License, or 299 | (at your option) any later version. 300 | 301 | This program is distributed in the hope that it will be useful, 302 | but WITHOUT ANY WARRANTY; without even the implied warranty of 303 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 304 | GNU General Public License for more details. 305 | 306 | You should have received a copy of the GNU General Public License along 307 | with this program; if not, write to the Free Software Foundation, Inc., 308 | 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. 309 | 310 | Also add information on how to contact you by electronic and paper mail. 311 | 312 | If the program is interactive, make it output a short notice like this 313 | when it starts in an interactive mode: 314 | 315 | Gnomovision version 69, Copyright (C) year name of author 316 | Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. 317 | This is free software, and you are welcome to redistribute it 318 | under certain conditions; type `show c' for details. 319 | 320 | The hypothetical commands `show w' and `show c' should show the appropriate 321 | parts of the General Public License. Of course, the commands you use may 322 | be called something other than `show w' and `show c'; they could even be 323 | mouse-clicks or menu items--whatever suits your program. 324 | 325 | You should also get your employer (if you work as a programmer) or your 326 | school, if any, to sign a "copyright disclaimer" for the program, if 327 | necessary. Here is a sample; alter the names: 328 | 329 | Yoyodyne, Inc., hereby disclaims all copyright interest in the program 330 | `Gnomovision' (which makes passes at compilers) written by James Hacker. 331 | 332 | , 1 April 1989 333 | Ty Coon, President of Vice 334 | 335 | This General Public License does not permit incorporating your program into 336 | proprietary programs. If your program is a subroutine library, you may 337 | consider it more useful to permit linking proprietary applications with the 338 | library. If this is what you want to do, use the GNU Lesser General 339 | Public License instead of this License. 340 | -------------------------------------------------------------------------------- /README.md: -------------------------------------------------------------------------------- 1 | # Arduino ESP8266 filesystem uploader [![Build Status](https://travis-ci.org/esp8266/arduino-esp8266fs-plugin.svg?branch=master)](https://travis-ci.org/esp8266/arduino-esp8266fs-plugin) 2 | 3 | Arduino plugin which packs sketch data folder into SPIFFS filesystem image, 4 | and uploads the image to ESP8266 flash memory. 5 |
6 | Tested with the following Arduino IDE versions: 1.6.5-r2, 7 | 1.6.6 8 | 9 | 10 | 11 | ## Installation 12 | - Make sure you use one of the supported versions of Arduino IDE and have ESP8266 core installed. 13 | - Download the tool archive from [releases page](https://github.com/esp8266/arduino-esp8266fs-plugin/releases/latest). 14 | - In your Arduino sketchbook directory, create `tools` directory if it doesn't exist yet. You can find the location of your sketchbook directory in the Arduino IDE at **File > Preferences > Sketchbook location**. 15 | - Unpack the tool into `tools` directory (the path will look like `/tools/ESP8266FS/tool/esp8266fs.jar)`. 16 | - Restart Arduino IDE. 17 | 18 | On OS X and Linux based OSs create the tools directory in ~/Documents/Arduino/ and unpack the files there 19 | 20 | ## Usage 21 | - Open a sketch (or create a new one and save it). 22 | - Go to sketch directory (choose Sketch > Show Sketch Folder). 23 | - Create a directory named `data` and any files you want in the file system there. 24 | - Make sure you have selected a board, port, and closed Serial Monitor. 25 | - Select *Tools > ESP8266 Sketch Data Upload* menu item. This should start uploading the files into ESP8266 flash file system. 26 | When done, IDE status bar will display SPIFFS Image Uploaded message. Might take a few minutes for large file system sizes. 27 | 28 | ## Screenshot 29 | 30 | ![Screenshot](screenshot.png) 31 | 32 | ## Credits and license 33 | 34 | - Copyright (c) 2015 Hristo Gochkov (ficeto at ficeto dot com) 35 | - Licensed under GPL v2 ([text](LICENSE)) 36 | - Maintained by Ivan Grokhotkov (ivan at esp8266 dot com) 37 | 38 | ## Issues and suggestions 39 | 40 | File issues here on github, or ask your questions on the [esp8266.com forum](http://esp8266.com/arduino). 41 | -------------------------------------------------------------------------------- /make.sh: -------------------------------------------------------------------------------- 1 | #!/usr/bin/env bash 2 | 3 | if [[ -z "$INSTALLDIR" ]]; then 4 | INSTALLDIR="$HOME/Documents/Arduino" 5 | fi 6 | echo "INSTALLDIR: $INSTALLDIR" 7 | 8 | pde_path=`find ../../../ -name pde.jar` 9 | core_path=`find ../../../ -name arduino-core.jar` 10 | lib_path=`find ../../../ -name commons-codec-1.7.jar` 11 | if [[ -z "$core_path" || -z "$pde_path" ]]; then 12 | echo "Some java libraries have not been built yet (did you run ant build?)" 13 | return 1 14 | fi 15 | echo "pde_path: $pde_path" 16 | echo "core_path: $core_path" 17 | echo "lib_path: $lib_path" 18 | 19 | set -e 20 | 21 | mkdir -p bin 22 | javac -target 11 -cp "$pde_path:$core_path:$lib_path" \ 23 | -d bin src/ESP8266FS.java 24 | 25 | pushd bin 26 | mkdir -p $INSTALLDIR/tools 27 | rm -rf $INSTALLDIR/tools/ESP8266FS 28 | mkdir -p $INSTALLDIR/tools/ESP8266FS/tool 29 | zip -r $INSTALLDIR/tools/ESP8266FS/tool/esp8266fs.jar * 30 | popd 31 | 32 | dist=$PWD/dist 33 | rev=$(git describe --tags) 34 | mkdir -p $dist 35 | pushd $INSTALLDIR/tools 36 | zip -r $dist/ESP8266FS-$rev.zip ESP8266FS/ 37 | popd 38 | -------------------------------------------------------------------------------- /screenshot.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/esp8266/arduino-esp8266fs-plugin/56a6c515545ff5301be5e679d014ab7062600d81/screenshot.png -------------------------------------------------------------------------------- /src/ESP8266FS.java: -------------------------------------------------------------------------------- 1 | /* -*- mode: java; c-basic-offset: 2; indent-tabs-mode: nil -*- */ 2 | 3 | /* 4 | Tool to put the contents of the sketch's "data" subfolder 5 | into an SPIFFS partition image and upload it to an ESP8266 MCU 6 | 7 | Copyright (c) 2015 Hristo Gochkov (ficeto at ficeto dot com) 8 | 9 | This program is free software; you can redistribute it and/or modify 10 | it under the terms of the GNU General Public License as published by 11 | the Free Software Foundation; either version 2 of the License, or 12 | (at your option) any later version. 13 | 14 | This program is distributed in the hope that it will be useful, 15 | but WITHOUT ANY WARRANTY; without even the implied warranty of 16 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 17 | GNU General Public License for more details. 18 | 19 | You should have received a copy of the GNU General Public License 20 | along with this program; if not, write to the Free Software Foundation, 21 | Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 22 | */ 23 | 24 | package com.esp8266.mkspiffs; 25 | 26 | import java.io.File; 27 | import java.io.BufferedReader; 28 | import java.io.InputStreamReader; 29 | import java.io.IOException; 30 | 31 | import java.text.SimpleDateFormat; 32 | import java.util.Date; 33 | import java.lang.reflect.Field; 34 | import java.lang.reflect.InvocationTargetException; 35 | import javax.swing.JOptionPane; 36 | 37 | import processing.app.PreferencesData; 38 | import processing.app.Editor; 39 | import processing.app.Base; 40 | import processing.app.BaseNoGui; 41 | import processing.app.Platform; 42 | import processing.app.Sketch; 43 | import processing.app.tools.Tool; 44 | import processing.app.helpers.ProcessUtils; 45 | import processing.app.debug.TargetPlatform; 46 | 47 | import org.apache.commons.codec.digest.DigestUtils; 48 | import processing.app.helpers.FileUtils; 49 | 50 | import cc.arduino.files.DeleteFilesOnShutdown; 51 | 52 | /** 53 | * Example Tools menu entry. 54 | */ 55 | public class ESP8266FS implements Tool { 56 | Editor editor; 57 | 58 | 59 | public void init(Editor editor) { 60 | this.editor = editor; 61 | } 62 | 63 | 64 | public String getMenuTitle() { 65 | return "ESP8266 Sketch Data Upload"; 66 | } 67 | 68 | private int listenOnProcess(String[] arguments){ 69 | try { 70 | final Process p = ProcessUtils.exec(arguments); 71 | Thread thread = new Thread() { 72 | public void run() { 73 | try { 74 | InputStreamReader reader = new InputStreamReader(p.getInputStream()); 75 | int c; 76 | while ((c = reader.read()) != -1) 77 | System.out.print((char) c); 78 | reader.close(); 79 | 80 | reader = new InputStreamReader(p.getErrorStream()); 81 | while ((c = reader.read()) != -1) 82 | System.err.print((char) c); 83 | reader.close(); 84 | } catch (Exception e){} 85 | } 86 | }; 87 | thread.start(); 88 | int res = p.waitFor(); 89 | thread.join(); 90 | return res; 91 | } catch (Exception e){ 92 | return -1; 93 | } 94 | } 95 | 96 | private void sysExec(final String[] arguments){ 97 | Thread thread = new Thread() { 98 | public void run() { 99 | try { 100 | if(listenOnProcess(arguments) != 0){ 101 | editor.statusError("SPIFFS Upload failed!"); 102 | } else { 103 | editor.statusNotice("SPIFFS Image Uploaded"); 104 | } 105 | } catch (Exception e){ 106 | editor.statusError("SPIFFS Upload failed!"); 107 | } 108 | } 109 | }; 110 | thread.start(); 111 | } 112 | 113 | private String getBuildFolderPath(Sketch s) { 114 | // first of all try the getBuildPath() function introduced with IDE 1.6.12 115 | // see commit arduino/Arduino#fd1541eb47d589f9b9ea7e558018a8cf49bb6d03 116 | try { 117 | String buildpath = s.getBuildPath().getAbsolutePath(); 118 | return buildpath; 119 | } 120 | catch (IOException er) { 121 | editor.statusError(er); 122 | } 123 | catch (Exception er) { 124 | try { 125 | File buildFolder = FileUtils.createTempFolder("build", DigestUtils.md5Hex(s.getMainFilePath()) + ".tmp"); 126 | return buildFolder.getAbsolutePath(); 127 | } 128 | catch (IOException e) { 129 | editor.statusError(e); 130 | } 131 | catch (Exception e) { 132 | // Arduino 1.6.5 doesn't have FileUtils.createTempFolder 133 | // String buildPath = BaseNoGui.getBuildFolder().getAbsolutePath(); 134 | java.lang.reflect.Method method; 135 | try { 136 | method = BaseNoGui.class.getMethod("getBuildFolder"); 137 | File f = (File) method.invoke(null); 138 | return f.getAbsolutePath(); 139 | } catch (SecurityException ex) { 140 | editor.statusError(ex); 141 | } catch (IllegalAccessException ex) { 142 | editor.statusError(ex); 143 | } catch (InvocationTargetException ex) { 144 | editor.statusError(ex); 145 | } catch (NoSuchMethodException ex) { 146 | editor.statusError(ex); 147 | } 148 | } 149 | } 150 | return ""; 151 | } 152 | 153 | private long getIntPref(String name){ 154 | String data = BaseNoGui.getBoardPreferences().get(name); 155 | if(data == null || data.contentEquals("")) return 0; 156 | if(data.startsWith("0x")) return Long.parseLong(data.substring(2), 16); 157 | else return Integer.parseInt(data); 158 | } 159 | 160 | private void createAndUpload(){ 161 | if(!PreferencesData.get("target_platform").contentEquals("esp8266")){ 162 | System.err.println(); 163 | editor.statusError("SPIFFS Not Supported on "+PreferencesData.get("target_platform")); 164 | return; 165 | } 166 | 167 | if(!BaseNoGui.getBoardPreferences().containsKey("build.spiffs_start") || !BaseNoGui.getBoardPreferences().containsKey("build.spiffs_end")){ 168 | System.err.println(); 169 | editor.statusError("SPIFFS Not Defined for "+BaseNoGui.getBoardPreferences().get("name")); 170 | return; 171 | } 172 | long spiStart, spiEnd, spiPage, spiBlock; 173 | try { 174 | spiStart = getIntPref("build.spiffs_start"); 175 | spiEnd = getIntPref("build.spiffs_end"); 176 | spiPage = getIntPref("build.spiffs_pagesize"); 177 | if(spiPage == 0) spiPage = 256; 178 | spiBlock = getIntPref("build.spiffs_blocksize"); 179 | if(spiBlock == 0) spiBlock = 4096; 180 | } catch(Exception e){ 181 | editor.statusError(e); 182 | return; 183 | } 184 | 185 | TargetPlatform platform = BaseNoGui.getTargetPlatform(); 186 | 187 | //Make sure mkspiffs binary exists 188 | String mkspiffsCmd; 189 | if(PreferencesData.get("runtime.os").contentEquals("windows")) 190 | mkspiffsCmd = "mkspiffs.exe"; 191 | else 192 | mkspiffsCmd = "mkspiffs"; 193 | 194 | File tool = new File(platform.getFolder() + "/tools", mkspiffsCmd); 195 | if (!tool.exists() || !tool.isFile()) { 196 | tool = new File(platform.getFolder() + "/tools/mkspiffs", mkspiffsCmd); 197 | if (!tool.exists()) { 198 | tool = new File(PreferencesData.get("runtime.tools.mkspiffs.path"), mkspiffsCmd); 199 | if (!tool.exists()) { 200 | System.err.println(); 201 | editor.statusError("SPIFFS Error: mkspiffs not found!"); 202 | return; 203 | } 204 | } 205 | } 206 | 207 | Boolean isNetwork = false; 208 | File espota = new File(platform.getFolder()+"/tools"); 209 | File esptool = new File(platform.getFolder()+"/tools"); 210 | String serialPort = PreferencesData.get("serial.port"); 211 | String pythonCmd = PreferencesData.get("runtime.os").contentEquals("windows") ? "python3.exe" : "python3"; 212 | String uploadCmd = ""; 213 | 214 | //make sure the serial port or IP is defined 215 | if (serialPort == null || serialPort.isEmpty()) { 216 | System.err.println(); 217 | editor.statusError("SPIFFS Error: serial port not defined!"); 218 | return; 219 | } 220 | 221 | // Find upload.py, don't fail if not present for backwards compat 222 | File uploadPyFile = new File(platform.getFolder()+"/tools", "upload.py"); 223 | if (uploadPyFile.exists() && uploadPyFile.isFile()) { 224 | uploadCmd = uploadPyFile.getAbsolutePath(); 225 | } 226 | // Find python.exe if present, don't fail if not found for backwards compat 227 | String[] paths = { platform.getFolder()+"/tools", platform.getFolder()+"/tools/python3", PreferencesData.get("runtime.tools.python3.path") }; 228 | for (String s: paths) { 229 | File toolPyFile = new File(s, pythonCmd); 230 | if (toolPyFile.exists() && toolPyFile.isFile() && toolPyFile.canExecute()) { 231 | pythonCmd = toolPyFile.getAbsolutePath(); 232 | break; 233 | } 234 | } 235 | // pythonCmd now points to either an installed exe with full path or just plain "python3(.exe)" 236 | 237 | //find espota if IP else find esptool 238 | if(serialPort.split("\\.").length == 4){ 239 | isNetwork = true; 240 | String espotaCmd = "espota.py"; 241 | espota = new File(platform.getFolder()+"/tools", espotaCmd); 242 | if(!espota.exists() || !espota.isFile()){ 243 | System.err.println(); 244 | editor.statusError("SPIFFS Error: espota not found!"); 245 | return; 246 | } 247 | } else { 248 | String esptoolCmd = platform.getTool("esptool").get("cmd"); 249 | esptool = new File(platform.getFolder()+"/tools", esptoolCmd); 250 | if(!esptool.exists() || !esptool.isFile()){ 251 | esptool = new File(platform.getFolder()+"/tools/esptool", esptoolCmd); 252 | if(!esptool.exists()){ 253 | esptool = new File(PreferencesData.get("runtime.tools.esptool.path"), esptoolCmd); 254 | if (!esptool.exists() && uploadCmd.isEmpty()) { 255 | System.err.println(); 256 | editor.statusError("SPIFFS Error: esptool not found!"); 257 | return; 258 | } 259 | } 260 | } 261 | } 262 | 263 | //load a list of all files 264 | int fileCount = 0; 265 | File dataFolder = new File(editor.getSketch().getFolder(), "data"); 266 | if (!dataFolder.exists()) { 267 | dataFolder.mkdirs(); 268 | } 269 | if(dataFolder.exists() && dataFolder.isDirectory()){ 270 | File[] files = dataFolder.listFiles(); 271 | if(files.length > 0){ 272 | for(File file : files){ 273 | if((file.isDirectory() || file.isFile()) && !file.getName().startsWith(".")) fileCount++; 274 | } 275 | } 276 | } 277 | 278 | String dataPath = dataFolder.getAbsolutePath(); 279 | String toolPath = tool.getAbsolutePath(); 280 | String sketchName = editor.getSketch().getName(); 281 | String imagePath = getBuildFolderPath(editor.getSketch()) + "/" + sketchName + ".spiffs.bin"; 282 | String resetMethod = BaseNoGui.getBoardPreferences().get("upload.resetmethod"); 283 | String uploadSpeed = BaseNoGui.getBoardPreferences().get("upload.speed"); 284 | String uploadAddress = BaseNoGui.getBoardPreferences().get("build.spiffs_start"); 285 | 286 | 287 | 288 | Object[] options = { "Yes", "No" }; 289 | String title = "SPIFFS Create"; 290 | String message = "No files have been found in your data folder!\nAre you sure you want to create an empty SPIFFS image?"; 291 | 292 | if(fileCount == 0 && JOptionPane.showOptionDialog(editor, message, title, JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE, null, options, options[1]) != JOptionPane.YES_OPTION){ 293 | System.err.println(); 294 | editor.statusError("SPIFFS Warning: mkspiffs canceled!"); 295 | return; 296 | } 297 | 298 | editor.statusNotice("SPIFFS Creating Image..."); 299 | System.out.println("[SPIFFS] data : "+dataPath); 300 | System.out.println("[SPIFFS] size : "+((spiEnd - spiStart)/1024)); 301 | System.out.println("[SPIFFS] page : "+spiPage); 302 | System.out.println("[SPIFFS] block : "+spiBlock); 303 | 304 | try { 305 | if(listenOnProcess(new String[]{toolPath, "-c", dataPath, "-p", spiPage+"", "-b", spiBlock+"", "-s", (spiEnd - spiStart)+"", imagePath}) != 0){ 306 | System.err.println(); 307 | editor.statusError("SPIFFS Create Failed!"); 308 | return; 309 | } 310 | } catch (Exception e){ 311 | editor.statusError(e); 312 | editor.statusError("SPIFFS Create Failed!"); 313 | return; 314 | } 315 | 316 | editor.statusNotice("SPIFFS Uploading Image..."); 317 | System.out.println("[SPIFFS] upload : "+imagePath); 318 | 319 | if(isNetwork){ 320 | System.out.println("[SPIFFS] IP : "+serialPort); 321 | System.out.println(); 322 | sysExec(new String[]{pythonCmd, espota.getAbsolutePath(), "-i", serialPort, "-s", "-f", imagePath}); 323 | } else { 324 | System.out.println("[SPIFFS] address : "+uploadAddress); 325 | System.out.println("[SPIFFS] reset : "+resetMethod); 326 | System.out.println("[SPIFFS] port : "+serialPort); 327 | System.out.println("[SPIFFS] speed : "+uploadSpeed); 328 | if (!uploadCmd.isEmpty()) { 329 | System.out.println("[SPIFFS] python : "+pythonCmd); 330 | System.out.println("[SPIFFS] uploader : "+uploadCmd); 331 | } 332 | System.out.println(); 333 | if (!uploadCmd.isEmpty()) { 334 | sysExec(new String[]{pythonCmd, uploadCmd, "--chip", "esp8266", "--port", serialPort, "--baud", uploadSpeed, "write_flash", uploadAddress, imagePath}); 335 | } else { 336 | sysExec(new String[]{esptool.getAbsolutePath(), "-cd", resetMethod, "-cb", uploadSpeed, "-cp", serialPort, "-ca", uploadAddress, "-cf", imagePath}); 337 | } 338 | } 339 | } 340 | 341 | public void run() { 342 | createAndUpload(); 343 | } 344 | } 345 | --------------------------------------------------------------------------------