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

feat：UDP通讯 - 定期上报中增加全局亮度

Browse Source 
UDP通讯 - 定期上报：
  -> 协议版本字段 0x02改为0x03
  -> 增加4Byte,其中一个Byte用于全局亮度上报，3个Byte保留
This commit is contained in:
caocong
2026-01-27 11:58:59 +08:00
parent 5ed13c4a00
commit 12580eba5d
11 changed files with 10607 additions and 10776 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1036,7 +1036,7 @@ void Dev_VirtualCard_Dis(uint32_t DevAddr)
VCard_Info.Condition_Trigger_Tick = SysTick_1s;
if( ( VCard_Info.Last_ConGroupType == VC_CONDGROUP_BrieflyLeaving_Type ) && (condata.Exist_Flag != VCard_Info.Last_ConGroupType) )
if( condata.Exist_Flag == VC_CONDGROUP_BrieflyLeaving_Type )
{
/*<2A><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>볬ʱ<EBB3AC>¼<EFBFBD> */
//Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>볬ʱ<EBB3AC>¼<EFBFBD> - %d",condata.Condi_Gruop);
@@ -1045,7 +1045,7 @@ void Dev_VirtualCard_Dis(uint32_t DevAddr)
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);
}else if( ( VCard_Info.Last_ConGroupType == VC_CONDGROUP_LongTermLeaving_Type ) && (condata.Exist_Flag != VCard_Info.Last_ConGroupType) )
}else if( condata.Exist_Flag == VC_CONDGROUP_LongTermLeaving_Type )
{
/*<2A><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʱ<EFBFBD><CAB1><EFBFBD><EFBFBD><EFBFBD>볬ʱ<EBB3AC>¼<EFBFBD> */
//Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʱ<EFBFBD><CAB1><EFBFBD><EFBFBD><EFBFBD>볬ʱ<EBB3AC>¼<EFBFBD> - %d",condata.Condi_Gruop);
@@ -1117,7 +1117,7 @@ void Dev_VirtualCard_Dis(uint32_t DevAddr)
SRAM_Write_DW(SysTick_1ms,SRAM_UDP_ELEReport_VirtualCard_Tick); //2026-01-20 <09><><EFBFBD>Ӽ<EFBFBD>¼ʱ<C2BC><CAB1><EFBFBD><EFBFBD>
/*<2A><><EFBFBD>ջ<EFBFBD>·<EFBFBD>ij<EFBFBD>ʱ<EFBFBD><CAB1><EFBFBD><EFBFBD><EFBFBD><EFBFBD>״̬ - ע<><D7A2><EFBFBD><EFBFBD>·1Ĭ<31><C4AC><EFBFBD>Dz忨ȡ<E5BFA8>磬<EFBFBD><E7A3AC><EFBFBD><EFBFBD><EFBFBD>볤ʱ<EBB3A4><CAB1>ͳ<EFBFBD><CDB3>*/
for(uint8_t i= 1; i < VIRTUAL_PORT_MAX; i++)
for(uint8_t i = 1; i < VIRTUAL_PORT_MAX; i++)
{
if(VCard_Info.Port_Info[i].HPort_Type != 0x00)
{

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

@@ -485,7 +485,7 @@ void Udp_Internal_Periodic_Report_PackSend(void)
sendlen = HEAD_LEN;
Global_Large_Buff[sendlen++] = 0x02; //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>汾
Global_Large_Buff[sendlen++] = 0x03; //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>汾
/*
<09>ж<EFBFBD><D0B6>忨ȡ<E5BFA8><C8A1><EFBFBD>豸<EFBFBD>Ƿ<EFBFBD><C7B7><EFBFBD><EFBFBD>ڣ<EFBFBD><DAA3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ڵĻ<DAB5><C4BB><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ϱ<EFBFBD><CFB1>忨ȡ<E5BFA8><C8A1>״̬Ϊ0x00 - <20><>ʾ<EFBFBD>忨״̬<D7B4><CCAC>Ч
@@ -506,7 +506,6 @@ void Udp_Internal_Periodic_Report_PackSend(void)
temp_dev |= DevActionGlobal.DevActionU64Cond.EleState & 0x03; //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϣ<EFBFBD>е<EFBFBD>ȡ<EFBFBD><C8A1><EFBFBD><EFBFBD><EFBFBD><EFBFBD>״̬
}
Global_Large_Buff[sendlen++] = temp_dev & 0xFF; // <20>忨״̬(bit2~bit3) & ȡ<><C8A1>״̬(bit0~bit1)
Global_Large_Buff[sendlen++] = SRAM_Read_Byte(SRAM_UDP_ELEReport_CardType); //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϣ
Global_Large_Buff[sendlen++] = SRAM_Read_Byte(SRAM_UDP_ELEReport_VirtualCard); //<2F>޿<EFBFBD><DEBF>߼<EFBFBD>״̬(<28><>Ӧ<EFBFBD>¼<EFBFBD>״̬)
@@ -515,10 +514,13 @@ void Udp_Internal_Periodic_Report_PackSend(void)
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>
//Global_Large_Buff[sendlen++] = 0x01; //<2F><><EFBFBD><EFBFBD>ʹ<EFBFBD><CAB9>
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>
Global_Large_Buff[sendlen++] = 0x00;
Global_Large_Buff[sendlen++] = 0x00;
Global_Large_Buff[sendlen++] = 0x00;
/*<2A><><EFBFBD><EFBFBD><EFBFBD>ܺļ<DCBA><C4BC><EFBFBD><EFBFBD>豸 - Ĭ<>ϣ<EFBFBD>1<EFBFBD><31>ַ - <20><>· 1*/
temp_dev = Find_AllDevice_List_Information(Dev_Energy_Monitor,0x01);