From 38ee9066c864f14bd749c12f39481e7148bf59f9 Mon Sep 17 00:00:00 2001
From: Phil1pp <15369870+Phil1pp@users.noreply.github.com>
Date: Wed, 7 May 2025 14:09:57 +0200
Subject: [PATCH] Don't assign built-in LED as ProgLED by default. Allow
 disabling ProgLED by setting _ledPin=-1

---
 src/knx_facade.h | 67 +++++++++++++++++++++++-------------------------
 1 file changed, 32 insertions(+), 35 deletions(-)

diff --git a/src/knx_facade.h b/src/knx_facade.h
index ca2f7be..55c27ae 100644
--- a/src/knx_facade.h
+++ b/src/knx_facade.h
@@ -28,9 +28,6 @@
         void buttonUp();
     #endif
 #elif defined(ARDUINO_ARCH_ESP32)
-    #if !defined(LED_BUILTIN)
-        #define LED_BUILTIN 13
-    #endif
     #include "esp32_platform.h"
     #ifndef KNX_NO_AUTOMATIC_GLOBAL_INSTANCE
         void buttonUp();
@@ -41,14 +38,8 @@
         void buttonUp();
     #endif
 #elif __linux__
-    #if !defined(LED_BUILTIN)
-        #define LED_BUILTIN 0
-    #endif
     #include "linux_platform.h"
 #else
-    #if !defined(LED_BUILTIN)
-        #define LED_BUILTIN 5 // see GPIO_PinConfig gpioPinConfigs[]
-    #endif
     #include "cc1310_platform.h"
     #ifndef KNX_NO_AUTOMATIC_GLOBAL_INSTANCE
         extern void buttonUp();
@@ -56,7 +47,7 @@
 #endif
 
 #ifndef KNX_LED
-    #define KNX_LED LED_BUILTIN
+    #define KNX_LED -1
 #endif
 #ifndef KNX_LED_ACTIVE_ON
     #define KNX_LED_ACTIVE_ON 0
@@ -170,12 +161,12 @@ template <class P, class B> class KnxFacade : private SaveRestore
             _ledPinActiveOn = value;
         }
 
-        uint32_t ledPin()
+        int32_t ledPin()
         {
             return _ledPin;
         }
 
-        void ledPin(uint32_t value)
+        void ledPin(int32_t value)
         {
             _ledPin = value;
         }
@@ -267,26 +258,30 @@ template <class P, class B> class KnxFacade : private SaveRestore
             _bau.deviceObject().version(value);
         }
 
-        void start()
-        {
-            if (_progLedOffCallback == 0 || _progLedOnCallback == 0)
-                pinMode(ledPin(), OUTPUT);
+	    void start()
+	    {
+	        if (_ledPin >= 0)
+	            pinMode(_ledPin, OUTPUT);
 
-            progLedOff();
-
-            if (_progButtonISRFuncPtr && _buttonPin >= 0)
+	        progLedOff();
+            
+            if(_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);
-#else
-                attachInterrupt(_buttonPin, _progButtonISRFuncPtr, CHANGE);
-#endif
+                pinMode(_buttonPin, INPUT_PULLUP);
+
+                if (_progButtonISRFuncPtr)
+                {
+                    // Workaround for https://github.com/arduino/ArduinoCore-samd/issues/587
+                    #if (ARDUINO_API_VERSION >= 10200)
+                        attachInterrupt(_buttonPin, _progButtonISRFuncPtr, (PinStatus)CHANGE);
+                    #else
+                        attachInterrupt(_buttonPin, _progButtonISRFuncPtr, CHANGE);
+                    #endif
+                }
             }
 
-            enabled(true);
-        }
+	        enabled(true);
+	    }
 
         void setButtonISRFunction(IsrFunctionPtr progButtonISRFuncPtr)
         {
@@ -423,7 +418,7 @@ template <class P, class B> class KnxFacade : private SaveRestore
         ActivityCallback _activityCallback = 0;
 #endif
         uint32_t _ledPinActiveOn = KNX_LED_ACTIVE_ON;
-        uint32_t _ledPin = KNX_LED;
+        int32_t _ledPin = KNX_LED;
         int32_t _buttonPin = KNX_BUTTON;
         SaveCallback _saveCallback = 0;
         RestoreCallback _restoreCallback = 0;
@@ -460,17 +455,19 @@ template <class P, class B> class KnxFacade : private SaveRestore
 
         void progLedOn()
         {
-            if (_progLedOnCallback == 0)
-                digitalWrite(ledPin(), _ledPinActiveOn);
-            else
+            if (_ledPin >= 0)
+                digitalWrite(_ledPin, _ledPinActiveOn);
+
+            if (_progLedOffCallback != 0)
                 _progLedOnCallback();
         }
 
         void progLedOff()
         {
-            if (_progLedOffCallback == 0)
-                digitalWrite(ledPin(), HIGH - _ledPinActiveOn);
-            else
+            if (_ledPin >= 0)
+                digitalWrite(_ledPin, HIGH - _ledPinActiveOn);
+
+            if (_progLedOffCallback != 0)
                 _progLedOffCallback();
         }
 };