Release 3.3

OpenKNX · Jul 9, 2024 · 0f27451 · 0f27451
1 parent b248288
commit 0f27451
Show file tree

Hide file tree

Showing 12 changed files with 41 additions and 38 deletions.
diff --git a/dependencies.txt b/dependencies.txt
diff --git a/include/knxprod.h b/include/knxprod.h
@@ -9,13 +9,14 @@
                                          (time & 0x3FFF) * 3600000 ) : 0 )
 
 #define MAIN_OpenKnxId 0xA0
-#define MAIN_ApplicationNumber 49
-#define MAIN_ApplicationVersion 198
-#define MAIN_ParameterSize 5579
-#define MAIN_MaxKoNumber 109
-#define MAIN_OrderNumber "OpenKnxLogicDev"
+#define MAIN_ApplicationNumber 48
+#define MAIN_ApplicationVersion 51
+#define MAIN_ParameterSize 11375
+#define MAIN_MaxKoNumber 316
+#define MAIN_OrderNumber "OpenKnxLogic"
+#define BASE_ModuleVersion 18
 #define UCT_ModuleVersion 1
-#define LOG_ModuleVersion 50
+#define LOG_ModuleVersion 51
 // Parameter with single occurrence
 
 
@@ -610,7 +611,7 @@
 // Buzzer sperren
 #define KoLOG_BuzzerLock                          (knx.getGroupObject(LOG_KoBuzzerLock))
 
-#define LOG_ChannelCount 30
+#define LOG_ChannelCount 99
 
 // Parameter per channel
 #define LOG_ParamBlockOffset 3059
@@ -2283,11 +2284,11 @@
 
 // Header generation for Module 'BASE_KommentarModule'
 
-#define BASE_KommentarModuleCount 30
+#define BASE_KommentarModuleCount 0
 #define BASE_KommentarModuleModuleParamSize 0
 #define BASE_KommentarModuleSubmodulesParamSize 0
 #define BASE_KommentarModuleParamSize 0
-#define BASE_KommentarModuleParamOffset 5579
+#define BASE_KommentarModuleParamOffset 11375
 #define BASE_KommentarModuleCalcIndex(index, m1) (index + BASE_KommentarModuleParamOffset + _channelIndex * BASE_KommentarModuleCount * BASE_KommentarModuleParamSize + m1 * BASE_KommentarModuleParamSize)
 
 

diff --git a/include/versions.h b/include/versions.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#define MAIN_Version "2481e93"
-#define KNX_Version "acf4a0b"
-#define MODULE_LogicModule_Version "3.2.0+ef7a8e2"
-#define MODULE_LogicModule_ETS 50
-#define MODULE_Common_Version "1.1.1+220d667"
-#define MODULE_Common_ETS 17
+#define MAIN_Version "b248288"
+#define KNX_Version "e69f636"
+#define MODULE_LogicModule_Version "3.3.0+0834fc0"
+#define MODULE_LogicModule_ETS 51
+#define MODULE_Common_Version "1.2.0+73e09e3"
+#define MODULE_Common_ETS 18
diff --git a/platformio.custom.ini b/platformio.custom.ini
@@ -36,10 +36,6 @@ build_flags =
   -D USE_KNX_DMA_IRQ=0
   ; -D SERIAL_HF=Serial2
   -Wunused-variable
-  ; ${RP2040_FIX_INCLUDES.build_flags}
-  ; -iC:/Users/[email protected]/.platformio/packages/framework-arduinopico
-  ; "@C:/Users/[email protected]/.platformio/packages/framework-arduinopico/lib/platform_inc.txt"
-  ;-D NCN5120
 
 ; this config block is for specifing options that are valid for all RP2040-based develop/debug builds
 [RP2040_custom_develop]
@@ -227,6 +223,12 @@ build_flags =
   ${RP2040_custom_releases_TP_16MB.build_flags}
   -D OKNXHW_REG1_CONTROLLER2040
 
