1
0
mirror of https://github.com/esp8266/Arduino.git synced 2025-06-17 22:23:10 +03:00
Commit Graph

604 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
223db048ff Updated keywords.txt
This commit fixes some highlighting issues due to multiple keyword
entries.

The missing C++ keywords have been added.

A set of standard fixed sized integers has been added also: uint8_t,
int32_t,...
2015-05-18 17:51:55 +10:00
02e94f1879 Update revisions.txt 2015-05-13 16:57:53 +02:00
6789cfe223 New modal dialog for adding additional boards manager url: with a wide text area, inputing is much easier 2015-05-13 16:24:37 +02:00
154d23ce11 Update revisions.txt 2015-05-12 10:17:18 +02:00
fe94d6aa6d Adding keywords. Closes #2213 2015-05-11 17:37:05 +02:00
f17cc834cf Code folding is disabled by default. Fixes #3105 2015-05-07 20:40:50 +02:00
8efe0a90cf Update revisions.txt 2015-05-07 17:16:33 +02:00
5967294287 MacOSX: default font size set to 12 2015-05-07 17:15:51 +02:00
9ebe916fac Restoring keyword.txt loading and parsing. Added token type identifiers and related style in theme.txt 2015-05-07 17:15:50 +02:00
2ec7a02532 Removed color theme selection: we currently support only one theme 2015-05-07 17:15:50 +02:00
67997a6605 Revert "make editor folding happy"
This reverts commit e0926139fb61f7edbc38dd5bf7aaff1644e07a8f.
2015-05-07 17:15:50 +02:00
f426188d04 Add 'Code Folding' preferences and fix Font-Size changes 2015-05-07 17:15:50 +02:00
1e61cd6b4c preferences for syntax highlighting theme 2015-05-07 17:15:50 +02:00
96fcda2cbc make editor folding happy 2015-05-07 17:15:50 +02:00
6b4e7d7c41 arduino logo for linux icon 2015-05-07 17:15:49 +02:00
e70545948c Update revisions.txt 2015-05-07 17:15:37 +02:00
11327bb3a6 Starting 1.6.5 2015-05-07 11:56:38 +02:00
7edf21f8c2 Updated revision log 2015-05-06 15:59:59 +02:00
70eaa47f8d Releasing 1.6.4 2015-05-06 13:09:15 +02:00
800cdd0fe0 update revisions.txt 2015-05-06 12:20:44 +02:00
724df07fb8 Update revision.txt 2015-05-04 17:03:22 +02:00
87fb45c3b4 Merge pull request #3055 from ffissore/other-packages
Allow listing other boards in boards manager
2015-05-04 16:55:41 +02:00
d87f0faf11 Examples: adding description, layout and schematics 2015-05-04 16:49:10 +02:00
cf1879f948 Introducing GPG signature verification when loading main package_index file 2015-05-04 12:05:50 +02:00
35d31b6277 add section BUGS 2015-04-30 16:44:24 +02:00
0e93798455 Bundled package and library index soon become obsolete. Download a fresh copy each time the IDE is built 2015-04-28 14:54:16 +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
2f31b8a80c AVR: upgrading avr core version 2015-04-23 11:10:17 +02:00
96c4576962 Added --preserve-temp-files command line option 2015-04-15 11:00:01 +02:00
e7dc30dae4 Update revisions.txt 2015-04-15 10:21:37 +02:00
890c2ada1c Update revisions.txt 2015-04-13 16:32:47 +02:00
818dc19553 Update revisions.txt 2015-04-13 15:36:34 +02:00
df1b82ac20 CLI: library manager, man page updated 2015-04-09 15:34:34 +02:00
87e2e68b85 CLI: Board and Lib Manager, syntax change: --install-boards (plural) and arduino:avr:1.6.2 (with the arch, not the name of the selected platform) 2015-04-09 13:03:43 +02:00
9833de618d Boards and Library manager command line interface documentation 2015-04-09 10:48:44 +02:00
f155601c5e Update revisions.txt 2015-04-08 20:59:52 +02:00
bf6f0f400b Update revisions.txt 2015-04-07 17:37:52 +02:00
ca5f1d405e Merge pull request #2903 from mixania/patch-1
Char now has the right KEYWORD
2015-04-07 17:20:26 +02:00
8020c0d733 Restored old error message colour 2015-04-07 10:10:12 +02:00
681cdb9faf Char now has the right KEYWORD
Before, char was assigned as a structure to **KEYWORD3**. It is not a structure so I assigned it to **LITERAL2** since it is a constant. 

Also renamed the DecrementCompound to its appropriate name.
2015-04-04 01:01:14 -04:00
9d2034a3c2 Update revisions.txt 2015-04-02 11:41:57 +02:00
e45dcba6c9 Update revisions.txt 2015-04-02 09:55:22 +02:00
1b139caef1 Theme: darker green 2015-04-01 16:18:18 +02:00
501333a8ef new theme 2015-04-01 16:11:59 +02:00
82b3269863 New splashscreen and about 2015-04-01 15:12:56 +02:00
a40415a7df Update revisions.txt 2015-04-01 09:53:35 +02:00
98f364ea38 Updated checksum for bundled packages (windows) 2015-03-30 19:55:14 +02:00
ea5155656a Starting 1.6.3
Updated toolchains: linux statically compiled, added gcc lto plugin (disabled)
2015-03-30 15:06:59 +02:00
5689fc7123 New splashscreen and about image 2015-03-30 14:59:07 +02:00