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

fix:全局亮度初始化，默认为100、修改服务信息驱动初始化、修改网络通讯中对于取电上报问题

Browse Source 
1、全局亮度初始化，默认为100
2、修改服务信息驱动
     -> 服务信息驱动初始化中，将部分服务信息状态进行初始化
3、修改网络通讯中对于取电上报问题
This commit is contained in:
caocong
2026-03-13 15:41:13 +08:00
parent 8a10946701
commit a7a16d49e3
20 changed files with 16932 additions and 16806 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
BasicCode/Drive/BLV_485_Protocol/BLV_485_Dev_C7TFun.c
View File

@@ -320,16 +320,27 @@ void BLWC43_TempCtrDataProc(Device_Public_Information_G* BUS_Public, uint8_t *Da
|| (C7T_Temp_Info->TemStateLast.mode != C7T_Temp_Info->TemState.mode)
|| (C7T_Temp_Info->TemStateLast.fan != C7T_Temp_Info->TemState.fan)
|| (C7T_Temp_Info->TemStateLast.valve != C7T_Temp_Info->TemState.valve)
|| (C7T_Temp_Info->TemStateLast.set_t != C7T_Temp_Info->TemState.set_t) )
|| (C7T_Temp_Info->TemStateLast.set_t != C7T_Temp_Info->TemState.set_t)
|| (C7T_Temp_Info->TemStateLast.indoor_t != C7T_Temp_Info->TemState.indoor_t) )
{
Dev_Temp_State_Sync(&C7T_Temp_Info->TemStateLast,&C7T_Temp_Info->TemState);
C7T_Temp_Info->udp_flag = 0x01;
C7T_Temp_Info->udp_tick = SysTick_1ms;
if( (C7T_Temp_Info->TemStateLast.on_off != C7T_Temp_Info->TemState.on_off)
|| (C7T_Temp_Info->TemStateLast.mode != C7T_Temp_Info->TemState.mode)
|| (C7T_Temp_Info->TemStateLast.fan != C7T_Temp_Info->TemState.fan)
|| (C7T_Temp_Info->TemStateLast.valve != C7T_Temp_Info->TemState.valve)
|| (C7T_Temp_Info->TemStateLast.set_t != C7T_Temp_Info->TemState.set_t) )
{
C7T_Temp_Info->udp_flag = 0x01;
C7T_Temp_Info->udp_tick = SysTick_1ms;
}
}
Dev_Temp_State_Sync(&C7T_Temp_Info->TemStateLast,&C7T_Temp_Info->TemState);
if(C7T_Temp_Info->udp_flag == 0x01)
{
@@ -375,7 +386,7 @@ uint8_t BLV_RS485_C7T_TempCycleCtrl(uint32_t DevAdd)
uint8_t BLW_Rs485_C7T_Temp_Check(uint32_t DevAdd ,uint32_t Data_addr, uint16_t DataLen)
{
uint8_t rev = 0x01;
uint16_t temp = 0;
// uint16_t temp = 0;
uint8_t data[RECDATALENMAX];
Device_Public_Information_G BUS_Public;
RS485_TEMP_INFO C7T_Temp_Info; //<2F>¿<EFBFBD><C2BF><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
@@ -392,7 +403,7 @@ uint8_t BLW_Rs485_C7T_Temp_Check(uint32_t DevAdd ,uint32_t Data_addr, uint16_t D
// temp = SRAM_Read_Byte(Data_addr);
if((DataLen != 0x05)|| ((data[1] != 0x13)&&(data[1] != 0x16))||(data[DataLen - 1] != SOR_CRC(data, DataLen-1))||(data[0] != SRAM_Read_Byte(DevAdd+Dev_Addr)))
{
Dbg_Println(DBG_BIT_DEVICE_STATUS_bit,"C7T<EFBFBD>¿<EFBFBD><EFBFBD><EFBFBD>δ<EFBFBD>ж<EFBFBD>ͨ<EFBFBD><EFBFBD> DevAdd:%d,len:%d",temp,DataLen);
Dbg_Println(DBG_BIT_DEVICE_STATUS_bit,"C7T<EFBFBD>¿<EFBFBD><EFBFBD><EFBFBD>δ<EFBFBD>ж<EFBFBD>ͨ<EFBFBD><EFBFBD> len:%d",DataLen);
return 0x01;
}
SRAM_DMA_Read_Buff((uint8_t *)&BUS_Public,sizeof(Device_Public_Information_G),DevAdd);

72
BasicCode/Drive/BLV_485_Protocol/BLV_485_Dev_TempFun.c
View File

@@ -109,6 +109,30 @@ void BLW_RS485_TempFun_For_Logic_Init(LOGICFILE_DEVICE_INFO *dev_info,uint8_t *d
Rs485TempT1.ValveNoExist = dev_info->priproperty[0]; //<2F>޷<EFBFBD><DEB7><EFBFBD><EFBFBD><EFBFBD>
////<2F><>ʾ<EFBFBD><CABE>ʹ<EFBFBD>ܱ<EFBFBD><DCB1><EFBFBD>
if( (dev_info->priproperty[1] & 0x03) == 0x01 )
{
Rs485TempT1.fan_en_flag = 0x01;
}else {
Rs485TempT1.fan_en_flag = 0x00;
}
//<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʾ<EFBFBD><CABE>
if( (dev_info->priproperty[1] & 0x0C) == 0x04 )
{
Rs485TempT1.switch_en_flag = 0x01;
}else {
Rs485TempT1.switch_en_flag = 0x00;
}
//<2F>ж<EFBFBD><D0B6><EFBFBD>ʾ<EFBFBD><CABE><EFBFBD>Ƿ<EFBFBD>ʹ<EFBFBD><CAB9>
if( ((Rs485TempT1.fan_en_flag == 0x01) && (PlayList.EnFlag == 0x00)) || ((Rs485TempT1.switch_en_flag == 0x01) && (PlayList.EnFlag == 0x00)) )
{
PlayList.EnFlag = 0x01;
}
Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"ValveNoExist init: %02X, %02X - %02x",Rs485TempT1.ValveNoExist,Rs485TempT1.switch_en_flag,Rs485TempT1.fan_en_flag);
switch(dev_info->port)
{
case Active_Port: //<2F><><EFBFBD><EFBFBD><EFBFBD>˿<EFBFBD>
@@ -472,23 +496,44 @@ void Dev_TEMPCTRL_Ctrl(uint32_t CfgDevAddIn, uint16_t DevInputAddr, uint32_t Cfg
Rs485Tem.CardCnt = 0x03;
// }
break;
case 0x02: //<2F><><EFBFBD><EFBFBD>ģʽ<C4A3><CABD>ʾ<EFBFBD><CABE>
case 0x02: //<2F><><EFBFBD><EFBFBD>ģʽ<C4A3><CABD>ʾ<EFBFBD><CABE>
switch(TempFan)
{
case 0x01:
PlayList.EnFlag = 0x01;
Rs485Tem.fan_en_flag = 0x01;
break;
case 0x02:
PlayList.EnFlag = 0x00;
Rs485Tem.fan_en_flag = 0x00;
break;
default:
break;
}
break;
case 0x03: //<2F><><EFBFBD>ƿ<EFBFBD><C6BF><EFBFBD><EFBFBD><EFBFBD>ʾ<EFBFBD><CABE>
switch(TempFan)
{
case 0x01:
Rs485Tem.switch_en_flag = 0x01;
break;
case 0x02:
Rs485Tem.switch_en_flag = 0x00;
break;
default:
break;
}
Dbg_Println(DBG_BIT_DEVICE_STATUS_bit,"<EFBFBD>¿<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ģʽ<EFBFBD><EFBFBD>ʾ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>%d",PlayList.EnFlag);
break;
default:
break;
}
//<2F>ж<EFBFBD><D0B6><EFBFBD>ʾ<EFBFBD><CABE><EFBFBD>Ƿ<EFBFBD>ʹ<EFBFBD><CAB9>
if( ((Rs485Tem.fan_en_flag == 0x01) && (PlayList.EnFlag == 0x00)) || ((Rs485Tem.switch_en_flag == 0x01) && (PlayList.EnFlag == 0x00)) )
{
PlayList.EnFlag = 0x01;
}
Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"Tone EnFlag Rev: %02X - %02X",Rs485Tem.switch_en_flag,Rs485Tem.fan_en_flag);
KeepFlag = 0x01;
}
else //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ȫ<EFBFBD><C8AB>ת<EFBFBD><D7AA><EFBFBD><EFBFBD> Rs485Tem->TemStateCtrl <20><>ֵ
@@ -728,7 +773,6 @@ uint8_t TemSingleJudge(uint32_t CfgDevAdd, RS485_Tem_Ctrl_ptr Rs485TemCtrl, RS48
SRAM_DMA_Read_Buff((uint8_t *)&BUS_Public,sizeof(Device_Public_Information_G),CfgDevAdd);
SRAM_DMA_Read_Buff((uint8_t *)&Rs485TempT1,sizeof(RS485_TEMP_INFO),CfgDevAdd+Dev_Privately);/*<2A><><EFBFBD><EFBFBD><EFBFBD>豸˽<E8B1B8><CBBD><EFBFBD><EFBFBD>Ϣ*/
// Rs485Tem = CfgDevAdd->DevDataStruct; //<2F>Ѿ<EFBFBD><D1BE>жϷǿ<CFB7>
if(Rs485TempT1.TemStateCtrlLast.on_off != Rs485TempT1.TemStateCtrl.on_off) //<2F><><EFBFBD>ػ<EFBFBD>
@@ -875,7 +919,7 @@ uint8_t TemSingleJudge(uint32_t CfgDevAdd, RS485_Tem_Ctrl_ptr Rs485TemCtrl, RS48
}
}
}
if((RS485OCCUPYTIME == Ret) || (keepflag == 0x01))
{
/*ͨѶͳ<D1B6><CDB3>*/
@@ -1321,23 +1365,23 @@ void Temp_Action_Set(RS485_TEMP_BASIC *Rs485TemRecBuf, RS485_TEMP_INFO *Rs485Tem
if(Rs485Tem->inif_flag != 0x00)
{
if(Rs485Tem->TemStateNetFlag == 0x00)
if( (Rs485Tem->TemStateNetFlag == 0x00) && (Rs485Tem->switch_en_flag == 0x01) )
{
AddPrompt_ToList(0x06);
addPrompt_flag = 0x01;
}else {
Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"<EFBFBD>ƶ˿<EFBFBD><EFBFBD><EFBFBD> <20>յ<EFBFBD><EFBFBD><EFBFBD>ʾ<EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>Ӧ");
Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"<EFBFBD>յ<EFBFBD><EFBFBD><EFBFBD>ʾ<EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>Ӧ %02x-%02x",Rs485Tem->switch_en_flag,Rs485Tem->TemStateNetFlag);
}
}
}else {
if(Rs485Tem->inif_flag != 0x00)
{
if(Rs485Tem->TemStateNetFlag == 0x00)
if( (Rs485Tem->TemStateNetFlag == 0x00) && (Rs485Tem->switch_en_flag == 0x01) )
{
AddPrompt_ToList(0x07);
addPrompt_flag = 0x01;
}else {
Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"<EFBFBD>ƶ˿<EFBFBD><EFBFBD><EFBFBD> <20>յ<EFBFBD><EFBFBD><EFBFBD>ʾ<EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>Ӧ");
Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"<EFBFBD>յ<EFBFBD><EFBFBD><EFBFBD>ʾ<EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>Ӧ %02x-%02x",Rs485Tem->switch_en_flag,Rs485Tem->TemStateNetFlag);
}
}
}
@@ -1366,7 +1410,7 @@ void Temp_Action_Set(RS485_TEMP_BASIC *Rs485TemRecBuf, RS485_TEMP_INFO *Rs485Tem
/*2023.03.20<EFBFBD>ֿ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>޸Ľ<EFBFBD><EFBFBD><EFBFBD>*/
if(Rs485Tem->inif_flag != 0x00) //2025-8-22
{
if( (Rs485Tem->TemStateNetFlag == 0x00) && (addPrompt_flag == 0x00) )
if( (Rs485Tem->TemStateNetFlag == 0x00) && (addPrompt_flag == 0x00) && (Rs485Tem->fan_en_flag == 0x01) )
{
if(Rs485TemRecBuf->TemState.mode == 0x01) //<2F><><EFBFBD><EFBFBD>
{
@@ -1388,7 +1432,7 @@ void Temp_Action_Set(RS485_TEMP_BASIC *Rs485TemRecBuf, RS485_TEMP_INFO *Rs485Tem
addPrompt_flag = 0x01;
}
}else {
Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"<EFBFBD>ƶ˿<EFBFBD><EFBFBD><EFBFBD> <20>յ<EFBFBD><EFBFBD><EFBFBD>ʾ<EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>Ӧ");
Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"<EFBFBD>յ<EFBFBD><EFBFBD><EFBFBD>ʾ<EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>Ӧ %02x-%02x",Rs485Tem->fan_en_flag,Rs485Tem->TemStateNetFlag);
}
}else {
Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"<EFBFBD><EFBFBD>һ<EFBFBD><EFBFBD> <20>յ<EFBFBD><D5B5><EFBFBD>ʾ<EFBFBD><CABE> <20><><EFBFBD><EFBFBD>Ӧ");
@@ -1407,7 +1451,7 @@ void Temp_Action_Set(RS485_TEMP_BASIC *Rs485TemRecBuf, RS485_TEMP_INFO *Rs485Tem
if(Rs485Tem->inif_flag != 0x00)
{
if( (Rs485Tem->TemStateNetFlag == 0x00) && (addPrompt_flag == 0x00) )
if( (Rs485Tem->TemStateNetFlag == 0x00) && (addPrompt_flag == 0x00) && (Rs485Tem->fan_en_flag == 0x01) )
{
if(Rs485TemRecBuf->TemState.fan == 0x01) //<2F><><EFBFBD><EFBFBD>
{
@@ -1425,7 +1469,7 @@ void Temp_Action_Set(RS485_TEMP_BASIC *Rs485TemRecBuf, RS485_TEMP_INFO *Rs485Tem
AddPrompt_ToList(0x05);
}
}else {
Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"<EFBFBD>ƶ˿<EFBFBD><EFBFBD><EFBFBD> <20>յ<EFBFBD><EFBFBD><EFBFBD>ʾ<EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>Ӧ");
Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"<EFBFBD>յ<EFBFBD><EFBFBD><EFBFBD>ʾ<EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>Ӧ %02x-%02x",Rs485Tem->fan_en_flag,Rs485Tem->TemStateNetFlag);
}
}else {
Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"<EFBFBD><EFBFBD>һ<EFBFBD><EFBFBD> <20>յ<EFBFBD><D5B5><EFBFBD>ʾ<EFBFBD><CABE> <20><><EFBFBD><EFBFBD>Ӧ");

