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

Migrating from from wiringpi to pigpio. This increases the sample rate by a factor of 3 and will allow creation of a board that can monitor over 30 breakers with a single raspberry pi.

Browse Source 
This is based on pi4j 2.0 which is in a beta status.  I have fixed a few bugs in a local version of pi4j 2.0 to get it to work but I haven't submitted those changes to pi4j yet.

This change requires a migration to Java 11 and will *NOT* be backwards compatible.  Upgrading to this hub software will require that java 11 and pigpio be installed on the hub.  This can be done from an ssh session with the following commands:

apt-get update
apt-get install openjdk-11-jre-headless
apt-get install pigpio

Alternatively, you can download a new sd image, reflash your sd card, and re-adopt your hub.
This commit is contained in:
Mark Milligan
2022-04-29 14:59:56 -05:00
parent 079206fcd7
commit c8319d6369
50 changed files with 637 additions and 412 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
util/lantern-util-dao-ephemeral/pom.xml
View File

@@ -1,13 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>com.lanternsoftware.util</groupId>
<artifactId>lantern-util-dao-ephemeral</artifactId>
<name>lantern-util-dao-ephemeral</name>
<version>1.0.0</version>
<packaging>jar</packaging>
<parent>
<groupId>com.lanternsoftware.util</groupId>
<artifactId>util</artifactId>
<version>1.0.0</version>
</parent>
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -38,8 +42,8 @@
<optimize>true</optimize>
<showDeprecation>true</showDeprecation>
<encoding>UTF-8</encoding>
<source>1.8</source>
<target>1.8</target>
<source>${maven.compiler.source}</source>
<target>${maven.compiler.target}</target>
</configuration>
</plugin>
<plugin>

85
util/lantern-util-dao-ephemeral/src/main/java/com/lanternsoftware/util/dao/ephemeral/EphemeralProxy.java
View File

