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

feat:新增无卡取电驱动 - 初始化状态时同步对于的服务信息回路状态

Browse Source 
1、修改无卡取电驱动
     -> 无卡取电回路在初始化门磁状态时，将初始化状态与对应的服务信息回路状态进行同步时，以门磁触发为门磁服务关，以门磁释放为门磁服务开
     -> 无卡回路初始化，需要在弱电输入初始化完成后
2、修改温控器驱动
     -> T1温控器设备和C7T温控器的服务器上报数据，在室温变化时也能更新
     -> 温控器控制方法修改 开关机提示音和风速模式提示音整合到一个控制方法中，使用一个提示音标志位控制，配置工具也只勾选风速模式提示音就可以使能提示音播放
     -> 服务器控制温控器时，不会触发提示音。而用户操作温控器，是否触发提示音由配置决定。
     -> T1温控器设备 新增小数点数据存储在定期上报里组包
3、网络通信驱动
     -> 定期上报协议版本更新到V04
      修改点：温控器数据组装中 新增内容 室内温度的小数位
4、修改能耗驱动
     -> 增加 - 通信数据接收处理函数中对数据进行和校验取反
This commit is contained in:
caocong
2026-03-04 14:37:11 +08:00
parent 514cd84f1e
commit 8a10946701
31 changed files with 29578 additions and 29450 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -308,6 +308,9 @@ void BLWC43_TempCtrDataProc(Device_Public_Information_G* BUS_Public, uint8_t *Da
break;
}
//Dbg_Println(DBG_BIT_DEVICE_STATUS_bit,"C7T û<><C3BB>С<EFBFBD><D0A1>λ");
C7T_Temp_Info->indoor_dec_temp = 0x00;
/*<2A>ȶԷ<C8B6><D4B7><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ϱ<EFBFBD>״̬ - <20>Ƿ<EFBFBD>д<EFBFBD><D0B4><EFBFBD><EFBFBD>־
2025-10-13 <20>޸<EFBFBD>
1<><31>ֻ<EFBFBD><D6BB><EFBFBD><EFBFBD><EFBFBD>û<EFBFBD><C3BB><EFBFBD><EFBFBD><EFBFBD>״̬<D7B4>仯<EFBFBD><E4BBAF><EFBFBD><EFBFBD><EFBFBD>ϱ<EFBFBD><CFB1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>¶ȱ仯<C8B1><E4BBAF><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ϱ<EFBFBD>
@@ -319,13 +322,15 @@ void BLWC43_TempCtrDataProc(Device_Public_Information_G* BUS_Public, uint8_t *Da
|| (C7T_Temp_Info->TemStateLast.valve != C7T_Temp_Info->TemState.valve)
|| (C7T_Temp_Info->TemStateLast.set_t != C7T_Temp_Info->TemState.set_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;
}
Dev_Temp_State_Sync(&C7T_Temp_Info->TemStateLast,&C7T_Temp_Info->TemState);
if(C7T_Temp_Info->udp_flag == 0x01)
{
if( SysTick_1ms - C7T_Temp_Info->udp_tick >= 2000)

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

@@ -417,6 +417,13 @@ uint8_t BLV_RS485_Energy_Data_Processing(uint32_t dev_addr,uint32_t data_addr,ui
return rev;
}
/*У<><D0A3>У<EFBFBD><D0A3>λ<EFBFBD><CEBB>У<EFBFBD><D0A3><EFBFBD><EFBFBD>ȡ<EFBFBD><C8A1>*/
if( deal_buff[5] != CheckSum_Overlook_Check(deal_buff,deal_len,5) )
{
Dbg_Println(DBG_BIT_DEVICE_STATUS_bit,"Energy Check %02x Err",deal_buff[5]);
return rev;
}
SRAM_DMA_Read_Buff((uint8_t *)&Rs485EnergyInfo,sizeof(RS485_ENERGYMONITOR_INFO),dev_addr+Dev_Privately);
switch(deal_buff[6])

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

