blackbeard420/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf synced 2025-04-01 04:10:10 -04:00
Code Issues Projects Releases Wiki Activity

Merge branch 'bugfix/tinyusb_pins_cfg' into 'master'

Browse Source 
usb: configure_pins fix for tinyusb

Closes IDFGH-3653

See merge request
This commit is contained in:
Michael (XIAO Xufeng) 2020-07-27 14:57:19 +08:00
commit 35007bd443
1 changed files with 10 additions and 8 deletions

18
components/tinyusb/port/esp32s2/src/tinyusb.c

@ -12,14 +12,14 @@
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
#include "tinyusb.h"
#include "hal/usb_hal.h"
#include "soc/usb_periph.h"
#include "soc/gpio_periph.h"
#include "hal/gpio_ll.h"
#include "esp_rom_gpio.h"
#include "driver/periph_ctrl.h"
#include "driver/gpio.h" #include "driver/gpio.h"
#include "driver/periph_ctrl.h"
#include "esp_rom_gpio.h"
#include "hal/gpio_ll.h"
#include "hal/usb_hal.h"
#include "soc/gpio_periph.h"
#include "soc/usb_periph.h"
#include "tinyusb.h"
static void configure_pins(usb_hal_context_t *usb) static void configure_pins(usb_hal_context_t *usb)
{ {
@ -34,7 +34,9 @@ static void configure_pins(usb_hal_context_t *usb)
esp_rom_gpio_connect_out_signal(iopin->pin, iopin->func, false, false); esp_rom_gpio_connect_out_signal(iopin->pin, iopin->func, false, false);
} else { } else {
esp_rom_gpio_connect_in_signal(iopin->pin, iopin->func, false); esp_rom_gpio_connect_in_signal(iopin->pin, iopin->func, false);
gpio_ll_input_enable(&GPIO, iopin->pin); if ((iopin->pin != GPIO_MATRIX_CONST_ZERO_INPUT) && (iopin->pin != GPIO_MATRIX_CONST_ONE_INPUT)) {
gpio_ll_input_enable(&GPIO, iopin->pin);
}
} }
esp_rom_gpio_pad_unhold(iopin->pin); esp_rom_gpio_pad_unhold(iopin->pin);
} }