Merge pull request #21 from csowada/develop

Prepare Release 1.1.9

.github/workflows/codeql-analysis.yml

@@ -0,0 +1,92 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL Advanced"
+
+on:
+  push:
+    branches: [ "master", "develop" ]
+  pull_request:
+    branches: [ "master", "develop" ]
+  schedule:
+    - cron: '26 10 * * 5'
+
+jobs:
+  analyze:
+    name: Analyze (${{ matrix.language }})
+    # Runner size impacts CodeQL analysis time. To learn more, please see:
+    #   - https://gh.io/recommended-hardware-resources-for-running-codeql
+    #   - https://gh.io/supported-runners-and-hardware-resources
+    #   - https://gh.io/using-larger-runners (GitHub.com only)
+    # Consider using larger runners or machines with greater resources for possible analysis time improvements.
+    runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }}
+    permissions:
+      # required for all workflows
+      security-events: write
+
+      # required to fetch internal or private CodeQL packs
+      packages: read
+
+      # only required for workflows in private repositories
+      actions: read
+      contents: read
+
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+        - language: java-kotlin
+          build-mode: none # This mode only analyzes Java. Set this to 'autobuild' or 'manual' to analyze Kotlin too.
+        # CodeQL supports the following values keywords for 'language': 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'swift'
+        # Use `c-cpp` to analyze code written in C, C++ or both
+        # Use 'java-kotlin' to analyze code written in Java, Kotlin or both
+        # Use 'javascript-typescript' to analyze code written in JavaScript, TypeScript or both
+        # To learn more about changing the languages that are analyzed or customizing the build mode for your analysis,
+        # see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/customizing-your-advanced-setup-for-code-scanning.
+        # If you are analyzing a compiled language, you can modify the 'build-mode' for that language to customize how
+        # your codebase is analyzed, see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v4
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v3
+      with:
+        languages: ${{ matrix.language }}
+        build-mode: ${{ matrix.build-mode }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+
+        # For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
+        # queries: security-extended,security-and-quality
+
+    # If the analyze step fails for one of the languages you are analyzing with
+    # "We were unable to automatically build your code", modify the matrix above
+    # to set the build mode to "manual" for that language. Then modify this step
+    # to build your code.
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
+    - if: matrix.build-mode == 'manual'
+      shell: bash
+      run: |
+        echo 'If you are using a "manual" build mode for one or more of the' \
+          'languages you are analyzing, replace this with the commands to build' \
+          'your code, for example:'
+        echo '  make bootstrap'
+        echo '  make release'
+        exit 1
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v3
+      with:
+        category: "/language:${{matrix.language}}"

.github/workflows/maven-publish.yml

@@ -15,12 +15,15 @@ jobs:
   build:
 
     runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
 
     steps:
     - uses: actions/checkout@v2
 
     - name: Use Cache for Maven packages
-      uses: actions/cache@v2
+      uses: actions/cache@v4
       with:
         path: ~/.m2
         key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
@@ -33,9 +36,11 @@ jobs:
         GPG_FILE: ${{secrets.GPG_FILE}}
 
     - name: Set up Java for Apache Maven Central
-      uses: actions/setup-java@v1
+      uses: actions/setup-java@v4
       with:
         java-version: 11
+        distribution: temurin
+        cache: maven
         server-id: ossrh # Value of the distributionManagement/repository/id field of the pom.xml
         server-username: OSSRH_USERNAME  # env variable for username in deploy
         server-password: OSSRH_PASSWORD  # env variable for token in deploy
@@ -53,10 +58,12 @@ jobs:
         GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
 
     - name: Set up Java for publishing to GitHub Packages
-      uses: actions/setup-java@v1
+      uses: actions/setup-java@v4
       with:
         java-version: 11
-
+        distribution: temurin
+        cache: maven
+
     - name: Publish to GitHub Packages
     #  -DaltDeploymentRepository=github::default::https://maven.pkg.github.com/csowada/ebus
       run: mvn deploy --batch-mode --update-snapshots -P !sign,!build-extras,!deploy-ossrh,deploy-github -Dmaven.test.skip=true

.github/workflows/maven.yml

@@ -5,60 +5,51 @@ name: Java CI with Maven
 
 on:
   push:
-    branches: [ master, develop ]
+    branches: [master, develop]
   pull_request:
     types: [opened, synchronize, reopened]
 
 jobs:
-
   build:
-
     runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
 
     steps:
-    - uses: actions/checkout@v2
-      with:
-        fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
-
-    - name: Cache Maven packages
-      uses: actions/cache@v2
-      with:
-        path: ~/.m2
-        key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
-        restore-keys: ${{ runner.os }}-m2
-
-    - name: Cache SonarCloud packages
-      uses: actions/cache@v2
-      with:
-        path: ~/.sonar/cache
-        key: ${{ runner.os }}-sonar
-        restore-keys: ${{ runner.os }}-sonar
-
-    - name: Set up Java
-      uses: actions/setup-java@v1
-      with:
-        java-version: 11
-        server-id: ossrh # Value of the distributionManagement/repository/id field of the pom.xml
-        server-username: OSSRH_USERNAME  # env variable for username in deploy
-        server-password: OSSRH_PASSWORD  # env variable for token in deploy
-
-    - name: Build and analyze
-      run: mvn -B verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
-        SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-        BUILD_NUMBER: ${{ github.run_id }}-${{ github.run_number }}
-
-    - name: Upload Maven build artifact
-      uses: actions/upload-artifact@v2
-      with:
-        name: artifact
-        path: target/*.jar
-
-    # Upload if develop branch
-    - name: Upload snapshot to OSSRH if development release
-      if: ${{ github.ref == 'refs/heads/develop' && github.event_name == 'push' }}
-      run: mvn deploy --batch-mode --update-snapshots -P !sign,!build-extras,deploy-ossrh -Dmaven.test.skip=true -DskipChecks -DskipTest
-      env:
-        OSSRH_USERNAME: ${{ secrets.OSSRH_JIRA_USERNAME }}
-        OSSRH_PASSWORD: ${{ secrets.OSSRH_JIRA_PASSWORD }}
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
+
+      - name: Cache Maven packages
+        uses: actions/cache@v4
+        with:
+          path: ~/.m2
+          key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
+
+      - name: Set up Java
+        uses: actions/setup-java@v4
+        with:
+          java-version: 11
+          distribution: temurin
+          cache: maven
+          server-id: ossrh # Value of the distributionManagement/repository/id field of the pom.xml
+          server-username: OSSRH_USERNAME # env variable for username in deploy
+          server-password: OSSRH_PASSWORD # env variable for token in deploy
+
+      - name: Build with Maven
+        run: mvn -B package --file pom.xml
+
+      - name: Upload Maven build artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: artifact
+          path: target/*.jar
+
+      # Upload if develop branch
+      - name: Upload snapshot to OSSRH if development release
+        if: ${{ github.ref == 'refs/heads/develop' && github.event_name == 'push' }}
+        run: mvn deploy --batch-mode --update-snapshots -P !sign,!build-extras,deploy-ossrh -Dmaven.test.skip=true -DskipChecks -DskipTest
+        env:
+          OSSRH_USERNAME: ${{ secrets.OSSRH_JIRA_USERNAME }}
+          OSSRH_PASSWORD: ${{ secrets.OSSRH_JIRA_PASSWORD }}

CHANGELOG.md

@@ -3,6 +3,13 @@ All notable changes to this project will be documented in this file.
 
 ## Unreleased 
 
+## [1.1.9] - 2025-01-31
+### Changed
+- Update dependecies, license headers and pipelines
+- Fix Wolf CWL 300/400 issue for setter `fan_stepX`
+- Add Cooling State to `controller.d_values_rc2`
+- Update to ebus core lib v1.1.13
+
 ## [1.1.8] - 2023-03-25
 ### Changed
 - Enhance Wolf CWL 300/400

pom.xml

@@ -7,7 +7,7 @@
 	<description>eBUS library configuration</description>
 	<groupId>de.cs-dev.ebus</groupId>
 	<artifactId>ebus-configuration</artifactId>
-	<version>1.1.8</version>
+	<version>1.1.9</version>
 	<url>https://github.com/csowada/ebus-configuration</url>
 	<packaging>bundle</packaging>
 
@@ -17,13 +17,13 @@
 		<maven.compiler.source>1.8</maven.compiler.source>
 		<maven.compiler.target>1.8</maven.compiler.target>
 		<maven.compiler.release>8</maven.compiler.release>
-		<license.year>2023</license.year>
+		<license.year>2025</license.year>
 		<bundle.version>${project.version}</bundle.version>
 		<sonar.projectKey>csowada_ebus-configuration</sonar.projectKey>
 		<sonar.organization>csowada</sonar.organization>
 		<sonar.host.url>https://sonarcloud.io</sonar.host.url>
 
-		<ebus.core.version>1.1.10</ebus.core.version>
+		<ebus.core.version>1.1.13</ebus.core.version>
 	</properties>
 
 	<organization>
@@ -245,7 +245,7 @@
 					<plugin>
 						<groupId>org.sonatype.plugins</groupId>
 						<artifactId>nexus-staging-maven-plugin</artifactId>
-						<version>1.6.8</version>
+						<version>1.6.14</version>
 						<extensions>true</extensions>
 						<configuration>
 							<serverId>ossrh</serverId>
@@ -308,14 +308,14 @@
 		<dependency>
 			<groupId>com.google.code.gson</groupId>
 			<artifactId>gson</artifactId>
-			<version>2.8.9</version>
+			<version>2.10.1</version>
 			<scope>test</scope>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-lang3</artifactId>
-			<version>3.12.0</version>
+			<version>3.14.0</version>
 			<scope>test</scope>
 		</dependency>
 
@@ -336,14 +336,14 @@
 		<dependency>
 			<groupId>ch.qos.logback</groupId>
 			<artifactId>logback-classic</artifactId>
-			<version>1.2.10</version>
+			<version>1.5.16</version>
 			<scope>test</scope>
 		</dependency>
 
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-api</artifactId>
-			<version>1.7.32</version>
+			<version>2.0.16</version>
 			<scope>provided</scope>
 		</dependency>
 

src/main/java/de/csdev/ebus/configuration/EBusConfigurationReaderExt.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2023 by the respective copyright holders.
+ * Copyright (c) 2016-2025 by the respective copyright holders.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0

src/main/java/de/csdev/ebus/configuration/EBusConfigurationVersion.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2023 by the respective copyright holders.
+ * Copyright (c) 2016-2025 by the respective copyright holders.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0

src/main/resources/commands/common-configuration.json

@@ -189,7 +189,13 @@
                 {"name": "performance_forced", "type": "data1b", "label": "Forced performance"},
                 {"name": "states", "type": "byte", "children": [
                     {"name": "state_dhw", "type": "bit", "label": "State DHW active"},
-                    {"name": "state_hc", "type": "bit", "label": "State heating circuit active"}
+                    {"name": "state_hc", "type": "bit", "label": "State heating circuit active"},
+                    {"name": "_state_unknown_0x04", "type": "bit", "label": "unknown 0x04"},
+                    {"name": "_state_unknown_0x08", "type": "bit", "label": "unknown 0x08"},
+                    {"name": "_state_unknown_0x10", "type": "bit", "label": "unknown 0x10"},
+                    {"name": "state_cooling", "type": "bit", "label": "State cooling active"},
+                    {"name": "_state_unknown_0x40", "type": "bit", "label": "unknown 0x40"},
+                    {"name": "_state_unknown_0x80", "type": "bit", "label": "unknown 0x80"}
                 ]},
                 {"name": "temp_d_dhw", "type": "data2b", "label": "DHW desire temperature", "min":0, "max":100, "format":"%.1f°C"}
             ],

src/main/resources/commands/wolf-cwl-configuration.json

@@ -456,7 +456,7 @@
                 "command": "40 80",
                 "master": [
                     {"type": "static", "default": "21"},
-                    {"name": "cur", "type": "uint", "label":"Current Value", "reverseByteOrder": true, "min": 0, "max": 50, "step": 50, "format":"%4dm³/h"}   
+                    {"name": "fan_step0", "type": "uint", "label":"Current Value", "reverseByteOrder": true, "min": 0, "max": 50, "step": 50, "format":"%4dm³/h"}   
                 ]
             }
         },
@@ -483,7 +483,7 @@
                 "command": "40 80",
                 "master": [
                     {"type": "static", "default": "01"},
-                    {"name": "cur", "type": "uint", "label":"Current Value", "reverseByteOrder": true, "min": 50, "max": 400, "step": 5, "format":"%4dm³/h"}   
+                    {"name": "fan_step1", "type": "uint", "label":"Current Value", "reverseByteOrder": true, "min": 50, "max": 400, "step": 5, "format":"%4dm³/h"}   
                 ]
             }
 
@@ -511,7 +511,7 @@
                 "command": "40 80",
                 "master": [
                     {"type": "static", "default": "02"},
-                    {"name": "cur", "type": "uint", "label":"Current Value", "reverseByteOrder": true, "min": 50, "max": 400, "step": 5, "format":"%4dm³/h"}   
+                    {"name": "fan_step2", "type": "uint", "label":"Current Value", "reverseByteOrder": true, "min": 50, "max": 400, "step": 5, "format":"%4dm³/h"}   
                 ]
             }
         },
@@ -538,7 +538,7 @@
                 "command": "40 80",
                 "master": [
                     {"type": "static", "default": "03"},
-                    {"name": "cur", "type": "uint", "label":"Current Value", "reverseByteOrder": true, "min": 50, "max": 400, "step": 5, "format":"%4dm³/h"}   
+                    {"name": "fan_step3", "type": "uint", "label":"Current Value", "reverseByteOrder": true, "min": 50, "max": 400, "step": 5, "format":"%4dm³/h"}   
                 ]
             }
         },

src/test/java/de/csdev/ebus/StaticTestTelegrams.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2023 by the respective copyright holders.
+ * Copyright (c) 2016-2025 by the respective copyright holders.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0