rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2024-12-12 23:08:52 +01:00
Code Issues Releases Activity
3,442 Commits 7 Branches 93 Tags 2.9 GiB
e2b15c852b
Commit Graph

432 Commits

Author SHA1 Message Date
dcuartielles
b2c17f9812 Added notification about the need of the IR-Remote library 2013-05-17 13:34:49 +02:00
dcuartielles
aa800e8b0e added a better configurarion string for the line following example 2013-05-17 13:25:27 +02:00
Cristian Maglie
82511def8e Merge remote-tracking branch 'arduino/TFT_display' 2013-05-17 12:47:27 +02:00
Fede85
ee6a833b7b added the TFT display library 2013-05-17 12:39:31 +02:00
dcuartielles
2b7753ffc7 fixed the classic fix vs stroke issue after migrating to the TFT library 2013-05-17 11:08:59 +02:00
dcuartielles
b91e6308bd fixed glitch with the screen when starting the process 2013-05-17 11:08:50 +02:00
dcuartielles
e5baff7372 fixed order in how the commands were executed 2013-05-17 11:07:44 +02:00
Cristian Maglie
bd11079cd0 Added Arduino Robot libraries 2013-05-15 10:47:17 +02:00
bjelojac
2aee42a12c Fix for #814, Memory Leak 
File isn't closed before being released, it leaks. This test has been verified and tested many times.
 2013-04-25 13:46:43 -05:00
Fede85
c111f66112 Corrected the return type of the digitalPotWrite in the SPI/DigitalPotControl example 
Fixes #1063
 2013-04-24 10:45:22 +02:00
Fede85
a138309ff6 WebServer example: Added comments 2013-04-17 11:37:31 +02:00
Fede85
fab4632b07 WifiWebServer example: Moved the autorefresh feature inside the http header 2013-04-17 11:33:28 +02:00
Fede85
ce3554261d Moved refresh client from html meta tag to http header 
Fixes #953
 2013-04-16 21:37:41 +02:00
Fede85
2e6023bc2a edited some ethernet ad wifi examples 2013-04-11 17:36:15 +02:00
Fede85
afc9ad2663 converted to HTTP/1.1 and the client point to the arduino ascii logo 2013-04-09 17:33:43 +02:00
Fede85
34334fca4f GSM library webClient example needs fix 
Fixes #1345
 2013-04-09 13:50:37 +02:00
Fede85
d003c538f4 small changes inside the GSM pachube examples 2013-04-05 19:13:27 +02:00
Cristian Maglie
f4232373fd Added Wifi NTP client example 2013-03-29 15:26:43 +01:00
Cristian Maglie
f88c9847ac Removed deprecated interrupt handlers 
Fixes #831 #881 #955 #1123 #1140
 2013-03-29 14:41:36 +01:00
