Commit 66db08ed authored by Don Gagne's avatar Don Gagne

Merge pull request #2565 from nopeppermint/master

correct spelling mistakes
parents 529f8dde 5fa40b0f
......@@ -19,7 +19,7 @@
#
# This file contains configuration settings which are common to both the QGC Application and
# the Location Plugin. It should mainly contains intial CONFIG tag setup and compiler settings.
# the Location Plugin. It should mainly contains initial CONFIG tag setup and compiler settings.
#
# Setup our supported build types. We do this once here and then use the defined config scopes
......
......@@ -49,7 +49,7 @@ QString APMAirframeComponent::name(void) const
QString APMAirframeComponent::description(void) const
{
return tr("The Airframe Component is used to select the airframe which matches your vehicle. "
"This will in turn set up the various tuning values for flight paramters.");
"This will in turn set up the various tuning values for flight parameters.");
}
QString APMAirframeComponent::iconResource(void) const
......
......@@ -86,7 +86,7 @@
QStringList parameterNames(int componentId);
/// Returns the specified parameter Fact from the default component
/// WARNING: Returns a default Fact if parameter does not exists. If that possibility exists, check for existince first with
/// WARNING: Returns a default Fact if parameter does not exists. If that possibility exists, check for existence first with
/// parameterExists.
Fact* getParameterFact(int componentId, const QString& name);
......@@ -103,7 +103,7 @@
const QString& name); ///< fact name
/// Returns the specified Fact.
/// WARNING: Will assert if fact does not exists. If that possibility exists, check for existince first with
/// WARNING: Will assert if fact does not exists. If that possibility exists, check for existence first with
/// factExists.
Fact* getFact(FactSystem::Provider_t provider, ///< fact provider
int componentId, ///< fact component, -1=default component
......
......@@ -168,7 +168,7 @@ private:
rcCalFunctionFirstAttitudeFunction = rcCalFunctionRoll,
rcCalFunctionLastAttitudeFunction = rcCalFunctionThrottle,
// Non-Attitude functions are everthing else
// Non-Attitude functions are everything else
rcCalFunctionFirstNonAttitudeFunction = rcCalFunctionModeSwitch,
rcCalFunctionLastNonAttitudeFunction = rcCalFunctionAux2,
};
......
......@@ -127,7 +127,7 @@ QString AirframeComponent::name(void) const
QString AirframeComponent::description(void) const
{
return tr("The Airframe Component is used to select the airframe which matches your vehicle. "
"This will in turn set up the various tuning values for flight paramters.");
"This will in turn set up the various tuning values for flight parameters.");
}
QString AirframeComponent::iconResource(void) const
......
......@@ -948,12 +948,12 @@ velocity</short_desc>
<max>1</max>
</parameter>
<parameter default="30.0" name="LAUN_CAT_A" type="FLOAT">
<short_desc>Catapult accelerometer theshold</short_desc>
<short_desc>Catapult accelerometer threshold</short_desc>
<long_desc>LAUN_CAT_A * LAUN_CAT_T serves as threshold to trigger launch detection.</long_desc>
<min>0</min>
</parameter>
<parameter default="0.05" name="LAUN_CAT_T" type="FLOAT">
<short_desc>Catapult time theshold</short_desc>
<short_desc>Catapult time threshold</short_desc>
<long_desc>LAUN_CAT_A * LAUN_CAT_T serves as threshold to trigger launch detection.</long_desc>
<min>0</min>
</parameter>
......
......@@ -73,7 +73,7 @@ public:
QStringList parameterNames(int componentId);
/// Returns the specified Fact.
/// WARNING: Will assert if parameter does not exists. If that possibily exists, check for existince first with
/// WARNING: Will assert if parameter does not exists. If that possibily exists, check for existence first with
/// parameterExists.
Fact* getFact(int componentId, ///< fact component, -1=default component
const QString& name); ///< fact name
......
......@@ -686,7 +686,7 @@
<value code="1">Enable</value>
</values>
</param>
<param humanName="Crash Detection" name="ArduPlane:CRASH_DETECT" documentation="Automatically detect a crash during AUTO flight and perform the bitmask selected action(s). Disarm will turn off motor for saftey and to help against burning out ESC and motor. Setting the mode to manual will help save the servos from burning out by overexerting if the aircraft crashed in an odd orientation such as upsidedown." user="Advanced">
<param humanName="Crash Detection" name="ArduPlane:CRASH_DETECT" documentation="Automatically detect a crash during AUTO flight and perform the bitmask selected action(s). Disarm will turn off motor for safety and to help against burning out ESC and motor. Setting the mode to manual will help save the servos from burning out by overexerting if the aircraft crashed in an odd orientation such as upsidedown." user="Advanced">
<field name="Bitmask">0:Disarm</field>
<values>
<value code="0">Disabled</value>
......
......@@ -87,7 +87,7 @@ public:
/// @return -1: reserver all buttons, >0 number of buttons to reserve
virtual int manualControlReservedButtonCount(void) = 0;
/// Called before any mavlink message is processed by Vehicle such taht the firmwre plugin
/// Called before any mavlink message is processed by Vehicle such that the firmwre plugin
/// can adjust any message characteristics. This is handy to adjust or differences in mavlink
/// spec implementations such that the base code can remain mavlink generic.
/// @param vehicle Vehicle message came from
......
......@@ -239,7 +239,7 @@ void MissionCommands::_loadMavCmdInfoJson(void)
// We don't add categories till down here, since friendly edit isn't valid till here
if (mavCmdInfo->_command != MAV_CMD_NAV_LAST) {
// Don't add fake home postion command to categories
// Don't add fake home position command to categories
if (mavCmdInfo->friendlyEdit()) {
// Only friendly edit commands go in category list. We use MAV_AUTOPILOT_GENERIC key to store full list.
......
......@@ -63,7 +63,7 @@ public:
{ return _messageBox(QMessageBox::Warning, title, text, buttons, defaultButton, parent); }
private slots:
/// @brief The exec slot is private becasue when only want QGCMessageBox users to use the static methods. Otherwise it will break
/// @brief The exec slot is private because when only want QGCMessageBox users to use the static methods. Otherwise it will break
/// unit testing.
int exec(void) { return QMessageBox::exec(); }
......
......@@ -150,7 +150,7 @@ private:
static const int _eraseTimeout = 20000; ///< Msecs to wait for response from erase command
static const int _rebootTimeout = 10000; ///< Msecs to wait for reboot command to cause serial port to disconnect
static const int _verifyTimeout = 5000; ///< Msecs to wait for response to PROTO_GET_CRC command
static const int _readTimout = 2000; ///< Msecs to wait for read bytes to become avilable
static const int _readTimout = 2000; ///< Msecs to wait for read bytes to become available
static const int _responseTimeout = 2000; ///< Msecs to wait for command response bytes
};
......
......@@ -285,7 +285,7 @@ QGCView {
"This firmware has NOT BEEN FLIGHT TESTED. " +
"It is only intended for DEVELOPERS. " +
"Run bench tests without props first. " +
"Do NOT fly this without addional safety precautions. " +
"Do NOT fly this without additonal safety precautions. " +
"Follow the mailing list actively when using it."
} else {
firmwareVersionWarningLabel.visible = false
......
......@@ -1998,7 +1998,7 @@ PREDEFINED =
EXPAND_AS_DEFINED =
# If the SKIP_FUNCTION_MACROS tag is set to YES then doxygen's preprocessor will
# remove all refrences to function-like macros that are alone on a line, have an
# remove all references to function-like macros that are alone on a line, have an
# all uppercase name, and do not end with a semicolon. Such function macros are
# typically used for boiler-plate code, and will confuse the parser if not
# removed.
......
......@@ -194,7 +194,7 @@ void FileManagerTest::_listTest(void)
// And then it should have errored out because the next list Request would have failed.
QCOMPARE(_multiSpy->checkOnlySignalByMask(commandErrorSignalMask), true);
} else {
// For the simulated errors which failed the intial response we should not have gotten any results back at all.
// For the simulated errors which failed the initial response we should not have gotten any results back at all.
// Just an error.
QCOMPARE(_multiSpy->checkOnlySignalByMask(commandErrorSignalMask), true);
}
......
......@@ -614,7 +614,7 @@ QString FileManager::errorString(uint8_t errorCode)
case kErrInvalidSession:
return QString("invalid session");
case kErrNoSessionsAvailable:
return QString("no sessions availble");
return QString("no sessions available");
case kErrFailFileExists:
return QString("File already exists on target");
case kErrFailFileProtected:
......
......@@ -468,7 +468,7 @@ protected: //COMMENTS FOR TEST UNIT
/// IMAGING
int imageSize; ///< Image size being transmitted (bytes)
int imagePackets; ///< Number of data packets being sent for this image
int imagePacketsArrived; ///< Number of data packets recieved
int imagePacketsArrived; ///< Number of data packets received
int imagePayload; ///< Payload size per transmitted packet (bytes). Standard is 254, and decreases when image resolution increases.
int imageQuality; ///< Quality of the transmitted image (percentage)
int imageType; ///< Type of the transmitted image (BMP, PNG, JPEG, RAW 8 bit, RAW 32 bit)
......
......@@ -22,7 +22,7 @@
======================================================================*/
/// @file
/// @brief Dialog to configure RC to paramter mapping
/// @brief Dialog to configure RC to parameter mapping
/// @author Thomas Gubler <thomasgubler@gmail.com>
#ifndef QGCMAPRCTOPARAMDIALOG_H
......
......@@ -161,7 +161,7 @@ void UASQuickView::sortItems(int columncount)
m_PropertyToLayoutIndexMap.remove(i.key());
itemlist.append(i.value());
}
// Item list has all the widgets availble, now re-add them to the layouts.
// Item list has all the widgets available, now re-add them to the layouts.
for (int i = 0; i < m_verticalLayoutList.size(); i++)
{
ui.horizontalLayout->removeItem(m_verticalLayoutList[i]);
......
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