Made main.c compliant with Energy

Complaining about main() defined twice
This commit is contained in:
Francisco Ruiz
2014-12-03 00:31:34 +00:00
parent e1ad6072dd
commit 2af34821aa

View File

@ -3,9 +3,9 @@
* See LICENSE for details. * See LICENSE for details.
*/ */
#define false 0 #define false 0
#define true 1 #define true 1
typedef int bool; typedef int bool;
#include <stdint.h> #include <stdint.h>
#include "inc/hw_memmap.h" #include "inc/hw_memmap.h"
@ -16,27 +16,21 @@ typedef int bool;
#define LED_BLUE GPIO_PIN_2 #define LED_BLUE GPIO_PIN_2
#define LED_GREEN GPIO_PIN_3 #define LED_GREEN GPIO_PIN_3
int main(void)
{ void setup() {
SysCtlClockSet( SysCtlClockSet(
SYSCTL_SYSDIV_4|SYSCTL_USE_PLL|SYSCTL_XTAL_16MHZ|SYSCTL_OSC_MAIN); SYSCTL_SYSDIV_4|SYSCTL_USE_PLL|SYSCTL_XTAL_16MHZ|SYSCTL_OSC_MAIN);
SysCtlPeripheralEnable(SYSCTL_PERIPH_GPIOF); SysCtlPeripheralEnable(SYSCTL_PERIPH_GPIOF);
GPIOPinTypeGPIOOutput(GPIO_PORTF_BASE, LED_RED|LED_BLUE|LED_GREEN); GPIOPinTypeGPIOOutput(GPIO_PORTF_BASE, LED_RED|LED_BLUE|LED_GREEN);
while (1)
{
GPIOPinWrite(GPIO_PORTF_BASE, LED_RED|LED_BLUE|LED_GREEN, LED_RED);
SysCtlDelay(3000000);
GPIOPinWrite(GPIO_PORTF_BASE, LED_RED|LED_BLUE|LED_GREEN, LED_BLUE);
SysCtlDelay(3000000);
GPIOPinWrite(GPIO_PORTF_BASE, LED_RED|LED_BLUE|LED_GREEN, LED_GREEN);
SysCtlDelay(3000000);
}
return 0;
} }
// hook for Energia main.cpp where these methods are defined
void setup() {} void loop() {
void loop() {} GPIOPinWrite(GPIO_PORTF_BASE, LED_RED|LED_BLUE|LED_GREEN, LED_RED);
SysCtlDelay(3000000);
GPIOPinWrite(GPIO_PORTF_BASE, LED_RED|LED_BLUE|LED_GREEN, LED_BLUE);
SysCtlDelay(3000000);
GPIOPinWrite(GPIO_PORTF_BASE, LED_RED|LED_BLUE|LED_GREEN, LED_GREEN);
SysCtlDelay(3000000);
}