pio build

src/knx/knx_facade.cpp

@@ -47,26 +47,26 @@ ICACHE_RAM_ATTR void buttonEvent()
 #ifdef ARDUINO_ARCH_SAMD
     // predefined global instance for TP or RF or TP/RF coupler
     #if MASK_VERSION == 0x07B0
-        KnxFacade<SamdPlatform, Bau07B0> knx(buttonEvent);
+        Knx::KnxFacade<Knx::SamdPlatform, Knx::Bau07B0> knx(buttonEvent);
     #elif MASK_VERSION == 0x27B0
-        KnxFacade<SamdPlatform, Bau27B0> knx(buttonEvent);
+        Knx::KnxFacade<Knx::SamdPlatform, Knx::Bau27B0> knx(buttonEvent);
     #elif MASK_VERSION == 0x2920
-        KnxFacade<SamdPlatform, Bau2920> knx(buttonEvent);
+        Knx::KnxFacade<Knx::SamdPlatform, Knx::Bau2920> knx(buttonEvent);
     #else
         #error "Mask version not supported on ARDUINO_ARCH_SAMD"
     #endif
 #elif defined(ARDUINO_ARCH_RP2040)
     // predefined global instance for TP or RF or IP or TP/RF coupler or TP/IP coupler
     #if MASK_VERSION == 0x07B0
-        KnxFacade<RP2040ArduinoPlatform, Bau07B0> knx(buttonEvent);
+        Knx::KnxFacade<Knx::RP2040ArduinoPlatform, Knx::Bau07B0> knx(buttonEvent);
     #elif MASK_VERSION == 0x27B0
-        KnxFacade<RP2040ArduinoPlatform, Bau27B0> knx(buttonEvent);
+        Knx::KnxFacade<Knx::RP2040ArduinoPlatform, Knx::Bau27B0> knx(buttonEvent);
     #elif MASK_VERSION == 0x57B0
-        KnxFacade<RP2040ArduinoPlatform, Bau57B0> knx(buttonEvent);
+        Knx::KnxFacade<Knx::RP2040ArduinoPlatform, Knx::Bau57B0> knx(buttonEvent);
     #elif MASK_VERSION == 0x2920
-        KnxFacade<RP2040ArduinoPlatform, Bau2920> knx(buttonEvent);
+        Knx::KnxFacade<Knx::RP2040ArduinoPlatform, Knx::Bau2920> knx(buttonEvent);
     #elif MASK_VERSION == 0x091A
-        KnxFacade<RP2040ArduinoPlatform, Bau091A> knx(buttonEvent);
+        Knx::KnxFacade<Knx::RP2040ArduinoPlatform, Knx::Bau091A> knx(buttonEvent);
     #else
         #error "Mask version not supported on ARDUINO_ARCH_RP2040"
     #endif
@@ -74,11 +74,11 @@ ICACHE_RAM_ATTR void buttonEvent()
 #elif defined(ARDUINO_ARCH_ESP8266)
     // predefined global instance for TP or IP or TP/IP coupler
     #if MASK_VERSION == 0x07B0
-        KnxFacade<EspPlatform, Bau07B0> knx(buttonEvent);
+        Knx::KnxFacade<Knx::EspPlatform, Knx::Bau07B0> knx(buttonEvent);
     #elif MASK_VERSION == 0x57B0
-        KnxFacade<EspPlatform, Bau57B0> knx(buttonEvent);
+        Knx::KnxFacade<Knx::EspPlatform, Knx::Bau57B0> knx(buttonEvent);
     #elif MASK_VERSION == 0x091A
-        KnxFacade<EspPlatform, Bau091A> knx(buttonEvent);
+        Knx::KnxFacade<Knx::EspPlatform, Knx::Bau091A> knx(buttonEvent);
     #else
         #error "Mask version not supported on ARDUINO_ARCH_ESP8266"
     #endif
@@ -86,18 +86,18 @@ ICACHE_RAM_ATTR void buttonEvent()
 #elif defined(ARDUINO_ARCH_ESP32)
     // predefined global instance for TP or IP or TP/IP coupler
     #if MASK_VERSION == 0x07B0
-        KnxFacade<Esp32Platform, Bau07B0> knx(buttonEvent);
+        Knx::KnxFacade<Knx::Esp32Platform, Knx::Bau07B0> knx(buttonEvent);
     #elif MASK_VERSION == 0x57B0
-        KnxFacade<Esp32Platform, Bau57B0> knx(buttonEvent);
+        Knx::KnxFacade<Knx::Esp32Platform, Knx::Bau57B0> knx(buttonEvent);
     #elif MASK_VERSION == 0x091A
