arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-06-16 11:21:18 +03:00
Code 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
parent e5f34e5a83 668559fc6f
commit c2c122b079
3 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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
*/
@ -38,6 +43,8 @@ int main( void )
{
init();
initVariant();
delay(1);
#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 ) ;
/**