From 2f85669cff121a85b828bfef39a49c070df5745b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrick=20Jos=C3=A9=20Pereira?= Date: Mon, 8 May 2017 19:12:07 -0300 Subject: [PATCH] Solve some typos MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Patrick José Pereira --- src/AnalyzeView/ExifParser.cc | 2 +- src/FactSystem/ParameterManager.cc | 2 +- src/FirmwarePlugin/FirmwarePlugin.h | 2 +- src/FirmwarePlugin/PX4/PX4ParameterFactMetaData.xml | 6 +++--- src/GPS/RTCM/RTCMMavlink.cc | 4 ++-- src/Joystick/Joystick.h | 2 +- src/MissionManager/GeoFenceController.cc | 2 +- src/MissionManager/GeoFenceManager.h | 2 +- src/MissionManager/MissionCommandUIInfo.h | 4 ++-- src/MissionManager/MissionController.cc | 2 +- src/MissionManager/MissionSettingsItem.cc | 2 +- src/MissionManager/PlanMasterController.h | 2 +- src/MissionManager/RallyPointController.cc | 2 +- src/QGCApplication.h | 4 ++-- src/QmlControls/MavlinkQmlSingleton.h | 2 +- src/QmlControls/QGCComboBox.qml | 2 +- src/Settings/Video.SettingsGroup.json | 2 +- src/Vehicle/MAVLinkLogManager.cc | 2 +- src/Vehicle/Vehicle.h | 2 +- src/api/QGCCorePlugin.h | 2 +- src/comm/MockLink.h | 2 +- src/comm/QGCXPlaneLink.cc | 2 +- src/ui/linechart/LinechartPlot.cc | 2 +- src/ui/preferences/GeneralSettings.qml | 4 ++-- 24 files changed, 30 insertions(+), 30 deletions(-) diff --git a/src/AnalyzeView/ExifParser.cc b/src/AnalyzeView/ExifParser.cc index 2b4ccf0..3dddf64 100644 --- a/src/AnalyzeView/ExifParser.cc +++ b/src/AnalyzeView/ExifParser.cc @@ -71,7 +71,7 @@ bool ExifParser::write(QByteArray &buf, QGeoCoordinate coordinate) conversionPointer = reinterpret_cast(buf.mid(nextIfdOffsetInd, 2).data()); uint16_t nextIfdOffset = *conversionPointer; - // Definition of usefull unions and structs + // Definition of useful unions and structs union char2uint32_u { char c[4]; uint32_t i; diff --git a/src/FactSystem/ParameterManager.cc b/src/FactSystem/ParameterManager.cc index 07fb0c0..a0a3c86 100644 --- a/src/FactSystem/ParameterManager.cc +++ b/src/FactSystem/ParameterManager.cc @@ -111,7 +111,7 @@ void ParameterManager::_parameterUpdate(int vehicleId, int componentId, QString // ArduPilot has this strange behavior of streaming parameters that we didn't ask for. This even happens before it responds to the // PARAM_REQUEST_LIST. We disregard any of this until the initial request is responded to. if (parameterId == 65535 && parameterName != "_HASH_CHECK" && _initialRequestTimeoutTimer.isActive()) { - qCDebug(ParameterManagerVerbose1Log) << "Disregarding unrequested param prior to intial list response" << parameterName; + qCDebug(ParameterManagerVerbose1Log) << "Disregarding unrequested param prior to initial list response" << parameterName; return; } diff --git a/src/FirmwarePlugin/FirmwarePlugin.h b/src/FirmwarePlugin/FirmwarePlugin.h index 1d438c2..0a94055 100644 --- a/src/FirmwarePlugin/FirmwarePlugin.h +++ b/src/FirmwarePlugin/FirmwarePlugin.h @@ -62,7 +62,7 @@ public: /// value: remapParamNameMinorVersionRemapMap_t entry typedef QMap remapParamNameMajorVersionMap_t; - /// @return The AutoPilotPlugin associated with this firmware plugin. Must be overriden. + /// @return The AutoPilotPlugin associated with this firmware plugin. Must be overridden. virtual AutoPilotPlugin* autopilotPlugin(Vehicle* vehicle); /// Called when Vehicle is first created to perform any firmware specific setup. diff --git a/src/FirmwarePlugin/PX4/PX4ParameterFactMetaData.xml b/src/FirmwarePlugin/PX4/PX4ParameterFactMetaData.xml index 4da3065..d13163e 100644 --- a/src/FirmwarePlugin/PX4/PX4ParameterFactMetaData.xml +++ b/src/FirmwarePlugin/PX4/PX4ParameterFactMetaData.xml @@ -3399,7 +3399,7 @@ if required for the gimbal (only in AUX output mode) Yaw feed forward - Feed forward weight for manual yaw control. 0 will give slow responce and no overshot, 1 - fast responce and big overshot. + Feed forward weight for manual yaw control. 0 will give slow response and no overshot, 1 - fast response and big overshot. 0.0 1.0 2 @@ -3642,7 +3642,7 @@ if required for the gimbal (only in AUX output mode) Vertical velocity feed forward - Feed forward weight for altitude control in stabilized modes (ALTCTRL, POSCTRL). 0 will give slow responce and no overshot, 1 - fast responce and big overshot. + Feed forward weight for altitude control in stabilized modes (ALTCTRL, POSCTRL). 0 will give slow response and no overshot, 1 - fast response and big overshot. 0.0 1.0 2 @@ -3718,7 +3718,7 @@ if required for the gimbal (only in AUX output mode) Horizontal velocity feed forward - Feed forward weight for position control in position control mode (POSCTRL). 0 will give slow responce and no overshot, 1 - fast responce and big overshot. + Feed forward weight for position control in position control mode (POSCTRL). 0 will give slow response and no overshot, 1 - fast response and big overshot. 0.0 1.0 2 diff --git a/src/GPS/RTCM/RTCMMavlink.cc b/src/GPS/RTCM/RTCMMavlink.cc index b3ebf07..d8f6c92 100644 --- a/src/GPS/RTCM/RTCMMavlink.cc +++ b/src/GPS/RTCM/RTCMMavlink.cc @@ -44,12 +44,12 @@ void RTCMMavlink::RTCMDataUpdate(QByteArray message) // We need to fragment static uint8_t sequenceId = 0; // Sequence id is used to indicate that the individual fragements belong to the same set - uint8_t fragmentId = 0; // Fragment id indicates the fragement within a set + uint8_t fragmentId = 0; // Fragment id indicates the fragment within a set int start = 0; while (start < message.size()) { int length = std::min(message.size() - start, maxMessageLength); - mavlinkRtcmData.flags = 1; // LSB set indicates messsage is fragmented + mavlinkRtcmData.flags = 1; // LSB set indicates message is fragmented mavlinkRtcmData.flags |= fragmentId++ << 1; // Next 2 bits are fragment id mavlinkRtcmData.flags |= sequenceId++ << 3; // Next 5 bits are sequence id mavlinkRtcmData.len = length; diff --git a/src/Joystick/Joystick.h b/src/Joystick/Joystick.h index 4884298..2e98c3f 100644 --- a/src/Joystick/Joystick.h +++ b/src/Joystick/Joystick.h @@ -97,7 +97,7 @@ public: QString name(void) { return _name; } /* // Joystick index used by sdl library - // Settable because sdl library remaps indicies after certain events + // Settable because sdl library remaps indices after certain events virtual int index(void) = 0; virtual void setIndex(int index) = 0; */ diff --git a/src/MissionManager/GeoFenceController.cc b/src/MissionManager/GeoFenceController.cc index e09c4fb..cb2d6a3 100644 --- a/src/MissionManager/GeoFenceController.cc +++ b/src/MissionManager/GeoFenceController.cc @@ -322,7 +322,7 @@ bool GeoFenceController::showPlanFromManagerVehicle(void) qCDebug(GeoFenceControllerLog) << "showPlanFromManagerVehicle" << _editMode; if (_masterController->offline()) { qCWarning(GeoFenceControllerLog) << "GeoFenceController::showPlanFromManagerVehicle called while offline"; - return true; // stops further propogation of showPlanFromManagerVehicle due to error + return true; // stops further propagation of showPlanFromManagerVehicle due to error } else { _itemsRequested = true; if (!_managerVehicle->initialPlanRequestComplete()) { diff --git a/src/MissionManager/GeoFenceManager.h b/src/MissionManager/GeoFenceManager.h index 899b2a3..a1ea66a 100644 --- a/src/MissionManager/GeoFenceManager.h +++ b/src/MissionManager/GeoFenceManager.h @@ -42,7 +42,7 @@ public: /// Signals sendComplete when done virtual void sendToVehicle(const QGeoCoordinate& breachReturn, QmlObjectListModel& polygon); - /// Remove all fence related items from vehicle (does not affect paramters) + /// Remove all fence related items from vehicle (does not affect parameters) /// Signals removeAllComplete when done virtual void removeAll(void); diff --git a/src/MissionManager/MissionCommandUIInfo.h b/src/MissionManager/MissionCommandUIInfo.h index 4c1d4bf..f2a6692 100644 --- a/src/MissionManager/MissionCommandUIInfo.h +++ b/src/MissionManager/MissionCommandUIInfo.h @@ -24,7 +24,7 @@ class MissionCommandTreeTest; /// UI Information associated with a mission command (MAV_CMD) parameter /// -/// MissionCommandParamInfo is used to automatically generate editing ui for a parameter assocaited with a MAV_CMD. +/// MissionCommandParamInfo is used to automatically generate editing ui for a parameter associated with a MAV_CMD. /// /// The json format for a MissionCmdParamInfo object is: /// @@ -34,7 +34,7 @@ class MissionCommandTreeTest; /// default double 0.0/NaN Default value for param. If no default value specified and nanUnchanged == true, then defaultValue is NaN. /// decimalPlaces int 7 Number of decimal places to show for value /// enumStrings string Strings to show in combo box for selection -/// enumValues string Values assocaited with each enum string +/// enumValues string Values associated with each enum string /// nanUnchanged bool false True: value can be set to NaN to signal unchanged /// class MissionCmdParamInfo : public QObject { diff --git a/src/MissionManager/MissionController.cc b/src/MissionManager/MissionController.cc index 6839585..ebb9eee 100644 --- a/src/MissionManager/MissionController.cc +++ b/src/MissionManager/MissionController.cc @@ -1693,7 +1693,7 @@ bool MissionController::showPlanFromManagerVehicle (void) qCDebug(MissionControllerLog) << "showPlanFromManagerVehicle" << _editMode; if (_masterController->offline()) { qCWarning(MissionControllerLog) << "MissionController::showPlanFromManagerVehicle called while offline"; - return true; // stops further propogation of showPlanFromManagerVehicle due to error + return true; // stops further propagation of showPlanFromManagerVehicle due to error } else { if (!_managerVehicle->initialPlanRequestComplete()) { // The vehicle hasn't completed initial load, we can just wait for newMissionItemsAvailable to be signalled automatically diff --git a/src/MissionManager/MissionSettingsItem.cc b/src/MissionManager/MissionSettingsItem.cc index 85d7bdc..bcf63ae 100644 --- a/src/MissionManager/MissionSettingsItem.cc +++ b/src/MissionManager/MissionSettingsItem.cc @@ -90,7 +90,7 @@ void MissionSettingsItem::save(QJsonArray& missionItems) appendMissionItems(items, this); - // First item show be planned home position, we are not reponsible for save/load + // First item show be planned home position, we are not responsible for save/load // Remaining items we just output as is for (int i=1; ioffline()) { qCWarning(RallyPointControllerLog) << "RallyPointController::showPlanFromManagerVehicle called while offline"; - return true; // stops further propogation of showPlanFromManagerVehicle due to error + return true; // stops further propagation of showPlanFromManagerVehicle due to error } else { if (!_managerVehicle->initialPlanRequestComplete()) { // The vehicle hasn't completed initial load, we can just wait for loadComplete to be signalled automatically diff --git a/src/QGCApplication.h b/src/QGCApplication.h index 0e9afda..5aea0aa 100644 --- a/src/QGCApplication.h +++ b/src/QGCApplication.h @@ -126,11 +126,11 @@ public: /// Although public should only be called by main. void _initCommon(void); - /// @brief Intialize the application for normal application boot. Or in other words we are not going to run + /// @brief Initialize the application for normal application boot. Or in other words we are not going to run /// unit tests. Although public should only be called by main. bool _initForNormalAppBoot(void); - /// @brief Intialize the application for normal application boot. Or in other words we are not going to run + /// @brief Initialize the application for normal application boot. Or in other words we are not going to run /// unit tests. Although public should only be called by main. bool _initForUnitTests(void); diff --git a/src/QmlControls/MavlinkQmlSingleton.h b/src/QmlControls/MavlinkQmlSingleton.h index 95268c0..fa064e6 100644 --- a/src/QmlControls/MavlinkQmlSingleton.h +++ b/src/QmlControls/MavlinkQmlSingleton.h @@ -97,7 +97,7 @@ public: MAV_CMD_VIDEO_STOP_CAPTURE=2501, /* Stop the current video capture |Reserved| Reserved| */ MAV_CMD_PANORAMA_CREATE=2800, /* Create a panorama at the current position |Viewing angle horizontal of the panorama (in degrees, +- 0.5 the total angle)| Viewing angle vertical of panorama (in degrees)| Speed of the horizontal rotation (in degrees per second)| Speed of the vertical rotation (in degrees per second)| */ MAV_CMD_DO_VTOL_TRANSITION=3000, /* Request VTOL transition |The target VTOL state, as defined by ENUM MAV_VTOL_STATE. Only MAV_VTOL_STATE_MC and MAV_VTOL_STATE_FW can be used.| */ - MAV_CMD_PAYLOAD_PREPARE_DEPLOY=30001, /* Deploy payload on a Lat / Lon / Alt position. This includes the navigation to reach the required release position and velocity. |Operation mode. 0: prepare single payload deploy (overwriting previous requests), but do not execute it. 1: execute payload deploy immediately (rejecting further deploy commands during execution, but allowing abort). 2: add payload deploy to existing deployment list.| Desired approach vector in degrees compass heading (0..360). A negative value indicates the system can define the approach vector at will.| Desired ground speed at release time. This can be overriden by the airframe in case it needs to meet minimum airspeed. A negative value indicates the system can define the ground speed at will.| Minimum altitude clearance to the release position in meters. A negative value indicates the system can define the clearance at will.| Latitude unscaled for MISSION_ITEM or in 1e7 degrees for MISSION_ITEM_INT| Longitude unscaled for MISSION_ITEM or in 1e7 degrees for MISSION_ITEM_INT| Altitude, in meters AMSL| */ + MAV_CMD_PAYLOAD_PREPARE_DEPLOY=30001, /* Deploy payload on a Lat / Lon / Alt position. This includes the navigation to reach the required release position and velocity. |Operation mode. 0: prepare single payload deploy (overwriting previous requests), but do not execute it. 1: execute payload deploy immediately (rejecting further deploy commands during execution, but allowing abort). 2: add payload deploy to existing deployment list.| Desired approach vector in degrees compass heading (0..360). A negative value indicates the system can define the approach vector at will.| Desired ground speed at release time. This can be overridden by the airframe in case it needs to meet minimum airspeed. A negative value indicates the system can define the ground speed at will.| Minimum altitude clearance to the release position in meters. A negative value indicates the system can define the clearance at will.| Latitude unscaled for MISSION_ITEM or in 1e7 degrees for MISSION_ITEM_INT| Longitude unscaled for MISSION_ITEM or in 1e7 degrees for MISSION_ITEM_INT| Altitude, in meters AMSL| */ MAV_CMD_PAYLOAD_CONTROL_DEPLOY=30002, /* Control the payload deployment. |Operation mode. 0: Abort deployment, continue normal mission. 1: switch to payload deploment mode. 100: delete first payload deployment request. 101: delete all payload deployment requests.| Reserved| Reserved| Reserved| Reserved| Reserved| Reserved| */ MAV_CMD_DO_START_MAG_CAL=42424, /* Initiate a magnetometer calibration |uint8_t bitmask of magnetometers (0 means all)| Automatically retry on failure (0=no retry, 1=retry).| Save without user input (0=require input, 1=autosave).| Delay (seconds)| Empty| Empty| Empty| */ MAV_CMD_DO_ACCEPT_MAG_CAL=42425, /* Initiate a magnetometer calibration |uint8_t bitmask of magnetometers (0 means all)| Empty| Empty| Empty| Empty| Empty| Empty| */ diff --git a/src/QmlControls/QGCComboBox.qml b/src/QmlControls/QGCComboBox.qml index f703d6d..32634b5 100644 --- a/src/QmlControls/QGCComboBox.qml +++ b/src/QmlControls/QGCComboBox.qml @@ -210,7 +210,7 @@ Button { onObjectAdded: { // There is a bug in Instantiator which can cause objects to be added out of order from an index standpoint. - // If not handled correcty this will cause menu items to be added incorrectly due to the way Menu.insertItem works. + // If not handled correctly this will cause menu items to be added incorrectly due to the way Menu.insertItem works. //console.log("menu add", index, object.text) if (index === popup.__selectedIndex) { popup.selectedText = object["text"] diff --git a/src/Settings/Video.SettingsGroup.json b/src/Settings/Video.SettingsGroup.json index 260a872..b3f39e2 100644 --- a/src/Settings/Video.SettingsGroup.json +++ b/src/Settings/Video.SettingsGroup.json @@ -39,7 +39,7 @@ { "name": "VideoGridLines", "shortDescription": "Video Grid Lines", - "longDescription": "Displays a grid overlayed over the video view.", + "longDescription": "Displays a grid overlaid over the video view.", "type": "uint32", "enumStrings": "Hide,Show", "enumValues": "1,0", diff --git a/src/Vehicle/MAVLinkLogManager.cc b/src/Vehicle/MAVLinkLogManager.cc index ad5de1d..efeca2c 100644 --- a/src/Vehicle/MAVLinkLogManager.cc +++ b/src/Vehicle/MAVLinkLogManager.cc @@ -264,7 +264,7 @@ MAVLinkLogProcessor::processStreamData(uint16_t sequence, uint8_t first_message, if(num_drops > 0) { _writeUlogMessage(_ulogMessage); _ulogMessage.clear(); - //-- If no usefull information in this message. Drop it. + //-- If no useful information in this message. Drop it. if(first_message == 255) { break; } diff --git a/src/Vehicle/Vehicle.h b/src/Vehicle/Vehicle.h index d7617fa..a1c1ca9 100644 --- a/src/Vehicle/Vehicle.h +++ b/src/Vehicle/Vehicle.h @@ -466,7 +466,7 @@ public: MAV_TYPE vehicleType(void) const { return _vehicleType; } Q_INVOKABLE QString vehicleTypeName(void) const; - /// Returns the highest quality link available to the Vehicle. If you need to hold a refernce to this link use + /// Returns the highest quality link available to the Vehicle. If you need to hold a reference to this link use /// LinkManager::sharedLinkInterfaceForGet to get QSharedPointer for link. LinkInterface* priorityLink(void) { return _priorityLink.data(); } diff --git a/src/api/QGCCorePlugin.h b/src/api/QGCCorePlugin.h index 222552d..567e851 100644 --- a/src/api/QGCCorePlugin.h +++ b/src/api/QGCCorePlugin.h @@ -77,7 +77,7 @@ public: /// @return The message to show to the user when they a re prompted to confirm turning on advanced ui. virtual QString showAdvancedUIMessage(void) const; - /// @return An instance of an alternate postion source (or NULL if not available) + /// @return An instance of an alternate position source (or NULL if not available) virtual QGeoPositionInfoSource* createPositionSource(QObject* parent) { Q_UNUSED(parent); return NULL; } /// Allows a plugin to override the specified color name from the palette diff --git a/src/comm/MockLink.h b/src/comm/MockLink.h index da7fe70..9039350 100644 --- a/src/comm/MockLink.h +++ b/src/comm/MockLink.h @@ -141,7 +141,7 @@ public: /// Reset the state of the MissionItemHandler to no items, no transactions in progress. void resetMissionItemHandler(void) { _missionItemHandler.reset(); } - /// Returns the filename for the simulated log file. Onyl available after a download is requested. + /// Returns the filename for the simulated log file. Only available after a download is requested. QString logDownloadFile(void) { return _logDownloadFilename; } static MockLink* startPX4MockLink (bool sendStatusText, MockConfiguration::FailureMode_t failureMode = MockConfiguration::FailNone); diff --git a/src/comm/QGCXPlaneLink.cc b/src/comm/QGCXPlaneLink.cc index 87b4247..247e7ef 100644 --- a/src/comm/QGCXPlaneLink.cc +++ b/src/comm/QGCXPlaneLink.cc @@ -202,7 +202,7 @@ void QGCXPlaneLink::run() struct iset_struct { char b[5]; - int index; // (0->20 in the lsit below) + int index; // (0->20 in the list below) char str_ipad_them[16]; char str_port_them[6]; char padding[2]; diff --git a/src/ui/linechart/LinechartPlot.cc b/src/ui/linechart/LinechartPlot.cc index 61d14b8..9399e2b 100644 --- a/src/ui/linechart/LinechartPlot.cc +++ b/src/ui/linechart/LinechartPlot.cc @@ -557,7 +557,7 @@ quint64 LinechartPlot::getMaxTime() * @brief Get the plot interval * The plot interval is the time interval which is displayed on the plot * - * @return The plot inteval in milliseconds + * @return The plot interval in milliseconds * @see setPlotInterval() * @see getDataInterval() To get the interval for which data is available **/ diff --git a/src/ui/preferences/GeneralSettings.qml b/src/ui/preferences/GeneralSettings.qml index da291d0..810b3d3 100644 --- a/src/ui/preferences/GeneralSettings.qml +++ b/src/ui/preferences/GeneralSettings.qml @@ -112,7 +112,7 @@ QGCView { } //----------------------------------------------------------------- - //-- Miscellanous + //-- Miscellaneous Item { width: _qgcView.width * 0.8 height: miscLabel.height @@ -425,7 +425,7 @@ QGCView { } QGCLabel { - text: qsTr("Minumum observation duration:") + text: qsTr("Minimum observation duration:") } FactTextField { fact: QGroundControl.settingsManager.rtkSettings.surveyInMinObservationDuration