Skip to content

Commit 9586960

Browse files
author
Federico Fissore
committed
Merge branch 'ide-1.5.x' into ide-1.5.x-jssc
2 parents ea8a4ec + a0f1d16 commit 9586960

File tree

2 files changed

+24
-6
lines changed

2 files changed

+24
-6
lines changed

build/shared/revisions.txt

+23-5
Original file line numberDiff line numberDiff line change
@@ -9,30 +9,48 @@ We suggest to delay the adoption of the new format until a stable 1.5.x is relea
99
* Added missing keywords: YunServer, YunClient, pow
1010
* Improved folder ignore: now hidden, starting with a dot, and SCCS folders are ignored
1111
* Improved auto format: now handled by Artistic Style http://astyle.sourceforge.net/
12-
* Improved SSH uploader (Arduino Yun): uses file ~/.ssh/config if available. Allows public key only authentication and ssh servers listening on ports other than 22.
12+
* Improved SSH uploader (Arduino Yun): uses file ~/.ssh/config if available.
13+
Allows public key only authentication and ssh servers listening on ports other than 22.
1314
* Font anti-aliasing now ON by default (users will have to either delete or manually edit their preferences.txt file)
1415
* Added warning message when opening sketches with additional files with illegal names
1516
* (windows) Upgraded embedded Java runtime to version 7: much faster startup
1617
* Improved files open/save dialogs
1718
* Added line numbers, can be enabled/disabled from preferences (Cayci Gorlitsky)
1819
* Removed check on forbidden file in 1.5 formatted libraries (#1692)
20+
* (windows) Updated msys-1.0.dll to the latest version (Windows 8.1 compatibility)
21+
* Using [code] tag instead of [quote] in "Copy for forum". Removed color coding.
22+
* When an hardware addon reference another core also the libraries are referenced.
23+
* It's now possible to specify additional custom board parameters from command line.
24+
* Sketches path can be relative (#1493)
25+
* Example and Boards are now scrollable.
26+
* Fixed localization issues that sometimes prevented the IDE to start.
27+
* Added "Using library..." debugging message in verbose compile.
28+
* Improved preprocessor (fixes #1653, #1687, #817, #1293, #1245)
29+
* Fixed StringStartsWithEndsWith, KeyboardMessage, LCD CustomCharacter, Blink without delay, SD List files, Arduino Robot examples
30+
* Added PID/VID for older Arduinos
31+
* (mac) Improved board autodetection on Mac OS X
1932

2033
[libraries]
21-
* avr: Fixed buffer overflow in File::doBuffer() (dreggy)
22-
* avr: Fixed timeout in Bridge::transfer()
34+
* Bridge: Fixed buffer overflow in File::doBuffer() (dreggy)
35+
* Bridge: Fixed timeout in Bridge::transfer()
36+
* Bridge: Fixed return value of Bridge::get(..) (returning 0 with valid data len >0)
37+
* Bridge: Implemented multi-byte File::read(..)
2338
* sam: Fixed SPI initialization (when using extended API and multiple CS)
24-
* avr: Fixed behavior of EthernetClient::flush()
39+
* Partially fixed the behavior of EthernetClient::flush(), now it doesn't discard
40+
incoming data BUT it doesn't wait for outgoing data to be successfully transmitted.
41+
* Esplora: Added support for display GREENTAB_L
2542

2643
[core]
2744
* sam: Fixed wrong initialization for ADC timings (analogRead speed Arduino DUE improved by a factor x10)
2845
https://github.com/arduino/Arduino/issues/1418
2946
(http://www.djerickson.com/arduino/)
3047
* avr: Fixed wrong extended fuses on Arduino Yún when using external programmer
31-
* avr: Added yun variant with LED_BUILTIN definition
48+
* Added LED_BUILTIN metadata in variant files
3249
* avr: Refactored Mega* variants definitions in boards.txt (Kristian Sloth Lauszus)
3350
* avr: Removed File object destructor. In order to free memory allocated by a File object the safest way is to call its close() method
3451
* Added digitalPinToInterrupt variant macro (Paul Stoffregen)
3552
* avr: added variant file for Arduino Ethernet
53+
* Added SERIAL_* metadata in variants files (Paul Stoffregen)
3654

3755
ARDUINO 1.5.4 BETA 2013.09.10
3856

libraries/Bridge/src/Bridge.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ class BridgeClass {
3636
unsigned int get(const char *key, uint8_t *buff, unsigned int size);
3737
unsigned int get(const char *key, char *value, unsigned int maxlen)
3838
{
39-
get(key, reinterpret_cast<uint8_t *>(value), maxlen);
39+
return get(key, reinterpret_cast<uint8_t *>(value), maxlen);
4040
}
4141

4242
// Trasnfer a frame (with error correction and response)

0 commit comments

Comments
 (0)