diff --git a/libraries/MySensors/MyConfig.h b/libraries/MySensors/MyConfig.h index bbbabdb..c28e15f 100644 --- a/libraries/MySensors/MyConfig.h +++ b/libraries/MySensors/MyConfig.h @@ -152,35 +152,12 @@ //#define MY_WITH_LEDS_BLINKING_INVERSE - -// default LEDs blinking period in milliseconds -#ifndef MY_DEFAULT_LED_BLINK_PERIOD -#define MY_DEFAULT_LED_BLINK_PERIOD 300 -#endif -// The RX LED default pin -#ifndef MY_DEFAULT_RX_LED_PIN - #if defined(ARDUINO_ARCH_ESP8266) - #define MY_DEFAULT_RX_LED_PIN 8 - #else - #define MY_DEFAULT_RX_LED_PIN 6 - #endif -#endif -// The TX LED default pin -#ifndef MY_DEFAULT_TX_LED_PIN - #if defined(ARDUINO_ARCH_ESP8266) - #define MY_DEFAULT_TX_LED_PIN 9 - #else - #define MY_DEFAULT_TX_LED_PIN 5 - #endif -#endif -// The Error LED default pin -#ifndef MY_DEFAULT_ERR_LED_PIN - #if defined(ARDUINO_ARCH_ESP8266) - #define MY_DEFAULT_ERR_LED_PIN 7 - #else - #define MY_DEFAULT_ERR_LED_PIN 4 - #endif -#endif +// The following defines can be used to set the port pin, that the LED is connected to +// If one of the following is defined here, or in the sketch, MY_LEDS_BLINKING_FEATURE will be +// enabled by default. (Replace x with the pin number you have the LED on) +//#define MY_DEFAULT_ERR_LED x +//#define MY_DEFAULT_TX_LED x +//#define MY_DEFAULT_RX_LED x /********************************************** * Gateway inclusion button/mode configuration diff --git a/libraries/MySensors/MySensor.h b/libraries/MySensors/MySensor.h index 2833f5a..ebb881b 100644 --- a/libraries/MySensors/MySensor.h +++ b/libraries/MySensors/MySensor.h @@ -58,6 +58,7 @@ #include "core/MyHwSAMD.cpp" #endif +// LEDS #if !defined(MY_DEFAULT_ERR_LED_PIN) & defined(MY_HW_ERR_LED_PIN) #define MY_DEFAULT_ERR_LED_PIN MY_HW_ERR_LED_PIN #endif @@ -67,7 +68,7 @@ #endif #if !defined(MY_DEFAULT_RX_LED_PIN) && defined(MY_HW_TX_LED_PIN) - #define MY_DEFAULT_TX_LED_PIN MY_HW_TX_LED_PIN + #define MY_DEFAULT_RX_LED_PIN MY_HW_TX_LED_PIN #endif // Not necessary to include blinking feature if no LED's are defined! @@ -80,13 +81,42 @@ #define MY_LEDS_BLINKING_FEATURE #endif -// LEDS #if defined(MY_LEDS_BLINKING_FEATURE) #include "core/MyLeds.cpp" #else #include "core/MyLeds.h" #endif +// default LEDs blinking period in milliseconds +#ifndef MY_DEFAULT_LED_BLINK_PERIOD +#define MY_DEFAULT_LED_BLINK_PERIOD 300 +#endif +// The RX LED default pin +#ifndef MY_DEFAULT_RX_LED_PIN + #if defined(ARDUINO_ARCH_ESP8266) + #define MY_DEFAULT_RX_LED_PIN 8 + #else + #define MY_DEFAULT_RX_LED_PIN 6 + #endif +#endif +// The TX LED default pin +#ifndef MY_DEFAULT_TX_LED_PIN + #if defined(ARDUINO_ARCH_ESP8266) + #define MY_DEFAULT_TX_LED_PIN 9 + #else + #define MY_DEFAULT_TX_LED_PIN 5 + #endif +#endif +// The Error LED default pin +#ifndef MY_DEFAULT_ERR_LED_PIN + #if defined(ARDUINO_ARCH_ESP8266) + #define MY_DEFAULT_ERR_LED_PIN 7 + #else + #define MY_DEFAULT_ERR_LED_PIN 4 + #endif +#endif + + // INCLUSION MODE #if defined(MY_INCLUSION_MODE_FEATURE) #include "core/MyInclusionMode.cpp"