测试:场景中延时执行、反馈灯控制，初步测试OK
场景执行基本功能都已测试通过，开关设备、插卡取电设备、温控器设备初步测试OK
This commit is contained in:
caocong
@@ -660,6 +660,7 @@ __attribute__((section(".non_0_wait"))) void Expand_State_Get(DEV_ACTION_INFO *D
|
||||
uint8_t DevCtrlCont = 0x00; //ִ<><D6B4><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
||||
uint8_t SceneState = DEV_STATE_OPEN;
|
||||
uint8_t SceneType = 0x01;
|
||||
uint8_t rev = 0;
|
||||
|
||||
Device_Public_Information_G BUS_Public;
|
||||
|
||||
@@ -683,13 +684,20 @@ __attribute__((section(".non_0_wait"))) void Expand_State_Get(DEV_ACTION_INFO *D
|
||||
{
|
||||
if(DevActionInfo->DevActionOutput[i].DevActionOutCfg.DevAddr == expand_type[j].Addr)
|
||||
{
|
||||
|
||||
if(expand_type[j].ExpandReadFlag != 0x00)
|
||||
{
|
||||
BLV_Device_PublicInfo_Read_To_Struct(DevActionInfo->DevActionOutput[i].DevActionOutAddr,&BUS_Public);
|
||||
if(NULL != BUS_Public.DevFunInfo.Dev_Output_Loop_Group_State_Get_ptr)
|
||||
{
|
||||
if(DEV_STATE_CLOSE == BUS_Public.DevFunInfo.Dev_Output_Loop_Group_State_Get_ptr(DevActionInfo->DevActionOutput[i].DevActionOutAddr, SceneType, expand_type[j].ExpandReadFlag, HVoutNumMAX, expand_type[j].ExpandReadState))
|
||||
rev = BUS_Public.DevFunInfo.Dev_Output_Loop_Group_State_Get_ptr(DevActionInfo->DevActionOutput[i].DevActionOutAddr, SceneType, expand_type[j].ExpandReadFlag, HVoutNumMAX, expand_type[j].ExpandReadState);
|
||||
if( DEV_STATE_CLOSE == rev)
|
||||
{
|
||||
// Dbg_Println(DBG_BIT_ActCond_STATUS_bit,"1 <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:%d <20><><EFBFBD><EFBFBD>:%d <20><>ַ:%d <20><>·:%d %x<><78><EFBFBD><EFBFBD><EFBFBD><EFBFBD>״̬ %d",DevActionInfo->DevActionCore.ActionNo,\
|
||||
// DevActionInfo->DevActionOutput[i].DevActionOutCfg.DevType,\
|
||||
// DevActionInfo->DevActionOutput[i].DevActionOutCfg.DevAddr,\
|
||||
// DevActionInfo->DevActionOutput[i].DevActionOutCfg.DevOutputLoop,\
|
||||
// DevActionInfo->DevActionOutput[i].DevActionOutCfg.DevCtrlState,rev);
|
||||
SceneState = DEV_STATE_CLOSE;
|
||||
}
|
||||
}
|
||||
@@ -712,6 +720,11 @@ __attribute__((section(".non_0_wait"))) void Expand_State_Get(DEV_ACTION_INFO *D
|
||||
{
|
||||
if(DEV_STATE_CLOSE == BUS_Public.DevFunInfo.Dev_Output_Loop_Group_State_Get_ptr(DevActionInfo->DevActionOutput[i].DevActionOutAddr, SceneType, dimm_type[j].DimmReadFlag, LED_OUT_CH_MAX, dimm_type[j].DimmReadState))
|
||||
{
|
||||
// Dbg_Println(DBG_BIT_ActCond_STATUS_bit,"2 <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:%d <20><><EFBFBD><EFBFBD>:%d <20><>ַ:%d <20><>·:%d %x<><78><EFBFBD><EFBFBD><EFBFBD><EFBFBD>״̬",DevActionInfo->DevActionCore.ActionNo,\
|
||||
// DevActionInfo->DevActionOutput[i].DevActionOutCfg.DevType,\
|
||||
// DevActionInfo->DevActionOutput[i].DevActionOutCfg.DevAddr,\
|
||||
// DevActionInfo->DevActionOutput[i].DevActionOutCfg.DevOutputLoop,\
|
||||
// DevActionInfo->DevActionOutput[i].DevActionOutCfg.DevCtrlState);
|
||||
SceneState = DEV_STATE_CLOSE;
|
||||
}
|
||||
}
|
||||
@@ -748,6 +761,11 @@ __attribute__((section(".non_0_wait"))) void Expand_State_Get(DEV_ACTION_INFO *D
|
||||
{
|
||||
if(BUS_Public.DevFunInfo.Dev_Output_Loop_State_Get(DevActionInfo->DevActionOutput[i].DevActionOutAddr, DevActionInfo->DevActionOutput[i].DevActionOutCfg.DevOutputLoop) != DevCtrlWay)
|
||||
{
|
||||
// Dbg_Println(DBG_BIT_ActCond_STATUS_bit,"3 <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:%d <20><><EFBFBD><EFBFBD>:%d <20><>ַ:%d <20><>·:%d %x<><78><EFBFBD><EFBFBD><EFBFBD><EFBFBD>״̬",DevActionInfo->DevActionCore.ActionNo,\
|
||||
// DevActionInfo->DevActionOutput[i].DevActionOutCfg.DevType,\
|
||||
// DevActionInfo->DevActionOutput[i].DevActionOutCfg.DevAddr,\
|
||||
// DevActionInfo->DevActionOutput[i].DevActionOutCfg.DevOutputLoop,\
|
||||
// DevActionInfo->DevActionOutput[i].DevActionOutCfg.DevCtrlState);
|
||||
SceneState = DEV_STATE_CLOSE;
|
||||
break;
|
||||
}
|
||||
@@ -788,6 +806,11 @@ __attribute__((section(".non_0_wait"))) void Expand_State_Get(DEV_ACTION_INFO *D
|
||||
{
|
||||
if( BUS_Public.DevFunInfo.Dev_Output_Loop_State_Get(DevActionInfo->DevActionOutput[i].DevActionOutAddr, DevActionInfo->DevActionOutput[i].DevActionOutCfg.DevOutputLoop) != DevCtrlWay)
|
||||
{
|
||||
// Dbg_Println(DBG_BIT_ActCond_STATUS_bit,"4 <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:%d <20><><EFBFBD><EFBFBD>:%d <20><>ַ:%d <20><>·:%d %x<><78><EFBFBD><EFBFBD><EFBFBD><EFBFBD>״̬",DevActionInfo->DevActionCore.ActionNo,\
|
||||
// DevActionInfo->DevActionOutput[i].DevActionOutCfg.DevType,\
|
||||
// DevActionInfo->DevActionOutput[i].DevActionOutCfg.DevAddr,\
|
||||
// DevActionInfo->DevActionOutput[i].DevActionOutCfg.DevOutputLoop,\
|
||||
// DevActionInfo->DevActionOutput[i].DevActionOutCfg.DevCtrlState);
|
||||
SceneState = DEV_STATE_CLOSE;
|
||||
break;
|
||||
}
|
||||
@@ -795,6 +818,11 @@ __attribute__((section(".non_0_wait"))) void Expand_State_Get(DEV_ACTION_INFO *D
|
||||
{
|
||||
if( BUS_Public.DevFunInfo.Dev_Output_Loop_State_Get(DevActionInfo->DevActionOutput[i].DevActionOutAddr, DevActionInfo->DevActionOutput[i].DevActionOutCfg.DevOutputLoop) != DEV_CTRLWAY_STOP)
|
||||
{
|
||||
// Dbg_Println(DBG_BIT_ActCond_STATUS_bit,"5 <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:%d <20><><EFBFBD><EFBFBD>:%d <20><>ַ:%d <20><>·:%d %x<><78><EFBFBD><EFBFBD><EFBFBD><EFBFBD>״̬",DevActionInfo->DevActionCore.ActionNo,\
|
||||
// DevActionInfo->DevActionOutput[i].DevActionOutCfg.DevType,\
|
||||
// DevActionInfo->DevActionOutput[i].DevActionOutCfg.DevAddr,\
|
||||
// DevActionInfo->DevActionOutput[i].DevActionOutCfg.DevOutputLoop,\
|
||||
// DevActionInfo->DevActionOutput[i].DevActionOutCfg.DevCtrlState);
|
||||
SceneState = DEV_STATE_CLOSE;
|
||||
break;
|
||||
}
|
||||
@@ -803,7 +831,7 @@ __attribute__((section(".non_0_wait"))) void Expand_State_Get(DEV_ACTION_INFO *D
|
||||
}
|
||||
break;
|
||||
#if Dev_Nor_ColorTemp
|
||||
case Dev_Nor_ColorTemp:
|
||||
case DEV_Virtual_ColorTemp:
|
||||
BLV_Device_PublicInfo_Read_To_Struct(DevActionInfo->DevActionOutput[i].DevActionOutAddr,&BUS_Public);
|
||||
if(BUS_Public.DevFunInfo.Dev_Output_Loop_State_Get != 0x00)
|
||||
{
|
||||
@@ -815,6 +843,11 @@ __attribute__((section(".non_0_wait"))) void Expand_State_Get(DEV_ACTION_INFO *D
|
||||
DevCtrlCont |= 0x80;
|
||||
if( BUS_Public.DevFunInfo.Dev_Output_Loop_State_Get(DevActionInfo->DevActionOutput[i].DevActionOutAddr, DevActionInfo->DevActionOutput[i].DevActionOutCfg.DevOutputLoop) != DevCtrlCont )
|
||||
{
|
||||
// Dbg_Println(DBG_BIT_ActCond_STATUS_bit,"6 <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:%d <20><><EFBFBD><EFBFBD>:%d <20><>ַ:%d <20><>·:%d %x<><78><EFBFBD><EFBFBD><EFBFBD><EFBFBD>״̬",DevActionInfo->DevActionCore.ActionNo,\
|
||||
// DevActionInfo->DevActionOutput[i].DevActionOutCfg.DevType,\
|
||||
// DevActionInfo->DevActionOutput[i].DevActionOutCfg.DevAddr,\
|
||||
// DevActionInfo->DevActionOutput[i].DevActionOutCfg.DevOutputLoop,\
|
||||
// DevActionInfo->DevActionOutput[i].DevActionOutCfg.DevCtrlState);
|
||||
SceneState = DEV_STATE_CLOSE;
|
||||
break;
|
||||
}
|
||||
@@ -822,6 +855,11 @@ __attribute__((section(".non_0_wait"))) void Expand_State_Get(DEV_ACTION_INFO *D
|
||||
{
|
||||
if( BUS_Public.DevFunInfo.Dev_Output_Loop_State_Get(DevActionInfo->DevActionOutput[i].DevActionOutAddr, DevActionInfo->DevActionOutput[i].DevActionOutCfg.DevOutputLoop) != (DevCtrlCont & 0x80) )
|
||||
{
|
||||
// Dbg_Println(DBG_BIT_ActCond_STATUS_bit,"7 <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:%d <20><><EFBFBD><EFBFBD>:%d <20><>ַ:%d <20><>·:%d %x<><78><EFBFBD><EFBFBD><EFBFBD><EFBFBD>״̬",DevActionInfo->DevActionCore.ActionNo,\
|
||||
// DevActionInfo->DevActionOutput[i].DevActionOutCfg.DevType,\
|
||||
// DevActionInfo->DevActionOutput[i].DevActionOutCfg.DevAddr,\
|
||||
// DevActionInfo->DevActionOutput[i].DevActionOutCfg.DevOutputLoop,\
|
||||
// DevActionInfo->DevActionOutput[i].DevActionOutCfg.DevCtrlState);
|
||||
SceneState = DEV_STATE_CLOSE;
|
||||
break;
|
||||
}
|
||||
@@ -829,7 +867,7 @@ __attribute__((section(".non_0_wait"))) void Expand_State_Get(DEV_ACTION_INFO *D
|
||||
}
|
||||
break;
|
||||
#endif
|
||||
case DEV_C5MUSIC_Type:
|
||||
case DEV_RS485_MUSIC:
|
||||
if(DevActionInfo->DevActionCond.SceneExcute != ACTION_SCENE_SLEEP)
|
||||
{
|
||||
BLV_Device_PublicInfo_Read_To_Struct(DevActionInfo->DevActionOutput[i].DevActionOutAddr,&BUS_Public);
|
||||
@@ -845,6 +883,11 @@ __attribute__((section(".non_0_wait"))) void Expand_State_Get(DEV_ACTION_INFO *D
|
||||
{
|
||||
if(DevCtrlWay != BUS_Public.DevFunInfo.Dev_Output_Loop_State_Get(DevActionInfo->DevActionOutput[i].DevActionOutAddr, DevActionInfo->DevActionOutput[i].DevActionOutCfg.DevOutputLoop))
|
||||
{
|
||||
// Dbg_Println(DBG_BIT_ActCond_STATUS_bit,"8 <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:%d <20><><EFBFBD><EFBFBD>:%d <20><>ַ:%d <20><>·:%d %x<><78><EFBFBD><EFBFBD><EFBFBD><EFBFBD>״̬",DevActionInfo->DevActionCore.ActionNo,\
|
||||
// DevActionInfo->DevActionOutput[i].DevActionOutCfg.DevType,\
|
||||
// DevActionInfo->DevActionOutput[i].DevActionOutCfg.DevAddr,\
|
||||
// DevActionInfo->DevActionOutput[i].DevActionOutCfg.DevOutputLoop,\
|
||||
// DevActionInfo->DevActionOutput[i].DevActionOutCfg.DevCtrlState);
|
||||
SceneState = DEV_STATE_CLOSE;
|
||||
break;
|
||||
}
|
||||
@@ -864,6 +907,11 @@ __attribute__((section(".non_0_wait"))) void Expand_State_Get(DEV_ACTION_INFO *D
|
||||
{
|
||||
if(DevCtrlCont != BUS_Public.DevFunInfo.Dev_Output_Loop_State_Get(DevActionInfo->DevActionOutput[i].DevActionOutAddr, DevActionInfo->DevActionOutput[i].DevActionOutCfg.DevOutputLoop))
|
||||
{
|
||||
// Dbg_Println(DBG_BIT_ActCond_STATUS_bit,"9 <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:%d <20><><EFBFBD><EFBFBD>:%d <20><>ַ:%d <20><>·:%d %x<><78><EFBFBD><EFBFBD><EFBFBD><EFBFBD>״̬",DevActionInfo->DevActionCore.ActionNo,\
|
||||
// DevActionInfo->DevActionOutput[i].DevActionOutCfg.DevType,\
|
||||
// DevActionInfo->DevActionOutput[i].DevActionOutCfg.DevAddr,\
|
||||
// DevActionInfo->DevActionOutput[i].DevActionOutCfg.DevOutputLoop,\
|
||||
// DevActionInfo->DevActionOutput[i].DevActionOutCfg.DevCtrlState);
|
||||
SceneState = DEV_STATE_CLOSE; //ֻҪ<D6BB><D2AA>һ<EFBFBD><D2BB>״̬<D7B4><CCAC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><>ʱ<EFBFBD><CAB1><EFBFBD><EFBFBD>״̬Ϊ<CCAC><CEAA>
|
||||
break; //<2F><><EFBFBD><EFBFBD>switchѭ<68><D1AD>
|
||||
}
|
||||
@@ -878,7 +926,7 @@ __attribute__((section(".non_0_wait"))) void Expand_State_Get(DEV_ACTION_INFO *D
|
||||
|
||||
if(DevActionInfo->DevActionState.SceneState != SceneState)
|
||||
{
|
||||
Dbg_Println(DBG_BIT_LOGIC_STATUS_bit," <20><>ǰ<EFBFBD><C7B0><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:%d <20><><EFBFBD><EFBFBD>״̬:%d", DevActionInfo->DevActionCore.ActionNo, SceneState);
|
||||
Dbg_Println(DBG_BIT_LOGIC_STATUS_bit," <20><>ǰ<EFBFBD><C7B0><EFBFBD><EFBFBD>:%d <20><><EFBFBD><EFBFBD>״̬:%d", DevActionInfo->DevActionCore.ActionNo, SceneState);
|
||||
DevActionInfo->DevActionState.SceneState = SceneState; //1<><31> 2<><32> 0δ<30><CEB4>ʼ<EFBFBD><CABC>
|
||||
}
|
||||
}
|
||||
@@ -908,6 +956,7 @@ __attribute__((section(".non_0_wait"))) void Sleep_State_Get(DEV_ACTION_INFO *De
|
||||
{
|
||||
if(DevActionInfo->DevActionOutput[i].DevActionOutAddr != 0x00)
|
||||
{
|
||||
|
||||
switch(DevActionInfo->DevActionOutput[i].DevActionOutCfg.DevType)
|
||||
{
|
||||
case Dev_Host_HVout: //<2F>̵<EFBFBD><CCB5><EFBFBD>
|
||||
@@ -1192,6 +1241,7 @@ __attribute__((section(".non_0_wait"))) void DevAction_State_Get(DEV_ACTION_INFO
|
||||
|
||||
if( DevActionGlobal.DevActionU64Cond.NeightState != DevActionGlobal.Last_NeightState )
|
||||
{
|
||||
Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"<EFBFBD><EFBFBD>ҹ״̬<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ı<EFBFBD>:%d -1",DevActionGlobal.DevActionU64Cond.NeightState);
|
||||
DevActionGlobal.Last_NeightState = DevActionGlobal.DevActionU64Cond.NeightState;
|
||||
}
|
||||
}
|
||||
@@ -1241,7 +1291,7 @@ __attribute__((section(".non_0_wait"))) void DevDly_InfoSet(
|
||||
DlyExcuteTime = SysTick_1ms + DevDlyValue.DelayCont*1000*60*60;
|
||||
break;
|
||||
default:
|
||||
Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"<EFBFBD><EFBFBD>ʱ<EFBFBD><EFBFBD>λΪ<EFBFBD><EFBFBD>Ч:", DevDlyValue.DelayWeight);
|
||||
Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"<EFBFBD><EFBFBD>ʱ<EFBFBD><EFBFBD>λΪ<EFBFBD><EFBFBD>Ч:%d", DevDlyValue.DelayWeight);
|
||||
return; //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ֱ<EFBFBD>ӷ<EFBFBD><D3B7><EFBFBD>
|
||||
}
|
||||
|
||||
@@ -1277,7 +1327,7 @@ __attribute__((section(".non_0_wait"))) void DevDly_InfoSet(
|
||||
|
||||
DevDlyInfo.DlyBlinkTime.DelayCont = DevDelayTime.DelayCont;
|
||||
DevDlyInfo.DlyBlinkTime.DelayWeight = DevDelayTime.DelayWeight;
|
||||
Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"<EFBFBD><EFBFBD>ʱ<EFBFBD>ڵ㸳ֵ<EFBFBD><EFBFBD><EFBFBD>ڵ<EFBFBD><EFBFBD><EFBFBD>ַ:%08X ִ<>б<EFBFBD>־:%d ʱ<><CAB1>:%02x%02x, ִ<>з<EFBFBD>ʽ:%04X <20><>˸<EFBFBD><CBB8>־:%d", \
|
||||
Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"<EFBFBD><EFBFBD>ʱ<EFBFBD>ڵ㸳ֵ<EFBFBD><EFBFBD><EFBFBD>ڵ<EFBFBD><EFBFBD><EFBFBD>ַ:%X ִ<>б<EFBFBD>־:%d ʱ<><CAB1>:%x-%x, ִ<>з<EFBFBD>ʽ:%X <20><>˸<EFBFBD><CBB8>־:%d", \
|
||||
DevDlyAddr, DlyExcuteFlag, \
|
||||
DevDlyValue.DelayCont, \
|
||||
DevDlyValue.DelayWeight, \
|
||||
@@ -1300,14 +1350,14 @@ __attribute__((section(".non_0_wait"))) uint32_t DevDlyAddr_Get(uint32_t DevDlyA
|
||||
{
|
||||
uint16_t i = 0x00;
|
||||
uint32_t list_addr = 0x00;
|
||||
Struct_Dev_Dly_Core DevDlyCore;
|
||||
Struct_Dev_Dly DevDly;
|
||||
|
||||
for(i = 0; i < DevActionGlobal.DevDlyNum; i++)
|
||||
{
|
||||
list_addr = SRAM_DevDly_List_Start_Addr + i * DevDlyStructLen;
|
||||
SRAM_DMA_Read_Buff((uint8_t *)&DevDlyCore, sizeof(Struct_Dev_Dly_Core), list_addr);
|
||||
SRAM_DMA_Read_Buff((uint8_t *)&DevDly, DevDlyStructLen, list_addr);
|
||||
|
||||
if( (DevDlyCore.DevDlyAddr == DevDlyAddr) && (DevDlyCore.DevOutputLoop == DevOutputLoop) )
|
||||
if( (DevDly.DevDlyCore.DevDlyAddr == DevDlyAddr) && (DevDly.DevDlyCore.DevOutputLoop == DevOutputLoop) )
|
||||
{
|
||||
return list_addr;
|
||||
}
|
||||
@@ -1328,7 +1378,7 @@ __attribute__((section(".non_0_wait"))) uint32_t DevDlyAddr_Get(uint32_t DevDlyA
|
||||
__attribute__((section(".non_0_wait"))) uint32_t Add_DevDly_To_List(uint8_t DevType, uint32_t DevDlyAddr, uint16_t DevOutputLoop)
|
||||
{
|
||||
uint32_t list_addr = 0x00;
|
||||
Struct_Dev_Dly_Core DevDlyCore;
|
||||
Struct_Dev_Dly DevDly;
|
||||
|
||||
if(DevActionGlobal.DevActionNum >= DevDlyNumMax) //<2F><>ʱ<EFBFBD>豸<EFBFBD><E8B1B8><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Χ<EFBFBD>ͷ<EFBFBD><CDB7><EFBFBD>
|
||||
{
|
||||
@@ -1338,19 +1388,19 @@ __attribute__((section(".non_0_wait"))) uint32_t Add_DevDly_To_List(uint8_t DevT
|
||||
list_addr = DevDlyAddr_Get(DevDlyAddr, DevOutputLoop); //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ǰ<EFBFBD><C7B0><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʱ<EFBFBD>ڵ<EFBFBD>
|
||||
if(list_addr != 0x00) return list_addr; //ֱ<>ӽ<EFBFBD><D3BD><EFBFBD>ַ<EFBFBD><D6B7><EFBFBD><EFBFBD>
|
||||
|
||||
DevDlyCore.DevType = DevType;
|
||||
DevDlyCore.DevDlyAddr = DevDlyAddr;
|
||||
DevDlyCore.DevOutputLoop = DevOutputLoop; //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
||||
DevDly.DevDlyCore.DevType = DevType;
|
||||
DevDly.DevDlyCore.DevDlyAddr = DevDlyAddr;
|
||||
DevDly.DevDlyCore.DevOutputLoop = DevOutputLoop; //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
||||
list_addr = SRAM_DevDly_List_Start_Addr + DevActionGlobal.DevDlyNum*DevDlyStructLen;
|
||||
|
||||
SRAM_DMA_Write_Buff((uint8_t *)&DevDlyCore, sizeof(Struct_Dev_Dly_Core), list_addr);
|
||||
SRAM_DMA_Write_Buff((uint8_t *)&DevDly, DevDlyStructLen, list_addr);
|
||||
DevActionGlobal.DevDlyNum++; //<2F><>ʱ<EFBFBD>ڵ<EFBFBD><DAB5><EFBFBD><EFBFBD><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><EFBFBD>ǰ<EFBFBD><EFBFBD>ʱ<EFBFBD>ڵ<EFBFBD><EFBFBD><EFBFBD>ַ:%X <20><>ǰ<EFBFBD><C7B0>ʱ<EFBFBD>豸<EFBFBD><E8B1B8><EFBFBD><EFBFBD>:%d <20><>ʱ<EFBFBD>豸<EFBFBD><E8B1B8>ַ: %X <20><>ʱ<EFBFBD>豸<EFBFBD><E8B1B8>·<EFBFBD><C2B7>%d",
|
||||
list_addr ,
|
||||
DevActionGlobal.DevDlyNum,
|
||||
DevDlyCore.DevDlyAddr,
|
||||
DevDlyCore.DevOutputLoop);
|
||||
DevDly.DevDlyCore.DevDlyAddr,
|
||||
DevDly.DevDlyCore.DevOutputLoop);
|
||||
|
||||
/*<2A><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ǰ<EFBFBD><C7B0><EFBFBD>е<EFBFBD><D0B5><EFBFBD>ʱ<EFBFBD>豸<EFBFBD><E8B1B8><EFBFBD><EFBFBD><EFBFBD>ڹ<EFBFBD><DAB9>ģ<EFBFBD><C4A3>Ͳ<EFBFBD><CDB2><EFBFBD><EFBFBD>ӣ<EFBFBD><D3A3><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ڵľ<DAB5><C4BE><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>*/
|
||||
return list_addr; //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ч<EFBFBD>ĵ<EFBFBD>ַ
|
||||
@@ -1461,7 +1511,7 @@ __attribute__((section(".non_0_wait"))) uint8_t DevAddrCtr(DEV_ACTION_INFO *DevA
|
||||
{
|
||||
if( (DevActionInfo != 0x00) && (DevActionInfo->DevActionState.DevAddrIn != 0x00) )
|
||||
{
|
||||
Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>豸<EFBFBD><EFBFBD>ַ:%04X <20>豸<EFBFBD><E8B1B8><EFBFBD><EFBFBD>:%d <20><>ַ:%04X %d· <20><><EFBFBD><EFBFBD>״̬: %04X",
|
||||
Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"1 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>豸<EFBFBD><EFBFBD>ַ:%X <20>豸<EFBFBD><E8B1B8><EFBFBD><EFBFBD>:%d <20><>ַ:%X %d· <20><><EFBFBD><EFBFBD>״̬: %X",
|
||||
DevActionInfo->DevActionState.DevAddrIn,
|
||||
DevActionOutput.DevActionOutCfg.DevType,
|
||||
DevAddrOut,
|
||||
@@ -1496,7 +1546,7 @@ __attribute__((section(".non_0_wait"))) uint8_t DevAddrCtr(DEV_ACTION_INFO *DevA
|
||||
{
|
||||
if( (DevActionInfo != 0x00) && (DevActionInfo->DevActionState.DevAddrIn != 0x00) )
|
||||
{
|
||||
Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>豸<EFBFBD><EFBFBD>ַ:%04X <20>豸<EFBFBD><E8B1B8><EFBFBD><EFBFBD>:%d <20><>ַ:%04X %d· <20><><EFBFBD><EFBFBD>״̬: %04X",
|
||||
Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"2 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>豸<EFBFBD><EFBFBD>ַ:%X <20>豸<EFBFBD><E8B1B8><EFBFBD><EFBFBD>:%d <20><>ַ:%X %d· <20><><EFBFBD><EFBFBD>״̬: %X",
|
||||
DevActionInfo->DevActionState.DevAddrIn,
|
||||
DevActionOutput.DevActionOutCfg.DevType,
|
||||
DevAddrOut,
|
||||
@@ -1637,7 +1687,7 @@ __attribute__((section(".non_0_wait"))) void DevAction_ExpandCtrl(DEV_ACTION_INF
|
||||
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 ",
|
||||
Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"<EFBFBD>̵<EFBFBD><EFBFBD><EFBFBD>״̬Ⱥ<EFBFBD>ؿ<EFBFBD><EFBFBD>ƿ<EFBFBD>ʼ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>·<EFBFBD><EFBFBD>־:%X <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:%s ",
|
||||
expand_type[j].ExpandReadFlag,
|
||||
DevActionInfo->DevActionCore.DevActionName);
|
||||
|
||||
@@ -1666,7 +1716,7 @@ __attribute__((section(".non_0_wait"))) void DevAction_ExpandCtrl(DEV_ACTION_INF
|
||||
dimm_type[j].DimmReadFlag,
|
||||
LED_OUT_CH_MAX,
|
||||
dimm_type[j].DimmReadState);
|
||||
Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"PWM<EFBFBD><EFBFBD><EFBFBD><EFBFBD>״̬Ⱥ<EFBFBD>ؿ<EFBFBD><EFBFBD>ƿ<EFBFBD>ʼ<EFBFBD><EFBFBD>ַ:%d<><64><EFBFBD><EFBFBD>·<EFBFBD><C2B7>־:%08X <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:%s ",
|
||||
Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"PWM<EFBFBD><EFBFBD><EFBFBD><EFBFBD>״̬Ⱥ<EFBFBD>ؿ<EFBFBD><EFBFBD>ƿ<EFBFBD>ʼ<EFBFBD><EFBFBD>ַ:%d<><64><EFBFBD><EFBFBD>·<EFBFBD><C2B7>־:%X <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:%s ",
|
||||
DevActionInfo->DevActionOutput[i].DevActionOutCfg.DevAddr,
|
||||
dimm_type[j].DimmReadFlag,
|
||||
DevActionInfo->DevActionCore.DevActionName);
|
||||
@@ -1724,7 +1774,7 @@ __attribute__((section(".non_0_wait"))) void DevAction_ExpandCtrl(DEV_ACTION_INF
|
||||
{
|
||||
if( (DevActionInfo != NULL) && (DevActionInfo->DevActionState.DevAddrIn != 0x00) )
|
||||
{
|
||||
Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>豸<EFBFBD><EFBFBD>ַ:%04X <20>豸<EFBFBD><E8B1B8><EFBFBD><EFBFBD>:%d <20><>ַ:%04X %d· <20><><EFBFBD><EFBFBD>״̬: %04X",
|
||||
Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"3 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>豸<EFBFBD><EFBFBD>ַ:%X <20>豸<EFBFBD><E8B1B8><EFBFBD><EFBFBD>:%d <20><>ַ:%X %d· <20><><EFBFBD><EFBFBD>״̬: %X",
|
||||
DevActionInfo->DevActionState.DevAddrIn,
|
||||
DevActionInfo->DevActionOutput[i].DevActionOutCfg.DevType,
|
||||
DevActionInfo->DevActionOutput[i].DevActionOutAddr,
|
||||
@@ -1756,7 +1806,7 @@ __attribute__((section(".non_0_wait"))) void DevAction_ExpandCtrl(DEV_ACTION_INF
|
||||
{
|
||||
if( (DevActionInfo != NULL) && (DevActionInfo->DevActionState.DevAddrIn != 0x00) )
|
||||
{
|
||||
Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>豸<EFBFBD><EFBFBD>ַ:%04X <20>豸<EFBFBD><E8B1B8><EFBFBD><EFBFBD>:%d <20><>ַ:%04X %d· <20><><EFBFBD><EFBFBD>״̬: %04X",
|
||||
Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"4 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>豸<EFBFBD><EFBFBD>ַ:%X <20>豸<EFBFBD><E8B1B8><EFBFBD><EFBFBD>:%d <20><>ַ:%X %d· <20><><EFBFBD><EFBFBD>״̬: %X",
|
||||
DevActionInfo->DevActionState.DevAddrIn,
|
||||
DevActionInfo->DevActionOutput[i].DevActionOutCfg.DevType,
|
||||
DevActionInfo->DevActionOutput[i].DevActionOutAddr,
|
||||
@@ -1792,7 +1842,7 @@ __attribute__((section(".non_0_wait"))) void DevAction_ExpandCtrl(DEV_ACTION_INF
|
||||
switch(DevMusicCtrlState.DevMusicCtrlWay.CtrlDirect)
|
||||
{
|
||||
case 0x03: //<2F><><EFBFBD><EFBFBD><EFBFBD><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>ļ<EFBFBD><EFBFBD>п<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ţ<EFBFBD><EFBFBD><EFBFBD>·:%d ״̬: %04X",DevActionInfo->DevActionOutput[i].DevActionOutCfg.DevOutputLoop, DevActionInfo->DevActionOutput[i].DevActionOutCfg.DevCtrlState);
|
||||
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 ״̬: %X",DevActionInfo->DevActionOutput[i].DevActionOutCfg.DevOutputLoop, DevActionInfo->DevActionOutput[i].DevActionOutCfg.DevCtrlState);
|
||||
BUS_Public.DevFunInfo.Dev_Output_Ctrl(
|
||||
0x00,
|
||||
0x00,
|
||||
@@ -1803,7 +1853,7 @@ __attribute__((section(".non_0_wait"))) void DevAction_ExpandCtrl(DEV_ACTION_INF
|
||||
case 0x04: //<2F><><EFBFBD><EFBFBD><EFBFBD>ز<EFBFBD><D8B2><EFBFBD>
|
||||
break;
|
||||
default: //<2F><><EFBFBD><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><EFBFBD><EFBFBD>ƣ<EFBFBD><EFBFBD><EFBFBD>ַ:%d <20><>·:%d״̬: %04X",BUS_Public.addr, DevActionInfo->DevActionOutput[i].DevActionOutCfg.DevOutputLoop, DevActionInfo->DevActionOutput[i].DevActionOutCfg.DevCtrlState);
|
||||
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>ַ:%d <20><>·:%d״̬: %X",BUS_Public.addr, DevActionInfo->DevActionOutput[i].DevActionOutCfg.DevOutputLoop, DevActionInfo->DevActionOutput[i].DevActionOutCfg.DevCtrlState);
|
||||
BUS_Public.DevFunInfo.Dev_Output_Ctrl(
|
||||
0x00,
|
||||
0x00,
|
||||
@@ -1880,7 +1930,7 @@ __attribute__((section(".non_0_wait"))) void DevAction_ExpandLightOpen(DEV_ACTIO
|
||||
HVoutNumMAX,
|
||||
expand_type[j].ExpandReadState);
|
||||
|
||||
Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"<EFBFBD>̵<EFBFBD><EFBFBD><EFBFBD>Ⱥ<EFBFBD>ؿ<EFBFBD><EFBFBD>ƣ<EFBFBD><EFBFBD><EFBFBD>·<EFBFBD><EFBFBD>־:%08X <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:%s ",
|
||||
Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"<EFBFBD>̵<EFBFBD><EFBFBD><EFBFBD>Ⱥ<EFBFBD>ؿ<EFBFBD><EFBFBD>ƣ<EFBFBD><EFBFBD><EFBFBD>·<EFBFBD><EFBFBD>־:%X <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:%s ",
|
||||
expand_type[j].ExpandReadFlag,
|
||||
DevActionInfo->DevActionCore.DevActionName);
|
||||
|
||||
@@ -1910,7 +1960,7 @@ __attribute__((section(".non_0_wait"))) void DevAction_ExpandLightOpen(DEV_ACTIO
|
||||
LED_OUT_CH_MAX,
|
||||
dimm_type[j].DimmReadState);
|
||||
|
||||
Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"PWM<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ⱥ<EFBFBD>ؿ<EFBFBD><EFBFBD>ƿ<EFBFBD>ʼ<EFBFBD><EFBFBD>ַ:%d<><64><EFBFBD><EFBFBD>·<EFBFBD><C2B7>־:%08X <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:%s ",
|
||||
Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"PWM<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ⱥ<EFBFBD>ؿ<EFBFBD><EFBFBD>ƿ<EFBFBD>ʼ<EFBFBD><EFBFBD>ַ:%d<><64><EFBFBD><EFBFBD>·<EFBFBD><C2B7>־:%X <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:%s ",
|
||||
DevActionInfo->DevActionOutput[i].DevActionOutCfg.DevAddr,
|
||||
dimm_type[j].DimmReadFlag,
|
||||
DevActionInfo->DevActionCore.DevActionName);
|
||||
@@ -1945,7 +1995,7 @@ __attribute__((section(".non_0_wait"))) void DevAction_ExpandLightOpen(DEV_ACTIO
|
||||
{
|
||||
if( (DevActionInfo != 0x00) && (DevActionInfo->DevActionState.DevAddrIn != 0x00) )
|
||||
{
|
||||
Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>豸<EFBFBD><EFBFBD>ַ:%04X <20>豸<EFBFBD><E8B1B8><EFBFBD><EFBFBD>:%d <20><>ַ:%04X %d· <20><><EFBFBD><EFBFBD>״̬: %04X",
|
||||
Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"5 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>豸<EFBFBD><EFBFBD>ַ:%X <20>豸<EFBFBD><E8B1B8><EFBFBD><EFBFBD>:%d <20><>ַ:%X %d· <20><><EFBFBD><EFBFBD>״̬: %X",
|
||||
DevActionInfo->DevActionState.DevAddrIn,
|
||||
DevActionInfo->DevActionOutput[i].DevActionOutCfg.DevType,
|
||||
DevActionInfo->DevActionOutput[i].DevActionOutAddr,
|
||||
@@ -1976,7 +2026,7 @@ __attribute__((section(".non_0_wait"))) void DevAction_ExpandLightOpen(DEV_ACTIO
|
||||
{
|
||||
if( (DevActionInfo != 0x00) && (DevActionInfo->DevActionState.DevAddrIn != 0x00) )
|
||||
{
|
||||
Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>豸<EFBFBD><EFBFBD>ַ:%04X <20>豸<EFBFBD><E8B1B8><EFBFBD><EFBFBD>:%d <20><>ַ:%04X %d· <20><><EFBFBD><EFBFBD>״̬: %04X",
|
||||
Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"6 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>豸<EFBFBD><EFBFBD>ַ:%X <20>豸<EFBFBD><E8B1B8><EFBFBD><EFBFBD>:%d <20><>ַ:%X %d· <20><><EFBFBD><EFBFBD>״̬: %X",
|
||||
DevActionInfo->DevActionState.DevAddrIn,
|
||||
DevActionInfo->DevActionOutput[i].DevActionOutCfg.DevType,
|
||||
DevActionInfo->DevActionOutput[i].DevActionOutAddr,
|
||||
@@ -2070,7 +2120,7 @@ __attribute__((section(".non_0_wait"))) void DevAction_ExpandLightClose(DEV_ACTI
|
||||
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 ",
|
||||
Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"<EFBFBD>̵<EFBFBD><EFBFBD><EFBFBD>״̬Ⱥ<EFBFBD>ؿ<EFBFBD><EFBFBD>ƿ<EFBFBD>ʼ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>·<EFBFBD><EFBFBD>־:%X <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:%s ",
|
||||
expand_type[j].ExpandReadFlag,
|
||||
DevActionInfo->DevActionCore.DevActionName);
|
||||
}
|
||||
@@ -2099,7 +2149,7 @@ __attribute__((section(".non_0_wait"))) void DevAction_ExpandLightClose(DEV_ACTI
|
||||
LED_OUT_CH_MAX,
|
||||
dimm_type[j].DimmReadState);
|
||||
|
||||
Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"PWM<EFBFBD><EFBFBD><EFBFBD><EFBFBD>״̬Ⱥ<EFBFBD>ؿ<EFBFBD><EFBFBD>ƿ<EFBFBD>ʼ<EFBFBD><EFBFBD>ַ:%d<><64><EFBFBD><EFBFBD>·<EFBFBD><C2B7>־:%08X <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:%s ",
|
||||
Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"PWM<EFBFBD><EFBFBD><EFBFBD><EFBFBD>״̬Ⱥ<EFBFBD>ؿ<EFBFBD><EFBFBD>ƿ<EFBFBD>ʼ<EFBFBD><EFBFBD>ַ:%d<><64><EFBFBD><EFBFBD>·<EFBFBD><C2B7>־:%X <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:%s ",
|
||||
DevActionInfo->DevActionOutput[i].DevActionOutCfg.DevAddr,
|
||||
dimm_type[j].DimmReadFlag,
|
||||
DevActionInfo->DevActionCore.DevActionName);
|
||||
@@ -2140,7 +2190,7 @@ __attribute__((section(".non_0_wait"))) void DevAction_ExpandLightClose(DEV_ACTI
|
||||
{
|
||||
if( (DevActionInfo != 0x00) && (DevActionInfo->DevActionState.DevAddrIn != 0x00) )
|
||||
{
|
||||
Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>豸<EFBFBD><EFBFBD>ַ:%04X <20>豸<EFBFBD><E8B1B8><EFBFBD><EFBFBD>:%d <20><>ַ:%04X %d· <20><><EFBFBD><EFBFBD>״̬: %04X",
|
||||
Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"7 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>豸<EFBFBD><EFBFBD>ַ:%X <20>豸<EFBFBD><E8B1B8><EFBFBD><EFBFBD>:%d <20><>ַ:%X %d· <20><><EFBFBD><EFBFBD>״̬: %X",
|
||||
DevActionInfo->DevActionState.DevAddrIn,
|
||||
DevActionInfo->DevActionOutput[i].DevActionOutCfg.DevType,
|
||||
DevActionInfo->DevActionOutput[i].DevActionOutAddr,
|
||||
@@ -2171,7 +2221,7 @@ __attribute__((section(".non_0_wait"))) void DevAction_ExpandLightClose(DEV_ACTI
|
||||
{
|
||||
if( (DevActionInfo != 0x00) && (DevActionInfo->DevActionState.DevAddrIn != 0x00) )
|
||||
{
|
||||
Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>豸<EFBFBD><EFBFBD>ַ:%04X <20>豸<EFBFBD><E8B1B8><EFBFBD><EFBFBD>:%d <20><>ַ:%04X %d· <20><><EFBFBD><EFBFBD>״̬: %04X",
|
||||
Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"8 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>豸<EFBFBD><EFBFBD>ַ:%X <20>豸<EFBFBD><E8B1B8><EFBFBD><EFBFBD>:%d <20><>ַ:%X %d· <20><><EFBFBD><EFBFBD>״̬: %X",
|
||||
DevActionInfo->DevActionState.DevAddrIn,
|
||||
DevActionInfo->DevActionOutput[i].DevActionOutCfg.DevType,
|
||||
DevActionInfo->DevActionOutput[i].DevActionOutAddr,
|
||||
@@ -2229,6 +2279,8 @@ __attribute__((section(".non_0_wait"))) void DevAction_ExpandClose(DEV_ACTION_IN
|
||||
EXPAND_TYPE_G expand_type[Action_Group_Ctrl_Num]={0};
|
||||
DIMM_TYPE_G dimm_type[Action_Group_Ctrl_Num]={0};
|
||||
|
||||
Expand_And_Dimm_Action_Get(DevActionInfo,expand_type,dimm_type,0x00);
|
||||
|
||||
for(i = 0; i < DevActionInfo->DevCtrlNum; i++)
|
||||
{
|
||||
if(DevActionInfo->DevActionOutput[i].DevActionOutAddr != 0x00)
|
||||
@@ -2253,7 +2305,7 @@ __attribute__((section(".non_0_wait"))) void DevAction_ExpandClose(DEV_ACTION_IN
|
||||
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 ",
|
||||
Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"<EFBFBD>̵<EFBFBD><EFBFBD><EFBFBD>״̬Ⱥ<EFBFBD>ؿ<EFBFBD><EFBFBD>ƿ<EFBFBD>ʼ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>·<EFBFBD><EFBFBD>־:%X <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:%s ",
|
||||
expand_type[j].ExpandReadFlag,
|
||||
DevActionInfo->DevActionCore.DevActionName);
|
||||
}
|
||||
@@ -2282,7 +2334,7 @@ __attribute__((section(".non_0_wait"))) void DevAction_ExpandClose(DEV_ACTION_IN
|
||||
LED_OUT_CH_MAX,
|
||||
dimm_type[j].DimmReadState);
|
||||
|
||||
Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"PWM<EFBFBD><EFBFBD><EFBFBD><EFBFBD>״̬Ⱥ<EFBFBD>ؿ<EFBFBD><EFBFBD>ƿ<EFBFBD>ʼ<EFBFBD><EFBFBD>ַ:%d<><64><EFBFBD><EFBFBD>·<EFBFBD><C2B7>־:%08X <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:%s ",
|
||||
Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"PWM<EFBFBD><EFBFBD><EFBFBD><EFBFBD>״̬Ⱥ<EFBFBD>ؿ<EFBFBD><EFBFBD>ƿ<EFBFBD>ʼ<EFBFBD><EFBFBD>ַ:%d<><64><EFBFBD><EFBFBD>·<EFBFBD><C2B7>־:%X <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:%s ",
|
||||
DevActionInfo->DevActionOutput[i].DevActionOutCfg.DevAddr,
|
||||
dimm_type[j].DimmReadFlag,
|
||||
DevActionInfo->DevActionCore.DevActionName);
|
||||
@@ -2323,7 +2375,7 @@ __attribute__((section(".non_0_wait"))) void DevAction_ExpandClose(DEV_ACTION_IN
|
||||
{
|
||||
if( (DevActionInfo != 0x00) && (DevActionInfo->DevActionState.DevAddrIn != 0x00) )
|
||||
{
|
||||
Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>豸<EFBFBD><EFBFBD>ַ:%04X <20>豸<EFBFBD><E8B1B8><EFBFBD><EFBFBD>:%d <20><>ַ:%04X %d· <20><><EFBFBD><EFBFBD>״̬: %04X",
|
||||
Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"9 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>豸<EFBFBD><EFBFBD>ַ:%X <20><EFBFBD><EFBFBD><EFBFBD><EFBFBD>豸<EFBFBD><EFBFBD><EFBFBD><EFBFBD>:%d <20><>ַ:%X %d· <20><><EFBFBD><EFBFBD>״̬: %X",
|
||||
DevActionInfo->DevActionState.DevAddrIn,
|
||||
DevActionInfo->DevActionOutput[i].DevActionOutCfg.DevType,
|
||||
DevActionInfo->DevActionOutput[i].DevActionOutAddr,
|
||||
@@ -2354,7 +2406,7 @@ __attribute__((section(".non_0_wait"))) void DevAction_ExpandClose(DEV_ACTION_IN
|
||||
{
|
||||
if((DevActionInfo != 0x00) && (DevActionInfo->DevActionState.DevAddrIn != 0x00)) //
|
||||
{
|
||||
Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>豸<EFBFBD><EFBFBD>ַ:%04X <20>豸<EFBFBD><E8B1B8><EFBFBD><EFBFBD>:%d <20><>ַ:%04X %d· <20><><EFBFBD><EFBFBD>״̬: %04X",
|
||||
Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"10 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>豸<EFBFBD><EFBFBD>ַ:%X <20>豸<EFBFBD><E8B1B8><EFBFBD><EFBFBD>:%d <20><>ַ:%X %d· <20><><EFBFBD><EFBFBD>״̬: %X",
|
||||
DevActionInfo->DevActionState.DevAddrIn,
|
||||
DevActionInfo->DevActionOutput[i].DevActionOutCfg.DevType,
|
||||
DevActionInfo->DevActionOutput[i].DevActionOutAddr,
|
||||
@@ -2440,7 +2492,7 @@ __attribute__((section(".non_0_wait"))) void DevAction_ExpandClose(DEV_ACTION_IN
|
||||
DevActionInfo->DevActionOutput[i].DevActionOutCfg.DevOutputLoop,
|
||||
DEV_CTRLWAY_STOP);
|
||||
|
||||
Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"485<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>رտ<EFBFBD><EFBFBD><EFBFBD> state:%4X",DevActionInfo->DevActionOutput[i].DevActionOutCfg.DevCtrlState);
|
||||
Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"485<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>رտ<EFBFBD><EFBFBD><EFBFBD> state:%X",DevActionInfo->DevActionOutput[i].DevActionOutCfg.DevCtrlState);
|
||||
break;
|
||||
case DEV_CTRLWAY_STOP:
|
||||
break;
|
||||
@@ -2741,12 +2793,12 @@ __attribute__((section(".non_0_wait"))) void DevAction_Output(DEV_ACTION_INFO *D
|
||||
DevActionGlobal.DevActionU64Cond.NeightState = NightModeClose;
|
||||
DevAction_No_Ctrl(DevActionGlobal.SleepActionNo, 0x02, DEV_CTRLWAY_CLOSE);//<2F>ر<EFBFBD>ҹ<EFBFBD><D2B9>
|
||||
case NightModeClose:
|
||||
Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"<EFBFBD><EFBFBD>ҹ<EFBFBD><EFBFBD><EFBFBD>й<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɹرտ<EFBFBD>ʼ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>豸<EFBFBD><EFBFBD><EFBFBD><EFBFBD>״̬<EFBFBD><EFBFBD><EFBFBD>и<EFBFBD>ֵ:");
|
||||
Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"<EFBFBD><EFBFBD>ҹ<EFBFBD><EFBFBD><EFBFBD>й<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɹر<EFBFBD>-ִ<>г<EFBFBD><D0B3><EFBFBD>");
|
||||
DevAction_ExpandCtrl(DevActionInfo); //ִ<>е<EFBFBD>ǰ<EFBFBD><C7B0><EFBFBD><EFBFBD>
|
||||
break;
|
||||
}
|
||||
}else {
|
||||
Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"<EFBFBD><EFBFBD>ҹ<EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɹرտ<EFBFBD>ʼ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>豸<EFBFBD><EFBFBD><EFBFBD><EFBFBD>״̬<EFBFBD><EFBFBD><EFBFBD>и<EFBFBD>ֵ:");
|
||||
Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"<EFBFBD><EFBFBD>ҹ<EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɹر<C9B9>-ִ<>г<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>");
|
||||
DevAction_ExpandCtrl(DevActionInfo);
|
||||
if(DevActionInfo->DevActionInput.DevType == DEV_RS485_SWT)
|
||||
{
|
||||
@@ -2780,12 +2832,12 @@ __attribute__((section(".non_0_wait"))) void DevAction_Output(DEV_ACTION_INFO *D
|
||||
}
|
||||
if(DEV_STATE_CLOSE == DevActionInfo->DevActionState.SceneState) //<2F><>ǰ<EFBFBD><C7B0><EFBFBD><EFBFBD>Ϊ<EFBFBD><CEAA>
|
||||
{
|
||||
Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"<EFBFBD><EFBFBD>ҹ<EFBFBD><EFBFBD><EFBFBD>й<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>ɹرտ<EFBFBD>ʼ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>豸<EFBFBD><EFBFBD><EFBFBD><EFBFBD>״̬<EFBFBD><EFBFBD><EFBFBD>и<EFBFBD>ֵ:<><D7BC>ִ<EFBFBD>г<EFBFBD><D0B3><EFBFBD><EFBFBD><EFBFBD>");
|
||||
Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"<EFBFBD><EFBFBD>ҹ<EFBFBD><EFBFBD><EFBFBD>й<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>ɹر<EFBFBD>:<><D7BC>ִ<EFBFBD>г<EFBFBD><D0B3><EFBFBD><EFBFBD><EFBFBD>");
|
||||
DevAction_ExpandCtrl(DevActionInfo); //ִ<>е<EFBFBD>ǰ<EFBFBD><C7B0><EFBFBD><EFBFBD>
|
||||
}
|
||||
else if(DEV_STATE_OPEN == DevActionInfo->DevActionState.SceneState)
|
||||
{
|
||||
Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"<EFBFBD><EFBFBD>ҹ<EFBFBD><EFBFBD><EFBFBD>й<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>ɹرտ<EFBFBD>ʼ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>豸<EFBFBD><EFBFBD><EFBFBD><EFBFBD>״̬<EFBFBD><EFBFBD><EFBFBD>и<EFBFBD>ֵ:<><D7BC>ִ<EFBFBD>г<EFBFBD><D0B3><EFBFBD><EFBFBD><EFBFBD>");
|
||||
Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"<EFBFBD><EFBFBD>ҹ<EFBFBD><EFBFBD><EFBFBD>й<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>ɹر<EFBFBD>:<><D7BC>ִ<EFBFBD>г<EFBFBD><D0B3><EFBFBD><EFBFBD><EFBFBD>");
|
||||
DevAction_ExpandClose(DevActionInfo, NOR_MODE_CTRL); //ִ<>е<EFBFBD>ǰ<EFBFBD><C7B0><EFBFBD><EFBFBD>
|
||||
}
|
||||
break;
|
||||
@@ -2793,14 +2845,15 @@ __attribute__((section(".non_0_wait"))) void DevAction_Output(DEV_ACTION_INFO *D
|
||||
}else {
|
||||
if(DEV_STATE_CLOSE == DevActionInfo->DevActionState.SceneState) //<2F><>ǰ<EFBFBD><C7B0><EFBFBD><EFBFBD>Ϊ<EFBFBD><CEAA>
|
||||
{
|
||||
Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"<EFBFBD><EFBFBD>ҹ<EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>ɹرտ<EFBFBD>ʼ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>豸<EFBFBD><EFBFBD><EFBFBD><EFBFBD>״̬<EFBFBD><EFBFBD><EFBFBD>и<EFBFBD>ֵ:<><D7BC>ִ<EFBFBD>г<EFBFBD><D0B3><EFBFBD><EFBFBD><EFBFBD>");
|
||||
Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"<EFBFBD><EFBFBD>ҹ<EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>ɹر<EFBFBD>:<><D7BC>ִ<EFBFBD>г<EFBFBD><D0B3><EFBFBD><EFBFBD><EFBFBD>");
|
||||
DevAction_ExpandCtrl(DevActionInfo); //ִ<>е<EFBFBD>ǰ<EFBFBD><C7B0><EFBFBD><EFBFBD>
|
||||
}
|
||||
else if(DEV_STATE_OPEN == DevActionInfo->DevActionState.SceneState) //<2F><>ǰ<EFBFBD><C7B0><EFBFBD><EFBFBD>Ϊ<EFBFBD><CEAA>
|
||||
{
|
||||
Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"<EFBFBD><EFBFBD>ҹ<EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>ɹرտ<EFBFBD>ʼ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>豸<EFBFBD><EFBFBD><EFBFBD><EFBFBD>״̬<EFBFBD><EFBFBD><EFBFBD>и<EFBFBD>ֵ:<><D7BC>ִ<EFBFBD>г<EFBFBD><D0B3><EFBFBD><EFBFBD><EFBFBD>");
|
||||
Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"<EFBFBD><EFBFBD>ҹ<EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>ɹر<EFBFBD>:<><D7BC>ִ<EFBFBD>г<EFBFBD><D0B3><EFBFBD><EFBFBD><EFBFBD>");
|
||||
DevAction_ExpandClose(DevActionInfo, NOR_MODE_CTRL); //ִ<>е<EFBFBD>ǰ<EFBFBD><C7B0><EFBFBD><EFBFBD>
|
||||
}
|
||||
|
||||
if(DevActionInfo->DevActionInput.DevType == DEV_RS485_SWT)
|
||||
{
|
||||
DevActionGlobal.SleepMode_State = 0x00; //˯<><CBAF>ģʽ<C4A3><CABD>
|
||||
@@ -2833,12 +2886,12 @@ __attribute__((section(".non_0_wait"))) void DevAction_Output(DEV_ACTION_INFO *D
|
||||
}
|
||||
if(DevActionInfo->DevActionState.SceneState == DEV_STATE_CLOSE) //<2F><>ǰ<EFBFBD><C7B0><EFBFBD><EFBFBD>Ϊ<EFBFBD><CEAA>
|
||||
{
|
||||
Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"<EFBFBD><EFBFBD>ҹ<EFBFBD><EFBFBD><EFBFBD>й<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>ɹرտ<EFBFBD>ʼ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>豸<EFBFBD><EFBFBD><EFBFBD><EFBFBD>״̬<EFBFBD><EFBFBD><EFBFBD>и<EFBFBD>ֵ:<><D7BC>ִ<EFBFBD>г<EFBFBD><D0B3><EFBFBD><EFBFBD><EFBFBD>");
|
||||
Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"<EFBFBD>ܿ<EFBFBD><EFBFBD><EFBFBD>-<2D><EFBFBD>ҹ<EFBFBD><EFBFBD><EFBFBD>й<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>ɹر<EFBFBD>:<><D7BC>ִ<EFBFBD>г<EFBFBD><D0B3><EFBFBD><EFBFBD><EFBFBD>");
|
||||
DevAction_ExpandLightOpen(DevActionInfo); //<2F><EFBFBD>ǰ<EFBFBD><C7B0><EFBFBD><EFBFBD><EFBFBD>ĵƹ<C4B5>
|
||||
}
|
||||
else if(DevActionInfo->DevActionState.SceneState == DEV_STATE_OPEN)
|
||||
{
|
||||
Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"<EFBFBD><EFBFBD>ҹ<EFBFBD><EFBFBD><EFBFBD>й<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>ɹرտ<EFBFBD>ʼ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>豸<EFBFBD><EFBFBD><EFBFBD><EFBFBD>״̬<EFBFBD><EFBFBD><EFBFBD>и<EFBFBD>ֵ:<><D7BC>ִ<EFBFBD>г<EFBFBD><D0B3><EFBFBD><EFBFBD><EFBFBD>");
|
||||
Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"<EFBFBD>ܿ<EFBFBD><EFBFBD><EFBFBD>-<2D><EFBFBD>ҹ<EFBFBD><EFBFBD><EFBFBD>й<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>ɹر<EFBFBD>:<><D7BC>ִ<EFBFBD>г<EFBFBD><D0B3><EFBFBD><EFBFBD><EFBFBD>");
|
||||
DevAction_ExpandClose(DevActionInfo, SLEEP_MODE_CTRL); //ִ<>е<EFBFBD>ǰ<EFBFBD><C7B0><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ƹ<EFBFBD><C6B9><EFBFBD><EFBFBD>豸<EFBFBD>ر<EFBFBD>
|
||||
}
|
||||
break;
|
||||
@@ -2846,12 +2899,12 @@ __attribute__((section(".non_0_wait"))) void DevAction_Output(DEV_ACTION_INFO *D
|
||||
}else {
|
||||
if(DevActionInfo->DevActionState.SceneState == DEV_STATE_CLOSE) //<2F><>ǰ<EFBFBD><C7B0><EFBFBD><EFBFBD>Ϊ<EFBFBD><CEAA>
|
||||
{
|
||||
Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"<EFBFBD><EFBFBD>ҹ<EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>ɹرտ<EFBFBD>ʼ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>豸<EFBFBD><EFBFBD><EFBFBD><EFBFBD>״̬<EFBFBD><EFBFBD><EFBFBD>и<EFBFBD>ֵ:<><D7BC>ִ<EFBFBD>г<EFBFBD><D0B3><EFBFBD><EFBFBD><EFBFBD>");
|
||||
Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"<EFBFBD>ܿ<EFBFBD><EFBFBD><EFBFBD>-<2D><EFBFBD>ҹ<EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>ɹر<EFBFBD>:<><D7BC>ִ<EFBFBD>г<EFBFBD><D0B3><EFBFBD><EFBFBD><EFBFBD>");
|
||||
DevAction_ExpandLightOpen(DevActionInfo); //<2F><EFBFBD>ǰ<EFBFBD><C7B0><EFBFBD><EFBFBD><EFBFBD>ĵƹ<C4B5>
|
||||
}
|
||||
else if(DevActionInfo->DevActionState.SceneState == DEV_STATE_OPEN) //<2F><>ǰ<EFBFBD><C7B0><EFBFBD><EFBFBD>Ϊ<EFBFBD><CEAA>
|
||||
{
|
||||
Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"<EFBFBD><EFBFBD>ҹ<EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>ɹرտ<EFBFBD>ʼ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>豸<EFBFBD><EFBFBD><EFBFBD><EFBFBD>״̬<EFBFBD><EFBFBD><EFBFBD>и<EFBFBD>ֵ:<><D7BC>ִ<EFBFBD>г<EFBFBD><D0B3><EFBFBD><EFBFBD><EFBFBD>");
|
||||
Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"<EFBFBD>ܿ<EFBFBD><EFBFBD><EFBFBD>-<2D><EFBFBD>ҹ<EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>ɹر<EFBFBD>:<><D7BC>ִ<EFBFBD>г<EFBFBD><D0B3><EFBFBD><EFBFBD><EFBFBD>");
|
||||
DevAction_ExpandClose(DevActionInfo, SLEEP_MODE_CTRL); //ִ<>е<EFBFBD>ǰ<EFBFBD><C7B0><EFBFBD><EFBFBD>
|
||||
}
|
||||
if(DevActionInfo->DevActionInput.DevType == DEV_RS485_SWT)
|
||||
@@ -2969,12 +3022,13 @@ __attribute__((section(".non_0_wait"))) void DevAction_Output(DEV_ACTION_INFO *D
|
||||
break;
|
||||
#endif
|
||||
case ACTION_SCENE_SLEEP_UNRELATED:
|
||||
Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"<EFBFBD><EFBFBD>ҹ<EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><EFBFBD>ȡ<EFBFBD><C8A1>-<2D><><EFBFBD>ⰴ<EFBFBD><E2B0B4> <><D7BC>ִ<EFBFBD>д<EFBFBD><D0B4><EFBFBD>ҹ<EFBFBD><D2B9>:");
|
||||
Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"<EFBFBD><EFBFBD>ҹ<EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><EFBFBD>ȡ<EFBFBD><C8A1>-<2D><><EFBFBD>ⰴ<EFBFBD><E2B0B4> <><D7BC>ִ<EFBFBD>д<EFBFBD><D0B4><EFBFBD>ҹ<EFBFBD><D2B9>");
|
||||
DevAction_ExpandCtrl(DevActionInfo); //ִ<>е<EFBFBD>ǰ<EFBFBD><C7B0><EFBFBD><EFBFBD>
|
||||
break;
|
||||
}
|
||||
|
||||
if(DevActionGlobal.DevActionU64Cond.NeightState != DevActionGlobal.Last_NeightState) {
|
||||
Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"<EFBFBD><EFBFBD>ҹ״̬<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ı<EFBFBD>:%d -2",DevActionGlobal.DevActionU64Cond.NeightState);
|
||||
DevActionGlobal.Last_NeightState = DevActionGlobal.DevActionU64Cond.NeightState;
|
||||
}
|
||||
|
||||
@@ -3162,7 +3216,7 @@ __attribute__((section(".non_0_wait"))) void BLV_DevAction_Cycle(uint32_t Dev_pr
|
||||
if(BLV_DevAction_Cond_Judge(&DevActionInfo) == CondIsPass)
|
||||
{
|
||||
BreakFlag = 0x01;
|
||||
Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"<EFBFBD><EFBFBD><EFBFBD><EFBFBD>:%d <20><>ַ%d <20><>·:%d <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:%d <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ַ:%Xͨ<58><CDA8>", \
|
||||
Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"<EFBFBD><EFBFBD><EFBFBD><EFBFBD>:%d <20><>ַ%d <20><>·:%d <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:%d <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ַ:%Xͨ<58><CDA8>", \
|
||||
DevActionInfo.DevActionInput.DevType, \
|
||||
DevActionInfo.DevActionInput.DevAddr, \
|
||||
DevActionInfo.DevActionInput.DevLoop, \
|
||||
@@ -3171,7 +3225,7 @@ __attribute__((section(".non_0_wait"))) void BLV_DevAction_Cycle(uint32_t Dev_pr
|
||||
DevAction_Output(&DevActionInfo); //ִ<><D6B4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
||||
}else if(DevActionInfo.DevActionCond.DevActionU64Cond.EleCtrlFlag == 0x01)
|
||||
{
|
||||
Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"<EFBFBD><EFBFBD><EFBFBD><EFBFBD>:%d <20><>ַ%d <20><>·:%d <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:%d <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ַ:%Xδͨ<CEB4><CDA8><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>п<EFBFBD>ȡ<EFBFBD>翪<EFBFBD><E7BFAA>־",
|
||||
Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"<EFBFBD><EFBFBD><EFBFBD><EFBFBD>:%d <20><>ַ%d <20><>·:%d <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:%d <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ַ:%Xδͨ<CEB4><CDA8><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>п<EFBFBD>ȡ<EFBFBD>翪<EFBFBD><E7BFAA>־",
|
||||
DevActionInfo.DevActionInput.DevType, \
|
||||
DevActionInfo.DevActionInput.DevAddr, \
|
||||
DevActionInfo.DevActionInput.DevLoop, \
|
||||
@@ -3198,7 +3252,7 @@ __attribute__((section(".non_0_wait"))) void BLV_DevAction_Cycle(uint32_t Dev_pr
|
||||
if( DevActionInfo.DevActionState.MultiNumber == (ret >> 0x01) )
|
||||
{
|
||||
BreakFlag = 0x01;
|
||||
Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:%s,<2C>豸<EFBFBD><E8B1B8><EFBFBD><EFBFBD><CDB8><EFBFBD>:%d <20>豸<EFBFBD><E8B1B8>ַ%d <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ַ:%d <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:%d <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ַ:%08Xͨ<EFBFBD><EFBFBD>",
|
||||
Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:%s,<2C>豸<EFBFBD><E8B1B8><EFBFBD><EFBFBD><CDB8><EFBFBD>:%d <20>豸<EFBFBD><E8B1B8>ַ%d <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ַ:%d <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:%d <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ַ:%Xͨ<58><CDA8>",
|
||||
DevActionInfo.DevActionCore.DevActionName, \
|
||||
DevActionInfo.DevActionInput.DevType, \
|
||||
DevActionInfo.DevActionInput.DevAddr, \
|
||||
@@ -3219,7 +3273,7 @@ __attribute__((section(".non_0_wait"))) void BLV_DevAction_Cycle(uint32_t Dev_pr
|
||||
deal_addr = deal_addr - 3;
|
||||
if( SRAM_Read_Byte(deal_addr) == (ret >> 0x01) )
|
||||
{
|
||||
Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"<EFBFBD>ҵ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:%d <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ַ:%08X",SRAM_Read_Byte(deal_addr),TempAddr);
|
||||
Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"<EFBFBD>ҵ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:%d <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ַ:%X",SRAM_Read_Byte(deal_addr),TempAddr);
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -3235,7 +3289,7 @@ __attribute__((section(".non_0_wait"))) void BLV_DevAction_Cycle(uint32_t Dev_pr
|
||||
}
|
||||
|
||||
BreakFlag = 0x01;
|
||||
Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:%s,<2C>豸<EFBFBD><E8B1B8><EFBFBD><EFBFBD><CDB8><EFBFBD>:%d <20>豸<EFBFBD><E8B1B8>ַ%d <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ַ:%d <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:%d <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ַ:%08Xͨ<EFBFBD><EFBFBD>",
|
||||
Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:%s,<2C>豸<EFBFBD><E8B1B8><EFBFBD><EFBFBD><CDB8><EFBFBD>:%d <20>豸<EFBFBD><E8B1B8>ַ%d <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ַ:%d <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:%d <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ַ:%Xͨ<58><CDA8>",
|
||||
DevActionInfo.DevActionCore.DevActionName, \
|
||||
DevActionInfo.DevActionInput.DevType, \
|
||||
DevActionInfo.DevActionInput.DevAddr, \
|
||||
@@ -3256,7 +3310,7 @@ __attribute__((section(".non_0_wait"))) void BLV_DevAction_Cycle(uint32_t Dev_pr
|
||||
DevActionInfo.DevActionInput.DevEvent ) == CtrlValid ) )
|
||||
{
|
||||
BreakFlag = 0x01;
|
||||
Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:%s,<2C>豸<EFBFBD><E8B1B8><EFBFBD><EFBFBD><CDB8><EFBFBD>:%d <20>豸<EFBFBD><E8B1B8>ַ%d <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ַ:%d <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:%d <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ַ:%08Xͨ<EFBFBD><EFBFBD>",
|
||||
Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:%s,<2C>豸<EFBFBD><E8B1B8><EFBFBD><EFBFBD><CDB8><EFBFBD>:%d <20>豸<EFBFBD><E8B1B8>ַ%d <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ַ:%d <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:%d <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ַ:%Xͨ<58><CDA8>",
|
||||
DevActionInfo.DevActionCore.DevActionName, \
|
||||
DevActionInfo.DevActionInput.DevType, \
|
||||
DevActionInfo.DevActionInput.DevAddr, \
|
||||
@@ -3275,12 +3329,14 @@ __attribute__((section(".non_0_wait"))) void BLV_DevAction_Cycle(uint32_t Dev_pr
|
||||
|
||||
if(BreakFlag == 0x01) //<2F><><EFBFBD>ز<EFBFBD><D8B2><EFBFBD><EFBFBD>¼<EFBFBD><C2BC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ˢ<EFBFBD>³<EFBFBD><C2B3><EFBFBD>״̬
|
||||
{
|
||||
Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"<EFBFBD><EFBFBD><EFBFBD><EFBFBD>%d %d״̬<D7B4><CCAC><EFBFBD><EFBFBD>...", DevActionInfo.DevActionCore.ActionNo,DevActionInfo.DevActionState.SceneState);
|
||||
DevAction_State_Get(&DevActionInfo); //<2F><>ǰ<EFBFBD><C7B0><EFBFBD><EFBFBD>״̬<D7B4><CCAC><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>豸<EFBFBD><E8B1B8><EFBFBD><EFBFBD>ȥ<EFBFBD>ж<EFBFBD>
|
||||
}
|
||||
|
||||
//<2F><><EFBFBD><EFBFBD>״̬<D7B4>ı<EFBFBD>,<2C><><EFBFBD>Ʒ<EFBFBD><C6B7><EFBFBD><EFBFBD><EFBFBD>
|
||||
if( DevActionInfo.DevActionState.SceneState != DevActionInfo.DevActionState.SceneStateLast )
|
||||
{
|
||||
Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"<EFBFBD><EFBFBD><EFBFBD><EFBFBD>%d ״̬<D7B4>ı<EFBFBD>:%d,<2C><><EFBFBD>泡<EFBFBD><E6B3A1>...", DevActionInfo.DevActionCore.ActionNo,DevActionInfo.DevActionState.SceneState);
|
||||
DevActionInfo.DevActionState.SceneStateLast = DevActionInfo.DevActionState.SceneState;
|
||||
DevAction_IndicateCtrl(&DevActionInfo);
|
||||
|
||||
@@ -3289,7 +3345,7 @@ __attribute__((section(".non_0_wait"))) void BLV_DevAction_Cycle(uint32_t Dev_pr
|
||||
|
||||
if(BreakFlag == 0x01)
|
||||
{
|
||||
Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"<EFBFBD><EFBFBD>ǰ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>±<EFBFBD>:%d", j);
|
||||
Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"<EFBFBD><EFBFBD>ǰ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>±<EFBFBD>:%d", j);
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -3415,6 +3471,8 @@ __attribute__((section(".non_0_wait"))) void BLV_DevDly_Process(uint32_t dly_pro
|
||||
uint8_t KeepFlag = 0x00;
|
||||
Dev_Output_Ctrl_ptr Dev_Output_Ctrl;
|
||||
|
||||
Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"%s : %x",__func__,dly_processing_addr);
|
||||
|
||||
SRAM_DMA_Read_Buff((uint8_t *)&DevDlyInfo, sizeof(Struct_Dev_Dly), dly_processing_addr);
|
||||
|
||||
if( (DevDlyInfo.DlyExcuteFlag == 0x01) && (SysTick_1ms >= DevDlyInfo.DlyExcuteTime) )
|
||||
@@ -3422,6 +3480,8 @@ __attribute__((section(".non_0_wait"))) void BLV_DevDly_Process(uint32_t dly_pro
|
||||
DevDlyInfo.DlyExcuteFlag = 0x00; //<2F><>־<EFBFBD><D6BE>0
|
||||
KeepFlag = 0x01;
|
||||
|
||||
Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"%s : %x ʱ<>䵽<EFBFBD><E4B5BD> %x %d",__func__,dly_processing_addr,DevDlyInfo.DevDlyCore.DevDlyAddr,DevDlyInfo.DevDlyCore.DevType);
|
||||
|
||||
if(DevDlyInfo.DevDlyCore.DevDlyAddr != 0x00)
|
||||
{
|
||||
switch(DevDlyInfo.DevDlyCore.DevType)
|
||||
@@ -3486,7 +3546,7 @@ __attribute__((section(".non_0_wait"))) void BLV_DevDly_Task(void)
|
||||
static uint32_t dev_devdly_processing_tick = 0;
|
||||
uint32_t dly_processing_addr = 0;
|
||||
|
||||
if( SysTick_1ms - dev_devdly_processing_tick >= 10 )
|
||||
if( SysTick_1ms - dev_devdly_processing_tick >= 100 )
|
||||
{
|
||||
dev_devdly_processing_tick = SysTick_1ms;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user