Boonlive_RD_Embedded/BLV_C1F_Module
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:全局亮度初始化，默认为100、修改服务信息驱动初始化、修改网络通讯中对于取电上报问题

Browse Source 
1、全局亮度初始化，默认为100
2、修改服务信息驱动
     -> 服务信息驱动初始化中，将部分服务信息状态进行初始化
3、修改网络通讯中对于取电上报问题
This commit is contained in:
caocong
2026-03-14 17:13:36 +08:00
parent 392146013c
commit c1ce5df62c
17 changed files with 28111 additions and 27376 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
BasicCode/Drive/BLV_485_Protocol/BLV_BUS_Dev_C5IOFun.h
View File

@@ -13,25 +13,24 @@
#define C5IO_RecvData_Len_MAX 0x28 //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ݳ<EFBFBD><DDB3><EFBFBD>Ŀǰ<C4BF>30Byte #define C5IO_RecvData_Len_MAX 0x28 //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ݳ<EFBFBD><DDB3><EFBFBD>Ŀǰ<C4BF>30Byte
/*?????<3F><><EFBFBD><EFBFBD>?*/
/*<2A><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>*/ #define BLV_C5IO_Inquire_CMD 0x20 //?<3F><>?<3F><>?<3F><><EFBFBD><EFBFBD>?
#define BLV_C5IO_Inquire_CMD 0x20 //ѯ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> #define BLV_C5IO_Set_Relay_CMD 0x21 //<2F><><EFBFBD><EFBFBD>???<3F><><EFBFBD><EFBFBD>??<3F><>?<3F><><EFBFBD><EFBFBD>?
#define BLV_C5IO_Set_Relay_CMD 0x21 //<2F><><EFBFBD>ü̵<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> #define BLV_C5IO_Set_Relay_Inching_CMD 0x22 //<2F><><EFBFBD><EFBFBD>???<3F><><EFBFBD><EFBFBD>??<3F>¦<EFBFBD>??<3F><>?<3F><><EFBFBD><EFBFBD>?
#define BLV_C5IO_Set_Relay_Inching_CMD 0x22 //<2F><><EFBFBD>ü̵<EFBFBD><EFBFBD><EFBFBD><EFBFBD>㶯<EFBFBD><EFBFBD><EFBFBD><EFBFBD> #define BLV_C5IO_Set_Do_CMD 0x23 //<2F><><EFBFBD><EFBFBD>??DO?<EFBFBD><EFBFBD><EFBFBD><EFBFBD>?
#define BLV_C5IO_Set_Do_CMD 0x23 //<2F><><EFBFBD><EFBFBD>DO<44><4F><EFBFBD><EFBFBD> #define BLV_C5IO_Set_Do_Inching_CMD 0x24 //<2F><><EFBFBD><EFBFBD>??DO<EFBFBD><EFBFBD>??<3F><>?<3F><><EFBFBD><EFBFBD>?
#define BLV_C5IO_Set_Do_Inching_CMD 0x24 //<2F><><EFBFBD><EFBFBD>DO<EFBFBD>㶯<EFBFBD><EFBFBD><EFBFBD><EFBFBD> #define BLV_C5IO_Set_Di_CMD 0x25 //<2F><><EFBFBD><EFBFBD>??DI?<EFBFBD><EFBFBD><EFBFBD><EFBFBD>?
#define BLV_C5IO_Set_Di_CMD 0x25 //<2F><><EFBFBD><EFBFBD>DI<44><49><EFBFBD><EFBFBD>
#define BLV_C5IO_SetRTC_CMD 0x27 // #define BLV_C5IO_SetRTC_CMD 0x27 //
#define BLV_C5IO_Reply_CMD 0xA0 //<EFBFBD>ظ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> #define BLV_C5IO_Reply_CMD 0xA0 //???<3F><>?<EFBFBD><EFBFBD><EFBFBD><EFBFBD>?
#define BLV_C5IO_Reply_Result 0x00 //<2F><>ѯ<EFBFBD><EFBFBD><EFBFBD><EFBFBD> #define BLV_C5IO_Reply_Result 0x00 //2<EFBFBD><EFBFBD>?<EFBFBD><EFBFBD>?<EFBFBD><EFBFBD>1?
#define BLV_C5IO_Relay_Result 0x01 //<EFBFBD>̵<EFBFBD><EFBFBD><EFBFBD>ִ<EFBFBD>гɹ<EFBFBD> #define BLV_C5IO_Relay_Result 0x01 //?<3F><><EFBFBD><EFBFBD>??<3F><>?<3F><>DD3<44><33>1|
#define BLV_C5IO_Relay_Inching_Result 0x02 //<2F>̵<EFBFBD><EFBFBD><EFBFBD><EFBFBD>㶯ִ<EFBFBD>гɹ<EFBFBD> #define BLV_C5IO_Relay_Inching_Result 0x02 //?<EFBFBD><EFBFBD><EFBFBD><EFBFBD>??<3F>¦<EFBFBD>??<3F><>?<3F><>DD3<44><33>1|
#define BLV_C5IO_Do_Result 0x03 //Doִ<EFBFBD>гɹ<EFBFBD> #define BLV_C5IO_Do_Result 0x03 //Do?<3F><>DD3<44><33>1|
#define BLV_C5IO_Do_Inching_Result 0x04 //DO<44>㶯ִ<EFBFBD>гɹ<EFBFBD> #define BLV_C5IO_Do_Inching_Result 0x04 //DO<44><4F>??<3F><>?<3F><>DD3<44><33>1|
#define BLV_C5IO_Di_Result 0x05 //DIִ<EFBFBD>гɹ<EFBFBD> #define BLV_C5IO_Di_Result 0x05 //DI?<3F><>DD3<44><33>1|
#define BLV_C5IO_Error_Result 0xF0 //<2F><><EFBFBD>ݸ<EFBFBD>ʽ<EFBFBD><EFBFBD><EFBFBD><EFBFBD> #define BLV_C5IO_Error_Result 0xF0 //<2F><>y?Y??<3F><>?<3F>䨪?<EFBFBD><EFBFBD>
#define BUS_C5IO_DI_Key_Type 0x01 //DI<44><49><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> - <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> #define BUS_C5IO_DI_Key_Type 0x01 //DI<44><49><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> - <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
#define BUS_C5IO_DI_Pir_Type 0x02 //DI<44><49><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> - PIR<49><52><EFBFBD><EFBFBD> #define BUS_C5IO_DI_Pir_Type 0x02 //DI<44><49><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> - PIR<49><52><EFBFBD><EFBFBD>