Cristian Maglie
0e7a434fe8 Fixed Wifi example 2013-03-29 12:04:36 +01:00
Fede85
9e7dfb2a06 updated config() methods in WiFi library 2013-03-28 12:56:57 +01:00
Cristian Maglie
b92937b1fc Merge branch 'wifishield-bugfix' 2013-03-28 12:27:11 +01:00
Cristian Maglie
83dbd395f3 Merge remote-tracking branch 'mlafauci/wifishield-bugfix' into HEAD 2013-03-28 12:10:48 +01:00
Mimmo La Fauci
1231fb82e3 Fix WiFi interface for static IP 2013-03-26 22:25:55 +01:00
Mimmo La Fauci
792056d62b Fix issue with multiple clients on WebServer 2013-03-22 13:42:12 +01:00
Mimmo La Fauci
dc3102d2f4 Added API to set static IP and DNS server 2013-03-21 09:24:07 +01:00
Cristian Maglie
1b0bff6f2c Merge remote-tracking branch 'mlafauci/wifishield-bugfix' into HEAD 2013-03-20 11:35:55 +01:00
Mimmo La Fauci
85e0353588 Fixed issu con client.available to return the correct number of bytes 2013-03-16 12:33:50 +01:00
Fede85
353f828cb8 small change in the macro that assign the serial pin to the Uno 2013-03-11 12:47:50 +01:00
Cristian Maglie
f7b2e72308 Renamed GSM folder 2013-03-11 12:20:47 +01:00
Cristian Maglie
3ea0903fa8 Added GSM shield library (AVR) 2013-03-11 12:17:08 +01:00
Cristian Maglie
b699bdc663 Added example WifiUdpSendReceiveString 2013-03-11 00:24:01 +01:00
Cristian Maglie
15727e9a2d Merge remote-tracking branch 'arduino/master' into wifishield-bugfix 2013-03-10 23:22:48 +01:00
Mimmo La Fauci
8862a7d54e Fix bug on client.available() to retrun the number of bytes available 2013-03-10 22:37:54 +01:00
Mimmo La Fauci
863b47ad5e Added WiFi Udp Implementation 2013-02-08 19:22:23 +01:00
Fede85
1a0dcb2959 closes #954. Typo in WebServer sketches 2013-02-07 16:24:56 +01:00
Tom Igoe
d8e5997328 Added Esplora readJoystickButton function to be consistent with Esplora readButton 2012-12-23 23:05:29 -05:00
Tom Igoe
d7d78ff6a5 Updated title in comments of Esplora Sound Sensor example 2012-12-23 22:22:37 -05:00
Tom Igoe
fb87c81cb0 Added comments for EsploraPong 2012-12-23 22:10:07 -05:00
Tom Igoe
fbd488e07e Added header comments to EsploraPong 2012-12-23 21:49:09 -05:00
Tom Igoe
5a644dffe0 Minor change to EsploraRemote example 2012-12-23 21:33:39 -05:00
Tom Igoe
957d7d480f Revert "Small change to EsploraLightCalibrator example" 
This reverts commit 7e5ca6244b.
 2012-12-23 20:29:43 -05:00
Scott Fitzgerald
7289ac6149 Minor changes to EsploraTable example 2012-12-23 11:57:46 -07:00
Scott Fitzgerald
7e5ca6244b Small change to EsploraLightCalibrator example 
Chnaged LOW to HIGH
 2012-12-23 11:55:16 -07:00
Tom Igoe
fd1055cc5a Updated Esplora examples to match the latest of the Esplora repo 2012-12-23 11:55:59 -05:00
Federico Fissore
730f81e8ba fixes #832 2012-12-20 16:28:09 +01:00
Federico Fissore
9ef43accbc fixes #832 2012-12-20 16:26:46 +01:00
Scott Fitzgerald
f56b98210d Clarified some comments in the EsploraTable example 2012-12-13 10:15:33 -05:00
Richard Sim
cce70d269c * Fixed memory leak when calling Ethernet.begin() multiple times 
* Ensure the UDP socket is closed before trying to open it
 2012-12-12 12:50:21 +01:00
Cristian Maglie
1b7fd24480 Fixed server address on UdpNtpClient example. 
Fixes #1156
 2012-12-10 11:50:49 +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
2752b408b8 Fixed EsploraKart example......... 2012-12-07 18:49:05 +01:00
Cristian Maglie
948a5c89e4 Added support for Arduino Esplora 2012-12-07 18:11:07 +01:00
sebastienjean
9554c1d3cd Reverted begin(long speed) to its original prototype (i.e. 
returning void)
 2012-12-02 17:22:59 +01:00
sebastienjean
369aeeef51 600 Baud comm. support, unsupported baudrate notification 
- Added a 600 Baud line in DELAY_TABLE, for each CPU frequency.
(successfully tested for 16 MHz)

- begin(long speed) now returns a bool indicating if speed has been
found in DELAY_TABLE (if not, the method returns false immediately)
 2012-12-01 00:20:55 +01:00
Tom Igoe
336e578d02 Added SimpleWebServerWiFi 2012-11-25 21:28:55 -05:00
Cristian Maglie
39aae0be01 Moved WiFi library in the proper place 2012-10-22 09:17:24 +02:00
Cristian Maglie
aba27c43aa Merged upstream arduino branch 2012-10-18 15:50:09 +02:00
Scott
9a13d211ba Fixed typo in PachubeClientString example 2012-10-12 15:59:45 -04:00
Cristian Maglie
e0f967951f Fixed SD examples. (added include for SPI lib) 2012-09-25 18:29:19 +02:00
Cristian Maglie
11c0555dcc SD Card ported and tested 2012-09-24 19:00:56 +02:00
Cristian Maglie
1e221116f3 Moved SD lib into root libraries folder 2012-09-24 12:42:23 +02:00
David A. Mellis
3f5298d19f Merge branch 'master' of ../wifishield 2012-09-13 10:21:52 -04:00
David A. Mellis
ed511819a8 Moving back into libraries folder. 2012-09-13 10:20:48 -04:00
David A. Mellis
47714c3d2c Merge pull request #102 from sgk/leonardoTone 
Fix for tone() on Leonardo.
 2012-09-13 06:07:10 -07:00
