Fixes all Board Variants issues for Arduino Core 3.0.0 #8706

SuGlider · 2023-10-05T02:10:31Z

Description of Change

This PR follows #8600 and #8562 changes for all necessary variant files / boards.txt.
It also fixes the #8560 issue in the Arduino Core 3.0.0
The PR moves common macros and defines to Arduino.h, not necessary in pins_arduino.h file anymore.
It also adds NEO_LED macros and constants in order to allow using it in a digitalWrite() for Blinking as in the example:
https://github.com/espressif/arduino-esp32/blob/master/libraries/ESP32/examples/GPIO/BlinkRGB/BlinkRGB.ino

Tests scenarios

Passed boards CI https://github.com/SuGlider/arduino-esp32/actions/runs/6413632411

Testing compilation of a sketch using the new Arduino.h and its changes:

void setup() {
  int a = NUM_DIGITAL_PINS;
  int b = NUM_ANALOG_INPUTS;
  int c = EXTERNAL_NUM_INTERRUPTS;
  int d = analogInputToDigitalPin(1);
  int e = digitalPinToInterrupt(2);
  bool f = digitalPinHasPWM(3);
}
void loop() { 
}

Tested the sketch from #8560

// Not a working sketch - Using ESP32-S3

void IRAM_ATTR Callback() {
}

void setup() {
  //This does not work:
  attachInterrupt(digitalPinToInterrupt(48), Callback, FALLING);
  //This works:
  attachInterrupt(48, Callback, FALLING);
}

Related links

Fix #8560

P-R-O-C-H-Y

@SuGlider PTAL on the Adafruit LEDs

P-R-O-C-H-Y · 2023-10-05T09:21:13Z

variants/adafruit_feather_esp32s2/pins_arduino.h

-#define digitalPinToInterrupt(p)    (((p)<48)?(p):-1)
-#define digitalPinHasPWM(p)         (p < 46)
-
-#define LED_BUILTIN     13


Same here, you removed the define for LED_BUILTIN on pin 13

P-R-O-C-H-Y · 2023-10-05T09:36:23Z

variants/adafruit_metro_esp32s3/pins_arduino.h

+// BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino
+static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT+PIN_NEOPIXEL;
+#define BUILTIN_LED  LED_BUILTIN // backward compatibility
+// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()
+#define RGB_BUILTIN LED_BUILTIN
+#define RGB_BRIGHTNESS 64
+


#define LED_BUILTIN 13 can't be removed.

Suggested change

// BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino

static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT+PIN_NEOPIXEL;

#define BUILTIN_LED LED_BUILTIN // backward compatibility

// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()

#define RGB_BUILTIN LED_BUILTIN

#define RGB_BRIGHTNESS 64

#define LED_BUILTIN 13

#define BUILTIN_LED LED_BUILTIN // backward compatibility

// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()

#define RGB_BUILTIN (PIN_NEOPIXEL + SOC_GPIO_PIN_COUNT)

#define RGB_BRIGHTNESS 64

P-R-O-C-H-Y · 2023-10-05T09:38:19Z

variants/adafruit_matrixportal_esp32s3/pins_arduino.h

+// BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino
+static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT+PIN_NEOPIXEL;
+#define BUILTIN_LED  LED_BUILTIN // backward compatibility
+// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()
+#define RGB_BUILTIN LED_BUILTIN
+#define RGB_BRIGHTNESS 64


#define LED_BUILTIN 13 can't be removed.

Suggested change

// BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino

static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT+PIN_NEOPIXEL;

#define BUILTIN_LED LED_BUILTIN // backward compatibility

// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()

#define RGB_BUILTIN LED_BUILTIN

#define RGB_BRIGHTNESS 64

#define LED_BUILTIN 13

#define BUILTIN_LED LED_BUILTIN // backward compatibility

// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()

#define RGB_BUILTIN (PIN_NEOPIXEL + SOC_GPIO_PIN_COUNT)

#define RGB_BRIGHTNESS 64

P-R-O-C-H-Y · 2023-10-05T09:38:59Z

variants/adafruit_magtag29_esp32s2/pins_arduino.h

+// BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino
+static const uint8_t LED_BUILTIN = (PIN_NEOPIXEL + SOC_GPIO_PIN_COUNT); // Only 1 NeoPixel will be affected
+#define BUILTIN_LED  LED_BUILTIN // backward compatibility
+// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()
+#define RGB_BUILTIN LED_BUILTIN
+#define RGB_BRIGHTNESS 64


#define LED_BUILTIN 13 can't be removed.

Suggested change

// BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino

static const uint8_t LED_BUILTIN = (PIN_NEOPIXEL + SOC_GPIO_PIN_COUNT); // Only 1 NeoPixel will be affected

#define BUILTIN_LED LED_BUILTIN // backward compatibility

// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()

#define RGB_BUILTIN LED_BUILTIN

#define RGB_BRIGHTNESS 64

