riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #450 from LudwigOrtmann/chronos_fixes

Browse Source 
Chronos fixes
This commit is contained in:
Oleg Hahm 2013-12-19 10:06:03 -08:00
commit a680b180ef
7 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
boards/chronos/board_init.c
View File

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

1
boards/chronos/drivers/battery.c
View File

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

1
boards/chronos/drivers/buzzer.c
View File

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

1
boards/chronos/drivers/display.c
View File

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

1
boards/chronos/drivers/display1.c
View File

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

3
boards/chronos/drivers/display_putchar.c
View File

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

10
sys/auto_init/auto_init.c
View File

@ -42,16 +42,6 @@ extern int main(void);
void auto_init(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 #ifdef MODULE_HWTIMER
DEBUG("Auto init hwtimer module.\n"); DEBUG("Auto init hwtimer module.\n");
hwtimer_init(); hwtimer_init();