Merge PR #614: Shelly: Add support for flood, smoke and gas sensors
jenkins
commit
f2498355f2
|
|
@ -77,6 +77,9 @@ static QHash<ThingClassId, ParamTypeId> idParamTypeMap = {
|
|||
{shellyI3ThingClassId, shellyI3ThingIdParamTypeId},
|
||||
{shellyMotionThingClassId, shellyMotionThingIdParamTypeId},
|
||||
{shellyTrvThingClassId, shellyTrvThingIdParamTypeId},
|
||||
{shellyFloodThingClassId, shellyFloodThingIdParamTypeId},
|
||||
{shellySmokeThingClassId, shellySmokeThingIdParamTypeId},
|
||||
{shellyGasThingClassId, shellyGasThingIdParamTypeId}
|
||||
};
|
||||
|
||||
static QHash<ThingClassId, ParamTypeId> usernameParamTypeMap = {
|
||||
|
|
@ -95,6 +98,9 @@ static QHash<ThingClassId, ParamTypeId> usernameParamTypeMap = {
|
|||
{shellyI3ThingClassId, shellyI3ThingUsernameParamTypeId},
|
||||
{shellyMotionThingClassId, shellyMotionThingUsernameParamTypeId},
|
||||
{shellyTrvThingClassId, shellyTrvThingUsernameParamTypeId},
|
||||
{shellyFloodThingClassId, shellyFloodThingUsernameParamTypeId},
|
||||
{shellySmokeThingClassId, shellySmokeThingUsernameParamTypeId},
|
||||
{shellyGasThingClassId, shellyGasThingUsernameParamTypeId}
|
||||
};
|
||||
|
||||
static QHash<ThingClassId, ParamTypeId> passwordParamTypeMap = {
|
||||
|
|
@ -112,7 +118,10 @@ static QHash<ThingClassId, ParamTypeId> passwordParamTypeMap = {
|
|||
{shellyHTThingClassId, shellyHTThingPasswordParamTypeId},
|
||||
{shellyI3ThingClassId, shellyI3ThingPasswordParamTypeId},
|
||||
{shellyMotionThingClassId, shellyMotionThingPasswordParamTypeId},
|
||||
{shellyTrvThingClassId, shellyTrvThingPasswordParamTypeId}
|
||||
{shellyTrvThingClassId, shellyTrvThingPasswordParamTypeId},
|
||||
{shellyFloodThingClassId, shellyFloodThingPasswordParamTypeId},
|
||||
{shellySmokeThingClassId, shellySmokeThingPasswordParamTypeId},
|
||||
{shellyGasThingClassId, shellyGasThingPasswordParamTypeId}
|
||||
};
|
||||
|
||||
static QHash<ThingClassId, ParamTypeId> rollerModeParamTypeMap = {
|
||||
|
|
@ -234,7 +243,10 @@ static QHash<ActionTypeId, ThingClassId> updateActionTypesMap = {
|
|||
{shellyHTPerformUpdateActionTypeId, shellyHTThingClassId},
|
||||
{shellyI3PerformUpdateActionTypeId, shellyI3ThingClassId},
|
||||
{shellyMotionPerformUpdateActionTypeId, shellyMotionThingClassId},
|
||||
{shellyTrvPerformUpdateActionTypeId, shellyTrvThingClassId}
|
||||
{shellyTrvPerformUpdateActionTypeId, shellyTrvThingClassId},
|
||||
{shellyFloodPerformUpdateActionTypeId, shellyFloodThingClassId},
|
||||
{shellySmokePerformUpdateActionTypeId, shellySmokeThingClassId},
|
||||
{shellyGasPerformUpdateActionTypeId, shellyGasThingClassId}
|
||||
};
|
||||
|
||||
// Settings
|
||||
|
|
@ -302,6 +314,12 @@ void IntegrationPluginShelly::discoverThings(ThingDiscoveryInfo *info)
|
|||
namePattern = QRegExp("shellymotionsensor-[0-9A-Z]+$");
|
||||
} else if (info->thingClassId() == shellyTrvThingClassId) {
|
||||
namePattern = QRegExp("shellytrv-[0-9A-Z]+$");
|
||||
} else if (info->thingClassId() == shellyFloodThingClassId) {
|
||||
namePattern = QRegExp("^shellyflood-[0-9A-Z]+$");
|
||||
} else if (info->thingClassId() == shellyFloodThingClassId) {
|
||||
namePattern = QRegExp("^shellysmoke-[0-9A-Z]+$");
|
||||
} else if (info->thingClassId() == shellyGasThingClassId) {
|
||||
namePattern = QRegExp("^shellygas-[0-9A-Z]+$");
|
||||
}
|
||||
if (!entry.name().contains(namePattern)) {
|
||||
continue;
|
||||
|
|
@ -406,7 +424,7 @@ void IntegrationPluginShelly::executeAction(ThingActionInfo *info)
|
|||
} else {
|
||||
url.setPath("/reboot");
|
||||
QNetworkReply *reply = hardwareManager()->networkManager()->get(QNetworkRequest(url));
|
||||
connect(reply, &QNetworkReply::finished, &QNetworkReply::deleteLater);
|
||||
connect(reply, &QNetworkReply::finished, reply, &QNetworkReply::deleteLater);
|
||||
connect(reply, &QNetworkReply::finished, info, [info, reply](){
|
||||
if (reply->error() != QNetworkReply::NoError) {
|
||||
qCWarning(dcShelly()) << "Failed to execute reboot action:" << reply->error() << reply->errorString();
|
||||
|
|
@ -423,7 +441,7 @@ void IntegrationPluginShelly::executeAction(ThingActionInfo *info)
|
|||
query.addQueryItem("update", "true");
|
||||
url.setQuery(query);
|
||||
QNetworkReply *reply = hardwareManager()->networkManager()->get(QNetworkRequest(url));
|
||||
connect(reply, &QNetworkReply::finished, &QNetworkReply::deleteLater);
|
||||
connect(reply, &QNetworkReply::finished, reply, &QNetworkReply::deleteLater);
|
||||
connect(reply, &QNetworkReply::finished, info, [info, reply](){
|
||||
info->finish(reply->error() == QNetworkReply::NoError ? Thing::ThingErrorNoError : Thing::ThingErrorHardwareFailure);
|
||||
});
|
||||
|
|
@ -459,7 +477,7 @@ void IntegrationPluginShelly::executeAction(ThingActionInfo *info)
|
|||
query.addQueryItem("turn", on ? "on" : "off");
|
||||
url.setQuery(query);
|
||||
QNetworkReply *reply = hardwareManager()->networkManager()->get(QNetworkRequest(url));
|
||||
connect(reply, &QNetworkReply::finished, &QNetworkReply::deleteLater);
|
||||
connect(reply, &QNetworkReply::finished, reply, &QNetworkReply::deleteLater);
|
||||
connect(reply, &QNetworkReply::finished, info, [info, reply, on](){
|
||||
info->thing()->setStateValue("power", on);
|
||||
info->finish(reply->error() == QNetworkReply::NoError ? Thing::ThingErrorNoError : Thing::ThingErrorHardwareFailure);
|
||||
|
|
@ -476,7 +494,7 @@ void IntegrationPluginShelly::executeAction(ThingActionInfo *info)
|
|||
query.addQueryItem("turn", on ? "on" : "off");
|
||||
url.setQuery(query);
|
||||
QNetworkReply *reply = hardwareManager()->networkManager()->get(QNetworkRequest(url));
|
||||
connect(reply, &QNetworkReply::finished, &QNetworkReply::deleteLater);
|
||||
connect(reply, &QNetworkReply::finished, reply, &QNetworkReply::deleteLater);
|
||||
connect(reply, &QNetworkReply::finished, info, [info, reply, on](){
|
||||
info->thing()->setStateValue("power", on);
|
||||
info->finish(reply->error() == QNetworkReply::NoError ? Thing::ThingErrorNoError : Thing::ThingErrorHardwareFailure);
|
||||
|
|
@ -494,7 +512,7 @@ void IntegrationPluginShelly::executeAction(ThingActionInfo *info)
|
|||
query.addQueryItem("blue", QString::number(color.blue()));
|
||||
url.setQuery(query);
|
||||
QNetworkReply *reply = hardwareManager()->networkManager()->get(QNetworkRequest(url));
|
||||
connect(reply, &QNetworkReply::finished, &QNetworkReply::deleteLater);
|
||||
connect(reply, &QNetworkReply::finished, reply, &QNetworkReply::deleteLater);
|
||||
connect(reply, &QNetworkReply::finished, info, [info, reply, color](){
|
||||
info->thing()->setStateValue("color", color);
|
||||
info->finish(reply->error() == QNetworkReply::NoError ? Thing::ThingErrorNoError : Thing::ThingErrorHardwareFailure);
|
||||
|
|
@ -509,7 +527,7 @@ void IntegrationPluginShelly::executeAction(ThingActionInfo *info)
|
|||
query.addQueryItem("white", QString::number(whiteValue));
|
||||
url.setQuery(query);
|
||||
QNetworkReply *reply = hardwareManager()->networkManager()->get(QNetworkRequest(url));
|
||||
connect(reply, &QNetworkReply::finished, &QNetworkReply::deleteLater);
|
||||
connect(reply, &QNetworkReply::finished, reply, &QNetworkReply::deleteLater);
|
||||
connect(reply, &QNetworkReply::finished, info, [info, reply, whiteValue](){
|
||||
info->thing()->setStateValue(shellyRgbw2WhiteChannelStateTypeId, whiteValue);
|
||||
info->finish(reply->error() == QNetworkReply::NoError ? Thing::ThingErrorNoError : Thing::ThingErrorHardwareFailure);
|
||||
|
|
@ -528,7 +546,7 @@ void IntegrationPluginShelly::executeAction(ThingActionInfo *info)
|
|||
query.addQueryItem("white", "255");
|
||||
url.setQuery(query);
|
||||
QNetworkReply *reply = hardwareManager()->networkManager()->get(QNetworkRequest(url));
|
||||
connect(reply, &QNetworkReply::finished, &QNetworkReply::deleteLater);
|
||||
connect(reply, &QNetworkReply::finished, reply, &QNetworkReply::deleteLater);
|
||||
connect(reply, &QNetworkReply::finished, info, [info, reply, ct](){
|
||||
info->thing()->setStateValue("colorTemperature", ct);
|
||||
info->finish(reply->error() == QNetworkReply::NoError ? Thing::ThingErrorNoError : Thing::ThingErrorHardwareFailure);
|
||||
|
|
@ -544,7 +562,7 @@ void IntegrationPluginShelly::executeAction(ThingActionInfo *info)
|
|||
query.addQueryItem("gain", QString::number(brightness));
|
||||
url.setQuery(query);
|
||||
QNetworkReply *reply = hardwareManager()->networkManager()->get(QNetworkRequest(url));
|
||||
connect(reply, &QNetworkReply::finished, &QNetworkReply::deleteLater);
|
||||
connect(reply, &QNetworkReply::finished, reply, &QNetworkReply::deleteLater);
|
||||
connect(reply, &QNetworkReply::finished, info, [info, reply, brightness](){
|
||||
info->thing()->setStateValue("brightness", brightness);
|
||||
info->finish(reply->error() == QNetworkReply::NoError ? Thing::ThingErrorNoError : Thing::ThingErrorHardwareFailure);
|
||||
|
|
@ -560,7 +578,7 @@ void IntegrationPluginShelly::executeAction(ThingActionInfo *info)
|
|||
query.addQueryItem("turn", on ? "on" : "off");
|
||||
url.setQuery(query);
|
||||
QNetworkReply *reply = hardwareManager()->networkManager()->get(QNetworkRequest(url));
|
||||
connect(reply, &QNetworkReply::finished, &QNetworkReply::deleteLater);
|
||||
connect(reply, &QNetworkReply::finished, reply, &QNetworkReply::deleteLater);
|
||||
connect(reply, &QNetworkReply::finished, info, [info, reply, on](){
|
||||
info->thing()->setStateValue("power", on);
|
||||
info->finish(reply->error() == QNetworkReply::NoError ? Thing::ThingErrorNoError : Thing::ThingErrorHardwareFailure);
|
||||
|
|
@ -576,7 +594,7 @@ void IntegrationPluginShelly::executeAction(ThingActionInfo *info)
|
|||
query.addQueryItem("brightness", QString::number(brightness));
|
||||
url.setQuery(query);
|
||||
QNetworkReply *reply = hardwareManager()->networkManager()->get(QNetworkRequest(url));
|
||||
connect(reply, &QNetworkReply::finished, &QNetworkReply::deleteLater);
|
||||
connect(reply, &QNetworkReply::finished, reply, &QNetworkReply::deleteLater);
|
||||
connect(reply, &QNetworkReply::finished, info, [info, reply, brightness](){
|
||||
info->thing()->setStateValue("brightness", brightness);
|
||||
info->finish(reply->error() == QNetworkReply::NoError ? Thing::ThingErrorNoError : Thing::ThingErrorHardwareFailure);
|
||||
|
|
@ -593,7 +611,7 @@ void IntegrationPluginShelly::executeAction(ThingActionInfo *info)
|
|||
url.setQuery(query);
|
||||
qCDebug(dcShelly()) << "Requesting:" << url;
|
||||
QNetworkReply *reply = hardwareManager()->networkManager()->get(QNetworkRequest(url));
|
||||
connect(reply, &QNetworkReply::finished, &QNetworkReply::deleteLater);
|
||||
connect(reply, &QNetworkReply::finished, reply, &QNetworkReply::deleteLater);
|
||||
connect(reply, &QNetworkReply::finished, info, [info, reply, targetValue](){
|
||||
// The Shelly TRV seems to reply with OK, but then takes ages to actually set the value
|
||||
// If we send another value within that time frame, it will again reply with OK but just ognore it...
|
||||
|
|
@ -613,7 +631,7 @@ void IntegrationPluginShelly::executeAction(ThingActionInfo *info)
|
|||
query.addQueryItem("pos", QString::number(targetValue));
|
||||
url.setQuery(query);
|
||||
QNetworkReply *reply = hardwareManager()->networkManager()->get(QNetworkRequest(url));
|
||||
connect(reply, &QNetworkReply::finished, &QNetworkReply::deleteLater);
|
||||
connect(reply, &QNetworkReply::finished, reply, &QNetworkReply::deleteLater);
|
||||
connect(reply, &QNetworkReply::finished, info, [info, reply, targetValue](){
|
||||
// The Shelly TRV seems to reply with OK, but then takes ages to actually set the value
|
||||
// If we send another value within that time frame, it will again reply with OK but just ognore it...
|
||||
|
|
@ -632,7 +650,7 @@ void IntegrationPluginShelly::executeAction(ThingActionInfo *info)
|
|||
query.addQueryItem("boost_minutes", thing->setting(shellyTrvSettingsBoostDurationParamTypeId).toString());
|
||||
url.setQuery(query);
|
||||
QNetworkReply *reply = hardwareManager()->networkManager()->get(QNetworkRequest(url));
|
||||
connect(reply, &QNetworkReply::finished, &QNetworkReply::deleteLater);
|
||||
connect(reply, &QNetworkReply::finished, reply, &QNetworkReply::deleteLater);
|
||||
connect(reply, &QNetworkReply::finished, info, [info, reply](){
|
||||
info->finish(reply->error() == QNetworkReply::NoError ? Thing::ThingErrorNoError : Thing::ThingErrorHardwareFailure);
|
||||
});
|
||||
|
|
@ -645,7 +663,7 @@ void IntegrationPluginShelly::executeAction(ThingActionInfo *info)
|
|||
query.addQueryItem("go", "open");
|
||||
url.setQuery(query);
|
||||
QNetworkReply *reply = hardwareManager()->networkManager()->get(QNetworkRequest(url));
|
||||
connect(reply, &QNetworkReply::finished, &QNetworkReply::deleteLater);
|
||||
connect(reply, &QNetworkReply::finished, reply, &QNetworkReply::deleteLater);
|
||||
connect(reply, &QNetworkReply::finished, info, [info, reply](){
|
||||
info->finish(reply->error() == QNetworkReply::NoError ? Thing::ThingErrorNoError : Thing::ThingErrorHardwareFailure);
|
||||
});
|
||||
|
|
@ -658,7 +676,7 @@ void IntegrationPluginShelly::executeAction(ThingActionInfo *info)
|
|||
query.addQueryItem("go", "close");
|
||||
url.setQuery(query);
|
||||
QNetworkReply *reply = hardwareManager()->networkManager()->get(QNetworkRequest(url));
|
||||
connect(reply, &QNetworkReply::finished, &QNetworkReply::deleteLater);
|
||||
connect(reply, &QNetworkReply::finished, reply, &QNetworkReply::deleteLater);
|
||||
connect(reply, &QNetworkReply::finished, info, [info, reply](){
|
||||
info->finish(reply->error() == QNetworkReply::NoError ? Thing::ThingErrorNoError : Thing::ThingErrorHardwareFailure);
|
||||
});
|
||||
|
|
@ -671,7 +689,7 @@ void IntegrationPluginShelly::executeAction(ThingActionInfo *info)
|
|||
query.addQueryItem("go", "stop");
|
||||
url.setQuery(query);
|
||||
QNetworkReply *reply = hardwareManager()->networkManager()->get(QNetworkRequest(url));
|
||||
connect(reply, &QNetworkReply::finished, &QNetworkReply::deleteLater);
|
||||
connect(reply, &QNetworkReply::finished, reply, &QNetworkReply::deleteLater);
|
||||
connect(reply, &QNetworkReply::finished, info, [info, reply](){
|
||||
info->finish(reply->error() == QNetworkReply::NoError ? Thing::ThingErrorNoError : Thing::ThingErrorHardwareFailure);
|
||||
});
|
||||
|
|
@ -681,7 +699,7 @@ void IntegrationPluginShelly::executeAction(ThingActionInfo *info)
|
|||
if (action.actionTypeId() == shellyRollerCalibrateActionTypeId) {
|
||||
url.setPath(QString("/roller/%1/calibrate").arg(info->thing()->paramValue(shellyRollerThingChannelParamTypeId).toInt() - 1));
|
||||
QNetworkReply *reply = hardwareManager()->networkManager()->get(QNetworkRequest(url));
|
||||
connect(reply, &QNetworkReply::finished, &QNetworkReply::deleteLater);
|
||||
connect(reply, &QNetworkReply::finished, reply, &QNetworkReply::deleteLater);
|
||||
connect(reply, &QNetworkReply::finished, info, [info, reply](){
|
||||
info->finish(reply->error() == QNetworkReply::NoError ? Thing::ThingErrorNoError : Thing::ThingErrorHardwareFailure);
|
||||
});
|
||||
|
|
@ -695,7 +713,7 @@ void IntegrationPluginShelly::executeAction(ThingActionInfo *info)
|
|||
query.addQueryItem("roller_pos", info->action().paramValue(shellyRollerPercentageActionPercentageParamTypeId).toString());
|
||||
url.setQuery(query);
|
||||
QNetworkReply *reply = hardwareManager()->networkManager()->get(QNetworkRequest(url));
|
||||
connect(reply, &QNetworkReply::finished, &QNetworkReply::deleteLater);
|
||||
connect(reply, &QNetworkReply::finished, reply, &QNetworkReply::deleteLater);
|
||||
connect(reply, &QNetworkReply::finished, info, [info, reply](){
|
||||
info->finish(reply->error() == QNetworkReply::NoError ? Thing::ThingErrorNoError : Thing::ThingErrorHardwareFailure);
|
||||
});
|
||||
|
|
@ -705,7 +723,63 @@ void IntegrationPluginShelly::executeAction(ThingActionInfo *info)
|
|||
if (action.actionTypeId() == shellyEmResetActionTypeId || action.actionTypeId() == shellyEm3ResetActionTypeId) {
|
||||
url.setPath("/reset_data");
|
||||
QNetworkReply *reply = hardwareManager()->networkManager()->get(QNetworkRequest(url));
|
||||
connect(reply, &QNetworkReply::finished, &QNetworkReply::deleteLater);
|
||||
connect(reply, &QNetworkReply::finished, reply, &QNetworkReply::deleteLater);
|
||||
connect(reply, &QNetworkReply::finished, info, [info, reply](){
|
||||
info->finish(reply->error() == QNetworkReply::NoError ? Thing::ThingErrorNoError : Thing::ThingErrorHardwareFailure);
|
||||
});
|
||||
return;
|
||||
}
|
||||
|
||||
if (action.actionTypeId() == shellyGasSelfTestActionTypeId) {
|
||||
url.setPath("/self_test");
|
||||
QNetworkReply *reply = hardwareManager()->networkManager()->get(QNetworkRequest(url));
|
||||
connect(reply, &QNetworkReply::finished, reply, &QNetworkReply::deleteLater);
|
||||
connect(reply, &QNetworkReply::finished, info, [info, reply](){
|
||||
info->finish(reply->error() == QNetworkReply::NoError ? Thing::ThingErrorNoError : Thing::ThingErrorHardwareFailure);
|
||||
});
|
||||
return;
|
||||
}
|
||||
|
||||
if (action.actionTypeId() == shellyGasMuteActionTypeId) {
|
||||
url.setPath("/mute");
|
||||
QNetworkReply *reply = hardwareManager()->networkManager()->get(QNetworkRequest(url));
|
||||
connect(reply, &QNetworkReply::finished, reply, &QNetworkReply::deleteLater);
|
||||
connect(reply, &QNetworkReply::finished, info, [info, reply](){
|
||||
info->finish(reply->error() == QNetworkReply::NoError ? Thing::ThingErrorNoError : Thing::ThingErrorHardwareFailure);
|
||||
});
|
||||
return;
|
||||
}
|
||||
|
||||
if (action.actionTypeId() == shellyGasUnmuteActionTypeId) {
|
||||
url.setPath("/unmute");
|
||||
QNetworkReply *reply = hardwareManager()->networkManager()->get(QNetworkRequest(url));
|
||||
connect(reply, &QNetworkReply::finished, reply, &QNetworkReply::deleteLater);
|
||||
connect(reply, &QNetworkReply::finished, info, [info, reply](){
|
||||
info->finish(reply->error() == QNetworkReply::NoError ? Thing::ThingErrorNoError : Thing::ThingErrorHardwareFailure);
|
||||
});
|
||||
return;
|
||||
}
|
||||
|
||||
if (action.actionTypeId() == shellyGasOpenValveActionTypeId) {
|
||||
url.setPath("/settings/valve/0");
|
||||
QUrlQuery query;
|
||||
query.addQueryItem("go", "open");
|
||||
url.setQuery(query);
|
||||
QNetworkReply *reply = hardwareManager()->networkManager()->get(QNetworkRequest(url));
|
||||
connect(reply, &QNetworkReply::finished, reply, &QNetworkReply::deleteLater);
|
||||
connect(reply, &QNetworkReply::finished, info, [info, reply](){
|
||||
info->finish(reply->error() == QNetworkReply::NoError ? Thing::ThingErrorNoError : Thing::ThingErrorHardwareFailure);
|
||||
});
|
||||
return;
|
||||
}
|
||||
|
||||
if (action.actionTypeId() == shellyGasCloseValveActionTypeId) {
|
||||
url.setPath("/settings/valve/0");
|
||||
QUrlQuery query;
|
||||
query.addQueryItem("go", "close");
|
||||
url.setQuery(query);
|
||||
QNetworkReply *reply = hardwareManager()->networkManager()->get(QNetworkRequest(url));
|
||||
connect(reply, &QNetworkReply::finished, reply, &QNetworkReply::deleteLater);
|
||||
connect(reply, &QNetworkReply::finished, info, [info, reply](){
|
||||
info->finish(reply->error() == QNetworkReply::NoError ? Thing::ThingErrorNoError : Thing::ThingErrorHardwareFailure);
|
||||
});
|
||||
|
|
@ -798,6 +872,9 @@ void IntegrationPluginShelly::onMulticastMessageReceived(const QHostAddress &sou
|
|||
roller->setStateValue(shellyRollerPercentageStateTypeId, value.toUInt());
|
||||
}
|
||||
break;
|
||||
case 1105:
|
||||
thing->setStateValue("valveState", value);
|
||||
break;
|
||||
case 1201: // power (on/off) for channel 2
|
||||
thing->setStateValue("channel2", value.toInt() == 1);
|
||||
break;
|
||||
|
|
@ -865,6 +942,9 @@ void IntegrationPluginShelly::onMulticastMessageReceived(const QHostAddress &sou
|
|||
case 3106:
|
||||
thing->setStateValue("lightIntensity", value.toInt());
|
||||
break;
|
||||
case 3107:
|
||||
thing->setStateValue("gasLevel", value.toInt());
|
||||
break;
|
||||
case 3111:
|
||||
if (value.toInt() == -1) { // When connected to power surce
|
||||
thing->setStateValue("batteryLevel", 100);
|
||||
|
|
@ -873,6 +953,12 @@ void IntegrationPluginShelly::onMulticastMessageReceived(const QHostAddress &sou
|
|||
}
|
||||
thing->setStateValue("batteryCritical", thing->stateValue("batteryLevel").toUInt() < 10);
|
||||
break;
|
||||
case 3113:
|
||||
thing->setStateValue("sensorOperation", value);
|
||||
break;
|
||||
case 3114:
|
||||
thing->setStateValue("selfTest", value);
|
||||
break;
|
||||
case 3121:
|
||||
thing->setStateValue("valvePosition", value.toUInt());
|
||||
thing->setStateValue("heatingOn", value.toUInt() > 0);
|
||||
|
|
@ -1044,9 +1130,18 @@ void IntegrationPluginShelly::onMulticastMessageReceived(const QHostAddress &sou
|
|||
case 5108:
|
||||
white = value.toInt();
|
||||
break;
|
||||
case 6105:
|
||||
thing->setStateValue("fireDetected", value.toInt() == 1);
|
||||
break;
|
||||
case 6106:
|
||||
thing->setStateValue("waterDetected", value.toInt() == 1);
|
||||
break;
|
||||
case 6107:
|
||||
thing->setStateValue("isPresent", value.toInt() == 1);
|
||||
break;
|
||||
case 6108:
|
||||
thing->setStateValue("gas", value);
|
||||
break;
|
||||
case 6110:
|
||||
thing->setStateValue("vibration", value.toInt() == 1);
|
||||
break;
|
||||
|
|
@ -1093,6 +1188,12 @@ void IntegrationPluginShelly::onMulticastMessageReceived(const QHostAddress &sou
|
|||
roller->setStateValue(shellyRollerMovingStateTypeId, moving);
|
||||
}
|
||||
}
|
||||
|
||||
// Fetching info about signal strength, battery level for sleepy devices as they may be still awake when sending us something.
|
||||
if (thing->thingClassId() == shellyFloodThingClassId ||
|
||||
thing->thingClassId() == shellyTrvThingClassId) {
|
||||
fetchStatusGen1(thing);
|
||||
}
|
||||
}
|
||||
|
||||
void IntegrationPluginShelly::updateStatus()
|
||||
|
|
@ -1101,6 +1202,12 @@ void IntegrationPluginShelly::updateStatus()
|
|||
if (thing->paramValue("id").toString().contains("Plus")) {
|
||||
fetchStatusGen2(thing);
|
||||
} else {
|
||||
//Skipping sleepy devices, as they won't reply to cyclic requests.
|
||||
if (thing->thingClassId() == shellyFloodThingClassId
|
||||
|| thing->thingClassId() == shellyTrvThingClassId) {
|
||||
continue;
|
||||
}
|
||||
|
||||
fetchStatusGen1(thing);
|
||||
}
|
||||
}
|
||||
|
|
@ -1282,6 +1389,10 @@ void IntegrationPluginShelly::setupGen1(ThingSetupInfo *info)
|
|||
info->thing()->setSettingValue(shellyTrvSettingsChildLockParamTypeId, settingsMap.value("child_lock").toBool());
|
||||
info->thing()->setSettingValue(shellyTrvSettingsDisplayFlippedParamTypeId, settingsMap.value("display").toMap().value("flipped").toBool());
|
||||
info->thing()->setSettingValue(shellyTrvSettingsDisplayBrightnessParamTypeId, settingsMap.value("display").toMap().value("brightness").toUInt());
|
||||
} else if (info->thing()->thingClassId() == shellyGasThingClassId) {
|
||||
info->thing()->setSettingValue(shellyGasSettingsBuzzerVolumeParamTypeId, settingsMap.value("set_volume").toUInt());
|
||||
} else if (info->thing()->thingClassId() == shellyFloodThingClassId) {
|
||||
info->thing()->setSettingValue(shellyFloodSettingsRainSensorParamTypeId, settingsMap.value("rain_sensor").toBool());
|
||||
}
|
||||
|
||||
ThingDescriptors autoChilds;
|
||||
|
|
@ -1384,7 +1495,8 @@ void IntegrationPluginShelly::setupGen1(ThingSetupInfo *info)
|
|||
if (info->thing()->thingClassId() == shellyPlugThingClassId ||
|
||||
info->thing()->thingClassId() == shellyButton1ThingClassId ||
|
||||
info->thing()->thingClassId() == shellyI3ThingClassId ||
|
||||
info->thing()->thingClassId() == shellyTrvThingClassId) {
|
||||
info->thing()->thingClassId() == shellyTrvThingClassId ||
|
||||
info->thing()->thingClassId() == shellyGasThingClassId) {
|
||||
connect(info->thing(), &Thing::settingChanged, this, [this, thing, shellyId](const ParamTypeId &settingTypeId, const QVariant &value) {
|
||||
|
||||
pluginStorage()->beginGroup(thing->id().toString());
|
||||
|
|
@ -1428,6 +1540,12 @@ void IntegrationPluginShelly::setupGen1(ThingSetupInfo *info)
|
|||
} else if (settingTypeId == shellyTrvSettingsDisplayFlippedParamTypeId) {
|
||||
url.setPath("/settings");
|
||||
query.addQueryItem("display_flipped", value.toString());
|
||||
} else if (settingTypeId == shellyGasSettingsBuzzerVolumeParamTypeId) {
|
||||
url.setPath("/settings");
|
||||
query.addQueryItem("set_volume", value.toString());
|
||||
} else if (settingTypeId == shellyFloodSettingsRainSensorParamTypeId) {
|
||||
url.setPath("/settings");
|
||||
query.addQueryItem("rain_sensor", value.toString());
|
||||
}
|
||||
|
||||
url.setQuery(query);
|
||||
|
|
|
|||
|
|
@ -1755,7 +1755,439 @@
|
|||
"displayName": "Reboot device"
|
||||
}
|
||||
]
|
||||
|
||||
},
|
||||
{
|
||||
"id": "d59f08e4-64e3-49f1-96e1-60b63136e3d9",
|
||||
"name": "shellyFlood",
|
||||
"displayName": "Shelly Flood",
|
||||
"createMethods": ["discovery"],
|
||||
"interfaces": ["watersensor", "temperaturesensor", "wirelessconnectable", "battery", "update"],
|
||||
"paramTypes": [
|
||||
{
|
||||
"id": "9c35b068-d099-4278-b10f-8d9ee8e20597",
|
||||
"name":"id",
|
||||
"displayName": "Shelly ID",
|
||||
"type": "QString",
|
||||
"readOnly": true
|
||||
},
|
||||
{
|
||||
"id": "3e392be4-4129-4856-92b6-1d72e7c02523",
|
||||
"name": "coapMode",
|
||||
"displayName": "CoIoT peer mode",
|
||||
"type": "QString",
|
||||
"allowedValues": ["unicast", "multicast"],
|
||||
"defaultValue": "unicast"
|
||||
},
|
||||
{
|
||||
"id": "7fb6d4fa-ce51-4863-b1c8-1ff4bc2b1aa7",
|
||||
"name": "username",
|
||||
"displayName": "Username (optional)",
|
||||
"type": "QString"
|
||||
},
|
||||
{
|
||||
"id": "3f810961-cac8-4d85-9e0b-5580dd94a2ec",
|
||||
"name": "password",
|
||||
"displayName": "Password (optional)",
|
||||
"type": "QString"
|
||||
}
|
||||
],
|
||||
"settingsTypes": [
|
||||
{
|
||||
"id": "db6b2930-05f0-476e-9c9c-d9f89f05dc59",
|
||||
"name": "rainSensor",
|
||||
"displayName": "Rain sensor",
|
||||
"type": "bool",
|
||||
"defaultValue": false
|
||||
}
|
||||
],
|
||||
"stateTypes": [
|
||||
{
|
||||
"id": "c8ecb7c4-da20-49b4-a086-8c137d3dc349",
|
||||
"name": "waterDetected",
|
||||
"displayName": "Water detected",
|
||||
"displayNameEvent": "Water detected",
|
||||
"type": "bool",
|
||||
"defaultValue": false
|
||||
},
|
||||
{
|
||||
"id": "1f62ad7a-5200-4807-ad5d-7d3bff1f8966",
|
||||
"name": "temperature",
|
||||
"displayName": "Temperature",
|
||||
"displayNameEvent": "Temperature changed",
|
||||
"type": "double",
|
||||
"unit": "DegreeCelsius",
|
||||
"defaultValue": 0
|
||||
},
|
||||
{
|
||||
"id": "0c445ba9-091d-4cca-bca1-b15c51a95d0f",
|
||||
"name": "connected",
|
||||
"displayName": "Connected",
|
||||
"displayNameEvent": "Connected or disconnected",
|
||||
"type": "bool",
|
||||
"defaultValue": false,
|
||||
"cached": false
|
||||
},
|
||||
{
|
||||
"id": "bbb6d325-9712-4f29-81b6-65fd09264a99",
|
||||
"name": "signalStrength",
|
||||
"displayName": "Signal strength",
|
||||
"displayNameEvent": "Signal strength changed",
|
||||
"type": "uint",
|
||||
"unit": "Percentage",
|
||||
"minValue": 0,
|
||||
"maxValue": 100,
|
||||
"defaultValue": 0,
|
||||
"cached": false
|
||||
},
|
||||
{
|
||||
"id": "e321f13e-8efc-4882-8498-def48b3e8ae4",
|
||||
"name": "batteryLevel",
|
||||
"displayName": "Battery level",
|
||||
"displayNameEvent": "Battery level changed",
|
||||
"type": "int",
|
||||
"minValue": 0,
|
||||
"maxValue": 100,
|
||||
"unit": "Percentage",
|
||||
"defaultValue": 0
|
||||
},
|
||||
{
|
||||
"id": "0b657f84-f09c-46af-ac28-069b2b67bac3",
|
||||
"name": "batteryCritical",
|
||||
"displayName": "Battery level critical",
|
||||
"displayNameEvent": "Battery critical changed",
|
||||
"type": "bool",
|
||||
"defaultValue": false
|
||||
},
|
||||
{
|
||||
"id": "a5120193-9396-45c5-bd16-e92a229899db",
|
||||
"name": "updateStatus",
|
||||
"displayName": "Update status",
|
||||
"displayNameEvent": "Update status changed",
|
||||
"type": "QString",
|
||||
"possibleValues": ["idle", "available", "updating"],
|
||||
"defaultValue": "idle"
|
||||
},
|
||||
{
|
||||
"id": "15c1f27c-2379-4df0-afa9-086b63282d2a",
|
||||
"name": "currentVersion",
|
||||
"displayName": "Current firmware version",
|
||||
"displayNameEvent": "Current firmware version changed",
|
||||
"type": "QString",
|
||||
"defaultValue": ""
|
||||
},
|
||||
{
|
||||
"id": "e86ef323-4531-459f-9c8c-d150a93ad208",
|
||||
"name": "availableVersion",
|
||||
"displayName": "Available firmware version",
|
||||
"displayNameEvent": "Available firmware version changed",
|
||||
"type": "QString",
|
||||
"defaultValue": ""
|
||||
}
|
||||
],
|
||||
"actionTypes": [
|
||||
{
|
||||
"id": "0263209a-65b2-4521-a241-db597fb003ea",
|
||||
"name": "performUpdate",
|
||||
"displayName": "Start firmware update"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"id": "7317eb8a-fa6d-41a3-9ff5-0da3feacc960",
|
||||
"name": "shellySmoke",
|
||||
"displayName": "Shelly Smoke",
|
||||
"createMethods": ["discovery"],
|
||||
"interfaces": ["firesensor", "temperaturesensor", "wirelessconnectable", "battery", "update"],
|
||||
"paramTypes": [
|
||||
{
|
||||
"id": "3ec27a9e-c92b-4c05-bde9-3ef546b0db0a",
|
||||
"name":"id",
|
||||
"displayName": "Shelly ID",
|
||||
"type": "QString",
|
||||
"readOnly": true
|
||||
},
|
||||
{
|
||||
"id": "87344da6-b58a-42f8-b958-d3c940300992",
|
||||
"name": "coapMode",
|
||||
"displayName": "CoIoT peer mode",
|
||||
"type": "QString",
|
||||
"allowedValues": ["unicast", "multicast"],
|
||||
"defaultValue": "unicast"
|
||||
},
|
||||
{
|
||||
"id": "9068fb98-534c-461b-902d-03d43ff10582",
|
||||
"name": "username",
|
||||
"displayName": "Username (optional)",
|
||||
"type": "QString"
|
||||
},
|
||||
{
|
||||
"id": "5931bdaf-7b3d-402c-a7fd-fb9a7238e36f",
|
||||
"name": "password",
|
||||
"displayName": "Password (optional)",
|
||||
"type": "QString"
|
||||
}
|
||||
],
|
||||
"stateTypes": [
|
||||
{
|
||||
"id": "a16585f7-7cc6-49b0-848c-d7da2237ba77",
|
||||
"name": "fireDetected",
|
||||
"displayName": "Fire detected",
|
||||
"displayNameEvent": "Fire detected",
|
||||
"type": "bool",
|
||||
"defaultValue": false
|
||||
},
|
||||
{
|
||||
"id": "3e3606ba-8c2d-41b0-a434-171dccd97795",
|
||||
"name": "temperature",
|
||||
"displayName": "Temperature",
|
||||
"displayNameEvent": "Temperature changed",
|
||||
"type": "double",
|
||||
"unit": "DegreeCelsius",
|
||||
"defaultValue": 0
|
||||
},
|
||||
{
|
||||
"id": "a1d0350f-d71d-4bd2-b5c7-f928d9c561bb",
|
||||
"name": "connected",
|
||||
"displayName": "Connected",
|
||||
"displayNameEvent": "Connected or disconnected",
|
||||
"type": "bool",
|
||||
"defaultValue": false,
|
||||
"cached": false
|
||||
},
|
||||
{
|
||||
"id": "dd7205f4-2431-4ed5-8127-d31800c442a7",
|
||||
"name": "signalStrength",
|
||||
"displayName": "Signal strength",
|
||||
"displayNameEvent": "Signal strength changed",
|
||||
"type": "uint",
|
||||
"unit": "Percentage",
|
||||
"minValue": 0,
|
||||
"maxValue": 100,
|
||||
"defaultValue": 0,
|
||||
"cached": false
|
||||
},
|
||||
{
|
||||
"id": "61090a03-b3ff-4b21-a5b8-2ad27bbdf1a5",
|
||||
"name": "batteryLevel",
|
||||
"displayName": "Battery level",
|
||||
"displayNameEvent": "Battery level changed",
|
||||
"type": "int",
|
||||
"minValue": 0,
|
||||
"maxValue": 100,
|
||||
"unit": "Percentage",
|
||||
"defaultValue": 0
|
||||
},
|
||||
{
|
||||
"id": "1ce8e795-65a7-4e10-815d-0cb8e9f2ec7e",
|
||||
"name": "batteryCritical",
|
||||
"displayName": "Battery level critical",
|
||||
"displayNameEvent": "Battery critical changed",
|
||||
"type": "bool",
|
||||
"defaultValue": false
|
||||
},
|
||||
{
|
||||
"id": "34b839d7-0043-44c9-8bf9-136059141ff9",
|
||||
"name": "updateStatus",
|
||||
"displayName": "Update status",
|
||||
"displayNameEvent": "Update status changed",
|
||||
"type": "QString",
|
||||
"possibleValues": ["idle", "available", "updating"],
|
||||
"defaultValue": "idle"
|
||||
},
|
||||
{
|
||||
"id": "4750db5f-6380-4528-9a5e-216c32dc1709",
|
||||
"name": "currentVersion",
|
||||
"displayName": "Current firmware version",
|
||||
"displayNameEvent": "Current firmware version changed",
|
||||
"type": "QString",
|
||||
"defaultValue": ""
|
||||
},
|
||||
{
|
||||
"id": "0633052d-5b6c-480b-8208-23b25018c11f",
|
||||
"name": "availableVersion",
|
||||
"displayName": "Available firmware version",
|
||||
"displayNameEvent": "Available firmware version changed",
|
||||
"type": "QString",
|
||||
"defaultValue": ""
|
||||
}
|
||||
],
|
||||
"actionTypes": [
|
||||
{
|
||||
"id": "09dc2e58-149c-4131-bd1b-e039a5133f72",
|
||||
"name": "performUpdate",
|
||||
"displayName": "Start firmware update"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"id": "f032e312-0911-450e-9456-67c27f31bebd",
|
||||
"name": "shellyGas",
|
||||
"displayName": "Shelly Gas",
|
||||
"createMethods": ["discovery"],
|
||||
"interfaces": ["gassensor", "wirelessconnectable", "update"],
|
||||
"paramTypes": [
|
||||
{
|
||||
"id": "f5b3cd5a-07d3-4084-a223-0d6242a180cb",
|
||||
"name":"id",
|
||||
"displayName": "Shelly ID",
|
||||
"type": "QString",
|
||||
"readOnly": true
|
||||
},
|
||||
{
|
||||
"id": "5c414606-2a2e-4251-b9fc-0442457f4111",
|
||||
"name": "coapMode",
|
||||
"displayName": "CoIoT peer mode",
|
||||
"type": "QString",
|
||||
"allowedValues": ["unicast", "multicast"],
|
||||
"defaultValue": "unicast"
|
||||
},
|
||||
{
|
||||
"id": "57916ac9-ae2e-41d4-8f67-2d16138672f7",
|
||||
"name": "username",
|
||||
"displayName": "Username (optional)",
|
||||
"type": "QString"
|
||||
},
|
||||
{
|
||||
"id": "9802c341-0c1c-45f9-bc9c-6e03472e55f2",
|
||||
"name": "password",
|
||||
"displayName": "Password (optional)",
|
||||
"type": "QString"
|
||||
}
|
||||
],
|
||||
"settingsTypes": [
|
||||
{
|
||||
"id": "2f58325e-718d-4529-8f7e-453c911b0974",
|
||||
"name": "buzzerVolume",
|
||||
"displayName": "Buzzer volume",
|
||||
"type": "uint",
|
||||
"minValue": 1,
|
||||
"maxValue": 11,
|
||||
"defaultValue": 11
|
||||
}
|
||||
],
|
||||
"stateTypes": [
|
||||
{
|
||||
"id": "f7549376-226f-42aa-ae0e-1a62884908d8",
|
||||
"name": "gasLevel",
|
||||
"displayName": "Gas level",
|
||||
"displayNameEvent": "Gas leve changed",
|
||||
"type": "double",
|
||||
"unit": "PartsPerMillion",
|
||||
"defaultValue": 0,
|
||||
"minValue": 0,
|
||||
"maxValue": 65535
|
||||
},
|
||||
{
|
||||
"id": "4c912d66-398f-4c82-9ae1-a08d191cfbc7",
|
||||
"name": "connected",
|
||||
"displayName": "Connected",
|
||||
"displayNameEvent": "Connected or disconnected",
|
||||
"type": "bool",
|
||||
"defaultValue": false,
|
||||
"cached": false
|
||||
},
|
||||
{
|
||||
"id": "71a6ef7a-c116-4cc6-94ab-943c0aad4d5f",
|
||||
"name": "signalStrength",
|
||||
"displayName": "Signal strength",
|
||||
"displayNameEvent": "Signal strength changed",
|
||||
"type": "uint",
|
||||
"unit": "Percentage",
|
||||
"minValue": 0,
|
||||
"maxValue": 100,
|
||||
"defaultValue": 0,
|
||||
"cached": false
|
||||
},
|
||||
{
|
||||
"id": "8ceb701b-7a6d-4f81-a09e-72e8ace12057",
|
||||
"name": "updateStatus",
|
||||
"displayName": "Update status",
|
||||
"displayNameEvent": "Update status changed",
|
||||
"type": "QString",
|
||||
"possibleValues": ["idle", "available", "updating"],
|
||||
"defaultValue": "idle"
|
||||
},
|
||||
{
|
||||
"id": "98911e5d-16f6-4502-a7df-111c7007a660",
|
||||
"name": "currentVersion",
|
||||
"displayName": "Current firmware version",
|
||||
"displayNameEvent": "Current firmware version changed",
|
||||
"type": "QString",
|
||||
"defaultValue": ""
|
||||
},
|
||||
{
|
||||
"id": "8c805225-86fb-4a50-b8af-4bbe0b4d7dde",
|
||||
"name": "availableVersion",
|
||||
"displayName": "Available firmware version",
|
||||
"displayNameEvent": "Available firmware version changed",
|
||||
"type": "QString",
|
||||
"defaultValue": ""
|
||||
},
|
||||
{
|
||||
"id": "efbc314f-d3e4-4558-9736-e7499d2bd8ba",
|
||||
"name": "sensorOperation",
|
||||
"displayName": "Sensor operation",
|
||||
"type": "QString",
|
||||
"possibleValues": ["warmup", "normal", "fault", "unknown"],
|
||||
"defaultValue": "unknown"
|
||||
},
|
||||
{
|
||||
"id": "36d55e34-27a5-4e1d-9c87-9f89c65e8aed",
|
||||
"name": "selfTest",
|
||||
"displayName": "Self test",
|
||||
"type": "QString",
|
||||
"possibleValues": ["not_completed", "completed", "running", "pending"],
|
||||
"defaultValue": "not_completed"
|
||||
},
|
||||
{
|
||||
"id": "eb69d7d4-0947-4829-a3de-c0c0f94124bd",
|
||||
"name": "gas",
|
||||
"displayName": "Gas level index",
|
||||
"type": "QString",
|
||||
"possibleValues": ["none", "mild", "heavy", "test", "unknown"],
|
||||
"defaultValue": "unknown"
|
||||
},
|
||||
{
|
||||
"id": "5bc36b2c-4110-44ec-816f-8a3421343bb4",
|
||||
"name": "valveState",
|
||||
"displayName": "Valve state",
|
||||
"type": "QString",
|
||||
"possibleValues": ["closed", "opened", "not_connected", "failure", "closing", "opening", "checking", "unknown"],
|
||||
"defaultValue": "unknown"
|
||||
}
|
||||
],
|
||||
"actionTypes": [
|
||||
{
|
||||
"id": "8aa54702-b76f-46a1-a23b-1fc6d699eea8",
|
||||
"name": "performUpdate",
|
||||
"displayName": "Start firmware update"
|
||||
},
|
||||
{
|
||||
"id": "28016a8c-fb0e-4c1b-9f8d-787eedadf0e0",
|
||||
"name": "selfTest",
|
||||
"displayName": "Perform self test"
|
||||
},
|
||||
{
|
||||
"id": "c9cf63b5-0582-441f-9508-1d45c468d9f4",
|
||||
"name": "mute",
|
||||
"displayName": "Mute active alarm"
|
||||
},
|
||||
{
|
||||
"id": "53455722-50b5-4597-b8d9-195b6dc65e96",
|
||||
"name": "unmute",
|
||||
"displayName": "Unmute active alarm"
|
||||
},
|
||||
{
|
||||
"id": "ae583f53-aced-439d-a7d6-82bd1e48477d",
|
||||
"name": "openValve",
|
||||
"displayName": "Open valve"
|
||||
},
|
||||
{
|
||||
"id": "9e46233b-d6d4-42f7-9cdc-a08cf72a5b49",
|
||||
"name": "closeValve",
|
||||
"displayName": "Close valve"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"id": "6de35a17-0f54-4397-894d-4321b64c53d1",
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue