Changed pin definition + added example

Author: PilnyTomas

cores/esp32/esp32-hal-gpio.c

@@ -15,7 +15,6 @@
 #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
@@ -92,17 +91,13 @@ 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);
+        __pinMode(LED_BUILTIN-SOC_GPIO_PIN_COUNT, mode);
         return;
     }
 #endif
 
-    log_d("Normal operation");
     if (!GPIO_IS_VALID_GPIO(pin)) {
         log_e("Invalid pin selected");
         return;
@@ -137,26 +132,27 @@ extern void ARDUINO_ISR_ATTR __pinMode(uint8_t pin, uint8_t mode)
     }
 }
 
+#ifdef BOARD_HAS_NEOPIXEL
 void RGBLedWrite(uint8_t pin, uint8_t red_val, uint8_t green_val, uint8_t blue_val){
   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;
+    _pin = LED_BUILTIN-SOC_GPIO_PIN_COUNT;
   }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
@@ -181,6 +177,7 @@ void RGBLedWrite(uint8_t pin, uint8_t red_val, uint8_t green_val, uint8_t blue_v
   }
   rmtWrite(rmt_send, led_data, 24);
 }
+#endif
 
 extern void ARDUINO_ISR_ATTR __digitalWrite(uint8_t pin, uint8_t val)
 {

cores/esp32/esp32-hal-gpio.h

@@ -26,6 +26,7 @@ extern "C" {
 
 #include "esp32-hal.h"
 #include "soc/soc_caps.h"
+#include "pins_arduino.h"
 
 #if (CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3)
 #define NUM_OUPUT_PINS  46
@@ -71,7 +72,9 @@ extern "C" {
 #define digitalPinToDacChannel(pin)     (((pin) == DAC_CHANNEL_1_GPIO_NUM)?0:((pin) == DAC_CHANNEL_2_GPIO_NUM)?1:-1)
 
 void pinMode(uint8_t pin, uint8_t mode);
-void RGBLedWrite(uint8_t pin, uint8_t red_val, uint8_t green_val, uint8_t blue_val);
+#ifdef BOARD_HAS_NEOPIXEL
+  void RGBLedWrite(uint8_t pin, uint8_t red_val, uint8_t green_val, uint8_t blue_val);
+#endif
 void digitalWrite(uint8_t pin, uint8_t val);
 int digitalRead(uint8_t pin);
 

libraries/ESP32/examples/GPIO/BlinkRGB/BlinkRGB.ino

@@ -0,0 +1,38 @@
+/*
+  BlinkRGB
+
+  Demonstrates usage of onboard RGB LED on some ESP dev boards.
+
+  Calling digitalWrite(LED_BUILTIN, HIGH) will use hidden RGB driver.
+    
+  RGBLedWrite demonstrates controll of each channel:
+  void RGBLedWrite(uint8_t pin, uint8_t red_val, uint8_t green_val, uint8_t blue_val)
+
+  WARNING: After using digitalWrite to drive RGB LED it will be impossible to drive the same pin 
+    with normal HIGH/LOW level
+*/
+//#define LED_BRIGHTNESS 64 // Change white brightness (max 255)
+
+// the setup function runs once when you press reset or power the board
+
+void setup() {
+  // No need to initialize the RGB LED
+}
+
+// the loop function runs over and over again forever
+void loop() { 
+  digitalWrite(LED_BUILTIN, HIGH);   // Turn the RGB LED white
+  delay(1000);                       
+  log_w("LED LOW");  
+  digitalWrite(LED_BUILTIN, LOW);    // Turn the RGB LED off
+  delay(1000);                       
+ 
+  RGBLedWrite(LED_BUILTIN,255,0,0); // Red
+  delay(1000);          
+  RGBLedWrite(LED_BUILTIN,0,255,0); // Green
+  delay(1000);          
+  RGBLedWrite(LED_BUILTIN,0,0,255); // Blue
+  delay(1000);          
+  RGBLedWrite(LED_BUILTIN,0,0,0); // Off / black
+  delay(1000);                             
+}

variants/esp32c3/pins_arduino.h

@@ -8,11 +8,10 @@
 #define NUM_DIGITAL_PINS        22
 #define NUM_ANALOG_INPUTS       6
 
-static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT+1; // non-existing pin
+static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT+8;
 #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)

variants/esp32s2/pins_arduino.h

@@ -8,12 +8,11 @@
 #define NUM_DIGITAL_PINS        48
 #define NUM_ANALOG_INPUTS       20
 
-static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT+1; // non-existing pin
+static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT+18; // GPIO pin for Saola-1 & DevKitM-1 = 18
+//static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT+45; // GPIO pin for Kaluga = 45
 #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)

variants/esp32s3/pins_arduino.h

@@ -13,11 +13,10 @@
 
 // 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
+static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT+48;
 #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)