Skip to content

Commit 7dcb936

Browse files
committed
fix(symbol): remove TM terms
1 parent 4098c53 commit 7dcb936

File tree

74 files changed

+173
-173
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+173
-173
lines changed

cores/esp32/esp32-hal-gpio.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ extern void ARDUINO_ISR_ATTR __digitalWrite(uint8_t pin, uint8_t val) {
166166
//use RMT to set all channels on/off
167167
RGB_BUILTIN_storage = val;
168168
const uint8_t comm_val = val != 0 ? RGB_BRIGHTNESS : 0;
169-
neopixelWrite(RGB_BUILTIN, comm_val, comm_val, comm_val);
169+
rgbLedWrite(RGB_BUILTIN, comm_val, comm_val, comm_val);
170170
return;
171171
}
172172
#endif // RGB_BUILTIN

cores/esp32/io_pin_remap.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ int8_t gpioNumberToDigitalPin(int8_t gpioNumber);
7777
#define pinMatrixOutDetach(pin, invertOut, invertEnable) pinMatrixOutDetach(digitalPinToGPIONumber(pin), invertOut, invertEnable)
7878

7979
// cores/esp32/esp32-hal-rgb-led.h
80-
#define neopixelWrite(pin, red_val, green_val, blue_val) neopixelWrite(digitalPinToGPIONumber(pin), red_val, green_val, blue_val)
80+
#define rgbLedWrite(pin, red_val, green_val, blue_val) rgbLedWrite(digitalPinToGPIONumber(pin), red_val, green_val, blue_val)
8181

8282
// cores/esp32/esp32-hal-rmt.h
8383
#define rmtInit(pin, channel_direction, memsize, frequency_Hz) rmtInit(digitalPinToGPIONumber(pin), channel_direction, memsize, frequency_Hz)
532 Bytes
Binary file not shown.

docs/en/api/rmt.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ To get started with RMT, you can try:
1717
RMT Write Neo Pixel
1818
*******************
1919

20-
.. literalinclude:: ../../../libraries/ESP32/examples/RMT/RMTWriteNeoPixel/RMTWriteNeoPixel.ino
20+
.. literalinclude:: ../../../libraries/ESP32/examples/RMT/RMTWriteRGB_LED/RMTWriteRGB_LED.ino
2121
:language: arduino
2222

2323

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
Calling digitalWrite(RGB_BUILTIN, HIGH) will use hidden RGB driver.
77
88
RGBLedWrite demonstrates control of each channel:
9-
void neopixelWrite(uint8_t pin, uint8_t red_val, uint8_t green_val, uint8_t blue_val)
9+
void rgbLedWrite(uint8_t pin, uint8_t red_val, uint8_t green_val, uint8_t blue_val)
1010
1111
WARNING: After using digitalWrite to drive RGB LED it will be impossible to drive the same pin
1212
with normal HIGH/LOW level
@@ -27,13 +27,13 @@ void loop() {
2727
digitalWrite(RGB_BUILTIN, LOW); // Turn the RGB LED off
2828
delay(1000);
2929

30-
neopixelWrite(RGB_BUILTIN, RGB_BRIGHTNESS, 0, 0); // Red
30+
rgbLedWrite(RGB_BUILTIN, RGB_BRIGHTNESS, 0, 0); // Red
3131
delay(1000);
32-
neopixelWrite(RGB_BUILTIN, 0, RGB_BRIGHTNESS, 0); // Green
32+
rgbLedWrite(RGB_BUILTIN, 0, RGB_BRIGHTNESS, 0); // Green
3333
delay(1000);
34-
neopixelWrite(RGB_BUILTIN, 0, 0, RGB_BRIGHTNESS); // Blue
34+
rgbLedWrite(RGB_BUILTIN, 0, 0, RGB_BRIGHTNESS); // Blue
3535
delay(1000);
36-
neopixelWrite(RGB_BUILTIN, 0, 0, 0); // Off / black
36+
rgbLedWrite(RGB_BUILTIN, 0, 0, 0); // Off / black
3737
delay(1000);
3838
#endif
3939
}

libraries/ESP32/examples/RMT/Legacy_RMT_Driver_Compatible/Legacy_RMT_Driver_Compatible.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#else
1818

1919
// add the file "build_opt.h" to your Arduino project folder with "-DESP32_ARDUINO_NO_RGB_BUILTIN" to use the RMT Legacy driver
20-
// neoPixelWrite() is a function that writes to the RGB LED and it won't be available here
20+
// rgbLedWrite() is a function that writes to the RGB LED and it won't be available here
2121
#include "driver/rmt.h"
2222

