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>ҹ
}
}