Skip to content

Commit 7e35def

Browse files
author
Waldemar Porscha
committed
Release 0.15
- FIX: solved I²C Errors with Keypad for GIRA - Support for 4x3 keypad with UP1-SEN-8x
1 parent 4c68720 commit 7e35def

6 files changed

Lines changed: 20 additions & 19 deletions

File tree

‎dependencies.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
------- Built with -------
22
7124a64 v1 lib/knx https://github.com/OpenKNX/knx
3-
395eed4 devel lib/OFM-AccessControl https://github.com/OpenKNX/OFM-AccessControl
3+
cb0220f main lib/OFM-AccessControl https://github.com/OpenKNX/OFM-AccessControl
44
19e648c v1 lib/OFM-BinaryInput https://github.com/OpenKNX/OFM-BinaryInput.git
55
eca6977 v1 lib/OFM-ConfigTransfer https://github.com/OpenKNX/OFM-ConfigTransfer
6-
2fb8d68 v1dev lib/OFM-Feedback https://github.com/OpenKNX/OFM-Feedback.git
6+
3fa76cd v1 lib/OFM-Feedback https://github.com/OpenKNX/OFM-Feedback.git
77
178f186 v1 lib/OFM-FileTransferModule https://github.com/OpenKNX/OFM-FileTransferModule.git
88
8c0d835 v1 lib/OFM-LogicModule https://github.com/OpenKNX/OFM-LogicModule
99
7d4ec51 main lib/OFM-SwitchActuator https://github.com/OpenKNX/OFM-SwitchActuator

‎include/knxprod.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#define MAIN_FirmwareName "Zutrittskontrolle (R503)"
2121
#define MAIN_OpenKnxId 0xA6
2222
#define MAIN_ApplicationNumber 0
23-
#define MAIN_ApplicationVersion 14
23+
#define MAIN_ApplicationVersion 15
2424
#define MAIN_FirmwareRevision 0
2525
#define MAIN_ApplicationEncoding iso-8859-15
2626
#define MAIN_ParameterSize 20922

‎include/versions.h‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,17 @@
11
#pragma once
22

3-
#define MAIN_Version "cfbafe7"
3+
#define MAIN_Version "4c68720"
44
#define KNX_Version "2.3.1+7124a64"
5-
#define MODULE_AccessControl_Version "0.14.0+d6a6b72"
5+
#define MODULE_AccessControl_Version "0.14.0+cb0220f"
66
#define MODULE_AccessControl_Version_Major 0
77
#define MODULE_AccessControl_Version_Minor 14
88
#define MODULE_AccessControl_Version_Revision 0
99
#define MODULE_AccessControl_ETS 14
10+
#define MODULE_Feedback_Version "0.3.2+3fa76cd"
11+
#define MODULE_Feedback_Version_Major 0
12+
#define MODULE_Feedback_Version_Minor 3
13+
#define MODULE_Feedback_Version_Revision 2
14+
#define MODULE_Feedback_ETS 3
1015
#define MODULE_Common_Version "1.8.1+f6dbb3c"
1116
#define MODULE_Common_Version_Major 1
1217
#define MODULE_Common_Version_Minor 8
@@ -17,11 +22,6 @@
1722
#define MODULE_LogicModule_Version_Minor 3
1823
#define MODULE_LogicModule_Version_Revision 0
1924
#define MODULE_LogicModule_ETS 67
20-
#define MODULE_Feedback_Version "0.3.1+2fb8d68"
21-
#define MODULE_Feedback_Version_Major 0
22-
#define MODULE_Feedback_Version_Minor 3
23-
#define MODULE_Feedback_Version_Revision 1
24-
#define MODULE_Feedback_ETS 3
2525
#define MODULE_FileTransferModule_Version "0.1.5+178f186"
2626
#define MODULE_FileTransferModule_Version_Major 0
2727
#define MODULE_FileTransferModule_Version_Minor 1

‎src/AccessControl-ReleaseR503.xml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,12 @@
55
<op:config href="AccessControl.conf.xml" />
66
<op:config name="%SWA_Measure%" value="0" />
77

8+
<op:nowarn id="1" regex="ACC_ApplicationVersion_Dev" />
9+
810
<op:ETS OpenKnxId="0xA6"
911
ApplicationNumber="0x00"
1012
ApplicationVersion="%ACC_ApplicationVersion%"
11-
ReplacesVersions="%ACC_ReplacesVersions%"
13+
ReplacesVersionsDownTo="0.2"
1214
ApplicationRevision="0"
1315
ProductName="Zutrittskontrolle"
1416
BuildSuffix="-R503"

‎src/AccessControl.conf.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,17 @@
1313
<op:config name="%BI_VerifyVersion%" value="0.3" />
1414
<op:config name="%UCT_VerifyVersion%" value="0.5" />
1515
<op:config name="%LOG_VerifyVersion%" value="4.3" />
16-
<op:config name="%BASE_VerifyVersion%" value="1.8
17-
" />
16+
<op:config name="%BASE_VerifyVersion%" value="1.8" />
1817
<op:config name="%BUZZ_VerifyVersion%" value="0.3" />
1918
<op:config name="%ACC_VerifyVersion%" value="0.14" />
2019

21-
<op:config name="%ACC_ApplicationVersion%" value="0.14.0" />
22-
<op:config name="%ACC_ReplacesVersions%" value="0.13 0.12 0.11 0.10 0.9 0.8 0.7 0.6 0.5 0.2" />
23-
2420
<op:config name="%BUZZ_ModuleText%" value="Buzzer" />
2521
<op:config name="%BUZZ_BuzzerVisible%" value="1" />
2622
<op:config name="%BUZZ_VibrationVisible%" value="0" />
23+
24+
<op:config name="%ACC_ApplicationVersion%" value="0.15.0" />
25+
<op:config name="%ACC_ApplicationVersion_Dev%" value="10.14.0" />
26+
2727

2828
<op:nowarn id="3" regex="ACC_sleep" />
2929
<op:nowarn id="3" regex="ACC_assignFingerId" />

‎src/AccessControl.xml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,12 @@
66
<op:config name="%IsSecureEnabled%" value="false" />
77
<op:config name="%SWA_Measure%" value="0" />
88

9-
<op:nowarn id="1" regex="ACC_ReplacesVersions" />
109
<op:nowarn id="1" regex="ACC_ApplicationVersion" />
1110

1211
<op:ETS OpenKnxId="0xA6"
1312
ApplicationNumber="0x01"
14-
ApplicationVersion="10.13.0"
15-
ReplacesVersions="10.12 10.11 10.10 10.9 10.8 10.7 10.6 10.5 10.4 10.3 10.2 10.1 10.0 9.15 9.14 9.13 9.12 9.11 9.10 9.9 9.8 9.7 9.6 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.7 8.6 8.5 8.4 8.3 8.2 8.1 8.0 7.15 7.14 7.13 7.12 7.11 7.10 7.9 7.8 7.7 7.6 7.3 6.15 6.14 6.13 6.12 6.11 6.10 6.9 6.0 5.2 5.1 5.0 4.15 4.14 4.13 4.12 4.11 4.10 4.9 4.8 4.7 4.6 4.5 4.4 4.3 4.2 4.1 4.0"
13+
ApplicationVersion="%ACC_ApplicationVersion_Dev%"
14+
ReplacesVersionsDownTo="4.0"
1615
ApplicationRevision="0"
1716
ProductName="Zutrittskontrolle"
1817
BuildSuffix="-Dev"

0 commit comments

Comments
 (0)