ziver/hal
1
1
Fork 0
Code Pull requests Releases Activity

Added possibility to refresh individual Zigbee attributes.

Browse source
This commit is contained in:
Ziver Koc 2022-05-23 23:19:21 +02:00
parent 7cf6849e5d
commit 95ff5b81c0
2 changed files with 59 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

23
plugins/hal-zigbee/resource/resource/web/zigbee_network.tmpl
View file

@ -151,10 +151,11 @@
<table class="table table-hover table-condensed"> <table class="table table-hover table-condensed">
<thead> <thead>
<th>ID</th> <th>ID</th>
<th>Name</th> <th>Name</th>
<th>Last Value</th> <th>Last Value</th>
<th>Last Report Time</th> <th>Last Report Time</th>
<th></th>
</thead> </thead>
{{#.getAttributes()}} {{#.getAttributes()}}
<tr> <tr>
@ -162,6 +163,20 @@
<td>{{.getName()}}</td> <td>{{.getName()}}</td>
<td>{{.getLastValue()}}</td> <td>{{.getLastValue()}}</td>
<td><span class="timestamp">{{.getLastReportTime().getTimeInMillis()}}</span></td> <td><span class="timestamp">{{.getLastReportTime().getTimeInMillis()}}</span></td>
<td>
<form method="POST">
<input type="hidden" name="nodeAddress" value="{{.cluster.zigbeeEndpoint.node.getIeeeAddress()}}">
<input type="hidden" name="endpointId" value="{{.cluster.zigbeeEndpoint.getEndpointId()}}">
<input type="hidden" name="clusterId" value="{{.cluster.getClusterId()}}">
<input type="hidden" name="attributeId" value="{{.getId()}}">
<div class="btn-toolbar pull-right">
<button type="submit" class="btn btn-primary btn-xs" name="action" value="refresh">
<span class="glyphicon glyphicon-refresh"></span>
</button>
</div>
</form>
</td>
</tr> </tr>
{{/.getAttributes()}} {{/.getAttributes()}}
</table> </table>

40
plugins/hal-zigbee/src/se/hal/plugin/zigbee/page/ZigbeeNetworkPage.java
View file

@ -1,11 +1,17 @@
package se.hal.plugin.zigbee.page; package se.hal.plugin.zigbee.page;
import com.zsmartsystems.zigbee.IeeeAddress;
import com.zsmartsystems.zigbee.ZigBeeEndpoint;
import com.zsmartsystems.zigbee.ZigBeeNode; import com.zsmartsystems.zigbee.ZigBeeNode;
import com.zsmartsystems.zigbee.zcl.ZclAttribute;
import com.zsmartsystems.zigbee.zcl.ZclCluster;
import se.hal.HalContext; import se.hal.HalContext;
import se.hal.intf.HalAbstractController; import se.hal.intf.HalAbstractController;
import se.hal.intf.HalAbstractControllerManager; import se.hal.intf.HalAbstractControllerManager;
import se.hal.intf.HalWebPage; import se.hal.intf.HalWebPage;
import se.hal.plugin.zigbee.ZigbeeController; import se.hal.plugin.zigbee.ZigbeeController;
import se.hal.struct.Event;
import zutil.ObjectUtil;
import zutil.io.file.FileUtil; import zutil.io.file.FileUtil;
import zutil.parser.Templator; import zutil.parser.Templator;
@ -29,6 +35,40 @@ public class ZigbeeNetworkPage extends HalWebPage {
ZigbeeController controller = HalAbstractControllerManager.getController(ZigbeeController.class); ZigbeeController controller = HalAbstractControllerManager.getController(ZigbeeController.class);
if (request.containsKey("action")) {
ZigBeeNode node = null;
ZigBeeEndpoint endpoint = null;
ZclCluster cluster = null;
ZclAttribute attribute = null;
if (!ObjectUtil.isEmpty(request.get("nodeAddress"))) {
String nodeAddress = request.get("nodeAddress");
node = controller.getNode(new IeeeAddress(nodeAddress));
if (!ObjectUtil.isEmpty(request.get("endpointId"))) {
int endpointId = Integer.parseInt(request.get("endpointId"));
endpoint = node.getEndpoint(endpointId);
if (!ObjectUtil.isEmpty(request.get("clusterId"))) {
int clusterId = Integer.parseInt(request.get("clusterId"));
cluster = endpoint.getInputCluster(clusterId);
if (!ObjectUtil.isEmpty(request.get("attributeId"))) {
int attributeId = Integer.parseInt(request.get("attributeId"));
attribute = cluster.getAttribute(attributeId);
}
}
}
}
switch (request.get("action")) {
case "refresh":
if (attribute != null)
attribute.readValue(0);
break;
}
}
Templator tmpl = new Templator(FileUtil.find(TEMPLATE)); Templator tmpl = new Templator(FileUtil.find(TEMPLATE));
tmpl.set("controller", controller); tmpl.set("controller", controller);
tmpl.set("nodes", controller.getNodes()); tmpl.set("nodes", controller.getNodes());