Skip to content

Commit 4c68720

Browse files
author
Waldemar Porscha
committed
RC 14.0
1 parent cfbafe7 commit 4c68720

5 files changed

Lines changed: 43 additions & 25 deletions

File tree

‎dependencies.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
------- Built with -------
22
7124a64 v1 lib/knx https://github.com/OpenKNX/knx
3-
d6a6b72 devel lib/OFM-AccessControl https://github.com/OpenKNX/OFM-AccessControl
3+
395eed4 devel 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-
ff6af21 v1 lib/OFM-Feedback https://github.com/OpenKNX/OFM-Feedback.git
6+
2fb8d68 v1dev lib/OFM-Feedback https://github.com/OpenKNX/OFM-Feedback.git
77
178f186 v1 lib/OFM-FileTransferModule https://github.com/OpenKNX/OFM-FileTransferModule.git
8-
45e2159 v1 lib/OFM-LogicModule https://github.com/OpenKNX/OFM-LogicModule
8+
8c0d835 v1 lib/OFM-LogicModule https://github.com/OpenKNX/OFM-LogicModule
99
7d4ec51 main lib/OFM-SwitchActuator https://github.com/OpenKNX/OFM-SwitchActuator
1010
9ea99b5 v1 lib/OFM-VirtualButton https://github.com/OpenKNX/OFM-VirtualButton.git
1111
f6dbb3c v1 lib/OGM-Common https://github.com/OpenKNX/OGM-Common

‎include/knxprod.h‎

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@
2020
#define MAIN_FirmwareName "Zutrittskontrolle (R503)"
2121
#define MAIN_OpenKnxId 0xA6
2222
#define MAIN_ApplicationNumber 0
23-
#define MAIN_ApplicationVersion 13
24-
#define MAIN_FirmwareRevision 1
23+
#define MAIN_ApplicationVersion 14
24+
#define MAIN_FirmwareRevision 0
2525
#define MAIN_ApplicationEncoding iso-8859-15
2626
#define MAIN_ParameterSize 20922
2727
#define MAIN_MaxKoNumber 1239
2828
#define MAIN_OrderNumber "OpenKnxAccessControl"
2929
#define BASE_ModuleVersion 24
3030
#define UCT_ModuleVersion 5
31-
#define ACC_ModuleVersion 13
31+
#define ACC_ModuleVersion 14
3232
#define SWA_ModuleVersion 1
3333
#define LOG_ModuleVersion 67
3434
#define BTN_ModuleVersion 6
@@ -334,9 +334,9 @@
334334
// Verzögerung zwischen Sync-Telegrammen
335335
#define ParamACC_SyncDelay (knx.paramByte(ACC_SyncDelay))
336336
// Hintergrundbeleuchtung
337-
#define ParamACC_BacklightState ((knx.paramByte(ACC_BacklightState) & ACC_BacklightStateMask) >> ACC_BacklightStateShift)
337+
#define ParamACC_BacklightState (PT_BacklightState)((knx.paramByte(ACC_BacklightState) & ACC_BacklightStateMask) >> ACC_BacklightStateShift)
338338
// Helligkeit
339-
#define ParamACC_BacklightIntensity ((knx.paramByte(ACC_BacklightIntensity) & ACC_BacklightIntensityMask) >> ACC_BacklightIntensityShift)
339+
#define ParamACC_BacklightIntensity (PT_BacklightIntensity)((knx.paramByte(ACC_BacklightIntensity) & ACC_BacklightIntensityMask) >> ACC_BacklightIntensityShift)
340340
// Tastendruck auf den Bus senden?
341341
#define ParamACC_KeypressTrigger ((bool)(knx.paramByte(ACC_KeypressTrigger) & ACC_KeypressTriggerMask))
342342
// Ersten Tastendruck ignorieren?
@@ -4075,6 +4075,22 @@
40754075

40764076