2323
bool installed = false;

libraries/ESP32/examples/RMT/RMTWriteNeoPixel/RMTWriteNeoPixel.ino renamed to libraries/ESP32/examples/RMT/RMTWriteRGB_LED/RMTWriteRGB_LED.ino

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,17 @@
2020
*/
2121

2222
// The effect seen in (Espressif devkits) ESP32C6, ESP32H2, ESP32C3, ESP32S2 and ESP32S3 is like a Blink of RGB LED
23-
#ifdef PIN_NEOPIXEL
24-
#define BUILTIN_RGBLED_PIN PIN_NEOPIXEL
23+
#ifdef PIN_RGB_LED
24+
#define BUILTIN_RGB_LED_PIN PIN_RGB_LED
2525
#else
26-
#define BUILTIN_RGBLED_PIN 21 // ESP32 has no builtin RGB LED (PIN_NEOPIXEL)
26+
#define BUILTIN_RGB_LED_PIN 21 // ESP32 has no builtin RGB LED (PIN_RGB_LED)
2727
#endif
2828

2929
#define NR_OF_LEDS 8 * 4
3030
#define NR_OF_ALL_BITS 24 * NR_OF_LEDS
3131

3232
//
33-
// Note: This example uses Neopixel LED board, 32 LEDs chained one
33+
// Note: This example uses RGB LED board, 32 LEDs chained one
3434
// after another, each RGB LED has its 24 bit value
3535
// for color configuration (8b for each color)
3636
//
@@ -58,7 +58,7 @@ rmt_data_t led_data[NR_OF_ALL_BITS];
5858

