rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2025-02-21 15:54:39 +01:00
Code Issues Releases Activity

Merge branch 'master' into matthijskooijman-ide-1.5.x-timer-variant

Browse Source 
Conflicts:
	app/src/processing/app/debug/Compiler.java
	hardware/arduino/sam/cores/arduino/main.cpp
This commit is contained in:
Cristian Maglie 2014-07-01 18:34:46 +02:00
commit c2c122b079
3 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/shared/revisions.txt
View File

@ -42,6 +42,7 @@ The following changes are included also in the (not yet released) Arduino IDE 1.
* 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)
* Fixed wrong NULL pointer handling in Stream class (Amulya Kumar Sahoo) * Fixed wrong NULL pointer handling in Stream class (Amulya Kumar Sahoo)
* Added initVariant() hook to allow 3rd party variant-specific initialization
[ide] [ide]
* Fix toolchain command line to compile assembler files (Jimmy Hedman) * Fix toolchain command line to compile assembler files (Jimmy Hedman)
@ -302,6 +303,7 @@ ARDUINO 1.0.6 - not yet released
* 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
* Backported digitalPinToInterrupt macro from IDE 1.5.x * Backported digitalPinToInterrupt macro from IDE 1.5.x
* Added initVariant() hook to allow 3rd party variant-specific initialization
[ide] [ide]
* Added compatibility for IDE 1.5.x libraries layout * Added compatibility for IDE 1.5.x libraries layout

7
hardware/arduino/sam/cores/arduino/main.cpp
View File

@ -31,6 +31,11 @@ extern void SysTick_Handler( void )
} }
*/ */
// Weak empty variant initialization function.
// May be redefined by variant files.
void initVariant() __attribute__((weak));
void initVariant() { }
/* /*
* \brief Main entry point of Arduino application * \brief Main entry point of Arduino application
*/ */
@ -38,6 +43,8 @@ int main( void )
{ {
init(); init();
initVariant();
delay(1); delay(1);
#if defined(USBCON) #if defined(USBCON)

1
hardware/arduino/sam/cores/arduino/wiring.h
View File

@ -26,6 +26,7 @@ extern "C" {
/** /**
* *
*/ */
extern void initVariant( void ) ;
extern void init( void ) ; extern void init( void ) ;
/** /**