From 87e33ee0bf3c5a7781e5af0dcfcc4e23bdeb33d6 Mon Sep 17 00:00:00 2001 From: helei Date: Sun, 20 Sep 2026 12:09:19 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=97=E5=BA=93=E7=89=87=E9=80=89CS2?= =?UTF-8?q?=E6=94=B9PB3(=E5=8E=9FPC12=E9=87=8A=E6=94=BE);PB3=E4=B8=BAJTAG?= =?UTF-8?q?=E8=84=9A,=E5=B7=A5=E7=A8=8B=E5=B7=B2=E6=9C=89=E7=A6=81JTAG?= =?UTF-8?q?=E4=BF=9DSWD=E9=87=8D=E6=98=A0=E5=B0=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AI项目上下文.md | 2 +- STM32F103_App1/HardWare/OLED/oled.c | 6 +++--- STM32F103_App1/HardWare/OLED/oled.h | 2 +- STM32F103_App1/HardWare/SYSINIT/system.c | 8 ++++---- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/AI项目上下文.md b/AI项目上下文.md index 51b027c..3c9ee38 100644 --- a/AI项目上下文.md +++ b/AI项目上下文.md @@ -64,7 +64,7 @@ | EEPROM I2C（SCL/SDA） | **PB5/PB4** | | W25Q64（CS/DO/CLK/DI） | **PB8/PB9/PB6/PB7** | | OLED 屏幕 | **SSD1306 I2C：SCL=PB5/SDA=PB4（与 EEPROM 共总线，地址 0x78，无 RST）** | -| 字库 IC（独立 SPI） | **CLK/DI/DO 与 W25Q64 共线（PB6/PB7/PB9）**，CS2=PC12 独立片选 | +| 字库 IC（独立 SPI） | **CLK/DI/DO 与 W25Q64 共线（PB6/PB7/PB9）**，CS2=PB3 独立片选 | | HR_IN 缺料检测 | **PA8 下拉输入，高=缺料→停投料关继电器1（只记日志），不接传感器不影响投料** | | KEY1~4 | **PC6/PC7/PB14/PB15 上拉输入，功能预留** | | 取消 | PA8 手动模式开关（MANUAL_MODE 已删） | diff --git a/STM32F103_App1/HardWare/OLED/oled.c b/STM32F103_App1/HardWare/OLED/oled.c index 41a81e1..0d891e9 100644 --- a/STM32F103_App1/HardWare/OLED/oled.c +++ b/STM32F103_App1/HardWare/OLED/oled.c @@ -2,7 +2,7 @@ * Ļ: I2C ӿ(ԭͼ OLED_SCL/OLED_SDA), EEPROM I2C * (SCL=PB5 SDA=PB4, iic.h), RST ; ַ OLED_I2C_ADDR=0x78; * 24C02 Ŀ񻥳 storage_lock(ÿʾ) - * ֿ: SPI, W25Q64 (ROM_CLK=PB6 ROM_DI=PB7 ROM_DO=PB9), ROM_CS=PC12 Ƭѡ; + * ֿ: SPI, W25Q64 (ROM_CLK=PB6 ROM_DI=PB7 ROM_DO=PB9), ROM_CS=PB3 Ƭѡ; * ROM_DO(PB9) ̶Ϊ(W25Q64_Init ), ֿȡ storage_lock Flash */ #include "oled.h" @@ -17,8 +17,8 @@ #define ROM_DI_PIN GPIO_PIN_7 /* ֿ DI, W25Q64 DI */ #define ROM_DO_PORT GPIOB #define ROM_DO_PIN GPIO_PIN_9 /* ֿ DO(FSO), W25Q64 DO , Ϊ */ -#define ROM_CS_PORT GPIOC -#define ROM_CS_PIN GPIO_PIN_12 +#define ROM_CS_PORT GPIOB +#define ROM_CS_PIN GPIO_PIN_3 #define rom_di(a) HAL_GPIO_WritePin(ROM_DI_PORT, ROM_DI_PIN, (GPIO_PinState)(a)) #define rom_clk(a) HAL_GPIO_WritePin(ROM_CLK_PORT, ROM_CLK_PIN, (GPIO_PinState)(a)) diff --git a/STM32F103_App1/HardWare/OLED/oled.h b/STM32F103_App1/HardWare/OLED/oled.h index 2a38693..3558be5 100644 --- a/STM32F103_App1/HardWare/OLED/oled.h +++ b/STM32F103_App1/HardWare/OLED/oled.h @@ -4,7 +4,7 @@ #include "main.h" /* 128x64 OLED(SSD1306 I2C) + Ѷ GB2312 ֿ IC(SPI) * Ļ: SSD1306 I2C(SCL=PB5 SDA=PB4, EEPROM , ַ 0x78, RST) - * ֿ: SPI, W25Q64 (CLK=PB6 DI=PB7 DO=PB9), CS2=PC12 Ƭѡ + * ֿ: SPI, W25Q64 (CLK=PB6 DI=PB7 DO=PB9), CS2=PB3 Ƭѡ * ʾַ GB2312/GBK 루Դļ GBKֱдɣ * Ļ 128x6416 ظߵй 4 Уrow 0~3ÿ 8 ֻ 16 ASCII */ diff --git a/STM32F103_App1/HardWare/SYSINIT/system.c b/STM32F103_App1/HardWare/SYSINIT/system.c index 2a2807c..2c0f859 100644 --- a/STM32F103_App1/HardWare/SYSINIT/system.c +++ b/STM32F103_App1/HardWare/SYSINIT/system.c @@ -118,13 +118,13 @@ void MX_GPIO_Init(void) g.Pin = GPIO_PIN_14 | GPIO_PIN_15; HAL_GPIO_Init(GPIOB, &g); - /* ֿ CS2(PC12): W25Q64 SPI , ϵ缴ø߲ѡ, + /* ֿ CS2(PB3): W25Q64 SPI , ϵ缴ø߲ѡ, * ֹ oled_init ֮ǰ Flash ʱƬѡѡֿ IC */ - HAL_GPIO_WritePin(GPIOC, GPIO_PIN_12, GPIO_PIN_SET); + HAL_GPIO_WritePin(GPIOB, GPIO_PIN_3, GPIO_PIN_SET); g.Mode = GPIO_MODE_OUTPUT_PP; g.Pull = GPIO_NOPULL; - g.Pin = GPIO_PIN_12; - HAL_GPIO_Init(GPIOC, &g); + g.Pin = GPIO_PIN_3; + HAL_GPIO_Init(GPIOB, &g); /* ESP_EN(PA6): WiFi ģʹܣߵƽЧĬϹرʡ磬 * network.c ͨأ4G ʱͶϵ磬 WiFi ߣ */