Commit Graph

377 Commits

Author SHA1 Message Date
Cristian Maglie d4fe0a13b6 Merge branch 'ide-1.5.x' into dev-ide-1.5.x-discovery
Conflicts:
	build/shared/revisions.txt
2013-09-10 12:10:57 +02:00
Cristian Maglie 421fa18c3c Updated revision log, and upped version to 1.5.4 2013-09-09 19:47:25 +02:00
Cristian Maglie 33a177260e Revert to English locale if the system default is not available
See #1525
2013-09-09 19:47:25 +02:00
Cristian Maglie cd7196c592 Fixed HardwareSerial bug introduced in 1.5.3.
Fixes #1568
2013-09-09 13:09:27 +02:00
Cristian Maglie 7dd9f81f39 Updated revision log, and upped version to 1.5.4 2013-09-06 18:39:42 +02:00
Cristian Maglie 64ea65cf54 Revert to English locale if the system default is not available
See #1525
2013-09-06 16:02:42 +02:00
Federico Fissore effb59da4b Merge remote-tracking branch 'arduino/ide-1.5.x' into dev-ide-1.5.x-discovery 2013-09-06 12:59:24 +02:00
Cristian Maglie 4cdd4dfcba Updated incorrect revision log. 2013-09-04 12:42:46 +02:00
Cristian Maglie 2ebd47ab53 [sam] fixed SPI initialization
Fixes #1561
2013-09-03 14:50:54 +02:00
Cristian Maglie 9cd8541df9 Updated revision log 2013-08-30 17:54:28 +02:00
Cristian Maglie 690eac4047 Moved arm-gcc upgrade to specific development branch 2013-08-30 10:58:16 +02:00
Cristian Maglie ea8c14421a Merge branch 'ide-1.5.x' into dev-ide-1.5.x-discovery
Conflicts:
	app/src/processing/app/Preferences.java
	app/src/processing/app/debug/Uploader.java
2013-08-23 15:59:24 +02:00
Cristian Maglie 56316ea581 Updated Firmata to version 2.3.6
Merge branch 'soundanalogous-firmata-2-3-6' into ide-1.5.x
2013-08-23 13:41:08 +02:00
Cristian Maglie c2b55eb7a1 Scrollable menus can now be scrolled with the mouse wheel 2013-08-21 02:48:23 +02:00
Cristian Maglie 2e80136cab Import library menu is now scrollable.
Fixes #1543
2013-08-21 02:19:57 +02:00
Cristian Maglie 00210189fe Removed unused flags from String (free 1 byte of SRAM) 2013-08-20 15:15:47 +02:00
Cristian Maglie e4e2a47e68 Merge branch 'ide-1.5.x-library-to-new-format' into ide-1.5.x 2013-08-08 16:43:19 +02:00
Cristian Maglie 32a5a300b9 Merge branch 'update-arm-gcc' into ide-1.5.x 2013-08-08 15:00:14 +02:00
Cristian Maglie 0479d49741 Updated revision log 2013-08-01 11:57:14 +02:00
Cristian Maglie ea804023ef Updated ARM gcc to 4.7.4. Added native 64 bit version for linux (no more ia32-libs needed).
Fixes #1474
2013-07-28 14:14:04 +02:00
Cristian Maglie 008818868c Merge branch 'ide-1.5.x' into dev-ide-1.5.x-discovery
Conflicts:
	app/src/cc/arduino/packages/uploaders/SerialUploader.java
	app/src/processing/app/Editor.java
	app/src/processing/app/Sketch.java
	app/src/processing/app/debug/Uploader.java
2013-07-14 12:01:03 +02:00
Cristian Maglie 65c36f2eb6 Merge branch 'master' into ide-1.5.x 2013-07-14 11:51:50 +02:00
Cristian Maglie f604881d40 assembly compile recipe is missing (C. A. Church)
Fixes #1457
2013-07-12 21:09:45 +02:00
Fede85 8f39da6664 added some String methods syntax highlighting 2013-07-03 09:03:17 +02:00
Fede85 92ad5f039c added some String methods syntax highlighting 2013-07-01 18:47:13 +02:00
Federico Fissore d469dc9d90 Merge remote-tracking branch 'arduino/ide-1.5.x' into ide-1.5.x-discovery 2013-06-25 16:13:56 +02:00
Cristian Maglie d101bf51a2 [sam] 2 bugfix to SPI library.
- begin() after end() now works.
- unconnected SPI pin is selected as CS when old (non extended) API is used.
2013-06-21 19:58:08 +02:00
Nick ad500ae24d Update incorrect docs in tonePitchFollower example
The comments state that the speaker should be on pin 8, but the code references pin 9. Updated the comments to reflect the correct pin.
2013-06-11 14:47:15 +02:00
Cristian Maglie 3e4419d6be Merge branch 'ide-1.5.x' into ide-1.5.x-discovery 2013-06-07 00:38:42 +02:00
Cristian Maglie 81d41fc761 Updated revision log 2013-06-06 20:07:02 +02:00
Cristian Maglie 1130fede3a Added support for Flash string on String class. 2013-06-06 16:33:20 +02:00
Cristian Maglie 22a84c69d3 Merge branch 'merge-1.0.5' into ide-1.5.x-discovery 2013-06-01 23:16:02 +02:00
Cristian Maglie 3394f61276 Merged 1.0.5 2013-05-29 18:30:36 +02:00
Fede85 5481bacba2 Fixes #1432 2013-05-23 16:24:38 +02:00
Cristian Maglie 82511def8e Merge remote-tracking branch 'arduino/TFT_display' 2013-05-17 12:47:27 +02:00
Cristian Maglie 53fdcb53e9 Updated revision log 2013-05-15 11:34:05 +02:00
Cristian Maglie bd11079cd0 Added Arduino Robot libraries 2013-05-15 10:47:17 +02:00
Federico Fissore 2d6af8264b Merge remote-tracking branch 'arduino/ide-1.5.x' into ide-1.5.x-discovery 2013-05-13 16:58:10 +02:00
Cristian Maglie a46259a0cf Merged 1.0.5
Still missing:
- updates to WiFi lib for sam.
- updates to examples of Ehternet and WiFi for sam.

