Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add support for Develco magnetic sensor #1667 #1679

Closed
wants to merge 14 commits into from
Closed

Add support for Develco magnetic sensor #1667 #1679

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
e70b2d5
Set device type "Warning device" for Develco smoke sensor
SwoopX Jun 24, 2019
57f3769
Typo corrected
SwoopX Jun 24, 2019
04f8044
Develco additions
SwoopX Jun 24, 2019
3e15ac3
Develco bindings update
SwoopX Jun 27, 2019
e935cc2
Develco sensorNode additions
SwoopX Jun 27, 2019
d8da298
Update poll_manager.cpp
SwoopX Jul 1, 2019
a020075
Update light_node.cpp
SwoopX Jul 3, 2019
a4f2dc9
Update de_web_plugin.cpp
SwoopX Jul 3, 2019
eeb2b62
Update bindings.cpp
SwoopX Jul 3, 2019
f8874d1
Add Develco magnetic switch to supported device list #1667
SwoopX Jul 13, 2019
99be7d0
Added Develco window sensor support
SwoopX Jul 16, 2019
5d7a516
Added Develco/Wattle magnetic sensor
SwoopX Jul 16, 2019
7213d4c
Added Develco specific attr to basic cluster
SwoopX Jul 16, 2019
e8c73c0
Resolved merge conflict.
SwoopX Jul 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions bindings.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1065,10 +1065,12 @@ bool DeRestPluginPrivate::sendConfigureReportingRequest(BindingTask &bt)
rq.maxInterval = 3600;
rq.reportableChange8bit = 0;
}
else if (sensor && sensor->modelId().startsWith(QLatin1String("SMSZB-120")))
else if (sensor && (sensor->modelId().startsWith(QLatin1String("SMSZB-120")) || // Develco smoke sensor
sensor->modelId().startsWith(QLatin1String("WISZB-120")) || // Develco window sensor
sensor->modelId().startsWith(QLatin1String("ZHMS101")))) // Wattle (Develco) magnetic sensor
{
rq.attributeId = 0x0020; // battery voltage
rq.minInterval = 43200;
rq.minInterval = 300;
rq.maxInterval = 43200;
rq.reportableChange8bit = 0;
}
Expand Down Expand Up @@ -1713,7 +1715,9 @@ bool DeRestPluginPrivate::checkSensorBindingsForAttributeReporting(Sensor *senso
// Bitron
sensor->modelId().startsWith(QLatin1String("902010")) ||
// Develco
sensor->modelId().startsWith(QLatin1String("SMSZB-120")) ||
sensor->modelId().startsWith(QLatin1String("SMSZB-120")) || // smoke sensor
sensor->modelId().startsWith(QLatin1String("WISZB-120")) || // window sensor
sensor->modelId().startsWith(QLatin1String("ZHMS101")) || // Wattle (Develco) magnetic sensor
// LG
sensor->modelId() == QLatin1String("LG IP65 HMS") ||
// Sinope
Expand Down Expand Up @@ -1815,7 +1819,10 @@ bool DeRestPluginPrivate::checkSensorBindingsForAttributeReporting(Sensor *senso
{
val = sensor->getZclValue(*i, 0x0035); // battery alarm mask
}
else if (sensor->modelId() == QLatin1String("Motion Sensor-A") || sensor->modelId() == QLatin1String("SMSZB-120"))
else if (sensor->modelId() == QLatin1String("Motion Sensor-A") ||
sensor->modelId() == QLatin1String("SMSZB-120") ||
sensor->modelId() == QLatin1String("WISZB-120") ||
sensor->modelId() == QLatin1String("ZHMS101"))
{
val = sensor->getZclValue(*i, 0x0020); // battery voltage
}
Expand Down
2 changes: 2 additions & 0 deletions de_web_plugin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,8 @@ static const SupportedDevice supportedDevices[] = {
{ VENDOR_NONE, "RES001", tiMacPrefix }, // Hubitat environment sensor, see #1308
{ VENDOR_119C, "WL4200S", sinopeMacPrefix}, // Sinope water sensor
{ VENDOR_DEVELCO, "SMSZB-120", develcoMacPrefix }, // Develco smoke sensor
{ VENDOR_DEVELCO, "WISZB-120", develcoMacPrefix }, // Develco window sensor
{ VENDOR_DEVELCO, "ZHMS101", develcoMacPrefix }, // Wattle (Develco) magnetic sensor
{ 0, nullptr, 0 }
};

Expand Down
1 change: 1 addition & 0 deletions general.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,7 @@
<description>As printed on the product.</description>
</attribute>
<attribute id="0x4000" name="SW Build ID" type="cstring" access="r" required="o" range="0,16"></attribute>
<attribute id="0x8000" name="Primary SW Version" type="ostring" access="r" required="m" mfcode="0x1015"></attribute>
<attribute id="0xff0d" name="Xiaomi Sensitivity" type="u8" access="rw" required="o" mfcode="0x115f"></attribute>
<attribute id="0xff22" name="Xiaomi Disconnect 1" type="u8" showas="hex" access="rw" required="o" mfcode="0x115f">
<description>Set to 0x12 (0xFE) to connect (disconnect) the left button to (from) the relay.</description>
Expand Down