diff --git a/conf/airframes/AggieAir/conf_aggieair.xml b/conf/AGGIEAIR/aggieair_conf.xml similarity index 78% rename from conf/airframes/AggieAir/conf_aggieair.xml rename to conf/AGGIEAIR/aggieair_conf.xml index fe257d5fd0..a2ca61c18f 100644 --- a/conf/airframes/AggieAir/conf_aggieair.xml +++ b/conf/AGGIEAIR/aggieair_conf.xml @@ -2,8 +2,8 @@ + + + + + + + + + diff --git a/conf/OPENUAS/openuas_control_panel.xml b/conf/OPENUAS/openuas_control_panel.xml new file mode 100644 index 0000000000..28ad12ef04 --- /dev/null +++ b/conf/OPENUAS/openuas_control_panel.xml @@ -0,0 +1,647 @@ + + +
+ + + + + + +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ diff --git a/conf/airframes/OpenUAS/conf_openuas_obc2014.xml b/conf/OPENUAS/openuas_obc2014_conf.xml similarity index 58% rename from conf/airframes/OpenUAS/conf_openuas_obc2014.xml rename to conf/OPENUAS/openuas_obc2014_conf.xml index 62f6d011a0..0bb9f067cd 100644 --- a/conf/airframes/OpenUAS/conf_openuas_obc2014.xml +++ b/conf/OPENUAS/openuas_obc2014_conf.xml @@ -1,12 +1,12 @@ diff --git a/conf/airframes/OpenUAS/openuas_control_panel_obc2014.xml b/conf/OPENUAS/openuas_obc2014_control_panel.xml similarity index 87% rename from conf/airframes/OpenUAS/openuas_control_panel_obc2014.xml rename to conf/OPENUAS/openuas_obc2014_control_panel.xml index d9478bb7dc..1700ef5a8f 100644 --- a/conf/airframes/OpenUAS/openuas_control_panel_obc2014.xml +++ b/conf/OPENUAS/openuas_obc2014_control_panel.xml @@ -1,4 +1,4 @@ - +
@@ -15,7 +15,6 @@ - @@ -24,11 +23,9 @@ - - @@ -48,7 +45,6 @@ - @@ -65,7 +61,7 @@
- + @@ -76,7 +72,7 @@ - + @@ -129,12 +125,16 @@ + + + + + - - + @@ -144,7 +144,7 @@ - + @@ -166,12 +166,6 @@ - - - - - -
diff --git a/conf/airframes/AggieAir/ark_quad_lisa_mx.xml b/conf/airframes/AGGIEAIR/ark_quad_lisa_mx.xml similarity index 100% rename from conf/airframes/AggieAir/ark_quad_lisa_mx.xml rename to conf/airframes/AGGIEAIR/ark_quad_lisa_mx.xml diff --git a/conf/airframes/AggieAir/rp3_lia.xml b/conf/airframes/AGGIEAIR/rp3_lia.xml similarity index 100% rename from conf/airframes/AggieAir/rp3_lia.xml rename to conf/airframes/AGGIEAIR/rp3_lia.xml diff --git a/conf/airframes/cridea/quad-suave.xml b/conf/airframes/CRIDEA/cridea_quadsuave.xml similarity index 100% rename from conf/airframes/cridea/quad-suave.xml rename to conf/airframes/CRIDEA/cridea_quadsuave.xml diff --git a/conf/airframes/OPENUAS/openuas_ardrone2.xml b/conf/airframes/OPENUAS/openuas_ardrone2.xml new file mode 100644 index 0000000000..d5131949f9 --- /dev/null +++ b/conf/airframes/OPENUAS/openuas_ardrone2.xml @@ -0,0 +1,277 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + +
+ + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + +
+ + + + +
+ + + + + + +
+ +
+ + +
+ +
+ + + + + + + + + + + + + + + + + + + + + + +
+ +
+ + + + + + + +
+ +
+ + + + + + + + + + + + + + + +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ + + + + +
+ +
+ + + + +
+ +
+ + + + +
+ +
+ + + + + + +
+ +
+ + + + + +
+ + +
+ +
+ + + diff --git a/conf/airframes/OPENUAS/openuas_itsybitsy.xml b/conf/airframes/OPENUAS/openuas_itsybitsy.xml new file mode 100644 index 0000000000..8a8645b306 --- /dev/null +++ b/conf/airframes/OPENUAS/openuas_itsybitsy.xml @@ -0,0 +1,262 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + +
+ +
+ + + + + + + + + + + + + + + + + + + + +
+ +
+ + + + + + +
+ +
+ + + + + +
+ +
+ + + + + + + + + + + +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+
+ +
+ + + + +
+ +
+ + + +
+ +
+ + + +
+ +
+ + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/conf/airframes/OPENUAS/openuas_leapfrogeye.xml b/conf/airframes/OPENUAS/openuas_leapfrogeye.xml new file mode 100644 index 0000000000..38cb965cea --- /dev/null +++ b/conf/airframes/OPENUAS/openuas_leapfrogeye.xml @@ -0,0 +1,261 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + +
+ + + + + + + + + +
+ + + +
+ +
+ + + + + + + + + + + + + + + + +
+ + + +
+ + + + + + +
+ +
+ + +
+ +
+ + + + + + + + + + + + + + + + + + + + + + +
+ +
+ + + + + + + +
+ +
+ + + + + + + + + + + + + + + +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ + + + + +
+ +
+ + + + + + + + +
+ +
+ + +
+ +
+ + + +
+ +
+ + + + + + +
+ +
+ + + + + +
+ diff --git a/conf/airframes/OPENUAS/openuas_mentor.xml b/conf/airframes/OPENUAS/openuas_mentor.xml new file mode 100644 index 0000000000..16cea1c3fe --- /dev/null +++ b/conf/airframes/OPENUAS/openuas_mentor.xml @@ -0,0 +1,261 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + +
+ + + + + + + + + +
+ + +
+ +
+ + + + + + +
+ + + +
+ + + + + + + + + + + +
+ +
+ + + + +
+ +
+ + +
+ + + +
+ + + + + + + + + + + + +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + +
+ + + + +
+ +
+ + + + + + + + +
+ +
+ + + + + +
+ +
+ + + +
+ +
+ + +
+ +
+ + + + + + + +
+ + diff --git a/conf/airframes/OPENUAS/openuas_moksha.xml b/conf/airframes/OPENUAS/openuas_moksha.xml new file mode 100644 index 0000000000..743657c1f2 --- /dev/null +++ b/conf/airframes/OPENUAS/openuas_moksha.xml @@ -0,0 +1,579 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + +
+ +
+ + + +
+ + + + + + + + + + + + + + + + + + + + + + + +
+ + +
+ + +
+ + + + + + +
+ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + +
+ + +
+ + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + +
+ + + + + + + + + + + + + + + + + + + +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + +
+ +
+ + +
+ + + +
+ +
+ +
+ + + diff --git a/conf/airframes/OPENUAS/openuas_psi.xml b/conf/airframes/OPENUAS/openuas_psi.xml new file mode 100644 index 0000000000..d68b87e16c --- /dev/null +++ b/conf/airframes/OPENUAS/openuas_psi.xml @@ -0,0 +1,270 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + +
+ + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + +
+ + + +
+ + + + + + +
+ +
+ + +
+ +
+ + + + + + + + + + + + + + + + + + + + + + +
+ +
+ + + + + + + +
+ +
+ + + + + + + + + + + + + + + +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ + + + + +
+ +
+ + + + + + + +
+ +
+ + + + +
+ +
+ + + + + + +
+ +
+ + + + + +
+ diff --git a/conf/airframes/OPENUAS/openuas_taxiiii.xml b/conf/airframes/OPENUAS/openuas_taxiiii.xml new file mode 100644 index 0000000000..2de950ce22 --- /dev/null +++ b/conf/airframes/OPENUAS/openuas_taxiiii.xml @@ -0,0 +1,376 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + +
+ + + + + + + + + + +
+ + + + + +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ + + + + + + + + + + + + + + + + +
+ +
+ + + + + + + + + + + + + + + + + + + + + +
+ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + +
+ + + + + + + + + + + + + + + + + + + +
+ +
+ + +
+ + +
+ + + + + + + + +
+ + +
+ + + + + +
+ + +
+ + +
+ + +
+ +
+ + + diff --git a/conf/airframes/OpenUAS/openuas_vivify_mk1.xml b/conf/airframes/OPENUAS/openuas_vivify.xml similarity index 99% rename from conf/airframes/OpenUAS/openuas_vivify_mk1.xml rename to conf/airframes/OPENUAS/openuas_vivify.xml index 91f9b997d2..7002f0ed0f 100644 --- a/conf/airframes/OpenUAS/openuas_vivify_mk1.xml +++ b/conf/airframes/OPENUAS/openuas_vivify.xml @@ -1,7 +1,7 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + +
+ + + + + + + + + +
+ + + + + + + + + + + + + + + +
+ +
+ + + + + +
+ +
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + +
+ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ + + + + +
+ +
+ + + + + + +
+ +
+ + + + + +
+ +
+ + + +
+ +
+ + + + +
+ + diff --git a/conf/boards/px4fmu_2.4.makefile b/conf/boards/px4fmu_2.4.makefile new file mode 100644 index 0000000000..9301b7424a --- /dev/null +++ b/conf/boards/px4fmu_2.4.makefile @@ -0,0 +1,57 @@ +# Hey Emacs, this is a -*- makefile -*- +# +# px4fmu_2.4.makefile +# +# This is for the main MCU (STM32F427) on the pixhawk board +# See https://pixhawk.org/modules/pixhawk for details +# + +BOARD=px4fmu +BOARD_VERSION=2.4 +BOARD_CFG=\"boards/$(BOARD)_$(BOARD_VERSION).h\" + +ARCH=stm32 +ARCH_L=f4 +ARCH_DIR=stm32 +SRC_ARCH=arch/$(ARCH_DIR) +$(TARGET).ARCHDIR = $(ARCH) +$(TARGET).LDSCRIPT=$(SRC_ARCH)/px4fmu_2.4.ld + +HARD_FLOAT=yes + +# default flash mode is via usb dfu bootloader +# possibilities: DFU, SWD +FLASH_MODE ?= SWD + + +# +# default LED configuration +# +RADIO_CONTROL_LED ?= none +BARO_LED ?= none +AHRS_ALIGNER_LED ?= none +GPS_LED ?= none +SYS_TIME_LED ?= 1 + +# +# default UART configuration (modem, gps, spektrum) +# + +MODEM_PORT ?= UART2 +MODEM_BAUD ?= B57600 + +GPS_PORT ?= UART4 +GPS_BAUD ?= B38400 + +RADIO_CONTROL_SPEKTRUM_PRIMARY_PORT ?= UART2 + + +# +# default actuator configuration +# +# you can use different actuators by adding a configure option to your firmware section +# e.g. +# +ACTUATORS ?= actuators_pwm diff --git a/conf/flight_plans/OpenUAS/include_obc2014_mission.xml b/conf/flight_plans/OPENUAS/include_obc2014_mission.xml similarity index 98% rename from conf/flight_plans/OpenUAS/include_obc2014_mission.xml rename to conf/flight_plans/OPENUAS/include_obc2014_mission.xml index 2bf5828f2a..e6cb393753 100644 --- a/conf/flight_plans/OpenUAS/include_obc2014_mission.xml +++ b/conf/flight_plans/OPENUAS/include_obc2014_mission.xml @@ -1,5 +1,5 @@ - - + @@ -315,7 +317,7 @@ to “Airfield Home” and orbit for either a landing or regain of Data Link. ***************************************************** --> diff --git a/conf/flight_plans/OpenUAS/include_obc2014_safety.xml b/conf/flight_plans/OPENUAS/include_obc2014_safety.xml similarity index 100% rename from conf/flight_plans/OpenUAS/include_obc2014_safety.xml rename to conf/flight_plans/OPENUAS/include_obc2014_safety.xml diff --git a/conf/flight_plans/OpenUAS/include_obc2014_testing.xml b/conf/flight_plans/OPENUAS/include_obc2014_testing.xml similarity index 100% rename from conf/flight_plans/OpenUAS/include_obc2014_testing.xml rename to conf/flight_plans/OPENUAS/include_obc2014_testing.xml diff --git a/conf/flight_plans/OPENUAS/openuas_nav_modules_test.xml b/conf/flight_plans/OPENUAS/openuas_nav_modules_test.xml new file mode 100644 index 0000000000..c3de7f2d78 --- /dev/null +++ b/conf/flight_plans/OPENUAS/openuas_nav_modules_test.xml @@ -0,0 +1,141 @@ + + + +
+#include "subsystems/datalink/datalink.h" +#include "modules/digital_cam/dc.h" +#define LINE_START_FUNCTION dc_Survey(40); +#define LINE_STOP_FUNCTION dc_autoshoot = DC_AUTOSHOOT_STOP; +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/conf/flight_plans/OpenUAS/openuas_obc2014_kingaroy.xml b/conf/flight_plans/OPENUAS/openuas_obc2014_kingaroy.xml similarity index 100% rename from conf/flight_plans/OpenUAS/openuas_obc2014_kingaroy.xml rename to conf/flight_plans/OPENUAS/openuas_obc2014_kingaroy.xml diff --git a/conf/flight_plans/OPENUAS/openuas_rotorcraft_simple.xml b/conf/flight_plans/OPENUAS/openuas_rotorcraft_simple.xml new file mode 100644 index 0000000000..86eaa90ebe --- /dev/null +++ b/conf/flight_plans/OPENUAS/openuas_rotorcraft_simple.xml @@ -0,0 +1,146 @@ + + + + + +
+ +//Set Generic options + #include "autopilot.h" +//Enable AHRS Health test functions + #include "subsystems/ahrs/ahrs_aligner.h" +//Enable advanced electrical power functions + #include "subsystems/electrical.h" +//Enable datalink tests + #include "subsystems/datalink/datalink.h" +#include "firmwares/rotorcraft/guidance/guidance_v.h" + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/conf/flight_plans/OPENUAS/openuas_tuning_a_fresh_fixedwing.xml b/conf/flight_plans/OPENUAS/openuas_tuning_a_fresh_fixedwing.xml new file mode 100644 index 0000000000..98ab86fdf5 --- /dev/null +++ b/conf/flight_plans/OPENUAS/openuas_tuning_a_fresh_fixedwing.xml @@ -0,0 +1,341 @@ + + + + + + +
+#include "subsystems/navigation/nav_line.h" +#include "datalink.h" +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/conf/gcs/OPENUAS/openuas_papgets.xml b/conf/gcs/OPENUAS/openuas_papgets.xml new file mode 100644 index 0000000000..5c2eb1c29b --- /dev/null +++ b/conf/gcs/OPENUAS/openuas_papgets.xml @@ -0,0 +1,73 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/conf/gcs/OPENUAS/openuas_papgets_small.xml b/conf/gcs/OPENUAS/openuas_papgets_small.xml new file mode 100644 index 0000000000..1fef213c06 --- /dev/null +++ b/conf/gcs/OPENUAS/openuas_papgets_small.xml @@ -0,0 +1,73 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/conf/gcs/OPENUAS/openuas_r.xml b/conf/gcs/OPENUAS/openuas_r.xml new file mode 100644 index 0000000000..85e1a387f4 --- /dev/null +++ b/conf/gcs/OPENUAS/openuas_r.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/conf/joystick/OPENUAS/openuas_aeroflycable.xml b/conf/joystick/OPENUAS/openuas_aeroflycable.xml new file mode 100644 index 0000000000..1ad05b52ba --- /dev/null +++ b/conf/joystick/OPENUAS/openuas_aeroflycable.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + diff --git a/conf/joystick/OPENUAS/trust_qz_501_predator.xml b/conf/joystick/OPENUAS/trust_qz_501_predator.xml new file mode 100644 index 0000000000..86249d8fec --- /dev/null +++ b/conf/joystick/OPENUAS/trust_qz_501_predator.xml @@ -0,0 +1,38 @@ + + + + + + +