From b098cf993bbe4d2386e8ff7cf34b12320563c861 Mon Sep 17 00:00:00 2001
From: unknown <zhengxianyong@qq.com>
Date: Fri, 25 Nov 2022 10:56:59 +0800
Subject: [PATCH 1/2] 1.Full SWJ Disabled (JTAG-DP + SW-DP) 2.Change SWDIO and
 SWCLK pin to 13 and 14

---
 CMSIS-DAP2mod/STM32/CMSIS-DAP.c  | 4 ++--
 CMSIS-DAP2mod/STM32/DAP_config.h | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/CMSIS-DAP2mod/STM32/CMSIS-DAP.c b/CMSIS-DAP2mod/STM32/CMSIS-DAP.c
index efa0ed0..26d4612 100644
--- a/CMSIS-DAP2mod/STM32/CMSIS-DAP.c
+++ b/CMSIS-DAP2mod/STM32/CMSIS-DAP.c
@@ -413,8 +413,8 @@ void BoardInit(void)
 	// Enable GPIOA-GPIOC
 	RCC->APB2ENR |= (RCC_APB2ENR_AFIOEN | RCC_APB2ENR_IOPAEN | RCC_APB2ENR_IOPBEN | RCC_APB2ENR_IOPCEN);
 
-	// Enable SWJ only
-	GPIO_PinRemapConfig(GPIO_Remap_SWJ_JTAGDisable, ENABLE);
+	// Full SWJ Disabled (JTAG-DP + SW-DP) 
+	GPIO_PinRemapConfig(GPIO_Remap_SWJ_Disable, ENABLE);
 
 	GPIO_INIT(GPIOA, INIT_PINS_A);
 	GPIO_INIT(GPIOB, INIT_PINS_B);
diff --git a/CMSIS-DAP2mod/STM32/DAP_config.h b/CMSIS-DAP2mod/STM32/DAP_config.h
index 9e915e4..b439284 100644
--- a/CMSIS-DAP2mod/STM32/DAP_config.h
+++ b/CMSIS-DAP2mod/STM32/DAP_config.h
@@ -256,11 +256,11 @@ typedef enum Pin_e {
 
 	// SWDIO/TMS Pin
 	#define PIN_SWDIO_TMS_PORT      GPIOA
-	#define PIN_SWDIO_TMS_PIN		2
+	#define PIN_SWDIO_TMS_PIN		13
 
 	// SWCLK/TCK Pin
 	#define PIN_SWCLK_TCK_PORT		GPIOA
-	#define PIN_SWCLK_TCK_PIN		4
+	#define PIN_SWCLK_TCK_PIN		14
 
 	// TDO/SWO Pin (input)
 	#define PIN_TDO_PORT            GPIOA

From 3160c9566181b96f4aea6ef363c53489f4a30e3d Mon Sep 17 00:00:00 2001
From: unknown <zhengxianyong@qq.com>
Date: Fri, 25 Nov 2022 11:47:13 +0800
Subject: [PATCH 2/2] change readme

---
 readme.md | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/readme.md b/readme.md
index 9d06241..b4da9fb 100644
--- a/readme.md
+++ b/readme.md
@@ -4,8 +4,8 @@ HSE of STM32 is a 8MHz oscillator oscillator.
 The hardware GPIO pins (which can be modifed in file "DAP_config.h"):
     A9: serial TX
     A10: serial RX
-    A2: SWDIO
-    A4: SWCLK
+    SWDIO: SWDIO
+    SWCLK: SWCLK
     A6: nRESET
     B8: Connected LED
     B12: Target Running LED
@@ -21,4 +21,9 @@ Important: this is a Keil MDK5 project, but a compiler version 5 (ARMCC) is need
 3，原工程注释掉部分描述符，不知道是不是复合设备不兼容他们的win7，总之这导致了在win10下复合设备不识别(看到只有串口没有HID)
 4，原工程USBlib使用lib，但是提供了一份源码，为了完全开源我们改用源码编译，其中部分inline导致无法编译，已去除。
 5，那个USBlib库不兼容GD等国产单片机，请老实花钱购买正常STM32芯片。
-6，电路图就是常见的老古董STLINK2.0，还能刷JLINK OB的那种。我晶振是12M，用8M自行修改。
\ No newline at end of file
+6，电路图就是常见的老古董STLINK2.0，还能刷JLINK OB的那种。我晶振是12M，用8M自行修改。
+
+修改 by：hianiong
+1，修改SWDIO 和 SWCLK 到最小系统板后面默认SWDIO和SWCLK针脚
+2，刷完daplink后如果要通过SWD恢复到其他固件，必须把boot0 接 VCC，或通过串口下载
+3，我是8M晶振，测试可以直接使用不用修改
\ No newline at end of file