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
ba7fb5518f
Fixed buffer overflow on String class (Paul Stoffregen)
2013-06-06 20:04:43 +02:00
Cristian Maglie
f80c6c5f35
Merged various bugfix / improvements to String class.
...
Merge branch 'master' into ide-1.5.x
2013-06-06 19:54:58 +02:00
Cristian Maglie
1130fede3a
Added support for Flash string on String class.
2013-06-06 16:33:20 +02:00
Cristian Maglie
b341a7c751
String class: removed deep copy on substring method.
...
Small code cleanup.
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
Federico Fissore
7e130a0c8b
Etheris references renamed Yun without accent to avoid encoding issues
2013-05-23 09:53:56 +02:00
Federico Fissore
a7e85f818a
right etheris values
2013-05-16 15:37:42 +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
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
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
David A. Mellis
a1582fe973
Moving TXCO definition into HardwareSerial.cpp from HardwareSerial.h.
...
Otherwise, you get an error when compiling for processors with no serial port because the header file is always compiled.
See, for an example of the problem: https://github.com/damellis/attiny/issues/8
2012-12-08 10:44:48 -05:00
Cristian Maglie
23c7536dc7
Merged 1.0.2
...
Merge remote-tracking branch 'arduino/master' into ide-1.5.x
Conflicts:
app/src/processing/app/debug/AvrdudeUploader.java
build/shared/examples/09.USB/Keyboard/KeyboardLogout/KeyboardLogout.ino
build/shared/examples/09.USB/Keyboard/KeyboardReprogram/KeyboardReprogram.ino
build/shared/examples/09.USB/Keyboard/KeyboardSerial/KeyboardSerial.ino
build/shared/examples/09.USB/Mouse/ButtonMouseControl/ButtonMouseControl.ino
build/shared/examples/09.USB/Mouse/JoystickMouseControl/JoystickMouseControl.ino
hardware/arduino/boards.txt
2012-11-04 22:49:14 +01:00
Cristian Maglie
7b946264d5
Added general yield()-hook for cooperative scheduling development (part 2)
2012-11-02 18:12:21 +01:00
Cristian Maglie
107c1929bd
Added general yield()-hook for cooperative scheduling development
2012-10-31 01:37:37 +01:00
Cristian Maglie
289b836046
Merged latest changes in AVR arduino core
2012-10-18 18:47:50 +02:00
Cristian Maglie
aba27c43aa
Merged upstream arduino branch
2012-10-18 15:50:09 +02:00
Cristian Maglie
46aeeb4b29
Merged upstream Arduino master branch
2012-06-26 00:51:35 +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
Thibaut VIARD
f83cd2f3e7
[sam] prelimanary work on USB Device stack
2012-03-29 21:11:05 +02:00
Cristian Maglie
5ad4422fc7
Merge remote-tracking branch 'arduino/master' into platforms-b
2011-12-31 17:29:36 +01:00
Cristian Maglie
1b3ae5fa63
Created second level in hardware folder: hardware/PACKAGE/PLATFORM/...
...
Made some helper class for files filtering.
platforms.txt now contains only one platform at a time.
Some cleanup in Compiler and AvrDudeUploader classes.
2011-12-30 15:46:04 +01:00
