will/LanternPowerMonitor
1
0
Fork 0
mirror of https://github.com/zyphlar/LanternPowerMonitor.git synced 2024-03-08 14:07:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add support for adding and removing zwave nodes via software. Support secondary z-wave controllers.

Browse Source
This commit is contained in:
MarkBryanMilligan
2021-10-28 21:45:56 -05:00
parent 88933a2286
commit f5066c541f
28 changed files with 346 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zwave/lantern-service-zwave/src/main/java/com/lanternsoftware/zwave/context/ZWaveApp.java
+81 -10
View File
@@ -22,7 +22,8 @@ import com.lanternsoftware.zwave.controller.Controller;
import com.lanternsoftware.zwave.dao.MongoZWaveDao;
import com.lanternsoftware.zwave.message.IMessageSubscriber;
import com.lanternsoftware.zwave.message.MessageEngine;
import com.lanternsoftware.zwave.message.impl.AddNodeToNetworkRequest;
import com.lanternsoftware.zwave.message.impl.AddNodeToNetworkStartRequest;
import com.lanternsoftware.zwave.message.impl.AddNodeToNetworkStopRequest;
import com.lanternsoftware.zwave.message.impl.BinarySwitchReportRequest;
import com.lanternsoftware.zwave.message.impl.BinarySwitchSetRequest;
import com.lanternsoftware.zwave.message.impl.CRC16EncapRequest;
@@ -30,6 +31,8 @@ import com.lanternsoftware.zwave.message.impl.MultilevelSensorGetRequest;
import com.lanternsoftware.zwave.message.impl.MultilevelSensorReportRequest;
import com.lanternsoftware.zwave.message.impl.MultilevelSwitchReportRequest;
import com.lanternsoftware.zwave.message.impl.MultilevelSwitchSetRequest;
import com.lanternsoftware.zwave.message.impl.RemoveNodeFromNetworkStartRequest;
import com.lanternsoftware.zwave.message.impl.RemoveNodeFromNetworkStopRequest;
import com.lanternsoftware.zwave.message.impl.ThermostatModeSetRequest;
import com.lanternsoftware.zwave.message.impl.ThermostatSetPointReportRequest;
import com.lanternsoftware.zwave.message.impl.ThermostatSetPointSetRequest;
@@ -127,10 +130,10 @@ public class ZWaveApp {
mySwitches.put(sw.getNodeId(), sw);
CollectionUtils.addToMultiMap(sw.getRoom() + ":" + sw.getName(), sw, groups);
}
if (CollectionUtils.anyQualify(mySwitches.values(), Switch::isThermometerUrlValid)) {
if (CollectionUtils.anyQualify(mySwitches.values(), Switch::isSourceUrlValid)) {
timer.scheduleAtFixedRate(new ThermostatTask(), 0, 30000);
}
if (CollectionUtils.anyQualify(mySwitches.values(), _s->_s.isRelay() || _s.isRelayButton())) {
if (CollectionUtils.anyQualify(mySwitches.values(), _s->_s.isRelay() || _s.isRelayButton() || (_s.isSpaceHeaterThermostat() && _s.getGpioPin() != 0))) {
relayController = new RelayController();
}
List<Switch> securitySwitches = CollectionUtils.filter(mySwitches.values(), Switch::isSecurity);
@@ -227,7 +230,7 @@ public class ZWaveApp {
}
});
controller.send(new MultilevelSwitchSetRequest((byte)2, 0xFF));
// controller.send(new MultilevelSwitchSetRequest((byte)2, 0xFF));
// controller.send(new MultilevelSensorGetRequest((byte)11));
// controller.send(new ThermostatSetPointGetRequest((byte)11, ThermostatSetPointIndex.HEATING));
@@ -451,7 +454,8 @@ public class ZWaveApp {
nodes.addAll(CollectionUtils.filter(peers.get(_primary.getNodeId()), _p->!_p.isPrimary()));
for (Switch node : nodes) {
logger.info("Setting {}, Node {} to {}", node.getName(), node.getNodeId(), _level);
controller.send(node.isMultilevel() ? new MultilevelSwitchSetRequest((byte) node.getNodeId(), _level) : new BinarySwitchSetRequest((byte) node.getNodeId(), _level > 0));
byte nid = (byte) (node.getNodeId()%1000);
controller.send(node.isMultilevel() ? new MultilevelSwitchSetRequest(nid, _level) : new BinarySwitchSetRequest(nid, _level > 0));
}
}
@@ -469,16 +473,22 @@ public class ZWaveApp {
if (_sw.isSpaceHeaterThermostat()) {
double tempF = getTemperatureCelsius(_sw) * 1.8 + 32;
if (tempF > _sw.getLevel() + 0.4) {
setGroupSwitchLevel(_sw, 0);
if (_sw.getGpioPin() > 0)
relayController.setRelay(_sw.getGpioPin(), _sw.getLowLevel() > 0);
else
setGroupSwitchLevel(_sw, 0);
logger.info("Turning {} {} off, temp is: {} set to: {}", _sw.getRoom(), _sw.getName(), tempF, _sw.getLevel());
} else if (tempF < _sw.getLevel() - 0.4) {
setGroupSwitchLevel(_sw, 255);
if (_sw.getGpioPin() > 0)
relayController.setRelay(_sw.getGpioPin(), _sw.getLowLevel() == 0);
else
setGroupSwitchLevel(_sw, 255);
logger.info("Turning {} {} on, temp is: {} set to: {}", _sw.getRoom(), _sw.getName(), tempF, _sw.getLevel());
}
}
}
catch (Throwable t) {
logger.error("Failed to check temperature for thermostat {}", _sw.getName());
logger.error("Failed to check temperature for thermostat {}", _sw.getName(), t);
}
}
@@ -506,6 +516,13 @@ public class ZWaveApp {
}
}
public int getCO2ppm(int _nodeId) {
Switch sw = switches.get(_nodeId);
if (sw == null)
return 0;
return DaoSerializer.getInteger(DaoSerializer.parse(pool.executeToString(new HttpGet(sw.getSourceUrl()))), "ppm");
}
public double getTemperatureCelsius(int _nodeId) {
return getTemperatureCelsius(switches.get(_nodeId));
}
@@ -513,8 +530,8 @@ public class ZWaveApp {
private double getTemperatureCelsius(Switch _sw) {
if ((pool == null) || (_sw == null))
return 0.0;
if (_sw.isThermometerUrlValid())
return DaoSerializer.getDouble(DaoSerializer.parse(pool.executeToString(new HttpGet(_sw.getThermometerUrl()))), "temp");
if (_sw.isSourceUrlValid())
return DaoSerializer.getDouble(DaoSerializer.parse(pool.executeToString(new HttpGet(_sw.getSourceUrl()))), "temp");
else if (_sw.isZWaveThermostat() && config.isMySwitch(_sw)) {
synchronized (ZWAVE_MUTEX) {
synchronized (sensors) {
@@ -531,4 +548,58 @@ public class ZWaveApp {
}
return 0.0;
}
public void addNodeToNetwork(boolean _enable, int _controllerIdx) {
ZWaveConfig config = Globals.app.getConfig();
if (_enable) {
String controllerUrl = CollectionUtils.get(config.getControllers(), _controllerIdx);
if (NullUtils.isEqual(controllerUrl, config.getUrl()) && (controller != null))
controller.send(new AddNodeToNetworkStartRequest());
else {
HttpGet get = new HttpGet(controllerUrl + "/addNode/1/" + _controllerIdx);
get.setHeader("auth_code", authCode);
pool.execute(get);
}
}
else {
if (controller != null)
controller.send(new AddNodeToNetworkStopRequest());
List<String> controllers = config.getControllers();
controllers.remove(config.getUrl());
if (config.isMaster()) {
for (String controllerUrl : controllers) {
HttpGet get = new HttpGet(controllerUrl + "/addNode/0");
get.setHeader("auth_code", authCode);
pool.execute(get);
}
}
}
}
public void removeNodeFromNetwork(boolean _enable, int _controllerIdx) {
ZWaveConfig config = Globals.app.getConfig();
if (_enable) {
String controllerUrl = CollectionUtils.get(config.getControllers(), _controllerIdx);
if (NullUtils.isEqual(controllerUrl, config.getUrl()) && (controller != null))
controller.send(new RemoveNodeFromNetworkStartRequest());
else {
HttpGet get = new HttpGet(controllerUrl + "/removeNode/1/" + _controllerIdx);
get.setHeader("auth_code", authCode);
pool.execute(get);
}
}
else {
if (controller != null)
controller.send(new RemoveNodeFromNetworkStopRequest());
List<String> controllers = config.getControllers();
controllers.remove(config.getUrl());
if (config.isMaster()) {
for (String controllerUrl : controllers) {
HttpGet get = new HttpGet(controllerUrl + "/removeNode/0");
get.setHeader("auth_code", authCode);
pool.execute(get);
}
}
}
}
}
zwave/lantern-service-zwave/src/main/java/com/lanternsoftware/zwave/relay/RelayController.java
+1
View File
@@ -26,6 +26,7 @@ public class RelayController {
return;
}
}
LOG.info("Setting pin {} to {}", _pin, _on);
if (_on)
pin.high();
else
zwave/lantern-service-zwave/src/main/java/com/lanternsoftware/zwave/servlet/AddNodeServlet.java
+19
View File
@@ -0,0 +1,19 @@
package com.lanternsoftware.zwave.servlet;
import com.lanternsoftware.util.CollectionUtils;
import com.lanternsoftware.util.NullUtils;
import com.lanternsoftware.util.dao.DaoSerializer;
import com.lanternsoftware.util.dao.auth.AuthCode;
import com.lanternsoftware.zwave.context.Globals;
import javax.servlet.annotation.WebServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@WebServlet("/addNode/*")
public class AddNodeServlet extends SecureServlet {
@Override
protected void get(AuthCode _authCode, HttpServletRequest _req, HttpServletResponse _rep) {
Globals.app.addNodeToNetwork(NullUtils.isEqual(CollectionUtils.get(path(_req), 0), "1"), DaoSerializer.toInteger(CollectionUtils.get(path(_req), 1)));
}
}
zwave/lantern-service-zwave/src/main/java/com/lanternsoftware/zwave/servlet/CO2Servlet.java
+21
View File
@@ -0,0 +1,21 @@
package com.lanternsoftware.zwave.servlet;
import com.lanternsoftware.util.CollectionUtils;
import com.lanternsoftware.util.NullUtils;
import com.lanternsoftware.util.dao.DaoEntity;
import com.lanternsoftware.util.dao.DaoSerializer;
import com.lanternsoftware.util.dao.auth.AuthCode;
import com.lanternsoftware.zwave.context.Globals;
import javax.servlet.annotation.WebServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@WebServlet("/co2/*")
public class CO2Servlet extends SecureServlet {
@Override
protected void get(AuthCode _authCode, HttpServletRequest _req, HttpServletResponse _rep) {
String[] path = path(_req);
jsonResponse(_rep, DaoSerializer.toJson(new DaoEntity("ppm", Globals.app.getCO2ppm(NullUtils.toInteger(CollectionUtils.get(path, 0))))));
}
}
zwave/lantern-service-zwave/src/main/java/com/lanternsoftware/zwave/servlet/RemoveNodeServlet.java
+19
View File
@@ -0,0 +1,19 @@
package com.lanternsoftware.zwave.servlet;
import com.lanternsoftware.util.CollectionUtils;
import com.lanternsoftware.util.NullUtils;
import com.lanternsoftware.util.dao.DaoSerializer;
import com.lanternsoftware.util.dao.auth.AuthCode;
import com.lanternsoftware.zwave.context.Globals;
import javax.servlet.annotation.WebServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@WebServlet("/removeNode/*")
public class RemoveNodeServlet extends SecureServlet {
@Override
protected void get(AuthCode _authCode, HttpServletRequest _req, HttpServletResponse _rep) {
Globals.app.removeNodeFromNetwork(NullUtils.isEqual(CollectionUtils.get(path(_req), 0), "1"), DaoSerializer.toInteger(CollectionUtils.get(path(_req), 1)));
}
}
zwave/lantern-service-zwave/src/main/resources/logback.xml
+1 -1
View File
@@ -9,7 +9,7 @@
</appender>
<logger name="com.lanternsoftware" level="DEBUG"/>
<logger name="com.lanternsoftware" level="INFO"/>
<root level="OFF">
<appender-ref ref="STDOUT"/>