Scott
72595f86c4 Modified pachube Ethernet Client String example and removed Cosm examples 2012-09-10 12:02:59 -04:00
Cristian Maglie
9b027224a0 LiquidCrystal library is already multiplatform compliant, moved into libraries folder 2012-09-03 16:13:28 +02:00
Shigeru KANEMOTO
f60f17f79a Avoid TIMER3 conflict with Servo and tone(). 2012-08-08 18:27:40 +09:00
David A. Mellis
34b265ed4c Fixing SD card SPI pin mapping for Leonardo. 
http://code.google.com/p/arduino/issues/detail?id=931
 2012-06-22 11:28:16 -05:00
Andrew Stone
4e8fffa767 just change a comment to make more sense 2012-06-05 21:10:09 -04:00
Andrew Stone
a41c1233ba fix SPI init issues as described http://code.google.com/p/arduino/issues/detail?id=888. Tested using qt1110 (mode 3) on a mega and WS5100 (webserver example sketch) chips on a etherten 2012-06-05 15:45:51 -04:00
Tom Igoe
a24999d5a5 Updated SoftwareSerial examples so that they work easier with Leonardo and Mega 2012-05-25 09:38:44 -04:00
Zach Eveland
32e365b480 Merge branch 'master' of github.com:arduino/Arduino into LUFA_bootloader 2012-05-15 15:40:23 -04:00
Tom Igoe
2e30d3891c spell check on PachubeClientString 2012-05-14 16:18:26 -04:00
Tom Igoe
08cb1983d7 Added Cosm Clients to replace Pachube Clients due to Pachube.com 
rebranding
 2012-05-14 16:16:42 -04:00
David A. Mellis
2313f6e427 Merge branch 'master' of github.com:arduino/Arduino 2012-05-08 20:40:54 -04:00
David A. Mellis
71e9ff63f8 Servo bug that would sometimes cause skipping. 
http://code.google.com/p/arduino/issues/detail?id=908
 2012-05-08 20:38:38 -04:00
David A. Mellis
2a48aa5cbc Merge pull request #70 from johannrichard/ethernet-close_wait 
EthernetClient: recycle sockets in CLOSE_WAIT status
 2012-05-06 15:08:39 -07:00
Zach Eveland
573d08c4fa Merge branch 'master' of github.com:arduino/Arduino into LUFA_bootloader 2012-04-20 10:10:46 -04:00
Tom Igoe
a69bd00c68 Update to WebClientRepeating comments 2012-04-19 15:03:23 -04:00
Tom Igoe
2baf577437 Added WebClientRepeating example 2012-04-19 15:02:21 -04:00
Federico Vanzati
44966b81f4 Removed Serial.begin() inside examples where not needed 2012-04-11 13:08:43 +02:00
Federico Vanzati
8e50ecbb6c updated URLs in LiquidCrystal examples 2012-04-11 12:56:31 +02:00
Tom Igoe
6f93d3fc17 Updated all comments for while (!Serial) additions to serial-based examples 2012-04-09 10:48:40 -04:00
Johann Richard
47c46c4f25 Fix for CLOSE_WAIT Bug 
Fir for an EthernetClient bug, as per the following thread http://forum.freetronics.com/viewtopic.php?t=176

Kudos to mr-russ for finding a fix.
 2012-04-05 22:13:49 +02:00
Tom Igoe
202bb102a0 Updated all serial in setup examples with a note about the serial check 2012-04-02 11:11:46 -04:00
Tom Igoe
a631e4f834 Added Serial port check to all examples using Serial statements in the setup 2012-04-02 09:07:58 -04:00
Zach Eveland
a0f1f1a930 Merge branch 'master' of github.com:arduino/Arduino into LUFA_bootloader 2012-03-24 09:30:17 -04:00
David A. Mellis
19f513b943 Updating comments in SoftwareSerial example. 2012-03-20 16:24:48 -04:00
Tom Igoe
87eaf2d0c5 Updated comments in softwareSerial example 2012-03-20 14:48:24 -04:00
Tom Igoe
da09e0c867 Updated Ethernet WebServer example to give more diagnostic info 2012-03-20 10:37:15 -04:00
Tom Igoe
c9ded42197 Updated PachubeClientString and PachubeClient examples for Ethernet 2012-03-16 10:48:18 -04:00
Zach Eveland
d169114205 Merge branch 'master' of github.com:arduino/Arduino into LUFA_bootloader 2012-03-14 15:40:29 -04:00
Tom Igoe
7f11df115d Updated ChatServer 2012-03-12 15:30:18 -04:00
Zach Eveland
8a35793794 Merge branch 'master' of github.com:arduino/Arduino into LUFA_bootloader 
Conflicts:
	.gitignore
 2012-03-03 13:28:39 -05:00
David A. Mellis
9f3438c189 Adding Ethernet.maintain() to update DHCP leases (Peter Magnusson) 
returns:
    0: nothing happened
    1: renew failed
    2: renew success
    3: rebind fail
    4: rebind success

http://code.google.com/p/arduino/issues/detail?id=716
 2012-03-02 18:51:48 -05:00
Tom Igoe
f415edfc3b upated PachubeClientString to fix interval bug 2012-03-02 17:21:12 -05:00
Tom Igoe
8ef8be6ccd Adjusted interval bug in TwitterClient 2012-03-02 17:20:09 -05:00
Tom Igoe
59f68ebd8c Updated pachubeClientStirng to fix posting interval bug 2012-03-02 17:17:15 -05:00
Tom Igoe
366a490973 Updated TwitterClient example to fix timing bug 2012-03-02 13:14:07 -05:00
Zach Eveland
d10b5da4f6 Merge branch 'master' of github.com:arduino/Arduino into LUFA_bootloader 2012-02-27 21:21:34 -05:00
Tom Igoe
9f755d159a Updated Ethernet PachubeClient and PachubeClientString examples to use Pachube API 2.0 2012-02-27 11:51:13 -05:00
Zach Eveland
65ddc6c43b Merge branch 'master' of github.com:arduino/Arduino into LUFA_bootloader 2012-02-22 15:19:32 -05:00
David A. Mellis
2f29f898de Adding ability to send repeated starts in Wire library. 
This adds an additional (boolean) parameter to both endTransmission() and requestFrom(), which specifies whether or not to send a stop condition after the corresponding transmission.  This defaults to true, as in the previous behavior of the library.

http://code.google.com/p/arduino/issues/detail?id=663
 2012-02-18 20:05:11 -05:00
David A. Mellis
561cd7054d Fixing (maybe) a bug involving multiple received UDP packets. 
http://code.google.com/p/arduino/issues/detail?id=669
 2012-02-14 16:41:22 -08:00
Zach Eveland
5eb7ad154b Merge branch 'master' of github.com:arduino/Arduino into LUFA_bootloader 2012-02-03 19:54:33 -05:00
David A. Mellis
3dfc2c6311 Serial.print() -> Serial.write() in SD SerialPrint_P function. 
http://code.google.com/p/arduino/issues/detail?id=759
 2012-02-03 17:32:54 -05:00
Zach Eveland
2622ad5580 Merge branch 'master' of github.com:arduino/Arduino into new-extension 2012-01-10 12:02:27 -05:00
Cristian Maglie
b7c54b79d7 Fine tuned libraries search. Reintroduced ./libraries folder for shipped 
platform independent libraries.
 2012-01-09 18:20:55 +01: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
David A. Mellis
cce4ef7c69 Fixing warnings (unsigned comparisons to 0). (maniacbug) 2012-01-02 12:57:23 -05:00
Zach Eveland
531c3bfe28 Merge branch 'master' of github.com:arduino/32U4 into new-extension 2011-12-18 12:40:56 -05:00
David A. Mellis
64c8b89b5f Fixing ethernet library on Leonardo (correcting SS pin for 32U4). 2011-12-15 15:33:47 -05:00
David A. Mellis
b8fbffeac4 Fixing DHCP hostname (peter). 
http://code.google.com/p/arduino/issues/detail?id=742
 2011-12-14 00:55:10 -05:00
