From 28f1dd588d081301481fa67b0dd34803c74938d8 Mon Sep 17 00:00:00 2001 From: "evan.liu" <583229071@qq.com> Date: Sun, 13 Sep 2026 14:21:25 +0800 Subject: [PATCH] =?UTF-8?q?=E7=8A=B6=E6=80=81=E7=81=AF=E6=8D=A2=E8=84=9A:?= =?UTF-8?q?=20LED1->PB2,=20LED2->PB3=20(APP=20V1.00.43)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 避开 PB1(数码管pin2) 冲突: LED1改PB2运行心跳, LED2改PB3蓝牙连接 - 仅改 app_gpio.h 引脚定义, 其余逻辑不变 - 仅 APP 改动, Boot 不动 (仍 V1.00.07) - docs/开发日志.md: 新增 §72 --- docs/开发日志.md | 9 ++++++ mcm-ddc-ble/MDK-ARM/bin/mcm-ddc-ble-app2.bin | Bin 60468 -> 60468 bytes mcm-ddc-ble/MDK-ARM/bin/mcm-ddc-ble.bin | Bin 60168 -> 60168 bytes mcm-ddc-ble/inc/app_gpio.h | 4 +-- mcm-ddc-ble/inc/app_version.h | 4 +-- tools/out/mothercup_ble_ota.bin | Bin 120688 -> 120688 bytes tools/out/mothercup_ble_prod.bin | Bin 92936 -> 92936 bytes tools/out/mothercup_ble_prod.hex | 32 +++++++++---------- tools/out/mothercup_ble_prod_ota.bin | Bin 60168 -> 60168 bytes tools/out/mothercup_ble_prod_ota.json | 4 +-- tools/out/mothercup_ble_prod_ota_app2.bin | Bin 60468 -> 60468 bytes tools/out/mothercup_ble_prod_ota_app2.json | 4 +-- 12 files changed, 33 insertions(+), 24 deletions(-) diff --git a/docs/开发日志.md b/docs/开发日志.md index eb77f3d..53ce4e4 100644 --- a/docs/开发日志.md +++ b/docs/开发日志.md @@ -1689,3 +1689,12 @@ APP2 链接的镜像发向 APP1 区。设备端 END 校验（向量表 Reset PC 里 `LedOff(LED2)`。 - 版本：APP `V1.00.41` → `V1.00.42`（`APP_FW_VERSION_NUM` 0x00010029 → 0x0001002A）。Boot 不动（仍 V1.00.07）。 + +## 72. 状态灯换脚：LED1→PB2、LED2→PB3（2026-09-06，APP V1.00.43，仅 APP） + +- 用户要求避开 PB1（数码管 pin2 冲突）：LED1 从 PB1 改 **PB2**（运行心跳）、 + LED2 从 PB2 改 **PB3**（蓝牙连接指示）。 +- 修改：仅 `app_gpio.h` 的 `LED1_PIN=GPIO_PIN_2`、`LED2_PIN=GPIO_PIN_3` + （端口均为 GPIOB），其余逻辑不变。 +- 版本：APP `V1.00.42` → `V1.00.43`（`APP_FW_VERSION_NUM` 0x0001002A → + 0x0001002B）。Boot 不动（仍 V1.00.07）。 diff --git a/mcm-ddc-ble/MDK-ARM/bin/mcm-ddc-ble-app2.bin b/mcm-ddc-ble/MDK-ARM/bin/mcm-ddc-ble-app2.bin index bcd005f788a37d8450bb4303bfd4de259b95c0a0..d31aae42a3da35cd19f8b96d4dfd1ed495944834 100644 GIT binary patch delta 119 zcmdmTgL%sh<_#)ZJlYJ53}J?P1_pX2#+wbawsCQ@s4+kAs9?|#y2!ElqsccGM&r#d zEOo>fIVOt+cr$WrP7Ls81adY8N&-2j163^;wI_efStg4Hcr&tWP7Ls81adY8N&-2j163^;wI+Y;yvfM4`E*x0lOU6#g4^%!sXti2 Tbm9+|$m{QutkvtX}I0mtU~0jd^^ r+LMoV++<|gJijxYNsvWR!R`0=)E^vRI`Id`WbvLAKywfDc*Fq!ADc8& delta 139 zcmeCU#@um@dBYD49xVn&hA=}t0|Px1qs=Uu+qk%y)R-T5R4`}=U1ZsO)c6|m{QutkvtX}I0n6t30jd^^ rT9c1<++<|hJijxYNsviV!R`0=)E_KhI`Id~WbvLAKywfDc*Fq!79TV$ diff --git a/mcm-ddc-ble/inc/app_gpio.h b/mcm-ddc-ble/inc/app_gpio.h index dcf6963..01d78dc 100644 --- a/mcm-ddc-ble/inc/app_gpio.h +++ b/mcm-ddc-ble/inc/app_gpio.h @@ -63,9 +63,9 @@ extern "C" { #include "n32wb03x.h" #define LED1_PORT GPIOB -#define LED1_PIN GPIO_PIN_1 /* PB1: APP running status LED (heartbeat blink) */ +#define LED1_PIN GPIO_PIN_2 /* PB2: APP running status LED (heartbeat blink) */ #define LED2_PORT GPIOB -#define LED2_PIN GPIO_PIN_2 /* PB2: BLE connected indicator LED */ +#define LED2_PIN GPIO_PIN_3 /* PB3: BLE connected indicator LED */ void LedInit(GPIO_Module* GPIOx, uint16_t Pin); diff --git a/mcm-ddc-ble/inc/app_version.h b/mcm-ddc-ble/inc/app_version.h index 67f80d6..515be1f 100644 --- a/mcm-ddc-ble/inc/app_version.h +++ b/mcm-ddc-ble/inc/app_version.h @@ -9,12 +9,12 @@ #define __APP_VERSION_H__ #ifndef APP_FW_VERSION -#define APP_FW_VERSION "V1.00.42" +#define APP_FW_VERSION "V1.00.43" #endif /* Numeric form used by the BLE info query / OTA records: 0x00MMmmpp */ #ifndef APP_FW_VERSION_NUM -#define APP_FW_VERSION_NUM 0x0001002Au +#define APP_FW_VERSION_NUM 0x0001002Bu #endif #endif /* __APP_VERSION_H__ */ diff --git a/tools/out/mothercup_ble_ota.bin b/tools/out/mothercup_ble_ota.bin index 49573182c2cfc566d263d0add194a7f7b8617b0f..580c2fb876bc1df85532ffafd6441f80dbbb1ed7 100644 GIT binary patch delta 331 zcmeycj{Uc)QH@j)A;N)geV}9UK!Jr{@kz?~u<8LgC z#+yG_=!h|LOb@hX^afIMtr<%v-}Ao(WWKdwlmt@jwv3va{{;LoXVjjqTgsR{Ii)j? zk!ADc&U7Y07DWZO-``VzaDeH=9~{%`D;T{dPwk0gG@hXL4@#AthtC?g-^W;d-BoZL)m%nv*&7&L?~vTXio{Edat zX!8dP9Wh3h>4Daa-au-uHDl@Id;Yh8%(pg-l0b^xmQi!_pMXE+j9SxmOBu5#r*!5q zGHt%xna(80q^RKb`+MpS7BHRogJpVs1*6yGsXcLwM$H!!_HukR7sJ zSAh}g5)J04nK*y+BKpb+Dk!d@786z%NtY9?S4s?M>8~{ao BW*7hf diff --git a/tools/out/mothercup_ble_prod.bin b/tools/out/mothercup_ble_prod.bin index 85691292d81bf503d9c14437c489d15527f07d02..bed06fb1afe4bd8795676cbe156786373fd656a6 100644 GIT binary patch delta 185 zcmeCU#@ca>b%TI|On}PVb%nv*&7&L?~a%?`j`5OzP@#Z}{bi^1rCcixA&B(FY^t?Z#G>4*r+rRHV z{}?_T_`#sTbb-g?|M%vf1$%W0I5y9}plZRWJ^d&L<4s1E?ejSq)0qTW6cyZle^33v X0j3jwa7-8HVO+szy!`+VqemP7CbK_O delta 185 zcmeCU#@ca>b%TI|j7>!IDlG;^26T`f-<7r5(BZuOAHj4Yc?&-*hm{QutkvtX}I0mtU~0jd^^ r+LMoV++<|gJijxYNsvWR!R`0=)E^vRI`Id`WbvLAKywfDc*Fq!ADc8& delta 139 zcmeCU#@um@dBYD49xVn&hA=}t0|Px1qs=Uu+qk%y)R-T5R4`}=U1ZsO)c6|m{QutkvtX}I0n6t30jd^^ rT9c1<++<|hJijxYNsviV!R`0=)E_KhI`Id~WbvLAKywfDc*Fq!79TV$ diff --git a/tools/out/mothercup_ble_prod_ota.json b/tools/out/mothercup_ble_prod_ota.json index fea1b70..2326b3e 100644 --- a/tools/out/mothercup_ble_prod_ota.json +++ b/tools/out/mothercup_ble_prod_ota.json @@ -2,6 +2,6 @@ "file": "mothercup_ble_prod_ota.bin", "target_bank": 1, "size": 60168, - "crc32": "0xAA83583C", - "version": 65578 + "crc32": "0xC79D2450", + "version": 65579 } \ No newline at end of file diff --git a/tools/out/mothercup_ble_prod_ota_app2.bin b/tools/out/mothercup_ble_prod_ota_app2.bin index bcd005f788a37d8450bb4303bfd4de259b95c0a0..d31aae42a3da35cd19f8b96d4dfd1ed495944834 100644 GIT binary patch delta 119 zcmdmTgL%sh<_#)ZJlYJ53}J?P1_pX2#+wbawsCQ@s4+kAs9?|#y2!ElqsccGM&r#d zEOo>fIVOt+cr$WrP7Ls81adY8N&-2j163^;wI_efStg4Hcr&tWP7Ls81adY8N&-2j163^;wI+Y;yvfM4`E*x0lOU6#g4^%!sXti2 Tbm9+|$