测试:场景执行初步测试OK

场景执行-弱电输入触发控制继电器
This commit is contained in:
caocong
2026-01-06 21:02:22 +08:00
parent 6e19d0b451
commit d10556b0d5
10 changed files with 558 additions and 295 deletions

View File

@@ -57,6 +57,9 @@
#define DevCtrlDlyLen 0x08 //<2F><EFBFBD><E8B1B8><EFBFBD>Ƴ<EFBFBD><C6B3>ȴ<EFBFBD><C8B4><EFBFBD>ʱ<EFBFBD>̶<EFBFBD>8<EFBFBD><38><EFBFBD>ֽ<EFBFBD> <20><>Ҫ<EFBFBD>Լ<EFBFBD><D4BC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><E8B1B8><EFBFBD><EFBFBD>ʱ<EFBFBD>ڵ<EFBFBD>
#define DevCtrlDlyLenAddr 0x10 //<2F><EFBFBD><E8B1B8><EFBFBD>Ƴ<EFBFBD><C6B3>ȴ<EFBFBD><C8B4><EFBFBD><E8B1B8>ַ<EFBFBD>̶<EFBFBD>16<31><36><EFBFBD>ֽ<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ҫ<EFBFBD><D2AA><EFBFBD><EFBFBD><EFBFBD>ڲ<EFBFBD>ʹ<EFBFBD><CAB9>
#define DEV_ACTION_INFO_Size 864 //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϣ<EFBFBD>ܳ<EFBFBD> 864Byte
#define DevActionInfo_DevActionState_DevAddrIn_Index 59 //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><E8B1B8>ַ<EFBFBD>±<EFBFBD>
typedef struct
{
uint16_t ActionNo; //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
@@ -67,8 +70,8 @@ typedef struct
{
uint8_t DevType; //<2F><EFBFBD><E8B1B8><EFBFBD><EFBFBD>
uint8_t DevAddr; //<2F><EFBFBD><E8B1B8>ַ
uint16_t inAddr; //<2F><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ַ
uint16_t inType; //<2F><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><E8B1B8><EFBFBD>ͣ<EFBFBD><CDA3><EFBFBD>ʶ<EFBFBD><CAB6><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
uint16_t DevLoop; //<2F><EFBFBD><EFBFBD>·
uint16_t DevEvent; //<2F><EFBFBD>¼<EFBFBD>
}Dev_Action_Input; //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> һ<><D2BB>6<EFBFBD><36><EFBFBD>ֽ<EFBFBD>
typedef struct
@@ -150,7 +153,6 @@ typedef struct CFG_Action_Add
Dev_Action_Cond DevActionCond; //<2F><EFBFBD><E8B1B8><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> һ<><D2BB>9<EFBFBD>ֽ<EFBFBD>
/* <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ƚ<EFBFBD><C8BD><EFBFBD> <20><><EFBFBD>ݿ<EFBFBD><DDBF><EFBFBD><EFBFBD>ܳ<EFBFBD>49<34>ֽ<EFBFBD> */
Dev_Action_State DevActionState; //<2F><><EFBFBD><EFBFBD>״̬<D7B4><CCAC><EFBFBD><EFBFBD> һ<><D2BB>11<31><31><EFBFBD>ֽ<EFBFBD>
uint8_t CheckVal; //<2F><>ǰ<EFBFBD><EFBFBD><E8B1B8><EFBFBD><EFBFBD>У<EFBFBD><D0A3> 1<><31><EFBFBD>ֽ<EFBFBD>
uint16_t data_len; //<2F><EFBFBD><E8B1B8><EFBFBD><EFBFBD> 2<><32><EFBFBD>ֽ<EFBFBD>
@@ -251,10 +253,6 @@ typedef struct
Dev_Dly_Value DlyBlinkTime; //<2F><>˸Ƶ<CBB8><C6B5> 0201 Ϊ1S<31>л<EFBFBD> 0202 Ϊ2S<32>л<EFBFBD> <20><>Ϊ<EFBFBD><CEAA><EFBFBD><EFBFBD> Ϊ<><CEAA>ǰ<EFBFBD><C7B0>Ҫִ<D2AA>е<EFBFBD><D0B5><EFBFBD>չ<EFBFBD><EFBFBD>±<EFBFBD>
}Struct_Dev_Dly; //<2F><EFBFBD><E8B1B8>ʱ<EFBFBD><EFBFBD><EFBFBD><E5A3AC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>д<EFBFBD><D0B4><EFBFBD>ʱ<EFBFBD><CAB1><EFBFBD><EFBFBD>չ<EFBFBD><D5B9><EFBFBD><EFBFBD><EFBFBD><20>̶<EFBFBD>16<31><36><EFBFBD>ֽ<EFBFBD>
typedef struct{
uint8_t Addr;
uint16_t ExpandReadState[32];
@@ -269,15 +267,10 @@ typedef struct{
extern BLV_DevAction_Manage_G DevActionGlobal;
uint8_t DevAction_Info_Write_To_SRAM(uint32_t addr,DEV_ACTION_INFO *DevAction_Info);
uint8_t DevAction_Info_Read_To_Struct(uint32_t addr,DEV_ACTION_INFO *DevAction_Info);
void Logic_DevAction_Add(uint8_t *data,uint16_t len);
uint32_t DevAction_No_Get(uint16_t DevActionNo);
@@ -287,5 +280,6 @@ void DevAction_No_Ctrl(uint16_t DevActionNo, uint8_t Mode, uint16_t CtrlState);
uint8_t DevActionCtrl(uint8_t *p, uint8_t DataLen);
void BLV_DevAction_Task(void);
void BLV_DevDly_Task(void);
#endif /* MCU_DRIVER_INC_BLV_DEV_ACTION_H_ */

View File

@@ -346,6 +346,8 @@ void BLV_PollPort_ModeTask(void);
void BLV_ActivePort_Task(void);
void Act485Port_Passthrough_Task(void);
void BLV_ActivePort_ModeTask(void);
void BLV_Nor_Dev_ModeTask(void);
void BLV_Active_Set_List_Addr(uint32_t addr);
uint32_t Find_Device_List_Information(uint8_t dev_type,uint8_t addr);
uint32_t Find_AllDevice_List_Information(uint8_t dev_type,uint8_t addr);