42
BasicCode/Drive/BLV_Nor_Dev/BLV_Nor_Dev_ServiceFun.c
View File

@@ -134,36 +134,22 @@ void BLV_Nor_Dev_Service_For_Logic_Init(LOGICFILE_DEVICE_INFO *dev_info,uint8_t
BUS_Public.DevFunInfo.Dev_Output_Loop_State_Get = Service_Loop_State; // BUS_Public.DevFunInfo.Dev_Output_Loop_State_Get = Service_Loop_State; //
DevServiceInfo.ServiceLoopValidNum = ServiceNumMAX; DevServiceInfo.ServiceLoopValidNum = ServiceNumMAX;
DevServiceInfo.DevServiceState[Service_Warning] = 0x01; //Ĭ<>Ͽ<EFBFBD><CFBF><EFBFBD><EFBFBD><EFBFBD>ʾ<EFBFBD><CABE>
DevServiceInfo.DevServiceState[Service_Dnd] = 0x02; //Ĭ<>Ϲر<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> DevServiceInfo.DevServiceState[Service_Dnd] = 0x02; //Ĭ<><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϊ<EFBFBD><EFBFBD>
DevServiceInfo.DevServiceState[Service_Clean] = 0x02; //Ĭ<>Ϲر<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> DevServiceInfo.DevServiceState[Service_Clean] = 0x02; //Ĭ<><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
DevServiceInfo.DevServiceState[Service_Call] = 0x02; //Ĭ<>Ϲرպ<EFBFBD><EFBFBD><EFBFBD> DevServiceInfo.DevServiceState[Service_Luggage] = 0x02; //Ĭ<><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
DevServiceInfo.DevServiceState[Service_Wash] = 0x02; //Ĭ<>Ϲر<CFB9>ϴ<EFBFBD><EFBFBD> DevServiceInfo.DevServiceState[Service_Meals] = 0x02; //<2F>ر<EFBFBD>9<EFBFBD>ŷ<EFBFBD><EFBFBD><EFBFBD>
DevServiceInfo.DevServiceState[Service_CheckOut] = 0x02; //Ĭ<EFBFBD>Ϲر<EFBFBD><EFBFBD>˷<EFBFBD> DevServiceInfo.DevServiceState[Service_CheckOut] = 0x02; //<EFBFBD>ر<EFBFBD><EFBFBD>˷<EFBFBD>
DevServiceInfo.DevServiceState[Service_Wait] = 0x02; //Ĭ<>Ϲر<EFBFBD><EFBFBD>Ժ<EFBFBD> DevServiceInfo.DevServiceState[Service_Strong] = 0x02; //<2F>رձ<D8B1><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
DevServiceInfo.DevServiceState[Service_Sos] = 0x02; //Ĭ<>Ϲر<CFB9>SOS DevServiceInfo.DevServiceState[Service_Wait] = 0x02; //<2F>ر<EFBFBD><D8B1>Ժ<EFBFBD>
DevServiceInfo.DevServiceState[Service_Meals] = 0x02; //Ĭ<>Ϲر<CFB9>ԤԼ<EFBFBD><EFBFBD><EFBFBD><EFBFBD> DevServiceInfo.DevServiceState[Service_Sos] = 0x02; //Ĭ<>Ϲر<CFB9>SOS<EFBFBD><EFBFBD><EFBFBD><EFBFBD>
DevServiceInfo.DevServiceState[Service_Food_Plate] = 0x02; //Ĭ<>Ϲرտ<D8B1><D5BF><EFBFBD>
DevServiceInfo.DevServiceState[Service_Luggage] = 0x02; //Ĭ<>Ϲر<CFB9><D8B1><EFBFBD><EFBFBD><EFBFBD>
DevServiceInfo.DevServiceState[Service_Strong] = 0x02; //Ĭ<>Ϲرձ<D8B1><D5B1><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>޿<EFBFBD>ȡ<EFBFBD><C8A1><EFBFBD>ſں<C5BF>
DevServiceInfo.DevServiceState[Service_Door] = 0x02; //Ĭ<>Ϲر<CFB9><D8B1>Ŵ<EFBFBD>
DevServiceInfo.DevServiceState[Service_Warning] = 0x01; //Ĭ<>Ͽ<EFBFBD><CFBF><EFBFBD><EFBFBD><EFBFBD>ʾ<EFBFBD><CABE> <20><><EFBFBD>ھ<EFBFBD><DABE><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>͹ر<CDB9>
DevServiceInfo.DevServiceState[Service_22] = 0x02; //<2F><><EFBFBD>ӿ<EFBFBD><D3BF>ط<EFBFBD><D8B7><EFBFBD>״̬
DevServiceInfo.DevServiceStateLast[Service_Dnd] = 0x02; //Ĭ<>Ϲر<CFB9><D8B1><EFBFBD><EFBFBD><EFBFBD> DevServiceInfo.DevServiceState[Service_Call] = 0x02; //<2F>رպ<EFBFBD><EFBFBD><EFBFBD>
DevServiceInfo.DevServiceStateLast[Service_Clean] = 0x02; //Ĭ<>Ϲر<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> DevServiceInfo.DevServiceState[Service_22] = 0x02; //<2F><><EFBFBD>ӿ<EFBFBD><EFBFBD>ط<EFBFBD><EFBFBD><EFBFBD>״̬
DevServiceInfo.DevServiceStateLast[Service_Call] = 0x02; //Ĭ<>Ϲرպ<D8B1><D5BA><EFBFBD>
DevServiceInfo.DevServiceStateLast[Service_Wash] = 0x02; //Ĭ<>Ϲر<CFB9>ϴ<EFBFBD><EFBFBD> DevServiceInfo.DevServiceStateLast[Service_Call] = 0x02; //<2F>رպ<D8B1><EFBFBD><EFBFBD>
DevServiceInfo.DevServiceStateLast[Service_CheckOut] = 0x02; //Ĭ<>Ϲر<CFB9><D8B1>˷<EFBFBD> DevServiceInfo.DevServiceStateLast[Service_22] = 0x02; //<2F><><EFBFBD>ӿ<EFBFBD><D3BF>ط<EFBFBD><D8B7><EFBFBD>״̬
DevServiceInfo.DevServiceStateLast[Service_Wait] = 0x02; //Ĭ<>Ϲر<CFB9><D8B1>Ժ<EFBFBD>
DevServiceInfo.DevServiceStateLast[Service_Sos] = 0x02; //Ĭ<>Ϲر<CFB9>SOS
DevServiceInfo.DevServiceStateLast[Service_Meals] = 0x02; //Ĭ<>Ϲر<CFB9>ԤԼ<D4A4><D4BC><EFBFBD><EFBFBD>
DevServiceInfo.DevServiceStateLast[Service_Food_Plate] = 0x02; //Ĭ<>Ϲرտ<D8B1><D5BF><EFBFBD>
DevServiceInfo.DevServiceStateLast[Service_Luggage] = 0x02; //Ĭ<>Ϲر<CFB9><D8B1><EFBFBD><EFBFBD><EFBFBD>
DevServiceInfo.DevServiceStateLast[Service_Strong] = 0x02; //Ĭ<>Ϲرձ<D8B1><D5B1><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>޿<EFBFBD>ȡ<EFBFBD><C8A1><EFBFBD>ſں<C5BF>
DevServiceInfo.DevServiceStateLast[Service_Door] = 0x02; //Ĭ<>Ϲر<CFB9><D8B1>Ŵ<EFBFBD>
DevServiceInfo.DevServiceStateLast[Service_Warning] = 0x01; //Ĭ<>Ͽ<EFBFBD><CFBF><EFBFBD><EFBFBD><EFBFBD>ʾ<EFBFBD><CABE> <20><><EFBFBD>ھ<EFBFBD><DABE><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>͹ر<CDB9>
DevServiceInfo.DevServiceStateLast[Service_22] = 0x02; //<2F><><EFBFBD>ӿ<EFBFBD><D3BF>ط<EFBFBD><D8B7><EFBFBD>״̬
Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"<EFBFBD><EFBFBD><EFBFBD><EFBFBD>һ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϣ<EFBFBD><EFBFBD>˽<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ݳ<EFBFBD><EFBFBD><EFBFBD>:%d",sizeof(NOR_SERVICE_INFO)); Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"<EFBFBD><EFBFBD><EFBFBD><EFBFBD>һ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϣ<EFBFBD><EFBFBD>˽<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ݳ<EFBFBD><EFBFBD><EFBFBD>:%d",sizeof(NOR_SERVICE_INFO));

