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

fix:修改服务信息驱动初始化、补充readme、修改C5IO备注文本

Browse Source 
1、修改服务信息驱动初始化
2、补充readme
3、修复C5IO的h文件的部分异常备注
This commit is contained in:
caocong
2026-03-13 15:41:13 +08:00
committed by lsj147
parent 8a10946701
commit 23105abc3e
21 changed files with 16976 additions and 16835 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -316,6 +316,15 @@ void BLWC43_TempCtrDataProc(Device_Public_Information_G* BUS_Public, uint8_t *Da
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>
2<><32><EFBFBD>¿<EFBFBD><C2BF><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ֹͣ<CDA3><D6B9>30S<30><53><EFBFBD><EFBFBD><EFBFBD>ٽ<EFBFBD><D9BD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ϱ<EFBFBD>
*/
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->TemStateLast.indoor_t != C7T_Temp_Info->TemState.indoor_t) )
{
Dev_Temp_State_Sync(&C7T_Temp_Info->TemStateLast,&C7T_Temp_Info->TemState);
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)
@@ -329,7 +338,9 @@ void BLWC43_TempCtrDataProc(Device_Public_Information_G* BUS_Public, uint8_t *Da
}
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);

70
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;
}
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;
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;
}
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>
@@ -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

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

@@ -413,20 +413,31 @@ uint8_t BLWOut_TempT1CtrDataProc(Device_Public_Information_G* BUS_Public, uint8_
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>
2<><32><EFBFBD>¿<EFBFBD><C2BF><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ֹͣ<CDA3><D6B9>30S<30><53><EFBFBD><EFBFBD><EFBFBD>ٽ<EFBFBD><D9BD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ϱ<EFBFBD>
*/
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) \
|| (Rs485Tem->TemStateLast.indoor_t != Rs485Tem->TemState.indoor_t) )
{
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)
{

31
BasicCode/Drive/BLV_485_Protocol/BLV_BUS_Dev_C5IOFun.h
View File

@@ -13,24 +13,25 @@
#define C5IO_RecvData_Len_MAX 0x28 //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ݳ<EFBFBD><DDB3><EFBFBD>Ŀǰ<C4BF>30Byte
/*?????<3F><><EFBFBD><EFBFBD>?*/
#define BLV_C5IO_Inquire_CMD 0x20 //?<EFBFBD><EFBFBD>?<EFBFBD><EFBFBD>?<EFBFBD><EFBFBD><EFBFBD><EFBFBD>?
#define BLV_C5IO_Set_Relay_CMD 0x21 //<2F><><EFBFBD><EFBFBD>???<3F><><EFBFBD><EFBFBD>??<3F><>?<3F><><EFBFBD><EFBFBD>?
#define BLV_C5IO_Set_Relay_Inching_CMD 0x22 //<2F><><EFBFBD><EFBFBD>???<3F><><EFBFBD><EFBFBD>??<3F>¦<EFBFBD>??<3F><>?<3F><><EFBFBD><EFBFBD>?
#define BLV_C5IO_Set_Do_CMD 0x23 //<2F><><EFBFBD><EFBFBD>??DO?<EFBFBD><EFBFBD><EFBFBD><EFBFBD>?
#define BLV_C5IO_Set_Do_Inching_CMD 0x24 //<2F><><EFBFBD><EFBFBD>??DO<EFBFBD><EFBFBD>??<3F><>?<3F><><EFBFBD><EFBFBD>?
#define BLV_C5IO_Set_Di_CMD 0x25 //<2F><><EFBFBD><EFBFBD>??DI?<EFBFBD><EFBFBD><EFBFBD><EFBFBD>?
/*<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>*/
#define BLV_C5IO_Inquire_CMD 0x20 //ѯ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
#define BLV_C5IO_Set_Relay_CMD 0x21 //<2F><><EFBFBD>ü̵<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
#define BLV_C5IO_Set_Relay_Inching_CMD 0x22 //<2F><><EFBFBD>ü̵<EFBFBD><EFBFBD><EFBFBD><EFBFBD>㶯<EFBFBD><EFBFBD><EFBFBD><EFBFBD>
#define BLV_C5IO_Set_Do_CMD 0x23 //<2F><><EFBFBD><EFBFBD>DO<44><4F><EFBFBD><EFBFBD>
#define BLV_C5IO_Set_Do_Inching_CMD 0x24 //<2F><><EFBFBD><EFBFBD>DO<EFBFBD>㶯<EFBFBD><EFBFBD><EFBFBD><EFBFBD>
#define BLV_C5IO_Set_Di_CMD 0x25 //<2F><><EFBFBD><EFBFBD>DI<44><49><EFBFBD><EFBFBD>
#define BLV_C5IO_SetRTC_CMD 0x27 //
#define BLV_C5IO_Reply_CMD 0xA0 //???<3F><>?<EFBFBD><EFBFBD><EFBFBD><EFBFBD>?
#define BLV_C5IO_Reply_CMD 0xA0 //<EFBFBD>ظ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
#define BLV_C5IO_Reply_Result 0x00 //2<EFBFBD><EFBFBD>?<EFBFBD><EFBFBD>?<EFBFBD><EFBFBD>1?
#define BLV_C5IO_Relay_Result 0x01 //?<EFBFBD><EFBFBD><EFBFBD><EFBFBD>??<3F><>?<3F><>DD3<44><33>1|
#define BLV_C5IO_Relay_Inching_Result 0x02 //?<3F><><EFBFBD><EFBFBD>??<3F>¦<EFBFBD>??<EFBFBD><EFBFBD>?<EFBFBD><EFBFBD>DD3<EFBFBD><EFBFBD>1|
#define BLV_C5IO_Do_Result 0x03 //Do?<3F><>DD3<44><33>1|
#define BLV_C5IO_Do_Inching_Result 0x04 //DO<44><4F>??<3F><>?<3F><>DD3<44><33>1|
#define BLV_C5IO_Di_Result 0x05 //DI?<3F><>DD3<44><33>1|
#define BLV_C5IO_Error_Result 0xF0 //<2F><>y?Y??<3F><>?<3F>䨪?<EFBFBD><EFBFBD>
#define BLV_C5IO_Reply_Result 0x00 //<2F><>ѯ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>
#define BLV_C5IO_Relay_Result 0x01 //<EFBFBD>̵<EFBFBD><EFBFBD><EFBFBD>ִ<EFBFBD>гɹ<EFBFBD>
#define BLV_C5IO_Relay_Inching_Result 0x02 //<EFBFBD>̵<EFBFBD><EFBFBD><EFBFBD><EFBFBD>㶯ִ<EFBFBD>гɹ<EFBFBD>
#define BLV_C5IO_Do_Result 0x03 //Doִ<EFBFBD>гɹ<EFBFBD>
#define BLV_C5IO_Do_Inching_Result 0x04 //DO<44>㶯ִ<EFBFBD>гɹ<EFBFBD>
#define BLV_C5IO_Di_Result 0x05 //DIִ<EFBFBD>гɹ<EFBFBD>
#define BLV_C5IO_Error_Result 0xF0 //<2F><><EFBFBD>ݸ<EFBFBD>ʽ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>
#define BUS_C5IO_DI_Key_Type 0x01 //DI<44><49><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> - <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
#define BUS_C5IO_DI_Pir_Type 0x02 //DI<44><49><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> - PIR<49><52><EFBFBD><EFBFBD>

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

@@ -238,7 +238,7 @@ void Dev_LVoutput_Dis(uint32_t DevAddr)
break;
case CLOSE: //<2F><>
C5IO_Info.DO_Control[i] = BUS_C5IO_OUT_LOW;
C5IO_Info.DO_Control_Flag |= 0x00000001<<i;
C5IO_Info.DO_Control_Flag |= 0x01<<i;
break;
}
}