@@ -371,7 +371,6 @@ void Dev_TEMPCTRL_Ctrl(uint32_t CfgDevAddIn, uint16_t DevInputAddr, uint32_t Cfg
Device_Public_Information_G BUS_PublicIn; //<2F><><EFBFBD><EFBFBD>
RS485_TEMP_INFO Rs485TemIn; //<2F>¿<EFBFBD><C2BF><EFBFBD><EFBFBD>ֲ<EFBFBD><D6B2><EFBFBD><EFBFBD><EFBFBD>
if((NULL == CfgDevAddOut)||(0x00 != DevOutputLoop)) //<2F><><EFBFBD><EFBFBD><EFBFBD>ƽڵ<C6BD>Ϊ<EFBFBD>գ<EFBFBD><D5A3><EFBFBD><EFBFBD>߱<EFBFBD><DFB1><EFBFBD><EFBFBD>ƵĻ<C6B5>·<EFBFBD><C2B7>0<EFBFBD>ͷ<EFBFBD><CDB7><EFBFBD>
{
return ;
@@ -615,6 +614,23 @@ void Dev_TEMPCTRL_Ctrl(uint32_t CfgDevAddIn, uint16_t DevInputAddr, uint32_t Cfg
Rs485TemLoc.set_t = TempSet; //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><C2B6><EFBFBD>ȫ<EFBFBD><C8AB>ֵ <20><>ֵ0, 16~31
break;
}
/*<2A>ж<EFBFBD><D0B6>Ƿ<EFBFBD><C7B7>Ƿ<EFBFBD><C7B7><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>״̬*/
if(Rs485Tem.TemStateNetFlag != 0x00)
{
if(Rs485Tem.TemStateNetState == DevOutputType)
{
Dbg_Println(DBG_BIT_DEVICE_STATUS_bit,"<EFBFBD>ƶ˿<EFBFBD><EFBFBD><EFBFBD> 1:%4x - %4x", Rs485Tem.TemStateNetState,DevOutputType);
Rs485Tem.TemStateNetFlag = 0x02;
Rs485Tem.TemStateNetCnt = 0x00;
}else{
Dbg_Println(DBG_BIT_DEVICE_STATUS_bit,"<EFBFBD><EFBFBD><EFBFBD>ƶ˿<EFBFBD><EFBFBD><EFBFBD> 1:%4x - %4x", Rs485Tem.TemStateNetState,DevOutputType);
Rs485Tem.TemStateNetFlag = 0x00;
Rs485Tem.TemStateNetState = 0x00;
Rs485Tem.TemStateNetCnt = 0x00;
}
}
// switch(TempValve)
// {
// case 0x01: Rs485Tem->TemStateCtrl.valve = TEMP_VALVE_OPEN; break; //<2F><>
@@ -638,9 +654,18 @@ void Dev_TEMPCTRL_Ctrl(uint32_t CfgDevAddIn, uint16_t DevInputAddr, uint32_t Cfg
if(Dev_Temp_State_Data(Rs485Tem.TemStateCtrl) != Dev_Temp_State_Data(Rs485TemLoc) )
{
KeepFlag = 0x01;
Dev_Temp_State_Sync(&Rs485Tem.TemStateCtrl,&Rs485TemLoc);
Dbg_Println(DBG_BIT_DEVICE_STATUS_bit,"TemStateCtrl: %04X", Dev_Temp_State_Data(Rs485Tem.TemStateCtrl));
}else {
if(Rs485Tem.TemStateNetFlag != 0x00)
{
Dbg_Println(DBG_BIT_DEVICE_STATUS_bit,"<EFBFBD>ƶ˿<EFBFBD><EFBFBD><EFBFBD> 2:%4x <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", Rs485Tem.TemStateNetState,DevOutputType);
Rs485Tem.TemStateNetFlag = 0x00;
Rs485Tem.TemStateNetState = 0x00;
Rs485Tem.TemStateNetCnt = 0x00;
KeepFlag = 0x01;
}
}
}
@@ -743,52 +768,64 @@ uint8_t TemSingleJudge(uint32_t CfgDevAdd, RS485_Tem_Ctrl_ptr Rs485TemCtrl, RS48
if(0x00 != Rs485TempT1.TemStateCtrlCnt.TemOnOffCtrlVar)
{
Rs485TempT1.TemStateCtrlCnt.TemOnOffCtrlVar--;
Rs485TemCtrl(&BUS_Public,&Rs485TempT1, 0x00); //<2F><><EFBFBD>ػ<EFBFBD>
Ret = RS485OCCUPYTIME; //<2F><><EFBFBD>Ϳ<EFBFBD><CDBF><EFBFBD>
}
else
{
Rs485TempT1.TemStateCtrlFlag.TemOnOffCtrlVar = 0x00;
keepflag = 0x01;
}
Rs485TemCtrl(&BUS_Public,&Rs485TempT1, 0x00); //<2F><><EFBFBD>ػ<EFBFBD>
Ret = RS485OCCUPYTIME; //<2F><><EFBFBD>Ϳ<EFBFBD><CDBF><EFBFBD>
}
else if(0x01 == Rs485TempT1.TemStateCtrlFlag.TemModeCtrlVar) //ģʽ
{
if(0x00 != Rs485TempT1.TemStateCtrlCnt.TemModeCtrlVar)
{
Rs485TempT1.TemStateCtrlCnt.TemModeCtrlVar--;
Rs485TemCtrl(&BUS_Public, &Rs485TempT1, 0x01); //ģʽ
Ret = RS485OCCUPYTIME; //<2F><><EFBFBD>Ϳ<EFBFBD><CDBF><EFBFBD>
}
else
{
Rs485TempT1.TemStateCtrlFlag.TemModeCtrlVar = 0x00;
keepflag = 0x01;
}
Rs485TemCtrl(&BUS_Public, &Rs485TempT1, 0x01); //ģʽ
Ret = RS485OCCUPYTIME; //<2F><><EFBFBD>Ϳ<EFBFBD><CDBF><EFBFBD>
}
else if(0x01 == Rs485TempT1.TemStateCtrlFlag.TemSetTCtrlVar) //<2F><EFBFBD>
{
if(0x00 != Rs485TempT1.TemStateCtrlCnt.TemSetTCtrlVar)
{
Rs485TempT1.TemStateCtrlCnt.TemSetTCtrlVar--;
Rs485TemCtrl(&BUS_Public, &Rs485TempT1, 0x02); //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
Ret = RS485OCCUPYTIME; //<2F><><EFBFBD>Ϳ<EFBFBD><CDBF><EFBFBD>
}
else
{
Rs485TempT1.TemStateCtrlFlag.TemSetTCtrlVar = 0x00;
keepflag = 0x01;
}
Rs485TemCtrl(&BUS_Public, &Rs485TempT1, 0x02); //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
Ret = RS485OCCUPYTIME; //<2F><><EFBFBD>Ϳ<EFBFBD><CDBF><EFBFBD>
}
else if(0x01 == Rs485TempT1.TemStateCtrlFlag.TemFanCtrlVar) //<2F><><EFBFBD><EFBFBD>
{
if(0x00 != Rs485TempT1.TemStateCtrlCnt.TemFanCtrlVar)
{
Rs485TempT1.TemStateCtrlCnt.TemFanCtrlVar--;
Rs485TemCtrl(&BUS_Public, &Rs485TempT1, 0x03); //<2F><><EFBFBD><EFBFBD>
Ret = RS485OCCUPYTIME; //<2F><><EFBFBD>Ϳ<EFBFBD><CDBF><EFBFBD>
}
else
{
Rs485TempT1.TemStateCtrlFlag.TemFanCtrlVar = 0x00;
keepflag = 0x01;
}
Rs485TemCtrl(&BUS_Public, &Rs485TempT1, 0x03); //<2F><><EFBFBD><EFBFBD>
Ret = RS485OCCUPYTIME; //<2F><><EFBFBD>Ϳ<EFBFBD><CDBF><EFBFBD>
}
else if(Rs485TempT1.CardFlag == 0x01)
{
@@ -814,14 +851,29 @@ uint8_t TemSingleJudge(uint32_t CfgDevAdd, RS485_Tem_Ctrl_ptr Rs485TemCtrl, RS48
{
if(BUS_Public.port == Polling_Port) //2024-11-05
{
if(NULL != Rs485TemCycle)
{
Rs485TemCycle(&BUS_Public);
Ret = RS485OCCUPYTIME;// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ѯ
}
}
/* 2026-02-28
<09>ƶ˿<C6B6><CBBF>ƺ󣬲<C6BA>3<EFBFBD><33>״̬<D7B4>ñ<EFBFBD>־λ<D6BE><CEBB><EFBFBD><EFBFBD><EFBFBD>ڵĻ<DAB5>,<2C><><EFBFBD><EFBFBD>״̬
<09>޿<EFBFBD><DEBF>Ʊ<EFBFBD>־λ<D6BE><CEBB><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>£<EFBFBD><C2A3>ƶ˿<C6B6><CBBF>Ʋ<EFBFBD>Ϊ<EFBFBD>㣬<EFBFBD><E3A3AC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>־λ
Ԥ<><D4A4><EFBFBD>¿<EFBFBD><C2BF><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ߺ󣬱<DFBA>־λһֱ<D2BB><D6B1><EFBFBD><EFBFBD>
*/
if(Rs485TempT1.TemStateNetFlag != 0x00)
{
Rs485TempT1.TemStateNetCnt++;
if(Rs485TempT1.TemStateNetCnt >= REPEATSENDTIMEMAX)
{
Rs485TempT1.TemStateNetCnt = 0x00;
Rs485TempT1.TemStateNetFlag = 0x00;
Rs485TempT1.TemStateNetState = 0x00;
}
}
}
if((RS485OCCUPYTIME == Ret) || (keepflag == 0x01))
@@ -1223,12 +1275,15 @@ void Temp_FanAuto_Set(RS485_TEMP_BASIC *Rs485TemRecBuf, RS485_TEMP_INFO *Rs485Te
*/
void Temp_Action_Set(RS485_TEMP_BASIC *Rs485TemRecBuf, RS485_TEMP_INFO *Rs485Tem)
{
uint8_t addPrompt_flag = 0;
if(Rs485Tem->TemState.on_off != Rs485TemRecBuf->TemState.on_off)
{
Rs485Tem->TemState.on_off = Rs485TemRecBuf->TemState.on_off; //<2F><><EFBFBD>ػ<EFBFBD>ͬ<EFBFBD><CDAC>
Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ػ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ǰ״̬: %d",Rs485TemRecBuf->TemState.on_off);
Rs485Tem->TemCondRec.OnOffFlag = 0x01; //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
Rs485Tem->TemCondRec.OnOffState = Rs485TemRecBuf->TemState.on_off;
if(TEMP_STATE_ON == Rs485TemRecBuf->TemState.on_off)
{
Rs485Tem->TemCondRec.FanFlag = 0x01; //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ٶ<EFBFBD><D9B6><EFBFBD>
@@ -1263,6 +1318,28 @@ void Temp_Action_Set(RS485_TEMP_BASIC *Rs485TemRecBuf, RS485_TEMP_INFO *Rs485Tem
}
Rs485Tem->TemCondRec.ModeFlag = 0x01; //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ģʽ<C4A3><CABD><EFBFBD><EFBFBD>
Rs485Tem->TemCondRec.ModeState = Rs485TemRecBuf->TemState.mode;
if(Rs485Tem->inif_flag != 0x00)
{
if(Rs485Tem->TemStateNetFlag == 0x00)
{
AddPrompt_ToList(0x06);
addPrompt_flag = 0x01;
}else {
Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"<EFBFBD>ƶ˿<EFBFBD><EFBFBD><EFBFBD> <20>յ<EFBFBD><D5B5><EFBFBD>ʾ<EFBFBD><CABE> <20><><EFBFBD><EFBFBD>Ӧ");
}
}
}else {
if(Rs485Tem->inif_flag != 0x00)
{
if(Rs485Tem->TemStateNetFlag == 0x00)
{
AddPrompt_ToList(0x07);
addPrompt_flag = 0x01;
}else {
Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"<EFBFBD>ƶ˿<EFBFBD><EFBFBD><EFBFBD> <20>յ<EFBFBD><D5B5><EFBFBD>ʾ<EFBFBD><CABE> <20><><EFBFBD><EFBFBD>Ӧ");
}
}
}
}
if(Rs485Tem->TemState.mode != Rs485TemRecBuf->TemState.mode)
@@ -1289,20 +1366,29 @@ 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(Rs485TemRecBuf->TemState.mode == 0x01) //<2F><><EFBFBD><EFBFBD>
if( (Rs485Tem->TemStateNetFlag == 0x00) && (addPrompt_flag == 0x00) )
{
Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʾ<EFBFBD><EFBFBD>");
AddPrompt_ToList(0x00);
}
else if(Rs485TemRecBuf->TemState.mode == 0x02) //<2F><><EFBFBD><EFBFBD>
{
Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʾ<EFBFBD><EFBFBD>");
AddPrompt_ToList(0x01);
}
else if(Rs485TemRecBuf->TemState.mode == 0x03) //<2F>ͷ<EFBFBD>
{
Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ͷ<EFBFBD><EFBFBD><EFBFBD>ʾ<EFBFBD><EFBFBD>");
AddPrompt_ToList(0x02);
if(Rs485TemRecBuf->TemState.mode == 0x01) //<2F><><EFBFBD><EFBFBD>
{
Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʾ<EFBFBD><EFBFBD>");
AddPrompt_ToList(0x00);
addPrompt_flag = 0x01;
}
else if(Rs485TemRecBuf->TemState.mode == 0x02) //<2F><><EFBFBD><EFBFBD>
{
Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʾ<EFBFBD><EFBFBD>");
AddPrompt_ToList(0x01);
addPrompt_flag = 0x01;
}
else if(Rs485TemRecBuf->TemState.mode == 0x03) //<2F>ͷ<EFBFBD>
{
Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ͷ<EFBFBD><EFBFBD><EFBFBD>ʾ<EFBFBD><EFBFBD>");
AddPrompt_ToList(0x02);
addPrompt_flag = 0x01;
}
}else {
Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"<EFBFBD>ƶ˿<EFBFBD><EFBFBD><EFBFBD> <20>յ<EFBFBD><D5B5><EFBFBD>ʾ<EFBFBD><CABE> <20><><EFBFBD><EFBFBD>Ӧ");
}
}else {
Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"<EFBFBD><EFBFBD>һ<EFBFBD><EFBFBD> <20>յ<EFBFBD><D5B5><EFBFBD>ʾ<EFBFBD><CABE> <20><><EFBFBD><EFBFBD>Ӧ");
@@ -1321,20 +1407,25 @@ void Temp_Action_Set(RS485_TEMP_BASIC *Rs485TemRecBuf, RS485_TEMP_INFO *Rs485Tem
if(Rs485Tem->inif_flag != 0x00)
{
if(Rs485TemRecBuf->TemState.fan == 0x01) //<2F><><EFBFBD><EFBFBD>
if( (Rs485Tem->TemStateNetFlag == 0x00) && (addPrompt_flag == 0x00) )
{
Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"<EFBFBD><EFBFBD><EFBFBD>ӵ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʾ<EFBFBD><EFBFBD>");
AddPrompt_ToList(0x03);
}
else if(Rs485TemRecBuf->TemState.fan == 0x02) //<2F><><EFBFBD><EFBFBD>
{
Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʾ<EFBFBD><EFBFBD>");
AddPrompt_ToList(0x04);
}
else if(Rs485TemRecBuf->TemState.fan == 0x03) //<2F><><EFBFBD><EFBFBD>
{
Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"<EFBFBD><EFBFBD><EFBFBD>Ӹ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʾ<EFBFBD><EFBFBD>");
AddPrompt_ToList(0x05);
if(Rs485TemRecBuf->TemState.fan == 0x01) //<2F><><EFBFBD><EFBFBD>
{
Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"<EFBFBD><EFBFBD><EFBFBD>ӵ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʾ<EFBFBD><EFBFBD>");
AddPrompt_ToList(0x03);
}
else if(Rs485TemRecBuf->TemState.fan == 0x02) //<2F><><EFBFBD><EFBFBD>
{
Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʾ<EFBFBD><EFBFBD>");
AddPrompt_ToList(0x04);
}
else if(Rs485TemRecBuf->TemState.fan == 0x03) //<2F><><EFBFBD><EFBFBD>
{
Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"<EFBFBD><EFBFBD><EFBFBD>Ӹ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʾ<EFBFBD><EFBFBD>");
AddPrompt_ToList(0x05);
}
}else {
Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"<EFBFBD>ƶ˿<EFBFBD><EFBFBD><EFBFBD> <20>յ<EFBFBD><D5B5><EFBFBD>ʾ<EFBFBD><CABE> <20><><EFBFBD><EFBFBD>Ӧ");
}
}else {
Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"<EFBFBD><EFBFBD>һ<EFBFBD><EFBFBD> <20>յ<EFBFBD><D5B5><EFBFBD>ʾ<EFBFBD><CABE> <20><><EFBFBD><EFBFBD>Ӧ");
@@ -1470,6 +1561,14 @@ void Temp_Action_Set(RS485_TEMP_BASIC *Rs485TemRecBuf, RS485_TEMP_INFO *Rs485Tem
Rs485Tem->inif_flag = 0x01;
}
/*2026-02-28 <20><><EFBFBD><EFBFBD><EFBFBD>ƶ˿<C6B6><CBBF><EFBFBD><EFBFBD>¿<EFBFBD><C2BF><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ӧ<EFBFBD><D3A6>ʾ<EFBFBD><CABE>*/
if( Rs485Tem->TemStateNetFlag != 0x00 )
{
Rs485Tem->TemStateNetFlag = 0x00;
Rs485Tem->TemStateNetState = 0x00;
Rs485Tem->TemStateNetCnt = 0x00;
}
#if Dev_Nor_Carbon_Flag
//Dev_Temp_State_Sync(&Rs485Tem->TemStateCtrl,&Rs485Tem->TemState); //2024-12-16 ̼<><CCBC><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
Rs485Tem->Carbon_Set_Temp = Rs485Tem->TemState.set_t;

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

