Solarreader-1.3

Schnippsche · Feb 17, 2023 · deecf4f · deecf4f
1 parent 67440c1
commit deecf4f
Show file tree

Hide file tree

Showing 189 changed files with 11,532 additions and 2,419 deletions.
diff --git a/.idea/solarreader.iml b/.idea/solarreader.iml
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,14 +1,21 @@
-### 2022-08-09 First release
+### 2023-02-10 V1.3
++ Add Automation
++ Add device Fronius via API
++ Add device Tracer serie and compatible (Fa. Rover, Fa. Wattstunde, EPEVER XTRA 4415N)
++ Add device Peacefair PCEM
++ Bugfixes
 
-### 2022-10-30 V1.1
+### 2022-12-19 V1.2
++ Add device Fronius Symo
++ Add device Fronius Primo
++ Add device Fronius Smartmeter
++ Add device Powmr Pow-hvm1.5H-12v
++ Add device Tasmota Devices (SonOff, Shelly with Tasmota Firmware)
++ Add device Steca Solarix PLI 5000
++ Bugfixes
 
-#### New:
-Add some Ehz Powermeter for IR Sensors with USB Cable
+### 2022-10-30 V1.1
 
-### 2022-12-19 V1.2
-Add Fronius Symo
-Add Fronius Primo
-Add Fronius Smartmeter
-Add Powmr Pow-hvm1.5H-12v
-Add Tasmota Devices (SonOff, Shelly with Tasmota Firmware)
-Add Steca Solarix PLI 5000
++ Add some Ehz Powermeter for IR Sensors with USB Cable
++ Bugfixes
+### 2022-08-09 First release
diff --git a/README.md b/README.md
@@ -6,7 +6,7 @@
 configuration.
 All collected data can be exported to influx databases v1 / v2 and MQTT clients.
 A buffer for Influx and mqtt requests exists; it can hold the request for 30 minutes ore more in memory.
-So you didn't lost any information if influxdb is currently busy or unreachable.
+So you didn't loose any data if influxdb is currently busy or unreachable.
 
 Modbus communication is possible over RS485 connections as well as TCP sockets.
 
@@ -79,10 +79,15 @@ To show the GUI type "locahost:8080" in your browser (or the ip of your computer
 - Goodwe inverter
 - Phocos inverter
 - Hichi IR Reader for eHZ Energiemeter and other compatible
-- Fronius Primo, Fronius Symo and Fronius Smartmeter
+- Fronius Primo, Fronius Symo and Fronius Smartmeter via Modbus or API
 - Steca Solarix PLI 5000
 - Powmr Pow-hvm1.5H-12v
 - Tasmota Devices (SonOff, Shelly with Tasmota Firmware)
+- Shelly Gen1 with original Firmware
+- Easun SMG II
+- Infini Solar PIP serie 3k
+- Tracer serie and compatible (Fa. Rover, Fa. Wattstunde, EPEVER XTRA 4415N)
+- Peacefair PCEM
 - many more planned and in progress... Feel free to contribute and share it with the community!
 
 ### Using the precompiled binaries
@@ -92,7 +97,7 @@ the jar and optional the [start script](https://github.com/Schnippsche/solarread
 
 ### Building from source
 
-`solarreader` is written in java and requires jdk 8+. To build from source:
+`solarreader` is written in java and requires java 8 or higher. To build from source:
 
 - use `mvn clean package` to compile and build the jar file
 
@@ -113,3 +118,6 @@ You can build solarreader.jar with all tests with:
 ```bash
 mvn clean package
 ```
+
+Main Screenshot
+![Solarreader Screenshot](https://www.solarreader.de/solarreader-1.3.png)
diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
     <groupId>de.schnippsche.solarreader</groupId>
     <artifactId>solarreader</artifactId>
     <packaging>jar</packaging>
-    <version>1.2</version>
+    <version>1.3</version>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -34,8 +34,7 @@
         <dependency>
             <groupId>com.fazecast</groupId>
             <artifactId>jSerialComm</artifactId>
-            <!-- 2.8.5 is the version used by j2mod! -->
-            <version>2.9.2</version>
+            <version>2.9.3</version>
         </dependency>
 
         <!-- Modbus Library https://github.com/steveohara/j2mod -->
@@ -99,7 +98,7 @@
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-api</artifactId>
-            <version>5.9.0</version>
+            <version>5.9.2</version>
             <scope>test</scope>
         </dependency>
 
@@ -219,6 +218,46 @@
                     </dependency>
                 </dependencies>
             </plugin>
+
+            <plugin>
+                <groupId>com.coderplus.maven.plugins</groupId>
+                <artifactId>copy-rename-maven-plugin</artifactId>
+                <version>1.0</version>
+                <executions>
+                    <execution>
+                        <id>copy-file</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy</goal>
+                        </goals>
+                        <configuration>
+                            <sourceFile>target/solarreader-${project.version}.jar</sourceFile>
+                            <destinationFile>target/solarreader.jar</destinationFile>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <version>3.4.2</version>
+                <executions>
+                    <execution>
+                        <id>make-assembly</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <configuration>
+                            <appendAssemblyId>false</appendAssemblyId>
+                            <descriptors>
+                                <descriptor>src/main/assembly/tar.xml</descriptor>
+                            </descriptors>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 

diff --git a/src/main/assembly/tar.xml b/src/main/assembly/tar.xml
@@ -0,0 +1,27 @@
+<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.1.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.1.1 https://maven.apache.org/xsd/assembly-2.1.1.xsd">
+    <id>tar</id>
+    <formats>
+        <format>tar</format>
+    </formats>
+    <includeBaseDirectory>false</includeBaseDirectory>
+    <fileSets>
+        <fileSet>
+            <directory>src/scripts</directory>
+            <outputDirectory>solarreader</outputDirectory>
+            <includes>
+                <include>*.sh</include>
+            </includes>
+            <fileMode>0755</fileMode>
+            <directoryMode>0755</directoryMode>
+        </fileSet>
+        <fileSet>
+            <directory>target</directory>
+            <outputDirectory>solarreader</outputDirectory>
+            <includes>
+                <include>solarreader.jar</include>
+            </includes>
+            <fileMode>0555</fileMode>
+        </fileSet>
+    </fileSets>
+</assembly>