Merge branch 'devel' of https://github.com/ab-tools/OAM-Fingerprint into devel

ab-tools · ab-tools · commit 89a91c43c974 · 2024-07-15T19:56:44.000+02:00
# Conflicts:
#	include/knxprod.h
#	include/versions.h
diff --git a/library.json b/library.json
@@ -1,6 +1,6 @@
 {
     "name": "OAM-Fingerprint",
-    "version": "0.3.0",
+    "version": "0.6.0",
     "description": "Fingerprint Firmware and ETS-Application",
     "homepage": "https://openknx.de",
     "authors": {
diff --git a/src/FingerprintModule.conf.xml b/src/FingerprintModule.conf.xml
@@ -13,6 +13,6 @@
   <op:config name="%LOG_VerifyVersion%" value="3.3" />
   <op:config name="%BASE_VerifyVersion%" value="1.2" />
 
-  <op:config name="%FIN_ApplicationVersion%" value="0.3" />
-  <op:config name="%FIN_ReplacesVersions%" value="0.2" />
+  <op:config name="%FIN_ApplicationVersion%" value="0.6" />
+  <op:config name="%FIN_ReplacesVersions%" value="0.5 0.2" />
 </KNX>

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "OAM-Fingerprint",`
`3`		`- "version": "0.3.0",`
	`3`	`+ "version": "0.6.0",`
`4`	`4`	`"description": "Fingerprint Firmware and ETS-Application",`
`5`	`5`	`"homepage": "https://openknx.de",`
`6`	`6`	`"authors": {`