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

fix:修改全局设置驱动

Browse Source 
修改方法 - 退出睡眠模式，跳过执行起夜动作，直接退出起夜模式而不是进入；当前不处于睡眠模式时，但处于进入起夜状态时，也要退出起夜。
This commit is contained in:
caocong
2026-03-30 20:22:22 +08:00
parent 55fd9765db
commit fb1c6d83aa
18 changed files with 30001 additions and 29802 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
BasicCode/Drive/BLV_Nor_Dev/BLV_Nor_Dev_GlobalSet.c
View File

@@ -200,9 +200,7 @@ void BLV_GlobalSet_Control_State(uint32_t CfgDevAddIn, uint16_t DevInputAddr, ui
// GlobalSet_Inf.global_light = ctr_state;
//<2F><><EFBFBD>ӷ<EFBFBD><D3B7><EFBFBD> - <20>˳<EFBFBD>˯<EFBFBD><CBAF>ģʽ<C4A3><CABD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ִ<EFBFBD><D6B4><EFBFBD><EFBFBD>ҹ<EFBFBD><D2B9><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ֱ<EFBFBD>ӽ<EFBFBD><D3BD><EFBFBD><EFBFBD><EFBFBD>ҹģʽ <20><>ǰ<EFBFBD><C7B0><EFBFBD>ǵ<EFBFBD>ǰ<EFBFBD><C7B0><EFBFBD><EFBFBD>˯<EFBFBD><CBAF>ģʽ<C4A3><CABD>
if( (ctr_state == 0x01)
&& (DevActionGlobal.SleepMode_State == 0x01) //<2F><><EFBFBD><EFBFBD>˯<EFBFBD><CBAF>ģʽ
&& (DevActionGlobal.SleepLight_State == 0x00) )
if(ctr_state == 0x01)
{
Dev_SleepState_Set();
Dbg_Println(DBG_BIT_Debug_STATUS_bit,"GlobalSet_Inf SleepState:%d,ctr_mode:%d,",ctr_state,ctr_mode);
@@ -282,10 +280,16 @@ uint16_t Dev_DimGlobalValue_Get(void)
uint8_t Dev_SleepState_Set(void)//uint8_t SleepState)
{
uint8_t ret = 0x00;
DevActionGlobal.SleepMode_State = 0x00; //<2F>˳<EFBFBD>˯<EFBFBD><CBAF>ģʽ 2026-03-26
DevActionGlobal.SleepLight_State = 0x01;
DevActionGlobal.DevActionU64Cond.NeightState = NightModeOpen; //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ҹ 2026-03-26
if( (DevActionGlobal.SleepMode_State == 0x01) && (DevActionGlobal.SleepLight_State == 0x00) ) //<2F><>˯<EFBFBD><CBAF>ģʽ
{
DevActionGlobal.SleepMode_State = 0x00; //<2F>˳<EFBFBD>˯<EFBFBD><CBAF>ģʽ 2026-03-26
DevActionGlobal.SleepLight_State = 0x01;
DevActionGlobal.DevActionU64Cond.NeightState = NightModeClose; //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ҹ 2026-03-26
}
if(DevActionGlobal.DevActionU64Cond.NeightState == NightModeOpen) //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ҹ<EFBFBD><D2B9>ҹ<EFBFBD><D2B9>ģʽ<C4A3><CABD>
{
DevActionGlobal.DevActionU64Cond.NeightState = NightModeClose; //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ҹ<EFBFBD><D2B9>
}
return ret;
}

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

@@ -265,7 +265,7 @@ void BLW_Service_Control_State(uint32_t CfgDevAddIn, uint16_t DevInputAddr, uint
{
if(NightModeStart != DevActionGlobal.DevActionU64Cond.NeightState)
{
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>ߣ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ҹ"); //<2F>г<EFBFBD><D0B3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"<EFBFBD>豸<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>2<EFBFBD><EFBFBD><EFBFBD>г<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>˯<EFBFBD>ߣ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ҹ"); //<2F>г<EFBFBD><D0B3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
DevActionGlobal.DevActionU64Cond.NeightState = NightModeStart; //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ҹ
}
}

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

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

11
BasicCode/Logic_Scheduling/BLV_Dev_Action/BLV_Dev_Action.c
View File

@@ -871,7 +871,7 @@ void DevAction_ExpandCtrl(DEV_ACTION_INFO *DevActionInfo)
if(NULL != BUS_Public.DevFunInfo.Dev_Output_Group_Ctrl) //<2F>ǿ<EFBFBD>
{
BUS_Public.DevFunInfo.Dev_Output_Group_Ctrl(DevActionInfo->DevActionState.DevAddrIn, DevActionInfo->DevActionInput.inAddr, DevAddrOut, expand_type[j].ExpandReadFlag, HVoutNumMAX, expand_type[j].ExpandReadState);
Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"<EFBFBD>̵<EFBFBD><EFBFBD><EFBFBD>״̬Ⱥ<EFBFBD>ؿ<EFBFBD><EFBFBD>ƿ<EFBFBD>ʼ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>·<EFBFBD><EFBFBD>־:%08X <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:%s ", expand_type[j].ExpandReadFlag, DevActionInfo->DevActionCore.DevActionName);
Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"<EFBFBD>̵<EFBFBD><EFBFBD><EFBFBD>״̬Ⱥ<EFBFBD>ؿ<EFBFBD><EFBFBD>ƿ<EFBFBD>ʼ1<EFBFBD><EFBFBD><EFBFBD><EFBFBD>·<EFBFBD><EFBFBD>־:%08X <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:%s ", expand_type[j].ExpandReadFlag, DevActionInfo->DevActionCore.DevActionName);
}
expand_type[j].ExpandReadFlag=0x00;
}
@@ -1238,7 +1238,7 @@ void DevAction_ExpandLightOpen(DEV_ACTION_INFO *DevActionInfo)
if(NULL != BUS_Public.DevFunInfo.Dev_Output_Group_Ctrl) //<2F>ǿ<EFBFBD>
{
BUS_Public.DevFunInfo.Dev_Output_Group_Ctrl(NULL, NULL, DevAddrOut, expand_type[j].ExpandReadFlag, HVoutNumMAX, expand_type[j].ExpandReadState);
Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"<EFBFBD>̵<EFBFBD><EFBFBD><EFBFBD>״̬Ⱥ<EFBFBD>ؿ<EFBFBD><EFBFBD>ƿ<EFBFBD>ʼ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>·<EFBFBD><EFBFBD>־:%08X <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:%s ", expand_type[j].ExpandReadFlag, DevActionInfo->DevActionCore.DevActionName);
Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"<EFBFBD>̵<EFBFBD><EFBFBD><EFBFBD>״̬Ⱥ<EFBFBD>ؿ<EFBFBD><EFBFBD>ƿ<EFBFBD>ʼ2<EFBFBD><EFBFBD><EFBFBD><EFBFBD>·<EFBFBD><EFBFBD>־:%08X <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:%s ", expand_type[j].ExpandReadFlag, DevActionInfo->DevActionCore.DevActionName);
}
expand_type[j].ExpandReadFlag=0x00;
}
@@ -1412,7 +1412,7 @@ void DevAction_ExpandLightClose(DEV_ACTION_INFO *DevActionInfo)
if(NULL != BUS_Public.DevFunInfo.Dev_Output_Group_Ctrl) //<2F>ǿ<EFBFBD>
{
BUS_Public.DevFunInfo.Dev_Output_Group_Ctrl(NULL, NULL, DevAddrOut, expand_type[j].ExpandReadFlag, HVoutNumMAX, expand_type[j].ExpandReadState);
Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"<EFBFBD>̵<EFBFBD><EFBFBD><EFBFBD>״̬Ⱥ<EFBFBD>ؿ<EFBFBD><EFBFBD>ƿ<EFBFBD>ʼ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>·<EFBFBD><EFBFBD>־:%08X <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:%s ", expand_type[j].ExpandReadFlag, DevActionInfo->DevActionCore.DevActionName);
Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"<EFBFBD>̵<EFBFBD><EFBFBD><EFBFBD>״̬Ⱥ<EFBFBD>ؿ<EFBFBD><EFBFBD>ƿ<EFBFBD>ʼ3<EFBFBD><EFBFBD><EFBFBD><EFBFBD>·<EFBFBD><EFBFBD>־:%08X <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:%s ", expand_type[j].ExpandReadFlag, DevActionInfo->DevActionCore.DevActionName);
}
expand_type[j].ExpandReadFlag=0x00;
}
@@ -1562,7 +1562,7 @@ void DevAction_ExpandClose(DEV_ACTION_INFO *DevActionInfo, uint8_t ModeCtrl)
if(NULL != BUS_Public.DevFunInfo.Dev_Output_Group_Ctrl) //<2F>ǿ<EFBFBD>
{
BUS_Public.DevFunInfo.Dev_Output_Group_Ctrl(NULL, NULL, DevAddrOut, expand_type[j].ExpandReadFlag, HVoutNumMAX, expand_type[j].ExpandReadState);
Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"<EFBFBD>̵<EFBFBD><EFBFBD><EFBFBD>״̬Ⱥ<EFBFBD>ؿ<EFBFBD><EFBFBD>ƿ<EFBFBD>ʼ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>·<EFBFBD><EFBFBD>־:%08X <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:%s ", expand_type[j].ExpandReadFlag, DevActionInfo->DevActionCore.DevActionName);
Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"<EFBFBD>̵<EFBFBD><EFBFBD><EFBFBD>״̬Ⱥ<EFBFBD>ؿ<EFBFBD><EFBFBD>ƿ<EFBFBD>ʼ4<EFBFBD><EFBFBD><EFBFBD><EFBFBD>·<EFBFBD><EFBFBD>־:%08X <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:%s ", expand_type[j].ExpandReadFlag, DevActionInfo->DevActionCore.DevActionName);
}
expand_type[j].ExpandReadFlag=0x00;
}
@@ -1951,6 +1951,7 @@ void DevAction_No_Ctrl(uint16_t DevActionNo, uint8_t Mode, uint16_t CtrlState)
if(NightModeStart != DevActionGlobal.DevActionU64Cond.NeightState)
{
DevActionGlobal.DevActionU64Cond.NeightState = NightModeStart; //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ҹ
Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"<EFBFBD><EFBFBD><EFBFBD><EFBFBD>˯<EFBFBD>߳<EFBFBD><EFBFBD><EFBFBD>00");
}
}
@@ -2005,7 +2006,7 @@ void DevAction_DevAddr_Ctrl(uint32_t DevActionAddr, uint8_t Mode, uint8_t SceneM
{
if(NightModeStart != DevActionGlobal.DevActionU64Cond.NeightState)
{
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>ߣ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ҹ"); //<2F>г<EFBFBD><D0B3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"<EFBFBD>豸<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>43<EFBFBD><EFBFBD><EFBFBD>г<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>˯<EFBFBD>ߣ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ҹ"); //<2F>г<EFBFBD><D0B3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
DevActionGlobal.DevActionU64Cond.NeightState = NightModeStart; //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ҹ
}
}

BIN
Pro/Pro-9999_Logic_CC_251027_0x5000_Simplify/MDK_PROJECT/Bin/C1F_A_L4_45_260327_NM.bin → Pro/Pro-9999_Logic_CC_251027_0x5000_Simplify/MDK_PROJECT/Bin/C1F_A_L4_45_260330_NM.bin
View File

Binary file not shown.

4907
Pro/Pro-9999_Logic_CC_251027_0x5000_Simplify/MDK_PROJECT/Listings/C1F_A_L4_45_260327_NM.map → Pro/Pro-9999_Logic_CC_251027_0x5000_Simplify/MDK_PROJECT/Listings/C1F_A_L4_45_260330_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
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
EST -ID:\Keil_v5\ARM\PACK\Keil\WCH57x_DFP\1.1.0\Drivers\CMSIS\Device\WCH\CH57x\
Include -ID:\Keil_v5\ARM\CMSIS\Include --predefine="__MICROLIB SETA 1" --predef
ine="__UVISION_VERSION SETA 529" --list=.\listings\startup_armcm0.lst ..\CORE\s
tartup_ARMCM0.s
EST -ID:\Keil_v5\Pack\Keil\WCH57x_DFP\1.1.0\Drivers\CMSIS\Device\WCH\CH57x\Incl
ude -ID:\Keil_v5\ARM\CMSIS\Include --predefine="__MICROLIB SETA 1" --predefine=
"__UVISION_VERSION SETA 529" --list=.\listings\startup_armcm0.lst ..\CORE\start
up_ARMCM0.s

14506
Pro/Pro-9999_Logic_CC_251027_0x5000_Simplify/MDK_PROJECT/Objects/C1F_A_L4_45_260327_NM.hex
View File

File diff suppressed because it is too large Load Diff

BIN
Pro/Pro-9999_Logic_CC_251027_0x5000_Simplify/MDK_PROJECT/Objects/C1F_A_L4_45_260327_NM.axf → Pro/Pro-9999_Logic_CC_251027_0x5000_Simplify/MDK_PROJECT/Objects/C1F_A_L4_45_260330_NM.axf
View File

Binary file not shown.

170
Pro/Pro-9999_Logic_CC_251027_0x5000_Simplify/MDK_PROJECT/Objects/C1F_A_L4_45_260330_NM.build_log.htm Normal file
View File

@@ -0,0 +1,170 @@
<html>
<body>
<pre>
<h1><EFBFBD>Vision Build Log</h1>
<h2>Tool Versions:</h2>
IDE-Version: <20><>Vision V5.29.0.0
Copyright (C) 2019 ARM Ltd and ARM Germany GmbH. All rights reserved.
License Information: cc cc, cc, LIC=8VRJ7-ET3GP-BSUYX-HQQMI-9SM4L-15YCH
Tool Versions:
Toolchain: MDK-ARM Plus Version: 5.29.0.0
Toolchain Path: D:\Keil_v5\ARM\ARMCC\Bin
C Compiler: Armcc.exe V5.06 update 6 (build 750)
Assembler: Armasm.exe V5.06 update 6 (build 750)
Linker/Locator: ArmLink.exe V5.06 update 6 (build 750)
Library Manager: ArmAr.exe V5.06 update 6 (build 750)
Hex Converter: FromElf.exe V5.06 update 6 (build 750)
CPU DLL: SARMCM3.DLL V5.29.0.0
Dialog DLL: DARMCM1.DLL V1.19.2.0
Target DLL: Segger\JL2CM3.dll V2.99.36.0
Dialog DLL: TARMCM1.DLL V1.14.1.0
<h2>Project:</h2>
E:\Git_Project_Sourcode\BLV_C1F_Module\Pro\Pro-9999_Logic_CC_251027_0x5000_Simplify\MDK_PROJECT\project.uvprojx
Project File Date: 03/30/2026
<h2>Output:</h2>
*** Using Compiler 'V5.06 update 6 (build 750)', folder: 'D:\Keil_v5\ARM\ARMCC\Bin'
Rebuild target 'TEST'
assembling startup_ARMCM0.s...
compiling CH57x_pwr.c...
compiling CH57x_int.c...
compiling CH57x_sys.c...
compiling CH57x_gpio.c...
compiling CH57x_clk.c...
compiling CH57x_adc.c...
compiling main.c...
compiling CH57x_flash.c...
compiling CH57x_uart0.c...
compiling CH57x_uart2.c...
compiling CH57x_uart1.c...
compiling CH57x_timer0.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 flash.c...
compiling usart.c...
compiling Log_api.c...
compiling check_fun.c...
compiling SPI_SRAM.c...
compiling DNS.c...
compiling md5.c...
compiling rw_logging.c...
compiling BLV_Authorize.c...
compiling net.c...
compiling BLV_BUS_Dev_C5IOFun.c...
compiling BLV_BUS_Dev_C5MusicFun.c...
compiling BLV_485_Dev_CardFun.c...
compiling BLV_485_Protocol.c...
compiling BLV_NET_Function.c...
compiling PC_DeviceTest_Fun.c...
compiling BLV_485_Dev_TempFun.c...
compiling BLV_485_Dev_Touch_SwiFun.c...
compiling BLV_485_Dev_C7TFun.c...
compiling BLV_485_Dev_IrSendFun.c...
compiling BLV_485_Dev_A9RelayFun.c...
compiling BLV_485_Dev_PwmFun.c...
compiling BLV_485_Dev_TimeFun.c...
compiling BLV_485_Dev_XiaoBaoFun.c...
compiling BLV_BUS_Dev_C12DimmingFun.c...
compiling BLV_Nor_DevFun.c...
compiling BLV_485_Dev_TempT1Fun.c...
compiling BLV_All_Dev_Init.c...
compiling BLV_485_Dev_A9LDFun.c...
compiling BLV_485_Dev_RGB_Light_BeltFun.c...
compiling BLV_485_Dev_PirFun.c...
compiling BLV_485_Dev_LEDFun.c...
compiling BLV_485_Dev_SliderFun.c...
compiling BLV_485_Dev_AirRevealFun.c...
compiling BLV_485_Dev_AirDetectFun.c...
compiling BLV_485_Dev_A9IO_SwiFun.c...
compiling BLV_485_Dev_SwitchFun.c...
compiling BLV_Dev_Action.c...
compiling BLV_485_Dev_A8PBFun.c...
compiling BLV_485_Dev_BLWMusicFun.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_CardStateFun.c...
compiling BLV_485_Dev_HuaErSiFun.c...
compiling BLV_TempPrompt_Action.c...
compiling BLV_485_Dev_LCDFun.c...
compiling BLV_485_Dev_FloorHeatFun.c...
compiling BLV_485_Dev_FreshAirFun.c...
compiling BLV_485_Dev_CLEDFloorHeatFun.c...
compiling BLV_485_Dev_CLEDFreshAirFun.c...
compiling BLV_485_Dev_BLWFreshAirFun.c...
compiling BLV_485_Dev_BLWFloorHeatFun.c...
compiling BLV_485_Dev_BLE_Music.c...
compiling BLV_485_Dev_ShangJingTianIrSendFun.c...
compiling BLV_485_Dev_EnergyMonitor.c...
compiling BLV_485_Dev_Rotary_SwitchFun.c...
compiling BLV_485_Dev_BLVP2_Rotary_Switch.c...
compiling BLV_485_Dev_BLVP1_Rotary_Switch.c...
compiling BLV_485_Dev_CurtainFun.c...
compiling BLV_485_Dev_BinShen_Curtain.c...
compiling BLV_485_Dev_BLWLockFun.c...
compiling BLV_485_Dev_ChuangJiaLockFun.c...
compiling BLV_485_Dev_WeixinLockFun.c...
compiling BLV_RF_GatewayHost.c...
compiling BLV_485_Dev_FreegoLockFun.c...
compiling BLV_485_Dev_YangGeLockFun.c...
compiling BLV_485_Dev_PB20_LED_Fun.c...
compiling BLV_485_Dev_PB20_Relay_Fun.c...
compiling BLV_485_Dev_PB20_Strip_Fun.c...
compiling BLV_Bus_Dev_PB20Fun.c...
compiling BLV_Nor_Dev_LVoutputFun.c...
compiling BLV_Nor_Dev_LVinputFun.c...
compiling BLV_Nor_Dev_ServiceFun.c...
compiling BLV_Nor_Dev_HVoutFun.c...
compiling BLV_Nor_Dev_CurtainFun.c...
compiling BLV_Nor_Dev_ColorTemp.c...
compiling BLV_Nor_Dev_NoCard.c...
compiling BLV_Nor_Dev_VirtualTimeFun.c...
compiling BLV_Nor_Dev_CarbonFun.c...
compiling BLV_Nor_Dev_GlobalSet.c...
compiling BLV_Nor_Dev_VirtualCard.c...
compiling utils_hmac.c...
compiling BLV_Nor_Dev_Scene_Restore.c...
compiling aLiYun.c...
compiling MQTTConnectClient.c...
compiling Udp_Internal_Protocol.c...
compiling utils_md5.c...
compiling MQTTDeserializePublish.c...
compiling mqtt.c...
compiling MQTTFormat.c...
compiling MQTTSerializePublish.c...
compiling BLV_Logic_Edit.c...
compiling MQTTSubscribeClient.c...
compiling MQTTPacket.c...
compiling MQTTUnsubscribeClient.c...
compiling utils_sha1.c...
linking...
Program Size: Code=223608 RO-data=8232 RW-data=812 ZI-data=22660
FromELF: creating hex file...
After Build - User command #1: D:\Keil_v5\\ARM\ARMCC\bin\fromelf.exe --bin --output=Bin\C1F_A_L4_45_260330_NM.bin .\Objects\C1F_A_L4_45_260330_NM.axf
".\Objects\C1F_A_L4_45_260330_NM.axf" - 0 Error(s), 0 Warning(s).
<h2>Software Packages used:</h2>
Package Vendor: Keil
http://wch.cn/pack/Keil.WCH57x_DFP.1.1.0.pack
Keil.WCH57x_DFP.1.1.0
WCH wireless MCU CH57x Family Support, Drivers and Examples
<h2>Collection of Component include folders:</h2>
.\RTE\_TEST
D:\Keil_v5\Pack\Keil\WCH57x_DFP\1.1.0\Drivers\CMSIS\Device\WCH\CH57x\Include
<h2>Collection of Component Files used:</h2>
Build Time Elapsed: 00:00:21
</pre>
</body>
</html>

14509
Pro/Pro-9999_Logic_CC_251027_0x5000_Simplify/MDK_PROJECT/Objects/C1F_A_L4_45_260330_NM.hex Normal file
View File

File diff suppressed because it is too large Load Diff

7025
Pro/Pro-9999_Logic_CC_251027_0x5000_Simplify/MDK_PROJECT/Objects/C1F_A_L4_45_260327_NM.htm → Pro/Pro-9999_Logic_CC_251027_0x5000_Simplify/MDK_PROJECT/Objects/C1F_A_L4_45_260330_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_260327_NM.lnp → Pro/Pro-9999_Logic_CC_251027_0x5000_Simplify/MDK_PROJECT/Objects/C1F_A_L4_45_260330_NM.lnp
View File

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

0
Pro/Pro-9999_Logic_CC_251027_0x5000_Simplify/MDK_PROJECT/Objects/C1F_A_L4_45_260327_NM.sct → Pro/Pro-9999_Logic_CC_251027_0x5000_Simplify/MDK_PROJECT/Objects/C1F_A_L4_45_260330_NM.sct
View File

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

66
Pro/Pro-9999_Logic_CC_251027_0x5000_Simplify/MDK_PROJECT/project.uvguix.CC
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>
</TargetStatus>
<OutputDirectory>.\Objects\</OutputDirectory>
<OutputName>C1F_A_L4_45_260327_NM</OutputName>
<OutputName>C1F_A_L4_45_260330_NM</OutputName>
<CreateExecutable>1</CreateExecutable>
<CreateLib>0</CreateLib>
<CreateHexFile>1</CreateHexFile>

11
Readme.md
View File

@@ -1,5 +1,16 @@
# BLV_C1F_Module主机代码修改记录
### 2026-03-29
```c
修改人：李世杰
修改内容：
1、修改全局设置驱动
-> 修改方法 - 退出睡眠模式，跳过执行起夜动作，直接退出起夜模式而不是进入；当前不处于睡眠模式时，但处于进入起夜状态时，也要退出起夜。
-> 缺陷：需要配置在其它场景触发时去额外关闭夜灯，否则特殊状态下（如起夜时调用了退出起夜模式），开启的夜灯将无法关闭
```
### 2026-03-27