Moved RGBLedWrite to new file esp32-hal-rgb-led and created pinMode in variatn.cpp

Author: PilnyTomas

CMakeLists.txt

@@ -36,6 +36,7 @@ set(CORE_SRCS
   cores/esp32/esp32-hal-matrix.c
   cores/esp32/esp32-hal-misc.c
   cores/esp32/esp32-hal-psram.c
+  cores/esp32/esp32-hal-rgb-led.c
   cores/esp32/esp32-hal-sigmadelta.c
   cores/esp32/esp32-hal-spi.c
   cores/esp32/esp32-hal-time.c

cores/esp32/esp32-hal-gpio.c

@@ -91,13 +91,6 @@ static InterruptHandle_t __pinInterruptHandlers[SOC_GPIO_PIN_COUNT] = {0,};
 
 extern void ARDUINO_ISR_ATTR __pinMode(uint8_t pin, uint8_t mode)
 {
-#ifdef BOARD_HAS_NEOPIXEL
-    if (pin == LED_BUILTIN){
-        __pinMode(LED_BUILTIN-SOC_GPIO_PIN_COUNT, mode);
-        return;
-    }
-#endif
-
     if (!GPIO_IS_VALID_GPIO(pin)) {
         log_e("Invalid pin selected");
         return;
@@ -132,53 +125,6 @@ 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 = LED_BUILTIN-SOC_GPIO_PIN_COUNT;
-  }else{
-    _pin = pin;
-  }
-
-  if(!initialized){
-    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;
-  }
-
-  int color[] = {green_val, red_val, blue_val};  // Color coding is in order GREEN, RED, BLUE
-  int i = 0;
-  for(int col=0; col<3; col++ ){
-    for(int bit=0; bit<8; bit++){
-      if((color[col] & (1<<(7-bit)))){
-        // HIGH bit
-        led_data[i].level0 = 1; // T1H
-        led_data[i].duration0 = 8; // 0.8us
-        led_data[i].level1 = 0; // T1L
-        led_data[i].duration1 = 4; // 0.4us
-      }else{
-        // LOW bit
-        led_data[i].level0 = 1; // T0H
-        led_data[i].duration0 = 4; // 0.4us
-        led_data[i].level1 = 0; // T0L
-        led_data[i].duration1 = 8; // 0.8us
-      }
-      i++;
-    }
-  }
-  rmtWrite(rmt_send, led_data, 24);
-}
-#endif
-
 extern void ARDUINO_ISR_ATTR __digitalWrite(uint8_t pin, uint8_t val)
 {
     #ifdef BOARD_HAS_NEOPIXEL

cores/esp32/esp32-hal-gpio.h

@@ -72,9 +72,6 @@ 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);
-#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);
 

cores/esp32/esp32-hal-rgb-led.c

@@ -0,0 +1,51 @@
+#include "esp32-hal-rgb-led.h"
+
+#ifdef BOARD_HAS_NEOPIXEL
+
+void RGBLedWrite(uint8_t pin, uint8_t red_val, uint8_t green_val, uint8_t blue_val){
+  log_d("RGB: %d %d %d", red_val, green_val, 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 = LED_BUILTIN-SOC_GPIO_PIN_COUNT;
+  }else{
+    _pin = pin;
+  }
+
+  if(!initialized){
+    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;
+  }
+
+  int color[] = {green_val, red_val, blue_val};  // Color coding is in order GREEN, RED, BLUE
+  int i = 0;
+  for(int col=0; col<3; col++ ){
+    for(int bit=0; bit<8; bit++){
+      if((color[col] & (1<<(7-bit)))){
+        // HIGH bit
+        led_data[i].level0 = 1; // T1H
+        led_data[i].duration0 = 8; // 0.8us
+        led_data[i].level1 = 0; // T1L
+        led_data[i].duration1 = 4; // 0.4us
+      }else{
+        // LOW bit
+        led_data[i].level0 = 1; // T0H
+        led_data[i].duration0 = 4; // 0.4us
+        led_data[i].level1 = 0; // T0L
+        led_data[i].duration1 = 8; // 0.8us
+      }
+      i++;
+    }
+  }
+  rmtWrite(rmt_send, led_data, 24);
+}
+
+#endif

cores/esp32/esp32-hal-rgb-led.h

@@ -0,0 +1,22 @@
+#ifndef MAIN_ESP32_HAL_RGB_LED_H_
+#define MAIN_ESP32_HAL_RGB_LED_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "esp32-hal.h"
+/*
+#include "soc/soc_caps.h"
+#include "pins_arduino.h"
+*/
+
+//#ifdef BOARD_HAS_NEOPIXEL
+  void RGBLedWrite(uint8_t pin, uint8_t red_val, uint8_t green_val, uint8_t blue_val);
+//#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* MAIN_ESP32_HAL_RGB_LED_H_ */

cores/esp32/esp32-hal.h

@@ -88,6 +88,7 @@ void yield(void);
 #include "esp32-hal-timer.h"
 #include "esp32-hal-bt.h"
 #include "esp32-hal-psram.h"
+#include "esp32-hal-rgb-led.h"
 #include "esp32-hal-cpu.h"
 
 void analogWrite(uint8_t pin, int value);

variants/esp32c3/variant.cpp

@@ -0,0 +1,13 @@
+#include "esp32-hal-rgb-led.h"
+
+extern void ARDUINO_ISR_ATTR __pinMode(uint8_t pin, uint8_t mode)
+{
+  log_d("foo");
+#ifdef BOARD_HAS_NEOPIXEL
+    if (pin == LED_BUILTIN){
+        __pinMode(LED_BUILTIN-SOC_GPIO_PIN_COUNT, mode);
+        return;
+    }
+#endif
+  __pinMode(pin, mode);
+}

variants/esp32s2/variant.cpp

@@ -0,0 +1,13 @@
+#include "esp32-hal-rgb-led.h"
+
+extern void ARDUINO_ISR_ATTR __pinMode(uint8_t pin, uint8_t mode)
+{
+  log_d("foo");
+#ifdef BOARD_HAS_NEOPIXEL
+    if (pin == LED_BUILTIN){
+        __pinMode(LED_BUILTIN-SOC_GPIO_PIN_COUNT, mode);
+        return;
+    }
+#endif
+  __pinMode(pin, mode);
+}

variants/esp32s3/variant.cpp

@@ -0,0 +1,13 @@
+#include "esp32-hal-rgb-led.h"
+
+extern void ARDUINO_ISR_ATTR __pinMode(uint8_t pin, uint8_t mode)
+{
+  log_d("foo");
+#ifdef BOARD_HAS_NEOPIXEL
+    if (pin == LED_BUILTIN){
+        __pinMode(LED_BUILTIN-SOC_GPIO_PIN_COUNT, mode);
+        return;
+    }
+#endif
+  __pinMode(pin, mode);
+}