+[env:release_OpenKNX_REG1_BASE_V1]
+extends = RP2040_custom_releases_TP_16MB
+build_flags =
+  ${RP2040_custom_releases_TP_16MB.build_flags}
+  -D OKNXHW_REG1_BASE_V1
+
 [env:release_RP2040_devel]
 extends = RP2040_custom_releases_TP_2MB
 build_flags =
@@ -245,6 +247,12 @@ build_flags =
   ${RP2040_custom_releases_TP_16MB.build_flags}
   -D BOARD_MASIFI_HFPM_V20
 
+[env:release_Fingerprint_v13_RP2040]
+extends = RP2040_custom_develop, RP2040_16MB
+build_flags =
+   ${RP2040_custom_releases.build_flags}
+  -D BOARD_ABTOOLS_FINGERPRINT_V13
+
 [env:release_REG1_BASE_IP]
 extends = RP2040_UPLOAD_USB, RP2040_custom_releases_IP, RP2040_EXCHANGE_16MB
 build_flags =
@@ -254,9 +262,4 @@ build_flags =
     ; -D KNX_IP_GENERIC
     -D KNX_IP_W5500
 
-[env:release_OpenKNX_REG1_BASE_V1]
-extends = RP2040_custom_releases_TP_16MB
-build_flags =
-  ${RP2040_custom_releases_TP_16MB.build_flags}
-  -D OKNXHW_REG1_BASE_V1
 
diff --git a/platformio.ini b/platformio.ini
@@ -5,6 +5,5 @@ extra_configs =
   lib/OGM-Common/platformio.rp2040.ini
   lib/OGM-Common/platformio.samd.ini
   lib/OFM-UsbExchange/platformio.exchange.ini
-  lib/OFM-Network/platformio.network.ini
   platformio.custom.ini
 
