From 75b08e3bd6eb2ee22c318b5f60f557a92fb016e1 Mon Sep 17 00:00:00 2001 From: Florent Duchon Date: Fri, 11 May 2012 00:12:07 +0200 Subject: digital/beacon: sent data is coded in uint16_t instead of uint8_t --- digital/beacon/src/network.c | 9 ++++++--- digital/beacon/src/network.h | 5 +++-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/digital/beacon/src/network.c b/digital/beacon/src/network.c index 3322075b..6638ffaf 100644 --- a/digital/beacon/src/network.c +++ b/digital/beacon/src/network.c @@ -240,7 +240,7 @@ int8_t network_get_rssi(void) /* This function must be used to send data through zigbee network */ -void network_send_data(TMessage_type type, uint8_t data) +void network_send_data(TMessage_type type, uint16_t data) { /* Message type*/ zigbit_tx_buffer.message.data[NETWORK_MSG_TYPE_FIELD] = type; @@ -248,8 +248,11 @@ void network_send_data(TMessage_type type, uint8_t data) /* Source address */ zigbit_tx_buffer.message.data[NETWORK_MSG_ADDR_FIELD] = CS_NWK_ADDR; - /* Data */ - zigbit_tx_buffer.message.data[NETWORK_MSG_DATA_FIELD] = data; + /* LSB Data */ + zigbit_tx_buffer.message.data[NETWORK_MSG_DATA_LSB_FIELD] = data; + + /* MSB Data */ + zigbit_tx_buffer.message.data[NETWORK_MSG_DATA_MSB_FIELD] = data >> 8; /* Bitcloud sending request */ APS_DataReq(&config); diff --git a/digital/beacon/src/network.h b/digital/beacon/src/network.h index 8bb82954..a915000a 100644 --- a/digital/beacon/src/network.h +++ b/digital/beacon/src/network.h @@ -55,7 +55,8 @@ typedef enum { NETWORK_MSG_TYPE_FIELD, NETWORK_MSG_ADDR_FIELD, - NETWORK_MSG_DATA_FIELD + NETWORK_MSG_DATA_MSB_FIELD, + NETWORK_MSG_DATA_LSB_FIELD } TMessage_field; /* This function intializes network parameters */ @@ -92,7 +93,7 @@ uint8_t network_get_lqi(void); int8_t network_get_rssi(void); /* This function must be used to send data through zigbee network */ -void network_send_data(TMessage_type type, uint8_t data); +void network_send_data(TMessage_type type, uint16_t data); /* brief Handler of aps data sent confirmation */ void APS_DataConf(APS_DataConf_t* confInfo); -- cgit v1.2.3