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-14 17:13:36 +08:00
parent 392146013c
commit c1ce5df62c
17 changed files with 28111 additions and 27376 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13,25 +13,24 @@
#define C5IO_RecvData_Len_MAX 0x28 //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ݳ<EFBFBD><DDB3><EFBFBD>Ŀǰ<C4BF>30Byte
/*<2A><><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>
/*?????<3F><><EFBFBD><EFBFBD>?*/
#define BLV_C5IO_Inquire_CMD 0x20 //?<3F><>?<3F><>?<3F><><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>?
#define BLV_C5IO_SetRTC_CMD 0x27 //
#define BLV_C5IO_Reply_CMD 0xA0 //<EFBFBD>ظ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
#define BLV_C5IO_Reply_CMD 0xA0 //???<3F><>?<EFBFBD><EFBFBD><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 //<2F>̵<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 BLV_C5IO_Reply_Result 0x00 //2<EFBFBD><EFBFBD>?<EFBFBD><EFBFBD>?<EFBFBD><EFBFBD>1?
#define BLV_C5IO_Relay_Result 0x01 //?<3F><><EFBFBD><EFBFBD>??<3F><>?<3F><>DD3<44><33>1|
#define BLV_C5IO_Relay_Inching_Result 0x02 //?<EFBFBD><EFBFBD><EFBFBD><EFBFBD>??<3F>¦<EFBFBD>??<3F><>?<3F><>DD3<44><33>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 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>

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

@@ -134,36 +134,22 @@ 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>
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; //Ĭ<>Ϲر<EFBFBD><EFBFBD>Ժ<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.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><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
DevServiceInfo.DevServiceState[Service_Wait] = 0x02; //<2F>ر<EFBFBD><D8B1>Ժ<EFBFBD>
DevServiceInfo.DevServiceState[Service_Sos] = 0x02; //Ĭ<>Ϲر<CFB9>SOS<EFBFBD><EFBFBD><EFBFBD><EFBFBD>
DevServiceInfo.DevServiceStateLast[Service_Dnd] = 0x02; //Ĭ<>Ϲر<CFB9><D8B1><EFBFBD><EFBFBD><EFBFBD>
DevServiceInfo.DevServiceStateLast[Service_Clean] = 0x02; //Ĭ<>Ϲر<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
DevServiceInfo.DevServiceStateLast[Service_Call] = 0x02; //Ĭ<>Ϲرպ<D8B1><D5BA><EFBFBD>
DevServiceInfo.DevServiceStateLast[Service_Wash] = 0x02; //Ĭ<>Ϲر<CFB9>ϴ<EFBFBD><EFBFBD>
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.DevServiceState[Service_Call] = 0x02; //<2F>رպ<EFBFBD><EFBFBD><EFBFBD>
DevServiceInfo.DevServiceState[Service_22] = 0x02; //<2F><><EFBFBD>ӿ<EFBFBD><EFBFBD>ط<EFBFBD><EFBFBD><EFBFBD>״̬
DevServiceInfo.DevServiceStateLast[Service_Call] = 0x02; //<2F>رպ<D8B1><EFBFBD><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));

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

@@ -261,7 +261,7 @@
#if (SoftName_Custom_Enable == 0x00)
#if (LOGIC_FILE_EN == 0x01)
#define SoftwareVer "C1F_A_L4_45_260313" //<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