Moved constants to pins_arduino.h

Author: PilnyTomas

Diff for: cores/esp32/esp32-hal-gpio.c

@@ -15,6 +15,7 @@
 #include "esp32-hal-gpio.h"
 #include "hal/gpio_hal.h"
 #include "soc/soc_caps.h"
+#include "pins_arduino.h"
 
 // It fixes lack of pin definition for S3 and for any future SoC
 // this function works for ESP32, ESP32-S2 and ESP32-S3 - including the C3, it will return -1 for any pin
@@ -91,6 +92,17 @@ static InterruptHandle_t __pinInterruptHandlers[SOC_GPIO_PIN_COUNT] = {0,};
 
 extern void ARDUINO_ISR_ATTR __pinMode(uint8_t pin, uint8_t mode)
 {
+    log_d("pin %d", pin);
+#ifdef BOARD_HAS_NEOPIXEL
+    log_d("BOARD_HAS_NEOPIXEL");
+    if (pin == LED_BUILTIN){
+        log_d("pin == LED_BUILTIN; call __pinMode(%d)", NEOPIXEL_PIN);
+        __pinMode(NEOPIXEL_PIN, mode);
+        return;
+    }
+#endif
+
+    log_d("Normal operation");
     if (!GPIO_IS_VALID_GPIO(pin)) {
         log_e("Invalid pin selected");
         return;
@@ -126,18 +138,25 @@ extern void ARDUINO_ISR_ATTR __pinMode(uint8_t pin, uint8_t mode)
 }
 
 void RGBLedWrite(uint8_t pin, uint8_t red_val, uint8_t green_val, uint8_t blue_val){
-  static bool initialized = false;
   rmt_data_t led_data[24];
   static rmt_obj_t* rmt_send = NULL;
+  static bool initialized = false;
+
+  uint8_t _pin;
+  if(pin == LED_BUILTIN){
+    _pin = NEOPIXEL_PIN;
+  }else{
+    _pin = pin;
+  }
 
   if(!initialized){
-    if ((rmt_send = rmtInit(pin, RMT_TX_MODE, RMT_MEM_64)) == NULL){
+      if((rmt_send = rmtInit(_pin, RMT_TX_MODE, RMT_MEM_64)) == NULL){
         log_e("RGB LED driver initialization failed!");
         rmt_send = NULL;
         return;
-    }
-    rmtSetTick(rmt_send, 100);
-    initialized = true;
+      }
+      rmtSetTick(rmt_send, 100);
+      initialized = true;
   }
 
   int color[] = {green_val, red_val, blue_val};  // Color coding is in order GREEN, RED, BLUE
@@ -165,11 +184,11 @@ void RGBLedWrite(uint8_t pin, uint8_t red_val, uint8_t green_val, uint8_t blue_v
 
 extern void ARDUINO_ISR_ATTR __digitalWrite(uint8_t pin, uint8_t val)
 {
-    #ifdef BOARD_HAS_RGB_LED
+    #ifdef BOARD_HAS_NEOPIXEL
         if(pin == LED_BUILTIN){
             //use RMT to set all channels on/off
-            const uint8_t comm_val = val != 0 ? 255 : 0;
-            RGBLedWrite(pin, comm_val, comm_val, comm_val);
+            const uint8_t comm_val = val != 0 ? LED_BRIGHTNESS : 0;
+            RGBLedWrite(LED_BUILTIN, comm_val, comm_val, comm_val);
             return;
         }
     #endif

Diff for: cores/esp32/esp32-hal-gpio.h

@@ -63,22 +63,6 @@ extern "C" {
 #define ONLOW_WE  0x0C
 #define ONHIGH_WE 0x0D
 
-#if CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3 || CONFIG_IDF_TARGET_ESP32C3
-  #define BOARD_HAS_RGB_LED
-#endif
-
-#if CONFIG_IDF_TARGET_ESP32S2
-  #define LED_BUILTIN   18 // Saola-1 & DevKitM-1
-  //#define LED_BUILTIN   45 // Kaluga
-#elif CONFIG_IDF_TARGET_ESP32S3
-  // Some boards have too low voltage on this pin (board design bug)
-  // Use different pin with 3V and connect with 48
-  #define LED_BUILTIN   48
-#elif CONFIG_IDF_TARGET_ESP32C3
-  #define LED_BUILTIN   8
-#else
-  #define LED_BUILTIN   21   // ESP32 has no builtin RGB LED
-#endif
 
 #define digitalPinIsValid(pin)          GPIO_IS_VALID_GPIO(pin)
 #define digitalPinCanOutput(pin)        GPIO_IS_VALID_OUTPUT_GPIO(pin)

Diff for: variants/esp32c3/pins_arduino.h

@@ -2,11 +2,19 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define EXTERNAL_NUM_INTERRUPTS 22
 #define NUM_DIGITAL_PINS        22
 #define NUM_ANALOG_INPUTS       6
 
+static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT+1; // non-existing pin
+#define BUILTIN_LED  LED_BUILTIN // backward compatibility
+#define LED_BUILTIN LED_BUILTIN
+#define BOARD_HAS_NEOPIXEL
+#define NEOPIXEL_PIN 8 // Actual NeoPixel GPIO pin
+#define LED_BRIGHTNESS 64
+
 #define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
 #define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):-1)
 #define digitalPinHasPWM(p)         (p < EXTERNAL_NUM_INTERRUPTS)

Diff for: variants/esp32s2/pins_arduino.h

@@ -2,11 +2,20 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define EXTERNAL_NUM_INTERRUPTS 46
 #define NUM_DIGITAL_PINS        48
 #define NUM_ANALOG_INPUTS       20
 
+static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT+1; // non-existing pin
+#define BUILTIN_LED  LED_BUILTIN // backward compatibility
+#define LED_BUILTIN LED_BUILTIN
+#define BOARD_HAS_NEOPIXEL
+#define NEOPIXEL_PIN 18 // Actual NeoPixel GPIO pin for Saola-1 & DevKitM-1
+//#define NEOPIXEL_PIN 45 // Actual NeoPixel GPIO pin for Kaluga
+#define LED_BRIGHTNESS 64
+
 #define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
 #define digitalPinToInterrupt(p)    (((p)<48)?(p):-1)
 #define digitalPinHasPWM(p)         (p < 46)

Diff for: variants/esp32s3/pins_arduino.h

@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define USB_VID 0x303a
 #define USB_PID 0x1001
@@ -10,6 +11,15 @@
 #define NUM_DIGITAL_PINS        48
 #define NUM_ANALOG_INPUTS       20
 
+// Some boards have too low voltage on this pin (board design bug)
+// Use different pin with 3V and connect with 48
+static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT+1; // non-existing pin
+#define BUILTIN_LED  LED_BUILTIN // backward compatibility
+#define LED_BUILTIN LED_BUILTIN
+#define BOARD_HAS_NEOPIXEL
+#define NEOPIXEL_PIN 48 // Actual NeoPixel GPIO pin
+#define LED_BRIGHTNESS 64
+
 #define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
 #define digitalPinToInterrupt(p)    (((p)<48)?(p):-1)
 #define digitalPinHasPWM(p)         (p < 46)