David A. Mellis
7c90d9d8b5 Changing recv() to return signed int16 (in Ethernet socket.cpp). S. Wallace 
http://code.google.com/p/arduino/issues/detail?id=516
 2011-12-08 17:29:28 -05:00
David A. Mellis
597da2e45d Ethernet library fix for avr-gcc v4.5.1 (and maybe others). (SurferTim) 
This is a change in a few lines for combining two 8-bit values into a 16-bit one.  For some reason, the old way doesn't seem to work properly with certain gcc versions.

http://code.google.com/p/arduino/issues/detail?id=605
 2011-12-08 16:50:59 -05:00
David A. Mellis
6a6ed3d10a Adding overloads for other integer types in Wire.write(). (Paul Stoffregen) 
http://code.google.com/p/arduino/issues/detail?id=527
 2011-12-02 16:43:41 -05:00
Tom Igoe
9af71ad6e8 Moved Mouse and Keyboard examples for Leonardo into the core examples folder 2011-11-28 15:03:06 -05:00
Tom Igoe
8ccb3bdeb3 Moved Keyboard examples to an examples folder inside the Keyboard library folder 2011-11-23 14:35:18 -05:00
Zach Eveland
76ed870de8 Merge branch 'new-extension' of github.com:arduino/Arduino into diskloader_reboot 2011-10-31 21:42:09 -04:00
David A. Mellis
726acf77de Fixing SD ls function (Paul Stoffregen). 
http://code.google.com/p/arduino/issues/detail?id=700
 2011-10-29 17:31:04 -04:00
Zach Eveland
a6a59f1783 Revert "Merge branch 'master' of github.com:arduino/Arduino into diskloader_reboot" 
This reverts commit df9835efaf, reversing
changes made to ec45af8bfa.

Conflicts:

	hardware/arduino/variants/mega/pins_arduino.h
	libraries/Ethernet/examples/PachubeClientString/PachubeClientString.ino
 2011-10-27 11:45:13 -04:00
Zach Eveland
f2bd8a5394 Merge branch 'new-extension' of github.com:arduino/Arduino into diskloader_reboot 
Conflicts:
	hardware/arduino/variants/mega/pins_arduino.h
	libraries/Ethernet/examples/PachubeClient/PachubeClient.ino
	libraries/Ethernet/examples/PachubeClientString/PachubeClientString.ino
 2011-10-27 11:41:02 -04:00
Zach Eveland
df9835efaf Merge branch 'master' of github.com:arduino/Arduino into diskloader_reboot 
Conflicts:
	app/src/processing/app/Editor.java
	app/src/processing/app/Sketch.java
	build/shared/examples/4.Communication/SerialCallResponse/SerialCallResponse.pde
	build/shared/lib/theme/theme.txt
	hardware/arduino/cores/arduino/HardwareSerial.h
	hardware/arduino/cores/arduino/Print.cpp
	hardware/arduino/cores/arduino/WString.h
	hardware/arduino/variants/mega/pins_arduino.h
	libraries/Ethernet/examples/PachubeClient/PachubeClient.ino
	libraries/Ethernet/examples/PachubeClientString/PachubeClientString.ino
	libraries/Firmata/examples/EchoString/EchoString.ino
	libraries/SD/File.cpp
	libraries/SoftwareSerial/SoftwareSerial.cpp
	libraries/SoftwareSerial/SoftwareSerial.h
	libraries/SoftwareSerial/examples/SoftwareSerialExample/SoftwareSerialExample.ino
	libraries/SoftwareSerial/keywords.txt
 2011-10-27 09:32:27 -04:00
Tom Igoe
d16eeb0af3 Modified Pachube examples to use manual Ethernet config if DCHP fails. 2011-10-26 13:22:30 -04:00
David A. Mellis
e1dbe688e9 NewSoftSerial -> SoftwareSerial in keywords.txt. 
http://code.google.com/p/arduino/issues/detail?id=640
 2011-10-24 16:53:41 -04:00
