1
0
mirror of https://github.com/esp8266/Arduino.git synced 2025-06-16 11:21:18 +03:00
Commit Graph

196 Commits

Author SHA1 Message Date
e8789e9cb5 Merge branch 'master' into esp8266
* master: (414 commits)
  Don't export sketch if the underlying core does not support it. Fixes #3171
  RSyntaxTextArea: using a modified version, tracked at https://github.com/arduino/RSyntaxTextArea. Fixes #3099
  Updated keywords.txt
  New editor on MacOSX: since CMD+J is known as "jump to selection" and the editor has no such feature, CMD+J is disabled on mac. See #3098
  Old Preferences class remains for backwards compatibility as a delegate for PreferencesData
  New Preferences window: renders fine on every OS and it's easier to adapt using NetBeans as visual editor. Fixes #3140
  Remove spawn from exec command
  Removed redundant call to File.deleteIfExists()
  Removed buggy redundant check in FileUtils.deleteIfExists()
  Restored current line/current selected lines display on lower left of the IDE. Fixes #3134
  Updated cursor.ino
  New editor on MacOSX: restored CMD+E for finding selected text
  New editor on MacOSX: CMD+UP/DOWN moves cursor to start or end of sketch. See #3098
  New editor on MacOSX: CMD+BACKSPACE deletes current line until cursor position, ALT+BACKSPACE deletes previous word. See #3098
  ArduinoIDE is in the default package. Removed
  Fixes  #2969:
  Fix Uncategorized warning message
  New editor: ALT+ BACKSPACE deletes next word (OSX only). See #3098
  New editor: ALT+ UP/DOWN move current line only if "editor.advanced" (hidden pref) is true. Fixes #3101
  New editor: mark occurrences enable when "editor.advanced" (hidden pref) is true. Fixes #3102
  ...

Conflicts:
	.gitignore
	build/build.xml
	hardware/esp8266com/esp8266/libraries/ESP8266WiFi/keywords.txt
	hardware/esp8266com/esp8266/libraries/ESP8266WiFi/library.properties
	hardware/esp8266com/esp8266/libraries/ESP8266WiFi/src/ESP8266WiFi.h
	libraries/WiFi/README.adoc
	libraries/WiFi/src/WiFi.cpp
	libraries/WiFi/src/WiFiClient.cpp
	libraries/WiFi/src/WiFiClient.h
	libraries/WiFi/src/WiFiServer.cpp
	libraries/WiFi/src/WiFiUdp.cpp
2015-05-18 14:54:06 +03:00
4c3de26631 Don't export sketch if the underlying core does not support it. Fixes #3171 2015-05-18 13:34:29 +02:00
d008d9de81 Merge pull request #3141 from cmaglie/fix-recursive-delete
Fix for FileUtils.recursiveDelete() when dealing with symbolic links
2015-05-15 16:50:22 +02:00
7816ee3f10 New Preferences window: renders fine on every OS and it's easier to adapt using NetBeans as visual editor. Fixes #3140 2015-05-15 15:52:52 +02:00
971bd77058 Removed redundant call to File.deleteIfExists()
file is already checked for being not null, no need to check again.
2015-05-14 19:36:37 +02:00
956ddda98e Removed buggy redundant check in FileUtils.deleteIfExists()
The documentation for File.delete() says that the method return true
if the the file is successfully deleted, otherwise false is returned.
An exception is thrown only when the file is not accessible (for
permission problem).

Removing the extra check solves another problem, for example in a
folder with the following situation:

    linkToFileA -> FileA
    FileA

if we remove FileA, we remain with a broken link that can't be removed
using FileUtils.deleteIfExists() because calling File.exists() on a
broken link returns *false*. This commit solve this problem.
2015-05-14 19:18:24 +02:00
0210c6b53a Fix Uncategorized warning message 2015-05-13 14:00:30 -07:00
ee6d70d8ee export sketch data folder to the build config 2015-05-13 17:09:27 +03:00
74ace6674a Better naming and use of File constructor (avoids hardcoding system dependent path separator) 2015-05-13 10:21:57 +02:00
90a533b82c Using FileUtils.copyFile instead of dealing with raw streams 2015-05-13 10:16:09 +02:00
96b7c5ec6b MacOSX: fixed some failing tests 2015-05-12 15:23:22 +02:00
e8c4980c4e Added BaseNoGui.VERSION_NAME_LONG: it includes "Hourly Build DATE" in case of a hourly build 2015-05-11 10:48:52 +02:00
5064af486f Added .editorconfig files http://editorconfig.org/ 2015-05-08 10:18:43 +02:00
c3e1a9443c simple code refactor on PdePreprocessor 2015-05-07 17:15:49 +02:00
4d029de000 saveHex: rename recipe.hex -> recipe.output
Signed-off-by: Arnav Gupta <championswimmer@gmail.com>
2015-05-07 11:57:12 +02:00
78936541b7 update Sketch menu, add Save hex option
* Moving Upload options from "File" menu to "Sketch" menu as those
     are sketch actions more than file actions.

