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

[projects default]

Browse Source 
* adapted default project to different platforms

[sys transceiver]

* removed warning
This commit is contained in:
Oliver Hahm 2012-11-07 09:11:10 -05:00
parent 92281753ad
commit 3b4de3d39c
3 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
projects/default/Jamfile
View File

@ -6,6 +6,15 @@
SubDir TOP projects default ; SubDir TOP projects default ;
Module default_project : main.c : shell posix_io uart0 shell_commands ps rtc sht11 ltc4150 cc110x_ng transceiver gpioint auto_init config mci ; switch $(BOARD) {
case "msb-430h" :
Module default_project : main.c : shell posix_io uart0 shell_commands ps sht11 cc110x_ng transceiver auto_init ;
case "msba2" :
Module default_project : main.c : shell posix_io uart0 shell_commands ps rtc sht11 ltc4150 cc110x_ng transceiver gpioint auto_init config mci ;
case "msb-430" :
Module default_project : main.c : shell posix_io uart0 shell_commands ps sht11 auto_init ;
case "*" :
exit "Board not supported for this project" ;
}
UseModule default_project ; UseModule default_project ;

6
projects/default/main.c
View File

@ -25,9 +25,13 @@ static void shell_putchar(int c) {
int main(void) { int main(void) {
shell_t shell; shell_t shell;
(void) posix_open(uart0_handler_pid, 0); (void) posix_open(uart0_handler_pid, 0);
ltc4150_start(); #ifdef MODULE_LTC4150
ltc4150_start();
#endif
#ifdef MODULE_TRANSCEIVER
transceiver_init(TRANSCEIVER_CC1100); transceiver_init(TRANSCEIVER_CC1100);
(void) transceiver_start(); (void) transceiver_start();
#endif
(void) puts("Welcome to ukleos!"); (void) puts("Welcome to ukleos!");

4
sys/transceiver.c
View File

@ -340,7 +340,9 @@ void receive_cc1100_packet(radio_packet_t *trans_p) {
*/ */
static uint8_t send_packet(transceiver_type_t t, void *pkt) { static uint8_t send_packet(transceiver_type_t t, void *pkt) {
uint8_t res = 0; uint8_t res = 0;
#ifdef MODULE_CC110x
int snd_ret; int snd_ret;
#endif
radio_packet_t p = *((radio_packet_t*) pkt); radio_packet_t p = *((radio_packet_t*) pkt);
#ifdef MODULE_CC110X_NG #ifdef MODULE_CC110X_NG
@ -358,7 +360,7 @@ static uint8_t send_packet(transceiver_type_t t, void *pkt) {
#else #else
memcpy(cc1100_pkt, p.data, p.length); memcpy(cc1100_pkt, p.data, p.length);
if ((snd_ret = cc1100_send_csmaca(p.dst, 4, 0, (char*) cc1100_pkt, p.length)) < 0) { if ((snd_ret = cc1100_send_csmaca(p.dst, 4, 0, (char*) cc1100_pkt, p.length)) < 0) {
//printf("snd_ret (%u) = %i\n", p.length, snd_ret); DEBUG("snd_ret (%u) = %i\n", p.length, snd_ret);
res = 0; res = 0;
} }
else { else {