Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-05-22 04:13:39 +08:00
Code Issues Actions 24 Packages Projects Releases Wiki Activity

Adds define handling for xbee channel configuration.

Browse Source
This commit is contained in:
Fabien-B
2018-07-12 10:48:50 +02:00
parent c9b8219a31
commit 272fa0df44
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sw/airborne/modules/datalink/xbee_dl.c
+14 -2
View File
@@ -30,6 +30,9 @@
#include "mcu_periph/uart.h"
#include "generated/airframe.h"
#define STR_(s) #s
#define STR(s) STR_(s)
#ifndef XBEE_TYPE
#define XBEE_TYPE XBEE_24
#endif
@@ -37,6 +40,15 @@
#define XBEE_INIT ""
#endif
#ifdef XBEE_CHANNEL
#define XBEE_CHANNEL_CONF "ATCH" STR(XBEE_CHANNEL) "\r"
INFO("XBEE channel configured : " XBEE_CHANNEL_CONF)
#else
#define XBEE_CHANNEL_CONF ""
#endif
#define CONCAT(a, b) a b
struct xbee_transport xbee_tp;
void xbee_dl_init(void)
@@ -44,10 +56,10 @@ void xbee_dl_init(void)
#if USE_HARD_FAULT_RECOVERY
if (recovering_from_hard_fault)
// in case of hardfault recovery, we want to skip xbee init which as an active wait
xbee_transport_init(&xbee_tp, &((XBEE_UART).device), AC_ID, XBEE_TYPE, XBEE_BAUD, NULL, XBEE_INIT);
xbee_transport_init(&xbee_tp, &((XBEE_UART).device), AC_ID, XBEE_TYPE, XBEE_BAUD, NULL, CONCAT(XBEE_INIT, XBEE_CHANNEL_CONF));
else
#endif
xbee_transport_init(&xbee_tp, &((XBEE_UART).device), AC_ID, XBEE_TYPE, XBEE_BAUD, sys_time_usleep, XBEE_INIT);
xbee_transport_init(&xbee_tp, &((XBEE_UART).device), AC_ID, XBEE_TYPE, XBEE_BAUD, sys_time_usleep, CONCAT(XBEE_INIT, XBEE_CHANNEL_CONF));
}
void xbee_dl_event(void)