#define LED_BUILTIN 13

#define BUILTIN_LED LED_BUILTIN // backward compatibility

// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()

#define RGB_BUILTIN (PIN_NEOPIXEL + SOC_GPIO_PIN_COUNT)

#define RGB_BRIGHTNESS 64

P-R-O-C-H-Y · 2023-10-05T09:40:21Z

variants/adafruit_itsybitsy_esp32/pins_arduino.h

+// BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino
+static const uint8_t LED_BUILTIN = (PIN_NEOPIXEL + SOC_GPIO_PIN_COUNT);
+#define BUILTIN_LED  LED_BUILTIN // backward compatibility
+// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()
+#define RGB_BUILTIN LED_BUILTIN
+#define RGB_BRIGHTNESS 64


LED_BUILTIN 13 can't be removed.

Suggested change

// BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino

static const uint8_t LED_BUILTIN = (PIN_NEOPIXEL + SOC_GPIO_PIN_COUNT);

#define BUILTIN_LED LED_BUILTIN // backward compatibility

// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()

#define RGB_BUILTIN LED_BUILTIN

#define RGB_BRIGHTNESS 64

#define LED_BUILTIN 13

#define BUILTIN_LED LED_BUILTIN // backward compatibility

// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()

#define RGB_BUILTIN (PIN_NEOPIXEL + SOC_GPIO_PIN_COUNT)

#define RGB_BRIGHTNESS 64

P-R-O-C-H-Y · 2023-10-05T09:42:06Z

variants/adafruit_feather_esp32s2_tft/pins_arduino.h

+#define PIN_NEOPIXEL 33
+// BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino
+static const uint8_t LED_BUILTIN = (PIN_NEOPIXEL + SOC_GPIO_PIN_COUNT);
+#define BUILTIN_LED  LED_BUILTIN // backward compatibility
+// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()
+#define RGB_BUILTIN LED_BUILTIN
+#define RGB_BRIGHTNESS 64


LED_BUILTIN 13 can't be removed.

Suggested change

#define PIN_NEOPIXEL 33

// BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino

static const uint8_t LED_BUILTIN = (PIN_NEOPIXEL + SOC_GPIO_PIN_COUNT);

#define BUILTIN_LED LED_BUILTIN // backward compatibility

// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()

#define RGB_BUILTIN LED_BUILTIN

#define RGB_BRIGHTNESS 64

#define LED_BUILTIN 13

#define BUILTIN_LED LED_BUILTIN // backward compatibility

// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()

#define RGB_BUILTIN (PIN_NEOPIXEL + SOC_GPIO_PIN_COUNT)

#define RGB_BRIGHTNESS 64

P-R-O-C-H-Y · 2023-10-05T09:42:37Z

variants/adafruit_feather_esp32s2_reversetft/pins_arduino.h

+#define PIN_NEOPIXEL 33
+// BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino
+static const uint8_t LED_BUILTIN = (PIN_NEOPIXEL + SOC_GPIO_PIN_COUNT);
+#define BUILTIN_LED  LED_BUILTIN // backward compatibility
+// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()
+#define RGB_BUILTIN LED_BUILTIN
+#define RGB_BRIGHTNESS 64


LED_BUILTIN 13 can't be removed.

Suggested change

#define PIN_NEOPIXEL 33

// BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino

static const uint8_t LED_BUILTIN = (PIN_NEOPIXEL + SOC_GPIO_PIN_COUNT);

#define BUILTIN_LED LED_BUILTIN // backward compatibility

// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()

#define RGB_BUILTIN LED_BUILTIN

#define RGB_BRIGHTNESS 64

#define LED_BUILTIN 13

#define BUILTIN_LED LED_BUILTIN // backward compatibility

// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()

#define RGB_BUILTIN (PIN_NEOPIXEL + SOC_GPIO_PIN_COUNT)

#define RGB_BRIGHTNESS 64

P-R-O-C-H-Y · 2023-10-05T09:43:35Z

variants/adafruit_feather_esp32s2/pins_arduino.h

+// BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino
+static const uint8_t LED_BUILTIN = (PIN_NEOPIXEL + SOC_GPIO_PIN_COUNT);
+#define BUILTIN_LED  LED_BUILTIN // backward compatibility
+// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()
+#define RGB_BUILTIN LED_BUILTIN
+#define RGB_BRIGHTNESS 64


LED_BUILTIN 13 can't be removed.

Suggested change

// BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino

static const uint8_t LED_BUILTIN = (PIN_NEOPIXEL + SOC_GPIO_PIN_COUNT);

#define BUILTIN_LED LED_BUILTIN // backward compatibility

// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()

#define RGB_BUILTIN LED_BUILTIN

#define RGB_BRIGHTNESS 64

#define LED_BUILTIN 13

#define BUILTIN_LED LED_BUILTIN // backward compatibility

// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()