82
BasicCode/Drive/BLV_Nor_Dev/BLV_Nor_Dev_ServiceFun.c
View File

@@ -62,13 +62,43 @@ void BLV_Nor_Dev_Service_Init(uint8_t devaddr)
BUS_Public.DevFunInfo.Dev_Output_Loop_State_Get = Service_Loop_State; //
DevServiceInfo.ServiceLoopValidNum = ServiceNumMAX;
DevServiceInfo.DevServiceState[Service_Warning] = 0x01; //Ĭ<>Ͽ<EFBFBD><CFBF><EFBFBD><EFBFBD><EFBFBD>ʾ<EFBFBD><CABE>
DevServiceInfo.DevServiceState[Service_Dnd] = 0x02; //Ĭ<><C4AC><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϊ<EFBFBD><EFBFBD>
DevServiceInfo.DevServiceState[Service_Meals] = 0x02; //<EFBFBD>ر<EFBFBD>9<EFBFBD>ŷ<EFBFBD><EFBFBD><EFBFBD>
DevServiceInfo.DevServiceState[Service_CheckOut] = 0x02; //<2F>ر<EFBFBD><D8B1>˷<EFBFBD>
DevServiceInfo.DevServiceState[Service_Strong] = 0x02; //<2F>رձ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
DevServiceInfo.DevServiceState[Service_Call] = 0x02; //<2F>رպ<EFBFBD><EFBFBD><EFBFBD>
DevServiceInfo.DevServiceState[Service_Sos] = 0x02; //Ĭ<EFBFBD>Ϲر<EFBFBD>SOS<EFBFBD><EFBFBD><EFBFBD><EFBFBD> 2022-06-28
// DevServiceInfo.DevServiceState[Service_Warning] = 0x01; //Ĭ<>Ͽ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʾ<EFBFBD><EFBFBD>
// DevServiceInfo.DevServiceState[Service_Dnd] = 0x02; //Ĭ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϊ<EFBFBD><EFBFBD>
// DevServiceInfo.DevServiceState[Service_Meals] = 0x02; //<2F>ر<EFBFBD>9<EFBFBD>ŷ<EFBFBD><EFBFBD><EFBFBD>
// DevServiceInfo.DevServiceState[Service_CheckOut] = 0x02; //<2F>ر<EFBFBD><D8B1>˷<EFBFBD>
// DevServiceInfo.DevServiceState[Service_Strong] = 0x02; //<2F>رձ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
// DevServiceInfo.DevServiceState[Service_Call] = 0x02; //<EFBFBD>رպ<EFBFBD><EFBFBD><EFBFBD>
// DevServiceInfo.DevServiceState[Service_Sos] = 0x02; //Ĭ<>Ϲر<CFB9>SOS<4F><53><EFBFBD><EFBFBD> 2022-06-28
//2026-03-11 <20><>Ĭ<EFBFBD><C4AC>ֵ<EFBFBD><D6B5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
DevServiceInfo.DevServiceState[Service_Dnd] = 0x02; //Ĭ<>Ϲر<CFB9><D8B1><EFBFBD><EFBFBD><EFBFBD>
DevServiceInfo.DevServiceState[Service_Clean] = 0x02; //Ĭ<>Ϲر<CFB9><D8B1><EFBFBD><EFBFBD><EFBFBD>
DevServiceInfo.DevServiceState[Service_Call] = 0x02; //Ĭ<>Ϲرպ<D8B1><D5BA><EFBFBD>
DevServiceInfo.DevServiceState[Service_Wash] = 0x02; //Ĭ<>Ϲر<CFB9>ϴ<EFBFBD><CFB4>
DevServiceInfo.DevServiceState[Service_CheckOut] = 0x02; //Ĭ<>Ϲر<CFB9><D8B1>˷<EFBFBD>
DevServiceInfo.DevServiceState[Service_Wait] = 0x02; //Ĭ<>Ϲر<CFB9><D8B1>Ժ<EFBFBD>
DevServiceInfo.DevServiceState[Service_Sos] = 0x02; //Ĭ<>Ϲر<CFB9>SOS
DevServiceInfo.DevServiceState[Service_Meals] = 0x02; //Ĭ<>Ϲر<CFB9>ԤԼ<D4A4><D4BC><EFBFBD><EFBFBD>
DevServiceInfo.DevServiceState[Service_Food_Plate] = 0x02; //Ĭ<>Ϲرտ<D8B1><D5BF><EFBFBD>
DevServiceInfo.DevServiceState[Service_Luggage] = 0x02; //Ĭ<>Ϲر<CFB9><D8B1><EFBFBD><EFBFBD><EFBFBD>
DevServiceInfo.DevServiceState[Service_Strong] = 0x02; //Ĭ<>Ϲرձ<D8B1><D5B1><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>޿<EFBFBD>ȡ<EFBFBD><C8A1><EFBFBD>ſں<C5BF>
DevServiceInfo.DevServiceState[Service_Door] = 0x02; //Ĭ<>Ϲر<CFB9><D8B1>Ŵ<EFBFBD>
DevServiceInfo.DevServiceState[Service_Warning] = 0x01; //Ĭ<>Ͽ<EFBFBD><CFBF><EFBFBD><EFBFBD><EFBFBD>ʾ<EFBFBD><CABE> <20><><EFBFBD>ھ<EFBFBD><DABE><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>͹ر<CDB9>
DevServiceInfo.DevServiceStateLast[Service_Dnd] = 0x02; //Ĭ<>Ϲر<CFB9><D8B1><EFBFBD><EFBFBD><EFBFBD>
DevServiceInfo.DevServiceStateLast[Service_Clean] = 0x02; //Ĭ<>Ϲر<CFB9><D8B1><EFBFBD><EFBFBD><EFBFBD>
DevServiceInfo.DevServiceStateLast[Service_Call] = 0x02; //Ĭ<>Ϲرպ<D8B1><D5BA><EFBFBD>
DevServiceInfo.DevServiceStateLast[Service_Wash] = 0x02; //Ĭ<>Ϲر<CFB9>ϴ<EFBFBD><CFB4>
DevServiceInfo.DevServiceStateLast[Service_CheckOut] = 0x02; //Ĭ<>Ϲر<CFB9><D8B1>˷<EFBFBD>
DevServiceInfo.DevServiceStateLast[Service_Wait] = 0x02; //Ĭ<>Ϲر<CFB9><D8B1>Ժ<EFBFBD>
DevServiceInfo.DevServiceStateLast[Service_Sos] = 0x02; //Ĭ<>Ϲر<CFB9>SOS
DevServiceInfo.DevServiceStateLast[Service_Meals] = 0x02; //Ĭ<>Ϲر<CFB9>ԤԼ<D4A4><D4BC><EFBFBD><EFBFBD>
DevServiceInfo.DevServiceStateLast[Service_Food_Plate] = 0x02; //Ĭ<>Ϲرտ<D8B1><D5BF><EFBFBD>
DevServiceInfo.DevServiceStateLast[Service_Luggage] = 0x02; //Ĭ<>Ϲر<CFB9><D8B1><EFBFBD><EFBFBD><EFBFBD>
DevServiceInfo.DevServiceStateLast[Service_Strong] = 0x02; //Ĭ<>Ϲرձ<D8B1><D5B1><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>޿<EFBFBD>ȡ<EFBFBD><C8A1><EFBFBD>ſں<C5BF>
DevServiceInfo.DevServiceStateLast[Service_Door] = 0x02; //Ĭ<>Ϲر<CFB9><D8B1>Ŵ<EFBFBD>
DevServiceInfo.DevServiceStateLast[Service_Warning] = 0x01; //Ĭ<>Ͽ<EFBFBD><CFBF><EFBFBD><EFBFBD><EFBFBD>ʾ<EFBFBD><CABE> <20><><EFBFBD>ھ<EFBFBD><DABE><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>͹ر<CDB9>
Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"<EFBFBD><EFBFBD><EFBFBD><EFBFBD>һ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϣ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϣ˽<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ݳ<EFBFBD><EFBFBD><EFBFBD>:%d",sizeof(NOR_SERVICE_INFO));
@@ -104,21 +134,35 @@ void BLV_Nor_Dev_Service_For_Logic_Init(LOGICFILE_DEVICE_INFO *dev_info,uint8_t
BUS_Public.DevFunInfo.Dev_Output_Loop_State_Get = Service_Loop_State; //
DevServiceInfo.ServiceLoopValidNum = ServiceNumMAX;
DevServiceInfo.DevServiceState[Service_Warning] = 0x01; //Ĭ<>Ͽ<EFBFBD><CFBF><EFBFBD><EFBFBD><EFBFBD>ʾ<EFBFBD><CABE>
DevServiceInfo.DevServiceState[Service_Dnd] = 0x02; //Ĭ<><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϊ<EFBFBD><EFBFBD>
DevServiceInfo.DevServiceState[Service_Clean] = 0x02; //Ĭ<><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
DevServiceInfo.DevServiceState[Service_Luggage] = 0x02; //Ĭ<><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
DevServiceInfo.DevServiceState[Service_Meals] = 0x02; //<2F>ر<EFBFBD>9<EFBFBD>ŷ<EFBFBD><EFBFBD><EFBFBD>
DevServiceInfo.DevServiceState[Service_CheckOut] = 0x02; //<EFBFBD>ر<EFBFBD><EFBFBD>˷<EFBFBD>
DevServiceInfo.DevServiceState[Service_Strong] = 0x02; //<2F>رձ<D8B1><D5B1><EFBFBD><EFBFBD><EFBFBD>
DevServiceInfo.DevServiceState[Service_Wait] = 0x02; //<2F>ر<EFBFBD><D8B1>Ժ<EFBFBD>
DevServiceInfo.DevServiceState[Service_Sos] = 0x02; //Ĭ<>Ϲر<CFB9>SOS<EFBFBD><EFBFBD><EFBFBD><EFBFBD>
DevServiceInfo.DevServiceState[Service_Call] = 0x02; //<2F>رպ<EFBFBD><EFBFBD><EFBFBD>
DevServiceInfo.DevServiceState[Service_Dnd] = 0x02; //Ĭ<>Ϲر<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
DevServiceInfo.DevServiceState[Service_Clean] = 0x02; //Ĭ<>Ϲر<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
DevServiceInfo.DevServiceState[Service_Call] = 0x02; //Ĭ<>Ϲرպ<EFBFBD><EFBFBD><EFBFBD>
DevServiceInfo.DevServiceState[Service_Wash] = 0x02; //Ĭ<>Ϲر<CFB9>ϴ<EFBFBD><EFBFBD>
DevServiceInfo.DevServiceState[Service_CheckOut] = 0x02; //Ĭ<EFBFBD>Ϲر<EFBFBD><EFBFBD>˷<EFBFBD>
DevServiceInfo.DevServiceState[Service_Wait] = 0x02; //Ĭ<>Ϲر<CFB9><D8B1>Ժ<EFBFBD>
DevServiceInfo.DevServiceState[Service_Sos] = 0x02; //Ĭ<>Ϲر<CFB9>SOS
DevServiceInfo.DevServiceState[Service_Meals] = 0x02; //Ĭ<>Ϲر<CFB9>ԤԼ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>
DevServiceInfo.DevServiceState[Service_Food_Plate] = 0x02; //Ĭ<>Ϲرտ<D8B1><D5BF><EFBFBD>
DevServiceInfo.DevServiceState[Service_Luggage] = 0x02; //Ĭ<>Ϲر<CFB9><D8B1><EFBFBD><EFBFBD><EFBFBD>
DevServiceInfo.DevServiceState[Service_Strong] = 0x02; //Ĭ<>Ϲرձ<D8B1><D5B1><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>޿<EFBFBD>ȡ<EFBFBD><C8A1><EFBFBD>ſں<C5BF>
DevServiceInfo.DevServiceState[Service_Door] = 0x02; //Ĭ<>Ϲر<CFB9><D8B1>Ŵ<EFBFBD>
DevServiceInfo.DevServiceState[Service_Warning] = 0x01; //Ĭ<>Ͽ<EFBFBD><CFBF><EFBFBD><EFBFBD><EFBFBD>ʾ<EFBFBD><CABE> <20><><EFBFBD>ھ<EFBFBD><DABE><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>͹ر<CDB9>
DevServiceInfo.DevServiceState[Service_22] = 0x02; //<2F><><EFBFBD>ӿ<EFBFBD><D3BF>ط<EFBFBD><D8B7><EFBFBD>״̬
DevServiceInfo.DevServiceStateLast[Service_Call] = 0x02; //<2F>رպ<EFBFBD><EFBFBD><EFBFBD>
DevServiceInfo.DevServiceStateLast[Service_Dnd] = 0x02; //Ĭ<>Ϲر<CFB9><D8B1><EFBFBD><EFBFBD><EFBFBD>
DevServiceInfo.DevServiceStateLast[Service_Clean] = 0x02; //Ĭ<>Ϲر<CFB9><D8B1><EFBFBD><EFBFBD><EFBFBD>
DevServiceInfo.DevServiceStateLast[Service_Call] = 0x02; //Ĭ<>Ϲرպ<D8B1><D5BA><EFBFBD>
DevServiceInfo.DevServiceStateLast[Service_Wash] = 0x02; //Ĭ<>Ϲر<CFB9>ϴ<EFBFBD><CFB4>
DevServiceInfo.DevServiceStateLast[Service_CheckOut] = 0x02; //Ĭ<>Ϲر<CFB9><D8B1>˷<EFBFBD>
DevServiceInfo.DevServiceStateLast[Service_Wait] = 0x02; //Ĭ<>Ϲر<CFB9><D8B1>Ժ<EFBFBD>
DevServiceInfo.DevServiceStateLast[Service_Sos] = 0x02; //Ĭ<>Ϲر<CFB9>SOS
DevServiceInfo.DevServiceStateLast[Service_Meals] = 0x02; //Ĭ<>Ϲر<CFB9>ԤԼ<D4A4><D4BC><EFBFBD><EFBFBD>
DevServiceInfo.DevServiceStateLast[Service_Food_Plate] = 0x02; //Ĭ<>Ϲرտ<D8B1><D5BF><EFBFBD>
DevServiceInfo.DevServiceStateLast[Service_Luggage] = 0x02; //Ĭ<>Ϲر<CFB9><D8B1><EFBFBD><EFBFBD><EFBFBD>
DevServiceInfo.DevServiceStateLast[Service_Strong] = 0x02; //Ĭ<>Ϲرձ<D8B1><D5B1><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>޿<EFBFBD>ȡ<EFBFBD><C8A1><EFBFBD>ſں<C5BF>
DevServiceInfo.DevServiceStateLast[Service_Door] = 0x02; //Ĭ<>Ϲر<CFB9><D8B1>Ŵ<EFBFBD>
DevServiceInfo.DevServiceStateLast[Service_Warning] = 0x01; //Ĭ<>Ͽ<EFBFBD><CFBF><EFBFBD><EFBFBD><EFBFBD>ʾ<EFBFBD><CABE> <20><><EFBFBD>ھ<EFBFBD><DABE><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>͹ر<CDB9>
DevServiceInfo.DevServiceStateLast[Service_22] = 0x02; //<2F><><EFBFBD>ӿ<EFBFBD><D3BF>ط<EFBFBD><D8B7><EFBFBD>״̬
Dbg_Println(DBG_BIT_LOGIC_STATUS_bit,"<EFBFBD><EFBFBD><EFBFBD><EFBFBD>һ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϣ<EFBFBD><EFBFBD>˽<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ݳ<EFBFBD><EFBFBD><EFBFBD>:%d",sizeof(NOR_SERVICE_INFO));

4
BasicCode/Drive/MAIN/includes.h
View File

@@ -253,7 +253,7 @@
#if (USE_CORE_TYPE == 1) //ʹ<><CAB9>C1F<31><46><EFBFBD>İ<EFBFBD>
#define MCU_TYPE "BLV-C1F" //<2F><><EFBFBD>ͱ<EFBFBD><CDB1><EFBFBD>
#define APP_NAME "App_L4_C1F_44" //APP<50><50><EFBFBD><EFBFBD> 16Byte
#define APP_NAME "App_L4_C1F_45" //APP<50><50><EFBFBD><EFBFBD> 16Byte
#if (USE_FLOOR_TYPE == 1) //C5<43>װ<EFBFBD>
#define Center_Control_TYPE "BLV-C5" //<2F><><EFBFBD><EFBFBD><EFBFBD>ͺ<EFBFBD>
@@ -261,7 +261,7 @@
#if (SoftName_Custom_Enable == 0x00)
#if (LOGIC_FILE_EN == 0x01)
#define SoftwareVer "C1F_A_L4_44_260304" //<2F><><EFBFBD><EFBFBD><EFBFBD>汾 20Byte
#define SoftwareVer "C1F_A_L4_45_260312" //<2F><><EFBFBD><EFBFBD><EFBFBD>汾 20Byte
#else
#define SoftwareVer "C1F_C5_Init220525 " //<2F><><EFBFBD><EFBFBD><EFBFBD>汾 20Byte
#endif

2
BasicCode/Drive/MAIN/main.c
View File

@@ -89,8 +89,6 @@ int main()
BLV_DevAction_AllData_Init();
TempPrompt_Fun_Init(); //2024-03-29
#if MQTT_EN
// ALiYun_Machine_Init(&mqtt_info, NET485_PRODUCTKEY, NET485_DEVICE_NAME, NET485_DEVICE_SECRET, 120); //<2F><><EFBFBD><EFBFBD><EFBFBD>Ʋ<EFBFBD><C6B2><EFBFBD><EFBFBD><EFBFBD>ʼ<EFBFBD><CABC>
// MQTT_SET_SUB_Topic(&mqtt_info, NET485_SUBLISH); //<2F><><EFBFBD>ö<EFBFBD><C3B6>IJ<EFBFBD><C4B2><EFBFBD>

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

@@ -3972,11 +3972,12 @@ void Internal_TFTP_Task(void)
*/
uint8_t UDP_ActSend_PowerChange_Scan_State(void)
{
uint8_t temp_state = 0,last_temp_state = 0,temp_flag = 0;
uint8_t temp_state = 0,last_temp_state = 0,temp_flag = 0,last_temp_flag = 0;
uint32_t temp_tick = 0;
/*<2A>ж<EFBFBD>ȡ<EFBFBD><C8A1><EFBFBD><EFBFBD><EFBFBD><EFBFBD>״̬<D7B4>Ƿ<EFBFBD><C7B7>б仯*/
temp_flag = SRAM_Read_Byte(SRAM_UDP_ELEReport_Action);
last_temp_flag = temp_flag;
temp_tick = SRAM_Read_DW(SRAM_UDP_ELEReport_EleState_Tick);
if(SysTick_1ms - temp_tick <= 4000)
@@ -4041,15 +4042,20 @@ uint8_t UDP_ActSend_PowerChange_Scan_State(void)
}
if(temp_flag != 0x00)
if(temp_flag != last_temp_flag)
{
SRAM_Write_Byte(temp_flag,SRAM_UDP_ELEReport_Action);
if( ((server_info.active_cmd_flag & UDP_ActSend_PowerChange_Flag) != 0x00) && (server_info.udp_send_flag == UDP_ActSend_PowerChange_Flag) )
{
/*<2A><>ǰ<EFBFBD><C7B0><EFBFBD>ڷ<EFBFBD><DAB7><EFBFBD> - <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>㣬<EFBFBD><E3A3AC><EFBFBD>¿<EFBFBD>ʼ<EFBFBD><CABC><EFBFBD><EFBFBD>*/
server_info.udp_retry_cnt = 0x00;
server_info.udp_retry_time = 2000;
if( (server_info.udp_sta == 0x03) || (server_info.udp_sta == 0x04) )
{
//<2F><>ǰ<EFBFBD><C7B0><EFBFBD>ڷ<EFBFBD><DAB7><EFBFBD> - <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>㣬<EFBFBD><E3A3AC><EFBFBD>¿<EFBFBD>ʼ<EFBFBD><CABC><EFBFBD><EFBFBD>
server_info.udp_sta = 0x02;
}
}else {
server_info.active_cmd_flag |= UDP_ActSend_PowerChange_Flag;

7
BasicCode/Project_APP/BLV_LOGIC_EDIT/BLV_Logic_Edit.c
View File

@@ -709,6 +709,9 @@ void BLV_DevAction_AllData_Init(void)
memset((void *)&NorDevInfoGlobal,0,sizeof(BLV_NORDEV_Manage_G));
memset((void *)&DevActionGlobal,0,sizeof(BLV_DevAction_Manage_G)); //ȫ<>ֲ<EFBFBD><D6B2><EFBFBD>ȫ<EFBFBD><C8AB><EFBFBD><EFBFBD>0
DevActionGlobal.DimGlobalValue = 100; //Ĭ<><C4AC><EFBFBD><EFBFBD><EFBFBD><EFBFBD>100
DevActionGlobal.Last_DimGlobalValue = DevActionGlobal.DimGlobalValue;
SRAM_PowerOn_Restore_ParaInfo();
DevAction_CondData_Init(); //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ݳ<EFBFBD>ʼ<EFBFBD><CABC>
@@ -3958,6 +3961,8 @@ uint8_t LOGIC_FILE_Check(void)
SRAM_Write_DW(Poll485_Info.Last_list_addr,SRAM_POLL_Device_List_Addr); //<2F><>ʼ<EFBFBD><CABC>Polling<6E><67>ʼ<EFBFBD><CABC>ַ
TempPrompt_Fun_Init(); //2026-03-13
//<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ѯ<EFBFBD>豸
for(uint8_t i=0;i<Lfile_stat.Polling_device_num;i++)
{
@@ -4003,11 +4008,9 @@ uint8_t LOGIC_FILE_Check(void)
}
}
Dbg_Println(DBG_BIT_SYS_STATUS_bit,"Ĭ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ѯ<EFBFBD>忨״̬ͬ<EFBFBD><EFBFBD><EFBFBD>豸");
BLW_RS485_CardState_AddTo_PollingPort(); //2023-10-31
Dbg_Println(DBG_BIT_SYS_STATUS_bit,"<EFBFBD><EFBFBD>ѯ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>豸<EFBFBD><EFBFBD><EFBFBD><EFBFBD>:%d", Poll485_Info.device_num);
Dbg_Println(DBG_BIT_SYS_STATUS_bit,"BLV_POLL_dev END:%08X",SRAM_Read_DW(SRAM_POLL_Device_List_Addr));

BIN
Pro/Pro-9999_Logic_CC_251027_0x5000_Simplify/MDK_PROJECT/Bin/C1F_A_L4_44_260304_NM.bin
View File

Binary file not shown.

5083
Pro/Pro-9999_Logic_CC_251027_0x5000_Simplify/MDK_PROJECT/Listings/C1F_A_L4_44_260304_NM.map
View File

File diff suppressed because it is too large Load Diff

BIN
Pro/Pro-9999_Logic_CC_251027_0x5000_Simplify/MDK_PROJECT/Objects/C1F_A_L4_44_260304_NM.axf
View File

Binary file not shown.

111
Pro/Pro-9999_Logic_CC_251027_0x5000_Simplify/MDK_PROJECT/Objects/C1F_A_L4_44_260304_NM.build_log.htm
View File

@@ -26,128 +26,87 @@ Project File Date: 03/04/2026
<h2>Output:</h2>
*** Using Compiler 'V5.06 update 6 (build 750)', folder: 'D:\Keil_v5\ARM\ARMCC\Bin'
Rebuild target 'TEST'
assembling startup_ARMCM0.s...
compiling CH57x_sys.c...
compiling CH57x_clk.c...
compiling CH57x_gpio.c...
compiling CH57x_int.c...
compiling CH57x_pwr.c...
compiling CH57x_adc.c...
compiling main.c...
compiling CH57x_flash.c...
compiling CH57x_uart0.c...
compiling CH57x_uart1.c...
compiling CH57x_timer0.c...
compiling CH57x_uart2.c...
compiling CH57x_uart3.c...
compiling CH57x_spi0.c...
compiling CH57x_spi1.c...
compiling Debug.c...
compiling rtc.c...
compiling dwg.c...
Build target 'TEST'
compiling key.c...
compiling SPI_SRAM.c...
compiling rw_logging.c...
compiling check_fun.c...
compiling main.c...
compiling flash.c...
compiling usart.c...
compiling Log_api.c...
compiling SPI_SRAM.c...
compiling check_fun.c...
compiling DNS.c...
compiling rw_logging.c...
compiling md5.c...
compiling BLV_Authorize.c...
compiling net.c...
compiling BLV_BUS_Dev_C5IOFun.c...
compiling BLV_485_Protocol.c...
compiling BLV_BUS_Dev_C5MusicFun.c...
compiling BLV_485_Dev_CardFun.c...
compiling BLV_NET_Function.c...
compiling BLV_485_Dev_TempFun.c...
compiling PC_DeviceTest_Fun.c...
compiling BLV_485_Dev_IrSendFun.c...
compiling BLV_485_Dev_Touch_SwiFun.c...
compiling BLV_485_Dev_C7TFun.c...
compiling net.c...
compiling BLV_485_Dev_CardFun.c...
compiling BLV_485_Dev_TempFun.c...
compiling BLV_485_Protocol.c...
compiling PC_DeviceTest_Fun.c...
compiling BLV_485_Dev_A9RelayFun.c...
compiling BLV_485_Dev_C7TFun.c...
compiling BLV_485_Dev_IrSendFun.c...
compiling BLV_NET_Function.c...
compiling BLV_485_Dev_PwmFun.c...
compiling BLV_485_Dev_TimeFun.c...
compiling BLV_485_Dev_XiaoBaoFun.c...
compiling BLV_BUS_Dev_C12DimmingFun.c...
compiling BLV_Nor_DevFun.c...
compiling BLV_BUS_Dev_C12DimmingFun.c...
compiling BLV_485_Dev_XiaoBaoFun.c...
compiling BLV_All_Dev_Init.c...
compiling BLV_485_Dev_TempT1Fun.c...
compiling BLV_485_Dev_A9LDFun.c...
compiling BLV_485_Dev_RGB_Light_BeltFun.c...
compiling BLV_485_Dev_PirFun.c...
compiling BLV_485_Dev_LEDFun.c...
compiling BLV_485_Dev_SliderFun.c...
compiling BLV_485_Dev_AirRevealFun.c...
compiling BLV_485_Dev_A9IO_SwiFun.c...
compiling BLV_485_Dev_SwitchFun.c...
compiling BLV_485_Dev_A8PBFun.c...
compiling BLV_485_Dev_LEDFun.c...
compiling BLV_485_Dev_AirDetectFun.c...
compiling BLV_485_Dev_BLWMusicFun.c...
compiling BLV_485_Dev_MusicFun.c...
compiling BLV_485_Dev_C5RelayFun.c...
compiling BLV_485_Dev_IN_CH6.c...
compiling BLV_485_Dev_SwitchFun.c...
compiling BLV_Dev_Action.c...
compiling BLV_485_Dev_C12DimFun.c...
compiling BLV_485_Dev_A8PBFun.c...
compiling BLV_485_Dev_BLWMusicFun.c...
compiling BLV_485_Dev_SwiRelayFun.c...
compiling BLV_485_Dev_MusicFun.c...
compiling BLV_485_Dev_HuaErSiFun.c...
compiling BLV_TempPrompt_Action.c...
compiling BLV_485_Dev_CardStateFun.c...
compiling BLV_TempPrompt_Action.c...
compiling BLV_485_Dev_LCDFun.c...
compiling BLV_485_Dev_FloorHeatFun.c...
compiling BLV_485_Dev_FreshAirFun.c...
compiling BLV_485_Dev_CLEDFloorHeatFun.c...
compiling BLV_485_Dev_CLEDFreshAirFun.c...
compiling BLV_485_Dev_FreshAirFun.c...
compiling BLV_485_Dev_BLWFreshAirFun.c...
compiling BLV_485_Dev_BLWFloorHeatFun.c...
compiling BLV_485_Dev_Rotary_SwitchFun.c...
compiling BLV_485_Dev_ShangJingTianIrSendFun.c...
compiling BLV_485_Dev_BLE_Music.c...
compiling BLV_485_Dev_EnergyMonitor.c...
compiling BLV_485_Dev_ShangJingTianIrSendFun.c...
compiling BLV_485_Dev_Rotary_SwitchFun.c...
compiling BLV_485_Dev_BLVP1_Rotary_Switch.c...
compiling BLV_485_Dev_EnergyMonitor.c...
compiling BLV_485_Dev_BLVP2_Rotary_Switch.c...
compiling BLV_485_Dev_BinShen_Curtain.c...
compiling BLV_485_Dev_CurtainFun.c...
compiling BLV_485_Dev_BinShen_Curtain.c...
compiling BLV_485_Dev_BLWLockFun.c...
compiling BLV_485_Dev_WeixinLockFun.c...
compiling BLV_485_Dev_ChuangJiaLockFun.c...
compiling BLV_RF_GatewayHost.c...
compiling BLV_485_Dev_FreegoLockFun.c...
compiling BLV_485_Dev_PB20_LED_Fun.c...
compiling BLV_485_Dev_PB20_Relay_Fun.c...
compiling BLV_485_Dev_YangGeLockFun.c...
compiling BLV_485_Dev_PB20_Relay_Fun.c...
compiling BLV_485_Dev_PB20_LED_Fun.c...
compiling BLV_485_Dev_PB20_Strip_Fun.c...
compiling BLV_Bus_Dev_PB20Fun.c...
compiling BLV_Nor_Dev_ServiceFun.c...
compiling BLV_Nor_Dev_LVinputFun.c...
compiling BLV_Nor_Dev_LVoutputFun.c...
compiling BLV_Nor_Dev_ServiceFun.c...
compiling BLV_Nor_Dev_CurtainFun.c...
compiling BLV_Nor_Dev_HVoutFun.c...
compiling BLV_Nor_Dev_ColorTemp.c...
compiling BLV_Nor_Dev_NoCard.c...
compiling BLV_Nor_Dev_VirtualTimeFun.c...
compiling BLV_Nor_Dev_GlobalSet.c...
compiling BLV_Nor_Dev_ColorTemp.c...
compiling BLV_Nor_Dev_CarbonFun.c...
compiling BLV_Nor_Dev_Scene_Restore.c...
compiling utils_hmac.c...
compiling aLiYun.c...
compiling BLV_Nor_Dev_VirtualCard.c...
compiling utils_md5.c...
compiling Udp_Internal_Protocol.c...
compiling BLV_Nor_Dev_GlobalSet.c...
compiling mqtt.c...
compiling MQTTFormat.c...
compiling BLV_Nor_Dev_Scene_Restore.c...
compiling Udp_Internal_Protocol.c...
compiling BLV_Logic_Edit.c...
compiling MQTTDeserializePublish.c...
compiling MQTTConnectClient.c...
compiling MQTTPacket.c...
compiling MQTTSerializePublish.c...
compiling MQTTUnsubscribeClient.c...
compiling MQTTSubscribeClient.c...
compiling utils_sha1.c...
linking...
Program Size: Code=221052 RO-data=8328 RW-data=812 ZI-data=22660
Program Size: Code=221292 RO-data=8324 RW-data=812 ZI-data=22660
FromELF: creating hex file...
After Build - User command #1: D:\Keil_v5\\ARM\ARMCC\bin\fromelf.exe --bin --output=Bin\C1F_A_L4_44_260304_NM.bin .\Objects\C1F_A_L4_44_260304_NM.axf
".\Objects\C1F_A_L4_44_260304_NM.axf" - 0 Error(s), 0 Warning(s).
@@ -164,7 +123,7 @@ Package Vendor: Keil
D:\Keil_v5\Pack\Keil\WCH57x_DFP\1.1.0\Drivers\CMSIS\Device\WCH\CH57x\Include
<h2>Collection of Component Files used:</h2>
Build Time Elapsed: 00:00:19
Build Time Elapsed: 00:00:17
</pre>
</body>
</html>

26713
Pro/Pro-9999_Logic_CC_251027_0x5000_Simplify/MDK_PROJECT/Objects/C1F_A_L4_44_260304_NM.hex
View File

File diff suppressed because it is too large Load Diff

1190
Pro/Pro-9999_Logic_CC_251027_0x5000_Simplify/MDK_PROJECT/Objects/C1F_A_L4_44_260304_NM.htm
View File

File diff suppressed because it is too large Load Diff

332
Pro/Pro-9999_Logic_CC_251027_0x5000_Simplify/MDK_PROJECT/Objects/project_TEST.dep
View File

File diff suppressed because it is too large Load Diff

96
Pro/Pro-9999_Logic_CC_251027_0x5000_Simplify/MDK_PROJECT/project.uvguix.CC
View File

File diff suppressed because one or more lines are too long

13
Readme.md
View File

@@ -1,5 +1,16 @@
# BLV_C1F_Module主机代码修改记录
### 2026-03-13
```C
修改人：曹聪、李世杰
修改内容：
1、全局亮度初始化，默认为100
2、修改服务信息驱动
-> 服务信息驱动初始化中，将部分服务信息状态进行初始化
3、修改网络通讯中对于取电上报问题
```
### 2026-03-04
```c
@@ -21,8 +32,6 @@
-> 增加 - 通信数据接收处理函数中对数据进行和校验取反
```
### 2026-02-26
```C