@@ -118,7 +118,7 @@ typedef struct
uint8_t control_start; //<2F><><EFBFBD>ؿ<EFBFBD><D8BF>ػ<EFBFBD><D8BB><EFBFBD><EFBFBD><EFBFBD>״̬
TemState_Struct TemStateVir; //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>¿<EFBFBD><C2BF><EFBFBD>״̬<D7B4>仯<EFBFBD>Ƚ<EFBFBD> <20><>δ<EFBFBD><CEB4>
// TemState_Struct TemStateNet; //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>¿<EFBFBD><C2BF><EFBFBD>״̬<D7B4>仯<EFBFBD>Ƚ<EFBFBD> <20><>δ<EFBFBD><CEB4>
TemState_Struct TemStateLast; //<2F>¿<EFBFBD><C2BF><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>һ<EFBFBD><D2BB>״̬ <20><><EFBFBD><EFBFBD>״̬<D7B4>仯<EFBFBD>ϱ<EFBFBD>
// TemState_Struct TemStateRs485; //<2F>¿<EFBFBD><C2BF><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>һ<EFBFBD><D2BB>״̬ <20><><EFBFBD><EFBFBD>״̬<D7B4>仯<EFBFBD>ϱ<EFBFBD> RS485 <20><>δ<EFBFBD><CEB4>
// TemState_Struct TemStateMap; //<2F>¿<EFBFBD><C2BF><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>һ<EFBFBD><D2BB>״̬ <20><><EFBFBD><EFBFBD>״̬<D7B4>仯<EFBFBD>ϱ<EFBFBD> RS485 <20><>δ<EFBFBD><CEB4>
@@ -131,11 +131,13 @@ typedef struct
uint8_t TemCycleCnt; //<2F>¿<EFBFBD><C2BF><EFBFBD><EFBFBD><EFBFBD>ѯ<EFBFBD><D1AF><EFBFBD><EFBFBD><EFBFBD><EFBFBD>LF<4C>¿<EFBFBD><C2BF><EFBFBD><EFBFBD><EFBFBD>ѯ<EFBFBD><D1AF><EFBFBD><EFBFBD>ר<EFBFBD><D7A8>
uint8_t TemDataChangeFlag; //<2F>¿<EFBFBD><C2BF><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ݸı<DDB8><C4B1><EFBFBD>־
uint8_t TempType; //<2F>¿<EFBFBD><C2BF><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ͣ<EFBFBD>Ĭ<EFBFBD><C4AC>Ϊ<EFBFBD><CEAA><EFBFBD><EFBFBD><EFBFBD>¿<EFBFBD><C2BF><EFBFBD><EFBFBD><EFBFBD><EFBFBD>м̵<D0BC><CCB5><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ڣ<EFBFBD><DAA3><EFBFBD><EFBFBD>ǵ<EFBFBD><C7B5>ŷ<EFBFBD><C5B7>¿<EFBFBD><C2BF><EFBFBD><EFBFBD><EFBFBD>0Ϊ<30><CEAA><EFBFBD><EFBFBD><EFBFBD>¿<EFBFBD><C2BF><EFBFBD><EFBFBD><EFBFBD>1Ϊ<31><CEAA><EFBFBD>ŷ<EFBFBD><C5B7>¿<EFBFBD><C2BF><EFBFBD>
// uint8_t TemDataChangeFlag; //<2F>¿<EFBFBD><C2BF><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ݸı<DDB8><C4B1><EFBFBD>־
// uint8_t TempType; //<2F>¿<EFBFBD><C2BF><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ͣ<EFBFBD>Ĭ<EFBFBD><C4AC>Ϊ<EFBFBD><CEAA><EFBFBD><EFBFBD><EFBFBD>¿<EFBFBD><C2BF><EFBFBD><EFBFBD><EFBFBD><EFBFBD>м̵<D0BC><CCB5><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ڣ<EFBFBD><DAA3><EFBFBD><EFBFBD>ǵ<EFBFBD><C7B5>ŷ<EFBFBD><C5B7>¿<EFBFBD><C2BF><EFBFBD><EFBFBD><EFBFBD>0Ϊ<30><CEAA><EFBFBD><EFBFBD><EFBFBD>¿<EFBFBD><C2BF><EFBFBD><EFBFBD><EFBFBD>1Ϊ<31><CEAA><EFBFBD>ŷ<EFBFBD><C5B7>¿<EFBFBD><C2BF><EFBFBD>
uint8_t TemStateNetFlag; //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>¿<EFBFBD><C2BF><EFBFBD><EFBFBD><EFBFBD>־λ - <20><><EFBFBD><EFBFBD><EFBFBD>ƶ˿<C6B6><CBBF><EFBFBD><EFBFBD>¿<EFBFBD><C2BF><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʾ
uint8_t TemStateNetCnt; //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>¿<EFBFBD><C2BF><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ѯ<EFBFBD><D1AF><EFBFBD><EFBFBD>
uint16_t TemStateNetState; //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>¿<EFBFBD><C2BF><EFBFBD>״̬
uint8_t TempComSetFlag; //<2F>¿<EFBFBD><C2BF><EFBFBD><EFBFBD>²<EFBFBD><C2B2><EFBFBD><EFBFBD>ñ<EFBFBD>־<EFBFBD><D6BE><EFBFBD><EFBFBD>ʼ<EFBFBD><CABC>Ϊ1<CEAA><31>C43<34><33><EFBFBD><EFBFBD>ʱ<EFBFBD><CAB1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>һ<EFBFBD><D2BB><EFBFBD>²
uint8_t TempComSetCnt; //<2F>¿<EFBFBD><C2BF><EFBFBD><EFBFBD>²<EFBFBD><C2B2><EFBFBD><EFBFBD>ü<EFBFBD><C3BC><EFBFBD>
//Dev_Name_Struct DevNameStruct;//<2F>յ<EFBFBD><D5B5><EFBFBD><EFBFBD><EFBFBD> ÿ<><C3BF><EFBFBD><EFBFBD>·16<31><36><EFBFBD>ֽڱ<D6BD><DAB1><EFBFBD> //<2F><>֧<EFBFBD><D6A7>30<33><30><EFBFBD><EFBFBD>·<EFBFBD><C2B7><EFBFBD><EFBFBD>
@@ -157,6 +159,8 @@ typedef struct
uint8_t udp_flag; //2025-10-13 <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ϱ<EFBFBD><CFB1><EFBFBD>־λ
uint32_t udp_tick; //2025-10-13
uint8_t indoor_dec_temp; //2026-03-02 <09>洢<EFBFBD><E6B4A2><EFBFBD><EFBFBD><EFBFBD>ϱ<EFBFBD><CFB1><EFBFBD>С<EFBFBD><D0A1><EFBFBD>㲿<EFBFBD><E3B2BF><EFBFBD><EFBFBD><EFBFBD><EFBFBD> lsj
}__attribute__ ((__packed__))RS485_TEMP_INFO; //485<38>¿<EFBFBD><C2BF><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>뺯<EFBFBD><EBBAAF>
typedef struct

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

