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 bcd005f..d31aae4 100644 Binary files a/mcm-ddc-ble/MDK-ARM/bin/mcm-ddc-ble-app2.bin and b/mcm-ddc-ble/MDK-ARM/bin/mcm-ddc-ble-app2.bin differ diff --git a/mcm-ddc-ble/MDK-ARM/bin/mcm-ddc-ble.bin b/mcm-ddc-ble/MDK-ARM/bin/mcm-ddc-ble.bin index 7d6d6fb..b863698 100644 Binary files a/mcm-ddc-ble/MDK-ARM/bin/mcm-ddc-ble.bin and b/mcm-ddc-ble/MDK-ARM/bin/mcm-ddc-ble.bin differ 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 4957318..580c2fb 100644 Binary files a/tools/out/mothercup_ble_ota.bin and b/tools/out/mothercup_ble_ota.bin differ diff --git a/tools/out/mothercup_ble_prod.bin b/tools/out/mothercup_ble_prod.bin index 8569129..bed06fb 100644 Binary files a/tools/out/mothercup_ble_prod.bin and b/tools/out/mothercup_ble_prod.bin differ diff --git a/tools/out/mothercup_ble_prod.hex b/tools/out/mothercup_ble_prod.hex index 541cf04..6d0f7aa 100644 --- a/tools/out/mothercup_ble_prod.hex +++ b/tools/out/mothercup_ble_prod.hex @@ -916,8 +916,8 @@ :103920000000000000000000000000000000000097 :103930000000000000000000000000000000000087 :1040000011C011CA010000000080000108EB00008F -:104010003C5883AA2A0001000000000000000000B4 -:0C4020000000000000000000675F8A6ADA +:1040100050249DC72B00010000000000000000009C +:0C4020000000000000000000E563E9C3A0 :10800000F8BD00206981000171810001DDBB000124 :108010000000000000000000000000000000000060 :1080200000000000000000000000000045C000014A @@ -1573,8 +1573,8 @@ :10A8C000854203D134A004F0E5F903E029463AA01B :10A8D00004F07AF90AF0F4F97D21C900FDF752FC81 :10A8E000014639A004F070F909F0F2FD01463AA0E2 -:10A8F00004F06AF9F8BD00002A00010056312E303C -:10A90000302E3432000000006669726D7761726526 +:10A8F00004F06AF9F8BD00002B00010056312E303B +:10A90000302E3433000000006669726D7761726525 :10A910003A202573202830782530386C58290D0AC4 :10A92000000000006375722062616E6B3A20415036 :10A930005025750D0A000000FF7F000063686970F4 @@ -1745,8 +1745,8 @@ :10B380006C6574652C2055502F444F574E203D203E :10B39000686973746F72790D0A00000070B50C460D :10B3A000032822DB61681D4D0A78312A02D0322A37 -:10B3B00005D01AE04878002817D1022603E0487823 -:10B3C000002812D1042616A1A068FCF778FF0028F7 +:10B3B00005D01AE04878002817D1042603E0487821 +:10B3C000002812D1082616A1A068FCF778FF0028F3 :10B3D0000FD014A1A068FCF772FF00280ED012A1B4 :10B3E000A068FCF76CFF00280DD011A003F052FC00 :10B3F00070BD3146284600F099FC08E031462846E9 @@ -1825,7 +1825,7 @@ :10B880002C20727820717565756520666C757368FB :10B8900065640D0A0000000010B506A108A003F0C1 :10B8A00093F90DA003F0F6F91948016819A003F007 -:10B8B0008BF910BD56312E30302E3432000000008E +:10B8B0008BF910BD56312E30302E3433000000008D :10B8C0006669726D776172652076657273696F6EF5 :10B8D0003A2025730D0A00006D636D2D6464632D9D :10B8E000626C653A20424C45287264747373292057 @@ -2180,12 +2180,12 @@ :10CEB000C001D08308480090684604F037F819B0E4 :10CEC00000BD000003160A18000000000AFFFFFF63 :10CED0004E6174696F6E7300DDCE00017047000013 -:10CEE00010B509490020087004210848FEF71EFF0C +:10CEE00010B509490020087008210848FEF71EFF08 :10CEF00000F08EF9002802D005A0FFF751FAF720C4 :10CF000004F088F910BD000037470020000C0140F4 :10CF10005B424C455D20636F6E6E65637465640DA6 :10CF20000A00000010B504F025F800F07FF9074969 -:10CF30000020087004210648FEF7F4FE00F068F9AE +:10CF30000020087008210648FEF7F4FE00F068F9AA :10CF4000002802D003A0FFF72BFA10BD37470020BE :10CF5000000C01405B424C455D20646973636F6E59 :10CF60006E65637465642C206164766572746973A0 @@ -2206,8 +2206,8 @@ :10D0500000BD000065D0000109DF0001D9D5000145 :10D06000F1DC00010178012928D070B50024144DAD :10D07000144E022912D003290FD103F07BFF00F0D8 -:10D08000D5F82C7004213046FEF74CFE00F0C0F8B5 -:10D09000002802D00C48FFF783F970BD2C700421E2 +:10D08000D5F82C7008213046FEF74CFE00F0C0F8B1 +:10D09000002802D00C48FFF783F970BD2C700821DE :10D0A0003046FEF743FE00F0B3F8002802D00748F0 :10D0B000FFF776F9F72004F0ADF870BD7047000077 :10D0C00037470020000C014054CF000110CF000171 @@ -3107,7 +3107,7 @@ :10089000FDF712F91049884201D1022000E0012041 :1008A000694608740120009004AB22460799069817 :1008B00000F014F809B0F0BD079809B0F0BD0000D1 -:1008C000FFFF00002A00010000080240A4470020AA +:1008C000FFFF00002B00010000080240A4470020A9 :1008D000FF7F0000000020410040020130B4029C74 :1008E00042540546491C88B22C54401C002180B259 :1008F000002C07D95A5C2A54401C491CC9B280B24A @@ -3120,7 +3120,7 @@ :100960004360286004E060682860201DF7F77CFC85 :10097000201D2660F8BD251D2C68002CE2D100202A :10098000F8BD00002C4800207D260D4C0D4DF600D2 -:1009900004F086F9022802D104F092F920600221C5 +:1009900004F086F9022802D104F092F920600421C3 :1009A0002846FBF795F9FDF75BF900897D21C90021 :1009B00048433146F7F7E6FB03F04EFCE8E700005A :1009C00038470020000C014010B5A0230949022837 @@ -3159,8 +3159,8 @@ :100BD00039A13CA0FBF7E4FB4048016840A0FBF7CB :100BE000DFFB46A14AA0FBF7DBFB52A0FBF7D8FBDB :100BF000FDF798F9FCF710FAFCF700FBFDF734F865 -:100C000001F054F8564C02212046FBF765F8042108 -:100C10002046FBF761F804212046FBF783F8022009 +:100C000001F054F8564C04212046FBF765F8082102 +:100C10002046FBF761F808212046FBF783F8022005 :100C20000025020200902B464EA101954E4803F08C :100C30007BFF0124002322024CA14E480195009421 :100C400003F072FF002380224BA14C4801950094D1 @@ -3170,7 +3170,7 @@ :100C80003D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D94 :100C90003D0A0000206D636D2D6464632D626C65F8 :100CA0003A20424C45202B204672656552544F53E2 -:100CB000202B20434C490A0056312E30302E34323E +:100CB000202B20434C490A0056312E30302E34333D :100CC00000000000204669726D77617265207665CC :100CD0007273696F6E2025730A00000000400020C7 :100CE0002053797374656D436F7265436C6F636BEA diff --git a/tools/out/mothercup_ble_prod_ota.bin b/tools/out/mothercup_ble_prod_ota.bin index 7d6d6fb..b863698 100644 Binary files a/tools/out/mothercup_ble_prod_ota.bin and b/tools/out/mothercup_ble_prod_ota.bin differ 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 bcd005f..d31aae4 100644 Binary files a/tools/out/mothercup_ble_prod_ota_app2.bin and b/tools/out/mothercup_ble_prod_ota_app2.bin differ diff --git a/tools/out/mothercup_ble_prod_ota_app2.json b/tools/out/mothercup_ble_prod_ota_app2.json index f9029f5..c920bd0 100644 --- a/tools/out/mothercup_ble_prod_ota_app2.json +++ b/tools/out/mothercup_ble_prod_ota_app2.json @@ -2,6 +2,6 @@ "file": "mothercup_ble_prod_ota_app2.bin", "target_bank": 2, "size": 60468, - "crc32": "0xABC86CA6", - "version": 65578 + "crc32": "0xC6D610CA", + "version": 65579 } \ No newline at end of file