-        KnxFacade<Esp32Platform, Bau091A> knx(buttonEvent);
+        Knx::KnxFacade<Knx::Esp32Platform, Knx::Bau091A> knx(buttonEvent);
     #else
         #error "Mask version not supported on ARDUINO_ARCH_ESP32"
     #endif
 
 #elif defined(ARDUINO_ARCH_STM32)
     #if MASK_VERSION == 0x07B0
-        KnxFacade<Stm32Platform, Bau07B0> knx(buttonEvent);
+        Knx::KnxFacade<Knx::Stm32Platform, Knx::Bau07B0> knx(buttonEvent);
     #else
         #error "Mask version not supported on ARDUINO_ARCH_STM32"
     #endif

src/knx/knx_facade.h

@@ -46,468 +46,469 @@
     #define KNX_BUTTON -1
 #endif
 
-namespace Knx {
+namespace Knx
+{
 
 #ifndef KNX_NO_AUTOMATIC_GLOBAL_INSTANCE
     extern void buttonUp();
 #endif
 
-typedef const uint8_t* (*RestoreCallback)(const uint8_t* buffer);
+    typedef const uint8_t* (*RestoreCallback)(const uint8_t* buffer);
-typedef uint8_t* (*SaveCallback)(uint8_t* buffer);
+    typedef uint8_t* (*SaveCallback)(uint8_t* buffer);
-typedef void (*IsrFunctionPtr)();
+    typedef void (*IsrFunctionPtr)();
-typedef void (*ProgLedCallback)(bool on);
+    typedef void (*ProgLedCallback)(bool on);
 #ifdef KNX_ACTIVITYCALLBACK
     typedef void (*ActivityCallback)(uint8_t info);
 #endif
 
-template <class P, class B> class KnxFacade : private SaveRestore
+    template <class P, class B> class KnxFacade : private SaveRestore
-{
+    {
-    public:
+        public:
-        KnxFacade() : _platformPtr(new P()), _bauPtr(new B(*_platformPtr)), _bau(*_bauPtr)
+            KnxFacade() : _platformPtr(new P()), _bauPtr(new B(*_platformPtr)), _bau(*_bauPtr)
-        {
-            manufacturerId(0xfa);
-            bauNumber(platform().uniqueSerialNumber());
-            _bau.addSaveRestore(this);
-        }
-
-        KnxFacade(B& bau) : _bau(bau)
-        {
-            _platformPtr = static_cast<P*>(&bau.platform());
-            manufacturerId(0xfa);
-            bauNumber(platform().uniqueSerialNumber());
-            _bau.addSaveRestore(this);
-        }
-
-        KnxFacade(IsrFunctionPtr buttonISRFunction) : _platformPtr(new P()), _bauPtr(new B(*_platformPtr)), _bau(*_bauPtr)
-        {
-            manufacturerId(0xfa);
-            bauNumber(platform().uniqueSerialNumber());
-            _bau.addSaveRestore(this);
-            setButtonISRFunction(buttonISRFunction);
-        }
-
-        virtual ~KnxFacade()
-        {
-            if (_bauPtr)
-                delete _bauPtr;
-
-            if (_platformPtr)
-                delete _platformPtr;
-        }
-
-        P& platform()
-        {
-            return *_platformPtr;
-        }
-
-        B& bau()
-        {
-            return _bau;
-        }
-
-        bool enabled()
-        {
-            return _bau.enabled();
-        }
-
-        void enabled(bool value)
-        {
-            _bau.enabled(value);
-        }
-
-        bool progMode()
-        {
-            return _bau.deviceObject().progMode();
-        }
-
-        void progMode(bool value)
-        {
-            _bau.deviceObject().progMode(value);
-        }
-
-        /**
-         * To be called by ISR handling on button press.
-         */
-        void toggleProgMode()
-        {
-            _toggleProgMode = true;
-        }
-
-        bool configured()
-        {
-            return _bau.configured();
-        }
-
-        /**
-         * returns HIGH if led is active on HIGH, LOW otherwise
-         */
-        uint32_t ledPinActiveOn()
-        {
-            return _ledPinActiveOn;
-        }
-
-        /**
-         * Sets if the programming led is active on HIGH or LOW.
-         *
-         * Set to HIGH for GPIO--RESISTOR--LED--GND or to LOW for GPIO--LED--RESISTOR--VDD
-         */
-        void ledPinActiveOn(uint32_t value)
-        {
-            _ledPinActiveOn = value;
-        }
-
-        uint32_t ledPin()
-        {
-            return _ledPin;
-        }
-
-        void ledPin(uint32_t value)
-        {
-            _ledPin = value;
-        }
-
-        void progLedCallback(ProgLedCallback value)
-        {
-            _progLedCallback = value;
-        }
-
-        int32_t buttonPin()
-        {
-            return _buttonPin;
-        }
-
-        void buttonPin(int32_t value)
-        {
-            _buttonPin = value;
-        }
-
-        void readMemory()
-        {
-            _bau.readMemory();
-        }
-
-        void writeMemory()
-        {
-            _bau.writeMemory();
-        }
-
-        uint16_t individualAddress()
-        {
-            return _bau.deviceObject().individualAddress();
-        }
-
-        void loop()
-        {
-            if (progMode() != _progLedState)
             {
-                _progLedState = progMode();
+                manufacturerId(0xfa);
-
+                bauNumber(platform().uniqueSerialNumber());
-                if (_progLedState)
+                _bau.addSaveRestore(this);
-                {
-                    Logger::logger("KnxFacade").info("progmode on");
-                    progLedOn();
-                }
-                else
-                {
-                    Logger::logger("KnxFacade").info("progmode off");
-                    progLedOff();
-                }
             }
 
-            if (_toggleProgMode)
+            KnxFacade(B& bau) : _bau(bau)
             {
-                progMode(!progMode());
+                _platformPtr = static_cast<P*>(&bau.platform());
-                _toggleProgMode = false;
+                manufacturerId(0xfa);
+                bauNumber(platform().uniqueSerialNumber());
+                _bau.addSaveRestore(this);
             }
 
-            _bau.loop();
+            KnxFacade(IsrFunctionPtr buttonISRFunction) : _platformPtr(new P()), _bauPtr(new B(*_platformPtr)), _bau(*_bauPtr)
-        }
-
-        void manufacturerId(uint16_t value)
-        {
-            _bau.deviceObject().manufacturerId(value);
-        }
-
-        void bauNumber(uint32_t value)
-        {
-            _bau.deviceObject().bauNumber(value);
-        }
-
-        void orderNumber(const uint8_t* value)
-        {
-            _bau.deviceObject().orderNumber(value);
-        }
-
-        void hardwareType(const uint8_t* value)
-        {
-            _bau.deviceObject().hardwareType(value);
-        }
-
-        void version(uint16_t value)
-        {
-            _bau.deviceObject().version(value);
-        }
-
-        void start()
-        {
-            if (_progLedCallback == 0 && _ledPin >= 0)
-                pinMode(ledPin(), OUTPUT);
-
-            progLedOff();
-
-            if (_progButtonISRFuncPtr && _buttonPin >= 0)
             {
-                pinMode(buttonPin(), INPUT_PULLUP);
+                manufacturerId(0xfa);
-                // Workaround for https://github.com/arduino/ArduinoCore-samd/issues/587
+                bauNumber(platform().uniqueSerialNumber());
+                _bau.addSaveRestore(this);
+                setButtonISRFunction(buttonISRFunction);
+            }
+
+            virtual ~KnxFacade()
+            {
+                if (_bauPtr)
+                    delete _bauPtr;
+
+                if (_platformPtr)
+                    delete _platformPtr;
+            }
+
+            P& platform()
+            {
+                return *_platformPtr;
+            }
+
+            B& bau()
+            {
+                return _bau;
+            }
+
+            bool enabled()
+            {
+                return _bau.enabled();
+            }
+
+            void enabled(bool value)
+            {
+                _bau.enabled(value);
+            }
+
+            bool progMode()
+            {
+                return _bau.deviceObject().progMode();
+            }
+
+            void progMode(bool value)
+            {
+                _bau.deviceObject().progMode(value);
+            }
+
+            /**
+             * To be called by ISR handling on button press.
+             */
+            void toggleProgMode()
+            {
+                _toggleProgMode = true;
+            }
+
+            bool configured()
+            {
+                return _bau.configured();
+            }
+
+            /**
+             * returns HIGH if led is active on HIGH, LOW otherwise
+             */
+            uint32_t ledPinActiveOn()
+            {
+                return _ledPinActiveOn;
+            }
+
+            /**
+             * Sets if the programming led is active on HIGH or LOW.
+             *
+             * Set to HIGH for GPIO--RESISTOR--LED--GND or to LOW for GPIO--LED--RESISTOR--VDD
+             */
+            void ledPinActiveOn(uint32_t value)
+            {
+                _ledPinActiveOn = value;
+            }
+
+            uint32_t ledPin()
+            {
+                return _ledPin;
+            }
+
+            void ledPin(uint32_t value)
+            {
+                _ledPin = value;
+            }
+
+            void progLedCallback(ProgLedCallback value)
+            {
+                _progLedCallback = value;
+            }
+
+            int32_t buttonPin()
+            {
+                return _buttonPin;
+            }
+
+            void buttonPin(int32_t value)
+            {
+                _buttonPin = value;
+            }
+
+            void readMemory()
+            {
+                _bau.readMemory();
+            }
+
+            void writeMemory()
+            {
+                _bau.writeMemory();
+            }
+
+            uint16_t individualAddress()
+            {
+                return _bau.deviceObject().individualAddress();
+            }
+
+            void loop()
+            {
+                if (progMode() != _progLedState)
+                {
+                    _progLedState = progMode();
+
+                    if (_progLedState)
+                    {
+                        Logger::logger("KnxFacade").info("progmode on");
+                        progLedOn();
+                    }
+                    else
+                    {
+                        Logger::logger("KnxFacade").info("progmode off");
+                        progLedOff();
+                    }
+                }
+
+                if (_toggleProgMode)
+                {
+                    progMode(!progMode());
+                    _toggleProgMode = false;
+                }
+
+                _bau.loop();
+            }
+
+            void manufacturerId(uint16_t value)
+            {
+                _bau.deviceObject().manufacturerId(value);
+            }
+
+            void bauNumber(uint32_t value)
+            {
+                _bau.deviceObject().bauNumber(value);
+            }
+
+            void orderNumber(const uint8_t* value)
+            {
+                _bau.deviceObject().orderNumber(value);
+            }
+
+            void hardwareType(const uint8_t* value)
+            {
+                _bau.deviceObject().hardwareType(value);
+            }
+
+            void version(uint16_t value)
+            {
+                _bau.deviceObject().version(value);
+            }
+
+            void start()
+            {
+                if (_progLedCallback == 0 && _ledPin >= 0)
+                    pinMode(ledPin(), OUTPUT);
+
+                progLedOff();
+
+                if (_progButtonISRFuncPtr && _buttonPin >= 0)
+                {
+                    pinMode(buttonPin(), INPUT_PULLUP);
+                    // Workaround for https://github.com/arduino/ArduinoCore-samd/issues/587
 #if (ARDUINO_API_VERSION >= 10200)
-                attachInterrupt(_buttonPin, _progButtonISRFuncPtr, (PinStatus)CHANGE);
+                    attachInterrupt(_buttonPin, _progButtonISRFuncPtr, (PinStatus)CHANGE);
 #else
-                attachInterrupt(_buttonPin, _progButtonISRFuncPtr, CHANGE);
+                    attachInterrupt(_buttonPin, _progButtonISRFuncPtr, CHANGE);
 #endif
+                }
+
+                enabled(true);
             }
 
-            enabled(true);
+            void setButtonISRFunction(IsrFunctionPtr progButtonISRFuncPtr)
-        }
+            {
+                _progButtonISRFuncPtr = progButtonISRFuncPtr;
+            }
 
-        void setButtonISRFunction(IsrFunctionPtr progButtonISRFuncPtr)
+            void setSaveCallback(SaveCallback func)
-        {
+            {
-            _progButtonISRFuncPtr = progButtonISRFuncPtr;
+                _saveCallback = func;
-        }
+            }
 
-        void setSaveCallback(SaveCallback func)
+            void setRestoreCallback(RestoreCallback func)
-        {
+            {
-            _saveCallback = func;
+                _restoreCallback = func;
-        }
+            }
 
-        void setRestoreCallback(RestoreCallback func)
+            uint8_t* paramData(uint32_t addr)
-        {
+            {
-            _restoreCallback = func;
+                if (!_bau.configured())
-        }
+                    return nullptr;
 
-        uint8_t* paramData(uint32_t addr)
+                return _bau.parameters().data(addr);
-        {
+            }
-            if (!_bau.configured())
-                return nullptr;
 
-            return _bau.parameters().data(addr);
+            // paramBit(address, shift)
-        }
+            // get state of a parameter as a boolean like "enable/disable", ...
+            // Declaration in XML file:
+            // ...
+            // <ParameterType Id="M-00FA_A-0066-EA-0001_PT-toggle" Name="toggle">
+            //   <TypeRestriction Base="Value" SizeInBit="1">
+            //     <Enumeration Text="Désactivé" Value="0" Id="M-00FA_A-0066-EA-0001_PT-toggle_EN-0"/>
+            //     <Enumeration Text="Activé" Value="1" Id="M-00FA_A-0066-EA-0001_PT-toggle_EN-1"/>
+            //  </TypeRestriction>
+            // </ParameterType>
+            // ...
+            // <Parameter Id="M-00FA_A-0066-EA-0001_P-2" Name="Input 1" ParameterType="M-00FA_A-0066-EA-0001_PT-toggle" Text="Input 1" Value="1">
+            //   <Memory CodeSegment="M-00FA_A-0066-EA-0001_RS-04-00000" Offset="1" BitOffset="0"/>
+            // </Parameter>
+            // <Parameter Id="M-00FA_A-0066-EA-0001_P-3" Name="Input 2" ParameterType="M-00FA_A-0066-EA-0001_PT-toggle" Text="Input 2" Value="1">
+            //   <Memory CodeSegment="M-00FA_A-0066-EA-0001_RS-04-00000" Offset="1" BitOffset="1"/>
+            // </Parameter>
+            // <Parameter Id="M-00FA_A-0066-EA-0001_P-4" Name="Inout 3" ParameterType="M-00FA_A-0066-EA-0001_PT-toggle" Text="Input 3" Value="1">
+            //   <Memory CodeSegment="M-00FA_A-0066-EA-0001_RS-04-00000" Offset="1" BitOffset="2"/>
+            // </Parameter>
+            // ...
+            // Usage in code :
+            //   if ( knx.paramBit(1,1))
+            //   {
+            //      //do somthings ....
+            //   }
+            bool paramBit(uint32_t addr, uint8_t shift)
+            {
+                if (!_bau.configured())
+                    return 0;
 
-        // paramBit(address, shift)
+                return (bool) ((_bau.parameters().getByte(addr) >> (7 - shift)) & 0x01);
-        // get state of a parameter as a boolean like "enable/disable", ...
+            }
-        // Declaration in XML file:
-        // ...
-        // <ParameterType Id="M-00FA_A-0066-EA-0001_PT-toggle" Name="toggle">
-        //   <TypeRestriction Base="Value" SizeInBit="1">
-        //     <Enumeration Text="Désactivé" Value="0" Id="M-00FA_A-0066-EA-0001_PT-toggle_EN-0"/>
-        //     <Enumeration Text="Activé" Value="1" Id="M-00FA_A-0066-EA-0001_PT-toggle_EN-1"/>
-        //  </TypeRestriction>
-        // </ParameterType>
-        // ...
-        // <Parameter Id="M-00FA_A-0066-EA-0001_P-2" Name="Input 1" ParameterType="M-00FA_A-0066-EA-0001_PT-toggle" Text="Input 1" Value="1">
-        //   <Memory CodeSegment="M-00FA_A-0066-EA-0001_RS-04-00000" Offset="1" BitOffset="0"/>
-        // </Parameter>
-        // <Parameter Id="M-00FA_A-0066-EA-0001_P-3" Name="Input 2" ParameterType="M-00FA_A-0066-EA-0001_PT-toggle" Text="Input 2" Value="1">
-        //   <Memory CodeSegment="M-00FA_A-0066-EA-0001_RS-04-00000" Offset="1" BitOffset="1"/>
-        // </Parameter>
-        // <Parameter Id="M-00FA_A-0066-EA-0001_P-4" Name="Inout 3" ParameterType="M-00FA_A-0066-EA-0001_PT-toggle" Text="Input 3" Value="1">
-        //   <Memory CodeSegment="M-00FA_A-0066-EA-0001_RS-04-00000" Offset="1" BitOffset="2"/>
-        // </Parameter>
-        // ...
-        // Usage in code :
-        //   if ( knx.paramBit(1,1))
-        //   {
-        //      //do somthings ....
-        //   }
-        bool paramBit(uint32_t addr, uint8_t shift)
-        {
-            if (!_bau.configured())
-                return 0;
 
-            return (bool) ((_bau.parameters().getByte(addr) >> (7 - shift)) & 0x01);
+            uint8_t paramByte(uint32_t addr)
-        }
+            {
+                if (!_bau.configured())
+                    return 0;
 
-        uint8_t paramByte(uint32_t addr)
+                return _bau.parameters().getByte(addr);
-        {
+            }
-            if (!_bau.configured())
-                return 0;
 
-            return _bau.parameters().getByte(addr);
+            // Same usage than paramByte(addresse) for signed parameters
-        }
+            // Declaration in XML file
+            // <ParameterType Id="M-00FA_A-0066-EA-0001_PT-delta" Name="delta">
+            //   <TypeNumber SizeInBit="8" Type="signedInt" minInclusive="-10" maxInclusive="10"/>
+            // </ParameterType>
+            int8_t paramSignedByte(uint32_t addr)
+            {
+                if (!_bau.configured())
+                    return 0;
 
-        // Same usage than paramByte(addresse) for signed parameters
+                return (int8_t) _bau.parameters().getByte(addr);
-        // Declaration in XML file
+            }
-        // <ParameterType Id="M-00FA_A-0066-EA-0001_PT-delta" Name="delta">
-        //   <TypeNumber SizeInBit="8" Type="signedInt" minInclusive="-10" maxInclusive="10"/>
-        // </ParameterType>
-        int8_t paramSignedByte(uint32_t addr)
-        {
-            if (!_bau.configured())
-                return 0;
 
-            return (int8_t) _bau.parameters().getByte(addr);
+            uint16_t paramWord(uint32_t addr)
-        }
+            {
+                if (!_bau.configured())
+                    return 0;
 
-        uint16_t paramWord(uint32_t addr)
+                return _bau.parameters().getWord(addr);
-        {
+            }
-            if (!_bau.configured())
-                return 0;
 
-            return _bau.parameters().getWord(addr);
+            uint32_t paramInt(uint32_t addr)
-        }
+            {
+                if (!_bau.configured())
+                    return 0;
 
-        uint32_t paramInt(uint32_t addr)
+                return _bau.parameters().getInt(addr);
-        {
+            }
-            if (!_bau.configured())
-                return 0;
 
-            return _bau.parameters().getInt(addr);
+            double paramFloat(uint32_t addr, ParameterFloatEncodings enc)
-        }
+            {
+                if (!_bau.configured())
+                    return 0;
 
-        double paramFloat(uint32_t addr, ParameterFloatEncodings enc)
+                return _bau.parameters().getFloat(addr, enc);
-        {
+            }
-            if (!_bau.configured())
-                return 0;
-
-            return _bau.parameters().getFloat(addr, enc);
-        }
 
 #if (MASK_VERSION == 0x07B0) || (MASK_VERSION == 0x27B0) || (MASK_VERSION == 0x57B0)
-        GroupObject& getGroupObject(uint16_t goNr)
+            GroupObject& getGroupObject(uint16_t goNr)
-        {
+            {
-            return _bau.groupObjectTable().get(goNr);
+                return _bau.groupObjectTable().get(goNr);
-        }
+            }
 #endif
 
-        void restart(uint16_t individualAddress)
+            void restart(uint16_t individualAddress)
-        {
+            {
-            SecurityControl sc = {false, None};
+                SecurityControl sc = {false, None};
-            _bau.restartRequest(individualAddress, sc);
+                _bau.restartRequest(individualAddress, sc);
-        }
+            }
 
-        void beforeRestartCallback(BeforeRestartCallback func)
+            void beforeRestartCallback(BeforeRestartCallback func)
-        {
+            {
-            _bau.beforeRestartCallback(func);
+                _bau.beforeRestartCallback(func);
-        }
+            }
 
-        BeforeRestartCallback beforeRestartCallback()
+            BeforeRestartCallback beforeRestartCallback()
-        {
+            {
-            return _bau.beforeRestartCallback();
+                return _bau.beforeRestartCallback();
-        }
+            }
 
-    private:
+        private:
-        P* _platformPtr = 0;
+            P* _platformPtr = 0;
-        B* _bauPtr = 0;
+            B* _bauPtr = 0;
-        B& _bau;
+            B& _bau;
-        ProgLedCallback _progLedCallback = 0;
+            ProgLedCallback _progLedCallback = 0;
 #ifdef KNX_ACTIVITYCALLBACK
-        ActivityCallback _activityCallback = 0;
+            ActivityCallback _activityCallback = 0;
 #endif
-        uint32_t _ledPinActiveOn = KNX_LED_ACTIVE_ON;
+            uint32_t _ledPinActiveOn = KNX_LED_ACTIVE_ON;
-        int32_t _ledPin = KNX_LED;
+            int32_t _ledPin = KNX_LED;
-        int32_t _buttonPin = KNX_BUTTON;
+            int32_t _buttonPin = KNX_BUTTON;
-        SaveCallback _saveCallback = 0;
+            SaveCallback _saveCallback = 0;
-        RestoreCallback _restoreCallback = 0;
+            RestoreCallback _restoreCallback = 0;
-        volatile bool _toggleProgMode = false;
+            volatile bool _toggleProgMode = false;
-        bool _progLedState = false;
+            bool _progLedState = false;
-        uint16_t _saveSize = USERDATA_SAVE_SIZE;
+            uint16_t _saveSize = USERDATA_SAVE_SIZE;
-        IsrFunctionPtr _progButtonISRFuncPtr = 0;
+            IsrFunctionPtr _progButtonISRFuncPtr = 0;
 
-        uint8_t* save(uint8_t* buffer)
+            uint8_t* save(uint8_t* buffer)
-        {
+            {
-            if (_saveCallback != 0)
+                if (_saveCallback != 0)
-                return _saveCallback(buffer);
+                    return _saveCallback(buffer);
 
-            return buffer;
+                return buffer;
-        }
+            }
 
-        const uint8_t* restore(const uint8_t* buffer)
+            const uint8_t* restore(const uint8_t* buffer)
-        {
+            {
-            if (_restoreCallback != 0)
+                if (_restoreCallback != 0)
-                return _restoreCallback(buffer);
+                    return _restoreCallback(buffer);
 
-            return buffer;
+                return buffer;
-        }
+            }
 
-        uint16_t saveSize()
+            uint16_t saveSize()
-        {
+            {
-            return _saveSize;
+                return _saveSize;
-        }
+            }
 
-        void saveSize(uint16_t size)
+            void saveSize(uint16_t size)
-        {
+            {
-            _saveSize = size;
+                _saveSize = size;
-        }
+            }
 
-        void progLedOn()
+            void progLedOn()
-        {
+            {
-            if (_progLedCallback == 0)
+                if (_progLedCallback == 0)
-                digitalWrite(ledPin(), _ledPinActiveOn);
+                    digitalWrite(ledPin(), _ledPinActiveOn);
-            else
+                else
-                _progLedCallback(true);
+                    _progLedCallback(true);
-        }
+            }
 
-        void progLedOff()
+            void progLedOff()
-        {
+            {
-            if (_progLedCallback == 0)
+                if (_progLedCallback == 0)
-                digitalWrite(ledPin(), HIGH - _ledPinActiveOn);
+                    digitalWrite(ledPin(), HIGH - _ledPinActiveOn);
-            else
+                else
-                _progLedCallback(false);
+                    _progLedCallback(false);
-        }
+            }
-};
+    };
 }
 #ifndef KNX_NO_AUTOMATIC_GLOBAL_INSTANCE
     #ifdef ARDUINO_ARCH_SAMD
         // predefined global instance for TP or RF or TP/RF coupler
         #if MASK_VERSION == 0x07B0
-            extern KnxFacade<SamdPlatform, Bau07B0> knx;
+            extern Knx::KnxFacade<Knx::SamdPlatform, Knx::Bau07B0> knx;
         #elif MASK_VERSION == 0x27B0
-            extern KnxFacade<SamdPlatform, Bau27B0> knx;
+            extern Knx::KnxFacade<Knx::SamdPlatform, Knx::Bau27B0> knx;
         #elif MASK_VERSION == 0x2920
-            extern KnxFacade<SamdPlatform, Bau2920> knx;
+            extern Knx::KnxFacade<Knx::SamdPlatform, Knx::Bau2920> knx;
         #else
             #error "Mask version not supported on ARDUINO_ARCH_SAMD"
         #endif
     #elif defined(ARDUINO_ARCH_RP2040)
         // predefined global instance for TP or RF or TP/RF or TP/IP coupler
         #if MASK_VERSION == 0x07B0
-            extern KnxFacade<RP2040ArduinoPlatform, Bau07B0> knx;
+            extern Knx::KnxFacade<Knx::RP2040ArduinoPlatform, Knx::Bau07B0> knx;
         #elif MASK_VERSION == 0x27B0
-            extern KnxFacade<RP2040ArduinoPlatform, Bau27B0> knx;
+            extern Knx::KnxFacade<Knx::RP2040ArduinoPlatform, Knx::Bau27B0> knx;
         #elif MASK_VERSION == 0x57B0
-            extern KnxFacade<RP2040ArduinoPlatform, Bau57B0> knx;
+            extern Knx::KnxFacade<Knx::RP2040ArduinoPlatform, Knx::Bau57B0> knx;
         #elif MASK_VERSION == 0x2920
-            extern KnxFacade<RP2040ArduinoPlatform, Bau2920> knx;
+            extern Knx::KnxFacade<Knx::RP2040ArduinoPlatform, Knx::Bau2920> knx;
         #elif MASK_VERSION == 0x091A
-            extern KnxFacade<RP2040ArduinoPlatform, Bau091A> knx;
+            extern Knx::KnxFacade<Knx::RP2040ArduinoPlatform, Knx::Bau091A> knx;
         #else
             #error "Mask version not supported on ARDUINO_ARCH_RP2040"
         #endif
     #elif defined(ARDUINO_ARCH_ESP8266)
         // predefined global instance for TP or IP or TP/IP coupler
         #if MASK_VERSION == 0x07B0
-            extern KnxFacade<EspPlatform, Bau07B0> knx;
+            extern Knx::KnxFacade<Knx::EspPlatform, Knx::Bau07B0> knx;
         #elif MASK_VERSION == 0x57B0
-            extern KnxFacade<EspPlatform, Bau57B0> knx;
+            extern Knx::KnxFacade<Knx::EspPlatform, Knx::Bau57B0> knx;
         #elif MASK_VERSION == 0x091A
-            extern KnxFacade<EspPlatform, Bau091A> knx;
+            extern Knx::KnxFacade<Knx::EspPlatform, Knx::Bau091A> knx;
         #else
             #error "Mask version not supported on ARDUINO_ARCH_ESP8266"
         #endif
     #elif defined(ARDUINO_ARCH_ESP32)
         // predefined global instance for TP or IP or TP/IP coupler
         #if MASK_VERSION == 0x07B0
-            extern KnxFacade<Esp32Platform, Bau07B0> knx;
+            extern Knx::KnxFacade<Knx::Esp32Platform, Knx::Bau07B0> knx;
         #elif MASK_VERSION == 0x57B0
-            extern KnxFacade<Esp32Platform, Bau57B0> knx;
+            extern Knx::KnxFacade<Knx::Esp32Platform, Knx::Bau57B0> knx;
         #elif MASK_VERSION == 0x091A
-            extern KnxFacade<Esp32Platform, Bau091A> knx;
+            extern Knx::KnxFacade<Knx::Esp32Platform, Knx::Bau091A> knx;
         #else
             #error "Mask version not supported on ARDUINO_ARCH_ESP32"
         #endif
     #elif defined(ARDUINO_ARCH_STM32)
         // predefined global instance for TP only
         #if MASK_VERSION == 0x07B0
-            extern KnxFacade<Stm32Platform, Bau07B0> knx;
+            extern Knx::KnxFacade<Knx::Stm32Platform, Knx::Bau07B0> knx;
         #else
             #error "Mask version not supported on ARDUINO_ARCH_STM32"
         #endif

src/knx/platform/rp2040_arduino_platform.cpp

@@ -35,6 +35,13 @@ For usage of KNX-IP you have to define either
 #include <hardware/watchdog.h> // from Pico SDK
 #include <pico/unique_id.h>    // from Pico SDK
 
+#ifdef KNX_IP_LAN
+    extern Wiznet5500lwIP KNX_NETIF;
+#elif defined(KNX_IP_WIFI)
+#elif defined(KNX_IP_GENERIC)
+
+#endif
+
 namespace Knx
 {
 #ifdef USE_KNX_DMA_UART
@@ -104,13 +111,6 @@ namespace Knx
     #if KNX_FLASH_OFFSET % 4096
         #error "KNX_FLASH_OFFSET must be multiple of 4096"
     #endif
-#endif
-
-#ifdef KNX_IP_LAN
-    extern Wiznet5500lwIP KNX_NETIF;
-#elif defined(KNX_IP_WIFI)
-#elif defined(KNX_IP_GENERIC)
-
 #endif
 
     RP2040ArduinoPlatform::RP2040ArduinoPlatform()

src/knx/platform/samd_platform.cpp

@@ -16,6 +16,10 @@
     #define KNX_SERIAL Serial1
 #endif
 
+extern uint32_t __etext;
+extern uint32_t __data_start__;
+extern uint32_t __data_end__;
+
 namespace Knx
 {
     SamdPlatform::SamdPlatform()
@@ -78,10 +82,6 @@ namespace Knx
     }
 #else
 
-    extern uint32_t __etext;
-    extern uint32_t __data_start__;
-    extern uint32_t __data_end__;
-
     static const uint32_t pageSizes[] = {8, 16, 32, 64, 128, 256, 512, 1024};
 
     void SamdPlatform::init()