@@ -243,56 +243,7 @@ void BLV_T1Temp_PortSet_Send(Device_Public_Information_G *BUS_Public, RS485_TEMP
*******************************************************************************/
uint8_t BLWOut_TempT1CycleCtrl(uint32_t dev_addr)
{
// uint16_t temp = 0;
// uint8_t crc_val = 0;
// uint8_t i;
// uint8_t CtrlWay = 4;//<2F><><EFBFBD>Ʒ<EFBFBD>ʽ
// RS485_TEMP_INFO Rs485TempT1;
// SRAM_DMA_Read_Buff((uint8_t *)&Rs485TempT1,sizeof(RS485_TEMP_INFO),dev_addr+Dev_Privately);
//
// for(i = 0;i<4;i++)
// {
// if(0xff != Rs485TempT1.info[i])
// {
// CtrlWay = i;
// break;
// }
// }
//
// switch(CtrlWay)
// {
// case 0: //<2F><><EFBFBD>ػ<EFBFBD>
// case 1: //ģʽ
// case 2: //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
// case 3: //<2F><><EFBFBD>ٿ<EFBFBD><D9BF><EFBFBD>
// BLWOut_TempT1Ctrl(dev_addr,&Rs485TempT1, CtrlWay);
// break;
// case 4: //<2F><>ѯ<EFBFBD><D1AF><EFBFBD><EFBFBD>
// BLWOut_tempCycle(dev_addr);
// break;
// }
// if(Rs485TempT1.DevSendCnt > REPEATSENDTIMEMAX)
// {
// Rs485TempT1.DevOffline = DEV_IS_OFFLINE; //<2F><>Ϊ<EFBFBD><CEAA><EFBFBD><EFBFBD>
// }
// else
// {
// Rs485TempT1.DevSendCnt++; //<2F><><EFBFBD>ʹ<EFBFBD><CDB4><EFBFBD><EFBFBD>ۼ<EFBFBD>
// }
//
// /*<2A><><EFBFBD><EFBFBD><EFBFBD>ݱ<EFBFBD><DDB1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>SRAM<41><4D>*/
// SRAM_DMA_Write_Buff((uint8_t *)&Rs485TempT1,sizeof(RS485_TEMP_INFO),dev_addr+Dev_Privately);
//
// /*<2A><><EFBFBD><EFBFBD>У<EFBFBD><D0A3>ֵ*/
// SRAM_Write_Byte(0x00,dev_addr+Dev_Check);
// temp = sizeof(RS485_TEMP_INFO) + Dev_Privately;
// crc_val = Dev_CheckSum(dev_addr,temp);
// SRAM_Write_Byte(crc_val,dev_addr+Dev_Check); //У<><D0A3>ֵ<EFBFBD><D6B5><EFBFBD><EFBFBD>д<EFBFBD><D0B4>
// //Dbg_Print(DBG_BIT_DEVICE_STATUS_bit,"TempT1 crc_val:%02X\r\n",crc_val);
//
// return 0;
return TemSingleJudge(dev_addr, BLWOut_TempT1Ctrl, BLWOut_tempT1Cycle);
}
@@ -364,10 +315,22 @@ uint8_t BLWOut_TempT1CtrDataProc(Device_Public_Information_G* BUS_Public, uint8_
}
Rs485TemRecBuf.TemState.indoor_t = data[17];//SRAM_Read_Byte(data_addr + 17); //
if((Rs485TemRecBuf.TemState.on_off != Rs485Tem->TemState.on_off) || (Rs485TemRecBuf.TemState.mode != Rs485Tem->TemState.mode) ||
(Rs485TemRecBuf.TemState.fan != Rs485Tem->TemState.fan) || (Rs485TemRecBuf.TemState.valve != Rs485Tem->TemState.valve)||
(Rs485TemRecBuf.FanAutoRelay != Rs485Tem->FanAutoRelay) ||
(Rs485TemRecBuf.TemState.set_t != Rs485Tem->TemState.set_t)||(Rs485TemRecBuf.TemState.indoor_t != Rs485Tem->TemState.indoor_t))//<2F><><EFBFBD>ػ<EFBFBD> ģʽ <20><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><C2B6>봢<EFBFBD><EBB4A2><EFBFBD>IJ<EFBFBD>һ<EFBFBD><D2BB>
if(data[18] < 0x0A ){ //<2F><><EFBFBD><EFBFBD>Χ<EFBFBD><CEA7>0-9<><39>С<EFBFBD><D0A1><EFBFBD><EFBFBD><EFBFBD>ݴ<EFBFBD>ΪС<CEAA><D0A1><EFBFBD><EFBFBD><EFBFBD>֣<EFBFBD><D6A3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ݷǷ<DDB7><C7B7><EFBFBD><EFBFBD><EFBFBD>С<EFBFBD><D0A1><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϊ0
Rs485Tem->indoor_dec_temp = data[18];
}else{
Dbg_Println(DBG_BIT_DEVICE_STATUS_bit,"dec ERR:%d",data[18]);
Rs485Tem->indoor_dec_temp = 0x00;
}
if((Rs485TemRecBuf.TemState.on_off != Rs485Tem->TemState.on_off)
|| (Rs485TemRecBuf.TemState.mode != Rs485Tem->TemState.mode)
||(Rs485TemRecBuf.TemState.fan != Rs485Tem->TemState.fan)
|| (Rs485TemRecBuf.TemState.valve != Rs485Tem->TemState.valve)
||(Rs485TemRecBuf.FanAutoRelay != Rs485Tem->FanAutoRelay)
||(Rs485TemRecBuf.TemState.set_t != Rs485Tem->TemState.set_t)
||(Rs485TemRecBuf.TemState.indoor_t != Rs485Tem->TemState.indoor_t)
)//<2F><><EFBFBD>ػ<EFBFBD> ģʽ <20><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><C2B6>봢<EFBFBD><EBB4A2><EFBFBD>IJ<EFBFBD>һ<EFBFBD><D2BB>
{
Temp_Action_Set(&Rs485TemRecBuf, Rs485Tem); //ͬ<><CDAC>״̬<D7B4><CCAC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
@@ -456,8 +419,6 @@ uint8_t BLWOut_TempT1CtrDataProc(Device_Public_Information_G* BUS_Public, uint8_
|| (Rs485Tem->TemStateLast.valve != Rs485Tem->TemState.valve) \
|| (Rs485Tem->TemStateLast.set_t != Rs485Tem->TemState.set_t) )
{
Dev_Temp_State_Sync(&Rs485Tem->TemStateLast,&Rs485Tem->TemState);
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;
@@ -465,6 +426,8 @@ uint8_t BLWOut_TempT1CtrDataProc(Device_Public_Information_G* BUS_Public, uint8_
temp++;
}
Dev_Temp_State_Sync(&Rs485Tem->TemStateLast,&Rs485Tem->TemState);
if(Rs485Tem->udp_flag == 0x01)
{
if( SysTick_1ms - Rs485Tem->udp_tick >= 2000)

11
BasicCode/Drive/BLV_485_Protocol/BLV_BUS_Dev_C5MusicFun.c
View File

@@ -361,11 +361,8 @@ uint8_t BLV_BUS_C5MUSIC_Data_Processing(uint32_t dev_addr,uint32_t data_addr,uin
C5Music_Info.now_helpsleep_volume = deal_buff[PKT2_PARA + 12]; //<2F><>ǰ<EFBFBD><C7B0><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 2022-12-16
// Dbg_Print_Buff(DBG_BIT_DEVICE_STATUS_bit,"Music Polling Data",deal_buff,deal_len);
if(C5Music_Info.last_playback_status != C5Music_Info.now_playback_status) /*<2A>Ƚ<EFBFBD>C5MUSIC_Playback<63><6B><EFBFBD><EFBFBD>,<2C>Ƿ񱣴<C7B7><F1B1A3B4><EFBFBD>־*/
{
Dbg_Println(DBG_BIT_DEVICE_STATUS_bit,"C5MUSIC_Playback_Status Change:%d",C5Music_Info.now_playback_status);
@@ -2663,13 +2660,13 @@ void Logic_Music_Ctrl(uint32_t DevAddrIn, uint16_t DevInputLoop, uint32_t DevAdd
uint16_t Dev_Music_Loop_State(uint32_t devaddr, uint16_t DevOutputLoop) //2023-02-28
{
BUS_C5MUSIC_INFO C5Music_Info; //<2F><><EFBFBD>ؾֲ<D8BE><D6B2><EFBFBD><EFBFBD><EFBFBD>
uint8_t status;
if(devaddr == 0x00)
return 0x00;
uint8_t status = 0x00;
if(devaddr == 0x00) return 0x00;
SRAM_DMA_Read_Buff((uint8_t *)&C5Music_Info,sizeof(BUS_C5MUSIC_INFO),devaddr+Dev_Privately);
if(C5Music_Info.now_playback_type ==0x01) //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
if(C5Music_Info.now_playback_type == 0x01) //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
{
if(C5Music_Info.now_playback_status == 0x00) //<2F><><EFBFBD><EFBFBD>
{