From 720037c9a21a15910266fad2650fc446faa6ed58 Mon Sep 17 00:00:00 2001 From: Florent Duchon Date: Wed, 4 Apr 2012 00:05:59 +0200 Subject: digital/beacon: compilation warnings cleaning --- digital/beacon/src/main_avr.c | 10 ++++++---- digital/beacon/src/network.c | 6 +++--- digital/beacon/src/position.h | 2 +- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/digital/beacon/src/main_avr.c b/digital/beacon/src/main_avr.c index 3410efa4..46fc594f 100644 --- a/digital/beacon/src/main_avr.c +++ b/digital/beacon/src/main_avr.c @@ -32,6 +32,7 @@ #include "debug.h" #include "position.h" #include "led.h" +#include "twi.h" // Application related parameters AppState_t appState = APP_INITIAL_STATE; // application state @@ -73,19 +74,20 @@ void APL_TaskHandler(void) uprintf("DEVICE_TYPE_COORDINATOR init OK\n\r"); break; case DEVICE_TYPE_END_DEVICE: + servo_timer1_init(); sensors_laser_init(); sensors_codewheel_init(); - network_init(); + network_init(); uprintf("DEVICE_TYPE_END_DEVICE init OK\n\r"); break; default: break; } - appState = APP_NETWORK_JOINING_STATE; - SYS_PostTask(APL_TASK_ID); + appState = APP_NETWORK_JOINING_STATE; + SYS_PostTask(APL_TASK_ID); break; case APP_NETWORK_JOINING_STATE: - network_start(); + network_start(); break; case APP_NETWORK_LEAVING_STATE: break; diff --git a/digital/beacon/src/network.c b/digital/beacon/src/network.c index 8e0fbaa0..4247304f 100644 --- a/digital/beacon/src/network.c +++ b/digital/beacon/src/network.c @@ -245,12 +245,12 @@ void send_data(uint8_t type, uint8_t data) APS_DataReq(&config); } -void send_angle(int angle_degree) -{ +// void send_angle(int angle_degree) +// { // zigbit_tx_buffer.message.data[0]=0x43; // zigbit_tx_buffer.message.data[1]=beacon_id; // zigbit_tx_buffer.message.data[2]=angle_degree; -} +// } diff --git a/digital/beacon/src/position.h b/digital/beacon/src/position.h index 9010e705..8cc77f2a 100644 --- a/digital/beacon/src/position.h +++ b/digital/beacon/src/position.h @@ -52,7 +52,7 @@ typedef struct { int x; int y; - int trust + int trust; }opponent_s; /* Coordinates structure */ -- cgit v1.2.3