Commit Graph

56 Commits

Author SHA1 Message Date
Cristian Maglie 77678f3af1 Merge branch 'master' into ide-1.5.x 2013-07-14 11:51:50 +02:00
Cristian Maglie d90fcca583 Merged 1.0.5 2013-05-29 18:30:36 +02:00
Cristian Maglie 7207108255 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 ee90e68e86 Merged 1.0.5
Merge remote-tracking branch 'arduino/master' into ide-1.5.x

Conflicts:
	app/src/processing/app/Base.java
	build/shared/revisions.txt
	hardware/arduino/avr/cores/arduino/malloc.c
	hardware/arduino/cores/arduino/avr-libc/malloc.c
	hardware/arduino/cores/arduino/malloc.c
	todo.txt
2013-04-03 13:51:04 +02:00
Federico Fissore c6287dd6ac closes #954: wrong header name in WebServer example sketches 2013-01-10 16:30:07 +01:00
Federico Fissore 37604e695d wrong comment in Firmata.cpp. closes #786 #785 2013-01-10 14:53:20 +01:00
Cristian Maglie c01bc2b62f Merged upcoming 1.0.4 and updated revision log 2013-01-06 18:38:03 +01:00
Cristian Maglie 5f4e55a3d2 Merged 1.0.4 pre-release into 1.5 2012-12-17 16:53:45 +01:00
Cristian Maglie 433090f18b Merged 1.0.3 2012-12-10 15:55:05 +01:00
Federico Fissore c453e0a32e fixed permissions on a lot of text files. see #1116 2012-12-10 10:42:49 +01:00
Cristian Maglie e03133b1b4 Moved WiFi library in the proper place 2012-10-22 09:17:24 +02:00
Cristian Maglie 46d658fac8 Merge remote-tracking branch 'origin/master' into merge-1.0.1 2012-10-18 20:31:51 +02:00
Fede85 12df9f2c83 review of typos a and small errors in some examples 2012-10-18 19:03:25 +02:00
Cristian Maglie 6a45ba48ab Merged upstream arduino branch 2012-10-18 15:50:09 +02:00
Cristian Maglie 5f8b79d4e2 Moved SD lib into root libraries folder 2012-09-24 12:42:23 +02:00
Cristian Maglie f201dab33e LiquidCrystal library is already multiplatform compliant, moved into libraries folder 2012-09-03 16:13:28 +02:00
Cristian Maglie 79521e1a15 Merged upstream Arduino master branch 2012-06-26 00:51:35 +02:00
Cristian Maglie 386e059e7e Added Ethernet for ARM. Updated examples. 2012-06-08 22:37:10 +02:00
Cristian Maglie a3dbb49c07 Merge of arduino-1.0.1. Work in progress... 2012-05-23 09:22:52 +02:00
Cristian Maglie 3786e337e0 Pre-merge upstream Arduino 2012-05-22 11:23:47 +02:00
Cristian Maglie 8c2b5b979a Moved libraries folder inside platform folder. Now libraries and examples are searched per board/platform 2012-01-04 15:14:51 +01:00
David A. Mellis 6005c59ad0 Moving libraries out of arduino platform / core directory and to top-level. 2009-11-07 17:54:56 +00:00
Tom Igoe 79b7ecdd92 Checked and updated all LiquidCrystal examples 2009-08-05 14:41:27 +00:00
Tom Igoe 6f28053a8e Checked and updated all LiquidCrystal examples 2009-08-05 14:41:24 +00:00
Tom Igoe d241a63685 Checked and updated all LiquidCrystal examples 2009-08-05 14:41:23 +00:00
Tom Igoe b521782b52 Checked and updated all LiquidCrystal examples 2009-08-05 14:41:17 +00:00
Tom Igoe e947327158 Checked and updated all LiquidCrystal examples 2009-08-05 14:41:14 +00:00
Tom Igoe 16eaf9a9fb Checked and updated all LiquidCrystal examples 2009-08-05 14:41:11 +00:00
Tom Igoe d48347ec1d Checked and updated all LiquidCrystal examples 2009-08-05 14:41:08 +00:00
Tom Igoe b63e74ecbe Checked and updated all LiquidCrystal examples 2009-08-05 14:41:03 +00:00
Tom Igoe fd3bcef9d5 Checked and updated all LiquidCrystal examples 2009-08-05 14:40:55 +00:00
Tom Igoe 739714e28c Changed begin() in LiquidCrystal examples 2009-08-02 18:45:13 +00:00
Tom Igoe 0675c7a005 Changed begin() in LiquidCrystal examples 2009-08-02 18:45:08 +00:00
Tom Igoe e66eb79a26 Changed begin() in LiquidCrystal examples 2009-08-02 18:45:04 +00:00
Tom Igoe a0f72ba82c Changed begin() in LiquidCrystal examples 2009-08-02 18:44:59 +00:00
Tom Igoe 4a6c915296 Changed begin() in LiquidCrystal examples 2009-08-02 18:44:54 +00:00
Tom Igoe 7544b57ea8 Changed begin() in LiquidCrystal examples 2009-08-02 18:44:52 +00:00
Tom Igoe bf81836591 Changed begin() in LiquidCrystal examples 2009-08-02 18:44:30 +00:00
Tom Igoe 37a1c71351 Changed begin() in LiquidCrystal examples 2009-08-02 18:41:40 +00:00
David A. Mellis 8032397b18 Updating to rev. 27 of Firmata. 2009-07-30 20:48:59 +00:00
David A. Mellis 65e95030c6 Updating keywords.txt for LiquidCrystal library. 2009-07-25 18:56:46 +00:00
David A. Mellis 79c0ffdcdb Renaming LiquidCrystal example .pde files to correspond to new function names. 2009-07-25 18:29:53 +00:00
David A. Mellis 5101d36d84 Renaming LiquidCrystal example directories to correspond to new function names. 2009-07-25 18:28:35 +00:00
David A. Mellis 58b4e52f7f Updating LiquidCrystal API and examples. 2009-07-25 18:26:29 +00:00
David A. Mellis f504460fc4 Fixing Servo library on the ATmega8 by changing assignments to TIMSK and TIFR into bitwise-or's. Otherwise, this broke millis() by disabling the timer 0 overflow interrupt. 2009-07-21 06:05:02 +00:00
David A. Mellis d841661dc5 Updating to revision 25 of firmata (slightly post version 2.1beta2). 2009-07-21 05:18:50 +00:00
David A. Mellis 3f5220e454 Updating to Firmata-2.1beta1 (rev 23). 2009-07-14 21:32:55 +00:00
David A. Mellis f30af5e288 Adding Tom's examples for the new LiquidCrystal library. 2009-07-13 02:33:02 +00:00
David A. Mellis b63012069f Removing old LiquidCrystal examples. 2009-07-13 02:31:46 +00:00
David A. Mellis 86db64db9b Adding keywords.txt file for the Ethernet library. 2009-07-12 00:33:25 +00:00