FIX: processScan did not handle authentication correctly

Author: Waldemar Porscha

dependencies.txt

@@ -2833,9 +2833,9 @@
 
 // Mehrfach-Klick
 #define ParamBTN_ReactionTimeMultiClick              (knx.paramByte(BTN_ReactionTimeMultiClick))
-// Langer Tasterdruck
+// Langer Tastendruck
 #define ParamBTN_ReactionTimeLong                    (knx.paramByte(BTN_ReactionTimeLong))
-// Extra langer Tastedruck
+// Extra langer Tastendruck
 #define ParamBTN_ReactionTimeExtraLong               (knx.paramByte(BTN_ReactionTimeExtraLong))
 // Verfügbare Kanäle
 #define ParamBTN_VisibleChannels                     (knx.paramByte(BTN_VisibleChannels))
@@ -3062,9 +3062,9 @@
 #define ParamBTN_bInB                                (knx.paramWord(BTN_ParamCalcIndex(BTN_bInB)))
 // Mehrfach-Klick
 #define ParamBTN_bReactionTimeMultiClick             (knx.paramByte(BTN_ParamCalcIndex(BTN_bReactionTimeMultiClick)))
-// Langer Tasterdruck
+// Langer Tastendruck
 #define ParamBTN_bReactionTimeLong                   (knx.paramByte(BTN_ParamCalcIndex(BTN_bReactionTimeLong)))
-// Extra langer Tasterdruck
+// Extra langer Tastendruck
 #define ParamBTN_bReactionTimeExtraLong              (knx.paramByte(BTN_ParamCalcIndex(BTN_bReactionTimeExtraLong)))
 // Datentyp
 #define ParamBTN_bOutShort_DPT                       (knx.paramByte(BTN_ParamCalcIndex(BTN_bOutShort_DPT)))
@@ -3402,6 +3402,8 @@
 // 
 #define KoBTN_Out6                                (knx.getGroupObject(BTN_KoCalcNumber(BTN_KoOut6)))
 
+
+
 #define BI_ChannelCount 4
 
 // Parameter per channel
@@ -3466,7 +3468,7 @@
 
 // Header generation for Module 'BASE_KommentarModule'
 
-#define BASE_KommentarModuleCount 99
+#define BASE_KommentarModuleCount 0
 #define BASE_KommentarModuleModuleParamSize 0
 #define BASE_KommentarModuleSubmodulesParamSize 0
 #define BASE_KommentarModuleParamSize 0

include/knxprod.h

@@ -1,16 +1,16 @@
 #pragma once
 
-#define MAIN_Version "89a91c4"
-#define KNX_Version "e69f636"
-#define MODULE_Common_Version "1.2.0+1aa43bb"
+#define MAIN_Version "152efc8"
+#define KNX_Version "2.1.0+e69f636"
+#define MODULE_Common_Version "1.2.0+ddd1363"
 #define MODULE_Common_ETS 18
 #define MODULE_SwitchActuator_Version "0.1.0+cfaf665"
 #define MODULE_SwitchActuator_ETS 1
 #define MODULE_LogicModule_Version "3.3.0+0834fc0"
 #define MODULE_LogicModule_ETS 51
 #define MODULE_BinaryInput_Version "0.2.0+9fd5ad1"
 #define MODULE_BinaryInput_ETS 2
-#define MODULE_VirtualButton_Version "0.4.0+aa25ef8"
-#define MODULE_VirtualButton_ETS 4
+#define MODULE_VirtualButton_Version "0.5.0+3a79603"
+#define MODULE_VirtualButton_ETS 5
 #define MODULE_FileTransferModule_Version "0.0.4+db4a240"
 #define MODULE_FileTransferModule_ETS 0

include/versions.h

@@ -41,7 +41,10 @@ void ActionChannel::processInputKo(GroupObject &ko)
 
 bool ActionChannel::processScan(uint16_t location)
 {
-    if (_authenticateActive && !ParamFIN_ActAuthenticate)
+    // here are 2 cases relevant:
+    // authentication is active and the action is without auth-flag => skip processing
+    // authentication is inaction and the action has te auth-flag => skip processing
+    if (_authenticateActive != ParamFIN_ActAuthenticate)
         return false;
 
     if (!ParamFIN_ActAuthenticate || KoFIN_ActCall.value(DPT_Switch))

src/ActionChannel.cpp

@@ -7,7 +7,7 @@
 
 void setup()
 {
-    const uint8_t firmwareRevision = 0;
+    const uint8_t firmwareRevision = 1;
     openknx.init(firmwareRevision);
     openknx.addModule(1, openknxLogic);
     openknx.addModule(2, openknxFingerprintModule);