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

[pprlink] remove paparazzi message definition

Browse Source 
- by default use pprzlink message definition
- if custom messages are need to be used, place the file messages.xml in conf
- only use default units.xml file
- better quiet compilation
This commit is contained in:
Gautier Hattenberger
2016-01-15 13:17:34 +01:00
parent 1bdc2087c7
commit dc30874a07
4 changed files with 11 additions and 2925 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+10 -11
View File
@@ -137,7 +137,7 @@ static: cockpit tmtc generators sim_static joystick static_h
libpprzlink:
$(MAKE) -C $(EXT) pprzlink.update
DESTDIR=$(PPRZLINK_INSTALL) $(MAKE) -C $(PPRZLINK_DIR) libpprzlink-install
$(Q)Q=$(Q) DESTDIR=$(PPRZLINK_INSTALL) $(MAKE) -C $(PPRZLINK_DIR) libpprzlink-install
libpprz: libpprzlink _save_build_version
$(MAKE) -C $(LIB)/ocaml
@@ -183,11 +183,17 @@ $(LOGALIZER): libpprz
static_h: pprzlink_protocol $(GEN_HEADERS)
pprzlink_protocol : $(MESSAGES_XML)
pprzlink_protocol :
$(Q)test -d $(STATICINCLUDE) || mkdir -p $(STATICINCLUDE)
$(Q)test -d $(STATICLIB) || mkdir -p $(STATICLIB)
@echo GENERATE $@
$(Q)MESSAGES_INSTALL=$(MESSAGES_INSTALL) $(MAKE) -C $(PPRZLINK_DIR) pymessages
ifeq ("$(wildcard $(MESSAGES_XML))","")
@echo GENERATE $@ with default messages
$(Q)Q=$(Q) MESSAGES_INSTALL=$(MESSAGES_INSTALL) $(MAKE) -C $(PPRZLINK_DIR) pymessages
else
@echo GENERATE $@ with custome messages from $(MESSAGES_XML)
$(Q)Q=$(Q) MESSAGES_XML=$(MESSAGES_XML) MESSAGES_INSTALL=$(MESSAGES_INSTALL) $(MAKE) -C $(PPRZLINK_DIR) pymessages
endif
$(UBX_PROTOCOL_H) : $(UBX_XML) generators
@echo GENERATE $@
@@ -210,13 +216,6 @@ $(XSENS_PROTOCOL_H) : $(XSENS_XML) generators
$(Q)mv $($@_TMP) $@
$(Q)chmod a+r $@
$(DL_PROTOCOL_H) : $(MESSAGES_XML) generators
@echo GENERATE $@
$(eval $@_TMP := $(shell $(MKTEMP)))
$(Q)PAPARAZZI_SRC=$(PAPARAZZI_SRC) PAPARAZZI_HOME=$(PAPARAZZI_HOME) $(GENERATORS)/gen_messages.out $< datalink > $($@_TMP)
$(Q)mv $($@_TMP) $@
$(Q)chmod a+r $@
$(ABI_MESSAGES_H) : $(ABI_XML) generators
@echo GENERATE $@
$(eval $@_TMP := $(shell $(MKTEMP)))
conf/messages.xml
-2891
View File
File diff suppressed because it is too large Load Diff
conf/units.xml
-22
View File
@@ -1,22 +0,0 @@
<!-- Table of default units convertion -->
<!-- used to convert from unit to alt_unit (messages) or code_unit (airframe) -->
<units>
<unit from="m" to="ft" coef="3.28084"/>
<unit from="ft" to="m" coef="0.3048"/>
<unit from="m" to="cm" coef="100."/>
<unit from="cm" to="m" coef="0.01"/>
<unit from="m/s" to="cm/s" coef="100."/>
<unit from="cm/s" to="m/s" coef="0.01"/>
<unit from="m" to="mm" coef="1000."/>
<unit from="mm" to="m" coef="0.001"/>
<unit from="m/s" to="mm/s" coef="1000."/>
<unit from="mm/s" to="m/s" coef="0.001"/>
<unit from="decideg" to="deg" coef="0.1"/>
<unit from="deg" to="decideg" coef="10."/>
<unit from="centideg" to="deg" coef="0.01"/>
<unit from="deg" to="centideg" coef="100."/>
<unit from="deg" to="rad" coef="0.0174532925" auto="code"/>
<unit from="rad" to="deg" coef="57.2957795131" auto="display"/>
<unit from="deg/s" to="rad/s" coef="0.0174532925" auto="code"/>
<unit from="rad/s" to="deg/s" coef="57.2957795131" auto="display"/>
</units>
sw/ext/pprzlink
+1 -1
Submodule sw/ext/pprzlink updated: 8b8d80fe12...5f11dfd389