Tom Igoe
dc21e1da8a Added examples for the Keyboard library of the Leonardo 2011-10-24 10:55:44 -04:00
David A. Mellis
f684321850 Fixing bug in LiquidCrystal::setCursor() for row == numrows. 
http://code.google.com/p/arduino/issues/detail?id=671
 2011-10-10 12:35:36 -04:00
David A. Mellis
9296f1db31 Fixing bug in Ethernet (recv() in socket.cpp). (Paul Stoffregen) 
http://code.google.com/p/arduino/issues/detail?id=670
 2011-10-10 11:49:50 -04:00
David A. Mellis
ca671fdc05 Fixing more warnings (Paul Stoffregen). 2011-10-10 11:28:44 -04:00
David A. Mellis
965480f148 Fixing warnings in Ethernet library (Paul Stoffregen). 
http://code.google.com/p/arduino/issues/detail?id=208
 2011-10-02 10:17:33 -04:00
Zach Eveland
ab8fc5aab7 Merge branch 'new-extension' of https://github.com/arduino/Arduino into new-extension 2011-09-16 10:27:11 -04:00
Tom Igoe
264724c451 Added joystick mouse control example in libraries/Mouse/examples 2011-09-15 19:37:20 -04:00
Tom Igoe
e42691d0f4 Deleted Software Serial TwoPortRXExample because it was a duplicate of TwoPortReceive example 2011-09-14 18:26:04 -04:00
David A. Mellis
b722028c7b Updating to Firmata r82 (e.g. including I2C in StandardFirmata). 
http://code.google.com/p/arduino/issues/detail?id=633
 2011-09-09 17:11:42 -04:00
David A. Mellis
5ba38fa9bd Applying adafruit SD updates (available() overful fix). 
http://code.google.com/p/arduino/issues/detail?id=595
 2011-09-09 16:57:00 -04:00
David A. Mellis
71289521bf Use SDA and SCL constants, not hardcoded registers for TWI pullups. 
http://code.google.com/p/arduino/issues/detail?id=601
 2011-09-08 16:50:07 -04:00
David A. Mellis
7d8d20894c Making Print::write(char *) non-virtual. 
http://code.google.com/p/arduino/issues/detail?id=607
 2011-09-07 18:41:05 -04:00
David A. Mellis
0c92f230b5 Fixing SD library compilation error (writeError() -> getWriteError()). 2011-09-04 20:18:27 -04:00
David A. Mellis
108df37445 Updating Firmata to r71. 
Note that I also changed the extensions of the examples (firmwares) from .pde to .ino and removed the Makefiles (since they assume the pde extension).

http://code.google.com/p/arduino/issues/detail?id=447
 2011-09-02 14:43:44 -04:00
David A. Mellis
94c371bed2 Moving tests into their own repository: https://github.com/arduino/Tests 2011-09-02 10:00:21 -04:00
David A. Mellis
25770f69a8 Adding missing file from ATS_String_Addition test. 2011-09-01 11:28:37 -04:00
David A. Mellis
33146ca75a Merge remote-tracking branch 'ricklon/atsupdatefor0100' into new-extension 2011-09-01 11:20:00 -04:00
David A. Mellis
da5ccf4eaf Merge remote-tracking branch 'amcewen/wifly_integration' into new-extension 2011-08-31 14:25:04 -04:00
amcewen
a6093a8d91 Created an abstract base class UDP to match the Client and Server classes, and reworked the Ethernet library to use it and derive EthernetUDP. 2011-08-30 21:27:31 +01:00
Tom Igoe
35777612c0 Changed all .pde examples to .ino 
All examples in /build/shared/examples/ and /libraries/ have had their
extensions changed to .ino
 2011-08-30 15:33:32 -04:00
Ricklon
c49ba1831b ArduinoTestSuite updates from Paul Stoffregen 2011-08-29 17:12:08 -07:00
amcewen
ad5dead85a Changed names of the Ethernet classes: Client -> EthernetClient, NetClient -> Client, and basic testing performed 2011-08-29 22:36:28 +01:00
amcewen
b7533c1839 Final changes to integrate latest core updates to WiFly branch 2011-08-28 22:26:07 +01:00
amcewen
e1748e79d7 Merge branch 'master' into wifly_integration 2011-08-28 20:28:53 +01:00