esp32/bitstream: Update bitsream code to leave output value

Signed-off-by: Rick Sorensen <[email protected]>

Author: ricksorensen

ports/esp32/esp32_common.cmake

@@ -237,6 +237,14 @@ target_link_options(${MICROPY_TARGET} PUBLIC
 target_include_directories(${MICROPY_TARGET} PUBLIC
     ${IDF_PATH}/components/bt/host/nimble/nimble
 )
+if (IDF_VERSION VERSION_LESS "5.3")
+# Additional include directories needed for private RMT header.
+#  IDF 5.x versions before 5.3.1
+  message(STATUS "Using private rmt headers for ${IDF_VERSION}")
+  target_include_directories(${MICROPY_TARGET} PRIVATE
+    ${IDF_PATH}/components/driver/rmt
+  )
+endif()
 
 # Add additional extmod and usermod components.
 target_link_libraries(${MICROPY_TARGET} micropy_extmod_btree)

ports/esp32/machine_bitstream.c

@@ -93,6 +93,9 @@ static void IRAM_ATTR machine_bitstream_high_low_bitbang(mp_hal_pin_obj_t pin, u
 /******************************************************************************/
 // RMT implementation
 
+#if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5,3,0)
+#include "rmt_private.h" //RJS  need to add rmt_private path in _common.cmake
+#endif
 #include "driver/rmt_tx.h"
 #include "driver/rmt_encoder.h"
 
@@ -147,14 +150,16 @@ static void machine_bitstream_high_low_rmt(mp_hal_pin_obj_t pin, uint32_t *timin
     rmt_encoder_reset(encoder);
     check_esp_err(rmt_transmit(channel, encoder, buf, len, &tx_config));
 
-    // Wait 50% longer than we expect (if every bit takes the maximum time).
-    uint32_t timeout_ms = (3 * len / 2) * (1 + (8 * MAX(timing_ns[0] + timing_ns[1], timing_ns[2] + timing_ns[3])) / 1000000) + 9;
-    check_esp_err(rmt_tx_wait_all_done(channel, timeout_ms));
+    check_esp_err(rmt_tx_wait_all_done(channel, -1));
 
     // Disable and release channel.
     check_esp_err(rmt_del_encoder(encoder));
     rmt_disable(channel);
-    rmt_del_channel(channel);
+#if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5,3,0)
+    channel->del(channel);
+#else
+    rmt_del_channel(channel);    // RJS untested
+#endif
 
     // Cancel RMT output to GPIO pin.
     esp_rom_gpio_connect_out_signal(pin, SIG_GPIO_OUT_IDX, false, false);