3
BasicCode/Drive/BLV_485_Protocol/BLV_485_Dev_TempFun.h
View File

@@ -149,6 +149,9 @@ typedef struct
uint8_t CardCnt; //2023-12-26 <20>忨״̬ͬ<CCAC><CDAC><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
uint8_t ValveNoExist; //2024-06-27 ˮ<><CBAE><EFBFBD>޷<EFBFBD><DEB7><EFBFBD><EFBFBD><EFBFBD>
uint8_t switch_en_flag; //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʾ<EFBFBD><CABE> ʹ<>ܱ<EFBFBD>־λ
uint8_t fan_en_flag; //<2F><><EFBFBD><EFBFBD>ģʽ<C4A3><CABD>ʾ<EFBFBD><CABE> ʹ<>ܱ<EFBFBD>־λ
uint8_t DevPort; //2024-11-05
uint8_t DevPort_Last; //2024-11-05
uint8_t DevPort_Flag; //2024-11-05

25
BasicCode/Drive/BLV_485_Protocol/BLV_485_Dev_TempT1Fun.c
View File

@@ -417,16 +417,27 @@ uint8_t BLWOut_TempT1CtrDataProc(Device_Public_Information_G* BUS_Public, uint8_
|| (Rs485Tem->TemStateLast.mode != Rs485Tem->TemState.mode) \
|| (Rs485Tem->TemStateLast.fan != Rs485Tem->TemState.fan) \
|| (Rs485Tem->TemStateLast.valve != Rs485Tem->TemState.valve) \
|| (Rs485Tem->TemStateLast.set_t != Rs485Tem->TemState.set_t) )
|| (Rs485Tem->TemStateLast.set_t != Rs485Tem->TemState.set_t) \
|| (Rs485Tem->TemStateLast.indoor_t != Rs485Tem->TemState.indoor_t) )
{
Dbg_Println(DBG_BIT_DEVICE_STATUS_bit,"<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ϱ<EFBFBD>:%04x",Dev_Temp_State_Data(Rs485Tem->TemState));
Rs485Tem->udp_flag = 0x01;
Rs485Tem->udp_tick = SysTick_1ms;
temp++;
Dev_Temp_State_Sync(&Rs485Tem->TemStateLast,&Rs485Tem->TemState);
if( (Rs485Tem->TemStateLast.on_off != Rs485Tem->TemState.on_off) \
|| (Rs485Tem->TemStateLast.mode != Rs485Tem->TemState.mode) \
|| (Rs485Tem->TemStateLast.fan != Rs485Tem->TemState.fan) \
|| (Rs485Tem->TemStateLast.valve != Rs485Tem->TemState.valve) \
|| (Rs485Tem->TemStateLast.set_t != Rs485Tem->TemState.set_t) )
{
Dbg_Println(DBG_BIT_DEVICE_STATUS_bit,"<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ϱ<EFBFBD>:%04x",Dev_Temp_State_Data(Rs485Tem->TemState));
Rs485Tem->udp_flag = 0x01;
Rs485Tem->udp_tick = SysTick_1ms;
temp++;
}
}
Dev_Temp_State_Sync(&Rs485Tem->TemStateLast,&Rs485Tem->TemState);
if(Rs485Tem->udp_flag == 0x01)
{