Signed-off-by: Arnav Gupta <championswimmer@gmail.com>
2015-05-07 11:57:12 +02:00
11327bb3a6 Starting 1.6.5 2015-05-07 11:56:38 +02:00
d0d9aa82d1 Merge pull request #3017 from cmaglie/programmer-pref-override
programmer.txt definitions must have priority over platforms.txt tools definitions
2015-05-06 15:49:33 +02:00
e2bf41ddd9 MacOSX: fixed error when clicking on https urls. Fixes #3083 2015-05-06 09:11:00 +02:00
03a43370b7 Added missing license headers to files added with the last commits 2015-05-05 14:29:15 +02:00
85b2298ca7 When IDE is started and built in core is newer than installed one and this check hasn't been notified before, show "please update" modal 2015-05-05 13:03:28 +02:00
de95ef6c41 Predicates: extracting anonymous inner classes for better reuse 2015-05-05 11:56:56 +02:00
9b58812d1d Preparing the ground for rewriting Preferences GUI code (and hopefully fixing the tiny-pref-window bug on macosx) 2015-05-05 10:02:12 +02:00
7e7a9d0fe8 Disabling uncertified boards warning even in java code, for good measure 2015-05-05 09:17:50 +02:00
060ec30e1c GPGSignatureVerification: better error handling when reading signature 2015-05-05 08:49:01 +02:00
0c123d7d14 Deleting json files if they are some how corrupted. Fixes #3015 2015-05-04 17:44:16 +02:00
875a775e93 Mitigates #3074 by avoiding NPE. Making the IDE work with system toolchains remains to be fixed 2015-05-04 17:28:39 +02:00
cd49d29e52 Lots of unclosed input and output streams now properly closed. They were preventing Boards Manager from working on Windows 2015-05-04 15:44:34 +02:00
19bb40cbb1 ContributionInstaller: downloadIndex -> download 2015-05-04 12:54:12 +02:00
a214564952 Boards Manager: platforms listed in non-signed package index files goes under "Contributed" category 2015-05-04 12:05:50 +02:00
cddfa2891e Boards Manager: package index file with name starting with "test_package_" are preserved 2015-05-04 12:05:50 +02:00
ecf432fadc Boards Manager: downloading additional files as specified in preference 'boardsmanager.additional.urls' 2015-05-04 12:05:50 +02:00
1f1f5b5c0e Copying bundled signature file if missing from user's preferences folder 2015-05-04 12:05:50 +02:00
cf1879f948 Introducing GPG signature verification when loading main package_index file 2015-05-04 12:05:50 +02:00
804480ce53 ContributionIndexer now loads and merges content of files named package_SOMETHING_index.json 2015-05-04 12:05:49 +02:00
7552636bd1 File.listFiles() can return null 2015-04-29 11:57:27 +02:00
b10417505f Windows: added comment to DoubleQuotedArgumentsOnWindowsCommandLine to explain the need for such a char replacement 2015-04-24 12:20:42 +02:00
f54851ecfa Windows: Compiler wasn't supplying Windows command line with the correct double quotes 2015-04-24 12:03:41 +02:00
d805fb4e1f Renamed compiler.warning_flags pref to compiler.warning_level
Provided a default value for compiler.warning_flags
Releasing avr core 1.6.5
2015-04-24 09:27:28 +02:00
4cf77cd90d If previously downloaded package_index.json is older than the bundled one, the bundled one wins 2015-04-23 11:10:54 +02:00
a7e6a39f4e programmer.txt has now priority over platforms.txt tools definitions
This allows properties defined in programmers.txt to override generic
configurations in platform.txt where needed, for example in the
following configuration:

programmers.txt:

   myprog.name=My New Programmer
   [...]
   myprog.program.tool=avrdude
   myprog.config.path={runtime.platform.path}/myprog_avrdude.conf
   [...]

platform.txt:

   tools.avrdude.path={runtime.tools.avrdude.path}
   tools.avrdude.cmd.path={path}/bin/avrdude
   tools.avrdude.config.path={path}/etc/avrdude.conf
   [...]
   tools.avrdude.upload.pattern="{cmd.path}" "-C{config.path}" {upload.verbose} -p{build.mcu} -c{upload.protocol} -P{serial.port} -b{upload.speed} -D "-Uflash:w:{build.path}/{build.project_name}.hex:i"

the generic tools.avrdude.config.path value

   {path}/etc/avrdude.conf

is replaced by the more specific myprog.config.path used in "myprog" programmer

   {runtime.plaform.path}/myprog_avrdude.conf
2015-04-22 14:33:20 +02:00
5af390b5e2 Added missing eclipse classpath entries 2015-04-21 18:28:26 +02:00
96c4576962 Added --preserve-temp-files command line option 2015-04-15 11:00:01 +02:00
3465fcf97b File.deleteOnExit is not recursive. Replaced by DeleteFilesOnShutdown shutdown hook. Fixes #2971 2015-04-15 10:21:37 +02:00
eacddd6120 Block discovery threads until packages is not null, otherwise boards discovered during startup will miss model name 2015-04-13 15:36:17 +02:00
350adb99cb Also SerialDiscovery was affected by bug found at 40535dfc55. Fixes #2892 2015-04-13 13:38:55 +02:00
40535dfc55 NetworkDiscovery was silently failing because packages werenìt ready yet. Fixes #2837 2015-04-13 13:29:05 +02:00
b42c6667e1 Better preference for setting warnings level. See 61592d78fa (commitcomment-10668365) 2015-04-13 12:22:37 +02:00
c740f251f4 SAM boards stop compiling due to way of handling params with spaces on different OSs. Fixed 2015-04-13 12:05:00 +02:00
4c9e5fc564 Restored error messages. Got rid of MessageSyphon as ther were losing some error messages. Fixes #2737 2015-04-10 17:44:13 +02:00