Skip to content

Commit

Permalink
Fix typos
Browse files Browse the repository at this point in the history
  • Loading branch information
ricdevz committed Aug 29, 2016
1 parent 5fc24cf commit 52fef37
Show file tree
Hide file tree
Showing 57 changed files with 83 additions and 83 deletions.
2 changes: 1 addition & 1 deletion CodingStyle.cc
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

#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")

Expand Down
2 changes: 1 addition & 1 deletion CodingStyle.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#include "Fact.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
// with a suffix of Log.
Expand Down
2 changes: 1 addition & 1 deletion QGCExternalLibs.pri
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ WindowsBuild {
# [REQUIRED] Add support for the MAVLink communications protocol.
# Mavlink dialect is hardwired to arudpilotmega for now. The reason being
# 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
# QGC can support both in the same codebase.
#
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ public void run() {
}
}

/* 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;
if (mReadStatusException != null) {
mReadStatusException = null;
Expand Down Expand Up @@ -288,7 +288,7 @@ public void open() throws IOException {
+ "available! Assuming that it is a HX device");
mDeviceType = DEVICE_TYPE_HX;
} 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);
}
}
Expand Down Expand Up @@ -318,7 +318,7 @@ public void close() throws IOException {
try {
mReadStatusThread.join();
} 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);
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion android/src/org/qgroundcontrol/qgchelper/UsbDeviceJNI.java
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,7 @@ public void onReceive(Context contextA, Intent intentA)
Log.e(TAG, "UsbIoManager instance is null");
m_ioManager.put(idL, managerL);
m_Executor.submit(managerL);
Log.i(TAG, "Port open successfull");
Log.i(TAG, "Port open successful");
return idL;
}
}
Expand Down
2 changes: 1 addition & 1 deletion doc/Doxyfile
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@ TYPEDEF_HIDES_STRUCT = NO
# causing a significant performance penality.
# 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
# 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:
# 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
Expand Down
2 changes: 1 addition & 1 deletion resources/flightgear/Aircraft/EasyStar/easystar.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<fileheader>
<author> Ron Jensen Aeromatic v 0.91 </author>
<filecreationdate> 2010-03-28 </filecreationdate>
<version>$Revison: $</version>
<version>$Revision: $</version>
<description> Models a EasyStar. </description>
</fileheader>

Expand Down
2 changes: 1 addition & 1 deletion resources/flightgear/Aircraft/EasyStar/readme.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Origional readme:
Original readme:
************************************************************************
* MULTIPLEX Modellsport GmbH & Co. KG *
* Neuer Weg 2, D-75223 Niefern, Germany *
Expand Down
2 changes: 1 addition & 1 deletion resources/flightgear/Aircraft/Rascal/README.Rascal
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ tires.
rudder which is connected to a steerable tail wheel. Use brakes only
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
in direction of turn; apply ailerons away from the turn when turning
downwind. This procedure helps to prevent the wind "picking up" a
Expand Down
2 changes: 1 addition & 1 deletion resources/flightgear/Aircraft/Rascal110/README.Rascal
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ tires.
rudder which is connected to a steerable tail wheel. Use brakes only
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
in direction of turn; apply ailerons away from the turn when turning
downwind. This procedure helps to prevent the wind "picking up" a
Expand Down
2 changes: 1 addition & 1 deletion src/AutoPilotPlugins/APM/APMCameraComponent.qml
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ QGCView {
Connections { target: _rc13Function; 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 {
target: _mountRCInPan
onValueChanged: _mountDefaultMode.value = _mountDefaultModeRCTargetting
Expand Down
4 changes: 2 additions & 2 deletions src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,11 @@ Item {
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 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.")

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.")

readonly property string fwAcroModeName: qsTr("Stabilized")
Expand Down
8 changes: 4 additions & 4 deletions src/AutoPilotPlugins/PX4/PX4AdvancedFlightModesController.cc
Original file line number Diff line number Diff line change
Expand Up @@ -88,15 +88,15 @@ void PX4AdvancedFlightModesController::_init(void)
// PosCtl disabled so AltCtl must move back to main Mode switch
_assistModeVisible = false;
} 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;
}

if (loiterChannel == 0) {
// Loiter disabled so Mission must move back to main Mode switch
_autoModeVisible = false;
} 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;
}

Expand Down Expand Up @@ -662,7 +662,7 @@ void PX4AdvancedFlightModesController::setPosCtlModeChannelIndex(int index)
// PosCtl disabled so AltCtl must move back to main Mode switch
_assistModeVisible = false;
} 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();
}

Expand All @@ -684,7 +684,7 @@ void PX4AdvancedFlightModesController::setLoiterModeChannelIndex(int index)
// Loiter disabled so Mission must move back to main Mode switch
_autoModeVisible = false;
} 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();
}

Expand Down
2 changes: 1 addition & 1 deletion src/FactSystem/FactMetaData.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

/// 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
/// instance or each Fact.
class FactMetaData : public QObject
Expand Down
2 changes: 1 addition & 1 deletion src/FactSystem/ParameterLoader.h
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ class ParameterLoader : public QObject
QMap<int, QMap<QString, QStringList> > _mapGroup2ParameterName;

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 _saveRequired; ///< true: _saveToEEPROM should be called
int _defaultComponentId;
Expand Down
2 changes: 1 addition & 1 deletion src/FirmwarePlugin/APM/APMParameterMetaData.cc
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,7 @@ bool APMParameterMetaData::parseParameterAttributes(QXmlStreamReader& xml, APMFa
// as long as param doens't end
while (!(elementName == "param" && xml.isEndElement())) {
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") {
QString attributeName = xml.attributes().value("name").toString();

Expand Down
2 changes: 1 addition & 1 deletion src/FirmwarePlugin/FirmwarePlugin.h
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ class FirmwarePlugin : public QObject
virtual QString internalParameterMetaDataFile(void) { return QString(); }

/// 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.
virtual QObject* loadParameterMetaData(const QString& metaDataFile) { Q_UNUSED(metaDataFile); return NULL; }

Expand Down
4 changes: 2 additions & 2 deletions src/FollowMe/FollowMe.cc
Original file line number Diff line number Diff line change
Expand Up @@ -92,13 +92,13 @@ void FollowMe::_setGPSLocation(QGeoPositionInfo geoPositionInfo)
_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)) {
_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) &&
(geoPositionInfo.hasAttribute(QGeoPositionInfo::GroundSpeed) == true)) {
Expand Down
2 changes: 1 addition & 1 deletion src/LogCompressor.cc
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ void LogCompressor::run()


// 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.
const unsigned int keySearchLimit = 15000;
unsigned int keyCounter = 0;
Expand Down
2 changes: 1 addition & 1 deletion src/MissionEditor/SurveyItemEditor.qml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Rectangle {
color: qgcPal.windowShadeDark
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 var missionItem ///< Mission Item for editor

Expand Down
2 changes: 1 addition & 1 deletion src/MissionManager/MavCmdInfoCommon.json
Original file line number Diff line number Diff line change
Expand Up @@ -768,7 +768,7 @@
"label": "Mode:",
"default": 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"
},
"param2": {
Expand Down
2 changes: 1 addition & 1 deletion src/MissionManager/MissionManager.cc
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ void MissionManager::_ackTimeout(void)

if (timedOutAck == 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;
}

Expand Down
2 changes: 1 addition & 1 deletion src/MissionManager/MissionManager.h
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ private slots:
AckMissionCount, ///< MISSION_COUNT message expected
AckMissionItem, ///< MISSION_ITEM expected
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;

void _startAckTimeout(AckType_t ack);
Expand Down
4 changes: 2 additions & 2 deletions src/MissionManager/SimpleMissionItem.cc
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ void SimpleMissionItem::_connectSignals(void)
connect(&_missionItem._commandFact, &Fact::valueChanged, 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(&_missionItem._frameFact, &Fact::valueChanged, this, &SimpleMissionItem::_syncFrameToAltitudeRelativeToHome);

Expand Down Expand Up @@ -182,7 +182,7 @@ void SimpleMissionItem::_connectSignals(void)
connect(&_missionItem._commandFact, &Fact::valueChanged, this, &SimpleMissionItem::_sendCommandChanged);
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);
}

Expand Down
2 changes: 1 addition & 1 deletion src/MissionManager/VisualMissionItem.h
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ class VisualMissionItem : public QObject

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 altPercent READ altPercent WRITE setAltPercent NOTIFY altPercentChanged) ///< Percent of total altitude change in mission altitude
Expand Down
2 changes: 1 addition & 1 deletion src/PositionManager/SimulatedPosition.h
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ private slots:

QGeoPositionInfo lastPosition;

// items for simulating QGC movment in jMAVSIM
// items for simulating QGC movement in jMAVSIM

int32_t lat_int;
int32_t lon_int;
Expand Down
2 changes: 1 addition & 1 deletion src/QGCApplication.cc
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ QGCApplication::QGCApplication(int &argc, char* argv[], bool unitTesting)
if (!_runningUnitTests) {
if (getuid() == 0) {
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. "
"QGroundControl will now exit. "
"If you are having serial port issues on Ubuntu, execute the following commands to fix most issues:\n"
Expand Down
2 changes: 1 addition & 1 deletion src/QGCMobileFileDialogController.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ class QGCMobileFileDialogController : public QObject
/// @param fileExtension Expected file extension, added if needed
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 fileExtension Expected file extension, added if needed
/// @return true: File exists at Documents location
Expand Down
2 changes: 1 addition & 1 deletion src/QGCQmlWidgetHolder.h
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ class QGCQmlWidgetHolder : public QGCDockWidget
QQmlEngine* getEngine();

/// 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);

void setContextPropertyObject(const QString& name, QObject* object);
Expand Down
2 changes: 1 addition & 1 deletion src/QGCQuickWidget.cc
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#include <QQmlEngine>

/// @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.
///
/// @author Don Gagne <[email protected]>
Expand Down
4 changes: 2 additions & 2 deletions src/QGCQuickWidget.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#include "AutoPilotPlugin.h"

/// @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.
///
/// @author Don Gagne <[email protected]>
Expand All @@ -31,7 +31,7 @@ class QGCQuickWidget : public QQuickWidget {
void setAutoPilot(AutoPilotPlugin* autoPilot);

/// 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);
};

Expand Down
Loading

0 comments on commit 52fef37

Please sign in to comment.