Fix typos

parent 5fc24cfa
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#include <math.h> #include <math.h>
// Note how the Qt headers and the QGroundControl headers above are kept seperate // Note how the Qt headers and the QGroundControl headers above are kept separate
Q_LOGGING_CATEGORY(CodingStyleLog, "CodingStyleLog") Q_LOGGING_CATEGORY(CodingStyleLog, "CodingStyleLog")
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
#include "Fact.h" #include "Fact.h"
#include "UASInterface.h" #include "UASInterface.h"
// Note how the Qt headers, System, headers and the QGroundControl headers above are kept in seperate groups // Note how the Qt headers, System, headers and the QGroundControl headers above are kept in separate groups
// If you are going to use a logging category for a class it should have the same name as the class // If you are going to use a logging category for a class it should have the same name as the class
// with a suffix of Log. // with a suffix of Log.
......
...@@ -9,7 +9,7 @@ WindowsBuild { ...@@ -9,7 +9,7 @@ WindowsBuild {
# [REQUIRED] Add support for the MAVLink communications protocol. # [REQUIRED] Add support for the MAVLink communications protocol.
# Mavlink dialect is hardwired to arudpilotmega for now. The reason being # Mavlink dialect is hardwired to arudpilotmega for now. The reason being
# the current codebase supports both PX4 and APM flight stack. PX4 flight stack # the current codebase supports both PX4 and APM flight stack. PX4 flight stack
# only usese common mavlink specifications, wherease APM flight stack uses custom # only usese common mavlink specifications, whereas APM flight stack uses custom
# mavlink specifications which add to common. So by using the adupilotmega dialect # mavlink specifications which add to common. So by using the adupilotmega dialect
# QGC can support both in the same codebase. # QGC can support both in the same codebase.
# #
......
...@@ -217,7 +217,7 @@ public class ProlificSerialDriver extends CommonUsbSerialDriver { ...@@ -217,7 +217,7 @@ public class ProlificSerialDriver extends CommonUsbSerialDriver {
} }
} }
/* throw and clear an exception which occured in the status read thread */ /* throw and clear an exception which occurred in the status read thread */
IOException readStatusException = mReadStatusException; IOException readStatusException = mReadStatusException;
if (mReadStatusException != null) { if (mReadStatusException != null) {
mReadStatusException = null; mReadStatusException = null;
...@@ -288,7 +288,7 @@ public class ProlificSerialDriver extends CommonUsbSerialDriver { ...@@ -288,7 +288,7 @@ public class ProlificSerialDriver extends CommonUsbSerialDriver {
+ "available! Assuming that it is a HX device"); + "available! Assuming that it is a HX device");
mDeviceType = DEVICE_TYPE_HX; mDeviceType = DEVICE_TYPE_HX;
} catch (Exception e) { } catch (Exception e) {
Log.e(TAG, "An unexpected exception occured while trying " Log.e(TAG, "An unexpected exception occurred while trying "
+ "to detect PL2303 subtype", e); + "to detect PL2303 subtype", e);
} }
} }
...@@ -318,7 +318,7 @@ public class ProlificSerialDriver extends CommonUsbSerialDriver { ...@@ -318,7 +318,7 @@ public class ProlificSerialDriver extends CommonUsbSerialDriver {
try { try {
mReadStatusThread.join(); mReadStatusThread.join();
} catch (Exception e) { } catch (Exception e) {
Log.w(TAG, "An error occured while waiting for status read thread", e); Log.w(TAG, "An error occurred while waiting for status read thread", e);
} }
} }
} }
......
...@@ -347,7 +347,7 @@ public class UsbDeviceJNI extends QtActivity implements TextToSpeech.OnInitListe ...@@ -347,7 +347,7 @@ public class UsbDeviceJNI extends QtActivity implements TextToSpeech.OnInitListe
Log.e(TAG, "UsbIoManager instance is null"); Log.e(TAG, "UsbIoManager instance is null");
m_ioManager.put(idL, managerL); m_ioManager.put(idL, managerL);
m_Executor.submit(managerL); m_Executor.submit(managerL);
Log.i(TAG, "Port open successfull"); Log.i(TAG, "Port open successful");
return idL; return idL;
} }
} }
......
...@@ -281,7 +281,7 @@ TYPEDEF_HIDES_STRUCT = NO ...@@ -281,7 +281,7 @@ TYPEDEF_HIDES_STRUCT = NO
# causing a significant performance penality. # causing a significant performance penality.
# If the system has enough physical memory increasing the cache will improve the # If the system has enough physical memory increasing the cache will improve the
# performance by keeping more symbols in memory. Note that the value works on # performance by keeping more symbols in memory. Note that the value works on
# a logarithmic scale so increasing the size by one will rougly double the # a logarithmic scale so increasing the size by one will roughly double the
# memory usage. The cache size is given by this formula: # memory usage. The cache size is given by this formula:
# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0, # 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0,
# corresponding to a cache size of 2^16 = 65536 symbols # corresponding to a cache size of 2^16 = 65536 symbols
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<fileheader> <fileheader>
<author> Ron Jensen Aeromatic v 0.91 </author> <author> Ron Jensen Aeromatic v 0.91 </author>
<filecreationdate> 2010-03-28 </filecreationdate> <filecreationdate> 2010-03-28 </filecreationdate>
<version>$Revison: $</version> <version>$Revision: $</version>
<description> Models a EasyStar. </description> <description> Models a EasyStar. </description>
</fileheader> </fileheader>
......
Origional readme: Original readme:
************************************************************************ ************************************************************************
* MULTIPLEX Modellsport GmbH & Co. KG * * MULTIPLEX Modellsport GmbH & Co. KG *
* Neuer Weg 2, D-75223 Niefern, Germany * * Neuer Weg 2, D-75223 Niefern, Germany *
......
...@@ -127,7 +127,7 @@ tires. ...@@ -127,7 +127,7 @@ tires.
rudder which is connected to a steerable tail wheel. Use brakes only rudder which is connected to a steerable tail wheel. Use brakes only
for positive, precision ground control when necessary. for positive, precision ground control when necessary.
(3) Taxi upwind with stick back; downwind with stick foreward. When (3) Taxi upwind with stick back; downwind with stick forward. When
ground winds are in excess of 15 M.P.H., turn into wind using ailerons ground winds are in excess of 15 M.P.H., turn into wind using ailerons
in direction of turn; apply ailerons away from the turn when turning in direction of turn; apply ailerons away from the turn when turning
downwind. This procedure helps to prevent the wind "picking up" a downwind. This procedure helps to prevent the wind "picking up" a
......
...@@ -127,7 +127,7 @@ tires. ...@@ -127,7 +127,7 @@ tires.
rudder which is connected to a steerable tail wheel. Use brakes only rudder which is connected to a steerable tail wheel. Use brakes only
for positive, precision ground control when necessary. for positive, precision ground control when necessary.
(3) Taxi upwind with stick back; downwind with stick foreward. When (3) Taxi upwind with stick back; downwind with stick forward. When
ground winds are in excess of 15 M.P.H., turn into wind using ailerons ground winds are in excess of 15 M.P.H., turn into wind using ailerons
in direction of turn; apply ailerons away from the turn when turning in direction of turn; apply ailerons away from the turn when turning
downwind. This procedure helps to prevent the wind "picking up" a downwind. This procedure helps to prevent the wind "picking up" a
......
...@@ -144,7 +144,7 @@ QGCView { ...@@ -144,7 +144,7 @@ QGCView {
Connections { target: _rc13Function; onValueChanged: calcGimbalOutValues() } Connections { target: _rc13Function; onValueChanged: calcGimbalOutValues() }
Connections { target: _rc14Function; onValueChanged: calcGimbalOutValues() } Connections { target: _rc14Function; onValueChanged: calcGimbalOutValues() }
// Whenever an MNT_RC_IN_* setting is changed make sure to turn on RC targetting // Whenever an MNT_RC_IN_* setting is changed make sure to turn on RC targeting
Connections { Connections {
target: _mountRCInPan target: _mountRCInPan
onValueChanged: _mountDefaultMode.value = _mountDefaultModeRCTargetting onValueChanged: _mountDefaultMode.value = _mountDefaultModeRCTargetting
......
...@@ -51,11 +51,11 @@ Item { ...@@ -51,11 +51,11 @@ Item {
qsTr("The Main mode switch must always be assigned to a channel in order to fly") qsTr("The Main mode switch must always be assigned to a channel in order to fly")
readonly property string assistModeName: qsTr("Assist") readonly property string assistModeName: qsTr("Assist")
readonly property string assistModeDescription: qsTr("If Position Control is placed on a seperate channel from the Main mode channel, an additional 'Assist' mode is added to the Main switch. ") + readonly property string assistModeDescription: qsTr("If Position Control is placed on a separate channel from the Main mode channel, an additional 'Assist' mode is added to the Main switch. ") +
qsTr("In order for the Attitude Control/Position Control switch to be active, the Main switch must be in Assist mode.") qsTr("In order for the Attitude Control/Position Control switch to be active, the Main switch must be in Assist mode.")
readonly property string autoModeName: qsTr("Auto") readonly property string autoModeName: qsTr("Auto")
readonly property string autoModeDescription: qsTr("If Loiter is placed on a seperate channel from the Main mode channel, an additional 'Auto' mode is added to the Main switch. ") + readonly property string autoModeDescription: qsTr("If Loiter is placed on a separate channel from the Main mode channel, an additional 'Auto' mode is added to the Main switch. ") +
qsTr("In order for the Mission/Loiter switch to be active, the Main switch must be in Auto mode.") qsTr("In order for the Mission/Loiter switch to be active, the Main switch must be in Auto mode.")
readonly property string fwAcroModeName: qsTr("Stabilized") readonly property string fwAcroModeName: qsTr("Stabilized")
......
...@@ -88,7 +88,7 @@ void PX4AdvancedFlightModesController::_init(void) ...@@ -88,7 +88,7 @@ void PX4AdvancedFlightModesController::_init(void)
// PosCtl disabled so AltCtl must move back to main Mode switch // PosCtl disabled so AltCtl must move back to main Mode switch
_assistModeVisible = false; _assistModeVisible = false;
} else { } else {
// Assist mode is visible if AltCtl/PosCtl are on seperate channel from main Mode switch // Assist mode is visible if AltCtl/PosCtl are on separate channel from main Mode switch
_assistModeVisible = posCtlChannel != modeChannel; _assistModeVisible = posCtlChannel != modeChannel;
} }
...@@ -96,7 +96,7 @@ void PX4AdvancedFlightModesController::_init(void) ...@@ -96,7 +96,7 @@ void PX4AdvancedFlightModesController::_init(void)
// Loiter disabled so Mission must move back to main Mode switch // Loiter disabled so Mission must move back to main Mode switch
_autoModeVisible = false; _autoModeVisible = false;
} else { } else {
// Auto mode is visible if Mission/Loiter are on seperate channel from main Mode switch // Auto mode is visible if Mission/Loiter are on separate channel from main Mode switch
_autoModeVisible = loiterChannel != modeChannel; _autoModeVisible = loiterChannel != modeChannel;
} }
...@@ -662,7 +662,7 @@ void PX4AdvancedFlightModesController::setPosCtlModeChannelIndex(int index) ...@@ -662,7 +662,7 @@ void PX4AdvancedFlightModesController::setPosCtlModeChannelIndex(int index)
// PosCtl disabled so AltCtl must move back to main Mode switch // PosCtl disabled so AltCtl must move back to main Mode switch
_assistModeVisible = false; _assistModeVisible = false;
} else { } else {
// Assist mode is visible if AltCtl/PosCtl are on seperate channel from main Mode switch // Assist mode is visible if AltCtl/PosCtl are on separate channel from main Mode switch
_assistModeVisible = channel != getParameterFact(-1, "RC_MAP_MODE_SW")->rawValue().toInt(); _assistModeVisible = channel != getParameterFact(-1, "RC_MAP_MODE_SW")->rawValue().toInt();
} }
...@@ -684,7 +684,7 @@ void PX4AdvancedFlightModesController::setLoiterModeChannelIndex(int index) ...@@ -684,7 +684,7 @@ void PX4AdvancedFlightModesController::setLoiterModeChannelIndex(int index)
// Loiter disabled so Mission must move back to main Mode switch // Loiter disabled so Mission must move back to main Mode switch
_autoModeVisible = false; _autoModeVisible = false;
} else { } else {
// Auto mode is visible if Mission/Loiter are on seperate channel from main Mode switch // Auto mode is visible if Mission/Loiter are on separate channel from main Mode switch
_autoModeVisible = channel != getParameterFact(-1, "RC_MAP_MODE_SW")->rawValue().toInt(); _autoModeVisible = channel != getParameterFact(-1, "RC_MAP_MODE_SW")->rawValue().toInt();
} }
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
/// Holds the meta data associated with a Fact. /// Holds the meta data associated with a Fact.
/// ///
/// Holds the meta data associated with a Fact. This is kept in a seperate object from the Fact itself /// Holds the meta data associated with a Fact. This is kept in a separate object from the Fact itself
/// since you may have multiple instances of the same Fact. But there is only ever one FactMetaData /// since you may have multiple instances of the same Fact. But there is only ever one FactMetaData
/// instance or each Fact. /// instance or each Fact.
class FactMetaData : public QObject class FactMetaData : public QObject
......
...@@ -142,7 +142,7 @@ private: ...@@ -142,7 +142,7 @@ private:
QMap<int, QMap<QString, QStringList> > _mapGroup2ParameterName; QMap<int, QMap<QString, QStringList> > _mapGroup2ParameterName;
bool _parametersReady; ///< true: full set of parameters correctly loaded bool _parametersReady; ///< true: full set of parameters correctly loaded
bool _initialLoadComplete; ///< true: Initial load of all parameters complete, whether succesful or not bool _initialLoadComplete; ///< true: Initial load of all parameters complete, whether successful or not
bool _waitingForDefaultComponent; ///< true: last chance wait for default component params bool _waitingForDefaultComponent; ///< true: last chance wait for default component params
bool _saveRequired; ///< true: _saveToEEPROM should be called bool _saveRequired; ///< true: _saveToEEPROM should be called
int _defaultComponentId; int _defaultComponentId;
......
...@@ -312,7 +312,7 @@ bool APMParameterMetaData::parseParameterAttributes(QXmlStreamReader& xml, APMFa ...@@ -312,7 +312,7 @@ bool APMParameterMetaData::parseParameterAttributes(QXmlStreamReader& xml, APMFa
// as long as param doens't end // as long as param doens't end
while (!(elementName == "param" && xml.isEndElement())) { while (!(elementName == "param" && xml.isEndElement())) {
if (elementName.isEmpty()) { if (elementName.isEmpty()) {
// skip empty elements. Somehow I am getting lot of these. Dont know what to do with them. // skip empty elements. Somehow I am getting lot of these. Don't know what to do with them.
} else if (elementName == "field") { } else if (elementName == "field") {
QString attributeName = xml.attributes().value("name").toString(); QString attributeName = xml.attributes().value("name").toString();
......
...@@ -181,7 +181,7 @@ public: ...@@ -181,7 +181,7 @@ public:
virtual QString internalParameterMetaDataFile(void) { return QString(); } virtual QString internalParameterMetaDataFile(void) { return QString(); }
/// Loads the specified parameter meta data file. /// Loads the specified parameter meta data file.
/// @return Opaque parameter meta data information which must be stored with Vehicle. Vehicle is reponsible to /// @return Opaque parameter meta data information which must be stored with Vehicle. Vehicle is responsible to
/// call deleteParameterMetaData when no longer needed. /// call deleteParameterMetaData when no longer needed.
virtual QObject* loadParameterMetaData(const QString& metaDataFile) { Q_UNUSED(metaDataFile); return NULL; } virtual QObject* loadParameterMetaData(const QString& metaDataFile) { Q_UNUSED(metaDataFile); return NULL; }
......
...@@ -92,13 +92,13 @@ void FollowMe::_setGPSLocation(QGeoPositionInfo geoPositionInfo) ...@@ -92,13 +92,13 @@ void FollowMe::_setGPSLocation(QGeoPositionInfo geoPositionInfo)
_motionReport.pos_std_dev[2] = geoPositionInfo.attribute(QGeoPositionInfo::VerticalAccuracy); _motionReport.pos_std_dev[2] = geoPositionInfo.attribute(QGeoPositionInfo::VerticalAccuracy);
} }
// calculate z velocity if it's availible // calculate z velocity if it's available
if(geoPositionInfo.hasAttribute(QGeoPositionInfo::VerticalSpeed)) { if(geoPositionInfo.hasAttribute(QGeoPositionInfo::VerticalSpeed)) {
_motionReport.vz = geoPositionInfo.attribute(QGeoPositionInfo::VerticalSpeed); _motionReport.vz = geoPositionInfo.attribute(QGeoPositionInfo::VerticalSpeed);
} }
// calculate x,y velocity if it's availible // calculate x,y velocity if it's available
if((geoPositionInfo.hasAttribute(QGeoPositionInfo::Direction) == true) && if((geoPositionInfo.hasAttribute(QGeoPositionInfo::Direction) == true) &&
(geoPositionInfo.hasAttribute(QGeoPositionInfo::GroundSpeed) == true)) { (geoPositionInfo.hasAttribute(QGeoPositionInfo::GroundSpeed) == true)) {
......
...@@ -70,7 +70,7 @@ void LogCompressor::run() ...@@ -70,7 +70,7 @@ void LogCompressor::run()
// First we search the input file through keySearchLimit number of lines // First we search the input file through keySearchLimit number of lines
// looking for variables. This is neccessary before CSV files require // looking for variables. This is necessary before CSV files require
// the same number of fields for every line. // the same number of fields for every line.
const unsigned int keySearchLimit = 15000; const unsigned int keySearchLimit = 15000;
unsigned int keyCounter = 0; unsigned int keyCounter = 0;
......
...@@ -16,7 +16,7 @@ Rectangle { ...@@ -16,7 +16,7 @@ Rectangle {
color: qgcPal.windowShadeDark color: qgcPal.windowShadeDark
radius: _radius radius: _radius
// The following properties must be available up the hierachy chain // The following properties must be available up the hierarchy chain
//property real availableWidth ///< Width for control //property real availableWidth ///< Width for control
//property var missionItem ///< Mission Item for editor //property var missionItem ///< Mission Item for editor
......
...@@ -768,7 +768,7 @@ ...@@ -768,7 +768,7 @@
"label": "Mode:", "label": "Mode:",
"default": 0, "default": 0,
"decimalPlaces": 0, "decimalPlaces": 0,
"enumStrings": "Retract,Neutral,Mavlink Targetting,RC Targetting,GPS Point", "enumStrings": "Retract,Neutral,Mavlink Targeting,RC Targeting,GPS Point",
"enumValues": "0,1,2,3,4" "enumValues": "0,1,2,3,4"
}, },
"param2": { "param2": {
......
...@@ -165,7 +165,7 @@ void MissionManager::_ackTimeout(void) ...@@ -165,7 +165,7 @@ void MissionManager::_ackTimeout(void)
if (timedOutAck == AckNone) { if (timedOutAck == AckNone) {
qCWarning(MissionManagerLog) << "_ackTimeout timeout with AckNone"; qCWarning(MissionManagerLog) << "_ackTimeout timeout with AckNone";
_sendError(InternalError, "Internal error occured during Mission Item communication: _ackTimeOut:_retryAck == AckNone"); _sendError(InternalError, "Internal error occurred during Mission Item communication: _ackTimeOut:_retryAck == AckNone");
return; return;
} }
......
...@@ -82,7 +82,7 @@ private: ...@@ -82,7 +82,7 @@ private:
AckMissionCount, ///< MISSION_COUNT message expected AckMissionCount, ///< MISSION_COUNT message expected
AckMissionItem, ///< MISSION_ITEM expected AckMissionItem, ///< MISSION_ITEM expected
AckMissionRequest, ///< MISSION_REQUEST is expected, or MISSION_ACK to end sequence AckMissionRequest, ///< MISSION_REQUEST is expected, or MISSION_ACK to end sequence
AckGuidedItem, ///< MISSION_ACK expected in reponse to ArduPilot guided mode single item send AckGuidedItem, ///< MISSION_ACK expected in response to ArduPilot guided mode single item send
} AckType_t; } AckType_t;
void _startAckTimeout(AckType_t ack); void _startAckTimeout(AckType_t ack);
......
...@@ -152,7 +152,7 @@ void SimpleMissionItem::_connectSignals(void) ...@@ -152,7 +152,7 @@ void SimpleMissionItem::_connectSignals(void)
connect(&_missionItem._commandFact, &Fact::valueChanged, this, &SimpleMissionItem::_setDirtyFromSignal); connect(&_missionItem._commandFact, &Fact::valueChanged, this, &SimpleMissionItem::_setDirtyFromSignal);
connect(&_missionItem, &MissionItem::sequenceNumberChanged, this, &SimpleMissionItem::_setDirtyFromSignal); connect(&_missionItem, &MissionItem::sequenceNumberChanged, this, &SimpleMissionItem::_setDirtyFromSignal);
// Values from these facts must propogate back and forth between the real object storage // Values from these facts must propagate back and forth between the real object storage
connect(&_altitudeRelativeToHomeFact, &Fact::valueChanged, this, &SimpleMissionItem::_syncAltitudeRelativeToHomeToFrame); connect(&_altitudeRelativeToHomeFact, &Fact::valueChanged, this, &SimpleMissionItem::_syncAltitudeRelativeToHomeToFrame);
connect(&_missionItem._frameFact, &Fact::valueChanged, this, &SimpleMissionItem::_syncFrameToAltitudeRelativeToHome); connect(&_missionItem._frameFact, &Fact::valueChanged, this, &SimpleMissionItem::_syncFrameToAltitudeRelativeToHome);
...@@ -182,7 +182,7 @@ void SimpleMissionItem::_connectSignals(void) ...@@ -182,7 +182,7 @@ void SimpleMissionItem::_connectSignals(void)
connect(&_missionItem._commandFact, &Fact::valueChanged, this, &SimpleMissionItem::_sendCommandChanged); connect(&_missionItem._commandFact, &Fact::valueChanged, this, &SimpleMissionItem::_sendCommandChanged);
connect(&_missionItem._frameFact, &Fact::valueChanged, this, &SimpleMissionItem::_sendFrameChanged); connect(&_missionItem._frameFact, &Fact::valueChanged, this, &SimpleMissionItem::_sendFrameChanged);
// Sequence number is kept in mission iteem, so we need to propogate signal up as well // Sequence number is kept in mission iteem, so we need to propagate signal up as well
connect(&_missionItem, &MissionItem::sequenceNumberChanged, this, &SimpleMissionItem::sequenceNumberChanged); connect(&_missionItem, &MissionItem::sequenceNumberChanged, this, &SimpleMissionItem::sequenceNumberChanged);
} }
......
...@@ -40,7 +40,7 @@ public: ...@@ -40,7 +40,7 @@ public:
const VisualMissionItem& operator=(const VisualMissionItem& other); const VisualMissionItem& operator=(const VisualMissionItem& other);
// The following properties are calulated/set by the MissionControll recalc methods // The following properties are calculated/set by the MissionControll recalc methods
Q_PROPERTY(double altDifference READ altDifference WRITE setAltDifference NOTIFY altDifferenceChanged) ///< Change in altitude from previous waypoint Q_PROPERTY(double altDifference READ altDifference WRITE setAltDifference NOTIFY altDifferenceChanged) ///< Change in altitude from previous waypoint
Q_PROPERTY(double altPercent READ altPercent WRITE setAltPercent NOTIFY altPercentChanged) ///< Percent of total altitude change in mission altitude Q_PROPERTY(double altPercent READ altPercent WRITE setAltPercent NOTIFY altPercentChanged) ///< Percent of total altitude change in mission altitude
......
...@@ -41,7 +41,7 @@ private: ...@@ -41,7 +41,7 @@ private:
QGeoPositionInfo lastPosition; QGeoPositionInfo lastPosition;
// items for simulating QGC movment in jMAVSIM // items for simulating QGC movement in jMAVSIM
int32_t lat_int; int32_t lat_int;
int32_t lon_int; int32_t lon_int;
......
...@@ -206,7 +206,7 @@ QGCApplication::QGCApplication(int &argc, char* argv[], bool unitTesting) ...@@ -206,7 +206,7 @@ QGCApplication::QGCApplication(int &argc, char* argv[], bool unitTesting)
if (!_runningUnitTests) { if (!_runningUnitTests) {
if (getuid() == 0) { if (getuid() == 0) {
QMessageBox msgBox; QMessageBox msgBox;
msgBox.setInformativeText("You are runnning QGroundControl as root. " msgBox.setInformativeText("You are running QGroundControl as root. "
"You should not do this since it will cause other issues with QGroundControl. " "You should not do this since it will cause other issues with QGroundControl. "
"QGroundControl will now exit. " "QGroundControl will now exit. "
"If you are having serial port issues on Ubuntu, execute the following commands to fix most issues:\n" "If you are having serial port issues on Ubuntu, execute the following commands to fix most issues:\n"
......
...@@ -30,7 +30,7 @@ public: ...@@ -30,7 +30,7 @@ public:
/// @param fileExtension Expected file extension, added if needed /// @param fileExtension Expected file extension, added if needed
Q_INVOKABLE QString fullPath(const QString& filename, const QString& fileExtension); Q_INVOKABLE QString fullPath(const QString& filename, const QString& fileExtension);
/// Check for file existance /// Check for file existence
/// @param filename File name, not fully qualified, may not have extension /// @param filename File name, not fully qualified, may not have extension
/// @param fileExtension Expected file extension, added if needed /// @param fileExtension Expected file extension, added if needed
/// @return true: File exists at Documents location /// @return true: File exists at Documents location
......
...@@ -50,7 +50,7 @@ public: ...@@ -50,7 +50,7 @@ public:
QQmlEngine* getEngine(); QQmlEngine* getEngine();
/// Sets the QML into the control. Will display errors message box if error occurs loading source. /// Sets the QML into the control. Will display errors message box if error occurs loading source.
/// @return true: source loaded, false: source not loaded, errors occured /// @return true: source loaded, false: source not loaded, errors occurred
bool setSource(const QUrl& qmlUrl); bool setSource(const QUrl& qmlUrl);
void setContextPropertyObject(const QString& name, QObject* object); void setContextPropertyObject(const QString& name, QObject* object);
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
#include <QQmlEngine> #include <QQmlEngine>
/// @file /// @file
/// @brief Subclass of QQuickWidget which injects Facts and the Pallete object into /// @brief Subclass of QQuickWidget which injects Facts and the Palette object into
/// the QML context. /// the QML context.
/// ///
/// @author Don Gagne <don@thegagnes.com> /// @author Don Gagne <don@thegagnes.com>
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
#include "AutoPilotPlugin.h" #include "AutoPilotPlugin.h"
/// @file /// @file
/// @brief Subclass of QQuickWidget which injects Facts and the Pallete object into /// @brief Subclass of QQuickWidget which injects Facts and the Palette object into
/// the QML context. /// the QML context.
/// ///
/// @author Don Gagne <don@thegagnes.com> /// @author Don Gagne <don@thegagnes.com>
...@@ -31,7 +31,7 @@ public: ...@@ -31,7 +31,7 @@ public:
void setAutoPilot(AutoPilotPlugin* autoPilot); void setAutoPilot(AutoPilotPlugin* autoPilot);
/// Sets the QML into the control. Will display errors message box if error occurs loading source. /// Sets the QML into the control. Will display errors message box if error occurs loading source.
/// @return true: source loaded, false: source not loaded, errors occured /// @return true: source loaded, false: source not loaded, errors occurred
bool setSource(const QUrl& qmlUrl); bool setSource(const QUrl& qmlUrl);
}; };
......
...@@ -32,12 +32,12 @@ Item { ...@@ -32,12 +32,12 @@ Item {
property real defaultFontPointSize: 10 property real defaultFontPointSize: 10
/// You can use this property to position ui elements in a screen resolution independant manner. Using fixed positioning values should not /// You can use this property to position ui elements in a screen resolution independent manner. Using fixed positioning values should not
/// be done. All positioning should be done using anchors or a ratio of the defaultFontPixelHeight and defaultFontPixelWidth values. This way /// be done. All positioning should be done using anchors or a ratio of the defaultFontPixelHeight and defaultFontPixelWidth values. This way
/// your ui elements will reposition themselves appropriately on varying screen sizes and resolutions. /// your ui elements will reposition themselves appropriately on varying screen sizes and resolutions.
property real defaultFontPixelHeight: 10 property real defaultFontPixelHeight: 10
/// You can use this property to position ui elements in a screen resolution independant manner. Using fixed positioning values should not /// You can use this property to position ui elements in a screen resolution independent manner. Using fixed positioning values should not
/// be done. All positioning should be done using anchors or a ratio of the defaultFontPixelHeight and defaultFontPixelWidth values. This way /// be done. All positioning should be done using anchors or a ratio of the defaultFontPixelHeight and defaultFontPixelWidth values. This way
/// your ui elements will reposition themselves appropriately on varying screen sizes and resolutions. /// your ui elements will reposition themselves appropriately on varying screen sizes and resolutions.
property real defaultFontPixelWidth: 10 property real defaultFontPixelWidth: 10
......
...@@ -198,7 +198,7 @@ bool FirmwareImage::_px4Load(const QString& imageFilename) ...@@ -198,7 +198,7 @@ bool FirmwareImage::_px4Load(const QString& imageFilename)
{ {
_imageSize = 0; _imageSize = 0;
// We need to collect information from the .px4 file as well as pull the binary image out to a seperate file. // We need to collect information from the .px4 file as well as pull the binary image out to a separate file.
QFile px4File(imageFilename); QFile px4File(imageFilename);
if (!px4File.open(QIODevice::ReadOnly | QIODevice::Text)) { if (!px4File.open(QIODevice::ReadOnly | QIODevice::Text)) {
...@@ -400,7 +400,7 @@ bool FirmwareImage::_decompressJsonValue(const QJsonObject& jsonObject, ///< J ...@@ -400,7 +400,7 @@ bool FirmwareImage::_decompressJsonValue(const QJsonObject& jsonObject, ///< J
return false; return false;
} }
emit statusMessage(QString("Succesfully decompressed %1").arg(bytesKey)); emit statusMessage(QString("Successfully decompressed %1").arg(bytesKey));
return true; return true;
} }
......
...@@ -312,7 +312,7 @@ QGCView { ...@@ -312,7 +312,7 @@ QGCView {
qsTr("This firmware has NOT BEEN FLIGHT TESTED. ") + qsTr("This firmware has NOT BEEN FLIGHT TESTED. ") +
qsTr("It is only intended for DEVELOPERS. ") + qsTr("It is only intended for DEVELOPERS. ") +
qsTr("Run bench tests without props first. ") + qsTr("Run bench tests without props first. ") +
qsTr("Do NOT fly this without additonal safety precautions. ") + qsTr("Do NOT fly this without additional safety precautions. ") +
qsTr("Follow the mailing list actively when using it.") qsTr("Follow the mailing list actively when using it.")
} else { } else {
firmwareVersionWarningLabel.visible = false firmwareVersionWarningLabel.visible = false
......
...@@ -218,7 +218,7 @@ private: ...@@ -218,7 +218,7 @@ private:
QNetworkAccessManager* _downloadManager; ///< Used for firmware file downloading across the internet QNetworkAccessManager* _downloadManager; ///< Used for firmware file downloading across the internet
QNetworkReply* _downloadNetworkReply; ///< Used for firmware file downloading across the internet QNetworkReply* _downloadNetworkReply; ///< Used for firmware file downloading across the internet
/// @brief Thread controller which is used to run bootloader commands on seperate thread /// @brief Thread controller which is used to run bootloader commands on separate thread
PX4FirmwareUpgradeThreadController* _threadController; PX4FirmwareUpgradeThreadController* _threadController;
static const int _eraseTickMsec = 500; ///< Progress bar update tick time for erase static const int _eraseTickMsec = 500; ///< Progress bar update tick time for erase
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
/// @file /// @file
/// @brief PX4 Firmware Upgrade operations which occur on a seperate thread. /// @brief PX4 Firmware Upgrade operations which occur on a separate thread.
/// @author Don Gagne <don@thegagnes.com> /// @author Don Gagne <don@thegagnes.com>
#include "PX4FirmwareUpgradeThread.h" #include "PX4FirmwareUpgradeThread.h"
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
/// @file /// @file
/// @brief PX4 Firmware Upgrade operations which occur on a seperate thread. /// @brief PX4 Firmware Upgrade operations which occur on a separate thread.
/// @author Don Gagne <don@thegagnes.com> /// @author Don Gagne <don@thegagnes.com>
#ifndef PX4FirmwareUpgradeThread_H #ifndef PX4FirmwareUpgradeThread_H
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
class PX4FirmwareUpgradeThreadController; class PX4FirmwareUpgradeThreadController;
/// @brief Used to run bootloader commands on a seperate thread. These routines are mainly meant to to be called /// @brief Used to run bootloader commands on a separate thread. These routines are mainly meant to to be called
/// internally by the PX4FirmwareUpgradeThreadController. Clients should call the various public methods /// internally by the PX4FirmwareUpgradeThreadController. Clients should call the various public methods
/// exposed by PX4FirmwareUpgradeThreadController. /// exposed by PX4FirmwareUpgradeThreadController.
class PX4FirmwareUpgradeThreadWorker : public QObject class PX4FirmwareUpgradeThreadWorker : public QObject
...@@ -83,7 +83,7 @@ private: ...@@ -83,7 +83,7 @@ private:
}; };
/// @brief Provides methods to interact with the bootloader. The commands themselves are signalled /// @brief Provides methods to interact with the bootloader. The commands themselves are signalled
/// across to PX4FirmwareUpgradeThreadWorker so that they run on the seperate thread. /// across to PX4FirmwareUpgradeThreadWorker so that they run on the separate thread.
class PX4FirmwareUpgradeThreadController : public QObject class PX4FirmwareUpgradeThreadController : public QObject
{ {
Q_OBJECT Q_OBJECT
......
...@@ -86,7 +86,7 @@ void GstQtGLVideoSink::class_init(gpointer g_class, gpointer class_data) ...@@ -86,7 +86,7 @@ void GstQtGLVideoSink::class_init(gpointer g_class, gpointer class_data)
* This is an action signal that you can call from your Qt surface class inside * This is an action signal that you can call from your Qt surface class inside
* its paint function to render the video. It takes a QPainter* and the target * its paint function to render the video. It takes a QPainter* and the target
* area rectangle as arguments. You should schedule to call this function to * area rectangle as arguments. You should schedule to call this function to
* repaint the surface whenever the ::update signal is emited. * repaint the surface whenever the ::update signal is emitted.
* *
* Note that the x,y,width and height arguments are actually qreal. This means * Note that the x,y,width and height arguments are actually qreal. This means
* that on architectures like arm they will be float instead of double. You should * that on architectures like arm they will be float instead of double. You should
...@@ -107,7 +107,7 @@ void GstQtGLVideoSink::class_init(gpointer g_class, gpointer class_data) ...@@ -107,7 +107,7 @@ void GstQtGLVideoSink::class_init(gpointer g_class, gpointer class_data)
/** /**
* GstQtGLVideoSink::update * GstQtGLVideoSink::update
* *
* This signal is emited when the surface should be repainted. It should * This signal is emitted when the surface should be repainted. It should
* be connected to QWidget::update() or QGraphicsItem::update() or any * be connected to QWidget::update() or QGraphicsItem::update() or any
* other similar function in your surface. * other similar function in your surface.
*/ */
......
...@@ -410,7 +410,7 @@ gst_qt_quick2_video_sink_class_init (GstQtQuick2VideoSinkClass *klass) ...@@ -410,7 +410,7 @@ gst_qt_quick2_video_sink_class_init (GstQtQuick2VideoSinkClass *klass)
* inside its updateNode function to render the video. It takes a QSGNode* * inside its updateNode function to render the video. It takes a QSGNode*
* and the item's area rectangle as arguments. You should schedule to call * and the item's area rectangle as arguments. You should schedule to call
* this function to repaint the surface whenever the ::update signal is * this function to repaint the surface whenever the ::update signal is
* emited. * emitted.
* *
* Note that the x,y,width and height arguments are actually qreal. * Note that the x,y,width and height arguments are actually qreal.
* This means that on architectures like arm they will be float instead * This means that on architectures like arm they will be float instead
...@@ -432,7 +432,7 @@ gst_qt_quick2_video_sink_class_init (GstQtQuick2VideoSinkClass *klass) ...@@ -432,7 +432,7 @@ gst_qt_quick2_video_sink_class_init (GstQtQuick2VideoSinkClass *klass)
/** /**
* GstQtQuick2VideoSink::update * GstQtQuick2VideoSink::update
* *
* This signal is emited when the surface should be repainted. It should * This signal is emitted when the surface should be repainted. It should
* be connected to QQuickItem::update(). * be connected to QQuickItem::update().
*/ */
s_signals[SIGNAL_UPDATE] = s_signals[SIGNAL_UPDATE] =
......
...@@ -66,7 +66,7 @@ void GstQtVideoSink::class_init(gpointer g_class, gpointer class_data) ...@@ -66,7 +66,7 @@ void GstQtVideoSink::class_init(gpointer g_class, gpointer class_data)
* This is an action signal that you can call from your Qt surface class inside * This is an action signal that you can call from your Qt surface class inside
* its paint function to render the video. It takes a QPainter* and the target * its paint function to render the video. It takes a QPainter* and the target
* area rectangle as arguments. You should schedule to call this function to * area rectangle as arguments. You should schedule to call this function to
* repaint the surface whenever the ::update signal is emited. * repaint the surface whenever the ::update signal is emitted.
* *
* Note that the x,y,width and height arguments are actually qreal. This means * Note that the x,y,width and height arguments are actually qreal. This means
* that on architectures like arm they will be float instead of double. You should * that on architectures like arm they will be float instead of double. You should
...@@ -87,7 +87,7 @@ void GstQtVideoSink::class_init(gpointer g_class, gpointer class_data) ...@@ -87,7 +87,7 @@ void GstQtVideoSink::class_init(gpointer g_class, gpointer class_data)
/** /**
* GstQtVideoSink::update * GstQtVideoSink::update
* *
* This signal is emited when the surface should be repainted. It should * This signal is emitted when the surface should be repainted. It should
* be connected to QWidget::update() or QGraphicsItem::update() or any * be connected to QWidget::update() or QGraphicsItem::update() or any
* other similar function in your surface. * other similar function in your surface.
*/ */
......
...@@ -187,7 +187,7 @@ signals: ...@@ -187,7 +187,7 @@ signals:
*/ */
void nameChanged(QString name); void nameChanged(QString name);
/** @brief Communication error occured */ /** @brief Communication error occurred */
void communicationError(const QString& title, const QString& error); void communicationError(const QString& title, const QString& error);
void communicationUpdate(const QString& linkname, const QString& text); void communicationUpdate(const QString& linkname, const QString& text);
...@@ -217,7 +217,7 @@ protected: ...@@ -217,7 +217,7 @@ protected:
/// This function logs the send times and amounts of datas for input. Data is used for calculating /// This function logs the send times and amounts of datas for input. Data is used for calculating
/// the transmission rate. /// the transmission rate.
/// @param byteCount Number of bytes received /// @param byteCount Number of bytes received
/// @param time Time in ms send occured /// @param time Time in ms send occurred
void _logInputDataRate(quint64 byteCount, qint64 time) { void _logInputDataRate(quint64 byteCount, qint64 time) {
if(_enableRateCollection) if(_enableRateCollection)
_logDataRateToBuffer(_inDataWriteAmounts, _inDataWriteTimes, &_inDataIndex, byteCount, time); _logDataRateToBuffer(_inDataWriteAmounts, _inDataWriteTimes, &_inDataIndex, byteCount, time);
...@@ -226,7 +226,7 @@ protected: ...@@ -226,7 +226,7 @@ protected:
/// This function logs the send times and amounts of datas for output. Data is used for calculating /// This function logs the send times and amounts of datas for output. Data is used for calculating
/// the transmission rate. /// the transmission rate.
/// @param byteCount Number of bytes sent /// @param byteCount Number of bytes sent
/// @param time Time in ms receive occured /// @param time Time in ms receive occurred
void _logOutputDataRate(quint64 byteCount, qint64 time) { void _logOutputDataRate(quint64 byteCount, qint64 time) {
if(_enableRateCollection) if(_enableRateCollection)
_logDataRateToBuffer(_outDataWriteAmounts, _outDataWriteTimes, &_outDataIndex, byteCount, time); _logDataRateToBuffer(_outDataWriteAmounts, _outDataWriteTimes, &_outDataIndex, byteCount, time);
......
...@@ -159,7 +159,7 @@ quint64 LogReplayLink::_parseTimestamp(const QByteArray& bytes) ...@@ -159,7 +159,7 @@ quint64 LogReplayLink::_parseTimestamp(const QByteArray& bytes)
return timestamp; return timestamp;
} }
/// Seeks to the beginning of the next successully parsed mavlink message in the log file. /// Seeks to the beginning of the next successfully parsed mavlink message in the log file.
/// @param nextMsg[output] Parsed next message that was found /// @param nextMsg[output] Parsed next message that was found
/// @return A Unix timestamp in microseconds UTC for found message or 0 if parsing failed /// @return A Unix timestamp in microseconds UTC for found message or 0 if parsing failed
quint64 LogReplayLink::_seekToNextMavlinkMessage(mavlink_message_t* nextMsg) quint64 LogReplayLink::_seekToNextMavlinkMessage(mavlink_message_t* nextMsg)
......
...@@ -68,13 +68,13 @@ QGCFlightGearLink::QGCFlightGearLink(Vehicle* vehicle, QString startupArguments, ...@@ -68,13 +68,13 @@ QGCFlightGearLink::QGCFlightGearLink(Vehicle* vehicle, QString startupArguments,
QGCFlightGearLink::~QGCFlightGearLink() QGCFlightGearLink::~QGCFlightGearLink()
{ //do not disconnect unless it is connected. { //do not disconnect unless it is connected.
//disconnectSimulation will delete the memory that was allocated for proces, terraSync and _udpCommSocket //disconnectSimulation will delete the memory that was allocated for process, terraSync and _udpCommSocket
if(connectState){ if(connectState){
disconnectSimulation(); disconnectSimulation();
} }
} }
/// @brief Runs the simulation thread. We do setup work here which needs to happen in the seperate thread. /// @brief Runs the simulation thread. We do setup work here which needs to happen in the separate thread.
void QGCFlightGearLink::run() void QGCFlightGearLink::run()
{ {
Q_ASSERT(_vehicle); Q_ASSERT(_vehicle);
...@@ -497,7 +497,7 @@ bool QGCFlightGearLink::disconnectSimulation() ...@@ -497,7 +497,7 @@ bool QGCFlightGearLink::disconnectSimulation()
return !connectState; return !connectState;
} }
/// @brief Splits a space seperated set of command line arguments into a QStringList. /// @brief Splits a space separated set of command line arguments into a QStringList.
/// Quoted strings are allowed and handled correctly. /// Quoted strings are allowed and handled correctly.
/// @param uiArgs Arguments to parse /// @param uiArgs Arguments to parse
/// @param argList Returned argument list /// @param argList Returned argument list
...@@ -602,7 +602,7 @@ bool QGCFlightGearLink::connectSimulation() ...@@ -602,7 +602,7 @@ bool QGCFlightGearLink::connectSimulation()
// We setup all the information we need to start FlightGear here such that if something goes // We setup all the information we need to start FlightGear here such that if something goes
// wrong we can return false out of here. All of this happens on the main UI thread. Once we // wrong we can return false out of here. All of this happens on the main UI thread. Once we
// have that information setup we start the thread which will call run, which will in turn // have that information setup we start the thread which will call run, which will in turn
// start the various FG processes on the seperate thread. // start the various FG processes on the separate thread.
if (!_vehicle->uas()) { if (!_vehicle->uas()) {
return false; return false;
...@@ -617,7 +617,7 @@ bool QGCFlightGearLink::connectSimulation() ...@@ -617,7 +617,7 @@ bool QGCFlightGearLink::connectSimulation()
QDir fgAppDir; // Location of main FlightGear application QDir fgAppDir; // Location of main FlightGear application
// Reset the list of arguments which will be provided to FG to the arguments set by the user via the UI // Reset the list of arguments which will be provided to FG to the arguments set by the user via the UI
// First split the space seperated command line arguments coming in from the ui into a QStringList since // First split the space separated command line arguments coming in from the ui into a QStringList since
// that is what QProcess::start needs. // that is what QProcess::start needs.
QStringList uiArgList; QStringList uiArgList;
bool mismatchedQuotes = parseUIArguments(startupArguments, uiArgList); bool mismatchedQuotes = parseUIArguments(startupArguments, uiArgList);
...@@ -709,7 +709,7 @@ bool QGCFlightGearLink::connectSimulation() ...@@ -709,7 +709,7 @@ bool QGCFlightGearLink::connectSimulation()
regExp.setPattern("^fg_scenery:(.*)"); regExp.setPattern("^fg_scenery:(.*)");
if (regExp.indexIn(line) == 0 && regExp.captureCount() == 1) { if (regExp.indexIn(line) == 0 && regExp.captureCount() == 1) {
// Scenery can contain multiple paths seperated by ';' so don't do QDir::absolutePath on it // Scenery can contain multiple paths separated by ';' so don't do QDir::absolutePath on it
fgSceneryPath = regExp.cap(1); fgSceneryPath = regExp.cap(1);
qDebug() << "fg_scenery" << fgSceneryPath; qDebug() << "fg_scenery" << fgSceneryPath;
continue; continue;
......
...@@ -48,7 +48,7 @@ QGCJSBSimLink::QGCJSBSimLink(Vehicle* vehicle, QString startupArguments, QString ...@@ -48,7 +48,7 @@ QGCJSBSimLink::QGCJSBSimLink(Vehicle* vehicle, QString startupArguments, QString
QGCJSBSimLink::~QGCJSBSimLink() QGCJSBSimLink::~QGCJSBSimLink()
{ //do not disconnect unless it is connected. { //do not disconnect unless it is connected.
//disconnectSimulation will delete the memory that was allocated for proces, terraSync and socket //disconnectSimulation will delete the memory that was allocated for process, terraSync and socket
if(connectState){ if(connectState){
disconnectSimulation(); disconnectSimulation();
} }
......
...@@ -88,7 +88,7 @@ void SerialLink::_writeBytes(const QByteArray data) ...@@ -88,7 +88,7 @@ void SerialLink::_writeBytes(const QByteArray data)
_logOutputDataRate(data.size(), QDateTime::currentMSecsSinceEpoch()); _logOutputDataRate(data.size(), QDateTime::currentMSecsSinceEpoch());
_port->write(data); _port->write(data);
} else { } else {
// Error occured // Error occurred
_emitLinkError(tr("Could not send data - link %1 is disconnected!").arg(getName())); _emitLinkError(tr("Could not send data - link %1 is disconnected!").arg(getName()));
} }
} }
......
...@@ -240,7 +240,7 @@ void Mouse6dofInput::button3DMouseDown(int button) ...@@ -240,7 +240,7 @@ void Mouse6dofInput::button3DMouseDown(int button)
#ifdef QGC_MOUSE_ENABLED_LINUX #ifdef QGC_MOUSE_ENABLED_LINUX
void Mouse6dofInput::handleX11Event(XEvent *event) void Mouse6dofInput::handleX11Event(XEvent *event)
{ {
//qDebug("XEvent occured..."); //qDebug("XEvent occurred...");
if (!mouseActive) if (!mouseActive)
{ {
qDebug() << "3dMouse not initialized. Cancelled handling X11event for 3dMouse"; qDebug() << "3dMouse not initialized. Cancelled handling X11event for 3dMouse";
......
...@@ -235,7 +235,7 @@ void FileManagerTest::_readDownloadTest(void) ...@@ -235,7 +235,7 @@ void FileManagerTest::_readDownloadTest(void)
_fileManager->downloadPath(testCase->filename, QDir::temp()); _fileManager->downloadPath(testCase->filename, QDir::temp());
QTest::qWait(_ackTimerTimeoutMsecs); // Let the file manager timeout QTest::qWait(_ackTimerTimeoutMsecs); // Let the file manager timeout
// This should be a succesful download // This should be a successful download
QCOMPARE(_multiSpy->checkOnlySignalByMask(commandCompleteSignalMask), true); QCOMPARE(_multiSpy->checkOnlySignalByMask(commandCompleteSignalMask), true);
_multiSpy->clearAllSignals(); _multiSpy->clearAllSignals();
...@@ -321,7 +321,7 @@ void FileManagerTest::_streamDownloadTest(void) ...@@ -321,7 +321,7 @@ void FileManagerTest::_streamDownloadTest(void)
_fileManager->streamPath(testCase->filename, QDir::temp()); _fileManager->streamPath(testCase->filename, QDir::temp());
QTest::qWait(_ackTimerTimeoutMsecs); // Let the file manager timeout QTest::qWait(_ackTimerTimeoutMsecs); // Let the file manager timeout
// This should be a succesful download // This should be a successful download
QCOMPARE(_multiSpy->checkOnlySignalByMask(commandCompleteSignalMask), true); QCOMPARE(_multiSpy->checkOnlySignalByMask(commandCompleteSignalMask), true);
_multiSpy->clearAllSignals(); _multiSpy->clearAllSignals();
......
...@@ -1745,7 +1745,7 @@ float UAS::addZeroMeanNoise(float truth_meas, float noise_var) ...@@ -1745,7 +1745,7 @@ float UAS::addZeroMeanNoise(float truth_meas, float noise_var)
//as well //as well
float noise = z0 * sqrt(noise_var); //calculate normally distributed variable with mu = 0, std = var^2 float noise = z0 * sqrt(noise_var); //calculate normally distributed variable with mu = 0, std = var^2
//Finally gaurd against any case where the noise is not real //Finally guard against any case where the noise is not real
if(std::isfinite(noise)) { if(std::isfinite(noise)) {
return truth_meas + noise; return truth_meas + noise;
} else { } else {
......
...@@ -590,7 +590,7 @@ protected: ...@@ -590,7 +590,7 @@ protected:
bool componentMulti[256]; bool componentMulti[256];
bool connectionLost; ///< Flag indicates a timed out connection bool connectionLost; ///< Flag indicates a timed out connection
quint64 connectionLossTime; ///< Time the connection was interrupted quint64 connectionLossTime; ///< Time the connection was interrupted
quint64 lastVoltageWarning; ///< Time at which the last voltage warning occured quint64 lastVoltageWarning; ///< Time at which the last voltage warning occurred
quint64 lastNonNullTime; ///< The last timestamp from the MAV that was not null quint64 lastNonNullTime; ///< The last timestamp from the MAV that was not null
unsigned int onboardTimeOffsetInvalidCount; ///< Count when the offboard time offset estimation seemed wrong unsigned int onboardTimeOffsetInvalidCount; ///< Count when the offboard time offset estimation seemed wrong
bool hilEnabled; bool hilEnabled;
......
...@@ -192,7 +192,7 @@ signals: ...@@ -192,7 +192,7 @@ signals:
/** /**
* @brief Update the error count of a device * @brief Update the error count of a device
* *
* The error count indicates how many errors occured during the use of a device. * The error count indicates how many errors occurred during the use of a device.
* Usually a random error from time to time is acceptable, e.g. through electromagnetic * Usually a random error from time to time is acceptable, e.g. through electromagnetic
* interferences on device lines like I2C and SPI. A constantly and rapidly increasing * interferences on device lines like I2C and SPI. A constantly and rapidly increasing
* error count however can help to identify broken cables or misbehaving drivers. * error count however can help to identify broken cables or misbehaving drivers.
...@@ -200,7 +200,7 @@ signals: ...@@ -200,7 +200,7 @@ signals:
* @param uasid System ID * @param uasid System ID
* @param component Name of the component, e.g. "IMU" * @param component Name of the component, e.g. "IMU"
* @param device Name of the device, e.g. "SPI0" or "I2C1" * @param device Name of the device, e.g. "SPI0" or "I2C1"
* @param count Errors occured since system startup * @param count Errors occurred since system startup
*/ */
void errCountChanged(int uasid, QString component, QString device, int count); void errCountChanged(int uasid, QString component, QString device, int count);
......
...@@ -405,7 +405,7 @@ void MainWindow::reallyClose(void) ...@@ -405,7 +405,7 @@ void MainWindow::reallyClose(void)
void MainWindow::closeEvent(QCloseEvent *event) void MainWindow::closeEvent(QCloseEvent *event)
{ {
if (!_forceClose) { if (!_forceClose) {
// Attemp close from within the root Qml item // Attempt close from within the root Qml item
qgcApp()->qmlAttemptWindowClose(); qgcApp()->qmlAttemptWindowClose();
event->ignore(); event->ignore();
return; return;
......
...@@ -680,7 +680,7 @@ bool QGCDataPlot2D::linearRegression(double *x, double *y, int n, double *a, dou ...@@ -680,7 +680,7 @@ bool QGCDataPlot2D::linearRegression(double *x, double *y, int n, double *a, dou
syy = sumy2 - sumy * sumy / n; syy = sumy2 - sumy * sumy / n;
sxy = sumxy - sumx * sumy / n; sxy = sumxy - sumx * sumy / n;
/* Infinite slope (b), non existant intercept (a) */ /* Infinite slope (b), non existent intercept (a) */
if (fabs(sxx) == 0) if (fabs(sxx) == 0)
return false; return false;
......
...@@ -128,7 +128,7 @@ void IncrementalPlot::showLegend(bool show) ...@@ -128,7 +128,7 @@ void IncrementalPlot::showLegend(bool show)
} }
/** /**
* Set datapoint and line style. This interface is intented * Set datapoint and line style. This interface is intended
* to be directly connected to the UI and allows to parse * to be directly connected to the UI and allows to parse
* human-readable, textual descriptions into plot specs. * human-readable, textual descriptions into plot specs.
* *
......
...@@ -240,9 +240,9 @@ protected: ...@@ -240,9 +240,9 @@ protected:
// TODO CHECK THIS!!! // TODO CHECK THIS!!!
int scaling; int scaling;
QwtScaleEngine* yScaleEngine; QwtScaleEngine* yScaleEngine;
quint64 minTime; ///< The smallest timestamp occured so far quint64 minTime; ///< The smallest timestamp occurred so far
quint64 lastTime; ///< Last added timestamp quint64 lastTime; ///< Last added timestamp
quint64 maxTime; ///< The biggest timestamp occured so far quint64 maxTime; ///< The biggest timestamp occurred so far
quint64 maxInterval; quint64 maxInterval;
quint64 storageInterval; quint64 storageInterval;
......
...@@ -219,7 +219,7 @@ Rectangle { ...@@ -219,7 +219,7 @@ Rectangle {
QGCLabel { QGCLabel {
id: rssiLabel id: rssiLabel
text: activeVehicle ? (activeVehicle.rcRSSI != 255 ? qsTr("RC RSSI Status") : qsTr("RC RSSI Data Unavailable")) : qsTr("N/A", "No data avaliable") text: activeVehicle ? (activeVehicle.rcRSSI != 255 ? qsTr("RC RSSI Status") : qsTr("RC RSSI Data Unavailable")) : qsTr("N/A", "No data available")
font.family: ScreenTools.demiboldFontFamily font.family: ScreenTools.demiboldFontFamily
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
} }
......
...@@ -137,7 +137,7 @@ class Main(object): ...@@ -137,7 +137,7 @@ class Main(object):
# module # module
import optparse import optparse
usage = "usage: %prog [options] directory old_prefix new_prefix" usage = "usage: %prog [options] directory old_prefix new_prefix"
description = 'Rellocates object files changing the dependant '\ description = 'Rellocates object files changing the dependent '\
' dynamic libraries location path with a new one' ' dynamic libraries location path with a new one'
parser = optparse.OptionParser(usage=usage, description=description) parser = optparse.OptionParser(usage=usage, description=description)
parser.add_option('-r', '--recursive', action='store_true', parser.add_option('-r', '--recursive', action='store_true',
......
...@@ -62,7 +62,7 @@ process_framework() { ...@@ -62,7 +62,7 @@ process_framework() {
rm -rf $GST_TARGET/lib/libffi-3.0.13 rm -rf $GST_TARGET/lib/libffi-3.0.13
rm -rf $GST_TARGET/lib/pkgconfig rm -rf $GST_TARGET/lib/pkgconfig
rm $GST_TARGET/Commands rm $GST_TARGET/Commands
#-- Now relocate the embeded paths #-- Now relocate the embedded paths
echo "GST Installer: Relocating" echo "GST Installer: Relocating"
python $RELOC -r "$GST_TARGET" "$OLDDLPATH" "$NEWDLPATH" > /dev/null || die "Error relocating binaries in $GST_TARGET/lib" python $RELOC -r "$GST_TARGET" "$OLDDLPATH" "$NEWDLPATH" > /dev/null || die "Error relocating binaries in $GST_TARGET/lib"
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment