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

fix:插卡取电驱动 - 修正插卡动作上报问题

Browse Source 
插卡取电驱动 - 修正设备动作 - 插卡动作上报
  问题点：接收到插卡取电设备数据包时，便产生一条插卡动作上报。
This commit is contained in:
caocong
2026-02-03 13:58:42 +08:00
parent af6351fa09
commit 6858ad953d
11 changed files with 15000 additions and 14816 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -478,15 +478,15 @@ uint8_t BLV_Rs485_Card_Check(uint32_t dev_addr,uint32_t data_addr,uint16_t len)
{
case 0x02: //<2F><><EFBFBD><EFBFBD> 2025-09-03 <20><>ȡ<EFBFBD><C8A1>M0<4D><30>
Rs485CardInfo.Rs485CardFlag = 0x01;
Udp_Addtion_Roomstate(BUS_Public.type,BUS_Public.addr,0x00,0x02);
//Udp_Addtion_Roomstate(BUS_Public.type,BUS_Public.addr,0x00,0x02);
break;
case 0x01: //<2F><><EFBFBD><EFBFBD> 2025-09-03 <20><>ȡ<EFBFBD><C8A1>M1<4D><31>
Rs485CardInfo.Rs485CardFlag = 0x01;
Udp_Addtion_Roomstate(BUS_Public.type,BUS_Public.addr,0x00,0x01);
//Udp_Addtion_Roomstate(BUS_Public.type,BUS_Public.addr,0x00,0x01);
break;
case 0x00: //<2F><><EFBFBD><EFBFBD>
Rs485CardInfo.Rs485CardFlag = 0x00;
Udp_Addtion_Roomstate(BUS_Public.type,BUS_Public.addr,0x00,0x00);
//Udp_Addtion_Roomstate(BUS_Public.type,BUS_Public.addr,0x00,0x00);
break;
default: //<2F><><EFBFBD><EFBFBD> 2025-09-26 <20>ϱ<EFBFBD>δ֪״̬<D7B4><CCAC>ȡ<EFBFBD><C8A1><EFBFBD><EFBFBD>־λ<D6BE><CEBB><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>仯
//Rs485CardInfo.Rs485CardFlag = 0x00;
@@ -538,6 +538,7 @@ uint8_t BLV_Rs485_Card_Check(uint32_t dev_addr,uint32_t data_addr,uint16_t len)
Dbg_Print_Buff(DBG_BIT_DEVICE_STATUS_bit,"485<EFBFBD>忨ȡ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ݱ仯<EFBFBD><EFBFBD>",data,len);
Udp_Addtion_Roomstate(BUS_Public.type,BUS_Public.addr,0x00,Rs485CardInfo.Rs485CardFlagLast);
LOG_Device_COMM_ASK_TO_Reply_Record2(dev_addr+Dev_port,dev_addr+Dev_baud,(SysTick_1ms - Rs485CardInfo.inquire_tick),data,len);
// switch(Rs485CardInfo.Rs485CardType) //<2F><>Ҫ<EFBFBD>ж<EFBFBD><D0B6><EFBFBD><EFBFBD>ݣ<EFBFBD><DDA3><EFBFBD>ִ<EFBFBD>в<EFBFBD>ͬ<EFBFBD>ij<EFBFBD><C4B3><EFBFBD>

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

@@ -399,10 +399,10 @@ typedef enum
DEV_Virtual_Time, //47 //<2F><><EFBFBD><EFBFBD>ʱ<EFBFBD><CAB1><EFBFBD>豸
Dev_Rs485_PB20 = 0x30,
Dev_Rs485_PB20_LD = 0x31,
Dev_Rs485_PB20_LS = 0x32,
Dev_Rs485_PB20_Relay = 0x33,
Dev_Rs485_PB20 = 0x30, //48 //PLC<4C>ܿ<EFBFBD>
Dev_Rs485_PB20_LD = 0x31, //49 //PLC - <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
Dev_Rs485_PB20_LS = 0x32, //50 //PLC - <20><>ѹ<EFBFBD><D1B9><EFBFBD><EFBFBD>
Dev_Rs485_PB20_Relay = 0x33, //51 //PLC - <20>̵<EFBFBD><CCB5><EFBFBD>
DEV_Virtual_ColorTemp, //52 //ɫ<>µ<EFBFBD><C2B5>ڹ<EFBFBD><DAB9><EFBFBD>