ETM-Schurig/etm-powersync-plugins
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use qmath, remove some comments

Browse Source
This commit is contained in:
loosrob 2022-02-07 19:56:38 +01:00
parent bfe91a9ab2
commit f7eabe522d
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
shelly/integrationpluginshelly.cpp
View File

@ -44,7 +44,7 @@
#include "plugintimer.h" #include "plugintimer.h"
#include "math.h" #include "qmath.h"
#include "network/zeroconf/zeroconfservicebrowser.h" #include "network/zeroconf/zeroconfservicebrowser.h"
#include "platform/platformzeroconfcontroller.h" #include "platform/platformzeroconfcontroller.h"
@ -335,7 +335,7 @@ static QHash<ActionTypeId, ThingClassId> powerActionTypesMap = {
{shellyGenericPMPowerActionTypeId, shellyGenericPMThingClassId}, {shellyGenericPMPowerActionTypeId, shellyGenericPMThingClassId},
{shellyLightPMPowerActionTypeId, shellyLightPMThingClassId}, {shellyLightPMPowerActionTypeId, shellyLightPMThingClassId},
{shellySocketPMPowerActionTypeId, shellySocketPMThingClassId}, {shellySocketPMPowerActionTypeId, shellySocketPMThingClassId},
{shellyEmPowerActionTypeId, shellyEmThingClassId}, // move power to switch child? {shellyEmPowerActionTypeId, shellyEmThingClassId},
{shellyEm3PowerActionTypeId, shellyEm3ThingClassId}, {shellyEm3PowerActionTypeId, shellyEm3ThingClassId},
}; };
@ -350,7 +350,7 @@ static QHash<ActionTypeId, ThingClassId> powerActionParamTypesMap = {
{shellyGenericPMPowerActionTypeId, shellyGenericPMPowerActionPowerParamTypeId}, {shellyGenericPMPowerActionTypeId, shellyGenericPMPowerActionPowerParamTypeId},
{shellyLightPMPowerActionTypeId, shellyLightPMPowerActionPowerParamTypeId}, {shellyLightPMPowerActionTypeId, shellyLightPMPowerActionPowerParamTypeId},
{shellySocketPMPowerActionTypeId, shellySocketPMPowerActionPowerParamTypeId}, {shellySocketPMPowerActionTypeId, shellySocketPMPowerActionPowerParamTypeId},
{shellyEmPowerActionTypeId, shellyEmPowerActionPowerParamTypeId}, // move power to switch child? {shellyEmPowerActionTypeId, shellyEmPowerActionPowerParamTypeId},
{shellyEm3PowerActionTypeId, shellyEm3PowerActionPowerParamTypeId}, {shellyEm3PowerActionTypeId, shellyEm3PowerActionPowerParamTypeId},
}; };
@ -1140,7 +1140,7 @@ void IntegrationPluginShelly::onPublishReceived(MqttChannel *channel, const QStr
} }
double power = child->stateValue(shellyEmChannelCurrentPowerPhaseAStateTypeId).toDouble(); double power = child->stateValue(shellyEmChannelCurrentPowerPhaseAStateTypeId).toDouble();
double reactivePower = child->stateValue(shellyEmChannelReactivePowerPhaseAStateTypeId).toDouble(); double reactivePower = child->stateValue(shellyEmChannelReactivePowerPhaseAStateTypeId).toDouble();
double root = sqrt(power*power + reactivePower*reactivePower); double root = qsqrt(power*power + reactivePower*reactivePower);
if (qFuzzyCompare(root, 0) == false) { if (qFuzzyCompare(root, 0) == false) {
double calcPf = power/root; double calcPf = power/root;
child->setStateValue(shellyEmChannelPowerFactorPhaseAStateTypeId, calcPf); child->setStateValue(shellyEmChannelPowerFactorPhaseAStateTypeId, calcPf);
@ -1357,9 +1357,6 @@ void IntegrationPluginShelly::setupShellyGateway(ThingSetupInfo *info)
// Create 2 measurement channels for shelly em --> create separate switch child as well? // Create 2 measurement channels for shelly em --> create separate switch child as well?
if (info->thing()->thingClassId() == shellyEmThingClassId) { if (info->thing()->thingClassId() == shellyEmThingClassId) {
/*ThingDescriptor switchChild(shellySwitchThingClassId, info->thing()->name() + " switch", QString(), info->thing()->id());
switchChild.setParams(ParamList() << Param(shellySwitchThingChannelParamTypeId, 1));
autoChilds.append(switchChild);*/
ThingDescriptor channelChild(shellyEmChannelThingClassId, info->thing()->name() + " channel 1", QString(), info->thing()->id()); ThingDescriptor channelChild(shellyEmChannelThingClassId, info->thing()->name() + " channel 1", QString(), info->thing()->id());
channelChild.setParams(ParamList() << Param(shellyEmChannelThingChannelParamTypeId, 1)); channelChild.setParams(ParamList() << Param(shellyEmChannelThingChannelParamTypeId, 1));
autoChilds.append(channelChild); autoChilds.append(channelChild);