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

Merge fixes from branch 'v3.9'

Browse Source 
* fix SaveSettings to deal with units properly: #238
* implicit unit conversions are now described in conf/units.mxl
* fix aspirin2 driver: only update on new measurements: #239
* fix order of message fields in the server
This commit is contained in:
Felix Ruess
2012-07-20 02:05:10 +02:00
parent 353bd38c5b 1a585205a5
commit b189804be9
22 changed files with 304 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+8 -2
View File
@@ -64,6 +64,7 @@ XSENS_XML = $(CONF)/xsens_MTi-G.xml
TOOLS=$(PAPARAZZI_SRC)/sw/tools
OCAML=$(shell which ocaml)
OCAMLRUN=$(shell which ocamlrun)
BUILD_DATETIME:=$(shell date +%Y%m%d-%H%M%S)
# try to find the paparazzi multilib toolchain
TOOLCHAIN=$(shell find -L /opt/paparazzi/arm-multilib ~/sat -maxdepth 1 -type d -name arm-none-eabi 2>/dev/null | head -n 1)
@@ -264,9 +265,12 @@ ab_clean:
find sw/airborne -name '*~' -exec rm -f {} \;
replace_current_conf_xml:
test conf/conf.xml || mv conf/conf.xml conf/conf.xml.backup.`date +%Y%m%d-%H%M%s`
test conf/conf.xml && mv conf/conf.xml conf/conf.xml.backup.$(BUILD_DATETIME)
cp conf/conf.xml.example conf/conf.xml
restore_conf_xml:
test conf/conf.xml.backup.$(BUILD_DATETIME) && mv conf/conf.xml.backup.$(BUILD_DATETIME) conf/conf.xml
commands: paparazzi sw/simulator/launchsitl
paparazzi:
@@ -277,6 +281,8 @@ sw/simulator/launchsitl:
cat src/$(@F) | sed s#OCAMLRUN#$(OCAMLRUN)# | sed s#OCAML#$(OCAML)# > $@
chmod a+x $@
test: all replace_current_conf_xml
run_tests:
cd tests; $(MAKE) test
test: all replace_current_conf_xml run_tests restore_conf_xml