Merge pull request #450 from LudwigOrtmann/chronos_fixes

Chronos fixes
dev/timer
Oleg Hahm 10 years ago
commit a680b180ef

@ -1,7 +1,12 @@
#include <stdint.h>
#include "board.h"
#include "cpu.h"
#include "irq.h"
#include "debug.h"
#include "display.h"
#include "display_putchar.h"
void cc430_cpu_init(void)
{
@ -73,4 +78,7 @@ void cc430_cpu_init(void)
void board_init(void)
{
cc430_cpu_init();
lcd_init();
init_display_putchar();
DEBUG("DISP OK");
}

@ -1,5 +1,6 @@
#include <stdint.h>
#include <cc430f6137.h>
#include "cc430-adc.h"
uint32_t battery_get_voltage(void)

@ -1,5 +1,6 @@
#include <stdint.h>
#include <cc430f6137.h>
#include "buzzer.h"
#include "hwtimer.h"

@ -44,6 +44,7 @@
/* driver */
#include <cc430f6137.h>
#include "display.h"

@ -40,6 +40,7 @@
/* Include section */
#include <stdint.h>
#include <cc430f6137.h>
#include "display.h"
/* ************************************************************************************************* */

@ -1,8 +1,9 @@
#include <stdio.h>
#include <string.h>
#include <ctype.h>
#include "display.h"
extern int toupper(int c);
extern void (*_putchar)(int c);
static char display_buf[11];

@ -42,16 +42,6 @@ extern int main(void);
void auto_init(void)
{
#ifdef MODULE_BOARD_DISPLAY
extern void lcd_init();
lcd_init();
DEBUG("DISP OK");
#endif
#ifdef MODULE_DISPLAY_PUTCHAR
extern void init_display_putchar();
init_display_putchar();
DEBUG("DISP OK");
#endif
#ifdef MODULE_HWTIMER
DEBUG("Auto init hwtimer module.\n");
hwtimer_init();

Loading…
Cancel
Save