#define RGB_BUILTIN (PIN_NEOPIXEL + SOC_GPIO_PIN_COUNT)

#define RGB_BRIGHTNESS 64

P-R-O-C-H-Y · 2023-10-05T09:44:07Z

variants/adafruit_feather_esp32_v2/pins_arduino.h

+// BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino
+static const uint8_t LED_BUILTIN = (PIN_NEOPIXEL + SOC_GPIO_PIN_COUNT);
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
+// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()
+#define RGB_BUILTIN LED_BUILTIN
+#define RGB_BRIGHTNESS 64


LED_BUILTIN 13 can't be removed.

Suggested change

// BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino

static const uint8_t LED_BUILTIN = (PIN_NEOPIXEL + SOC_GPIO_PIN_COUNT);

#define BUILTIN_LED LED_BUILTIN // backward compatibility

#define LED_BUILTIN LED_BUILTIN

// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()

#define RGB_BUILTIN LED_BUILTIN

#define RGB_BRIGHTNESS 64

#define LED_BUILTIN 13

#define BUILTIN_LED LED_BUILTIN // backward compatibility

// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()

#define RGB_BUILTIN (PIN_NEOPIXEL + SOC_GPIO_PIN_COUNT)

#define RGB_BRIGHTNESS 64

P-R-O-C-H-Y · 2023-10-05T09:49:06Z

variants/department_of_alchemy_minimain_esp32s2/pins_arduino.h

+// BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino
+static const uint8_t LED_BUILTIN = (PIN_NEOPIXEL + SOC_GPIO_PIN_COUNT);
+#define BUILTIN_LED  LED_BUILTIN // backward compatibility
+// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()
+#define RGB_BUILTIN LED_BUILTIN
+#define RGB_BRIGHTNESS 64


LED_BUILTIN 13 can't be removed.

Suggested change

// BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino

static const uint8_t LED_BUILTIN = (PIN_NEOPIXEL + SOC_GPIO_PIN_COUNT);

#define BUILTIN_LED LED_BUILTIN // backward compatibility

// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()

#define RGB_BUILTIN LED_BUILTIN

#define RGB_BRIGHTNESS 64

#define LED_BUILTIN 13

#define BUILTIN_LED LED_BUILTIN // backward compatibility

// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()

#define RGB_BUILTIN (PIN_NEOPIXEL + SOC_GPIO_PIN_COUNT)

#define RGB_BRIGHTNESS 64

lucasssvaz

LGTM. Just needs to solve the conflicts when merging.

SuGlider · 2023-10-05T19:39:12Z

Force rebase to master in #8726

SuGlider added 2 commits October 4, 2023 21:08

boards fix + S3 GIO48 issue

aab449a

Git Action Fixes

8b4b546

SuGlider added this to the 3.0.0 milestone Oct 5, 2023

SuGlider requested review from me-no-dev, lucasssvaz and P-R-O-C-H-Y October 5, 2023 02:10

SuGlider self-assigned this Oct 5, 2023

P-R-O-C-H-Y requested changes Oct 5, 2023

View reviewed changes

me-no-dev changed the base branch from esp-idf-v5.1-libs to master October 5, 2023 11:59

me-no-dev changed the base branch from master to esp-idf-v5.1-libs October 5, 2023 11:59

P-R-O-C-H-Y mentioned this pull request Oct 5, 2023

added namino bianco board + other fix #8710

Closed

adds LED_BUILTIN back

e4b6eba

lucasssvaz approved these changes Oct 5, 2023

View reviewed changes

SuGlider closed this Oct 5, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fixes all Board Variants issues for Arduino Core 3.0.0 #8706

Fixes all Board Variants issues for Arduino Core 3.0.0 #8706

SuGlider commented Oct 5, 2023 •

edited

Loading

P-R-O-C-H-Y left a comment

P-R-O-C-H-Y Oct 5, 2023

P-R-O-C-H-Y Oct 5, 2023

P-R-O-C-H-Y Oct 5, 2023

P-R-O-C-H-Y Oct 5, 2023

P-R-O-C-H-Y Oct 5, 2023

P-R-O-C-H-Y Oct 5, 2023

P-R-O-C-H-Y Oct 5, 2023

P-R-O-C-H-Y Oct 5, 2023

P-R-O-C-H-Y Oct 5, 2023

P-R-O-C-H-Y Oct 5, 2023

lucasssvaz left a comment

SuGlider commented Oct 5, 2023

Fixes all Board Variants issues for Arduino Core 3.0.0 #8706

Fixes all Board Variants issues for Arduino Core 3.0.0 #8706

Conversation

SuGlider commented Oct 5, 2023 • edited Loading

Description of Change

Tests scenarios

Related links

P-R-O-C-H-Y left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

lucasssvaz left a comment

Choose a reason for hiding this comment

SuGlider commented Oct 5, 2023

SuGlider commented Oct 5, 2023 •

edited

Loading