diff --git a/commandlauncher/deviceplugincommandlauncher.cpp b/commandlauncher/deviceplugincommandlauncher.cpp index e1e0d0d6..3ab244d2 100644 --- a/commandlauncher/deviceplugincommandlauncher.cpp +++ b/commandlauncher/deviceplugincommandlauncher.cpp @@ -51,7 +51,7 @@ is finished, the \tt running \l{State} will change to \tt false. \section3 Example - An example for a very usefull script could be a backup scrip like following \tt backup.sh script. + An example for a very useful script could be a backup scrip like following \tt backup.sh script. \code #!/bin/sh # Directories to backup... diff --git a/elgato/aveabulb.cpp b/elgato/aveabulb.cpp index 8ba051a9..cfd72330 100644 --- a/elgato/aveabulb.cpp +++ b/elgato/aveabulb.cpp @@ -286,8 +286,8 @@ void AveaBulb::onColorServiceStateChanged(const QLowEnergyService::ServiceState foreach (const QLowEnergyCharacteristic &characteristic, m_colorService->characteristics()) { qCDebug(dcElgato()) << " -->" << characteristic.name() << characteristic.uuid().toString() << characteristic.value(); - foreach (const QLowEnergyDescriptor &desciptor, characteristic.descriptors()) { - qCDebug(dcElgato()) << " -->" << desciptor.name() << desciptor.uuid().toString() << desciptor.value(); + foreach (const QLowEnergyDescriptor &descriptor, characteristic.descriptors()) { + qCDebug(dcElgato()) << " -->" << descriptor.name() << descriptor.uuid().toString() << descriptor.value(); } } diff --git a/eq-3/deviceplugineq-3.cpp b/eq-3/deviceplugineq-3.cpp index 2b4de16d..3f4da44f 100644 --- a/eq-3/deviceplugineq-3.cpp +++ b/eq-3/deviceplugineq-3.cpp @@ -28,12 +28,12 @@ \ingroup plugins \ingroup nymea-plugins - This plugin allows to find and controll devices from Max!(eQ-3). To use this devices, you need at least + This plugin allows to find and control devices from Max!(eQ-3). To use this devices, you need at least one \l{http://www.eq-3.de/max-heizungssteuerung-produktdetail/items/bc-lgw-o-tw.html}{Max! Cube LAN Gateway} in you local network. Once the cube is connected (DHCP), you can auto detect the cube in the network and add it to your \l{https://nymea.io}{nymea} devices. Also more than one cube in the network is supported. All devices, which are connected to a cube, will be autogenerated. For the setup of a cube, the original - software is recomanded (min/max setpoint temperature, weekly programm...). + software is recomanded (min/max setpoint temperature, weekly program...). \chapter Supported devices \section2 Max! Cube LAN Gateway @@ -349,7 +349,7 @@ void DevicePluginEQ3::wallThermostatDataUpdated() device->setStateValue(wallThermostateEcoTempStateTypeId, wallThermostat->ecoTemp()); device->setStateValue(wallThermostateMaxSetpointTempStateTypeId, wallThermostat->maxSetPointTemp()); device->setStateValue(wallThermostateMinSetpointTempStateTypeId, wallThermostat->minSetPointTemp()); - device->setStateValue(wallThermostateErrorOccurredStateTypeId, wallThermostat->errorOccured()); + device->setStateValue(wallThermostateErrorOccurredStateTypeId, wallThermostat->errorOccurred()); device->setStateValue(wallThermostateInitializedStateTypeId, wallThermostat->initialized()); device->setStateValue(wallThermostateBatteryLowStateTypeId, wallThermostat->batteryLow()); device->setStateValue(wallThermostateLinkStatusOKStateTypeId, wallThermostat->linkStatusOK()); @@ -375,7 +375,7 @@ void DevicePluginEQ3::radiatorThermostatDataUpdated() device->setStateValue(radiatorThermostateComfortTempStateTypeId, radiatorThermostat->comfortTemp()); device->setStateValue(radiatorThermostateMaxSetpointTempStateTypeId, radiatorThermostat->maxSetPointTemp()); device->setStateValue(radiatorThermostateMinSetpointTempStateTypeId, radiatorThermostat->minSetPointTemp()); - device->setStateValue(radiatorThermostateErrorOccurredStateTypeId, radiatorThermostat->errorOccured()); + device->setStateValue(radiatorThermostateErrorOccurredStateTypeId, radiatorThermostat->errorOccurred()); device->setStateValue(radiatorThermostateInitializedStateTypeId, radiatorThermostat->initialized()); device->setStateValue(radiatorThermostateBatteryLowStateTypeId, radiatorThermostat->batteryLow()); device->setStateValue(radiatorThermostatePanelLockedStateTypeId, radiatorThermostat->panelLocked()); diff --git a/eq-3/maxcube.cpp b/eq-3/maxcube.cpp index bc02b608..271da975 100644 --- a/eq-3/maxcube.cpp +++ b/eq-3/maxcube.cpp @@ -416,7 +416,7 @@ void MaxCube::decodeDevicelistMessage(QByteArray data) // init/valid code QByteArray initCode = fillBin(QByteArray::number(rawData.mid(8,2).toInt(0,16),2),8); device->setInformationValid((bool)initCode.mid(3,1).toInt()); - device->setErrorOccured((bool)initCode.mid(4,1).toInt()); + device->setErrorOccurred((bool)initCode.mid(4,1).toInt()); device->setIsAnswereToCommand((bool)initCode.mid(5,1).toInt()); device->setInitialized((bool)initCode.mid(6,1).toInt()); @@ -444,7 +444,7 @@ void MaxCube::decodeDevicelistMessage(QByteArray data) qCDebug(dcEQ3) << " RF address (hex) | " << device->rfAddress(); qCDebug(dcEQ3) << " initCode | " << initCode; qCDebug(dcEQ3) << " information valid | " << device->informationValid(); - qCDebug(dcEQ3) << " error occured | " << device->errorOccured(); + qCDebug(dcEQ3) << " error occurred | " << device->errorOccurred(); qCDebug(dcEQ3) << " is answere to a command | " << device->isAnswereToCommand(); qCDebug(dcEQ3) << " initialized | " << device->initialized(); qCDebug(dcEQ3) << " battery low | " << device->batteryLow(); @@ -468,7 +468,7 @@ void MaxCube::decodeDevicelistMessage(QByteArray data) QByteArray initCode = fillBin(QByteArray::number(rawData.mid(8,2).toInt(0,16),2),8); device->setInformationValid((bool)initCode.mid(3,1).toInt()); - device->setErrorOccured((bool)initCode.mid(4,1).toInt()); + device->setErrorOccurred((bool)initCode.mid(4,1).toInt()); device->setIsAnswereToCommand((bool)initCode.mid(5,1).toInt()); device->setInitialized((bool)initCode.mid(6,1).toInt()); @@ -487,7 +487,7 @@ void MaxCube::decodeDevicelistMessage(QByteArray data) qCDebug(dcEQ3) << " device name | " << device->deviceName(); qCDebug(dcEQ3) << " RF address (hex) | " << device->rfAddress(); qCDebug(dcEQ3) << " information valid | " << device->informationValid(); - qCDebug(dcEQ3) << " error occured | " << device->errorOccured(); + qCDebug(dcEQ3) << " error occurred | " << device->errorOccurred(); qCDebug(dcEQ3) << " is answere to a command | " << device->isAnswereToCommand(); qCDebug(dcEQ3) << " initialized | " << device->initialized(); qCDebug(dcEQ3) << " battery low | " << device->batteryLow(); @@ -808,7 +808,7 @@ void MaxCube::setDeviceSetpointTemp(QByteArray rfAddress, int roomId, double tem temperatureData = fillBin(QByteArray::number((int)temperature*2,2),6); // set auto/ permanent/ temp - // 00 = auto (weekly programm...the hole tempererature byte to 0x00 + // 00 = auto (weekly program...the hole tempererature byte to 0x00 // 01 = Permanent // 10 = Temporary (date/time has to be set) diff --git a/eq-3/radiatorthermostat.cpp b/eq-3/radiatorthermostat.cpp index a1b4b101..3c244f17 100644 --- a/eq-3/radiatorthermostat.cpp +++ b/eq-3/radiatorthermostat.cpp @@ -168,14 +168,14 @@ void RadiatorThermostat::setInformationValid(const bool &informationValid) m_informationValid = informationValid; } -bool RadiatorThermostat::errorOccured() const +bool RadiatorThermostat::errorOccurred() const { - return m_errorOccured; + return m_errorOccurred; } -void RadiatorThermostat::setErrorOccured(const bool &errorOccured) +void RadiatorThermostat::setErrorOccurred(const bool &errorOccurred) { - m_errorOccured = errorOccured; + m_errorOccurred = errorOccurred; } bool RadiatorThermostat::isAnswereToCommand() const diff --git a/eq-3/radiatorthermostat.h b/eq-3/radiatorthermostat.h index 5a599cf1..3a43fb99 100644 --- a/eq-3/radiatorthermostat.h +++ b/eq-3/radiatorthermostat.h @@ -76,8 +76,8 @@ public: bool informationValid() const; void setInformationValid(const bool &informationValid); - bool errorOccured() const; - void setErrorOccured(const bool &errorOccured); + bool errorOccurred() const; + void setErrorOccurred(const bool &errorOccurred); bool isAnswereToCommand() const; void setIsAnswereToCommand(const bool &isAnswereToCommand); @@ -126,7 +126,7 @@ private: double m_valveMaximumSettings; double m_valveOffset; bool m_informationValid; - bool m_errorOccured; + bool m_errorOccurred; bool m_isAnswerToCommand; bool m_initialized; bool m_batteryLow; diff --git a/eq-3/wallthermostat.cpp b/eq-3/wallthermostat.cpp index 98e5874b..218e92bb 100644 --- a/eq-3/wallthermostat.cpp +++ b/eq-3/wallthermostat.cpp @@ -78,14 +78,14 @@ void WallThermostat::setInformationValid(const bool &informationValid) m_informationValid = informationValid; } -bool WallThermostat::errorOccured() const +bool WallThermostat::errorOccurred() const { - return m_errorOccured; + return m_errorOccurred; } -void WallThermostat::setErrorOccured(const bool &errorOccured) +void WallThermostat::setErrorOccurred(const bool &errorOccurred) { - m_errorOccured = errorOccured; + m_errorOccurred = errorOccurred; } bool WallThermostat::isAnswereToCommand() const diff --git a/eq-3/wallthermostat.h b/eq-3/wallthermostat.h index 48489a89..f73bf2ef 100644 --- a/eq-3/wallthermostat.h +++ b/eq-3/wallthermostat.h @@ -47,8 +47,8 @@ public: bool informationValid() const; void setInformationValid(const bool &informationValid); - bool errorOccured() const; - void setErrorOccured(const bool &errorOccured); + bool errorOccurred() const; + void setErrorOccurred(const bool &errorOccurred); bool isAnswereToCommand() const; void setIsAnswereToCommand(const bool &isAnswereToCommand); @@ -92,7 +92,7 @@ private: double m_minSetPointTemp; bool m_informationValid; - bool m_errorOccured; + bool m_errorOccurred; bool m_isAnswerToCommand; bool m_initialized; bool m_batteryLow; diff --git a/intertechno/devicepluginintertechno.cpp b/intertechno/devicepluginintertechno.cpp index 28b7af1c..dd76536a 100644 --- a/intertechno/devicepluginintertechno.cpp +++ b/intertechno/devicepluginintertechno.cpp @@ -28,7 +28,7 @@ \ingroup plugins \ingroup nymea-plugins - This plugin allows to controll RF 433 MHz actors an receive remote signals from + This plugin allows to control RF 433 MHz actors an receive remote signals from \l{http://www.intertechno.at}{Intertechno} devices. \chapter Plugin properties diff --git a/kodi/devicepluginkodi.cpp b/kodi/devicepluginkodi.cpp index af10bac4..d33aff5c 100644 --- a/kodi/devicepluginkodi.cpp +++ b/kodi/devicepluginkodi.cpp @@ -217,7 +217,7 @@ void DevicePluginKodi::onUpnpDiscoveryFinished() foreach (const UpnpDeviceDescriptor &upnpDescriptor, reply->deviceDescriptors()) { if (upnpDescriptor.modelName().contains("Kodi")) { - // check if we allready found the kodi on this ip + // check if we already found the kodi on this ip bool alreadyAdded = false; foreach (const DeviceDescriptor dDescriptor, deviceDescriptors) { if (dDescriptor.params().paramValue(kodiIpParamTypeId).toString() == upnpDescriptor.hostAddress().toString()) { diff --git a/mailnotification/devicepluginmailnotification.cpp b/mailnotification/devicepluginmailnotification.cpp index db03c965..48bf5ccf 100644 --- a/mailnotification/devicepluginmailnotification.cpp +++ b/mailnotification/devicepluginmailnotification.cpp @@ -47,7 +47,7 @@ from your yahoo account. \section2 Custom Mail - With the Custom Mail Notification you can set up a custom SMTP connection. The supported authentification + With the Custom Mail Notification you can set up a custom SMTP connection. The supported authentication methods are ["PLAIN", "LOGIN"], the supported encryption methods are ["NONE", "SSL", "TLS"]. \chapter Plugin properties diff --git a/osdomotics/devicepluginosdomotics.cpp b/osdomotics/devicepluginosdomotics.cpp index fbc5f595..9bdb0460 100644 --- a/osdomotics/devicepluginosdomotics.cpp +++ b/osdomotics/devicepluginosdomotics.cpp @@ -161,7 +161,7 @@ void DevicePluginOsdomotics::parseNodes(Device *device, const QByteArray &data) QHostAddress nodeAddress(QString(data.mid(index, delta - index))); - // check if we allready have found this node + // check if we already have found this node foreach (Device *device, myDevices()) { if (device->paramValue(merkurNodeHostParamTypeId).toString() == nodeAddress.toString()) { return; diff --git a/philipshue/devicepluginphilipshue.cpp b/philipshue/devicepluginphilipshue.cpp index da71589a..d8d8e2ec 100644 --- a/philipshue/devicepluginphilipshue.cpp +++ b/philipshue/devicepluginphilipshue.cpp @@ -1033,7 +1033,7 @@ void DevicePluginPhilipsHue::processBridgeRefreshResponse(Device *device, const break; } - // do lights/sensor update right after successfull bridge update + // do lights/sensor update right after successful bridge update HueBridge *bridge = m_bridges.key(device); refreshLights(bridge); } diff --git a/plantcare/devicepluginplantcare.cpp b/plantcare/devicepluginplantcare.cpp index e3e91f4a..84e1d7a7 100644 --- a/plantcare/devicepluginplantcare.cpp +++ b/plantcare/devicepluginplantcare.cpp @@ -29,7 +29,7 @@ \ingroup plugins \ingroup nymea-plugins-merkur - This allows to controll the nymea plantcare demo for 6LoWPAN networks. + This allows to control the nymea plantcare demo for 6LoWPAN networks. \chapter Plugin properties Following JSON file contains the definition and the description of all available \l{DeviceClass}{DeviceClasses} diff --git a/senic/nuimo.cpp b/senic/nuimo.cpp index 82471f83..a5e87745 100644 --- a/senic/nuimo.cpp +++ b/senic/nuimo.cpp @@ -213,8 +213,8 @@ void Nuimo::printService(QLowEnergyService *service) { foreach (const QLowEnergyCharacteristic &characteristic, service->characteristics()) { qCDebug(dcSenic()) << " -->" << characteristic.name() << characteristic.uuid().toString() << characteristic.value(); - foreach (const QLowEnergyDescriptor &desciptor, characteristic.descriptors()) { - qCDebug(dcSenic()) << " -->" << desciptor.name() << desciptor.uuid().toString() << desciptor.value(); + foreach (const QLowEnergyDescriptor &descriptor, characteristic.descriptors()) { + qCDebug(dcSenic()) << " -->" << descriptor.name() << descriptor.uuid().toString() << descriptor.value(); } } } diff --git a/snapd/devicepluginsnapd.cpp b/snapd/devicepluginsnapd.cpp index 00c1306d..90816bb4 100644 --- a/snapd/devicepluginsnapd.cpp +++ b/snapd/devicepluginsnapd.cpp @@ -114,7 +114,7 @@ DeviceManager::DeviceSetupStatus DevicePluginSnapd::setupDevice(Device *device) } m_snapdControl = new SnapdControl(device, this); - m_snapdControl->setPreferedRefreshTime(configValue(SnapdRefreshScheduleParamTypeId).toInt()); + m_snapdControl->setPreferredRefreshTime(configValue(SnapdRefreshScheduleParamTypeId).toInt()); connect(m_snapdControl, &SnapdControl::snapListUpdated, this, &DevicePluginSnapd::onSnapListUpdated); } else if (device->deviceClassId() == snapDeviceClassId) { @@ -208,7 +208,7 @@ void DevicePluginSnapd::onPluginConfigurationChanged(const ParamTypeId ¶mTyp m_refreshTime = value.toInt(); qCDebug(dcSnapd()) << "Refresh schedule start time" << QTime(m_refreshTime, 0, 0).toString("hh:mm"); - m_snapdControl->setPreferedRefreshTime(m_refreshTime); + m_snapdControl->setPreferredRefreshTime(m_refreshTime); } } diff --git a/snapd/snapdcontrol.cpp b/snapd/snapdcontrol.cpp index 218b2a0e..8a1d3f76 100644 --- a/snapd/snapdcontrol.cpp +++ b/snapd/snapdcontrol.cpp @@ -129,11 +129,11 @@ void SnapdControl::configureRefreshSchedule() return; QVariantMap configuration; QVariantMap configMap; - configMap.insert("timer", m_preferedRefreshSchedule); - configMap.insert("schedule", m_preferedRefreshSchedule); + configMap.insert("timer", m_preferredRefreshSchedule); + configMap.insert("schedule", m_preferredRefreshSchedule); configuration.insert("refresh", configMap); - qCDebug(dcSnapd()) << "Configure refresh schedule from" << m_currentRefreshSchedule << "-->" << m_preferedRefreshSchedule; + qCDebug(dcSnapd()) << "Configure refresh schedule from" << m_currentRefreshSchedule << "-->" << m_preferredRefreshSchedule; SnapdReply *reply = m_snapConnection->put(QString("/v2/snaps/core/conf"), QJsonDocument::fromVariant(configuration).toJson(QJsonDocument::Compact), this); connect(reply, &SnapdReply::finished, this, &SnapdControl::onConfigureRefreshScheduleFinished); @@ -191,7 +191,7 @@ void SnapdControl::onLoadSystemInfoFinished() reply->deleteLater(); // Check if the refresh schedule should be updated - if (m_currentRefreshSchedule != m_preferedRefreshSchedule) { + if (m_currentRefreshSchedule != m_preferredRefreshSchedule) { configureRefreshSchedule(); } } @@ -391,7 +391,7 @@ void SnapdControl::update() return; } - // Note: this makes sure the state is realy connected (including connection initialisation stuff) + // Note: this makes sure the state is really connected (including connection initialisation stuff) if (!m_snapConnection->isConnected()) return; @@ -453,13 +453,13 @@ void SnapdControl::checkForUpdates() connect(reply, &SnapdReply::finished, this, &SnapdControl::onCheckForUpdatesFinished); } -void SnapdControl::setPreferedRefreshTime(int startTime) +void SnapdControl::setPreferredRefreshTime(int startTime) { // Schedule the refresh between startTime and startTime + 59 minutes QTime start(startTime, 0, 0); QTime end = start.addSecs(3540); - m_preferedRefreshSchedule = QString("%1-%2").arg(start.toString("h:mm")).arg(end.toString("h:mm")); - qCDebug(dcSnapd()) << "Set prefered refresh schedule to " << m_preferedRefreshSchedule; + m_preferredRefreshSchedule = QString("%1-%2").arg(start.toString("h:mm")).arg(end.toString("h:mm")); + qCDebug(dcSnapd()) << "Set preferred refresh schedule to " << m_preferredRefreshSchedule; } void SnapdControl::snapRevert(const QString &snapName) diff --git a/snapd/snapdcontrol.h b/snapd/snapdcontrol.h index bd541435..a9439a73 100644 --- a/snapd/snapdcontrol.h +++ b/snapd/snapdcontrol.h @@ -53,7 +53,7 @@ private: bool m_timerBasedSchedule = false; QString m_currentRefreshSchedule; - QString m_preferedRefreshSchedule; + QString m_preferredRefreshSchedule; // Update calls void loadSystemInfo(); @@ -90,7 +90,7 @@ public slots: void snapRefresh(); void checkForUpdates(); - void setPreferedRefreshTime(int startTime); + void setPreferredRefreshTime(int startTime); void snapRevert(const QString &snapName); void changeSnapChannel(const QString &snapName, const QString &channel); diff --git a/tcpcommander/deviceplugintcpcommander.cpp b/tcpcommander/deviceplugintcpcommander.cpp index 9fb444ac..52bfef1c 100644 --- a/tcpcommander/deviceplugintcpcommander.cpp +++ b/tcpcommander/deviceplugintcpcommander.cpp @@ -143,7 +143,7 @@ void DevicePluginTcpCommander::onTcpServerConnected() } connect(tcpServer, &TcpServer::textMessageReceived, this, &DevicePluginTcpCommander::onTcpServerTextMessageReceived); - //send signal device Setup was successfull + //send signal device Setup was successful } @@ -167,7 +167,7 @@ void DevicePluginTcpCommander::onTcpServerTextMessageReceived(QByteArray data) device->setStateValue(tcpInputDataReceivedStateTypeId, data); if (device->paramValue(tcpInputComparisionParamTypeId).toString() == "Is exactly") { - qDebug(dcTCPCommander()) << "is exacly"; + qDebug(dcTCPCommander()) << "is exactly"; if (data == device->paramValue(tcpInputInputDataParamTypeId)) { qDebug(dcTCPCommander()) << "comparison successful"; emitEvent(Event(tcpInputCommandReceivedEventTypeId, device->id())); diff --git a/unitec/devicepluginunitec.cpp b/unitec/devicepluginunitec.cpp index e8270f7e..109c4ffc 100644 --- a/unitec/devicepluginunitec.cpp +++ b/unitec/devicepluginunitec.cpp @@ -34,7 +34,7 @@ The unitec socket units have a learn function. If you plug in the switch, a red light will start to blink. This means the socket is in the learning mode. Now you can add a Unitec switch (48111) to nymea with your desired Channel (A,B,C or D). In order to pair the socket you just have to press the power ON, and the switch has to be in the pairing mode. - If the pairing was successfull, the switch will turn on. If the switches will be removed from the socket or there will + If the pairing was successful, the switch will turn on. If the switches will be removed from the socket or there will be a power breakdown, the switch has to be re-paired. The device can not remember the teached channel. \chapter Plugin properties diff --git a/wemo/devicepluginwemo.cpp b/wemo/devicepluginwemo.cpp index dbfc4303..0574b0f5 100644 --- a/wemo/devicepluginwemo.cpp +++ b/wemo/devicepluginwemo.cpp @@ -28,7 +28,7 @@ \ingroup plugins \ingroup nymea-plugins - This plugin allows to find and controll devices from WeMo, the + This plugin allows to find and control devices from WeMo, the \l{http://www.belkin.com/de/PRODUKTE/home-automation/c/wemo-home-automation/}{Belkin} home automation system. @@ -105,7 +105,7 @@ DeviceManager::DeviceError DevicePluginWemo::executeAction(Device *device, const if (action.actionTypeId() == wemoSwitchPowerActionTypeId) { // Check if wemo device is reachable if (device->stateValue(wemoSwitchReachableStateTypeId).toBool()) { - // setPower returns false, if the curent powerState is allready the new powerState + // setPower returns false, if the curent powerState is already the new powerState if (setPower(device, action.param(wemoSwitchPowerStateParamTypeId).value().toBool(), action.id())) { return DeviceManager::DeviceErrorAsync; } else { diff --git a/ws2812/devicepluginws2812.cpp b/ws2812/devicepluginws2812.cpp index 672dc85d..4c602f37 100644 --- a/ws2812/devicepluginws2812.cpp +++ b/ws2812/devicepluginws2812.cpp @@ -24,7 +24,7 @@ /*! \page ws2812.html \title ws2812 - \brief Plugin to controll ws2812 LEDs based on 6LoWPAN networking. + \brief Plugin to control ws2812 LEDs based on 6LoWPAN networking. \ingroup plugins \ingroup nymea-plugins-merkur