rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-18 08:54:15 +01:00
Code Issues Releases Activity

Merge branch 'steve/OP-1289_two_telemetry_streams' into steve/OP-1803_s.bus_dropped_frames

Browse Source 
Update with taskinfo update
This commit is contained in:
Steve Evans 2015-04-03 12:46:12 +01:00
commit 2843715432
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
flight/modules/Telemetry/telemetry.c
View File

@ -32,7 +32,7 @@
/* Telemetry uses four tasks. Two are created for the main telemetry
* stream called "TelTx" and "TelRx". Two are created to handle the OPLink
* radio connection, called "RadioTx" and "Radio Rx", the latter being
* radio connection, called "RadioTx" and "RadioRx", the latter being
* overridden by USB if connected.
*
* The following code uses a "local" prefix to refer to the telemetry channel
@ -193,7 +193,7 @@ int32_t TelemetryStart(void)
&radioChannel,
TASK_PRIORITY_RADTX,
&radioChannel.txTaskHandle);
PIOS_TASK_MONITOR_RegisterTask(TASKINFO_RUNNING_TELEMETRYTX,
PIOS_TASK_MONITOR_RegisterTask(TASKINFO_RUNNING_RADIOTX,
radioChannel.txTaskHandle);
xTaskCreate(telemetryRxTask,
"RadioRx",

9
shared/uavobjectdefinition/taskinfo.xml
View File

@ -23,8 +23,9 @@
<!-- telemetry -->
<elementname>TelemetryTx</elementname>
<elementname>TelemetryRx</elementname>
<!-- com -->
<elementname>RadioTx</elementname>
<elementname>RadioRx</elementname>
<!-- com -->
<elementname>Com2UsbBridge</elementname>
<elementname>Usb2ComBridge</elementname>
<!-- optional -->
@ -54,8 +55,9 @@
<!-- telemetry -->
<elementname>TelemetryTx</elementname>
<elementname>TelemetryRx</elementname>
<!-- com -->
<elementname>RadioTx</elementname>
<elementname>RadioRx</elementname>
<!-- com -->
<elementname>Com2UsbBridge</elementname>
<elementname>Usb2ComBridge</elementname>
<!-- optional -->
@ -89,8 +91,9 @@
<!-- telemetry -->
<elementname>TelemetryTx</elementname>
<elementname>TelemetryRx</elementname>
<!-- com -->
<elementname>RadioTx</elementname>
<elementname>RadioRx</elementname>
<!-- com -->
<elementname>Com2UsbBridge</elementname>
<elementname>Usb2ComBridge</elementname>
<!-- optional -->