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

feat:增加插卡取电驱动、无卡取电驱动设备动作上报

Browse Source 
-> 插卡取电驱动 - 增加设备动作 - 插卡动作上报
-> 无卡取电驱动 - 增加设备动作 - 无卡动作上报
This commit is contained in:
caocong
2026-01-27 18:27:03 +08:00
parent 12580eba5d
commit 5e7697cc21
18 changed files with 24005 additions and 23642 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
BasicCode/Drive/BLV_485_Protocol/BLV_485_Dev_CardFun.c
View File

@@ -478,12 +478,15 @@ uint8_t BLV_Rs485_Card_Check(uint32_t dev_addr,uint32_t data_addr,uint16_t len)
{
case 0x02: //<2F><><EFBFBD><EFBFBD> 2025-09-03 <20><>ȡ<EFBFBD><C8A1>M0<4D><30>
Rs485CardInfo.Rs485CardFlag = 0x01;
Udp_Addtion_Roomstate(BUS_Public.type,BUS_Public.addr,0x00,0x02);
break;
case 0x01: //<2F><><EFBFBD><EFBFBD> 2025-09-03 <20><>ȡ<EFBFBD><C8A1>M1<4D><31>
Rs485CardInfo.Rs485CardFlag = 0x01;
Udp_Addtion_Roomstate(BUS_Public.type,BUS_Public.addr,0x00,0x01);
break;
case 0x00: //<2F><><EFBFBD><EFBFBD>
Rs485CardInfo.Rs485CardFlag = 0x00;
Udp_Addtion_Roomstate(BUS_Public.type,BUS_Public.addr,0x00,0x00);
break;
default: //<2F><><EFBFBD><EFBFBD> 2025-09-26 <20>ϱ<EFBFBD>δ֪״̬<D7B4><CCAC>ȡ<EFBFBD><C8A1><EFBFBD><EFBFBD>־λ<D6BE><CEBB><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>仯
//Rs485CardInfo.Rs485CardFlag = 0x00;

268
BasicCode/Drive/BLV_485_Protocol/BLV_485_Dev_EnergyMonitor.c
View File

@@ -370,7 +370,7 @@ uint8_t BLV_RS485_Energy_Data_Processing(uint32_t dev_addr,uint32_t data_addr,ui
uint8_t rev = 0x01;
uint16_t deal_len = len;
uint8_t deal_buff[BLV_Energy_RecvData_LenMax];
uint32_t temp_value = 0;
uint32_t temp_value = 0,temp_flag = 0x00;
if((dev_addr == NULL) || (data_addr == 0x00) ) return rev;
@@ -452,96 +452,194 @@ uint8_t BLV_RS485_Energy_Data_Processing(uint32_t dev_addr,uint32_t data_addr,ui
//20250829 - Ŀǰֻ<C7B0><D6BB>һ<EFBFBD><D2BB><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ͨ<EFBFBD><CDA8>
//Dbg_Println(DBG_BIT_DEVICE_STATUS_bit,"BLE Energy PeriodicReport process");
//Dbg_Print_Buff(DBG_BIT_DEVICE_STATUS_bit,"Energy PeriodicReport process",deal_buff,deal_len);
temp_value = deal_buff[9];
temp_value <<= 8;
temp_value |= deal_buff[8];
Rs485EnergyInfo.voltage = temp_value;
//Dbg_Println(DBG_BIT_DEVICE_STATUS_bit,"BLE Energy voltage %dmV",Rs485EnergyInfo.voltage*10);
temp_value = deal_buff[11];
temp_value <<= 8;
temp_value |= deal_buff[10];
Rs485EnergyInfo.current = temp_value;
//Dbg_Println(DBG_BIT_DEVICE_STATUS_bit,"BLE Energy current %dmA",Rs485EnergyInfo.current*10);
temp_value = deal_buff[15];
temp_value <<= 8;
temp_value |= deal_buff[14];
temp_value <<= 8;
temp_value |= deal_buff[13];
temp_value <<= 8;
temp_value |= deal_buff[12];
Rs485EnergyInfo.active_power = temp_value;
//Dbg_Println(DBG_BIT_DEVICE_STATUS_bit,"BLE Energy active_power %dmW",Rs485EnergyInfo.active_power);
temp_value = deal_buff[19];
temp_value <<= 8;
temp_value |= deal_buff[18];
temp_value <<= 8;
temp_value |= deal_buff[17];
temp_value <<= 8;
temp_value |= deal_buff[16];
Rs485EnergyInfo.phase_energy = temp_value;
//Dbg_Println(DBG_BIT_DEVICE_STATUS_bit,"BLE Energy phase_energy %dWh",Rs485EnergyInfo.phase_energy);
temp_value = deal_buff[23];
temp_value <<= 8;
temp_value |= deal_buff[22];
temp_value <<= 8;
temp_value |= deal_buff[21];
temp_value <<= 8;
temp_value |= deal_buff[20];
Rs485EnergyInfo.total_energy = temp_value;
//Dbg_Println(DBG_BIT_DEVICE_STATUS_bit,"BLE Energy total_energy %dWh",Rs485EnergyInfo.total_energy);
temp_flag = deal_buff[7];
if( (temp_flag&0x01) != 0x00 )
{
temp_value = deal_buff[9];
temp_value <<= 8;
temp_value |= deal_buff[8];
Rs485EnergyInfo.voltage = temp_value;
//Dbg_Println(DBG_BIT_DEVICE_STATUS_bit,"BLE Energy voltage %dmV",Rs485EnergyInfo.voltage*10);
temp_value = deal_buff[11];
temp_value <<= 8;
temp_value |= deal_buff[10];
Rs485EnergyInfo.current = temp_value;
//Dbg_Println(DBG_BIT_DEVICE_STATUS_bit,"BLE Energy current %dmA",Rs485EnergyInfo.current*10);
temp_value = deal_buff[15];
temp_value <<= 8;
temp_value |= deal_buff[14];
temp_value <<= 8;
temp_value |= deal_buff[13];
temp_value <<= 8;
temp_value |= deal_buff[12];
Rs485EnergyInfo.active_power = temp_value;
//Dbg_Println(DBG_BIT_DEVICE_STATUS_bit,"BLE Energy active_power %dmW",Rs485EnergyInfo.active_power);
temp_value = deal_buff[19];
temp_value <<= 8;
temp_value |= deal_buff[18];
temp_value <<= 8;
temp_value |= deal_buff[17];
temp_value <<= 8;
temp_value |= deal_buff[16];
Rs485EnergyInfo.phase_energy = temp_value;
//Dbg_Println(DBG_BIT_DEVICE_STATUS_bit,"BLE Energy phase_energy %dWh",Rs485EnergyInfo.phase_energy);
temp_value = deal_buff[23];
temp_value <<= 8;
temp_value |= deal_buff[22];
temp_value <<= 8;
temp_value |= deal_buff[21];
temp_value <<= 8;
temp_value |= deal_buff[20];
Rs485EnergyInfo.total_energy = temp_value;
//Dbg_Println(DBG_BIT_DEVICE_STATUS_bit,"BLE Energy total_energy %dWh",Rs485EnergyInfo.total_energy);
}
if( (temp_flag&0x02) != 0x00 )
{
temp_value = deal_buff[25];
temp_value <<= 8;
temp_value |= deal_buff[24];
Rs485EnergyInfo.voltage_B = temp_value;
//Dbg_Println(DBG_BIT_DEVICE_STATUS_bit,"BLE Energy voltageB %dmV",Rs485EnergyInfo.voltage_B*10);
temp_value = deal_buff[27];
temp_value <<= 8;
temp_value |= deal_buff[26];
Rs485EnergyInfo.current_B = temp_value;
//Dbg_Println(DBG_BIT_DEVICE_STATUS_bit,"BLE Energy currentB %dmA",Rs485EnergyInfo.current_B*10);
temp_value = deal_buff[31];
temp_value <<= 8;
temp_value |= deal_buff[30];
temp_value <<= 8;
temp_value |= deal_buff[29];
temp_value <<= 8;
temp_value |= deal_buff[28];
Rs485EnergyInfo.active_power_B = temp_value;
//Dbg_Println(DBG_BIT_DEVICE_STATUS_bit,"BLE Energy active_powerB %dmW",Rs485EnergyInfo.active_power_B);
temp_value = deal_buff[35];
temp_value <<= 8;
temp_value |= deal_buff[34];
temp_value <<= 8;
temp_value |= deal_buff[33];
temp_value <<= 8;
temp_value |= deal_buff[32];
Rs485EnergyInfo.phase_energy_B = temp_value;
//Dbg_Println(DBG_BIT_DEVICE_STATUS_bit,"BLE Energy phase_energyB %dWh",Rs485EnergyInfo.phase_energy_B);
temp_value = deal_buff[39];
temp_value <<= 8;
temp_value |= deal_buff[38];
temp_value <<= 8;
temp_value |= deal_buff[37];
temp_value <<= 8;
temp_value |= deal_buff[36];
Rs485EnergyInfo.total_energy_B = temp_value;
//Dbg_Println(DBG_BIT_DEVICE_STATUS_bit,"BLE Energy total_energyB %dWh",Rs485EnergyInfo.total_energy_B);
}
BLV_Energy_PeriodicReport_Reply(&BUS_Public,deal_buff[1]);
break;
case BLV_Energy_Inquire_CMD:
//Dbg_Println(DBG_BIT_DEVICE_STATUS_bit,"BLE Energy Inquire process");
temp_value = deal_buff[9];
temp_value <<= 8;
temp_value |= deal_buff[8];
Rs485EnergyInfo.voltage = temp_value;
//Dbg_Println(DBG_BIT_DEVICE_STATUS_bit,"BLE Energy voltage %dmV",Rs485EnergyInfo.voltage*10);
temp_value = deal_buff[11];
temp_value <<= 8;
temp_value |= deal_buff[10];
Rs485EnergyInfo.current = temp_value;
//Dbg_Println(DBG_BIT_DEVICE_STATUS_bit,"BLE Energy current %dmA",Rs485EnergyInfo.current*10);
temp_value = deal_buff[15];
temp_value <<= 8;
temp_value |= deal_buff[14];
temp_value <<= 8;
temp_value |= deal_buff[13];
temp_value <<= 8;
temp_value |= deal_buff[12];
Rs485EnergyInfo.active_power = temp_value;
//Dbg_Println(DBG_BIT_DEVICE_STATUS_bit,"BLE Energy active_power %dmW",Rs485EnergyInfo.active_power);
temp_value = deal_buff[19];
temp_value <<= 8;
temp_value |= deal_buff[18];
temp_value <<= 8;
temp_value |= deal_buff[17];
temp_value <<= 8;
temp_value |= deal_buff[16];
Rs485EnergyInfo.phase_energy = temp_value;
//Dbg_Println(DBG_BIT_DEVICE_STATUS_bit,"BLE Energy phase_energy %dWh",Rs485EnergyInfo.phase_energy);
temp_value = deal_buff[23];
temp_value <<= 8;
temp_value |= deal_buff[22];
temp_value <<= 8;
temp_value |= deal_buff[21];
temp_value <<= 8;
temp_value |= deal_buff[20];
Rs485EnergyInfo.total_energy = temp_value;
//Dbg_Println(DBG_BIT_DEVICE_STATUS_bit,"BLE Energy total_energy %dWh",Rs485EnergyInfo.total_energy);
temp_flag = deal_buff[7];
if( (temp_flag&0x01) != 0x00 )
{
temp_value = deal_buff[9];
temp_value <<= 8;
temp_value |= deal_buff[8];
Rs485EnergyInfo.voltage = temp_value;
//Dbg_Println(DBG_BIT_DEVICE_STATUS_bit,"BLE Energy voltage %dmV",Rs485EnergyInfo.voltage*10);
temp_value = deal_buff[11];
temp_value <<= 8;
temp_value |= deal_buff[10];
Rs485EnergyInfo.current = temp_value;
//Dbg_Println(DBG_BIT_DEVICE_STATUS_bit,"BLE Energy current %dmA",Rs485EnergyInfo.current*10);
temp_value = deal_buff[15];
temp_value <<= 8;
temp_value |= deal_buff[14];
temp_value <<= 8;
temp_value |= deal_buff[13];
temp_value <<= 8;
temp_value |= deal_buff[12];
Rs485EnergyInfo.active_power = temp_value;
//Dbg_Println(DBG_BIT_DEVICE_STATUS_bit,"BLE Energy active_power %dmW",Rs485EnergyInfo.active_power);
temp_value = deal_buff[19];
temp_value <<= 8;
temp_value |= deal_buff[18];
temp_value <<= 8;
temp_value |= deal_buff[17];
temp_value <<= 8;
temp_value |= deal_buff[16];
Rs485EnergyInfo.phase_energy = temp_value;
//Dbg_Println(DBG_BIT_DEVICE_STATUS_bit,"BLE Energy phase_energy %dWh",Rs485EnergyInfo.phase_energy);
temp_value = deal_buff[23];
temp_value <<= 8;
temp_value |= deal_buff[22];
temp_value <<= 8;
temp_value |= deal_buff[21];
temp_value <<= 8;
temp_value |= deal_buff[20];
Rs485EnergyInfo.total_energy = temp_value;
//Dbg_Println(DBG_BIT_DEVICE_STATUS_bit,"BLE Energy total_energy %dWh",Rs485EnergyInfo.total_energy);
}
if( (temp_flag&0x02) != 0x00 )
{
temp_value = deal_buff[25];
temp_value <<= 8;
temp_value |= deal_buff[24];
Rs485EnergyInfo.voltage_B = temp_value;
//Dbg_Println(DBG_BIT_DEVICE_STATUS_bit,"BLE Energy voltage %dmV",Rs485EnergyInfo.voltage*10);
temp_value = deal_buff[27];
temp_value <<= 8;
temp_value |= deal_buff[26];
Rs485EnergyInfo.current_B = temp_value;
//Dbg_Println(DBG_BIT_DEVICE_STATUS_bit,"BLE Energy current %dmA",Rs485EnergyInfo.current*10);
temp_value = deal_buff[31];
temp_value <<= 8;
temp_value |= deal_buff[30];
temp_value <<= 8;
temp_value |= deal_buff[29];
temp_value <<= 8;
temp_value |= deal_buff[28];
Rs485EnergyInfo.active_power_B = temp_value;
//Dbg_Println(DBG_BIT_DEVICE_STATUS_bit,"BLE Energy active_power %dmW",Rs485EnergyInfo.active_power);
temp_value = deal_buff[35];
temp_value <<= 8;
temp_value |= deal_buff[34];
temp_value <<= 8;
temp_value |= deal_buff[33];
temp_value <<= 8;
temp_value |= deal_buff[32];
Rs485EnergyInfo.phase_energy_B = temp_value;
//Dbg_Println(DBG_BIT_DEVICE_STATUS_bit,"BLE Energy phase_energy %dWh",Rs485EnergyInfo.phase_energy);
temp_value = deal_buff[39];
temp_value <<= 8;
temp_value |= deal_buff[38];
temp_value <<= 8;
temp_value |= deal_buff[37];
temp_value <<= 8;
temp_value |= deal_buff[36];
Rs485EnergyInfo.total_energy_B = temp_value;
}
Rs485EnergyInfo.send_flag &= ~BLV_Energy_Inquire_Flag;
break;

20
BasicCode/Drive/BLV_485_Protocol/BLV_485_Dev_EnergyMonitor.h
View File

@@ -7,7 +7,7 @@
#define BLV_Energy_Bus_Type 0xF4
#define BLV_Energy_RecvData_LenMax 30
#define BLV_Energy_RecvData_LenMax 45
#define BLV_Energy_RecvData_LenMin 8
#define BLV_Energy_DataHeard 0x8A
@@ -38,12 +38,18 @@ typedef struct
uint8_t DevSendSN; //<2F>豸ͨѶ SN
uint8_t periodic_enable; //<2F><><EFBFBD><EFBFBD><EFBFBD>ϱ<EFBFBD>ʹ<EFBFBD><CAB9>״̬
uint16_t voltage; //<2F><>ѹ
uint16_t current; //<2F><><EFBFBD><EFBFBD>
uint32_t active_power; //<2F>й<EFBFBD><D0B9><EFBFBD><EFBFBD><EFBFBD>
uint32_t phase_energy; //<2F>׶<EFBFBD><D7B6>ܺ<EFBFBD>
uint32_t total_energy; //<2F><><EFBFBD>ܺ<EFBFBD>
uint16_t voltage; //<2F><>ѹ,ͨ<><CDA8>A<EFBFBD><41>B<EFBFBD><42>ͬ
uint16_t current; //<2F><><EFBFBD><EFBFBD>,ͨ<><CDA8>A
uint32_t active_power; //<2F>й<EFBFBD><D0B9><EFBFBD><EFBFBD><EFBFBD>,ͨ<><CDA8>A
uint32_t phase_energy; //<2F>׶<EFBFBD><D7B6>ܺ<EFBFBD>,ͨ<><CDA8>A
uint32_t total_energy; //<2F><><EFBFBD>ܺ<EFBFBD>,ͨ<><CDA8>A
uint16_t voltage_B; //<2F><>ѹ,ͨ<><CDA8>A<EFBFBD><41>B<EFBFBD><42>ͬ
uint16_t current_B; //<2F><><EFBFBD><EFBFBD>,ͨ<><CDA8>B
uint32_t active_power_B; //<2F>й<EFBFBD><D0B9><EFBFBD><EFBFBD><EFBFBD>,ͨ<><CDA8>B
uint32_t phase_energy_B; //<2F>׶<EFBFBD><D7B6>ܺ<EFBFBD>,ͨ<><CDA8>B
uint32_t total_energy_B; //<2F><><EFBFBD>ܺ<EFBFBD>,ͨ<><CDA8>B
uint32_t send_flag; //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>־λ
uint32_t periodic_time; //<2F><><EFBFBD><EFBFBD><EFBFBD>ϱ<EFBFBD>ʱ<EFBFBD><CAB1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>λ<EFBFBD><CEBB>mS

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

@@ -693,7 +693,7 @@ void Dev_ColorTemp_Dis(uint32_t DevAddr){
if(ColorTemp_Inf.global_light != DevActionGlobal.DimGlobalValue) //2025-07-15,YYW,ȫ<><C8AB><EFBFBD><EFBFBD><EFBFBD>ȱȽ<C8B1>
{
ColorTemp_Inf.global_light = DevActionGlobal.DimGlobalValue;
Dbg_Println(DBG_BIT_DEVICE_STATUS_bit,"ColorTemp--ȫ<><C8AB><EFBFBD><EFBFBD><EFBFBD>ȸı<EFBFBD>:",ColorTemp_Inf.global_light);
Dbg_Println(DBG_BIT_DEVICE_STATUS_bit,"ColorTemp--ȫ<><C8AB><EFBFBD><EFBFBD><EFBFBD>ȸı䣺%d",ColorTemp_Inf.global_light);
}

21
BasicCode/Drive/BLV_Nor_Dev/BLV_Nor_Dev_VirtualCard.c
View File

@@ -902,6 +902,8 @@ void Dev_VirtualCard_Dis(uint32_t DevAddr)
//Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"-<2D>¼<EFBFBD>:<3A><><EFBFBD>Ž<EFBFBD><C5BD><EFBFBD>--");
VCard_Info.Action |= VC_Event_DoorSensor_Flag;
Udp_Addtion_Roomstate(BUS_Public.type,BUS_Public.addr,0x00,VC_EventID_DoorSensor);
SRAM_Write_Byte(VC_EventID_DoorSensor,SRAM_UDP_ELEReport_VirtualCard);
SRAM_Write_DW(SysTick_1ms,SRAM_UDP_ELEReport_VirtualCard_Tick);
LOG_LogicInfo_DebugRecord("VCLog:T4:%d",VC_EventID_DoorSensor);
@@ -974,6 +976,8 @@ void Dev_VirtualCard_Dis(uint32_t DevAddr)
//Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>¼<EFBFBD> - %d",condata.Condi_Gruop);
VCard_Info.Last_ConGroupType = 0x00;
VCard_Info.Action |= VC_Event_ShortAway_Flag;
Udp_Addtion_Roomstate(BUS_Public.type,BUS_Public.addr,0x00,VC_EventID_ShortAway);
SRAM_Write_Byte(VC_EventID_ShortAway,SRAM_UDP_ELEReport_VirtualCard);
SRAM_Write_DW(SysTick_1ms,SRAM_UDP_ELEReport_VirtualCard_Tick); //2026-01-20 <09><><EFBFBD>Ӽ<EFBFBD>¼ʱ<C2BC><CAB1><EFBFBD><EFBFBD>
LOG_LogicInfo_DebugRecord("VCLog:T4:%d",VC_EventID_ShortAway);
@@ -984,6 +988,8 @@ void Dev_VirtualCard_Dis(uint32_t DevAddr)
//Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʱ<EFBFBD><CAB1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>¼<EFBFBD> - %d",condata.Condi_Gruop);
VCard_Info.Last_ConGroupType = 0x00;
VCard_Info.Action |= VC_Event_LongAway_Flag;
Udp_Addtion_Roomstate(BUS_Public.type,BUS_Public.addr,0x00,VC_EventID_LongAway);
SRAM_Write_Byte(VC_EventID_LongAway,SRAM_UDP_ELEReport_VirtualCard);
SRAM_Write_DW(SysTick_1ms,SRAM_UDP_ELEReport_VirtualCard_Tick); //2026-01-20 <09><><EFBFBD>Ӽ<EFBFBD>¼ʱ<C2BC><CAB1><EFBFBD><EFBFBD>
LOG_LogicInfo_DebugRecord("VCLog:T4:%d",VC_EventID_LongAway);
@@ -1042,6 +1048,8 @@ void Dev_VirtualCard_Dis(uint32_t DevAddr)
//Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>볬ʱ<EBB3AC>¼<EFBFBD> - %d",condata.Condi_Gruop);
VCard_Info.Last_ConGroupType = 0x00;
VCard_Info.Action |= VC_Event_ShortAwayTimeout_Flag;
Udp_Addtion_Roomstate(BUS_Public.type,BUS_Public.addr,0x00,VC_EventID_ShortAwayTimeout);
SRAM_Write_Byte(VC_EventID_ShortAwayTimeout,SRAM_UDP_ELEReport_VirtualCard);
SRAM_Write_DW(SysTick_1ms,SRAM_UDP_ELEReport_VirtualCard_Tick); //2026-01-20 <09><><EFBFBD>Ӽ<EFBFBD>¼ʱ<C2BC><CAB1><EFBFBD><EFBFBD>
LOG_LogicInfo_DebugRecord("VCLog:T4:%d",VC_EventID_ShortAwayTimeout);
@@ -1051,6 +1059,8 @@ void Dev_VirtualCard_Dis(uint32_t DevAddr)
//Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʱ<EFBFBD><CAB1><EFBFBD><EFBFBD><EFBFBD>볬ʱ<EBB3AC>¼<EFBFBD> - %d",condata.Condi_Gruop);
VCard_Info.Last_ConGroupType = 0x00;
VCard_Info.Action |= VC_Event_LongAwayTimeout_Flag;
Udp_Addtion_Roomstate(BUS_Public.type,BUS_Public.addr,0x00,VC_EventID_LongAwayTimeout);
SRAM_Write_Byte(VC_EventID_LongAwayTimeout,SRAM_UDP_ELEReport_VirtualCard);
SRAM_Write_DW(SysTick_1ms,SRAM_UDP_ELEReport_VirtualCard_Tick); //2026-01-20 <09><><EFBFBD>Ӽ<EFBFBD>¼ʱ<C2BC><CAB1><EFBFBD><EFBFBD>
LOG_LogicInfo_DebugRecord("VCLog:T4:%d",VC_EventID_LongAwayTimeout);
@@ -1106,11 +1116,15 @@ void Dev_VirtualCard_Dis(uint32_t DevAddr)
{
//Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"-<2D>¼<EFBFBD>:<3A><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>--");
VCard_Info.Action |= VC_Event_CardedPersonLeft_Flag;
Udp_Addtion_Roomstate(BUS_Public.type,BUS_Public.addr,0x00,VC_EventID_CardedPersonLeft);
SRAM_Write_Byte(VC_EventID_CardedPersonLeft,SRAM_UDP_ELEReport_VirtualCard);
LOG_LogicInfo_DebugRecord("VCLog:T4:%d",VC_EventID_CardedPersonLeft);
}else {
//Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"-<2D>¼<EFBFBD>:<3A>޿<EFBFBD><DEBF><EFBFBD><EFBFBD><EFBFBD>--");
VCard_Info.Action |= VC_Event_UncardedPersonLeft_Flag;
Udp_Addtion_Roomstate(BUS_Public.type,BUS_Public.addr,0x00,VC_EventID_UncardedPersonLeft);
SRAM_Write_Byte(VC_EventID_UncardedPersonLeft,SRAM_UDP_ELEReport_VirtualCard);
LOG_LogicInfo_DebugRecord("VCLog:T4:%d",VC_EventID_UncardedPersonLeft);
}
@@ -1155,6 +1169,8 @@ void Dev_VirtualCard_Dis(uint32_t DevAddr)
/*<2A><>״̬<D7B4>ı<EFBFBD>Ϊ<EFBFBD><CEAA><EFBFBD>ˣ<EFBFBD><CBA3><EFBFBD><EFBFBD><EFBFBD><EFBFBD>л<EFBFBD>·<EFBFBD>Ļ<EFBFBD><C4BB><EFBFBD><EFBFBD><EFBFBD>ȫ<EFBFBD><C8AB><EFBFBD><EFBFBD><EFBFBD>ա<EFBFBD><D5A1><EFBFBD><EFBFBD>ˡ<EFBFBD>״̬<D7B4><CCAC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>䣬<EFBFBD><E4A3AC><EFBFBD><EFBFBD><EFBFBD>¿<EFBFBD>ʼ<EFBFBD><CABC><EFBFBD><EFBFBD>*/
VCard_Info.Action |= VC_Event_RadarPersonDetected_Flag;
Udp_Addtion_Roomstate(BUS_Public.type,BUS_Public.addr,0x00,VC_EventID_RadarPersonDetected);
SRAM_Write_Byte(VC_EventID_RadarPersonDetected,SRAM_UDP_ELEReport_VirtualCard);
SRAM_Write_DW(SysTick_1ms,SRAM_UDP_ELEReport_VirtualCard_Tick); //2026-01-20 <09><><EFBFBD>Ӽ<EFBFBD>¼ʱ<C2BC><CAB1><EFBFBD><EFBFBD>
LOG_LogicInfo_DebugRecord("VCLog:T4:%d",VC_EventID_RadarPersonDetected);
@@ -1195,6 +1211,8 @@ void Dev_VirtualCard_Dis(uint32_t DevAddr)
/*<2A><>״̬<D7B4>ı<EFBFBD>Ϊ<EFBFBD><CEAA><EFBFBD>ˣ<EFBFBD><CBA3><EFBFBD><EFBFBD><EFBFBD><EFBFBD>л<EFBFBD>·<EFBFBD>Ļ<EFBFBD><C4BB><EFBFBD><EFBFBD><EFBFBD>ȫ<EFBFBD><C8AB><EFBFBD><EFBFBD><EFBFBD>ա<EFBFBD><D5A1><EFBFBD><EFBFBD>ˡ<EFBFBD>״̬<D7B4><CCAC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>䣬<EFBFBD><E4A3AC><EFBFBD><EFBFBD><EFBFBD>¿<EFBFBD>ʼ<EFBFBD><CABC><EFBFBD><EFBFBD>*/
VCard_Info.Action |= VC_Event_RadarPersonLeft_Flag;
Udp_Addtion_Roomstate(BUS_Public.type,BUS_Public.addr,0x00,VC_EventID_RadarPersonLeft);
SRAM_Write_Byte(VC_EventID_RadarPersonLeft,SRAM_UDP_ELEReport_VirtualCard);
SRAM_Write_DW(SysTick_1ms,SRAM_UDP_ELEReport_VirtualCard_Tick); //2026-01-20 <09><><EFBFBD>Ӽ<EFBFBD>¼ʱ<C2BC><CAB1><EFBFBD><EFBFBD>
LOG_LogicInfo_DebugRecord("VCLog:T4:%d",VC_EventID_RadarPersonLeft);
@@ -1216,7 +1234,6 @@ void Dev_VirtualCard_Dis(uint32_t DevAddr)
DetWin_WriteData((i - 1), 0x00, ((VCard_Info.DetInfo.DetWinTotalNum[i] / 8) + 1 ) );
}
}
break;
}
}
@@ -1234,6 +1251,8 @@ void Dev_VirtualCard_Dis(uint32_t DevAddr)
/*<2A><><EFBFBD><EFBFBD><EFBFBD>д<EFBFBD><D0B4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>۵<EFBFBD>ǰ<EFBFBD><C7B0><EFBFBD><EFBFBD>״̬<D7B4>ж<EFBFBD>Ϊ<EFBFBD><CEAA><EFBFBD>˻<EFBFBD><CBBB><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ˣ<EFBFBD><CBA3><EFBFBD><EFBFBD><EFBFBD>״̬<D7B4>޸<EFBFBD>Ϊ<EFBFBD><CEAA><EFBFBD>ˣ<EFBFBD>ͬʱ<CDAC><CAB1>ʱ<EFBFBD><CAB1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>߼<EFBFBD><DFBC>еĻ<D0B5><C4BB><EFBFBD>ֵȫ<D6B5><C8AB>ˢ<EFBFBD><CBA2>Ϊ<EFBFBD><CEAA><EFBFBD><EFBFBD>*/
VCard_Info.Action |= VC_Event_RS485ButtonPress_Flag;
Udp_Addtion_Roomstate(BUS_Public.type,BUS_Public.addr,0x00,VC_EventID_RS485ButtonPress);
SRAM_Write_Byte(VC_EventID_RS485ButtonPress,SRAM_UDP_ELEReport_VirtualCard);
SRAM_Write_DW(SysTick_1ms,SRAM_UDP_ELEReport_VirtualCard_Tick); //2026-01-20 <09><><EFBFBD>Ӽ<EFBFBD>¼ʱ<C2BC><CAB1><EFBFBD><EFBFBD>
LOG_LogicInfo_DebugRecord("VCLog:T4:%d",VC_EventID_RS485ButtonPress);

