Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-05-09 22:49:53 +08:00
Code Issues Actions 27 Packages Projects Releases Wiki Activity

[sensors] update airspeed_otf to generic device

Browse Source
This commit is contained in:
Gautier Hattenberger
2015-03-17 10:53:12 +01:00
parent 30c347633b
commit 20b371aee7
3 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
conf/modules/airspeed_otf.xml
+4 -1
View File
@@ -22,9 +22,12 @@
<periodic fun="airspeed_otf_periodic()" freq="1"/>
<event fun="airspeed_otf_event()"/>
<makefile target="ap">
<raw>
OTF_UART_LOWER=$(shell echo $(OTF_UART) | tr A-Z a-z)
</raw>
<file name="airspeed_otf.c"/>
<define name="USE_$(OTF_UART)"/>
<define name="MET_LINK" value="$(OTF_UART)"/>
<define name="MET_LINK" value="$(OTF_UART_LOWER)"/>
<define name="$(OTF_UART)_BAUD" value="B115200"/>
</makefile>
</module>
sw/airborne/modules/sensors/airspeed_otf.c
+2 -2
View File
@@ -153,8 +153,8 @@ void airspeed_otf_init(void)
void airspeed_otf_event(void)
{
while (MetLink(ChAvailable())) {
uint8_t ch = MetLink(Getch());
while (MetBuffer()) {
uint8_t ch = MetGetch();
airspeed_otf_parse(ch);
}
}
sw/airborne/modules/sensors/met_module.h
+7 -8
View File
@@ -37,17 +37,16 @@
#ifndef SITL
#include "mcu_periph/uart.h"
#define __MetLink(dev, _x) dev##_x
#define _MetLink(dev, _x) __MetLink(dev, _x)
#define MetLink(_x) _MetLink(MET_LINK, _x)
#define MetLinkDevice (&(MET_LINK).device)
#define MetBuffer() MetLink(ChAvailable())
#define ReadMetBuffer() { while (MetLink(ChAvailable())&&!met_msg_received) parse_met_buffer(MetLink(Getch())); }
#define MetSend1(c) MetLink(Transmit(c))
#define MetBuffer() MetLinkDevice->char_available(MetLinkDevice->periph)
#define MetGetch() MetLinkDevice->getchar(MetLinkDevice->periph)
#define ReadMetBuffer() { while (MetBuffer()&&!met_msg_received) parse_met_buffer(MetGetch()); }
#define MetSend1(c) MetLinkDevice->transmit(MetLinkDevice->periph, c)
#define MetUartSend1(c) MetSend1(c)
#define MetSend(_dat,_len) { for (uint8_t i = 0; i< (_len); i++) MetSend1(_dat[i]); };
#define MetUartSetBaudrate(_b) MetLink(SetBaudrate(_b))
#define MetUartRunning MetLink(TxRunning)
#define MetUartSetBaudrate(_b) uart_periph_set_baudrate(&(MET_LINK), _b)
#define MetUartRunning (MET_LINK).tx_running
#endif /** !SITL */