Skip to content

Commit 930681c

Browse files
committed
fix(rmt): ESP32_ARDUINO_NEW_RMT_DRV_OFF
1 parent a11b473 commit 930681c

File tree

6 files changed

+12
-12
lines changed

6 files changed

+12
-12
lines changed

cores/esp32/esp32-hal-gpio.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ uint8_t RGB_BUILTIN_storage = 0;
151151
#endif
152152

153153
extern void ARDUINO_ISR_ATTR __digitalWrite(uint8_t pin, uint8_t val) {
154-
#ifndef NO_NEW_RMT_DRV
154+
#ifndef ESP32_ARDUINO_NEW_RMT_DRV_OFF
155155
#ifdef RGB_BUILTIN
156156
if (pin == RGB_BUILTIN) {
157157
//use RMT to set all channels on/off
@@ -161,7 +161,7 @@ extern void ARDUINO_ISR_ATTR __digitalWrite(uint8_t pin, uint8_t val) {
161161
return;
162162
}
163163
#endif // RGB_BUILTIN
164-
#endif // NO_NEW_RMT_DRV
164+
#endif // ESP32_ARDUINO_NEW_RMT_DRV_OFF
165165
if (perimanGetPinBus(pin, ESP32_BUS_TYPE_GPIO) != NULL) {
166166
gpio_set_level((gpio_num_t)pin, val);
167167
} else {

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#include "soc/soc_caps.h"
22

3-
#ifndef NO_NEW_RMT_DRV
3+
#ifndef ESP32_ARDUINO_NEW_RMT_DRV_OFF
44

55
#include "esp32-hal-rgb-led.h"
66

@@ -42,4 +42,4 @@ void neopixelWrite(uint8_t pin, uint8_t red_val, uint8_t green_val, uint8_t blue
4242
log_e("RMT is not supported on " CONFIG_IDF_TARGET);
4343
#endif /* SOC_RMT_SUPPORTED */
4444
}
45-
#endif /* NO_NEW_RMT_DRV */
45+
#endif /* ESP32_ARDUINO_NEW_RMT_DRV_OFF */

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#ifndef MAIN_ESP32_HAL_RGB_LED_H_
22
#define MAIN_ESP32_HAL_RGB_LED_H_
33

4-
#ifndef NO_NEW_RMT_DRV
4+
#ifndef ESP32_ARDUINO_NEW_RMT_DRV_OFF
55
#ifdef __cplusplus
66
extern "C" {
77
#endif
@@ -19,4 +19,4 @@ void neopixelWrite(uint8_t pin, uint8_t red_val, uint8_t green_val, uint8_t blue
1919
#endif
2020

2121
#endif /* MAIN_ESP32_HAL_RGB_LED_H_ */
22-
#endif /* NO_NEW_RMT_DRV */
22+
#endif /* ESP32_ARDUINO_NEW_RMT_DRV_OFF */

cores/esp32/esp32-hal-rmt.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
// limitations under the License.
1414

1515
#include "soc/soc_caps.h"
16-
#ifndef NO_NEW_RMT_DRV
16+
#ifndef ESP32_ARDUINO_NEW_RMT_DRV_OFF
1717

1818
#if SOC_RMT_SUPPORTED
1919
#include "esp32-hal.h"
@@ -629,4 +629,4 @@ bool rmtInit(int pin, rmt_ch_dir_t channel_direction, rmt_reserve_memsize_t mem_
629629
}
630630

631631
#endif /* SOC_RMT_SUPPORTED */
632-
#endif /* NO_NEW_RMT_DRV */
632+
#endif /* ESP32_ARDUINO_NEW_RMT_DRV_OFF */

cores/esp32/esp32-hal-rmt.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#define MAIN_ESP32_HAL_RMT_H_
1717

1818
#include "soc/soc_caps.h"
19-
#ifndef NO_NEW_RMT_DRV
19+
#ifndef ESP32_ARDUINO_NEW_RMT_DRV_OFF
2020

2121
#if SOC_RMT_SUPPORTED
2222

@@ -236,4 +236,4 @@ bool rmtDeinit(int pin);
236236

237237
#endif /* SOC_RMT_SUPPORTED */
238238
#endif /* MAIN_ESP32_HAL_RMT_H_ */
239-
#endif /* NO_NEW_RMT_DRV */
239+
#endif /* ESP32_ARDUINO_NEW_RMT_DRV_OFF */

cores/esp32/io_pin_remap.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ int8_t gpioNumberToDigitalPin(int8_t gpioNumber);
7979
// cores/esp32/esp32-hal-rgb-led.h
8080
#define neopixelWrite(pin, red_val, green_val, blue_val) neopixelWrite(digitalPinToGPIONumber(pin), red_val, green_val, blue_val)
8181

82-
#ifndef NO_NEW_RMT_DRV
82+
#ifndef ESP32_ARDUIESP32_ARDUINO_NEW_RMT_DRV_OFF_OFF
8383
// cores/esp32/esp32-hal-rmt.h
8484
#define rmtInit(pin, channel_direction, memsize, frequency_Hz) rmtInit(digitalPinToGPIONumber(pin), channel_direction, memsize, frequency_Hz)
8585
#define rmtSetEOT(pin, EOT_Level) rmtSetEOT(digitalPinToGPIONumber(pin), EOT_Level)
@@ -95,7 +95,7 @@ int8_t gpioNumberToDigitalPin(int8_t gpioNumber);
9595
rmtSetCarrier(digitalPinToGPIONumber(pin), carrier_en, carrier_level, frequency_Hz, duty_percent)
9696
#define rmtSetRxMinThreshold(pin, filter_pulse_ticks) rmtSetRxMinThreshold(digitalPinToGPIONumber(pin), filter_pulse_ticks)
9797
#define rmtDeinit(pin) rmtDeinit(digitalPinToGPIONumber(pin))
98-
#endif // NO_NEW_RMT_DRV
98+
#endif // ESP32_ARDUIESP32_ARDUINO_NEW_RMT_DRV_OFF_OFF
9999

100100
// cores/esp32/esp32-hal-sigmadelta.h
101101
#define sigmaDeltaAttach(pin, freq) sigmaDeltaAttach(digitalPinToGPIONumber(pin), freq)

0 commit comments

Comments
 (0)