2
BasicCode/Drive/MAIN/includes.h
View File

@@ -261,7 +261,7 @@
#if (SoftName_Custom_Enable == 0x00) #if (SoftName_Custom_Enable == 0x00)
#if (LOGIC_FILE_EN == 0x01) #if (LOGIC_FILE_EN == 0x01)
#define SoftwareVer "C1F_A_L4_45_260313" //<2F><><EFBFBD><EFBFBD><EFBFBD>汾 20Byte #define SoftwareVer "C1F_A_L4_45_260312" //<2F><><EFBFBD><EFBFBD><EFBFBD>汾 20Byte
#else #else
#define SoftwareVer "C1F_C5_Init220525 " //<2F><><EFBFBD><EFBFBD><EFBFBD>汾 20Byte #define SoftwareVer "C1F_C5_Init220525 " //<2F><><EFBFBD><EFBFBD><EFBFBD>汾 20Byte
#endif #endif

BIN
Pro/Pro-9999_Logic_CC_251027_0x5000_Simplify/MDK_PROJECT/Bin/C1F_A_L4_45_260313_NM.bin → Pro/Pro-9999_Logic_CC_251027_0x5000_Simplify/MDK_PROJECT/Bin/C1F_A_L4_44_260304_NM.bin
View File

Binary file not shown.

5013
Pro/Pro-9999_Logic_CC_251027_0x5000_Simplify/MDK_PROJECT/Listings/C1F_A_L4_45_260313_NM.map → Pro/Pro-9999_Logic_CC_251027_0x5000_Simplify/MDK_PROJECT/Listings/C1F_A_L4_44_260304_NM.map
View File

File diff suppressed because it is too large Load Diff

8
Pro/Pro-9999_Logic_CC_251027_0x5000_Simplify/MDK_PROJECT/Listings/startup_armcm0.lst
View File

@@ -354,10 +354,10 @@ ARM Macro Assembler Page 6
00000000 00000000
Command Line: --debug --xref --diag_suppress=9931 --cpu=Cortex-M0 --apcs=interw Command Line: --debug --xref --diag_suppress=9931 --cpu=Cortex-M0 --apcs=interw
ork --depend=.\objects\startup_armcm0.d -o.\objects\startup_armcm0.o -I.\RTE\_T ork --depend=.\objects\startup_armcm0.d -o.\objects\startup_armcm0.o -I.\RTE\_T
EST -ID:\Keil_v5\ARM\PACK\Keil\WCH57x_DFP\1.1.0\Drivers\CMSIS\Device\WCH\CH57x\ EST -ID:\Keil_v5\Pack\Keil\WCH57x_DFP\1.1.0\Drivers\CMSIS\Device\WCH\CH57x\Incl
Include -ID:\Keil_v5\ARM\CMSIS\Include --predefine="__MICROLIB SETA 1" --predef ude -ID:\Keil_v5\ARM\CMSIS\Include --predefine="__MICROLIB SETA 1" --predefine=
ine="__UVISION_VERSION SETA 529" --list=.\listings\startup_armcm0.lst ..\CORE\s "__UVISION_VERSION SETA 529" --list=.\listings\startup_armcm0.lst ..\CORE\start
tartup_ARMCM0.s up_ARMCM0.s

BIN
Pro/Pro-9999_Logic_CC_251027_0x5000_Simplify/MDK_PROJECT/Objects/C1F_A_L4_45_260313_NM.axf → Pro/Pro-9999_Logic_CC_251027_0x5000_Simplify/MDK_PROJECT/Objects/C1F_A_L4_44_260304_NM.axf
View File

Binary file not shown.

109
Pro/Pro-9999_Logic_CC_251027_0x5000_Simplify/MDK_PROJECT/Objects/C1F_A_L4_45_260313_NM.build_log.htm → Pro/Pro-9999_Logic_CC_251027_0x5000_Simplify/MDK_PROJECT/Objects/C1F_A_L4_44_260304_NM.build_log.htm
View File