Merge remote-tracking branch 'arduino/master' into ide-1.5.x

Conflicts:
	app/src/processing/app/Base.java
	app/src/processing/app/Editor.java
	app/src/processing/app/helpers/FileUtils.java
	app/src/processing/app/i18n/Resources_fr.po
	app/src/processing/app/i18n/Resources_fr.properties
	build/shared/revisions.txt
	hardware/arduino/avr/libraries/Ethernet/examples/DnsWebClient/DnsWebClient.ino
	hardware/arduino/avr/libraries/WiFi/examples/WifiChatServer/WifiChatServer.ino
	hardware/arduino/avr/libraries/WiFi/examples/WifiPachubeClient/WifiPachubeClient.ino
	hardware/arduino/avr/libraries/WiFi/examples/WifiPachubeClientString/WifiPachubeClientString.ino
	hardware/arduino/avr/libraries/WiFi/examples/WifiTwitterClient/WifiTwitterClient.ino
	hardware/arduino/avr/libraries/WiFi/examples/WifiUdpSendReceiveString/WifiUdpSendReceiveString.ino
	hardware/arduino/avr/libraries/WiFi/examples/WifiWebClient/WifiWebClient.ino
	hardware/arduino/avr/libraries/WiFi/examples/WifiWebClientRepeating/WifiWebClientRepeating.ino
	hardware/arduino/avr/libraries/WiFi/examples/WifiWebServer/WifiWebServer.ino
	libraries/WiFi/examples/WiFiChatServer/WiFiChatServer.ino
	libraries/WiFi/examples/WiFiPachubeClient/WiFiPachubeClient.ino
	libraries/WiFi/examples/WiFiPachubeClientString/WiFiPachubeClientString.ino
	libraries/WiFi/examples/WiFiTwitterClient/WiFiTwitterClient.ino
	libraries/WiFi/examples/WiFiUdpSendReceiveString/WiFiUdpSendReceiveString.ino
	libraries/WiFi/examples/WiFiWebClient/WiFiWebClient.ino
	libraries/WiFi/examples/WiFiWebClientRepeating/WiFiWebClientRepeating.ino
	libraries/WiFi/examples/WiFiWebServer/WiFiWebServer.ino
	libraries/WiFi/examples/WifiChatServer/WifiChatServer.ino
	libraries/WiFi/examples/WifiPachubeClient/WifiPachubeClient.ino
	libraries/WiFi/examples/WifiPachubeClientString/WifiPachubeClientString.ino
	libraries/WiFi/examples/WifiTwitterClient/WifiTwitterClient.ino
	libraries/WiFi/examples/WifiUdpSendReceiveString/WifiUdpSendReceiveString.ino
	libraries/WiFi/examples/WifiWebClient/WifiWebClient.ino
	libraries/WiFi/examples/WifiWebClientRepeating/WifiWebClientRepeating.ino
	libraries/WiFi/examples/WifiWebServer/WifiWebServer.ino
2013-05-11 14:37:25 +02:00
Cristian Maglie 296bdacfb9 Updated revision log 2013-05-11 13:25:37 +02:00
Cristian Maglie 1cdf75d4df "Add library" moved into "Import library" menu 2013-05-11 13:25:36 +02:00
Cristian Maglie d66e094a3b Revert ""Add library" moved into "Import library" menu"
This reverts commit 1866050e07.
2013-05-11 13:25:36 +02:00
Fede85 595d7fe1a3 added colored keywords readString and readStringUntil 2013-05-09 18:39:03 +02:00
Federico Fissore dc71ab77bf nicer password popup 2013-05-06 12:31:03 +02:00
Federico Fissore 79952e9691 linux, macosx, windows build scripts and confs
temporary lock image
2013-05-06 12:31:03 +02:00
Cristian Maglie 5b8ac97a42 Updated revision log 2013-05-03 13:49:06 +02:00
Cristian Maglie 33a7279a7d Merge branch 'penguin359-ide-1.5.x-ram' into ide-1.5.x
Fixes #1377
Fixes #1356
2013-05-03 13:25:59 +02:00
Loren M. Lang 090f721606 Clarified error messages and added a configurable warning level
Changed memory usage check to only fail build on 100%+ usage and added a
configurable warning level for memory usage defaulting to 75%.

Clarified error and warning messages related to memory usage to specify
that this is the minimum memory usage.
2013-05-02 13:10:02 -07:00
Zachary Eveland 2c5a86e336 Merge branch 'master' of github.com:arduino/Arduino into LUFA_bootloader 2013-05-01 10:49:05 -04:00
Fede85 0db906f175 changed the pin where to connect the button from 2 to 4 to be compliant with the comment in the header and the tutorial.
Fixes #1396
2013-04-30 17:55:34 +02:00