diff --git a/restore/Restore-Dependencies-Branch.ps1 b/restore/Restore-Dependencies-Branch.ps1
@@ -18,7 +18,7 @@ param(
   [string]$DependenciesFile = "dependencies.txt", # Default is "dependencies.txt"
 
   # Check for privileges (Windows only)
-  [switch]$CheckForDeveloperMode = $true,  # Default is $true
+  [switch]$CheckForDeveloperMode = $false,  # Default is $false
   [switch]$CheckForSymbolicLinkPermissions = $true, # Default is $true
   [switch]$CheckForAdminOnly = $false, # Default is $false
 

diff --git a/restore/Restore-Dependencies.ps1 b/restore/Restore-Dependencies.ps1
@@ -49,7 +49,7 @@ param(
   [string]$DependenciesFile= "dependencies.txt", # Default is "dependencies.txt"
 
   # Check for privileges (Windows only)
-  [switch]$CheckForDeveloperMode= $true,  # Default is $true
+  [switch]$CheckForDeveloperMode= $false,  # Default is $false
   [switch]$CheckForSymbolicLinkPermissions= $true, # Default is $true
   [switch]$CheckForAdminOnly= $false, # Default is $false
 

diff --git a/src/Logikmodul-IP.xml b/src/Logikmodul-IP.xml
@@ -6,8 +6,6 @@
 
   <op:config name="%BASE_ManualSave%" value="3" />
   <op:config name="%BASE_StartupDelay%" value="5" />
-
-  <op:nowarn id="1" regex="NET_VerifyVersion" />
 
   <op:ETS ProductName="Logikmodul-IP"
     OpenKnxId="0xA0"

diff --git a/src/Logikmodul-Release.xml b/src/Logikmodul-Release.xml
@@ -11,6 +11,8 @@
   <op:config name="%LOG_BuzzerDefault%" value="0" />
   <op:config name="%BASE_ManualSave%" value="3" />
 
+  <op:nowarn id="1" regex="NET_VerifyVersion" />
+
   <op:ETS ProductName="Logikmodul"
     OpenKnxId="0xA0"
     ApplicationNumber="0x30"

diff --git a/src/Logikmodul.conf.xml b/src/Logikmodul.conf.xml
@@ -3,11 +3,11 @@
 <KNX xmlns="http://knx.org/xml/project/20" xmlns:op="http://github.com/OpenKNX/OpenKNXproducer">
   <op:config name="%LOG_NumChannelsDefault%" value="5" />
 
-  <op:config name="%LOG_VerifyVersion%" value="3.2" />
+  <op:config name="%LOG_VerifyVersion%" value="3.3" />
   <op:config name="%UCT_VerifyVersion%" value="0.1" />
-  <op:config name="%NET_VerifyVersion%" value="0.2" />
-  <op:config name="%BASE_VerifyVersion%" value="1.1" />
+  <op:config name="%NET_VerifyVersion%" value="0.3" />
+  <op:config name="%BASE_VerifyVersion%" value="1.2" />
 
-  <op:config name="%ApplicationVersion%" value="3.2" />
-  <op:config name="%ReplacesVersions%" value="3.0 3.1" />
+  <op:config name="%ApplicationVersion%" value="3.3" />
+  <op:config name="%ReplacesVersions%" value="3.2 3.1" />
 </KNX>
diff --git a/src/Logikmodul.xml b/src/Logikmodul.xml
@@ -12,8 +12,8 @@
   <op:ETS ProductName="Logikmodul"
     OpenKnxId="0xA0"
     ApplicationNumber="0x31"
-    ApplicationVersion="12.6"
-    ReplacesVersions="12.5 12.4 12.3 12.2 12.1 12.0 11.15 11.14 11.13 11.12 11.11 11.10 11.9 11.8 11.7 11.6 11.5 11.4 11.3 11.2 11.1 11.0 10.15 10.14 10.13 10.11 10.10 10.0 9.15 9.14 9.13 9.12 9.11 9.10 9.9 9.8 9.7 9.6 9.5 9.4 9.3 9.2 9.1 9.0 8.15 8.14 8.13 8.12 8.11 8.10 8.9 8.8 8.3 8.2 8.1 7.15 7.14 7.13 7.12 7.11 14 19 20 21 22 23 24 25 31 32 33 34 35 38 44 45 46 52 57 59 60 61 62 4.0 5.1"
+    ApplicationVersion="12.10"
+    ReplacesVersions="12.6 12.5 12.4 12.3 12.2 12.1 12.0 11.15 11.14 11.13 11.12 11.11 11.10 11.9 11.8 11.7 11.6 11.5 11.4 11.3 11.2 11.1 11.0 10.15 10.14 10.13 10.11 10.10 10.0 9.15 9.14 9.13 9.12 9.11 9.10 9.9 9.8 9.7 9.6 9.5 9.4 9.3 9.2 9.1 9.0 8.15 8.14 8.13 8.12 8.11 8.10 8.9 8.8 8.3 8.2 8.1 7.15 7.14 7.13 7.12 7.11 14 19 20 21 22 23 24 25 31 32 33 34 35 38 44 45 46 52 57 59 60 61 62 4.0 5.1"
     ApplicationRevision="0"
     ApplicationName="WP-Logic"
     BuildSuffix="-Dev"
@@ -39,7 +39,7 @@
     NumChannels="30"
     KoOffset="20"
     ModuleType="1">
-    <op:verify File="../lib/OFM-LogicModule/library.json" ModuleVersion="3.2" /> 
+    <op:verify File="../lib/OFM-LogicModule/library.json" ModuleVersion="3.3" /> 
   </op:define>
 
   <!-- <generate base="MyApplication.xml" /> -->

diff --git a/src/main.cpp b/src/main.cpp
@@ -14,7 +14,7 @@
 void setup()
 {
     // change this also in library.json
-    const uint8_t firmwareRevision = 1;
+    const uint8_t firmwareRevision = 0;
     openknx.init(firmwareRevision);
     openknx.addModule(1, openknxLogic);
 #ifdef ARDUINO_ARCH_RP2040