Fixedwing for Pixracer

paparazzi · May 30, 2017 · 2a1eea8 · 2a1eea8
1 parent 66fd002
commit 2a1eea8
Show file tree

Hide file tree

Showing 14 changed files with 2,032 additions and 425 deletions.
diff --git a/.gitignore b/.gitignore
@@ -56,10 +56,10 @@ paparazzi.sublime-workspace
 /paparazzi
 
 # /conf/
-/conf/conf.xml
+/conf/conf.xml~
 /conf/conf.xml.20*
 /conf/conf_personal.xml.20*
-/conf/control_panel.xml
+/conf/control_panel.xml~
 /conf/control_panel.xml.20*
 /conf/%gconf.xml
 /conf/maps_data/*

diff --git a/conf/airframes/OPENUAS/openuas_eflite_t28.xml b/conf/airframes/OPENUAS/openuas_eflite_t28.xml
diff --git a/conf/boards/px4fmu_4.0.makefile b/conf/boards/px4fmu_4.0.makefile
@@ -57,3 +57,9 @@ GPS_BAUD ?= B38400
 # e.g. <servo driver="Ppm">
 #
 ACTUATORS ?= actuators_pwm
+
+#
+# default External Current and Volt Sensor configuration
+#
+# ADC_CURRENT_SENSOR ?= ADC_3
+# ADC_VOLTAGE_SENSOR ?= ADC_2
diff --git a/conf/conf.xml b/conf/conf.xml
@@ -0,0 +1 @@
+userconf/OPENUAS/openuas_conf.xml