1
0
mirror of https://github.com/esp8266/Arduino.git synced 2025-06-17 22:23:10 +03:00
Commit Graph

552 Commits

Author SHA1 Message Date
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
65c36f2eb6 Merge branch 'master' into ide-1.5.x 2013-07-14 11:51:50 +02:00
f604881d40 assembly compile recipe is missing (C. A. Church)
Fixes #1457
2013-07-12 21:09:45 +02:00
7d3fee937e Windows: added Yun entries into .inf file 2013-07-08 15:58:41 +02:00
8f39da6664 added some String methods syntax highlighting 2013-07-03 09:03:17 +02:00
92ad5f039c added some String methods syntax highlighting 2013-07-01 18:47:13 +02:00
d469dc9d90 Merge remote-tracking branch 'arduino/ide-1.5.x' into ide-1.5.x-discovery 2013-06-25 16:13:56 +02:00
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
d5374ca1c9 Merge branch 'ide-1.5.x' into dev-ide-1.5.x-discovery 2013-06-21 18:13:19 +02:00
8b0b0a7d68 new librxtxSerial64 compiled on debian with glibc 2.13 2013-06-21 18:12:41 +02:00
21203cbe1b introducing jsch. now network monitor uses SSH to trigger a telnet session at yun side 2013-06-11 15:02:10 +02:00
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
3e4419d6be Merge branch 'ide-1.5.x' into ide-1.5.x-discovery 2013-06-07 00:38:42 +02:00
81d41fc761 Updated revision log 2013-06-06 20:07:02 +02:00
1130fede3a Added support for Flash string on String class. 2013-06-06 16:33:20 +02:00
22a84c69d3 Merge branch 'merge-1.0.5' into ide-1.5.x-discovery 2013-06-01 23:16:02 +02:00
3394f61276 Merged 1.0.5 2013-05-29 18:30:36 +02:00
5481bacba2 Fixes #1432 2013-05-23 16:24:38 +02:00
82511def8e Merge remote-tracking branch 'arduino/TFT_display' 2013-05-17 12:47:27 +02:00
53fdcb53e9 Updated revision log 2013-05-15 11:34:05 +02:00
bd11079cd0 Added Arduino Robot libraries 2013-05-15 10:47:17 +02:00
7e3aef91bc Updated drivers for robot 2013-05-14 18:43:51 +02:00
2d6af8264b Merge remote-tracking branch 'arduino/ide-1.5.x' into ide-1.5.x-discovery 2013-05-13 16:58:10 +02:00
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
296bdacfb9 Updated revision log 2013-05-11 13:25:37 +02:00
1cdf75d4df "Add library" moved into "Import library" menu 2013-05-11 13:25:36 +02:00
d66e094a3b Revert ""Add library" moved into "Import library" menu"
This reverts commit 1866050e07.
2013-05-11 13:25:36 +02:00
595d7fe1a3 added colored keywords readString and readStringUntil 2013-05-09 18:39:03 +02:00
dc71ab77bf nicer password popup 2013-05-06 12:31:03 +02:00
79952e9691 linux, macosx, windows build scripts and confs
temporary lock image
2013-05-06 12:31:03 +02:00
1445529d1c working on #223: Auto-detection of serial ports. Windows version ready 2013-05-06 12:31:01 +02:00
0d47f22787 working on #223: Auto-detection of serial ports. Mac version ready even if a bit slow 2013-05-06 12:31:01 +02:00
776952762f working on #223: Auto-detection of serial ports. Linux version ready 2013-05-06 12:31:01 +02:00
5b8ac97a42 Updated revision log 2013-05-03 13:49:06 +02:00
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
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
33c086d068 updated driver description string to "Arduino USB Driver". includes new .cat 2013-05-01 10:49:50 -04:00
2c5a86e336 Merge branch 'master' of github.com:arduino/Arduino into LUFA_bootloader 2013-05-01 10:49:05 -04:00
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
c87ddd567d small changes to the Debounce example 2013-04-16 16:50:23 +02:00
97e0f34572 Merge pull request #1192 from miek/debounce-fix
Fix Debounce example to work as described
2013-04-16 01:22:31 -07:00
c46e178c2e added driver install utility (dpinst 32- and 64-bit) and Arduino icon needed for Windows installer 2013-04-12 15:15:21 -04:00
1866050e07 "Add library" moved into "Import library" menu
Conflicts:
	app/src/processing/app/Base.java
	app/src/processing/app/Editor.java
2013-04-07 20:39:21 +02:00
cadc4b00c2 Reverted librxtx library 2013-04-03 14:16:23 +02:00
87da5af463 Merge remote-tracking branch 'arduino/ide-1.5.x' into ide-1.5.x 2013-04-03 14:10:54 +02:00
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
d6ba36b0a5 Reverted RXTX 2.1 native lib for mac 2013-03-30 18:26:46 +01:00
c3b581b470 Upped version to 1.0.5 2013-03-29 16:14:10 +01:00
f88c9847ac Removed deprecated interrupt handlers
Fixes #831 #881 #955 #1123 #1140
2013-03-29 14:41:36 +01:00
d76468069b Updated revision log 2013-03-28 12:29:15 +01:00