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

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>