esp32/machine_pwm.c: Fix invert param.

Signed-off-by: Ihor Nehrutsa <[email protected]>

Author: IhorNehrutsa

ports/esp32/machine_pwm.c

@@ -33,14 +33,19 @@
 
 #include <math.h>
 #include "py/mphal.h"
-#include "driver/ledc.h"
 #include "esp_err.h"
+#include "driver/ledc.h"
+#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 3, 0)
+#include "soc/ledc_periph.h"
+#include "esp_private/gpio.h"
+#include "esp_private/esp_gpio_reserve.h"
+#include "soc/io_mux_reg.h"
+#endif
 #include "soc/gpio_sig_map.h"
 #include "esp_clk_tree.h"
-
 #include "py/mpprint.h"
 
-#define debug_printf(...) // mp_printf(&mp_plat_print, __VA_ARGS__); mp_printf(&mp_plat_print, ", LINE=%d\n", __LINE__);
+#define debug_printf(...) // mp_printf(&mp_plat_print, __VA_ARGS__); mp_printf(&mp_plat_print, " | LINE=%d at %s\n", __LINE__, __FILE__);
 
 // 10-bit user interface resolution compatible with esp8266 PWM.duty()
 #define UI_RES_10_BIT  (10)
@@ -87,6 +92,7 @@ typedef struct _machine_pwm_obj_t {
     int duty_ui;       // saved values of UI duty
     int channel_duty;  // saved values of UI duty, calculated to raw channel->duty
     bool output_invert;
+    bool output_invert_prev;
 } machine_pwm_obj_t;
 
 typedef struct _chans_t {
@@ -213,20 +219,38 @@ static int duty_to_ns(machine_pwm_obj_t *self, int duty) {
     return ((int64_t)duty * 1000000000LL + (int64_t)self->freq * (int64_t)(MAX_16_DUTY / 2)) / ((int64_t)self->freq * (int64_t)MAX_16_DUTY);
 }
 
+#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 3, 0)
+static esp_err_t _ledc_set_pin(int gpio_num, bool out_inv, ledc_mode_t speed_mode, ledc_channel_t channel) {
+    gpio_func_sel(gpio_num, PIN_FUNC_GPIO);
+    // reserve the GPIO output path, because we don't expect another peripheral to signal to the same GPIO
+    uint64_t old_gpio_rsv_mask = esp_gpio_reserve(BIT64(gpio_num));
+    // check if the GPIO is already used by others, LEDC signal only uses the output path of the GPIO
+    if (old_gpio_rsv_mask & BIT64(gpio_num)) {
+        mp_raise_msg_varg(&mp_type_RuntimeError, MP_ERROR_TEXT("GPIO %d is not usable, maybe conflict with others"), gpio_num);
+    }
+    esp_rom_gpio_connect_out_signal(gpio_num, ledc_periph_signal[speed_mode].sig_out0_idx + channel, out_inv, 0);
+    return ESP_OK;
+}
+#endif
+
 // Reconfigure PWM pin output as input/output. This allows to read the pin level.
 static void reconfigure_pin(machine_pwm_obj_t *self) {
     bool invert = self->output_invert;
     if (self->channel_duty && (self->channel_duty == MAX_timer_duty)) {
         invert = !invert;
     }
     gpio_set_direction(self->pin, GPIO_MODE_INPUT_OUTPUT);
+    #if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 3, 0)
+    _ledc_set_pin(self->pin, invert, self->mode, self->channel);
+    #else
     if (self->mode == LEDC_LOW_SPEED_MODE) {
         esp_rom_gpio_connect_out_signal(self->pin, LEDC_LS_SIG_OUT0_IDX + self->channel, invert, false);
     #if SOC_LEDC_SUPPORT_HS_MODE
     } else if (self->mode == LEDC_HIGH_SPEED_MODE) {
         esp_rom_gpio_connect_out_signal(self->pin, LEDC_HS_SIG_OUT0_IDX + self->channel, invert, false);
     #endif
     }
+    #endif
 }
 
 static void apply_duty(machine_pwm_obj_t *self) {
@@ -242,7 +266,8 @@ static void apply_duty(machine_pwm_obj_t *self) {
     }
     self->channel_duty = duty >> (UI_RES_16_BIT - timers[self->mode][self->timer].duty_resolution);
 
-    if ((chans[self->mode][self->channel].pin == -1) || (self->channel_duty == 0) || (self->channel_duty == MAX_timer_duty)) {
+    if ((chans[self->mode][self->channel].pin == -1) || (self->channel_duty == 0) || (self->channel_duty == MAX_timer_duty) || (self->output_invert_prev != self->output_invert)) {
+        self->output_invert_prev = self->output_invert;
         // New PWM assignment
         ledc_channel_config_t cfg = {
             .channel = self->channel,
@@ -395,7 +420,7 @@ static void set_freq(machine_pwm_obj_t *self, unsigned int freq) {
         // Check for clock source conflic
         ledc_clk_cfg_t pwm_clk = find_clock_in_use();
         if ((pwm_clk != LEDC_AUTO_CLK) && (pwm_clk != timer.clk_cfg)) {
-            mp_raise_msg_varg(&mp_type_RuntimeError, MP_ERROR_TEXT("one or more active timers use a different clock source, not supported by the current SoC."));
+            mp_raise_msg(&mp_type_RuntimeError, MP_ERROR_TEXT("one or more active timers use a different clock source, not supported by the current SoC."));
         }
         #endif
 
@@ -639,6 +664,7 @@ static void self_reset(machine_pwm_obj_t *self) {
     self->duty_ui = 0;
     self->channel_duty = -1;
     self->output_invert = false;
+    self->output_invert_prev = false;
     self->light_sleep_enable = false;
 }