@@ -5,10 +5,10 @@
<h2>Tool Versions:</h2> <h2>Tool Versions:</h2>
IDE-Version: ¦ÌVision V5.29.0.0 IDE-Version: ¦ÌVision V5.29.0.0
Copyright (C) 2019 ARM Ltd and ARM Germany GmbH. All rights reserved. Copyright (C) 2019 ARM Ltd and ARM Germany GmbH. All rights reserved.
License Information: 11 ΢ÈíÓû§, ΢ÈíÖйú, LIC=9N0AE-5IIL6-C2RL6-D8CZW-3JTCV-CC614 License Information: cc cc, cc, LIC=8VRJ7-ET3GP-BSUYX-HQQMI-9SM4L-15YCH
Tool Versions: Tool Versions:
Toolchain: MDK-ARM Professional Version: 5.29.0.0 Toolchain: MDK-ARM Plus Version: 5.29.0.0
Toolchain Path: D:\Keil_v5\ARM\ARMCC\Bin Toolchain Path: D:\Keil_v5\ARM\ARMCC\Bin
C Compiler: Armcc.exe V5.06 update 6 (build 750) C Compiler: Armcc.exe V5.06 update 6 (build 750)
Assembler: Armasm.exe V5.06 update 6 (build 750) Assembler: Armasm.exe V5.06 update 6 (build 750)
@@ -21,136 +21,95 @@ Target DLL: Segger\JL2CM3.dll V2.99.36.0
Dialog DLL: TARMCM1.DLL V1.14.1.0 Dialog DLL: TARMCM1.DLL V1.14.1.0
<h2>Project:</h2> <h2>Project:</h2>
D:\Project_git\BLV_C1F_Module\Pro\Pro-9999_Logic_CC_251027_0x5000_Simplify\MDK_PROJECT\project.uvprojx E:\Git_Project_Sourcode\BLV_C1F_Module\Pro\Pro-9999_Logic_CC_251027_0x5000_Simplify\MDK_PROJECT\project.uvprojx
Project File Date: 03/13/2026 Project File Date: 03/04/2026
<h2>Output:</h2> <h2>Output:</h2>
*** Using Compiler 'V5.06 update 6 (build 750)', folder: 'D:\Keil_v5\ARM\ARMCC\Bin' *** Using Compiler 'V5.06 update 6 (build 750)', folder: 'D:\Keil_v5\ARM\ARMCC\Bin'
Rebuild target 'TEST' Build target 'TEST'
assembling startup_ARMCM0.s...
compiling CH57x_sys.c...
compiling CH57x_gpio.c...
compiling CH57x_int.c...
compiling CH57x_pwr.c...
compiling CH57x_clk.c...
compiling CH57x_adc.c...
compiling main.c...
compiling CH57x_uart0.c...
compiling CH57x_uart1.c...
compiling CH57x_timer0.c...
compiling CH57x_flash.c...
compiling CH57x_uart2.c...
compiling CH57x_uart3.c...
compiling CH57x_spi0.c...
compiling CH57x_spi1.c...
compiling Debug.c...
compiling rtc.c...
compiling dwg.c...
compiling key.c... compiling key.c...
compiling Log_api.c...
compiling usart.c...
compiling flash.c...
compiling check_fun.c...
compiling SPI_SRAM.c... compiling SPI_SRAM.c...
compiling md5.c...
compiling rw_logging.c... compiling rw_logging.c...
compiling DNS.c... compiling check_fun.c...
compiling BLV_Authorize.c... compiling main.c...
compiling flash.c...
compiling usart.c...
compiling BLV_485_Dev_Touch_SwiFun.c...
compiling net.c... compiling net.c...
compiling BLV_BUS_Dev_C5IOFun.c...
compiling BLV_485_Dev_CardFun.c... compiling BLV_485_Dev_CardFun.c...
compiling BLV_BUS_Dev_C5MusicFun.c... compiling BLV_485_Dev_TempFun.c...
compiling BLV_485_Protocol.c... compiling BLV_485_Protocol.c...
compiling PC_DeviceTest_Fun.c... compiling PC_DeviceTest_Fun.c...
compiling BLV_NET_Function.c...
compiling BLV_485_Dev_TempFun.c...
compiling BLV_485_Dev_Touch_SwiFun.c...
compiling BLV_485_Dev_IrSendFun.c...
compiling BLV_485_Dev_C7TFun.c...
compiling BLV_485_Dev_A9RelayFun.c... compiling BLV_485_Dev_A9RelayFun.c...
compiling BLV_485_Dev_C7TFun.c...
compiling BLV_485_Dev_IrSendFun.c...
compiling BLV_NET_Function.c...
compiling BLV_485_Dev_PwmFun.c... compiling BLV_485_Dev_PwmFun.c...
compiling BLV_485_Dev_TimeFun.c...
compiling BLV_Nor_DevFun.c... compiling BLV_Nor_DevFun.c...
compiling BLV_BUS_Dev_C12DimmingFun.c... compiling BLV_BUS_Dev_C12DimmingFun.c...
compiling BLV_485_Dev_XiaoBaoFun.c... compiling BLV_485_Dev_XiaoBaoFun.c...
compiling BLV_485_Dev_TempT1Fun.c...
compiling BLV_All_Dev_Init.c... compiling BLV_All_Dev_Init.c...
compiling BLV_485_Dev_A9LDFun.c... compiling BLV_485_Dev_TempT1Fun.c...
compiling BLV_485_Dev_RGB_Light_BeltFun.c... compiling BLV_485_Dev_RGB_Light_BeltFun.c...
compiling BLV_485_Dev_PirFun.c... compiling BLV_485_Dev_PirFun.c...
compiling BLV_485_Dev_LEDFun.c...
compiling BLV_485_Dev_SliderFun.c... compiling BLV_485_Dev_SliderFun.c...
compiling BLV_485_Dev_AirRevealFun.c... compiling BLV_485_Dev_AirRevealFun.c...
compiling BLV_485_Dev_A9IO_SwiFun.c... compiling BLV_485_Dev_LEDFun.c...
compiling BLV_485_Dev_SwitchFun.c...
compiling BLV_485_Dev_AirDetectFun.c... compiling BLV_485_Dev_AirDetectFun.c...
compiling BLV_485_Dev_SwitchFun.c...
compiling BLV_Dev_Action.c...
compiling BLV_485_Dev_A8PBFun.c... compiling BLV_485_Dev_A8PBFun.c...
compiling BLV_485_Dev_BLWMusicFun.c... compiling BLV_485_Dev_BLWMusicFun.c...
compiling BLV_Dev_Action.c...
compiling BLV_485_Dev_MusicFun.c...
compiling BLV_485_Dev_C5RelayFun.c...
compiling BLV_485_Dev_C12DimFun.c...
compiling BLV_485_Dev_IN_CH6.c...
compiling BLV_485_Dev_SwiRelayFun.c... compiling BLV_485_Dev_SwiRelayFun.c...
compiling BLV_485_Dev_MusicFun.c...
compiling BLV_485_Dev_HuaErSiFun.c... compiling BLV_485_Dev_HuaErSiFun.c...
compiling BLV_485_Dev_CardStateFun.c... compiling BLV_485_Dev_CardStateFun.c...
compiling BLV_TempPrompt_Action.c... compiling BLV_TempPrompt_Action.c...
compiling BLV_485_Dev_LCDFun.c... compiling BLV_485_Dev_LCDFun.c...
compiling BLV_485_Dev_FloorHeatFun.c... compiling BLV_485_Dev_FloorHeatFun.c...
compiling BLV_485_Dev_FreshAirFun.c...
compiling BLV_485_Dev_CLEDFloorHeatFun.c... compiling BLV_485_Dev_CLEDFloorHeatFun.c...
compiling BLV_485_Dev_CLEDFreshAirFun.c... compiling BLV_485_Dev_CLEDFreshAirFun.c...
compiling BLV_485_Dev_BLWFloorHeatFun.c... compiling BLV_485_Dev_FreshAirFun.c...
compiling BLV_485_Dev_BLWFreshAirFun.c... compiling BLV_485_Dev_BLWFreshAirFun.c...
compiling BLV_485_Dev_BLWFloorHeatFun.c...
compiling BLV_485_Dev_BLE_Music.c... compiling BLV_485_Dev_BLE_Music.c...
compiling BLV_485_Dev_ShangJingTianIrSendFun.c... compiling BLV_485_Dev_ShangJingTianIrSendFun.c...
compiling BLV_485_Dev_EnergyMonitor.c...
compiling BLV_485_Dev_Rotary_SwitchFun.c... compiling BLV_485_Dev_Rotary_SwitchFun.c...
compiling BLV_485_Dev_BLVP1_Rotary_Switch.c... compiling BLV_485_Dev_BLVP1_Rotary_Switch.c...
compiling BLV_485_Dev_EnergyMonitor.c...
compiling BLV_485_Dev_BLVP2_Rotary_Switch.c... compiling BLV_485_Dev_BLVP2_Rotary_Switch.c...
compiling BLV_485_Dev_CurtainFun.c... compiling BLV_485_Dev_CurtainFun.c...
compiling BLV_485_Dev_BLWLockFun.c...
compiling BLV_485_Dev_BinShen_Curtain.c... compiling BLV_485_Dev_BinShen_Curtain.c...
compiling BLV_485_Dev_ChuangJiaLockFun.c... compiling BLV_485_Dev_BLWLockFun.c...
compiling BLV_485_Dev_WeixinLockFun.c... compiling BLV_485_Dev_WeixinLockFun.c...
compiling BLV_485_Dev_ChuangJiaLockFun.c...
compiling BLV_RF_GatewayHost.c... compiling BLV_RF_GatewayHost.c...
compiling BLV_485_Dev_FreegoLockFun.c... compiling BLV_485_Dev_FreegoLockFun.c...
compiling BLV_485_Dev_YangGeLockFun.c...
compiling BLV_485_Dev_PB20_Relay_Fun.c... compiling BLV_485_Dev_PB20_Relay_Fun.c...
compiling BLV_485_Dev_PB20_LED_Fun.c... compiling BLV_485_Dev_PB20_LED_Fun.c...
compiling BLV_485_Dev_YangGeLockFun.c...
compiling BLV_485_Dev_PB20_Strip_Fun.c... compiling BLV_485_Dev_PB20_Strip_Fun.c...
compiling BLV_Bus_Dev_PB20Fun.c... compiling BLV_Bus_Dev_PB20Fun.c...
compiling BLV_Nor_Dev_ServiceFun.c... compiling BLV_Nor_Dev_ServiceFun.c...
compiling BLV_Nor_Dev_LVoutputFun.c...
compiling BLV_Nor_Dev_LVinputFun.c... compiling BLV_Nor_Dev_LVinputFun.c...
compiling BLV_Nor_Dev_LVoutputFun.c...
compiling BLV_Nor_Dev_CurtainFun.c... compiling BLV_Nor_Dev_CurtainFun.c...
compiling BLV_Nor_Dev_HVoutFun.c... compiling BLV_Nor_Dev_HVoutFun.c...
compiling BLV_Nor_Dev_ColorTemp.c...
compiling BLV_Nor_Dev_NoCard.c... compiling BLV_Nor_Dev_NoCard.c...
compiling BLV_Nor_Dev_VirtualTimeFun.c... compiling BLV_Nor_Dev_VirtualTimeFun.c...
compiling BLV_Nor_Dev_GlobalSet.c... compiling BLV_Nor_Dev_ColorTemp.c...
compiling BLV_Nor_Dev_CarbonFun.c... compiling BLV_Nor_Dev_CarbonFun.c...
compiling BLV_Nor_Dev_Scene_Restore.c...
compiling utils_hmac.c...
compiling aLiYun.c...
compiling BLV_Nor_Dev_VirtualCard.c... compiling BLV_Nor_Dev_VirtualCard.c...
compiling utils_md5.c... compiling BLV_Nor_Dev_GlobalSet.c...
compiling MQTTConnectClient.c...
compiling MQTTDeserializePublish.c...
compiling MQTTFormat.c...
compiling MQTTPacket.c...
compiling mqtt.c... compiling mqtt.c...
compiling BLV_Nor_Dev_Scene_Restore.c...
compiling Udp_Internal_Protocol.c... compiling Udp_Internal_Protocol.c...
compiling MQTTSerializePublish.c...
compiling MQTTSubscribeClient.c...
compiling MQTTUnsubscribeClient.c...
compiling BLV_Logic_Edit.c... compiling BLV_Logic_Edit.c...
compiling utils_sha1.c...
linking... linking...
Program Size: Code=221384 RO-data=8324 RW-data=812 ZI-data=22660 Program Size: Code=221292 RO-data=8324 RW-data=812 ZI-data=22660
FromELF: creating hex file... FromELF: creating hex file...
After Build - User command #1: D:\Keil_v5\\ARM\ARMCC\bin\fromelf.exe --bin --output=Bin\C1F_A_L4_45_260313_NM.bin .\Objects\C1F_A_L4_45_260313_NM.axf After Build - User command #1: D:\Keil_v5\\ARM\ARMCC\bin\fromelf.exe --bin --output=Bin\C1F_A_L4_44_260304_NM.bin .\Objects\C1F_A_L4_44_260304_NM.axf
".\Objects\C1F_A_L4_45_260313_NM.axf" - 0 Error(s), 0 Warning(s). ".\Objects\C1F_A_L4_44_260304_NM.axf" - 0 Error(s), 0 Warning(s).
<h2>Software Packages used:</h2> <h2>Software Packages used:</h2>
@@ -161,10 +120,10 @@ Package Vendor: Keil
<h2>Collection of Component include folders:</h2> <h2>Collection of Component include folders:</h2>
.\RTE\_TEST .\RTE\_TEST
D:\Keil_v5\ARM\PACK\Keil\WCH57x_DFP\1.1.0\Drivers\CMSIS\Device\WCH\CH57x\Include D:\Keil_v5\Pack\Keil\WCH57x_DFP\1.1.0\Drivers\CMSIS\Device\WCH\CH57x\Include
<h2>Collection of Component Files used:</h2> <h2>Collection of Component Files used:</h2>
Build Time Elapsed: 00:00:14 Build Time Elapsed: 00:00:17
</pre> </pre>
</body> </body>
</html> </html>