40774077
// enumeration types
4078+
enum class PT_BacklightState
4079+
{
4080+
alwaysOn = 0,
4081+
onByAnyKey = 1,
4082+
onByKO = 2,
4083+
alwaysOff = 3
4084+
};
4085+
4086+
enum class PT_BacklightIntensity
4087+
{
4088+
high = 0,
4089+
medium = 1,
4090+
low = 2,
4091+
byKO = 3
4092+
};
4093+
40784094
enum class PT_Logic
40794095
{
40804096
AUS = 0,

‎include/versions.h‎

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

3-
#define MAIN_Version "f30f4d4"
3+
#define MAIN_Version "cfbafe7"
44
#define KNX_Version "2.3.1+7124a64"
5-
#define MODULE_AccessControl_Version "0.13.1+26671f4"
5+
#define MODULE_AccessControl_Version "0.14.0+d6a6b72"
66
#define MODULE_AccessControl_Version_Major 0
7-
#define MODULE_AccessControl_Version_Minor 13
8-
#define MODULE_AccessControl_Version_Revision 1
9-
#define MODULE_AccessControl_ETS 13
7+
#define MODULE_AccessControl_Version_Minor 14
8+
#define MODULE_AccessControl_Version_Revision 0
9+
#define MODULE_AccessControl_ETS 14
1010
#define MODULE_Common_Version "1.8.1+f6dbb3c"
1111
#define MODULE_Common_Version_Major 1
1212
#define MODULE_Common_Version_Minor 8
1313
#define MODULE_Common_Version_Revision 1
1414
#define MODULE_Common_ETS 24
15-
#define MODULE_LogicModule_Version "4.3.0+45e2159"
15+
#define MODULE_LogicModule_Version "4.3.0+8c0d835"
1616
#define MODULE_LogicModule_Version_Major 4
1717
#define MODULE_LogicModule_Version_Minor 3
1818
#define MODULE_LogicModule_Version_Revision 0
1919
#define MODULE_LogicModule_ETS 67
20-
#define MODULE_Feedback_Version "0.3.0+ff6af21"
20+
#define MODULE_Feedback_Version "0.3.1+2fb8d68"
2121
#define MODULE_Feedback_Version_Major 0
2222
#define MODULE_Feedback_Version_Minor 3
23-
#define MODULE_Feedback_Version_Revision 0
23+
#define MODULE_Feedback_Version_Revision 1
2424
#define MODULE_Feedback_ETS 3
2525
#define MODULE_FileTransferModule_Version "0.1.5+178f186"
2626
#define MODULE_FileTransferModule_Version_Major 0

‎src/AccessControl.conf.xml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,16 @@
1616
<op:config name="%BASE_VerifyVersion%" value="1.8
1717
" />
1818
<op:config name="%BUZZ_VerifyVersion%" value="0.3" />
19-
<op:config name="%ACC_VerifyVersion%" value="0.13" />
19+
<op:config name="%ACC_VerifyVersion%" value="0.14" />
2020

21-
<op:config name="%ACC_ApplicationVersion%" value="0.13.1" />
22-
<op:config name="%ACC_ReplacesVersions%" value="0.12 0.11 0.10 0.9 0.8 0.7 0.6 0.5 0.2" />
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" />
2323

2424
<op:config name="%BUZZ_ModuleText%" value="Buzzer" />
2525
<op:config name="%BUZZ_BuzzerVisible%" value="1" />
2626
<op:config name="%BUZZ_VibrationVisible%" value="0" />
2727

2828
<op:nowarn id="3" regex="ACC_sleep" />
2929
<op:nowarn id="3" regex="ACC_assignFingerId" />
30+
<op:nowarn id="3" regex="ACC_syncData" />
3031
</KNX>

‎src/AccessControl.xml‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,12 @@
77
<op:config name="%SWA_Measure%" value="0" />
88

99
<op:nowarn id="1" regex="ACC_ReplacesVersions" />
10+
<op:nowarn id="1" regex="ACC_ApplicationVersion" />
1011

1112
<op:ETS OpenKnxId="0xA6"
1213
ApplicationNumber="0x01"
13-
ApplicationVersion="10.8.0"
14-
ReplacesVersions="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"
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"
1516
ApplicationRevision="0"
1617
ProductName="Zutrittskontrolle"
1718
BuildSuffix="-Dev"
@@ -35,7 +36,7 @@
3536

3637
<!-- for FIN, we have to stay with ModuleType 2!!! -->
3738
<op:define prefix="ACC"
38-
configTransferName="Zutrittskontrolle (Aktionen)"
39+
configTransferName="Zutrittskontrolle (Aktionen + Allgemein)"
3940
share="../lib/OFM-AccessControl/src/AccessControl.share.xml"
4041
template="../lib/OFM-AccessControl/src/Action.templ.xml"
4142
ModuleType="2"
@@ -47,7 +48,7 @@
4748

4849
<op:define prefix="FINACT"
4950
prefixDoc="ACC"
50-
configTransferName="Zutrittskontrolle (Finger)"
51+
configTransferName=" - (Finger)"
5152
share="../lib/OFM-AccessControl/src/FingerAction.share.xml"
5253
template="../lib/OFM-AccessControl/src/FingerAction.templ.xml"
5354
ModuleType="2"
@@ -62,7 +63,7 @@
6263

6364
<op:define prefix="NFCACT"
6465
prefixDoc="ACC"
65-
configTransferName="Zutrittskontrolle (NFC)"
66+
configTransferName=" - (NFC)"
6667
share="../lib/OFM-AccessControl/src/NfcAction.share.xml"
6768
template="../lib/OFM-AccessControl/src/NfcAction.templ.xml"
6869
ModuleType="2"
@@ -77,7 +78,7 @@
7778

7879
<op:define prefix="KEYACT"
7980
prefixDoc="ACC"
80-
configTransferName="Zutrittskontrolle (Keypad)"
81+
configTransferName=" - (Keypad)"
8182
share="../lib/OFM-AccessControl/src/KeypadAction.share.xml"
8283
template="../lib/OFM-AccessControl/src/KeypadAction.templ.xml"
8384
ModuleType="2"

0 commit comments

Comments
 (0)