Merge remote-tracking branch 'upstream/mdev' into mdev

This commit is contained in:
Brandon502
2024-06-16 21:39:31 -04:00
3 changed files with 6 additions and 5 deletions

View File

@@ -253,7 +253,7 @@
#define TYPE_NET_ARTNET_RGB 82 //network ArtNet RGB bus (master broadcast bus, unused)
#define TYPE_NET_DDP_RGBW 88 //network DDP RGBW bus (master broadcast bus)
#define IS_DIGITAL(t) ((t) & 0x10) //digital are 16-31 and 48-63
#define IS_DIGITAL(t) (((t) & 0x10) || ((t)==TYPE_HUB75MATRIX)) //digital are 16-31 and 48-63 // WLEDMM added HUB75
#define IS_PWM(t) ((t) > 40 && (t) < 46)
#define NUM_PWM_PINS(t) ((t) - 40) //for analog PWM 41-45 only
#define IS_2PIN(t) ((t) > 47)

View File

@@ -269,9 +269,9 @@ void appendGPIOinfo() {
// add info about max. # of pins
oappend(SET_F("d.max_gpio="));
#if defined(ESP32)
#if defined(ESP32) && !defined(CONFIG_IDF_TARGET_ESP32S3)
oappendi(NUM_DIGITAL_PINS - 1);
#else //8266
#else //8266 (max=17), or esp32-S3 (max=48)
oappendi(NUM_DIGITAL_PINS); //WLEDMM include pin 17 for Analog
#endif
oappend(SET_F(";"));