rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-01 09:24:10 +01:00
Code Issues Releases Activity

Fixed setting of PipX description, and changed gcs receiver object to be update on change on flight side so that it works on the PipX.

Browse Source
This commit is contained in:
Brian Webb 2012-05-19 09:25:11 -07:00
parent 00a83f3984
commit 6a7179120d
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
flight/Modules/RadioComBridge/RadioComBridge.c
View File

@ -330,7 +330,8 @@ static void comUAVTalkTask(void *parameters)
if (state == UAVTALK_STATE_COMPLETE) if (state == UAVTALK_STATE_COMPLETE)
{ {
// Is this a local UAVObject? // Is this a local UAVObject?
if (iproc->obj != NULL) // We only generate GcsReceiver ojects, we don't consume them.
if ((iproc->obj != NULL) && (iproc->objId != GCSRECEIVER_OBJID))
{ {
// We treat the ObjectPersistence object differently // We treat the ObjectPersistence object differently
if(iproc->objId == OBJECTPERSISTENCE_OBJID) if(iproc->objId == OBJECTPERSISTENCE_OBJID)
@ -691,7 +692,6 @@ static void radioStatusTask(void *parameters)
PipXSettingsPairIDGet(&pairID); PipXSettingsPairIDGet(&pairID);
// Update the status // Update the status
PIOS_BL_HELPER_FLASH_Read_Description(pipxStatus.Description, PIPXSTATUS_DESCRIPTION_NUMELEM);
pipxStatus.DeviceID = PIOS_RFM22B_DeviceID(pios_rfm22b_id); pipxStatus.DeviceID = PIOS_RFM22B_DeviceID(pios_rfm22b_id);
pipxStatus.RSSI = PIOS_RFM22B_RSSI(pios_rfm22b_id); pipxStatus.RSSI = PIOS_RFM22B_RSSI(pios_rfm22b_id);
pipxStatus.Retries = data->comTxRetries; pipxStatus.Retries = data->comTxRetries;

2
shared/uavobjectdefinition/gcsreceiver.xml
View File

@ -4,7 +4,7 @@
<field name="Channel" units="us" type="uint16" elements="6"/> <field name="Channel" units="us" type="uint16" elements="6"/>
<access gcs="readwrite" flight="readwrite"/> <access gcs="readwrite" flight="readwrite"/>
<telemetrygcs acked="false" updatemode="onchange" period="0"/> <telemetrygcs acked="false" updatemode="onchange" period="0"/>
<telemetryflight acked="false" updatemode="manual" period="0"/> <telemetryflight acked="false" updatemode="onchange" period="0"/>
<logging updatemode="manual" period="0"/> <logging updatemode="manual" period="0"/>
</object> </object>
</xml> </xml>