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

Auto-detect frequency on first hub startup. If frequency is 50Hz, assume 230V. (This should work for 95% of cases)

Browse Source
This commit is contained in:
MarkBryanMilligan
2022-02-10 13:21:18 -06:00
parent 94ebf5fa93
commit a892c7f0e8
13 changed files with 143 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
currentmonitor/lantern-currentmonitor/src/main/java/com/lanternsoftware/currentmonitor/CalibrationResult.java Normal file
View File

@@ -0,0 +1,19 @@
package com.lanternsoftware.currentmonitor;
public class CalibrationResult {
private final double voltageCalibrationFactor;
private final int frequency;
public CalibrationResult(double _voltageCalibrationFactor, int _frequency) {
voltageCalibrationFactor = _voltageCalibrationFactor;
frequency = _frequency;
}
public double getVoltageCalibrationFactor() {
return voltageCalibrationFactor;
}
public int getFrequency() {
return frequency;
}
}

6
currentmonitor/lantern-currentmonitor/src/main/java/com/lanternsoftware/currentmonitor/CalibrationSample.java Normal file
View File

@@ -0,0 +1,6 @@
package com.lanternsoftware.currentmonitor;
public class CalibrationSample {
public long time;
public double voltage;
}

66
currentmonitor/lantern-currentmonitor/src/main/java/com/lanternsoftware/currentmonitor/CurrentMonitor.java
View File

@@ -56,44 +56,71 @@ public class CurrentMonitor {
chips.clear();
pins.clear();
gpio.shutdown();
LOG.info("Current Monitor Stopped");
LOG.info("Power Monitor Service Stopped");
}
public void setDebug(boolean _debug) {
debug = _debug;
}
public double calibrateVoltage(double _curCalibration, float _voltage) {
public CalibrationResult calibrateVoltage(double _curCalibration) {
GpioPinAnalogInput voltagePin = getPin(0, 0);
if (voltagePin == null)
return 0.0;
List<Double> samples = new ArrayList<>(120000);
return null;
int maxSamples = 120000;
CalibrationSample[] samples = new CalibrationSample[maxSamples];
int offset = 0;
for (;offset < maxSamples; offset++) {
samples[offset] = new CalibrationSample();
}
offset = 0;
long intervalEnd = System.nanoTime() + 2000000000L; //Scan voltage for 2 seconds
while (System.nanoTime() < intervalEnd) {
samples.add(voltagePin.getValue());
while (offset < maxSamples) {
samples[offset].time = System.nanoTime();
samples[offset].voltage = voltagePin.getValue();
offset++;
if (samples[offset-1].time > intervalEnd)
break;
}
double vOffset = 0.0;
for (Double sample : samples) {
vOffset += sample;
for (CalibrationSample sample : samples) {
vOffset += sample.voltage;
}
vOffset /= samples.size();
vOffset /= offset;
int cycles = 0;
boolean under = true;
if (samples[0].voltage > (vOffset * 1.3)) {
cycles = 1;
under = false;
}
double voltage;
double vRms = 0.0;
for (Double sample : samples) {
sample -= vOffset;
vRms += sample * sample;
for (int sample = 0; sample < offset; sample++) {
voltage = samples[sample].voltage - vOffset;
vRms += voltage * voltage;
if (under && (samples[sample].voltage > (vOffset * 1.3))) {
cycles += 1;
under = false;
}
else if (samples[sample].voltage < vOffset * 0.7) {
under = true;
}
}
vRms /= samples.size();
vRms /= offset;
double oldVrms = _curCalibration * Math.sqrt(vRms);
if (oldVrms < 20) {
LOG.error("Could not get a valid voltage read, please check that your AC/AC transformer is connected");
return 0.0;
return null;
}
double newCal = (_voltage/oldVrms) * _curCalibration;
int frequency = Math.round(cycles/((samples[offset-1].time-samples[0].time)/100000000f))*10;
LOG.info("Detected Frequency: " + frequency);
double newCal = ((frequency > 55 ? 120:230)/oldVrms) * _curCalibration;
double newVrms = newCal * Math.sqrt(vRms);
LOG.info("Old Voltage Calibration: {} Old vRMS: {}", _curCalibration, oldVrms);
LOG.info("New Voltage Calibration: {} New vRMS: {}", newCal, newVrms);
return newCal;
return new CalibrationResult(newCal, frequency);
}
public void monitorPower(BreakerHub _hub, List<Breaker> _breakers, int _intervalMs, PowerListener _listener) {
@@ -101,6 +128,9 @@ public class CurrentMonitor {
stopMonitoring();
listener = _listener;
List<Breaker> validBreakers = CollectionUtils.filter(_breakers, _b -> _b.getPort() > 0 && _b.getPort() < 16);
if (CollectionUtils.isEmpty(validBreakers))
return;
LOG.info("Monitoring {} breakers for hub {}", CollectionUtils.size(validBreakers), _hub.getHub());
sampler = new Sampler(_hub, validBreakers, _intervalMs, 2);
LOG.info("Starting to monitor ports {}", CollectionUtils.transformToCommaSeparated(validBreakers, _b -> String.valueOf(_b.getPort())));
executor.submit(sampler);
@@ -188,7 +218,7 @@ public class CurrentMonitor {
while (true) {
synchronized (this) {
if (!running) {
LOG.error("Power Monitoring Stopped");
LOG.info("Power Monitoring Stopped");
break;
}
}

20
currentmonitor/lantern-currentmonitor/src/main/java/com/lanternsoftware/currentmonitor/MonitorApp.java
View File

@@ -164,11 +164,8 @@ public class MonitorApp {
breakerConfig = newConfig;
List<Breaker> breakers = breakerConfig.getBreakersForHub(config.getHub());
BreakerHub hub = breakerConfig.getHub(config.getHub());
if (hub != null) {
LOG.info("Monitoring {} breakers for hub {}", CollectionUtils.size(breakers), hub.getHub());
if (CollectionUtils.size(breakers) > 0)
monitor.monitorPower(hub, breakers, 1000, logger);
}
if (hub != null)
monitor.monitorPower(hub, breakers, 1000, logger);
}
break;
}
@@ -270,19 +267,18 @@ public class MonitorApp {
LOG.info("Breaker Config loaded");
BreakerHub hub = breakerConfig.getHub(config.getHub());
if (hub != null) {
if (config.isNeedsCalibration() && (config.getAutoCalibrationVoltage() != 0.0)) {
double newCal = monitor.calibrateVoltage(hub.getVoltageCalibrationFactor(), config.getAutoCalibrationVoltage());
if (newCal != 0.0) {
hub.setVoltageCalibrationFactor(newCal);
if (config.isNeedsCalibration()) {
CalibrationResult cal = monitor.calibrateVoltage(hub.getVoltageCalibrationFactor());
if (cal != null) {
hub.setVoltageCalibrationFactor(cal.getVoltageCalibrationFactor());
hub.setFrequency(cal.getFrequency());
config.setNeedsCalibration(false);
ResourceLoader.writeFile(WORKING_DIR + "config.json", DaoSerializer.toJson(config));
post(DaoSerializer.toZipBson(breakerConfig), "config");
}
}
List<Breaker> breakers = breakerConfig.getBreakersForHub(config.getHub());
LOG.info("Monitoring {} breakers for hub {}", CollectionUtils.size(breakers), hub.getHub());
if (CollectionUtils.size(breakers) > 0)
monitor.monitorPower(hub, breakers, 1000, logger);
monitor.monitorPower(hub, breakers, 1000, logger);
}
monitor.submit(new PowerPoster());
}