Skip to content

Commit

Permalink
[pprzlink] generate intermcu messages from pprzlink
Browse files Browse the repository at this point in the history
  • Loading branch information
gautierhattenberger committed Jan 8, 2016
1 parent 3080a62 commit 85cf59e
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 13 deletions.
11 changes: 1 addition & 10 deletions Makefile
Expand Up @@ -97,11 +97,10 @@ UBX_PROTOCOL_H=$(STATICINCLUDE)/ubx_protocol.h
MTK_PROTOCOL_H=$(STATICINCLUDE)/mtk_protocol.h
XSENS_PROTOCOL_H=$(STATICINCLUDE)/xsens_protocol.h
ABI_MESSAGES_H=$(STATICINCLUDE)/abi_messages.h
INTERMCU_MSG_H=$(STATICINCLUDE)/intermcu_msg.h
MAVLINK_DIR=$(STATICINCLUDE)/mavlink/
MAVLINK_PROTOCOL_H=$(MAVLINK_DIR)protocol.h

GEN_HEADERS = $(UBX_PROTOCOL_H) $(MTK_PROTOCOL_H) $(XSENS_PROTOCOL_H) $(ABI_MESSAGES_H) $(INTERMCU_MSG_H) $(MAVLINK_PROTOCOL_H)
GEN_HEADERS = $(UBX_PROTOCOL_H) $(MTK_PROTOCOL_H) $(XSENS_PROTOCOL_H) $(ABI_MESSAGES_H) $(MAVLINK_PROTOCOL_H)

all: ground_segment ext lpctools

Expand Down Expand Up @@ -224,14 +223,6 @@ $(ABI_MESSAGES_H) : $(ABI_XML) generators
$(Q)mv $($@_TMP) $@
$(Q)chmod a+r $@

$(INTERMCU_MSG_H) : $(MESSAGES_XML) generators
$(Q)test -d $(STATICINCLUDE) || mkdir -p $(STATICINCLUDE)
@echo GENERATE $@
$(eval $@_TMP := $(shell $(MKTEMP)))
$(Q)PAPARAZZI_SRC=$(PAPARAZZI_SRC) PAPARAZZI_HOME=$(PAPARAZZI_HOME) $(GENERATORS)/gen_messages.out $< intermcu > $($@_TMP)
$(Q)mv $($@_TMP) $@
$(Q)chmod a+r $@

$(MAVLINK_PROTOCOL_H) :
$(Q)make -C $(PAPARAZZI_HOME)/sw/ext mavlink

Expand Down
2 changes: 1 addition & 1 deletion sw/airborne/subsystems/intermcu/intermcu_ap.c
Expand Up @@ -25,7 +25,7 @@
*/

#include "intermcu_ap.h"
#include "intermcu_msg.h"
#include "pprzlink/intermcu_msg.h"
#include "subsystems/radio_control.h"
#include "pprzlink/pprz_transport.h"
#include "mcu_periph/uart.h"
Expand Down
2 changes: 1 addition & 1 deletion sw/airborne/subsystems/intermcu/intermcu_fbw.c
Expand Up @@ -25,7 +25,7 @@
*/

#include "intermcu_fbw.h"
#include "intermcu_msg.h"
#include "pprzlink/intermcu_msg.h"
#include "subsystems/radio_control.h"
#include "mcu_periph/uart.h"
#include "pprzlink/pprz_transport.h"
Expand Down
2 changes: 1 addition & 1 deletion sw/ext/pprzlink

0 comments on commit 85cf59e

Please sign in to comment.