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/zigbit/common/network.h | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'digital/zigbit/common/network.h') 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