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

Uncrustify

Browse Source
This commit is contained in:
Alessio Morale 2014-04-01 22:58:23 +02:00
parent e964c863eb
commit 8bb1d0148c
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
flight/modules/RadioComBridge/RadioComBridge.c
View File

@ -298,8 +298,8 @@ static void updateRadioComBridgeStats()
// Get stats object data // Get stats object data
RadioComBridgeStatsGet(&radioComBridgeStats); RadioComBridgeStatsGet(&radioComBridgeStats);
radioComBridgeStats.TelemetryTxRetries = data->telemetryTxRetries; radioComBridgeStats.TelemetryTxRetries = data->telemetryTxRetries;
radioComBridgeStats.RadioTxRetries = data->radioTxRetries; radioComBridgeStats.RadioTxRetries = data->radioTxRetries;
// Update stats object // Update stats object
radioComBridgeStats.TelemetryTxBytes += telemetryUAVTalkStats.txBytes; radioComBridgeStats.TelemetryTxBytes += telemetryUAVTalkStats.txBytes;
@ -310,13 +310,13 @@ static void updateRadioComBridgeStats()
radioComBridgeStats.TelemetryRxSyncErrors += telemetryUAVTalkStats.rxSyncErrors; radioComBridgeStats.TelemetryRxSyncErrors += telemetryUAVTalkStats.rxSyncErrors;
radioComBridgeStats.TelemetryRxCrcErrors += telemetryUAVTalkStats.rxCrcErrors; radioComBridgeStats.TelemetryRxCrcErrors += telemetryUAVTalkStats.rxCrcErrors;
radioComBridgeStats.RadioTxBytes += radioUAVTalkStats.txBytes; radioComBridgeStats.RadioTxBytes += radioUAVTalkStats.txBytes;
radioComBridgeStats.RadioTxFailures += radioUAVTalkStats.txErrors; radioComBridgeStats.RadioTxFailures += radioUAVTalkStats.txErrors;
radioComBridgeStats.RadioRxBytes += radioUAVTalkStats.rxBytes; radioComBridgeStats.RadioRxBytes += radioUAVTalkStats.rxBytes;
radioComBridgeStats.RadioRxFailures += radioUAVTalkStats.rxErrors; radioComBridgeStats.RadioRxFailures += radioUAVTalkStats.rxErrors;
radioComBridgeStats.RadioRxSyncErrors += radioUAVTalkStats.rxSyncErrors; radioComBridgeStats.RadioRxSyncErrors += radioUAVTalkStats.rxSyncErrors;
radioComBridgeStats.RadioRxCrcErrors += radioUAVTalkStats.rxCrcErrors; radioComBridgeStats.RadioRxCrcErrors += radioUAVTalkStats.rxCrcErrors;
// Update stats object data // Update stats object data
RadioComBridgeStatsSet(&radioComBridgeStats); RadioComBridgeStatsSet(&radioComBridgeStats);

4
ground/openpilotgcs/src/plugins/systemhealth/systemhealthgadgetwidget.cpp
View File

@ -111,9 +111,9 @@ void SystemHealthGadgetWidget::updateAlarms(UAVObject *systemAlarm)
if (m_renderer->elementExists(element2)) { if (m_renderer->elementExists(element2)) {
// element2 is in global coordinates // element2 is in global coordinates
// transform its matrix into the coordinates of background // transform its matrix into the coordinates of background
QMatrix blockMatrix = backgroundMatrix * m_renderer->matrixForElement(element2); QMatrix blockMatrix = backgroundMatrix * m_renderer->matrixForElement(element2);
// use this composed projection to get the position in background coordinates // use this composed projection to get the position in background coordinates
QRectF rectProjected = blockMatrix.mapRect(m_renderer->boundsOnElement(element2)); QRectF rectProjected = blockMatrix.mapRect(m_renderer->boundsOnElement(element2));
QGraphicsSvgItem *ind = new QGraphicsSvgItem(); QGraphicsSvgItem *ind = new QGraphicsSvgItem();
ind->setSharedRenderer(m_renderer); ind->setSharedRenderer(m_renderer);