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

Merge branch 'master' into ide-1.5.x

Browse Source
This commit is contained in:
Cristian Maglie
2014-08-08 15:44:41 +02:00
parent a6c80364da 1bbcb2f9d4
commit 7f2350f714
3 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
build/shared/revisions.txt
View File

@ -1,4 +1,4 @@
ARDUINO 1.5.8 BETA - not yet release ARDUINO 1.5.8 BETA - not yet released
[ide] [ide]
* Find/Replace over multiple tabs (Erwin Ried, Fulvio Ieva) * Find/Replace over multiple tabs (Erwin Ried, Fulvio Ieva)
@ -11,6 +11,11 @@ ARDUINO 1.5.8 BETA - not yet release
* FileIO bridge: fixed wrong return value in File::size() for size >32768 * FileIO bridge: fixed wrong return value in File::size() for size >32768
* Updated Temboo to latest version * Updated Temboo to latest version
The following changes are included also in the (not yet released) Arduino IDE 1.0.6:
[core]
* avr: Added replacement stub for cstdlib atexit() funciton (Christopher Andrews)
ARDUINO 1.5.7 BETA - 2014.07.07 ARDUINO 1.5.7 BETA - 2014.07.07
[core] [core]
@ -319,6 +324,7 @@ ARDUINO 1.0.6 - not yet released
* avr: Improved USB-CDC write speed (Justin Rajewski) * avr: Improved USB-CDC write speed (Justin Rajewski)
* avr: Improved USB-CDC read code (Paul Brook) * avr: Improved USB-CDC read code (Paul Brook)
* avr: Fixed race condition in USB-CDC transmit (Paul Brook) * avr: Fixed race condition in USB-CDC transmit (Paul Brook)
* avr: Added replacement stub for cstdlib atexit() funciton (Christopher Andrews)
* Fixed wrong NULL pointer handling in Stream class (Amulya Kumar Sahoo) * Fixed wrong NULL pointer handling in Stream class (Amulya Kumar Sahoo)
* Backported String class from IDE 1.5.x (Matt Jenkins) * Backported String class from IDE 1.5.x (Matt Jenkins)
* Backported Print class from IDE 1.5.x * Backported Print class from IDE 1.5.x

2
hardware/arduino/avr/cores/arduino/Arduino.h
View File

@ -120,6 +120,8 @@ typedef uint8_t byte;
void init(void); void init(void);
void initVariant(void); void initVariant(void);
int atexit(void (*func)()) __attribute__((weak));
void pinMode(uint8_t, uint8_t); void pinMode(uint8_t, uint8_t);
void digitalWrite(uint8_t, uint8_t); void digitalWrite(uint8_t, uint8_t);
int digitalRead(uint8_t); int digitalRead(uint8_t);

3
hardware/arduino/avr/cores/arduino/main.cpp
View File

@ -19,6 +19,9 @@
#include <Arduino.h> #include <Arduino.h>
//Declared weak in Arduino.h to allow user redefinitions.
int atexit(void (*func)()) { return 0; }
// Weak empty variant initialization function. // Weak empty variant initialization function.
// May be redefined by variant files. // May be redefined by variant files.
void initVariant() __attribute__((weak)); void initVariant() __attribute__((weak));