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

Compare commits

base: Boonlive_RD_Embedded:a7a16d49e30386a321cddb2f557efde7be64f331
Branches Tags
Boonlive_RD_Embedded:main
...
compare: Boonlive_RD_Embedded:1030b9c18a10b4ed4060a92fa53945836eda453d
Branches Tags
Boonlive_RD_Embedded:main

2 Commits
a7a16d49e3 ... 1030b9c18a

Author SHA1 Message Date
lsj147
1030b9c18a Merge branch 'main' of http://blv-rd.tech:3001/Boonlive_RD_Embedded/BLV_C1F_Module 2026-03-13 19:32:26 +08:00
caocong
23105abc3e fix:修改服务信息驱动初始化、补充readme、修改C5IO备注文本 
1、修改服务信息驱动初始化
2、补充readme
3、修复C5IO的h文件的部分异常备注
 2026-03-13 19:29:56 +08:00
2 changed files with 44 additions and 29 deletions
Expand all files Collapse all files

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 #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>? /*<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_Inquire_CMD 0x20 //ѯ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><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_Relay_CMD 0x21 //<2F><><EFBFBD>ü̵<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
#define BLV_C5IO_Set_Do_CMD 0x23 //<2F><><EFBFBD><EFBFBD>??DO?<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_Inching_CMD 0x24 //<2F><><EFBFBD><EFBFBD>??DO<EFBFBD><EFBFBD>??<3F><>?<3F><><EFBFBD><EFBFBD>? #define BLV_C5IO_Set_Do_CMD 0x23 //<2F><><EFBFBD><EFBFBD>DO<44><4F><EFBFBD><EFBFBD>
#define BLV_C5IO_Set_Di_CMD 0x25 //<2F><><EFBFBD><EFBFBD>??DI?<EFBFBD><EFBFBD><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_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_Reply_Result 0x00 //<2F><>ѯ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>
#define BLV_C5IO_Relay_Result 0x01 //?<EFBFBD><EFBFBD><EFBFBD><EFBFBD>??<3F><>?<3F><>DD3<44><33>1| #define BLV_C5IO_Relay_Result 0x01 //<EFBFBD>̵<EFBFBD><EFBFBD><EFBFBD>ִ<EFBFBD>гɹ<EFBFBD>
#define BLV_C5IO_Relay_Inching_Result 0x02 //?<3F><><EFBFBD><EFBFBD>??<3F>¦<EFBFBD>??<EFBFBD><EFBFBD>?<EFBFBD><EFBFBD>DD3<EFBFBD><EFBFBD>1| #define BLV_C5IO_Relay_Inching_Result 0x02 //<EFBFBD>̵<EFBFBD><EFBFBD><EFBFBD><EFBFBD>㶯ִ<EFBFBD>гɹ<EFBFBD>
#define BLV_C5IO_Do_Result 0x03 //Do?<3F><>DD3<44><33>1| #define BLV_C5IO_Do_Result 0x03 //Doִ<EFBFBD>гɹ<EFBFBD>
#define BLV_C5IO_Do_Inching_Result 0x04 //DO<44><4F>??<3F><>?<3F><>DD3<44><33>1| #define BLV_C5IO_Do_Inching_Result 0x04 //DO<44>㶯ִ<EFBFBD>гɹ<EFBFBD>
#define BLV_C5IO_Di_Result 0x05 //DI?<3F><>DD3<44><33>1| #define BLV_C5IO_Di_Result 0x05 //DIִ<EFBFBD>гɹ<EFBFBD>
#define BLV_C5IO_Error_Result 0xF0 //<2F><>y?Y??<3F><>?<3F>䨪?<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_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> #define BUS_C5IO_DI_Pir_Type 0x02 //DI<44><49><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> - PIR<49><52><EFBFBD><EFBFBD>

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

@@ -134,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; // BUS_Public.DevFunInfo.Dev_Output_Loop_State_Get = Service_Loop_State; //
DevServiceInfo.ServiceLoopValidNum = ServiceNumMAX; 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_Dnd] = 0x02; //Ĭ<>Ϲر<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
DevServiceInfo.DevServiceState[Service_Clean] = 0x02; //Ĭ<><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> DevServiceInfo.DevServiceState[Service_Clean] = 0x02; //Ĭ<>Ϲر<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
DevServiceInfo.DevServiceState[Service_Luggage] = 0x02; //Ĭ<><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> DevServiceInfo.DevServiceState[Service_Call] = 0x02; //Ĭ<>Ϲرպ<EFBFBD><EFBFBD><EFBFBD>
DevServiceInfo.DevServiceState[Service_Meals] = 0x02; //<2F>ر<EFBFBD>9<EFBFBD>ŷ<EFBFBD><EFBFBD><EFBFBD> DevServiceInfo.DevServiceState[Service_Wash] = 0x02; //Ĭ<>Ϲر<CFB9>ϴ<EFBFBD><EFBFBD>
DevServiceInfo.DevServiceState[Service_CheckOut] = 0x02; //<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; //Ĭ<>Ϲر<CFB9><D8B1>Ժ<EFBFBD>
DevServiceInfo.DevServiceState[Service_Wait] = 0x02; //<2F>ر<EFBFBD><D8B1>Ժ<EFBFBD> DevServiceInfo.DevServiceState[Service_Sos] = 0x02; //Ĭ<>Ϲر<CFB9>SOS
DevServiceInfo.DevServiceState[Service_Sos] = 0x02; //Ĭ<>Ϲر<CFB9>SOS<EFBFBD><EFBFBD><EFBFBD><EFBFBD> DevServiceInfo.DevServiceState[Service_Meals] = 0x02; //Ĭ<>Ϲر<CFB9>ԤԼ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>
DevServiceInfo.DevServiceState[Service_Food_Plate] = 0x02; //Ĭ<>Ϲرտ<D8B1><D5BF><EFBFBD>
DevServiceInfo.DevServiceState[Service_Call] = 0x02; //<2F>رպ<EFBFBD><EFBFBD><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.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>״̬ 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)); 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));