[SYS] Bump ESP32 platform to v6.1.0 and ESP8266 to v4.1.0 (#1547)
* Bump ESP32 platform to v6.1.0 and ESP8266 to v4.1.0 * Fix ESP32 not connecting to Ethernet And remove check updates as it is now done every hour * Do not define LED pins if not explicitly stated * OLED need to be reset for Heltec Lora 32 V2 * Fix issue with SSD1306 saving
This commit is contained in:
1 parent
537d4849e5
commit
86744b283b
6 files changed
+75
-55
No files matched your search
+53
-29
@@ -417,13 +417,13 @@ int lowpowermode = DEFAULT_LOW_POWER_MODE;
|
||||
/*-------------DEFINE PINs FOR STATUS LEDs----------------*/
|
||||
# ifndef LED_SEND_RECEIVE
|
||||
# ifdef ESP8266
|
||||
# define LED_SEND_RECEIVE 40
|
||||
//# define LED_SEND_RECEIVE 40
|
||||
# elif ESP32
|
||||
# define LED_SEND_RECEIVE 40
|
||||
//# define LED_SEND_RECEIVE 40
|
||||
# elif __AVR_ATmega2560__ //arduino mega
|
||||
# define LED_SEND_RECEIVE 40
|
||||
//# define LED_SEND_RECEIVE 40
|
||||
# else //arduino uno/nano
|
||||
# define LED_SEND_RECEIVE 40
|
||||
//# define LED_SEND_RECEIVE 40
|
||||
# endif
|
||||
# endif
|
||||
# ifndef LED_SEND_RECEIVE_ON
|
||||
@@ -431,13 +431,13 @@ int lowpowermode = DEFAULT_LOW_POWER_MODE;
|
||||
# endif
|
||||
# ifndef LED_ERROR
|
||||
# ifdef ESP8266
|
||||
# define LED_ERROR 42
|
||||
//# define LED_ERROR 42
|
||||
# elif ESP32
|
||||
# define LED_ERROR 42
|
||||
//# define LED_ERROR 42
|
||||
# elif __AVR_ATmega2560__ //arduino mega
|
||||
# define LED_ERROR 42
|
||||
//# define LED_ERROR 42
|
||||
# else //arduino uno/nano
|
||||
# define LED_ERROR 42
|
||||
//# define LED_ERROR 42
|
||||
# endif
|
||||
# endif
|
||||
# ifndef LED_ERROR_ON
|
||||
@@ -445,36 +445,57 @@ int lowpowermode = DEFAULT_LOW_POWER_MODE;
|
||||
# endif
|
||||
# ifndef LED_INFO
|
||||
# ifdef ESP8266
|
||||
# define LED_INFO 44
|
||||
//# define LED_INFO 44
|
||||
# elif ESP32
|
||||
# define LED_INFO 44
|
||||
//# define LED_INFO 44
|
||||
# elif __AVR_ATmega2560__ //arduino mega
|
||||
# define LED_INFO 44
|
||||
//# define LED_INFO 44
|
||||
# else //arduino uno/nano
|
||||
# define LED_INFO 44
|
||||
//# define LED_INFO 44
|
||||
# endif
|
||||
# endif
|
||||
# ifndef LED_INFO_ON
|
||||
# define LED_INFO_ON HIGH
|
||||
# endif
|
||||
# define SetupIndicators() \
|
||||
pinMode(LED_SEND_RECEIVE, OUTPUT); \
|
||||
pinMode(LED_INFO, OUTPUT); \
|
||||
pinMode(LED_ERROR, OUTPUT); \
|
||||
SendReceiveIndicatorOFF(); \
|
||||
InfoIndicatorOFF(); \
|
||||
ErrorIndicatorOFF();
|
||||
|
||||
# define ErrorIndicatorON() digitalWrite(LED_ERROR, LED_ERROR_ON)
|
||||
# define ErrorIndicatorOFF() digitalWrite(LED_ERROR, !LED_ERROR_ON)
|
||||
# define SendReceiveIndicatorON() digitalWrite(LED_SEND_RECEIVE, LED_SEND_RECEIVE_ON)
|
||||
# define SendReceiveIndicatorOFF() digitalWrite(LED_SEND_RECEIVE, !LED_SEND_RECEIVE_ON)
|
||||
# define InfoIndicatorON() digitalWrite(LED_INFO, LED_INFO_ON)
|
||||
# define InfoIndicatorOFF() digitalWrite(LED_INFO, !LED_INFO_ON)
|
||||
# define CriticalIndicatorON() // Not used
|
||||
# define CriticalIndicatorON() // Not used
|
||||
# define PowerIndicatorON() // Not used
|
||||
# define PowerIndicatorOFF() // Not used
|
||||
# ifdef LED_ERROR
|
||||
# define SetupIndicatorError() \
|
||||
pinMode(LED_ERROR, OUTPUT); \
|
||||
ErrorIndicatorOFF();
|
||||
# define ErrorIndicatorON() digitalWrite(LED_ERROR, LED_ERROR_ON)
|
||||
# define ErrorIndicatorOFF() digitalWrite(LED_ERROR, !LED_ERROR_ON)
|
||||
# else
|
||||
# define SetupIndicatorError()
|
||||
# define ErrorIndicatorON()
|
||||
# define ErrorIndicatorOFF()
|
||||
# endif
|
||||
# ifdef LED_SEND_RECEIVE
|
||||
# define SetupIndicatorSendReceive() \
|
||||
pinMode(LED_SEND_RECEIVE, OUTPUT); \
|
||||
SendReceiveIndicatorOFF();
|
||||
# define SendReceiveIndicatorON() digitalWrite(LED_SEND_RECEIVE, LED_SEND_RECEIVE_ON)
|
||||
# define SendReceiveIndicatorOFF() digitalWrite(LED_SEND_RECEIVE, !LED_SEND_RECEIVE_ON)
|
||||
# else
|
||||
# define SetupIndicatorSendReceive()
|
||||
# define SendReceiveIndicatorON()
|
||||
# define SendReceiveIndicatorOFF()
|
||||
# endif
|
||||
# ifdef LED_INFO
|
||||
# define SetupIndicatorInfo() \
|
||||
pinMode(LED_INFO, OUTPUT); \
|
||||
InfoIndicatorOFF();
|
||||
# define InfoIndicatorON() digitalWrite(LED_INFO, LED_INFO_ON)
|
||||
# define InfoIndicatorOFF() digitalWrite(LED_INFO, !LED_INFO_ON)
|
||||
# else
|
||||
# define SetupIndicatorInfo()
|
||||
# define InfoIndicatorON()
|
||||
# define InfoIndicatorOFF()
|
||||
# endif
|
||||
# define CriticalIndicatorON() // Not used
|
||||
# define CriticalIndicatorON() // Not used
|
||||
# define PowerIndicatorON() // Not used
|
||||
# define PowerIndicatorOFF() // Not used
|
||||
# define SetupIndicators() // Not used
|
||||
#else // Management of Errors, reception/emission and informations indicators with RGB LED
|
||||
# if !defined(CONFIG_IDF_TARGET_ESP32S3) && !defined(CONFIG_IDF_TARGET_ESP32C3) //I2S not available yet with Fastled on S3 and C3
|
||||
# define FASTLED_ESP32_I2S // To avoid ESP32 instabilities https://github.com/FastLED/FastLED/issues/1438
|
||||
@@ -549,6 +570,9 @@ CRGB leds2[FASTLED_IND_NUM_LEDS];
|
||||
leds2[FASTLED_INFO_LED] = CRGB::Black; \
|
||||
FastLED.show()
|
||||
# endif
|
||||
# define SetupIndicatorInfo()
|
||||
# define SetupIndicatorSendReceive()
|
||||
# define SetupIndicatorError()
|
||||
#endif
|
||||
|
||||
#ifdef ESP8266
|
||||
|
||||
Reference in new issue
Block a user