Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-05-27 17:06:31 +08:00
Code Issues Actions 28 Packages Projects Releases Wiki Activity

Galois Embedded Crypto module updates (#2235)

Browse Source 
* Bump rustlink

* Changes in GEC, now communication and key exchange works. TODO is key renegotiation and some cleanup

* Bump pprzlink

* Update in GEC and related control panel configs

* Updated name

* Bump rustlink

* Changes in GEC, now communication and key exchange works. TODO is key renegotiation and some cleanup

* Bump pprzlink

* Update in GEC and related control panel configs

* Update atomic settings

* Minor changes, style fix

* Code style fix

* More code style fix
This commit is contained in:
Michal Podhradsky
2018-02-12 16:36:11 -08:00
committed by GitHub
parent 1f85390422
commit 4e80b97050
10 changed files with 742 additions and 369 deletions
Download Patch File Download Diff File Expand all files Collapse all files
conf/airframes/AGGIEAIR/aggieair_atomic_lia.xml
+4 -3
View File
@@ -11,8 +11,8 @@ AggieAir Atomic Tangerine
<module name="radio_control" type="sbus">
<configure name="SBUS_PORT" value="UART5"/>
</module>
<configure name="HAS_LUFTBOOT" value="0"/>
<configure name="FLASH_MODE" value="SWD"/>
<configure name="HAS_LUFTBOOT" value="1"/>
<configure name="FLASH_MODE" value="DFU"/>
</target>
<!-- NOTE: if you want to use extra_dl module for HITL
@@ -39,9 +39,10 @@ AggieAir Atomic Tangerine
<module name="control"/>
<module name="navigation"/>
<module name="telemetry" type="transparent">
<module name="telemetry" type="transparent_gec">
<configure name="MODEM_PORT" value="UART3"/>
<configure name="MODEM_BAUD" value="B57600"/>
<define name="GEC_STATUS_LED" value="5"/>
</module>
<module name="ins" type="vectornav">
conf/airframes/AGGIEAIR/aggieair_conf.xml
-1
View File
@@ -31,7 +31,6 @@
settings="settings/fixedwing_basic.xml settings/nps.xml"
settings_modules="modules/battery_monitor.xml modules/lidar_sf11.xml modules/nav_skid_landing.xml modules/nav_survey_poly_osam.xml modules/gps.xml modules/nav_basic_fw.xml modules/guidance_basic_fw.xml modules/stabilization_attitude_fw.xml"
gui_color="#ffff42870000"
release=""
/>
<aircraft
name="BluJay_Goose"
conf/airframes/AGGIEAIR/aggieair_control_panel.xml
+41 -1
View File
@@ -20,7 +20,7 @@
<program name="Secure Link" command="sw/ext/rustlink/link">
<arg flag="-d" constant="/dev/ttyUSB0"/>
<arg flag="-a" constant="@AC_ID"/>
<arg flag="-n" constant="@ACIRCRAFT"/>
<arg flag="-n" constant="@AIRCRAFT"/>
<arg flag="-c" />
</program>
<program name="Link Combiner" command="sw/ground_segment/python/redundant_link/link_combiner.py"/>
@@ -107,6 +107,46 @@
<program name="Real-time Plotter"/>
</session>
<session name="Secure Flight USB-serial@57600">
<program name="Secure Link">
<arg flag="-d" constant="/dev/ttyUSB0"/>
<arg flag="-s" constant="57600"/>
<arg flag="-a" constant="@AC_ID"/>
<arg flag="-n" constant="@AIRCRAFT"/>
<arg flag="-c" />
</program>
<program name="Server"/>
<program name="GCS">
<arg flag="-layout" constant="AGGIEAIR/vertical.xml"/>
</program>
<program name="Messages"/>
<program name="Real-time Plotter"/>
</session>
<session name="Secure Simulation">
<program name="Secure Link">
<arg flag="--udp"/>
<arg flag="-a" constant="@AC_ID"/>
<arg flag="-n" constant="@AIRCRAFT"/>
<arg flag="-c" />
</program>
<program name="Server">
<arg flag="-n"/>
</program>
<program name="GCS">
<arg flag="-layout" constant="AGGIEAIR/vertical.xml"/>
</program>
<program name="Simulator">
<arg flag="-a" constant="@AIRCRAFT"/>
<arg flag="-f" constant="127.0.0.1"/>
<arg flag="-b" constant="127.255.255.255"/>
<arg flag="--fg_fdm"/>
<arg flag="--nodisplay"/>
</program>
<program name="Messages"/>
<program name="Environment Simulator"/>
</session>
<session name="Flight USB-serial@115200">
<program name="Data Link">
<arg flag="-d" constant="/dev/ttyUSB0"/>
conf/modules/telemetry_transparent_secure.xml
-49
View File
@@ -1,49 +0,0 @@
<!DOCTYPE module SYSTEM "module.dtd">
<module name="telemetry_transparent_secure" dir="datalink" task="datalink">
<doc>
<description>
Telemetry using secure PPRZ protocol over UART
Similar to telemetry_transparent, except it uses message scheduling and encryption
</description>
<configure name="MODEM_PORT" value="UARTx" description="UART where the modem is connected to (UART1, UART2, etc)"/>
<configure name="MODEM_BAUD" value="B57600" description="UART baud rate"/>
</doc>
<autoload name="telemetry" type="nps"/>
<autoload name="telemetry" type="sim"/>
<autoload name="haclc"/>
<header>
<file name="spprz_dl.h"/>
</header>
<init fun="spprz_dl_init()"/>
<periodic fun="spprz_dl_periodic()" freq="PERIODIC_FREQUENCY" autorun="TRUE"/>
<event fun="spprz_dl_event()"/>
<makefile target="!fbw|sim|nps|hitl">
<configure name="MODEM_PORT" case="upper|lower"/>
<define name="USE_$(MODEM_PORT_UPPER)"/>
<define name="$(MODEM_PORT_UPPER)_BAUD" value="$(MODEM_BAUD)"/>
<define name="DOWNLINK"/>
<define name="PERIODIC_TELEMETRY"/>
<define name="DOWNLINK_DEVICE" value="$(MODEM_PORT_LOWER)"/>
<define name="PPRZ_UART" value="$(MODEM_PORT_LOWER)"/>
<define name="DOWNLINK_TRANSPORT" value="spprz_tp"/>
<define name="DATALINK" value="PPRZ"/>
<file name="spprz_dl.c"/>
<file name="downlink.c" dir="subsystems/datalink"/>
<file name="datalink.c" dir="subsystems/datalink"/>
<file name="telemetry.c" dir="subsystems/datalink"/>
<file name="secure_pprz_transport.c" dir="pprzlink/src"/>
</makefile>
<makefile target="ap" firmware="fixedwing">
<file name="fixedwing_datalink.c" dir="$(SRC_FIRMWARE)"/>
<file name="ap_downlink.c" dir="$(SRC_FIRMWARE)"/>
</makefile>
<makefile target="ap|fbw" firmware="fixedwing">
<file name="fbw_downlink.c" dir="$(SRC_FIRMWARE)"/>
</makefile>
<makefile target="ap" firmware="rotorcraft">
<file name="rotorcraft_datalink.c" dir="$(SRC_FIRMWARE)"/>
<file name="rotorcraft_telemetry.c" dir="$(SRC_FIRMWARE)"/>
</makefile>
</module>