5959
void setup() {
6060
Serial.begin(115200);
61-
if (!rmtInit(BUILTIN_RGBLED_PIN, RMT_TX_MODE, RMT_MEM_NUM_BLOCKS_1, 10000000)) {
61+
if (!rmtInit(BUILTIN_RGB_LED_PIN, RMT_TX_MODE, RMT_MEM_NUM_BLOCKS_1, 10000000)) {
6262
Serial.println("init sender failed\n");
6363
}
6464
Serial.println("real tick set to: 100ns");
@@ -94,6 +94,6 @@ void loop() {
9494
led_index = 0;
9595
}
9696
// Send the data and wait until it is done
97-
rmtWrite(BUILTIN_RGBLED_PIN, led_data, NR_OF_ALL_BITS, RMT_WAIT_FOR_EVER);
97+
rmtWrite(BUILTIN_RGB_LED_PIN, led_data, NR_OF_ALL_BITS, RMT_WAIT_FOR_EVER);
9898
delay(100);
9999
}

libraries/ESP32/examples/RMT/RMT_CPUFreq_Test/RMT_CPUFreq_Test.ino

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
* @brief This example demonstrates usage of RGB LED driven by RMT to verify
1717
* that RMT works on any CPU/APB Frequency.
1818
*
19-
* It uses an ESP32 Arduino builtin RGB NeoLED function based on RMT:
20-
* void neopixelWrite(uint8_t pin, uint8_t red_val, uint8_t green_val, uint8_t blue_val)
19+
* It uses an ESP32 Arduino builtin RGB LED function based on RMT:
20+
* void rgbLedWrite(uint8_t pin, uint8_t red_val, uint8_t green_val, uint8_t blue_val)
2121
*
2222
* The output is a visual WS2812 RGB LED color change routine using each time a
2323
* different CPU Frequency, just to illustrate how it works. Serial output indicates
@@ -26,10 +26,10 @@
2626

2727
// Default DevKit RGB LED GPIOs:
2828
// The effect seen in (Espressif devkits) ESP32C6, ESP32H2, ESP32C3, ESP32S2 and ESP32S3 is like a Blink of RGB LED
29-
#ifdef PIN_NEOPIXEL
30-
#define MY_LED_GPIO PIN_NEOPIXEL
29+
#ifdef PIN_RGB_LED
30+
#define MY_LED_GPIO PIN_RGB_LED
3131
#else
32-
#define MY_LED_GPIO 21 // ESP32 has no builtin RGB LED (PIN_NEOPIXEL)
32+
#define MY_LED_GPIO 21 // ESP32 has no builtin RGB LED (PIN_RGB_LED)
3333
#endif
3434

3535
// Set the correct GPIO to any necessary by changing RGB_LED_GPIO value
@@ -58,29 +58,29 @@ void loop() {
5858

5959
// Changing the CPU Freq demands RMT to reset internals parameters setting it correctly
6060
// This is fixed by reinitializing the RMT peripheral as done below
61-
// 100ns RMT Tick for driving the NeoLED as in the code of esp32-hal-rgb-led.c (github)
61+
// 100ns RMT Tick for driving the RGB LED as in the code of esp32-hal-rgb-led.c (github)
6262
rmtInit(RGB_LED_GPIO, RMT_TX_MODE, RMT_MEM_NUM_BLOCKS_1, 10000000);
6363

6464
// resets also UART to adapt to the new CPU Freq
6565
Serial.updateBaudRate(115200);
6666
Serial.printf("\n--changed CPU Frequency to %lu MHz\n", getCpuFrequencyMhz());
6767

68-
neopixelWrite(RGB_LED_GPIO, BRIGHTNESS, BRIGHTNESS, BRIGHTNESS); // White
68+
rgbLedWrite(RGB_LED_GPIO, BRIGHTNESS, BRIGHTNESS, BRIGHTNESS); // White
6969
Serial.println("White");
7070
delay(1000);
71-
neopixelWrite(RGB_LED_GPIO, 0, 0, 0); // Off
71+
rgbLedWrite(RGB_LED_GPIO, 0, 0, 0); // Off
7272
Serial.println("Off");
7373
delay(1000);
74-
neopixelWrite(RGB_LED_GPIO, BRIGHTNESS, 0, 0); // Red
74+
rgbLedWrite(RGB_LED_GPIO, BRIGHTNESS, 0, 0); // Red
7575
Serial.println("Red");
7676
delay(1000);
77-
neopixelWrite(RGB_LED_GPIO, 0, BRIGHTNESS, 0); // Green
77+
rgbLedWrite(RGB_LED_GPIO, 0, BRIGHTNESS, 0); // Green
7878
Serial.println("Green");
7979
delay(1000);
80-
neopixelWrite(RGB_LED_GPIO, 0, 0, BRIGHTNESS); // Blue
80+
rgbLedWrite(RGB_LED_GPIO, 0, 0, BRIGHTNESS); // Blue
8181
Serial.println("Blue");
8282
delay(1000);
83-
neopixelWrite(RGB_LED_GPIO, 0, 0, 0); // Off
83+
rgbLedWrite(RGB_LED_GPIO, 0, 0, 0); // Off
8484
Serial.println("Off");
8585
delay(1000);
8686
}

libraries/ESP32/examples/Zigbee/Zigbee_Light_Bulb/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Currently, this example supports the following targets.
2020
### Configure the Project
2121

2222
Set the LED GPIO by changing the `LED_PIN` definition. By default, the LED_PIN is `RGB_BUILTIN`.
23-
By default, the `neoPixelWrite` function is used to control the LED. You can change it to digitalWrite to control a simple LED.
23+
By default, the `rgbLedWrite` function is used to control the LED. You can change it to digitalWrite to control a simple LED.
2424

2525
#### Using Arduino IDE
2626

libraries/ESP32/examples/Zigbee/Zigbee_Light_Bulb/Zigbee_Light_Bulb.ino

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ static esp_err_t zb_attribute_handler(const esp_zb_zcl_set_attr_value_message_t
155155
if (message->attribute.id == ESP_ZB_ZCL_ATTR_ON_OFF_ON_OFF_ID && message->attribute.data.type == ESP_ZB_ZCL_ATTR_TYPE_BOOL) {
156156
light_state = message->attribute.data.value ? *(bool *)message->attribute.data.value : light_state;
157157
log_i("Light sets to %s", light_state ? "On" : "Off");
158-
neopixelWrite(LED_PIN, 255 * light_state, 255 * light_state, 255 * light_state); // Toggle light
158+
rgbLedWrite(LED_PIN, 255 * light_state, 255 * light_state, 255 * light_state); // Toggle light
159159
}
160160
}
161161
}
@@ -172,7 +172,7 @@ void setup() {
172172
ESP_ERROR_CHECK(esp_zb_platform_config(&config));
173173

174174
// Init RMT and leave light OFF
175-
neopixelWrite(LED_PIN, 0, 0, 0);
175+
rgbLedWrite(LED_PIN, 0, 0, 0);
176176

177177
// Start Zigbee task
178178
xTaskCreate(esp_zb_task, "Zigbee_main", 4096, NULL, 5, NULL);

0 commit comments

Comments
 (0)