From 6a2f7833c18dab2dea4892de15f10d5e5247ec0c Mon Sep 17 00:00:00 2001 From: Florent Duchon Date: Tue, 23 Apr 2013 17:06:29 +0200 Subject: digital/beacon: rework of zigbit network stack --- digital/beacon/src/network_specific.c | 65 +++++++---------------------------- digital/beacon/src/network_specific.h | 3 -- digital/zigbit/common/network.c | 28 +++++++++------ digital/zigbit/common/network.h | 13 +++---- 4 files changed, 38 insertions(+), 71 deletions(-) diff --git a/digital/beacon/src/network_specific.c b/digital/beacon/src/network_specific.c index 33c00069..a61400e1 100644 --- a/digital/beacon/src/network_specific.c +++ b/digital/beacon/src/network_specific.c @@ -39,12 +39,7 @@ #include "codewheel.h" #include "servo.h" #include "reset.h" - -AppMessageBuffer_t zigbit_tx_buffer; - -extern APS_RegisterEndpointReq_t endpointParams; -extern APS_DataReq_t network_config; - +#include "uid.h" /* Specific callback after data packet received */ void network_specific_DataIndicationcallback(APS_DataInd_t* indData) @@ -52,13 +47,14 @@ void network_specific_DataIndicationcallback(APS_DataInd_t* indData) uint8_t beacon = 0; uint16_t angle = 0; uint16_t angle_id = 0; - AppMessage_t *appMessage = (AppMessage_t *) indData->asdu; + AppMessage_t *FrameReceived = (AppMessage_t *) indData->asdu; + /* Data received indication */ - switch(appMessage->data[NETWORK_MSG_TYPE_FIELD]) + switch(FrameReceived->type) { case NETWORK_JACK_STATE: - if(appMessage->data[NETWORK_MSG_DATA_LSB_FIELD]) + if(FrameReceived->data[NETWORK_MSG_DATA_MSB_FIELD]) { motor_start(); servo_start_wave_task(); @@ -72,15 +68,13 @@ void network_specific_DataIndicationcallback(APS_DataInd_t* indData) case NETWORK_OPPONENT_NUMBER: break; case NETWORK_ANGLE_RAW: - /* Beacon address */ - beacon = appMessage->data[NETWORK_MSG_ADDR_FIELD]; - + beacon = indData->srcAddress.shortAddress; /* Angle ID */ - angle_id = appMessage->data[NETWORK_MSG_DATA_MSB_FIELD] >> 1; + angle_id = FrameReceived->data[NETWORK_MSG_DATA_MSB_FIELD] >> 1; /* Angle value */ - angle = ((appMessage->data[NETWORK_MSG_DATA_MSB_FIELD]&0x01) << 8) + appMessage->data[NETWORK_MSG_DATA_LSB_FIELD]; + angle = ((FrameReceived->data[NETWORK_MSG_DATA_MSB_FIELD]&0x01) << 8) + FrameReceived->data[NETWORK_MSG_DATA_LSB_FIELD]; /* New angle is avaiiable, update position */ update_position(beacon,angle_id,codewheel_convert_angle_raw2radians(angle)); @@ -88,8 +82,11 @@ void network_specific_DataIndicationcallback(APS_DataInd_t* indData) case NETWORK_RESET: reset_avr(); break; + case NETWORK_UART_OVER_ZB: + print_raw_data(FrameReceived->data,indData->asduLength-1); + break; default: - uprintf("Unknown data type received = %x\r\n",appMessage->data[NETWORK_MSG_TYPE_FIELD]); + uprintf("Unknown data type received = %x\r\n",FrameReceived->type); break; } } @@ -100,40 +97,4 @@ void network_specific_DataConfcallback(void) } -/* This function must be used to send data through zigbee network */ -void network_send_data(TMessage_type type, uint16_t data) -{ - - if(network_get_state() == APP_NETWORK_JOINED_STATE) - { - /* Configure the message structure */ - network_config.dstAddrMode = APS_SHORT_ADDRESS; // Short addressing mode - network_config.dstAddress.shortAddress = 0x00; // Destination address - network_config.profileId = APP_PROFILE_ID; // Profile ID - network_config.dstEndpoint = APP_ENDPOINT; // Desctination endpoint - network_config.clusterId = APP_CLUSTER_ID; // Desctination cluster ID - network_config.srcEndpoint = APP_ENDPOINT; // Source endpoint - network_config.asdu = (uint8_t*) &zigbit_tx_buffer.message; // application message pointer - network_config.txOptions.acknowledgedTransmission = 0; // Acknowledged transmission enabled - network_config.radius = 0; // Use maximal possible radius - network_config.APS_DataConf = APS_DataConf; - - /* Message type*/ - zigbit_tx_buffer.message.data[NETWORK_MSG_TYPE_FIELD] = type; - - /* Source address */ - zigbit_tx_buffer.message.data[NETWORK_MSG_ADDR_FIELD] = CS_NWK_ADDR; - - /* 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 */ - network_set_transmission_state(APP_DATA_TRANSMISSION_WAIT_STATE); - network_config.asduLength = 4 + sizeof(zigbit_tx_buffer.message.messageId); // actual application message length - - network_start_transmission(); - } -} + diff --git a/digital/beacon/src/network_specific.h b/digital/beacon/src/network_specific.h index 00e0fccc..c4cef1cb 100644 --- a/digital/beacon/src/network_specific.h +++ b/digital/beacon/src/network_specific.h @@ -38,7 +38,4 @@ void network_specific_DataIndicationcallback(APS_DataInd_t* indData); /* Specific callback after data packet sent */ void network_specific_DataConfcallback(void); -/* This function must be used to send data through zigbee network */ -void network_send_data(TMessage_type type, uint16_t data); - #endif diff --git a/digital/zigbit/common/network.c b/digital/zigbit/common/network.c index 31319829..dccbd5d7 100644 --- a/digital/zigbit/common/network.c +++ b/digital/zigbit/common/network.c @@ -30,12 +30,13 @@ #include "configuration.h" #include "network.h" #include "network_specific.h" +#include "serial_ota.h" #include "print.h" #include "led.h" #include "uid.h" /* Endpoint parameters */ -SimpleDescriptor_t simpleDescriptor = { APP_ENDPOINT, APP_PROFILE_ID, 1, 1, 0, 0 , NULL, 0, NULL }; +SimpleDescriptor_t simpleDescriptor = { 1, 1, 1, 1, 0, 0 , NULL, 0, NULL }; APS_RegisterEndpointReq_t endpointParams; /* Network related variables */ @@ -60,16 +61,15 @@ void network_init(uint16_t uid) if(deviceType == DEVICE_TYPE_COORDINATOR) { uprintf("I'm a Cooridinator\r\n"); - bool rx_on_idle = true; - CS_WriteParameter(CS_RX_ON_WHEN_IDLE_ID, &rx_on_idle); } - if(deviceType == DEVICE_TYPE_END_DEVICE) + if(deviceType == DEVICE_TYPE_ROUTER) { - uprintf("I'm an End-Device\r\n"); - bool rx_on_idle = false; - CS_WriteParameter(CS_RX_ON_WHEN_IDLE_ID, &rx_on_idle); + uprintf("I'm a Router\r\n"); } + bool rx_on_idle = true; + CS_WriteParameter(CS_RX_ON_WHEN_IDLE_ID, &rx_on_idle); + /*False = random ID */ /* True = static short address */ bool unique_addr = true; @@ -167,9 +167,18 @@ void ZDO_MgmtNwkUpdateNotf(ZDO_MgmtNwkUpdateNotf_t *nwkParams) uprintf("Child %d joined\r\n",nwkParams->childInfo.shortAddr); uprintf(" > RSSI = %d dBm (-91 dBm to -7 dBm)\r\n",(int8_t)network_get_rssi(nwkParams->childInfo.shortAddr)); uprintf(" > LQI = %d (0 to 255)\r\n",(uint8_t)network_get_lqi(nwkParams->childInfo.shortAddr)); + + /* if dongle_zigbit then aciivate uart over zb */ + if(get_device_functionnality(nwkParams->childInfo.shortAddr) == ZIGBIT_DONGLE) + serial_over_zigbit_start(nwkParams->childInfo.shortAddr); + break; case ZDO_CHILD_REMOVED_STATUS: uprintf("Child %d quit\r\n",nwkParams->childInfo.shortAddr); + + /* if dongle_zigbit then deaciivate uart over zb */ + if(get_device_functionnality(nwkParams->childInfo.shortAddr) == ZIGBIT_DONGLE) + serial_over_zigbit_stop(); break; default: uprintf("Network status = 0x%x\r\n",nwkParams->status); @@ -218,7 +227,7 @@ void APS_DataConf(APS_DataConf_t* confInfo) if (APS_SUCCESS_STATUS != confInfo->status) { retryCounter++; -// uprintf("!!! Last transfert was failed. Reset it (retry = %d)\r\n",retryCounter); + uprintf("!!! Last transfert was failed. Reset it (retry = %d)\r\n",retryCounter); if (MAX_RETRIES_BEFORE_REJOIN == retryCounter) { @@ -246,7 +255,7 @@ void APS_DataConf(APS_DataConf_t* confInfo) void network_start_transmission(void) { /* Check the transmission state and send if ready */ - if(network_get_transmission_state() != APP_DATA_TRANSMISSION_BUSY_STATE) + if(network_get_transmission_state() == APP_DATA_TRANSMISSION_READY_STATE) { network_set_transmission_state(APP_DATA_TRANSMISSION_BUSY_STATE); APS_DataReq(&network_config); @@ -259,7 +268,6 @@ void network_start_transmission(void) void network_set_transmission_state(AppDataTransmissionState_t state) { appDataTransmissionState = state; - /* Modify the LED in accordance with the transmission state */ if(state == APP_DATA_TRANSMISSION_BUSY_STATE) led_on(NETWORK_ACTIVITY_LED); diff --git a/digital/zigbit/common/network.h b/digital/zigbit/common/network.h index 0928199a..5f771218 100644 --- a/digital/zigbit/common/network.h +++ b/digital/zigbit/common/network.h @@ -28,34 +28,35 @@ #include +BEGIN_PACK typedef struct { - uint8_t messageId; // message ID + uint8_t type; // message ID uint8_t data[APP_MAX_PACKET_SIZE]; // data } AppMessage_t; +END_PACK - +BEGIN_PACK typedef struct { uint8_t header[APS_ASDU_OFFSET]; // Auxiliary header (required by stack) AppMessage_t message; // Application message uint8_t footer[APS_AFFIX_LENGTH - APS_ASDU_OFFSET]; // Auxiliary footer (required by stack) } AppMessageBuffer_t; - +END_PACK typedef enum { NETWORK_JACK_STATE, NETWORK_OPPONENT_NUMBER, NETWORK_ANGLE_RAW, - NETWORK_RESET + NETWORK_RESET, + NETWORK_UART_OVER_ZB } TMessage_type; typedef enum { - NETWORK_MSG_TYPE_FIELD, - NETWORK_MSG_ADDR_FIELD, NETWORK_MSG_DATA_MSB_FIELD, NETWORK_MSG_DATA_LSB_FIELD } TMessage_field; -- cgit v1.2.3