Skip to content

Commit

Permalink
Modifications in the mission computer
Browse files Browse the repository at this point in the history
  • Loading branch information
podhrmic committed Jan 10, 2018
1 parent 74ea249 commit e52968b
Show file tree
Hide file tree
Showing 5 changed files with 118 additions and 4 deletions.
4 changes: 3 additions & 1 deletion conf/airframes/examples/bixler_lisa_m_2.xml
Expand Up @@ -28,7 +28,9 @@
<define name="USE_MAGNETOMETER" value="FALSE"/>

<module name="radio_control" type="ppm"/>
<module name="telemetry" type="transparent"/>
<module name="telemetry" type="transparent">
<configure name="MODEM_HOST" value="192.168.41.50"/>
</module>
<module name="control"/>
<module name="imu" type="aspirin_v2.1"/>
<module name="ahrs" type="float_dcm"/>
Expand Down
2 changes: 1 addition & 1 deletion conf/conf_example.xml
Expand Up @@ -28,7 +28,7 @@
radio="radios/cockpitSX.xml"
telemetry="telemetry/default_fixedwing.xml"
flight_plan="flight_plans/mission_fw.xml"
settings="settings/fixedwing_basic.xml settings/nps.xml"
settings="settings/fixedwing_basic.xml [settings/nps.xml]"
settings_modules="modules/nav_basic_fw.xml modules/gps.xml modules/ahrs_float_dcm.xml modules/imu_common.xml modules/guidance_basic_fw.xml modules/stabilization_attitude_fw.xml"
gui_color="#8ef3f705ffff"
/>
Expand Down
112 changes: 112 additions & 0 deletions conf/control_panel_mission.xml
Expand Up @@ -84,6 +84,9 @@
<arg flag="--prop:/sim/model/path=Models/Aircraft/paparazzi/minion.xml"/>
<arg flag="--enable-terrasync"/>
</program>
<program name="RustLink" command="sw/ext/rustlink/link">
<arg flag="-d" constant="/dev/ttyUSB0"/>
</program>
</section>

<section name="sessions">
Expand Down Expand Up @@ -265,6 +268,7 @@
</program>
</session>


<session name="Mission simulation: GCS and Flight Computer">
<!-- Flight computer
Ivy bus on separate for for NPS messages
Expand Down Expand Up @@ -315,6 +319,7 @@
</session>



<session name="Mission simulation: Mission Computer">
<!-- Mission computer
Ivy bus on separate for for NPS messages
Expand Down Expand Up @@ -355,6 +360,7 @@




<session name="Mission simulation: All in one">
<!-- Flight computer
Ivy bus on separate for for NPS messages
Expand All @@ -372,6 +378,111 @@
<arg flag="--fg_fdm" constant=""/>
</program>

<!-- Mission computer
Ivy bus on separate for for NPS messages
bus: 127.255.255.255:8484
port out: 4243 (to Flight computer)
port in: 4242 (from Flight computer)
port out: 4244 (to GCS)
port in: 4245 (from GCS)
- data link to flight computer
- ivy logger
- link forwarder to GCS
-->
<program name="RustLink">
<arg flag="-b" constant="127.255.255.255:8484"/>
<arg flag="--udp"/>
<arg flag="--udp_port" constant="4242"/>
<arg flag="--udp_uplink_port" constant="4243"/>
<arg flag="--ping_period" constant="0"/>
<arg flag="--status_period" constant="0"/>
<arg flag="--sender_id" constant="0"/>
<arg flag="-v" constant="1.0"/>
<arg flag="-n" constant="MISSION_LINK"/>
</program>

<program name="Ivy Logger">
<arg flag="-b" constant="127.255.255.255:8484"/>
</program>

<program name="Mission Planner">
<arg flag="-b" constant="127.255.255.255:8484"/>
<arg flag="-a" constant="2"/>
</program>



<!--
<program name="Link Forwarder">
<arg flag="-b" constant="127.255.255.255:8484"/>
<arg flag="-d" constant="4245"/>
<arg flag="-u" constant="4244"/>
</program> -->
<program name="RustLink">
<arg flag="-b" constant="127.255.255.255:8484"/>
<arg flag="--udp"/>
<arg flag="--udp_port" constant="4245"/>
<arg flag="--udp_uplink_port" constant="4244"/>
<arg flag="--rx_msg_class" constant="datalink"/>
<arg flag="--sender_id" constant="2"/>
<arg flag="--ping_period" constant="0"/>
<arg flag="--status_period" constant="0"/>
<arg flag="-v" constant="1.0"/>
<arg flag="-n" constant="FORWARDER"/>
</program>

<!-- GCS computer
Ivy bus on separate for for NPS messages
bus: 127.255.255.255:2010
port out: 4244 (to Mission computer)
port in: 4245 (from Mission computer)
- data link to mission computer
- GCS
- server
- messages
-->
<program name="RustLink">
<arg flag="-b" constant="127.255.255.255:2010"/>
<arg flag="--udp"/>
<arg flag="--udp_port" constant="4244"/>
<arg flag="--udp_uplink_port" constant="4245"/>
<arg flag="--ping_period" constant="1000"/>
<arg flag="--status_period" constant="1000"/>
<arg flag="-v" constant="1.0"/>
<arg flag="-n" constant="DATALINK"/>
</program>
<program name="Server">
<arg flag="-b" constant="127.255.255.255:2010"/>
</program>
<program name="GCS">
<arg flag="-b" constant="127.255.255.255:2010"/>
</program>
<program name="Messages">
<arg flag="-c" constant="datalink"/>
<arg flag="-c" constant="ground"/>
<arg flag="-b" constant="127.255.255.255:2010"/>
</program>
</session>



<session name="Mission simulation: All in one (Link)">
<!-- Flight computer
Ivy bus on separate for for NPS messages
bus: 127.255.255.255:2222
port out: 4242
port in: 4243
- simulator, nodisplay
-->
<program name="Simulator">
<arg flag="-a" constant="@AIRCRAFT"/>
<arg flag="-b" constant="127.255.255.255:2222"/>
<arg flag="-t" constant="nps"/>
<arg flag="--nodisplay"/>
<arg flag="-f" constant="127.0.0.1"/>
<arg flag="--fg_fdm" constant=""/>
</program>

<!-- Mission computer
Ivy bus on separate for for NPS messages
bus: 127.255.255.255:8484
Expand Down Expand Up @@ -439,6 +550,7 @@
</program>
</session>


</section>

</control_panel>
2 changes: 1 addition & 1 deletion sw/ext/ivy-cpp
Submodule ivy-cpp updated 1 files
+2 −2 testIvy.cxx
2 changes: 1 addition & 1 deletion sw/ext/rustlink
Submodule rustlink updated 3 files
+11 −1 src/comms.rs
+55 −4 src/configs.rs
+36 −32 src/main.rs

0 comments on commit e52968b

Please sign in to comment.