From 501b5765964affe9b48c88a5b580bd321170cc38 Mon Sep 17 00:00:00 2001 From: Vegard Storheil Eriksen Date: Sat, 19 Nov 2011 18:48:57 +0100 Subject: Avoid symbol conflicts from usart.h and xbee.h. --- xbee.h | 49 ++----------------------------------------------- 1 file changed, 2 insertions(+), 47 deletions(-) (limited to 'xbee.h') diff --git a/xbee.h b/xbee.h index f868972..59cf0cb 100644 --- a/xbee.h +++ b/xbee.h @@ -1,53 +1,8 @@ #ifndef XBEE_H #define XBEE_H -#include "mutex.h" +#include -Mutex xbm; - -void xbee_send(uint16_t type, int len, const uint8_t* buf) { - xbm.lock(); - - // Start and length. - usart_send(0x7e); - usart_send(((len + 16) >> 8) & 0xff); - usart_send((len + 16) & 0xff); - - // Frame type and ID. - usart_send(0x10); - usart_send(0x01); - - // Destination address. - usart_send(0x00); - usart_send(0x13); - usart_send(0xa2); - usart_send(0x00); - usart_send(0x40); - usart_send(0x6f); - usart_send(0x19); - usart_send(0xf1); - - usart_send(0xff); - usart_send(0xfe); - usart_send(0x00); - usart_send(0x00); - - uint8_t chsum = 0x83; - - usart_send(type & 0xff); - chsum -= type & 0xff; - usart_send(type >> 8); - chsum -= type >> 8; - - // Payload - for(int i = 0; i < len; i++) { - usart_send(buf[i]); - chsum -= buf[i]; - } - - usart_send(chsum); - - xbm.unlock(); -} +void xbee_send(uint16_t type, int len, const uint8_t* buf); #endif -- cgit v1.2.3