diff --git a/QGCCommon.pri b/QGCCommon.pri
index f3ac0d97db5a2105b215953d27aa230b08f55ef7..1ed81aafe1d4b72e4ea7435889601da35cabd63b 100644
--- a/QGCCommon.pri
+++ b/QGCCommon.pri
@@ -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
diff --git a/flightgear/Aircraft/EasyStar/easystar.xml b/flightgear/Aircraft/EasyStar/easystar.xml
index 742c6cb6318b5269fb93c35561020a5362a506b3..2d0090e7303d36f05797423f74de9081351a6f89 100644
--- a/flightgear/Aircraft/EasyStar/easystar.xml
+++ b/flightgear/Aircraft/EasyStar/easystar.xml
@@ -7,7 +7,7 @@
xbee_pkt(3) - libxbee's packet structure diff --git a/libs/thirdParty/libxbee/doc/man/man3/xbee_getpacket.3.html b/libs/thirdParty/libxbee/doc/man/man3/xbee_getpacket.3.html index 45063f77369f1abf8072bb1d7e39dfcda77574d4..371d72d53643bf8a75d12bf646637783a86cfa98 100644 --- a/libs/thirdParty/libxbee/doc/man/man3/xbee_getpacket.3.html +++ b/libs/thirdParty/libxbee/doc/man/man3/xbee_getpacket.3.html @@ -26,7 +26,7 @@ xbee_getpacket The xbee_getpacket() -function will return the next avaliable packet for the provided connection. +function will return the next available packet for the provided connection. It takes 1 argument.
The argument @@ -49,7 +49,7 @@ You must keep hold of the packet until you are finished with it, and then you mu it to prevent memory leaks.
-If a packet was not avaliable for the provided connection, a +If a packet was not available for the provided connection, a NULL is returned. @@ -69,7 +69,7 @@ For information on using callback functions with connections instead, please see
#include <xbee.h> diff --git a/libs/thirdParty/libxbee/doc/man/man3/xbee_newcon.3.html b/libs/thirdParty/libxbee/doc/man/man3/xbee_newcon.3.html index 32f085b2685782320a34654812647c3898b51a46..16ea278a0533c308faef3d8b06ff05b7789736b8 100644 --- a/libs/thirdParty/libxbee/doc/man/man3/xbee_newcon.3.html +++ b/libs/thirdParty/libxbee/doc/man/man3/xbee_newcon.3.html @@ -37,7 +37,7 @@ It takes at least 2 arguments, and possibly up to 4 depending on the NOTE: Packets will only be collected when they match an active connection. -You must setup a connection in order to recieve packets. +You must setup a connection in order to receive packets.The argument frameID @@ -48,7 +48,7 @@ identifies where the data is coming from or going to. The type -specifies the type of connection you would like. The following types are avaliable: +specifies the type of connection you would like. The following types are available:
diff --git a/libs/thirdParty/libxbee/doc/man/man3/xbee_pkt.3.html b/libs/thirdParty/libxbee/doc/man/man3/xbee_pkt.3.html index 1859405aa7a94fb1384c2d2ba38b0ca6c4fb89df..8ebb809a54ff209b69012dc6e982eceaf13ed141 100644 --- a/libs/thirdParty/libxbee/doc/man/man3/xbee_pkt.3.html +++ b/libs/thirdParty/libxbee/doc/man/man3/xbee_pkt.3.html @@ -51,18 +51,18 @@ and others need explaining. I will touch on the most important here:
1200 diff --git a/libs/thirdParty/libxbee/notes/v1-v2.txt b/libs/thirdParty/libxbee/notes/v1-v2.txt index cb2e1c923dd418a905c61879eecd69ca14118613..8223982f816c53f6aa00447eeea70f65061d6958 100644 --- a/libs/thirdParty/libxbee/notes/v1-v2.txt +++ b/libs/thirdParty/libxbee/notes/v1-v2.txt @@ -21,7 +21,7 @@ XBee 2.5 0x10* ZigBee Transmit Request 0x11 Explicit Addressing ZigBee Command Frame 0x8B* ZigBee Transmit Status -0x90* ZigBee Recieve Packet +0x90* ZigBee Receive Packet 0x91 ZigBee Explicit Rx 0x92 ZigBee IO Data Sample Rx 0x94 Xbee Sensor Read diff --git a/src/AutoPilotPlugins/APM/APMAirframeComponent.cc b/src/AutoPilotPlugins/APM/APMAirframeComponent.cc index db71666b23e5a2e9b173b440bf1af6a40497fd44..d2af4b4a9d033aa8b0ab28cbcbb1dbabcd691f6f 100644 --- a/src/AutoPilotPlugins/APM/APMAirframeComponent.cc +++ b/src/AutoPilotPlugins/APM/APMAirframeComponent.cc @@ -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 diff --git a/src/AutoPilotPlugins/AutoPilotPlugin.h b/src/AutoPilotPlugins/AutoPilotPlugin.h index 649542ae9df79e8d3512a6e720b325cc79cc404d..36dcc53360f4101d52bbb9fa46aa922798ee8767 100644 --- a/src/AutoPilotPlugins/AutoPilotPlugin.h +++ b/src/AutoPilotPlugins/AutoPilotPlugin.h @@ -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 diff --git a/src/AutoPilotPlugins/Common/RadioComponentController.h b/src/AutoPilotPlugins/Common/RadioComponentController.h index 21fdd0e7eaa3a92412f9dbc2a6e4dd15e3be1e9e..dd3304daffb2b98e9f09dc26cc3385b9777bb741 100644 --- a/src/AutoPilotPlugins/Common/RadioComponentController.h +++ b/src/AutoPilotPlugins/Common/RadioComponentController.h @@ -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, }; diff --git a/src/AutoPilotPlugins/PX4/AirframeComponent.cc b/src/AutoPilotPlugins/PX4/AirframeComponent.cc index 24f6dcdb2d0faf978a9cd8e341ac11aed221292b..44b0ebdb53ff82e5d3d8a4b8cd90236617e68c68 100644 --- a/src/AutoPilotPlugins/PX4/AirframeComponent.cc +++ b/src/AutoPilotPlugins/PX4/AirframeComponent.cc @@ -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 diff --git a/src/AutoPilotPlugins/PX4/ParameterFactMetaData.xml b/src/AutoPilotPlugins/PX4/ParameterFactMetaData.xml index 177143f82f67dcea0abc3a57079730bfbff00a0e..d4b602f2e8cbcde5215b55fd89347458a224636c 100644 --- a/src/AutoPilotPlugins/PX4/ParameterFactMetaData.xml +++ b/src/AutoPilotPlugins/PX4/ParameterFactMetaData.xml @@ -948,12 +948,12 @@ velocity1 - Catapult accelerometer theshold +Catapult accelerometer threshold LAUN_CAT_A * LAUN_CAT_T serves as threshold to trigger launch detection. 0 - diff --git a/src/FactSystem/ParameterLoader.h b/src/FactSystem/ParameterLoader.h index 74775d77808f0c41b35f9ccde61c1a9d538f057f..722e2b94b6761333ffab5cb31d79730fbcfb6534 100644 --- a/src/FactSystem/ParameterLoader.h +++ b/src/FactSystem/ParameterLoader.h @@ -75,7 +75,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 diff --git a/src/FirmwarePlugin/APM/apm.pdef.xml b/src/FirmwarePlugin/APM/apm.pdef.xml index 0a83916e723b9293d2c1e79287071990b2182928..5829b911055436323d8e71b5afe66a93bec996cb 100644 --- a/src/FirmwarePlugin/APM/apm.pdef.xml +++ b/src/FirmwarePlugin/APM/apm.pdef.xml @@ -686,7 +686,7 @@Catapult time theshold +Catapult time threshold LAUN_CAT_A * LAUN_CAT_T serves as threshold to trigger launch detection. 0 Enable - +0:Disarm Disabled diff --git a/src/FirmwarePlugin/FirmwarePlugin.h b/src/FirmwarePlugin/FirmwarePlugin.h index 7838dbdb991fc79102c65e27220062fdcf74f0ca..5fe39e1e922bf87ebbd8cfd1ce32e2023c3f584a 100644 --- a/src/FirmwarePlugin/FirmwarePlugin.h +++ b/src/FirmwarePlugin/FirmwarePlugin.h @@ -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 diff --git a/src/MissionManager/MissionCommands.cc b/src/MissionManager/MissionCommands.cc index 9ee58e5b84409f44bb8e94ff48cdfb264983b0f8..1ac697b5aaf1f884c434faac431f640aff022132 100644 --- a/src/MissionManager/MissionCommands.cc +++ b/src/MissionManager/MissionCommands.cc @@ -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. diff --git a/src/QGCMessageBox.h b/src/QGCMessageBox.h index 5a2dd877aa234faf815ededa772125250c2da394..2c40d2cf247d20c892f3a27acfb3dfb4d7c5c5b4 100644 --- a/src/QGCMessageBox.h +++ b/src/QGCMessageBox.h @@ -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(); } diff --git a/src/VehicleSetup/Bootloader.h b/src/VehicleSetup/Bootloader.h index c5eefbb14a517a56aed033a481a6fde023d8b9de..d23520815a9fe5e7355e2f892ba8054c76e1ab76 100644 --- a/src/VehicleSetup/Bootloader.h +++ b/src/VehicleSetup/Bootloader.h @@ -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 }; diff --git a/src/VehicleSetup/FirmwareUpgrade.qml b/src/VehicleSetup/FirmwareUpgrade.qml index 78f8bdff337bc30c41bdeac1451a7dc6e08393fa..887d70abe209a39746c7dd9a9a66333b0bb00afa 100644 --- a/src/VehicleSetup/FirmwareUpgrade.qml +++ b/src/VehicleSetup/FirmwareUpgrade.qml @@ -282,7 +282,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 diff --git a/src/documentation.dox b/src/documentation.dox index 38726a99796113395cb063d982e303d310894f63..fefe019d97df855f626517d60033d747a7433562 100644 --- a/src/documentation.dox +++ b/src/documentation.dox @@ -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. diff --git a/src/qgcunittest/FileManagerTest.cc b/src/qgcunittest/FileManagerTest.cc index d7a94d7b8c403bd18889e8c8fac376b064936d58..6287fe1510e7a908b771a2edb7c9dec1cbda4971 100644 --- a/src/qgcunittest/FileManagerTest.cc +++ b/src/qgcunittest/FileManagerTest.cc @@ -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); } diff --git a/src/uas/FileManager.cc b/src/uas/FileManager.cc index 4c34284ed3ccaedd75e8252a33b11f4a56f3fbb9..de501de9041a4e6cb959574a95954f69ab044817 100644 --- a/src/uas/FileManager.cc +++ b/src/uas/FileManager.cc @@ -591,7 +591,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: diff --git a/src/uas/UAS.h b/src/uas/UAS.h index fe5e957d7206ed427568f42754eb8fbf3587d33d..f769b5c2df1beffe48a0649af5f861fb64356190 100644 --- a/src/uas/UAS.h +++ b/src/uas/UAS.h @@ -471,7 +471,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) diff --git a/src/ui/QGCMapRCToParamDialog.h b/src/ui/QGCMapRCToParamDialog.h index 0460b764d81741ff67ff3e0edc31999f35935d89..75b649b3fe1516be3d9946ad835b0c26b649cc24 100644 --- a/src/ui/QGCMapRCToParamDialog.h +++ b/src/ui/QGCMapRCToParamDialog.h @@ -22,7 +22,7 @@ ======================================================================*/ /// @file -/// @brief Dialog to configure RC to paramter mapping +/// @brief Dialog to configure RC to parameter mapping /// @author Thomas Gubler#ifndef QGCMAPRCTOPARAMDIALOG_H diff --git a/src/ui/uas/UASQuickView.cc b/src/ui/uas/UASQuickView.cc index 96fa299028d394a10095a85519ff05ced6a683d9..52bbd0e7a121eb7bb276bd8d493f39f8d7d09bb8 100644 --- a/src/ui/uas/UASQuickView.cc +++ b/src/ui/uas/UASQuickView.cc @@ -160,7 +160,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]);