Merge branch 'master' into simple-offboard-refactored

This commit is contained in:
Oleg Kalachev
2018-03-19 20:45:20 +03:00
235 changed files with 769 additions and 563 deletions

View File

@@ -17,6 +17,7 @@
<!-- gcs bridge -->
<param name="gcs_url" value="tcp-l://0.0.0.0:5760" if="$(eval gcs_bridge == 'tcp')"/>
<param name="gcs_url" value="udp://@192.168.11.14:14550" if="$(eval gcs_bridge == 'udp')"/> <!-- TODO: fix -->
<param name="gcs_url" value="udp-b://192.168.11.1:14550@" if="$(eval gcs_bridge == 'udp-b')"/>
<param name="gcs_url" value="" if="$(eval not gcs_bridge)"/>
<!-- default px4 params -->