From 5602ec143eb0afedda7e0809ddbeca18552b7c69 Mon Sep 17 00:00:00 2001 From: Florent Duchon Date: Fri, 11 May 2012 00:13:32 +0200 Subject: digital/beacon: send angle in raw format instead of degree --- digital/beacon/src/network.c | 5 +++-- digital/beacon/src/network.h | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'digital') diff --git a/digital/beacon/src/network.c b/digital/beacon/src/network.c index 6638ffaf..fe413314 100644 --- a/digital/beacon/src/network.c +++ b/digital/beacon/src/network.c @@ -284,6 +284,7 @@ void APS_DataConf(APS_DataConf_t* confInfo) /* APS data indication handler */ void APS_DataIndication(APS_DataInd_t* indData) { + uint16_t angle = 0; AppMessage_t *appMessage = (AppMessage_t *) indData->asdu; // Data received indication @@ -293,8 +294,8 @@ void APS_DataIndication(APS_DataInd_t* indData) break; case NETWORK_OPPONENT_NUMBER: break; - case NETWORK_ANGLE_DEGREE: - + case NETWORK_ANGLE_RAW: + angle = codewheel_convert_angle_raw2degrees((appMessage->data[NETWORK_MSG_DATA_MSB_FIELD]<<8) + appMessage->data[NETWORK_MSG_DATA_LSB_FIELD]); /* New angle is avaiiable, update position */ // update_position(appMessage->data[NETWORK_MSG_ADDR_FIELD],appMessage->data[NETWORK_MSG_DATA_FIELD]); break; diff --git a/digital/beacon/src/network.h b/digital/beacon/src/network.h index a915000a..88c875f2 100644 --- a/digital/beacon/src/network.h +++ b/digital/beacon/src/network.h @@ -47,7 +47,7 @@ typedef enum { NETWORK_JACK_STATE, NETWORK_OPPONENT_NUMBER, - NETWORK_ANGLE_DEGREE + NETWORK_ANGLE_RAW } TMessage_type; -- cgit v1.2.3