14370
Pro/Pro-9999_Logic_CC_251027_0x5000_Simplify/MDK_PROJECT/Objects/C1F_A_L4_44_260304_NM.hex Normal file
View File

File diff suppressed because it is too large Load Diff

2066
Pro/Pro-9999_Logic_CC_251027_0x5000_Simplify/MDK_PROJECT/Objects/C1F_A_L4_45_260313_NM.htm → Pro/Pro-9999_Logic_CC_251027_0x5000_Simplify/MDK_PROJECT/Objects/C1F_A_L4_44_260304_NM.htm
View File

File diff suppressed because it is too large Load Diff

4
Pro/Pro-9999_Logic_CC_251027_0x5000_Simplify/MDK_PROJECT/Objects/C1F_A_L4_45_260313_NM.lnp → Pro/Pro-9999_Logic_CC_251027_0x5000_Simplify/MDK_PROJECT/Objects/C1F_A_L4_44_260304_NM.lnp
View File

@@ -119,7 +119,7 @@
".\objects\mqttserializepublish.o" ".\objects\mqttserializepublish.o"
".\objects\mqttsubscribeclient.o" ".\objects\mqttsubscribeclient.o"
".\objects\mqttunsubscribeclient.o" ".\objects\mqttunsubscribeclient.o"
--library_type=microlib --strict --scatter ".\Objects\C1F_A_L4_45_260313_NM.sct" --library_type=microlib --strict --scatter ".\Objects\C1F_A_L4_44_260304_NM.sct"
--summary_stderr --info summarysizes --map --load_addr_map_info --xref --callgraph --symbols --summary_stderr --info summarysizes --map --load_addr_map_info --xref --callgraph --symbols
--info sizes --info totals --info unused --info veneers --info sizes --info totals --info unused --info veneers
--list ".\Listings\C1F_A_L4_45_260313_NM.map" -o .\Objects\C1F_A_L4_45_260313_NM.axf --list ".\Listings\C1F_A_L4_44_260304_NM.map" -o .\Objects\C1F_A_L4_44_260304_NM.axf