@@ -1,30 +1,27 @@
package com.lanternsoftware.util.dao.ephemeral;
import java.io.File;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.UUID;
import com.lanternsoftware.util.CollectionUtils;
import com.lanternsoftware.util.IFilter;
import com.lanternsoftware.util.NullUtils;
import com.lanternsoftware.util.ResourceLoader;
import com.lanternsoftware.util.dao.AbstractDaoProxy;
import com.lanternsoftware.util.dao.DaoEntity;
import com.lanternsoftware.util.dao.DaoProxyType;
import com.lanternsoftware.util.dao.DaoQuery;
import com.lanternsoftware.util.dao.DaoSerializer;
import com.lanternsoftware.util.dao.DaoSort;
import com.lanternsoftware.util.dao.annotations.PrimaryKey;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.lanternsoftware.util.CollectionUtils;
import com.lanternsoftware.util.IFilter;
import com.lanternsoftware.util.ITransformer;
import com.lanternsoftware.util.NullUtils;
import com.lanternsoftware.util.ResourceLoader;
import com.lanternsoftware.util.dao.annotations.PrimaryKey;
import java.io.File;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.UUID;
public class EphemeralProxy extends AbstractDaoProxy {
private static final Logger LOG = LoggerFactory.getLogger(EphemeralProxy.class);
@@ -42,16 +39,19 @@ public class EphemeralProxy extends AbstractDaoProxy {
try {
File file = new File(_path);
if (file.isDirectory()) {
for (File child : file.listFiles()) {
if (child.getName().endsWith(".json")) {
Class<?> clazz = null;
try {
clazz = Class.forName(child.getName().substring(0, child.getName().length()-5));
} catch (ClassNotFoundException _e) {
continue;
File[] files = file.listFiles();
if (files != null) {
for (File child : files) {
if (child.getName().endsWith(".json")) {
Class<?> clazz;
try {
clazz = Class.forName(child.getName().substring(0, child.getName().length() - 5));
} catch (ClassNotFoundException _e) {
continue;
}
List<DaoEntity> entities = DaoSerializer.parseList(NullUtils.toString(ResourceLoader.loadFile(child)));
proxy.save(clazz, entities);
}
List<DaoEntity> entities = DaoSerializer.parseList(NullUtils.toString(ResourceLoader.loadFile(child)));
proxy.save(clazz, entities);
}
}
}
@@ -108,18 +108,14 @@ public class EphemeralProxy extends AbstractDaoProxy {
@Override
public synchronized void update(Class<?> _class, DaoQuery _query, DaoEntity _changes) {
for (DaoEntity entity : queryForEntities(DaoSerializer.getTableName(_class, getType()), _query)) {
for (Entry<String, Object> change : _changes.entrySet()) {
entity.put(change.getKey(), change.getValue());
}
entity.putAll(_changes);
}
}
@Override
public synchronized <T> T updateOne(Class<T> _class, DaoQuery _query, DaoEntity _changes) {
DaoEntity entity = CollectionUtils.getFirst(queryForEntities(DaoSerializer.getTableName(_class, getType()), _query));
for (Entry<String, Object> change : _changes.entrySet()) {
entity.put(change.getKey(), change.getValue());
}
entity.putAll(_changes);
return DaoSerializer.fromDaoEntity(entity, _class);
}
@@ -152,18 +148,12 @@ public class EphemeralProxy extends AbstractDaoProxy {
}
} else if (value instanceof Integer) {
if (((Integer) value) == 0) {
value = new Long(getNextSequence()).intValue();
value = Long.valueOf(getNextSequence()).intValue();
}
}
_entity.put(key, value);
}
pk = CollectionUtils.commaSeparated(CollectionUtils.transform(CollectionUtils.getAll(_entity, _primaryKeys), new ITransformer<Object, String>() {
@Override
public String transform(Object _o) {
return DaoSerializer.toString(_o);
}
}));
pk = CollectionUtils.commaSeparated(CollectionUtils.transform(CollectionUtils.getAll(_entity, _primaryKeys), DaoSerializer::toString));
}
else
pk = DaoSerializer.getString(_entity, "_id");
@@ -187,12 +177,7 @@ public class EphemeralProxy extends AbstractDaoProxy {
IFilter<DaoEntity> filter = new QueryFilter(_query);
Map<String, DaoEntity> table = tables.get(_tableName);
if (table != null) {
Iterator<DaoEntity> iter = table.values().iterator();
while (iter.hasNext()) {
DaoEntity entity = iter.next();
if (filter.isFiltered(entity))
iter.remove();
}
table.values().removeIf(filter::isFiltered);
}
return true;
}
@@ -241,16 +226,16 @@ public class EphemeralProxy extends AbstractDaoProxy {
if ((comp != null) && !DaoSerializer.getString(_daoEntity, qual.getKey()).toLowerCase().contains(((String) comp).toLowerCase()))
return false;
comp = child.get("$equalssIgnoreCase");
if ((comp != null) && !DaoSerializer.getString(_daoEntity, qual.getKey()).toLowerCase().equals(((String) comp).toLowerCase()))
if ((comp != null) && !DaoSerializer.getString(_daoEntity, qual.getKey()).equalsIgnoreCase(((String) comp)))
return false;
comp = child.get("$startsWithIgnoreCase");
if ((comp != null) && !DaoSerializer.getString(_daoEntity, qual.getKey()).toLowerCase().startsWith(((String) comp).toLowerCase()))
return false;
comp = child.get("$in");
if ((comp != null) && !in(_daoEntity.get(qual.getKey()), (Collection) comp))
if ((comp != null) && !in(_daoEntity.get(qual.getKey()), (Collection<?>) comp))
return false;
comp = child.get("$nin");
if ((comp != null) && in(_daoEntity.get(qual.getKey()), (Collection) comp))
if ((comp != null) && in(_daoEntity.get(qual.getKey()), (Collection<?>) comp))
return false;
}
else if ((qual.getValue() instanceof String) && NullUtils.isEqual(qual.getValue(), "$null")) {
@@ -268,10 +253,10 @@ public class EphemeralProxy extends AbstractDaoProxy {
}
}
private boolean in(Object field, Collection qual) {
private boolean in(Object field, Collection<?> qual) {
for (Object qualObject : qual) {
if (field instanceof Collection) {
for (Object fieldObject : (Collection) field) {
for (Object fieldObject : (Collection<?>) field) {
if (NullUtils.isEqual(fieldObject, qualObject))
return true;
}