2
BasicCode/Drive/NET/BLV_NET_Function.c
View File

@@ -621,7 +621,7 @@ uint8_t UDP_CLOUD_IAP_Cmd(uint8_t* data,uint16_t DataLen, uint8_t *ip,uint16_t p
}
else if(data[CLOUD_IAP_Cmd_Rev_Filetype] == DATATYPE_CONFIG) //<2F><><EFBFBD><EFBFBD>
{
IAPVarTypeStruct_Ptr->IapFileType = DATATYPE_CONFIG;
IAPVarTypeStruct_Ptr->IapFileType = DATATYPE_CONFIG;
UDP_ADD_SoftwareVer(&back_data[CLOUD_IAP_Cmd_Send_SoftwareVer]);
back_data[CLOUD_IAP_Cmd_Send_Filetype] = DATATYPE_CONFIG;
}

45
BasicCode/Drive/NET_UPDATE/Udp_Internal_Protocol.c
View File

@@ -513,7 +513,16 @@ void Udp_Internal_Periodic_Report_PackSend(void)
ServiceInfo_Get_ALL_Loop_State(&Global_Large_Buff[sendlen]);
sendlen += 8;
Global_Large_Buff[sendlen++] = SRAM_Read_Byte( SRAM_Register_Start_ADDRESS + Register_RoomRent_OFFSET ); //PMS״̬ - 0x01:<3A><>ס<EFBFBD><D7A1>0x02:<3A>˷<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>RCU<43><55><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>͵<EFBFBD>
if( (SRAM_Read_Byte( SRAM_Register_Start_ADDRESS + Register_RoomRent_OFFSET ) == 0x02) || \
(SRAM_Read_Byte( SRAM_Register_Start_ADDRESS + Register_RoomRent_OFFSET ) == 0x04) || \
(SRAM_Read_Byte( SRAM_Register_Start_ADDRESS + Register_RoomRent_OFFSET ) == 0x08) || \
(SRAM_Read_Byte( SRAM_Register_Start_ADDRESS + Register_RoomRent_OFFSET ) == 0x10)){
Global_Large_Buff[sendlen++] = SRAM_Read_Byte( SRAM_Register_Start_ADDRESS + Register_RoomRent_OFFSET ); //PMS״̬ - 0x01:<3A><>ס<EFBFBD><D7A1>0x02:<3A>˷<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>RCU<43><55><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>͵<EFBFBD> 02 04 08 10
}
else{
Global_Large_Buff[sendlen++] = 0x00; //PMS״̬ - 0x00 <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
}
Global_Large_Buff[sendlen++] = SRAM_Read_Byte(SRAM_UDP_Report_CarbonSatet); //̼<><CCBC><EFBFBD><EFBFBD>״̬ - 0x01:<3A><><EFBFBD><EFBFBD>0x00:<3A><>
Global_Large_Buff[sendlen++] = DevActionGlobal.DimGlobalValue; //2026-01-27 <20><><EFBFBD><EFBFBD>ȫ<EFBFBD>ֵ<EFBFBD><D6B5>⣬ͬʱ<CDAC><CAB1><EFBFBD><EFBFBD>3<EFBFBD><33><EFBFBD>ֽ<EFBFBD>
@@ -530,7 +539,7 @@ void Udp_Internal_Periodic_Report_PackSend(void)
RS485_ENERGYMONITOR_INFO Rs485EnergyInfo;
SRAM_DMA_Read_Buff((uint8_t *)&Rs485EnergyInfo,sizeof(RS485_ENERGYMONITOR_INFO),temp_dev+Dev_Privately);
Global_Large_Buff[sendlen++] = 0x01; //<2F>ϱ<EFBFBD><CFB1><EFBFBD><EFBFBD>ݸ<EFBFBD><DDB8><EFBFBD>
Global_Large_Buff[sendlen++] = 0x02; //<2F>ϱ<EFBFBD><CFB1><EFBFBD><EFBFBD>ݸ<EFBFBD><DDB8><EFBFBD>,2026-01-04,˫ͨ<CBAB><CDA8><EFBFBD><EFBFBD>Ϊ2
Global_Large_Buff[sendlen++] = Dev_Energy_Monitor; //<2F>豸<EFBFBD><E8B1B8><EFBFBD><EFBFBD> - <20>ܺļ<DCBA><C4BC><EFBFBD>
Global_Large_Buff[sendlen++] = 0x01; //<2F>豸<EFBFBD><E8B1B8>ַ - <20>ܺļ<DCBA><C4BC><EFBFBD> <20>豸Ĭ<E8B1B8><C4AC>0x01
@@ -558,6 +567,36 @@ void Udp_Internal_Periodic_Report_PackSend(void)
Global_Large_Buff[sendlen++] = (Rs485EnergyInfo.total_energy >> 8) & 0xFF;
Global_Large_Buff[sendlen++] = (Rs485EnergyInfo.total_energy >> 16) & 0xFF;
Global_Large_Buff[sendlen++] = (Rs485EnergyInfo.total_energy >> 24) & 0xFF;
//ͨ<><CDA8>B
Global_Large_Buff[sendlen++] = Dev_Energy_Monitor; //<2F>豸<EFBFBD><E8B1B8><EFBFBD><EFBFBD> - <20>ܺļ<DCBA><C4BC><EFBFBD>
Global_Large_Buff[sendlen++] = 0x01; //<2F>豸<EFBFBD><E8B1B8>ַ - <20>ܺļ<DCBA><C4BC><EFBFBD> <20>豸Ĭ<E8B1B8><C4AC>0x01
Global_Large_Buff[sendlen++] = 0x02; //<2F>豸<EFBFBD><E8B1B8>· - <20>ܺļ<DCBA><C4BC><EFBFBD> <20>豸Ĭ<E8B1B8><C4AC>0x01
Global_Large_Buff[sendlen++] = 0x00; //<2F>豸<EFBFBD><E8B1B8>· - <20>ܺļ<DCBA><C4BC><EFBFBD> <20>豸Ĭ<E8B1B8><C4AC>0x01
Global_Large_Buff[sendlen++] = 0x10; //<2F>豸<EFBFBD><E8B1B8><EFBFBD>ݳ<EFBFBD><DDB3><EFBFBD>
//<2F>ܺļ<DCBA><C4BC><EFBFBD> - <20><>ѹ <20><>λ:10mV
Global_Large_Buff[sendlen++] = Rs485EnergyInfo.voltage_B & 0xFF;
Global_Large_Buff[sendlen++] = (Rs485EnergyInfo.voltage_B >> 8) & 0xFF;
//<2F>ܺļ<DCBA><C4BC><EFBFBD> - <20><><EFBFBD><EFBFBD> <20><>λ:10mA
Global_Large_Buff[sendlen++] = Rs485EnergyInfo.current_B & 0xFF;
Global_Large_Buff[sendlen++] = (Rs485EnergyInfo.current_B >> 8) & 0xFF;
//<2F>ܺļ<DCBA><C4BC><EFBFBD> - <20>й<EFBFBD><D0B9><EFBFBD><EFBFBD><EFBFBD> <20><>λ:mW
Global_Large_Buff[sendlen++] = Rs485EnergyInfo.active_power_B & 0xFF;
Global_Large_Buff[sendlen++] = (Rs485EnergyInfo.active_power_B >> 8) & 0xFF;
Global_Large_Buff[sendlen++] = (Rs485EnergyInfo.active_power_B >> 16) & 0xFF;
Global_Large_Buff[sendlen++] = (Rs485EnergyInfo.active_power_B >> 24) & 0xFF;
//<2F>ܺļ<DCBA><C4BC><EFBFBD> - <20>ܺ<EFBFBD> <20><>λ:Wh
Global_Large_Buff[sendlen++] = Rs485EnergyInfo.phase_energy_B & 0xFF;
Global_Large_Buff[sendlen++] = (Rs485EnergyInfo.phase_energy_B >> 8) & 0xFF;
Global_Large_Buff[sendlen++] = (Rs485EnergyInfo.phase_energy_B >> 16) & 0xFF;
Global_Large_Buff[sendlen++] = (Rs485EnergyInfo.phase_energy_B >> 24) & 0xFF;
//<2F>ܺļ<DCBA><C4BC><EFBFBD> - <20><><EFBFBD>ܺ<EFBFBD> <20><>λ:Wh
Global_Large_Buff[sendlen++] = Rs485EnergyInfo.total_energy_B & 0xFF;
Global_Large_Buff[sendlen++] = (Rs485EnergyInfo.total_energy_B >> 8) & 0xFF;
Global_Large_Buff[sendlen++] = (Rs485EnergyInfo.total_energy_B >> 16) & 0xFF;
Global_Large_Buff[sendlen++] = (Rs485EnergyInfo.total_energy_B >> 24) & 0xFF;
}else{
/*û<>ҵ<EFBFBD><D2B5>ܺ<EFBFBD><DCBA>豸*/
Global_Large_Buff[sendlen++] = 0x00; //<2F>ϱ<EFBFBD><CFB1><EFBFBD><EFBFBD>ݸ<EFBFBD><DDB8><EFBFBD>
@@ -567,7 +606,7 @@ void Udp_Internal_Periodic_Report_PackSend(void)
temp_dev = Find_TempDevice_List_Information(&Global_Large_Buff[sendlen],0x05); //Ŀǰ<C4BF><C7B0><EFBFBD><EFBFBD>5<EFBFBD><35><EFBFBD>յ<EFBFBD>
sendlen = sendlen + (temp_dev * 0x07);
Global_Large_Buff[29] += temp_dev; //<2F><><EFBFBD><EFBFBD><EFBFBD>ϱ<EFBFBD><CFB1>豸<EFBFBD><E8B1B8><EFBFBD><EFBFBD>
Global_Large_Buff[33] += temp_dev; //<2F><><EFBFBD><EFBFBD><EFBFBD>ϱ<EFBFBD><CFB1>豸<EFBFBD><E8B1B8><EFBFBD><EFBFBD>
sendlen += 0x02; //<2F><><EFBFBD><EFBFBD>CRCУ<43>鳤<EFBFBD><E9B3A4>
UDP_Add_Header(Global_Large_Buff,In_PeriodicReport_Cmd,sendlen,server_info.frame_no); //<2F><><EFBFBD><EFBFBD>ͷ<EFBFBD><CDB7>