fix(dap): Cannot find JTAG device when power up

windowsair · Jun 6, 2021 · e78da8c · e78da8c
1 parent 9876edd
commit e78da8c
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 12 deletions.
diff --git a/README.md b/README.md
@@ -17,7 +17,7 @@ Realized by USBIP and CMSIS-DAP protocol stack.
 
 > 👉 5m distance, 100kb size firmware(Hex) flash test:
 
-<p align="center"><img src="https://user-images.githubusercontent.com/17078589/107896674-e5a95700-6f71-11eb-90f7-bf7362045537.gif"/></p>
+<p align="center"><img src="https://user-images.githubusercontent.com/17078589/120925694-4bca0d80-c70c-11eb-91b7-ffa54770faea.gif"/></p>
 
 ## Feature
 

diff --git a/components/DAP/config/DAP_config.h b/components/DAP/config/DAP_config.h
@@ -269,7 +269,18 @@ __STATIC_INLINE void PORT_JTAG_SETUP(void)
 
 
   // set TCK, TMS pin
-  DAP_SPI_Deinit();
+  PIN_FUNC_SELECT(PERIPHS_IO_MUX_MTMS_U, FUNC_GPIO14); // GPIO14 is SPI CLK pin (Clock)
+  GPIO.enable_w1ts |= (0x1 << 14); // PP Output
+  pin_reg.val = READ_PERI_REG(GPIO_PIN_REG(14));
+  pin_reg.pullup = 1;
+  WRITE_PERI_REG(GPIO_PIN_REG(14), pin_reg.val);
+
+  PIN_FUNC_SELECT(PERIPHS_IO_MUX_MTCK_U, FUNC_GPIO13); // GPIO13 is SPI MOSI pin (Master Data Out)
+  GPIO.enable_w1ts |= (0x1 << 13);
+  GPIO.pin[13].driver = 1; // OD output
+  pin_reg.val = READ_PERI_REG(GPIO_PIN_REG(13));
+  pin_reg.pullup = 0;
+  WRITE_PERI_REG(GPIO_PIN_REG(13), pin_reg.val);
 
 
   // use RTC pin 16

diff --git a/sdkconfig b/sdkconfig
@@ -148,12 +148,10 @@ CONFIG_ESP_SYSTEM_EVENT_QUEUE_SIZE=32
 CONFIG_ESP_SYSTEM_EVENT_TASK_STACK_SIZE=2048
 CONFIG_ESP_MAIN_TASK_STACK_SIZE=3584
 CONFIG_ESP_TIMER_TASK_STACK_SIZE=2048
-# CONFIG_ESP_CONSOLE_UART_DEFAULT is not set
-CONFIG_ESP_CONSOLE_UART_CUSTOM=y
+CONFIG_ESP_CONSOLE_UART_DEFAULT=y
+# CONFIG_ESP_CONSOLE_UART_CUSTOM is not set
 # CONFIG_ESP_CONSOLE_UART_NONE is not set
-# CONFIG_ESP_CONSOLE_UART_CUSTOM_NUM_0 is not set
-CONFIG_ESP_CONSOLE_UART_CUSTOM_NUM_1=y
-CONFIG_ESP_CONSOLE_UART_NUM=1
+CONFIG_ESP_CONSOLE_UART_NUM=0
 CONFIG_ESP_CONSOLE_UART_BAUDRATE=74880
 # CONFIG_ESP_UART0_SWAP_IO is not set
 # CONFIG_ESP_TASK_WDT is not set
@@ -472,12 +470,10 @@ CONFIG_STACK_CHECK_NONE=y
 # CONFIG_STACK_CHECK is not set
 # CONFIG_WARN_WRITE_STRINGS is not set
 CONFIG_MAIN_TASK_STACK_SIZE=3584
-# CONFIG_CONSOLE_UART_DEFAULT is not set
-CONFIG_CONSOLE_UART_CUSTOM=y
+CONFIG_CONSOLE_UART_DEFAULT=y
+# CONFIG_CONSOLE_UART_CUSTOM is not set
 # CONFIG_CONSOLE_UART_NONE is not set
-# CONFIG_CONSOLE_UART_CUSTOM_NUM_0 is not set
-CONFIG_CONSOLE_UART_CUSTOM_NUM_1=y
-CONFIG_CONSOLE_UART_NUM=1
+CONFIG_CONSOLE_UART_NUM=0
 CONFIG_CONSOLE_UART_BAUDRATE=74880
 # CONFIG_UART0_SWAP_IO is not set
 # CONFIG_TASK_WDT is not set