Commit Graph

294 Commits

Author SHA1 Message Date
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 2e05fbe7c8 Updated XivelyClient example 2013-05-31 13:27:01 +02:00
Cristian Maglie 689b25ce31 Console and Process classes are automatically included with Bridge 2013-05-31 13:25:25 +02:00
tigoe 765a975414 Updated YunSerialTerminal 2013-05-30 23:14:16 -04:00
tigoe 04d19946f4 Updated TimeCheck example 2013-05-30 23:13:34 -04:00
tigoe bcacf68108 Merge branch 'ide-1.5.x-discovery' of https://github.com/arduino/DogStick into ide-1.5.x-discovery
Conflicts:

hardware/arduino/avr/libraries/Bridge/examples/YunSerialTerminal/YunSeri
alTerminal.ino
2013-05-30 23:11:13 -04:00
tigoe a49a2e3c2e Ignore passwords.h for xively client 2013-05-30 23:10:48 -04:00
tigoe 3fa7c137ef Updated YunSerialTerminal 2013-05-30 23:10:14 -04:00
tigoe 9bdc89699a Updated XivelyClient. Still not working 2013-05-30 23:09:57 -04:00
Cristian Maglie 113e28d861 Yùn console now runs at 57600 baud 2013-05-30 17:28:43 +02:00
Cristian Maglie 3394f61276 Merged 1.0.5 2013-05-29 18:30:36 +02:00
Tom Igoe a181cf715a Updates to Xively client 2013-05-27 13:12:05 -04:00
Tom Igoe 5cb25503d7 Added passwords.h for Xively client 2013-05-27 12:55:58 -04:00
Tom Igoe 520285871c Added Xively client: currently not working, not sure why 2013-05-27 12:55:09 -04:00
Tom Igoe 97068d3de5 Added TimeCheck example to demonstrate re-use of Process 2013-05-27 12:54:44 -04:00
Tom Igoe 0c226b8229 Added possible boot watcher 2013-05-26 08:28:56 -04:00
Tom Igoe e304d06059 Added Massimo's Serial command line example 2013-05-26 08:28:45 -04:00
Tom Igoe c212c9de9d Added WiFiCheck example to Bridge Library 2013-05-22 14:09:39 -04:00
Cristian Maglie 6e94316bbb Updated Console class. New ConsoleAsciiTable example. 2013-05-22 19:17:58 +02:00
Federico Fissore e2dd85d508 added responses to Bridge.ino 2013-05-16 16:43:47 +02:00
Cristian Maglie ef9070e85c Fixed Process example 2013-05-16 10:28:00 +02:00
Cristian Maglie 05b0fc5f0b Update Bridge library 2013-05-15 18:06:25 +02:00
Federico Fissore b97fdb451f Etheris bootloader
updated python bridge path
2013-05-14 16:51:42 +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
Federico Fissore 27b88aa523 Bridge lib moved bridge branch embedded into ide discovery branch 2013-05-09 11:15:36 +02:00
Cristian Maglie 62b723357c 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 c596edd083 closes #954: wrong header name in WebServer example sketches 2013-01-10 16:30:07 +01:00
Federico Fissore 110148877f wrong comment in Firmata.cpp. closes #786 #785 2013-01-10 14:53:20 +01:00
Cristian Maglie 1da3752860 Merged upcoming 1.0.4 and updated revision log 2013-01-06 18:38:03 +01:00
Cristian Maglie 38c05d2742 Merged 1.0.4 pre-release into 1.5 2012-12-17 16:53:45 +01:00
Cristian Maglie 66ee23b885 Merged 1.0.3 2012-12-10 15:55:05 +01:00
Federico Fissore d458ef7806 fixed permissions on a lot of text files. see #1116 2012-12-10 10:42:49 +01:00
Cristian Maglie 39aae0be01 Moved WiFi library in the proper place 2012-10-22 09:17:24 +02:00
Cristian Maglie 05a2d77f15 Merge remote-tracking branch 'origin/master' into merge-1.0.1 2012-10-18 20:31:51 +02:00
Fede85 a21c4e153f review of typos a and small errors in some examples 2012-10-18 19:03:25 +02:00
Cristian Maglie aba27c43aa Merged upstream arduino branch 2012-10-18 15:50:09 +02:00
Cristian Maglie 1e221116f3 Moved SD lib into root libraries folder 2012-09-24 12:42:23 +02:00
Cristian Maglie 9b027224a0 LiquidCrystal library is already multiplatform compliant, moved into libraries folder 2012-09-03 16:13:28 +02:00
Cristian Maglie 46aeeb4b29 Merged upstream Arduino master branch 2012-06-26 00:51:35 +02:00
Cristian Maglie b2ded1f1a5 Added Ethernet for ARM. Updated examples. 2012-06-08 22:37:10 +02:00
Cristian Maglie 33083d84b3 Merge of arduino-1.0.1. Work in progress... 2012-05-23 09:22:52 +02:00
Cristian Maglie b276a75d13 Pre-merge upstream Arduino 2012-05-22 11:23:47 +02:00
Cristian Maglie 57b8713cab Moved libraries folder inside platform folder. Now libraries and examples are searched per board/platform 2012-01-04 15:14:51 +01:00