diff --git a/STM32F103_App1/HardWare/W25Q64/w25q64.c b/STM32F103_App1/HardWare/W25Q64/w25q64.c index dffe714..2316b36 100644 --- a/STM32F103_App1/HardWare/W25Q64/w25q64.c +++ b/STM32F103_App1/HardWare/W25Q64/w25q64.c @@ -59,7 +59,7 @@ uint8_t W25Q64_Init(void) __HAL_RCC_GPIOB_CLK_ENABLE(); __HAL_RCC_AFIO_CLK_ENABLE(); - /* 释放 PA15、PB3、PB4 作为 GPIO(关闭 JTAG,保留 SWD) */ + /* 关闭 JTAG 保留 SWD: PB4(I2C SDA) 等脚需要 GPIO 功能 */ __HAL_AFIO_REMAP_SWJ_NOJTAG(); gpio.Mode = GPIO_MODE_OUTPUT_PP; diff --git a/STM32F103_App1/HardWare/W25Q64/w25q64.h b/STM32F103_App1/HardWare/W25Q64/w25q64.h index 6163454..56bdeba 100644 --- a/STM32F103_App1/HardWare/W25Q64/w25q64.h +++ b/STM32F103_App1/HardWare/W25Q64/w25q64.h @@ -11,10 +11,10 @@ extern "C" { /* ------------------------------------------------- * W25Q64 外部 SPI Flash 驱动接口 * 硬件连接(软件 SPI,任意 GPIO): - * CS -> PB4 - * CLK -> PB3 - * DO -> PB5 (Flash 数据输出 / MCU 输入) - * DI -> PA15 (Flash 数据输入 / MCU 输出) + * CS -> PB8 + * CLK -> PB6 + * DO -> PB9 (Flash 数据输出 / MCU 输入) + * DI -> PB7 (Flash 数据输入 / MCU 输出) * ------------------------------------------------- */ #define W25Q64_FLASH_SIZE (8ul * 1024 * 1024) /* 8MB */ diff --git a/STM32F103_BootLoader/HardWare/W25Q64/w25q64.c b/STM32F103_BootLoader/HardWare/W25Q64/w25q64.c index e6ca963..5d29afe 100644 --- a/STM32F103_BootLoader/HardWare/W25Q64/w25q64.c +++ b/STM32F103_BootLoader/HardWare/W25Q64/w25q64.c @@ -57,7 +57,7 @@ uint8_t W25Q64_Init(void) __HAL_RCC_GPIOB_CLK_ENABLE(); __HAL_RCC_AFIO_CLK_ENABLE(); - /* 释放 PA15、PB3、PB4 作为 GPIO(关闭 JTAG,保留 SWD) */ + /* 关闭 JTAG 保留 SWD: PB4(I2C SDA) 等脚需要 GPIO 功能 */ __HAL_AFIO_REMAP_SWJ_NOJTAG(); gpio.Mode = GPIO_MODE_OUTPUT_PP; diff --git a/STM32F103_BootLoader/HardWare/W25Q64/w25q64.h b/STM32F103_BootLoader/HardWare/W25Q64/w25q64.h index 111e6e6..882ad94 100644 --- a/STM32F103_BootLoader/HardWare/W25Q64/w25q64.h +++ b/STM32F103_BootLoader/HardWare/W25Q64/w25q64.h @@ -11,10 +11,10 @@ extern "C" { /* ------------------------------------------------- * W25Q64 外部 SPI Flash 驱动接口 * 硬件连接(软件 SPI,任意 GPIO): - * CS -> PB4 - * CLK -> PB3 - * DO -> PB5 (Flash 数据输出 / MCU 输入) - * DI -> PA15 (Flash 数据输入 / MCU 输出) + * CS -> PB8 + * CLK -> PB6 + * DO -> PB9 (Flash 数据输出 / MCU 输入) + * DI -> PB7 (Flash 数据输入 / MCU 输出) * ------------------------------------------------- */ #define W25Q64_FLASH_SIZE (8ul * 1024 * 1024) /* 8MB */