From c4dedb3fce855b7318eed9067262c8889ac3e57e Mon Sep 17 00:00:00 2001 From: MavLab Date: Sun, 21 Nov 2010 15:54:51 +0100 Subject: [PATCH 1/4] Import Script --- import.sh | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100755 import.sh diff --git a/import.sh b/import.sh new file mode 100755 index 0000000000..7ddfebbe0a --- /dev/null +++ b/import.sh @@ -0,0 +1,45 @@ +echo "Warning: Did you commit first?" +echo "Updating TUDelft Paparazzi Version" +svn update ./ +rm -vrf ./conf/conf.xml.*-* +echo "Cleaning and Updating ENAC Paparazzi Version" +cd ../paparazzi3/ +svn revert -R ./ +svn status | sed 's/? /rm -rf /' > rm.sh +chmod +x ./rm.sh +./rm.sh +svn update ./ +cd ../ppz2svn/ +echo "Exporting ENAC to TUDelft Paparazzi Version" +svn export ../paparazzi3/ ./ --force +echo "Adding new Files" +svn status | grep '? ' | sed 's/? /svn add/' > add.sh +chmod +x ./add.sh +./add.sh +svn remove ./add.sh --force +svn remove ./tud.txt --force +# rm -f ./add.sh +echo "Removing Deleted Files" +svn export ./ ../paparazzi3/ --force +cd ../paparazzi3/ +svn status | grep 'TUDelft' | sed 's/? /rm -rf /' > rm.sh +chmod +x ./rm.sh +./rm.sh +rm -rf ./import.sh +rm -rf ./export.sh +rm -rf ./sw/airborne/modules/onboardcam +rm -rf ./sw/airborne/modules/opticflow +rm -rf ./sw/airborne/modules/asset_kite_actuator +rm -rf ./sw/airborne/modules/asset_kite_sensors +rm -rf ./sw/airborne/modules/bmp085 +rm -rf ./sw/airborne/boards/tiny_sense.h +rm -rf ./sw/airborne/booz/aerovinci +rm -rf ./conf/simulator/jsbsim/aircraft/LISA_BOOZ_BART.xml +echo "Check this list manually: what files need to be added to ENAC server?" > ./rm.sh +svn status | sed 's/? /svn remove ..\/ppz2svn\//' >> rm.sh +chmod +x ./rm.sh +gedit ./rm.sh +#svn status | sed 's/? /rm -rf /' > ./rm.sh +cd ../ppz2svn +svn diff > tud.txt +gedit tud.txt From 008ff0ea2e011e31090151ef3e9c719cbfc5e309 Mon Sep 17 00:00:00 2001 From: dewagter Date: Sun, 21 Nov 2010 16:22:02 +0100 Subject: [PATCH 2/4] Payload Messages --- conf/messages.xml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/conf/messages.xml b/conf/messages.xml index efc4d578ed..3a69a1fb30 100644 --- a/conf/messages.xml +++ b/conf/messages.xml @@ -743,7 +743,12 @@ - + + + + + + @@ -1931,6 +1936,11 @@ + + + + + From 047e34a898e770d3890b346eaa47912c83a29ac4 Mon Sep 17 00:00:00 2001 From: dewagter Date: Sun, 21 Nov 2010 19:53:17 +0100 Subject: [PATCH 3/4] unused --- import.sh | 45 --------------------------------------------- 1 file changed, 45 deletions(-) delete mode 100755 import.sh diff --git a/import.sh b/import.sh deleted file mode 100755 index 7ddfebbe0a..0000000000 --- a/import.sh +++ /dev/null @@ -1,45 +0,0 @@ -echo "Warning: Did you commit first?" -echo "Updating TUDelft Paparazzi Version" -svn update ./ -rm -vrf ./conf/conf.xml.*-* -echo "Cleaning and Updating ENAC Paparazzi Version" -cd ../paparazzi3/ -svn revert -R ./ -svn status | sed 's/? /rm -rf /' > rm.sh -chmod +x ./rm.sh -./rm.sh -svn update ./ -cd ../ppz2svn/ -echo "Exporting ENAC to TUDelft Paparazzi Version" -svn export ../paparazzi3/ ./ --force -echo "Adding new Files" -svn status | grep '? ' | sed 's/? /svn add/' > add.sh -chmod +x ./add.sh -./add.sh -svn remove ./add.sh --force -svn remove ./tud.txt --force -# rm -f ./add.sh -echo "Removing Deleted Files" -svn export ./ ../paparazzi3/ --force -cd ../paparazzi3/ -svn status | grep 'TUDelft' | sed 's/? /rm -rf /' > rm.sh -chmod +x ./rm.sh -./rm.sh -rm -rf ./import.sh -rm -rf ./export.sh -rm -rf ./sw/airborne/modules/onboardcam -rm -rf ./sw/airborne/modules/opticflow -rm -rf ./sw/airborne/modules/asset_kite_actuator -rm -rf ./sw/airborne/modules/asset_kite_sensors -rm -rf ./sw/airborne/modules/bmp085 -rm -rf ./sw/airborne/boards/tiny_sense.h -rm -rf ./sw/airborne/booz/aerovinci -rm -rf ./conf/simulator/jsbsim/aircraft/LISA_BOOZ_BART.xml -echo "Check this list manually: what files need to be added to ENAC server?" > ./rm.sh -svn status | sed 's/? /svn remove ..\/ppz2svn\//' >> rm.sh -chmod +x ./rm.sh -gedit ./rm.sh -#svn status | sed 's/? /rm -rf /' > ./rm.sh -cd ../ppz2svn -svn diff > tud.txt -gedit tud.txt From 0350e8ad79ccd4bf93fa67f54ea6eae7488c088b Mon Sep 17 00:00:00 2001 From: Antoine Drouin Date: Sun, 21 Nov 2010 23:15:29 +0100 Subject: [PATCH 4/4] updated description and packages list --- README | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/README b/README index 82a77efe6e..4239f4a8a6 100644 --- a/README +++ b/README @@ -1,33 +1,33 @@ # Paparazzi $Id$ -# Copyright (C) 2003-2006 Pascal Brisset Antoine Drouin +# Copyright (C) 2003-2010 The Paparazzi Team # -# This file is part of paparazzi. +# This file is part of Paparazzi. # -# paparazzi is free software; you can redistribute it and/or modify +# Paparazzi is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2, or (at your option) # any later version. # -# paparazzi is distributed in the hope that it will be useful, +# Paparazzi is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with paparazzi; see the file COPYING. If not, write to +# along with Paparazzi; see the file COPYING. If not, write to # the Free Software Foundation, 59 Temple Place - Suite 330, # Boston, MA 02111-1307, USA. + Intro ----- -Paparazzi is an attempt to develop a cheap fixed wing UAV (Unmanned Air -Vehicle). As of today we have successfully flown autonomously several small -electro powered fixed wing aircraft (Twinstar, Microjet, ...). +Paparazzi is an attempt to develop a free software Unmanned (Air) Vehicle System. + As of today the system is being used successfuly by a number of hobyists, universities and companies all over the world, on vehicle of various size ( 100g to 25Kg ) and of various nature ( fixed wing, rotorcrafts, boats and surface vehicles). Up to date informations are available from the wiki website - paparazzi.enac.fr + http://paparazzi.enac.fr and from the mailing list (http://savannah.nongnu.org/mail/?group=paparazzi) and the IRC channel (freenode, #paparazzi). @@ -62,15 +62,18 @@ For Debian or Ubuntu users, required packages are available at http://paparazzi.enac.fr/debian -Installation of the meta-package "paparazzi-dev" will install -everything needed to compile this project (if something is missing, -please ask) for simulation. "paparazzi-arm7" is required to compile -the code for the ARM based boards. + + - "paparazzi-dev" will provide everything needed to compile and run the ground segment and the simulator. If something is missing, please report it. + - "paparazzi-arm7" is required to compile the code for LPC21 based boards ( tiny, twog, booz, etc). + - "paparazzi-stm32" is needed for building code for STM32 based boards (lisa/L, lisa/M) + - "paparazzi-omap" is needed for building code for the optional Gumstix Overo module available on lisa/L + + - "paparazzi-jsbsim" is needed for using jsbsim as flight dynamic model for the simulator. Compilation and demo simulation ------------------------------- - 1) "make" in the top directory to compile all the libraries and tools. + 1) type "make" in the top directory to compile all the libraries and tools. 2) "./paparazzi" to run the Paparazzi Center