added JDK8 support and MPPSolar binding to configurator

Author: ai-republic

bms-daly-can/src/main/java/com/airepublic/bmstoinverter/bms/daly/can/DalyBmsCANProcessor.java

@@ -14,7 +14,6 @@
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.util.ArrayList;
-import java.util.HexFormat;
 import java.util.List;
 
 import org.slf4j.Logger;
@@ -26,6 +25,7 @@
 import com.airepublic.bmstoinverter.core.NoDataAvailableException;
 import com.airepublic.bmstoinverter.core.Port;
 import com.airepublic.bmstoinverter.core.protocol.can.CANPort;
+import com.airepublic.bmstoinverter.core.util.HexUtil;
 
 /**
  * The class to handle CAN messages from a Daly BMS.
@@ -99,7 +99,7 @@ protected List<ByteBuffer> sendMessage(final Port port, final DalyCommand cmd, f
             }
         } while (framesToBeReceived > 0 & skip > 0);
 
-        LOG.debug("Command 0x{} to BMS {} successfully sent and received!", HexFormat.of().toHexDigits(cmd.id), getBmsId());
+        LOG.debug("Command 0x{} to BMS {} successfully sent and received!", HexUtil.toHexDigits(cmd.id), getBmsId());
         return readBuffers;
     }
 
@@ -144,14 +144,15 @@ public DalyMessage convertReceiveFrameToDalyMessage(final ByteBuffer buffer) {
         }
 
         final byte[] dataBytes = new byte[buffer.get(4)];
-        buffer.get(8, dataBytes);
+        buffer.position(8);
+        buffer.get(dataBytes);
         msg.data = ByteBuffer.wrap(dataBytes);
 
         if (LOG.isDebugEnabled()) {
             LOG.info("DALY Message: frameId= " + Integer.toHexString(frameId)
-                    + ", address=" + HexFormat.of().toHexDigits(msg.bmsId)
-                    + ", dataId=" + HexFormat.of().toHexDigits(msg.cmd.id)
-                    + ", data=" + HexFormat.of().formatHex(dataBytes));
+                    + ", address=" + HexUtil.toHexDigits(msg.bmsId)
+                    + ", dataId=" + HexUtil.toHexDigits(msg.cmd.id)
+                    + ", data=" + HexUtil.formatHex(dataBytes));
         }
 
         return msg;

bms-daly-common/src/main/java/com/airepublic/bmstoinverter/bms/daly/common/AbstractDalyBmsProcessor.java

@@ -13,7 +13,6 @@
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.time.LocalDateTime;
-import java.util.HexFormat;
 import java.util.List;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -28,6 +27,7 @@
 import com.airepublic.bmstoinverter.core.Port;
 import com.airepublic.bmstoinverter.core.TooManyInvalidFramesException;
 import com.airepublic.bmstoinverter.core.bms.data.BatteryPack;
+import com.airepublic.bmstoinverter.core.util.HexUtil;
 
 import jakarta.inject.Inject;
 
@@ -111,7 +111,7 @@ protected void autoCalibrateSOC(final Port port) {
             try {
                 final Future<List<ByteBuffer>> future = executor.submit(() -> {
 
-                    LOG.info("calibrate request (SOC " + calculatedSOC + "): " + HexFormat.of().withUpperCase().withDelimiter(", 0x").formatHex(data));
+                    LOG.info("calibrate request (SOC " + calculatedSOC + "): " + HexUtil.formatHex(data));
                     final List<ByteBuffer> result = sendMessage(port, DalyCommand.WRITE_RTC_AND_SOC, data);
                     LOG.info("calibrate result: " + Port.printBuffer(result.get(0)));
                     return result;

bms-daly-rs485/src/main/java/com/airepublic/bmstoinverter/bms/daly/rs485/DalyBmsRS485Processor.java

@@ -13,7 +13,6 @@
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
-import java.util.HexFormat;
 import java.util.List;
 import java.util.function.Predicate;
 
@@ -26,6 +25,7 @@
 import com.airepublic.bmstoinverter.core.NoDataAvailableException;
 import com.airepublic.bmstoinverter.core.Port;
 import com.airepublic.bmstoinverter.core.TooManyInvalidFramesException;
+import com.airepublic.bmstoinverter.core.util.HexUtil;
 
 /**
  * The class to handle RS485 messages from a Daly BMS.
@@ -147,7 +147,7 @@ protected List<ByteBuffer> sendMessage(final Port port, final DalyCommand cmd, f
             }
         } while (framesToBeReceived > 0);
 
-        LOG.warn("Command {} to BMS {} successfully sent and received!", HexFormat.of().withPrefix("0x").formatHex(new byte[] { (byte) cmd.id }), address - 0x3F);
+        LOG.warn("Command {} to BMS {} successfully sent and received!", HexUtil.formatHex(new byte[] { (byte) cmd.id }), address - 0x3F);
 
         return readBuffers;
     }
@@ -192,7 +192,8 @@ protected DalyMessage convertReceiveFrameToDalyMessage(final ByteBuffer buffer)
         }
 
         final byte[] dataBytes = new byte[8];
-        buffer.get(4, dataBytes);
+        buffer.position(4);
+        buffer.get(dataBytes);
         msg.data = ByteBuffer.wrap(dataBytes);
         msg.data.rewind();
 

bms-discover-can/pom.xml

@@ -0,0 +1,29 @@
+<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>com.ai-republic.bms-to-inverter</groupId>
+		<artifactId>bms-to-inverter-parent</artifactId>
+		<version>0.0.1-SNAPSHOT</version>
+	</parent>
+
+	<artifactId>bms-discover-can</artifactId>
+
+	<name>${project.artifactId}-${project.version}</name>
+	<description>Module for the Discover BMS CAN support</description>
+
+	<properties>
+		<encoding>UTF-8</encoding>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+	</properties>
+
+	<dependencies>
+		<dependency>
+			<groupId>com.ai-republic.bms-to-inverter</groupId>
+			<artifactId>protocol-can</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+	</dependencies>
+</project>

bms-discover-can/src/main/java/com/airepublic/bmstoinverter/bms/discover/can/DiscoverBmsCANDescriptor.java

@@ -0,0 +1,46 @@
+/**
+ * This software is free to use and to distribute in its unchanged form for private use.
+ * Commercial use is prohibited without an explicit license agreement of the copyright holder.
+ * Any changes to this software must be made solely in the project repository at https://github.com/ai-republic/bms-to-inverter.
+ * The copyright holder is not liable for any damages in whatever form that may occur by using this software.
+ *
+ * (c) Copyright 2022 and onwards - Torsten Oltmanns
+ *
+ * @author Torsten Oltmanns - bms-to-inverter''AT''gmail.com
+ */
+package com.airepublic.bmstoinverter.bms.discover.can;
+
+import com.airepublic.bmstoinverter.core.BMS;
+import com.airepublic.bmstoinverter.core.BMSConfig;
+import com.airepublic.bmstoinverter.core.BMSDescriptor;
+import com.airepublic.bmstoinverter.protocol.can.JavaCANPort;
+
+/**
+ * The {@link BMSDescriptor} for the Pylon LV BMS using the CAN protocol.
+ */
+public class DiscoverBmsCANDescriptor implements BMSDescriptor {
+    @Override
+    public String getName() {
+        return "DISCOVER_CAN";
+    }
+
+
+    @Override
+    public int getDefaultBaudRate() {
+        return 500000;
+    }
+
+
+    @Override
+    public Class<? extends BMS> getBMSClass() {
+        return DiscoverBmsCANProcessor.class;
+    }
+
+
+    @Override
+    public JavaCANPort createPort(final BMSConfig config) {
+        final JavaCANPort port = new JavaCANPort(config.getPortLocator(), config.getBaudRate());
+        return port;
+    }
+
+}