0
Pro/Pro-9999_Logic_CC_251027_0x5000_Simplify/MDK_PROJECT/Objects/C1F_A_L4_45_260313_NM.sct → Pro/Pro-9999_Logic_CC_251027_0x5000_Simplify/MDK_PROJECT/Objects/C1F_A_L4_44_260304_NM.sct
View File

14376
Pro/Pro-9999_Logic_CC_251027_0x5000_Simplify/MDK_PROJECT/Objects/C1F_A_L4_45_260313_NM.hex
View File

File diff suppressed because it is too large Load Diff

18562
Pro/Pro-9999_Logic_CC_251027_0x5000_Simplify/MDK_PROJECT/Objects/project_TEST.dep
View File

File diff suppressed because it is too large Load Diff

901
Pro/Pro-9999_Logic_CC_251027_0x5000_Simplify/MDK_PROJECT/project.uvguix.Administrator
View File

File diff suppressed because one or more lines are too long

2
Pro/Pro-9999_Logic_CC_251027_0x5000_Simplify/MDK_PROJECT/project.uvprojx
View File

@@ -49,7 +49,7 @@
<InvalidFlash>1</InvalidFlash> <InvalidFlash>1</InvalidFlash>
</TargetStatus> </TargetStatus>
<OutputDirectory>.\Objects\</OutputDirectory> <OutputDirectory>.\Objects\</OutputDirectory>
<OutputName>C1F_A_L4_45_260313_NM</OutputName> <OutputName>C1F_A_L4_44_260304_NM</OutputName>
<CreateExecutable>1</CreateExecutable> <CreateExecutable>1</CreateExecutable>
<CreateLib>0</CreateLib> <CreateLib>0</CreateLib>
<CreateHexFile>1</CreateHexFile> <CreateHexFile>1</CreateHexFile>

1
Readme.md
View File

@@ -9,7 +9,6 @@
2、修改服务信息驱动 2、修改服务信息驱动
-> 服务信息驱动初始化中，将部分服务信息状态进行初始化 -> 服务信息驱动初始化中，将部分服务信息状态进行初始化
3、修改网络通讯中对于取电上报问题 3、修改网络通讯中对于取电上报问题
4、温控器提示音修改不能单独控制开关机提示音和模式提示音的问题
``` ```
### 2026-03-04 ### 2026-03-04