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

Some bugfixes

Browse source
This commit is contained in:
Ziver Koc 2024-05-27 01:41:37 +02:00
parent ce73bd70fe
commit f3cbda43d1
2 changed files with 12 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
plugins/hal-zigbee/resources/web/zigbee_network.tmpl
View file

@ -40,10 +40,10 @@
var links = []; var links = [];
data.forEach(node => { data.forEach(node => {
nodes.add({"id": node.address, "name": node.address}); nodes.push({"id": node.address, "name": node.address});
nodes.neighbours.forEach(neighbour => { node.neighbors.forEach(neighbor => {
links.add({"source": node.address, "target": neighbour}) links.push({"source": node.address, "target": neighbor})
} })
}); });
const Graph = ForceGraph() const Graph = ForceGraph()

13
plugins/hal-zigbee/src/se/hal/plugin/zigbee/page/api/ZigbeeApiEndpoint.java
View file

@ -39,20 +39,23 @@ public class ZigbeeApiEndpoint extends HalApiEndpoint {
for (ZigBeeNode node : controller.getNodes()) { for (ZigBeeNode node : controller.getNodes()) {
DataNode zigbeeNode = new DataNode(DataNode.DataType.Map); DataNode zigbeeNode = new DataNode(DataNode.DataType.Map);
root.add(zigbeeNode);
zigbeeNode.set("address", node.getIeeeAddress().toString()); zigbeeNode.set("address", node.getIeeeAddress().toString());
zigbeeNode.set("logicalType", node.getLogicalType().toString()); zigbeeNode.set("logicalType", node.getLogicalType().toString());
DataNode powerNode = new DataNode(DataNode.DataType.Map); DataNode powerNode = new DataNode(DataNode.DataType.Map);
powerNode.set("currentPowerMode", node.getPowerDescriptor().getCurrentPowerMode().toString()); zigbeeNode.set("powerDescriptor", powerNode);
powerNode.set("currentPowerSource", node.getPowerDescriptor().getCurrentPowerSource().toString()); if (node.getPowerDescriptor() != null) {
powerNode.set("powerLevel", node.getPowerDescriptor().getPowerLevel().toString()); powerNode.set("currentPowerMode", node.getPowerDescriptor().getCurrentPowerMode().toString());
powerNode.set("currentPowerSource", node.getPowerDescriptor().getCurrentPowerSource().toString());
powerNode.set("powerLevel", node.getPowerDescriptor().getPowerLevel().toString());
}
DataNode neighborsNode = new DataNode(DataNode.DataType.List); DataNode neighborsNode = new DataNode(DataNode.DataType.List);
zigbeeNode.set("neighbors", neighborsNode);
for (NeighborTable neighbor : node.getNeighbors()) { for (NeighborTable neighbor : node.getNeighbors()) {
neighborsNode.add(neighbor.getExtendedAddress().toString()); neighborsNode.add(neighbor.getExtendedAddress().toString());
} }
zigbeeNode.set("neighbors", neighborsNode);
} }
return root; return root;