rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-03-15 07:29:15 +01:00
Code Issues Releases Activity

Merged in f5soh/librepilot/next_fix (pull request #195)

Browse Source 
Next_fix
This commit is contained in:
Lalanne Laurent 2016-03-12 19:50:19 +01:00
commit 52d1c2d517
9 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
flight/modules/OPLink/oplinkmod.c
View File

@ -146,7 +146,7 @@ static void systemTask(__attribute__((unused)) void *parameters)
OPLinkStatusGet(&oplinkStatus); OPLinkStatusGet(&oplinkStatus);
// Get the other device stats. // Get the other device stats.
PIOS_RFM2B_GetPairStats(pios_rfm22b_id, oplinkStatus.PairIDs, oplinkStatus.PairSignalStrengths, OPLINKSTATUS_PAIRIDS_NUMELEM); PIOS_RFM22B_GetPairStats(pios_rfm22b_id, oplinkStatus.PairIDs, oplinkStatus.PairSignalStrengths, OPLINKSTATUS_PAIRIDS_NUMELEM);
// Get the stats from the radio device // Get the stats from the radio device
struct rfm22b_stats radio_stats; struct rfm22b_stats radio_stats;

2
flight/modules/System/systemmod.c
View File

@ -269,7 +269,7 @@ static void systemTask(__attribute__((unused)) void *parameters)
if (pios_rfm22b_id) { if (pios_rfm22b_id) {
// Get the other device stats. // Get the other device stats.
PIOS_RFM2B_GetPairStats(pios_rfm22b_id, oplinkStatus.PairIDs, oplinkStatus.PairSignalStrengths, OPLINKSTATUS_PAIRIDS_NUMELEM); PIOS_RFM22B_GetPairStats(pios_rfm22b_id, oplinkStatus.PairIDs, oplinkStatus.PairSignalStrengths, OPLINKSTATUS_PAIRIDS_NUMELEM);
// Get the stats from the radio device // Get the stats from the radio device
struct rfm22b_stats radio_stats; struct rfm22b_stats radio_stats;

2
flight/pios/common/pios_rfm22b.c
View File

@ -682,7 +682,7 @@ void PIOS_RFM22B_GetStats(uint32_t rfm22b_id, struct rfm22b_stats *stats)
* @param[in] mx_pairs The length of the pdevice_ids and RSSIs arrays. * @param[in] mx_pairs The length of the pdevice_ids and RSSIs arrays.
* @return The number of pair stats returned. * @return The number of pair stats returned.
*/ */
uint8_t PIOS_RFM2B_GetPairStats(uint32_t rfm22b_id, uint32_t *device_ids, int8_t *RSSIs, uint8_t max_pairs) uint8_t PIOS_RFM22B_GetPairStats(uint32_t rfm22b_id, uint32_t *device_ids, int8_t *RSSIs, uint8_t max_pairs)
{ {
struct pios_rfm22b_dev *rfm22b_dev = (struct pios_rfm22b_dev *)rfm22b_id; struct pios_rfm22b_dev *rfm22b_dev = (struct pios_rfm22b_dev *)rfm22b_id;

2
flight/pios/inc/pios_rfm22b.h
View File

@ -107,7 +107,7 @@ extern void PIOS_RFM22B_SetChannelConfig(uint32_t rfm22b_id, enum rfm22b_datarat
extern void PIOS_RFM22B_SetCoordinatorID(uint32_t rfm22b_id, uint32_t coord_id); extern void PIOS_RFM22B_SetCoordinatorID(uint32_t rfm22b_id, uint32_t coord_id);
extern uint32_t PIOS_RFM22B_DeviceID(uint32_t rfb22b_id); extern uint32_t PIOS_RFM22B_DeviceID(uint32_t rfb22b_id);
extern void PIOS_RFM22B_GetStats(uint32_t rfm22b_id, struct rfm22b_stats *stats); extern void PIOS_RFM22B_GetStats(uint32_t rfm22b_id, struct rfm22b_stats *stats);
extern uint8_t PIOS_RFM2B_GetPairStats(uint32_t rfm22b_id, uint32_t *device_ids, int8_t *RSSIs, uint8_t max_pairs); extern uint8_t PIOS_RFM22B_GetPairStats(uint32_t rfm22b_id, uint32_t *device_ids, int8_t *RSSIs, uint8_t max_pairs);
extern bool PIOS_RFM22B_InRxWait(uint32_t rfb22b_id); extern bool PIOS_RFM22B_InRxWait(uint32_t rfb22b_id);
extern bool PIOS_RFM22B_LinkStatus(uint32_t rfm22b_id); extern bool PIOS_RFM22B_LinkStatus(uint32_t rfm22b_id);
extern bool PIOS_RFM22B_ReceivePacket(uint32_t rfm22b_id, uint8_t *p); extern bool PIOS_RFM22B_ReceivePacket(uint32_t rfm22b_id, uint8_t *p);

2
ground/gcs/src/libs/osgearth/osgQtQuick/OSGGeoTransformNode.cpp
View File

@ -31,7 +31,7 @@
#include <osg/ComputeBoundsVisitor> #include <osg/ComputeBoundsVisitor>
#include <osgearth/GeoTransform> #include <osgEarth/GeoTransform>
#include <osgEarth/MapNode> #include <osgEarth/MapNode>
#include <osgEarth/GeoData> #include <osgEarth/GeoData>

2
ground/gcs/src/libs/osgearth/osgQtQuick/OSGNode.cpp
View File

@ -30,7 +30,7 @@
#include <osg/Node> #include <osg/Node>
#include <osg/NodeVisitor> #include <osg/NodeVisitor>
#include <qDebug> #include <QDebug>
namespace osgQtQuick { namespace osgQtQuick {
class OSGNode; class OSGNode;

6
ground/gcs/src/plugins/pfdqml/pfdqmlcontext.cpp
View File

@ -280,12 +280,10 @@ void PfdQmlContext::loadConfiguration(PfdQmlGadgetConfiguration *config)
void PfdQmlContext::saveState(QSettings *settings) void PfdQmlContext::saveState(QSettings *settings)
{ {}
}
void PfdQmlContext::restoreState(QSettings *settings) void PfdQmlContext::restoreState(QSettings *settings)
{ {}
}
void PfdQmlContext::apply(QQmlContext *context) void PfdQmlContext::apply(QQmlContext *context)
{ {