lih/TSCP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: lih/TSCP:9.6
Branches Tags
lih/TSCP:master lih/TSCP:stable/新加坡分支 lih/TSCP:dev/9.11 lih/TSCP:test/四乘压力测试 lih/TSCP:dev/9.3.101.3 lih/TSCP:stable/9.4.1分支 lih/TSCP:test/轨旁IP化测试 lih/TSCP:debug/9.4.2应用跟随调试 lih/TSCP:stable/迪士尼分支
lih/TSCP:分支9.3.1 lih/TSCP:9.10 lih/TSCP:9.9 lih/TSCP:9.8 lih/TSCP:分支9.4.2 lih/TSCP:9.7 lih/TSCP:9.6 lih/TSCP:9.5 lih/TSCP:9.3 lih/TSCP:9.2 lih/TSCP:9.1
...
compare: lih/TSCP:e0a4ce32c216a68ec31d91ebab9daa0cd646b9b0
Branches Tags
lih/TSCP:stable/新加坡分支 lih/TSCP:dev/9.11 lih/TSCP:test/四乘压力测试 lih/TSCP:master lih/TSCP:dev/9.3.101.3 lih/TSCP:stable/9.4.1分支 lih/TSCP:test/轨旁IP化测试 lih/TSCP:debug/9.4.2应用跟随调试 lih/TSCP:stable/迪士尼分支
lih/TSCP:分支9.3.1 lih/TSCP:9.10 lih/TSCP:9.9 lih/TSCP:9.8 lih/TSCP:分支9.4.2 lih/TSCP:9.7 lih/TSCP:9.6 lih/TSCP:9.5 lih/TSCP:9.3 lih/TSCP:9.2 lih/TSCP:9.1

2 Commits
9.6 ... e0a4ce32c2

Author SHA1 Message Date
lh e0a4ce32c2 [9.8] 9.8首版二回代码，基线版本 2026-05-25 15:25:26 +08:00
lh 6d6ddaec6b [9.7] 9.7首版一回代码，基线版本 2026-05-22 15:40:28 +08:00
179 changed files with 33186 additions and 12915 deletions
Expand all files Collapse all files
TSCP/Makefile
+58 -57
View File
@@ -20,77 +20,23 @@ LD = $(CC)
#INCLUDES += -I/path/to/my/lib/include
#INCLUDES += -I../mylib/public
INCLUDES += -I ./src/APP \
-I ./src/APP/ciapp/2oo2 \
-I ./src/APP/ciapp/AllAutoReturn \
-I ./src/APP/ciapp/AutoReturn \
-I ./src/APP/ciapp/AutoRoute \
-I ./src/APP/ciapp/AxisAssert \
-I ./src/APP/ciapp/AxisSort \
-I ./src/APP/ciapp/CutoffPoint \
-I ./src/APP/ciapp/DataManage \
-I ./src/APP/ciapp/DebugPrint \
-I ./src/APP/ciapp/Deployment \
-I ./src/APP/ciapp/DiffLineDev \
-I ./src/APP/ciapp/EnvelopeManage \
-I ./src/APP/ciapp/ERROR \
-I ./src/APP/ciapp/ESB \
-I ./src/APP/ciapp/FloodGate \
-I ./src/APP/ciapp/Garagedoor \
-I ./src/APP/ciapp/HLHTMsgHead \
-I ./src/APP/ciapp/Indicator \
-I ./src/APP/ciapp/Initial \
-I ./src/APP/ciapp/InvadeSection \
-I ./src/APP/ciapp/IO \
-I ./src/APP/ciapp/LogicManage \
-I ./src/APP/ciapp/LogicProcess \
-I ./src/APP/ciapp/LogRecord \
-I ./src/APP/ciapp/Main \
-I ./src/APP/ciapp/Mask \
-I ./src/APP/ciapp/NonAutoReturn \
-I ./src/APP/ciapp/NonRoute \
-I ./src/APP/ciapp/Overlap \
-I ./src/APP/ciapp/ParsePack \
-I ./src/APP/ciapp/PSC \
-I ./src/APP/ciapp/PSD \
-I ./src/APP/ciapp/QueryFiles \
-I ./src/APP/ciapp/Relay \
-I ./src/APP/ciapp/RemoteRM \
-I ./src/APP/ciapp/ReverseCut \
-I ./src/APP/ciapp/ReverseRoute \
-I ./src/APP/ciapp/Route \
-I ./src/APP/ciapp/Section \
-I ./src/APP/ciapp/SectionStateProcess \
-I ./src/APP/ciapp/SGBJ \
-I ./src/APP/ciapp/Signal \
-I ./src/APP/ciapp/SPKS \
-I ./src/APP/ciapp/Switch \
-I ./src/APP/ciapp/System \
-I ./src/APP/ciapp/Train \
-I ./src/APP/ciapp/Transmit \
-I ./src/APP/ciapp/VirtualDevice \
-I ./src/APP/ciapp/WashMachine \
-I ./src/APP/ciapp/WLScreen \
-I ./src/APP/ciapp/WLBrake \
-I ./src/APP/PU13_integration_config \
-I ./src/commoncode/common \
INCLUDES += -I ./src/commoncode/common \
-I ./src/commoncode/commoncode_config_vxworks \
-I ./src/dqu_common/dqu_idmap_common \
-I ./src/dqu_common/dqu_emap_common \
-I ./src/dqu_common/dqu_dfs_common \
-I ./src/dqu_common/dqu_cbtc_common \
-I .\src\protocol\fsfb\common_dqu_fsfb \
-I .\src\protocol\fsfb\common_fsfb \
-I .\src\protocol\protocol_cbtc\common_protocol_config \
-I .\src\protocol\protocol_cbtc\common_dqu_protocol \
-I .\src\protocol\protocol_cbtc\common_protocol \
-I .\src\protocol\protocol_cbtc\common_protocol_sfp_rsspi-config \
-I .\src\protocol\redun_record_cbtc\common_dqu_rp \
-I .\src\protocol\redun_record_cbtc\common_redun \
-I .\src\protocol\redun_record_cbtc\common_redun_record_config \
-I .\src\protocol\rsr_record_cbtc\common_dqu_rsr \
-I .\src\protocol\rsr_record_cbtc\common_rsr \
-I .\src\protocol\rsr_record_cbtc\common_rsr\rssp \
-I .\src\protocol\rsr_record_cbtc\common_rsr\sig \
-I .\src\protocol\rsr_record_cbtc\common_rsr \
-I .\src\protocol\rsr_record_cbtc\common_rsr_record_config \
-I .\src\protocol\rssp_record_cbtc1\common_dqu_rssp \
-I .\src\protocol\rssp_record_cbtc1\common_rssp \
@@ -101,6 +47,8 @@ INCLUDES += -I ./src/APP \
-I .\src\protocol\sfp_record_cbtc1\common_dqu_sfp \
-I .\src\protocol\sfp_record_cbtc1\common_sfp \
-I .\src\protocol\sfp_record_cbtc1\common_sfp_nr_config \
-I .\src\protocol\fsfb\common_dqu_fsfb \
-I .\src\protocol\fsfb\common_fsfb \
-I ./src/DRV \
-I ./src/MSCP \
-I ./src/MSCP/CM \
@@ -109,6 +57,59 @@ INCLUDES += -I ./src/APP \
-I ./src/MSCP/SFM \
-I ./src/MSCP/PFM \
-I ./src/MSCP_CFG \
-I ./src/APP \
-I ./src/APP/ciapp/2oo2 \
-I ./src/APP/ciapp/AllAutoReturn \
-I ./src/APP/ciapp/AutoReturn \
-I ./src/APP/ciapp/AutoRoute \
-I ./src/APP/ciapp/DataManage \
-I ./src/APP/ciapp/DebugPrint \
-I ./src/APP/ciapp/DiffLineDev \
-I ./src/APP/ciapp/ERROR \
-I ./src/APP/ciapp/ESB \
-I ./src/APP/ciapp/FloodGate \
-I ./src/APP/ciapp/Garagedoor \
-I ./src/APP/ciapp/HLHTMsgHead \
-I ./src/APP/ciapp/Indicator \
-I ./src/APP/ciapp/Initial \
-I ./src/APP/ciapp/InvadeSection \
-I ./src/APP/ciapp/IO \
-I ./src/APP/ciapp/LightTestButtonManage \
-I ./src/APP/ciapp/LogicManage \
-I ./src/APP/ciapp/LogicProcess \
-I ./src/APP/ciapp/LogRecord \
-I ./src/APP/ciapp/Main \
-I ./src/APP/ciapp/Mask \
-I ./src/APP/ciapp/NonRoute \
-I ./src/APP/ciapp/Overlap \
-I ./src/APP/ciapp/ParsePack \
-I ./src/APP/ciapp/PSC \
-I ./src/APP/ciapp/PSD \
-I ./src/APP/ciapp/QueryFiles \
-I ./src/APP/ciapp/Relay \
-I ./src/APP/ciapp/ReverseRoute \
-I ./src/APP/ciapp/Route \
-I ./src/APP/ciapp/Section \
-I ./src/APP/ciapp/Signal \
-I ./src/APP/ciapp/SPKS \
-I ./src/APP/ciapp/Switch \
-I ./src/APP/ciapp/System \
-I ./src/APP/ciapp/Transmit \
-I ./src/APP/ciapp/VirtualDevice \
-I ./src/APP/ciapp/WashMachine \
-I ./src/APP/PU13_integration_config \
-I ./src/APP/ciapp/AxisSort \
-I ./src/APP/ciapp/Train \
-I ./src/APP/ciapp/EnvelopeManage \
-I ./src/APP/ciapp/CutoffPoint \
-I ./src/APP/ciapp/SectionStateProcess \
-I ./src/APP/ciapp/AxisAssert \
-I ./src/APP/ciapp/ReverseCut \
-I ./src/APP/ciapp/WLScreen \
-I ./src/APP/ciapp/WLBrake \
-I ./src/APP/ciapp/RemoteRM \
-I ./src/APP/ciapp/NonAutoReturn \
-include stdarg.h
#LIBS += -L/path/to/my/lib/$(PLATFORM)/usr/lib -lmylib
#LIBS += -L../mylib/$(OUTPUT_DIR) -lmylib
TSCP/src/APP/APP_API.c
+48 -3
View File
@@ -307,6 +307,7 @@ void APP_API_Data_Init()
.M_AutoReboot_Count = 3, /**< 自动重启次数 */
.M_AutoClear_Days = 1, /**< 连续运行多久清空宕机次数的天数 */
.M_Area_Enable = 0, /**< 区域状态开关配置 */
.M_AREA_SEB_Enable = 0xAA, /**< RC与CI扩展板卡通信功能开关配置 */
.CPU[0].Logger_PortBase = 55011, /**< 明文日志记录发送端口 */
.CPU[0].Logger_PortCiphertext = 55002, /**< 暗文日志记录发送端口 */
@@ -350,6 +351,9 @@ void APP_API_Data_Init()
.OutNetRed.CC_P_IP = "192.168.2.60", /**< 通控的内网IP */
.OutNetRed.EXTEND_G_IP = "192.168.1.70", /**< 扩展板卡的内网IP */
.OutNetRed.EXTEND_P_IP = "192.168.2.70", /**< 扩展板卡的内网IP */
.Another_SEB.EXTEND_R_G_IP = "192.168.1.90", /**< CI扩展板卡的内网IP */
.Another_SEB.EXTEND_R_P_IP = "192.168.2.90", /**< CI扩展板卡的内网IP */
.Another_SEB.OutnetSafe_R_Port = 54001, /**< 外网安全通信端口 */
.OutNetRed.OutnetSafe_Port = 54001, /**< 外网安全通信端口 */
.OutNetRed.OutnetRaw_Port = 54002, /**< 外网透传通信端口 */
.OutNetRed.InnetRaw_Port = 53003, /**< 内网透传通信端口 */
@@ -358,9 +362,13 @@ void APP_API_Data_Init()
.OutNetBlue.CC_P_IP = "192.168.2.61", /**< 通控的内网IP */
.OutNetBlue.EXTEND_G_IP = "192.168.1.71", /**< 扩展板卡的内网IP */
.OutNetBlue.EXTEND_P_IP = "192.168.2.71", /**< 扩展板卡的内网IP */
.Another_SEB.EXTEND_B_G_IP = "192.168.1.91", /**< CI扩展板卡的内网IP */
.Another_SEB.EXTEND_B_P_IP = "192.168.2.91", /**< CI扩展板卡的内网IP */
.Another_SEB.OutnetSafe_B_Port = 54001, /**< 外网安全通信端口 */
.OutNetBlue.OutnetSafe_Port = 54001, /**< 外网安全通信端口 */
.OutNetBlue.OutnetRaw_Port = 54002, /**< 外网透传通信端口 */
.OutNetBlue.InnetRaw_Port = 53003, /**< 内网透传通信端口 */
.INNET_COM_NUM = 1, /**< 内网通信设备数量 */
.INNET_COM_CFG[0].InnetID = DEVICE_TYPE_AIM, /**< 内网通信ID */
.INNET_COM_CFG[0].Port_Raw_G = 55004, /**< 绿网透传端口 */
@@ -416,10 +424,14 @@ void APP_API_Data_Init()
(void)CommonMemCpy((void*)(AppCfgInterface.OutNetRed.CC_P_IP), (UINT32)sizeof(CM_CHAR) * 32, (const void*)("192.168.2.60"), (UINT32)sizeof("192.168.2.60"));
(void)CommonMemCpy((void*)(AppCfgInterface.OutNetRed.EXTEND_G_IP), (UINT32)sizeof(CM_CHAR) * 32, (const void*)("192.168.1.70"), (UINT32)sizeof("192.168.1.70"));
(void)CommonMemCpy((void*)(AppCfgInterface.OutNetRed.EXTEND_P_IP), (UINT32)sizeof(CM_CHAR) * 32, (const void*)("192.168.2.70"), (UINT32)sizeof("192.168.2.70"));
(void)CommonMemCpy((void*)(AppCfgInterface.Another_SEB.EXTEND_R_G_IP), (UINT32)sizeof(CM_CHAR) * 32, (const void*)("192.168.1.90"), (UINT32)sizeof("192.168.1.90"));
(void)CommonMemCpy((void*)(AppCfgInterface.Another_SEB.EXTEND_R_P_IP), (UINT32)sizeof(CM_CHAR) * 32, (const void*)("192.168.2.90"), (UINT32)sizeof("192.168.2.90"));
(void)CommonMemCpy((void*)(AppCfgInterface.OutNetBlue.CC_G_IP), (UINT32)sizeof(CM_CHAR) * 32, (const void*)("192.168.1.61"), (UINT32)sizeof("192.168.1.61"));
(void)CommonMemCpy((void*)(AppCfgInterface.OutNetBlue.CC_P_IP), (UINT32)sizeof(CM_CHAR) * 32, (const void*)("192.168.2.61"), (UINT32)sizeof("192.168.2.61"));
(void)CommonMemCpy((void*)(AppCfgInterface.OutNetBlue.EXTEND_G_IP), (UINT32)sizeof(CM_CHAR) * 32, (const void*)("192.168.1.71"), (UINT32)sizeof("192.168.1.71"));
(void)CommonMemCpy((void*)(AppCfgInterface.OutNetBlue.EXTEND_P_IP), (UINT32)sizeof(CM_CHAR) * 32, (const void*)("192.168.2.71"), (UINT32)sizeof("192.168.2.71"));
(void)CommonMemCpy((void*)(AppCfgInterface.Another_SEB.EXTEND_B_G_IP), (UINT32)sizeof(CM_CHAR) * 32, (const void*)("192.168.1.91"), (UINT32)sizeof("192.168.1.91"));
(void)CommonMemCpy((void*)(AppCfgInterface.Another_SEB.EXTEND_B_P_IP), (UINT32)sizeof(CM_CHAR) * 32, (const void*)("192.168.2.91"), (UINT32)sizeof("192.168.2.91"));
(void)CommonMemCpy((void*)(AppCfgInterface.CPU[0].IP_Maintain), (UINT32)sizeof(CM_CHAR) * 32, (const void*)("192.168.146.101"), (UINT32)sizeof("192.168.146.101"));
(void)CommonMemCpy((void*)(AppCfgInterface.CPU[1].IP_Maintain), (UINT32)sizeof(CM_CHAR) * 32, (const void*)("192.168.18.102"), (UINT32)sizeof("192.168.18.102"));
@@ -476,10 +488,14 @@ void APP_API_Data_Init()
(void)CommonMemCpy((void*)(AppCfgInterface.OutNetRed.CC_P_IP), (UINT32)sizeof(CM_CHAR) * 32, (const void*)("192.168.2.80"), (UINT32)sizeof("192.168.2.80"));
(void)CommonMemCpy((void*)(AppCfgInterface.OutNetRed.EXTEND_G_IP), (UINT32)sizeof(CM_CHAR) * 32, (const void*)("192.168.1.90"), (UINT32)sizeof("192.168.1.90"));
(void)CommonMemCpy((void*)(AppCfgInterface.OutNetRed.EXTEND_P_IP), (UINT32)sizeof(CM_CHAR) * 32, (const void*)("192.168.2.90"), (UINT32)sizeof("192.168.2.90"));
(void)CommonMemCpy((void*)(AppCfgInterface.Another_SEB.EXTEND_R_G_IP), (UINT32)sizeof(CM_CHAR) * 32, (const void*)("192.168.1.90"), (UINT32)sizeof("192.168.1.90"));
(void)CommonMemCpy((void*)(AppCfgInterface.Another_SEB.EXTEND_R_P_IP), (UINT32)sizeof(CM_CHAR) * 32, (const void*)("192.168.2.90"), (UINT32)sizeof("192.168.2.90"));
(void)CommonMemCpy((void*)(AppCfgInterface.OutNetBlue.CC_G_IP), (UINT32)sizeof(CM_CHAR) * 32, (const void*)("192.168.1.81"), (UINT32)sizeof("192.168.1.81"));
(void)CommonMemCpy((void*)(AppCfgInterface.OutNetBlue.CC_P_IP), (UINT32)sizeof(CM_CHAR) * 32, (const void*)("192.168.2.81"), (UINT32)sizeof("192.168.2.81"));
(void)CommonMemCpy((void*)(AppCfgInterface.OutNetBlue.EXTEND_G_IP), (UINT32)sizeof(CM_CHAR) * 32, (const void*)("192.168.1.91"), (UINT32)sizeof("192.168.1.91"));
(void)CommonMemCpy((void*)(AppCfgInterface.OutNetBlue.EXTEND_P_IP), (UINT32)sizeof(CM_CHAR) * 32, (const void*)("192.168.2.91"), (UINT32)sizeof("192.168.2.91"));
(void)CommonMemCpy((void*)(AppCfgInterface.Another_SEB.EXTEND_B_G_IP), (UINT32)sizeof(CM_CHAR) * 32, (const void*)("192.168.1.91"), (UINT32)sizeof("192.168.1.91"));
(void)CommonMemCpy((void*)(AppCfgInterface.Another_SEB.EXTEND_B_P_IP), (UINT32)sizeof(CM_CHAR) * 32, (const void*)("192.168.2.91"), (UINT32)sizeof("192.168.2.91"));
(void)CommonMemCpy((void*)(AppCfgInterface.CPU[0].IP_Maintain), (UINT32)sizeof(CM_CHAR) * 32, (const void*)("192.168.148.101"), (UINT32)sizeof("192.168.148.101"));
(void)CommonMemCpy((void*)(AppCfgInterface.CPU[1].IP_Maintain), (UINT32)sizeof(CM_CHAR) * 32, (const void*)("192.168.20.102"), (UINT32)sizeof("192.168.20.102"));
@@ -504,7 +520,8 @@ void APP_API_Data_Init()
{
/*RC区域开关设置为0xAA*/
AppCfgInterface.M_Area_Enable = 0xAAu;
/**< RC与CI扩展板卡通信功能开关配置 */
AppCfgInterface.M_AREA_SEB_Enable = 0x55u;
}
else
@@ -705,6 +722,9 @@ ENUM_CM_RECCUSEB Is_Send_ExtendBoard(IN const CM_UINT16 dstDevTypeId)
UINT8 chLocalCiType = 0U; /*本联锁属性*/
UINT8 chDstCiType = 0U; /*本联锁属性*/
UINT8 chCldScxCommMode = 0U;
UINT8 chWorkType = 0U; /*双系工作模式*/
UINT8 cControlState = 0U;/*主备用模式*/
UINT8 cRcWorkMode = 0u;/*RC工作模式*/
UINT8 chResult = CI_ERROR; /*联锁属性检查结果*/
wAtsGtWayDevTypeId = GetTiocTrnsmtGtwyDevTypeId();
@@ -717,6 +737,9 @@ ENUM_CM_RECCUSEB Is_Send_ExtendBoard(IN const CM_UINT16 dstDevTypeId)
chLocalCiType = GetLocalCiType();
chDstCiType = GetCiType(devId);
chCldScxCommMode = GetCiFunctionSwitchConfig(SCX_CLD_INTERFACE_TYPE);
chWorkType = GetSystemWorkType();
cControlState = GetLocalCiBackUpPattern();
cRcWorkMode = GetLocalRcWorkMode();
if ((SCX_CLD_SERIAL_PORT_COMM == chCldScxCommMode) && (CI_SYSTEM_TYPE_RCI == devType))
{
@@ -735,9 +758,9 @@ ENUM_CM_RECCUSEB Is_Send_ExtendBoard(IN const CM_UINT16 dstDevTypeId)
; /*不为串口通信，此时不对本地CI类型及对方CI类型进行判断*/
}
if ((CI_SYSTEM_TYPE_XIANDI == devType) || (CI_SYSTEM_TYPE_ATS == devType) || (CI_SYSTEM_TYPE_LEU == devType)
if ((CI_SYSTEM_TYPE_XIANDI == devType) || (CI_SYSTEM_TYPE_ATS == devType)
|| (CI_SUCCESS == chResult)
|| (CI_SYSTEM_TYPE_VOBC_BACKUP == devType)) /*现地,ATS,LEU,使用串口的相邻CI*/
|| (CI_SYSTEM_TYPE_VOBC_BACKUP == devType)) /*现地,ATS,使用串口的相邻CI*/
{
retVal = ENUM_CM_SEB;
}
@@ -745,6 +768,28 @@ ENUM_CM_RECCUSEB Is_Send_ExtendBoard(IN const CM_UINT16 dstDevTypeId)
{
retVal = ENUM_CM_CCSEB;
}
else if (CI_SYSTEM_TYPE_LEU == devType)
{
if ((SYSTEM_WORK_MODE_ALL == chWorkType) && (RC_WORK_MODE_TIOC == cRcWorkMode))
{
/*双系统,并且当前是RC*/
if (SYSTEM_WORK_MODE_MAIN == cControlState)
{
/*是RC主用时，需要用CI的串口板进行LEU通信*/
retVal = ENUM_CM_SEB_ANOTHER;
}
else
{
/*RC备用，禁止发送*/
retVal = ENUM_CM_FORBIDDEN;
}
}
else
{
/*单系统，或当前是CI*/
retVal = ENUM_CM_SEB;
}
}
else
{
retVal = ENUM_CM_CC;
TSCP/src/APP/PU13_integration_config/ci_integrate_config.h
+1 -1
View File
@@ -30,6 +30,6 @@
#define VER_INTE_PROJECT 220 /*项目编号*/
#define VER_INTE_PRODUCT 40 /*产品编号*/
#define VER_INTE_EXE 1 /*可执行编号*/
#define VER_INTE_TIME 105 /*集成次数编号*/
#define VER_INTE_TIME 116 /*集成次数编号*/
#endif/*endif of #define _CI_INTEGRATE_CONFIG_H*/
TSCP/src/APP/ciapp/2oo2/2oo2DataTransferManage.c
+366 -57
View File
@@ -16,6 +16,7 @@
#include "NonAutoReturnDataManage.h"
#include "DynamicRouteDataManage.h"
#include "../Deployment/DeploymentExtern.h"
#include "ParsePackPlatformData.h"
/*��������*/
extern UINT16 TransmitStateDataCurSum; /*ͨ�Ź�ϵ״̬���ݵ�ǰ����*/
extern UINT8 ComCycNumForCiToAts; /*������ATSͨ�����ڼ�¼*/
@@ -414,6 +415,58 @@ UINT32 CopyValidSetDataStru(const UINT8 *pCurCiAppDataPointer, void *pDataStru,
return curIndex;
}
/*
* ���������� ����RCͨ�ŵ�VOBC��Ч���ݵ���Ӧ��ȫ������
* ����˵����
�������
const UINT8 *pCurCiAppDataPointer:��ǰ����ָ��
UINT16 struNum:���鳤��,
UINT16 struLength:�ṹ�峤��
�������
void *pDataStru:�ṹ��ָ��,
* ����ֵ �� �������ݵij���
*/
UINT32 CopyValidSetRcVobcDataStru(const UINT8* pCurCiAppDataPointer, void* pDataStru, UINT16 struNum, UINT16 struLength)
{
UINT32 curIndex = 0u;
UINT16 i = 0u;
UINT16 ValidIdNum = 0u;
void* pDstAddr = NULL;
/*�����*/
if ((NULL != pCurCiAppDataPointer) && (NULL != pDataStru) && (0u != struNum) && (0u != struLength))
{
/*��ȡ�ܵ���ЧID����*/
ValidIdNum = ShortFromChar(pCurCiAppDataPointer);
curIndex += (UINT32)sizeof(UINT16);
for (i = 0u; i < ValidIdNum; i++)
{
if (i < struNum)
{
pDstAddr = (UINT8*)pDataStru + struLength * i;
(void)CommonMemCpy((void*)pDstAddr, (UINT32)struLength, (const void*)(pCurCiAppDataPointer + curIndex), (UINT32)struLength);
curIndex += (UINT32)struLength;
}
else
{
curIndex += (UINT32)struLength;
debug_infor_printf((const)"ERROR: SetValidIdNum = %d\n", i);
}
}
}
else
{
curIndex = 0u;
debug_infor_printf((const)"ERROR: Parameter is invailid\n");
}
return curIndex;
}
/*
* ���������� ����ͨ�ų���Ч���ݵ���Ӧ��ȫ������
* ����˵����
@@ -1141,8 +1194,6 @@ UINT32 GetCiAppData(UINT8 *pCiAppDataPointer)
(void)memcpy(pCiAppDataPointer + curIndex, &g_VirtualCIStructData.virtualCi[ii].chAllSwitchYLockFlag, sizeof(UINT8));
curIndex = curIndex + (UINT32)sizeof(UINT8);
(void)CommonMemCpy((const void*)(pCiAppDataPointer + curIndex), (UINT32)(sizeof(VirCIRtnIndicatorState) * RTNINDICATOR_SUM_MAX), (void*)(&g_VirtualCIStructData.virtualCi[ii].VirCIRtnIndicatorStaData), (UINT32)(sizeof(VirCIRtnIndicatorState) * RTNINDICATOR_SUM_MAX));
curIndex = curIndex + (UINT32)(sizeof(VirCIRtnIndicatorState) * RTNINDICATOR_SUM_MAX);
(void)memcpy(pCiAppDataPointer + curIndex, &g_VirtualCIStructData.virtualCi[ii].autoTriggerflag, sizeof(UINT8));
curIndex = curIndex + (UINT32)sizeof(UINT8);
@@ -1511,10 +1562,78 @@ UINT32 GetCiAppData(UINT8 *pCiAppDataPointer)
(void)CommonMemCpy(pCiAppDataPointer + curIndex, (UINT32)sizeof(UINT32),&gSystemUpdateMainUseCycNum, (UINT32)sizeof(UINT32));
curIndex = curIndex + (UINT32)sizeof(UINT32);
/*CIͬ�����뱾CIͨ�ŵ�CI������ͨ����ͷ����������*/
curResult = CopyValidGetHlhtHeadCtxs(pCiAppDataPointer + curIndex, CI_SUM_MAX, (UINT16)sizeof(HLHTHeadContextStru), ciHLHTHeadCtxsCiToRc);
curIndex = curIndex + curResult;
/*CIͬ�����뱾CIͨ�ŵ�RC������ͨ����ͷ����������*/
curResult = CopyValidGetHlhtHeadCtxs(pCiAppDataPointer + curIndex, CI_SUM_MAX, (UINT16)sizeof(HLHTHeadContextStru), gSzRcHLHTHeadCtxsCiToRc);
curIndex = curIndex + curResult;
/*��������RC���͵�֡����*/
(void)CommonMemCpy(pCiAppDataPointer + curIndex, (UINT32)(sizeof(NeighborCiInfoStruct) * CI_COM_CI_MAX_NUM), &szNeighborCiInfo, (UINT32)(sizeof(NeighborCiInfoStruct) * CI_COM_CI_MAX_NUM));
curIndex = curIndex + (UINT32)(sizeof(NeighborCiInfoStruct) * CI_COM_CI_MAX_NUM);
/*�Գ����복���β���ͨ�Žӿ�ʱ������SQJ״̬*/
pCiAppDataPointer[curIndex] = comm_Train_Test_SQJ_CLD_State;
curIndex += 1U;
/*�Գ����복���β���ͨ�Žӿ�ʱ������TYSJ״̬*/
pCiAppDataPointer[curIndex] = comm_Train_Test_TYSJ_CLD_State;
curIndex += 1U;
/*����CI��������ṹ������*/
(void)CommonMemCpy((void*)(pCiAppDataPointer + curIndex), (UINT32)(sizeof(CommandDataStruct)* ATSORXIANDI_TO_CI_CMD_DATA_STRU_SUM_MAX), (void*)(&CiRevCmdDataStru), (UINT32)(sizeof(CommandDataStruct)* ATSORXIANDI_TO_CI_CMD_DATA_STRU_SUM_MAX));
curIndex = curIndex + (UINT32)(sizeof(CommandDataStruct) * ATSORXIANDI_TO_CI_CMD_DATA_STRU_SUM_MAX);
/*����CI��������ṹ�����鳤��*/
ShortToChar(CiRevCmdStruCurSum, &pCiAppDataPointer[curIndex]);
curIndex += 2U;
/*����ATS���ֵص�CI�ź��ؿ���������ṹ������*/
(void)CommonMemCpy((void*)(pCiAppDataPointer + curIndex), (UINT32)(sizeof(CommandDataStruct)* ATSORXIANDI_TO_CI_CMD_DATA_STRU_SUM_MAX), (void*)(&ATSorXDToCiCmdRtnToTRDataStru), (UINT32)(sizeof(CommandDataStruct)* ATSORXIANDI_TO_CI_CMD_DATA_STRU_SUM_MAX));
curIndex = curIndex + (UINT32)(sizeof(CommandDataStruct) * ATSORXIANDI_TO_CI_CMD_DATA_STRU_SUM_MAX);
/*����ATS���ֵص�CI�ź��ؿ���������ṹ�����鳤��*/
ShortToChar(ATSorXDToCiCmdReturnToTRCurSum, &pCiAppDataPointer[curIndex]);
curIndex += 2U;
/*��������TIOC������ͨ�ų��ṹ������*/
(void)CommonMemCpy((void*)(pCiAppDataPointer + curIndex), (UINT32)(sizeof(TiocTransmitCtStruct)* TRANSMIT_OBJECT_DEVICE_SUM_MAX), (void*)(&g_szTiocCt), (UINT32)(sizeof(TiocTransmitCtStruct)* TRANSMIT_OBJECT_DEVICE_SUM_MAX));
curIndex = curIndex + (UINT32)(sizeof(TiocTransmitCtStruct) * TRANSMIT_OBJECT_DEVICE_SUM_MAX);
/*��������վ̨����CIͨ�����ݽṹ������*/
(void)CommonMemCpy((void*)(pCiAppDataPointer + curIndex), (UINT32)(sizeof(PlatformToCiDataStruct)* PLATFORM_TO_CI_SUM_MAX), (void*)(&platformToCiDataStru), (UINT32)(sizeof(PlatformToCiDataStruct)* PLATFORM_TO_CI_SUM_MAX));
curIndex = curIndex + (UINT32)(sizeof(PlatformToCiDataStruct) * PLATFORM_TO_CI_SUM_MAX);
/*����Psc-CI�Ľṹ������*/
(void)CommonMemCpy((void*)(pCiAppDataPointer + curIndex), (UINT32)(sizeof(PSCToCiDataStruct)* PSC_TO_CI_SUM_MAX), (void*)(&PscToCiDataStru), (UINT32)(sizeof(PSCToCiDataStruct)* PSC_TO_CI_SUM_MAX));
curIndex = curIndex + (UINT32)(sizeof(PSCToCiDataStruct) * PSC_TO_CI_SUM_MAX);
/*������̬�����г��ṹ������*/
(void)CommonMemCpy((void*)(pCiAppDataPointer + curIndex), (UINT32)(sizeof(TrainDyInfoStru)* TRAIN_DYN_TEST_SUM_MAX), (void*)(&gszDyTestInfo), (UINT32)(sizeof(TrainDyInfoStru)* TRAIN_DYN_TEST_SUM_MAX));
curIndex = curIndex + (UINT32)(sizeof(TrainDyInfoStru) * TRAIN_DYN_TEST_SUM_MAX);
/*������̬�����г�����*/
pCiAppDataPointer[curIndex] = gDyTestNum;
curIndex += 1U;
/*ZC����������CBTC�г���ѹ��Ϣ*/
pCiAppDataPointer[curIndex] = gCbtcCrossNumZc;
curIndex += 1u;
for (ii = 0u; ii < gCbtcCrossNumZc; ii++)
{
ShortToChar(gCbtcCrossStructZc[ii].wSignalId, &pCiAppDataPointer[curIndex]);
curIndex += 2u;
pCiAppDataPointer[curIndex] = gCbtcCrossStructZc[ii].wTrainId;
curIndex += 1u;
}
/*����һ��CRC*/
crcLength = curIndex - crcIndex;
crcResult = Tioc_CommonCrc32(pCiAppDataPointer + crcIndex, crcLength);
debug_infor_printf((const)"2oo2 RecvCiCmdDataStruCurSum-vobcToRcHLHTHeadCtxs CRC:%x, Length:%d\n", crcResult, crcLength);
debug_infor_printf((const)"2oo2 RecvCiCmdDataStruCurSum-gDyTestNum CRC:%x, Length:%d\n", crcResult, crcLength);
}
return curIndex;
}
@@ -1948,9 +2067,6 @@ UINT8 SetCiAppData(const UINT8 *pCiAppDataPointer,const UINT32 len)
(void)memcpy(&g_VirtualCIStructData.virtualCi[ii].chAllSwitchYLockFlag,pCiAppDataPointer + curIndex, sizeof(UINT8));
curIndex = curIndex + (UINT32)sizeof(UINT8);
(void)CommonMemCpy((void*)(&g_VirtualCIStructData.virtualCi[ii].VirCIRtnIndicatorStaData), (UINT32)(RTNINDICATOR_SUM_MAX * sizeof(VirCIRtnIndicatorState)), (const void*)(pCiAppDataPointer + curIndex), (UINT32)(RTNINDICATOR_SUM_MAX * sizeof(VirCIRtnIndicatorState)));
curIndex = curIndex + (UINT32)(RTNINDICATOR_SUM_MAX * sizeof(VirCIRtnIndicatorState));
(void)memcpy(&g_VirtualCIStructData.virtualCi[ii].autoTriggerflag,pCiAppDataPointer + curIndex, sizeof(UINT8));
curIndex = curIndex + (UINT32)sizeof(UINT8);
@@ -2279,7 +2395,7 @@ UINT8 SetCiAppData(const UINT8 *pCiAppDataPointer,const UINT32 len)
/*������RCͨ�ŵ�Vobc��Ϣ*/
(void)CommonMemSet(&VobcToRcDataStru, (UINT32)((VOBC_TO_CI_SUM_MAX) * sizeof(VobcToRcDataStruct)), 0U, (UINT32)((VOBC_TO_CI_SUM_MAX) * sizeof(VobcToRcDataStruct))); /*����սṹ���ֹ������*/
curResult = CopyValidSetDataStru(pCiAppDataPointer + curIndex, VobcToRcDataStru, VOBC_TO_CI_SUM_MAX, (UINT16)sizeof(VobcToRcDataStruct));
curResult = CopyValidSetRcVobcDataStru(pCiAppDataPointer + curIndex, VobcToRcDataStru, VOBC_TO_CI_SUM_MAX, (UINT16)sizeof(VobcToRcDataStruct));
curIndex = curIndex + curResult;
/*������RCͨ�ŵ�Vobc����*/
@@ -2293,6 +2409,75 @@ UINT8 SetCiAppData(const UINT8 *pCiAppDataPointer,const UINT32 len)
/*����������������*/
(void)CommonMemCpy(&gSystemUpdateMainUseCycNum, (UINT32)sizeof(UINT32), pCiAppDataPointer + curIndex, (UINT32)sizeof(UINT32));
curIndex = curIndex + (UINT32)sizeof(UINT32);
/*CIͬ�����뱾CIͨ�ŵ�CI������ͨ����ͷ����������*/
curResult = CopyValidSetHlhtHeadCtxs(pCiAppDataPointer + curIndex, CI_SUM_MAX, (UINT16)sizeof(HLHTHeadContextStru), ciHLHTHeadCtxsCiToRc);/*�洢��CI�������ݽṹ��*/
curIndex = curIndex + curResult;
/*CIͬ�����뱾CIͨ�ŵ�RC������ͨ����ͷ����������*/
curResult = CopyValidSetHlhtHeadCtxs(pCiAppDataPointer + curIndex, CI_SUM_MAX, (UINT16)sizeof(HLHTHeadContextStru), gSzRcHLHTHeadCtxsCiToRc);/*�洢��CI�������ݽṹ��*/
curIndex = curIndex + curResult;
/*ͬ������RC���͵�֡����*/
(void)CommonMemCpy(&szNeighborCiInfo, (UINT32)(sizeof(NeighborCiInfoStruct)* CI_COM_CI_MAX_NUM), pCiAppDataPointer + curIndex, (UINT32)(sizeof(NeighborCiInfoStruct)* CI_COM_CI_MAX_NUM));
curIndex = curIndex + (UINT32)(sizeof(NeighborCiInfoStruct) * CI_COM_CI_MAX_NUM);
/*�Գ����복���β���ͨ�Žӿ�ʱ������SQJ״̬*/
comm_Train_Test_SQJ_CLD_State = pCiAppDataPointer[curIndex];
curIndex += 1U;
/*�Գ����복���β���ͨ�Žӿ�ʱ������TYSJ״̬*/
comm_Train_Test_TYSJ_CLD_State = pCiAppDataPointer[curIndex];
curIndex += 1U;
/*����CI��������ṹ������*/
(void)CommonMemCpy((void*)(&CiRevCmdDataStru), (UINT32)(sizeof(CommandDataStruct)* ATSORXIANDI_TO_CI_CMD_DATA_STRU_SUM_MAX), (const void*)(pCiAppDataPointer + curIndex), (UINT32)(sizeof(CommandDataStruct)* ATSORXIANDI_TO_CI_CMD_DATA_STRU_SUM_MAX));
curIndex = curIndex + (UINT32)(sizeof(CommandDataStruct) * ATSORXIANDI_TO_CI_CMD_DATA_STRU_SUM_MAX);
/*����CI��������ṹ�����鳤��*/
CiRevCmdStruCurSum = ShortFromChar(&pCiAppDataPointer[curIndex]);
curIndex += 2U;
/*����ATS���ֵص�CI�ź��ؿ���������ṹ������*/
(void)CommonMemCpy((void*)(&ATSorXDToCiCmdRtnToTRDataStru), (UINT32)(sizeof(CommandDataStruct)* ATSORXIANDI_TO_CI_CMD_DATA_STRU_SUM_MAX), (const void*)(pCiAppDataPointer + curIndex), (UINT32)(sizeof(CommandDataStruct)* ATSORXIANDI_TO_CI_CMD_DATA_STRU_SUM_MAX));
curIndex = curIndex + (UINT32)(sizeof(CommandDataStruct) * ATSORXIANDI_TO_CI_CMD_DATA_STRU_SUM_MAX);
/*����ATS���ֵص�CI�ź��ؿ���������ṹ�����鳤��*/
ATSorXDToCiCmdReturnToTRCurSum = ShortFromChar(&pCiAppDataPointer[curIndex]);
curIndex += 2U;
/*��������TIOC������ͨ�ų��ṹ������*/
(void)CommonMemCpy((void*)(&g_szTiocCt), (UINT32)(sizeof(TiocTransmitCtStruct)* TRANSMIT_OBJECT_DEVICE_SUM_MAX), (const void*)(pCiAppDataPointer + curIndex), (UINT32)(sizeof(TiocTransmitCtStruct)* TRANSMIT_OBJECT_DEVICE_SUM_MAX));
curIndex = curIndex + (UINT32)(sizeof(TiocTransmitCtStruct) * TRANSMIT_OBJECT_DEVICE_SUM_MAX);
/*��������վ̨����CIͨ�����ݽṹ������*/
(void)CommonMemCpy((void*)&platformToCiDataStru, (UINT32)(sizeof(PlatformToCiDataStruct)* PLATFORM_TO_CI_SUM_MAX), (const void*)(pCiAppDataPointer + curIndex), (UINT32)(sizeof(PlatformToCiDataStruct)* PLATFORM_TO_CI_SUM_MAX));
curIndex = curIndex + (UINT32)(sizeof(PlatformToCiDataStruct) * PLATFORM_TO_CI_SUM_MAX);
/*����Psc-CI�Ľṹ������*/
(void)CommonMemCpy((void*)(&PscToCiDataStru), (UINT32)(sizeof(PSCToCiDataStruct)* PSC_TO_CI_SUM_MAX), (const void*)(pCiAppDataPointer + curIndex), (UINT32)(sizeof(PSCToCiDataStruct)* PSC_TO_CI_SUM_MAX));
curIndex = curIndex + (UINT32)(sizeof(PSCToCiDataStruct) * PSC_TO_CI_SUM_MAX);
/*������̬�����г��ṹ������*/
(void)CommonMemCpy((void*)(&gszDyTestInfo), (UINT32)(sizeof(TrainDyInfoStru)* TRAIN_DYN_TEST_SUM_MAX), (const void*)(pCiAppDataPointer + curIndex), (UINT32)(sizeof(TrainDyInfoStru)* TRAIN_DYN_TEST_SUM_MAX));
curIndex = curIndex + (UINT32)(sizeof(TrainDyInfoStru) * TRAIN_DYN_TEST_SUM_MAX);
/*������̬�����г�����*/
gDyTestNum = pCiAppDataPointer[curIndex];
curIndex += 1U;
/*ZC����������CBTC�г���ѹ��Ϣ*/
gCbtcCrossNumZc = pCiAppDataPointer[curIndex];
curIndex += 1u;
for (ii = 0u; ii < gCbtcCrossNumZc; ii++)
{
gCbtcCrossStructZc[ii].wSignalId = ShortFromChar(&pCiAppDataPointer[curIndex]);
curIndex += 2u;
gCbtcCrossStructZc[ii].wTrainId = pCiAppDataPointer[curIndex];
curIndex += 1u;
}
rtn = 1U;
}
}
@@ -2747,12 +2932,12 @@ UINT32 GetCiGeneralData(UINT8* pCiAppDataPointer)
curIndex = curIndex + curResult;
/*ͬ����������������ѩ������Ϣ*/
curResult = CopyValidGetDataStru(pCiAppDataPointer + curIndex, (void*)(szSendCiAreaSnow), CI_COM_CI_MAX_NUM, (UINT16)sizeof(ToCiAreaSnowStruct));
curIndex = curIndex + curResult;
(void)CommonMemCpy((void*)(pCiAppDataPointer + curIndex), (UINT32)(sizeof(ToCiAreaSnowStruct)* CI_COM_CI_MAX_NUM), (void*)(szSendCiAreaSnow), (UINT32)(sizeof(ToCiAreaSnowStruct)* CI_COM_CI_MAX_NUM));
curIndex = curIndex + (UINT32)(sizeof(ToCiAreaSnowStruct) * CI_COM_CI_MAX_NUM);
/*ͬ�������������������ѩ��Ϣ*/
curResult = CopyValidGetDataStru(pCiAppDataPointer + curIndex, (void*)(szRecvCiAreaSnow), CI_COM_CI_MAX_NUM, (UINT16)sizeof(ToCiAreaSnowStruct));
curIndex = curIndex + curResult;
(void)CommonMemCpy((void*)(pCiAppDataPointer + curIndex), (UINT32)(sizeof(ToCiAreaSnowStruct)* CI_COM_CI_MAX_NUM), (void*)(szRecvCiAreaSnow), (UINT32)(sizeof(ToCiAreaSnowStruct)* CI_COM_CI_MAX_NUM));
curIndex = curIndex + (UINT32)(sizeof(ToCiAreaSnowStruct) * CI_COM_CI_MAX_NUM);
/* ����������ѩ���� */
(void)CommonMemCpy((void*)(pCiAppDataPointer + curIndex), (UINT32)sizeof(UINT8), (const void*)(&g_LocalSnowModel), (UINT32)sizeof(UINT8));
@@ -2776,6 +2961,64 @@ UINT32 GetCiGeneralData(UINT8* pCiAppDataPointer)
/*����OCԭʼ����*/
curResult = CopyValidGetOcOrginData(pCiAppDataPointer + curIndex, OC_SUM_MAX, &m_OcToCiOrginDataArr[0]);
curIndex = curIndex + curResult;
/*�뱾CIͨ�ŵ�CI������ͨ����ͷ����������*/
curResult = CopyValidGetHlhtHeadCtxs(pCiAppDataPointer + curIndex, CI_SUM_MAX, (UINT16)sizeof(HLHTHeadContextStru), ciHLHTHeadCtxs);
curIndex = curIndex + curResult;
/*�뱾CIͨ�ŵ�Rc������ͨ����ͷ����������*/
curResult = CopyValidGetHlhtHeadCtxs(pCiAppDataPointer + curIndex, CI_SUM_MAX, (UINT16)sizeof(HLHTHeadContextStru), gSzRcHLHTHeadCtxs);
curIndex = curIndex + curResult;
/*ZC����������CBTC�г���ѹ��Ϣ*/
pCiAppDataPointer[curIndex] = gCbtcCrossNumZc;
curIndex += 1u;
for (ii = 0u; ii < gCbtcCrossNumZc; ii++)
{
ShortToChar(gCbtcCrossStructZc[ii].wSignalId, &pCiAppDataPointer[curIndex]);
curIndex += 2u;
pCiAppDataPointer[curIndex] = gCbtcCrossStructZc[ii].wTrainId;
curIndex += 1u;
}
/*����������������*/
for (ii = 0U; ii < g_VirtualCIStructData.virtualCiNum; ii++)
{
(void)CommonMemCpy((void*)(pCiAppDataPointer + curIndex), (UINT32)sizeof(UINT8), (const void*)(&g_VirtualCIStructData.virtualCi[ii].virtualCiId), (UINT32)sizeof(UINT8));
curIndex = curIndex + (UINT32)sizeof(UINT8);
(void)CommonMemCpy((void*)(pCiAppDataPointer + curIndex), (UINT32)sizeof(UINT8), (const void*)(&g_VirtualCIStructData.virtualCi[ii].chAllSignalBrightFlag) , (UINT32)sizeof(UINT8));
curIndex = curIndex + (UINT32)sizeof(UINT8);
(void)CommonMemCpy((void*)(pCiAppDataPointer + curIndex), (UINT32)sizeof(UINT8), (const void*)(&g_VirtualCIStructData.virtualCi[ii].chAllSwitchYLockFlag), (UINT32)sizeof(UINT8));
curIndex = curIndex + (UINT32)sizeof(UINT8);
(void)CommonMemCpy((void*)(pCiAppDataPointer + curIndex), (UINT32)sizeof(UINT8) , (const void*)(&g_VirtualCIStructData.virtualCi[ii].autoTriggerflag) , (UINT32)sizeof(UINT8));
curIndex = curIndex + (UINT32)sizeof(UINT8);
(void)CommonMemCpy((void*)(pCiAppDataPointer + curIndex), (UINT32)sizeof(UINT8), (const void*)(&g_VirtualCIStructData.virtualCi[ii].cimode), (UINT32)sizeof(UINT8));
curIndex = curIndex + (UINT32)sizeof(UINT8);
(void)CommonMemCpy((void*)(pCiAppDataPointer + curIndex), (UINT32)sizeof(UINT8), (const void*)(&g_VirtualCIStructData.virtualCi[ii].chLabourCancelLinShiXianState) , (UINT32)sizeof(UINT8));
curIndex = curIndex + (UINT32)sizeof(UINT8);
(void)CommonMemCpy((void*)(pCiAppDataPointer + curIndex), (UINT32)sizeof(UINT8), (const void*)(&g_VirtualCIStructData.virtualCi[ii].ZfwFlag), (UINT32)sizeof(UINT8));
curIndex = curIndex + (UINT32)sizeof(UINT8);
(void)CommonMemCpy((void*)(pCiAppDataPointer + curIndex), (UINT32)sizeof(UINT8), (const void*)(&g_VirtualCIStructData.virtualCi[ii].ZfwjHunXianFLag) , (UINT32)sizeof(UINT8));
curIndex = curIndex + (UINT32)sizeof(UINT8);
(void)CommonMemCpy((void*)(pCiAppDataPointer + curIndex), (UINT32)sizeof(UINT32), (const void*)(&g_VirtualCIStructData.virtualCi[ii].ZfwStartCycNum) , (UINT32)sizeof(UINT32));
curIndex = curIndex + (UINT32)sizeof(UINT32);
(void)CommonMemCpy((void*)(pCiAppDataPointer + curIndex), (UINT32)sizeof(UINT32), (const void*)(&g_VirtualCIStructData.virtualCi[ii].ZfwValidCycNum) , (UINT32)sizeof(UINT32));
curIndex = curIndex + (UINT32)sizeof(UINT32);
/*ָʾ��״̬����*/
(void)CommonMemCpy((void*)(pCiAppDataPointer + curIndex), (UINT32)(VIRTUAL_CI_INDICATOR_SUM_MAX) * sizeof(IndicatorDataStruct) ,(const void*)(&g_VirtualCIStructData.virtualCi[ii].IndicatorData) , (UINT32)(VIRTUAL_CI_INDICATOR_SUM_MAX) * sizeof(IndicatorDataStruct));
curIndex = curIndex + (UINT32)((VIRTUAL_CI_INDICATOR_SUM_MAX) * sizeof(IndicatorDataStruct));
}
}
return curIndex;
@@ -3034,12 +3277,12 @@ UINT8 SetCiGeneralData(const UINT8* pCiAppDataPointer, const UINT32 len)
curIndex = curIndex + curResult;
/*ͬ����������������ѩ������Ϣ*/
curResult = CopyValidSetDataStru(pCiAppDataPointer + curIndex, (void*)(szSendCiAreaSnow), CI_COM_CI_MAX_NUM, (UINT16)sizeof(ToCiAreaSnowStruct));
curIndex = curIndex + curResult;
(void)CommonMemCpy((void*)(szSendCiAreaSnow), (UINT32)(sizeof(ToCiAreaSnowStruct)* CI_COM_CI_MAX_NUM), (const void*)(pCiAppDataPointer + curIndex), (UINT32)(sizeof(ToCiAreaSnowStruct)* CI_COM_CI_MAX_NUM));
curIndex = curIndex + (UINT32)(sizeof(ToCiAreaSnowStruct) * CI_COM_CI_MAX_NUM);
/*ͬ�������������������ѩ��Ϣ*/
curResult = CopyValidSetDataStru(pCiAppDataPointer + curIndex, (void*)(szRecvCiAreaSnow), CI_COM_CI_MAX_NUM, (UINT16)sizeof(ToCiAreaSnowStruct));
curIndex = curIndex + curResult;
(void)CommonMemCpy((void*)(szRecvCiAreaSnow), (UINT32)(sizeof(ToCiAreaSnowStruct)* CI_COM_CI_MAX_NUM), (const void*)(pCiAppDataPointer + curIndex), (UINT32)(sizeof(ToCiAreaSnowStruct)* CI_COM_CI_MAX_NUM));
curIndex = curIndex + (UINT32)(sizeof(ToCiAreaSnowStruct) * CI_COM_CI_MAX_NUM);
/* ����������ѩ���� */
(void)CommonMemCpy((void*)(&g_LocalSnowModel), (UINT32)sizeof(UINT8), (const void*)(pCiAppDataPointer + curIndex), (UINT32)sizeof(UINT8));
@@ -3064,6 +3307,64 @@ UINT8 SetCiGeneralData(const UINT8* pCiAppDataPointer, const UINT32 len)
curResult = CopyValidSetOcOrginData(pCiAppDataPointer + curIndex, OC_SUM_MAX, &m_OcToCiOrginDataArr[0]);
curIndex = curIndex + curResult;
/*�뱾����ͨ�ŵ�CI������ͨ����ͷ����������*/
curResult = CopyValidSetHlhtHeadCtxs(pCiAppDataPointer + curIndex, CI_SUM_MAX, (UINT16)sizeof(HLHTHeadContextStru), ciHLHTHeadCtxsCiToRc);
curIndex = curIndex + curResult;
/*�뱾����ͨ�ŵ�Rc������ͨ����ͷ����������*/
curResult = CopyValidSetHlhtHeadCtxs(pCiAppDataPointer + curIndex, CI_SUM_MAX, (UINT16)sizeof(HLHTHeadContextStru), gSzRcHLHTHeadCtxsCiToRc);
curIndex = curIndex + curResult;
/*ZC����������CBTC�г���ѹ��Ϣ*/
gCbtcCrossNumZc = pCiAppDataPointer[curIndex];
curIndex += 1u;
for (ii = 0u; ii < gCbtcCrossNumZc; ii++)
{
gCbtcCrossStructZc[ii].wSignalId = ShortFromChar(&pCiAppDataPointer[curIndex]);
curIndex += 2u;
gCbtcCrossStructZc[ii].wTrainId = pCiAppDataPointer[curIndex];
curIndex += 1u;
}
/*����������������*/
for (ii = 0U; ii < g_VirtualCIStructData.virtualCiNum; ii++)
{
(void)CommonMemCpy((void*)(&g_VirtualCIStructData.virtualCi[ii].virtualCiId) , (UINT32)sizeof(UINT8), (const void*)(pCiAppDataPointer + curIndex), (UINT32)sizeof(UINT8));
curIndex = curIndex + (UINT32)sizeof(UINT8);
(void)CommonMemCpy((void*)(&g_VirtualCIStructData.virtualCi[ii].chAllSignalBrightFlag), (UINT32)sizeof(UINT8), (const void*)(pCiAppDataPointer + curIndex), (UINT32)sizeof(UINT8));
curIndex = curIndex + (UINT32)sizeof(UINT8);
(void)CommonMemCpy((void*)(&g_VirtualCIStructData.virtualCi[ii].chAllSwitchYLockFlag), (UINT32)sizeof(UINT8), (const void*)(pCiAppDataPointer + curIndex), (UINT32)sizeof(UINT8));
curIndex = curIndex + (UINT32)sizeof(UINT8);
(void)CommonMemCpy((void*)(&g_VirtualCIStructData.virtualCi[ii].autoTriggerflag), (UINT32)sizeof(UINT8), (const void*)(pCiAppDataPointer + curIndex), (UINT32)sizeof(UINT8));
curIndex = curIndex + (UINT32)sizeof(UINT8);
(void)CommonMemCpy((void*)(&g_VirtualCIStructData.virtualCi[ii].cimode) , (UINT32)sizeof(UINT8), (const void*)(pCiAppDataPointer + curIndex), (UINT32)sizeof(UINT8));
curIndex = curIndex + (UINT32)sizeof(UINT8);
(void)CommonMemCpy((void*)(&g_VirtualCIStructData.virtualCi[ii].chLabourCancelLinShiXianState) , (UINT32)sizeof(UINT8), (const void*)(pCiAppDataPointer + curIndex), (UINT32)sizeof(UINT8));
curIndex = curIndex + (UINT32)sizeof(UINT8);
(void)CommonMemCpy((void*)(&g_VirtualCIStructData.virtualCi[ii].ZfwFlag), (UINT32)sizeof(UINT8), (const void*)(pCiAppDataPointer + curIndex), (UINT32)sizeof(UINT8));
curIndex = curIndex + (UINT32)sizeof(UINT8);
(void)CommonMemCpy((void*)(&g_VirtualCIStructData.virtualCi[ii].ZfwjHunXianFLag), (UINT32)sizeof(UINT8), (const void*)(pCiAppDataPointer + curIndex), (UINT32)sizeof(UINT8));
curIndex = curIndex + (UINT32)sizeof(UINT8);
(void)CommonMemCpy((void*)(&g_VirtualCIStructData.virtualCi[ii].ZfwStartCycNum) , (UINT32)sizeof(UINT32), (const void*)(pCiAppDataPointer + curIndex), (UINT32)sizeof(UINT32));
curIndex = curIndex + (UINT32)sizeof(UINT32);
(void)CommonMemCpy((void*)(&g_VirtualCIStructData.virtualCi[ii].ZfwValidCycNum), (UINT32)sizeof(UINT32), (const void*)(pCiAppDataPointer + curIndex), (UINT32)sizeof(UINT32));
curIndex = curIndex + (UINT32)sizeof(UINT32);
/*ָʾ��״̬����*/
(void)CommonMemCpy((void*)(g_VirtualCIStructData.virtualCi[ii].IndicatorData), (UINT32)(VIRTUAL_CI_INDICATOR_SUM_MAX) * sizeof(IndicatorDataStruct), (const void*)(pCiAppDataPointer + curIndex), (UINT32)(VIRTUAL_CI_INDICATOR_SUM_MAX) * sizeof(IndicatorDataStruct));
curIndex = curIndex + (UINT32)((VIRTUAL_CI_INDICATOR_SUM_MAX) * sizeof(IndicatorDataStruct));
}
rtn = 1u;
}
else
@@ -3219,6 +3520,8 @@ UINT32 CopyValidGetSigDataCC(UINT8* pCurCiAppDataPointer, UINT16 struNum, Signal
curIndex++;
*(pCurCiAppDataPointer + curIndex) = pstSignalDataStruCC[i].SignalCrossState;
curIndex++;
*(pCurCiAppDataPointer + curIndex) = pstSignalDataStruCC[i].wCrossTacsTrainId;
curIndex++;
}
else
{
@@ -3285,6 +3588,8 @@ UINT32 CopyValidSetSigDataCC(UINT8* pCurCiAppDataPointer, UINT16 struNum, Signal
curIndex++;
pstSignalDataStruCC[devId].SignalCrossState = *(pCurCiAppDataPointer + curIndex);
curIndex++;
pstSignalDataStruCC[devId].wCrossTacsTrainId = *(pCurCiAppDataPointer + curIndex);
curIndex++;
}
else
@@ -3458,19 +3763,19 @@ UINT32 CopyValidGetLogicSecDataCC(UINT8* pCurCiAppDataPointer, UINT16 struNum,Lo
for (j = 0U; j < pstLogSecDataStruCC[i].chTrainInfoSum; j++)
{
ShortToChar(pstLogSecDataStruCC[i].szTrainResData->wTrainId, (pCurCiAppDataPointer + curIndex));
ShortToChar(pstLogSecDataStruCC[i].szTrainResData[j].wTrainId, (pCurCiAppDataPointer + curIndex));
curIndex += 2U;
*(pCurCiAppDataPointer + curIndex) = pstLogSecDataStruCC[i].szTrainResData->chTrainApplyState;
*(pCurCiAppDataPointer + curIndex) = pstLogSecDataStruCC[i].szTrainResData[j].chTrainApplyState;
curIndex++;
*(pCurCiAppDataPointer + curIndex) = pstLogSecDataStruCC[i].szTrainResData->chLogicResUsable;
*(pCurCiAppDataPointer + curIndex) = pstLogSecDataStruCC[i].szTrainResData[j].chLogicResUsable;
curIndex++;
*(pCurCiAppDataPointer + curIndex) = pstLogSecDataStruCC[i].szTrainResData->chLogicReturnState;
*(pCurCiAppDataPointer + curIndex) = pstLogSecDataStruCC[i].szTrainResData[j].chLogicReturnState;
curIndex++;
*(pCurCiAppDataPointer + curIndex) = pstLogSecDataStruCC[i].szTrainResData->chLogicUnlockState;
*(pCurCiAppDataPointer + curIndex) = pstLogSecDataStruCC[i].szTrainResData[j].chLogicUnlockState;
curIndex++;
*(pCurCiAppDataPointer + curIndex) = pstLogSecDataStruCC[i].szTrainResData->chTrainLevel;
*(pCurCiAppDataPointer + curIndex) = pstLogSecDataStruCC[i].szTrainResData[j].chTrainLevel;
curIndex++;
LongToChar(pstLogSecDataStruCC[i].szTrainResData->dwRcvUnlockCmdCyc, (pCurCiAppDataPointer + curIndex));
LongToChar(pstLogSecDataStruCC[i].szTrainResData[j].dwRcvUnlockCmdCyc, (pCurCiAppDataPointer + curIndex));
curIndex += 4U;
}
*(pCurCiAppDataPointer + curIndex) = pstLogSecDataStruCC[i].cResReqOtherCIId;
@@ -3857,7 +4162,7 @@ UINT32 CopyGetZcSignalDymDataStru(UINT8* pCurCiAppDataPointer)
/*�����*/
if (NULL != pCurCiAppDataPointer)
{
dwCurIndex += sizeof(UINT16); /*�������ֽ��豸����*/
dwCurIndex += (UINT32)(sizeof(UINT16)); /*�������ֽ��豸����*/
cLocalCiId = GetSystemParaLocalCiId();
wSignalSum = GetSignalCurSum();
@@ -3865,12 +4170,12 @@ UINT32 CopyGetZcSignalDymDataStru(UINT8* pCurCiAppDataPointer)
{
wSignalId = GetSignalId(ii);
wBufIndex = GetSignalConfigBufIndex(wSignalId);
cSignalBlongCiId = GetSignalBelongCiId(ii);
cSignalBlongCiId = GetSignalBelongCiId(wSignalId);
if (cLocalCiId == cSignalBlongCiId)
{
/*�������������źŻ�����*/
(void)CommonMemCpy((void*)(pCurCiAppDataPointer + dwCurIndex), sizeof(SignalDataStructZC), (const void*)(&gZcToCiDymDataStru.szSignalDataStruZc[wBufIndex]), sizeof(SignalDataStructZC));
dwCurIndex += sizeof(SignalDataStructZC);
(void)CommonMemCpy((void*)(pCurCiAppDataPointer + dwCurIndex), (UINT32)(sizeof(SignalDataStructZC)), (const void*)(&gZcToCiDymDataStru.szSignalDataStruZc[wBufIndex]), (UINT32)(sizeof(SignalDataStructZC)));
dwCurIndex += (UINT32)(sizeof(SignalDataStructZC));
wValidDevNum++;
}
else
@@ -3911,7 +4216,7 @@ UINT32 CopySetZcSignalDymDataStru(const UINT8* pCurCiAppDataPointer)
/*��ȡ���豸����*/
wValidDevNum = ShortFromChar(pCurCiAppDataPointer);
dwCurIndex += sizeof(UINT16); /*�������ֽ��豸����*/
dwCurIndex += (UINT32)(sizeof(UINT16)); /*�������ֽ��豸����*/
/*ͬ��ǰ������*/
(void)CommonMemSet((void*)(gZcToCiDymDataStru.szSignalDataStruZc), (UINT32)(sizeof(SignalDataStructZC) * SIGNAL_SUM_MAX), (UINT8)0U, (UINT32)(sizeof(SignalDataStructZC) * SIGNAL_SUM_MAX));
@@ -3923,14 +4228,14 @@ UINT32 CopySetZcSignalDymDataStru(const UINT8* pCurCiAppDataPointer)
wBufIndex = GetSignalConfigBufIndex(wSignalId);
if (wBufIndex < SIGNAL_SUM_MAX)
{
(void)CommonMemCpy((void*)(&gZcToCiDymDataStru.szSignalDataStruZc[wBufIndex]), sizeof(SignalDataStructZC), (const void*)(pCurCiAppDataPointer + dwCurIndex), sizeof(SignalDataStructZC));
(void)CommonMemCpy((void*)(&gZcToCiDymDataStru.szSignalDataStruZc[wBufIndex]), (UINT32)(sizeof(SignalDataStructZC)), (const void*)(pCurCiAppDataPointer + dwCurIndex), (UINT32)(sizeof(SignalDataStructZC)));
}
else
{
debug_infor_printf((const)"\nCopySetZcSignalDymDataStru: wSignalId[%d] Is Invalid\n", wSignalId);
}
dwCurIndex += sizeof(SignalDataStructZC);
dwCurIndex += (UINT32)(sizeof(SignalDataStructZC));
}
}
else
@@ -3962,7 +4267,7 @@ UINT32 CopyGetZcLogSecDymDataStru(UINT8* pCurCiAppDataPointer)
/*�����*/
if (NULL != pCurCiAppDataPointer)
{
dwCurIndex += sizeof(UINT16); /*�������ֽ��豸����*/
dwCurIndex += (UINT32)(sizeof(UINT16)); /*�������ֽ��豸����*/
cLocalCiId = GetSystemParaLocalCiId();
wLogSecSum = GetLogicSecCurSum();
@@ -3970,12 +4275,12 @@ UINT32 CopyGetZcLogSecDymDataStru(UINT8* pCurCiAppDataPointer)
{
wLogSecId = GetLogicSecId(ii);
wBufIndex = GetlogSectionBufIndex(wLogSecId);
cLogSecBlongCiId = GetLogSecBelongCiId(ii);
cLogSecBlongCiId = GetLogSecBelongCiId(wLogSecId);
if (cLocalCiId == cLogSecBlongCiId)
{
/*�������������߼���������*/
(void)CommonMemCpy((void*)(pCurCiAppDataPointer + dwCurIndex), sizeof(LogicSectionDataStructZC), (const void*)(&gZcToCiDymDataStru.LogicSectionDataStruZc[wBufIndex]), sizeof(LogicSectionDataStructZC));
dwCurIndex += sizeof(LogicSectionDataStructZC);
(void)CommonMemCpy((void*)(pCurCiAppDataPointer + dwCurIndex), (UINT32)(sizeof(LogicSectionDataStructZC)), (const void*)(&gZcToCiDymDataStru.LogicSectionDataStruZc[wBufIndex]), (UINT32)(sizeof(LogicSectionDataStructZC)));
dwCurIndex += (UINT32)(sizeof(LogicSectionDataStructZC));
wValidDevNum++;
}
else
@@ -4016,7 +4321,7 @@ UINT32 CopySetZcLogSecDymDataStru(const UINT8* pCurCiAppDataPointer)
/*��ȡ���豸����*/
wValidDevNum = ShortFromChar(pCurCiAppDataPointer);
dwCurIndex += sizeof(UINT16); /*�������ֽ��豸����*/
dwCurIndex += (UINT32)(sizeof(UINT16)); /*�������ֽ��豸����*/
/*ͬ��ǰ������*/
(void)CommonMemSet((void*)(gZcToCiDymDataStru.LogicSectionDataStruZc), (UINT32)(sizeof(LogicSectionDataStructZC) * LOGIC_SECTION_SUM_MAX), (UINT8)0U, (UINT32)(sizeof(LogicSectionDataStructZC) * LOGIC_SECTION_SUM_MAX));
@@ -4028,14 +4333,14 @@ UINT32 CopySetZcLogSecDymDataStru(const UINT8* pCurCiAppDataPointer)
wBufIndex = GetlogSectionBufIndex(wLogSecId);
if (wBufIndex < LOGIC_SECTION_SUM_MAX)
{
(void)CommonMemCpy((void*)(&gZcToCiDymDataStru.LogicSectionDataStruZc[wBufIndex]), sizeof(LogicSectionDataStructZC), (const void*)(pCurCiAppDataPointer + dwCurIndex), sizeof(LogicSectionDataStructZC));
(void)CommonMemCpy((void*)(&gZcToCiDymDataStru.LogicSectionDataStruZc[wBufIndex]), (UINT32)(sizeof(LogicSectionDataStructZC)), (const void*)(pCurCiAppDataPointer + dwCurIndex), (UINT32)(sizeof(LogicSectionDataStructZC)));
}
else
{
debug_infor_printf((const)"\nCopySetZcLogSecDymDataStru: wLogSecId[%d] Is Invalid\n", wLogSecId);
}
dwCurIndex += sizeof(LogicSectionDataStructZC);
dwCurIndex += (UINT32)(sizeof(LogicSectionDataStructZC));
}
}
else
@@ -4067,7 +4372,7 @@ UINT32 CopyGetZcAxisSecDymDataStru(UINT8* pCurCiAppDataPointer)
/*�����*/
if (NULL != pCurCiAppDataPointer)
{
dwCurIndex += sizeof(UINT16); /*�������ֽ��豸����*/
dwCurIndex += (UINT32)(sizeof(UINT16)); /*�������ֽ��豸����*/
cLocalCiId = GetSystemParaLocalCiId();
wAxisSecSum = GetAxisSecCurSum();
@@ -4075,12 +4380,12 @@ UINT32 CopyGetZcAxisSecDymDataStru(UINT8* pCurCiAppDataPointer)
{
wAxisSecId = GetAxisSecId(ii);
wBufIndex = GetAxisSecConfigBufIndex(wAxisSecId);
cAxisSecBlongCiId = GetAxisSectionBelongCiId(ii);
cAxisSecBlongCiId = GetAxisSectionBelongCiId(wAxisSecId);
if (cLocalCiId == cAxisSecBlongCiId)
{
/*������������������������*/
(void)CommonMemCpy((void*)(pCurCiAppDataPointer + dwCurIndex), sizeof(AxisSectionDataStructZC), (const void*)(&gZcToCiDymDataStru.AxisSectionDataStruZc[wBufIndex]), sizeof(AxisSectionDataStructZC));
dwCurIndex += sizeof(AxisSectionDataStructZC);
(void)CommonMemCpy((void*)(pCurCiAppDataPointer + dwCurIndex), (UINT32)(sizeof(AxisSectionDataStructZC)), (const void*)(&gZcToCiDymDataStru.AxisSectionDataStruZc[wBufIndex]), (UINT32)(sizeof(AxisSectionDataStructZC)));
dwCurIndex += (UINT32)(sizeof(AxisSectionDataStructZC));
wValidDevNum++;
}
else
@@ -4121,7 +4426,7 @@ UINT32 CopySetZcAxisSecDymDataStru(const UINT8* pCurCiAppDataPointer)
/*��ȡ���豸����*/
wValidDevNum = ShortFromChar(pCurCiAppDataPointer);
dwCurIndex += sizeof(UINT16); /*�������ֽ��豸����*/
dwCurIndex += (UINT32)(sizeof(UINT16)); /*�������ֽ��豸����*/
/*ͬ��ǰ������*/
(void)CommonMemSet((void*)(gZcToCiDymDataStru.AxisSectionDataStruZc), (UINT32)(sizeof(AxisSectionDataStructZC) * AXIS_SECTION_SUM_MAX), (UINT8)0U, (UINT32)(sizeof(AxisSectionDataStructZC) * AXIS_SECTION_SUM_MAX));
@@ -4133,14 +4438,14 @@ UINT32 CopySetZcAxisSecDymDataStru(const UINT8* pCurCiAppDataPointer)
wBufIndex = GetAxisSecConfigBufIndex(wAxisSecId);
if (wBufIndex < AXIS_SECTION_SUM_MAX)
{
(void)CommonMemCpy((void*)(&gZcToCiDymDataStru.AxisSectionDataStruZc[wBufIndex]), sizeof(AxisSectionDataStructZC), (const void*)(pCurCiAppDataPointer + dwCurIndex), sizeof(AxisSectionDataStructZC));
(void)CommonMemCpy((void*)(&gZcToCiDymDataStru.AxisSectionDataStruZc[wBufIndex]), (UINT32)(sizeof(AxisSectionDataStructZC)), (const void*)(pCurCiAppDataPointer + dwCurIndex), (UINT32)(sizeof(AxisSectionDataStructZC)));
}
else
{
debug_infor_printf((const)"\nCopySetZcAxisSecDymDataStru: wAxisSecId[%d] Is Invalid\n", wAxisSecId);
}
dwCurIndex += sizeof(AxisSectionDataStructZC);
dwCurIndex += (UINT32)(sizeof(AxisSectionDataStructZC));
}
}
else
@@ -4172,7 +4477,7 @@ UINT32 CopyGetZcPhySecDymDataStru(UINT8* pCurCiAppDataPointer)
/*�����*/
if (NULL != pCurCiAppDataPointer)
{
dwCurIndex += sizeof(UINT16); /*�������ֽ��豸����*/
dwCurIndex += (UINT32)(sizeof(UINT16)); /*�������ֽ��豸����*/
cLocalCiId = GetSystemParaLocalCiId();
wPhySecSum = GetPhySecCurSum();
@@ -4180,12 +4485,12 @@ UINT32 CopyGetZcPhySecDymDataStru(UINT8* pCurCiAppDataPointer)
{
wPhySecId = GetPhySecId(ii);
wBufIndex = GetPhySecConfigBufIndex(wPhySecId);
cPhySecBlongCiId = GetPhySecBelongCiId(ii);
cPhySecBlongCiId = GetPhySecBelongCiId(wPhySecId);
if (cLocalCiId == cPhySecBlongCiId)
{
/*������������������������*/
(void)CommonMemCpy((void*)(pCurCiAppDataPointer + dwCurIndex), sizeof(PhysicalSectionDataStructZC), (const void*)(&gZcToCiDymDataStru.PhysicalSectionDataStruZc[wBufIndex]), sizeof(PhysicalSectionDataStructZC));
dwCurIndex += sizeof(PhysicalSectionDataStructZC);
(void)CommonMemCpy((void*)(pCurCiAppDataPointer + dwCurIndex), (UINT32)(sizeof(PhysicalSectionDataStructZC)), (const void*)(&gZcToCiDymDataStru.PhysicalSectionDataStruZc[wBufIndex]), (UINT32)(sizeof(PhysicalSectionDataStructZC)));
dwCurIndex += (UINT32)(sizeof(PhysicalSectionDataStructZC));
wValidDevNum++;
}
else
@@ -4226,7 +4531,7 @@ UINT32 CopySetZcPhySecDymDataStru(const UINT8* pCurCiAppDataPointer)
/*��ȡ���豸����*/
wValidDevNum = ShortFromChar(pCurCiAppDataPointer);
dwCurIndex += sizeof(UINT16); /*�������ֽ��豸����*/
dwCurIndex += (UINT32)(sizeof(UINT16)); /*�������ֽ��豸����*/
/*ͬ��ǰ������*/
(void)CommonMemSet((void*)(gZcToCiDymDataStru.PhysicalSectionDataStruZc), (UINT32)(sizeof(PhysicalSectionDataStructZC) * PHYSICAL_SECTION_SUM_MAX), (UINT8)0U, (UINT32)(sizeof(PhysicalSectionDataStructZC) * PHYSICAL_SECTION_SUM_MAX));
@@ -4238,14 +4543,14 @@ UINT32 CopySetZcPhySecDymDataStru(const UINT8* pCurCiAppDataPointer)
wBufIndex = GetPhySecConfigBufIndex(wPhySecId);
if (wBufIndex < PHYSICAL_SECTION_SUM_MAX)
{
(void)CommonMemCpy((void*)(&gZcToCiDymDataStru.PhysicalSectionDataStruZc[wBufIndex]), sizeof(PhysicalSectionDataStructZC), (const void*)(pCurCiAppDataPointer + dwCurIndex), sizeof(PhysicalSectionDataStructZC));
(void)CommonMemCpy((void*)(&gZcToCiDymDataStru.PhysicalSectionDataStruZc[wBufIndex]), (UINT32)(sizeof(PhysicalSectionDataStructZC)), (const void*)(pCurCiAppDataPointer + dwCurIndex), (UINT32)(sizeof(PhysicalSectionDataStructZC)));
}
else
{
debug_infor_printf((const)"\nCopySetZcPhySecDymDataStru: wPhySecId[%d] Is Invalid\n", wPhySecId);
}
dwCurIndex += sizeof(PhysicalSectionDataStructZC);
dwCurIndex += (UINT32)(sizeof(PhysicalSectionDataStructZC));
}
}
else
@@ -4277,7 +4582,7 @@ UINT32 CopyGetZcRouteDymDataStru(UINT8* pCurCiAppDataPointer)
/*�����*/
if (NULL != pCurCiAppDataPointer)
{
dwCurIndex += sizeof(UINT16); /*�������ֽ��豸����*/
dwCurIndex += (UINT32)(sizeof(UINT16)); /*�������ֽ��豸����*/
cLocalCiId = GetSystemParaLocalCiId();
wRouteSum = GetRouteCurSum();
@@ -4285,12 +4590,12 @@ UINT32 CopyGetZcRouteDymDataStru(UINT8* pCurCiAppDataPointer)
{
wRouteId = GetRouteId(ii);
wBufIndex = GetRouteConfigBufIndex(wRouteId);
cRouteBlongCiId = GetRouteBelongCiId(ii);
cRouteBlongCiId = GetRouteBelongCiId(wRouteId);
if (cLocalCiId == cRouteBlongCiId)
{
/*��������������·����*/
(void)CommonMemCpy((void*)(pCurCiAppDataPointer + dwCurIndex), sizeof(RouteDataStructZC), (const void*)(&gZcToCiDymDataStru.szRouteDataStruZc[wBufIndex]), sizeof(RouteDataStructZC));
dwCurIndex += sizeof(RouteDataStructZC);
(void)CommonMemCpy((void*)(pCurCiAppDataPointer + dwCurIndex), (UINT32)(sizeof(RouteDataStructZC)), (const void*)(&gZcToCiDymDataStru.szRouteDataStruZc[wBufIndex]), (UINT32)(sizeof(RouteDataStructZC)));
dwCurIndex += (UINT32)(sizeof(RouteDataStructZC));
wValidDevNum++;
}
else
@@ -4331,7 +4636,7 @@ UINT32 CopySetZcRouteDymDataStru(const UINT8* pCurCiAppDataPointer)
/*��ȡ���豸����*/
wValidDevNum = ShortFromChar(pCurCiAppDataPointer);
dwCurIndex += sizeof(UINT16); /*�������ֽ��豸����*/
dwCurIndex += (UINT32)(sizeof(UINT16)); /*�������ֽ��豸����*/
/*ͬ��ǰ������*/
(void)CommonMemSet((void*)(gZcToCiDymDataStru.szRouteDataStruZc), (UINT32)(sizeof(RouteDataStructZC) * ROUTE_SUM_MAX), (UINT8)0U, (UINT32)(sizeof(RouteDataStructZC) * ROUTE_SUM_MAX));
@@ -4343,14 +4648,14 @@ UINT32 CopySetZcRouteDymDataStru(const UINT8* pCurCiAppDataPointer)
wBufIndex = GetRouteConfigBufIndex(wRouteId);
if (wBufIndex < ROUTE_SUM_MAX)
{
(void)CommonMemCpy((void*)(&gZcToCiDymDataStru.szRouteDataStruZc[wBufIndex]), sizeof(RouteDataStructZC), (const void*)(pCurCiAppDataPointer + dwCurIndex), sizeof(RouteDataStructZC));
(void)CommonMemCpy((void*)(&gZcToCiDymDataStru.szRouteDataStruZc[wBufIndex]), (UINT32)(sizeof(RouteDataStructZC)), (const void*)(pCurCiAppDataPointer + dwCurIndex), (UINT32)(sizeof(RouteDataStructZC)));
}
else
{
debug_infor_printf((const)"\nCopySetZcRouteDymDataStru: wRouteId[%d] Is Invalid\n", wRouteId);
}
dwCurIndex += sizeof(RouteDataStructZC);
dwCurIndex += (UINT32)(sizeof(RouteDataStructZC));
}
}
else
@@ -4432,6 +4737,8 @@ UINT32 CopyValidSetOcOrginData(UINT8* pCurCiAppDataPointer, UINT16 struNum, OcTo
curIndex++;
pOcDevice->BoardState[j] = *(pCurCiAppDataPointer + curIndex);
curIndex++;
pOcDevice->MainStandbyState[j] = *(pCurCiAppDataPointer + curIndex);
curIndex++;
}
}
@@ -4631,6 +4938,8 @@ UINT32 CopyValidGetOcOrginData(UINT8* pCurCiAppDataPointer, UINT16 struNum, OcTo
curIndex++;
*(pCurCiAppDataPointer + curIndex) = pOcDevice->BoardState[j];
curIndex++;
*(pCurCiAppDataPointer + curIndex) = pOcDevice->MainStandbyState[j];
curIndex++;
}
}
ShortToChar(OcRecvData[i].OcGdNum, (pCurCiAppDataPointer + curIndex));
TSCP/src/APP/ciapp/2oo2/2oo2DataTransferManage.h
+14
View File
@@ -153,6 +153,20 @@ UINT32 CopyValidSetVobcBackHlht(const UINT8 *pCurCiAppDataPointer, UINT16 struNu
*/
UINT32 CopyValidSetVobcDataStru(const UINT8* pCurCiAppDataPointer, VobcToCiDataStruct* pDataStru, UINT16 struNum);
/*
* 功能描述： 拷贝RC通信的VOBC有效数据到对应的全局数组
* 参数说明：
输入参数
const UINT8 *pCurCiAppDataPointer:当前数据指针
UINT16 struNum:数组长度,
UINT16 struLength:结构体长度
输出参数
void *pDataStru:结构体指针,
* 返回值 ： 拷贝数据的长度
*/
UINT32 CopyValidSetRcVobcDataStru(const UINT8* pCurCiAppDataPointer, void* pDataStru, UINT16 struNum, UINT16 struLength);
/*
* 功能描述：拷贝ITE有效数据到对应的全局数组
* 参数说明：const UINT8 *pCurCiAppDataPointer:当前数据指针
TSCP/src/APP/ciapp/AllAutoReturn/AllAutoReturnConfigDataManage.c
+21
View File
@@ -125,6 +125,27 @@ UINT8 GetAllAutoReturnRouteBelongCiId(const UINT16 allAutoReturnId)
return belongCiId;
}
/*
* 功能描述： 获取指定ID全自动折返所属虚拟联锁ID
* 参数说明： const UINT16 allAutoReturnId, 全自动折返ID
* 返回值 ： 0: 获取数据失败
* >0: 所属虚拟联锁ID
* add by mpt 20260107
*/
UINT8 GetAllAutoRetRoutBelongVirCiId(const UINT16 allAutoReturnId)
{
UINT16 bufIndex = 0u; /*数组下标*/
UINT8 belongVirCiId = CI_ERROR;
bufIndex = GetAllAutoReturnBufIndex(allAutoReturnId); /*获取全自动折返数组下标*/
if (bufIndex < ALL_AUTO_RETURN_SUM_MAX)
{
belongVirCiId = AllAutoReturnConfigDataStru[bufIndex].BelongVirCiId;
}
return belongVirCiId;
}
/*
* 功能描述： 获取指定ID全自动折返包含进路ID数组
TSCP/src/APP/ciapp/AllAutoReturn/AllAutoReturnConfigDataManage.h
+9
View File
@@ -34,6 +34,7 @@ typedef struct S_AllAutoReturnConfigDataStruct
{
UINT16 AllAutoReturnId; /*全自动折返ID (配置字段)*/
UINT8 BelongCiId; /*所属联锁ID*/
UINT8 BelongVirCiId; /*虚拟联锁ID*/
UINT8 RouteSum; /*全自动折返包含进路数目 (配置字段)*/
UINT16 RouteIdBuf[ALL_AUTO_RETURN_INCLROUTE_SUM_MAX]; /*全自动折返进路ID数组 (配置字段)*/
UINT16 RebackRouteIdBuf[ALL_AUTO_RETURN_REBACKROUTE_SUM_MAX]; /*全自动折返包含折出进路数组(配置字段)*/
@@ -92,6 +93,14 @@ UINT8 GetAllAutoReturnIncludeRouteSum(const UINT16 allAutoReturnId);
* >0: 所属联锁ID
*/
UINT8 GetAllAutoReturnRouteBelongCiId(const UINT16 allAutoReturnId);
/*
* 功能描述： 获取指定ID全自动折返所属虚拟联锁ID
* 参数说明： const UINT16 allAutoReturnId, 全自动折返ID
* 返回值 ： 0: 获取数据失败
* >0: 所属虚拟联锁ID
* add by mpt 20260107
*/
UINT8 GetAllAutoRetRoutBelongVirCiId(const UINT16 allAutoReturnId);
/*
* 功能描述： 获取指定ID全自动折返包含进路ID数组
TSCP/src/APP/ciapp/AutoReturn/AutoReturnConfigDataManage.c
+21
View File
@@ -119,6 +119,27 @@ UINT8 GetAutoReturnRouteBelongCiId(const UINT16 autoReturnId)
return returnValue;
}
/*
* 功能描述： 获取指定ID自动折返所属虚拟联锁ID
* 参数说明： const UINT16 autoReturnId, 自动折返ID
* 返回值 ： 0: 获取数据失败
* >0: 所属联锁ID
* add by mpt 20260107
*/
UINT8 GetAutoReturnRouteBelongVirCiId(const UINT16 autoReturnId)
{
UINT16 bufIndex = 0u; /*数组下标*/
UINT8 returnValue = CI_ERROR;
bufIndex = GetAutoReturnBufIndex(autoReturnId); /*获取自动折返数组下标*/
if (bufIndex < AUTO_RETURN_SUM_MAX)
{
returnValue = AutoReturnConfigDataStru[bufIndex].BelongVirCiId;
}
return returnValue;
}
/*
* 功能描述： 获取指定ID自动折返包含进路ID数组
TSCP/src/APP/ciapp/AutoReturn/AutoReturnConfigDataManage.h
+9
View File
@@ -34,6 +34,7 @@ typedef struct S_AutoReturnConfigDataStruct
{
UINT16 AutoReturnId; /*自动折返ID (配置字段)*/
UINT8 BelongCiId; /*所属联锁ID*/
UINT8 BelongVirCiId; /*所属虚拟联锁ID*/
UINT8 RouteSum; /*自动折返包含进路数目 (配置字段)*/
UINT16 RouteIdBuf[AUTO_RETURN_INCLROUTE_SUM_MAX]; /*自动折返进路包含进路ID数组 (配置字段)*/
UINT8 AutoReturnOpposedReturnIdSum; /*自动折返抵触自动折返进路数目 (配置字段)*/
@@ -88,6 +89,14 @@ UINT8 GetAutoReturnIncludeRouteSum(const UINT16 autoReturnId);
* >0: 所属联锁ID
*/
UINT8 GetAutoReturnRouteBelongCiId(const UINT16 autoReturnId);
/*
* 功能描述： 获取指定ID自动折返所属虚拟联锁ID
* 参数说明： const UINT16 autoReturnId, 自动折返ID
* 返回值 ： 0: 获取数据失败
* >0: 所属联锁ID
* add by mpt 20260107
*/
UINT8 GetAutoReturnRouteBelongVirCiId(const UINT16 autoReturnId);
/*
* 功能描述： 获取指定ID自动折返包含进路ID数组
TSCP/src/APP/ciapp/AutoRoute/AutoRouteConfigDataManage.c
+20
View File
@@ -97,6 +97,26 @@ UINT8 GetAutoRouteBelongCiId(const UINT16 autoRouteId)
}
return belongCiId;
}
/*
* 功能描述： 获取指定ID自动进路所属虚拟联锁ID
* 参数说明： const UINT16 autoRouteId, 自动进路ID
* 返回值 ： 0: 获取数据失败
* >0: 所属联锁ID
* add by mpt 20260107
*/
UINT8 GetAutoRouteBelongVirCiId(const UINT16 autoRouteId)
{
UINT16 bufIndex = 0u; /*数组下标*/
UINT8 belongVirCiId = CI_ERROR;
bufIndex = GetAutoRouteBufIndex(autoRouteId); /*获取自动进路数组下标*/
if (bufIndex < AUTO_ROUTE_SUM_MAX)
{
belongVirCiId = AutoRouteConfigDataStru[bufIndex].BelongVirCiId;
}
return belongVirCiId;
}
/*
TSCP/src/APP/ciapp/AutoRoute/AutoRouteConfigDataManage.h
+8
View File
@@ -32,6 +32,7 @@ typedef struct S_AutoRouteConfigDataStruct
{
UINT16 AutoRouteId; /*自动进路ID (配置字段)*/
UINT8 BelongCiId; /*所属联锁ID*/
UINT8 BelongVirCiId; /*所属虚拟联锁ID*/
UINT8 RouteSum; /*自动进路包含进路数目 (配置字段)*/
UINT16 RouteIdBuf[AUTO_ROUTE_INCLROUTE_SUM_MAX]; /*自动进路进路ID数组 (配置字段)*/
UINT8 AutoRouteOpposedRouteIdSum; /*自动通过进路抵触自动通过进路数目 (配置字段)*/
@@ -89,6 +90,13 @@ UINT16 GetAutoRouteBufIndex(const UINT16 AutoRouteId);
* >0: 所属联锁ID
*/
UINT8 GetAutoRouteBelongCiId(const UINT16 autoRouteId);
/*
* 功能描述： 获取指定ID自动进路所属虚拟联锁ID
* 参数说明： const UINT16 autoRouteId, 自动进路ID
* 返回值 ： 0: 获取数据失败
* >0: 所属联锁ID
*/
UINT8 GetAutoRouteBelongVirCiId(const UINT16 autoRouteId);
/*
* 功能描述： 获取指定ID自动进路包含进路数目
TSCP/src/APP/ciapp/CutoffPoint/CutoffPointDataManage.c
+5 -2
View File
@@ -792,6 +792,7 @@ void SetCfpLocalOcCtData(const UINT16 wCfpId)
UINT8 chSendNum = 0u;
UINT8 chFunRtn = CI_ERROR;
struct_PathPoint strPoint = { 0u };
UINT8 dir = 0u;
wIndex = GetCfpBufIndex(wCfpId);
/* 输入合法 */
@@ -812,7 +813,9 @@ void SetCfpLocalOcCtData(const UINT16 wCfpId)
g_CutoffPointDataBuf[wIndex].szLocalCtTrain[chSendNum].dwDelay = GetTrainMsgDelayTime(szCtTrainId[chCtIndex]);
g_CutoffPointDataBuf[wIndex].szLocalCtTrain[chSendNum].wSpeed = GetTrainSpeed(szCtTrainId[chCtIndex]);
g_CutoffPointDataBuf[wIndex].szLocalCtTrain[chSendNum].chSpeedDir = GetTrainSpeedDir(szCtTrainId[chCtIndex]);
g_CutoffPointDataBuf[wIndex].szLocalCtTrain[chSendNum].chTrainDir = GetTrainDir(szCtTrainId[chCtIndex]);
dir = GetTrainDir(szCtTrainId[chCtIndex]); /*获取列车的逻辑方向*/
g_CutoffPointDataBuf[wIndex].szLocalCtTrain[chSendNum].chTrainDir = ConvertDirectionToLogic(dir); /*将逻辑方向转换为运营方向*/
g_CutoffPointDataBuf[wIndex].szLocalCtTrain[chSendNum].wMaxHeadLink = GetTrainMaxHeadLink(szCtTrainId[chCtIndex]);
g_CutoffPointDataBuf[wIndex].szLocalCtTrain[chSendNum].dwMaxHeadOff = GetTrainMaxHeadOffset(szCtTrainId[chCtIndex]);
g_CutoffPointDataBuf[wIndex].szLocalCtTrain[chSendNum].wMinHeadLink = GetTrainMinHeadLink(szCtTrainId[chCtIndex]);
@@ -1629,7 +1632,7 @@ void OtherCfpTrainInfoCal(UINT16 wLinkId,UINT32 dwOffSet,UINT32 dwLocalOffSet, C
{
chLinkTiocId = (UINT8)GetLinkManageTiocById(wLinkId);
strCfpInfo = GetCfpOtherOcTrainInfo(wCfpId);
chTransmitStat = GetCiTransmitState(CI_SYSTEM_TYPE_RCI, chLinkTiocId);
chTransmitStat = GetRcPbTacsTransmitState(chLinkTiocId);
if ((TRANSMIT_STATE_GOOD != chTransmitStat) || (UINT16_MAX == strCfpInfo.wTrainId))
{
;/*通信不良好，或者分界点列车信息获取失败*/
TSCP/src/APP/ciapp/DataManage/DeviceConfigDataManage.c
+1 -1
View File
@@ -204,7 +204,7 @@ UINT32 GetCiTranCiDataCheckVer(const UINT8 ciId, const UINT16 deviceName)
UINT8 ii = 0U;
UINT8 chBreakFlag = 0U;
UINT8 chDevType = 0U;
chDevType = (UINT8)((deviceName & 0xFF00) >> 8U);
chDevType = (UINT8)((deviceName & 0xFF00u) >> 8U);
if ((ciId > 0U) && (ciId < CI_SUM_MAX) &&
((RC_WORK_MODE_CI == chDevType)||(RC_WORK_MODE_TIOC == chDevType)))
{
TSCP/src/APP/ciapp/DataManage/DeviceDataManage.c
+179 -105
View File
@@ -216,46 +216,6 @@ UINT8 GetLabourCancelLinShiXianState(void)
return LabourCancelLinShiXianState;
}
/*
功能描述：人工取消临时限速状态迁移处理
参数说明：setFlag 状态
返回值：无
*/
void LabourCancelLSXianStaMoveProc(UINT8 setFlag)
{
UINT8 linShiXianState = 0u;
UINT8 wholelinShiXianState = 0u;
linShiXianState = GetLabourCancelLinShiXianState();
wholelinShiXianState = GetWholeLineLinShiXianSuFlag();
switch(setFlag)
{
case LINSHIXIANSU_COMM_GOOD_STATE:/*与ZC通信正常状态*/
if((LINSHIXIANSU_COMM_BAD_STATE == linShiXianState) ||
(LINSHIXIANSU_LABOURCANCLE_YES_STATE == linShiXianState))
{/*前一状态为： 通信故障且未进行人工取消 || 通信故障且进行了人工取消 则进行状态迁移*/
LabourCancelLinShiXianState = setFlag;
}
break;
case LINSHIXIANSU_COMM_BAD_STATE:/*与ZC通信故障状态*/
if((LINSHIXIANSU_COMM_GOOD_STATE == linShiXianState) && (WHOLE_LINE_LINSHIXIANSUSET_YES == wholelinShiXianState))
{/*前一状态为：通信正常状态且临时限速标志为设置 则进行状态迁移*/
LabourCancelLinShiXianState = setFlag;
}
break;
case LINSHIXIANSU_LABOURCANCLE_YES_STATE:/*已经进行了人工取消临时限速*/
if(LINSHIXIANSU_COMM_BAD_STATE == linShiXianState)
{/*前一状态为：通信故障状态 则进行状态迁移*/
LabourCancelLinShiXianState = setFlag;
}
break;
default:
/*不可达分支*/
break;
}
}
/*
功能描述：人工取消临时限速状态迁移处理
参数说明：setFlag 状态,UINT8 virCIid 虚拟联锁ID
@@ -1332,17 +1292,13 @@ edit cgh 20241203
UINT8 RouteLockDriveSwitch(const UINT16 routeId, const UINT8 NeedForDrvRoutAssoSwit)
{
UINT8 ii = 0u;
UINT8 switchSum = 0u;
UINT16 switchId = 0u;
UINT8 switchExpPosition = SWITCH_POSITION_INVALID; /*道岔期望位置*/
UINT8 switchDancaoPosition = SWITCH_POSITION_INVALID; /*单操有效位置*/
RouteSwitchStruct* pRouteSwitchStru = NULL; /*道岔数据结构指针*/
UINT8 innerSwitchRetVal = CI_ERROR; /*检查进路内道岔是否可被驱动的结果*/
UINT8 assocSwitchRetVal = CI_ERROR; /*检查带动道岔是否可被驱动的结果*/
UINT8 assocSwitchSum = 0u; /*道岔数目*/
RouteAssocSwitchStruct routeAssocSwitchStru = {0,0}; /*道岔数据*/
UINT8 routeProtectSwitchSum = 0u; /*防护道岔数目*/
RouteProtectSwitchStruct* pRouteProtectSwitchStru = NULL; /*防护道岔数据*/
UINT8 chAutoCheck = 0U;
UINT8 chSendLevel = 0U;
chAutoCheck = AutoSignalOrRouteValid(routeId);
@@ -1710,7 +1666,6 @@ void DriveSignalOpen(const UINT16 signalId, const UINT16 routeId)
UINT8 bCiSwitchShowGreenYellow = FUNC_SWITCH_OFF;/*ci显示绿黄开关,默认是关闭的*/
UINT8 belongVirCI= 0u;
UINT8 includeVirFlag= GetCiFunctionSwitchConfig(FUNC_INCLUDEVIRCI_FLAG);
UINT8 sigalMaintainState = 0u;
UINT8 signalIsfushiFlag = 0u;
UINT8 signalCurDriveColor = 0u;
@@ -1804,27 +1759,23 @@ void DriveSignalOpen(const UINT16 signalId, const UINT16 routeId)
}
/*虚拟联锁兼容*/
if(FUNC_SWITCH_ON == includeVirFlag)
{
belongVirCI = GetSignalBelongVirCiId(signalId);
allSignalBrightFlag = GetVirCIAllSignalBrightState(belongVirCI);/*本虚拟联锁全站亮灯标志*/
}
else
{
allSignalBrightFlag = GetAllSignalBrightFlag(); /*全站亮灯标志*/
}
lightExtinctState = GetSignalLightExtinctState(signalId);/*信号机亮灭状态*/
sigalMaintainState = GetSignalMaintainState(signalId);/*信号机维修点灯状态*/
chRoutelightFlag = GetSignalShine(signalId);
if (SIGNAL_LIGHT_CONFIG_CBTC_CLOSE == chRoutelightFlag)
chRoutelightFlag = GetSignalShineBit2(signalId);
if (SIGNAL_LIGHT_CONFIG_CBTC_LIGHT_BIT2 == chRoutelightFlag)
{
lightExtinctState = SIGNAL_LIGHT_EXTICT_STATE_YES;
}
else
{
/*数据配置常亮，CBTC接近时灭灯，驱动亮灯；配置其他依据亮灭灯状态*/
}
signalIsfushiFlag = GetSignalIsfushiFlag(signalId);
signalCurDriveColor = GetSignalCurDriveColor(signalId);
@@ -2085,7 +2036,6 @@ UINT8 DriveSignalClose(const UINT16 signalId)
UINT8 belongVirCIid = 0u;
UINT8 detainOpenRedBright = 0u;
UINT8 signalDetainFlag = 0u;
UINT8 includeVirFlag= GetCiFunctionSwitchConfig(FUNC_INCLUDEVIRCI_FLAG);
UINT8 sigalMaintainState = 0u;
UINT8 signalIsfushiFlag = 0u;
UINT16 wSigInFirstPhyId = 0U;
@@ -2100,16 +2050,11 @@ UINT8 DriveSignalClose(const UINT16 signalId)
}
else
{
/*虚拟联锁兼容*/
if(FUNC_SWITCH_ON == includeVirFlag)
{
belongVirCIid = GetSignalBelongVirCiId(signalId);
allSignalBrightFlag = GetVirCIAllSignalBrightState(belongVirCIid); /*全站亮灯标志*/
}
else
{
allSignalBrightFlag = GetAllSignalBrightFlag(); /*全站亮灯标志*/
}
/*无论什么时候，复示信号机关闭都驱动红灭*/
signalIsfushiFlag = GetSignalIsfushiFlag(signalId);
if (SIGNALTYPE_FUSHI_YES == signalIsfushiFlag)
@@ -2128,8 +2073,8 @@ UINT8 DriveSignalClose(const UINT16 signalId)
routeState = GetRouteState(routeId);/*获取进路状态*/
wStartSignalId = GetRouteStartSignalId(routeId);
chRoutelightFlag = GetSignalShine(signalId);
if (SIGNAL_LIGHT_CONFIG_CBTC_CLOSE == chRoutelightFlag)
chRoutelightFlag = GetSignalShineBit2(signalId);
if (SIGNAL_LIGHT_CONFIG_CBTC_LIGHT_BIT2 == chRoutelightFlag)
{
lightExtinctState = SIGNAL_LIGHT_EXTICT_STATE_YES;
}
@@ -3287,7 +3232,6 @@ UINT8 GetSwitchRouteLockState(UINT16 switchId)
{
UINT16 bufIndex = 0u; /*数组下标*/
UINT16 belongSecId = 0u; /*所属区段ID*/
UINT16 doubleSwitchId = 0u; /*双动道岔ID*/
UINT8 belongPhySecState = 0u; /*所属物理区段的进路状态*/
UINT8 reVal = CI_ERROR;
@@ -3309,21 +3253,7 @@ UINT8 GetSwitchRouteLockState(UINT16 switchId)
}
else
{
doubleSwitchId = GetDSwitchOtherId(switchId);/*获取双动道岔ID*/
if (doubleSwitchId != 0u)
{/*双动道岔非空*/
belongSecId = GetSwitchPhySectionId(doubleSwitchId);
belongPhySecState = GetPhySecLockState(belongSecId);
if ((PHYSICAL_SECTION_LOCK_NORMAL == belongPhySecState) ||
(PHYSICAL_SECTION_LOCK_PROTECT == belongPhySecState) ||
(PHYSICAL_SECTION_LOCK_DELAY == belongPhySecState) ||
(PHYSICAL_SECTION_LOCK_FAULTDELAY == belongPhySecState))
{
reVal = CI_SUCCESS;
}
}
/*双动道岔锁闭状态不处理*/
}
}
return reVal;
@@ -4378,7 +4308,6 @@ void YLockSignalOpenManage(void)
UINT8 belongVirCI = 0u;
UINT8 flag = 0u;
UINT8 yLockState = 0u;
UINT8 includeVirFlag = GetCiFunctionSwitchConfig(FUNC_INCLUDEVIRCI_FLAG);
/*处理信号机*/
@@ -4390,15 +4319,12 @@ void YLockSignalOpenManage(void)
signalId = GetSignalId(ii); /*获取信号机ID*/
belongCiId = GetSignalBelongCiId(signalId); /*获取进路所属联锁ID*/
if(FUNC_SWITCH_ON == includeVirFlag)
{
belongVirCI = GetSignalBelongVirCiId(signalId); /*获取信号机所属虚拟联锁ID*/
yLockState = GetVirCIAllSwitchYLockState(belongVirCI);
}
else
{
yLockState = GetAllSwitchYLockFlag();
}
if ((0u == signalId) || (signalId >= SIGNAL_SUM_MAX))
{
@@ -5183,8 +5109,9 @@ UINT8 GetOtherCiDevStatus(UINT16 const devType,UINT16 const devId,UINT16 const c
devState = 0u;
}
break;
case CI_DEVICE_TYPE_PSD_EXCEPT_OPEN: /*站台屏蔽门（异常打开）*/
devState = GePsdExceptOpenState(devId);
case CI_DEVICE_TYPE_PSD_EXCEPT_OPEN: /*站台屏蔽门（异常）*/
devState = GePsdExceptState(devId);
/*宁象需求：屏蔽门异常打开又关闭、尚未取消异常状态时不开放信号*/
break;
case CI_DEVICE_TYPE_GARAGEDOOR: /*车库门*/
tmpDevState = GetGaragedoorState(devId);
@@ -5983,6 +5910,8 @@ UINT8 CheckJumpLockApply(UINT16 axisSectionId)
UINT8 routeTrainNear = 0u;
UINT8 physicalCheck = 0u;
UINT8 phyPLockRouteState = 0u;
UINT16 devId = 0u; /*设备ID*/
UINT8 devState = 0u; /*设备状态*/
physicalSecId = GetAxisSecRelativePhySecId(axisSectionId);
routeRlockId = GetPhySecRLockBelongRouteId(physicalSecId);/*物理区段进路锁闭所属进路ID*/
@@ -6127,6 +6056,21 @@ UINT8 CheckJumpLockApply(UINT16 axisSectionId)
}
}
}
if (CI_SUCCESS == reVal)
{/*检查防护道岔位置*/
devId = 0u;
devState = 0u;
reVal = AxisSecAllProtSwitchPosCheck(axisSectionId, &devId, &devState);
}
if (CI_SUCCESS == reVal)
{/*检查防护道岔封锁状态*/
devId = 0u;
devState = 0u;
reVal = AxisSecProtSwitchFLockCheck(axisSectionId, &devId, &devState);
}
return reVal;
}
@@ -6521,6 +6465,20 @@ UINT8 CheckLogJumpLockApply(UINT16 logSectionId)
reVal = CI_SUCCESS;
}
}
if (CI_SUCCESS == reVal)
{/*防护道岔封锁状态检查*/
devId = 0u; /*设备ID*/
devState = 0u; /*设备状态*/
reVal = LogicSecRltvPrtctSwFlockCheck(logSectionId, &devId, &devState);/*封锁检查*/
}
if (CI_SUCCESS == reVal)
{/*防护道岔位置检查*/
devId = 0u; /*设备ID*/
devState = 0u; /*设备状态*/
reVal = LogicSecRltvPrtctSwPosCheck(logSectionId, &devId, &devState);/*位置检查*/
}
}
else
{
@@ -6822,10 +6780,17 @@ UINT8 JumpLockDriveSwitch(const UINT16 axisSecId)
AxisSwitchStruct* pRouteSwitchStru = NULL; /*道岔数据结构指针*/
UINT8 innerSwitchRetVal = CI_ERROR; /*检查计轴区段内道岔是否可被驱动的结果*/
AxisSwitchStruct* pProtectSwitchStru = NULL; /*防护道岔数据结构指针*/
UINT8 protectSwitchSum = 0u;
switchSum = GetAxisSwitchSum(axisSecId);
pRouteSwitchStru = GetAxisSwitchIdStru(axisSecId);
if((0u == axisSecId) || (axisSecId >= AXIS_SECTION_SUM_MAX))
protectSwitchSum = GetAxisSecRelateProSwSum(axisSecId);
pProtectSwitchStru = GetAxisSecRelateProSwStru(axisSecId);
if((0u == axisSecId) || (axisSecId >= AXIS_SECTION_SUM_MAX)||(NULL == pRouteSwitchStru) || (NULL == pProtectSwitchStru))
{
innerSwitchRetVal = CI_ERROR;
}
@@ -6854,6 +6819,32 @@ UINT8 JumpLockDriveSwitch(const UINT16 axisSecId)
}
}
if (innerSwitchRetVal == CI_SUCCESS)
{
/* 单操相反位置取消驱动检查 */
for (ii = 0u; ii < protectSwitchSum; ii++)
{
switchId = pProtectSwitchStru[ii].SwitchId;
switchExpPosition = pProtectSwitchStru[ii].SwitchPosition;
switchDancaoPosition = GetSwitchDanCaoPostition(switchId);
if ((SWITCH_POSITION_INVALID == switchDancaoPosition)
||
(switchDancaoPosition == switchExpPosition))
{/*单操无效 或者 单操位置与动作位置一样*/
innerSwitchRetVal = CI_SUCCESS;
}
else
{
/*单操到相反位置取消道岔的驱动*/
innerSwitchRetVal = CI_ERROR;
break;
}
}
}
if(innerSwitchRetVal == CI_SUCCESS)
{
/*驱动计轴区段道岔*/
@@ -6886,20 +6877,35 @@ void AxisSecDrvInnerSwitch(const UINT16 axisSecId, const UINT8 DrivFlag)
UINT8 ii = 0u; /*循环变量*/
UINT8 funRtn = CI_ERROR;
AxisSwitchStruct* pProtectSwitchStru = NULL; /*防护道岔数据结构指针*/
UINT8 protectSwitchSum = 0u;
switchSum = GetAxisSwitchSum(axisSecId); /*获取计轴区段道岔数目*/
pAxisSecSwitchStru = GetAxisSwitchIdStru(axisSecId); /*获取计轴区段内道岔数据*/
protectSwitchSum = GetAxisSecRelateProSwSum(axisSecId);
pProtectSwitchStru = GetAxisSecRelateProSwStru(axisSecId);
if(SWITCH_NEED_DRIV_TRUE == DrivFlag)
if ((NULL != pAxisSecSwitchStru) && (NULL != pProtectSwitchStru))
{
if (SWITCH_NEED_DRIV_TRUE == DrivFlag)
{/*需要驱动计轴区段内道岔*/
for(ii = 0u; ii < switchSum; ii++)
for (ii = 0u; ii < switchSum; ii++)
{
switchId = pAxisSecSwitchStru[ii].SwitchId;
switchExpPos = pAxisSecSwitchStru[ii].SwitchPosition;
funRtn = SwitchDriveProcess(switchId, switchExpPos); /*设置计轴区段内道岔的驱动状态为驱动中*/
}
for (ii = 0u; ii < protectSwitchSum; ii++)
{
switchId = pProtectSwitchStru[ii].SwitchId;
switchExpPos = pProtectSwitchStru[ii].SwitchPosition;
(void) SwitchDriveProcess(switchId, switchExpPos); /*设置计轴区段防护道岔的驱动状态为驱动中*/
}
}
}
}
@@ -7353,7 +7359,7 @@ UINT8 GetSwitchLogSecLockState(UINT16 switchId, UINT16* logOccOrLockId, UINT8* p
UINT8 retValue = CI_ERROR;
UINT8 chLogSecLogLockState = 0U; /*逻辑区段逻辑锁闭状态*/
UINT8 cLockBelongLogicRouteNum = 0U; /*逻辑区段逻辑锁闭所属逻辑进路数量*/
UINT8 chLogSecJumpLockState = 0U;
/*获取道岔关联逻辑区段信息*/
logSecSum = GetSwitchLogSecSum(switchId);
logSecBuf = GetSwitchLogSecBuf(switchId);
@@ -7377,8 +7383,9 @@ UINT8 GetSwitchLogSecLockState(UINT16 switchId, UINT16* logOccOrLockId, UINT8* p
/*检查逻辑区段逻辑锁闭状态*/
chLogSecLogLockState = GetLogSecLogLockState(logSecBuf[i]);
cLockBelongLogicRouteNum = GetLogSecLockBelLogRouteSum(logSecBuf[i]);
chLogSecJumpLockState = GetLogSecJumpLockState(logSecBuf[i]);
if ((LOG_SECTION_LOGLOCK_NO == chLogSecLogLockState) && (0U == cLockBelongLogicRouteNum))
if ((LOG_SECTION_LOGLOCK_NO == chLogSecLogLockState) && (0U == cLockBelongLogicRouteNum)&&(LOGIC_SECTION_JUMP_LOCK_NO== chLogSecJumpLockState))
{
retValue = CI_SUCCESS;
}
@@ -8998,7 +9005,7 @@ void SetCtrlPower(const UINT8 virtualCiId, const UINT8 ctrlPowerFlag, const UINT
UINT8 i = 0u;
UINT8 cimode = 0u;
UINT8 virtualCiNum = 0u;
cimode = GetCiModeFlag();
cimode = GetVirCImode(virtualCiId);
virtualCiNum = GetVirtualCINum();
if (CI_MODE_ATS != cimode)
{
@@ -9105,7 +9112,6 @@ void SetSigleRouteAutoTriggerManage(UINT8 virCIid, UINT16 routeId, UINT8 setFlag
{
UINT8 chkFState = CI_ERROR;
UINT8 chkFloodState = CI_ERROR;
UINT8 includeVirFlag = GetCiFunctionSwitchConfig(FUNC_INCLUDEVIRCI_FLAG);
UINT8 belongCiId = 0u; /*进路所属联锁ID*/
UINT8 localCiId = 0u; /*本地联锁ID*/
UINT8 belongVirCI = 0u;
@@ -9123,14 +9129,13 @@ void SetSigleRouteAutoTriggerManage(UINT8 virCIid, UINT16 routeId, UINT8 setFlag
belongCiId = GetRouteBelongCiId(routeId); /*获取进路所属联锁ID*/
if (ROUTE_TYPE_AUTO_TRIGGER == autoTriggerType)
{
if (FUNC_SWITCH_ON == includeVirFlag)
{
belongVirCI = GetRouteBelongVirCiId(routeId);
if (belongVirCI != virCIid)
{
flag = 1u;
}
}
if ((0u == routeId) || (routeId >= ROUTE_SUM_MAX) || (belongCiId != localCiId) || (1u == flag))
{
@@ -9242,7 +9247,6 @@ void SetSigleRouteAutoTriggerManage(UINT8 virCIid, UINT16 routeId, UINT8 setFlag
*/
void CancelSigleRouteAutoTrigger(UINT8 virCIid, UINT16 routeId, UINT8 setFlag)
{
UINT8 includeVirFlag = GetCiFunctionSwitchConfig(FUNC_INCLUDEVIRCI_FLAG);
UINT8 belongCiId = 0u; /*进路所属联锁ID*/
UINT8 localCiId = 0u; /*本地联锁ID*/
UINT8 belongVirCI = 0u;
@@ -9252,14 +9256,13 @@ void CancelSigleRouteAutoTrigger(UINT8 virCIid, UINT16 routeId, UINT8 setFlag)
localCiId = GetSystemParaLocalCiId(); /*获取本机联锁ID*/
belongCiId = GetRouteBelongCiId(routeId); /*获取进路所属联锁ID*/
flag = 0u;
if (FUNC_SWITCH_ON == includeVirFlag)
{
belongVirCI = GetRouteBelongVirCiId(routeId);
if (belongVirCI != virCIid)
{
flag = 1u;
}
}
if ((0u == routeId) || (routeId >= ROUTE_SUM_MAX) || (belongCiId != localCiId) || (1u == flag))
{
@@ -11624,3 +11627,74 @@ void SetLocalSnowModelCC(UINT8 setmodle)
; /*不处理*/
}
}
/*
* 功能描述： 获取虚拟联锁类型
* 参数说明： UINT8 chVirCiId 虚拟联锁ID
* 返回值 ：
CI_TYPE_ZX ((UINT8)0x01) 正线联锁
CI_TYPE_CLD ((UINT8)0x04) 车辆段联锁
CI_TYPE_SCX ((UINT8)0x02) 试车线
add by mpt 20260104
*/
UINT8 GetLocalVirCiType(UINT8 chVirCiId)
{
UINT8 cLocalCiId = 0U;
UINT8 ret = 0U;
cLocalCiId = GetSystemParaLocalCiId();
if (chVirCiId == 200U + cLocalCiId)
{
ret = CI_TYPE_SCX;
}
else
{
ret = GetLocalCiType();
}
return ret;
}
/*
* 功能描述：判断本联锁临时限速状态
* 参数说明：无
* 返 回 值：临时限速有效返回失败，清除或与ZC通信正常返回成功
* Created :LYJ
*/
UINT8 CheckLocalCiLSXSStata(void)
{
UINT8 cLocalCiId = 0U;
UINT8 chRet = 0U;
UINT8 chVirCINum = 0U;
UINT8 i = 0U;
UINT8 chXiansuState = 0U;
UINT8 chVirtualCIid = 0U;
UINT8 chTsrSureFlag = 0U;
cLocalCiId = GetSystemParaLocalCiId();
chVirCINum = GetVirtualCINum();
chTsrSureFlag = GetTsrSureFlag(); /*获取临时限速确认标志*/
if (CI_TSR_SURE_YES == chTsrSureFlag)
{
chRet = CI_SUCCESS;
}
else
{
/*临时限速未确认，判断是否做了限速确认*/
for (i = 0U; i < chVirCINum; i++)
{
chVirtualCIid = GetVirtualCIid(i);
chXiansuState = GetVirCILabourCancelLSXianSta(chVirtualCIid);
if ((LINSHIXIANSU_COMM_GOOD_STATE == chXiansuState) || (LINSHIXIANSU_LABOURCANCLE_YES_STATE == chXiansuState))
{
chRet = CI_SUCCESS;
}
else
{
chRet = CI_ERROR;
break;
}
}
}
return chRet;
}
TSCP/src/APP/ciapp/DataManage/DeviceDataManage.h
+22 -7
View File
@@ -74,6 +74,11 @@ typedef struct S_AreaSnowInfoStruct
/* 其他联锁条件检查配置状态相关定义 */
#define LOCAL_AREA_SNOW_SUM_MAX ((UINT8)20) /*本控区及相邻控区发送的区间雨雪站台数量*/
#define ALL_AREA_SNOW_SUM_MAX ((UINT8)254) /*TMC发送的全线区间雨雪站台数量*/
#define ALL_CBTC_CROSS_SUM_MAX ((UINT8)253) /*CBTC跨压最大数量*/
#define ALL_TACS_CROSS_SUM_MAX ((UINT8)253) /*TACS跨压最大数量*/
#define CROSS_SIGNAL_ID_MAX ((UINT8)1499) /*跨压信号机ID最大值*/
#define CBTC_CROSS_ID_MAX ((UINT8)253) /*CBTC跨压最大列车ID*/
#define TACS_CROSS_ID_MAX ((UINT8)253) /*TACS跨压最大列车ID*/
/* 1 信号机
开放0x55
@@ -295,13 +300,6 @@ void SetStartLockFlag(UINT8 setFlag);
LINSHIXIANSU_COMM_BAD_YES_LABOURCANCLE_STATE
*/
UINT8 GetLabourCancelLinShiXianState(void);
/*
功能描述：人工取消临时限速状态迁移处理
参数说明：setFlag 状态
返回值：无
*/
void LabourCancelLSXianStaMoveProc(UINT8 setFlag);
/*
功能描述：人工取消临时限速状态迁移处理
参数说明：setFlag 状态,UINT8 virCIid 虚拟联锁ID
@@ -1972,5 +1970,22 @@ UINT8 GetLocalSnowModelCC(void);
* Created By LQ 2025.11.06
*/
void SetLocalSnowModelCC(UINT8 setmodle);
/*
* 功能描述： 获取虚拟联锁类型
* 参数说明： UINT8 chVirCiId 虚拟联锁ID
* 返回值 ：
CI_TYPE_ZX ((UINT8)0x01) 正线联锁
CI_TYPE_CLD ((UINT8)0x04) 车辆段联锁
CI_TYPE_SCX ((UINT8)0x02) 试车线
add by mpt 20260104
*/
UINT8 GetLocalVirCiType(UINT8 chVirCiId);
/*
* 功能描述：判断本联锁临时限速状态
* 参数说明：无
* 返 回 值：临时限速有效返回失败，清除或与ZC通信正常返回成功
* Created :LYJ
*/
UINT8 CheckLocalCiLSXSStata(void);
#endif
TSCP/src/APP/ciapp/ERROR/ErrorDefine.h
+3
View File
@@ -217,6 +217,8 @@
#define EFUNC_PARSE_LOCAL_CI2RC_DATA ((UINT8)0xD4U) /*函数：ParseCiToLocalRcDataFrame*/
#define EFUNC_PARSE_LOCAL_RC2CI_DATA ((UINT8)0xD5U) /*函数：ParseRcToLocalCiDataFrame*/
#define EFUNC_PARSE_LOCAL_CI2CI_DATA ((UINT8)0xD6U) /*函数：ParseCiToCiDataFrame*/
#define EFUNC_PARSE_LOCAL_OC2CI_DATA ((UINT8)0xD7U) /*函数：ParseOcToCiDataFrame*/
/*************************************************分界线******************************************************************************/
@@ -251,6 +253,7 @@
#define ETYPE_COMM_WITH_TMC ((UINT8)0x17) /*与TMC通信*/
#define ETYPE_COMM_WITH_RC ((UINT8)0x18U) /*与RC通信*/
#define ETYPE_COMM_WITH_OC ((UINT8)0x19U) /*与OC通信*/
/* 信号机故障类型编码 (UINT8)0x21-(UINT8)0x3f */
/* 设备类型 CI_DEVICE_TYPE_SIGNAL */
TSCP/src/APP/ciapp/ESB/ESBConfigDataManage.c
+51
View File
@@ -663,3 +663,54 @@ UINT8 CheckEsbBelSendRange(const UINT16 wCheckEsbId)
return retVal;
}
/*
* 功能描述：获取指定ID紧急停车按钮关联的同站紧急按钮数量
* 参数说明：const UINT16 esbId 紧急停车按钮ID
* 返 回 值：同站紧急按钮数量
* Created By LQ 2025.12.30
*/
UINT8 GetEsbRelOnePlatEsbNum(const UINT16 esbId)
{
UINT16 bufIndex = 0U; /*数组下标*/
UINT8 reVal = 0U;
bufIndex = GetEsbConfigBufIndex(esbId); /*获取数组下标*/
if (ESB_SUM_MAX > bufIndex)
{
reVal = EsbConfigDataStru[bufIndex].RelOnePlatEsbNum;
}
else
{
/*返回0*/
}
return reVal;
}
/*
* 功能描述：获取指定ID紧急停车按钮关联的同站紧急按钮ID数组
* 参数说明：const UINT16 esbId 紧急停车按钮ID
* 返 回 值：NULL 获取数据失败
* 其它 同站紧急按钮ID数组
* Created By LQ 2025.12.30
*/
UINT16* GetEsbRelOnePlatEsbId(const UINT16 esbId)
{
UINT16 bufIndex = 0U; /*数组下标*/
UINT16* reVal = NULL;
bufIndex = GetEsbConfigBufIndex(esbId); /*获取数组下标*/
if (ESB_SUM_MAX > bufIndex)
{
reVal = EsbConfigDataStru[bufIndex].RelOnePlatEsbId;
}
else
{
/*返回NULL*/
}
return reVal;
}
TSCP/src/APP/ciapp/ESB/ESBConfigDataManage.h
+20
View File
@@ -19,6 +19,7 @@
#include "CommonTypes.h"
#include "../System/CiSystemDefine.h"
#include "../System/SystemParameterManage.h"
#include "dquStructInit.h"
#ifdef __cplusplus
@@ -50,6 +51,8 @@ typedef struct S_EsbConfigDataStruct
UINT16 EsbCutoffBuzzRelayId; /*切除蜂鸣器报警继电器ID*/
UINT8 ConfigAtsCiEssSteadyMask; /*是否配置了ATS-CI稳灯状态码位0x55 配置；0xaa未配置*/
UINT8 ConfigAtsCiEssFlashMask; /*是否配置了ATS-CI闪灯状态码位0x55 配置；0xaa未配置*/
UINT8 RelOnePlatEsbNum; /*关联同站ESB数量*/
UINT16 RelOnePlatEsbId[ESB_PROTECT_LINK_NUM]; /*关联同站ESB ID数组*/
} EsbConfigDataStruct;
/*******************************全局变量声明*******************************/
@@ -293,6 +296,23 @@ UINT16 GetEsbCutoffBuzzRelayId(const UINT16 esbId);
*/
UINT8 CheckEsbBelSendRange(const UINT16 wCheckEsbId);
/*
* 功能描述：获取指定ID紧急停车按钮关联的同站紧急按钮数量
* 参数说明：const UINT16 esbId 紧急停车按钮ID
* 返 回 值：同站紧急按钮数量
* Created By LQ 2025.12.30
*/
UINT8 GetEsbRelOnePlatEsbNum(const UINT16 esbId);
/*
* 功能描述：获取指定ID紧急停车按钮关联的同站紧急按钮ID数组
* 参数说明：const UINT16 esbId 紧急停车按钮ID
* 返 回 值：NULL 获取数据失败
* 其它 同站紧急按钮ID数组
* Created By LQ 2025.12.30
*/
UINT16* GetEsbRelOnePlatEsbId(const UINT16 esbId);
#ifdef __cplusplus
}
#endif
TSCP/src/APP/ciapp/ESB/ESBDataManage.c
+301
View File
@@ -171,6 +171,8 @@ UINT8 EsbDataManageInit(void)
EsbDataStru[esbId].EsbCutErrTriggerPressCycNum = 0U; /*紧急关闭旁路按钮误触发按下周期*/
EsbDataStru[esbId].EsbCutErrorFlag = ESB_ERROR_FLAG_NO; /*紧急关闭旁路按钮未故障*/
EsbDataStru[esbId].EsbCutRelayDownState = ESB_RELAY_ERROR_DOWN_YES; /*紧急关闭旁路按钮采集继电器落下状态初始化为通信异常落下*/
EsbDataStru[esbId].cOnePlatEsbState = ESB_STATE_VALID_NO; /*初始化同站紧急按钮未激活*/
EsbDataStru[esbId].cOnePlatEsbCutState = ESB_CUT_NO; /*初始化同站紧急旁路按钮未激活*/
}
rtn = CI_SUCCESS;
return rtn;
@@ -1073,3 +1075,302 @@ UINT8 GetEsbRelayDownState(const UINT16 esbId)
return reVal;
}
/*
* 功能描述： 获取指定ID紧急停车按钮状态(融合了旁路状态)
* 参数说明： const UINT16 esbId, 紧急停车按钮ID
* 返回值 ： 0: 获取数据失败
* >0: 紧急停车按钮状态
*/
UINT8 GetEsbMergeState(const UINT16 esbId)
{
UINT8 reVal = CI_ERROR;
UINT8 chEsbState = 0U;
UINT8 chEsbCutState = 0U;
chEsbState = GetEsbState(esbId);
chEsbCutState = GetEsbCutState(esbId);
if (ESB_CUT_YES == chEsbCutState)
{
reVal = ESB_STATE_VALID_NO;/*未按下*/
}
else
{
if (ESB_STATE_VALID_NO == chEsbState)
{
reVal = ESB_STATE_VALID_NO;/*未按下*/
}
else
{
reVal = ESB_STATE_VALID_YES;
}
}
return reVal;
}
/*
* 功能描述：获取指定ID紧急按钮同站紧急按钮激活状态
* 参数说明：const UINT16 esbId 紧急停车按钮ID
* 返 回 值：0 获取数据失败
* 0x55 紧急未激活
* 0xAA 紧急激活
* Created By LQ 2025.12.29
*/
UINT8 GetOnePlatEsbState(const UINT16 esbId)
{
UINT16 bufIndex = 0U; /*数组下标*/
UINT8 reVal = CI_ERROR;
bufIndex = GetEsbConfigBufIndex(esbId); /*获取数组下标*/
if (ESB_SUM_MAX > bufIndex)
{
reVal = EsbDataStru[bufIndex].cOnePlatEsbState;
}
else
{
/*返回失败*/
}
return reVal;
}
/*
* 功能描述：设置指定ID紧急按钮同站紧急按钮激活状态
* 参数说明：const UINT16 esbId 紧急按钮ID
* const UINT8 esbState 紧急按钮状态
* 返 回 值：无
* Created By LQ 2025.12.29
*/
void SetOnePlatEsbState(const UINT16 esbId, const UINT8 esbState)
{
UINT16 bufIndex = 0U; /*数组下标*/
bufIndex = GetEsbConfigBufIndex(esbId); /*获取数组下标*/
if (ESB_SUM_MAX > bufIndex)
{
if ((ESB_STATE_VALID_NO == esbState) || (ESB_STATE_VALID_YES == esbState))
{
EsbDataStru[bufIndex].cOnePlatEsbState = esbState; /*同站紧急按钮激活状态*/
}
else
{
/*不处理*/
}
}
else
{
/*不处理*/
}
}
/*
* 功能描述：获取指定ID紧急按钮同站紧急旁路按钮激活状态
* 参数说明：const UINT16 esbId 紧急停车按钮ID
* 返 回 值：0 获取数据失败
* 0x55 旁路未激活
* 0xAA 旁路激活
* Created By LQ 2025.12.29
*/
UINT8 GetOnePlatEsbCutState(const UINT16 esbId)
{
UINT16 bufIndex = 0U; /*数组下标*/
UINT8 reVal = CI_ERROR;
bufIndex = GetEsbConfigBufIndex(esbId); /*获取数组下标*/
if (ESB_SUM_MAX > bufIndex)
{
reVal = EsbDataStru[bufIndex].cOnePlatEsbCutState;
}
else
{
/*返回失败*/
}
return reVal;
}
/*
* 功能描述：设置指定ID紧急按钮同站紧急旁路按钮激活状态
* 参数说明：const UINT16 esbId 紧急按钮ID
* const UINT8 esbCutState 紧急旁路按钮状态
* 返 回 值：无
* Created By LQ 2025.12.29
*/
void SetOnePlatEsbCutState(const UINT16 esbId, const UINT8 esbCutState)
{
UINT16 bufIndex = 0U; /*数组下标*/
bufIndex = GetEsbConfigBufIndex(esbId); /*获取数组下标*/
if (ESB_SUM_MAX > bufIndex)
{
if ((ESB_CUT_NO == esbCutState) || (ESB_CUT_YES == esbCutState))
{
EsbDataStru[bufIndex].cOnePlatEsbCutState = esbCutState; /*同站紧急按钮激活状态*/
}
else
{
/*不处理*/
}
}
else
{
/*不处理*/
}
}
/*
* 功能描述：清除同站紧急按钮及旁路按钮激活状态
* 参数说明：无
* 返 回 值：无
* Created By LQ 2025.12.30
*/
void ClearOnePlatEsbAndCutState(void)
{
UINT16 wEsbTotalSum = 0U; /*ESB总数*/
UINT16 ii = 0U;
UINT16 wEsbId = 0U; /*ESB ID*/
wEsbTotalSum = GetTotalEsbCurNum();
/*重置所有紧急按钮的同站紧急按钮及旁路按钮为未激活状态*/
for (ii = 0U; ii < wEsbTotalSum; ii++)
{
wEsbId = GetEsbId(ii);
SetOnePlatEsbState(wEsbId, ESB_STATE_VALID_NO);
SetOnePlatEsbCutState(wEsbId, ESB_CUT_NO);
}
}
/*
* 功能描述：设置指定ID紧急按钮关联的其它同站紧急按钮激活状态
* 参数说明：const UINT16 esbId 紧急按钮ID
* const UINT8 esbState 紧急按钮状态
* 返 回 值：无
* Created By LQ 2025.12.29
*/
void SetRelOtherOnePlatEsbState(const UINT16 esbId, const UINT8 esbState)
{
UINT16 bufIndex = 0U; /*数组下标*/
UINT8 cRelOnePlatEsbNum = 0U; /*关联的其它同站紧急按钮数量*/
UINT16* pRelOnePlatEsbId = NULL; /*关联的其它同站紧急按钮ID*/
UINT8 ii = 0U;
bufIndex = GetEsbConfigBufIndex(esbId); /*获取数组下标*/
cRelOnePlatEsbNum = GetEsbRelOnePlatEsbNum(esbId);
pRelOnePlatEsbId = GetEsbRelOnePlatEsbId(esbId);
if ((ESB_SUM_MAX > bufIndex) && (0U < cRelOnePlatEsbNum) && (NULL != pRelOnePlatEsbId))
{
if ((ESB_STATE_VALID_NO == esbState) || (ESB_STATE_VALID_YES == esbState))
{
for (ii = 0U; ii < cRelOnePlatEsbNum; ii++)
{
SetOnePlatEsbState(pRelOnePlatEsbId[ii], esbState);
}
}
else
{
/*不处理*/
}
}
else
{
/*不处理*/
}
}
/*
* 功能描述：设置指定ID紧急按钮关联的其它同站紧急旁路按钮激活状态
* 参数说明：const UINT16 esbId 紧急按钮ID
* const UINT8 esbCutState 紧急旁路按钮状态
* 返 回 值：无
* Created By LQ 2025.12.29
*/
void SetRelOtherOnePlatEsbCutState(const UINT16 esbId, const UINT8 esbCutState)
{
UINT16 bufIndex = 0U; /*数组下标*/
UINT8 cRelOnePlatEsbNum = 0U; /*关联的其它同站紧急按钮数量*/
UINT16* pRelOnePlatEsbId = NULL; /*关联的其它同站紧急按钮ID*/
UINT8 ii = 0U;
bufIndex = GetEsbConfigBufIndex(esbId); /*获取数组下标*/
cRelOnePlatEsbNum = GetEsbRelOnePlatEsbNum(esbId);
pRelOnePlatEsbId = GetEsbRelOnePlatEsbId(esbId);
if ((ESB_SUM_MAX > bufIndex) && (0U < cRelOnePlatEsbNum) && (NULL != pRelOnePlatEsbId))
{
if ((ESB_CUT_NO == esbCutState) || (ESB_CUT_YES == esbCutState))
{
for (ii = 0U; ii < cRelOnePlatEsbNum; ii++)
{
SetOnePlatEsbCutState(pRelOnePlatEsbId[ii], esbCutState);
}
}
else
{
/*不处理*/
}
}
else
{
/*不处理*/
}
}
/*
* 功能描述：检查指定ID紧急按钮关联的其它同站紧急按钮状态
* 参数说明：const UINT16 esbId 紧急按钮ID
* 返 回 值：1 紧急无效或旁路有效
* 0 紧急有效
* Created By LQ 2025.12.29
*/
UINT8 CheckRelOtherOnePlatEsbState(const UINT16 esbId)
{
UINT8 cRetVal = CI_ERROR;
UINT16 bufIndex = 0U; /*数组下标*/
UINT8 cRelOnePlatEsbNum = 0U; /*关联的其它同站紧急按钮数量*/
UINT16* pRelOnePlatEsbId = NULL; /*关联的其它同站紧急按钮ID*/
UINT8 ii = 0U;
UINT8 cEsbState = 0U; /*紧急按钮状态*/
UINT8 cEsbCutState = 0U; /*紧急按钮旁路状态*/
bufIndex = GetEsbConfigBufIndex(esbId); /*获取数组下标*/
cRelOnePlatEsbNum = GetEsbRelOnePlatEsbNum(esbId);
pRelOnePlatEsbId = GetEsbRelOnePlatEsbId(esbId);
if ((ESB_SUM_MAX > bufIndex) && (NULL != pRelOnePlatEsbId))
{
cRetVal = CI_SUCCESS;
for (ii = 0U; ii < cRelOnePlatEsbNum; ii++)
{
cEsbState = GetEsbState(pRelOnePlatEsbId[ii]);
cEsbCutState = GetEsbCutState(pRelOnePlatEsbId[ii]);
if ((ESB_STATE_VALID_NO == cEsbState) || (ESB_CUT_YES == cEsbCutState))
{
/*继续检查*/
}
else
{
cRetVal = CI_ERROR; /*存在一个ESB紧急有效且旁路无效，返回0*/
break;
}
}
}
else
{
cRetVal = CI_ERROR; /*入参非法，返回0*/
}
return cRetVal;
}
TSCP/src/APP/ciapp/ESB/ESBDataManage.h
+82
View File
@@ -49,6 +49,8 @@ typedef struct S_EsbDataStruct
UINT32 EsbCutErrTriggerPressCycNum; /*紧急关闭旁路按钮误触发按下周期*/
UINT8 EsbCutErrorFlag; /*紧急关闭旁路按钮故障标志，0x55-未故障，0xaa-故障*/
UINT8 EsbCutRelayDownState; /*紧急关闭旁路按钮采集继电器落下状态，0x55-正常采集落下，0xaa-通信异常落下*/
UINT8 cOnePlatEsbState; /*同站紧急按钮激活状态：0x55-未激活，0xAA-激活*/
UINT8 cOnePlatEsbCutState; /*同站紧急旁路按钮激活状态：0x55-未激活，0xAA-激活*/
} EsbDataStruct;
/*******************************全局变量声明*******************************/
@@ -406,6 +408,86 @@ void SetEsbRelayDownState(const UINT16 esbId, const UINT8 cRelayDownState);
* Created By LQ 2025.04.01
*/
UINT8 GetEsbRelayDownState(const UINT16 esbId);
/*
* 功能描述： 获取指定ID紧急停车按钮状态(融合了旁路状态)
* 参数说明： const UINT16 esbId, 紧急停车按钮ID
* 返回值 ： 0: 获取数据失败
* >0: 紧急停车按钮状态
*/
UINT8 GetEsbMergeState(const UINT16 esbId);
/*
* 功能描述：获取指定ID紧急按钮同站紧急按钮激活状态
* 参数说明：const UINT16 esbId 紧急停车按钮ID
* 返 回 值：0 获取数据失败
* 0x55 紧急未激活
* 0xAA 紧急激活
* Created By LQ 2025.12.29
*/
UINT8 GetOnePlatEsbState(const UINT16 esbId);
/*
* 功能描述：设置指定ID紧急按钮同站紧急按钮激活状态
* 参数说明：const UINT16 esbId 紧急按钮ID
* const UINT8 esbState 紧急按钮状态
* 返 回 值：无
* Created By LQ 2025.12.29
*/
void SetOnePlatEsbState(const UINT16 esbId, const UINT8 esbState);
/*
* 功能描述：获取指定ID紧急按钮同站紧急旁路按钮激活状态
* 参数说明：const UINT16 esbId 紧急停车按钮ID
* 返 回 值：0 获取数据失败
* 0x55 旁路未激活
* 0xAA 旁路激活
* Created By LQ 2025.12.29
*/
UINT8 GetOnePlatEsbCutState(const UINT16 esbId);
/*
* 功能描述：设置指定ID紧急按钮同站紧急旁路按钮激活状态
* 参数说明：const UINT16 esbId 紧急按钮ID
* const UINT8 esbCutState 紧急旁路按钮状态
* 返 回 值：无
* Created By LQ 2025.12.29
*/
void SetOnePlatEsbCutState(const UINT16 esbId, const UINT8 esbCutState);
/*
* 功能描述：清除同站紧急按钮及旁路按钮激活状态
* 参数说明：无
* 返 回 值：无
* Created By LQ 2025.12.30
*/
void ClearOnePlatEsbAndCutState(void);
/*
* 功能描述：设置指定ID紧急按钮关联的其它同站紧急按钮激活状态
* 参数说明：const UINT16 esbId 紧急按钮ID
* const UINT8 esbState 紧急按钮状态
* 返 回 值：无
* Created By LQ 2025.12.29
*/
void SetRelOtherOnePlatEsbState(const UINT16 esbId, const UINT8 esbState);
/*
* 功能描述：设置指定ID紧急按钮关联的其它同站紧急旁路按钮激活状态
* 参数说明：const UINT16 esbId 紧急按钮ID
* const UINT8 esbCutState 紧急旁路按钮状态
* 返 回 值：无
* Created By LQ 2025.12.29
*/
void SetRelOtherOnePlatEsbCutState(const UINT16 esbId, const UINT8 esbCutState);
/*
* 功能描述：检查指定ID紧急按钮关联的其它同站紧急按钮状态
* 参数说明：const UINT16 esbId 紧急按钮ID
* 返 回 值：1 紧急无效或旁路有效
* 0 紧急有效
* Created By LQ 2025.12.29
*/
UINT8 CheckRelOtherOnePlatEsbState(const UINT16 esbId);
#ifdef __cplusplus
}
TSCP/src/APP/ciapp/EnvelopeManage/ELMDataPrepare.c
+3 -3
View File
@@ -1529,7 +1529,7 @@ UINT8 elm_PrepareEnvelopeIsSelf(IN const EnvelopeStruct* ptemp)
/** 在一个OC*/
ret = ELM_BELONG_OWNER;
}
else if((localOCid != pointABelongOcid) && (localOCid != pointBBelongOcid))
else if ((localOCid != pointABelongOcid) && (localOCid != pointBBelongOcid))
{
/** 不在同一OC*/
ret = ELM_BELONG_OTHER;
@@ -1683,8 +1683,8 @@ UINT8 elm_PrepareOCCommStatus(UINT8 OCID)
UINT8 ret = ELM_COM_STATUS_ERROR;
UINT8 funRtn = TRANSMIT_STATE_BAD;
/** 获取OC通信状态 */
funRtn = GetCiTransmitState(CI_SYSTEM_TYPE_RCI,OCID);
/** 获取Rc通信状态 */
funRtn = GetRcPbTacsTransmitState(OCID);
/** 设置函数返回值 */
ASSERT_SETRET(TRANSMIT_STATE_GOOD == funRtn,ret,ELM_COM_STATUS_OK,ELM_COM_STATUS_ERROR)
TSCP/src/APP/ciapp/HLHTMsgHead/HLHTCommonDataPacketHead.c
+1
View File
@@ -156,6 +156,7 @@ UINT8 HLHTRecvCommonPacketHeadCheck(UINT16 LocalDevName, UINT16 RemoteDevName, U
if ((CI_SYSTEM_TYPE_CI == devType) || (CI_SYSTEM_TYPE_RC == devType))
{
/*修改：根据发送方类型获取电子地图校验*/
emapVer = GetCiTranCiDataCheckVer((UINT8)(RemoteDevName & 0x00FFU), LocalDevName);
emapCheckVer = CI_SUCCESS;
}
TSCP/src/APP/ciapp/HLHTMsgHead/HLHTHeadContexManage.c
+50 -14
View File
@@ -17,6 +17,8 @@
HLHTHeadContextStru ciHLHTHeadCtxs[CI_SUM_MAX]={0U};/*存放与本控区通信的相邻CI互联互通报文头上下文数据*/
HLHTHeadContextStru gSzRcHLHTHeadCtxs[CI_SUM_MAX] = { 0U }; /*存放与本控区通信的相邻RC互联互通报文头上下文数据*/
HLHTHeadContextStru ciHLHTHeadCtxsCiToRc[CI_SUM_MAX] = { 0U };/*存放本控区CI同步的相邻CI互联互通报文头上下文数据*/
HLHTHeadContextStru gSzRcHLHTHeadCtxsCiToRc[CI_SUM_MAX] = { 0U }; /*存放本控区CI同步的相邻RC互联互通报文头上下文数据*/
HLHTHeadContextStru vobcHLHTHeadCtxs[VOBC_SUM_MAX]={0U};/*存放与本CI通信的VOBC互联互通报文头上下文数据*/
HLHTHeadContextStru vobcBackupHLHTHeadCtxs[VOBC_BACKUP_SUM_MAX] = { 0U };/*存放与本CI通信的后备模式VOBC互联互通报文头上下文数据*/
HLHTHeadContextStru zcHLHTHeadCtxs[ZC_SUM_MAX]={0U};/*存放与本CI通信的ZC互联互通报文头上下文数据*/
@@ -576,7 +578,7 @@ static UINT8 GetHLHTHeadCtxTmepVars(const UINT8 devType, UINT16 *devMaxSum, HLHT
UINT8 retVal = CI_ERROR;
UINT16 maxDevSum = 0u;
HLHTHeadContextStru *tempHeadCtxPtr = NULL;
UINT8 chSystemWorkType = GetSystemWorkType();; /*系统工作类型*/
UINT8 chSystemWorkType = GetSystemWorkType();/*系统工作类型*/
UINT8 cRcWorkMode = 0U;/*本系统当前工作模式*/
cRcWorkMode = GetLocalRcWorkMode();
@@ -699,7 +701,7 @@ static void ProcHlhtHeadCtxTimeOutDiffSys(const UINT32 timeoutSnCount, const UIN
HLHTHeadContextStru tempHeadCtx = { 0u };
UINT8 headValid = 0u;
INT32 remainValidiy;/*剩余的时间*/
UINT8 chRcID = 0U;
if (NULL != headCtxs)
{
for (i = 0u;i < headCount;i++)
@@ -736,23 +738,11 @@ static void ProcHlhtHeadCtxTimeOutDiffSys(const UINT32 timeoutSnCount, const UIN
}
if (0u == headValid)
{
if ((headCtxs == axleHLHTHeadCtxs) || (headCtxs == gSzRcAxleHLHTHeadCtxs)) /*计轴系统中断时,GAL层对方序号,收到对方数据时本方序号,设置0xFFFFFFFF*/
{
headCtxs[i].logId = 0u;
headCtxs[i].sourceRecvOppMsgSN = 0u;
headCtxs[i].sourcePreOwnMsgSN = 0u;
headCtxs[i].sourceComPeriod = 0u;
headCtxs[i].sourceCrntOwnMsgSN = 0xFFFFFFFFu;
headCtxs[i].ciPreRecvOwnSn = 0xFFFFFFFFu;
}
else
{
(void)CommonMemSet(&(headCtxs[i]), (UINT32)sizeof(HLHTHeadContextStru), 0u, (UINT32)sizeof(HLHTHeadContextStru));
headCtxs[i].sourceCrntOwnMsgSN = 0xFFFFFFFFu;
headCtxs[i].ciPreRecvOwnSn = 0xFFFFFFFFu;
}
}
else
{
; /*不处理*/
@@ -1291,3 +1281,49 @@ HLHTHeadContextStru* GetCiToRcHLHTOcHeadCtx(const UINT8 ocId)
return pstrRetVal;
}
/*
* 功能描述：获取指定CI的CI-RC同步CI互联互通报文头上下文数据
* 参数说明：const UINT8 chDevId 设备ID
* 返 回 值：NULL 获取数据失败
* 非NULL 获取数据成功
* Created By fan 2025.12.31
*/
HLHTHeadContextStru* GetCiToRcWithCiHeadCtx(const UINT8 chDevId)
{
HLHTHeadContextStru* pstrRetVal = NULL;
if ((0U < chDevId) && (CI_SUM_MAX > chDevId))
{
pstrRetVal = &ciHLHTHeadCtxsCiToRc[chDevId];
}
else
{
/*不处理*/
}
return pstrRetVal;
}
/*
* 功能描述：获取指定CI的CI-RC同步RC互联互通报文头上下文数据
* 参数说明：const UINT8 chDevId 设备ID
* 返 回 值：NULL 获取数据失败
* 非NULL 获取数据成功
* Created By fan 2025.12.31
*/
HLHTHeadContextStru* GetCiToRcWithRcHeadCtx(const UINT8 chDevId)
{
HLHTHeadContextStru* pstrRetVal = NULL;
if ((0U < chDevId) && (CI_SUM_MAX > chDevId))
{
pstrRetVal = &gSzRcHLHTHeadCtxsCiToRc[chDevId];
}
else
{
/*不处理*/
}
return pstrRetVal;
}
TSCP/src/APP/ciapp/HLHTMsgHead/HLHTHeadContexManage.h
+19
View File
@@ -40,6 +40,8 @@ extern "C" {
/*******************************全局变量声明*******************************/
extern HLHTHeadContextStru ciHLHTHeadCtxs[CI_SUM_MAX];/*存放与本控区通信的相邻CI互联互通报文头上下文数据*/
extern HLHTHeadContextStru gSzRcHLHTHeadCtxs[CI_SUM_MAX]; /*存放与本控区通信的相邻RC互联互通报文头上下文数据*/
extern HLHTHeadContextStru ciHLHTHeadCtxsCiToRc[CI_SUM_MAX];/*存放与本控区通信的相邻CI互联互通报文头上下文数据*/
extern HLHTHeadContextStru gSzRcHLHTHeadCtxsCiToRc[CI_SUM_MAX]; /*存放与本控区通信的相邻RC互联互通报文头上下文数据*/
extern HLHTHeadContextStru vobcHLHTHeadCtxs[VOBC_SUM_MAX];/*存放与本CI通信的VOBC互联互通报文头上下文数据*/
extern HLHTHeadContextStru vobcBackupHLHTHeadCtxs[VOBC_BACKUP_SUM_MAX];/*存放与本CI通信的后备模式VOBC互联互通报文头上下文数据*/
extern HLHTHeadContextStru zcHLHTHeadCtxs[ZC_SUM_MAX];/*存放与本CI通信的ZC互联互通报文头上下文数据*/
@@ -298,6 +300,23 @@ extern "C" {
* Created By fan 2025.11.12
*/
HLHTHeadContextStru* GetCiToRcHLHTOcHeadCtx(const UINT8 ocId);
/*
* 功能描述：获取指定CI的CI-RC同步CI互联互通报文头上下文数据
* 参数说明：const UINT8 chDevId 设备ID
* 返 回 值：NULL 获取数据失败
* 非NULL 获取数据成功
* Created By fan 2025.12.31
*/
HLHTHeadContextStru* GetCiToRcWithCiHeadCtx(const UINT8 chDevId);
/*
* 功能描述：获取指定CI的CI-RC同步RC互联互通报文头上下文数据
* 参数说明：const UINT8 chDevId 设备ID
* 返 回 值：NULL 获取数据失败
* 非NULL 获取数据成功
* Created By fan 2025.12.31
*/
HLHTHeadContextStru* GetCiToRcWithRcHeadCtx(const UINT8 chDevId);
#ifdef __cplusplus
}
TSCP/src/APP/ciapp/IO/DeviceRelayDataProcess.c
+2217 -363
View File
File diff suppressed because it is too large Load Diff
TSCP/src/APP/ciapp/IO/DeviceRelayDataProcess.h
+217 -5
View File
@@ -137,12 +137,14 @@ void SwitchDeviceToRelayStateProc(void);
*/
void PhySecRelayToDeviceStateProc(void);
#if 0
/*
* 功能描述： 更新区段计轴复位继电器状态
* 参数说明： void
* 返回值 ： void
*/
void PhySecResetToRelayStateProc(void);
#endif
/*
* 功能描述： 更新区段计轴复位继电器状态
* 参数说明： void
@@ -326,12 +328,17 @@ void OcSwitchDeviceOutput(void);
UINT8 GetOcSignalColor(UINT16 signalId);
/*
* 功能描述： 获取OC道岔设备颜色
* 功能描述： 获取OC道岔设备状态
* 参数说明：
UINT16 signalId：信号机id
* 返回值 ： void
UINT16 switchId：道岔id
UINT8 mainControlOCId 主控OCId
* 返回值 ：
* ((UINT8)0x01) 道岔定位
* ((UINT8)0x02) 道岔反位
* ((UINT8)0x04) 道岔四开
* ((UINT8)0x08) 道岔移动
*/
UINT8 GetOcSwitchState(UINT16 switchId);
UINT8 GetOcSwitchState(UINT16 switchId, UINT8 mainControlOCId);
/*
* 功能描述： 间隙探测脉冲接口方式启动驱动处理
@@ -803,7 +810,7 @@ UINT8 WashMachineWorkModeRelayProc(const UINT16 washMachineId);
* CI_SUCCESS: 更新成功
* by cgh 20231113
*/
UINT8 DownWashDevToRelayStaProc(const UINT16 washMachineId);
void DownWashDevToRelayStaProc(const UINT16 washMachineId);
/*
* 功能描述： 降级模式洗车线关联进路状态检查
@@ -991,6 +998,211 @@ UINT8 GetSndDetBtnCollTolerateRet(const UINT16 wSignalId);
*/
void SetAllSingleSwitchZzjState(UINT16 switchCurSum);
/*
* 功能描述： 指定洗车机ID降级模式洗车按钮状态更新
* 参数说明： const UINT16 washMachineId 洗车机ID
* 返回值 ： void
*/
void WashMachineButtonStateProc(const UINT16 washMachineId);
/*
* 功能描述： 指定洗车机ID降级模式请求信息处理
* 参数说明： const UINT16 washMachineId 洗车机ID
* 返回值 ： void
*/
void WashMachineApplyStateProc(const UINT16 washMachineId);
/*
* 功能描述： 指定洗车机ID降级模式洗车请求信息处理
* 参数说明： const UINT16 washMachineId 洗车机ID
* 返回值 ： void
*/
void WashMachineApplyProc(const UINT16 washMachineId);
/*
* 功能描述： 指定洗车机ID降级模式反向通过请求信息处理
* 参数说明： const UINT16 washMachineId 洗车机ID
* 返回值 ： void
*/
void WashMachinePassApplyProc(const UINT16 washMachineId);
/*
* 功能描述： 洗车线控制室更新洗车同意按钮逻辑
* 参数说明： const UINT16 washMachineId 洗车机ID
* 返回值 ： void
*/
void WashMachineButtonUpdate(const UINT16 washMachineId);
/*
* 功能描述： DCC更新洗车同意按钮逻辑
* 参数说明： const UINT16 washMachineId 洗车机ID
* 返回值 ： void
*/
void WashMachineDCCButtonUpdate(const UINT16 washMachineId);
/*
* 功能描述： 融合洗车同意状态
* 参数说明： const UINT16 washMachineId 洗车机ID
* 返回值 ： void
*/
void FusionWashMachineAllowState(const UINT16 washMachineId);
/*
* 功能描述： 洗车线控制室更新反向洗车同意按钮逻辑
* 参数说明： const UINT16 washMachineId 洗车机ID
* 返回值 ： void
*/
void WashMachinePassButtonUpdate(const UINT16 washMachineId);
/*
* 功能描述： DCC更新反向洗车同意按钮逻辑
* 参数说明： const UINT16 washMachineId 洗车机ID
* 返回值 ： void
*/
void WashMachineDCCPassButtonUpdate(const UINT16 washMachineId);
/*
* 功能描述： 融合反向通过同意按钮状态
* 参数说明： const UINT16 washMachineId 洗车机ID
* 返回值 ： void
*/
void FusionWashMachinePassAllowState(const UINT16 washMachineId);
/*
* 功能描述： 降级模式洗车线洗车请求指示灯
* 参数说明： const UINT16 washMachineId 洗车机ID
* 返回值 ：void
*/
void WashMachineApplyLight(const UINT16 washMachineId);
/*
* 功能描述： 降级模式DCC洗车请求指示灯
* 参数说明： const UINT16 washMachineId 洗车机ID
* 返回值 ：void
*/
void WashMachineDccApplyLight(const UINT16 washMachineId);
/*
* 功能描述： 降级模式洗车线洗车反向通过请求指示灯
* 参数说明： const UINT16 washMachineId 洗车机ID
* 返回值 ：void
*/
void WashMachinePassApplyLight(const UINT16 washMachineId);
/*
* 功能描述： 降级模式DCC洗车反向通过请求指示灯
* 参数说明： const UINT16 washMachineId 洗车机ID
* 返回值 ：void
*/
void WashMachineDccPassApplyLight(const UINT16 washMachineId);
/*
* 功能描述： 降级模式洗车同意指示灯
* 参数说明： const UINT16 washMachineId 洗车机ID
* 返回值 ：void
*/
void WashMachineAllowLight(const UINT16 washMachineId);
/*
* 功能描述： 降级模式DCC洗车同意指示灯
* 参数说明： const UINT16 washMachineId 洗车机ID
* 返回值 ：void
*/
void WashMachineDccAllowLight(const UINT16 washMachineId);
/*
* 功能描述： 降级模式洗车同意反向通过指示灯
* 参数说明： const UINT16 washMachineId 洗车机ID
* 返回值 ：void
*/
void WashMachinePassAllowLight(const UINT16 washMachineId);
/*
* 功能描述： 降级模式DCC洗车同意反向通过指示灯
* 参数说明： const UINT16 washMachineId 洗车机ID
* 返回值 ：void
*/
void WashMachineDccPassAllowLight(const UINT16 washMachineId);
/*
* 功能描述： 更新屏蔽门对应IBP盘发车按钮继电器状态
* 参数说明： const UINT16 wPsdId 屏蔽门ID
* 返回值 ： CI_ERROR: 更新失败
* CI_SUCCESS: 更新成功
*/
UINT8 PsdIbpRelToDevStaProc(const UINT16 wPsdId);
/*
* 功能描述：同站紧急按钮及旁路按钮状态处理
* 参数说明：void
* 返 回 值：无
* Created By LQ 2025.12.30
*/
void OnePlatEsbAndCutBtnProc(void);
/*
* 功能描述：取消当前未异常打开的站台门的异常状态
* 参数说明： const UINT16 doorId，屏蔽门ID
* 返回值 ：无
*Create fan 2026.03.26
*/
void CancelPsdExceptState(UINT16 doorId);
/*
* 功能描述： 设置道岔的每一个OC的主控状态
* 参数说明：
UINT16 switchId：道岔id
* 返回值 ：void
* add by mpt 20260326
*/
void SetOcSwitchControlState(UINT16 switchId);
/*
* 功能描述： 仲裁当前道岔的主控OC
* 参数说明： UINT16 switchCurSum 道岔总数
* 返回值 ： 无
* add by mpt 20260326
*/
void SetAllSwitchCurMainControlOC(UINT16 switchCurSum);
/*
* 功能描述： OC道岔主控命令生成处理
* 参数说明： UINT16 switchId 道岔ID
* 返回值 ： void
*/
void OutSwitchControlModeCmd(UINT16 switchId);
/*
* 功能描述： 道岔无主控时产生主备控命令处理
* 参数说明： UINT16 switchId
* 返回值 ： void
*/
void SwitchMainControlCmdOut(UINT16 switchId, UINT8 ocId);
/*
* 功能描述： OC道岔主控状态管理
* 参数说明： void
* 返回值 ： void
*/
void OcSwitchControlModeCmdOutput(void);
/*
* 功能描述： 双主防护模块
* 参数说明： UINT16 switchId 道岔ID
* 返回值 ： void
*/
void SwitchDoubleMainProtect(UINT16 switchId);
/*
* 功能描述：道岔寻表模块
* 参数说明： UINT16 switchId 道岔ID
* 返回值 ： void
* add by mpt 20260328
*/
void FindSwitchPostionCmdOut(UINT16 switchId);
/*
* 功能描述：道岔寻表超时检测模块
* 参数说明： UINT16 switchId 道岔ID
* 返回值 ： void
* add by mpt 20260330
*/
void FindSwitchPostionCmdTimeOutCheck(UINT16 switchId);
#ifdef __cplusplus
}
#endif
TSCP/src/APP/ciapp/IO/InputDataProcess.c
+745 -1814
View File
File diff suppressed because it is too large Load Diff
TSCP/src/APP/ciapp/IO/InputDataProcess.h
+8 -9
View File
@@ -128,14 +128,6 @@ void ProcessPscToCiData(void);
*/
UINT8 ProcessAtsOrXianDiToCiData(void);
/*
* 功能描述： 处理车辆段的ATS或现地到CI数据
* 参数说明： void
* 返回值 ： 0:处理失败
* 1:处理成功
*/
UINT8 ProcessAtsOrXianDiToCiDataCld(void);
/*
* 功能描述： 处理设备逻辑状态
* 参数说明： void
@@ -304,7 +296,7 @@ UINT8 CheckOrderWhetherDoing(UINT8 virCIid,UINT8 belongVirCIid,UINT8 orderType,U
* UINT8 MaskType 码位类型
* 返回值 ： 无
*/
void DealAutoReturnMask_UseVirCI(UINT16 DeviceId,UINT16*maskBuf,UINT8 MaskType,UINT16 index);
void DealAutoReturnMask(UINT16 DeviceId,UINT8* pMaskBuf,UINT8 MaskType,UINT16 index);
/*
* 功能描述： 获取全站维修点灯状态
* 参数说明： UINT8 virCIid 虚拟联锁ID
@@ -545,6 +537,13 @@ void SignalTrainCrossPro(void);
* 返回值 ： void
*/
void ProcessIvocToRCData(void);
/*
* 功能描述： Vobc点连式信息清除
* 参数说明： UINT16 wTrainId：VOBCid
* 返回值 ： void
* by lyj 20260316
*/
void VobcBlocLinkDataClear(const UINT16 wTrainId);
#ifdef __cplusplus
}
TSCP/src/APP/ciapp/IO/OutputDataProcess.c
+1349 -1050
View File
File diff suppressed because it is too large Load Diff
TSCP/src/APP/ciapp/IO/OutputDataProcess.h
+90 -6
View File
@@ -92,6 +92,7 @@ UINT8 CiToAtsBackInfoFunctionJudge(const UINT8 functionId,const UINT8 deviceType
*/
void IndicatorStateProc(void);
#if 0
/*
* 功能描述： 指示器状态处理
* 参数说明： void
@@ -99,6 +100,7 @@ void IndicatorStateProc(void);
*/
void IndicatorStateProc_UseVirCI(UINT8 virCIid);
#endif
/*
* 功能描述： 非进路继电器状态处理
* 参数说明： void
@@ -147,12 +149,7 @@ void SignaDsBreakAlarmIndicator_Vir(UINT8 virCIid,UINT8 devId);
*/
void CiToCiOutputCmdProc(void);
/*
* 功能描述： 根据无人折返指示灯的闪灯和稳灯状态驱动继电器或设置状态
* 参数说明： 无
* 返回值 ： 无
*/
static void AutoRtnIndictStatusProc_VirCI(void);
/*
* 功能描述： 获取组合自动进路所属虚拟联锁ID
* 参数说明： groupAutoRouteId 组合自动进路的ID
@@ -463,6 +460,93 @@ void RtnRealyAdhesionStatePro(void);
* by cgh 20250928
*/
UINT16 GetOverlapLaborUnlockBackTime(const UINT16 overlapId);
/*
* 功能描述： 设置联锁I系II系工作状态指示灯
* 参数说明： const UINT16 wFIndicatorId I系指示灯id
* const UINT16 wSIndicatorId II系指示灯id
* 返回值 ： 无
* by lyj 20260105
*/
void SetWorkStatusIndicator(const UINT16 wFIndicatorId, const UINT16 wSIndicatorId);
/*
* 功能描述： 设置信号故障关闭指示灯
* 参数说明： const UINT16 wIndicatorId 指示灯id
* 返回值 ： 无
* by lyj 20260105
*/
void SetSigFaultCloseIndicator(const UINT16 wIndicatorId);
/*
* 功能描述： 设置道岔挤岔指示灯
* 参数说明： const UINT16 wIndicatorId 指示灯id
* 返回值 ： 无
* by lyj 20260105
*/
void SetSwitchJiChaIndicator(const UINT16 wIndicatorId);
/*
* 功能描述： 设置车库门故障指示灯
* 参数说明： const UINT16 wIndicatorId 指示灯id
* 返回值 ： 无
* by lyj 20260105
*/
void SetGDoorFaultIndicator(const UINT16 wIndicatorId);
/*
* 功能描述： 设置继电器混线指示灯
* 参数说明： const UINT16 wIndicatorId 指示灯id
* 返回值 ： 无
* by lyj 20260105
*/
void SetRealyHunXianIndicator(const UINT16 wIndicatorId);
/*
* 功能描述： 设置应急盘指示灯
* 参数说明： const UINT16 wIndicatorId 指示灯id
* 返回值 ： 无
* by lyj 20260106
*/
void SetYjpIndicator(const UINT16 wIndicatorId);
/*
* 功能描述： 设置试车请求指示灯
* 参数说明： const UINT16 wIndicatorId 指示灯id
* 返回值 ： 无
* by lyj 20260106
*/
void SetSCApplyIndicator(const UINT16 wIndicatorId);
/*
* 功能描述： 设置试车同意指示灯
* 参数说明： const UINT16 wIndicatorId 指示灯id
* 返回值 ： 无
* by lyj 20260106
*/
void SetSCAllowIndicator(const UINT16 wIndicatorId);
/*
* 功能描述： 设置试车结束指示灯
* 参数说明： const UINT16 wIndicatorId 指示灯id
* 返回值 ： 无
* by lyj 20260106
*/
void SetSCOverIndicator(const UINT16 wIndicatorId);
/*
* 功能描述： 处理点连式列车发送数据信息
* 参数说明： void
* 返回值 ： 无
* by lyj 20260314
*/
void VobcBlocLinkOutputProcess(void);
/*
* 功能描述： 处理点连式列车进路信息
* 参数说明： const UINT16 wTrainId 列车ID
* 返回值 ： 计算结果
* by lyj 20260316
*/
UINT8 BlocLinkTrainRouteMange(const UINT16 wTrainId);
/*
* 功能描述： 处理点连式列车逻辑区段信息
* 参数说明： const UINT16 wTrainId 列车ID
* 返回值 ： 计算结果
* by lyj 20260316
*/
UINT8 BlocLinkTrainLogSecMange(const UINT16 wTrainId);
#ifdef __cplusplus
}
TSCP/src/APP/ciapp/Indicator/IndicatorConfigDataManage.c
+27 -1
View File
@@ -423,7 +423,7 @@ UINT8 GetIndicatorDevId(UINT16 indicatorId)
* >0u: 报警灯设备ID
* by cgh 20240910
*/
UINT8 GetIndicatorRelNonReturnId(UINT16 indicatorId)
UINT16 GetIndicatorRelNonReturnId(UINT16 indicatorId)
{
UINT16 wRetVal = CI_ERROR;
@@ -457,3 +457,29 @@ UINT8 GetIndicatorRelNonReturnId(UINT16 indicatorId)
return wRetVal;
}
/*
* 功能描述： 根据指示灯ID获取指示灯虚拟联锁ID
* 参数说明： UINT16 wIndicId 指示灯ID
* 返回值 ： 0u: 获取数据失败
* >0u: 虚拟联锁ID
* BY:lyj 20260105
*/
UINT8 GetIndicBelongRtuId(UINT16 wIndicId)
{
UINT16 bufIndex = 0U; /*数组下标*/
UINT8 reVal = CI_ERROR;
bufIndex = GetIndicatorConfigBufIndex(wIndicId); /*获取指示器相关继电器数组下标*/
if (INDICATOR_SUM_MAX > bufIndex)
{
reVal = IndicatorConfigDataStru[bufIndex].chBelongVirCIid;
}
else
{
/*不处理*/
}
return reVal;
}
TSCP/src/APP/ciapp/Indicator/IndicatorConfigDataManage.h
+10 -1
View File
@@ -30,6 +30,7 @@ typedef struct S_IndicatorConfigDataStruct
UINT8 IdSum; /*相关Id数量(配置字段)*/
UINT16 IdBuf[INDICATOR_RELAY_SUM_MAX]; /*相关ID (配置字段)*/
UINT8 BjdDeviceId; /*报警灯设备ID*/
UINT8 chBelongVirCIid; /*所属虚拟联锁ID*/
} IndicatorConfigDataStruct;
/*cgh-合并ECI11.0:OC站表示灯 OC站指一级集中站（CI+OC）的现地工作站、二级集中站（OC）的有岔非集现地工作站，中央联锁工作站*/
@@ -183,7 +184,15 @@ UINT8 GetIndicatorDevId(UINT16 indicatorId);
* >0u: 报警灯设备ID
* by cgh 20240910
*/
UINT8 GetIndicatorRelNonReturnId(UINT16 indicatorId);
UINT16 GetIndicatorRelNonReturnId(UINT16 indicatorId);
/*
* 功能描述： 根据指示灯ID获取指示灯虚拟联锁ID
* 参数说明： UINT16 wIndicId 指示灯ID
* 返回值 ： 0u: 获取数据失败
* >0u: 虚拟联锁ID
* BY:lyj 20260105
*/
UINT8 GetIndicBelongRtuId(UINT16 wIndicId);
#ifdef __cplusplus
}
TSCP/src/APP/ciapp/Indicator/IndicatorDefine.h
+3 -1
View File
@@ -64,7 +64,9 @@
#define INDICATOR_TYPE_SWITCH_JICHA ((UINT8)0x24) /* 道岔挤岔状态 */
#define INDICATOR_TYPE_GD_DAD ((UINT8)0x25) /* 车库门故障报警状态 */
#define INDICATOR_TYPE_XICHEJI_ALLOW_STATE ((UINT8)0x26) /* 非FAO线路同意洗车状态指示灯 */
#define INDICATOR_TYPE_DOWNWASH_ALLOW_PASS_STATE ((UINT8)0x29) /* 降级模式洗车同意通过指示灯 */
#define INDICATOR_TYPE_DOWNWASH_ALLOW_PASS ((UINT8)0x29) /* 降级模式洗车同意通过指示灯 */
#define INDICATOR_TYPE_DOWNWASH_APPLY ((UINT8)0x63) /* 降级模式洗车请求指示灯 */
#define INDICATOR_TYPE_DOWNWASH_PASS_APPLY ((UINT8)0x64) /* 降级模式反向通过请求指示灯 */
#define INDICATOR_TYPE_ATS_CONFIRM_RELAY_INTERFACE ((UINT8)0x27) /*相邻联锁继电接口确认状态指示灯*/
TSCP/src/APP/ciapp/Initial/ConfigDataReadManage.c
+50 -13
View File
@@ -129,6 +129,9 @@ UINT8 InitAllStaticDataStr(void)
/*声光报警器配置数据结构体*/
chRtn &= CommonMemSet(SGBJConfigDataStru, (UINT32)(SGBJ_SUM_MAX * sizeof(SGBJConfigDataStruct)), 0u, (UINT32)(SGBJ_SUM_MAX * sizeof(SGBJConfigDataStruct)));
/*试灯数据配置结构体*/
chRtn &= CommonMemSet(LightTestButtonConfigDataStru, (UINT32)(LIGHTTESTBUTTON_BUTTON_MAX_NUM * sizeof(LightTestButtonConfigDataStruct)), 0u, (UINT32)(LIGHTTESTBUTTON_BUTTON_MAX_NUM * sizeof(LightTestButtonConfigDataStruct)));
return chRtn;
}
@@ -246,6 +249,7 @@ UINT8 ReadConfigureData(void)
{
; /*不处理*/
}
if (0u == rtnVal)
{
PhysicalSectionCurSum = ReadPhySicalSectionConfigData(LocalCiId, PhysicalSectionConfigDataStru);/*读物理区段配置数据*/
@@ -446,6 +450,13 @@ UINT8 ReadConfigureData(void)
if (0u == rtnVal)
{
IndicatorCurSum = ReadIndicatorConfigData(LocalCiId, IndicatorConfigDataStru); /*读指示灯报警灯配置数据*/
if (-1 == IndicatorCurSum)
{
rtnVal = 20u;/*读取指示灯报警灯配置数据失败*/
debug_infor_printf((const)"ReadIndicatorConfigData fail.");
}
#if 0
includeVirFlag = GetCiFunctionSwitchConfig(FUNC_INCLUDEVIRCI_FLAG);
if (FUNC_SWITCH_ON == includeVirFlag)
{
@@ -468,15 +479,7 @@ UINT8 ReadConfigureData(void)
}
}
else
{
IndicatorCurSum = ReadIndicatorConfigData(LocalCiId, IndicatorConfigDataStru); /*读指示灯报警灯配置数据*/
if (-1 == IndicatorCurSum)
{
rtnVal = 20u;/*读取指示灯报警灯配置数据失败*/
debug_infor_printf((const)"ReadIndicatorConfigData fail.");
}
}
#endif
}
else
{
@@ -552,7 +555,23 @@ UINT8 ReadConfigureData(void)
{
; /*不处理*/
}
if (0u == rtnVal)
{
LightTestButtonCurSum = ReadLightTestConfigData(LocalCiId, LightTestButtonConfigDataStru); /*读OC试灯按钮配置数据*/
if (-1 == LightTestButtonCurSum)
{
rtnVal = 44u;/*读取OC试灯按钮数据失败*/
debug_infor_printf((const)"\nReadLightTestConfigData fail.\n");
}
else
{
; /*不处理*/
}
}
else
{
; /*不处理*/
}
if (0u == rtnVal)
{
CiToAtsMaskCurSum = ReadCiToAtsMaskConfigData(LocalCiId, CiToAtsMaskConfigDataStru); /*读CI-ATS配置数据*/
@@ -1097,6 +1116,17 @@ UINT8 ReadConfigureData(void)
/*不处理*/
}
if (0u == rtnVal)
{
/*设置试车线与车辆段合设配置*/
g_ret = (INT16)SetCldAndScxMergeConfig();
if (0 == g_ret)
{
debug_infor_printf((const)"SetCldAndScxMergeConfig fail.\r\n");
rtnVal = 44u;
}
}
}
@@ -1114,7 +1144,6 @@ UINT8 ReadConfigureData(void)
UINT8 DeviceDataManage(void)
{
UINT8 rtValue = 0u;
UINT8 includeVirFlag= GetCiFunctionSwitchConfig(FUNC_INCLUDEVIRCI_FLAG);
UINT8 reval = CI_ERROR;
/*整理继电器数据*/
if (CI_ERROR == RelayConfigDataManage())
@@ -1238,6 +1267,7 @@ UINT8 DeviceDataManage(void)
{
rtValue = 0u;
}
#if 0
if(FUNC_SWITCH_ON == includeVirFlag)
{
reval = InitVirCIlocalCiIndicatorIdBuf();
@@ -1246,15 +1276,17 @@ UINT8 DeviceDataManage(void)
rtValue = 1u;
}
}
else
#endif
if (0U == rtValue)
{
reval = IndicatorConfigDataManage();
if(CI_ERROR == reval)
if (CI_ERROR == reval)
{
rtValue = 1u;
}
}
if (0U == rtValue)
{
reval = CutoffPointConfigDataManage();
@@ -2055,6 +2087,11 @@ INT8 OcConnectConfigDataToDevStruct(SignalConfigDataStruct* pSignalCfgData, Phys
{
pSwitchCfgData[j].ByPassRelayId = pConnectCfgData[i].OcConnetRelayDataBuf[k].RelayId;
}
/*IBP*/
else if(SWITCH_IBP_TYPE == pConnectCfgData[i].OcConnetRelayDataBuf[k].RelayType)
{
pSwitchCfgData[j].IbpDrvRelayId = pConnectCfgData[i].OcConnetRelayDataBuf[k].DrvRelayId;
}
else
{
/*不做处理*/
TSCP/src/APP/ciapp/Initial/ConfigDataReadManage.h
+1
View File
@@ -60,6 +60,7 @@
#include "../Route/LongRouteConfigDataManage.h"
#include "../SGBJ/SGBJConfigDataManage.h"
#include "../VirtualDevice/VirtualDevDataManage.h"
#include "LightTestButtonConfigDataManage.h"
extern INT16 trackCheckRes;
extern INT16 g_ret;
TSCP/src/APP/ciapp/Initial/InitialProcess.c
+155 -113
View File
@@ -480,6 +480,8 @@ UINT8 InitialProcess(void)
{/*初始化LEU数据*/
(void)InitLEUDataStru();
}
/*初始化设备打印数据*/
(void)RecordDeviceDataLog(CI_ERROR);
@@ -496,6 +498,7 @@ UINT8 InitialProcess(void)
TiocTransCtInit();
return ret;
}
@@ -514,10 +517,8 @@ UINT8 InitialSignalData(void)
UINT16 routeSum = 0u; /*进路总数*/
UINT16 routeId = 0u; /*进路ID*/
UINT8 belongCiId = 0u; /*信号机所属CI的id*/
UINT16 ciToLeuMaskSum = 0u; /*CI-LEU码位总数*/
UINT16 startSignalId = 0u; /*始端信号机ID*/
UINT8 ret = CI_SUCCESS;
UINT8 localCi = 0u;/*本CI编号*/
UINT8 sameLine = SAME_LINE_ERR;/*信号机与本CI是否属于同一线路*/
UINT16 outSecId = 0u;/*信号机外方物理区段*/
@@ -525,11 +526,8 @@ UINT8 InitialSignalData(void)
UINT8 outSecSameLine = SAME_LINE_ERR;/*信号机外方物理区段与本CI是否属于同一线路*/
UINT16 detainBtnRelayId = 0U; /*扣车按钮采集继电器1ID*/
UINT8 wRouteLeadProperty = 0U;
localCi = GetSystemParaLocalCiId();
signalDataSum = GetTotalSignalCurNum(); /*本联锁和相邻联锁发送给本联锁的信号机总数目*/
ciToLeuMaskSum = GetSendMaskSum(CI_SYSTEM_TYPE_LEU);
if (signalDataSum >= SIGNAL_SUM_MAX)
{/*配置数据总数错误*/
@@ -685,6 +683,7 @@ UINT8 InitialSignalData(void)
SignalDataStruCC[signalId].cSleepTrainLightUpFlag = SIGNAL_SLEEP_TRAIN_LIGHTUP_NO; /*初始化休眠车点亮信号机标志无效*/
SignalDataStruCC[signalId].LightExtinctState = SIGNAL_LIGHT_EXTICT_STATE_YES; /*信号机亮灭状态CC(0x55：灭灯，0xaa：亮灯)*/
SignalDataStruCC[signalId].SignalCrossState = SIGNAL_CROSS_STATE_NO; /*通信车跨压通过信号机状态CC(0x55：未跨压，0xaa：跨压)*/
SignalDataStruCC[signalId].wCrossTacsTrainId = 0u; /*通信车跨压通过信号机TACS主控列车ID*/
/*初始化ZC发送的信号机动态数据*/
gZcToCiDymDataStru.szSignalDataStruZc[signalId].SignalId = signalId;
@@ -735,23 +734,43 @@ UINT8 InitialWashMachineData(void)
WashMachineDataStru[washMachinelId].TrainEmergencyStopState = WASHMACHINE_COL_FALUT_YES;
WashMachineDataStru[washMachinelId].HeadWashAllowState = WASHMACHINE_COL_HEADWASH_NO;
WashMachineDataStru[washMachinelId].TailWashAllowState = WASHMACHINE_COL_TAILWASH_NO;
WashMachineDataStru[washMachinelId].chCoupingWashAllowState = WASHMACHINE_COL_COUPINGWASH_NO;
WashMachineDataStru[washMachinelId].WashTrainRequestDrvState = WASHMACHINE_DRVSTATE_REQ_FALSE;
WashMachineDataStru[washMachinelId].TrainHeadStopSteadyDrvState = WASHMACHINE_HEAD_STEADY_NO;
WashMachineDataStru[washMachinelId].TrainTailStopSteadyDrvState = WASHMACHINE_TAIL_STEADY_NO;
WashMachineDataStru[washMachinelId].chCoupingStopSteadyDrvState = WASHMACHINE_COUPING_STEADY_NO;
WashMachineDataStru[washMachinelId].TrainOutWashTrainPortAllowState = WASHMACHINE_COL_OUT_NO;
WashMachineDataStru[washMachinelId].PauseTrainWashRequestDrvState = WASHMACHINE_PAUSE_DRVREQ_FALSE;
WashMachineDataStru[washMachinelId].PaseWashMachineRequesDrvtState = PASS_WASHMACHINE_DRVREQ_FALSE;
WashMachineDataStru[washMachinelId].WashMachineWorkModeDrvtState = WASHMACHINE_WORKMODE_INVALID_DRV;
WashMachineDataStru[washMachinelId].WashWorkModeRelayDrvCycle = 0U;
WashMachineDataStru[washMachinelId].WashmachineXTACurState = XTA_STATE_RAISE_UP;/*洗车同意按钮当前状态：初始化为抬起*/
WashMachineDataStru[washMachinelId].WashmachineXTAPreState = XTA_STATE_RAISE_UP;/*洗车同意按钮之前状态：初始化为抬起*/
WashMachineDataStru[washMachinelId].WashmachineXTALogicState = XTA_STATE_RAISE_UP;/*洗车同意按钮逻辑状态：初始化为抬起*/
WashMachineDataStru[washMachinelId].WashmachineXTAPressDownCycle = 0u;/*洗车同意按钮按下周期：初始化为0*/
WashMachineDataStru[washMachinelId].WashModeState = XTA_MODE_STATE_NO;/*洗车模式，初始化为OXFF*/
WashMachineDataStru[washMachinelId].chSetWashWorkModeBack = WASH_WORKMODE_BACK_DEFAULT;/*洗车机工作模式反馈，初始化为OX00*/
WashMachineDataStru[washMachinelId].chDownWashAllowState = WASH_COL_STATE_ALLOW_NO;/*降级模式洗车同意状态*/
WashMachineDataStru[washMachinelId].chDownWashAllowPassState = WASH_COL_STATE_ALLOW_PASS_NO;/*降级模式洗车同意通过状态*/
WashMachineDataStru[washMachinelId].chDownWashReqState = WASH_REQ_STATE_ALLOW_NO; /*降级模式洗车请求状态*/
WashMachineDataStru[washMachinelId].dwDownWashReqCycle = 0U; /*降级模式洗车请求周期*/
WashMachineDataStru[washMachinelId].chDownWashPassReqState = WASH_REQ_STATE_ALLOW_NO; /*降级模式反向洗车请求状态*/
WashMachineDataStru[washMachinelId].dwDownWashPassReqCycle = 0U; /*降级模式反向洗车请求周期*/
WashMachineDataStru[washMachinelId].chDownWashAllowColState = WASH_COL_STATE_ALLOW_NO; /*降级模式洗车线洗车同意状态(动态字段:采集)*/
WashMachineDataStru[washMachinelId].chDownDccWashAllowColState = WASH_COL_STATE_ALLOW_NO; /*降级模式DCC洗车同意状态(动态字段:采集)*/
WashMachineDataStru[washMachinelId].chDownWashAllowPassColState = WASH_COL_STATE_ALLOW_NO; /*降级模式洗车线洗车同意反向通过状态(动态字段:采集)*/
WashMachineDataStru[washMachinelId].chDownDccWashAllowPassColState = WASH_COL_STATE_ALLOW_NO; /*降级模式DCC洗车同意反向通过状态(动态字段:采集)*/
WashMachineDataStru[washMachinelId].dwDownWashAllowCycle = 0U; /*降级模式洗车线洗车同意按钮按下起始周期*/
WashMachineDataStru[washMachinelId].dwDownWashDccAllowCycle = 0U; /*降级模式DCC洗车同意按钮按下起始周期*/
WashMachineDataStru[washMachinelId].dwDownWashAllowPassCycle = 0U; /*降级模式洗车线反向通过洗车同意按钮按下起始周期*/
WashMachineDataStru[washMachinelId].dwDownWashDccAllowPassCycle = 0U; /*降级模式DCC反向通过洗车同意按钮按下起始周期*/
WashMachineDataStru[washMachinelId].chDownWashAllowErrState = WASH_BUTTON_STATE_ERR_NO; /*洗车线洗车同意按钮粘连状态*/
WashMachineDataStru[washMachinelId].chDownDccWashAllowErrState = WASH_BUTTON_STATE_ERR_NO; /*DCC洗车同意按钮粘连状态*/
WashMachineDataStru[washMachinelId].chDownWashAllowPassErrState = WASH_BUTTON_STATE_ERR_NO; /*洗车线反向通过同意按钮粘连状态*/
WashMachineDataStru[washMachinelId].chDownDccWashAllowPassErrState = WASH_BUTTON_STATE_ERR_NO; /*DCC反向通过同意按钮粘连状态*/
WashMachineDataStru[washMachinelId].dwDownWashBtVadCycle = 0U; /*降级模式洗车线洗车同意按钮有效周期*/
WashMachineDataStru[washMachinelId].dwDownWashDccBtVadCycle = 0U; /*降级模式DCC洗车同意按钮有效周期*/
WashMachineDataStru[washMachinelId].dwDownWashBtVadPassCycle = 0U; /*降级模式洗车线反向通过洗车同意按钮有效周期*/
WashMachineDataStru[washMachinelId].dwDownWashDccBtVadPassCycle = 0U; /*降级模式DCC反向通过洗车同意按钮有效周期*/
}
ret = CI_SUCCESS;
return ret;
@@ -771,6 +790,9 @@ UINT8 InitialSwitchData(void)
UINT16 ii = 0u; /*游标*/
UINT16 jj = 0u; /*游标*/
UINT8 reVal = CI_ERROR;
UINT8 chSwitchIncludeOcNum = 0U;
UINT8 ocId = 0u;
UINT8 kk = 0u;
switchDataSum = GetTotalSwitchCurNum(); /*本联锁和相邻联锁发送给本联锁的道岔总数目*/
/*数值大于SWITCH_SUM_MAX会返回0*/
@@ -831,6 +853,24 @@ UINT8 InitialSwitchData(void)
{
SwitchDataStru[switchId].szSwitchIncldeZzjState[jj] = OC_SWITCH_POSITION_SIKAI;
}
chSwitchIncludeOcNum = GetSwitchIncludeOcNum(switchId);
SwitchDataStru[switchId].chSwitchBelongOcNum = chSwitchIncludeOcNum;
for (jj = 0u; jj < chSwitchIncludeOcNum; jj++)
{/*从静态数据读取OCID赋值给动态数据*/
ocId = GetSwitchIncludeOCId(switchId, jj);
SwitchDataStru[switchId].belongOCData[jj].OcId = ocId;
SwitchDataStru[switchId].belongOCData[jj].OutControlCmd = STANDBY_CONTROL;
SwitchDataStru[switchId].belongOCData[jj].PlusBoxSate = SWITCH_BOX_FAULT;
for (kk = 0u; kk < MAX_OC_SWITCH_INCLUDE_BOARD_NUM; kk++)
{
SwitchDataStru[switchId].belongOCData[jj].BoardStateBuf[kk] = SWITCH_BOARD_FAULT;
}
SwitchDataStru[switchId].belongOCData[jj].controlMode = STANDBY_CONTROL;
SwitchDataStru[switchId].belongOCData[jj].FindCmdStartCycNum = 0u;
SwitchDataStru[switchId].belongOCData[jj].FindPostionCmd = NO_FIND_CMD;
SwitchDataStru[switchId].belongOCData[jj].OutMainControlCmdCycNum = 0u;
}
}
reVal = CI_SUCCESS;
return reVal;
@@ -1072,7 +1112,8 @@ UINT8 InitialLogicSectionData(void)
LogicSectionDataStru[logicSectionId].chLogicSpksFLockState = LOGIC_SECTION_SPKS_FLOCK_NO;/*仅用于ATS显示；逻辑区段不一定关联SPKS，如果初始化成封锁，无法获取SPKS状态，此逻辑区段会一直为封锁状态*/
LogicSectionDataStru[logicSectionId].chLinShiXianSuSetSpeed = 0U; /*逻辑区段临时限速设置速度值*/
LogicSectionDataStru[logicSectionId].chLogSecEmergXianSu = LOGSEC_EMERG_XS_SET_NO; /*逻辑区段紧急临时限速*/
LogicSectionDataStru[logicSectionId].chLogSecCbtcArbState = LGC_SECTION_ARB_NO;
LogicSectionDataStru[logicSectionId].chLogSecPbTacsArbState = LGC_SECTION_ARB_NO;
/*初始化车车结构体成员*/
LogicSectionDataStruCC[logicSectionId].LogicSectionId = logicSectionId;
LogicSectionDataStruCC[logicSectionId].chResShareFlag = LOGIC_SECTION_RES_SHARE_NO;
@@ -1337,6 +1378,7 @@ UINT8 InitialPsdData(void)
UINT16 wCleFarePCBButRelayId = 0U;/*清客确认箱关门按钮继电器ID*/
UINT16 wPsdButtenRelayId2 = 0U;
psdDataSum = GetTotalPsdCurNum();/*本联锁和相邻联锁发送给本联锁的Psd总数目*/
UINT16 wibpButtonRelayId = 0U; /*IBP盘发车继电器ID*/
/*数值大于等于PSD_SUM_MAX会返回0*/
/*屏蔽门所属联锁ID?待处理?*/
@@ -1407,6 +1449,7 @@ UINT8 InitialPsdData(void)
PsdDataStru[psdId].StartDetectionCycNum = 0u;
PsdDataStru[psdId].StartDetectionState = JXTC_START_DETECTION_NO;
PsdDataStru[psdId].StopDetectionState = JXTC_STOP_DETECTION_YES;
PsdDataStru[psdId].StopDetectionCycNum = 0u;
PsdDataStru[psdId].VOBCDoorState = PSD_DOOR_CLOSEDANDLOCKED_INVALID;
PsdDataStru[psdId].PCBPressCycNum = 0u;
PsdDataStru[psdId].POBPressCycNum = 0u;
@@ -1424,6 +1467,7 @@ UINT8 InitialPsdData(void)
PsdDataStru[psdId].steadyLightFlag = QK_BUTTON_STEADY_LIGHT_NO;
PsdDataStru[psdId].dwCleFarePCBPressCycNum = 0U;
PsdDataStru[psdId].IBPPressCycNum = 0U;
/*清客确认箱PCB按钮状态初始化处理*/
wCleFarePCBButRelayId = GetCleFarePCBButRelayId(psdId);
if ((0u == wCleFarePCBButRelayId) || (UINT16_MAX == wCleFarePCBButRelayId))
@@ -1453,8 +1497,10 @@ UINT8 InitialPsdData(void)
PsdDataStru[psdId].psdOpenErrState = PSD_OPEN_CLOSE_ERROR;
PsdDataStru[psdId].psdCloseErrState = PSD_OPEN_CLOSE_ERROR;
PsdDataStru[psdId].cPsdExceptOpenState = PSD_EXCEPT_OPEN_YES; /*初始化为PSD异常打开*/
PsdDataStru[psdId].cPsdExceptOpenState = PSD_EXCEPT_NO; /*初始化为PSD未异常*/
PsdDataStru[psdId].dwPsdRelayDownCycNum = 0U; /*PSD门关继电器落下起始周期*/
PsdDataStru[psdId].JXTCMutualLockFaultState = JXTC_MUTUALLOCKFAULT_NO;
PsdDataStru[psdId].JXTCMutualLockStartCycNum = 0u;
/*初始化车车结构体成员*/
PsdDataStruCC[psdId].PsdId = psdId;
@@ -1462,6 +1508,16 @@ UINT8 InitialPsdData(void)
PsdDataStruCC[psdId].SrcVobcId = 0U;
PsdDataStruCC[psdId].PsdCmd = PSD_DEFAULT_CONTROL_CMD;
PsdDataStruCC[psdId].CmdSetCycle = 0U;
wibpButtonRelayId = GetIbpConfmRelayId(psdId);
if ((0u == wibpButtonRelayId) || (UINT16_MAX == wibpButtonRelayId))
{
PsdDataStru[psdId].ibpButtonState = PLATFORM_DEPAR_BUTTON_STATE_INVALID;
}
else
{
PsdDataStru[psdId].ibpButtonState = PSD_RELATED_BUTTON_STATE_DEFAULT; /*IBP盘发车按钮状态初始化*/
}
}
reVal = CI_SUCCESS;
return reVal;
@@ -1569,6 +1625,7 @@ UINT8 InitialOverlapData(void)
OverlapDataStru[overlapId].cProSwitchCheckResultFlag = PROSWITCH_CHECK_RESULT_DEFAULT;
OverlapDataStru[overlapId].cProSwitchCheckStartFlag = PROSWITCH_CHECK_START_INVALID;
OverlapDataStru[overlapId].chPreLaborUnlockState = PRO_PRE_LABOR_UNLOCK_STATE_NO;
OverlapDataStru[overlapId].dwAtsLastTimeLockCyc = 0U;
}
}
@@ -1662,6 +1719,7 @@ UINT8 InitialRouteData(void)
RouteDataStru[routeId].chRoutCouplinkFlag = ROUTE_COUPLINK_FLAG_NO; /*初始化联挂标志无效*/
RouteDataStru[routeId].chCouplinkSuccessFlag = ROUTE_COUPLINK_RESULT_NOT; /*初始化联挂成功标志为未收到*/
RouteDataStru[routeId].chCouplinkErrorFlag = ROUTE_COUPLINK_RESULT_NOT; /*初始化联挂失败标志为未收到*/
RouteDataStru[routeId].dwRouteIdleCycNum = 0U; /*进路空闲起始周期号*/
/*初始化车车结构体成员*/
RouteDataStruCC[routeId].RouteId = routeId;
@@ -1886,30 +1944,7 @@ UINT8 InitialIndicatorStateData(void)
UINT8 j = 0u;
UINT8 virCINum = 0u;
UINT8 virCIid = 0u;
UINT8 includeVirFlag= GetCiFunctionSwitchConfig(FUNC_INCLUDEVIRCI_FLAG);
if(FUNC_SWITCH_ON == includeVirFlag)
{
/*虚拟联锁兼容*/
virCINum = GetVirtualCINum();
for(j=0u;(j < virCINum)&&(j<VIRTUAL_CI_MAX);j++)
{
virCIid = GetVirtualCIid(j);
configStruSum = (UINT8)GetVirCIIndicatorConfigDataNum(virCIid);
for(kk = 0u;kk<configStruSum;kk++)
{
indicatorId = (UINT8)GetVirCIlocalCiIndicatorId(virCIid,kk);
if((VIRTUAL_CI_INDICATOR_SUM_MAX > indicatorId))
{
g_VirtualCIStructData.virtualCi[j].IndicatorData[indicatorId].IndicatorId = indicatorId;
g_VirtualCIStructData.virtualCi[j].IndicatorData[indicatorId].IndicatorState = 0u;
}
}
}
}
else
{
configStruSum = GetIndicatorCurSum();
if (configStruSum >= INDICATOR_SUM_MAX)
{/*配置数据总数错误*/
@@ -1925,7 +1960,7 @@ UINT8 InitialIndicatorStateData(void)
IndicatorDataStru[indicatorId].IndicatorState = 0u;
}
}
}
return reVal;
@@ -2124,9 +2159,6 @@ void ResetDynamicState(const UINT8 ciId)
UINT8 funcSwitchSupportRelayInterface = GetCiFunctionSwitchConfig(FUNC_SWITCH_USE_RELAY_INTERFACE_BETWEEN_NEIGHBOURCI);
UINT8 localCi = GetSystemParaLocalCiId();/*本机联锁*/
UINT8 confirmRelayInterfaceFlag = GetCiCiRelayInterfConfirmFlag();/*继电接口确认状态*/
UINT16 wCfpSum = 0u;
UINT16 wCfpId = 0u;
UINT16 wCfpOtherCiid = 0U; /*分界点关联的相邻联锁ID*/
UINT8 chOverlapCiId = 0u;
UINT32 dwCurCyc = Get2oo2CurCycleNum();
UINT8 chSearchCiId = 0U;/*查询到的联锁ID*/
@@ -2207,7 +2239,6 @@ void ResetDynamicState(const UINT8 ciId)
PhysicalSectionDataStru[ii].chABLTrainFlag = PHYSICAL_SECTION_ABLOCCUPY_YES;
PhysicalSectionDataStru[ii].chPreABLTrainFlag = PHYSICAL_SECTION_ABLOCCUPY_NO;
PhysicalSectionDataStru[ii].dwAblTagSetCyc = dwCurCyc;
SetPhySecUTTrainFlag(PhysicalSectionDataStru[ii].PhysicalSectionId, PHYSICAL_AXIS_UT_YES); /*物理区段坏车占用标志设置*/
if ((localCi !=phyBelongCi) && (TRANSMIT_STATE_BAD == commState) &&
(localCi ==phySecRepGjBelongCi)&&
@@ -2289,12 +2320,6 @@ void ResetDynamicState(const UINT8 ciId)
LogicSectionDataStru[logicSectionId].LogLockState = LOG_SECTION_LOCK_EXCEPT;
}
}
if (LOG_SECTION_LOGLOCK_NORMAL == LogicSectionDataStruCC[logicSectionId].LogSecLogLockState)
{
LogicSectionDataStruCC[logicSectionId].LogSecLogLockState = LOG_SECTION_LOGLOCK_EXCEPT; /*与相邻联锁断通信，将相邻联锁逻辑正常锁闭的逻辑区段置为逻辑异常锁闭*/
}
if ((localCi !=phyBelongCi) && (TRANSMIT_STATE_BAD == commState) &&
(localCi ==phySecRepGjBelongCi)&&
(CICI_RELAY_INTERFACE_CONFIRM_YES == confirmRelayInterfaceFlag)&&
@@ -2322,6 +2347,8 @@ void ResetDynamicState(const UINT8 ciId)
LogicSectionDataStruCC[logicSectionId].cRouteLeaveLogFlag = LOGSEC_LEAVE_LOGSEC_REPLY_NO; /*离去区段ABL列车检查不通过*/
LogicSectionDataStru[logicSectionId].chLogicProResUsable = LOGIC_SECTION_PRO_RES_UNUSABLE;
LogicSectionDataStru[logicSectionId].chLogSecEmergXianSu = LOGSEC_EMERG_XS_SET_YES; /*逻辑区段紧急临时限速设置状态*/
LogicSectionDataStru[logicSectionId].chLogSecCbtcArbState = LGC_SECTION_ARB_NO;
LogicSectionDataStru[logicSectionId].chLogSecPbTacsArbState = LGC_SECTION_ARB_NO;
}
else
{
@@ -2374,7 +2401,7 @@ void ResetDynamicState(const UINT8 ciId)
PsdDataStru[devId].PsdState = PSD_STATE_CLOSE;
}
PsdDataStru[devId].MutualLockRemoveState = PSD_MUTUALLOCK_REMOVE_NO;
PsdDataStru[devId].cPsdExceptOpenState = PSD_EXCEPT_OPEN_YES; /*重置为PSD异常打开*/
PsdDataStru[devId].cPsdExceptOpenState = PSD_EXCEPT_YES; /*重置为PSD异常*/
}
}
@@ -2518,6 +2545,7 @@ void ResetDynamicState(const UINT8 ciId)
}
}
/*重置非本联锁spks动态数据*/
for (ii = 1u; ii < SPKS_SUM_MAX; ii ++)
{
devId = (ii);
@@ -2564,7 +2592,7 @@ void ResetDynamicState(const UINT8 ciId)
devId = (ii);
devLen = (UINT16)sizeof(OverlapDataStruct);
chOverlapCiId = GetOverlapBelongCiId(devId);
if((chOverlapCiId == ciId) && (devId > 0u) && (devId < OVERLAP_SUM_MAX))
if((chOverlapCiId == ciId))
{
OverlapDataStru[devId].BelongRouteId = 0u;
OverlapDataStru[devId].UnlockStartCycNum = 0u;
@@ -2583,8 +2611,9 @@ void ResetDynamicState(const UINT8 ciId)
OverlapDataStru[devId].cProSwitchCheckResultFlag = PROSWITCH_CHECK_RESULT_INVALID;
OverlapDataStru[devId].cProSwitchCheckStartFlag = PROSWITCH_CHECK_START_INVALID;
OverlapDataStru[devId].chPreLaborUnlockState = PRO_PRE_LABOR_UNLOCK_STATE_NO;
OverlapDataStru[devId].dwAtsLastTimeLockCyc = 0U;
}
else if ((chOverlapCiId == localCi) && (devId > 0U) && (devId < OVERLAP_SUM_MAX))
else if ((chOverlapCiId == localCi))
{
cOverlapRelProSwNum = GetOverlapRelatedProtSwitSum(devId); /*获取保护区段关联的防护道岔信息*/
pOverlapRelProSwStru = GetOverlapRelatedProtSwitStru(devId);
@@ -2624,6 +2653,81 @@ void ResetDynamicState(const UINT8 ciId)
}
}
/*重置自动通过进路数据*/
/*cgh-合并CID-2539-7：*/
for (ii = 1u; ii < AUTO_ROUTE_SUM_MAX; ii++)
{
devId = ii;
belongCiId = GetAutoRouteBelongCiId(devId);
if (belongCiId == ciId)
{
/*非本联锁重置状态*/
AutoRouteDataStru[devId].AutoRouteSetFlag = AUTO_ROUTE_SET_NO; /*自动进路未办理*/
}
}
}
/*
* 功能描述：重置相邻Rc通信中断动态数据
* 参数说明：const UINT8 ciId, 重置联锁ID
* 返回值 ： void
*/
void ResetDynamicRcState(const UINT8 ciId)
{
UINT16 ii = 0u;
UINT16 logicSectionDataSum = 0u; /*逻辑区段总数*/
UINT16 logicSectionId = 0u; /*逻辑区段ID*/
UINT8 belongCiId = 0u;
/*相邻联锁是否支持继电接口*/
UINT16 wCfpSum = 0u;
UINT16 wCfpId = 0u;
UINT16 wCfpOtherCiid = 0U; /*分界点关联的相邻联锁ID*/
UINT8 cPhySecCurMerOccState = 0U; /*物理区段融合占用状态*/
/*重置非本联锁物理区段动态数据*/
for (ii = 1U; ii < PHYSICAL_SECTION_SUM_MAX; ii++)
{
belongCiId = GetPhySecBelongCiId(ii);
if (belongCiId == ciId)
{
cPhySecCurMerOccState = GetPhySecCurMergeState(ii);
if (SECTION_OCCUPY_YES == cPhySecCurMerOccState)
{
SetPhySecUTTrainFlag(PhysicalSectionDataStru[ii].PhysicalSectionId, PHYSICAL_AXIS_UT_YES); /*物理区段坏车占用标志设置*/
}
else
{
/*当前空闲，不设置坏车占用*/
}
}
else
{
/* 不是指定联锁，则不处理 */
}
}
logicSectionDataSum = GetTotalLogSecCurNum();/*本联锁和相邻联锁发送给本联锁的逻辑区段总数目*/
/*重置非本联锁逻辑区段动态数据*/
for (ii = 0u; ii < logicSectionDataSum; ii++)
{
logicSectionId = GetLogicSecId(ii);/*获取配置文件中该索引下的逻辑区段ID*/
belongCiId = GetLogSecBelongCiId(logicSectionId);
/*与相邻联锁断通信，将相邻联锁逻辑正常锁闭的逻辑区段置为逻辑异常锁闭*/
if (belongCiId == ciId)
{
if (LOG_SECTION_LOGLOCK_NORMAL == LogicSectionDataStruCC[logicSectionId].LogSecLogLockState)
{
LogicSectionDataStruCC[logicSectionId].LogSecLogLockState = LOG_SECTION_LOGLOCK_EXCEPT;
}
}
else
{
/*不做处理*/
}
}
/* 重置相邻联锁发来的包络信息 */
wCfpSum = GetCfpSum();
for (ii = 0u; ii < wCfpSum; ii++)
@@ -2639,20 +2743,7 @@ void ResetDynamicState(const UINT8 ciId)
;
}
}
/*重置自动通过进路数据*/
/*cgh-合并CID-2539-7：*/
for (ii = 1u; ii < AUTO_ROUTE_SUM_MAX; ii++)
{
devId = ii;
belongCiId = GetAutoRouteBelongCiId(devId);
if (belongCiId == ciId)
{
/*非本联锁重置状态*/
AutoRouteDataStru[devId].AutoRouteSetFlag = AUTO_ROUTE_SET_NO; /*自动进路未办理*/
}
}
}
/*
* 功能描述： 将自动进路和对应的自动信号ID关联
* 参数说明： void
@@ -3292,56 +3383,6 @@ UINT8 InitialRtnIndicStaData(void)
; /*返回失败*/
}
if (CI_SUCCESS == chReval)
{
for (jj = 0; jj < g_VirtualCIStructData.virtualCiNum; jj++)
{
/*给虚拟联锁的指示灯设备ID赋值*/
for (kk = 0U; kk < g_VirtualCIStructData.virtualCi[jj].IndicatorConfigDataNum; kk++)
{
indicatorType = g_VirtualCIStructData.virtualCi[jj].IndicatorConfigData[kk].IndicatorType;
if ((INDICATOR_TYPE_EXPRESS_RETURN == indicatorType) && (RTNINDICATOR_SUM_MAX > rtnIndicatorSum))
{
g_VirtualCIStructData.virtualCi[jj].VirCIRtnIndicatorStaData[rtnIndicatorSum].VirCiIndicatorDevId = g_VirtualCIStructData.virtualCi[jj].IndicatorConfigData[kk].BjdDeviceId;
rtnIndicatorSum++;
}
else
{
;
}
if (RTNINDICATOR_SUM_MAX <= rtnIndicatorSum)
{
/*一个虚拟联锁集中区最大只有两个无人折返指示灯ID*/
break;
}
else
{
;
}
}
/*将每个虚拟联锁包含的无人折返指示灯状态初始化为无效*/
for (kk = 0U; kk < RTNINDICATOR_SUM_MAX; kk++)
{
if (RTNINDICATOR_SUM_MAX > rtnIndicatorSum)
{/*当本集中区没有无人折返指示灯设备只有一个时，其余数据初始化为0*/
g_VirtualCIStructData.virtualCi[jj].VirCIRtnIndicatorStaData[rtnIndicatorSum].VirCiIndicatorDevId = 0U;
rtnIndicatorSum++;
}
else
{
;
}
g_VirtualCIStructData.virtualCi[jj].VirCIRtnIndicatorStaData[kk].VirCiFlashState = VOBCTOCIAUTORTN_INDICT_MASK_INVALID;
g_VirtualCIStructData.virtualCi[jj].VirCIRtnIndicatorStaData[kk].VirCiSteadyState = VOBCTOCIAUTORTN_INDICT_MASK_INVALID;
}
}
}
else
{
;
}
return chReval;
}
@@ -3397,7 +3438,7 @@ void ResetLocalRcDynamicState(void)
if (cBelongCiId == cLocalCiId)
{
SetSignalLightExtinctStateCC(wSignalId, SIGNAL_LIGHT_EXTICT_STATE_YES); /*设置RC信号机亮灭状态为亮灯*/
SetSignalCrossStateCC(wSignalId, SIGNAL_CROSS_STATE_NO); /*设置RC信号机跨压状态为未跨压*/
SetSignalCrossStateCC(wSignalId, SIGNAL_CROSS_STATE_NO, 0u); /*设置RC信号机跨压状态为未跨压*/
}
else
{
@@ -3410,7 +3451,7 @@ void ResetLocalRcDynamicState(void)
for (jj = 0U; jj < wAxisSecNum; jj++)
{
wAxisSecId = GetAxisSecId(jj);
cBelongCiId = GetAxisBelongTioc(wAxisSecId);
cBelongCiId = (UINT8)GetAxisBelongTioc(wAxisSecId);
if (cBelongCiId == cLocalCiId)
{
SetAxisSecArbStateCC(wAxisSecId, AXIS_SECTION_ARB_NO); /*设置RC计轴区段ARB状态为未ARB*/
@@ -3610,3 +3651,4 @@ void ResetDevStateProcess(void)
TiocTransCtInit();
}
TSCP/src/APP/ciapp/Initial/InitialProcess.h
+8 -1
View File
@@ -243,7 +243,12 @@ UINT8 InitialPhySecIdBufOfOtherCi(void);
* 返回值 ： void
*/
void ResetDynamicState(const UINT8 ciId);
/*
* 功能描述：重置相邻Rc通信中断动态数据
* 参数说明：const UINT8 ciId, 重置联锁ID
* 返回值 ： void
*/
void ResetDynamicRcState(const UINT8 ciId);
/*
* 功能描述： 初始化全自动折返进路数据
@@ -346,6 +351,8 @@ void ResetLocalRcDynamicState(void);
*/
void ResetDevStateProcess(void);
#ifdef __cplusplus
}
#endif
TSCP/src/APP/ciapp/LightTestButtonManage/LightTestButtonConfigDataManage.c
+129
View File
@@ -0,0 +1,129 @@
/********************************************************
*
* 文 件 名： LightTestButtonConfigDataManage.c
* 版权说明： 北京交控科技有限公司
* 创建时间： 2025-12-09
* 作 者： 联锁组
* 功能描述： 试灯按钮配置数据管理
* 修改记录：
*
********************************************************/
#include "LightTestButtonConfigDataManage.h"
LightTestButtonConfigDataStruct LightTestButtonConfigDataStru[LIGHTTESTBUTTON_BUTTON_MAX_NUM] = {0}; /*定义试灯按钮数据配置结构体*/
INT16 LightTestButtonCurSum = 0; /*试灯按钮当前总数*/
/*
* 功能描述： 获取试灯按钮当前总数
* 参数说明： void
* 返回值 ： 0: 获取数据失败
* >0: 试灯按钮当前总数
*/
UINT16 GetLightTestButtonCurSum(void)
{
UINT16 retVal = 0u;
if (LIGHTTESTBUTTON_BUTTON_MAX_NUM <= ((UINT16)LightTestButtonCurSum))
{
retVal = LIGHTTESTBUTTON_BUTTON_MAX_NUM;
}
else
{
retVal = (UINT16)LightTestButtonCurSum;
}
return retVal;
}
/*
* 功能描述： 获取试灯按钮的ID
* 参数说明： UINT16 index 试灯按钮索引
* 返回值 UINT16 retVal 试灯按钮ID
*/
UINT16 GetLightTestButtonId(UINT16 index)
{
UINT16 retVal = 0u;
UINT16 lightTestButtonCurSum = GetLightTestButtonCurSum();
if (index < lightTestButtonCurSum)
{
retVal = LightTestButtonConfigDataStru[index].LightTestButtonId;
}
else
{
}
return retVal;
}
/*
* 功能描述： 获取试灯按钮ID对应的继电器数据
* 参数说明： UINT16 lightTestButtonId 试灯按钮ID
* 返回值 ：
LightTestButtonConfigDataStruct *
*/
LightTestButtonConfigDataStruct *GetLightTestButtonConfigData(UINT16 lightTestButtonId)
{
LightTestButtonConfigDataStruct *retVal = NULL;
UINT16 i = 0u;
UINT16 lightTestButtonCurSum = GetLightTestButtonCurSum();
for (i = 0u; i < lightTestButtonCurSum; i++)
{
if (lightTestButtonId == LightTestButtonConfigDataStru[i].LightTestButtonId)
{
retVal = &LightTestButtonConfigDataStru[i];
break;
}
else
{
}
}
return retVal;
}
/*
* 功能描述： 获取试灯按钮ID对应继电器的总数量
* 参数说明： UINT16 lightTestButtonId 试灯按钮ID
* 返回值 ： UINT16 lightTestButtonRelayNum 继电器数量
*/
UINT16 GetLightTestButtonRelayNum(UINT16 lightTestButtonId)
{
UINT16 lightTestButtonRelayNum = 0u;
LightTestButtonConfigDataStruct *lightTestButtonConfigData = GetLightTestButtonConfigData(lightTestButtonId);
if (NULL != lightTestButtonConfigData)
{
lightTestButtonRelayNum = lightTestButtonConfigData->LightTestButtonRelayNum;
}
else
{
; /* 不处理 */
}
return lightTestButtonRelayNum;
}
/*
* 功能描述： 获取试灯按钮ID对应继电器ID
* 参数说明： UINT16 lightTestButtonId 试灯按钮ID
* UINT16 index 继电器索引
* 返回值 ： UINT16 lightTestButtonRelayId 继电器ID
*/
UINT16 GetLightTestButtonRelayId(UINT16 lightTestButtonId, UINT16 index)
{
UINT16 lightTestButtonRelayId = 0u;
LightTestButtonConfigDataStruct *lightTestButtonConfigData = GetLightTestButtonConfigData(lightTestButtonId);
if (NULL != lightTestButtonConfigData)
{
if (index < lightTestButtonConfigData->LightTestButtonRelayNum)
{
lightTestButtonRelayId = lightTestButtonConfigData->LightRelayId[index];
}
else
{
; /* 不处理 */
}
}
else
{
; /* 不处理 */
}
return lightTestButtonRelayId;
}
TSCP/src/APP/ciapp/LightTestButtonManage/LightTestButtonConfigDataManage.h
+80
View File
@@ -0,0 +1,80 @@
/********************************************************
*
* 文 件 名： LightTestButtonConfigDataManage.h
* 版权说明： 北京交控科技有限公司
* 创建时间： 2025-12-09
* 作 者： 联锁组
* 功能描述： 试灯按钮配置数据管理头文件
* 函数包括：
* 使用注意：
* 修改记录：
*
********************************************************/
#ifndef _LIGHTTESTBUTTON_CONFIG_DATA_MANAGE_H_
#define _LIGHTTESTBUTTON_CONFIG_DATA_MANAGE_H_
#include "LightTestButtonDefine.h"
typedef struct S_LightTestButtonConfigDataStruct
{
UINT16 LightTestButtonId; /* 试灯按钮ID (配置字段) */
UINT16 BelongOcId; /* 所属OC ID (配置字段) */
UINT8 LightTestButtonType; /* 试灯按钮类型 (配置字段) */
UINT16 LightTestButtonRelayNum; /* 试灯表示灯继电器数量 */
UINT16 LightRelayId[LIGHTTESTBUTTON_LIGHT_SUPPORT_MAX_NUM]; /* 试灯表示灯继电器ID数组 */
}LightTestButtonConfigDataStruct;
extern LightTestButtonConfigDataStruct LightTestButtonConfigDataStru[LIGHTTESTBUTTON_BUTTON_MAX_NUM]; /*定义试灯按钮数据配置结构体*/
extern INT16 LightTestButtonCurSum; /*试灯按钮当前总数*/
#ifdef __cplusplus
extern "C" {
#endif
/*
* 功能描述： 获取试灯按钮当前总数
* 参数说明： void
* 返回值 ： 0: 获取数据失败
* >0: 信试灯按钮当前总数
*/
UINT16 GetLightTestButtonCurSum(void);
/*
* 功能描述： 获取试灯按钮的ID
* 参数说明： UINT16 index 试灯按钮索引
* 返回值 UINT16 retVal 试灯按钮ID
*/
UINT16 GetLightTestButtonId(UINT16 index);
/*
* 功能描述： 获取试灯按钮ID对应的继电器数据
* 参数说明： UINT16 lightTestButtonId 试灯按钮ID
* 返回值 ：
LightTestButtonConfigDataStruct *
*/
LightTestButtonConfigDataStruct *GetLightTestButtonConfigData(UINT16 lightTestButtonId);
/*
* 功能描述： 获取试灯按钮ID对应继电器的总数量
* 参数说明： UINT16 lightTestButtonId 试灯按钮ID
* 返回值 ： UINT16 lightTestButtonRelayNum 继电器数量
*/
UINT16 GetLightTestButtonRelayNum(UINT16 lightTestButtonId);
/*
* 功能描述： 获取试灯按钮ID对应继电器ID
* 参数说明： UINT16 lightTestButtonId 试灯按钮ID
* UINT16 index 继电器索引
* 返回值 ： UINT16 lightTestButtonRelayId 继电器ID
*/
UINT16 GetLightTestButtonRelayId(UINT16 lightTestButtonId, UINT16 index);
#ifdef __cplusplus
}
#endif
#endif
TSCP/src/APP/ciapp/LightTestButtonManage/LightTestButtonDataManage.c
+63
View File
@@ -0,0 +1,63 @@
/********************************************************
*
* 文 件 名： LightTestButtonDataManage.c
* 版权说明： 北京交控科技有限公司
* 创建时间： 2025-12-09
* 作 者： 联锁组
* 功能描述： 试灯按钮数据管理
* 修改记录：
*
********************************************************/
#include "LightTestButtonDataManage.h"
/*
* 功能描述： 试灯按钮处理函数
* 参数说明： void
* 返回值 ： void
*/
void LightTestButtonDataManageProc(void)
{
UINT16 i = 0u; /*循环变量*/
UINT16 j = 0u; /*循环变量*/
UINT16 lightTestButtonId = 0u; /* 试灯按钮ID */
UINT16 lightTestButtonRelayNum = 0u; /* 试灯按钮ID数量 */
UINT16 lightRelayId = 0u; /* 试灯表示灯继电器ID */
UINT16 ligthtRelatNum = 0u; /* 试灯表示灯继电器数量 */
UINT8 lightTestButtonState = RELAY_STATE_DOWN; /*试灯按钮状态*/
lightTestButtonRelayNum = GetLightTestButtonCurSum(); /*获取试灯按钮总数量*/
for(i = 0u; i < lightTestButtonRelayNum; i++)
{
/* 获取对应试灯按钮ID*/
lightTestButtonId = GetLightTestButtonId(i);
/*获取试灯按钮继电器采集状态*/
lightTestButtonState = GetRelayCollState(lightTestButtonId);
if(RELAY_STATE_UP == lightTestButtonState) /*试灯按钮按下*/
{
/* 试灯表示灯继电器数量*/
ligthtRelatNum = GetLightTestButtonRelayNum(lightTestButtonId);
for(j = 0u; j < ligthtRelatNum; j++)
{
/* 获取对应试灯表示灯继电器ID*/
lightRelayId = GetLightTestButtonRelayId(lightTestButtonId,j);
/*设置试灯表示灯继电器吸起*/
(void)SetRelayDriveState(lightRelayId, RELAY_DRIVE_STATE_UP);
}
}
else if(RELAY_STATE_DOWN == lightTestButtonState) /*试灯按钮未按下*/
{
/* 不处理即可 */
}
else
{
/* 不处理 */
}
}
}
TSCP/src/APP/ciapp/LightTestButtonManage/LightTestButtonDataManage.h
+42
View File
@@ -0,0 +1,42 @@
/********************************************************
* 文 件 名： LightTestButtonDataManage.h
* 版权说明： 北京交控科技有限公司
* 创建时间： 2025-12-09
* 作 者： 联锁组
* 功能描述： 试灯按钮数据管理头文件
* 函数包括：
* 使用注意：
* 修改记录：
*
********************************************************/
#ifndef _LIGHTTEST_BUTTON_DATA_MANAGE_H_
#define _LIGHTTEST_BUTTON_DATA_MANAGE_H_
#include "LightTestButtonDefine.h"
#include "LightTestButtonConfigDataManage.h"
#include "RelayDefine.h"
#include "RelayDataManage.h"
#ifdef __cplusplus
extern "C" {
#endif
/*
* 功能描述： 试灯按钮处理函数
* 参数说明： void
* 返回值 ： void
*/
void LightTestButtonDataManageProc(void);
#ifdef __cplusplus
}
#endif
#endif
TSCP/src/APP/ciapp/LightTestButtonManage/LightTestButtonDefine.h
+33
View File
@@ -0,0 +1,33 @@
/********************************************************
*
* 文 件 名： LightTestButtonDefine.h
* 版权说明： 北京交控科技有限公司
* 创建时间： 2025-12-09
* 作 者： 联锁组
* 功能描述： 试灯按钮配置数据头文件
* 函数包括：
* 使用注意：
* 修改记录：
*
********************************************************/
#ifndef _LIGHTTESTBUTTON_DEFINE_H_
#define _LIGHTTESTBUTTON_DEFINE_H_
#include "CommonTypes.h"
/* 试灯表示灯最大数量 */
#define LIGHTTESTBUTTON_LIGHT_MAX_NUM ((UINT8)13U)
/* 试灯表示灯支持最大数 */
#define LIGHTTESTBUTTON_LIGHT_SUPPORT_MAX_NUM ((UINT8)39U)
/* 试灯按钮可配置最大数量 */
#define LIGHTTESTBUTTON_BUTTON_MAX_NUM ((UINT16)70U)
/* 武汉新港OC采集试灯按钮类型 */
#define LIGHTTESTBUTTON_TYPE_XINGANG ((UINT8)0xaaU)
#endif
TSCP/src/APP/ciapp/LogRecord/LogRecord.c
+97 -23
View File
@@ -505,6 +505,7 @@ UINT8 RecordDeviceDataLog(UINT8 Flag)
UINT16 wNonAutoReturnCurSum = 0U;/*无人折返按钮当前总数*/
NonAutoReturnDataStruct* pNonAutoReturnData = NULL; /*无人折返数据结构体指针*/
NonAutoReturnDataStructCC* pNonReturnDataStruCC = NULL; /*无人折返数据结构体指针-CC*/
UINT8 chThisOCBoardState = 0U;
/*************************************打印物理区段数据********************************************/
/*打印区段数据*/
@@ -833,6 +834,11 @@ UINT8 RecordDeviceDataLog(UINT8 Flag)
outStringLength += 4u;
LongToChar(pNewEsbData[deviceId].EsbCutErrTriggerPressCycNum, &outString[outStringLength]); /*紧急关闭旁路按钮误触发按下周期*/
outStringLength += 4U;
outString[outStringLength] = pNewEsbData[deviceId].cOnePlatEsbState;/*同站紧急按钮激活状态：0x55-未激活，0xAA-激活*/
outStringLength++;
outString[outStringLength] = pNewEsbData[deviceId].cOnePlatEsbCutState;/*同站紧急旁路按钮激活状态：0x55-未激活，0xAA-激活*/
outStringLength++;
}
}
else
@@ -950,6 +956,36 @@ UINT8 RecordDeviceDataLog(UINT8 Flag)
outString[outStringLength++] = newSwitchData[deviceId].chSwitchJichaState; /*道岔挤岔状态*/
LongToChar(newSwitchData[deviceId].SwitchCollTolerateCycNum, &outString[outStringLength]);/*容忍周期号*/
outStringLength += 4u;
LongToChar(newSwitchData[deviceId].SwitchOutputDrvCmdCycNum, &outString[outStringLength]);/*驱动起始周期*/
outStringLength += 4u;
outString[outStringLength++] = newSwitchData[deviceId].mainControlOcId;/*主控OC*/
outString[outStringLength++] = newSwitchData[deviceId].chSwitchBelongOcNum;/*道岔所属OC数*/
for (jj = 0U; jj < newSwitchData[deviceId].chSwitchBelongOcNum; jj++)
{
outString[outStringLength++] = newSwitchData[deviceId].belongOCData[jj].OcId;/*道岔所属OC*/
outString[outStringLength++] = newSwitchData[deviceId].belongOCData[jj].controlMode;/*OC当前主控状态*/
outString[outStringLength++] = newSwitchData[deviceId].belongOCData[jj].OutControlCmd;/*发送OC当前主控命令*/
outString[outStringLength++] = newSwitchData[deviceId].belongOCData[jj].PlusBoxSate;/*插箱状态*/
chThisOCBoardState = GetSwitchThisOCBoardState(deviceId, newSwitchData[deviceId].belongOCData[jj].OcId);
outString[outStringLength++] = chThisOCBoardState;/*双系板卡故障状态*/
LongToChar(newSwitchData[deviceId].belongOCData[jj].OutMainControlCmdCycNum, &outString[outStringLength]);/*升主控命令周期*/
outStringLength += 4u;
outString[outStringLength++] = newSwitchData[deviceId].belongOCData[jj].FindPostionCmd;/*寻表命令*/
LongToChar(newSwitchData[deviceId].belongOCData[jj].FindCmdStartCycNum, &outString[outStringLength]);/*寻表命令起始周期*/
outStringLength += 4u;
}
outString[outStringLength++] = newSwitchData[deviceId].PLockedAxisSecNum;/*被防护锁闭的计轴区段ID*/
for (jj = 0; jj < SWITCH_MAX_PROTECT_LOCKED_NUM; jj++)
{
ShortToChar(newSwitchData[deviceId].PLockedAxisSecIdArr[jj], &outString[outStringLength]);
outStringLength += 2u;
}
}
}
else
@@ -1339,6 +1375,9 @@ UINT8 RecordDeviceDataLog(UINT8 Flag)
outStringLength++;
outString[outStringLength] = pLogicSecDataCC[deviceId].TXOccupyState;/*逻辑区段通信车占用状态CC(0x55-无车或非通信车占用，0xAA-通信车占用)*/
outStringLength++;
outString[outStringLength++] = newLogicSecData[deviceId].chLogSecCbtcArbState;/*逻辑区段CBTC_ARB状态*/
outString[outStringLength++] = newLogicSecData[deviceId].chLogSecPbTacsArbState;/*逻辑区段PB_TACS_ARB状态*/
outString[outStringLength++] = newLogicSecData[deviceId].chArbState;/*逻辑区段ARB状态*/
outString[outStringLength++] = newLogicSecData[deviceId].LogLockState;/*逻辑区段锁闭状态*/
outString[outStringLength++] = newLogicSecData[deviceId].LogLockDir;/*逻辑区段锁闭方向*/
outString[outStringLength++] = pLogicSecDataCC[deviceId].chResShareFlag;/*逻辑区段共享标志 0x55共享 0xAA非共享*/
@@ -1490,18 +1529,46 @@ UINT8 RecordDeviceDataLog(UINT8 Flag)
outString[outStringLength++] = newWashMachineData[deviceId].PauseTrainWashRequestDrvState;/*暂停洗车请求驱动状态(动态字段:驱动)*/
outString[outStringLength++] = newWashMachineData[deviceId].PaseWashMachineRequesDrvtState;/*通过洗车机请求驱动状态(动态字段:驱动)*/
outString[outStringLength++] = newWashMachineData[deviceId].WashmachineXTACurState;/*洗车同意按钮当前状态*/
outString[outStringLength++] = newWashMachineData[deviceId].WashmachineXTAPreState;/*洗车同意按钮上周期状态*/
outString[outStringLength++] = newWashMachineData[deviceId].WashmachineXTALogicState;/*洗车机按钮逻辑状态*/
LongToChar(newWashMachineData[deviceId].WashmachineXTAPressDownCycle,&outString[outStringLength]);/*洗车机洗车同意按钮按下起始周期*/
outStringLength += 4u;
outString[outStringLength++] = newWashMachineData[deviceId].WashMachineWorkModeDrvtState;/*洗车机洗车模式驱动状态(动态字段:驱动)*/
outString[outStringLength++] = newWashMachineData[deviceId].WashModeState;/*洗车机洗车模式采集状态*/
outString[outStringLength++] = newWashMachineData[deviceId].chSetWashWorkModeBack;/*设置洗车机工作模式反馈*/
outString[outStringLength++] = newWashMachineData[deviceId].chDownWashAllowState;/*降级模式洗车同意状态*/
outString[outStringLength++] = newWashMachineData[deviceId].chDownWashAllowPassState;/*降级模式洗车同意通过状态*/
LongToChar(newWashMachineData[deviceId].WashWorkModeRelayDrvCycle, &outString[outStringLength]);/*洗车模式继电器驱动起始周期号*/
outStringLength += 4u;
outString[outStringLength++] = newWashMachineData[deviceId].chDownWashAllowState;/**降级模式洗车同意状态(动态字段:融合)*/
outString[outStringLength++] = newWashMachineData[deviceId].chDownWashAllowPassState;/*降级模式洗车同意通过状态(动态字段:融合)*/
outString[outStringLength++] = newWashMachineData[deviceId].chDownWashReqState;/*降级模式洗车请求状态*/
LongToChar(newWashMachineData[deviceId].dwDownWashReqCycle, &outString[outStringLength]);/*降级模式洗车请求周期*/
outStringLength += 4u;
outString[outStringLength++] = newWashMachineData[deviceId].chDownWashPassReqState;/*降级模式反向洗车请求状态*/
LongToChar(newWashMachineData[deviceId].dwDownWashPassReqCycle, &outString[outStringLength]);/*降级模式反向洗车请求周期*/
outStringLength += 4u;
outString[outStringLength++] = newWashMachineData[deviceId].chDownWashAllowColState;/*降级模式洗车线洗车同意状态*/
LongToChar(newWashMachineData[deviceId].dwDownWashAllowCycle, &outString[outStringLength]);/*降级模式洗车线洗车同意按钮按下起始周期*/
outStringLength += 4u;
LongToChar(newWashMachineData[deviceId].dwDownWashBtVadCycle, &outString[outStringLength]);/*降级模式洗车线洗车同意按钮有效周期*/
outStringLength += 4u;
outString[outStringLength++] = newWashMachineData[deviceId].chDownDccWashAllowColState;/*降级模式DCC洗车同意状态*/
LongToChar(newWashMachineData[deviceId].dwDownWashDccAllowCycle, &outString[outStringLength]);/*降级模式DCC洗车同意按钮按下起始周期*/
outStringLength += 4u;
LongToChar(newWashMachineData[deviceId].dwDownWashDccBtVadCycle, &outString[outStringLength]);/*降级模式DCC洗车同意按钮有效周期*/
outStringLength += 4u;
outString[outStringLength++] = newWashMachineData[deviceId].chDownWashAllowErrState;/*降级模式洗车线洗车同意粘连状态*/
outString[outStringLength++] = newWashMachineData[deviceId].chDownDccWashAllowErrState;/*降级模式DCC洗车同意粘连状态*/
outString[outStringLength++] = newWashMachineData[deviceId].chDownWashAllowPassColState;/*降级模式洗车线洗车同意反向通过状态*/
LongToChar(newWashMachineData[deviceId].dwDownWashAllowPassCycle, &outString[outStringLength]);/*降级模式洗车线反向通过洗车同意按钮按下起始周期*/
outStringLength += 4u;
LongToChar(newWashMachineData[deviceId].dwDownWashBtVadPassCycle, &outString[outStringLength]);/*降级模式洗车线反向通过洗车同意按钮有效周期*/
outStringLength += 4u;
outString[outStringLength++] = newWashMachineData[deviceId].chDownDccWashAllowPassColState;/*降级模式DCC洗车同意反向通过状态*/
LongToChar(newWashMachineData[deviceId].dwDownWashDccAllowPassCycle, &outString[outStringLength]);/*降级模式DCC反向通过洗车同意按钮按下起始周期*/
outStringLength += 4u;
LongToChar(newWashMachineData[deviceId].dwDownWashDccBtVadPassCycle, &outString[outStringLength]);/*降级模式DCC反向通过洗车同意按钮有效周期*/
outStringLength += 4u;
outString[outStringLength++] = newWashMachineData[deviceId].chDownWashAllowPassErrState;/*降级模式洗车线洗车同意反向通过粘连状态*/
outString[outStringLength++] = newWashMachineData[deviceId].chDownDccWashAllowPassErrState;/*降级模式DCC洗车同意反向通过粘连状态*/
}
}
@@ -1595,6 +1662,8 @@ UINT8 RecordDeviceDataLog(UINT8 Flag)
outStringLength += 4u;
outString[outStringLength++] = newPsdData[deviceId].StartDetectionState;/*启动探测状态*/
outString[outStringLength++] = newPsdData[deviceId].StopDetectionState; /*停止探测状态*/
LongToChar(newPsdData[deviceId].StopDetectionCycNum,&outString[outStringLength]);/*停止探测周期*/
outStringLength += 4u;
outString[outStringLength++] = newPsdData[deviceId].VOBCDoorState; /*VOBC车门状态*/
LongToChar(newPsdData[deviceId].PCBPressCycNum,&outString[outStringLength]);/*PCB按下起始周期*/
outStringLength += 4u;
@@ -1624,6 +1693,14 @@ UINT8 RecordDeviceDataLog(UINT8 Flag)
outStringLength++;
LongToChar(newPsdData[deviceId].dwPsdRelayDownCycNum, &outString[outStringLength]); /*PSD门关继电器落下起始周期*/
outStringLength += 4U;
outString[outStringLength] = newPsdData[deviceId].JXTCMutualLockFaultState; /*间隙探测旁路按钮故障状态*/
outStringLength++;
LongToChar(newPsdData[deviceId].JXTCMutualLockStartCycNum, &outString[outStringLength]); /*间隙探测旁路按钮按压起始周期*/
outStringLength += 4U;
outString[outStringLength++] = newPsdData[deviceId].ibpButtonState;/*IBP盘发车按钮状态*/
LongToChar(newPsdData[deviceId].IBPPressCycNum, &outString[outStringLength]); /*IBP盘发车按钮按下周期*/
outStringLength += 4U;
}
}
else
@@ -1667,14 +1744,14 @@ UINT8 RecordDeviceDataLog(UINT8 Flag)
deviceId = GetGaragedoorId(ii);
comparaResult = DeviceCompara((UINT8*)(&Record_GaragedoorDataStru[deviceId]), (UINT16)sizeof(GaragedoorDataStruct),
(UINT8*)(&newGaragedoorData[deviceId]), (UINT16)sizeof(GaragedoorDataStruct));
comparaResult += DeviceCompara((UINT8*)(&Record_GaragedoorDataStruCC[deviceId]), (UINT16)sizeof(GaragedoorDataStructCC),
comparaResultCC = DeviceCompara((UINT8*)(&Record_GaragedoorDataStruCC[deviceId]), (UINT16)sizeof(GaragedoorDataStructCC),
(UINT8*)(&pGaragedoorDataCC[deviceId]), (UINT16)sizeof(GaragedoorDataStructCC));
if (0u==comparaResult)
if ((0U == comparaResult) && (0U == comparaResultCC))
{/*比较数据一致*/
}
else if (1u==comparaResult )
else if ((1U == comparaResult) || (1U == comparaResultCC))
{/*比较数据不一致*/
if (CI_ERROR==Flag)
@@ -1746,14 +1823,14 @@ UINT8 RecordDeviceDataLog(UINT8 Flag)
deviceId = GetFloodGateId(ii);
comparaResult = DeviceCompara((UINT8*)(&Record_FloodGateDataStru[deviceId]), (UINT16)sizeof(FloodGateDataStruct),
(UINT8*)(&pNewFloodGateData[deviceId]), (UINT16)sizeof(FloodGateDataStruct));
comparaResult += DeviceCompara((UINT8*)(&Record_FloodGateDataStruCC[deviceId]), (UINT16)sizeof(FloodGateDataStructCC),
comparaResultCC = DeviceCompara((UINT8*)(&Record_FloodGateDataStruCC[deviceId]), (UINT16)sizeof(FloodGateDataStructCC),
(UINT8*)(&pNewFloodGateDataCC[deviceId]), (UINT16)sizeof(FloodGateDataStructCC));
if (0u==comparaResult )
if ((0U == comparaResult) && (0U == comparaResultCC))
{/*比较数据一致*/
}
else if (1u==comparaResult )
else if ((1U == comparaResult) || (1U == comparaResultCC))
{/*比较数据不一致*/
if (CI_ERROR==Flag )
@@ -1829,14 +1906,14 @@ UINT8 RecordDeviceDataLog(UINT8 Flag)
deviceId = GetOverlapId(ii);
comparaResult = DeviceCompara((UINT8*)(&Record_OverlapDataStru[deviceId]), (UINT16)sizeof(OverlapDataStruct),
(UINT8*)(&newOverlapData[deviceId]), (UINT16)sizeof(OverlapDataStruct));
comparaResult += DeviceCompara((UINT8*)(&Record_OverlapDataStruCC[deviceId]), (UINT16)sizeof(OverlapDataStructCC),
comparaResultCC = DeviceCompara((UINT8*)(&Record_OverlapDataStruCC[deviceId]), (UINT16)sizeof(OverlapDataStructCC),
(UINT8*)(&pOverlapDataCC[deviceId]), (UINT16)sizeof(OverlapDataStructCC));
if (0u==comparaResult)
if ((0U == comparaResult) && (0U == comparaResultCC))
{/*比较数据一致*/
}
else if (1u==comparaResult )
else if ((1U == comparaResult) || (1U == comparaResultCC))
{/*比较数据不一致*/
if (CI_ERROR != Flag)
@@ -1851,6 +1928,9 @@ UINT8 RecordDeviceDataLog(UINT8 Flag)
outStringLength += 4u;
LongToChar(newOverlapData[deviceId].XuanPaiStartCycNum,&outString[outStringLength]);/*保护区段选排开始周期号*/
outStringLength += 4u;
LongToChar(newOverlapData[deviceId].dwAtsLastTimeLockCyc, &outString[outStringLength]);/*最近一次ATS锁闭保护区段周期号*/
outStringLength += 4u;
outString[outStringLength++] = newOverlapData[deviceId].OverlapFromSetRouteCmdFlag; /*保护区段由进路办理时连带的标志*/
outString[outStringLength++] = newOverlapData[deviceId].chPreLaborUnlockState; /*之前人工解锁状态*/
outString[outStringLength++] = newOverlapData[deviceId].OverlapUnlockApplyFlag;/*向ZC申请解锁保护区段解锁标志*/
outString[outStringLength++] = newOverlapData[deviceId].OverlapCanLaborUnlockFlag;/*保护区段可以人工解锁标志*/
@@ -3003,7 +3083,7 @@ UINT8 DeviceCompara(UINT8* deviceStruAddr1, const UINT16 deviceStruLen1,
void GetVirCIKeyDataStru(void)
{
UINT8 ii = 0u;
UINT8 jj = 0U;
for(ii=0u;ii<g_VirtualCIStructData.virtualCiNum;ii++)
{
@@ -3022,12 +3102,6 @@ void GetVirCIKeyDataStru(void)
newVirCIKeyDataStru[ii].ZfwValidCycNum = g_VirtualCIStructData.virtualCi[ii].ZfwValidCycNum;
for (jj = 0U; jj < RTNINDICATOR_SUM_MAX; jj++)
{
newVirCIKeyDataStru[ii].RtnIndicatorKeyData[jj].PrintVirCiIndicatorDevId = g_VirtualCIStructData.virtualCi[ii].VirCIRtnIndicatorStaData[jj].VirCiIndicatorDevId;
newVirCIKeyDataStru[ii].RtnIndicatorKeyData[jj].PrintVirCiFlashState = g_VirtualCIStructData.virtualCi[ii].VirCIRtnIndicatorStaData[jj].VirCiFlashState;
newVirCIKeyDataStru[ii].RtnIndicatorKeyData[jj].PrintVirCiSteadyState = g_VirtualCIStructData.virtualCi[ii].VirCIRtnIndicatorStaData[jj].VirCiSteadyState;
}
newVirCIKeyDataStru[ii].ZfwjHunXianFLag = g_VirtualCIStructData.virtualCi[ii].ZfwjHunXianFLag;
}
}
TSCP/src/APP/ciapp/LogicManage/InterlockCommonManage.c
+36 -93
View File
@@ -16,6 +16,7 @@
#include "../Section/LogicSectionDataManage.h"
#include "LogicalRouteDataManage.h"
#include "../LogicProcess/LogicalRouteLogicCheck.h"
#include "../Overlap/OverlapDataManage.h"
/* C01_进路监督级别确认 */
/*
@@ -594,7 +595,7 @@ void SetRouteRelProSwitchLockSta(const UINT16 routeId, const UINT8 lockCommand)
cSwitchCurPos = GetSwitchCurPosition(protectSwitchId);
cFuncRet = checkSwtLastValDrvPosStayorNot(protectSwitchId, routeProtectSwitchStru[ii].ProtectPosition);
if ((SWITCH_LOCK_PROTECT_CANCEL == lockCommand)
|| ((SWITCH_LOCK_PROTECT_SET == lockCommand) && (cSwitchCurPos == routeProtectSwitchStru[ii].ProtectPosition) && (CI_SUCCESS == cFuncRet)))
|| ((cSwitchCurPos == routeProtectSwitchStru[ii].ProtectPosition) && (CI_SUCCESS == cFuncRet)))
{
SetSwitchLockStatus(SWITCH_PLOCKTYPE_ROUTE, routeId, protectSwitchId, lockCommand); /*设置道岔防护锁闭状态*/
/*RC 13.0.0 修：不检查防护道岔中双动道岔另一端*/
@@ -801,7 +802,6 @@ void PhySecFaultUnlockLogicManage(const UINT16 phySectionId,const UINT8 virCIid)
UINT8 goExec = CI_ERROR;
UINT8 autoTriggerType = 0U;
UINT8 belongvirCIid = 0U;
UINT8 includeVirFlag = GetCiFunctionSwitchConfig(FUNC_INCLUDEVIRCI_FLAG);
UINT8 chPhyIncLogSum = 0U; /*包含逻辑区段数目*/
UINT16* pPhyIncLogId = NULL; /*物理区段包含逻辑区段ID数组*/
UINT16 wLogLockBelongRouteId = 0U; /*逻辑区段锁闭所属进路ID*/
@@ -1038,8 +1038,6 @@ void PhySecFaultUnlockLogicManage(const UINT16 phySectionId,const UINT8 virCIid)
}
}
else if((phyBelongCi == localCiId)&&(TRANSMIT_STATE_GOOD == commState))
{
if(FUNC_SWITCH_ON == includeVirFlag)
{
belongvirCIid = GetPhySecBelongVirCiId(phySectionId);
if((belongvirCIid == virCIid)&&(0u != virCIid))/*区故解可以由相邻虚拟联锁现地操作，不相邻不能操作*/
@@ -1049,12 +1047,6 @@ void PhySecFaultUnlockLogicManage(const UINT16 phySectionId,const UINT8 virCIid)
}
}
else
{
/*进路属于相邻联锁，且区段属于本联锁时，传递区段故障解锁命令 */
AddCiSendToCiCmdInfo(CI_CMD_SECTION_FAULT_UNLOCK,phySectionId,0u,routeBelongCi);
}
}
else
{
/*异常情况，不处理区故解命令*/
}
@@ -1392,6 +1384,12 @@ void RouteRecoverOpenProc(const UINT16 routeId)
UINT8 errType = CI_ERROR;
UINT8 localCiType = GetLocalCiType();/*获得联锁类型*/
UINT16 wStartSignalId = 0U; /*进路始端信号机ID*/
UINT8 chVirCiId = 0U;/*虚拟联锁*/
UINT8 chLocalVirCiType = 0U;
chVirCiId = GetRouteBelongVirCiId(routeId);
chLocalVirCiType = GetLocalVirCiType(chVirCiId);
routeState = GetRouteState(routeId);
recoverState = GetRouteRecoverOpenFlag(routeId);
@@ -1400,7 +1398,7 @@ void RouteRecoverOpenProc(const UINT16 routeId)
{
if (ROUTE_RECOVER_STA_WAIT == recoverState)
{
if ((CI_TYPE_ZX == localCiType) || (CI_TYPE_SCX == localCiType))
if ((CI_TYPE_ZX == chLocalVirCiType) || (CI_TYPE_SCX == chLocalVirCiType))
{
errType = RecoverOpenRouteCheck(routeId);
}
@@ -1445,7 +1443,6 @@ void SetAtsExpectLockOverlapIdProc(const UINT16 expLkOverlapId,const UINT8 lockT
UINT16 ii = 0u;
UINT16 routeOverlapSum = 0u; /*进路保护区段数目*/
UINT16 routeId = 0u; /*进路ID*/
UINT16 routedLockOverlapId = 0u; /*进路锁闭过OverlapId*/
UINT8 retVal = CI_SUCCESS; /*执行检查*/
UINT8 routeState = 0u; /*进路状态*/
UINT16 preOverlepId = 0u;
@@ -1455,9 +1452,9 @@ void SetAtsExpectLockOverlapIdProc(const UINT16 expLkOverlapId,const UINT8 lockT
UINT8 flag = 0u;
UINT8 belongCiId = 0u;
UINT8 localCiId = GetSystemParaLocalCiId(); /*获取本机联锁ID*/
UINT8 includeVirFlag = GetCiFunctionSwitchConfig(FUNC_INCLUDEVIRCI_FLAG);
UINT8 virCIid = 0u;
UINT8 ciCtrModeFlag = 0u;
UINT32 dwCurCycNum = Get2oo2CurCycleNum();
if ((0u == expLkOverlapId) || (UINT16_MAX == expLkOverlapId))
{/*判断输入参数有效性*/
@@ -1498,7 +1495,7 @@ void SetAtsExpectLockOverlapIdProc(const UINT16 expLkOverlapId,const UINT8 lockT
if (routeOverlapSum >= 1u)
{/*只有当进路的保护区段数目大于等于1个时，ATS或现地才发送期望锁闭保护区段ID*/
/*输入参数保护区段ID是否属于当前进路 且进路保护区段未锁闭过*/
if (1u == checkExpOverlapBelongToRtOrNot(routeId,expLkOverlapId))
if (1u == checkExpOverlapBelongToRtOrNot(routeId, expLkOverlapId))
{/*期望锁闭的保护区段ID属于进路的保护区段ID*/
flag = 1u;/*有任意一条匹配到了，则置为1*/
retVal = CI_SUCCESS;
@@ -1525,30 +1522,16 @@ void SetAtsExpectLockOverlapIdProc(const UINT16 expLkOverlapId,const UINT8 lockT
/*判断当前保护区段所属联锁控制模式是否可以响应锁闭保护区段命令*/
if (CI_SUCCESS == retVal)
{
virCIid= GetOverlapBelongVirCiId(expLkOverlapId);
if(FUNC_SWITCH_ON == includeVirFlag)
{
ciCtrModeFlag = GetVirCImode(virCIid);/*获取联锁控制模式*/
}
else
{
ciCtrModeFlag = GetCiModeFlag(); /*获取联锁控制模式*/
}
virCIid = GetOverlapBelongVirCiId(expLkOverlapId);
if((CI_MODE_CI_LOCAL ==ciCtrModeFlag)||(0u ==ciCtrModeFlag))/*处于联锁控或者获取错误，发送现地不能响应人工锁闭命令*/
ciCtrModeFlag = GetVirCImode(virCIid);/*获取联锁控制模式*/
if ((CI_MODE_CI_LOCAL == ciCtrModeFlag) || (0u == ciCtrModeFlag))/*处于联锁控或者获取错误，发送现地不能响应人工锁闭命令*/
{
retVal = CI_ERROR;
}
}
/*add by shl*/
if (CI_SUCCESS == retVal)
{
routedLockOverlapId = GetRouteOverlapLockedId(routeId); /*获取进路锁闭过保护区段ID*/
if (0u == routedLockOverlapId)
{
/*判断进路状态，是否满足锁闭保护区段条件，若满足则设置期望锁闭保护区段*/
routeState = GetRouteState(routeId);
@@ -1566,38 +1549,35 @@ void SetAtsExpectLockOverlapIdProc(const UINT16 expLkOverlapId,const UINT8 lockT
(routeState == ROUTE_STATE_HALF_UNLOCK)
)
{/*设置指定ID进路的期望锁闭保护区段ID*/
if(LABOR_LOCK_OVERLAP == lockType)/*人工锁闭*/
if (LABOR_LOCK_OVERLAP == lockType)/*人工锁闭*/
{
SetOverlapAtsOrlaborLockCmdFlag(expLkOverlapId,LOCK_OVERLAP_CMD_YES);/*设置保护区段锁闭命令标志，用于保护区段解锁倒计时计算*/
SetOverlaplaborLockCmdFlag(expLkOverlapId,LOCK_OVERLAP_CMD_YES);/*设置人工锁闭标志，用于人工命令一次有效处理*/
SetOverlapAtsOrlaborLockCmdFlag(expLkOverlapId, LOCK_OVERLAP_CMD_YES);/*设置保护区段锁闭命令标志，用于保护区段解锁倒计时计算*/
SetOverlaplaborLockCmdFlag(expLkOverlapId, LOCK_OVERLAP_CMD_YES);/*设置人工锁闭标志，用于人工命令一次有效处理*/
ClearPreLoaborUnlockState(expLkOverlapId);
}
else if(ATS_LOCK_OVERLAP == lockType)/*ATS锁闭*/
else if (ATS_LOCK_OVERLAP == lockType)/*ATS锁闭*/
{
phySectionId = GetRouteLastPhySectionId(routeId);
phySectionSta = GetPhySecCurMergeState(phySectionId);
if(SECTION_OCCUPY_YES==phySectionSta)
if (SECTION_OCCUPY_YES == phySectionSta)
{
SetOverlapAtsOrlaborLockCmdFlag(expLkOverlapId,LOCK_OVERLAP_CMD_YES);/*设置保护区段锁闭命令标志*/
SetOverlapAtsOrlaborLockCmdFlag(expLkOverlapId, LOCK_OVERLAP_CMD_YES);/*设置保护区段锁闭命令标志*/
}
}
else
{
/*什么也不做*/
}
SetRouteAtsExpLkOverlapId(routeId,expLkOverlapId);
SetRouteAtsExpLkOverlapId(routeId, expLkOverlapId);
SetOverlapFromSetRouteCmdFlag(expLkOverlapId, OVERLAP_ROUTE_FLAG_NO);/*清除标志*/
SetOverlapAtsLastTimeLockCyc(expLkOverlapId, dwCurCycNum);
retVal = CI_SUCCESS;
}
else
{
retVal = CI_ERROR;
}
}
}
}
}
}
@@ -1621,7 +1601,6 @@ UINT8 CheckPhySecFaultUnlockCanDo(const UINT16 phySectionId,const UINT8 virCIid)
UINT16 lockBelongRouteId = 0u; /*区段锁闭所属进路ID*/
UINT8 reVal = CI_ERROR;
UINT8 belongvirCIid = 0u;
UINT8 includeVirFlag = GetCiFunctionSwitchConfig(FUNC_INCLUDEVIRCI_FLAG);
UINT8 isErrLock = CI_ERROR;
UINT8 phyLockState = 0U;
@@ -1647,8 +1626,7 @@ UINT8 CheckPhySecFaultUnlockCanDo(const UINT16 phySectionId,const UINT8 virCIid)
}
if(CI_SUCCESS == reVal)
{
if(FUNC_SWITCH_ON == includeVirFlag)
{
belongvirCIid = GetRouteBelongVirCiId(lockBelongRouteId);
if(0u < virCIid)
{
@@ -1674,11 +1652,7 @@ UINT8 CheckPhySecFaultUnlockCanDo(const UINT16 phySectionId,const UINT8 virCIid)
reVal = CI_ERROR;
}
}
else
{
reVal = CI_SUCCESS;
}
}
/*按顺序解锁进路异常锁闭*/
@@ -3424,14 +3398,12 @@ void OtherCiLogSecFaultUnlockProcess(const UINT16 wLogSectionId, const UINT8 chV
UINT8 chLogFaultUnLockRes = 0U;/*逻辑区段故障解锁条件检查结果*/
UINT8 chLogSecBelongRouteDir = 0U;/*逻辑区段锁闭所属进路方向*/
UINT8 chRouteLogSecHaveUnLock = 0u;/*进路逻辑区段是否已解锁*/
UINT8 chIncludeVirFlag = 0U;/*是否支持虚拟联锁*/
UINT8 chBelongVirCiId = 0U;/*逻辑区段所属虚拟联锁ID*/
UINT16 wLogSecBelongPhySecId = 0U;/*逻辑区段所属物理区段ID*/
chLocalCiId = GetSystemParaLocalCiId(); /*获取本机联锁ID*/
wLogLockBelongRouteId = GetLogSecLockBelongRoute(wLogSectionId);
chFuncSwitch = GetCiFunctionSwitchConfig(FUNC_SWITCH_USE_RELAY_INTERFACE_BETWEEN_NEIGHBOURCI);
chIncludeVirFlag = GetCiFunctionSwitchConfig(FUNC_INCLUDEVIRCI_FLAG);
chConfirmRelayInterfaceFlag = GetCiCiRelayInterfConfirmFlag();/*继电接口确认状态*/
if ((0U < wLogLockBelongRouteId) && (ROUTE_SUM_MAX > wLogLockBelongRouteId))
@@ -3465,21 +3437,15 @@ void OtherCiLogSecFaultUnlockProcess(const UINT16 wLogSectionId, const UINT8 chV
else if ((chLocalCiId == chLogSecBelongCiId) && (TRANSMIT_STATE_GOOD == chCommState))
{
wLogSecBelongPhySecId = GetLgcSecRelativePhySecId(wLogSectionId);
if (FUNC_SWITCH_ON == chIncludeVirFlag)
{
chBelongVirCiId = GetLogSecBelongVirCiId(wLogSectionId);
if ((chVirCIid == chBelongVirCiId) && (0U != chVirCIid))
{
/*进路属于相邻联锁，且区段属于本联锁时，传递区段故障解锁命令 */
AddCiSendToCiCmdInfo(CI_CMD_SECTION_FAULT_UNLOCK, wLogSecBelongPhySecId, 0U, chRouteBelongCiId);
}
}
else
{
/*进路属于相邻联锁，且区段属于本联锁时，传递区段故障解锁命令 */
AddCiSendToCiCmdInfo(CI_CMD_SECTION_FAULT_UNLOCK, wLogSecBelongPhySecId, 0U, chRouteBelongCiId);
}
}
else
{
@@ -3500,7 +3466,6 @@ UINT8 CheckLogSecFaultUnlockCanDo(const UINT16 wLogSectionId, const UINT8 chVirC
UINT16 wLockBelongRouteId = 0U; /*区段锁闭所属进路ID*/
UINT8 reVal = CI_ERROR;
UINT8 chBelongvirCIid = 0U;
UINT8 chIncludeVirFlag = GetCiFunctionSwitchConfig(FUNC_INCLUDEVIRCI_FLAG);
if ((0u == wLogSectionId) || (LOGIC_SECTION_SUM_MAX <= wLogSectionId))
{
@@ -3523,8 +3488,7 @@ UINT8 CheckLogSecFaultUnlockCanDo(const UINT16 wLogSectionId, const UINT8 chVirC
}
if (CI_SUCCESS == reVal)
{
if (FUNC_SWITCH_ON == chIncludeVirFlag)
{
chBelongvirCIid = GetRouteBelongVirCiId(wLockBelongRouteId);
if (0U < chVirCIid)
{
@@ -3551,11 +3515,6 @@ UINT8 CheckLogSecFaultUnlockCanDo(const UINT16 wLogSectionId, const UINT8 chVirC
}
}
else
{
reVal = CI_SUCCESS;
}
}
return reVal;
}
@@ -4512,7 +4471,6 @@ void DriveLogRouteSignalClose(const UINT16 wLogSignalId)
UINT8 sigalMaintainState = 0u;
UINT8 detainOpenRedBright = 0u;
UINT8 signalDetainFlag = 0u;
UINT8 includeVirFlag = GetCiFunctionSwitchConfig(FUNC_INCLUDEVIRCI_FLAG);
if ((0u == wLogSignalId) || (SIGNAL_SUM_MAX <= wLogSignalId))
{
/*不做处理*/
@@ -4520,15 +4478,11 @@ void DriveLogRouteSignalClose(const UINT16 wLogSignalId)
else
{
/*虚拟联锁兼容*/
if (FUNC_SWITCH_ON == includeVirFlag)
{
belongVirCIid = GetSignalBelongVirCiId(wLogSignalId);
allSignalBrightFlag = GetVirCIAllSignalBrightState(belongVirCIid); /*全站亮灯标志*/
}
else
{
allSignalBrightFlag = GetAllSignalBrightFlag(); /*全站亮灯标志*/
}
/*无论什么时候，复示信号机关闭都驱动红灭*/
signalIsfushiFlag = GetSignalIsfushiFlag(wLogSignalId);
@@ -5127,7 +5081,6 @@ void LogRouteErrLockFaultManage(const UINT16 wPhySectionId)
void SetAtsLockOverlapHaveRouteId(const UINT16 expLkOverlapId, const UINT16 routeId)
{
UINT16 routeOverlapSum = 0U; /*进路保护区段数目*/
UINT16 routedLockOverlapId = 0U; /*进路锁闭过OverlapId*/
UINT8 retVal = CI_SUCCESS; /*返回值*/
UINT8 routeState = 0U; /*进路状态*/
UINT16 preOverlepId = 0U;
@@ -5136,11 +5089,11 @@ void SetAtsLockOverlapHaveRouteId(const UINT16 expLkOverlapId, const UINT16 rout
UINT8 phySectionSta = 0U;
UINT8 belongCiId = 0U;
UINT8 localCiId = GetSystemParaLocalCiId(); /*获取本机联锁ID*/
UINT8 includeVirFlag = GetCiFunctionSwitchConfig(FUNC_INCLUDEVIRCI_FLAG);
UINT8 virCIid = 0U;
UINT8 ciCtrModeFlag = 0U;
UINT8 routeStateFlag = 0U;
UINT8 flag = 0U;
UINT32 dwCurCycNum = Get2oo2CurCycleNum();
routeStateFlag = GetRouteStateFlag(routeId);
@@ -5203,14 +5156,8 @@ void SetAtsLockOverlapHaveRouteId(const UINT16 expLkOverlapId, const UINT16 rout
if (CI_SUCCESS == retVal)
{
virCIid = GetOverlapBelongVirCiId(expLkOverlapId);
if (FUNC_SWITCH_ON == includeVirFlag)
{
ciCtrModeFlag = GetVirCImode(virCIid);/*获取联锁控制模式*/
}
else
{
ciCtrModeFlag = GetCiModeFlag(); /*获取联锁控制模式*/
}
if ((CI_MODE_CI_LOCAL == ciCtrModeFlag) || (0U == ciCtrModeFlag))/*处于联锁控或者获取错误，发送现地不能响应人工锁闭命令*/
{
@@ -5219,10 +5166,6 @@ void SetAtsLockOverlapHaveRouteId(const UINT16 expLkOverlapId, const UINT16 rout
}
if (CI_SUCCESS == retVal)
{
routedLockOverlapId = GetRouteOverlapLockedId(routeId); /*获取进路锁闭过保护区段ID*/
if (0U == routedLockOverlapId)
{
/*判断进路状态，是否满足锁闭保护区段条件，若满足则设置期望锁闭保护区段*/
routeState = GetRouteState(routeId);
@@ -5238,7 +5181,8 @@ void SetAtsLockOverlapHaveRouteId(const UINT16 expLkOverlapId, const UINT16 rout
|| (ROUTE_STATE_NEAR_LOCKERR == routeState)
|| ((ROUTE_STATE_AUTO_UNLOCK == routeState) && (ROUTE_STATE_FLAG_YES == routeStateFlag))
)
{/*设置指定ID进路的期望锁闭保护区段ID*/
{
/*设置指定ID进路的期望锁闭保护区段ID*/
/*仅处理ATS办理保护区段，不处理人工办理保护区段*/
phySectionId = GetRouteLastPhySectionId(routeId);
phySectionSta = GetPhySecCurMergeState(phySectionId);
@@ -5255,6 +5199,7 @@ void SetAtsLockOverlapHaveRouteId(const UINT16 expLkOverlapId, const UINT16 rout
SetOverlapFromSetRouteCmdFlag(expLkOverlapId, OVERLAP_ROUTE_FLAG_YES);/*设置保护区段由进路连带标识*/
SetOverlapAtsLastTimeLockCyc(expLkOverlapId, dwCurCycNum);
retVal = CI_SUCCESS;
}
else
@@ -5268,8 +5213,6 @@ void SetAtsLockOverlapHaveRouteId(const UINT16 expLkOverlapId, const UINT16 rout
}
}
}
if (0U == flag)
{/*发送的这个区段不属于任何进路的保护区段*/
TSCP/src/APP/ciapp/LogicManage/InterlockLogicManage.c
+181 -202
View File
@@ -16,7 +16,6 @@
#include "TrainDataManage.h"
#include "HLHTHeadContexManage.h"
#include "TrainOnAcManage.h"
#include "TrainDataManage.h"
#include "SectionStateProcess_define.h"
#include "DynamicRouteDataManage.h"
#include "LogicalRouteDataManage.h"
@@ -150,6 +149,10 @@ void InterlockLogicMainProc(void)
cost[0] = MSCP_GetTick();
if (SYSTEM_WORK_MODE_MAIN == cControlState)
{
/*试车线状态机处理*/
CiTrainTestLogicManage();
if ((CI_TYPE_ZX == localCiType) || (CI_TYPE_SCX == localCiType))
{
/*全自动折返进路逻辑处理*/
@@ -162,10 +165,6 @@ void InterlockLogicMainProc(void)
NearCIRouteNeedCloseProce();
/*cgh-合并CID-2341-8：清除保护区段的选排起始周期号, 进路空闲状态，清除进路保护区段选排起始周期*/
ClearOverlapXuanPaiStartCycNum();
if (CI_TYPE_SCX == localCiType)
{
CiTrainTestLogicManage();
}
#if 0
/*指示灯逻辑管理*/
IndicatorLogicManage();
@@ -205,8 +204,6 @@ void InterlockLogicMainProc(void)
/*保护区段状态更新管理*/
OverlapStateUpdateManage();
cost[2] = MSCP_GetTick();
/*进路其它联锁道岔管理*/
@@ -294,22 +291,11 @@ void RouteLogicManage(void)
if (CI_SUCCESS == rtVal)
{
if ((CI_TYPE_ZX == localCiType) || (CI_TYPE_SCX == localCiType))
{/*正线和试车线既检查上电解锁，又检查全站解封*/
if ((CI_START_LOCK_NO != startLockState) || (CI_START_FLOCK_NO != startFlockFlag))
{/*未全站解封且未上电解锁*/
rtVal = CI_ERROR;
}
}
else
{/*车辆段仅检查上电解锁*/
if (GetStartLockFlag() != CI_START_LOCK_NO)
{ /*未上电解锁*/
rtVal = CI_ERROR;
}
}
}
@@ -736,7 +722,6 @@ void RouteAutoManage(const UINT16 routeId)
UINT8 phySectionUseState = 0u;
UINT16 routeAutoReturnId = 0u;
UINT8 virCIid = 0u;
UINT8 includeVirFlag = GetCiFunctionSwitchConfig(FUNC_INCLUDEVIRCI_FLAG);
checkDSBreakLoseEfficacyFlag = GetCiFunctionSwitchConfig(FUNC_DS_BREAK_AUTOSIG_LOSE_EFFICACY_FLAG);
@@ -1658,6 +1643,7 @@ void RouteNearLockErrManage(const UINT16 routeId)
UINT8 routeRepeatStat = 0U;
UINT8 routeTrainNear = 0U;
UINT8 cFuncRetVal = CI_ERROR;
UINT8 cFuncSwitch = 0U;
/*获取进路始端信号机ID*/
startSignalId = GetRouteStartSignalId(routeId);
@@ -1685,7 +1671,16 @@ void RouteNearLockErrManage(const UINT16 routeId)
{/*之前驱动开放*/
if ((CI_SUCCESS == autoSignalValid) || (ROUTE_REPEATOPEN_SET_YES == routeRepeatStat))
{ /*自动信号或者重开*/
cFuncSwitch = GetCiFunctionSwitchConfig(FUNC_REOPRN_SET_NEAR);
if (FUNC_SWITCH_ON == cFuncSwitch)
{
/*“重开信号是否记忆进路接近锁闭状态开关”配置为0xAA时，默认设置进路接近*/
SetRouteStateManage(routeId, ROUTE_STATE_NEAR_OPEN); /*-->设置接近开放*/
RouteNearOpenManage(routeId); /*-->进路接近开放管理*/
}
else
{
/*“重开信号是否记忆进路接近锁闭状态开关”配置为0x55时，根据接近区段占用状态设置进路接近/未接近*/
if (CI_SUCCESS == routeTrainNear)
{/*进路有车接近*/
SetRouteStateManage(routeId, ROUTE_STATE_NEAR_OPEN); /*-->设置接近开放*/
@@ -1699,6 +1694,7 @@ void RouteNearLockErrManage(const UINT16 routeId)
RouteYuXianOpenManage(routeId); /*进路预先开放管理*/
}
}
}
else
{
/*信号异常开放*/
@@ -2017,8 +2013,10 @@ void RouteNearLockManage(const UINT16 routeId)
UINT16 returnSecId = 0U; /*折返区段*/
UINT8 localCiType = 0U;/*联锁类型*/
UINT8 cFuncRetVal = CI_ERROR;
UINT8 chRouteBelongVirCiId = 0U;
localCiType = GetLocalCiType();
chRouteBelongVirCiId = GetRouteBelongVirCiId(routeId);
localCiType = GetLocalVirCiType(chRouteBelongVirCiId);
/*获取进路始端信号机ID*/
startSignalId = GetRouteStartSignalId(routeId);
autoSigRouteState = GetRouteAutoSigSetState(routeId); /*获取自动信号进路状态*/
@@ -2144,6 +2142,7 @@ void RouteNearLockManage(const UINT16 routeId)
validReturnSigId = GetValidReturnSinalId(routeId, logBelongPhyId);
returnSecId = GetSignalOutFirstPhySecId(validReturnSigId);
/*逻辑区段当前CT占用，或者之前CT占用，当前空闲 且逻辑区段不是道岔区段，且非折返进路或为折返进路但非折返轨*/
if (((LOGICSECTION_OCCUPY_CT == logCurOccupyState) ||
((LOGICSECTION_OCCUPY_NO == logCurOccupyState) && (LOGICSECTION_OCCUPY_CT == logPreOccupyState)))
@@ -2257,7 +2256,6 @@ void RouteNearLockManage(const UINT16 routeId)
*/
void RouteDelayUnlockManage(const UINT16 routeId)
{
UINT8 routeLevel = 0u; /*进路监督级别*/
UINT16 startSignalId = 0u; /*进路始端信号机ID*/
UINT32 delayStartCycNum = 0u; /*延时解锁起始周期号*/
UINT32 delayTotalCycSum = 0u; /*延时解锁总周期数*/
@@ -2270,13 +2268,10 @@ void RouteDelayUnlockManage(const UINT16 routeId)
UINT16 wTrainId = 0u;
UINT16 wLastTrainId = 0u;
UINT32 curCycle = 0u;
UINT8 chRouteState = 0u;
/*获取进路动态字段*/
routeLevel = GetRouteLevel(routeId); /*获取进路监督级别*/
startSignalId = GetRouteStartSignalId(routeId); /*获取进路始端信号机ID*/
curCycle = Get2oo2CurCycleNum();
chRouteState = GetRouteType(routeId);
(void)DriveSignalClose(startSignalId); /*驱动信号关闭*/
@@ -2458,7 +2453,7 @@ void RoutePhySecAutoUnlockManage(const UINT16 routeId)
{
UINT16 phySectionId = 0u; /*物理区段ID*/
UINT8 returnValue = 0u; /*函数返回值*/
UINT8 localCiType = 0u;
UINT16 sectionSum = 0u; /*区段总数*/
UINT16 sectionId = 0u; /*区段ID*/
UINT8 sectionState = 0u; /*设备状态*/
@@ -2469,6 +2464,9 @@ void RoutePhySecAutoUnlockManage(const UINT16 routeId)
UINT8 kk = 0;
NonRouteDataStruct* pNonData = NULL;
UINT8 interfaceType = GetCiFunctionSwitchConfig(SCX_CLD_INTERFACE_TYPE);/*获取试车线与车辆段接口方式类型*/
UINT8 chVirCiId = 0U;
UINT8 chLocalVirCiType = 0U;
UINT8 chPhySecBelongVirCiId = 0U;
/*进路区段自动解锁处理*/
returnValue = RouteOtherSecAutoUnlockProcess(routeId, &phySectionId);
@@ -2491,8 +2489,10 @@ void RoutePhySecAutoUnlockManage(const UINT16 routeId)
else if (RETURN_AUTOLOCK_ERR_EXCEPT == returnValue)
{
/*解锁异常*/
localCiType = GetLocalCiType();
if (CI_TYPE_SCX == localCiType)
chVirCiId = GetRouteBelongVirCiId(routeId);
chLocalVirCiType = GetLocalVirCiType(chVirCiId);/*获取进路所属虚拟联锁对应的联锁类型*/
if (CI_TYPE_SCX == chLocalVirCiType)
{
/*获取非进路id*/
@@ -2531,14 +2531,18 @@ void RoutePhySecAutoUnlockManage(const UINT16 routeId)
sectionSum = GetPhySecCurSum();
for (ii = 0u; ii < sectionSum; ii++)
{
sectionId = GetPhySecId(ii); /*获取物理区段ID*/
sectionId = GetPhySecId(ii);/*获取物理区段ID*/
chPhySecBelongVirCiId = GetPhySecBelongVirCiId(sectionId);
chLocalVirCiType = GetLocalVirCiType(chPhySecBelongVirCiId);
if (CI_TYPE_SCX == chLocalVirCiType)
{/*区段属于试车线*/
sectionState = GetPhySecCurMergeState(sectionId);
if (SECTION_OCCUPY_NO != sectionState)
{
break;
}
}
}
if (ii == sectionSum)
{/*最后一个区段占用*/
@@ -2889,20 +2893,23 @@ UINT8 SetRouteProc(const UINT16 routeId)
UINT8 routeType = 0U; /*进路类型*/
UINT8 routeLevel = 0U; /*进路监督级别*/
UINT8 returnValue = CI_ERROR; /*返回值定义*/
UINT8 chLocalCiType = 0U; /*本地联锁类型*/
UINT8 chStopCheckState = 0U;/*停止检查标志*/
UINT8 chRouteState = 0U;/*进路状态*/
UINT8 chVirCiId = 0U;
UINT8 chLocalVirCiType = 0U;
routeType = GetRouteType(routeId); /*获取进路类型*/
routeLevel = GetRouteLevel(routeId); /*获取进路监督级别*/
chLocalCiType = GetLocalCiType(); /*获取本地联锁类型*/
chRouteState = GetRouteState(routeId);
chVirCiId = GetRouteBelongVirCiId(routeId);
chLocalVirCiType= GetLocalVirCiType(chVirCiId);/*获取进路所属虚拟联锁对应的联锁类型*/
/*by cgh 20230720 合并车辆段与正线进路办理处理*/
if (ROUTE_TYPE_LIECHE == routeType)
{
/*列车进路*/
if ((CI_TYPE_ZX == chLocalCiType) || (CI_TYPE_SCX == chLocalCiType))
if ((CI_TYPE_ZX == chLocalVirCiType) || (CI_TYPE_SCX == chLocalVirCiType))
{
if (ROUTE_REVERSE_PROPERTY_YES == GetRouteReverseProperty(routeId))
{
@@ -2924,7 +2931,7 @@ UINT8 SetRouteProc(const UINT16 routeId)
}
}
}
else if (CI_TYPE_CLD == chLocalCiType)
else if (CI_TYPE_CLD == chLocalVirCiType)
{
returnValue = SetLTrainRouteP(routeId);
}
@@ -3117,19 +3124,22 @@ UINT8 LockRouteProc(const UINT16 routeId)
UINT8 routeType = 0U; /*进路类型*/
UINT8 routeLevel = 0U; /*进路监督级别*/
UINT8 returnValue = CI_ERROR; /*返回值定义*/
UINT8 chLocalCIType = 0U;/*联锁类型*/
UINT8 chLocalVirCiType = 0U;/*联锁类型*/
UINT8 chVirCiId = 0U;
routeType = GetRouteType(routeId); /*获取进路类型*/
routeLevel = GetRouteLevel(routeId); /*获取进路监督级别*/
chLocalCIType = GetLocalCiType();
chVirCiId = GetRouteBelongVirCiId(routeId);
chLocalVirCiType = GetLocalVirCiType(chVirCiId);/*获取进路所属虚拟联锁对应的联锁类型*/
if (ROUTE_TYPE_LIECHE == routeType)
{ /*列车进路*/
if ((CI_TYPE_ZX == chLocalCIType) || (CI_TYPE_SCX == chLocalCIType))
if ((CI_TYPE_ZX == chLocalVirCiType) || (CI_TYPE_SCX == chLocalVirCiType))
{
if (ROUTE_LEVEL_CBTC == routeLevel)
{ /*CBTC*/
/*锁闭CBTC列车进路逻辑处理*/
returnValue = LockCbtcLTrainRouteLogicProcess(routeId);
}
@@ -3139,7 +3149,7 @@ UINT8 LockRouteProc(const UINT16 routeId)
returnValue = LockBlocLTrainRouteLogicProcess(routeId);
}
}
else if (CI_TYPE_CLD == chLocalCIType)
else if (CI_TYPE_CLD == chLocalVirCiType)
{
returnValue = LockLTrainRouteP(routeId);
}
@@ -4503,7 +4513,10 @@ void RouteZongRenJieProc(const UINT16 routeId)
if (CI_SUCCESS == checkResultSecAndQXZC)
{ /*所有区段空闲或最后一个区段占用*/
SetRouteStateManage(routeId, ROUTE_STATE_IDLE); /*-->设置进路空闲*/
/*总人解办理*/
SetRouteStateManage(routeId, ROUTE_STATE_DELAY_UNLOCK); /*-->设置进路延时解锁*/
/*延时后全部解锁*/
SetRouteZongRenJieDelayType(routeId, ROUTE_ZRJ_DELAY_TYPE_IDLE);/*延时结束后所有区段解锁*/
}
else if ((ROUTE_TRAIN_ENTER_FLAG_NO == trainEnterSta) && (CI_ERROR_QXZC != checkResultSecAndQXZC))
{/*当总人解引导进路时，有取消照查继电器且未吸起则不能解锁引导进路*/
@@ -4892,6 +4905,7 @@ UINT8 RouteLTrainEnter(const UINT16 routeId)
UINT8 chRCMode = 0u;
UINT8 cRoutePreLevel = 0U; /*进路之前级别*/
UINT8 chLocalCiType = 0U;/*联锁类型*/
UINT8 chRouteBelongVirCiId = 0U;
/* 联锁逻辑检查 */
@@ -5036,7 +5050,8 @@ UINT8 RouteLTrainEnter(const UINT16 routeId)
chDevState = GetPhySecCurMergeState(inPhySecId);
if (SECTION_OCCUPY_YES == chDevState)
{ /*内方区段占用，进路为CBTC非车辆段时，考虑为列车高速跨压,只需要考虑内方第一区段的占压，不用管外方*/
chLocalCiType = GetLocalCiType();
chRouteBelongVirCiId = GetRouteBelongVirCiId(routeId);
chLocalCiType = GetLocalVirCiType(chRouteBelongVirCiId);
if ((ROUTE_LEVEL_CBTC == routeLevel) && (CI_TYPE_CLD != chLocalCiType))
{
chRetVal = CI_SUCCESS;
@@ -5444,11 +5459,9 @@ void SetOverlapLockState(const UINT16 overlapId, const UINT8 lockState, const UI
SetOverlapUnlockApplyFlag(overlapId, UNLOCK_OVERLAP_APPLY_NO);
/*取消保护区段关联防护道岔的防护锁闭*/
SetOverlapRelateProtSwLockSta(overlapId, SWITCH_LOCK_PROTECT_CANCEL);
#if 0
/*设置防护区段解锁起始周期为0*/
SetOverlapUnlockStartCycNum(overlapId, 0);
#endif
SetRouteAtsExpLkOverlapId(routeId, 0u);
/*清除保护区段个别状态*/
CleanOverlapSpecificFlag(routeId, overlapId);
/*设置为不可以人工解锁保护区段*/
SetOverlapCanLaborUnlockFlag(overlapId, CANNOT_LABOR_UNLOCK_OVERLAP);
@@ -5456,8 +5469,10 @@ void SetOverlapLockState(const UINT16 overlapId, const UINT8 lockState, const UI
SetlaborUnlockStartCycNum(overlapId, 0u);
/*人工解锁保护区段命令清除*/
SetOverlapLaborUnlockSetState(overlapId, LABOR_UNLOCK_OVERLAP_NO);
/*清除保护区段锁闭命令*/
CleanOverlapAtsOrlaborLockFlag(routeId, overlapId);
/*设置防护区段解锁起始周期为0*/
(void)SetOverlapUnlockStartCycNum(overlapId, 0U);
/*设置锁闭起始周期0*/
SetOverlaplockSucessStartCycNum(overlapId, 0u);
@@ -5467,8 +5482,6 @@ void SetOverlapLockState(const UINT16 overlapId, const UINT8 lockState, const UI
/*设置保护区段向车申请解锁起始周期为0*/
SetReqIvocUnlockStartCycNum(overlapId, 0U);
SetOverlapFromSetRouteCmdFlag(overlapId, OVERLAP_ROUTE_FLAG_NO);/*清除保护区段建立命令由进路命令连带下发标志*/
/*设置保护区段列车不同意解锁*/
SetOverlapIvocAllowUnlockFlag(overlapId, IVOC_ALLOW_UNLOCK_OVERLAP_NO);
@@ -5561,7 +5574,6 @@ void SetCommonRouteLogicManage(const UINT16 routeId,const UINT8 chSendLevel)
UINT8 cRcWorkMode = 0u;
UINT8 cKeepWorkFlag = CI_ERROR;
UINT8 firstLogicOccuState = 0u;
UINT8 chLocalCiType = 0U;/*本地联锁类型*/
UINT8 chSignalReOpenFunc = 0U;
UINT8 chReadyEnterRouteTrainSum = 0U;
UINT16 wszReadyEtRouteTrainId[LOGIC_SECTION_RES_SUM_MAX] = { 0U };
@@ -5571,13 +5583,18 @@ void SetCommonRouteLogicManage(const UINT16 routeId,const UINT8 chSendLevel)
UINT16 wRouteInLastLogSecId = 0U;
UINT16 wLogLockRouteId = 0U;
UINT8 chAutoFlagCheck = 0U;
UINT8 chVirCiId = 0U;
UINT8 chLocalVirCiType = 0U;
chHitSoftWallSwitch = GetHitSoftWallSwitch();
/*进路信号异常关闭，收到进路办理命令后执行信号重开开关 0xaa执行 0x55不执行*/
chSignalReOpenFunc = GetCiFunctionSwitchConfig(FUNC_ROUTELOCK_OPEN_SIGNAL);
/* RC工作模式 */
cRcWorkMode = GetLocalRcWorkMode();
chLocalCiType = GetLocalCiType(); /*获取本地联锁类型*/
chVirCiId = GetRouteBelongVirCiId(routeId);
chLocalVirCiType = GetLocalVirCiType(chVirCiId);/*获取进路所属虚拟联锁对应的联锁类型*/
if ((0u == routeId) || (routeId >= ROUTE_SUM_MAX))
{
@@ -5645,7 +5662,7 @@ void SetCommonRouteLogicManage(const UINT16 routeId,const UINT8 chSendLevel)
checkResult = SetRouteProc(routeId);/*检查办理条件是否满足*/
if (CI_ERROR == checkResult)
{
if ((CI_TYPE_ZX == chLocalCiType) || (CI_TYPE_SCX == chLocalCiType))
if ((CI_TYPE_ZX == chLocalVirCiType) || (CI_TYPE_SCX == chLocalVirCiType))
{
if ((ROUTE_TYPE_LIECHE == routeType) && (ROUTE_REVERSE_PROPERTY_NO == GetRouteReverseProperty(routeId))
&& (ROUTE_LEVEL_CBTC == routeLevel) && (ROUTE_STATE_NEAR_LOCK == routeState))
@@ -6054,7 +6071,6 @@ void RouteZongQuXiaoLogicManage(const UINT16 routeId)
UINT16* overlapIdBuf = NULL;
UINT8 ii = 0u;
UINT8 virCIid = 0u;
UINT8 includeVirFlag = GetCiFunctionSwitchConfig(FUNC_INCLUDEVIRCI_FLAG);
if ((0u == routeId) || (routeId >= ROUTE_SUM_MAX))
{
@@ -6122,7 +6138,6 @@ void RouteZongRenJieLogicManage(const UINT16 routeId)
UINT16* overlapIdBuf = NULL;
UINT8 ii = 0u;
UINT8 virCIid = 0u;
UINT8 includeVirFlag = GetCiFunctionSwitchConfig(FUNC_INCLUDEVIRCI_FLAG);
if ((0u == routeId) || (routeId >= ROUTE_SUM_MAX))
{
@@ -7080,7 +7095,6 @@ void SetRouteStateManage(const UINT16 routeId, UINT8 routeState)
{
UINT8 setStateResult = 0u;
UINT8 virCIid = 0u;
UINT8 includeVirFlag = GetCiFunctionSwitchConfig(FUNC_INCLUDEVIRCI_FLAG);
UINT8 trainIdSum = 0u; /*列车ID总数量*/
UINT8 i = 0u; /*索引*/
UINT16* ptrainIdBuff = NULL; /*列车ID BUFF*/
@@ -7857,7 +7871,6 @@ void UpdateZhaoChaStateManage(const UINT16 routeId, UINT8 routeState)
void SetAutoRouteLogicManage(const UINT16 autoRouteId, const UINT8 virCIid)
{
UINT8 chkStatus = 0u;/*临时变量，检查结果*/
UINT8 includeVirFlag = GetCiFunctionSwitchConfig(FUNC_INCLUDEVIRCI_FLAG);
UINT8 chFunctionId = EFUNC_SET_AUTOROUTE;/*函数ID*/
UINT8 chSendLevel = ESEND_LEVEL_ATS;/*报警等级初始化为向ATS发送*/
UINT8 routeSum = 0u; /*自动进路包含进路数目 (配置字段)*/
@@ -7878,11 +7891,11 @@ void SetAutoRouteLogicManage(const UINT16 autoRouteId, const UINT8 virCIid)
if (CI_SUCCESS == chkStatus)
{
if (FUNC_SWITCH_ON == includeVirFlag)
{
/*检查自动进路包含进路是否都属于输入虚拟联锁，不属于则返回失败*/
chkStatus = CheckAutoRouteBelongVirCI(autoRouteId, virCIid);
}
}
if (CI_SUCCESS == chkStatus)
@@ -7939,7 +7952,6 @@ void SetAutoRouteLogicManage(const UINT16 autoRouteId, const UINT8 virCIid)
void CancelAutoRouteLogicManage(const UINT16 autoRouteId, const UINT8 virCIid)
{
UINT8 reVal = CI_ERROR;
UINT8 includeVirFlag = GetCiFunctionSwitchConfig(FUNC_INCLUDEVIRCI_FLAG);
if ((0u == autoRouteId) || (autoRouteId >= AUTO_ROUTE_SUM_MAX))
{
reVal = CI_ERROR;
@@ -7950,14 +7962,10 @@ void CancelAutoRouteLogicManage(const UINT16 autoRouteId, const UINT8 virCIid)
}
if (CI_SUCCESS == reVal)
{
if (FUNC_SWITCH_ON == includeVirFlag)
{
reVal = CheckAutoRouteBelongVirCI(autoRouteId, virCIid);
}
}
if (CI_SUCCESS == reVal)
{
SetAutoRouteSetFlag(autoRouteId, AUTO_ROUTE_SET_NO);
@@ -7973,7 +7981,6 @@ void CancelAutoRouteLogicManage(const UINT16 autoRouteId, const UINT8 virCIid)
void SetAutoReturnLogicManage(const UINT16 autoReturnId, const UINT8 virCIid)
{
UINT8 chkStatus = 0u;/*临时变量，检查结果*/
UINT8 includeVirFlag = GetCiFunctionSwitchConfig(FUNC_INCLUDEVIRCI_FLAG);
UINT8 chFunctionId = EFUNC_SET_AUTORETURN;/*函数ID*/
UINT8 chSendLevel = ESEND_LEVEL_ATS;/*报警等级初始化为向ATS发送*/
@@ -7986,12 +7993,9 @@ void SetAutoReturnLogicManage(const UINT16 autoReturnId, const UINT8 virCIid)
chkStatus = CI_SUCCESS;
}
if (CI_SUCCESS == chkStatus)
{
if (FUNC_SWITCH_ON == includeVirFlag)
{
chkStatus = CheckAutoReturnBelongVirCI(autoReturnId, virCIid);
}
}
if (CI_SUCCESS == chkStatus)
{/*自动折返进路是否有抵触自动进路已办理检查*/
chkStatus = AutoReturnIsOpposedCheck(autoReturnId, chFunctionId);
@@ -8038,7 +8042,6 @@ void SetAutoReturnLogicManage(const UINT16 autoReturnId, const UINT8 virCIid)
void CancelAutoReturnLogicManage(const UINT16 autoReturnId, const UINT8 virCIid)
{
UINT8 reVal = CI_ERROR;
UINT8 includeVirFlag = GetCiFunctionSwitchConfig(FUNC_INCLUDEVIRCI_FLAG);
if ((1U > autoReturnId) || (autoReturnId >= AUTO_RETURN_SUM_MAX))
{
reVal = CI_ERROR;
@@ -8048,12 +8051,9 @@ void CancelAutoReturnLogicManage(const UINT16 autoReturnId, const UINT8 virCIid)
reVal = CI_SUCCESS;
}
if (CI_SUCCESS == reVal)
{
if (FUNC_SWITCH_ON == includeVirFlag)
{
reVal = CheckAutoReturnBelongVirCI(autoReturnId, virCIid);
}
}
if (CI_SUCCESS == reVal)
{
SetAutoReturnSetFlag(autoReturnId, AUTO_RETURN_SET_NO);
@@ -8078,7 +8078,6 @@ void LockOverlapLogicManage(const UINT16 routeId)
UINT8 triggerFlag = 0u; /*进路自动触发设置标志*/
UINT8 autoSignalOrRouteValid = 0u;
UINT8 virCIid = 0u;
UINT8 includeVirFlag = GetCiFunctionSwitchConfig(FUNC_INCLUDEVIRCI_FLAG);
UINT8 routeOverlapNum = 0u;
UINT16* pRouteOverlapIdbuf = NULL;
UINT8 routeOverlapNeedCIlockFlag = 0u;
@@ -8107,8 +8106,7 @@ void LockOverlapLogicManage(const UINT16 routeId)
{
rtOverlapSum = GetRouteOverlapSum(routeId); /*获取进路保护区段数目*/
atsCmdLkOverlapId = GetRouteAtsExpLkOverlapId(routeId); /*获取进路的ATS期望锁闭保护区段Id*/
if (FUNC_SWITCH_ON == includeVirFlag)
{
/*cgh-合并CID-2539-10：*/
routeOverlapNum = GetRouteOverlapSum(routeId);
pRouteOverlapIdbuf = GetRouteOverlapIdBuf(routeId);
@@ -8117,11 +8115,8 @@ void LockOverlapLogicManage(const UINT16 routeId)
virCIid = GetOverlapBelongVirCiId(pRouteOverlapIdbuf[0]);
ciCtrModeFlag = GetVirCImode(virCIid);/*获取联锁控制模式*/
}
}
else
{
ciCtrModeFlag = GetCiModeFlag(); /*获取联锁控制模式*/
}
lockOverlapType = GetOverlapLockTypeSwitch(); /*获取锁闭保护区段方式 0x02：联锁自行锁闭保护区段 0x01：根据ATS命令锁闭保护区段*/
autoSignalOrRouteValid = AutoSignalOrRouteValid(routeId);
@@ -8376,7 +8371,14 @@ void SetSectionResetLogicManage(const UINT16 phySecId, const UINT8 resetType)
}
else
{
retValid = GetZFWValidByPhySecId(phySecId); /*获取物理区段计轴总复位继电器状态有效性*/
if (PHYSICAL_SECTION_PRE_RESET_YES != resetType)
{
retValid = GetZFWValidByPhySecId(phySecId); /*计轴复位：检查物理区段计轴总复位继电器状态有效性*/
}
else
{
retValid = CI_SUCCESS;/*计轴预复位不检查总复位继电器*/
}
if (CI_SUCCESS == retValid) /*有效，执行计轴复位功能*/
{
dwResetStartCycNum = GetPhySecResetStartCycNum(phySecId);
@@ -8590,7 +8592,6 @@ void SetYLockSignalOpenStateManage(UINT8 virCIid, UINT16 signalId)
UINT8 belongVirCIid = 0u;
UINT8 allSwitchYLockState = 0u;
UINT8 reVal = CI_ERROR;
UINT8 includeVirFlag = GetCiFunctionSwitchConfig(FUNC_INCLUDEVIRCI_FLAG);
if ((0u == signalId) || (SIGNAL_SUM_MAX <= signalId))
{
@@ -8612,8 +8613,7 @@ void SetYLockSignalOpenStateManage(UINT8 virCIid, UINT16 signalId)
}
if (CI_SUCCESS == reVal)
{
if (FUNC_SWITCH_ON == includeVirFlag)
{
belongVirCIid = GetSignalBelongVirCiId(signalId);
if ((belongVirCIid == virCIid) && (0u != virCIid))
{
@@ -8623,15 +8623,8 @@ void SetYLockSignalOpenStateManage(UINT8 virCIid, UINT16 signalId)
SetSignalYLockOpenState(signalId, SIGNAL_OPEN);
}
}
}
else
{
allSwitchYLockState = GetAllSwitchYLockFlag();
if (CI_ALL_SWITCH_YLOCK_YES == allSwitchYLockState)
{
SetSignalYLockOpenState(signalId, SIGNAL_OPEN);
}
}
}
}
/*
@@ -8920,7 +8913,6 @@ void DetainLogicManage(const UINT16 signalId, const UINT8 setState)
void SetAllAutoReturnLogicManage(const UINT16 allAutoReturnId, const UINT8 virCIid)
{
UINT8 chkStatus = 0u;/*临时变量，检查结果*/
UINT8 includeVirFlag = GetCiFunctionSwitchConfig(FUNC_INCLUDEVIRCI_FLAG);
UINT8 chFunctionId = EFUNC_SET_ALLAUTORETURN;/*函数ID*/
UINT8 chSendLevel = ESEND_LEVEL_ATS;/*报警等级初始化为向ATS发送*/
@@ -8933,12 +8925,9 @@ void SetAllAutoReturnLogicManage(const UINT16 allAutoReturnId, const UINT8 virCI
chkStatus = CI_SUCCESS;
}
if (CI_SUCCESS == chkStatus)
{
if (FUNC_SWITCH_ON == includeVirFlag)
{
chkStatus = CheckALLAutoReturnBelongVirCI(allAutoReturnId, virCIid);
}
}
if (CI_SUCCESS == chkStatus)
{/*全自动折返进路是否有抵触自动进路已办理检查*/
@@ -8984,7 +8973,6 @@ void SetAllAutoReturnLogicManage(const UINT16 allAutoReturnId, const UINT8 virCI
void CancelAllAutoReturnLogicManage(const UINT16 allAutoReturnId, const UINT8 virCIid)
{
UINT8 reVal = CI_ERROR;
UINT8 includeVirFlag = GetCiFunctionSwitchConfig(FUNC_INCLUDEVIRCI_FLAG);
if ((allAutoReturnId < 1u) || (allAutoReturnId >= ALL_AUTO_RETURN_SUM_MAX))
{
reVal = CI_ERROR;
@@ -8994,12 +8982,9 @@ void CancelAllAutoReturnLogicManage(const UINT16 allAutoReturnId, const UINT8 vi
reVal = CI_SUCCESS;
}
if (CI_SUCCESS == reVal)
{
if (FUNC_SWITCH_ON == includeVirFlag)
{
reVal = CheckALLAutoReturnBelongVirCI(allAutoReturnId, virCIid);
}
}
if (CI_SUCCESS == reVal)
{
SetAllAutoReturnSetFlag(allAutoReturnId, ALL_AUTO_RETURN_SET_NO);
@@ -9367,10 +9352,9 @@ void AllAutoReturnManage(const UINT16 routeId)
*/
void StartTrianTestManage(void)
{
UINT8 localCiType = GetLocalCiType();
UINT8 trainTestStatus = GetCiTrainTestStatus();
/* 当本联锁是试车线同时本联锁未开始试车作业下，才处理试车请求命令 */
if ((CI_TYPE_SCX == localCiType) && (CI_TRAIN_TEST_OFF == trainTestStatus))
if (CI_TRAIN_TEST_OFF == trainTestStatus)
{
SetCiTrainTestStatus(CI_TRAIN_TEST_START);
@@ -9386,11 +9370,9 @@ void StartTrianTestManage(void)
*/
void StopTrianTestManage(void)
{
UINT8 localCiType = GetLocalCiType();
UINT8 trainTestStatus = GetCiTrainTestStatus();
/* 当本联锁是试车线同时本联锁未开始试车作业下，才处理试车请求命令 */
if ((CI_TYPE_SCX == localCiType))
{
if (CI_TRAIN_TEST_ON == trainTestStatus)
{
SetCiTrainTestStatus(CI_TRAIN_TEST_STOP);
@@ -9403,78 +9385,7 @@ void StopTrianTestManage(void)
{
/* 不处理 */
}
}
}
/*
* 功能描述： 取消临时限速设置
* 参数说明： 无
* 返回值 ：
CI_ERROR 失败
CI_SUCCESS 成功
*/
UINT8 CancleLinShiXianSuManage(void)
{
UINT16 ii;
UINT16 logSecId = 0u;
UINT8 state = 0u;
UINT8 retVal = 0u;
/*通信状态*/
UINT8 comunicationState = 0u;
UINT8 zcCommState = 0u;
UINT8 localCi = 0u;
UINT8* pSourceIdBuf = NULL;
UINT8 dianshiLinshixiansuFlag = 0U;/*是否支持点式临时限速*/
dianshiLinshixiansuFlag = GetCiFunctionSwitchConfig(FUNC_DIANSHI_LINSHIXIANSU_FLAG);
localCi = GetSystemParaLocalCiId(); /*获取本机联锁ID*/
pSourceIdBuf = GetCiTransmitSpecifySysDevBuf(CI_SYSTEM_TYPE_ZC);/*获取与本联锁通信的ZC的ID*/
if (pSourceIdBuf != NULL)
{
/*更新与ZC通信状态*/
(void)UpdateCiTransmitState(localCi, CI_SYSTEM_TYPE_ZC, pSourceIdBuf[0]);
zcCommState = GetHLHTHeadCtxValid(CI_SYSTEM_TYPE_ZC, pSourceIdBuf[0]);
/*通信异常*/
if (CI_ERROR == zcCommState)
{
comunicationState = TRANSMIT_STATE_BAD;
}
else
{
comunicationState = TRANSMIT_STATE_GOOD;
}
}
if ((TRANSMIT_STATE_GOOD != comunicationState) && (HAVE_DIANSHILINSHIXIANSU == dianshiLinshixiansuFlag))
{/*和ZC通信故障时，才允许人工取消临时限速*/
for (ii = 0u; ii < GetLogicSecCurSum(); ii++)
{
logSecId = GetLogicSecId(ii); /*获取逻辑区段ID*/
state = GetLogSecLinShiXianSuSetState(logSecId); /*获取逻辑区段临时限速设置状态*/
if (LOGSEC_LSXS_SET_STATE_INVALID != state)
{/*具有临时限速属性*/
SetLogSecLinShiXianSuState(logSecId, LOGSEC_LSXS_SET_STATE_NO); /*取消临时限速*/
SetLogSecLinShiXianSuStateZc(logSecId, LOGSEC_LSXS_SET_STATE_NO); /*同时取消ZC的临时限速*/
/*备注：TMC尚不具备，限速清除先仅考虑和ZC通信*/
}
}
retVal = CI_SUCCESS;
}
else
{
/*记录和发送故障码*/
SetErrorData(EFUNC_CHECK_LABOUR_CANCEL_VALID,
CI_DEVICE_TYPE_LOGICSEC,
0,
ETYPE_LOGSEC_LINSHIXIANSU_CANCLE_STATE,
GetLabourCancelLinShiXianState(), ESEND_LEVEL_ATS);
retVal = CI_ERROR;
}
LabourCancelLSXianStaMoveProc(LINSHIXIANSU_LABOURCANCLE_YES_STATE); /*人工取消临时限速状态迁移*/
return retVal;
}
/*
* 功能描述： 取消临时限速设置
@@ -9524,6 +9435,8 @@ void CancleLinShiXianSuManage_Vir(const UINT8 virCIid)
if ((LOGSEC_LSXS_SET_STATE_INVALID != state) && (belongVirCIid == virCIid))
{/*具有临时限速属性*/
SetLogSecLinShiXianSuState(logSecId, LOGSEC_LSXS_SET_STATE_NO); /*取消临时限速*/
SetLogSecLinShiXianSuStateZc(logSecId, LOGSEC_LSXS_SET_STATE_NO); /*同时取消ZC的临时限速*/
/*备注：TMC尚不具备，限速清除先仅考虑和ZC通信*/
}
}
}
@@ -9563,7 +9476,29 @@ void CiTrainTestLogicManage(void)
NonRouteDataStruct* pNonRoute = NULL;
UINT16 wCollAgreeTryTrainRelayId = 0U;/*试车线采集同意试车继电器ID*/
UINT8 chRelayCollState = 0U;/*采集继电器状态*/
UINT8 ii = 0;
UINT8 ii = 0U;
UINT8 flag = 0U;
UINT8 chCldAndScxMergeFlag = GetCldAndScxMergeFlag();
UINT8 localCiType = GetLocalCiType();
if (CI_TYPE_SCX == localCiType)
{
flag = 1U;
}
else if (CI_TYPE_CLD == localCiType)
{
if (CLD_SCX_MERGE_ON == chCldAndScxMergeFlag)
{/*是车辆段，且车辆段与试车线合设*/
flag = 1U;
}
}
else
{
/*无处理*/
}
if (1U == flag)
{
for (; ii < NONROUTE_ID_NUM_MAX; ii++)
{
pNonRoute = GetNonRouteDataPtr() + ii;
@@ -9657,6 +9592,11 @@ void CiTrainTestLogicManage(void)
DriveAllSignaleRedClose();
}
}
}
else
{
/*无处理*/
}
}
/*
@@ -9668,11 +9608,17 @@ void DriveAllSignaleRedClose(void)
{
UINT16 signalSum = GetSignalCurSum();
UINT16 ii = 0u;
UINT8 virCIid = 0u;
UINT16 signalId = 0U;
UINT8 chLocalVirCiType = 0u;
for (ii = 0u; ii < signalSum; ii++)
{
UINT16 signalId = GetSignalId(ii);
/* 本机 */
if (GetSignalBelongCiId(signalId) == GetSystemParaLocalCiId())
signalId = GetSignalId(ii);
virCIid = GetSignalBelongVirCiId(signalId);
chLocalVirCiType = GetLocalVirCiType(virCIid);/*获取虚拟联锁类型*/
if (CI_TYPE_SCX == chLocalVirCiType)
{
SetSignalCurDriveColor(signalId, SIGNAL_DRIVECOLOUR_REDCLOSE);
}
@@ -11181,6 +11127,7 @@ void UnlockSwitchLogicManage(void)
UINT8 unlockFlag = 0U;/*解锁标志*/
UINT8 funcSwitch = 0U;
UINT8 chPhySecLogLockState = 0U;/*物理区段逻辑锁闭状态*/
UINT8 chPhySecJumpLockState = 0U;
localCiId = GetSystemParaLocalCiId(); /*获取本机联锁ID*/
funcSwitch = GetCiFunctionSwitchConfig(FUNC_ROUTE_DRV_SWITCH_EARLY);
@@ -11211,10 +11158,11 @@ void UnlockSwitchLogicManage(void)
phyLockStatus = GetPhySecLockState(hostPhyId);/*获取物理区段锁闭状态*/
chFuncRet1 = GetSwitchLogSecLockState(hostSwitchId, &wDevId, &chDevState);
chPhySecLogLockState = PhySecLogLockStateCheck(hostPhyId);
chPhySecJumpLockState = GetPhySecJumpLockState(hostPhyId);
if ((PHYSICAL_SECTION_LOCK_NO == phyLockStatus) && (CI_SUCCESS == chFuncRet1)
&& (LOG_SECTION_LOGLOCK_NO == chPhySecLogLockState))
{/*区段锁闭状态为未锁闭(物理区段未被进路锁，逻辑区段未被进路锁，物理区段未被逻辑进路锁)*/
&& (LOG_SECTION_LOGLOCK_NO == chPhySecLogLockState)&&(PHYSICAL_SECTION_JUMP_LOCK_NO == chPhySecJumpLockState))
{/*区段锁闭状态为未锁闭(物理区段未被进路锁，逻辑区段未被进路锁，物理区段未被逻辑进路锁,未被跳跃锁闭)*/
unlockFlag = 1u;
}
else
@@ -11477,6 +11425,9 @@ void CheckLogSecJumpLockManage(void)
UINT8 logJumpLockState = LOGIC_SECTION_JUMP_LOCK_NO;
UINT8 localCi = 0u;/*本联锁*/
UINT16 logJumpLockTrainId = 0u;
UINT16 devId = 0u; /*设备ID*/
UINT8 devState = 0u; /*设备状态*/
UINT8 retVal = CI_ERROR;
localCi = GetSystemParaLocalCiId();
@@ -11495,6 +11446,11 @@ void CheckLogSecJumpLockManage(void)
/** 检查本TIOC控区逻辑区段跳跃锁闭条件*/
checkResult = CheckLogJumpLockApply(logicSecId);
if (CI_SUCCESS == checkResult)
{
devId = 0u;
devState = 0u;
retVal = LogicSecRltvPrtctSwLockCheck(logicSecId, &devId, &devState);
if (CI_SUCCESS == retVal)
{
/** 检查条件满足，设置跳跃锁闭允许标志为允许 */
SetLogSecJumpLockPermFlag(logicSecId, LOGIC_JUMPUNLOCK_PERMISSIVE_YES);
@@ -11506,6 +11462,12 @@ void CheckLogSecJumpLockManage(void)
}
}
else
{
/** 检查条件不满足，设置跳跃锁闭允许标志为禁止 */
SetLogSecJumpLockPermFlag(logicSecId, LOGIC_JUMPUNLOCK_PERMISSIVE_NO);
}
}
else
{
/** 逻辑区段未跳跃锁闭，无需周期检查跳跃锁闭条件*/
}
@@ -11552,7 +11514,6 @@ void AxisSecJumpLockLogicManage(void)
UINT8 applyFlag = 0u;/*申请标志*/
UINT8 cancelApplyFlag = 0u;/*取消申请标志*/
UINT16 phyId = 0u;/*物理区段ID*/
UINT8 phyUseState = 0u;/*物理区段征用状态*/
UINT8 jumpLockState = 0u;/*跳跃锁闭状态*/
UINT8 secBelongCi = 0u;/*区段所属联锁*/
UINT8 localCi = 0u;/*本联锁*/
@@ -11565,6 +11526,7 @@ void AxisSecJumpLockLogicManage(void)
UINT32 applyCycle = 0u;/*跳跃锁闭申请周期*/
UINT32 curCycle = 0u;/*当前周期号*/
UINT8 chPhySecJmpState = 0U;
UINT8 chJumpPhySectionUseCheck = 0U;
localCi = GetSystemParaLocalCiId();
axisSectionDataSum = GetTotalAxisCurNum();
@@ -11580,7 +11542,6 @@ void AxisSecJumpLockLogicManage(void)
jumpLockState = GetAxisJumpLockState(axisSectionId);/*获取跳跃锁闭状态*/
phyId = GetAxisSecRelativePhySecId(axisSectionId);/*获取相关物理区段ID*/
phyUseState = GetPhySecUseState(phyId);/*获取物理区段征用状态*/
secBelongCi = GetPhySecBelongCiId(phyId);
@@ -11618,10 +11579,12 @@ void AxisSecJumpLockLogicManage(void)
(AXSEC_CANCEL_JUMPLOCK_APPLY_NO == cancelApplyFlag))
{/*有跳跃锁闭申请*/
if (PHYSICAL_SECTION_USING_NO == phyUseState)
chJumpPhySectionUseCheck = JumpPhySectionUseCheck(axisSectionId);
if (CI_SUCCESS == chJumpPhySectionUseCheck)
{/*未征用*/
/*设置征用*/
SetPhySecUseState(phyId, PHYSICAL_SECTION_USING_YES, 0);
SetJumpPhySectionPortectSecUse(phyId, PHYSICAL_SECTION_USING_YES);/*设置物理区段关联防护道岔的区段征用*/
/*转为选排*/
SetAxisJumpLockState(axisSectionId, AXIS_SECTION_JUMPLOCK_STATE_XUANPAI);
}
@@ -11647,6 +11610,7 @@ void AxisSecJumpLockLogicManage(void)
(curCycle == applyCycle))
{/*本周期有跳跃锁闭申请，才设置物理区段跳跃锁闭*/
SetPhySecJumpLockState(phyId, PHYSICAL_SECTION_JUMP_LOCK_YES);
SetAxisRelProSwitchLockSta(axisSectionId, SWITCH_LOCK_PROTECT_SET);
SetPhySecJumpLockStateToZC(phyId, PHYSICAL_SECTION_JUMP_LOCK_YES);
SetAxisInCludeLogJumpLockState(axisSectionId, LOGIC_SECTION_JUMP_LOCK_YES);
}
@@ -11667,6 +11631,7 @@ void AxisSecJumpLockLogicManage(void)
(AXSEC_CANCEL_JUMPLOCK_APPLY_YES == cancelApplyFlag))
{/*有取消跳跃申请*/
SetAxisJumpLockState(axisSectionId, AXIS_SECTION_JUMPLOCK_STATE_IDLE);
SetAxisRelProSwitchLockSta(axisSectionId, SWITCH_LOCK_PROTECT_CANCEL);
}
}
break;
@@ -11709,12 +11674,14 @@ void AxisJumpLockXuanPaiManage(const UINT16 axisSecId)
{
rtVal = LockAxisSecProc(axisSecId);/*跳跃锁闭联锁条件检查*/
}
axisSecSwitDrvOvtmFlag = ChekJumpLockSwitDrivOvtmStat(axisSecId);/*检查计轴区段内道岔是否驱动超时*/
axisSecSwitDrvOvtmFlag = ChekJumpLockSwitDrivOvtmStat(axisSecId);/*检查计轴区段关联道岔是否驱动超时*/
if (CI_SUCCESS == rtVal)
{/*检查成功*/
SetAxisJumpLockState(axisSecId, AXIS_SECTION_JUMPLOCK_STATE_LOCK);
/*设置未征用*/
SetPhySecUseState(phyId, PHYSICAL_SECTION_USING_NO, 0);
SetJumpPhySectionPortectSecUse(phyId, PHYSICAL_SECTION_USING_NO);/*设置物理区段的防护道岔所在区段取消防护征用*/
}
else if ((RETURN_LOCK_ERR_SWITPOS == rtVal) && (CI_SUCCESS == axisSecSwitDrvOvtmFlag))
{/*位置错误可驱动且驱动道岔没有超时*/
@@ -11725,6 +11692,8 @@ void AxisJumpLockXuanPaiManage(const UINT16 axisSecId)
{
/*设置未征用*/
SetPhySecUseState(phyId, PHYSICAL_SECTION_USING_NO, 0);
SetJumpPhySectionPortectSecUse(phyId, PHYSICAL_SECTION_USING_NO);/*设置物理区段的防护道岔所在区段取消防护征用*/
/*设置计轴区段跳跃状态空闲*/
SetAxisJumpLockState(axisSecId, AXIS_SECTION_JUMPLOCK_STATE_IDLE);
}
@@ -11733,6 +11702,8 @@ void AxisJumpLockXuanPaiManage(const UINT16 axisSecId)
{/*其它*/
/*设置未征用*/
SetPhySecUseState(phyId, PHYSICAL_SECTION_USING_NO, 0);
SetJumpPhySectionPortectSecUse(phyId, PHYSICAL_SECTION_USING_NO);/*设置物理区段的防护道岔所在区段取消防护征用*/
/*设置计轴区段跳跃状态空闲*/
SetAxisJumpLockState(axisSecId, AXIS_SECTION_JUMPLOCK_STATE_IDLE);
}
@@ -12457,8 +12428,11 @@ void RoutePhyOrLogSecAutoUnlocManage(const UINT16 routeId)
UINT8 chPhyIncSwitchSum = 0U;
UINT16* pPhySecSwitchId = NULL;
UINT8 localCiType = 0U;/*联锁类型*/
UINT8 chRouteBelongVirCiId = 0U;
localCiType = GetLocalCiType();
chRouteBelongVirCiId = GetRouteBelongVirCiId(routeId);
localCiType = GetLocalVirCiType(chRouteBelongVirCiId);
/*获取进路锁闭的第一逻辑区段占用状态*/
@@ -12626,7 +12600,6 @@ void LogicSecResManage(void)
startLockState = GetStartLockFlag(); /*获取上电解锁标志*/
startFlockFlag = GetStartFLockFlag(); /*获取上电解封标志*/
if (0u == localCiId)
{
rtVal = CI_ERROR;
@@ -13794,6 +13767,8 @@ static void TrainTransitmitStatJumpLockProcess(const UINT16 logSectionId, const
/** 清除区段跳跃锁闭延时解锁起始周期号和延时解锁设置标志*/
SetLogSecJumpDelayUnlocStartCyc(logSectionId, 0u);
SetLogSecJumpDelayUnlockFlag(logSectionId, LOGIC_JUMPUNLOCK_DELAY_SET_NO);
/*取消防护锁闭*/
SetLogSecRelProSwitchLockSta(logSectionId, SWITCH_LOCK_PROTECT_CANCEL);
}
else
{
@@ -14397,7 +14372,6 @@ void SetRouteOverlapNeedCIlockM(const UINT16 routeId)
{
UINT8 routeBelongCIid = GetRouteBelongCiId(routeId);
UINT8 localCIid = GetSystemParaLocalCiId();
UINT8 includeVirFlag = GetCiFunctionSwitchConfig(FUNC_INCLUDEVIRCI_FLAG);
UINT8 virCIid = 0u;
UINT8 ciCtrModeFlag = 0u;
UINT8 setflag = 0u;
@@ -14409,15 +14383,10 @@ void SetRouteOverlapNeedCIlockM(const UINT16 routeId)
if (localCIid == routeBelongCIid)
{
/*获取相关标志*/
if (FUNC_SWITCH_ON == includeVirFlag)
{
virCIid = GetRouteBelongVirCiId(routeId);
ciCtrModeFlag = GetVirCImode(virCIid);/*获取联锁控制模式*/
}
else
{
ciCtrModeFlag = GetCiModeFlag();
}
triggerFlag = GetRouteAutoTriggerFlag(routeId); /*获取进路的自动触发标志*/
/*进路所属联锁紧急站控下，需要保护区段由联锁锁闭，设置该标志*/
if (CI_MODE_CI_LOCAL == ciCtrModeFlag)/*是联锁控制*/
@@ -14504,6 +14473,8 @@ void PhySecJumpLockLogicManage(void)
UINT32 dwApplyCycle = 0U;/*跳跃锁闭申请周期号*/
UINT8 chPhySecFLockType = 0U;/*物理区段封锁类型*/
UINT8 chPhySecJempState = 0U;/*物理区段跳跃锁闭状态*/
UINT16 devId = 0u; /*设备ID*/
UINT8 devState = 0u; /*设备状态*/
wAxisSectionDataSum = GetTotalAxisCurNum();
@@ -14527,7 +14498,8 @@ void PhySecJumpLockLogicManage(void)
if ((PHY_SEC_FLOCK_TYPE_NONE == chPhySecFLockType))
{
SetPhySecJumpLockState(wPhyId, PHYSICAL_SECTION_JUMP_LOCK_YES);
SetPhySecJumpLockStateToZC(wPhyId, PHYSICAL_SECTION_JUMP_LOCK_YES);
SetAxisRelProSwitchLockSta(wAxisSectionId, SWITCH_LOCK_PROTECT_SET);
/* SetPhySecJumpLockStateToZC(wPhyId, PHYSICAL_SECTION_JUMP_LOCK_YES);当周期先不给ZC发锁闭*/
SetAxisInCludeLogJumpLockState(wAxisSectionId, LOGIC_SECTION_JUMP_LOCK_YES);
}
else
@@ -14550,16 +14522,22 @@ void PhySecJumpLockLogicManage(void)
}
else
{ /*联锁内部锁闭，当持续检查锁闭条件满足时，再次给ZC发锁闭*/
devId = 0u;
devState = 0u;
chTempcheck = AxisRelatedProSwitchLockCheck(wAxisSectionId, &devId, &devState);
if (CI_SUCCESS == chTempcheck)
{
SetPhySecJumpLockStateToZC(wPhyId, PHYSICAL_SECTION_JUMP_LOCK_YES);
}
}
}
}
if ((AXIS_SECTION_JUMPLOCK_APPLY_NO == chApplyFlag) &&
(AXSEC_CANCEL_JUMPLOCK_APPLY_YES == chCancelApplyFlag))
{/*有取消跳跃申请*/
SetPhySecJumpLockState(wPhyId, PHYSICAL_SECTION_JUMP_LOCK_NO);
SetPhySecJumpLockStateToZC(wPhyId, PHYSICAL_SECTION_JUMP_LOCK_NO);
SetAxisRelProSwitchLockSta(wAxisSectionId, SWITCH_LOCK_PROTECT_CANCEL);/*取消防护锁闭*/
}
}
}
@@ -15677,7 +15655,7 @@ void SetNormalRouteLogicResUsable(const UINT16 wLogSectionId, const UINT16 wTrai
if ((LOG_SECTION_LOCK_NORMAL == chLogicLockState)
|| (LOG_SECTION_LOCK_DELAY == chLogicLockState))
{
chRouteTrainEnterFlag = dsuTrainMinHeadCrossSignal(wTrainId, wLogicRLockRouteId);
chRouteTrainEnterFlag = dsuTrainMinHeadCrossSignal(wTrainId, wLogicRLockRouteId, CI_SUCCESS);
chTrainMaxHeadCross = dsuTrainCrossSignal(wTrainId, wLogicRLockRouteId);/*判断列车大前是否驶入进路*/
@@ -16499,6 +16477,7 @@ void OverlapStateUpdateManage(void)
if (CI_SUCCESS == chTempCheckFlag)
{
SetOverlapPreLoaborUnlockState(wOverlapId, PRO_PRE_LABOR_UNLOCK_STATE_NO);
SetOverlapAtsLastTimeLockCyc(wOverlapId, 0U);
}
else
{
TSCP/src/APP/ciapp/LogicManage/InterlockLogicManage.h
-8
View File
@@ -628,14 +628,6 @@ void StartTrianTestManage(void);
*/
void StopTrianTestManage(void);
/*
* 功能描述： 取消临时限速设置
* 参数说明： 无
* 返回值 ：
CI_ERROR 失败
CI_SUCCESS 成功
*/
UINT8 CancleLinShiXianSuManage(void);
/*
* 功能描述： 取消临时限速设置
* 参数说明： 无
TSCP/src/APP/ciapp/LogicManage/RouteRecoverManage.c
+19 -12
View File
@@ -3107,6 +3107,7 @@ static UINT8 OtherCiValidErrCheck(UINT16 const routeId)
UINT8 toOpenCheckFlag = 0u;/*恢复可重开信号的条件标志*/
UINT8 otherResult = 0u;/*其他联锁检查条件返回值*/
UINT8 cFuncSwitchSpks = 0U; /*SPKS信号重开检查进路级别开关*/
UINT8 cPsdExceptOpenState = 0U; /*PSD异常打开状态*/
if (routeLevel == ROUTE_LEVEL_BLOC)
{
@@ -3160,12 +3161,20 @@ static UINT8 OtherCiValidErrCheck(UINT16 const routeId)
{
if (psdIdBuf[j] == tmpOtherCiDevInfo->DevId)
{
toOpenCheckFlag = 1u;
cPsdExceptOpenState = GePsdExceptState(tmpOtherCiDevInfo->DevId);
if (PSD_EXCEPT_NO == cPsdExceptOpenState)
{
toOpenCheckFlag = 1U; /*PSD未异常，设置可自动重开*/
}
else
{
toOpenCheckFlag = 0U; /*存在PSD异常，停止遍历，设置不可自动重开*/
break;
}
}
}
}
}
else
{
toOpenCheckFlag = 0u;
@@ -3670,7 +3679,7 @@ static UINT8 OpenBlocRouteOverlapErrCheck(const UINT16 routeId)
}
}
if(CI_TRADITION_RAILWAY == lineIdentity)
if (CI_TRADITION_RAILWAY == lineIdentity)
{
/*保护区段道岔【位置正确】*/
if (CI_SUCCESS == reResult)
@@ -3731,12 +3740,6 @@ static UINT8 OpenBlocRouteOverlapErrCheck(const UINT16 routeId)
}
}
if (FUNC_SWITCH_ON == cSndSideProFuncSwitch)
{
/*二级侧防开关配置为支持二级侧防时，可不检查保护区段防护道岔位置及可动性，通过检查侧防条件防护*/
}
else
{
/*保护区段关联防护道岔【位置正确】*/
if (CI_SUCCESS == reResult)
{
@@ -3772,7 +3775,6 @@ static UINT8 OpenBlocRouteOverlapErrCheck(const UINT16 routeId)
reResult = CI_ERROR;
}
}
}
if (CI_SUCCESS == reResult)
{
@@ -3823,7 +3825,7 @@ static UINT8 OpenBlocRouteOverlapErrCheck(const UINT16 routeId)
{
devId = 0u;
devState = 0u;
checkResult = OverlapAllSecJumpLockStateCheck(overlapId,&devId,&devState);
checkResult = OverlapAllSecJumpLockStateCheck(overlapId, &devId, &devState);
if (CI_ERROR == checkResult)
{
reResult = checkResult;
@@ -3844,7 +3846,7 @@ static UINT8 OpenBlocRouteOverlapErrCheck(const UINT16 routeId)
{
devId = 0u;
devState = 0u;
checkResult = OverlapFloodGateStateCheck(overlapId,&devId,&devStateType,&devState);
checkResult = OverlapFloodGateStateCheck(overlapId, &devId, &devStateType, &devState);
if (CI_ERROR == checkResult)
{
reResult = checkResult;
@@ -4169,12 +4171,15 @@ static UINT8 KeepCbtcRouteSectionErrCheck(const UINT16 routeId)
UINT8 preLogDevState = 0u; /*之前逻辑区段占用状态*/
UINT8 LogSecCurCtOrUtOcc = 0U; /*逻辑区段当前占用状态*/
UINT8 cLocalCiType = 0U; /*本控区类型*/
UINT8 chRouteBelongVirCiId = 0U;
rcWorkMode = GetLocalRcWorkMode();
/* 联锁逻辑检查 */
reResult = CI_SUCCESS;
cLocalCiType = GetLocalCiType();
chRouteBelongVirCiId = GetRouteBelongVirCiId(routeId);
cLocalCiType = GetLocalVirCiType(chRouteBelongVirCiId);
if (CI_TYPE_CLD != cLocalCiType)
{
/*非车辆段，按CBTC既有逻辑处理*/
@@ -4322,10 +4327,12 @@ static UINT8 OpenCbtcRouteSectionErrCheck(const UINT16 routeId)
UINT8 cLocalCiType = 0U; /*本控区类型*/
UINT8 chRouteCouplinkFlag = 0U;
UINT8 chSigCrossState = 0U;
UINT8 chRouteBelongVirCiId = 0U;
rcWorkMode = GetLocalRcWorkMode();
/* 联锁逻辑检查 */
cLocalCiType = GetLocalCiType();
chRouteBelongVirCiId = GetRouteBelongVirCiId(routeId);
cLocalCiType = GetLocalVirCiType(chRouteBelongVirCiId);
if (CI_TYPE_CLD != cLocalCiType)
{
/*非车辆段，按CBTC既有逻辑处理*/
TSCP/src/APP/ciapp/LogicManage/TradInterlockLogicManage.c
+226 -22
View File
@@ -229,6 +229,7 @@ void NonRouteLogicProcess(void)
{
NonRouteCancelDeal(pNonRoute->NonRouteId); /*非进路取消处理*/
}
}
}
@@ -240,21 +241,41 @@ void NonRouteLogicProcess(void)
*/
void NonRouteXuanPaiDeal(UINT8 nonRouteId)
{
UINT8 reResult = CI_ERROR;
NonRouteDataStruct *pNonRoute = GetNonRouteDataById(nonRouteId);
if (CI_SUCCESS == LockNonRouteP(nonRouteId))
reResult = LockNonRouteP(nonRouteId);
if (CI_SUCCESS == reResult)
{ /*锁闭成功*/
reResult = CheckNonRouteSwitchPosRight(nonRouteId, 0U, 0U);
if (CI_SUCCESS == reResult)
{
/*进路道岔位置正确*/
/*侵限区段侵限条件不满足检查*/
reResult = NonRouteIntruSecVainCheck(nonRouteId, EFUNC_CLD_LOCK_NONROUTE, ESEND_LEVEL_ATS);
if (CI_SUCCESS == reResult)
{
SetNonRouteStateDeal(nonRouteId, NONROUTE_STATE_LOCK); /*设置非进路为锁闭*/
}
else
{
SetNonRouteStateDeal(nonRouteId, NONROUTE_STATE_IDLE); /*设置非进路为空闲*/
/* NonRouteIntruSecVainCheck函数已经有故障码，不再记录*/
}
if (CI_SUCCESS == CheckNonRouteSwitchPosRight(nonRouteId,0u,0u))
{ /*进路道岔位置正确*/
SetNonRouteStateDeal(nonRouteId,NONROUTE_STATE_LOCK); /*设置非进路为锁闭*/
}
else
{ /*道岔未动作到位*/
/*非进路锁闭驱动道岔*/
if (CI_ERROR == NonRouteLockDrvSwitchDeal(nonRouteId))
reResult = NonRouteLockDrvSwitchDeal(nonRouteId);
if (CI_SUCCESS == reResult)
{
SetNonRouteStateDeal(nonRouteId,NONROUTE_STATE_IDLE); /*设置非进路为空闲*/
/*继续驱动道岔*/
}
else
{
SetNonRouteStateDeal(nonRouteId, NONROUTE_STATE_IDLE); /*设置非进路为空闲*/
}
}
@@ -6026,6 +6047,8 @@ void DTrainReturnUnlockP(void)
UINT16 routeId = 0u; /*进路ID*/
UINT8 belongCiId = 0u; /*进路所属联锁ID*/
UINT16 ii = 0u; /*循环索引*/
UINT8 belongVirCIid = 0U;
UINT8 chLocalVirCiType = 0U;
routeCurSum = GetRouteCurSum(); /*获取进路总数*/
@@ -6047,10 +6070,14 @@ void DTrainReturnUnlockP(void)
{
continue;
}
belongVirCIid = GetRouteBelongVirCiId(routeId);
chLocalVirCiType = GetLocalVirCiType(belongVirCIid);
if (CI_TYPE_CLD == chLocalVirCiType)
{
/*调车中途折返进路完整锁闭处理*/
DTrainReturnUnlockRouteAllLockP(routeId);
}
}
/*处理调车中途折返*/
for (ii = 0u; ii < routeCurSum; ii++)
@@ -6068,10 +6095,14 @@ void DTrainReturnUnlockP(void)
{
continue;
}
belongVirCIid = GetRouteBelongVirCiId(routeId);
chLocalVirCiType = GetLocalVirCiType(belongVirCIid);
if (CI_TYPE_CLD == chLocalVirCiType)
{
/*调车中途折返进路部分锁闭处理*/
DTrainRtnUnlockRoutePartLockP(routeId);
}
}
}
@@ -6089,6 +6120,11 @@ UINT16 GetReturnId(const UINT16 routeId)
UINT8 preRouteState = 0u; /* 之前进路状态 */
UINT16 ii = 0u;
UINT8 toGo = CI_SUCCESS;
UINT8 chRouteState = 0U;
UINT8 chRoutePhysicalType = 0U;
UINT8 chAllLockSecNoOccupyCheck = 0U;
UINT8 chTrainEnterRouteFlag = 0U;
routeState = GetRouteState(routeId); /*获取进路状态*/
preRouteState = GetRoutePreState(routeId);/*获取进路前一状态*/
@@ -6098,7 +6134,8 @@ UINT16 GetReturnId(const UINT16 routeId)
toGo = CI_ERROR;
}
if ((CI_ERROR == RouteAllLockSecNoOccupyCheck(routeId)) && (CI_SUCCESS == toGo))
chAllLockSecNoOccupyCheck = RouteAllLockSecNoOccupyCheck(routeId);
if ((CI_ERROR == chAllLockSecNoOccupyCheck) && (CI_SUCCESS == toGo))
{ /*进路区段不是都空闲*/
toGo = CI_ERROR;
@@ -6119,8 +6156,10 @@ UINT16 GetReturnId(const UINT16 routeId)
/*获取所有满足道岔条件的进路ID*/
for (ii = 0u; ii < starSigRouteSum; ii++)
{
chRouteState = GetRouteState(starSigRouteBuf[ii]);
chRoutePhysicalType = CheckRoutePhysicalType(starSigRouteBuf[ii]);
/*B库改为两条进路，当8编组车占压两条进路时，此时BG2进路解锁需要检查以差值信号机为始端的进路的状态*/
if ((ROUTE_STATE_IDLE == GetRouteState(starSigRouteBuf[ii])) &&(CI_SUCCESS == CheckRoutePhysicalType(starSigRouteBuf[ii])))
if ((ROUTE_STATE_IDLE == chRouteState) &&(CI_SUCCESS == chRoutePhysicalType))
{
/*以并置信号机为始端的进路均为空闲且进路包含的区段均为列检库区段，且并置信号机为虚拟信号机,
该种算法目前只限制在库线中中途折返场景(SIGNAL_VIRTUAL_YES == GetSignalVirtualAttr(returnSigId))*/
@@ -6148,7 +6187,8 @@ UINT16 GetReturnId(const UINT16 routeId)
/* 如果是差至，如果列车驶入过进路，同时之前状态必须为接近锁闭开放
* 否则不认为是同一列车跨入中途折返处理
*/
if((ROUTE_STATE_NEAR_OPEN == preRouteState) && (TRAIN_ENTER_ROUTE_FLAG_YES == GetTrainEnterRouteFlag(routeId)))
chTrainEnterRouteFlag = GetTrainEnterRouteFlag(routeId);
if((ROUTE_STATE_NEAR_OPEN == preRouteState) && (TRAIN_ENTER_ROUTE_FLAG_YES == chTrainEnterRouteFlag))
{
returnSigId = GetRouteChaZhiSignalId(routeId); /*获取差置信号机ID*/
}
@@ -7100,23 +7140,187 @@ UINT8 CLDPhySectionFaultUnlockDeal(const UINT16 phySectionId,const UINT16 lockBe
}
/*
* 功能描述： 取消洗车逻辑管理
* 参数说明： void
* 功能描述： 取消洗车命令处理
* 参数说明： 无
* 返回值 ： void
by hh 20251208
*/
void CancelWashWorkLogicM(void)
{/*取消洗车命令*/
UINT16 washMachineId = 0u;
washMachineId = GetWashMachineId(0u);
#if 0
SetCancelWashMachineFlag(washMachineId,CANCEL_WASH_FLAG_SET_YES);
#endif
if (washMachineId >0u)
{/*收到现地取消洗车命令，直接把洗车同意按钮状逻辑态置为抬起*/
(void)SetWashmachineXTALogicState(washMachineId,XTA_STATE_RAISE_UP);
{
UINT16 washMachineId = 0U; /*洗车机ID*/
UINT16 wDownWashRelateRouteFirstId = 0U; /*降级模式洗车线控制台表示灯1关联进路ID*/
UINT8 chRouteState = 0U;/*进路状态*/
UINT8 downWashAllowState = 0U;/*降级模式洗车同意状态(融合)*/
UINT8 washMachineButtonType = GetCiFunctionSwitchConfig(FUNC_WDOWNWASH_ZIFUSHI_BUTTON); /*降级模式洗车同意按钮自复式类型*/
washMachineId = GetWashMachineId(0U);
if ((FUNC_SWITCH_ON == washMachineButtonType) && (washMachineId > 0u) && (washMachineId < WASHMACHINE_SUM_MAX))
{
downWashAllowState = GetDownWashAllowState(washMachineId);
if (WASH_COL_STATE_ALLOW_YES == downWashAllowState)
{
wDownWashRelateRouteFirstId = GetDownWashRelateRoute1Id(washMachineId);
chRouteState = GetRouteState(wDownWashRelateRouteFirstId);
if (ROUTE_STATE_IDLE == chRouteState)
{
/*设置降级模式洗车线和DCC的洗车同意按钮状态无效*/
SetDownWashAllowColState(washMachineId, WASH_COL_STATE_ALLOW_NO);
/*清除洗车线洗车同意按钮有效周期*/
SetDownWashBtVadCycle(washMachineId, 0U);
SetDownDccWashAllowColState(washMachineId, WASH_COL_STATE_ALLOW_NO);
/*清除DCC洗车同意按钮有效周期*/
SetDownWashDccBtVadCycle(washMachineId, 0U);
SetDownWashReqState(washMachineId, WASH_REQ_STATE_ALLOW_NO);
SetDownWashReqCycle(washMachineId, 0U);
}
else
{
/*向ATS报警进路未取消，请先取消进路 0XB5*/
SetCiSendCmdBackInfoData(CI_BACK_ROUTE_IDLE_NOT, CI_DEVICE_TYPE_ROUTE, wDownWashRelateRouteFirstId, 0U, 0U);
}
}
else
{
/*向ATS报警"当前洗车机洗车同意按钮未按下，不需要取消 0XB6"*/
SetCiSendCmdBackInfoData(CI_BACK_WASH_BUTTON_PRESS_NOT, CI_DEVICE_TYPE_WASHMACHINE, washMachineId, 0U, 0U);
}
}
else
{
/*其他情况不处理*/
}
}
/*
* 功能描述： 请求洗车命令处理
* 参数说明： 无
* 返回值 ： void
*by hh 20251208
*/
void ReqWashWorkLogicM(void)
{
UINT32 curCycle = Get2oo2CurCycleNum(); /*当前周期号*/
UINT8 downWashReqState = WASH_REQ_STATE_ALLOW_NO; /*洗车机洗车请求状态*/
UINT16 wMachineId = 0U; /*洗车机ID*/
UINT8 washMachineButtonType = GetCiFunctionSwitchConfig(FUNC_WDOWNWASH_ZIFUSHI_BUTTON); /*降级模式洗车同意按钮自复式类型*/
wMachineId = GetWashMachineId(0U);
if((FUNC_SWITCH_ON == washMachineButtonType) && (wMachineId >0u) && (wMachineId < WASHMACHINE_SUM_MAX))
{
downWashReqState = GetDownWashReqState(wMachineId);
if (WASH_REQ_STATE_ALLOW_NO == downWashReqState)
{
/*设置降级模式洗车请求有效*/
SetDownWashReqState(wMachineId, WASH_REQ_STATE_ALLOW_YES);
/*设置降级模式洗车请求周期号有效*/
SetDownWashReqCycle(wMachineId, curCycle);
}
else
{
/*向ATS报警当前洗车机洗车请求有效，请勿重复操作 0xB3*/
SetCiSendCmdBackInfoData(CI_BACK_WASH_APPLY_NOT, CI_DEVICE_TYPE_WASHMACHINE, wMachineId, 0U, 0U);
}
}
else
{
/*不处理*/
}
}
/*
* 功能描述： 反向通过请求命令处理
* 参数说明：无
* 返回值 ： void
*by hh 20251208
*/
void ReqPassWashWorkLogicM(void)
{
UINT32 curCycle = Get2oo2CurCycleNum(); /*当前周期号*/
UINT8 downWashPassReqState = WASH_REQ_STATE_ALLOW_NO; /*反向洗车请求状态*/
UINT16 wMachineId = 0U; /*洗车机ID*/
UINT8 washMachineButtonType = GetCiFunctionSwitchConfig(FUNC_WDOWNWASH_ZIFUSHI_BUTTON); /*降级模式洗车同意按钮自复式类型*/
wMachineId = GetWashMachineId(0U);
if ((FUNC_SWITCH_ON == washMachineButtonType) && (wMachineId > 0u) && (wMachineId < WASHMACHINE_SUM_MAX))
{
downWashPassReqState = GetDownWashPassReqState(wMachineId);
if (WASH_REQ_STATE_ALLOW_NO == downWashPassReqState)
{
/*设置降级模式反向洗车请求有效*/
SetDownWashPassReqState(wMachineId, WASH_REQ_STATE_ALLOW_YES);
/*设置降级模式反向洗车请求周期号有效*/
SetDownWashPassReqCycle(wMachineId, curCycle);
}
else
{
SetCiSendCmdBackInfoData(CI_BACK_WASH_PASSAPPLY_NOT, CI_DEVICE_TYPE_WASHMACHINE, wMachineId, 0U, 0U);
}
}
else
{
/*不处理*/
}
}
/*
* 功能描述： 取消反向通过请求命令处理
* 参数说明： 无
* 返回值 ： void
*by hh 20251208
*/
void CancelPassWashWorkLogicM(void)
{
UINT16 wDownWashRelateRouteSecId = 0U; /*降级模式洗车线控制台表示灯2关联进路ID*/
UINT8 chRouteState = 0U;/*进路状态*/
UINT8 downWashAllowPassState = 0U;/*降级模式反向通过洗车同意状态(融合)*/
UINT16 wMachineId = 0U; /*洗车机ID*/
UINT8 washMachineButtonType = GetCiFunctionSwitchConfig(FUNC_WDOWNWASH_ZIFUSHI_BUTTON); /*降级模式洗车同意按钮自复式类型*/
wMachineId = GetWashMachineId(0U);
if ((FUNC_SWITCH_ON == washMachineButtonType) && (wMachineId > 0u && wMachineId < WASHMACHINE_SUM_MAX))
{
downWashAllowPassState = GetDownWashAllowPassState(wMachineId);
if (WASH_COL_STATE_ALLOW_YES == downWashAllowPassState)
{
wDownWashRelateRouteSecId = GetDownWashRelateRoute2Id(wMachineId);
chRouteState = GetRouteState(wDownWashRelateRouteSecId);
if (ROUTE_STATE_IDLE == chRouteState)
{
/*设置降级模式洗车线和DCC的反向洗车同意按钮状态无效*/
SetDownWashAllowPassColState(wMachineId, WASH_COL_STATE_ALLOW_NO);
/*清除洗车线反向通过同意按钮有效周期*/
SetDownWashBtVadPassCycle(wMachineId, 0U);
SetDownDccWashAllowPassColState(wMachineId, WASH_COL_STATE_ALLOW_NO);
/*清除DCC反向通过同意按钮有效周期*/
SetDownWashDccBtVadPassCycle(wMachineId, 0U);
SetDownWashPassReqState(wMachineId, WASH_REQ_STATE_ALLOW_NO);
SetDownWashPassReqCycle(wMachineId, 0U);
}
else
{
/*向ATS报警进路未取消，请先取消进路 0XB5*/
SetCiSendCmdBackInfoData(CI_BACK_ROUTE_IDLE_NOT, CI_DEVICE_TYPE_ROUTE, wDownWashRelateRouteSecId, 0U, 0U);
}
}
else
{
/*向ATS报警"洗车机XXX反向通过同意按钮未按下，不需要取消 0XB7"*/
SetCiSendCmdBackInfoData(CI_BACK_WASH_PASSBUTTON_PRESS_NOT, CI_DEVICE_TYPE_WASHMACHINE, wMachineId, 0U, 0U);
}
}
else
{
/*其他情况不处理*/
}
}
/*
* 功能描述： 进路调车同意逻辑管理
* 参数说明： void
TSCP/src/APP/ciapp/LogicManage/TradInterlockLogicManage.h
+27 -2
View File
@@ -766,12 +766,37 @@ UINT16 GetReturnId(const UINT16 routeId);
void DTrainRtnUnlockRemoteRAllLockP(const UINT16 routeId);
/*
* 功能描述： 取消洗车逻辑管理
* 参数说明： void
* 功能描述： 取消洗车命令处理
* 参数说明： 无
* 返回值 ： void
by hh 20251208
*/
void CancelWashWorkLogicM(void);
/*
* 功能描述： 请求洗车命令处理
* 参数说明： 无
* 返回值 ： void
*by hh 20251208
*/
void ReqWashWorkLogicM(void);
/*
* 功能描述： 反向通过请求命令处理
* 参数说明：无
* 返回值 ： void
*by hh 20251208
*/
void ReqPassWashWorkLogicM(void);
/*
* 功能描述： 取消反向通过请求洗车逻辑管理
* 参数说明： const UINT16 wMachineId 洗车机ID
* 返回值 ： void
*by hh 20251208
*/
void CancelPassWashWorkLogicM(void);
/*
* 功能描述： 进路调车同意逻辑管理
* 参数说明： void
TSCP/src/APP/ciapp/LogicProcess/InterlockLogicCheck.c
+964 -92
View File
File diff suppressed because it is too large Load Diff
TSCP/src/APP/ciapp/LogicProcess/InterlockLogicCheck.h
+123 -2
View File
@@ -2919,7 +2919,128 @@ UINT8 AutoReturnRouteCouplinkCheck(const UINT16 wAutoRouteId, const UINT8 chFunc
* by lyj 20250929
*/
UINT8 AllAutoReturnRCouplinkCheck(const UINT16 wAutoRouteId, const UINT8 chFunctionId);
/*
* 功能描述： 区段征用、区段防护道岔区段征用、区段内道岔道岔征用检查、区段内防护道岔道岔征用
* 参数说明：const UINT16 axisSecId 计轴区段ID
* 返回值 ： CI_ERROR
* CI_SUCCESS
* add by mpt 20260331
*/
UINT8 JumpPhySectionUseCheck(const UINT16 axisSecId);
/*
* 功能描述：区段防护道岔区段、防护道岔征用检查
* 参数说明：const UINT16 axisSecId 计轴区段ID
* 返回值 ： CI_ERROR
* CI_SUCCESS
* add by mpt 20260331
*/
UINT8 JumpPhySectionPortectUseCheck(const UINT16 axisSecId);
/*
* 功能描述：逻辑区段防护道岔区段征用、道岔征用检查
* 参数说明：const UINT16 axisSecId 计轴区段ID
* 返回值 ： CI_ERROR
* CI_SUCCESS
* add by mpt 20260331
*/
UINT8 JumpLogicSecPortectUseCheck(const UINT16 wLgcId);
/*
* 功能描述：计轴区段所在道岔道岔征用检查
* 参数说明：const UINT16 axisSecId 计轴区段ID
* 返回值 ： CI_ERROR
* CI_SUCCESS
* add by mpt 20260331
*/
UINT8 JumpPhySectionSwitchUseCheck(const UINT16 axisSecId);
/*
* 功能描述：设置跳跃锁闭防护道岔区段征用状态
* 参数说明：const UINT16 axisSecId 计轴区段ID
* const UINT8 state 状态
* 返回值 ： void
* add by mpt 20260331
*/
void SetJumpPhySectionPortectSecUse(const UINT16 axisSecId, const UINT8 state);
/*
* 功能描述：设置逻辑区段的防护道岔区段征用
* 参数说明：const UINT16 axisSecId 计轴区段ID
* const UINT8 state 状态
* 返回值 ： void
* add by mpt 20260331
*/
void SetJumpLogicSecPortectUse(const UINT16 wLgcId, const UINT8 state);
/*
* 功能描述： 检查计轴区段跳跃锁闭是否有防护道岔驱动超时
* 参数说明： const UINT16 routeId, 进路ID
* 返回值 ： UINT8
CI_SUCCESS:计轴区段防护道岔无道岔驱动超时
CI_ERROR:计轴区段防护道岔驱动超时
add by mpt 20260331
*/
UINT8 ChekJumpLockProtectSwitDrivOvtmStat(const UINT16 axisSecId);
/*
* 功能描述： 计轴区段道岔封锁状态检查
* 参数说明： UINT16 const axisSecId, 计轴区段编号
* UINT16 *pDevId, 设备Id（返回）
* UINT8 *pDevState, 设备状态（返回）
* 返回值 ： CI_ERROR
* CI_SUCCESS
* Add by mpt 20260331
*/
UINT8 AxisSecProtSwitchFLockCheck(UINT16 const axisSecId, UINT16* pDevId, UINT8* pDevState);
/*
* 功能描述： 计轴区段的防护道岔位置和动作有效性检查
* 参数说明： UINT16 const axisSecId, 计轴区段编号
* UINT16 *pDevId, 设备Id（返回）
* UINT8 *pDevState, 设备状态（返回）
* 返回值 ： CI_ERROR
* CI_SUCCESS
* add by mpt 20260331
*/
UINT8 AxisSecPorteSwitchPosMoveCheck(UINT16 const axisSecId, UINT16* pDevId, UINT8* pDevState, UINT8 funcId, UINT8 sendLevel);
/*
* 功能描述： 计轴区段所有防护道岔位置正确检查
* 参数说明： UINT16 const axisSecId, 计轴区段编号
* UINT16 *pDevId, 设备Id（返回）
* UINT8 *pDevState, 设备状态（返回）
* 返回值 ： CI_ERROR
* CI_SUCCESS
* add mpt 20260331
*/
UINT8 AxisSecAllProtSwitchPosCheck(UINT16 const axisSecId, UINT16* pDevId, UINT8* pDevState);
/*
* 功能描述： 设置计轴区段关联防护道岔防护锁闭状态
* 参数说明： const UINT16 axisSecId, 计轴区段ID
* const UINT8 lockCommand, 锁闭状态
* 返回值 ： void
* add by mpt 20260331
*/
void SetAxisRelProSwitchLockSta(const UINT16 axisSecId, const UINT8 lockCommand);
/*
* 功能描述： 计轴区段关联防护道岔防护锁闭检查
* 参数说明： UINT16 const routeId, 计轴区段号
* UINT16 *pDevId, 设备Id（返回）
* UINT8 *pDevState, 设备状态（返回）
* 返回值 ： CI_ERROR
* CI_SUCCESS
* add mpt 20260331
*/
UINT8 AxisRelatedProSwitchLockCheck(UINT16 const axisSecId, UINT16* pDevId, UINT8* pDevState);
/*
* 功能描述： 逻辑区段所处道岔防护道岔封锁状态检查
* 参数说明： UINT16 const routeId, 逻辑区段ID
* UINT16 *pDevId, 设备Id（返回）
* UINT8 *pDevState, 设备状态（返回）
* 返回值 ： CI_ERROR
* CI_SUCCESS
* add by mpt 20260331
*/
UINT8 LogicSecRltvPrtctSwFlockCheck(UINT16 const wLgcId, UINT16* pDevId, UINT8* pDevState);
/*
* 功能描述： 设置逻辑区段关联防护道岔防护锁闭状态
* 参数说明： const UINT16 axisSecId, 计轴区段ID
* const UINT8 lockCommand, 锁闭状态
* 返回值 ： void
* add by mpt 20260331
*/
void SetLogSecRelProSwitchLockSta(const UINT16 wLgcId, const UINT8 lockCommand);
#endif
TSCP/src/APP/ciapp/LogicProcess/InterlockLogicProcess.c
+80 -38
View File
@@ -2557,12 +2557,6 @@ UINT8 LockRouteOverlapLogicProcess(UINT16 const routeId, UINT16 const overlapId,
/*人工解锁条件检查*/
if (CI_SUCCESS == reResult)
{
if ((LOCK_OVERLAP_CMD_YES == laborLockCmdFlag) && (ATS_LOCK_OVERLAP == lockType))
{
/*人工锁闭保护区段，允许*/
}
else
{
devId = 0u;
devState = 0u;
@@ -2578,7 +2572,6 @@ UINT8 LockRouteOverlapLogicProcess(UINT16 const routeId, UINT16 const overlapId,
SetErrorData(functionId, CI_DEVICE_TYPE_OVERLAP, devId, ETYPE_OVERLAP_LABORUNLOCK_STATE, devState, sendLevel);
}
}
}
/*保护区段照查条件检查*/
@@ -2973,7 +2966,7 @@ UINT8 LockRouteOverlapLogicProcess(UINT16 const routeId, UINT16 const overlapId,
/*保护区段关联防护道岔【未引导总锁】*/
devId = 0u;
devState = 0u;
checkResult = OvlpRelatedProSwitchYLockCheck(overlapId,&devId,&devState);
checkResult = OvlpRelatedProSwitchYLockCheck(overlapId, &devId, &devState);
if (checkResult == CI_SUCCESS)
{
/* 通过检查，保持当前状态 */
@@ -2981,17 +2974,11 @@ UINT8 LockRouteOverlapLogicProcess(UINT16 const routeId, UINT16 const overlapId,
else
{
/* 记录故障码 */
SetErrorData(functionId,CI_DEVICE_TYPE_SWITCH,devId,ETYPE_SWT_YLOCK_STATE,devState,sendLevel);
SetErrorData(functionId, CI_DEVICE_TYPE_SWITCH, devId, ETYPE_SWT_YLOCK_STATE, devState, sendLevel);
/* 失败返回 */
reResult = CI_ERROR;
}
if (FUNC_SWITCH_ON == cSndSideProFuncSwitch)
{
/*支持二级侧防时，不检查防护道岔位置和可动性*/
}
else
{
/*保护区段关联防护道岔位置正确或位置不正确但可动作*/
if ((CI_SUCCESS == reResult) || (RETURN_WAIT_SWITCH_USING == reResult) || (RETURN_LOCK_ERR_SWITPOS == reResult))
{
@@ -3055,7 +3042,6 @@ UINT8 LockRouteOverlapLogicProcess(UINT16 const routeId, UINT16 const overlapId,
}
}
}
}
if(CI_ERROR == reResult)
{
@@ -6718,7 +6704,7 @@ UINT8 UnlockRouteOverlapLogicProcess(UINT16 const routeId, UINT16* overlapId,UIN
/*进路最后一个区段*/
UINT16 const routeLastSecId = GetRouteLastPhySectionId(routeId);
UINT16 const secStopFlag = GetPhySecStopSteadyFlag(routeLastSecId);
UINT8 const secStopFlag = GetPhySecStopSteadyFlag(routeLastSecId);
/*防护进路*/
UINT8 const overlapSum = GetRouteOverlapSum(routeId);
@@ -6739,6 +6725,8 @@ UINT8 UnlockRouteOverlapLogicProcess(UINT16 const routeId, UINT16* overlapId,UIN
UINT8 chRoutCouplinkFlag = 0U;
UINT8 chCoupResult = 0U;
UINT8 chOverlapLaborUnlockSetState = 0U; /*保护区段人工解锁命令设置状态*/
UINT8 chOverlapUtUnlockMode = GetCiFunctionSwitchConfig(FUNC_OVERLAP_UT_UNLOCK_MODE);
localCiId = GetSystemParaLocalCiId();
SetOverlapCanLaborUnlockFlag(overlapLockedId,CANNOT_LABOR_UNLOCK_OVERLAP);/*每周期先设置不可人工解锁*/
@@ -6882,21 +6870,38 @@ UINT8 UnlockRouteOverlapLogicProcess(UINT16 const routeId, UINT16* overlapId,UIN
}
relyonStartCycNum = CalculaOverlapUnlockStartCycNum(overlapLockedId, devId);/*计算解锁起始倒计时*/
secStopTimeState = SystemOverTimeCheck(relyonStartCycNum, overlapUnLockCount);
if (((PHYSICAL_SECTION_STOPSTEADY_YES == secStopFlag) && (CI_TIME_IN == secStopTimeState)) || (CI_TIME_OUT == secStopTimeState))
{/*未超时且收到停稳信息，或是倒计时超时，则解锁保护区段*/
if (PHYSICAL_SECTION_STOPSTEADY_YES == secStopFlag)
{/*收到停稳信息，则解锁保护区段*/
reResult = CI_SUCCESS;
*overlapId = overlapLockedId;
}
else
{
if (FUNC_SWITCH_ON == chOverlapUtUnlockMode)
{
/*不自动解锁*/
reResult = CI_ERROR;
*overlapId = overlapLockedId;
}
else
{
if (CI_TIME_OUT == secStopTimeState)
{
/*超时，解锁保护区段*/
reResult = CI_SUCCESS;
*overlapId = overlapLockedId;
}
else
{
/*未超时且未收到停稳信息，不能解锁保护区段*/
reResult = CI_ERROR;
*overlapId = overlapLockedId;
}
}
}
}
else if (LOGICSECTION_OCCUPY_CT == utOrCtOccFlag)
{/*当前周期物理区段为通信车占用，检查180s倒计时*/
@@ -7032,7 +7037,7 @@ UINT8 UnlockRouteOverlapLogicProcess(UINT16 const routeId, UINT16* overlapId,UIN
SetOverlapCanLaborUnlockFlag(overlapLockedId, CAN_LABOR_UNLOCK_OVERLAP);/*设置可以人工解锁保护区段*/
checkResult = CheckOverlapLaborUnlock(overlapLockedId);
checkResult = CheckOverlapLaborUnlock(overlapLockedId, routeId);
if (CI_SUCCESS == checkResult)
{
reResult = CI_SUCCESS;
@@ -9599,11 +9604,13 @@ UINT8 OpenBlocRouteSectionCheck(UINT16 routeId,UINT8 functionId,UINT8 sendLevel)
UINT8 chDsnFuncSwitch = 0U; /* 无直轨计轴占用功能开关 */
UINT8 chXianSuFuncSwitch = 0U; /*后备模式信号开放是否检查区段临时限速开关*/
UINT8 cCrossState = 0U; /*信号机跨压状态*/
UINT8 chRouteBelongVirCiId = 0U;
chDsnFuncSwitch = GetCiFunctionSwitchConfig(FUNC_TOA_SWITCH);
chXianSuFuncSwitch = GetCiFunctionSwitchConfig(FUNC_XIANSU_SWITCH);
ciType = GetCiType(LocalCiId);
chRouteBelongVirCiId = GetRouteBelongVirCiId(routeId);
ciType = GetLocalVirCiType(chRouteBelongVirCiId);
/* 联锁逻辑检查 */
/* 进路内所有区段未被封锁 */
@@ -9630,6 +9637,8 @@ UINT8 OpenBlocRouteSectionCheck(UINT16 routeId,UINT8 functionId,UINT8 sendLevel)
devState = 0u;
startSignalId = GetRouteStartSignalId(routeId);/*获取进路始端信号机ID*/
checkResult = RouteAllSecOccuClearCheck(routeId,&devId, &cPhySecCurMergeState);
routeState = GetRouteState(routeId);
if ((CI_TYPE_CLD == ciType) && ((ROUTE_STATE_YUXIAN_OPEN == routeState) ||(ROUTE_STATE_NEAR_OPEN == routeState)))
{/*车辆段进路预先开放或接近开放*/
@@ -9868,8 +9877,6 @@ UINT8 CLDKeepOpenSecCheck(UINT16 routeId, UINT8 functionId, UINT8 sendLevel)
{
/*进路内区段，有UT占用，信号保持失败*/
/*进路内区段，有CT，且第一逻辑区段和外方第一物理区段最后一个逻辑区段CT占用，信号保持成功，其它失败*/
hasUtFlag = 0u;
hasCtFlag = 0u;
for (ii = 0u; ii < routePhyNum; ii++)
{
phyId = pRoutePhySecData[ii].PhysicalSectionId;
@@ -9911,7 +9918,7 @@ UINT8 CLDKeepOpenSecCheck(UINT16 routeId, UINT8 functionId, UINT8 sendLevel)
chFunRet = GetRouteInOutFstLgcTrainInfo(routeId, &chReadyEnterRouteTrainSum, wszReadyEtRouteTrainId);
if (CI_SUCCESS == chFunRet)
{
chTrainEnterState = dsuTrainMinHeadCrossSignal(wszReadyEtRouteTrainId[0], routeId);
chTrainEnterState = dsuTrainMinHeadCrossSignal(wszReadyEtRouteTrainId[0], routeId, CI_ERROR);
if (TRAIN_ENTER_ROUTE_FULL == chTrainEnterState)
{
/*列车完全驶入进路，关灯 by cgh 20231128*/
@@ -10033,6 +10040,7 @@ UINT8 OpenCbtcRouteSectionCheck(UINT16 routeId,UINT8 functionId,UINT8 sendLevel)
UINT16 startSignalId = 0u;
UINT8 signalCrossState = 0u;
UINT8 chRouteCouplinkFlag = 0U;
UINT8 chRouteBelongVirCiId = 0U;
/* 联锁逻辑检查 */
/* 进路内所有区段未被封锁 */
@@ -10055,7 +10063,8 @@ UINT8 OpenCbtcRouteSectionCheck(UINT16 routeId,UINT8 functionId,UINT8 sendLevel)
/*CBTC进路内方第一逻辑区段条件检查，车辆段进路需内方区段空闲*/
if (CI_SUCCESS == reResult)
{
cLocalCiType = GetLocalCiType();
chRouteBelongVirCiId = GetRouteBelongVirCiId(routeId);
cLocalCiType = GetLocalVirCiType(chRouteBelongVirCiId);
if (CI_TYPE_CLD != cLocalCiType)
{
/*非车辆段，按CBTC既有逻辑处理*/
@@ -10133,6 +10142,8 @@ UINT8 OpenCbtcRouteSectionCheck(UINT16 routeId,UINT8 functionId,UINT8 sendLevel)
}
else
{
devId = GetRouteInFirstLogSecId(routeId);
devState = GetLogSecCurOccupyState(devId);
reResult = CheckEngineerVehicleNear(routeId);/*检查是否是工程车接近的跨压*/
if (CI_SUCCESS == reResult)
{
@@ -10379,6 +10390,7 @@ UINT8 KeepCbtcRouteSectionCheck(UINT16 routeId,UINT8 functionId,UINT8 sendLevel)
UINT8 outPhySecState = 0U;
UINT8 cLocalCiType = 0U; /*本控区类型*/
UINT8 chRouteCouplinkFlag = 0U;
UINT8 chRouteBelongVirCiId = 0U;
/* 联锁逻辑检查 */
/* 进路内所有区段未被封锁 */
@@ -10401,7 +10413,8 @@ UINT8 KeepCbtcRouteSectionCheck(UINT16 routeId,UINT8 functionId,UINT8 sendLevel)
/*CBTC进路内方第一逻辑区段条件检查*/
if(CI_SUCCESS == reResult)
{
cLocalCiType = GetLocalCiType();
chRouteBelongVirCiId = GetRouteBelongVirCiId(routeId);
cLocalCiType = GetLocalVirCiType(chRouteBelongVirCiId);
if (CI_TYPE_CLD != cLocalCiType)
{
/*非车辆段，按CBTC既有逻辑处理*/
@@ -10438,7 +10451,12 @@ UINT8 KeepCbtcRouteSectionCheck(UINT16 routeId,UINT8 functionId,UINT8 sendLevel)
if (ROUTE_COUPLINK_FLAG_YES == chRouteCouplinkFlag)
{
reResult = KeepCouplinkRouteSecOccCheck(routeId,&devId,&devState);
if (CI_ERROR == reResult)
if (CI_SUCCESS == reResult)
{
/* 通过检查 */
reResult = CI_SUCCESS;
}
else
{
/* 记录故障码 */
SetErrorData(functionId, CI_DEVICE_TYPE_PHYSEC, devId, SECTION_OCCUPY_YES, devState, sendLevel);
@@ -10487,6 +10505,8 @@ UINT8 KeepCbtcRouteSectionCheck(UINT16 routeId,UINT8 functionId,UINT8 sendLevel)
}
else
{
devId = GetRouteInFirstLogSecId(routeId);
devState = GetLogSecCurOccupyState(devId);
reResult = CheckEngineerVehicleNear(routeId);/*检查是否是工程车接近的跨压以及列车的真实跨压*/
if (CI_SUCCESS == reResult)
{
@@ -11553,6 +11573,9 @@ void RouteLgcSecResReleaseProcess(const UINT16 wRouteId)
UINT16* routeLogIdBuf = NULL;
LogicTrainResStruct * pstTrainResInfo = NULL;
LogicSectionDataStructCC *pstLgcSecInfo = NULL;
UINT8 chLogSecLockState = 0u;
UINT8 chLogSecLogLockState = 0U;
/*获取进路逻辑区段数据*/
routeLogNum = GetRouteLogSectionSum(wRouteId);
routeLogIdBuf = GetRouteLogSectionIdBuf(wRouteId);
@@ -11569,6 +11592,9 @@ void RouteLgcSecResReleaseProcess(const UINT16 wRouteId)
wUnlockLgcSecId = routeLogIdBuf[ii];
wBelongRouteId = GetLogSecLockBelongRoute(wUnlockLgcSecId);
wLgcBufIndex = GetlogSectionBufIndex(wUnlockLgcSecId);
chLgcResTrainSum = GetLogSecTrainInfoSum(wUnlockLgcSecId);
chLogSecLogLockState = GetLogSecLogLockState(wUnlockLgcSecId);
if (LOGIC_SECTION_SUM_MAX > wLgcBufIndex)
{
@@ -11581,10 +11607,9 @@ void RouteLgcSecResReleaseProcess(const UINT16 wRouteId)
if (CI_SUCCESS == chKeepWork)
{
/*锁闭所属进路等于本进路*/
/*锁闭所属进路等于本进路或逻辑区段已解锁*/
if (wBelongRouteId == wRouteId)
{
chLgcResTrainSum = GetLogSecTrainInfoSum(wUnlockLgcSecId);
if (LOGIC_SECTION_RES_SUM_MAX > chLgcResTrainSum)
{
; /*继续执行*/
@@ -11595,10 +11620,17 @@ void RouteLgcSecResReleaseProcess(const UINT16 wRouteId)
}
}
else
{
if ((0u == wBelongRouteId) && (LOG_SECTION_LOGLOCK_NO == chLogSecLogLockState))
{
/*不被进路锁闭且不被逻辑进路锁闭*/
}
else
{
chKeepWork = CI_ERROR;
}
}
}
else
{
}
@@ -11616,9 +11648,12 @@ void RouteLgcSecResReleaseProcess(const UINT16 wRouteId)
/*上一区段是否已解锁*/
pstTrainResInfo = GetLogSecTrainInfoById(wPreUnlockLgcSecId, wTrainId);
if (((LOGIC_SECTION_TRAIN_UNLOCK_YES == chLogSecReleaseFlag)||(0U==wTrainId))
chLogSecLockState = GetLogSecLockState(wUnlockLgcSecId);
if (((LOGIC_SECTION_TRAIN_UNLOCK_YES == chLogSecReleaseFlag)||(0U==wTrainId)||
((0u == wBelongRouteId) && (LOG_SECTION_LOGLOCK_NO == chLogSecLogLockState))
)
&& (NULL == pstTrainResInfo))
{
{/*上一区段已经解锁，本区段由列车申请资源释放或本区段已经解锁*/
/*删除该列车对应逻辑区段资源*/
(void)ComMemSet((void *)&pstLgcSecInfo[wLgcBufIndex].szTrainResData[jj], (UINT16)sizeof(LogicTrainResStruct), 0U);
debug_infor_printf((const)"LogSecRes Release LgcId: %d TrainId:%d Cyc\n"
@@ -11648,11 +11683,12 @@ void RouteLgcSecResReleaseProcess(const UINT16 wRouteId)
/*
* 功能描述： 检查保护区段人工解锁是否可执行
* 参数说明： const UINT16 overlapId, 保护区段ID
* const UINT16 wRouteId 进路ID
* 返回值 ： CI_SUCCESS:成功
CI_ERROR:失败
* edit cgh 20250928
*/
UINT8 CheckOverlapLaborUnlock(const UINT16 overlapId)
UINT8 CheckOverlapLaborUnlock(const UINT16 overlapId,const UINT16 wRouteId)
{
UINT8 rtVal = CI_ERROR;
UINT8 OverlapLaborUnlockSetState = 0u;
@@ -11660,8 +11696,10 @@ UINT8 CheckOverlapLaborUnlock(const UINT16 overlapId)
UINT32 laborUnlockStartCycNum =0u;
UINT8 laborUnlockStopTimeState =0u;
UINT8 cTimeCheckFlag = CI_TIME_NO;
UINT16 wRouteLastSecId = 0U; /*进路最后一个区段ID*/
UINT8 chSecStopFlag = 0U; /*区段停稳标志*/
if ((0U < overlapId) && (OVERLAP_SUM_MAX > overlapId))
if ((0U < overlapId) && (OVERLAP_SUM_MAX > overlapId) && (0U < wRouteId) && (ROUTE_SUM_MAX > wRouteId))
{
OverlapLaborUnlockSetState = GetOverlapLaborUnlockSetState(overlapId);
if (LABOR_UNLOCK_OVERLAP_YES == OverlapLaborUnlockSetState)
@@ -11670,8 +11708,12 @@ UINT8 CheckOverlapLaborUnlock(const UINT16 overlapId)
laborUnlockOverlapTimeCount = GetlabarUnlockOverlapTimeCount();/*人工解锁延时时间*/
laborUnlockStartCycNum = GetlaborUnlockStartCycNum(overlapId);
laborUnlockStopTimeState = SystemOverTimeCheck(laborUnlockStartCycNum, laborUnlockOverlapTimeCount);
if (CI_TIME_OUT == laborUnlockStopTimeState)
wRouteLastSecId = GetRouteLastPhySectionId(wRouteId);
chSecStopFlag = GetPhySecStopSteadyFlag(wRouteLastSecId);
if ((CI_TIME_OUT == laborUnlockStopTimeState) || (PHYSICAL_SECTION_STOPSTEADY_YES == chSecStopFlag))
{
/*人工解锁保护区段超时或区段停稳标志有效，解锁保护区段*/
rtVal = CI_SUCCESS;
}
else
@@ -13016,7 +13058,7 @@ UINT8 SetRouteCouplinkProcess(const UINT16 wRouteId, const UINT8 functionId, con
else
{
/* 记录故障码 */
SetErrorData(functionId, CI_DEVICE_TYPE_ROUTE, wRouteId, ETYPE_ROUTE_TYPE, chRouteType, sendLevel);
SetErrorData(functionId, CI_DEVICE_TYPE_ROUTE, wRouteId, ETYPE_ROUTE_TYPE, chRouteType, ESEND_LEVEL_ZERO);
/* 失败返回 */
chReval = CI_ERROR;
}
TSCP/src/APP/ciapp/LogicProcess/InterlockLogicProcess.h
+2 -1
View File
@@ -692,11 +692,12 @@ void RouteLgcSecResReleaseProcess(const UINT16 wRouteId);
/*
* 功能描述： 检查保护区段人工解锁是否可执行
* 参数说明： const UINT16 overlapId, 保护区段ID
* const UINT16 wRouteId ½ø·ID
* 返回值 ： CI_SUCCESS:成功
CI_ERROR:失败
* edit cgh 20250928
*/
UINT8 CheckOverlapLaborUnlock(const UINT16 overlapId);
UINT8 CheckOverlapLaborUnlock(const UINT16 overlapId, const UINT16 wRouteId);
/*
* 功能描述： 计算保护区段解锁倒计时开始周期
* 参数说明： const UINT16 overlapId, 保护区段ID
TSCP/src/APP/ciapp/LogicProcess/TradInterlockLogicProcess.c
+3 -9
View File
@@ -1598,12 +1598,14 @@ UINT8 SetNonRouteP(UINT8 nonRouteId)
reResult = NonRouteRelProSwiPosMovValCheck(nonRouteId,functionId,sendLevel);
}
#if 0
/*修复缺陷YF0083-2105---LYJ--20260128*/
if (CI_SUCCESS == reResult)
{/*侵限区段侵限条件不满足检查*/
reResult = NonRouteIntruSecVainCheck(nonRouteId,functionId,sendLevel);
}
#endif
return reResult;
}
@@ -1721,14 +1723,6 @@ UINT8 LockNonRouteP(UINT8 nonRouteId)
reResult = NonRouteRelProSwiPosMovValCheck(nonRouteId,functionId,sendLevel);
}
if (CI_SUCCESS == reResult)
{/*侵限区段侵限条件不满足检查*/
reResult = NonRouteIntruSecVainCheck(nonRouteId,functionId,sendLevel);
}
return reResult;
}
TSCP/src/APP/ciapp/Mask/MaskDefine.h
+16 -4
View File
@@ -118,6 +118,8 @@
#define MASK_TYPE_PHYSECTION_HEAD_XTD ((UINT8)0x31) /*定义物理区段运行方向下行状态码位*/
#define MASK_TYPE_PHYSECTION_HEAD_STD ((UINT8)0x32) /*定义物理区段运行方向上行状态码位*/
#define MASK_TYPE_LIECHE_STOPSTATE ((UINT8)0x3a) /*定义列车停稳信息状态码位*/
#define MASK_TYPE_PHYSECTION_INTRUSION ((UINT8)0x5a) /*定义物理区段侵限状态码位(CI->ZC)*/
#define MASK_TYPE_PHYSECTION_ATS_FLOCK ((UINT8)0x5b) /*定义物理区段由ATS封锁状态码位(CI->ZC)*/
#define MASK_TYPE_PHYSEC_CENTERDETAIN_UP ((UINT8)0x3d) /*定义物理区段CI-ATS中心上行扣车状态状态码位 (兼容28.0.0.14使用)*/
#define MASK_TYPE_PHYSEC_CENTERDETAIN_DOWN ((UINT8)0x3e) /*定义物理区段CI-ATS中心下行扣车状态状态码位 (兼容28.0.0.14使用)*/
#define MASK_TYPE_PHYSEC_STATIONDETAIN_UP ((UINT8)0x3f) /*定义物理区段CI-ATS车站上行扣车状态状态码位 (兼容28.0.0.14使用)*/
@@ -139,9 +141,10 @@
#define MASK_TYPE_DOWNWARD_DIRECTION ((UINT8)0x94) /*定义逻辑区段下行锁闭码位*/
#define MASK_TYPE_LOGICSECTION_PROTECTLOCK ((UINT8)0x99) /*定义逻辑区段防护锁闭码位*/
#define MASK_TYPE_LOGICSECTION_JUMPLOCK ((UINT8)0x9A) /*定义逻辑区段跳跃锁闭码位*/
#define MASK_TYPE_LOGICSECTION_ARB ((UINT8)0x9B) /*定义逻辑区段ARB状态码位*/
#define MASK_TYPE_LOGSEC_CBTC_ARB ((UINT8)0x9B) /*定义逻辑区段CBTC_ARB状态码位*/
#define MASK_TYPE_LOGICSECTION_SPKS_FLOCK ((UINT8)0x9C) /*定义逻辑区段SPKS封锁状态码位*/
#define MASK_TYPE_LOGICSECTION_EMERG_XIANSU ((UINT8)0x9D) /*定义逻辑区段紧急临时限速码位*/
#define MASK_TYPE_LOGSEC_PB_TACS_ARB ((UINT8)0xB3) /*定义逻辑区段PB_TACS_ARB状态码位*/
/*保护区段相关码位*/
@@ -184,7 +187,9 @@
#define MASK_TYPE_CANCEL_ESP_FAULT ((UINT8)0x9c) /*定义取消紧急关闭按钮故障码位*/
#define MASK_TYPE_ESP_FAULT ((UINT8)0x9d) /*定义紧急关闭按钮故障码位*/
#define MASK_TYPE_CUT_ESP_FAULT ((UINT8)0xA3) /*定义紧急关闭旁路按钮故障码位*/
#define MASK_TYPE_ESP_PRESS_STATE ((UINT8)0xA4) /*定义紧急关闭按钮按下状态码位*/
#define MASK_TYPE_CUT_ESP_STATE ((UINT8)0xA4) /*定义紧急关闭旁路按钮激活状态码位*/
#define MASK_TYPE_ONEPLAT_ESP_STATE ((UINT8)0xAB) /*定义紧急关闭按钮同站紧急按钮激活状态码位*/
#define MASK_TYPE_ONEPLAT_CUT_ESP_STATE ((UINT8)0xAC) /*定义紧急关闭按钮同站旁路按钮激活状态码位*/
/*站台安全门相关码位*/
#define MASK_TYPE_PSD_STATE ((UINT8)0x60) /*定义站台安全门状态码位-ZC,LEU用*/
@@ -202,8 +207,11 @@
#define MASK_TYPE_PSD_PDB_FLASH_STATE ((UINT8)0xA0) /*定义清客确认箱PDB按钮指示灯闪灯状态码位*/
#define MASK_TYPE_PSD_VIDEO_QK_LU ((UINT8)0xA1) /*定义清客按钮箱视频清客表示灯（绿)状态码位*/
#define MASK_TYPE_PSD_VIDEO_QK_HONG ((UINT8)0xA2) /*定义清客按钮箱视频清客表示灯（红)状态码位*/
#define MASK_TYPE_PSD_EXCEPT_OPEN ((UINT8)0xA5) /*定义站台安全门异常打开码位*/
#define MASK_TYPE_PSD_EXCEPT ((UINT8)0xA5) /*定义站台安全门异常码位 CI-ATS、CI-ZC*/
#define MASK_TYPE_PSD_JXTCPANGLU_FAULT ((UINT8)0xAA) /*定义间隙探测旁路按钮故障码位*/
#define MASK_TYPE_PSD_IBP_STATE ((UINT8)0xAD) /*定义IBP盘按钮状态码位*/
#define MASK_TYPE_PSD_IBP_FAULT ((UINT8)0xAE) /*定义IBP盘按钮故障码位*/
#define MASK_TYPE_PSD_JXTC_STATE ((UINT8)0xAF) /*定义间隙探测状态码位*/
/*车库门相关码位*/
#define MASK_TYPE_GARAGEDOOR_OPEN_STATE ((UINT8)0x62) /*定义车库门开门状态码位（CI->ATS）*/
#define MASK_TYPE_GARAGEDOOR_CLOSE_STATE ((UINT8)0x63) /*定义车库门关门状态码位（CI->ATS）*/
@@ -235,6 +243,10 @@
/*洗车机相关码位*/
#define MASK_TYPE_WASHMACHINE_READYSTATE ((UINT8)0x74) /*定义洗车机就绪状态码位*/
#define MASK_TYPE_WASHMACHINE_WORKMODE ((UINT8)0x9E) /*定义洗车机工作模式码位*/
#define MASK_TYPE_WASHMACHINE_ZNTBUTTN ((UINT8)0x9F) /*定义CI-ATS洗车机降级模式洗车线洗车同意按钮粘连码位,0有粘连，1为无粘连*/
#define MASK_TYPE_DCCWASHACHINE_ZNTBUTTN ((UINT8)0xb0) /*定义CI-ATS洗车机降级模式DCC洗车同意按钮粘连码位,0有粘连，1为无粘连*/
#define MASK_TYPE_PASSWASHMACHINE_ZNTBUTTN ((UINT8)0xb1) /*定义CI-ATS洗车机降级模式洗车线洗车反向通过同意按钮粘连码位,0有粘连，1为无粘连*/
#define MASK_TYPE_DCCPASSWASHMACHINE_ZNTBUTTN ((UINT8)0xb2) /*定义CI-ATS洗车机降级模式DCC洗车反向通过同意按钮粘连码位,0有粘连，1为无粘连*/
/*防淹门相关码位*/
TSCP/src/APP/ciapp/NonRoute/NonRouteConfigDataManage.c
+18
View File
@@ -365,6 +365,24 @@ UINT16 GetSCXColAgreeTryRelayIdById(UINT8 nonRouteId)
return collAgreeTryTrainRelayId;
}
/*
* 功能描述： 获取试车线采集的轨旁试车指示器继电器ID
* 参数说明： UINT8 nonRouteId 非进路id
* 返回值 ： 试车线采集的轨旁试车指示器继电器ID
*/
UINT16 GetWaysideTryTrainIndRelayId(UINT8 nonRouteId)
{
UINT16 collAgreeTryTrainRelayId = 0u;
NonRouteConfigDataStruct* pNonRouteConfig = GetNonRouteConfigDataPtrById(nonRouteId);
if (pNonRouteConfig != NULL)
{
collAgreeTryTrainRelayId = pNonRouteConfig->ColWaysideTryTrainIndRelayId; /* 试车线采集的轨旁试车指示器继电器ID */
}
return collAgreeTryTrainRelayId;
}
/*
* 功能描述：根据道岔id查找对应的非进路
* 参数说明：swId-道岔id
TSCP/src/APP/ciapp/NonRoute/NonRouteConfigDataManage.h
+9
View File
@@ -82,6 +82,7 @@ typedef struct S_NonRouteConfigDataStruct
UINT16 AgreeTryTrainRelayId; /*同意试车继电器ID (配置字段)*/
UINT16 DrvApplyTryTrainRelayId; /* 试车线驱动的申请试车继电器ID */
UINT16 ColAgreeTryTrainRelayId; /* 试车线采集的同意试车继电器ID */
UINT16 ColWaysideTryTrainIndRelayId; /* 试车线采集的轨旁试车指示器继电器ID */
} NonRouteConfigDataStruct;
/*******************************全局变量声明*******************************/
@@ -268,6 +269,14 @@ UINT8 GetnonRouteIdbelongVirCIid(UINT8 nonRouteId);
*/
UINT8 GetnonRouteIdbelongCIid(UINT8 nonRouteId);
/*
* 功能描述： 获取试车线采集的轨旁试车指示器继电器ID
* 参数说明： UINT8 nonRouteId 非进路id
* 返回值 ： 试车线采集的轨旁试车指示器继电器ID
*/
UINT16 GetWaysideTryTrainIndRelayId(UINT8 nonRouteId);
#ifdef __cplusplus
}
#endif
TSCP/src/APP/ciapp/Overlap/OverlapDataManage.c
+133 -4
View File
@@ -97,7 +97,7 @@ void SetOverlapRelateProtSwLockSta(const UINT16 overlapId, const UINT8 lockComma
overlapProtectSwitchSum = GetOverlapRelatedProtSwitSum(overlapId); /*获取防护道岔数目*/
overlapProtectSwitchStru = GetOverlapRelatedProtSwitStru(overlapId); /*获取防护道岔数据*/
if (0u == overlapProtectSwitchSum)
if ((0U == overlapProtectSwitchSum) || (NULL == overlapProtectSwitchStru))
{
retVal = CI_ERROR;
}
@@ -842,13 +842,13 @@ UINT8 GetOverlapFromSetRouteCmdFlag(const UINT16 overlapId)
}
/*
* 功能描述： 清保护区段人工或ATS锁闭命令标志
* 功能描述： 清除保护区段个别标志
* 参数说明： const UINT16 routeId, 进路ID
* const UINT16 overlapId, 保护区段ID
* 返回值:无
* by cgh 20240920
* by cgh 20260106
*/
void CleanOverlapAtsOrlaborLockFlag(const UINT16 routeId, const UINT16 overlapId)
void CleanOverlapSpecificFlag(const UINT16 routeId, const UINT16 overlapId)
{
UINT16 overlapRouteSum = 0U; /*保护区段进路数量*/
UINT16* pOverlapRouteBuf = NULL; /*保护区段进路数据*/
@@ -856,6 +856,8 @@ void CleanOverlapAtsOrlaborLockFlag(const UINT16 routeId, const UINT16 overlapId
UINT16 routeLastPhyId = 0U; /*进路最后一个物理区段ID*/
UINT8 routeLastPhyState = 0U; /*进路最后一个物理区段融合占用状态*/
UINT16 ii = 0U; /*游标*/
UINT32 dwUnlockStartCycNum = 0U; /*保护区段解锁起始周期号*/
UINT32 dwAtsLastTimeLockCyc = 0U; /*最近一次ATS锁闭保护区段周期号*/
overlapRouteSum = GetOverlapRouteIdSum(overlapId); /*获取保护区段进路数量*/
pOverlapRouteBuf = GetOverlapRouteIdBuf(overlapId); /*获取保护区段进路数据*/
@@ -876,6 +878,29 @@ void CleanOverlapAtsOrlaborLockFlag(const UINT16 routeId, const UINT16 overlapId
{
SetOverlapAtsOrlaborLockCmdFlag(overlapId, LOCK_OVERLAP_CMD_NO);
}
dwUnlockStartCycNum = GetOverlapUnlockStartCycNum(overlapId);
dwAtsLastTimeLockCyc = GetOverlapAtsLastTimeLockCyc(overlapId);
if (0U == dwUnlockStartCycNum)
{
/*说明是人工解锁，人工解锁就不保留之前的命令了*/
SetRouteAtsExpLkOverlapId(routeId, 0U);
SetOverlapFromSetRouteCmdFlag(overlapId, OVERLAP_ROUTE_FLAG_NO);/*清除保护区段建立命令由进路命令连带下发标志*/
}
else
{
if ((dwAtsLastTimeLockCyc < dwUnlockStartCycNum) && (0U < dwAtsLastTimeLockCyc))
{
/*ATS最后一次下发锁闭保护区段命令时保护区段未自动解锁*/
SetRouteAtsExpLkOverlapId(routeId, 0U);
SetOverlapFromSetRouteCmdFlag(overlapId, OVERLAP_ROUTE_FLAG_NO);/*清除保护区段建立命令由进路命令连带下发标志*/
}
else
{
;
}
}
}
/*
@@ -1152,3 +1177,107 @@ void SetOverlapBelPhyStopSteadyFlag(const UINT16 wOverlapId, const UINT8 chSetFl
/*不处理*/
}
}
/* 功能描述：清除期望保护区段关联所有进路的所有保护区段人工锁闭过标志
* 参数说明： const UINT16 expLkOverlapId, ATS或现地发送的期望锁闭区段ID
* 返回值 ： 无
* by cgh 20260106
*/
void ClearPreLoaborUnlockState(const UINT16 expLkOverlapId)
{
UINT8 overlapSum = 0U;
UINT16* overlapIdBuf = NULL;
UINT16 ii = 0U;
UINT8 jj = 0U;
UINT8 localCiId = 0U; /*本联锁集中区ID*/
UINT8 OverlapBelongCiId = 0U;
UINT16 overlapRouteSum = 0U;/*保护区段关联进路数量*/
UINT16* overlapRouteBuf = NULL;/*保护区段关联进路数据*/
overlapRouteSum = GetOverlapRouteIdSum(expLkOverlapId);/*获取保护区段关联进路总数*/
overlapRouteBuf = GetOverlapRouteIdBuf(expLkOverlapId);/*获取进路数据*/
localCiId = GetSystemParaLocalCiId(); /*获取本机联锁ID*/
if ((0U != overlapRouteSum) && (NULL != overlapRouteBuf))
{
for (ii = 0U; ii < overlapRouteSum; ii++)
{
overlapSum = GetRouteOverlapSum(overlapRouteBuf[ii]); /*获取Overlap总数*/
overlapIdBuf = GetRouteOverlapIdBuf(overlapRouteBuf[ii]); /*获取Overlap ID BUF*/
if ((0U == overlapSum) || (NULL == overlapIdBuf))
{
;/*数据异常*/
}
else
{
for (jj = 0U; jj < overlapSum; jj++)
{
OverlapBelongCiId = GetOverlapBelongCiId(overlapIdBuf[jj]);
if (OverlapBelongCiId == localCiId)
{
SetOverlapPreLoaborUnlockState(overlapIdBuf[jj], PRO_PRE_LABOR_UNLOCK_STATE_NO);
}
else
{
; /*相邻联锁的不处理*/
}
}
}
}
}
else
{
; /*不处理*/
}
}
/*
* 功能描述： 获取指定ID保护区段最近一次ATS锁闭保护区段周期号
* 参数说明： const UINT16 overlapId, 保护区段ID
* 返回值 ： 最近一次ATS锁闭保护区段周期号
* BY CGH 20260106
*/
UINT32 GetOverlapAtsLastTimeLockCyc(const UINT16 overlapId)
{
UINT16 bufIndex = 0U; /*数组下标*/
UINT32 reVal = CI_ERROR;
bufIndex = GetOverlapConfigBufIndex(overlapId); /*获取数组下标*/
if (bufIndex < OVERLAP_SUM_MAX)
{
reVal = OverlapDataStru[bufIndex].dwAtsLastTimeLockCyc;
}
else
{
;
}
return reVal;
}
/*
* 功能描述： 设置指定ID保护区段最近一次ATS锁闭保护区段周期号
* 参数说明： const UINT16 overlapId, 保护区段ID
* const UINT32 dwAtsLastTimeLockCyc, 最近一次ATS锁闭保护区段周期号
* 返回值 void
* by cgh 20250928
*/
void SetOverlapAtsLastTimeLockCyc(const UINT16 overlapId, const UINT32 dwAtsLastTimeLockCyc)
{
UINT16 bufIndex = 0U; /*数组下标*/
bufIndex = GetOverlapConfigBufIndex(overlapId); /*获取数组下标*/
if (bufIndex < OVERLAP_SUM_MAX)
{
OverlapDataStru[bufIndex].dwAtsLastTimeLockCyc = dwAtsLastTimeLockCyc; /*设置解锁起始周期号*/
}
else
{
;
}
}
TSCP/src/APP/ciapp/Overlap/OverlapDataManage.h
+29 -4
View File
@@ -46,6 +46,7 @@ typedef struct S_OverlapDataStruct
UINT8 cProSwitchCheckResultFlag; /*跨控区防护道岔检查结果标志（0xFF：默认值，0x55：失败，0xAA：成功）*/
UINT8 cProSwitchCheckStartFlag; /*跨控区防护道岔检查开始标志（0x55：检查开始，0xAA：检查停止）*/
UINT8 chPreLaborUnlockState; /*之前人工解锁状态*/
UINT32 dwAtsLastTimeLockCyc; /*最近一次ATS锁闭保护区段周期号*/
} OverlapDataStruct;
/*保护区段数据结构体*/
@@ -89,7 +90,7 @@ OverlapDataStructCC* GetOverlapDataCC(void);
UINT16 GetOverlapBelongRouteId(const UINT16 overlapId);
/*
* 功能描述： 设置指定ID保护区段组解锁起始周期号
* 功能描述： 设置指定ID保护区段所属进路
* 参数说明： const UINT16 overlapId, 保护区段ID
* const UINT16 belongRouteId, 所属进路号
* 返回值 ： 无
@@ -335,13 +336,13 @@ void SetOverlapFromSetRouteCmdFlag(const UINT16 overlapId, const UINT8 setFlag);
UINT8 GetOverlapFromSetRouteCmdFlag(const UINT16 overlapId);
/*
* 功能描述： 清保护区段人工或ATS锁闭命令标志
* 功能描述： 清除保护区段个别标志
* 参数说明： const UINT16 routeId, 进路ID
* const UINT16 overlapId, 保护区段ID
* 返回值:无
* by cgh 20240920
* by cgh 20260106
*/
void CleanOverlapAtsOrlaborLockFlag(const UINT16 routeId, const UINT16 overlapId);
void CleanOverlapSpecificFlag(const UINT16 routeId, const UINT16 overlapId);
/*
* 功能描述：设置保护区段防护道岔检查结果标志
@@ -415,6 +416,30 @@ UINT8 OverlapLockRouteCheck(const UINT16 wOverlapId);
*/
void SetOverlapBelPhyStopSteadyFlag(const UINT16 wOverlapId, const UINT8 chSetFlag);
/* 功能描述：清除期望保护区段关联所有进路的所有保护区段人工锁闭过标志
* 参数说明： const UINT16 expLkOverlapId, ATS或现地发送的期望锁闭区段ID
* 返回值 ： 无
* by cgh 20260106
*/
void ClearPreLoaborUnlockState(const UINT16 expLkOverlapId);
/*
* 功能描述： 获取指定ID保护区段最近一次ATS锁闭保护区段周期号
* 参数说明： const UINT16 overlapId, 保护区段ID
* 返回值 ： 最近一次ATS锁闭保护区段周期号
* BY CGH 20260106
*/
UINT32 GetOverlapAtsLastTimeLockCyc(const UINT16 overlapId);
/*
* 功能描述： 设置指定ID保护区段最近一次ATS锁闭保护区段周期号
* 参数说明： const UINT16 overlapId, 保护区段ID
* const UINT32 dwAtsLastTimeLockCyc, 最近一次ATS锁闭保护区段周期号
* 返回值 void
* by cgh 20250928
*/
void SetOverlapAtsLastTimeLockCyc(const UINT16 overlapId, const UINT32 dwAtsLastTimeLockCyc);
#ifdef __cplusplus
}
#endif
TSCP/src/APP/ciapp/PSD/PSDConfigDataManage.c
+24
View File
@@ -1159,3 +1159,27 @@ UINT8 GetPsdIncloudeEsbNum(const UINT16 psdId)
}
return retVal;
}
/*
* 功能描述： 获取指定ID屏蔽门IBP盘发车按钮继电器ID
* 参数说明： const UINT16 doorId, 屏蔽门ID
* 返回值 ： 0: 获取数据失败
* >0: IBP盘发车按钮继电器ID
*/
UINT16 GetIbpConfmRelayId(const UINT16 doorId)
{
UINT16 bufIndex = 0u; /*数组下标*/
UINT16 retVal = CI_ERROR;
bufIndex = GetPsdConfigBufIndex(doorId); /*获取屏蔽门数组下标*/
if (bufIndex < PSD_SUM_MAX)
{
retVal = PsdConfigDataStru[bufIndex].wIbpRelayId;
}
else
{
retVal = CI_ERROR;
}
return retVal;
}
TSCP/src/APP/ciapp/PSD/PSDConfigDataManage.h
+10
View File
@@ -72,6 +72,7 @@ typedef struct S_PsdConfigDataStruct
UINT8 chPsdControlType; /*屏蔽门控制类型*/
UINT16 IncloudeEsbIdBuf[PSD_INCLUDE_ESB_NUM]; /*屏蔽门包含ESB ID*/
UINT8 IncloudeEsbNum; /*包含ESB数量*/
UINT16 wIbpRelayId; /*IBP盘发车按钮继电器ID*/
} PsdConfigDataStruct;
@@ -451,6 +452,15 @@ UINT8 GetPsdIncloudeEsbNum(const UINT16 psdId);
* 返回值 ：ESB ID数组
*/
UINT16* GetPsdIncloudeEsbIdBuf(const UINT16 psdId);
/*
* 功能描述： 获取指定ID屏蔽门IBP盘发车按钮继电器ID
* 参数说明： const UINT16 doorId, 屏蔽门ID
* 返回值 ： 0: 获取数据失败
* >0: IBP盘发车按钮继电器ID
*/
UINT16 GetIbpConfmRelayId(const UINT16 doorId);
#ifdef __cplusplus
}
#endif
TSCP/src/APP/ciapp/PSD/PSDDataManage.c
+311 -11
View File
@@ -952,6 +952,54 @@ UINT8 GetStopDetectionState(const UINT16 doorId)
}
return retVal;
}
/*
* 功能描述：设置指定PSD停止探测周期号
* 参数说明： const UINT16 doorId, 屏蔽门ID
* const UINT32 startCycNum, 起始周期号
* 返回值 ： 无
*
*/
void SetStopDetectionCycNum(const UINT16 doorId, const UINT32 startCycNum)
{
UINT16 bufIndex = 0u; /*数组下标*/
bufIndex = GetPsdConfigBufIndex(doorId); /*获取屏蔽门数组下标*/
if (bufIndex < PSD_SUM_MAX)
{
PsdDataStru[bufIndex].StopDetectionCycNum = startCycNum;
}
else
{
/*不做处理*/
}
}
/*
* 功能描述： 获取停止探测起始周期号
* 参数说明： const UINT16 doorId, 进路ID
* 返回值 ： 0: 获取数据失败
* >0: 起始周期号
*/
UINT32 GetStopDetectionCycNum(const UINT16 doorId)
{
UINT16 bufIndex = 0u; /*数组下标*/
UINT32 retVal = CI_ERROR;
bufIndex = GetPsdConfigBufIndex(doorId); /*获取屏蔽门数组下标*/
if (bufIndex < PSD_SUM_MAX)
{
retVal = PsdDataStru[bufIndex].StopDetectionCycNum;
}
else
{
retVal = CI_ERROR;
}
return retVal;
}
#if 0
/*
* 功能描述： 设置因VOBC关PSD而需要被重开的进路
@@ -1517,7 +1565,6 @@ UINT8 GetPsdPlFlag(const UINT16 doorId)
void SetNearCiPscPlFlag(const UINT16 psdId,const UINT16 pscId,const UINT8 setFlag)
{
/*变量初始化*/
UINT8 i = 0u;
UINT8 transmitState = 0u;
UINT8 localCiId = 0u;
UINT8 psdCiId = 0u;
@@ -2527,21 +2574,21 @@ UINT16 GePsdVideoQkRelateVobcId(const UINT16 wPsdId)
}
/*
* 功能描述：设置指定ID屏蔽门异常打开状态
* 功能描述：设置指定ID屏蔽门异常状态
* 参数说明：const UINT16 wPsdId 屏蔽门ID
* const UINT8 cExceptOpenState 屏蔽门异常打开状态
* const UINT8 cExceptOpenState 屏蔽门异常状态
* 返 回 值：无
* Created By LQ 2025.05.22
*/
void SetPsdExceptOpenState(const UINT16 wPsdId, const UINT8 cExceptOpenState)
void SetPsdExceptState(const UINT16 wPsdId, const UINT8 cExceptOpenState)
{
UINT16 bufIndex = 0U;
bufIndex = GetPsdConfigBufIndex(wPsdId); /*获取屏蔽门数组下标*/
if ((PSD_SUM_MAX > bufIndex) && ((PSD_EXCEPT_OPEN_YES == cExceptOpenState) || (PSD_EXCEPT_OPEN_NO == cExceptOpenState)))
if ((PSD_SUM_MAX > bufIndex) && ((PSD_EXCEPT_YES == cExceptOpenState) || (PSD_EXCEPT_NO == cExceptOpenState)))
{
PsdDataStru[bufIndex].cPsdExceptOpenState = cExceptOpenState; /*设置屏蔽门异常打开状态*/
PsdDataStru[bufIndex].cPsdExceptOpenState = cExceptOpenState; /*设置屏蔽门异常状态*/
}
else
{
@@ -2550,16 +2597,16 @@ void SetPsdExceptOpenState(const UINT16 wPsdId, const UINT8 cExceptOpenState)
}
/*
* 功能描述：获取指定ID屏蔽门异常打开状态
* 功能描述：获取指定ID屏蔽门异常状态
* 参数说明：const UINT16 wPsdId 屏蔽门ID
* 返 回 值：0x55 异常打开
* 0xAA 未异常打开
* 返 回 值：0x55 异常（曾异常打开未解除）
* 0xAA 未异常
* Created By LQ 2025.05.22
*/
UINT8 GePsdExceptOpenState(const UINT16 wPsdId)
UINT8 GePsdExceptState(const UINT16 wPsdId)
{
UINT16 bufIndex = 0U;
UINT8 cRetVal = PSD_EXCEPT_OPEN_YES;
UINT8 cRetVal = PSD_EXCEPT_YES;
bufIndex = GetPsdConfigBufIndex(wPsdId); /*获取屏蔽门数组下标*/
@@ -3117,3 +3164,256 @@ void SetPsdEditGroupInfoData(const UINT16 doorId, const UINT16 wPsdEditGroupInfo
/*不处理*/
}
}
/*
* 功能描述：获取指定ID屏蔽门间隙探测互锁解除故障状态
* 参数说明：const UINT16 doorId, 屏蔽门ID
* 返 回 值： 0 返回失败
* 0< 间隙探测互锁解除故障状态
*/
UINT8 GetPsdJXTCMutualLockFaultState(const UINT16 doorId)
{
UINT16 bufIndex = 0U; /*数组下标*/
UINT8 retVal = CI_ERROR;
bufIndex = GetPsdConfigBufIndex(doorId); /*获取屏蔽门数组下标*/
if (PSD_SUM_MAX > bufIndex)
{
retVal = PsdDataStru[bufIndex].JXTCMutualLockFaultState;
}
else
{
retVal = CI_ERROR;
}
return retVal;
}
/*
* 功能描述：设置指定ID屏蔽门间隙探测互锁解除故障状态
* 参数说明：const UINT16 doorId, 屏蔽门ID
* const UINT8 wJXTCMutualLockFaultState 间隙探测互锁解除故障状态
* 返 回 值：无
*/
void SetPsdJXTCMutualLockFaultState(const UINT16 doorId, const UINT8 wJXTCMutualLockFaultState)
{
UINT16 bufIndex = 0U; /*数组下标*/
bufIndex = GetPsdConfigBufIndex(doorId); /*获取屏蔽门数组下标*/
if (PSD_SUM_MAX > bufIndex)
{
if ((JXTC_MUTUALLOCKFAULT_YES == wJXTCMutualLockFaultState)
|| (JXTC_MUTUALLOCKFAULT_NO == wJXTCMutualLockFaultState))
{
PsdDataStru[bufIndex].JXTCMutualLockFaultState = wJXTCMutualLockFaultState; /*间隙探测互锁解除故障状态*/
}
else
{
/*不处理*/
}
}
else
{
/*不处理*/
}
}
/*
* 功能描述：获取指定ID屏蔽门间隙探测互锁解除时间
* 参数说明：const UINT16 doorId, 屏蔽门ID
* 返 回 值： 0 返回失败
* 0< 屏蔽门间隙探测互锁解除时间
*/
UINT32 GetPsdJXTCMutualLockStartCycNum(const UINT16 doorId)
{
UINT16 bufIndex = 0U; /*数组下标*/
UINT32 retVal = CI_ERROR;
bufIndex = GetPsdConfigBufIndex(doorId); /*获取屏蔽门数组下标*/
if (PSD_SUM_MAX > bufIndex)
{
retVal = PsdDataStru[bufIndex].JXTCMutualLockStartCycNum;
}
else
{
retVal = CI_ERROR;
}
return retVal;
}
/*
* 功能描述：设置指定ID屏蔽门间隙探测互锁解除起始时间
* 参数说明：const UINT16 doorId, 屏蔽门ID
* const UINT32 cycnum 互锁解除起始时间
* 返 回 值：无
*/
void SetPsdJXTCMutualLockStartCycNum(const UINT16 doorId, const UINT32 cycnum)
{
UINT16 bufIndex = 0U; /*数组下标*/
bufIndex = GetPsdConfigBufIndex(doorId); /*获取屏蔽门数组下标*/
if (PSD_SUM_MAX > bufIndex)
{
PsdDataStru[bufIndex].JXTCMutualLockStartCycNum = cycnum;
}
else
{
/*不处理*/
}
}
/*
* 功能描述： 设置指定ID屏蔽门IBP盘发车按钮状态
* 参数说明： const UINT16 doorId, 屏蔽门ID
* UINT8 setFlag 需设置的按钮状态
* 返回值 ： CI_ERROR 失败
* CI_SUCCESS 成功
*/
UINT8 SetPsdButtonIbpState(const UINT16 doorId, const UINT8 setFlag)
{
UINT16 bufIndex = 0u; /*数组下标*/
UINT8 retVal = 0u;
bufIndex = GetPsdConfigBufIndex(doorId); /*获取屏蔽门数组下标*/
if (bufIndex < PSD_SUM_MAX)
{
if ((PLATFORM_DEPAR_BUTTON_STATE_VALID == setFlag) || (PLATFORM_DEPAR_BUTTON_STATE_INVALID == setFlag)
||(PLATFORM_DEPAR_BUTTON_STATE_FAULT == setFlag))
{
PsdDataStru[bufIndex].ibpButtonState = setFlag; /*设置按钮状态*/
retVal = CI_SUCCESS;
}
else
{
retVal = CI_ERROR;
}
}
else
{
retVal = CI_ERROR;
}
return retVal;
}
/*
* 功能描述： 获取指定ID屏蔽门IBP盘发车按钮状态
* 参数说明： const UINT16 doorId, 屏蔽门ID
* 返回值 ：0: 获取数据失败
* >0: IBP盘发车按钮状态
*/
UINT8 GetPsdButtonIbpState(const UINT16 doorId)
{
UINT16 bufIndex = 0u; /*数组下标*/
UINT8 retVal = 0u;
bufIndex = GetPsdConfigBufIndex(doorId); /*获取屏蔽门数组下标*/
if (bufIndex < PSD_SUM_MAX)
{
retVal = PsdDataStru[bufIndex].ibpButtonState;
}
else
{
retVal = CI_ERROR;
}
return retVal;
}
/*
* 功能描述：设置指定ID屏蔽门IBP按下起始周期号
* 参数说明： const UINT16 doorId, 屏蔽门ID
* const UINT32 startCycNum, 起始周期号
* 返回值 ： 0: 设置数据失败
* >0: 设置数据成功
*/
UINT8 SetIBPPressCycNum(const UINT16 doorId, const UINT32 startCycNum)
{
UINT16 bufIndex = 0u; /*数组下标*/
UINT8 retVal = CI_ERROR;
bufIndex = GetPsdConfigBufIndex(doorId); /*获取屏蔽门数组下标*/
if (bufIndex < PSD_SUM_MAX)
{
PsdDataStru[bufIndex].IBPPressCycNum = startCycNum;
retVal = CI_SUCCESS;
}
else
{
retVal = CI_ERROR;
}
return retVal;
}
/*
* 功能描述： 获取指定ID屏蔽门IBP按下起始周期号
* 参数说明： const UINT16 doorId，屏蔽门ID
* 返回值 ： 0: 获取数据失败
* >0: 起始周期号
*/
UINT32 GetIBPPressCycNum(const UINT16 doorId)
{
UINT16 bufIndex = 0u; /*数组下标*/
UINT32 retVal = CI_ERROR;
bufIndex = GetPsdConfigBufIndex(doorId); /*获取屏蔽门数组下标*/
if (bufIndex < PSD_SUM_MAX)
{
retVal = PsdDataStru[bufIndex].IBPPressCycNum;
}
else
{
retVal = CI_ERROR;
}
return retVal;
}
/*
* 功能描述： 获取指定ID屏蔽门状态给 VOBC
* 参数说明： const UINT16 doorId，屏蔽门ID
* 返回值 ：屏蔽门状态
*/
UINT8 GetPsdStateToVobc(const UINT16 doorId)
{
UINT8 chPsdState = 0U;
UINT8 chPsdPlState = 0U;
UINT8 chExceptOpenState = 0U;
UINT8 chRet = 0U;
chPsdPlState = GetPsdMutualLockRemoveState(doorId); /*屏蔽门互锁解除*/
if ((PSD_MUTUALLOCK_REMOVE_YES == chPsdPlState) || (PSD_ATS_MUTUALLOCK_REMOVE_YES == chPsdPlState) || (PSD_ATS_AND_JD_MUTUALLOCK_REMOVE_YES == chPsdPlState))
{
/*屏蔽门互锁解除*/
chRet = CI_IVOC_PSD_STATE_PANGLU;
}
else
{
chPsdState = GetPsdState(doorId);
if (PSD_STATE_CLOSE == chPsdState)
{/*屏蔽门关*/
chRet = CI_IVOC_PSD_STATE_CLOSE;
}
else
{
/*屏蔽门开, 判断是否异常*/
chExceptOpenState = GePsdExceptState(doorId);
if (PSD_EXCEPT_NO == chExceptOpenState)
{
chRet = CI_IVOC_PSD_STATE_OPEN;
}
else
{
/*屏蔽门异常打开*/
chRet = CI_IVOC_PSD_STATE_OPEN_EXCEPT;
}
}
}
return chRet;
}
TSCP/src/APP/ciapp/PSD/PSDDataManage.h
+95 -7
View File
@@ -59,6 +59,7 @@ typedef struct S_PsdDataStruct
UINT32 StartDetectionCycNum; /*开启探测周期*/
UINT8 StartDetectionState; /*启动探测状态*/
UINT8 StopDetectionState; /*停止探测状态*/
UINT32 StopDetectionCycNum; /*停止探测周期*/
UINT8 VOBCDoorState; /*VOBC车门状态*/
UINT32 PCBPressCycNum; /*PCB按下起始周期*/
UINT32 POBPressCycNum; /*POB按下起始周期*/
@@ -92,6 +93,11 @@ typedef struct S_PsdDataStruct
UINT8 psdCloseErrState; /*关门故障状态*/
UINT8 cPsdExceptOpenState; /*屏蔽门异常打开状态：0x55-异常打开，0xAA-未异常打开*/
UINT32 dwPsdRelayDownCycNum; /*PSD门关继电器落下起始周期*/
UINT8 JXTCMutualLockFaultState; /*间隙探测互锁解除按钮故障状态 (动态字段)*/
UINT32 JXTCMutualLockStartCycNum; /*间隙探测互锁解除起始时间*/
UINT8 ibpButtonState; /*IBP盘发车按钮状态(动态字段)*/
UINT32 IBPPressCycNum; /*IBP按下起始周期*/
} PsdDataStruct;
/*屏蔽门数据结构体*/
@@ -406,6 +412,23 @@ void SetStopDetectionState(const UINT16 doorId, const UINT32 detectionState);
*/
UINT8 GetStopDetectionState(const UINT16 doorId);
/*
* 功能描述：设置指定PSD停止探测周期号
* 参数说明： const UINT16 doorId, 屏蔽门ID
* const UINT32 startCycNum, 起始周期号
* 返回值 ： 无
*
*/
void SetStopDetectionCycNum(const UINT16 doorId, const UINT32 startCycNum);
/*
* 功能描述： 获取停止探测起始周期号
* 参数说明： const UINT16 doorId, 进路ID
* 返回值 ： 0: 获取数据失败
* >0: 起始周期号
*/
UINT32 GetStopDetectionCycNum(const UINT16 doorId);
/*
* 功能描述： 获取指定ID屏蔽门开门按钮状态
* 参数说明： const UINT16 doorId, 屏蔽门ID
@@ -902,22 +925,22 @@ void SetPsdVideoQkRelateVobcId(const UINT16 wPsdId, const UINT16 wVobcId);
UINT16 GePsdVideoQkRelateVobcId(const UINT16 wPsdId);
/*
* 功能描述：设置指定ID屏蔽门异常打开状态
* 功能描述：设置指定ID屏蔽门异常状态
* 参数说明：const UINT16 wPsdId 屏蔽门ID
* const UINT8 cExceptOpenState 屏蔽门异常打开状态
* const UINT8 cExceptOpenState 屏蔽门异常状态
* 返 回 值：无
* Created By LQ 2025.05.22
*/
void SetPsdExceptOpenState(const UINT16 wPsdId, const UINT8 cExceptOpenState);
void SetPsdExceptState(const UINT16 wPsdId, const UINT8 cExceptOpenState);
/*
* 功能描述：获取指定ID屏蔽门异常打开状态
* 功能描述：获取指定ID屏蔽门异常状态
* 参数说明：const UINT16 wPsdId 屏蔽门ID
* 返 回 值：0x55 异常打开
* 0xAA 未异常打开
* 返 回 值：0x55 异常（曾异常打开未解除）
* 0xAA 未异常
* Created By LQ 2025.05.22
*/
UINT8 GePsdExceptOpenState(const UINT16 wPsdId);
UINT8 GePsdExceptState(const UINT16 wPsdId);
/*
* 功能描述： 设置指定ID屏蔽门故障隔离信息
@@ -1097,6 +1120,71 @@ UINT16 GetPsdEditGroupInfoData(const UINT16 doorId);
* 返 回 值：无
*/
void SetPsdEditGroupInfoData(const UINT16 doorId, const UINT16 wPsdEditGroupInfo);
/*
* 功能描述：获取指定ID屏蔽门间隙探测互锁解除故障状态
* 参数说明：const UINT16 doorId, 屏蔽门ID
* 返 回 值： 0 返回失败
* 0< 间隙探测互锁解除故障状态
*/
UINT8 GetPsdJXTCMutualLockFaultState(const UINT16 doorId);
/*
* 功能描述：设置指定ID屏蔽门间隙探测互锁解除故障状态
* 参数说明：const UINT16 doorId, 屏蔽门ID
* const UINT8 wJXTCMutualLockFaultState 间隙探测互锁解除故障状态
* 返 回 值：无
*/
void SetPsdJXTCMutualLockFaultState(const UINT16 doorId, const UINT8 wJXTCMutualLockFaultState);
/*
* 功能描述：获取指定ID屏蔽门间隙探测互锁解除时间
* 参数说明：const UINT16 doorId, 屏蔽门ID
* 返 回 值： 0 返回失败
* 0< 屏蔽门间隙探测互锁解除时间
*/
UINT32 GetPsdJXTCMutualLockStartCycNum(const UINT16 doorId);
/*
* 功能描述：设置指定ID屏蔽门间隙探测互锁解除起始时间
* 参数说明：const UINT16 doorId, 屏蔽门ID
* const UINT32 cycnum 互锁解除起始时间
* 返 回 值：无
*/
void SetPsdJXTCMutualLockStartCycNum(const UINT16 doorId, const UINT32 cycnum);
/*
* 功能描述： 设置指定ID屏蔽门IBP盘发车按钮状态
* 参数说明： const UINT16 doorId, 屏蔽门ID
* UINT8 setFlag 需设置的按钮状态
* 返回值 ： PSD_BUTTON_PANGLU_STATE_VALID 0x55 有效
* PSD_BUTTON_PANGLU_STATE_INVALID 0xaa 无效
*/
UINT8 SetPsdButtonIbpState(const UINT16 doorId, const UINT8 setFlag);
/*
* 功能描述： 获取指定ID屏蔽门IBP按下起始周期号
* 参数说明： const UINT16 doorId，屏蔽门ID
* 返回值 ： 0: 获取数据失败
* >0: 起始周期号
*/
UINT32 GetIBPPressCycNum(const UINT16 doorId);
/*
* 功能描述： 获取指定ID屏蔽门IBP盘发车按钮状态
* 参数说明： const UINT16 doorId, 屏蔽门ID
* 返回值 ：0: 获取数据失败
* >0: IBP盘发车按钮状态
*/
UINT8 GetPsdButtonIbpState(const UINT16 doorId);
/*
* 功能描述：设置指定ID屏蔽门IBP按下起始周期号
* 参数说明： const UINT16 doorId, 屏蔽门ID
* const UINT32 startCycNum, 起始周期号
* 返回值 ： 0: 设置数据失败
* >0: 设置数据成功
*/
UINT8 SetIBPPressCycNum(const UINT16 doorId, const UINT32 startCycNum);
/*
* 功能描述： 获取指定ID屏蔽门状态给 VOBC
* 参数说明： const UINT16 doorId，屏蔽门ID
* 返回值 ：屏蔽门状态
*/
UINT8 GetPsdStateToVobc(const UINT16 doorId);
#ifdef __cplusplus
}
#endif
TSCP/src/APP/ciapp/PSD/PSDDefine.h
+20 -3
View File
@@ -135,6 +135,7 @@
#define PLATFORM_DEPAR_BUTTON_STATE_VALID ((UINT8)0x55U) /*有效*/
#define PLATFORM_DEPAR_BUTTON_STATE_INVALID ((UINT8)0xaaU) /*无效*/
#define PLATFORM_DEPAR_BUTTON_NO ((UINT8)0xccU) /*无站台发车按钮*/
#define PLATFORM_DEPAR_BUTTON_STATE_FAULT ((UINT8)0xffU) /*站台发车按钮故障（IBP）*/
/*站台按钮旁路状态*/
#define PSD_BUTTON_PANGLU_STATE_VALID ((UINT8)0x55U) /*有效*/
@@ -197,9 +198,13 @@
#define VIDEO_QK_DRIVE_STATE_TESTING ((UINT8)0xccU) /*视频清客驱动状态—检测中*/
#define VIDEO_QK_DRIVE_STATE_INVALID ((UINT8)0xffU) /*视频清客驱动状态—无效*/
/*ÆÁ±ÎÃÅÒì³£´ò¿ª×´Ì¬*/
#define PSD_EXCEPT_OPEN_NO ((UINT8)0xAAU) /*δÒì³£´ò¿ª*/
#define PSD_EXCEPT_OPEN_YES ((UINT8)0x55U) /*Òì³£´ò¿ª*/
/*屏蔽门异常状态*/
#define PSD_EXCEPT_NO ((UINT8)0xAAU) /*未异常*/
#define PSD_EXCEPT_YES ((UINT8)0x55U) /*异常(曾异常打开未取消)*/
/*屏蔽门异常取消方式*/
#define PSD_EXCEPT_CANCLE_ATS ((UINT8)0xAAU) /*ATS命令取消*/
#define PSD_EXCEPT_CANCLE_RCI ((UINT8)0x55U) /*未异常打开时联锁自动取消异常*/
/*OC-P旁路状态确认*/
#define OC_PSC_PL_CONFIRM_YES ((UINT8)0xaaU) /*OC-P旁路状态已确认*/
@@ -210,5 +215,17 @@
#define LOW_FOUR_CHAR ((UINT8)1U) /*低四字节*/
/*间隙探测互锁解除故障状态*/
#define JXTC_MUTUALLOCKFAULT_YES ((UINT8)0x55U) /*间隙探测互锁解除按钮故障*/
#define JXTC_MUTUALLOCKFAULT_NO ((UINT8)0xaaU) /*间隙探测互锁解除按钮未故障*/
#define JXTC_MUTUALLOCKFAULT_NOCHECK ((UINT8)0xFFU) /*间隙探测互锁解除按钮未检测*/
#define PSD_INCLUDE_ESB_NUM ((UINT8)10U) /*ESB个数*/
/*CI-VOBC屏蔽门状态*/
#define CI_IVOC_PSD_STATE_CLOSE ((UINT8)0xAAU) /*CI到IVOC屏蔽门关闭*/
#define CI_IVOC_PSD_STATE_OPEN ((UINT8)0x55U) /*CI到IVOC屏蔽门打开*/
#define CI_IVOC_PSD_STATE_PANGLU ((UINT8)0xCCU) /*CI到IVOC屏蔽门互锁解除*/
#define CI_IVOC_PSD_STATE_OPEN_EXCEPT ((UINT8)0x33U) /*CI到IVOC屏蔽门异常打开*/
#endif
TSCP/src/APP/ciapp/ParsePack/CiInterfaceDefine.h
+14 -9
View File
@@ -107,7 +107,7 @@
#define ATS_CMD_SECTION_FENGSUO_CANCEL ((UINT8)0x61) /*区段解封*/
#define ATS_CMD_PHYSEC_PRE_RESET_ONE ((UINT8)0x62) /*计轴预复位一次*/
#define ATS_CMD_PHYSEC_PRE_RESET_TWO ((UINT8)0x63) /*计轴预复位二次*/
#define ATS_CMD_CANCEL_XICHE ((UINT8)0x64) /*现地取消洗车命令*/
#define ATS_CMD_CANCEL_XICHE ((UINT8)0x64) /*取消降级模式洗车命令*/
#define ATS_CMD_PHYSEC_GENERAL_RESET_SET ((UINT8)0x65) /*计轴总复位命令*/
#define ATS_CMD_PHYSEC_GENERAL_RESET_CANCEL ((UINT8)0x66) /*取消计轴总复位命令*/
#define ATS_CMD_CICI_NET_TO_RELAY_ONE ((UINT8)0x68) /*联锁与联锁网络接口转继电接口一次命令*/
@@ -118,7 +118,6 @@
#define ATS_CMD_QUXIAO_PSC_PL_TWO ((UINT8)0x73) /*取消PSC旁路二次命令*/
#define ATS_CMD_ROUTE_GROUP_AUTO_SET ((UINT8)0x74) /*办理组合自动进路命令*/
#define ATS_CMD_ROUTE_GROUP_AUTO_CANCLE ((UINT8)0x75) /*取消组合自动进路命令*/
#define ATS_CMD_SIGNALMAINTAINSTATE_ONE ((UINT8)0x76) /*信号机维修点灯一次*/
#define ATS_CMD_SIGNALMAINTAINSTATE_TWO ((UINT8)0x77) /*信号机维修点灯二次*/
#define ATS_CMD_CANCEL_SIG_MAINTAIN_ONE ((UINT8)0x78) /*取消信号机维修点灯一次*/
@@ -127,11 +126,9 @@
#define ATS_CMD_CANCEL_SW_ALARM_TWO ((UINT8)0x7b) /*取消转辙机封连报警二次命令*/
#define ATS_CMD_RECOVER_SW_ALARM_ONE ((UINT8)0x7c) /*恢复转辙机封连报警一次命令*/
#define ATS_CMD_RECOVER_SW_ALARM_TWO ((UINT8)0x7d) /*恢复转辙机封连报警二次命令*/
#define LABOR_CMD_CANCEL_OVERLAP_ONE ((UINT8)0x7e) /* 人工取消保护区段一次命令 */
#define LABOR_CMD_CANCEL_OVERLAP_TWO ((UINT8)0x7f) /* 人工取消保护区段二次命令 */
#define LABOR_CMD_SET_UP_OVERLAP ((UINT8)0x80) /* 人工建立保护区段命令,合代码暂时改成80 */
#define ATS_CMD_ROUTE_APPLY ((UINT8)0x92) /*申请路径*/
#define ATS_CMD_ROUTE_APPLY_CANCLE ((UINT8)0x93) /*取消申请路径*/
#define ATS_CMD_ROUTE_PART_APPLY ((UINT8)0x94) /*申请部分路径*/
@@ -143,22 +140,18 @@
#define ATS_CMD_OPEN_XIANSU_SIGNAL_FIRST ((UINT8)0x9d) /*开放限速信号一次*/
#define ATS_CMD_OPEN_XIANSU_SIGNAL_SECOND ((UINT8)0x9e) /*开放限速信号二次*/
#define ATS_CMD_OPEN_XIANSU_SIGNAL_SPECIAL ((UINT8)0xa6) /*限速信号特殊开放*/
#define ATS_CMD_OC_P_PL_ONE ((UINT8)0xa8) /*设置OC-P旁路一次命令*/
#define ATS_CMD_OC_P_PL_TWO ((UINT8)0xa9) /*设置OC-P旁路二次命令*/
#define ATS_CMD_QUXIAO_OC_P_PL_ONE ((UINT8)0xaa) /*取消OC-P旁路一次命令*/
#define ATS_CMD_QUXIAO_OC_P_PL_TWO ((UINT8)0xab) /*取消OC-P旁路二次命令*/
#define ATS_CMD_GET_CTRL_POWER ((UINT8)0x81) /* 获取联锁控制权*/
#define ATS_CMD_RELEASE_CTRL_POWER ((UINT8)0x82) /* 释放联锁控制权*/
#define ATS_CMD_ROUTE_AUTO_TRIGGER_SET (UINT8)0x83 /*单个进路自动触发进路办理 */
#define ATS_CMD_ROUTE_CANCLE_AUTO_TRIGGER (UINT8)0x84 /*单个进路取消自动触发进路 */
#define ATS_CMD_SWITCH_DINGWEI_TEST_ONE ((UINT8)0x85) /* 道岔定位测试一次命令*/
#define ATS_CMD_SWITCH_DINGWEI_TEST_TWO ((UINT8)0x86) /* 道岔定位测试二次命令*/
#define ATS_CMD_SWITCH_FANWEI_TEST_ONE ((UINT8)0x87) /* 道岔反位测试一次命令*/
#define ATS_CMD_SWITCH_FANWEI_TEST_TWO ((UINT8)0x88) /*道岔反位测试二次命令*/
#define SCX_ATS_CMD_ESS_GO_POSITION (UINT8)0x89 /*ESS去位命令*/
#define SCX_ATS_CMD_ESS_STOP_POSITION (UINT8)0x90 /*ESS停位命令*/
#define ATS_CMD_STATION_QK_SET (UINT8)0x91 /*站台清客标志设置 */
@@ -167,6 +160,10 @@
#define ATS_CMD_EMERG_XS_CANCEL_ONE (UINT8)0xAE /*取消紧急临时限速一次命令 */
#define ATS_CMD_EMERG_XS_CANCEL_TWO (UINT8)0xAF /*取消紧急临时限速二次命令 */
#define ATS_CMD_COUPLING_ROUTE_SET (UINT8)0xB0 /*联挂进路办理 */
#define ATS_CMD_APPLY_XICHE ((UINT8)0xB1) /*降级模式洗车请求*/
#define ATS_CMD_APPLY_PASSXICHE ((UINT8)0xB2) /*现地请求反向洗车命令-降级模式*/
#define ATS_CMD_CANCEL_PASSXICHE ((UINT8)0xB3) /*现地取消反向洗车命令-降级模式*/
#define ATS_CMD_CANCEL_PSD_EXCEPT ((UINT8)0xBA) /*现地取消站台门异常状态*/
/****联锁到其他联锁的命令宏定义****/
#define CI_CMD_PHYSEC_USING_APPLY ((UINT16)0x0001) /*物理区段征用申请*/
@@ -239,7 +236,7 @@
#define CI_BACK_ROUTE_LOCK_NOTALL ((UINT8)0x06) /*进路不完整锁闭?新增?*/
#define CI_BACK_ROUTE_LEVEL_CBTC ((UINT8)0x08) /*进路监督级别不为点式?未使用?*/
#define CI_BACK_ROUTE_LEVEL_BLOC ((UINT8)0x00) /*进路监督级别不为CBTC?未使用?*/
#define CI_BACK_ROUTE_LEVEL_BLOC ((UINT8)0xBA) /*进路监督级别不为CBTC*/
#define CI_BACK_ROUTE_TYPE_ERROR ((UINT8)0x00) /*进路类型异常?未使用?*/
#define CI_BACK_ROUTE_STATE_ERROR ((UINT8)0x59) /*进路建立条件不满足*/
#define CI_BACK_RETURN_ROUTE_STATE_ERROR ((UINT8)0x5A) /*折返进路不允许追踪办理*/
@@ -341,6 +338,14 @@
#define CI_BACK_OTHER_ROUTE_NOT_OPEN ((UINT8)0x9D) /*进路其他联锁条件需开放进路未开放*/
#define CI_BACK_WASH_PASS_ALLOW_NOT ((UINT8)0x9E) /*洗车库/线未同意通过*/
#define CI_BACK_WASH_APPLY_NOT ((UINT8)0xB3) /*洗车机洗车请求有效，请勿重复操作*/
#define CI_BACK_WASH_PASSAPPLY_NOT ((UINT8)0xB4) /*洗车机反向通过请求有效，请勿重复操作*/
#define CI_BACK_ROUTE_IDLE_NOT ((UINT8)0xB5) /*进路未空闲，请先取消进路*/
#define CI_BACK_WASH_BUTTON_PRESS_NOT ((UINT8)0xB6) /*洗车同意按钮未按下，不需要取消*/
#define CI_BACK_WASH_PASSBUTTON_PRESS_NOT ((UINT8)0xB7) /*洗车反向通过同意按钮未按下，不需要取消*/
#define CI_BACK_WASH_APPLY_BUTTON_NOT ((UINT8)0xB8) /*洗车机XXX洗车同意按钮在规定时间内未按下，洗车请求失效*/
#define CI_BACK_WASH_PASS_BUTTON_NOT ((UINT8)0xB9) /*洗车机XXX反向同意按钮在规定时间内未按下，反向通过请求失效*/
/* 设置与取消物理区段故障列车占用反馈 */
#define CI_BACK_SPE_TRAIN_DIR_ERR ((UINT8)0x86) /*设置物理区段故障车占用：与已存在的故障车方向不一致*/
#define CI_BACK_SPE_LOOK_DIR_ERR ((UINT8)0x87) /*设置物理区段故障车占用：与物理区段锁闭方向不一致*/
TSCP/src/APP/ciapp/ParsePack/ParsePackAtsData.c
+255 -49
View File
@@ -1318,7 +1318,7 @@ void AddCiSendBackDataCIid(void)
UINT8 virCINum = 0u;
UINT8 boardBelongOcId = 0U;
UINT16 phySecPlockBelongRouteId = 0U; /*物理区段防护锁闭所属进路ID*/
UINT8 includeVirFlag = GetCiFunctionSwitchConfig(FUNC_INCLUDEVIRCI_FLAG); /*获取是否支持虚拟联锁功能开关*/
for (ii = 0u; ii < CiSendCmdStruCurSum; ii ++)
{
@@ -1326,8 +1326,7 @@ void AddCiSendBackDataCIid(void)
cmdDeviceId = (UINT16)(CiSendCmdDataStru[ii].CommandParam >> 16u);
cmdDevType = (UINT8)(CiSendCmdDataStru[ii].CommandParam >> 8u);
backType = CiSendCmdDataStru[ii].CommandType;
if (FUNC_SWITCH_ON == includeVirFlag)
{
if ((CI_BACK_ORDER_REPEAT != backType) && (CI_BACK_FIRSTORDER_OUTTIME != backType)
&& (CI_BACK_COUNT_OVERLAP_UNLOCK != backType) && (CI_BACK_COUNT_OVERLAP_UNLOCK_HIGH != backType))
/*0x70，0x7d类型不处理,两种反馈VirCIid前面已经赋值过，在此处不再赋值。0x55,0x5d此分支不赋值，避免保护区段在相邻虚拟联锁时，在本虚拟联锁现地上不显示倒计时*/
@@ -1376,14 +1375,6 @@ void AddCiSendBackDataCIid(void)
case CI_DEVICE_TYPE_GROUP_AUTO_ROUTE:
belongVirCIid = GetGroupAutoRouteBelongVirCIid(cmdDeviceId);/*计算组合自动进路所属虚拟联锁*/
break;
/*此命令专用于试车线*/
case CI_DEVICE_TYPE_CMD:
virCINum = GetVirtualCINum();
if (1u <= virCINum)
{
belongVirCIid = GetVirtualCIid(0u);/*由于试车线一个联锁，仅存在一个虚拟联锁，故直接取读取到的第一个虚拟联锁ID*/
}
break;
case CI_DEVICE_TYPE_ESB:
belongVirCIid = GetEsbBelongVirCiId(cmdDeviceId);
break;
@@ -1400,6 +1391,15 @@ void AddCiSendBackDataCIid(void)
case CI_DEVICE_TYPE_WASH_ALLOW_PASS:/*洗车反向通过*/
belongVirCIid = GetWashMachineBelongVirCiId(cmdDeviceId);/*洗车机所属虚拟联锁*/
break;
case CI_DEVICE_TYPE_AUTORETURN:/*自动折返*/
belongVirCIid = GetAutoReturnRouteBelongVirCiId(cmdDeviceId);/*自动折返所属虚拟联锁*/
break;
case CI_DEVICE_TYPE_AUTOROUTE:/*自动通过*/
belongVirCIid = GetAutoRouteBelongVirCiId(cmdDeviceId);/*自动通过所属虚拟联锁*/
break;
case CI_DEVICE_TYPE_ALLAUTORETURN:/*全自动折返*/
belongVirCIid = GetAllAutoRetRoutBelongVirCiId(cmdDeviceId);/*全自动折返所属虚拟联锁*/
break;
default:
belongVirCIid = 0u;
break;
@@ -1417,12 +1417,7 @@ void AddCiSendBackDataCIid(void)
{
; /*不做处理*/
}
}
else
{
/*不具备虚拟联锁，给ATS组包本地联锁ID*/
belongVirCIid = GetSystemParaLocalCiId();
}
if (0U == CiSendCmdDataStru[ii].VirCIid)
{
@@ -2481,6 +2476,222 @@ void PackCiDataToAts(UINT8* ciToXianDiDataBuffer, UINT16* ii)
}
}
/*
* 功能描述：向ATS组相邻RC/CI的通信状态（双系统使用）
* 参数说明：UINT8* ciToXianDiDataBuffer 存放信息的buffer（出参）
* UINT16* ii 偏移量（出参）
* 返 回 值：无
* Created By LQ 2026.01.05
*/
void PackNearRciCommStateToAts(UINT8* ciToXianDiDataBuffer, UINT16* ii)
{
UINT16 index = 0U;
UINT8 cTransRciSum = 0U; /*通信设备数量*/
UINT8* pTransRciId = NULL; /*通信设备ID数组*/
UINT8 jj = 0U;
UINT8 cNearRciCommState = 0U; /*相邻RC/CI通信状态*/
UINT8 cCommState = 0U; /*向ATS汇报的通信状态*/
if ((NULL != ciToXianDiDataBuffer) && (NULL != ii))
{
index = *ii;
cTransRciSum = GetCiTransmitSpecifySysDevSum(CI_SYSTEM_TYPE_CI);
pTransRciId = GetCiTransmitSpecifySysDevBuf(CI_SYSTEM_TYPE_CI);
ciToXianDiDataBuffer[index] = cTransRciSum; /*具有通信关系的CI数量*/
index++;
if (NULL != pTransRciId)
{
for (jj = 0U; jj < cTransRciSum; jj++)
{
cNearRciCommState = Get2oo2CiAndOtherSysCommState(CI_SYSTEM_TYPE_CI, jj); /*获取与相邻CI通信状态*/
ciToXianDiDataBuffer[index] = CI_SYSTEM_TYPE_CI;
index++;
ciToXianDiDataBuffer[index] = pTransRciId[jj]; /*组CI ID*/
index++;
if (TRANSMIT_2OO2_STATE_GOOD == cNearRciCommState)
{
/*双网通信良好*/
cCommState = TRANSMIT_CI_STATE_GOOD;
}
else if (TRANSMIT_2OO2_STATE_LINK == cNearRciCommState)
{
/*单网通信故障*/
cCommState = TRANSMIT_CI_STATE_LINK;
}
else if (TRANSMIT_2OO2_STATE_BAD == cNearRciCommState)
{
/*双网通信故障*/
cCommState = TRANSMIT_CI_STATE_BAD;
}
else
{
/*异常分支，双网通信故障*/
cCommState = TRANSMIT_CI_STATE_BAD;
}
ciToXianDiDataBuffer[index] = cCommState; /*组相邻CI通信状态*/
index++;
}
}
else
{
/*不处理*/
}
cTransRciSum = GetCiTransmitSpecifySysDevSum(CI_SYSTEM_TYPE_RC);
pTransRciId = GetCiTransmitSpecifySysDevBuf(CI_SYSTEM_TYPE_RC);
ciToXianDiDataBuffer[index] = cTransRciSum; /*具有通信关系的RC数量*/
index++;
if (NULL != pTransRciId)
{
for (jj = 0U; jj < cTransRciSum; jj++)
{
cNearRciCommState = Get2oo2CiAndOtherSysCommState(CI_SYSTEM_TYPE_RC, jj); /*获取与相邻RC通信状态*/
ciToXianDiDataBuffer[index] = CI_SYSTEM_TYPE_RC;
index++;
ciToXianDiDataBuffer[index] = pTransRciId[jj]; /*组RC ID*/
index++;
if (TRANSMIT_2OO2_STATE_GOOD == cNearRciCommState)
{
/*双网通信良好*/
cCommState = TRANSMIT_CI_STATE_GOOD;
}
else if (TRANSMIT_2OO2_STATE_LINK == cNearRciCommState)
{
/*单网通信故障*/
cCommState = TRANSMIT_CI_STATE_LINK;
}
else if (TRANSMIT_2OO2_STATE_BAD == cNearRciCommState)
{
/*双网通信故障*/
cCommState = TRANSMIT_CI_STATE_BAD;
}
else
{
/*异常分支，双网通信故障*/
cCommState = TRANSMIT_CI_STATE_BAD;
}
ciToXianDiDataBuffer[index] = cCommState; /*组相邻RC通信状态*/
index++;
}
}
else
{
/*不处理*/
}
*ii = index;
}
else
{
/*入参检查失败，不处理*/
}
}
/*
* 功能描述：向ATS组通信表示灯（双系统使用）
* 参数说明：UINT8* ciToXianDiDataBuffer 存放信息的buffer（出参）
* UINT16* ii 偏移量（出参）
* 返 回 值：无
* Created By LQ 2026.01.05
*/
void PackCommIndicatorToAts(UINT8* ciToXianDiDataBuffer, UINT16* ii)
{
UINT16 index = 0U;
UINT16 jj = 0U;
UINT16 indicatorNum = 0U; /*表示报警灯数目*/
UINT16 wSumIndex = 0U;
UINT16 wPackIndicatorSum = 0U; /*已组包的表示灯数量*/
UINT16 indicatorId = 0U; /*表示灯报警灯ID*/
UINT8 indicatorType = 0U; /*表示报警灯类型*/
UINT8 indicatorState = 0U; /*表示报警灯状态*/
UINT8 indicatorDevId = 0U; /*标识报警灯设备ID*/
UINT8 cFuncRet = 0U;
if ((NULL != ciToXianDiDataBuffer) && (NULL != ii))
{
index = *ii;
wSumIndex = index;
wPackIndicatorSum = 0U;
index += 2U; /*跳过2字节表示灯数量*/
indicatorNum = GetIndicatorCurSum();
for (jj = 0U; jj < indicatorNum; jj++)
{
indicatorId = GetIndicatorId(jj);
indicatorType = GetIndicatorType(indicatorId); /*获取设备类型（原来直接用的类型做的索引，现在改为用ID做索引，需要转换为类型即报警灯类型）*/
cFuncRet = AtsIndicatorPackCheck(indicatorType); /*根据表示灯类型检查表示灯是否需要组包*/
if (CI_SUCCESS == cFuncRet)
{
ciToXianDiDataBuffer[index] = indicatorType; /*表示灯报警灯分类号*/
index++;
indicatorDevId = GetIndicatorDevId(indicatorId);
ciToXianDiDataBuffer[index] = indicatorDevId; /*报警灯设备ID*/
index++;
indicatorState = GetIndicatorState(indicatorId);
ciToXianDiDataBuffer[index] = indicatorState; /*表示灯报警灯状态*/
index++;
wPackIndicatorSum++;
}
else
{
/*不组该表示灯*/
}
}
ShortToChar(wPackIndicatorSum, &ciToXianDiDataBuffer[wSumIndex]); /*表示灯报警灯总数*/
*ii = index;
}
else
{
/*入参检查失败，不处理*/
}
}
/*
* 功能描述：检查指定类型表示灯是否需要向ATS组包（双系统使用）
* 参数说明：UINT8 cIndicatorType 表示灯类型
* 返 回 值：0 不需要组包
* 1 需要组包
* Created By LQ 2026.01.05
*/
UINT8 AtsIndicatorPackCheck(UINT8 cIndicatorType)
{
UINT8 cRetVal = CI_ERROR;
if ((INDICATOR_TYPE_CIDEVICE_FAULT == cIndicatorType)
|| (INDICATOR_TYPE_COMM_LEU == cIndicatorType)
|| (INDICATOR_TYPE_COMM_ZC == cIndicatorType)
|| (INDICATOR_TYPE_COMM_AXIS == cIndicatorType)
|| (INDICATOR_TYPE_EXPRESS_MAINP == cIndicatorType)
|| (INDICATOR_TYPE_EXPRESS_MAINP_2 == cIndicatorType)
|| (INDICATOR_TYPE_EXPRESS_BACKP == cIndicatorType)
|| (INDICATOR_TYPE_EXPRESS_BACKP_2 == cIndicatorType))
{
cRetVal = CI_SUCCESS; /*需要组包*/
}
else
{
/*不需要组包*/
}
return cRetVal;
}
/**
* @brief RC/CI设备通用状态处理
* @param[in] UINT8* ciToXianDiDataBuffer CI组包给ATS或现地的数据数组
@@ -2901,9 +3112,8 @@ void SendAtsCommonStationStateDeal(UINT8* ciToXianDiDataBuffer, UINT16* wDataInd
UINT8 chVirTailScreStat = TRAIN_VIR_SCREEN_PASS_FLAG_INVALID; /*列车虚拟后筛标志*/
UINT8 virtualCiNum = 0U; /*虚拟联锁数目*/
UINT8 virtualCIid = 0U; /*虚拟联锁ID*/
UINT8 includeVirFlag = GetCiFunctionSwitchConfig(FUNC_INCLUDEVIRCI_FLAG); /*是否支持虚拟联锁开关*/
UINT8 chIndicBelongRtuId = 0U; /*表示灯报警灯RTUID*/
UINT16 indicatorId = 0U; /*表示灯报警灯ID*/
UINT8 indicatorState = 0U; /*表示报警灯状态*/
UINT16 indicatorNum = 0U; /*表示报警灯数目*/
UINT8 indicatorType = 0U; /*表示报警灯类型*/
UINT8 indicatorDevId = 0U; /*标识报警灯设备ID*/
@@ -2912,7 +3122,8 @@ void SendAtsCommonStationStateDeal(UINT8* ciToXianDiDataBuffer, UINT16* wDataInd
UINT8 cFunRetVal = CI_ERROR; /*数据检查返回值*/
UINT8 cTiocMode = REVERSE_MODE_SHADOW; /*TIOC模式*/
UINT8 cTiocCutReason = 0U; /*不允许倒切原因*/
UINT16 wRtuIndicatorNum = 0U;
UINT16 wTempIndex = 0U;
if ((NULL != ciToXianDiDataBuffer) && (NULL != wDataIndex) && (NULL != chSendXiandiorAtsBuf))
{
ii = *wDataIndex;
@@ -3061,47 +3272,36 @@ void SendAtsCommonStationStateDeal(UINT8* ciToXianDiDataBuffer, UINT16* wDataInd
ShortToChar(comTrainSum, &ciToXianDiDataBuffer[wcomTrainSumIndex]);
/*指示灯状态*/
if (FUNC_SWITCH_ON == includeVirFlag)
{
virtualCiNum = GetVirtualCINum();
ciToXianDiDataBuffer[ii++] = virtualCiNum;/*本联锁包含的虚拟联锁数量*/
for (kk = 0u; kk < virtualCiNum; kk++)
ciToXianDiDataBuffer[ii++] = virtualCiNum; /*本联锁包含的虚拟联锁数量*/
for (kk = 0U; kk < virtualCiNum; kk++)
{
virtualCIid = GetVirtualCIid(kk);
ciToXianDiDataBuffer[ii++] = virtualCIid;/*虚拟联锁ID*/
ciToXianDiDataBuffer[ii++] = virtualCIid; /*虚拟联锁ID*/
/*表示灯报警灯信息*/
indicatorNum = (UINT16)GetVirCIIndicatorConfigDataNum(virtualCIid);
ShortToChar(indicatorNum, &ciToXianDiDataBuffer[ii]);/*表示灯报警灯总数*/
ii += 2u;
for (jj = 0u; jj < indicatorNum; jj++)
{
indicatorId = GetVirCIlocalCiIndicatorId(virtualCIid, jj); /*表示灯报警灯分类号*/
indicatorType = GetVirCIIndicatorType(virtualCIid, (UINT8)indicatorId); /*获取设备类型*/ /*原来直接用的类型做的索引，现在改为用ID做索引，需要转换为类型即报警灯类型*/
indicatorState = GetVirCIIndicatorState(virtualCIid, (UINT8)indicatorId); /*表示灯报警灯状态*/
indicatorDevId = GetVirCIIndicatorDevId(virtualCIid, (UINT8)indicatorId); /*表示灯报警灯ID*/
ciToXianDiDataBuffer[ii++] = indicatorType;
ciToXianDiDataBuffer[ii++] = indicatorDevId;
ciToXianDiDataBuffer[ii++] = indicatorState;
}
}
}
else
{
/*表示灯报警灯信息*/
ciToXianDiDataBuffer[ii++] = 1u;/*适配接口*/
ciToXianDiDataBuffer[ii++] = chLocalCiId;
indicatorNum = GetIndicatorCurSum();
ShortToChar(indicatorNum, &ciToXianDiDataBuffer[ii]);/*表示灯报警灯总数*/
ii += 2u;
for (jj = 0u; jj < indicatorNum; jj++)
wTempIndex = ii;
ii += 2U;
wRtuIndicatorNum = 0U;
for (jj = 0U; jj < indicatorNum; jj++)
{
indicatorId = GetIndicatorId(jj);
chIndicBelongRtuId = GetIndicBelongRtuId(indicatorId);
if (chIndicBelongRtuId == virtualCIid)
{
wRtuIndicatorNum++;
indicatorType = GetIndicatorType(indicatorId); /*获取设备类型*/ /*原来直接用的类型做的索引，现在改为用ID做索引，需要转换为类型即报警灯类型*/
ciToXianDiDataBuffer[ii++] = indicatorType; /*表示灯报警灯分类号*/
indicatorDevId = GetIndicatorDevId(indicatorId);
ciToXianDiDataBuffer[ii++] = indicatorDevId;/*报警灯设备ID*/
ciToXianDiDataBuffer[ii++] = GetIndicatorState(indicatorId);/*表示灯报警灯状态*/
}
else
{
/*不处理*/
}
}
ShortToChar(wRtuIndicatorNum, &ciToXianDiDataBuffer[wTempIndex]);/*表示灯报警灯总数*/
}
UpdataCiSendCmdBack_OrderBack();/*发送数据命令更新*/
@@ -3456,7 +3656,7 @@ UINT8 ReciveAtsCmdDeal(const UINT8* dataBuf, UINT16* dataIndex,const UINT16 wDat
if (wDataLength != (ii- *dataIndex))
{
CiRevCmdStruCurSum = 0u;
CiRevCmdStruCurSum = preAtsRouteSteCmdNum;
chRetVal = CI_ERROR;
}
else
@@ -3718,6 +3918,12 @@ void PackRcOrCiDeciveCommonState(UINT8* ciToXianDiDataBuffer, UINT16* ii)
/*通信设备故障*/
wIndex++;
/*组表示灯*/
PackCommIndicatorToAts(ciToXianDiDataBuffer, &wIndex);
/*组相邻RC/CI通信状态*/
PackNearRciCommStateToAts(ciToXianDiDataBuffer, &wIndex);
*ii = wIndex;
}
else
TSCP/src/APP/ciapp/ParsePack/ParsePackAtsData.h
+27
View File
@@ -433,6 +433,33 @@ UINT8 GetOcPscConfirmFlag(UINT8 index);
*/
void PackCiDataToAts(UINT8* ciToXianDiDataBuffer, UINT16* ii);
/*
* 功能描述：向ATS组相邻RC/CI的通信状态（双系统使用）
* 参数说明：UINT8* ciToXianDiDataBuffer 存放信息的buffer（出参）
* UINT16* ii 偏移量（出参）
* 返 回 值：无
* Created By LQ 2026.01.05
*/
void PackNearRciCommStateToAts(UINT8* ciToXianDiDataBuffer, UINT16* ii);
/*
* 功能描述：向ATS组通信表示灯（双系统使用）
* 参数说明：UINT8* ciToXianDiDataBuffer 存放信息的buffer（出参）
* UINT16* ii 偏移量（出参）
* 返 回 值：无
* Created By LQ 2026.01.05
*/
void PackCommIndicatorToAts(UINT8* ciToXianDiDataBuffer, UINT16* ii);
/*
* 功能描述：检查指定类型表示灯是否需要向ATS组包（双系统使用）
* 参数说明：UINT8 cIndicatorType 表示灯类型
* 返 回 值：0 不需要组包
* 1 需要组包
* Created By LQ 2026.01.05
*/
UINT8 AtsIndicatorPackCheck(UINT8 cIndicatorType);
/**
* @brief RC/CI设备通用状态处理
* @param[in] UINT8* ciToXianDiDataBuffer CI组包给ATS或现地的数据数组
TSCP/src/APP/ciapp/ParsePack/ParsePackCiData.c
+5781 -2198
View File
File diff suppressed because it is too large Load Diff
TSCP/src/APP/ciapp/ParsePack/ParsePackCiData.h
+499 -14
View File
@@ -85,12 +85,20 @@
#define BIT_VAL_00000001B ((UINT8)0X01)
#define BIT_VAL_00000010B ((UINT8)0X02)
#define BIT_VAL_00000011B ((UINT8)0X03)
#define BIT_VAL_00000100B ((UINT8)0x04)
#define BIT_VAL_00000101B ((UINT8)0x05)
#define BIT_VAL_00000110B ((UINT8)0x06)
#define BIT_VAL_00010001B ((UINT8)0x11)
#define BIT_VAL_00010010B ((UINT8)0x12)
#define BIT_VAL_00010100B ((UINT8)0x14)
#define BIT_VAL_00011000B ((UINT8)0x18)
#define BIT_VAL_11111111B ((UINT8)0xFF)
#define BIT_PALCE11000000 ((UINT8)0xC0)
#define BIT_PALCE00110000 ((UINT8)0x30)
#define BIT_PALCE00001100 ((UINT8)0x0C)
#define BIT_PALCE00000011 ((UINT8)0x03)
/*物理区段上电锁闭设置标志*/
#define HLHT_STARTLOCK_SET_NO ((UINT8)0xaa) /*未设置*/
#define HLHT_STARTLOCK_SET_YES ((UINT8)0x55) /*设置*/
@@ -100,12 +108,13 @@
#define PHYSEC_LOCKDIRECTION_OPPST_YES ((UINT8)0xAA) /*取反*/
#define PHYSEC_LOCKDIRECTION_OPPST_DEFAULT ((UINT8)0xFF) /*默认值*/
#define CICI_VERSION ((UINT8)30) /*cici接口版本号，每次修改接口需要升级版本号——Last Modified On 2025.11.04*/
#define CICI_BEGIN_TO_STATION_LEN ((UINT16)37) /*20251104更新为HLHT头长度+应用层保温内容前6字节*/
#define CICI_CICIVERINDEX (CICI_BEGIN_TO_STATION_LEN-6U-3U) /*20251104更新后CI接口版本信息索引*/
#define CICI_VERSION ((UINT8)32) /*cici接口版本号，每次修改接口需要升级版本号——Last Modified On 2026.03.10*/
#define CICI_BEGIN_TO_STATION_LEN ((UINT16)31) /*20251104更新为HLHT头长度+应用层保温内容前6字节*/
#define CICI_CICIVERINDEX (CICI_BEGIN_TO_STATION_LEN-3U) /*20251104更新后CI接口版本信息索引*/
#define CICI_ONE_SWITCH_LEN ((UINT16)13) /*一个道岔数据长度*/
#define CICI_ONE_PHYSEC_LEN ((UINT16)23U)/*一个物理区段数据长度*/
#define CICI_ONE_LOGSEC_LEN ((UINT16)11)/*一个逻辑区段数据长度*/
#define CICI_ONE_PHYSEC_LEN ((UINT16)12U)/*一个物理区段数据长度*/
#define CICI_ONE_PHYSEC_UT_LEN ((UINT16)1U)/*一个物理区段坏车占用数据长度*/
#define CICI_ONE_LOGSEC_LEN ((UINT16)6)/*一个逻辑区段数据长度*/
#define CICI_ONE_SIGNAL_LEN ((UINT16)11)/*一个信号机数据长度*/
#define CICI_ONE_PSD_LEN ((UINT16)5)/*一个屏蔽门数据长度*/
#define CICI_ONE_ESB_LEN ((UINT16)4)/*一个ESB数据长度*/
@@ -129,10 +138,22 @@
#define LOCAL_CI_RC_INTER_TYPE ((UINT16)0x0306U) /*本控区CI-RC接口类型*/
#define LOCAL_RC_TO_CI_INFO_DEV_STATE ((UINT16)0x0301U) /*本控区RC发送本控区CI设备状态帧*/
#define LOCAL_CI_TO_RC_INFO_HEART ((UINT16)0x0302U) /*本控区CI发送本控区RC心跳帧*/
#define LOCAL_RCI_INFO_STATE ((UINT16)0x0303U) /*同模式联锁间接口类型*/
#define NEAR_RCI_GENERAL_DEV_INFO ((UINT16)0x0303U) /*通用设备信息帧（相邻主用RC与主用CI间）*/
#define NEAR_RCI_PBTACS_DEV_INFO ((UINT16)0x0304U) /*PBTACS接口特有设备信息帧（相邻RC间）*/
#define NEAR_RCI_HEART_INFO ((UINT16)0x0305U) /*心跳帧（相邻备用RC与主用CI间）*/
#define LOCAL_CI_RC_PRTCL_VER ((UINT8)0x01U) /*本控区CI-RC协议版本号*/
#define TMP_PACKBUF_LEN (UINT16)(10000)/*临时组包数组长度*/
/*给相邻RC/CI组包类型*/
#define RCCI_PACK_TYPE_HEART ((UINT8)0U) /*组心跳帧*/
#define RCCI_PACK_TYPE_GENERAL ((UINT8)0x55U) /*组通用设备信息帧*/
#define RCCI_PACK_TYPE_PBTACS ((UINT8)0xAAU) /*组PB-TACS特有设备信息帧*/
#define RCCI_PACK_TYPE_ALL_DEV ((UINT8)0xFFU) /*组通用设备信息帧+PB-TACS特有设备信息帧*/
/*相邻RC/CI间命令类型*/
#define RCCI_CMD_TYPE_GENERAL ((UINT8)0x55U) /*通用命令*/
#define RCCI_CMD_TYPE_PBTACS ((UINT8)0xAAU) /*PB-TACS特有命令*/
/*物理区段数据结构体*/
typedef struct S_IntconPhySecDataStruct
@@ -259,6 +280,15 @@ extern "C" {
UINT16 wAreaIteCutId[CI_TO_CI_AREA_SNOW_SUM_MAX]; /*区间ID数组*/
} ToCiAreaIteCutStruct;
/*相邻RC发送的帧类型*/
typedef struct S_NeighborCiInfoStruct
{
UINT8 cSourceRcId; /*发送方ID*/
UINT16 cIRctoCInfoType; /*RC发送的帧类型*/
UINT8 cMainUseMode; /*相邻联锁主用方*/
UINT32 dwMainUseCurCyc; /*主用方周期号*/
} NeighborCiInfoStruct;
/*******************************全局变量声明*******************************/
extern ToCiCommandDataStruct RecvCiCmdDataStru[RECVCI_CMD_DATA_STRU_SUM_MAX];
extern UINT16 RecvCiCmdDataStruCurSum;
@@ -277,37 +307,412 @@ extern "C" {
extern ToCiAreaSnowStruct szSendCiAreaSnow[CI_COM_CI_MAX_NUM];
extern ToCiAreaIteCutStruct szRecvCiAreaIteCut[CI_COM_CI_MAX_NUM];
extern ToCiAreaIteCutStruct szSendCiAreaIteCut[CI_COM_CI_MAX_NUM];
extern NeighborCiInfoStruct szNeighborCiInfo[CI_COM_CI_MAX_NUM]; /*接收来自相邻RC的帧类型*/
/*
* 功能描述： 解析CI单帧数据
* 参数说明： UINT8* dataBuf 解析数据, UINT16 dataLength 长度,UINT8 chSendCiId 发送方id
* 参数说明： UINT8* dataBuf 解析数据, UINT16 dataLength 长度,UINT16 wSourceDevId 发送方id
* 返回值 ： 0:解析失败
* 1:解析成功
* @note 内部优化 20220419 wqm
1、编码规范：函数dsuCheckSameLoc返回值需要变量承接
2、增加返回值判断
3、适配北京10相邻联锁
*/
UINT8 ParseCiToCiDataFrame(UINT8* dataBuf, UINT16 dataLength, UINT8 sourceId);
UINT8 ParseCiToCiDataFrame(UINT8* dataBuf, UINT16 dataLength, UINT16 wSourceDevId);
/*
* 功能描述： 校验相邻CI间单帧数据
* 参数说明： UINT8* dataBuf 输入数据信息
* UINT16 dataLength 输入数据长度
* UINT16 srcDevTypeId 发送方设备
* UINT8 *errNo 校验失败故障码
* 返回值 ： CI_ERROR:校验失败
* CI_SUCCESS:校验成功
*/
UINT8 ParseCiToCiDataCheck(UINT8* dataBuf, UINT16 dataLength, UINT8 *errNo);
UINT8 ParseCiToCiDataCheck(UINT8* dataBuf, UINT16 dataLength, UINT8 *errNo, UINT16 srcDevTypeId);
/*
* 功能描述： 组CI数据
* 参数说明： UINT8 targetDeviceId, 目标设备ID
* 返回值 ： 0: 组包失败
* 功能描述：组CI数据
* 参数说明：UINT8 targetDeviceType 目标设备类型
* UINT8 targetDeviceId, 目标设备ID
* 返回值 ：0: 组包失败
* 1: 组包成功
*/
UINT8 PackCiToCiData(UINT8 targetDeviceId);
UINT8 PackCiToCiData(UINT8 targetDeviceType, UINT8 targetDeviceId);
/*
* 功能描述：获取本RC/CI需要给相邻RC/CI组包的帧类型
* 参数说明：UINT8 targetDeviceType 目标设备类型
* UINT8 targetDeviceId 目标设备ID
* 返 回 值：0 组心跳帧
* 0x55 组通用设备信息帧
* 0xAA 组PB-TACS特有设备信息帧
* 0xFF 组通用设备信息帧+PB-TACS特有设备信息帧
* Created By LQ 2026.01.04
*/
UINT8 GetSendToNearRciInfoType(UINT8 targetDeviceType, UINT8 targetDeviceId);
/*
* 功能描述：更新需要发送给相邻RC/CI的区段征用命令信息
* 参数说明：UINT8 targetDeviceId 目标设备ID
* 返 回 值：无
* Created By LQ 2026.01.04
*/
void UpdateSendToRciSecUseCmd(UINT8 targetDeviceId);
/*
* 功能描述：更新需要发送给相邻RC/CI的道岔征用命令信息
* 参数说明：UINT8 targetDeviceId 目标设备ID
* 返 回 值：无
* Created By LQ 2026.01.04
*/
void UpdateSendToRciSwtUseCmd(UINT8 targetDeviceId);
/*
* 功能描述：更新需要发送给相邻RC/CI的试车命令信息
* 参数说明：UINT8 targetDeviceId 目标设备ID
* 返 回 值：无
* Created By LQ 2026.01.04
*/
void UpdateSendToRciTrainTestCmd(UINT8 targetDeviceId);
/*
* 功能描述：相邻RC/CI间组心跳帧应用层信息
* 参数说明：UINT8* dataFrame 待填充的数组（出参）
* UINT16* dataLength 已组包长度地址（出参）
* 返 回 值：0 组包失败
* 1 组包成功
* Created By LQ 2026.01.04
*/
UINT8 PackNearRciHeartAppInfo(UINT8* dataFrame, UINT16* dataLength);
/*
* 功能描述：相邻RC/CI间组通用设备信息帧应用层信息
* 参数说明：UINT8 dstCiId 目标RC/CI编号
* UINT8* dataFrame 存数据Buf（出参）
* UINT16* dataLength 数据总长度的地址（出参）
* 返 回 值：0 组包失败
* 1 组包成功
* Modefied By LQ 2026.01.05
*/
UINT8 PackNearRciGeneralAppInfo(UINT8 dstCiId, UINT8* dataFrame, UINT16* dataLength);
/*
* 功能描述：相邻RC/CI间组道岔信息
* 参数说明：UINT8 dstCiId 目标RC/CI编号
* UINT8* dataFrame 待填充的数组（出参）
* UINT16* dataLength 数据总长度的地址（出参）
* 返 回 值：0 组包失败
* 1 组包成功
* Created By LQ 2026.01.05
*/
UINT8 PackNearRciSwitchData(UINT8 dstCiId, UINT8* dataFrame, UINT16* dataLength);
/*
* 功能描述：相邻RC/CI间组物理区段坏车占用信息
* 参数说明：UINT8 dstCiId 目标RC/CI编号
* UINT8* dataFrame 存数据Buf（出参）
* UINT16* dataLength 数据总长度的地址（出参）
* 返 回 值：0 组包失败
* 1 组包成功
* Created By LQ 2026.01.16
*/
UINT8 PackNearRciPhySecUtOccData(UINT8 dstCiId, UINT8* dataFrame, UINT16* dataLength);
/*
* 功能描述：相邻RC/CI间组物理区段状态信息
* 参数说明：UINT8 dstCiId 目标RC/CI编号
* UINT8* dataFrame 存数据Buf（出参）
* UINT16* dataLength 数据总长度的地址（出参）
* 返 回 值：0 组包失败
* 1 组包成功
* Created By LQ 2026.01.05
*/
UINT8 PackNearRciPhySecStateData(UINT8 dstCiId, UINT8* dataFrame, UINT16* dataLength);
/*
* 功能描述：校验相邻CI发送的待解析的物理区段坏车占用信息
* 参数说明：const UINT8* dataBuf 待解析的数据；
* UINT16* index 索引
* 返回值 ：0 校验失败
* 1 校验成功
*/
UINT8 CheckCiToCiPhySecUtOccData(const UINT8* dataBuf, UINT16* index);
/*
* 功能描述：相邻RC/CI间组逻辑区段状态信息
* 参数说明：UINT8 dstCiId 目标RC/CI编号
* UINT8* dataFrame 存数据Buf（出参）
* UINT16* dataLength 数据总长度的地址（出参）
* 返 回 值：0 组包失败
* 1 组包成功
* Created By LQ 2026.01.05
*/
UINT8 PackNearRciLogSecStateData(UINT8 dstCiId, UINT8* dataFrame, UINT16* dataLength);
/*
* 功能描述：相邻RC/CI间组信号机信息
* 参数说明：UINT8 dstCiId 目标RC/CI编号
* UINT8* dataFrame 存数据Buf（出参）
* UINT16* dataLength 数据总长度的地址（出参）
* 返 回 值：0 组包失败
* 1 组包成功
* Created By LQ 2026.01.05
*/
UINT8 PackNearRciSignalData(UINT8 dstCiId, UINT8* dataFrame, UINT16* dataLength);
/*
* 功能描述：相邻RC/CI间组屏蔽门信息
* 参数说明：UINT8 dstCiId 目标RC/CI编号
* UINT8* dataFrame 存数据Buf（出参）
* UINT16* dataLength 数据总长度的地址（出参）
* 返 回 值：0 组包失败
* 1 组包成功
* Created By LQ 2026.01.05
*/
UINT8 PackNearRciPsdData(UINT8 dstCiId, UINT8* dataFrame, UINT16* dataLength);
/*
* 功能描述：相邻RC/CI间组紧急停车按钮信息
* 参数说明：UINT8 dstCiId 目标RC/CI编号
* UINT8* dataFrame 存数据Buf（出参）
* UINT16* dataLength 数据总长度的地址（出参）
* 返 回 值：0 组包失败
* 1 组包成功
* Created By LQ 2026.01.05
*/
UINT8 PackNearRciEsbData(UINT8 dstCiId, UINT8* dataFrame, UINT16* dataLength);
/*
* 功能描述：相邻RC/CI间组进路信息
* 参数说明：UINT8 dstCiId 目标RC/CI编号
* UINT8* dataFrame 存数据Buf（出参）
* UINT16* dataLength 数据总长度的地址（出参）
* 返 回 值：0 组包失败
* 1 组包成功
* Created By LQ 2026.01.05
*/
UINT8 PackNearRciRouteData(UINT8 dstCiId, UINT8* dataFrame, UINT16* dataLength);
/*
* 功能描述：相邻RC/CI间组物理区段锁闭信息
* 参数说明：UINT8 dstCiId 目标RC/CI编号
* UINT8* dataFrame 存数据Buf（出参）
* UINT16* dataLength 数据总长度的地址（出参）
* 返 回 值：0 组包失败
* 1 组包成功
* Created By LQ 2026.01.05
*/
UINT8 PackNearRciPhySecLockData(UINT8 dstCiId, UINT8* dataFrame, UINT16* dataLength);
/*
* 功能描述：相邻RC/CI间组SPKS信息
* 参数说明：UINT8 dstCiId 目标RC/CI编号
* UINT8* dataFrame 存数据Buf（出参）
* UINT16* dataLength 数据总长度的地址（出参）
* 返 回 值：0 组包失败
* 1 组包成功
* Created By LQ 2026.01.05
*/
UINT8 PackNearRciSpksData(UINT8 dstCiId, UINT8* dataFrame, UINT16* dataLength);
/*
* 功能描述：相邻RC/CI间组虚拟继电器信息
* 参数说明：UINT8 dstCiId 目标RC/CI编号
* UINT8* dataFrame 存数据Buf（出参）
* UINT16* dataLength 数据总长度的地址（出参）
* 返 回 值：0 组包失败
* 1 组包成功
* Created By LQ 2026.01.05
*/
UINT8 PackNearRciVirtualRelayData(UINT8 dstCiId, UINT8* dataFrame, UINT16* dataLength);
/*
* 功能描述：相邻RC/CI间组防淹门信息
* 参数说明：UINT8 dstCiId 目标RC/CI编号
* UINT8* dataFrame 存数据Buf（出参）
* UINT16* dataLength 数据总长度的地址（出参）
* 返 回 值：0 组包失败
* 1 组包成功
* Created By LQ 2026.01.05
*/
UINT8 PackNearRciFloodGateData(UINT8 dstCiId, UINT8* dataFrame, UINT16* dataLength);
/*
* 功能描述：相邻RC/CI间组保护区段信息
* 参数说明：UINT8 dstCiId 目标RC/CI编号
* UINT8* dataFrame 存数据Buf（出参）
* UINT16* dataLength 数据总长度的地址（出参）
* 返 回 值：0 组包失败
* 1 组包成功
* Created By LQ 2026.01.05
*/
UINT8 PackNearRciOverlapData(UINT8 dstCiId, UINT8* dataFrame, UINT16* dataLength);
/*
* 功能描述：相邻RC/CI间组自动通过进路信息
* 参数说明：UINT8 dstCiId 目标RC/CI编号
* UINT8* dataFrame 存数据Buf（出参）
* UINT16* dataLength 数据总长度的地址（出参）
* 返 回 值：0 组包失败
* 1 组包成功
* Created By LQ 2026.01.05
*/
UINT8 PackNearRciAutoRouteData(UINT8 dstCiId, UINT8* dataFrame, UINT16* dataLength);
/*
* 功能描述：相邻RC/CI间组逻辑区段锁闭信息
* 参数说明：UINT8 dstCiId 目标RC/CI编号
* UINT8* dataFrame 存数据Buf（出参）
* UINT16* dataLength 数据总长度的地址（出参）
* 返 回 值：0 组包失败
* 1 组包成功
* Created By LQ 2026.01.05
*/
UINT8 PackNearRciLogSecLockData(UINT8 dstCiId, UINT8* dataFrame, UINT16* dataLength);
/*
* 功能描述：相邻RC/CI间组区间湿轨信息
* 参数说明：UINT8 dstCiId 目标RC/CI编号
* UINT8* dataFrame 存数据Buf（出参）
* UINT16* dataLength 数据总长度的地址（出参）
* 返 回 值：0 组包失败
* 1 组包成功
* Created By LQ 2026.01.05
*/
UINT8 PackNearRciAreaSnowData(UINT8 dstCiId, UINT8* dataFrame, UINT16* dataLength);
/*
* 功能描述：相邻RC/CI间组区间ITE切除信息
* 参数说明：UINT8 dstCiId 目标RC/CI编号
* UINT8* dataFrame 存数据Buf（出参）
* UINT16* dataLength 数据总长度的地址（出参）
* 返 回 值：0 组包失败
* 1 组包成功
* Created By LQ 2026.01.05
*/
UINT8 PackNearRciAreaIteCutData(UINT8 dstCiId, UINT8* dataFrame, UINT16* dataLength);
/*
* 功能描述：相邻RC/CI间组离去逻辑区段信息
* 参数说明：UINT8 dstCiId 目标RC/CI编号
* UINT8* dataFrame 存数据Buf（出参）
* UINT16* dataLength 数据总长度的地址（出参）
* 返 回 值：0 组包失败
* 1 组包成功
* Created By LQ 2026.01.05
*/
UINT8 PackNearRciLeaveLogSecData(UINT8 dstCiId, UINT8* dataFrame, UINT16* dataLength);
/*
* 功能描述：相邻RC/CI间组其它控区进路的道岔检查结果
* 参数说明：UINT8 dstCiId 目标RC/CI编号
* UINT8* dataFrame 存数据Buf（出参）
* UINT16* dataLength 数据总长度的地址（出参）
* 返 回 值：0 组包失败
* 1 组包成功
* Created By LQ 2026.01.05
*/
UINT8 PackNearRciRouteSwtCheckData(UINT8 dstCiId, UINT8* dataFrame, UINT16* dataLength);
/*
* 功能描述：相邻RC/CI间组其它控区保护区段的防护道岔检查结果
* 参数说明：UINT8 dstCiId 目标RC/CI编号
* UINT8* dataFrame 存数据Buf（出参）
* UINT16* dataLength 数据总长度的地址（出参）
* 返 回 值：0 组包失败
* 1 组包成功
* Created By LQ 2026.01.05
*/
UINT8 PackNearRciOlapProSwtCheckData(UINT8 dstCiId, UINT8* dataFrame, UINT16* dataLength);
/*
* 功能描述：相邻RC/CI间组防护道岔防护锁闭信息
* 参数说明：UINT8 dstCiId 目标RC/CI编号
* UINT8* dataFrame 存数据Buf（出参）
* UINT16* dataLength 数据总长度的地址（出参）
* 返 回 值：0 组包失败
* 1 组包成功
* Created By LQ 2026.01.05
*/
UINT8 PackNearRciProSwtProLockData(UINT8 dstCiId, UINT8* dataFrame, UINT16* dataLength);
/*
* 功能描述：相邻RC/CI间组通用命令信息
* 参数说明：UINT8 dstCiId 目标RC/CI编号
* UINT8* dataFrame 待填充的数组（出参）
* UINT16* dataLength 数据总长度的地址（出参）
* 返 回 值：0 组包失败
* 1 组包成功
* Created By LQ 2026.01.04
*/
UINT8 PackNearRciGeneralCmdData(UINT8 dstCiId, UINT8* dataFrame, UINT16* dataLength);
/*
* 功能描述：相邻RC/CI间组PB-TACS特有设备信息帧应用层信息
* 参数说明：UINT8 dstCiId 目标RC/CI编号
* UINT8* dataFrame 待填充的数组（出参）
* UINT16* dataLength 数据总长度的地址（出参）
* 返 回 值：0 组包失败
* 1 组包成功
* Created By LQ 2026.01.04
*/
UINT8 PackNearRciPbtacsAppInfo(UINT8 dstCiId, UINT8* dataFrame, UINT16* dataLength);
/*
* 功能描述：相邻RC/CI间组逻辑区段资源可用信息
* 参数说明：UINT8 dstCiId 目标RC/CI编号
* UINT8* dataFrame 待填充的数组（出参）
* UINT16* dataLength 数据总长度的地址（出参）
* 返 回 值：0 组包失败
* 1 组包成功
* Created By LQ 2026.01.04
*/
UINT8 PackNearRciLogSecResUseData(UINT8 dstCiId, UINT8* dataFrame, UINT16* dataLength);
/*
* 功能描述：相邻RC/CI间组逻辑区段资源锁闭信息
* 参数说明：UINT8 dstCiId 目标RC/CI编号
* UINT8* dataFrame 待填充的数组（出参）
* UINT16* dataLength 数据总长度的地址（出参）
* 返 回 值：0 组包失败
* 1 组包成功
* Created By LQ 2026.01.04
*/
UINT8 PackNearRciLogSecResLockData(UINT8 dstCiId, UINT8* dataFrame, UINT16* dataLength);
/*
* 功能描述：相邻RC/CI间组分界点信息
* 参数说明：UINT8 dstCiId 目标RC/CI编号
* UINT8* dataFrame 待填充的数组（出参）
* UINT16* dataLength 数据总长度的地址（出参）
* 返 回 值：0 组包失败
* 1 组包成功
* Created By LQ 2026.01.04
*/
UINT8 PackNearRciCfpData(UINT8 dstCiId, UINT8* dataFrame, UINT16* dataLength);
/*
* 功能描述：相邻RC/CI间组PB-TACS特有命令信息
* 参数说明：UINT8 dstCiId 目标RC/CI编号
* UINT8* dataFrame 待填充的数组（出参）
* UINT16* dataLength 数据总长度的地址（出参）
* 返 回 值：0 组包失败
* 1 组包成功
* Created By LQ 2026.01.04
*/
UINT8 PackNearRciPbtacsCmdData(UINT8 dstCiId, UINT8* dataFrame, UINT16* dataLength);
/*
* 功能描述：判断相邻RC/CI间指定ID命令的命令类型（通用命令或PB-TACS特有命令）
* 参数说明：UINT16 wCmdId 命令ID
* 返 回 值：0 失败
* 0x55 通用命令
* 0xAA PB-TACS特有命令
* Created By LQ 2026.01.04
*/
UINT8 CheckNearRciCmdType(UINT16 wCmdId);
/*
* 功能描述： 获取本联锁具有锁闭状态管理权的物理区段ID数组总数
@@ -552,7 +957,7 @@ void ClearCiRevCiDrCmdData(void);
* 返回值 ： CI_ERROR:校验失败
* CI_SUCCESS:校验成功
*/
UINT8 CheckCiIDAndVer(const UINT8* dataBuf, UINT8* Index);
UINT8 CheckCiIDAndVer(const UINT8* dataBuf, UINT16* Index);
/*
* 功能描述：校验相邻CI发送的待解析的道岔数据
@@ -581,6 +986,16 @@ UINT8 CheckCiToCiPhySecData(const UINT8* dataBuf, UINT16* index);
*/
UINT8 CheckCiToCiLogSecData(const UINT8* dataBuf, UINT16* index);
/*
* 功能描述：校验相邻RC发送的的特有逻辑区段数据
* 参数说明：const UINT8* dataBuf 待解析的数据；
* UINT16* index 索引
* 返回值 ：0 校验失败
* 1 校验成功
*Create fan 2026.01.04
*/
UINT8 CheckCiToCiLogSecDataRcOnly(const UINT8* dataBuf, UINT16* index);
/*
* 功能描述：校验相邻CI发送的待解析的信号机数据
* 参数说明：const UINT8* dataBuf 待解析的数据；
@@ -599,6 +1014,15 @@ UINT8 CheckCiToCiSignalData(const UINT8* dataBuf, UINT16* index);
*/
UINT8 CheckCiToCiCommandData(const UINT8* dataBuf, UINT16* index);
/*
* 功能描述：校验相邻CI发送的待解析的命令数据
* 参数说明：const UINT8* dataBuf 待解析的数据；
* UINT16* index 索引
* 返回值 ：0 校验失败
* 1 校验成功
*Create fan 2026.01.04
*/
UINT8 CheckCiToCiCommandDataRcOnly(const UINT8* dataBuf, UINT16* index);
/*
* 功能描述：校验相邻CI发送的待解析的防淹门数据
@@ -637,6 +1061,16 @@ UINT8 CheckCiToCiAutoRouteData(const UINT8* dataBuf, UINT16* index);
*/
UINT8 CheckCiToCiLogicLockData(const UINT8* dataBuf, UINT16* index);
/*
* 功能描述：校验相邻CI发送的本联锁中由其他联锁管理的逻辑区段锁闭数据
* 参数说明：const UINT8* dataBuf 待解析的数据；
* UINT16* index 索引
* 返回值 ：0 校验失败
* 1 校验成功
*Create fan 2026.0.1.04
*/
UINT8 CheckCiToCiLogicLockDataRcOnly(const UINT8* dataBuf, UINT16* index);
/*
* 功能描述：校验动态进路命令信息
* 参数说明：const UINT8* dataBuf 待解析的数据；
@@ -1136,6 +1570,57 @@ UINT8 CheckLocalRcToCiPsdData(const UINT8* dataBuf, UINT16* index);
*/
UINT8 CheckLocalRcToCiSnowData(const UINT8* dataBuf, UINT16* index);
/*
* 功能描述： 解析相邻RC间TB-TACS特有单帧数据
* 参数说明： UINT8* dataBuf 解析数据, UINT16 dataLength 长度
* 返回值 ： 0:解析失败
* 1:解析成功
* Create Fan 2025.12.31
*/
UINT8 ParseRcToRcPbTacsDataFrame(UINT8* dataBuf, UINT16 dataLength, UINT8 sourceId);
/*
* 功能描述：获取相邻RC发送本CI的帧类型
* 参数说明：const UINT8 cTargetRcId 目标RC ID
* 返 回 值：相邻RC发送本CI的帧类型
* Created By LQ 2026.01.04
*/
UINT16 GetNearRcSendInfoType(const UINT8 cTargetRcId);
/*
* 功能描述：设置相邻RC发送本CI的帧类型
* 参数说明：const UINT8 cTargetRcId 目标RC ID
* const UINT16 cIRctoCInfoType 帧类型
* 返 回 值：无
* Created By LQ 2026.01.04
*/
void SetNearRcSendInfoType(const UINT8 cTargetRcId, const UINT16 cInfoType);
/*
* 功能描述：功能描述：获取相邻RC发送本CI的主用模式类型（发送通用信息帧的模式）
* 参数说明：const UINT8 cTargetRcId 目标RC ID
* 返 回 值：相邻RC发送本CI的帧类型
* Created By fan 2026.01.04
*/
UINT8 GetNearRCISendMainUseMode(const UINT8 cTargetRcId);
/*
* 功能描述：设置相邻联锁发送通用信息帧的模式
* 参数说明：const UINT8 cTargetRcId 目标RC ID
* const UINT8 chMode 类型 UINT32 dwMainCyc主用方CYC
* 返 回 值：无
* Created By fan 2026.01.04
*/
void SetNearRCISendMainUseMode(const UINT8 cTargetRcId, const UINT8 chMode,const UINT32 dwMainCyc);
/*
* 功能描述：清除相邻联锁模式信息（中断处理）
* 参数说明：const UINT8 cTargetRcId 目标RC ID 待清除模式
* 返 回 值：无
* Created By fan 2026.01.04
*/
void ClearNearRCISendInfo(const UINT8 cTargetRcId, const UINT8 chMode);
#ifdef __cplusplus
}
#endif
TSCP/src/APP/ciapp/ParsePack/ParsePackCommon.c
+364 -59
View File
@@ -524,7 +524,6 @@ UINT8 SwitchMaskManage(UINT8 MaskType, UINT16 DeviceId, UINT16 MaskId, UINT8* da
UINT16 indexFind = 0U;
UINT8 devBelongThisLine = 0U;
UINT8 switchBoardNum = 0U;
UINT8 switchStateCheck = CI_ERROR;
switchLockStatus = GetSwitchLockStatus(DeviceId);
@@ -1178,6 +1177,42 @@ UINT8 PhySectionMaskManage(UINT8 MaskType, UINT16 DeviceId, UINT16 MaskId, UINT8
;
}
break;
case MASK_TYPE_PHYSECTION_INTRUSION:
/* 物理区段侵限状态码位 */
phyIntruSecVainCheck = PhysicalIntruSecVainCheck(DeviceId);
if (CI_SUCCESS == phyIntruSecVainCheck)
{
/*未侵限，发1*/
SetMaskValue(MaskId, dataBuf);
}
else
{
/*侵限，发0*/
}
break;
case MASK_TYPE_PHYSECTION_ATS_FLOCK:
/* 物理区段由ATS封锁状态码位 */
/*封锁状态码位(ATS设置) 封锁发0 未封锁以及SPKS命令封锁发1*/
phySecState = GetPhySecFLockState(DeviceId);
if (PHYSICAL_SECTION_FLOCK_NO != phySecState)
{
phySecLockType = GetPhySecFLockType(DeviceId);
if (PHY_SEC_FLOCK_TYPE_SPKS != phySecLockType)
{
/*除了SPKS封锁 都发0*/
}
else
{
/*SPKS命令的封锁 发1*/
SetMaskValue(MaskId, dataBuf);
}
}
else
{
/*未封锁 发1*/
SetMaskValue(MaskId, dataBuf);
}
break;
default:
returnValue = CI_ERROR;
@@ -1204,13 +1239,16 @@ UINT8 LogicSectionMaskManage(UINT8 MaskType, UINT16 DeviceId, UINT16 MaskId, UIN
UINT16 logLockBelongRoute = 0U;/*逻辑区段锁闭所属进路*/
UINT16 logProtectLockRoute = 0U;/*逻辑区段防护锁闭所属进路*/
UINT8 chJumpLockState = 0U;/*逻辑区段锁闭状态*/
UINT8 cLogArbState = 0U; /* 逻辑区段ARB状态 */
UINT8 cLogCbtcArbState = 0U; /* 逻辑区段CBTC_ARB状态 */
UINT8 cLogPbTacsArbState = 0U; /* 逻辑区段PB_TACS_ARB状态 */
UINT8 chLogSecLockDirOpposedFlag = CI_ERROR;/*逻辑区段锁闭方向是否取反标志*/
UINT8 cLogSpksFlockState = 0U; /* 逻辑区段SPKS封锁状态 */
UINT8 cLogSecLogicLockState = LOG_SECTION_LOCK_NO; /*逻辑区段逻辑锁闭状态*/
UINT8 cLogSecLockDir = CI_SYSTEM_DIRECTION_NONE; /*逻辑区段锁闭方向*/
UINT8 chLogSecBelLogRouteSum = 0U;/*逻辑区段所属逻辑进路数目*/
UINT8 chLogSecEmergXianSu = 0U;/*逻辑区段紧急临时限速状态*/
UINT8 chRcWorkMode = 0U; /*RC工作模式*/
switch (MaskType)
{
case MASK_TYPE_LOGICSECTION_UTOCCUPY:
@@ -1364,15 +1402,33 @@ UINT8 LogicSectionMaskManage(UINT8 MaskType, UINT16 DeviceId, UINT16 MaskId, UIN
SetMaskValue(MaskId, dataBuf);
}
break;
case MASK_TYPE_LOGICSECTION_ARB:
/* 逻辑区段ARB状态 */
cLogArbState = GetLgcArbState(DeviceId);
/*区段ARB*/
if (LGC_SECTION_ARB_YES == cLogArbState)
case MASK_TYPE_LOGSEC_CBTC_ARB:
/* 逻辑区段CBTC_ARB状态 */
cLogCbtcArbState = GetLogSecCbtcArbState(DeviceId);
/*当前系统为CI，获取逻辑区段ARB状态*/
if (LGC_SECTION_ARB_YES == cLogCbtcArbState)
{
/*设置码位为1*/
SetMaskValue(MaskId, dataBuf);
}
else
{
;
}
break;
case MASK_TYPE_LOGSEC_PB_TACS_ARB:
/* 逻辑区段PC_TACS_ARB状态 */
cLogPbTacsArbState = GetLogSecPbTacsArbState(DeviceId);
/*当前系统为RC，获取逻辑区段ARB状态*/
if (LGC_SECTION_ARB_YES == cLogPbTacsArbState)
{
/*设置码位为1*/
SetMaskValue(MaskId, dataBuf);
}
else
{
;
}
break;
case MASK_TYPE_LOGICSECTION_SPKS_FLOCK:
/* 逻辑区段SPKS封锁状态 */
@@ -1584,10 +1640,12 @@ UINT8 RouteMaskManage(UINT8 MaskType, UINT16 DeviceId, UINT16 MaskId, UINT8* dat
UINT8 dcQState = GetRouteDCQState(DeviceId);/*进路调车请求状态*/
UINT8 dcTState = GetRouteDCTYState(DeviceId);/*进路调车同意状态*/
UINT8 chDCAgreeBtnErrState = GetRouteDcAgreeButtonErrState(DeviceId);/*进路调车同意按钮故障状态*/
UINT8 RouteCiId = 0u; /*进路所属联锁*/
UINT8 CiTypeOfRoute = 0u; /*当前进路所属联锁类型*/
UINT8 ciTrainTestState = 0u; /*试车线联锁状态*/
UINT8 routeAutoTriggerFlag = GetRouteAutoTriggerFlag(DeviceId); /*获取进路自动触发标志*/
UINT8 chVirCiId = 0u;
UINT8 chVirCiType = 0u;
switch (MaskType)
{
case MASK_TYPE_ROUTE_IDLE:/*进路空闲码位*/
@@ -1673,10 +1731,11 @@ UINT8 RouteMaskManage(UINT8 MaskType, UINT16 DeviceId, UINT16 MaskId, UINT8* dat
break;
case MASK_TYPE_ROUTE_LOCKSTATE:/*CI-ZC码位，基本进路锁闭状态码位:根据接口说明，进路属于办理状态，引导进路均发送0,当进路状态为预选或选排且最后一个区段为锁闭状态则仍发1，解决CBTC模式进路追踪办理动道岔期间不给ZC发进路建立状态*/
/*获取进路所属CI*/
RouteCiId = GetRouteBelongCiId(DeviceId);
chVirCiId = GetRouteBelongVirCiId(DeviceId);
chVirCiType = GetLocalVirCiType(chVirCiId);
/*获取联锁类型*/
CiTypeOfRoute = GetCiType(RouteCiId);
if ((0u != RouteCiId) && (0u != CiTypeOfRoute))
if ((0u != chVirCiId) && (0u != chVirCiType))
{
if ((ROUTE_STATE_IDLE != routeState)
&& (ROUTE_STATE_FIRST_XUANPAI != routeState)
@@ -1693,7 +1752,7 @@ UINT8 RouteMaskManage(UINT8 MaskType, UINT16 DeviceId, UINT16 MaskId, UINT8* dat
)
{
ciTrainTestState = GetCiTrainTestStatus();
if ((CI_TYPE_SCX == CiTypeOfRoute) && (CI_TRAIN_TEST_ON != ciTrainTestState))
if ((CI_TYPE_SCX == chVirCiType) && (CI_TRAIN_TEST_ON != ciTrainTestState))
{
;
}
@@ -1881,7 +1940,6 @@ UINT8 PlatMaskManage(UINT8 MaskType, UINT16 DeviceId, UINT16 MaskId, UINT8* data
UINT8 mutualLockState = 0u;
UINT8 psdState = 0u;
UINT8 includeVirFlag = GetCiFunctionSwitchConfig(FUNC_INCLUDEVIRCI_FLAG);
UINT8 RelayCollState = 0u;
UINT8 localCi = GetSystemParaLocalCiId();
UINT8 virtualZDZFBelongCiId = 0U;
@@ -1901,13 +1959,18 @@ UINT8 PlatMaskManage(UINT8 MaskType, UINT16 DeviceId, UINT16 MaskId, UINT8* data
UINT8 esbErrFlag = ESB_ERROR_FLAG_NO; /*紧急关闭按钮故障标志*/
UINT8 chCleFarePDBFlaLigFlag = 0U;/*清客确认箱PDB按钮闪灯状态*/
UINT8 chPsdVideoQkDriveState = 0U;/*清客确认箱视频清客驱动状态*/
UINT8 chRtnIndicatorDevId = 0U;/*无人折返报警灯设备ID*/
UINT16 wRtnIndicatorDevId = 0U;/*无人折返报警灯设备ID*/
UINT8 chNonRrnAdhesionState = 0U;/*无人折返按钮粘连状态*/
UINT8 cEsbCutErrFlag = ESB_ERROR_FLAG_NO; /*紧急关闭旁路按钮故障标志*/
UINT16 wEsbCollRelayId = 0U; /*ESB采集继电器ID*/
UINT8 cPsdExceptOpenState = 0U; /*屏蔽门异常打开状态*/
UINT8 cPsdExceptState = 0U; /*屏蔽门异常状态*/
UINT8 chJXTCMutualLockFaultState = 0U; /*间隙探测按钮故障状态*/
UINT8 chIBPBtnState = 0U; /*IBP按钮状态*/
UINT8 chIBPBtnFaultState = 0U; /*IBP按钮故障状态*/
UINT8 cEsbCutBtnState = 0U; /*紧急关闭旁路按钮激活状态*/
UINT8 cOnePlatEsbState = 0U; /*同站紧急按钮激活状态*/
UINT8 cOnePlatEsbCutState = 0U; /*同站紧急旁路按钮激活状态*/
chRtnIndicatorDevId = GetIndicatorRelNonReturnId(DeviceId);
wRtnIndicatorDevId = GetIndicatorRelNonReturnId(DeviceId);
virtualZDZFBelongCiId = GetVirtualZDZFBelongCiId();
virtualZDZFDevType = GetVirtualZDZFDevType();
virtualZDZFButtonState = GetVirtualZDZFButtonState();
@@ -1915,12 +1978,7 @@ UINT8 PlatMaskManage(UINT8 MaskType, UINT16 DeviceId, UINT16 MaskId, UINT8* data
switch (MaskType)
{
case MASK_TYPE_PLAT_AUTORETURNSIG_BUTTONSTAT:/*站台无人折返按钮激活状态码位*/
if (FUNC_SWITCH_ON == includeVirFlag)
{
DealAutoReturnButtonMask_Vir(DeviceId, MaskId, dataBuf);/*若配置虚拟联锁，则DeviceId为指示灯表的行ID*/
}
else
{/*若未配置虚拟联锁，则DeviceId为指示灯ID*/
/*若未配置虚拟联锁，则DeviceId为指示灯ID*/
for (ii = 0u; ii < GetIndicatorCurSum(); ii++)
{
if ((DeviceId == GetIndicatorId(ii))
@@ -1946,7 +2004,7 @@ UINT8 PlatMaskManage(UINT8 MaskType, UINT16 DeviceId, UINT16 MaskId, UINT8* data
else
{
RelayCollState = GetRelayCollState(relayIdBuf[2]);
chNonRrnAdhesionState = GetNonRtnAdhesionState(chRtnIndicatorDevId);
chNonRrnAdhesionState = GetNonRtnAdhesionState(wRtnIndicatorDevId);
if ((RELAY_STATE_UP == RelayCollState) && (RTN_RELAY_ADHESION_NO == chNonRrnAdhesionState))
{/*无人折返按钮继电器吸起*/
@@ -1960,7 +2018,6 @@ UINT8 PlatMaskManage(UINT8 MaskType, UINT16 DeviceId, UINT16 MaskId, UINT8* data
}
}
}
break;
@@ -2028,16 +2085,41 @@ UINT8 PlatMaskManage(UINT8 MaskType, UINT16 DeviceId, UINT16 MaskId, UINT8* data
/*码位值发0*/
}
break;
case MASK_TYPE_ESP_PRESS_STATE:
wEsbCollRelayId = GetEsbRelayId(DeviceId); /*获取ESB采集继电器*/
RelayCollState = GetRelayCollState(wEsbCollRelayId); /*获取ESB采集继电器状态*/
if (RELAY_STATE_UP == RelayCollState)
case MASK_TYPE_CUT_ESP_STATE:
/*紧急关闭按钮旁路按钮激活状态*/
cEsbCutBtnState = GetEsbCutState(DeviceId);
if (ESB_CUT_YES == cEsbCutBtnState)
{
SetMaskValue(MaskId, dataBuf); /*ESB未按下，发1*/
SetMaskValue(MaskId, dataBuf); /*旁路有效，码位发1*/
}
else
{
/*ESB按下，发0*/
/*旁路无效，码位发0*/
}
break;
case MASK_TYPE_ONEPLAT_ESP_STATE:
/*紧急关闭按钮同站紧急按钮激活状态*/
cOnePlatEsbState = GetOnePlatEsbState(DeviceId);
cOnePlatEsbCutState = GetOnePlatEsbCutState(DeviceId);
if ((ESB_STATE_VALID_NO == cOnePlatEsbState) || (ESB_CUT_YES == cOnePlatEsbCutState))
{
SetMaskValue(MaskId, dataBuf); /*紧急无效或旁路有效，码位发1*/
}
else
{
/*紧急有效，码位发0*/
}
break;
case MASK_TYPE_ONEPLAT_CUT_ESP_STATE:
/*紧急关闭按钮同站旁路按钮激活状态*/
cOnePlatEsbCutState = GetOnePlatEsbCutState(DeviceId);
if (ESB_CUT_YES == cOnePlatEsbCutState)
{
SetMaskValue(MaskId, dataBuf); /*同站旁路有效，码位发1*/
}
else
{
/*同站旁路无效，码位发0*/
}
break;
case MASK_TYPE_PSD_STATE_ATS:/*站台屏蔽门状态码位;给ATS*/
@@ -2114,6 +2196,30 @@ UINT8 PlatMaskManage(UINT8 MaskType, UINT16 DeviceId, UINT16 MaskId, UINT8* data
else
{/*未开始计时或计时未到，给现地和ATS发送无障碍物*/
}
/* 间隙探测停止时间内，继续采信间隙探测结果*/
if(CI_TIME_OUT == SystemOverTimeCheck(GetStopDetectionCycNum(DeviceId), GetwJXTCStopDetectTime()))
{
/*间隙探测停止时间已经到了，不在继续采信间隙探测结果*/
}
else
{
if(0u == GetStopDetectionCycNum(DeviceId))
{
/*未开始计时*/
}
else
{
/* 间隙探测停止时间未到，继续采信间隙探测结果*/
if (PSD_REMORA_YES == GetPsdRemoraState(DeviceId))
{/*1表示间隙探测有障碍物*/
SetMaskValue(MaskId, dataBuf);
}
else
{/*0表示间隙探测无障碍物*/
}
}
}
}
break;
case MASK_TYPE_PSD_JXTC_PANGLU:
@@ -2257,15 +2363,82 @@ UINT8 PlatMaskManage(UINT8 MaskType, UINT16 DeviceId, UINT16 MaskId, UINT8* data
/*视频清客驱动状态为无人或者无效，红灯码位无效*/
}
break;
case MASK_TYPE_PSD_EXCEPT_OPEN: /*站台屏蔽门异常打开状态码位-给ZC/ATS用*/
cPsdExceptOpenState = GePsdExceptOpenState(DeviceId);
if (PSD_EXCEPT_OPEN_NO == cPsdExceptOpenState)
case MASK_TYPE_PSD_EXCEPT: /*站台屏蔽门异常状态码位-给ATS/ZC用*/
cPsdExceptState = GePsdExceptState(DeviceId);
if (PSD_EXCEPT_NO == cPsdExceptState)
{
SetMaskValue(MaskId, dataBuf); /*PSD未异常打开，码位组1*/
SetMaskValue(MaskId, dataBuf); /*PSD未异常，码位组1*/
}
else
{
/*PSD异常打开，码位组0*/
/*PSD异常，码位组0*/
}
break;
case MASK_TYPE_PSD_JXTCPANGLU_FAULT:
chJXTCMutualLockFaultState= GetPsdJXTCMutualLockFaultState(DeviceId);
if (JXTC_MUTUALLOCKFAULT_YES == chJXTCMutualLockFaultState)
{/*间隙探测互锁解除按钮故障*/
SetMaskValue(MaskId, dataBuf);
}
else
{/*间隙探测互锁解除按钮未故障*/
}
break;
case MASK_TYPE_PSD_IBP_STATE:
chIBPBtnState= GetPsdButtonIbpState(DeviceId);
if (PLATFORM_DEPAR_BUTTON_STATE_VALID == chIBPBtnState)
{/*IBP盘发车按钮有效*/
SetMaskValue(MaskId, dataBuf);
}
else
{/*IBP盘发车按钮无效*/
}
break;
case MASK_TYPE_PSD_IBP_FAULT:
chIBPBtnFaultState= GetPsdButtonIbpState(DeviceId);
if (PLATFORM_DEPAR_BUTTON_STATE_FAULT == chIBPBtnFaultState)
{/*IBP盘发车按钮故障*/
SetMaskValue(MaskId, dataBuf);
}
else
{/*IBP盘发车按钮未故障*/
}
break;
case MASK_TYPE_PSD_JXTC_STATE:
if (JXTC_MUTUALLOCK_REMOVE_YES == GetJXTCMutualLockState(DeviceId))
{/*间隙探测互锁解除*/
}
else
{/*间隙探测未互锁解除*/
if (CI_TIME_OUT == SystemOverTimeCheck(GetStartDetectionCycNum(DeviceId), GetGapDetectCount()))
{
/*间隙探测开始探测有效*/
SetMaskValue(MaskId, dataBuf);
}
else
{
/*未开始计时或计时未到，给现地和ATS发送未启动*/
}
/* 间隙探测停止时间内*/
if(CI_TIME_OUT == SystemOverTimeCheck(GetStopDetectionCycNum(DeviceId), GetwJXTCStopDetectTime()))
{
/*间隙探测停止时间已经到了*/
}
else
{
if(0u == GetStopDetectionCycNum(DeviceId))
{
/*未开始计时*/
}
else
{
/* 间隙探测停止时间未到*/
SetMaskValue(MaskId, dataBuf);
}
}
}
break;
default:
@@ -2342,6 +2515,11 @@ UINT8 WashManchineMaskManage(UINT8 MaskType, UINT16 DeviceId, UINT16 MaskId, UIN
{
UINT8 returnValue = CI_SUCCESS;/*返回值默认成功*/
UINT8 chWashMachineReadyState = 0U;/*洗车机就绪状态*/
UINT8 washAdhesionState = 0U; /*洗车线洗车同意按钮粘连状态*/
UINT8 dccWashAdhesionState = 0U; /*DCC洗车同意按钮粘连状态*/
UINT8 passWashAdhesionState = 0U; /*洗车线反向通过同意按钮粘连状态*/
UINT8 dccPassWashAdhesionState = 0U; /*DCC反向通过同意按钮粘连*/
UINT8 chWashModeState = 0U;/*洗车机工作模式*/
switch (MaskType)
@@ -2367,6 +2545,50 @@ UINT8 WashManchineMaskManage(UINT8 MaskType, UINT16 DeviceId, UINT16 MaskId, UIN
{
}
break;
case MASK_TYPE_WASHMACHINE_ZNTBUTTN:
/*降级模式洗车线洗车同意按钮粘连码位*/
washAdhesionState = GetDownWashAllowErrState(DeviceId);
if (WASH_BUTTON_STATE_ERR_NO == washAdhesionState)
{
SetMaskValue(MaskId, dataBuf);
}
else
{
}
break;
case MASK_TYPE_DCCWASHACHINE_ZNTBUTTN:
/*降级模式DCC洗车同意按钮粘连码位*/
dccWashAdhesionState = GetDownDccWashAllowErrState(DeviceId);
if (WASH_BUTTON_STATE_ERR_NO == dccWashAdhesionState)
{
SetMaskValue(MaskId, dataBuf);
}
else
{
}
break;
case MASK_TYPE_PASSWASHMACHINE_ZNTBUTTN:
/*降级模式洗车线洗车反向通过同意按钮粘连码位*/
passWashAdhesionState = GetDownWashAllowPassErrState(DeviceId);
if (WASH_BUTTON_STATE_ERR_NO == passWashAdhesionState)
{
SetMaskValue(MaskId, dataBuf);
}
else
{
}
break;
case MASK_TYPE_DCCPASSWASHMACHINE_ZNTBUTTN:
/*降级模式DCC洗车反向通过同意按钮粘连码位*/
dccPassWashAdhesionState = GetDownDccWashAllowPassErrState(DeviceId);
if (WASH_BUTTON_STATE_ERR_NO == dccPassWashAdhesionState)
{
SetMaskValue(MaskId, dataBuf);
}
else
{
}
break;
default:
returnValue = CI_ERROR;
break;
@@ -2790,10 +3012,8 @@ UINT8 OverlapValidMaskCheck(const UINT16 rtOverlapLockedId)
OverlapConditionSwitchStruct* condSwiDataIdBuf = NULL;
/* overlap防护道岔 */
UINT8 protectSwitchSum = 0u;
UINT8 lockStatus = 0u;
UINT8 ylockStatus = 0u;/*临时变量：引导总锁状态*/
UINT8 fengsuoStateus = 0u;/*临时变量：封锁状态*/
UINT8 switchPos = 0u;/*临时变量：道岔位置*/
OverlapProtectSwitchStruct* protSwiDataIdBuf = NULL;
/*防淹门*/
@@ -2844,7 +3064,9 @@ UINT8 OverlapValidMaskCheck(const UINT16 rtOverlapLockedId)
{ /* overlap道岔 */
checkSum = GetOverlapSwitchSum(rtOverlapLockedId);
condSwiDataIdBuf = GetOverlapCondSwitchStruct(rtOverlapLockedId);
for (ii = 0u; ii < checkSum; ii++)
if (NULL != condSwiDataIdBuf)
{
for (ii = 0U; ii < checkSum; ii++)
{
if ((SWITCH_LOCK_YINZONG_NO == GetSwitchYLockState(condSwiDataIdBuf[ii].SwitchId)) &&
(SWITCH_LOCK_FENGSUO_NO == GetSwitchFLockState(condSwiDataIdBuf[ii].SwitchId)) &&
@@ -2862,26 +3084,30 @@ UINT8 OverlapValidMaskCheck(const UINT16 rtOverlapLockedId)
}
}
else
{
returnValue = CI_ERROR;
/*异常分支，返回失败*/
}
}
else
{
/*不处理*/
}
if (CI_SUCCESS == returnValue)
{ /*保护区段关联防护道岔*/
{
/*检查保护区段关联防护道岔未引导总锁、未封锁*/
protectSwitchSum = GetOverlapRelatedProtSwitSum(rtOverlapLockedId);
protSwiDataIdBuf = GetOverlapRelatedProtSwitStru(rtOverlapLockedId);
for (ii = 0u; ii < protectSwitchSum; ii++)
if (NULL != protSwiDataIdBuf)
{
for (ii = 0U; ii < protectSwitchSum; ii++)
{
lockStatus = GetSwitchLockStatus(protSwiDataIdBuf[ii].ProtectSwitchId);
ylockStatus = GetSwitchYLockState(protSwiDataIdBuf[ii].ProtectSwitchId);
switchPos = GetSwitchCurPosition(protSwiDataIdBuf[ii].ProtectSwitchId);
fengsuoStateus = GetSwitchFLockState(protSwiDataIdBuf[ii].ProtectSwitchId);
if ((SWITCH_LOCK_YINZONG_NO == ylockStatus)
&& ((((SWITCH_LOCK_STATUS_PROTECT == lockStatus) || (SWITCH_LOCK_STATUS_DAP == lockStatus)) && (protSwiDataIdBuf[ii].ProtectPosition == switchPos))
|| (FUNC_SWITCH_ON == cSndSideProFuncSwitch))
&& (SWITCH_LOCK_FENGSUO_NO == fengsuoStateus))
if ((SWITCH_LOCK_YINZONG_NO == ylockStatus) && (SWITCH_LOCK_FENGSUO_NO == fengsuoStateus))
{
/* 保护区段关联防护道岔：非引导总锁且防护锁闭且（防护道岔位置正确或支持二级侧防）且未封锁，才发送码位*/
/*防护道岔未引导总锁、未封锁*/
}
else
{
@@ -2891,6 +3117,58 @@ UINT8 OverlapValidMaskCheck(const UINT16 rtOverlapLockedId)
}
}
else
{
returnValue = CI_ERROR;
/*异常分支，返回失败*/
}
}
else
{
/*不处理*/
}
/*保护区段关联防护道岔【位置正确】*/
if (CI_SUCCESS == returnValue)
{
devId = 0U;
devState = 0U;
returnValue = OvlpRelatedProtSwitchPosCheck(rtOverlapLockedId, &devId, &devState);
if (CI_SUCCESS == returnValue)
{
/* 通过检查 */
}
else
{
/* 记录故障码 */
SetErrorData(functionId, CI_DEVICE_TYPE_SWITCH, devId, ETYPE_SWT_POSTION_STATE, devState, ESEND_LEVEL_ZERO);
/* 失败返回 */
returnValue = CI_ERROR;
}
}
else
{
/*不处理*/
}
/*保护区段关联防护道岔【防护锁闭】或【单锁且防护锁闭】*/
if (CI_SUCCESS == returnValue)
{
devId = 0U;
devState = 0U;
returnValue = OvlpRelatedProtSwitchLockCheck(rtOverlapLockedId, &devId, &devState);
if (CI_SUCCESS == returnValue)
{
/* 通过检查 */
}
else
{
/* 记录故障码 */
SetErrorData(functionId, CI_DEVICE_TYPE_SWITCH, devId, ETYPE_SWT_LOCK_STATUS, devState, ESEND_LEVEL_ZERO);
/* 失败返回 */
returnValue = CI_ERROR;
}
}
else
{
/*不处理*/
}
@@ -3036,12 +3314,21 @@ void PackCiToCimCommData(void)
UINT8 cCommVobcNum = 0U; /*通信车数量*/
UINT8 cVobcToCiDataSum = 0U;
VobcToCiDataStruct* pstrVobcToCiData = NULL;
UINT8 chlocalMode = RC_WORK_MODE_TO_AIM_CI;
UINT32 dwCommBadCycCount = 0U;
cLocalWorkMode = GetLocalRcWorkMode();
cLocalCiId = GetSystemParaLocalCiId();
dwCurCycNum = Get2oo2CurCycleNum();
ciToCimDataBuffer[i++] = cLocalWorkMode;
if (RC_WORK_MODE_CI == cLocalWorkMode)
{
chlocalMode = RC_WORK_MODE_TO_AIM_CI;
}
else
{
chlocalMode = RC_WORK_MODE_TO_AIM_TIOC;
}
ciToCimDataBuffer[i++] = chlocalMode;
ciToCimDataBuffer[i++] = cLocalCiId;
transmitDevIndex = i;
@@ -3562,10 +3849,10 @@ void DealAutoReturnButtonMask_Vir(UINT16 DeviceId, UINT16 MaskId, UINT8* pdataBu
UINT8 virtualZDZFBelongCiId = 0U;
UINT8 virtualZDZFDevType = 0U;
UINT8 virtualZDZFButtonState = 0U;
UINT8 chRtnIndicatorDevId = 0U;/*无人折返报警灯设备ID*/
UINT16 wRtnIndicatorDevId = 0U;/*无人折返报警灯设备ID*/
UINT8 chNonRrnAdhesionState = 0U;/*无人折返按钮粘连状态*/
chRtnIndicatorDevId = GetIndicatorRelNonReturnId(DeviceId);
wRtnIndicatorDevId = GetIndicatorRelNonReturnId(DeviceId);
virtualZDZFBelongCiId = GetVirtualZDZFBelongCiId();
virtualZDZFDevType = GetVirtualZDZFDevType();
virtualZDZFButtonState = GetVirtualZDZFButtonState();
@@ -3598,7 +3885,7 @@ void DealAutoReturnButtonMask_Vir(UINT16 DeviceId, UINT16 MaskId, UINT8* pdataBu
else
{
RelayCollState = GetRelayCollState(pRelayIdBuf[2]);
chNonRrnAdhesionState = GetNonRtnAdhesionState(chRtnIndicatorDevId);
chNonRrnAdhesionState = GetNonRtnAdhesionState(wRtnIndicatorDevId);
if ((RELAY_STATE_UP == RelayCollState) && (RTN_RELAY_ADHESION_NO == chNonRrnAdhesionState))
{/*无人折返按钮继电器吸起*/
SetMaskValue(MaskId, pdataBuf);
@@ -4167,6 +4454,7 @@ void PackCiToCimDeviceData(void)
ii += 2u;
ciToCimDataBuffer[ii] = pPsdData[deviceId].cPsdExceptOpenState; /*屏蔽门异常打开状态：0x55-异常打开，0xAA-未异常打开*/
ii++;
ciToCimDataBuffer[ii++] = pPsdData[deviceId].ibpButtonState; /*IBP盘发车按钮状态*/
}
@@ -4272,9 +4560,18 @@ void PackCiToCimDeviceData(void)
ciToCimDataBuffer[ii++] = pWashMachineData[deviceId].WashMachineWorkModeDrvtState;/*洗车机工作模式设置驱动状态(动态字段:驱动)*/
ciToCimDataBuffer[ii++] = pWashMachineData[deviceId].WashModeState;/*洗车模式(动态字段:采集)*/
ciToCimDataBuffer[ii++] = pWashMachineData[deviceId].chSetWashWorkModeBack;/*设置洗车机工作模式反馈*/
ciToCimDataBuffer[ii++] = pWashMachineData[deviceId].chDownWashAllowState;/*降级模式洗车同意状态(动态字段:采集)*/
ciToCimDataBuffer[ii++] = pWashMachineData[deviceId].chDownWashAllowPassState;/*降级模式洗车同意通过状态(动态字段:采集)*/
ciToCimDataBuffer[ii++] = pWashMachineData[deviceId].chDownWashAllowState;/**降级模式洗车同意状态(动态字段:融合)*/
ciToCimDataBuffer[ii++] = pWashMachineData[deviceId].chDownWashAllowPassState;/*降级模式洗车同意通过状态(动态字段:融合)*/
ciToCimDataBuffer[ii++] = pWashMachineData[deviceId].chDownWashReqState;/*降级模式洗车请求状态*/
ciToCimDataBuffer[ii++] = pWashMachineData[deviceId].chDownWashPassReqState;/*降级模式反向洗车请求状态*/
ciToCimDataBuffer[ii++] = pWashMachineData[deviceId].chDownWashAllowColState;/*降级模式洗车线洗车同意状态*/
ciToCimDataBuffer[ii++] = pWashMachineData[deviceId].chDownDccWashAllowColState;/*降级模式DCC洗车同意状态*/
ciToCimDataBuffer[ii++] = pWashMachineData[deviceId].chDownWashAllowErrState;/*降级模式洗车线洗车同意粘连状态*/
ciToCimDataBuffer[ii++] = pWashMachineData[deviceId].chDownDccWashAllowErrState;/*降级模式DCC洗车同意粘连状态*/
ciToCimDataBuffer[ii++] = pWashMachineData[deviceId].chDownWashAllowPassColState;/*降级模式洗车线洗车同意反向通过状态*/
ciToCimDataBuffer[ii++] = pWashMachineData[deviceId].chDownDccWashAllowPassColState;/*降级模式DCC洗车同意反向通过状态*/
ciToCimDataBuffer[ii++] = pWashMachineData[deviceId].chDownWashAllowPassErrState;/*降级模式洗车线洗车同意反向通过粘连状态*/
ciToCimDataBuffer[ii++] = pWashMachineData[deviceId].chDownDccWashAllowPassErrState;/*降级模式DCC洗车同意反向通过粘连状态*/
}
@@ -4591,6 +4888,7 @@ UINT8 ParasePlantCCUHeartFrame(UINT8* dataBuf)
UINT16 curCoup = 0U;
UINT32 tempera = 0U;
UINT8 flagEEPROM = 0U;
UINT32 ccuSyn = 0u;/*通控请求序列号*/
UINT32 crcRecv = 0U;
/*接收到平台心跳帧*/
@@ -4632,6 +4930,9 @@ UINT8 ParasePlantCCUHeartFrame(UINT8* dataBuf)
/*EEPROM存储检验*/
flagEEPROM = dataBuf[ii];
ii += 1u;
/*通控请求序列号*/
ccuSyn = LongFromChar(&dataBuf[ii]);
ii += 4u;
/*CRC校验码*/
crcRecv = LongFromChar(&dataBuf[ii]); /*获取CRC*/
ii += 4u;
@@ -4641,7 +4942,7 @@ UINT8 ParasePlantCCUHeartFrame(UINT8* dataBuf)
{
/*计算CRC校验码,除长度2和CRC4*/
crcCheck = Tioc_PlatCommonCrc32(&dataBuf[2], 22U);
crcCheck = Tioc_PlatCommonCrc32(&dataBuf[2], 26U);
if (crcCheck == crcRecv)
@@ -4732,6 +5033,7 @@ UINT8 ParasePlantSEBHeartFrame(UINT8* dataBuf)
UINT8 boardSEBId = 0U;/*扩展板ID */
UINT16 dataLengthRcv = 0U; /*帧长度*/
UINT32 sebSyn = 0u; /*串口请求序列号*/
UINT32 crcRecv = 0U; /*CRC校验码*/
UINT32 rcvCyc = 0U; /*周期号*/
/*接收到平台心跳帧*/
@@ -4755,17 +5057,20 @@ UINT8 ParasePlantSEBHeartFrame(UINT8* dataBuf)
/*数据内容 3字节*/
ii += 5U;
/*串口请求序列号*/
sebSyn = LongFromChar(&dataBuf[ii]);
ii += 4U;
/*CRC校验码*/
crcRecv = LongFromChar(&dataBuf[ii]); /*获取CRC*/
ii += 4u;
/*长度校验*/ /*总长度16字节*/
/*长度校验*/ /*总长度20字节*/
if (dataLengthRcv == ii - 2U)
{
/*计算CRC校验码,除长度2和CRC4*/
crcCheck = Tioc_PlatCommonCrc32(&dataBuf[2], 10U);
crcCheck = Tioc_PlatCommonCrc32(&dataBuf[2], 14U);
if (crcCheck == crcRecv)
TSCP/src/APP/ciapp/ParsePack/ParsePackDefine.h
+1 -1
View File
@@ -38,7 +38,7 @@
/*CI 和 CI*/
#define RECVCI_CMD_DATA_STRU_SUM_MAX ((UINT16)100) /*CI接受其他联锁数据结构体数组最大值*/
#define SENDCI_CMD_DATA_STRU_SUM_MAX ((UINT16)100) /*CI发送到其他联锁数据结构体数组最大值*/
#define CI_TO_CI_DATA_LEN_MAX ((UINT16)5700) /*联锁到CI组包数据最大值*/
#define CI_TO_CI_DATA_LEN_MAX ((UINT16)5900) /*联锁到CI组包数据最大值*/
#define CI_TO_CI_AREA_SNOW_SUM_MAX ((UINT8)4) /*相邻RC间发送的区间雨雪数量最大值*/
#define CI_TO_CI_LEAVE_LOGSEC_ROUTE_NUM ((UINT16)100) /*相邻RC间发送的离去逻辑区段检查数量最大值*/
TSCP/src/APP/ciapp/ParsePack/ParsePackManage.c
+89 -33
View File
@@ -200,7 +200,6 @@ UINT8 ParseOtherSysToCiData(void)
UINT8 devId = 0u;
UINT8 ocInCiId = 0u;
UINT8 locCiId = 0u;
UINT32 curSysCount = 0u; /*当前系统周期*/
UINT8 srcDevTypeIdBuff[2] = { 0 }; /*源设备类型ID数组*/
UINT8 srcLogicIdBuff[2] = { 0 }; /*源逻辑ID数组*/
UINT8 isBreak = 0u; /*退出遍历*/
@@ -214,7 +213,6 @@ UINT8 ParseOtherSysToCiData(void)
cWorkMode = GetLocalRcWorkMode();
curSysCount = MSCP_GetSysCount();
wTiocRcvAtsGtwyDevTypeId = GetTiocTrnsmtGtwyDevTypeId();
while (1)
@@ -274,6 +272,7 @@ UINT8 ParseOtherSysToCiData(void)
{
debug_infor_printf((const)"\nATS_RECV:%d", dataLen);
debug_out_array(0xAA, data, (UINT16)dataLen);
checkResult = ParseAtsOrXianDiToCiDataFrame(data, (UINT16)dataLen, CI_SYSTEM_TYPE_ATS, devId);
chCurSystemAreaState = GetLocalCiBackUpPattern();
@@ -290,9 +289,10 @@ UINT8 ParseOtherSysToCiData(void)
{
debug_infor_printf((const)"\nGATEWAY_RECV:%d", dataLen);
debug_out_array(0xAA, data, (UINT16)dataLen);
checkResult = ParseGateWayToCiDataFrame(data, (UINT16)dataLen);
}
debug_out_array(0xAA, data, (UINT16)dataLen);
if (CI_ERROR == checkResult)
{/*解析失败*/
@@ -337,7 +337,7 @@ UINT8 ParseOtherSysToCiData(void)
/*解析CI数据*/
#ifdef LOGPRINT/*日志打印宏*/
#ifdef PLATFORM_2OO2/*2oo2平台打印*/
debug_infor_printf((const)"\nCI_RECV:%d", (UINT16)dataLen);
debug_infor_printf((const)"\nCI_RECV:%d, SrcDev[0x%x]", (UINT16)dataLen, srcDevTypeId);
debug_out_array(0xAA, data, (UINT16)dataLen);
#endif/*平台打印结束*/
@@ -345,7 +345,7 @@ UINT8 ParseOtherSysToCiData(void)
cLocalDevType = Get2oo2SheBeiType();
cLocalCiId = GetSystemParaLocalCiId();
startLockFlag = GetStartLockFlag();
if (devType == cLocalDevType)
if (cLocalCiId != devId)
{
/*解析RC间或CI间数据*/
/*判断是否是同一条线路的联锁，不同线路联锁使用互联互通联锁接口，同一条线路使用自家联锁接口*/
@@ -354,17 +354,17 @@ UINT8 ParseOtherSysToCiData(void)
{
if (CI_START_LOCK_NO == startLockFlag)
{
checkResult = ParseCiToCiDataCheck(data, (UINT16)dataLen, &errorNO_Type); /*相邻CI间数据传输的校验*/
checkResult = ParseCiToCiDataCheck(data, (UINT16)dataLen, &errorNO_Type, srcDevTypeId); /*相邻CI间数据传输的校验*/
if (CI_SUCCESS != checkResult)
{
debug_infor_printf((const)"check parse ci step %d error", errorNO_Type);
}
else
{
checkResult = ParseCiToCiDataFrame(data, (UINT16)dataLen, devId);
checkResult = ParseCiToCiDataFrame(data, (UINT16)dataLen, srcDevTypeId);
if (CI_SUCCESS != checkResult) /*错误*/
{
debug_infor_printf((const)"parse ci id %d error", devId);
debug_infor_printf((const)"parse ci id[0x%x] error", srcDevTypeId);
}
else
{
@@ -381,7 +381,7 @@ UINT8 ParseOtherSysToCiData(void)
checkResult = ParseCiToCiDataFrameHLHT(data, (UINT16)dataLen, devId);
if (CI_ERROR == checkResult) /*错误*/
{
debug_infor_printf((const)"parse hlht ci id %d error", devId);
debug_infor_printf((const)"parse hlht ci id[0x%x] error", srcDevTypeId);
}
else
{
@@ -389,7 +389,7 @@ UINT8 ParseOtherSysToCiData(void)
}
else
{
debug_infor_printf((const)"ci id %d sameLineCi:%d error", devId, sameLineCi);
debug_infor_printf((const)"ci id[0x%x] sameLineCi:%d error", srcDevTypeId, sameLineCi);
}
}
else
@@ -730,6 +730,8 @@ UINT8 PackCiToOtherSysData(void)
UINT8 cLocalDevType = 0U; /*本地设备类型*/
UINT8 cStartLockFlag = 0U; /*上电解锁标志*/
UINT8 cRcWorkMode = 0U;
UINT8 cControlState = 0U; /*主备用状态*/
UINT8 cNearOtherDevType = 0U; /*相邻控区另外一种设备类型*/
cRcWorkMode = GetLocalRcWorkMode();
@@ -962,27 +964,32 @@ UINT8 PackCiToOtherSysData(void)
; /*do nothing*/
}
/*****组CI数据*****/
deviceSum = 0u;
deviceIdBuf = NULL;
deviceSum = GetCiTransmitSpecifySysDevSum(Get2oo2SheBeiType()); /*获取通信CI设备总数*/
deviceIdBuf = GetCiTransmitSpecifySysDevBuf(Get2oo2SheBeiType()); /*获取通信CI设备ID数组*/
if ((deviceSum > 0u) && (deviceIdBuf != NULL))
{ /*通信设备正确*/
for (ii = 0u; ii < deviceSum; ii++)
cLocalDevType = Get2oo2SheBeiType();
cControlState = GetLocalCiBackUpPattern();
cLocalCiId = GetSystemParaLocalCiId();
if (((CI_SYSTEM_TYPE_CI == cLocalDevType) && (SYSTEM_WORK_MODE_MAIN == cControlState))
|| ((CI_SYSTEM_TYPE_RC == cLocalDevType) && ((SYSTEM_WORK_MODE_MAIN == cControlState) || (SYSTEM_WORK_MODE_BACKUP == cControlState))))
{
/*仅CI主用或（RC主用或备用）时，才向RC/CI组包*/
/*****组相邻RC/CI数据*****/
deviceSum = 0U;
deviceIdBuf = NULL;
deviceSum = GetCiTransmitSpecifySysDevSum(cLocalDevType); /*获取通信CI设备总数*/
deviceIdBuf = GetCiTransmitSpecifySysDevBuf(cLocalDevType); /*获取通信CI设备ID数组*/
IsSameLine = IsSameLineCI(GetSystemParaLocalCiId(), deviceIdBuf[ii]);
if ((deviceSum > 0U) && (deviceIdBuf != NULL))
{ /*通信设备正确*/
for (ii = 0U; ii < deviceSum; ii++)
{
IsSameLine = IsSameLineCI(cLocalCiId, deviceIdBuf[ii]);
if (SAME_LINE_YES == IsSameLine)
{
/*组CI数据*/
reVal = PackCiToCiData(deviceIdBuf[ii]);
reVal = PackCiToCiData(cLocalDevType, deviceIdBuf[ii]);
if (CI_ERROR == reVal)
{
/*组包错误*/
debug_infor_printf((const)"\nPackCiToCiData Error: DstDev[0x%x]", (UINT16)(cLocalDevType * 256U) + (UINT16)(deviceIdBuf[ii])); /*组包错误*/
}
else
{
@@ -995,7 +1002,7 @@ UINT8 PackCiToOtherSysData(void)
reVal = PackHLHTCiToCiData(deviceIdBuf[ii]);
if (CI_ERROR == reVal)
{
/*组包错误*/
debug_infor_printf((const)"\nPackHLHTCiToCiData Error: DstDev[0x%x]", (UINT16)(cLocalDevType * 256U) +(UINT16)(deviceIdBuf[ii]));/*组包错误*/
}
else
{
@@ -1009,17 +1016,61 @@ UINT8 PackCiToOtherSysData(void)
}
}
/*组CI-RC数据*/
cStartLockFlag = GetStartLockFlag();
if (CI_START_LOCK_NO == cStartLockFlag)
{
cSysType = GetSystemWorkType();
cLocalCiType = GetLocalCiType();
if ((SYSTEM_WORK_MODE_ALL == cSysType) && ((CI_TYPE_ZX == cLocalCiType) || (CI_TYPE_SCX == cLocalCiType)))
if (SYSTEM_WORK_MODE_ALL == cSysType)
{
/*****双系统，组相邻控区另一个设备数据*****/
if (CI_SYSTEM_TYPE_CI == cLocalDevType)
{
cNearOtherDevType = CI_SYSTEM_TYPE_RC;
}
else
{
cNearOtherDevType = CI_SYSTEM_TYPE_CI;
}
deviceSum = 0U;
deviceIdBuf = NULL;
deviceSum = GetCiTransmitSpecifySysDevSum(cNearOtherDevType); /*获取通信RC/CI设备总数*/
deviceIdBuf = GetCiTransmitSpecifySysDevBuf(cNearOtherDevType); /*获取通信RC/CI设备ID数组*/
if ((0U < deviceSum) && (NULL != deviceIdBuf))
{
/*通信设备正确*/
for (ii = 0U; ii < deviceSum; ii++)
{
IsSameLine = IsSameLineCI(cLocalCiId, deviceIdBuf[ii]);
if ((SAME_LINE_YES == IsSameLine) && (cLocalCiId != deviceIdBuf[ii]))
{
/*组相邻RC/CI数据*/
reVal = PackCiToCiData(cNearOtherDevType, deviceIdBuf[ii]);
if (CI_ERROR == reVal)
{
debug_infor_printf((const)"\nPackCiToCiData Error: DstDev[0x%x]", (UINT16)(cNearOtherDevType * 256U) +(UINT16)(deviceIdBuf[ii])); /*组包错误*/
}
else
{
;
}
}
else
{
/*跨线设备及同控区RC/CI不组包，*/
}
}
}
else
{
/*不处理*/
}
/*组本控区CI-RC数据*/
cStartLockFlag = GetStartLockFlag();
if ((CI_START_LOCK_NO == cStartLockFlag) && ((CI_TYPE_ZX == cLocalCiType) || (CI_TYPE_SCX == cLocalCiType)))
{
/*双系统下的正线和试车线才进行本控区CI-RC的组包*/
cLocalCiId = GetSystemParaLocalCiId();
cLocalDevType = Get2oo2SheBeiType();
if (CI_SYSTEM_TYPE_CI == cLocalDevType)
{
reVal = PackCiToLocalRcDataFrame(cLocalCiId); /*CI给本控区RC组包*/
@@ -1047,12 +1098,17 @@ UINT8 PackCiToOtherSysData(void)
}
else
{
/*单系统或场段不涉及，不处理*/
/*未上电，不组包*/
}
}
else
{
/*未上电，不组包*/
/*不处理*/
}
}
else
{
/*CI备用或不可用、RC不可用时，不向RC/CI组包*/
}
/*****组LEU数据*****/
TSCP/src/APP/ciapp/ParsePack/ParsePackOcData.c
+298 -27
View File
@@ -94,7 +94,10 @@ UINT16 ConvertSigDrvColorToSigDrvCmd(const UINT16 signalId, const UINT8 drvColor
UINT8 ocHasBlue = 0u;
UINT8 funSwitchGreenYellow = GetCiFunctionSwitchConfig(CI_FUNCTION_SWITCH_SHOW_SIGNAL_GreenYellow);/*显示绿黄功能开关是否打开*/
UINT8 funSwitchALLCloseUseBlue = GetCiFunctionSwitchConfig(FUNC_SWITCH_ZX_ALLCLOSE_USEBLUE);/*杭德正线灭灯均转蓝灯功能开关*/
UINT8 ciType = GetLocalCiType();
UINT8 ciType = 0U;
UINT8 chSigBelongRtuId = 0U;
chSigBelongRtuId = GetSignalBelongVirCiId(signalId);
ciType = GetLocalVirCiType(chSigBelongRtuId);
switch (drvColor)
{
case SIGNAL_DRIVECOLOUR_RED:/*红*/
@@ -247,6 +250,15 @@ UINT8 PackCiToOcData( UINT8 deviceId)
UINT16 deviceSum = 0u;
UINT16 kqChangeCommand = 0u;/*控权切换命令*/
UINT8 chCurSystemAreaState = 0u; /*主备用模式*/
UINT8 chMainCotrolOCId = 0U;
UINT8 chControlCmd = 0U;
UINT8 chControlCmdNum = 0u;
UINT16 cmdIndex = 0u;
UINT8 chOcOutControlCmd = 0u;
UINT8 chOcFindPostionCmd = 0u;
UINT8 chLocalCiOCSswitch = 0u;
chLocalCiOCSswitch = GetLocalCiOCSswitch();
#if 0
QueueClear(CiToOcDataQueue); /*清队列*/
#endif
@@ -325,7 +337,25 @@ UINT8 PackCiToOcData( UINT8 deviceId)
ShortToChar(pOcData->OcDevices[kk].DeviceId, &Ci2OcDataBuffer[ii]);
ii += 2u;
drvPos = GetSwitchDrivePostion(pOcData->OcDevices[kk].DeviceId);
chMainCotrolOCId = GetSwitchMainCotrolOCId(pOcData->OcDevices[kk].DeviceId);
if ((chMainCotrolOCId == pOcData->OcId)||(OC_S_OFF == chLocalCiOCSswitch))
{/*当前有主控OC或OC-S功能关闭*/
drvCmd = ConvertSwitchDrvPosToSwDrvCmd(drvPos);
}
else
{/*有OC-S且当前无主控，需寻表*/
drvCmd = OC_SWITCH_DRIVE_POS_KEEP;/*保持*/
chOcOutControlCmd = GetSwitchThisOcOutControlCmd(pOcData->OcDevices[kk].DeviceId, pOcData->OcId);
if (MAIN_CONTROL == chOcOutControlCmd)
{
chOcFindPostionCmd = GetSwitchThisOcFindPostionCmd(pOcData->OcDevices[kk].DeviceId, pOcData->OcId);
drvCmd = ConvertSwitchFindPosToSwFindCmd(chOcFindPostionCmd);
}
}
ShortToChar(drvCmd, &Ci2OcDataBuffer[ii]);
ii += 2u;
break;
@@ -636,6 +666,50 @@ UINT8 PackCiToOcData( UINT8 deviceId)
ii += ciSorToOcIdx;
}
if (CI_SUCCESS == retVal)
{
cmdIndex = ii;
ii += 1u;
for (kk = 0u; kk < pOcData->OcDeviceNum; kk++)/*遍历设备*/
{
switch (pOcData->OcDevices[kk].DeviceType)
{
case CI_DEVICE_TYPE_SWITCH:/*道岔设备*/
{
ShortToChar(pOcData->OcDevices[kk].DeviceId, &Ci2OcDataBuffer[ii]);
ii += 2u;
if (OC_S_ON == chLocalCiOCSswitch)
{/*OS-S开关打开*/
chControlCmd = GetSwitchThisOcOutControlCmd(pOcData->OcDevices[kk].DeviceId, pOcData->OcId);
if ((MAIN_CONTROL == chControlCmd) || (STANDBY_CONTROL == chControlCmd) || (NO_CONTROL_FUN == chControlCmd))
{
Ci2OcDataBuffer[ii] = chControlCmd;
}
else
{
Ci2OcDataBuffer[ii] = STANDBY_CONTROL;
}
}
else
{/*OC-S开关关闭*/
Ci2OcDataBuffer[ii] = NO_CONTROL_FUN;
}
ii += 1u;
chControlCmdNum++;
break;
}
default:
{/*无执行*/
}
}
}
Ci2OcDataBuffer[cmdIndex]= chControlCmdNum;/*设备数量*/
}
#if 0 /*屏蔽型式实验，以后有需要再打开*/
if (curCycleNum == xingshiTestStartCycle && 1 == xingshiTestStart)
{
@@ -1094,8 +1168,6 @@ UINT8 ParseOcToCiDataFrame(const UINT8* dataBuf, const UINT16 dataLength,const U
UINT16 ocName = 0u; /*与ci通信的oc Name 0x46*/
UINT16 wCiName = 0U; /*本联锁设备编号 0x3C+ID 或 0x3D+ID*/
UINT8 headRet = HLHT_HEAD_ERROR;
UINT8* sourceId = NULL; /*源ID*/
UINT32 curntCycleNo = 0u; /*当前周期号*/
HLHTGALInfoStruct hlhtGalHead= {0u};
INT32 ocInfoRemainValidity = 0;
@@ -1126,6 +1198,10 @@ UINT8 ParseOcToCiDataFrame(const UINT8* dataBuf, const UINT16 dataLength,const U
UINT32 dwUpToMainCyc = 0U;/*本机升主机周期号*/
UINT32 CiRecvOcSN = 0U;/*同步的CI数据中OC周期号*/
HLHTHeadContextStru* pstrHlhtHeadCtx = NULL; /*CI同步的互联互通报文头上下文数据*/
UINT32 dwMainStandbyState = 0U;
UINT8 chSwitchBelongOThisOCRet = 0U;
(void)CommonMemSet(pTmpOcToCiData, (UINT32)sizeof(OcToCiOriginDataStruct),0U, (UINT32)sizeof(OcToCiOriginDataStruct));/*清内存，防止脏数据*/
chMainWorckMode = GetLocalCiBackUpPattern();
dwUpToMainCyc = GetSystemUpdateMainUseCycNum();
@@ -1159,9 +1235,6 @@ UINT8 ParseOcToCiDataFrame(const UINT8* dataBuf, const UINT16 dataLength,const U
if (CI_SUCCESS == retVal)
{
/* 暂无项目使用OC100、不支持OC24.1 */
sourceId = GetCiTransmitSpecifySysDevBuf(CI_SYSTEM_TYPE_OC);/*获取与本联锁通信的OC的ID*/
ii+=4u;/*跳4个字节，以后oc处理*/
/*解析通用消息包头*/
hlhtGalHead.devInterInfoType = ShortFromChar(&dataBuf[ii]);
ii += 2u;
@@ -1215,7 +1288,7 @@ UINT8 ParseOcToCiDataFrame(const UINT8* dataBuf, const UINT16 dataLength,const U
/*2.接收对方记录的本方周期号大于等于升主周期号 或 同步的主机CI与OC数据中OC周期号晚于当前OC发送*/
if (((hlhtGalHead.recvOppMsgSN >= dwUpToMainCyc)
|| (0U != CiRecvOcSN) && (CiRecvOcSN <hlhtGalHead.crntOwnMsgSN))
&& (0U < ocInfoRemainValidity))
&& (0 < ocInfoRemainValidity))
{
chUsableCycCheck = CI_SUCCESS;
}
@@ -1258,9 +1331,9 @@ UINT8 ParseOcToCiDataFrame(const UINT8* dataBuf, const UINT16 dataLength,const U
{
tmpDeviceId = ShortFromChar(&dataBuf[ii]); /*设备Id 2B*/
ii += 2u;
chDevBelongOC = (UINT8)GetSwitchBelongOcId(tmpDeviceId);
chSwitchBelongOThisOCRet = (UINT8)GetSwitchWhetherBelongThisOc(tmpDeviceId, systemId);
chDevBelongCI = GetSwitchBelongCiId(tmpDeviceId);
if ((chDevBelongOC != systemId)||(chDevBelongCI != localCiId))
if ((CI_SUCCESS != chSwitchBelongOThisOCRet)||(chDevBelongCI != localCiId))
{
retVal = CI_ERROR;
debug_infor_printf((const)"Swicth devId:%d Belong OC/CI Error\n", tmpDeviceId);
@@ -1274,7 +1347,8 @@ UINT8 ParseOcToCiDataFrame(const UINT8* dataBuf, const UINT16 dataLength,const U
|| (OC_SWITCH_POSITION_MOVE == tmpDeviceState))
{
pTmpOcToCiData->OcDevices[j].chSwitchIncldeZzjNum = dataBuf[ii++];
if (MAX_OC_SWITCH_INCLUDE_ZZJ_NUM >= pTmpOcToCiData->OcDevices[j].chSwitchIncldeZzjNum)
if ((MAX_OC_SWITCH_INCLUDE_ZZJ_NUM >= pTmpOcToCiData->OcDevices[j].chSwitchIncldeZzjNum)
&&(0U <pTmpOcToCiData->OcDevices[j].chSwitchIncldeZzjNum))
{
for (chZzjStateIndex = 0U; chZzjStateIndex < pTmpOcToCiData->OcDevices[j].chSwitchIncldeZzjNum; chZzjStateIndex++)
{
@@ -1292,7 +1366,7 @@ UINT8 ParseOcToCiDataFrame(const UINT8* dataBuf, const UINT16 dataLength,const U
else
{
retVal = CI_ERROR;
debug_infor_printf((const)"SwitchID %d ZZJnum%d, exceed max:%d \n", tmpDeviceId, pTmpOcToCiData->OcDevices[j].chSwitchIncldeZzjNum, MAX_OC_SWITCH_INCLUDE_ZZJ_NUM);
debug_infor_printf((const)"SwitchID %d ZZJnum%d, max:%d \n", tmpDeviceId, pTmpOcToCiData->OcDevices[j].chSwitchIncldeZzjNum, MAX_OC_SWITCH_INCLUDE_ZZJ_NUM);
pTmpOcToCiData->OcDevices[j].chSwitchIncldeZzjNum = 0U;
pTmpOcToCiData->OcDevices[j].szSwitchIncldeZzjState[0U] = OC_SWITCH_POSITION_SIKAI;
}
@@ -1308,7 +1382,8 @@ UINT8 ParseOcToCiDataFrame(const UINT8* dataBuf, const UINT16 dataLength,const U
{
tmpSwitchBoardNum = dataBuf[ii++];/*板卡数量*/
if ( MAX_OC_SWITCH_INCLUDE_BOARD_NUM>=tmpSwitchBoardNum)
if ( (MAX_OC_SWITCH_INCLUDE_BOARD_NUM>=tmpSwitchBoardNum)
&&(0U < tmpSwitchBoardNum))
{
pTmpOcToCiData->OcDevices[j].OcId = systemId;/*每个设备的oc id*/
/*板卡地址状态赋值*/
@@ -1322,7 +1397,22 @@ UINT8 ParseOcToCiDataFrame(const UINT8* dataBuf, const UINT16 dataLength,const U
{
switchBoardCheck = CI_SUCCESS; /*存在正常板卡*/
}
dwMainStandbyState = dataBuf[ii++];/*板卡主控状态*/
if ((MAIN_CONTROL == dwMainStandbyState) || (STANDBY_CONTROL == dwMainStandbyState) || (NO_CONTROL_FUN == dwMainStandbyState))
{
pTmpOcToCiData->OcDevices[j].MainStandbyState[k] = dwMainStandbyState;
}
else
{
retVal = CI_ERROR;
debug_infor_printf((const)"Swicth devId %d Board ControlMode ill, mode: %d\n", tmpDeviceId, dwMainStandbyState);
break;
}
}
if (CI_SUCCESS == retVal)
{
pTmpOcToCiData->OcDevices[j].DeviceType = tmpDeviceType; /*设备类型 1B*/
pTmpOcToCiData->OcDevices[j].DeviceId = tmpDeviceId; /*设备Id 2B*/
pTmpOcToCiData->OcDevices[j].DeviceState = tmpDeviceState; /*设备状态 1B*/
@@ -1337,11 +1427,15 @@ UINT8 ParseOcToCiDataFrame(const UINT8* dataBuf, const UINT16 dataLength,const U
}
}
}
else
{
/*设备（信号机、道岔）超出索引，给出调试警告信息*/
retVal = CI_ERROR;
debug_infor_printf((const)"Swicth devId'index %d Board Num exceed Max %d boardNum%d,\n", tmpDeviceId,MAX_OC_SWITCH_INCLUDE_BOARD_NUM ,tmpSwitchBoardNum );
debug_infor_printf((const)"Swicth devId'index %d, Board Num Max %d, Recv boardNum%d,\n", tmpDeviceId,MAX_OC_SWITCH_INCLUDE_BOARD_NUM ,tmpSwitchBoardNum );
}
}
@@ -1574,7 +1668,7 @@ UINT8 ParseOcToCiDataFrame(const UINT8* dataBuf, const UINT16 dataLength,const U
/*************解析SO板卡***********/
if (CI_SUCCESS == retVal)
{
pTmpOcToCiData->OcSOBoardNum += ShortFromChar(&dataBuf[ii]);/*SO板卡数量*/
pTmpOcToCiData->OcSOBoardNum = ShortFromChar(&dataBuf[ii]);/*SO板卡数量*/
ii += 2u;
if (MAX_OC_BOARD_NUM > pTmpOcToCiData->OcSOBoardNum)
{
@@ -1659,6 +1753,49 @@ UINT8 ParseOcToCiDataFrame(const UINT8* dataBuf, const UINT16 dataLength,const U
pTmpOcToCiData->szPlusBox[chPbIndex].chPbType = dataBuf[ii++];
/* 空开状态 */
pTmpOcToCiData->szPlusBox[chPbIndex].chAsState = dataBuf[ii++];
if (OC_PBTYPE_SIGNAL == pTmpOcToCiData->szPlusBox[chPbIndex].chPbType)
{
/*类型为信号机*/
if (((OC_AirSwitchStat_NORMAL == (0xf0 & pTmpOcToCiData->szPlusBox[chPbIndex].chAsState) >> 4)
|| (OC_AirSwitchStat_FAULT == (0xf0 & pTmpOcToCiData->szPlusBox[chPbIndex].chAsState) >> 4))
&& (0U == (0x0f & pTmpOcToCiData->szPlusBox[chPbIndex].chAsState)))
{
; /*空开状态合法*/
}
else
{
retVal = CI_ERROR;
}
}
else if (OC_PBTYPE_ZZJ == pTmpOcToCiData->szPlusBox[chPbIndex].chPbType)
{
/*类型为转辙机*/
if (((OC_AirSwitchStat_NORMAL == (0xf0 & pTmpOcToCiData->szPlusBox[chPbIndex].chAsState) >> 4)
|| (OC_AirSwitchStat_FAULT == (0xf0 & pTmpOcToCiData->szPlusBox[chPbIndex].chAsState) >> 4))
&& ((OC_AirSwitchStat_NORMAL == (0x0f & pTmpOcToCiData->szPlusBox[chPbIndex].chAsState))
|| (OC_AirSwitchStat_FAULT == (0x0f & pTmpOcToCiData->szPlusBox[chPbIndex].chAsState))))
{
; /*空开状态合法*/
}
else
{
retVal = CI_ERROR;
}
}
else
{
retVal = CI_ERROR;
}
/*按照高低4位校验空开状态*/
if(CI_ERROR == retVal)
{
/*给出调试警告信息*/
debug_infor_printf((const)"OcPbId: %d, PbType:%d, AirSwitchStat:%d ERROR\n", pTmpOcToCiData->szPlusBox[chPbIndex].chPbId,
pTmpOcToCiData->szPlusBox[chPbIndex].chPbType,pTmpOcToCiData->szPlusBox[chPbIndex].chAsState);
break;
}
}
}
else
@@ -1828,7 +1965,7 @@ UINT8 ParseOcToCiDataFrame(const UINT8* dataBuf, const UINT16 dataLength,const U
if (CI_SUCCESS == retVal)
{
/*校验数据长度 发送两次长度，内层长度比外层少记录长度的两字节 */
if ((hlhtGalHead.totalDataLen != ii - 35U) || (wApplyDataLenth != ii - 37U))
if ((hlhtGalHead.totalDataLen != ii - 31U) || (wApplyDataLenth != ii - 33U))
{
/* 31为应用数据帧头长度+报文头前4字节 */
retVal = CI_ERROR;
@@ -1874,8 +2011,59 @@ UINT8 ParseOcToCiDataFrame(const UINT8* dataBuf, const UINT16 dataLength,const U
}
else
{
/*给ATS或现地反馈CI-OC数据版本校验失败信息*/
SetCiSendCmdBackInfoData(CI_BACK_DATA_VER_CHECK_FAIL, CI_SYSTEM_TYPE_OC, systemId, 0U, 0U);
/*给ATS或现地反馈OC-CI校验失败信息*/
if (GAL_COMPARE_INFO_TYPE_ERR == (errCode & GAL_COMPARE_INFO_TYPE_ERR))
{
/*给ATS或现地反馈OC-CI数据接口信息类型错误*/
SetErrorData(EFUNC_PARSE_LOCAL_OC2CI_DATA, CI_SYSTEM_TYPE_OC, systemId, ETYPE_COMM_WITH_OC, CI_BACK_DATA_INFO_TYPE_ERR, ESEND_LEVEL_ATS);
}
else if (GAL_COMPARE_SEND_FLAG_ERR == (errCode & GAL_COMPARE_SEND_FLAG_ERR))
{
/*给ATS或现地反馈OC-CI数据发送方标识信息错误*/
SetErrorData(EFUNC_PARSE_LOCAL_OC2CI_DATA, CI_SYSTEM_TYPE_OC, systemId, ETYPE_COMM_WITH_OC, CI_BACK_DATA_SEND_FLAG_ERR, ESEND_LEVEL_ATS);
}
else if (GAL_COMPARE_RECV_FLAG_ERR == (errCode & GAL_COMPARE_RECV_FLAG_ERR))
{
/*给ATS或现地反馈OC-CI数据接收方标志信息错误*/
SetErrorData(EFUNC_PARSE_LOCAL_OC2CI_DATA, CI_SYSTEM_TYPE_OC, systemId, ETYPE_COMM_WITH_OC, CI_BACK_DATA_RECV_FLAG_ERR, ESEND_LEVEL_ATS);
}
else if (GAL_COMPARE_EMAP_VER_COMP_ERR == (errCode & GAL_COMPARE_EMAP_VER_COMP_ERR))
{
/*给ATS或现地反馈OC-CI数据版本校验失败信息*/
SetErrorData(EFUNC_PARSE_LOCAL_OC2CI_DATA, CI_SYSTEM_TYPE_OC, systemId, ETYPE_COMM_WITH_OC, CI_BACK_DATA_VER_CHECK_FAIL, ESEND_LEVEL_ATS);
}
else if (GAL_COMPARE_MSG_BDS_SN_ERR == (errCode & GAL_COMPARE_MSG_BDS_SN_ERR))
{
/*给ATS或现地反馈OC-CI数据本方、对方及收到上一条消息时本方序列号错误*/
SetErrorData(EFUNC_PARSE_LOCAL_OC2CI_DATA, CI_SYSTEM_TYPE_OC, systemId, ETYPE_COMM_WITH_OC, CI_BACK_DATA_MSG_BDS_SN_ERR, ESEND_LEVEL_ATS);
}
#if 0
else if (GAL_COMPARE_MSG_SN_ERR == (errCode & GAL_COMPARE_MSG_SN_ERR))
{
/*给ATS或现地反馈OC-CI数据对方消息序列号及收到上一条消息时本方序列号错误*/
SetErrorData(EFUNC_PARSE_LOCAL_OC2CI_DATA, CI_SYSTEM_TYPE_OC, systemId, ETYPE_COMM_WITH_OC, CI_BACK_DATA_MSG_SN_ERR, ESEND_LEVEL_ATS);
}
#endif
else if (GAL_COMPARE_PROTOCOL_VER_ERR == (errCode & GAL_COMPARE_PROTOCOL_VER_ERR))
{
/*给ATS或现地反馈OC-CI数据协议版本号错误*/
SetErrorData(EFUNC_PARSE_LOCAL_OC2CI_DATA, CI_SYSTEM_TYPE_OC, systemId, ETYPE_COMM_WITH_OC, CI_BACK_DATA_PROTOCOL_VER_ERR, ESEND_LEVEL_ATS);
}
else if (GAL_COMPARE_APP_LEN_ERR == (errCode & GAL_COMPARE_APP_LEN_ERR))
{
/*给ATS或现地反馈OC-CI数据应用层数据长度无效*/
SetErrorData(EFUNC_PARSE_LOCAL_OC2CI_DATA, CI_SYSTEM_TYPE_OC, systemId, ETYPE_COMM_WITH_OC, CI_BACK_DATA_APP_LEN_ERR, ESEND_LEVEL_ATS);
}
else if (GAL_COMPARE_COM_PERIOD == (errCode & GAL_COMPARE_COM_PERIOD))
{
/*给ATS或现地反馈OC-CI数据通信周期错误 */
SetErrorData(EFUNC_PARSE_LOCAL_OC2CI_DATA, CI_SYSTEM_TYPE_OC, systemId, ETYPE_COMM_WITH_OC, CI_BACK_DATA_COM_PERIOD, ESEND_LEVEL_ATS);
}
else
{
/*记录通信故障码*/
SetErrorData(EFUNC_PARSE_LOCAL_OC2CI_DATA, CI_SYSTEM_TYPE_OC, systemId, ETYPE_COMM_WITH_OC, CI_ERROR, ESEND_LEVEL_ATS);
}
retVal = CI_ERROR;
}
}
@@ -1981,10 +2169,10 @@ INT16 GetIndexBySignalId(UINT16 sigId)
/*
* 功能描述： 通过道岔id获取索引
* 参数说明： void
* 返回值 ： void
* 参数说明： UINT16 swId 道岔ID,UINT8 ocId OCID
* 返回值 ： 索引
*/
INT16 GetIndexBySwitchId(UINT16 swId)
INT16 GetIndexBySwitchId(UINT16 swId,UINT16 ocId)
{
INT16 retIndex = -1;
@@ -1992,7 +2180,7 @@ INT16 GetIndexBySwitchId(UINT16 swId)
for (i=0u;i<m_SwitchNum;i++)
{
if (m_Switches[i].DeviceId == swId)
if ((m_Switches[i].DeviceId == swId)&&(ocId == m_Switches[i].OcId))
{
retIndex = (INT16)i;
break;
@@ -2071,23 +2259,28 @@ void InitOcSignals(void)
*/
void InitOcSwitchs(void)
{
UINT16 i = 0u;
UINT16 j = 0u;
UINT8 k = 0U;
SwitchConfigDataStruct *pSwitch = NULL;
UINT8 localCi = 0u;
localCi =GetSystemParaLocalCiId();
m_SwitchNum = 0u;
pSwitch = GetSwitchConfigData();
for (i=0u;i<SWITCH_SUM_MAX;i++)
if (NULL != pSwitch)
{
if ((CI_SWITCH_MAX == m_SwitchNum) || (NULL == pSwitch))
for (i = 0u; i < SWITCH_SUM_MAX; i++)
{
for (j = 0u; j < pSwitch[i].chSwitchBelongOcNum; j++)
{/*线性存储2个OC的临时数据*/
if (CI_SWITCH_MAX == m_SwitchNum)
{
/*超出索引，给出调试警告信息*/
debug_infor_printf((const)"InitOcSwitchs():error");
break;
}
if ((0u < pSwitch[i].SwitchId) && (0u < pSwitch[i].BelongOcId)&&(localCi == pSwitch[i].BelongCiId))
if ((0u < pSwitch[i].SwitchId) && (0u < pSwitch[i].BelongOcId) && (localCi == pSwitch[i].BelongCiId))
{
m_Switches[m_SwitchNum].DeviceId = pSwitch[i].SwitchId;
m_Switches[m_SwitchNum].DeviceType = OC_DEVICE_TYPE_SWITCH;
@@ -2098,10 +2291,18 @@ void InitOcSwitchs(void)
m_Switches[m_SwitchNum].BoardState[k] = 0xffU;
m_Switches[m_SwitchNum].BoardAddr[k] = 0U;
}
m_Switches[m_SwitchNum].OcId = pSwitch[i].BelongOcId;
m_Switches[m_SwitchNum].OcId = pSwitch[i].belongOCConfigData[j].OcId;/**/
m_SwitchNum++;
}
}
if (CI_SWITCH_MAX == m_SwitchNum)
{
debug_infor_printf((const)"InitOcSwitchs():error1");
break;
}
}
}
}
/*
@@ -2158,6 +2359,8 @@ void ConvertOcOriginDataToOcSigSwDev(UINT8 devId)
UINT8 chOcId = 0U;
UINT8 chOcBelongCI = 0U;/*OC所属联锁*/
UINT8 chLocalCiId = GetSystemParaLocalCiId();
UINT8 chSwitchszPlusBoxId = 0U;
UINT8 index = 0u;
for (i=0U;i<m_OcToCiOrginDataNum;i++)/*遍历OC*/
{
chOcId = (UINT8)m_OcToCiOrginDataArr[i].OcId & 0xFFU;
@@ -2198,7 +2401,7 @@ void ConvertOcOriginDataToOcSigSwDev(UINT8 devId)
}
else
{/*道岔*/
ind = GetIndexBySwitchId(pOcDevice->DeviceId);
ind = GetIndexBySwitchId(pOcDevice->DeviceId, pOcDevice->OcId);
if ((ind >=0) && (OC_DEVICE_TYPE_SWITCH == pOcDevice->DeviceType))
{
if ((m_Switches[ind].OcId == pOcDevice->OcId) &&
@@ -2211,6 +2414,8 @@ void ConvertOcOriginDataToOcSigSwDev(UINT8 devId)
{
m_Switches[ind].BoardAddr[k] = pOcDevice->BoardAddr[k];
m_Switches[ind].BoardState[k] = pOcDevice->BoardState[k];
}
/* 保存数据 */
m_Switches[ind].chSwitchIncldeZzjNum = pOcDevice->chSwitchIncldeZzjNum;
@@ -2218,6 +2423,36 @@ void ConvertOcOriginDataToOcSigSwDev(UINT8 devId)
{
m_Switches[ind].szSwitchIncldeZzjState[k] = pOcDevice->szSwitchIncldeZzjState[k];
}
for (k = 0U; k < MAX_OC_SWITCH_INCLUDE_BOARD_NUM; k++)
{/*给所有OC设置主控状态*/
m_Switches[ind].MainStandbyState[k] = pOcDevice->MainStandbyState[k];
}
chSwitchszPlusBoxId = GetSwitchszPlusBoxId(m_Switches[ind].DeviceId, m_Switches[ind].OcId);
for (k = 0U; k < m_OcToCiOrginDataArr[i].chPbNum; k++)
{
if (chSwitchszPlusBoxId == m_OcToCiOrginDataArr[i].szPlusBox[k].chPbId)
{
if (SWITCH_BOX_NORMAL == m_OcToCiOrginDataArr[i].szPlusBox[k].chAsState)
{/*正常*/
SetSwitchOcPlusBoxSateState(m_Switches[ind].DeviceId, m_Switches[ind].OcId, SWITCH_BOX_NORMAL);
}
else
{
SetSwitchOcPlusBoxSateState(m_Switches[ind].DeviceId, m_Switches[ind].OcId, SWITCH_BOX_FAULT);
}
break;
}
}
/*将板卡故障状态导入*/
for (k = 0U; k < m_Switches[ind].BoardNum; k++)
{
SetSwitchThisOCBoardState(m_Switches[ind].DeviceId, m_Switches[ind].OcId, m_Switches[ind].BoardAddr[k], m_Switches[ind].BoardState[k]);
}
}
else
{
@@ -2261,6 +2496,10 @@ void ConvertOcOriginDataToOcSigSwDev(UINT8 devId)
}
}
else
{
@@ -2776,6 +3015,38 @@ UINT8 OcInputSignalStateCheck(const UINT8 chInput)
}
return retVal;
}
/*
* 功能描述： 把道岔寻表状态转化为道岔寻表命令
* 参数说明：
* 输入参数：
* UINT8 drvColor：道岔寻表位置
* 返回值 ： 0:道岔驱动命令转化失败
* 1:道岔寻表命令
* add by mpt 20260330
*/
UINT16 ConvertSwitchFindPosToSwFindCmd(UINT8 chFindPos)
{
UINT16 retDrvCmd = 0u;
switch (chFindPos)
{
case FIND_DINGWEI_CMD:
retDrvCmd = OC_SWITCH_FIND_DINGWEI;
break;
case FIND_FANWEI_CMD:
retDrvCmd = OC_SWITCH_FIND_FANWEI;
break;
case INIT_FIND_CMD:
retDrvCmd = OC_SWITCH_ININ_FIAND;
break;
case NO_FIND_CMD:
retDrvCmd = OC_SWITCH_DRIVE_POS_KEEP;
break;
default:
retDrvCmd = OC_SWITCH_DRIVE_POS_KEEP;
break;
}
return retDrvCmd;
}
TSCP/src/APP/ciapp/ParsePack/ParsePackOcData.h
+20 -7
View File
@@ -55,7 +55,7 @@
#define MAX_OC_PLUS_BOX_NUM ((UINT16)3) /*一个OC支持最大执行电插箱（可达最大值）*/
#define MAX_OC_DEVICE_SWAP_MAX ((UINT16)83) /*一个OC最大切系板卡数量(MAX_OC_DEVICE_NUM/2)（不可达最大值） */
#define MAX_OC_SWITCH_INCLUDE_ZZJ_NUM ((UINT16)10) /*一个道岔支持最大转辙机个数（可达最大值）*/
#define MAX_OC_SWITCH_INCLUDE_BOARD_NUM ((UINT8)10) /*一个道岔支持最大板卡数量（不可达最大值）*/
#define Max_OC_GD_NUM ((UINT16)252) /*一个oc支持最大多少个轨道区段（不可达最大值）*/
#define MAX_OC_DEVICE_PSD_MAX ((UINT8)2) /*一个OC最大屏蔽门数量（可达最大值）*/
@@ -78,6 +78,11 @@
#define CHANGE_JK_COMMAND ((UINT16)0x00AA) /*切换机控申请命令*/
#define CHANGE_NO_COMMAND ((UINT16)0x00FF) /*无切换命令*/
#define OC_AirSwitchStat_NORMAL ((UINT8)0x5) /*空开正常*/
#define OC_AirSwitchStat_FAULT ((UINT8)0xa) /*空开故障*/
#define OC_PBTYPE_SIGNAL ((UINT8)0x55) /*执行电插箱类型信号机*/
#define OC_PBTYPE_ZZJ ((UINT8)0xAA) /*执行电插箱类型转辙机*/
typedef struct s_OcDevState
{
@@ -90,6 +95,7 @@ typedef struct s_OcDevState
UINT8 BoardNum; /*板卡数量*/
UINT8 BoardAddr[MAX_OC_SWITCH_INCLUDE_BOARD_NUM]; /*板卡地址*/
UINT8 BoardState[MAX_OC_SWITCH_INCLUDE_BOARD_NUM]; /*板卡状态 正常0x0000 错误发错误码*/
UINT8 MainStandbyState[MAX_OC_SWITCH_INCLUDE_BOARD_NUM]; /*主备状态*/
}OcDeviceStruct;
typedef struct s_OcDoBoardData
@@ -431,12 +437,10 @@ INT16 GetIndexBySignalId(UINT16 sigId);
/*
* 功能描述： 通过道岔id获取索引
* 参数说明：
* Id：道岔索引
* 返回值 ：
* Int16:道岔Id
* 参数说明： UINT16 swId 道岔ID,UINT8 ocId OCID
* 返回值 ： 索引
*/
INT16 GetIndexBySwitchId(UINT16 swId);
INT16 GetIndexBySwitchId(UINT16 swId, UINT16 ocId);
/*
* 功能描述： 通过轨道id获取索引
@@ -508,7 +512,16 @@ UINT8 OcInputStateCheck(const UINT8 chInput, const UINT8 chOtherValid);
* 返回值 ： CI_ERROR CI_SUCCESS
*/
UINT8 OcInputSignalStateCheck(const UINT8 chInput);
/*
* 功能描述： 把道岔寻表状态转化为道岔寻表命令
* 参数说明：
* 输入参数：
* UINT8 drvColor：道岔寻表位置
* 返回值 ： 0:道岔驱动命令转化失败
* 1:道岔寻表命令
* add by mpt 20260330
*/
UINT16 ConvertSwitchFindPosToSwFindCmd(UINT8 chFindPos);
#ifdef __cplusplus
}
#endif
TSCP/src/APP/ciapp/ParsePack/ParsePackPlatformData.c
+1 -1
View File
@@ -19,7 +19,7 @@
/*按车站编号映射
即stationId == 1,则映射到platformToCiDataStru[1]中
*/
PlatformToCiDataStruct platformToCiDataStru[PLATFORM_TO_CI_SUM_MAX] = {0u};
PlatformToCiDataStruct platformToCiDataStru[PLATFORM_TO_CI_SUM_MAX] = {0u}; /*引用站台门与CI通信数据结构体*/
/*屏蔽门在PlatformToCiDataStruct结构中的位置:Psd映射为行，Psd所处车站映射为第一列，所处PsdToCiDataStruct位置映射为第2列
即屏蔽门1在platformToCiDataStru中的位置为:所属车站为PsdPlatformIndex[1][0] ,在屏蔽门的结构中位置为PsdPlatformIndex[1][1]
TSCP/src/APP/ciapp/ParsePack/ParsePackPlatformData.h
+1 -1
View File
@@ -53,7 +53,7 @@ typedef struct S_PlatformToCiDataStruct
PsdToCiDataStruct psdDataStr[PLATFORM_INCLUDE_PSD_MAX_SUM]; /*屏蔽门信息结构体数组*/
}PlatformToCiDataStruct;
extern PlatformToCiDataStruct platformToCiDataStru[PLATFORM_TO_CI_SUM_MAX];
/*
* 功能描述： 站台数据结构初始化
TSCP/src/APP/ciapp/ParsePack/ParsePackVobcData.c
+2892 -439
View File
File diff suppressed because it is too large Load Diff
TSCP/src/APP/ciapp/ParsePack/ParsePackVobcData.h
+87 -5
View File
@@ -36,6 +36,8 @@
#include "../IO/DeviceRelayDataProcess.h"
#include "dquIdmapQuery.h"
#include "../Section/LogicSectionConfigDataManage.h"
#include "AxisAssertDefine.h"
#include "AxisAssertManageAPI.h"
#define CI_PSD_COMM_STATE_GOOD ((UINT8)0x55)
@@ -73,6 +75,10 @@
#define CI_VOBC_BACKUP_STATE_INFO ((UINT16)0x0211) /*CI=>VOBC后备运行状态信息*/
#define VOBC_CI_INFO_TYPE_BACKUU_CONTROL ((UINT16)0x0212) /*VOBC=>CI后备运行控制信息*/
/*VOBC_CI点连式信息帧-目前仅互联互通接口具备，帧类型与全自动运行洗车重复，若需要适配其他接口，需要重新排帧类型*/
#define VOBC_CI_INFO_TYPE_BLOCLINK ((UINT16)0x020b) /*VOBC_CI点连式信息帧类型*/
#define CI_VOBC_INFO_TYPE_BLOCLINK ((UINT16)0x020c) /*CI_VOBC点连式信息帧类型*/
#define VOBC_CI_GAP_DETECT_CMD_START ((UINT8)0x55) /*VOBC2CI启动间隙探测命令*/
#define VOBC_CI_GAP_DETECT_CMD_STOP ((UINT8)0xAA) /*VOBC2CI停止间隙探测命令*/
#define VOBC_CI_GAP_DETECT_CMD_DEFAULT ((UINT8)0xFF) /*VOBC2CI默认间隙探测命令*/
@@ -106,7 +112,8 @@
#define VOBC_RC_INTERFACE_INFOTYPE ((UINT16)0x0217U) /*VOBC-RC接口，RC-VOBC接口*/
#define VOBC_RC_INFO_STATE ((UINT16)0x0201U) /*VOBC->RC控制信息，周期发送*/
#define RC_VOBC_HEART_FRAME ((UINT16)0x0201U) /*RC->VOBC心跳信息，周期发送*/
#define RC_VOBC_HEART_FRAME ((UINT16)0x0202U) /*RC->VOBC心跳信息，非周期发送*/
#define RC_VOBC_STATE_FRAME ((UINT16)0x0205U) /*RC->VOBC设备状态信息，周期发送*/
#define CI_IVOC_PRTCL_VER ((UINT8)0x01U) /*CI_VOBC协议版本号*/
@@ -145,9 +152,9 @@
#define IVOC_CI_LOGOUT_NORMAL ((UINT8)0x00U) /*IVOC到IC 正常注销*/
#define IVOC_CI_LOGOUT_SLEEP ((UINT8)0x01U) /*IVOC到IC 休眠注销*/
#define VOBC_CI_DIR_UP ((UINT8)0x55U) /*IVOC到IC 上行*/
#define VOBC_CI_DIR_DOWN ((UINT8)0xAAU) /*IVOC到IC 下行*/
#define VOBC_CI_DIR_DEF ((UINT8)0xFFU) /*IVOC到IC 默认*/
#define VOBC_CI_DIR_UP ((UINT8)0x55U) /*VOBC-CI 上行*/
#define VOBC_CI_DIR_DOWN ((UINT8)0xAAU) /*VOBC-CI 下行*/
#define VOBC_CI_DIR_DEF ((UINT8)0xFFU) /*VOBC-CI 默认*/
#define CI_IVOC_SWITCH_POSTION_DING ((UINT8)0x55U) /*CI到IVOC道岔定位状态*/
#define CI_IVOC_SWITCH_POSTION_FAN ((UINT8)0xAAU) /*CI到IVOC道岔反位状态*/
@@ -175,7 +182,7 @@
#define CI_IVOC_ESB_STATE_VALID ((UINT8)0x55U) /*CI到IVOC(VOBC) ESB按钮按下*/
#define CI_IVOC_ESB_STATE_INVALID ((UINT8)0xAAU) /*CI到IVOC(VOBC) ESB按钮未按下*/
#define CI_IVOC_NO_HAVE_ESB ((UINT8)0xFFU) /*CI到IVOC(VOBC) ESB按钮未按下*/
#define CI_IVOC_NO_HAVE_ESB ((UINT8)0xFFU) /*CI到IVOC(VOBC) ESB按钮默认值*/
#define CI_IVOC_NON_RETURN_STATE_VALID ((UINT8)0x55U) /*CI到IVOC 无人折返按钮按下*/
#define CI_IVOC_NON_RETURN_STATE_INVALID ((UINT8)0xAAU) /*CI到IVOC 无人折返按钮未按下*/
@@ -224,6 +231,8 @@
#define IVOC_CI_FLOODGATE_CLOSE_ALLOW_SUM ((UINT8)50U) /*IVOC到CI防淹门关闭允许的数量最大值*/
#define IVOC_CI_GARAGEDOOR_CLOSE_ALLOW_SUM ((UINT8)50U) /*IVOC到CI车库门关闭允许的数量最大值*/
#define CI_IVOC_YUXIANOPEN_ROUTE_MAX ((UINT8)200U) /*CI到IVOC预先开放进路最大值*/
#define CI_IVOC_COM_ERR_RC_NUM_MAX ((UINT8)5U) /*CI到IVOC通信故障RC最大值*/
#define CI_IVOC_URGENT_YES ((UINT8)0x55U) /*CI到IVOC 紧急制动状态有效*/
#define CI_IVOC_URGENT_NO ((UINT8)0xaaU) /*CI到IVOC 紧急制动状态无效*/
@@ -237,6 +246,28 @@
#define CI_VOBC_JXTC_CUT_NO ((UINT8)0xAA) /*间隙探测旁路未故障*/
#define CI_VOBC_JXTC_OFF ((UINT8)0xFF) /*未检测/无此功能*/
#define PSD_INCOUDE_ESB_NUM ((UINT8)2U) /*站台关联ESB*/
#define TRAIN_LEN_MIN 1000U /*最小车长*/
#define TRAIN_LEN_MAX 50000U /*最大车长*/
#define VOBC_CI_BLOCLINK_BLOCK_CTRL ((UINT8)0x01) /*点式列车控制级别*/
#define VOBC_CI_BLOCLINK_CI_CTRL ((UINT8)0x02) /*联锁控制级别*/
#define VOBC_CI_BLOCLINK_CI_DEFAULT ((UINT8)0xFF) /*默认值*/
#define CI_VOBC_SWITCH_MAX ((UINT8)20U) /*CI-VOBC点连式道岔数量最大值*/
#define CI_VOBC_OTHER_EQUIPMENT_MAX ((UINT8)10U) /*CI-VOBC点连式其他设备数量最大值*/
#define CI_VOBC_XIANSU_NOT ((UINT8)0xaaU) /*CI-VOBC点连式未设置临时限速*/
#define CI_VOBC_XIANSU_YES ((UINT8)0x55U) /*CI-VOBC点连式已设置临时限速*/
#define CI_VOBC_DESTINATION_TYPE_RETURN ((UINT8)0xaaU) /*CI-VOBC点连式目的地属性-折返*/
#define CI_VOBC_DESTINATION_TYPE_LIECHE ((UINT8)0x55U) /*CI-VOBC点连式目的地属性-直通*/
#define CI_VOBC_FLOOD_STATE_OPEN ((UINT8)0xaaU) /*CI-VOBC点连式防淹门开启锁定状态且无关门请求*/
#define CI_VOBC_FLOOD_STATE_CLOSE ((UINT8)0x55U) /*CI-VOBC点连式防淹非开启锁定状态或有关门请求*/
#ifdef __cplusplus
extern "C" {
#endif
@@ -280,6 +311,18 @@ typedef struct S_IvocToCiCmdStruct
UINT16 wCmdDevId[IVOC_CI_CMD_DEVICE_MAX]; /* 命令设备ID数组*/
}IvocCmdStru;
/*点连式信息*/
typedef struct S_VobcToCiBlocLinkStruct
{
UINT8 chBlocLinkTrainLevel; /*点连式运行级别*/
UINT32 chBlocLinkCycle; /*点连式通信周期*/
UINT8 chTrainDirection; /*运行方向*/
UINT16 wTrainMaxSafeHeadLink; /*列车最大安全前端所处Link*/
UINT32 dwTrainMaxSafeHeadOffset; /*列车最大安全前端偏移量*/
UINT16 wTrainMinSafeTailLink; /*列车最小安全后端所处link*/
UINT32 dwTrainMinSafeTailOffset; /*列车最小安全后端偏移量*/
}VobcToCiBlocLinkStruct;
/*与联锁通信的Vobc信息*/
typedef struct S_VobcToCiDataStruct
{
@@ -289,6 +332,7 @@ typedef struct S_VobcToCiDataStruct
UINT8 washTrainRequest; /*洗车请求信息*/
UINT8 headWashStopSteadyInfo; /*头端洗位停稳信息，洗车停稳1*/
UINT8 tailWashStopSteadyInfo; /*尾端洗位停稳信息，洗车停稳2*/
UINT8 couplingWashStopSteadyInfo; /*联挂端洗位停稳信息，洗车停稳3*/
UINT8 passWashMachineRequest; /*通过洗车机请求信息*/
UINT8 washPauseRequest; /*暂停洗车请求*/
UINT8 chWashMachineWorkMode; /*洗车机工作模式设置*/
@@ -304,6 +348,8 @@ typedef struct S_VobcToCiDataStruct
VobcToCiPsdDataStruct PsdData[VOBC_TO_CI_TRAIN_PSD_MAX]; /*关联屏蔽门数据*/
UINT32 signalID; /*VOBC->CI信号机ID*/
VobcToCiBlocLinkStruct strBlocLinkData; /*VOBC->CI点连式信息*/
/*add by qw.liu 2022-02-24 增加车车新接口字段*/
UINT8 chTrainLevel; /*列车运行级别:01:VBTC;02:ITC;03:UR;04:ABL*/
UINT8 chTrainMode; /*列车模式*/
@@ -793,6 +839,42 @@ UINT8 GetIvocToRcSum(void);
* 0xaa 非主控
*/
UINT8 GetRecvVobcControlMode(const UINT16 wVobcId);
/*
* 功能描述：组包Ci到Ivoc未接近开放进路信息(预先开放)
* 参数说明： UINT8* dataBuf, 数据缓冲区
* UINT16 *dataLength, 数据长度 输出参数
* UINT16 wTrainId 列车ID
* 返 回 值：CI_ERROR 0 失败
* CI_SUCCESS 1 成功
* Create： fan 20250725
*/
UINT8 PackCiToIvocOpenRouteNotNearInfo(UINT8* pDataBuf, UINT16* wDataLength, UINT16 wTrainId);
/*
* 功能描述： 组VOBC点连式数据
* 参数说明： UINT8* CiToVobcDataBuffer 存放信息的buffer
* UINT16* ii 偏移量
* VobcToCiDataStruct *vobcToCiDataStru VOBC-CI数据
* 返回值 ： 无
* Create： lyj 20260314
*/
void PackVobcBlocLinkData(UINT8* CiToVobcDataBuffer, UINT16* ii, VobcToCiDataStruct* vobcToCiDataStru);
/*
* 功能描述： 解析VOBC点连式数据
* 参数说明： const UINT8* dataBuf, 数据缓冲区
* const UINT16 dataLength, 数据长度
* VobcToCiDataStruct* vobcToCiDataStru VOBC到CI结构体数据
* 返回值 ： 解析结果
* Create： lyj 20260314
*/
UINT8 ParseVobcBlocLinkData(const UINT8* dataBuf, const UINT16 dataLength, VobcToCiDataStruct* vobcToCiDataStru);
/*
* 功能描述：检查设备是否已经添加
* 参数说明：const UINT16 wCheckDeviceId 检查设备ID
* const UINT16* pDeviceBuf 数组
* const UINT8 wDeviceNum 数量
* 返回值 ：检查结果
*/
UINT8 CheckRepeatData(const UINT16 wCheckDeviceId, const UINT16* pDeviceBuf, const UINT8 wDeviceNum);
#ifdef __cplusplus
}
#endif
TSCP/src/APP/ciapp/ParsePack/ParsePackZcData.c
+270 -10
View File
@@ -28,6 +28,11 @@ UINT8 lineIdentity = 0u; /*
ZcToCiDynamicDataStruct gZcToCiDymDataStru = { 0U }; /*ZC动态数据结构体*/
UINT8 gCbtcCrossNumZc = 0u; /*主控CBTC列车跨压数量*/
CbtcCrossStructZC gCbtcCrossStructZc[ALL_CBTC_CROSS_SUM_MAX] = { 0u }; /*主控CBTC列车跨压信息*/
static UINT8 ParseZcCbtcCrossData(UINT8* pDataBuf, UINT16 dataLen);
static UINT16 PackRcTacsCrossData(UINT8 *pDataBuf);
/*
* 功能描述： 解析ZC单帧数据
@@ -41,8 +46,6 @@ UINT8 ParseZcToCiDataFrame(UINT8* dataBuf, UINT16 dataLength, UINT8 systemId)
{
UINT8* sourceId = NULL; /*源ID*/
UINT16 ii = 0u;
UINT16 jj = 0u;
UINT8 kk = 0u;
UINT8 retVal = CI_SUCCESS;
UINT32 dwStep = 0U;
UINT8 galHeadSaved = 0u; /*通用头是否已保存标志，1保存；0未保存*/
@@ -133,7 +136,7 @@ UINT8 ParseZcToCiDataFrame(UINT8* dataBuf, UINT16 dataLength, UINT8 systemId)
/*报文有效，继续解析*/
retVal = CI_SUCCESS;
{
if (DATA_TYPE_NEW == chDataType)
if (DATA_TYPE_MAIN_BRANCH == chDataType)
{
while (wTmpDataLen < hlhtGalHead.totalDataLen)
{
@@ -191,6 +194,11 @@ UINT8 ParseZcToCiDataFrame(UINT8* dataBuf, UINT16 dataLength, UINT8 systemId)
retVal = ParseZcIteCutData(&dataBuf[ii], wMsgCheckLen);
dwStep |= 0x00001U;
break;
case ZC_TO_RC_CBTC_CROSS_MSG:
/*解析ZC-CI的CBTC主控列车跨压信息*/
retVal = ParseZcCbtcCrossData(&dataBuf[ii], wMsgCheckLen);
dwStep |= 0x00002U;
break;
default:
retVal = CI_ERROR;
break;
@@ -334,11 +342,13 @@ UINT8 ParseZcToCiDataFrame(UINT8* dataBuf, UINT16 dataLength, UINT8 systemId)
{/*记录通信故障码*/
SetErrorData(EFUNC_PARSE_ZC2CI_DATA,CI_SYSTEM_TYPE_ZC,systemId,ETYPE_COMM_WITH_ZC,CI_BACK_DATA_MSG_BDS_SN_ERR,ESEND_LEVEL_ATS);
}
#if 0
/*给ATS或现地反馈ZC-CI数据对方消息序列号及收到上一条消息时本方序列号错误*/
else if (GAL_COMPARE_MSG_SN_ERR == (errCode & GAL_COMPARE_MSG_SN_ERR))
{/*记录通信故障码*/
SetErrorData(EFUNC_PARSE_ZC2CI_DATA,CI_SYSTEM_TYPE_ZC,systemId,ETYPE_COMM_WITH_ZC,CI_BACK_DATA_MSG_SN_ERR,ESEND_LEVEL_ATS);
}
#endif
/*给ATS或现地反馈ZC-CI数据协议版本号错误*/
else if (GAL_COMPARE_PROTOCOL_VER_ERR == (errCode & GAL_COMPARE_PROTOCOL_VER_ERR))
{/*记录通信故障码*/
@@ -1070,6 +1080,7 @@ UINT8 PackCiToZcData( UINT8 deviceId)
UINT32 dwHlhtHSrcSN = 0u;
UINT32 dwHlhtHRcvSN = 0u;
UINT16 totallenIndex = 0U;
UINT16 wCrossFrameLen = 0U;
UINT8 chDataType = 0U;
localCi = GetSystemParaLocalCiId(); /*获取本地联锁ID*/
@@ -1149,7 +1160,7 @@ UINT8 PackCiToZcData( UINT8 deviceId)
totallenIndex = ii;
ii += 2u;/*通用报文头中的应用层报文总长度*/
if (DATA_TYPE_NEW == chDataType)
if (DATA_TYPE_MAIN_BRANCH == chDataType)
{
ii += 2u;/*通用报文头中的应用层报文长度(0x202报文长度)*/
@@ -1165,16 +1176,27 @@ UINT8 PackCiToZcData( UINT8 deviceId)
/*组码位信息*/
(void)MaskPack(CI_SYSTEM_TYPE_ZC,&CiToZcDataBuffer[ii]);
ii = (UINT16) (ii + SendMaskSum);
ii = (UINT16)(ii + SendMaskSum);
/*通用报文头中应用层报文总长度*/
ShortToChar(ii - totallenIndex - 2U, &CiToZcDataBuffer[totallenIndex]);
if (DATA_TYPE_NEW == chDataType)
if (DATA_TYPE_MAIN_BRANCH == chDataType)
{
/*通用应用层报文长度(0x202报文长度)*/
totallenIndex += 2U;
ShortToChar(ii - totallenIndex - 2U, &CiToZcDataBuffer[totallenIndex]);
/*刨去2字节应用报文总长度+2字节0202帧长度*/
ShortToChar((ii - (totallenIndex + 4u)), &CiToZcDataBuffer[totallenIndex + 2u]);
/*组TACS列车跨压信息*/
wCrossFrameLen = PackRcTacsCrossData(&CiToZcDataBuffer[ii]);
ii += wCrossFrameLen;
}
else
{
/*nothing*/
}
/*通用报文头中应用层报文总长度*/
/*刨去2字节应用报文总长度*/
ShortToChar(ii - (totallenIndex + 2u), &CiToZcDataBuffer[totallenIndex]);
/*清ZC数据*/
ClearZcData();
@@ -1242,6 +1264,101 @@ UINT8 PackCiToZcData( UINT8 deviceId)
return retVal;
}
/*
* 功能描述： 组发送给ZC的TACS主控列车跨压信息
* 参数说明： UINT8 *pDataBuf 数据包
* 返回值 ： 数据长度
*/
static UINT16 PackRcTacsCrossData(UINT8 *pDataBuf)
{
UINT16 Index = 0u; /*索引编号*/
UINT16 i = 0u; /*循环变量*/
UINT8 j = 0u; /*循环变量*/
UINT16 wSignalCurSum = 0u; /*信号机数量*/
UINT16 wSignalId = 0u; /*信号机ID*/
UINT8 wSignalBelongCiId = 0u; /*信号机所属联锁ID*/
UINT8 wLocalCiId = 0u; /*本机联锁ID*/
UINT8 wCrossTacsTrainId = 0u; /*TACS跨压列车ID*/
UINT8 wTacsCrossTrainSum = 0u; /*TACS跨压列车数量*/
UINT16 wTacsCrossSignalBuf[ALL_TACS_CROSS_SUM_MAX] = { 0u }; /*TACS跨压信号机ID数组*/
UINT8 wTacsCrossTrainBuf[ALL_TACS_CROSS_SUM_MAX] = { 0u }; /*TACS跨压列车ID数组*/
/*Step1：TACS跨压信息准备*/
wSignalCurSum = GetSignalCurSum();
/*遍历所有本联锁信号机*/
for (i = 0u; i < wSignalCurSum; i++)
{
wSignalId = GetSignalId(i);
wSignalBelongCiId = GetSignalBelongCiId(wSignalId);
wLocalCiId = GetSystemParaLocalCiId();
if (wSignalBelongCiId == wLocalCiId)
{
/*判断跨压TACS主控列车ID是否为零*/
wCrossTacsTrainId = GetSignalCrossTacsTrainIdCC(wSignalId);
/*非法值防护*/
if ((0u < wSignalId) && (CROSS_SIGNAL_ID_MAX >= wSignalId)
&& (0u < wCrossTacsTrainId) && (TACS_CROSS_ID_MAX >= wCrossTacsTrainId)
&& (ALL_TACS_CROSS_SUM_MAX >= wTacsCrossTrainSum))
{
/*TACS主控列车ID有效，赋值至待发送数组*/
wTacsCrossSignalBuf[wTacsCrossTrainSum] = wSignalId;
wTacsCrossTrainBuf[wTacsCrossTrainSum] = wCrossTacsTrainId;
wTacsCrossTrainSum += 1u;
}
else
{
/*不处理*/
}
}
else
{
/*不处理*/
}
}
/*Step2：TACS跨压信息组包*/
/*帧长度，最后赋值*/
Index += 2u;
/*帧类型*/
ShortToChar(RC_TO_ZC_TACS_CROSS_MSG, &pDataBuf[Index]);
Index += 2u;
/*预留2字节发0*/
ShortToChar(0u, &pDataBuf[Index]);
Index += 2u;
/*跨压TACS主控列车数量*/
pDataBuf[Index] = wTacsCrossTrainSum;
Index += 1u;
for (j = 0u; j < wTacsCrossTrainSum; j++)
{
/*跨压信号机ID*/
ShortToChar(wTacsCrossSignalBuf[j], &pDataBuf[Index]);
Index += 2u;
/*跨压列车ID*/
pDataBuf[Index] = wTacsCrossTrainBuf[j];
Index += 1u;
}
/*最后赋值长度*/
ShortToChar((Index - 2u), &pDataBuf[0u]);
/*打印*/
debug_infor_printf((const)"SendTacsCross Len=%d:", Index);
for (i = 0u; i < Index; i++)
{
debug_infor_printf((const)"%x-", pDataBuf[i]);
}
debug_infor_printf((const)"\n");
return Index;
}
/*
* 功能描述： 获取ZC码位值Buf
@@ -1446,6 +1563,92 @@ UINT8 ParseZcIteCutData(UINT8* dataBuf, UINT16 dataLen)
return cRetVal;
}
/*
* 功能描述：解析ZC到CI的CBTC主控列车跨压数据
* 参数说明：UINT8* pDataBuf 数据缓冲区
* UINT16 dataLen 数据长度
* 返 回 值：CI_ERROR 0 数据解析失败
* CI_SUCCESS 1 数据解析成功
* Edit By wyd 2026.3.26
*/
static UINT8 ParseZcCbtcCrossData(UINT8* pDataBuf, UINT16 dataLen)
{
UINT8 cRetVal = CI_ERROR; /*函数返回值*/
UINT8 wCrossNum = 0u; /*承接跨压状态*/
UINT16 ii = 0U; /*数组下标变量*/
UINT8 jj = 0U; /*循环变量*/
UINT16 wSignalId = 0U; /*承接跨压信号机ID*/
UINT8 wTrainId = 0U; /*承接跨压列车ID*/
if (NULL != pDataBuf)
{
cRetVal = CI_SUCCESS;
wCrossNum = pDataBuf[ii];
ii++;
if (ALL_CBTC_CROSS_SUM_MAX >= wCrossNum)
{
ZcToCiDataStru.wCbtcCrossNum = wCrossNum;
for (jj = 0U; jj < wCrossNum; jj++)
{
wSignalId = ShortFromChar(&pDataBuf[ii]); /*解析信号机ID*/
ii += 2u;
if ((0U < wSignalId) && (CROSS_SIGNAL_ID_MAX >= wSignalId))
{
ZcToCiDataStru.wCbtcCrossSignalId[jj] = wSignalId;
}
else
{
debug_infor_printf((const)"ParseZcCbtcCrossData: wSignalId Error\n");
cRetVal = CI_ERROR; /*Z信号机ID超限，返回失败*/
}
wTrainId = pDataBuf[ii]; /*解析列车ID*/
ii += 1u;
if ((0U < wTrainId) && (CBTC_CROSS_ID_MAX >= wTrainId))
{
ZcToCiDataStru.wCbtcCrossTrainId[jj] = wTrainId;
}
else
{
debug_infor_printf((const)"ParseZcCbtcCrossData: wTrainId Error\n");
cRetVal = CI_ERROR; /*列车ID超限，返回失败*/
}
}
if (CI_SUCCESS == cRetVal)
{
if (dataLen != ii)
{
debug_infor_printf((const)"ParseZcCbtcCrossData: Msg Len Error\n");
cRetVal = CI_ERROR;
}
else
{
/*不处理*/
}
}
else
{
/*不处理*/
}
}
else
{
debug_infor_printf((const)"ParseZcCbtcCrossData Error: wCrossNum Error\n");
cRetVal = CI_ERROR; /*状态非法，返回失败*/
}
}
else
{
cRetVal = CI_ERROR; /*入参非法，返回失败*/
}
return cRetVal;
}
/**
* @brief 获取ZC发送的进路停车保证标志
* @param[in] UINT16 wDeviceId 设备ID
@@ -2016,3 +2219,60 @@ void SetLocalSnowModelZc(UINT8 setmodle)
; /*不处理*/
}
}
/*
* 功能描述：获取ZC发送的CBTC主控列车跨压数量
* 参数说明：无
* 返 回 值：跨压数量
* Created By wyd 2026.3.27
*/
UINT8 GetCbtcCrossNumZc(void)
{
return gCbtcCrossNumZc;
}
/*
* 功能描述：获取ZC发送的CBTC主控列车跨压信息
* 参数说明：无
* 返 回 值：跨压信息
* Created By wyd 2026.3.27
*/
CbtcCrossStructZC *GetCbtcCrossStructZc(void)
{
return gCbtcCrossStructZc;
}
/*
* 功能描述：设置ZC发送CBTC主控列车跨压信息
* 参数说明：UINT8 wCrossNum 跨压数量
* UINT16 wSignalId[ALL_CBTC_CROSS_SUM_MAX] 跨压信号机ID
* UINT8 wTrainId[ALL_CBTC_CROSS_SUM_MAX] 跨压列车ID
* 返 回 值：无
* 注意事项：RC接收CI->RC同步过来的该信息时，是直接赋值，没调用该接口函数
* Created By wyd 2026.3.26
*/
void SetCbtcCrossInfo(UINT8 wCrossNum, UINT16 wSignalId[ALL_CBTC_CROSS_SUM_MAX],
UINT8 wTrainId[ALL_CBTC_CROSS_SUM_MAX])
{
UINT8 i = 0u;
/*先清空，防止残留脏数据*/
(void)CommonMemSet(gCbtcCrossStructZc, ALL_CBTC_CROSS_SUM_MAX * sizeof(CbtcCrossStructZC),
0x00u, ALL_CBTC_CROSS_SUM_MAX * sizeof(CbtcCrossStructZC));
/*赋值跨压数量和ID*/
gCbtcCrossNumZc = wCrossNum;
if ((NULL == wSignalId) || (NULL == wTrainId))
{
/*不处理*/
}
else
{
for (i = 0u; i < wCrossNum; i++)
{
gCbtcCrossStructZc[i].wSignalId = wSignalId[i];
gCbtcCrossStructZc[i].wTrainId = wTrainId[i];
}
}
}
TSCP/src/APP/ciapp/ParsePack/ParsePackZcData.h
+43 -2
View File
@@ -34,6 +34,8 @@
#define ZC_TO_TIOC_WLB_MSG ((UINT16)0x0204u) /*ZC发送TIOC紧急制动信息类型*/
#define ZC_TO_TIOC_SNOW_MSG ((UINT16)0x0205u) /*ZC发送TIOC雨雪模式信息类型*/
#define ZC_TO_TIOC_ITELINECUT_MSG ((UINT16)0x0206U) /*ZC发送TIOC的全线ITE切除状态信息类型*/
#define ZC_TO_RC_CBTC_CROSS_MSG ((UINT16)0x0207U) /*ZC发送给RC的主控CBTC列车跨压信息*/
#define RC_TO_ZC_TACS_CROSS_MSG ((UINT16)0x0208u) /*RC发送给ZC的主控TACS列车跨压信息*/
#define ZC_TSR_VALID ((UINT8)0x55U) /*ZC发送临时限速有效*/
#ifdef __cplusplus
@@ -64,6 +66,9 @@ typedef struct S_ZcToCiDataStruct
UINT8 cIteLineCutState; /* ITE全线切除状态 */
UINT8 cAreaIteCutNum; /*区间ITE切除数量*/
UINT16 szAreaIteCutId[ALL_AREA_SNOW_SUM_MAX]; /*区间ITE切除ID数组*/
UINT8 wCbtcCrossNum; /*CBTC主控列车跨压数量*/
UINT16 wCbtcCrossSignalId[ALL_CBTC_CROSS_SUM_MAX]; /*CBTC主控列车跨压信号机ID*/
UINT8 wCbtcCrossTrainId[ALL_CBTC_CROSS_SUM_MAX]; /*CBTC主控列车跨压列车ID*/
} ZcToCiDataStruct;
/*ZC发送的信号机动态数据结构体*/
@@ -87,7 +92,7 @@ typedef struct S_LogicSectionDataStructZC
typedef struct S_AxisSectionDataStructZC
{
UINT16 AxisSectionId; /*计轴区段ID (初始化字段)*/
UINT8 AxisArbState; /*计轴ARB状态CC(0x55-未ARB，0xaa-ARB)*/
UINT8 AxisArbState; /*计轴ARB状态(0x55-未ARB，0xaa-ARB)*/
}AxisSectionDataStructZC;
/*ZC发送的物理区段动态数据结构体*/
@@ -104,6 +109,13 @@ typedef struct S_RouteDataStructZC
UINT8 StopensureFlag; /*停车保证标志ZC(0x55：已设置，0xAA：未设置) */
}RouteDataStructZC;
/*ZC发送的CBTC主控列车跨压结构体*/
typedef struct S_CbtcCrossStructZC
{
UINT16 wSignalId; /*跨压信号机ID*/
UINT8 wTrainId; /*跨压列车ID*/
}CbtcCrossStructZC;
/*存储ZC发送的动态数据结构体*/
typedef struct S_ZcToCiDynamicDataStruct
{
@@ -133,7 +145,8 @@ extern ComTrainPosDataStruct ComTrainPosDataStru[ZC_TO_CI_TRAIN_MAX];
extern UINT16 ComTrainSum;
extern UINT8 lineIdentity;
extern ZcToCiDynamicDataStruct gZcToCiDymDataStru; /*ZC动态数据结构体*/
extern UINT8 gCbtcCrossNumZc;
extern CbtcCrossStructZC gCbtcCrossStructZc[ALL_CBTC_CROSS_SUM_MAX];
#endif
@@ -468,6 +481,34 @@ UINT8 GetLocalSnowModelZc(void);
*/
void SetLocalSnowModelZc(UINT8 setmodle);
/*
* 功能描述：获取ZC发送的CBTC主控列车跨压数量
* 参数说明：无
* 返 回 值：跨压数量
* Created By wyd 2026.3.27
*/
UINT8 GetCbtcCrossNumZc(void);
/*
* 功能描述：获取ZC发送的CBTC主控列车跨压信息
* 参数说明：无
* 返 回 值：跨压信息
* Created By wyd 2026.3.27
*/
CbtcCrossStructZC *GetCbtcCrossStructZc(void);
/*
* 功能描述：设置ZC发送CBTC主控列车跨压信息
* 参数说明：UINT8 wCrossNum 跨压数量
* UINT16 wSignalId[ALL_CBTC_CROSS_SUM_MAX] 跨压信号机ID
* UINT8 wTrainId[ALL_CBTC_CROSS_SUM_MAX] 跨压列车ID
* 返 回 值：无
* 注意事项：RC接收CI->RC同步过来的该信息时，是直接赋值，没调用该接口函数
* Created By wyd 2026.3.26
*/
void SetCbtcCrossInfo(UINT8 wCrossNum, UINT16 wSignalId[ALL_CBTC_CROSS_SUM_MAX],
UINT8 wTrainId[ALL_CBTC_CROSS_SUM_MAX]);
#ifdef __cplusplus
}
#endif
TSCP/src/APP/ciapp/QueryFiles/dquCIInit.c
+1438 -209
View File
File diff suppressed because it is too large Load Diff
TSCP/src/APP/ciapp/QueryFiles/dquCIInit.h
+116 -14
View File
@@ -33,7 +33,8 @@
#include "../SGBJ/SGBJConfigDataManage.h"
#include "../Section/AxisSectionConfigDataManage.h"
#include "../System/SystemParameterManage.h"
#include "LightTestButtonDataManage.h"
#include "LightTestButtonConfigDataManage.h"
#define ORIGIN_TO_TERMINAL ((UINT8)0x55) /*起点到终点*/
#define TERMINAL_TO_ORIGIN ((UINT8)0xAA) /*终点到起点*/
/*用于记录结构成员个数最大值*/
@@ -48,9 +49,6 @@
/*4个字节*/
#define LONG_LEN ((UINT8)4)
/*dquCICfgDtStr.OCSwitchCfgStr中成员个数*/
#define OC_SWITCH_CFG_STR_MEMBER_NUM ((UINT8)2)
/*dquCICfgDtStr.OCSwitchCfgStr中成员个数_旧版*/
#define OC_SWITCH_CFG_STR_MEMBER_NUM_OLD ((UINT8)6)
@@ -128,7 +126,7 @@ typedef struct
UINT16 SystemParamStrLen;
CiTransmitStruct CiTransmitStru[CI_SUM_MAX][CI_SUM_MAX]; /* 相关联锁配,CiTransmitStru[CI_SUM_MAX] 以发送方为主，第二层以目标方为主，*/
UINT8 CiTransmitStrLen[CI_SUM_MAX]; /* 表示对应的联锁，有通信对象数据的个数 */
TransmitRelationDataStruct TrsmtRlsDtStr[500]; /*联锁通信对象配置数据数组*/
TransmitRelationDataStruct TrsmtRlsDtStr[TRANSMITRLX_SUM_MAX]; /*联锁通信对象配置数据数组*/
UINT16 TrsmtRlsDtStrLen;
AllAutoReturnConfigDataStruct AllAutoRtnRouteCfgDtStr[ALL_AUTO_RETURN_SUM_MAX]; /*全自动折返进路配置数据数组*/
UINT16 AllAutoRtnRouteCfgDtStrLen;
@@ -186,6 +184,10 @@ typedef struct
SGBJConfigDataStruct SGBJCfgDataStru[SGBJ_SUM_MAX]; /*声光报警器配置数据*/
UINT16 wSGBJCfgLen; /*声光报警器数量*/
LightTestButtonConfigDataStruct LightTestButtonCfgDataStru[LIGHTTESTBUTTON_BUTTON_MAX_NUM]; /*试灯按钮配置数据*/
UINT16 wLightTestButtonCfgLen; /*试灯按钮数量*/
} dquCIConfigDataStr;
@@ -439,6 +441,18 @@ UINT8 TransmitRelationDataStruFrmSZ(UINT16 Data[]);
*********************************************/
UINT8 TransmitRelationDataStructInit(CHAR* FSName);
/*********************************************
*函数功能：初始化通信关系数据结构体（NEW）
*参数说明：FSName文件指针
*返回值：0，失败；1，成功
*********************************************/
UINT8 TransmitDataStructInitNew(CHAR* FSName);
/*********************************************
*函数功能：解析通信关系 数据结构体
*参数说明：Data通信数组
*返回值：0，失败；1，成功
*********************************************/
UINT8 TransmitRelationDataStruNew(UINT8 Data[]);
/*********************************************
*函数功能：初始化屏蔽门配置数据接口配置数据结构体----对外结构体
@@ -591,13 +605,14 @@ UINT8 OCSwitchConfigDataStructInit(CHAR *FSName);
*返回值：0，失败；1，成功
*********************************************/
UINT8 OCSwitchCfgZzjDataStuInit(CHAR* FSName);
#if 0
/*********************************************
*函数功能：初始化OC 道岔配置表数据——OC2.1.6
*参数说明：FSName文件指针
*返回值：0，失败；1，成功
*********************************************/
UINT8 OCSwitchConfigDataStructInit_OLD(CHAR *FSName);
#endif
/*********************************************
*函数功能：解析OC 信号机表数据
@@ -821,14 +836,6 @@ UINT8 EaConfigDataStruFromDquEaStr(DSU_EMAP_EA_STRU* pEa, EaConfigStru* pEaCfgDt
*返回值：0，失败；1，成功
*********************************************/
UINT8 EaConfigDataStructInit(CHAR * FSName);
/*********************************************
*函数功能：解析OC 道岔配置表数据
*参数说明：pDataAddr 数据地址；
*返回值：0，失败；1，成功
*备注：cgh-合并CID-2539-5：：修改初始化《OC_配置数据表》中“物理区段模块配置表”、“信号机模块配置表”、“道岔模块配置表”的初始化方式，和其他表格的初始化方式一致
*********************************************/
void R_OCSwitchConfigDataFromChar(UINT8* pDataAddr);
/*********************************************
*函数功能：解析OC 道岔转辙机状态指示灯表
*参数说明：pDataAddr 数据地址；
@@ -966,5 +973,100 @@ CI_ERROR 0 ʧ
*/
UINT8 GetdsuStaticDataCiType(UINT8 chCiID);
/*********************************************
*函数功能：初始化OC 试灯继电器表
*参数说明：FSName文件指针
*返回值：0，失败；1，成功
*********************************************/
UINT8 OCLightTestButtonCfgDataStuInit(CHAR* FSName);
/*********************************************
*函数功能：解析OC 试灯继电器表配置表
*参数说明：pDataAddr 数据地址；
*返回值：0，失败；1，成功
*********************************************/
UINT8 R_OCLightTestCfgDataFromChar(LightTestButtonConfigDataStruct* pOCLightTestButtonCfgDtStr, UINT8* pDataAddr);
/*********************************************
*函数功能：填充不重复的数据进入数组
*参数说明：目标数组的指针
* 待填入的数据
*返回值：非-1为已填入的长度,-1为空间已满
*********************************************/
INT16 SetNoRepeatDataToBuf(UINT16* pBuf, UINT16 maxlen, UINT16 dwData, UINT16 currentLen);
/*********************************************
*函数功能：试车线与车辆段合设配置设置
*参数说明：void
*返回值：CI_ERROR 检查失败 CI_SUCCESS 检查通过
* add by mpt 20260104
*********************************************/
UINT8 SetCldAndScxMergeConfig(void);
/*********************************************
*函数功能：解析道岔模块配置表
*参数说明：pDataAddr 数据地址；
*返回值：0，失败；1，成功
* add by mpt 20260325
*********************************************/
void R_OCSwitchModeCfgDataFromChar(UINT8* pDataAddr);
/*********************************************
*函数功能：存储单个OC的板卡配置情况到道岔配置数据结构体
*参数说明：SwitchBelongOCConfigDataStr* pSwitchOCcfgDtStr 道岔配置结构体
* OCSwitchConfigDataStruct* pOcCfgDtStr OC配置表结构体
*返回值：0，失败；1，成功
* add by mpt 20260325
*********************************************/
UINT8 SwitchOcCfgStrFromOCconfigStr(SwitchBelongOCConfigDataStr* pSwitchOCcfgDtStr, OCSwitchConfigDataStruct* pOcCfgDtStr);
/*********************************************
*函数功能：从道岔结构体计算道岔继电器结构体
*参数说明：SwitchConfigDataStruct* pSwitchCfgDtStr 道岔配置数据结构体
*返回值：0，失败；1，成功
* add by mpt 20260325
*********************************************/
UINT8 SwitchCfgDtStruFromOCconfigStr(SwitchConfigDataStruct* pSwitchCfgDtStr);
/*********************************************
*函数功能：计算道岔关联每一个OC的插箱数
*参数说明：SwitchConfigDataStruct* pSwitchCfgDtStr 道岔配置数据结构体
*返回值：0，失败；1，成功
* add by mpt 20260325
*********************************************/
UINT8 CalcuSwitchInsertionBoxData(SwitchConfigDataStruct* pSwitchCfgDtStr);
/*********************************************
*函数功能：填充不重复的数据进入数组
*参数说明：目标数组的指针
* 待填入的数据
*返回值：非-1为已填入的长度,-1为空间已满
* add by mpt 20260330
*********************************************/
INT16 SetNoUINT8RepeatDataToBuf(UINT8* pBuf, UINT16 maxlen, UINT8 dwData, UINT16 currentLen);
/*********************************************
*函数功能：逻辑区段关联保护区段相关数据初始化
*参数说明：pOverlapCfgDtStr保护区段配置数据结构体指针 pLogCfgDtStr配置数据结构体指针
*返回值：0，失败；1，成功
* add by mpt 20260331
*********************************************/
UINT8 LogRelateOverlapDataInit(OverlapConfigDataStruct* pOverlapCfgDtStr, LogicSectionConfigDataStruct* pLogCfgDtStr);
/*********************************************
*函数功能：逻辑区段关联防护道岔（遍历保护区段）
*参数说明：pLogCfgDtStr配置数据结构体指针
*返回值：0，失败；1，成功
* add mpt 20260331
*********************************************/
UINT8 LogRelateProSwDataByOverlapInit(LogicSectionConfigDataStruct* pLgScCfgDtStr);
/*********************************************
*函数功能：逻辑区段配置数据结构体计算
*参数说明：LogsecSwitchStruct* pSrcSwitchStructBuf 源数据
UINT8 chSrclen 源数据长度
AxisSwitchStruct* pDstSwitchStructBuf 目标数据
UINT8 dstLen 目标数据长度
*返回值：-1，失败；其他为长度
*add by mpt 20260331
*********************************************/
INT16 AxisSecCfgDtStruFromLogicSecStr(LogsecSwitchStruct* pSrcSwitchStructBuf, UINT8 chSrclen, AxisSwitchStruct* pDstSwitchStructBuf, UINT8 dstLen);
/*********************************************
*函数功能：计轴区段防护道岔初始化
*参数说明：void
*返回值：0，失败；1，成功
* add mpt 20260331
*********************************************/
UINT8 AxisSecProtectSwitchInit(void);
#endif
TSCP/src/APP/ciapp/QueryFiles/dquCIInterFace.c
+145 -38
View File
@@ -1763,7 +1763,6 @@ INT16 ReadEsbConfigData(const UINT8 ciId,EsbConfigDataStruct* pEsbConfigDataStru
INT16 DataNum = -1;
UINT16 repEsbRelayId = 0u;/*复视esb继电器ID*/
UINT8 belongCi = 0u;
if ((0u == ciId) || (NULL == pEsbConfigDataStru))
{
DataNum = -1;
@@ -2370,60 +2369,25 @@ UINT8 ReadSystemParamConfDataNew(const UINT8 ciId,SystemParameterStructNew* Syst
}
if (1u == rtnVal)
{ /*给从公共查询函数中*/
/*紧急制动最高触发速度（单位已在dfsInitSubSystemCommonConfigData_CC函数中转换）*/
SystemParameterStru->MaxLineLimitSpeed = dquCICfgDtStr.SystemParaStrNew.MaxLineLimitSpeed;
/*临时限速最高限速(km/h)（未进行单位转换）*/
SystemParameterStru->MaxTsrSpeed = dquCICfgDtStr.SystemParaStrNew.MaxTsrSpeed;
/*NTP校时时区差（小时）*/
SystemParameterStru->TimeZoneDifference = dquCICfgDtStr.SystemParaStrNew.TimeZoneDifference;
/*区间同向行驶双车间隔最小安全距离(cm))*/
SystemParameterStru->MABackDistance = dquCICfgDtStr.SystemParaStrNew.MABackDistance;
/*一次设置的临时限速最大个数*/
SystemParameterStru->MaxTsrNum = dquCICfgDtStr.SystemParaStrNew.MaxTsrNum;
/*一个临时限速报文中包含的最大限速区段数量*/
SystemParameterStru->MaxSectionOfTsr = dquCICfgDtStr.SystemParaStrNew.MaxSectionOfTsr;
/*IVOC-IVOC信故障判断时间（ms）*/
SystemParameterStru->IvocIvocCommunicationErrorTime = dquCICfgDtStr.SystemParaStrNew.IvocIvocCommunicationErrorTime;
/*IVOC-OC通信故障判断时间(ms)*/
SystemParameterStru->IvocOcCommunicationErrorTime = dquCICfgDtStr.SystemParaStrNew.IvocOcCommunicationErrorTime;
/*VOBC-ITS通信故障判断时间(ms)*/
SystemParameterStru->VobcAtsCommunicationErrorTime = dquCICfgDtStr.SystemParaStrNew.VobcAtsCommunicationErrorTime;
/*TMC-ITS通信故障判断时间（ms）*/
SystemParameterStru->TmcItsCommunicationErrorTime = dquCICfgDtStr.SystemParaStrNew.TmcItsCommunicationErrorTime;
/*ITS-OC通信故障判断时间（ms）*/
SystemParameterStru->ItsOcCommunicationErrorTime = dquCICfgDtStr.SystemParaStrNew.ItsOcCommunicationErrorTime;
/*OC-PSD通信故障判断时间（ms）*/
SystemParameterStru->OcPsdCommunicationErrorTime = dquCICfgDtStr.SystemParaStrNew.OcPsdCommunicationErrorTime;
/*IVOC-TSL通信故障判断时间（ms）*/
SystemParameterStru->IvocTslCommunicationErrorTime = dquCICfgDtStr.SystemParaStrNew.IvocTslCommunicationErrorTime;
/*OC-TSL通信故障判断时间（ms）*/
SystemParameterStru->OcTslCommunicationErrorTime = dquCICfgDtStr.SystemParaStrNew.OcTslCommunicationErrorTime;
/*满足精确停车条件的MA延伸长度（cm）*/
SystemParameterStru->MALengthForATOParking = dquCICfgDtStr.SystemParaStrNew.MALengthForATOParking;
/*本线系统定义逻辑方向与上下行方向的关系*/
SystemParameterStru->LinkLogicDirUpAndDown = dquCICfgDtStr.SystemParaStrNew.LinkLogicDirUpAndDown;
/*对向行驶双车间隔最小安全距离(cm)*/
SystemParameterStru->OppositeTrackDistance = dquCICfgDtStr.SystemParaStrNew.OppositeTrackDistance;
/*站台追踪时，列车间隔距离（cm）*/
SystemParameterStru->StationTrackDistance = dquCICfgDtStr.SystemParaStrNew.StationTrackDistance;
/*线路最差情况下紧急制动距离（单位m）*/
SystemParameterStru->MaxMALength = dquCICfgDtStr.SystemParaStrNew.MaxMALength;
@@ -3459,14 +3423,17 @@ void ReadEmapCiConfig(EmapCiConfigStru emapVerArr[])
UINT16 i;
UINT8 ciId;
UINT8 jj = 0U;
UINT8 chLocalCiId = 0U;
chLocalCiId = GetSystemParaLocalCiId();
if (NULL != emapVerArr)
{
wCIStruSum = dsuDataLenStru.wCILen;
for (i = 0u; i < wCIStruSum; i++)
{
ciId = (UINT8)(dsuStaticHeadStru.pCIStruStru[i].wID & 0x00FF);
ciId = (UINT8)(dsuStaticHeadStru.pCIStruStru[i].wID & 0x00FFu);
emapVerArr[ciId].devId = ciId;
emapVerArr[ciId].ciType = (UINT8)(dsuStaticHeadStru.pCIStruStru[i].wType);
if (CI_TYPE_TCC == dsuStaticHeadStru.pCIStruStru[i].wType)
@@ -3512,6 +3479,13 @@ void ReadEmapCiConfig(EmapCiConfigStru emapVerArr[])
emapVerArr[ciId].wAdjoinOcId[jj] = dsuStaticHeadStru.pCIStruStru[i].wAdjoinOcId[jj];
emapVerArr[ciId].dwAdjoinOcShareCheckData[jj] = dsuStaticHeadStru.pCIStruStru[i].dwAdjoinOcShareCheckData[jj];
}
if (ciId == chLocalCiId)
{/*试车线与车辆段合设开关*/
SystemParameterStruNew.chCldAndScxMergeFlag = dsuStaticHeadStru.pCIStruStru[i].chCldAndScxMergeFlag;
}
}
else
{
@@ -3525,7 +3499,7 @@ void ReadEmapCiConfig(EmapCiConfigStru emapVerArr[])
for (i = 0u; i < wRCStruSum; i++)
{
/*并非所有联锁均包含在RC表，因此未配置在RC表中时根据CI表初始化*/
ciId = (UINT8)(dsuStaticHeadStru.pRCStruStru[i].wID & 0x00FF);
ciId = (UINT8)(dsuStaticHeadStru.pRCStruStru[i].wID & 0x00FFu);
emapVerArr[ciId].devId = ciId;
emapVerArr[ciId].ciType = (UINT8)(dsuStaticHeadStru.pRCStruStru[i].wType);
if (CI_TYPE_TCC == dsuStaticHeadStru.pRCStruStru[i].wType)
@@ -3571,6 +3545,7 @@ void ReadEmapCiConfig(EmapCiConfigStru emapVerArr[])
emapVerArr[ciId].dwAdjoinOcShareCheckData[jj] = dsuStaticHeadStru.pRCStruStru[i].dwAdjoinOcShareCheckData[jj];
}
}
SystemParameterStruNew.chCldAndScxMergeFlag = CLD_SCX_MERGE_OFF;/*RC系统中，默认不合设*/
}
else
{
@@ -4857,3 +4832,135 @@ UINT16 QueryTrackBelongLink(void)
return retVal;
}
/*********************************************
*函数功能：读OC试灯按钮配置数据
*参数说明：ciId联锁ID， pLightTestConfigDataStru OC试灯按钮配置数据结构体指针
*返回值：道岔数
*********************************************/
INT16 ReadLightTestConfigData(const UINT8 ciId, LightTestButtonConfigDataStruct* pLightTestConfigDataStru)
{
UINT16 i = 0u;
UINT16 j = 0u;
UINT16 jj = 0u;
INT16 DataNum = -1; /*按钮数量*/
UINT16 lightTestButtonid = 0u;
UINT16 lightCount = 0u; /*按钮ID对应的继电器数量*/
UINT8 findFlag = 0u;
UINT16 ocDeviceSum = 0u; /*OC设备总数*/
UINT8* pOcDeviceIdBuf = NULL; /*OC设备ID数组*/
UINT16 ocID = 0u; /*OC设备ID*/
ocDeviceSum = (UINT16)GetCiTransmitSpecifySysDevSum(CI_SYSTEM_TYPE_OC); /*获取通信OC设备总数*/
pOcDeviceIdBuf = GetCiTransmitSpecifySysDevBuf(CI_SYSTEM_TYPE_OC); /*获取通信OC设备ID数组*/
if ((0u == ciId) || (NULL == pLightTestConfigDataStru))
{
DataNum = -1;
}
else
{
DataNum = 0;
}
/* 配置检查*/
if (0 == DataNum)
{
for (i = 0u; i < dquCICfgDtStr.wLightTestButtonCfgLen; i++)
{
findFlag = 0u;
lightTestButtonid = dquCICfgDtStr.LightTestButtonCfgDataStru[i].LightTestButtonId;
for (j = 0u; j < ocDeviceSum; j++)
{
/* 找到对应的OC设备 */
if (pOcDeviceIdBuf[j] == dquCICfgDtStr.LightTestButtonCfgDataStru[i].BelongOcId)
{
findFlag = 1u;
ocID = pOcDeviceIdBuf[j];
break;
}
}
if (1u == findFlag)
{
findFlag = 0u;
/* 开始查找该ID的按钮是否已经存在*/
for(j = 0u; j < DataNum; j++)
{
/* 按钮ID已存在,*/
if (lightTestButtonid == pLightTestConfigDataStru[j].LightTestButtonId)
{
break;
}
else
{
/* 按钮ID不存在，添加按钮数据*/
}
}
/*
按钮找到，则下标j为该按钮数据存储位置
按钮未找到，则下j = DataNum 为当前按钮数据新存储位置
*/
/* 按钮ID是否满足条件，添加按钮数据*/
if(LIGHTTESTBUTTON_TYPE_XINGANG == dquCICfgDtStr.LightTestButtonCfgDataStru[i].LightTestButtonType)
{
pLightTestConfigDataStru[j].LightTestButtonId = lightTestButtonid;
pLightTestConfigDataStru[j].BelongOcId = ocID;
pLightTestConfigDataStru[j].LightTestButtonType = LIGHTTESTBUTTON_TYPE_XINGANG;
lightCount = pLightTestConfigDataStru[j].LightTestButtonRelayNum;
/* 添加继电器数据 */
for(jj = 0u; jj < LIGHTTESTBUTTON_LIGHT_MAX_NUM; jj++)
{
if((UINT16_MAX == dquCICfgDtStr.LightTestButtonCfgDataStru[i].LightRelayId[jj])
||(LIGHTTESTBUTTON_LIGHT_SUPPORT_MAX_NUM <= pLightTestConfigDataStru[j].LightTestButtonRelayNum))
{
if(UINT16_MAX == dquCICfgDtStr.LightTestButtonCfgDataStru[i].LightRelayId[jj])
{
;/*继电器数据添加完毕，退出循环*/
}
else
{
DataNum = -1; /* 配置错误，返回-1 */
}
break;
}
else /* 有效数据 */
{
if (0u == pLightTestConfigDataStru[j].LightTestButtonRelayNum)
{
DataNum++; /*首次添加，需要将DataNUm++*/
}
else
{
;
}
pLightTestConfigDataStru[j].LightRelayId[lightCount + jj] = dquCICfgDtStr.LightTestButtonCfgDataStru[i].LightRelayId[jj];
pLightTestConfigDataStru[j].LightTestButtonRelayNum++; /* 继电器数量加1 */
}
}
}
else
{
;/*不处理*/
}
}
else
{
;/* 该行数据，未找到对应的OC设备，继续处理 */
}
if (-1 == DataNum)
{
break; /* 数据异常，退出*/
}
else
{
; /* 不处理 */
}
}
}
else
{
;/*不处理*/
}
return DataNum;
}
TSCP/src/APP/ciapp/QueryFiles/dquCIInterFace.h
+8
View File
@@ -525,6 +525,14 @@ UINT8 ReadPhySecIndexInAxle(const UINT8 chLocalCiId, PhysicalSectionConfigDataSt
* CI_ERROR,ʧ°Ü
*/
UINT16 QueryTrackBelongLink(void);
/*********************************************
*函数功能：读OC试灯按钮配置数据
*参数说明：ciId联锁ID， pLightTestConfigDataStru OC试灯按钮配置数据结构体指针
*返回值：道岔数
*********************************************/
INT16 ReadLightTestConfigData(const UINT8 ciId, LightTestButtonConfigDataStruct* pLightTestConfigDataStru);
#ifdef __cplusplus
}
#endif
TSCP/src/APP/ciapp/QueryFiles/dquCIJDQStruFrmChar.c
+83 -165
View File
@@ -25,6 +25,7 @@ UINT8 RelayConfigDataStruFromChar(UINT8 * pDataAddr,RelayConfigDataStruct* pRela
UINT16 i=0u;
UINT16 OcIdBuff = 0u;
UINT8 localCiPattern = 0u; /*本CI模式*/
UINT8 chOCBelongVirCIid = 0U;
if ((NULL == pDataAddr) || (NULL == pRelayCfgDtStr) || (NULL == Name))
{
@@ -55,7 +56,16 @@ UINT8 RelayConfigDataStruFromChar(UINT8 * pDataAddr,RelayConfigDataStruct* pRela
pRelayCfgDtStr->BelongCiId = GetCiIdByOcId(OcIdBuff);
pRelayCfgDtStr->BelongOcId = OcIdBuff;
pRelayCfgDtStr->BelongDrvOcId = pRelayCfgDtStr->BelongOcId;
pRelayCfgDtStr->BelongVirCIid = GetOCBelongVirCIid((UINT8)OcIdBuff);
chOCBelongVirCIid = GetOCBelongVirCIid((UINT8)OcIdBuff);
if (0U != chOCBelongVirCIid)
{
pRelayCfgDtStr->BelongVirCIid = chOCBelongVirCIid;
}
else
{
pRelayCfgDtStr->BelongVirCIid = GetCiIdByOcId(OcIdBuff);
}
}
pData += 2u;
@@ -294,129 +304,21 @@ UINT8 R_ScreenStructFromChar(UINT8 * pDataAddr,Relay_ScreenStruct* pScrnStr, UIN
{/*若没有这一列配置*/
pScrnStr->chControlType = PSD_CONTROL_TYPE_RCI; /*由RCI控制*/
}
if (59U < rowLen)
{
pScrnStr->wIbpRelayId = dquCiShortFromChar(pData); /*IBP盘发车按钮继电器ID*/
pData += 2u;
}
else
{
;
}
rtnvalue = 1u;
}
return rtnvalue;
}
/*********************************************
*函数功能：从数据到屏蔽门继电器结构体
*参数说明：pDataAddr数据地址， pScrnStr屏蔽门继电器配置数据结构体指针,UINT16 rowLen 一行数据的长度
*返回值：0，失败；1，成功
*********************************************/
UINT8 R_ScreenStructFromCharT(UINT8* pDataAddr, Relay_ScreenStruct* pScrnStr, UINT16 rowLen)
{
UINT8* pData = pDataAddr;
UINT8 rtnvalue = 0u;
UINT8 localCiPattern = 0u; /*本CI模式*/
if ((NULL == pDataAddr) || (NULL == pScrnStr))
{
rtnvalue = 0u;
}
else
{
localCiPattern = GetLocalCiPattern();
pScrnStr->wScreenId = dquCiShortFromChar(pData); /*屏蔽门ID (配置字段)*/
pData += 2u;
if (CI_PATTERN_FULL_ELECTRONIC == localCiPattern)
{
pScrnStr->wOcId = dquCiShortFromChar(pData); /*OC ID*/
pData += 2u;
}
pScrnStr->wRelayRelatedId = dquCiShortFromChar(pData); /*互锁解除继电器ID */
pData += 2u;
if (CI_PATTERN_FULL_ELECTRONIC == localCiPattern)
{
pScrnStr->wRelayRelatedId2 = dquCiShortFromChar(pData); /*互锁解除继电器ID2 */
pData += 2;
}
pScrnStr->wRelayDoorClosedId = dquCiShortFromChar(pData); /*门关继电器ID */
pData += 2u;
if (CI_PATTERN_FULL_ELECTRONIC == localCiPattern)
{
pScrnStr->wRelayDoorClosedId2 = dquCiShortFromChar(pData); /*门关继电器ID2 */
pData += 2;
}
pScrnStr->wRelayCloseDoorId = dquCiShortFromChar(pData); /*关门继电器ID */
pData += 2u;
pScrnStr->wRelayFourEditGroupOpenDoorId = dquCiShortFromChar(pData); /*4编组开门继电器ID */
pData += 2u;
pScrnStr->wRelaySixEditGroupOpenDoorId = dquCiShortFromChar(pData); /*6编组开门继电器ID */
pData += 2u;
pScrnStr->wRelayEightEditGroupOpenDoorId = dquCiShortFromChar(pData); /*8编组开门继电器ID */
pData += 2u;
pScrnStr->wRelayDoorButtonId = dquCiShortFromChar(pData); /*PSD按钮继电器*/
pData += 2u;
pScrnStr->doorReopenRelayId = dquCiShortFromChar(pData); /*站台门再次开门继电器ID*/
pData += 2u;
pScrnStr->departureConfirmRelayId = dquCiShortFromChar(pData); /*发车确认继电器ID*/
pData += 2u;
pScrnStr->detectStartRelayId = dquCiShortFromChar(pData); /*启动探测继电器ID*/
pData += 2u;
pScrnStr->detectStopRelayId = dquCiShortFromChar(pData); /*停止探测继电器ID*/
pData += 2u;
pScrnStr->obstacleRelayId = dquCiShortFromChar(pData); /*障碍物继电器ID*/
pData += 2u;
pScrnStr->gapDetMuLockRelayId = dquCiShortFromChar(pData); /*间隙探测互锁解除继电器ID*/
pData += 2u;
pScrnStr->closeStateRelayId = dquCiShortFromChar(pData); /*关门状态继电器ID*/
pData += 2u;
if (36U < rowLen)
{
pScrnStr->wClearPasseSteadyLightRelayId = dquCiShortFromChar(pData); /*清客确认按钮指示灯稳灯继电器ID*/
pData += 2u;
pScrnStr->wClearPasseFlashLightRelayId = dquCiShortFromChar(pData); /*清客确认按钮指示灯闪灯继电器ID*/
pData += 2u;
pScrnStr->wClearPassengerButtonRelayId = dquCiShortFromChar(pData); /*清客确认按钮继电器ID*/
pData += 2u;
}
if (42U < rowLen)
{
pScrnStr->wCleFarePCBButtonRelayId = dquCiShortFromChar(pData); /*清客确认箱PCB按钮继电器*/
pData += 2u;
pScrnStr->wCleFarePDBFlaLigRelayId = dquCiShortFromChar(pData); /*清客确认箱PDB按钮指示灯闪灯继电器*/
pData += 2u;
}
if (46U < rowLen)
{
pScrnStr->wPobBsdRelayId = dquCiShortFromChar(pData); /*站台再开门按钮指示灯继电器*/
pData += 2u;
pScrnStr->wPcbBsdRelayId = dquCiShortFromChar(pData); /*站台再关门按钮指示灯继电器*/
pData += 2u;
}
if (50U < rowLen)
{
pScrnStr->wVideoQkLight1RelayId = dquCiShortFromChar(pData); /*清客按钮箱视频清客指示灯1（绿）继电器*/
pData += 2U;
pScrnStr->wVideoQkLight2RelayId = dquCiShortFromChar(pData); /*清客按钮箱视频清客指示灯2（红）继电器*/
pData += 2U;
}
if (54U < rowLen)
{
pScrnStr->chControlType = *pData; /*屏蔽门控制类型*/
pData += 1U;
}
else
{/*若没有这一列配置*/
pScrnStr->chControlType = PSD_CONTROL_TYPE_RCI; /*由RCI控制*/
}
rtnvalue = 1u;
}
return rtnvalue;
}
/*********************************************
*函数功能：从数据到物理区段继电器结构体
*参数说明：pDataAddr数据地址，pPhysclSgmtStr 物理区段继电器配置数据结构体指针
@@ -590,23 +492,22 @@ UINT8 R_SignalStructFromChar(UINT8 * pDataAddr,Relay_SignalStruct* pSgnlStr)
}
/*********************************************
*函数功能：从数据到洗车机继电器结构体
*参数说明：pDataAddr数据地址， pWashMachineStr 洗车机继电器配置数据结构体指针
*返回值：0，失败；1，成功
*********************************************/
UINT8 R_WashMachineStructFromChar(UINT8 * pDataAddr,Relay_WashMachineStruct * pWashMachineStr, UINT16 realRowLen)
UINT8 R_WashMachineStructFromChar(UINT8* pDataAddr, Relay_WashMachineStruct* pWashMachineStr)
{
UINT8 * pData = pDataAddr;
UINT8 rtnvalue = 1U;
UINT16 index = 0U;
UINT8* pData = pDataAddr;
UINT8 rtnvalue = 0U;
if ((NULL == pDataAddr) || (NULL == pWashMachineStr))
{
rtnvalue = 0U;
}
if(1U == rtnvalue)
else
{
pWashMachineStr->wId = dquCiShortFromChar(pData); /*洗车机ID*/
pData += 2U;
@@ -620,13 +521,16 @@ UINT8 R_WashMachineStructFromChar(UINT8 * pDataAddr,Relay_WashMachineStruct * pW
pData += 2U;
pWashMachineStr->TailWashAllowRelayId = dquCiShortFromChar(pData); /*出发2继电器ID*/
pData += 2U;
pWashMachineStr->WashTrainRequestRelayId= dquCiShortFromChar(pData); /*洗车请求继电器ID*/
pWashMachineStr->wCouplingWashAllowRelayId = dquCiShortFromChar(pData); /*联挂端出发继电器ID*/
pData += 2U;
pWashMachineStr->WashTrainRequestRelayId = dquCiShortFromChar(pData); /*洗车请求继电器ID*/
pData += 2U;
pWashMachineStr->TrainHeadStopSteadyRelayId = dquCiShortFromChar(pData); /*列车停稳1继电器ID*/
pData += 2U;
pWashMachineStr->TrainTailStopSteadyRelayId = dquCiShortFromChar(pData); /*列车停稳2继电器ID*/
pData += 2U;
pWashMachineStr->wCoupingStopSteadyRelayId = dquCiShortFromChar(pData); /*联挂端停稳继电器ID*/
pData += 2U;
pWashMachineStr->TrainOutWashPortAllowRelayId = dquCiShortFromChar(pData);/*允许出库继电器ID*/
pData += 2U;
pWashMachineStr->PauseTrainWashRequestRelayId = dquCiShortFromChar(pData); /*暂停洗车继电器ID*/
@@ -634,9 +538,6 @@ UINT8 R_WashMachineStructFromChar(UINT8 * pDataAddr,Relay_WashMachineStruct * pW
pWashMachineStr->TrainPassRequestRelayId = dquCiShortFromChar(pData); /*通过请求继电器ID*/
pData += 2U;
index += 24U;
if (index + 2U <= realRowLen)
{
pWashMachineStr->WashModeBackRelayId = dquCiShortFromChar(pData); /*全自动洗车模式反馈继电器(配置字段:采集继电器)*/
pData += 2U;
@@ -644,10 +545,20 @@ UINT8 R_WashMachineStructFromChar(UINT8 * pDataAddr,Relay_WashMachineStruct * pW
pData += 2U;
pWashMachineStr->wDownWashAllowRelayId = dquCiShortFromChar(pData);/*降级模式洗车同意按钮继电器ID(配置字段:采集继电器)*/
pData += 2U;
pWashMachineStr->wDownDccWashAllowRelayId = dquCiShortFromChar(pData);/*降级模式DCC洗车同意按钮继电器ID(配置字段:采集继电器)*/
pData += 2U;
pWashMachineStr->wDownWashAllowLightRelayId = dquCiShortFromChar(pData);/*降级模式洗车同意指示灯继电器ID（配置字段:驱动继电器)*/
pData += 2U;
pWashMachineStr->wDownDccWashAllowLightRelayId = dquCiShortFromChar(pData);/*降级模式DCC洗车同意指示灯继电器ID （配置字段:驱动继电器)*/
pData += 2U;
pWashMachineStr->wDownWashAllowPassRelayId = dquCiShortFromChar(pData);/*降级模式洗车同意通过按钮继电器ID(配置字段:采集继电器)*/
pData += 2U;
pWashMachineStr->downDccWashPassAllowRelayId = dquCiShortFromChar(pData);/*降级模式DCC洗车同意反向通过按钮继电器ID(配置字段:采集继电器)*/
pData += 2U;
pWashMachineStr->wDownWashPassAllowLightRelayId = dquCiShortFromChar(pData);/*降级模式洗车同意反向通过指示灯继电器ID（配置字段:驱动继电器)*/
pData += 2U;
pWashMachineStr->dccWashPassAllowLightRelayId = dquCiShortFromChar(pData);/*降级模式DCC洗车同意反向通过指示灯继电器ID（配置字段:驱动继电器)*/
pData += 2U;
pWashMachineStr->wDownWashRelateRoute1Id = dquCiShortFromChar(pData);/*降级模式洗车线控制台表示灯1关联进路ID*/
pData += 2U;
pWashMachineStr->wDownWashRelateRoute1CheckType = *pData;/*降级模式洗车线控制台表示灯1关联进路状态检查类型*/
@@ -660,10 +571,14 @@ UINT8 R_WashMachineStructFromChar(UINT8 * pDataAddr,Relay_WashMachineStruct * pW
pData += 1U;
pWashMachineStr->wDownWashRelRoute2LightRelayId = dquCiShortFromChar(pData);/*降级模式洗车线控制台表示灯2继电器ID（配置字段:驱动继电器)*/
pData += 2U;
index += 20U;
}
pWashMachineStr->wDownWashReqAllowLightRelayId = dquCiShortFromChar(pData);/*降级模式洗车请求指示灯继电器ID（配置字段:驱动继电器)*/
pData += 2U;
pWashMachineStr->downDccWashApplyLightRelayId = dquCiShortFromChar(pData);/*降级模式DCC洗车请求指示灯继电器ID（配置字段:驱动继电器)*/
pData += 2U;
pWashMachineStr->washPassApplyLightRelayId = dquCiShortFromChar(pData);/*降级模式洗车反向通过请求指示灯继电器ID（配置字段:驱动继电器)*/
pData += 2U;
pWashMachineStr->dccWashPassApplyLightRelayId = dquCiShortFromChar(pData);/*降级模式DCC洗车反向通过请求指示灯继电器ID（配置字段:驱动继电器)*/
pData += 2U;
rtnvalue = 1U;
}
@@ -699,6 +614,10 @@ UINT8 R_NoRouteDcStruFromChar(UINT8 * pDataAddr,Relay_NoRouteDcStruct* pNoRotStr
pNoRotStr->wRelayColTongYiScId = dquCiShortFromChar(pData); /* 试车线采集同意试车继电器ID */
pData += 2u;
pNoRotStr->wWaysideTryTrainIndRelayId = dquCiShortFromChar(pData); /* 轨旁试车指示器继电器ID */
pData += 2u;
rtnvalue = 1u;
return rtnvalue;
@@ -778,53 +697,52 @@ UINT8 R_ZhaoChaStruFromChar(UINT8 * pDataAddr,Relay_ZhaoChaStruct* pZCStr,UINT16
UINT8 R_BaoJingDengStruFromChar(UINT8 * pDataAddr,Relay_BaoJingDengStruct* pBjdStr,UINT32 dwRowLen)
{
UINT8 * pData = pDataAddr;
UINT8 rtnvalue = 0u;
UINT16 i=0u;
UINT8 localCiPattern = 0u; /*本CI模式*/
UINT8 includeVirFlag= GetCiFunctionSwitchConfig(FUNC_INCLUDEVIRCI_FLAG);
UINT16 OCid = 0u;
UINT8 rtnvalue = 0U;
UINT16 i=0U;
UINT8 localCiPattern = 0U; /*本CI模式*/
UINT16 OCid = 0U;
UINT8 chRtuId = 0U;
if ((NULL == pDataAddr) || (NULL == pBjdStr))
{
rtnvalue = 0u;
return rtnvalue;
}
localCiPattern = GetLocalCiPattern();
pBjdStr->wId = dquCiShortFromChar(pData); /*ID*/
pData += 2u;
pBjdStr->wBelongCiId = dquCiShortFromChar(pData); /*所属ID*/
if (CI_PATTERN_FULL_ELECTRONIC == localCiPattern)
{
OCid = pBjdStr->wBelongCiId;/*对应全电子联锁，读取到的是OCid*/
pBjdStr->wBelongCiId = (UINT16)GetCiIdByOcId(pBjdStr->wBelongCiId);/*找到0Cid对应联锁id*/
if(FUNC_SWITCH_ON == includeVirFlag)
{
pBjdStr->wBelongVirCIid = GetOCBelongVirCIid((UINT8)OCid);/*找到0Cid对应虚拟联锁id*/
rtnvalue = 0U;
}
else
{
pBjdStr->wBelongVirCIid = 0u;
}
}
pData += 2u;
pBjdStr->wId = dquCiShortFromChar(pData); /*ID*/
pData += 2U;
pBjdStr->wBelongCiId = dquCiShortFromChar(pData); /*所属ID*/
pData += 2U;
pBjdStr->wBjdID = dquCiShortFromChar(pData); /*报警灯ID*/
pData += 2u;
pData += 2U;
pBjdStr->wBjdYouXiao = *pData; /*是否有效*/
pData += 1u;
for(i=0u;i<BJD_MAX_NUM;i++)
pData += 1U;
for (i = 0U; i < BJD_MAX_NUM; i++)
{
pBjdStr->wBjdJdqId[i] = dquCiShortFromChar(pData); /*对端继电器ID*/
pData += 2u;
pBjdStr->wBjdJdqId[i] = dquCiShortFromChar(pData); /*相关设备ID*/
pData += 2U;
}
if (15U < dwRowLen)
{
pBjdStr->cBjdDevId = *pData;
pData += 1;
pData += 1U;
}
if (16U < dwRowLen)
{
chRtuId = *pData; /*RTU id*/
pData += 1U;
}
localCiPattern = GetLocalCiPattern();
if (CI_PATTERN_FULL_ELECTRONIC == localCiPattern)
{
OCid = pBjdStr->wBelongCiId; /*对应全电子联锁，读取到的是OCid*/
pBjdStr->wBelongCiId = (UINT16)GetCiIdByOcId(OCid); /*找到0Cid对应联锁id*/
pBjdStr->wBelongVirCIid = chRtuId; /*填写RTUid*/
}
rtnvalue = 1U;
}
rtnvalue = 1u;
return rtnvalue;
}
TSCP/src/APP/ciapp/QueryFiles/dquCIJDQStruFrmChar.h
+2 -7
View File
@@ -36,12 +36,6 @@ UINT8 R_EmegencyStopStructFromChar(UINT8 * pDataAddr,Relay_EmgcyStpStruct* pEmgc
*返回值：0，失败；1，成功
*********************************************/
UINT8 R_ScreenStructFromChar(UINT8* pDataAddr, Relay_ScreenStruct* pScrnStr, UINT16 rowLen);
/*********************************************
*函数功能：从数据到屏蔽门继电器结构体
*参数说明：pDataAddr数据地址， pScrnStr屏蔽门继电器配置数据结构体指针,UINT16 rowLen 一行数据的长度
*返回值：0，失败；1，成功
*********************************************/
UINT8 R_ScreenStructFromCharT(UINT8* pDataAddr, Relay_ScreenStruct* pScrnStr, UINT16 rowLen);
/*********************************************
*函数功能：从数据到物理区段继电器结构体
@@ -65,12 +59,13 @@ UINT8 R_PointStructFromChar(UINT8 * pDataAddr,Relay_PointStruct* pSwitchStr);
*返回值：0，失败；1，成功
*********************************************/
UINT8 R_SignalStructFromChar(UINT8 * pDataAddr,Relay_SignalStruct* pSgnlStr);
/*********************************************
*函数功能：从数据到洗车机继电器结构体
*参数说明：pDataAddr数据地址， pWashMachineStr 洗车机继电器配置数据结构体指针
*返回值：0，失败；1，成功
*********************************************/
UINT8 R_WashMachineStructFromChar(UINT8 * pDataAddr,Relay_WashMachineStruct * pWashMachineStr,UINT16 realRowLen);
UINT8 R_WashMachineStructFromChar(UINT8 * pDataAddr,Relay_WashMachineStruct * pWashMachineStr);
/*********************************************
*函数功能：从数据到非进路数据继电器结构体
TSCP/src/APP/ciapp/QueryFiles/dquCIJDQStruInit.c
+1 -11
View File
@@ -211,7 +211,7 @@ UINT8 InitRelay_WashMachineStru(CHAR* CIDataName)
pWashMachineStr = RelayData.pRelayWashMachineStr + j;
/*填充数据结构体*/
rtnValue &= R_WashMachineStructFromChar(pDataAddr, pWashMachineStr, realRowLen);
rtnValue &= R_WashMachineStructFromChar(pDataAddr, pWashMachineStr);
pDataAddr += realRowLen;
}
@@ -353,7 +353,6 @@ UINT8 InitRelay_ScreenStru(CHAR* CIDataName)
UINT32 sheetId = 0U; /*sheet id*/
UINT32 rowLen = 0U; /*行长度*/
UINT8 localCiPattern = 0U; /*本CI模式*/
UINT8 chOcPattern = 0U;
/*已经初始化了，不用老是调用执行过程*/
if (RelayData.pRelayScreenStr != NULL)
{
@@ -423,16 +422,7 @@ UINT8 InitRelay_ScreenStru(CHAR* CIDataName)
pScreenStr = RelayData.pRelayScreenStr + j;
/*填充数据结构体*/
chOcPattern = GetLocalOcPattern();
if(DATA_TYPE_NEW == chOcPattern)
{
rtnValue &= R_ScreenStructFromChar(pDataAddr, pScreenStr, (UINT16)rowLen);
}
else
{
rtnValue &= R_ScreenStructFromCharT(pDataAddr, pScreenStr, (UINT16)rowLen);
}
pDataAddr += rowLen;
}
TSCP/src/APP/ciapp/QueryFiles/dquCIPZStru.h
+1 -1
View File
@@ -40,7 +40,7 @@
#define CI_SYSTEM_OUTSIG_RALATE_AXIS_LEN ((UINT8)82)
#define CI_SYSTEM_CI_PATTERN_ID ((UINT8)0x08) /*增加联锁类型配置表*/
#define CI_SYSTEM_CI_PATTERN_LEN ((UINT8)13) /*修改为13，增加是否分布式联锁，UT/CT保护区段解锁停稳时间，UT/CT接近区段延时解锁超限时间*/
#define CI_SYSTEM_CI_PATTERN_LEN ((UINT8)14) /*修改为14，增加是否分布式联锁，UT/CT保护区段解锁停稳时间，UT/CT接近区段延时解锁超限时间*/
#define CI_SYSTEM_VIRCI_INCLUDEOC_ID ((UINT8)0x09) /*增加虚拟联锁与OC对应关系表*/
#define CI_SYSTEM_VIRCI_INCLUDEOC_LEN ((UINT8)22)
TSCP/src/APP/ciapp/QueryFiles/dquMaskInit.c
+167 -35
View File
@@ -304,7 +304,7 @@ UINT8 MaskCfgDtStruFrmCIATSPsdMask(UINT8* FSDataName)
MASK_TYPE_PSD_PCB,MASK_TYPE_PSD_POB,MASK_TYPE_PSD_PSB,MASK_TYPE_PSD_PCB_INVALID,
MASK_TYPE_PSD_POB_INVALID,MASK_TYPE_PSD_PSB_INVALID,MASK_TYPE_PSD_JXTC_PANGLU,
MASK_TYPE_PSD_PCBPSBDPB_PANGLU_STATE,MASK_TYPE_PSD_PDB_FLASH_STATE,
MASK_TYPE_PSD_VIDEO_QK_LU,MASK_TYPE_PSD_VIDEO_QK_HONG,MASK_TYPE_PSD_EXCEPT_OPEN,0U };
MASK_TYPE_PSD_VIDEO_QK_LU,MASK_TYPE_PSD_VIDEO_QK_HONG,MASK_TYPE_PSD_EXCEPT,MASK_TYPE_PSD_JXTCPANGLU_FAULT,MASK_TYPE_PSD_IBP_STATE,MASK_TYPE_PSD_IBP_FAULT,MASK_TYPE_PSD_JXTC_STATE,0U };
#else
UINT8 MaskType[] = { 0u,MASK_TYPE_PSD_STATE_ATS,MASK_TYPE_MUTUALLOCK_STATE,MASK_TYPE_REMORA_STATE, MASK_TYPE_PSD_PCB,MASK_TYPE_PSD_POB,MASK_TYPE_PSD_PSB,MASK_TYPE_PSD_PCB_INVALID,MASK_TYPE_PSD_POB_INVALID,MASK_TYPE_PSD_PSB_INVALID,0 };
#endif
@@ -410,7 +410,8 @@ UINT8 MaskCfgDtStruFrmCIATSEsbMask(UINT8* FSDataName)
UINT16 i = 0U;
UINT8 chBreakFlag = 0U;
UINT8 MaskType[] = { 0u, MASK_TYPE_ESP_STATE, MASK_TYPE_ESS_STEADY_STATE, MASK_TYPE_ESP_FLASH_STATE, MASK_TYPE_CANCEL_ESP_FAULT, MASK_TYPE_ESP_FAULT, MASK_TYPE_CUT_ESP_FAULT, MASK_TYPE_ESP_PRESS_STATE, 0u };
UINT8 MaskType[] = { 0U, MASK_TYPE_ESP_STATE, MASK_TYPE_ESS_STEADY_STATE, MASK_TYPE_ESP_FLASH_STATE, MASK_TYPE_CANCEL_ESP_FAULT, MASK_TYPE_ESP_FAULT, MASK_TYPE_CUT_ESP_FAULT,
MASK_TYPE_CUT_ESP_STATE, MASK_TYPE_ONEPLAT_ESP_STATE, MASK_TYPE_ONEPLAT_CUT_ESP_STATE, 0U };
UINT16 BuChang = 0u;
funcRtn = dquGetConfigDataNew(FSDataName, CI_ATS_MASK_TYPE, CI_ATS_ESB_MASK_ID, &pDataAddr, &DataSize, &realRow);
if (funcRtn == 0u)
@@ -545,7 +546,7 @@ UINT8 MaskCfgDtStruFrmCIATSLogSgmtT(UINT8* FSDataName)
MASK_TYPE_LOGICSECTION_JUMPLOCK,
MASK_TYPE_UPWARD_DIRECTION,
MASK_TYPE_DOWNWARD_DIRECTION,
MASK_TYPE_LOGICSECTION_ARB,
MASK_TYPE_LOGSEC_CBTC_ARB,
MASK_TYPE_LOGICSECTION_EMERG_XIANSU,1u };
UINT16 BuChang = 0u;
funcRtn = dquGetConfigDataNew(FSDataName, CI_ATS_MASK_TYPE, CI_ATS_LOGIC_SGMT_MASK_ID, &pDataAddr, &DataSize, &rowCount);
@@ -593,7 +594,7 @@ UINT8 MaskCfgDtStruFrmCIATSLogSgmtT(UINT8* FSDataName)
if ((0xFFFFu != tempMaskId) && (0u != tempMaskId))
{
/*0和0xFFFF是无效的码位*/
if ((CI_SUM_MAX > MaskRow) && (CI_TO_ATS_MASK_SUM_MAX > tempMaskId) && (0u < tempMaskId))/*¼ì²éÊÇ·ñΪÓÐЧÂëλֵ*/
if ((CI_SUM_MAX > MaskRow) && (CI_TO_ATS_MASK_SUM_MAX > tempMaskId))/*检查是否为有效码位值*/
{
ConfigCiToAtsMaskConfigDataStru[MaskRow][tempMaskId].DeviceId = DeviceID;
ConfigCiToAtsMaskConfigDataStru[MaskRow][tempMaskId].DeviceType = CI_DEVICE_TYPE_LOGICSEC;
@@ -668,8 +669,9 @@ UINT8 MaskCfgDtStruFrmCIATSLogSgmt(UINT8 * FSDataName)
MASK_TYPE_LOGICSECTION_JUMPLOCK,
MASK_TYPE_UPWARD_DIRECTION,
MASK_TYPE_DOWNWARD_DIRECTION,
MASK_TYPE_LOGICSECTION_ARB,
MASK_TYPE_LOGSEC_CBTC_ARB,
MASK_TYPE_LOGICSECTION_SPKS_FLOCK,
MASK_TYPE_LOGSEC_PB_TACS_ARB,
1u};
UINT16 BuChang = 0u;
funcRtn = dquGetConfigDataNew(FSDataName,CI_ATS_MASK_TYPE,CI_ATS_LOGIC_SGMT_MASK_ID,&pDataAddr,&DataSize,&rowCount);
@@ -1409,25 +1411,26 @@ UINT8 MaskCfgDtStruFrmCIATSSPKSMask(UINT8 * FSDataName)
funcRtn = 1u;
return funcRtn;
}
/*********************************************
*函数功能：CI-ATS 洗车机就绪状态码位
*参数说明：FSDataName件指针
*返回值：0，失败；1，成功
*********************************************/
UINT8 MaskCfgDtStruFrmCIATSWashM(UINT8 * FSDataName)
UINT8 MaskCfgDtStruFrmCIATSWashM(UINT8* FSDataName)
{
UINT8 funcRtn = 0u;
UINT8* pDataAddr, *pDataLin;
UINT8* pDataAddr, * pDataLin;
UINT32 DataSize = 0u;
UINT16 MaskRow=0u;
UINT16 DeviceID=0u;
UINT16 MaskRow = 0u;
UINT16 DeviceID = 0u;
UINT16 residue = 0u;
UINT16 tempMaskId = 0u; /*码位ID临时变量*/
UINT8 MaskType[]={0u,MASK_TYPE_WASHMACHINE_READYSTATE,MASK_TYPE_WASHMACHINE_WORKMODE,0u};
UINT8 MaskType[] = { 0u,MASK_TYPE_WASHMACHINE_READYSTATE,0u };
UINT16 BuChang = 0u;
funcRtn = dquGetConfigData(FSDataName,CI_ATS_MASK_TYPE,CI_ATS_WASHMACHINE_MASK_ID,&pDataAddr,&DataSize);
if(0u == funcRtn)
funcRtn = dquGetConfigData(FSDataName, CI_ATS_MASK_TYPE, CI_ATS_WASHMACHINE_MASK_ID, &pDataAddr, &DataSize);
if (0u == funcRtn)
{
funcRtn = 0u;
return funcRtn;
@@ -1436,7 +1439,7 @@ UINT8 MaskCfgDtStruFrmCIATSWashM(UINT8 * FSDataName)
{
}
if(0u != DataSize%CI_ATS_WASHMACHINE_MASK_LEN )
if (0u != DataSize % CI_ATS_WASHMACHINE_MASK_LEN)
{
funcRtn = 0u;
return funcRtn;
@@ -1444,7 +1447,7 @@ UINT8 MaskCfgDtStruFrmCIATSWashM(UINT8 * FSDataName)
else
{
}
if(0u == DataSize)
if (0u == DataSize)
{
/*无数据*/
funcRtn = 1u;
@@ -1454,17 +1457,17 @@ UINT8 MaskCfgDtStruFrmCIATSWashM(UINT8 * FSDataName)
{
}
for(;DataSize>0u;DataSize-=2u)
for (; DataSize > 0u; DataSize -= 2u)
{
residue = BuChang%(CI_ATS_WASHMACHINE_MASK_LEN/2u);
if(0u == residue)
residue = BuChang % (CI_ATS_WASHMACHINE_MASK_LEN / 2u);
if (0u == residue)
{
DeviceID = ShortFromChar(pDataAddr);
pDataLin = pDataAddr + CI_ATS_WASHMACHINE_MASK_LEN - 2u;
MaskRow = ShortFromChar(pDataLin);
/*访问数组不能越界，越界直接返回失败*/
if(CI_SUM_MAX <= MaskRow)
if (CI_SUM_MAX <= MaskRow)
{
funcRtn = 0u;
return funcRtn;
@@ -1473,25 +1476,25 @@ UINT8 MaskCfgDtStruFrmCIATSWashM(UINT8 * FSDataName)
{
}
pDataAddr+=2u;
pDataAddr += 2u;
BuChang++;
}
else if(3u >residue)
else if (3u > residue)
{
/*获取码位ID*/
tempMaskId = ShortFromChar(pDataAddr);
/*0和0xFFFF是无效的码位*/
if((0xFFFFu != tempMaskId)&&(0u != tempMaskId))
if ((0xFFFFu != tempMaskId) && (0u != tempMaskId))
{
ConfigCiToAtsMaskConfigDataStru[MaskRow][tempMaskId].DeviceId = DeviceID;
ConfigCiToAtsMaskConfigDataStru[MaskRow][tempMaskId].DeviceType = CI_DEVICE_TYPE_WASHMACHINE;
ConfigCiToAtsMaskConfigDataStru[MaskRow][tempMaskId].MaskId = tempMaskId;
ConfigCiToAtsMaskConfigDataStru[MaskRow][tempMaskId].MaskType = (UINT8)(MaskType[BuChang%(CI_ATS_WASHMACHINE_MASK_LEN/2U)]);
ConfigCiToAtsMaskConfigDataStru[MaskRow][tempMaskId].MaskType = (UINT8)(MaskType[BuChang % (CI_ATS_WASHMACHINE_MASK_LEN / 2U)]);
/*统计最大的有效码位*/
if(ConfigCiToAtsMaskConfigDataStru[MaskRow][tempMaskId].MaskId > ConfigCiToAtsMaskIdMax[MaskRow])
if (ConfigCiToAtsMaskConfigDataStru[MaskRow][tempMaskId].MaskId > ConfigCiToAtsMaskIdMax[MaskRow])
{
ConfigCiToAtsMaskIdMax[MaskRow] = ConfigCiToAtsMaskConfigDataStru[MaskRow][tempMaskId].MaskId;
}
@@ -1505,12 +1508,12 @@ UINT8 MaskCfgDtStruFrmCIATSWashM(UINT8 * FSDataName)
else
{
}
pDataAddr+=2u;
pDataAddr += 2u;
BuChang++;
}
else
{
pDataAddr+=2u;
pDataAddr += 2u;
BuChang++;
}
}
@@ -1518,6 +1521,126 @@ UINT8 MaskCfgDtStruFrmCIATSWashM(UINT8 * FSDataName)
return funcRtn;
}
/*********************************************
*函数功能：CI-ATS 洗车机就绪状态码位
*参数说明：FSDataName件指针
*返回值：0，失败；1，成功
*********************************************/
UINT8 MaskCfgDtStruFrmCIATSWash(UINT8* FSDataName)
{
UINT8 funcRtn = 0u;
UINT8* pDataAddr, * pDataLin;
UINT32 DataSize = 0u;
UINT16 MaskRow = 0u;
UINT16 DeviceID = 0u;
UINT16 residue = 0u;
UINT16 tempMaskId = 0u; /*码位ID临时变量*/
UINT16 rowCount = 0u;
UINT8 rowLenth = 0u;/*行字节数*/
UINT8 MaskType[] = { 0u,MASK_TYPE_WASHMACHINE_READYSTATE,MASK_TYPE_WASHMACHINE_WORKMODE,MASK_TYPE_WASHMACHINE_ZNTBUTTN, MASK_TYPE_DCCWASHACHINE_ZNTBUTTN,MASK_TYPE_PASSWASHMACHINE_ZNTBUTTN,MASK_TYPE_DCCPASSWASHMACHINE_ZNTBUTTN,0u };
UINT16 BuChang = 0u;
funcRtn = dquGetConfigDataNew(FSDataName, CI_ATS_MASK_TYPE, CI_ATS_WASHMACHINE_MASK_ID, &pDataAddr, &DataSize, &rowCount);
if (0U == funcRtn)
{
funcRtn = CI_ERROR;
}
else
{
funcRtn = CI_SUCCESS;
if ((0u < DataSize) && (0u < rowCount))
{
if (0u == DataSize % rowCount)
{
/*一行字节数*/
rowLenth = (UINT8)(DataSize / rowCount);
for (; DataSize > 0u; DataSize -= 2u)
{
residue = (UINT16)(BuChang % ((UINT16)rowLenth / 2U));
if (0u == residue)
{
DeviceID = ShortFromChar(pDataAddr);
pDataLin = pDataAddr + rowLenth - 2u;
MaskRow = ShortFromChar(pDataLin);
/*访问数组不能越界，越界直接返回失败*/
if (CI_SUM_MAX > MaskRow)
{
pDataAddr += 2u;
BuChang++;
}
else
{
funcRtn = CI_ERROR;
}
}
else if (residue < ((rowLenth / 2u) - 1u))
{
/*获取码位ID*/
tempMaskId = ShortFromChar(pDataAddr);
if ((0xFFFFu != tempMaskId) && (0u != tempMaskId))
{
/*0和0xFFFF是无效的码位*/
if ((CI_SUM_MAX > MaskRow) && (CI_TO_ATS_MASK_SUM_MAX > tempMaskId) && (0u < tempMaskId))/*检查是否为有效码位值*/
{
ConfigCiToAtsMaskConfigDataStru[MaskRow][tempMaskId].DeviceId = DeviceID;
ConfigCiToAtsMaskConfigDataStru[MaskRow][tempMaskId].DeviceType = CI_DEVICE_TYPE_WASHMACHINE;
ConfigCiToAtsMaskConfigDataStru[MaskRow][tempMaskId].MaskId = tempMaskId;
ConfigCiToAtsMaskConfigDataStru[MaskRow][tempMaskId].MaskType = (UINT8)(MaskType[BuChang % ((UINT16)rowLenth / 2u)]);
/*统计最大的有效码位*/
if (ConfigCiToAtsMaskConfigDataStru[MaskRow][tempMaskId].MaskId > ConfigCiToAtsMaskIdMax[MaskRow])
{
ConfigCiToAtsMaskIdMax[MaskRow] = ConfigCiToAtsMaskConfigDataStru[MaskRow][tempMaskId].MaskId;
}
else
{
/*do nothing*/
}
ConfigCiToAtsMaskCurSum[MaskRow]++;
}
else
{
funcRtn = CI_ERROR;
}
}
pDataAddr += 2u;
BuChang++;
}
else
{
pDataAddr += 2u;
BuChang++;
}
if (CI_ERROR == funcRtn)
{
break;
}
else
{
;
}
}
}
else
{
funcRtn = CI_ERROR;
}
}
else
{
funcRtn = CI_SUCCESS;
}
}
return funcRtn;
}
/*********************************************
*函数功能：CI-ATS 防淹门状态码位
*参数说明：FSDataName文件件指针
@@ -2337,7 +2460,7 @@ UINT8 MaskCfgDtStruFrmCIZCPsdMask(UINT8 * FSDataName)
UINT16 DeviceID=0u;
UINT16 tempMaskId = 0u; /*码位ID临时变量*/
UINT8 MaskType[] = { 1u,MASK_TYPE_PSD_STATE,MASK_TYPE_PSD_EXCEPT_OPEN,1u };
UINT8 MaskType[] = { 1u,MASK_TYPE_PSD_STATE,MASK_TYPE_PSD_EXCEPT,1u };
UINT16 BuChang = 0u;
UINT16 wTempCount = 0U;
funcRtn = dquGetConfigData(FSDataName,CI_ZC_MASK_TYPE,CI_ZC_PSD_MASK_ID,&pDataAddr,&DataSize);
@@ -3211,7 +3334,7 @@ UINT8 MaskCfgStruFrmCIZCAxleSgmtMask(UINT8 * FSDataName)
UINT8 MaskType[]={1u,MASK_TYPE_PHYSECTION_HEAD_STD,MASK_TYPE_PHYSECTION_HEAD_XTD,MASK_TYPE_PHYSECTION_OCCUPY,
MASK_TYPE_PHYSECTION_ROUTELOCK,MASK_TYPE_PHYSECTION_JUMPLOCK_ZC,MASK_TYPE_AXISSECTION_ARB,MASK_TYPE_LIECHE_STOPSTATE,
MASK_TYPE_PHYSECTION_HEAD_STD,MASK_TYPE_PHYSECTION_HEAD_XTD,MASK_TYPE_PHYSECTION_JUMPLOCK_APPLY,
MASK_TYPE_PHYSECTION_JUMPLOCK_CANCEL,1u};
MASK_TYPE_PHYSECTION_JUMPLOCK_CANCEL,MASK_TYPE_PHYSECTION_INTRUSION,MASK_TYPE_PHYSECTION_ATS_FLOCK,1u};
UINT16 BuChang = 0u;
funcRtn = dquGetConfigData(FSDataName,CI_ZC_MASK_TYPE,CI_ZC_AXLE_SGMT_MASK_ID,&pDataAddr,&DataSize);
if(funcRtn==0u)
@@ -3275,7 +3398,7 @@ UINT8 MaskCfgStruFrmCIZCAxleSgmtMask(UINT8 * FSDataName)
}
}
}
else if((0u < residue )&&( residue < 6u))
else if(((0u < residue )&&( residue < 6u))||((11U < residue)&&(residue < 14U)))
{
/*获取码位ID*/
tempMaskId = ShortFromChar(pDataAddr);
@@ -3459,7 +3582,7 @@ UINT8 MaskCfgStruFrmZCCIAxleSgmtMask(UINT8 * FSDataName)
UINT8 MaskType[]={1u,MASK_TYPE_PHYSECTION_HEAD_STD,MASK_TYPE_PHYSECTION_HEAD_XTD,MASK_TYPE_PHYSECTION_OCCUPY,
MASK_TYPE_PHYSECTION_ROUTELOCK,MASK_TYPE_PHYSECTION_JUMPLOCK_ZC,MASK_TYPE_AXISSECTION_ARB,MASK_TYPE_LIECHE_STOPSTATE,
MASK_TYPE_PHYSECTION_HEAD_STD,MASK_TYPE_PHYSECTION_HEAD_XTD,MASK_TYPE_PHYSECTION_JUMPLOCK_APPLY,
MASK_TYPE_PHYSECTION_JUMPLOCK_CANCEL,1u};
MASK_TYPE_PHYSECTION_JUMPLOCK_CANCEL,MASK_TYPE_PHYSECTION_INTRUSION,MASK_TYPE_PHYSECTION_ATS_FLOCK,1u};
UINT16 BuChang = 0u;
funcRtn = dquGetConfigData(FSDataName,CI_ZC_MASK_TYPE,CI_ZC_AXLE_SGMT_MASK_ID,&pDataAddr,&DataSize);
if(0U == funcRtn)
@@ -3536,7 +3659,7 @@ UINT8 MaskCfgStruFrmZCCIAxleSgmtMask(UINT8 * FSDataName)
return funcRtn;
}
}
else if((6u <= residue)&&(residue <((CI_ZC_AXLE_SGMT_MASK_LEN/2u)-1u)))
else if((6u <= residue)&&(residue < 12U))
{
/*获取码位ID*/
tempMaskId = ShortFromChar(pDataAddr);
@@ -4575,7 +4698,7 @@ UINT8 MaskInit(UINT8 * FSDataName)
******CI到ATS码位表解析
********/
/*CI-ATS道岔码位*/
if (DATA_TYPE_NEW == chPulicData)
if (DATA_TYPE_MAIN_BRANCH == chPulicData)
{
/*CI-ATS道岔码位*/
funcRtn = MaskCfgDtStruFrmCIATSSwitchMask(FSDataName);
@@ -4596,7 +4719,7 @@ UINT8 MaskInit(UINT8 * FSDataName)
/*CI-ATS紧急停车按钮码位*/
funcRtn *= MaskCfgDtStruFrmCIATSEsbMask( FSDataName);
/*CI-ATS逻辑区段码位*/
if (DATA_TYPE_NEW == chPulicData)
if (DATA_TYPE_MAIN_BRANCH == chPulicData)
{
/*主线*/
funcRtn *= MaskCfgDtStruFrmCIATSLogSgmt(FSDataName);
@@ -4620,7 +4743,16 @@ UINT8 MaskInit(UINT8 * FSDataName)
funcRtn *= MaskCfgDtStruFrmCIATSSPKSMask(FSDataName);
/*CI-ATS 洗车机码位*/
if (DATA_TYPE_MAIN_BRANCH == chPulicData)
{
/*主线*/
funcRtn *= MaskCfgDtStruFrmCIATSWash(FSDataName);
}
else
{
/*杭德*/
funcRtn *= MaskCfgDtStruFrmCIATSWashM(FSDataName);
}
/*CI-ATS 车库门码位*/
funcRtn *= MaskCfgDtStruFrmCIATSGarageDoor(FSDataName);
@@ -4642,7 +4774,7 @@ UINT8 MaskInit(UINT8 * FSDataName)
if(RC_WORK_MODE_CI == ciPattern)
{
if (DATA_TYPE_NEW == chPulicData)
if (DATA_TYPE_MAIN_BRANCH == chPulicData)
{
/*CI-ZC道岔码位*/
funcRtn *= MaskCfgDtStruFrmCIZCSwitchMask(FSDataName);
@@ -4675,7 +4807,7 @@ UINT8 MaskInit(UINT8 * FSDataName)
/*ZC-CI逻辑区段码位*/
funcRtn *= MaskCfgStruFrmZCCILogSgmtMask( FSDataName);
/*CI-ZC逻辑区段码位*/
if (DATA_TYPE_NEW == chPulicData)
if (DATA_TYPE_MAIN_BRANCH == chPulicData)
{
funcRtn *= MaskCfgDtStruFrmCI2ZCLogSgmt(FSDataName);
}
@@ -4687,7 +4819,7 @@ UINT8 MaskInit(UINT8 * FSDataName)
/*CI-ZC进路码位*/
funcRtn *= MaskCfgStruFrmCIZCRouteMask( FSDataName);
/*ZC-CI进路码位*/
if (DATA_TYPE_NEW == chPulicData)
if (DATA_TYPE_MAIN_BRANCH == chPulicData)
{
funcRtn *= MaskCfgDtStruFrmZC2CiRouteMask(FSDataName);
}
TSCP/src/APP/ciapp/QueryFiles/dquMaskInit.h
+9 -2
View File
@@ -53,7 +53,7 @@
#define CI_ZC_ROUTE_MASK_LEN ((UINT32)14) /*CI-ZC进路码位字节长度--1行长度*/
#define CI_ZC_AXLE_SGMT_MASK_ID ((UINT32)5) /*CI-ZC计轴区段码位*/
#define CI_ZC_AXLE_SGMT_MASK_LEN ((UINT32)26) /*CI-ZC计轴区段码位字节长度--1行长度，Modified 20151015*/
#define CI_ZC_AXLE_SGMT_MASK_LEN ((UINT32)30) /*CI-ZC计轴区段码位字节长度--1行长度，Modified 20151015*/
#define CI_ZC_OVER_LAP_MASK_ID ((UINT32)8) /*CI-ZC保护区段码位*/
#define CI_ZC_OVER_LAP_MASK_LEN ((UINT32)8) /*CI-ZC保护区段码位字节长度--1行长度*/
@@ -114,7 +114,7 @@
#define CI_ATS_SPKS_MASK_LEN ((UINT32)8) /*CI-ATS SPKS开关状态码位字节长度--1行长度；2018.03.19 由6改为8，CI_ATS SPKS开关码位表增加一列开关旁路状态码位*/
#define CI_ATS_WASHMACHINE_MASK_ID ((UINT32)11) /*CI-ATS 洗车机就绪状态码位*/
#define CI_ATS_WASHMACHINE_MASK_LEN ((UINT32)8) /*CI-ATS 洗车机就绪状态码位字节长度--1行长度*/
#define CI_ATS_WASHMACHINE_MASK_LEN ((UINT32)6) /*CI-ATS 洗车机就绪状态码位字节长度--1行长度*/
#define CI_ATS_AAR_ROUTE_MASK_ID ((UINT32)12) /*CI-ATS全自动折返进路码位*/
#define CI_ATS_AAR_ROUTE_MASK_LEN ((UINT32)6) /*CI-ATS全自动折返进路码位字节长度--1行长度*/
@@ -222,6 +222,13 @@ UINT8 MaskCfgDtStruFrmCIATSSPKSMask(UINT8 * FSDataName);
*********************************************/
UINT8 MaskCfgDtStruFrmCIATSWashM(UINT8 * FSDataName);
/*********************************************
*函数功能：CI-ATS 洗车机就绪状态码位
*参数说明：FSDataName件指针
*返回值：0，失败；1，成功
*********************************************/
UINT8 MaskCfgDtStruFrmCIATSWash(UINT8* FSDataName);
/*********************************************
*函数功能：CI-ATS 防淹门状态码位
*参数说明：FSDataName文件件指针
TSCP/src/APP/ciapp/QueryFiles/dqucijdqstru.h
+19 -2
View File
@@ -108,7 +108,8 @@
/*道岔配置表*/
#define OC_SWITCH_ID ((UINT8)2)
#define LEN_OC_SWITCH ((UINT8)8)
#define LEN_OC_SWITCH ((UINT8)25)
#define SWITCH_BOARD_MODE_MAX 5U /*一个OC中道岔最多的模块数*/
/*道岔继电器配置表*/
#define OC_SWITCH_RELAY_ID ((UINT8)4)
#define LEN_OC_SWITCH_RELAY ((UINT8)24)
@@ -171,7 +172,7 @@
/*非进路调车继电器表*/
#define OC_RELAY_NO_ROUTE_ID ((UINT8)20)
#define OC_LEN_RELAY_NO_ROUTE ((UINT8)10)
#define OC_LEN_RELAY_NO_ROUTE ((UINT8)12)
/*车库门继电器表*/
#define OC_RELAY_GARAGE_DOOR_ID ((UINT8)21)
@@ -198,6 +199,9 @@
/*调车同意继电器表ID*/
#define OC_RELAY_DCAGREE_ID ((UINT8)36)
/* 试灯继电器表 */
#define OC_RELAY_LIGHTTESTBUTTON_ID ((UINT8)39)
/*紧急停车按钮继电器结构体*/
typedef struct S_Relay_EmegencyStopStruct
{
@@ -251,6 +255,7 @@ typedef struct S_Relay_ScreenStruct
UINT16 wVideoQkLight1RelayId; /*清客按钮箱视频清客指示灯1（绿）继电器*/
UINT16 wVideoQkLight2RelayId; /*清客按钮箱视频清客指示灯2（红）继电器*/
UINT8 chControlType; /*屏蔽门控制类型*/
UINT16 wIbpRelayId; /*IBP盘发车按钮继电器ID*/
} Relay_ScreenStruct;
/*物理区段继电器结构体*/
@@ -336,6 +341,7 @@ typedef struct S_Relay_NoRouteDcStruct
UINT16 wRelayTongYiScId; /*同意试车继电器ID*/
UINT16 wRelayDrvShiCheShengQingId; /* 试车线驱动的申请试车继电器ID */
UINT16 wRelayColTongYiScId; /* 试车线同意试车继电器ID */
UINT16 wWaysideTryTrainIndRelayId; /* 轨旁试车指示器继电器ID */
} Relay_NoRouteDcStruct;
/*照查继电器结构体*/
@@ -433,9 +439,11 @@ typedef struct S_Relay_WashMachineStruct
UINT16 TrainEmergencyStopRelayId; /*全自动列车紧急停车继电器(配置字段:采集继电器)*/
UINT16 HeadWashAllowRelayId; /*全自动允许车头清洗继电器(配置字段:采集继电器)*/
UINT16 TailWashAllowRelayId; /*全自动允许车尾清洗继电器(配置字段:采集继电器)*/
UINT16 wCouplingWashAllowRelayId; /*全自动允许联挂段清洗继电器(配置字段:采集继电器)*/
UINT16 WashTrainRequestRelayId; /*全自动洗车请求继电器(配置字段:驱动继电器)*/
UINT16 TrainHeadStopSteadyRelayId; /*全自动车头停稳继电器(配置字段:驱动继电器)*/
UINT16 TrainTailStopSteadyRelayId; /*全自动车尾停稳继电器(配置字段:驱动继电器)*/
UINT16 wCoupingStopSteadyRelayId; /*全自动车尾停稳继电器(配置字段:驱动继电器)*/
UINT16 TrainPassRequestRelayId; /*全自动通过请求继电器(配置字段:驱动继电器)*/
UINT16 TrainOutWashPortAllowRelayId; /*全自动允许列车出库继电器(配置字段:采集继电器)*/
UINT16 PauseTrainWashRequestRelayId; /*全自动暂停洗车继电器(配置字段:驱动继电器)*/
@@ -443,13 +451,22 @@ typedef struct S_Relay_WashMachineStruct
UINT16 WashModeRelayId; /*全自动自动洗车模式继电器（配置字段:驱动继电器)*/
UINT16 wDownWashAllowRelayId; /*降级模式洗车同意按钮继电器ID(配置字段:采集继电器)*/
UINT16 wDownWashAllowLightRelayId; /*降级模式洗车同意指示灯继电器ID（配置字段:驱动继电器)*/
UINT16 wDownDccWashAllowRelayId; /*降级模式DCC洗车同意按钮继电器ID (配置字段:采集继电器)*/
UINT16 wDownDccWashAllowLightRelayId; /*降级模式DCC洗车同意指示灯继电器ID （配置字段:驱动继电器)*/
UINT16 wDownWashAllowPassRelayId; /*降级模式洗车同意通过按钮继电器ID(配置字段:采集继电器)*/
UINT16 wDownWashPassAllowLightRelayId; /*降级模式洗车同意反向通过指示灯继电器ID（配置字段:驱动继电器)*/
UINT16 downDccWashPassAllowRelayId; /*降级模式DCC洗车同意反向通过按钮继电器ID(配置字段:采集继电器)*/
UINT16 dccWashPassAllowLightRelayId; /*降级模式DCC洗车同意反向通过指示灯继电器ID（配置字段:驱动继电器)*/
UINT16 wDownWashRelateRoute1Id; /*降级模式洗车线控制台表示灯1关联进路ID*/
UINT8 wDownWashRelateRoute1CheckType; /*降级模式洗车线控制台表示灯1关联进路状态检查类型*/
UINT16 wDownWashRelRoute1LightRelayId; /*降级模式洗车线控制台表示灯1继电器ID（配置字段:驱动继电器)*/
UINT16 wDownWashRelateRoute2Id; /*降级模式洗车线控制台表示灯2关联进路ID*/
UINT8 wDownWashRelateRoute2CheckType; /*降级模式洗车线控制台表示灯2关联进路状态检查类型*/
UINT16 wDownWashRelRoute2LightRelayId; /*降级模式洗车线控制台表示灯2继电器ID（配置字段:驱动继电器)*/
UINT16 wDownWashReqAllowLightRelayId; /*降级模式洗车请求指示灯继电器ID（配置字段:驱动继电器)*/
UINT16 downDccWashApplyLightRelayId; /*降级模式DCC洗车请求指示灯继电器ID（配置字段:驱动继电器)*/
UINT16 washPassApplyLightRelayId; /*降级模式洗车反向通过请求指示灯继电器ID（配置字段:驱动继电器)*/
UINT16 dccWashPassApplyLightRelayId; /*降级模式DCC洗车反向通过请求指示灯继电器ID（配置字段:驱动继电器)*/
} Relay_WashMachineStruct;
TSCP/src/APP/ciapp/Relay/RelayDefine.h
+1
View File
@@ -96,6 +96,7 @@
#define SIGNAL_YXJ_TYPE ((UINT8)0x09) /*YXJ继电器*/
#define SIGNAL_DXJ_TYPE ((UINT8)0x0A) /*DXJ继电器*/
#define CHECK_ZCJ_TYPE ((UINT8)0x0B) /*ZCJ继电器*/
#define SWITCH_IBP_TYPE ((UINT8)0x0C) /*IBP继电器*/
/*继电器混线相关*/
#define RELAY_HUNXIAN_NUM ((UINT8)10) /*继电器混线容忍最大周期*/
TSCP/src/APP/ciapp/RemoteRM/RRMDataPrepare.c
+21 -10
View File
@@ -900,6 +900,7 @@ UINT8 rrm_PrepareSwitchStatOfAC(UINT16 acID)
UINT8 cycleESB = 0u;
UINT8 chLinkNum = 0u;
UINT8 ESBStatus = ESB_STATE_VALID_YES;
UINT8 chEsbCutState = 0U; /*ESB旁路状态*/
const UINT16 *pLinkIdBuf = NULL;
const DSU_DEVICE_IN_LINK_STRU* pTempDeviceStru = NULL;
@@ -932,7 +933,14 @@ UINT8 rrm_PrepareSwitchStatOfAC(UINT16 acID)
for (cycleESB = 0u;cycleESB < pTempDeviceStru->struESBDev.wDevCount;cycleESB++)
{
ESBStatus = GetEsbState(pTempDeviceStru->struESBDev.wDevSetId[cycleESB]);
chEsbCutState = GetEsbCutState(pTempDeviceStru->struESBDev.wDevSetId[cycleESB]);
if (ESB_CUT_YES == chEsbCutState)
{
/* ESB旁路，认为按钮未按下*/
}
else
{
if (ESB_STATE_VALID_NO == ESBStatus)
{
/** ESB未按下，继续遍历*/
@@ -942,6 +950,7 @@ UINT8 rrm_PrepareSwitchStatOfAC(UINT16 acID)
break;
}
}
}
if (cycleESB != pTempDeviceStru->struESBDev.wDevCount)
{
@@ -986,6 +995,7 @@ UINT8 rrm_PrepareSwitchStatOfAC(UINT16 acID)
UINT8 PSDStatus = PSD_STATE_OPEN;
const UINT16 *pLinkIdBuf = NULL;
const DSU_DEVICE_IN_LINK_STRU* pTempDeviceStru = NULL;
UINT8 chPsdMutualLockStat = 0U; /*PSD互锁解除状态*/
chLinkNum = GetAxisLinkSum(acID);
pLinkIdBuf = GetAxisLinkIdBuf(acID);
@@ -1016,7 +1026,14 @@ UINT8 rrm_PrepareSwitchStatOfAC(UINT16 acID)
for (cyclePSD = 0u;cyclePSD < pTempDeviceStru->struScreenDev.wDevCount;cyclePSD++)
{
PSDStatus = GetPsdState(pTempDeviceStru->struScreenDev.wDevSetId[cyclePSD]);
chPsdMutualLockStat = GetPsdMutualLockRemoveState(pTempDeviceStru->struScreenDev.wDevSetId[cyclePSD]);
if (PSD_MUTUALLOCK_REMOVE_YES == chPsdMutualLockStat)
{
/*互锁解除认为PSD状态正常，继续检查*/
}
else
{
if (PSD_STATE_CLOSE == PSDStatus)
{
/** 屏蔽门关闭，继续遍历*/
@@ -1026,6 +1043,7 @@ UINT8 rrm_PrepareSwitchStatOfAC(UINT16 acID)
break;
}
}
}
if (cyclePSD != pTempDeviceStru->struScreenDev.wDevCount)
{
@@ -1182,20 +1200,13 @@ UINT8 rrm_PrepareSwitchStatOfAC(UINT16 acID)
*/
void rrm_SetRRMResult(UINT16 trainID,UINT8 rrmReply,UINT8 rrmReason,UINT8 nextOCId)
{
UINT16 wRcIdWithType = 0U;
if (RC_WORK_MODE_CI == CI_SYSTEM_TYPE_RCI)
{
wRcIdWithType = 0x3C00U;
}
else
{
wRcIdWithType = 0x3D00U;
}
UINT16 wRcIdWithType = 0x3D00U;
wRcIdWithType |= (UINT16)nextOCId;
SetTrainRrmState(trainID,rrmReply);
SetTrainRrmReson(trainID,rrmReason);
SetTrainNextTioc(trainID, wRcIdWithType); /*设置下一控区ID需带0x3c，否则给IVOC组包时无法获取互联互通ID*/
SetTrainNextTioc(trainID, wRcIdWithType);
}
/**
TSCP/src/APP/ciapp/Route/RouteConfigDataManage.c
+26
View File
@@ -3701,3 +3701,29 @@ UINT8 GetPhySecInRoutePosIndex(const UINT16 routeId, const UINT16 phySectionId)
return retVal;
}
/*
* 功能描述： 获取指定ID进路配置方向
* 参数说明： const UINT16 routeId, 进路ID
* 返回值 ：0x55 与Link方向一致
* 0xAA 与Link方向相反
** by LYJ 20260330
*/
UINT8 GetRouteConfigDirection(const UINT16 routeId)
{
UINT16 bufIndex = 0U; /*数组下标*/
UINT8 retVal = CI_ERROR;
bufIndex = GetRouteConfigBufIndex(routeId); /*获取进路数组下标*/
if (ROUTE_SUM_MAX > bufIndex)
{
retVal = RouteConfigDataStru[bufIndex].chRouteConfigDirection;
}
else
{
retVal = CI_ERROR;
}
return retVal;
}
TSCP/src/APP/ciapp/Route/RouteConfigDataManage.h
+10 -1
View File
@@ -188,7 +188,8 @@ typedef struct S_RouteConfigDataStruct
UINT16 RouteId; /*进路ID (配置字段)*/
UINT8 BelongCiId; /*所属联锁ID (配置字段)*/
UINT8 BelongVirCIid; /*所属虚拟联锁ID*/
UINT8 RouteDirection; /*进路方向(向左/向右) (配置字段)*/
UINT8 RouteDirection; /*进路方向(向左/向右) (配置字段叠系统定义逻辑方向与上下行方向的关系计算的上下行)*/
UINT8 chRouteConfigDirection; /*进路方向(向左/向右) (纯配置字段0x55 与Link方向一致 0xAA 与Link方向相反)*/
UINT8 RouteType; /*进路类型(列车进路/折返进路/调车进路) (配置字段)*/
UINT8 ConfigRouteType; /*配置进路类型(列车进路/折返进路/调车进路) (配置字段)*/
UINT8 LeadProperty; /*进路引导属性(不可引导/可引导) (配置字段)*/
@@ -1418,6 +1419,14 @@ UINT8 GetRouteThisPortecSwitchPos(const UINT16 wRouteId, const UINT16 wSwitchId)
* 其它 位置所有
*/
UINT8 GetPhySecInRoutePosIndex(const UINT16 routeId, const UINT16 phySectionId);
/*
* 功能描述： 获取指定ID进路配置方向
* 参数说明： const UINT16 routeId, 进路ID
* 返回值 ：0x55 与Link方向一致
* 0xAA 与Link方向相反
** by LYJ 20260330
*/
UINT8 GetRouteConfigDirection(const UINT16 routeId);
#ifdef __cplusplus
}
TSCP/src/APP/ciapp/Route/RouteDataManage.c
+26
View File
@@ -140,6 +140,7 @@ UINT8 SetRouteState(const UINT16 routeId, const UINT8 routeState)
RouteDataStru[bufIndex].chRoutCouplinkFlag = ROUTE_COUPLINK_FLAG_NO;/*清除进路联挂标志*/
RouteDataStru[bufIndex].chCouplinkSuccessFlag = ROUTE_COUPLINK_RESULT_NOT; /*清除进路联挂成功标志*/
RouteDataStru[bufIndex].chCouplinkErrorFlag = ROUTE_COUPLINK_RESULT_NOT; /*清除进路联挂失败标志*/
RouteDataStru[bufIndex].dwRouteIdleCycNum = dwCurCycleNum; /*进路空闲起始周期号*/
ClearRouteResReqTrainBuf(routeId);
}
else if ((ROUTE_STATE_FIRST_XUANPAI == routeState)
@@ -6167,3 +6168,28 @@ void SetRouteStopensureFlagCC(const UINT16 routeId, const UINT8 stopensureFlag)
/*不处理*/
}
}
/*
* 功能描述： 获取指定进路空闲起始周期号
* 参数说明： const UINT16 routeId 进路ID
* 返 回 值： 进路空闲起始周期号
* by cgh 20251210
*/
UINT32 GetRouteIdleCycNum(const UINT16 routeId)
{
UINT16 bufIndex = 0U; /*数组下标*/
UINT32 reVal = 0U;
bufIndex = GetRouteConfigBufIndex(routeId); /*获取进路数组下标*/
if (ROUTE_SUM_MAX > bufIndex)
{
reVal = RouteDataStru[bufIndex].dwRouteIdleCycNum;
}
else
{
/*不做处理*/
}
return reVal;
}
TSCP/src/APP/ciapp/Route/RouteDataManage.h
+10 -1
View File
@@ -72,7 +72,7 @@ typedef struct S_RouteDataStruct
UINT8 RouteAssoSwitSingOperStat; /*进路带动道岔单操状态*/
UINT8 RouteInnerSwitDrivState; /*进路内道岔驱动状态*/
UINT8 RouteAssocSwitDrivState; /*进路带动道岔驱动状态*/
UINT8 RouteStateFlag; /*进路状态标志（1：表示有效；0：表示无效）*/
UINT8 RouteStateFlag; /*进路状态标志（0x55：表示有效；0xAA：表示无效）*/
UINT8 TrainEnterFlag; /*列车驶入标志*/
UINT8 ZongRenJieDelayType; /*总人解延时类型，分为：倒计时结束后立刻全部区段解锁，第一个占压的物理区段前变异常锁闭，所有的物理区段变异常锁闭*/
UINT8 RecoverOpenState; /*进路需要重开状态，用于处理PSD、SPKS、扣车恢复重开信号*/
@@ -112,6 +112,7 @@ typedef struct S_RouteDataStruct
UINT8 chRoutCouplinkFlag; /*进路联挂标志*/
UINT8 chCouplinkSuccessFlag; /*进路联挂成功*/
UINT8 chCouplinkErrorFlag; /*进路联挂失败*/
UINT32 dwRouteIdleCycNum; /*进路空闲起始周期号*/
} RouteDataStruct;
/*进路动态数据结构体-车车*/
@@ -1779,6 +1780,14 @@ UINT8 GetRouteStopensureFlagCC(const UINT16 routeId);
*/
void SetRouteStopensureFlagCC(const UINT16 routeId, const UINT8 stopensureFlag);
/*
* 功能描述： 获取指定进路空闲起始周期号
* 参数说明： const UINT16 routeId 进路ID
* 返 回 值： 进路空闲起始周期号
* by cgh 20251210
*/
UINT32 GetRouteIdleCycNum(const UINT16 routeId);
#ifdef __cplusplus
}
#endif
TSCP/src/APP/ciapp/Section/AxisSectionConfigDataManage.c
+53 -1
View File
@@ -17,7 +17,7 @@
AxisSectionConfigDataStruct AxisSectionConfigDataStru[AXIS_SECTION_SUM_MAX]; /*定义计轴区段配置数据结构体,cgh-合并CID-2539-1：此处声明不进行初始化，统一放到InitAllStaticDataStr函数中进行初始化，为解决生成内核过大得问题*/
UINT16 LocalCiAxisSectionIdBuf[AXIS_SECTION_SUM_MAX] = {0u}; /*定义本地联锁计轴区段ID映射数组*/
INT16 AxisSectionCurSum = 0; /*逻辑区段当前总数*/
INT16 AxisSectionCurSum = 0; /*计轴区段当前总数*/
UINT16 totalAxisNum = 0u; /*本联锁+相邻联锁的计轴区段ID数量*/
/*
@@ -1151,3 +1151,55 @@ UINT8 GetAxisSecCbtcProperty(const UINT16 axisSectionId)
return retVal;
}
/*
* 功能描述： 获取指定ID计轴区段关联防护道岔数目
* 参数说明： const UINT16 wLogicSecId, 计轴区段ID
* 返回值 ： 0: 获取数据失败
* >0: 道岔数目
* 创建 : mpt 20260331
*/
UINT8 GetAxisSecRelateProSwSum(const UINT16 wAxisSecId)
{
UINT16 wBufIndex = 0u; /*数组下标*/
UINT8 retVal = CI_ERROR;
wBufIndex = GetAxisSecConfigBufIndex(wAxisSecId); /*获取计轴区段数组下标*/
if (AXIS_SECTION_SUM_MAX > wBufIndex)
{
retVal = AxisSectionConfigDataStru[wBufIndex].chRelateProSwSum;
}
else
{
retVal = CI_ERROR;
}
return retVal;
}
/*
* 功能描述： 获取指定ID计轴区段关联防护道岔结构体
* 参数说明： const UINT16 wLogicSecId, 计轴区段ID
* 返回值 ： NULL: 获取数据失败
* 非NULL: 道岔ID数组指针
* 创建 : mpt 20260331
*/
AxisSwitchStruct* GetAxisSecRelateProSwStru(const UINT16 wAxisSecId)
{
UINT16 wBufIndex = 0u; /*数组下标*/
AxisSwitchStruct* retVal = NULL;
wBufIndex = GetAxisSecConfigBufIndex(wAxisSecId); /*获取数组下标*/
if (AXIS_SECTION_SUM_MAX > wBufIndex)
{
retVal = AxisSectionConfigDataStru[wBufIndex].wRelateProSwId;
}
else
{
retVal = NULL;
}
return retVal;
}
TSCP/src/APP/ciapp/Section/AxisSectionConfigDataManage.h
+18
View File
@@ -53,6 +53,8 @@ typedef struct S_AxisSectionConfigDataStruct
UINT8 chAxisLinXian; /*计轴临线属性-是否为本线路-电子地图Link表获得*/
UINT32 dwAxisTotalLen; /*计轴关联link总长*/
UINT8 cAcCbtcAttr; /*计轴区段CBTC区域属性：0x55-具有CBTC区域属性，0xaa-不具有CBTC区域属性*/
UINT8 chRelateProSwSum; /* add by mpt 20260331 计轴区段关联防护道岔数量*/
AxisSwitchStruct wRelateProSwId[AXIS_RELATE_PRO_SW_SUM_MAX];/* add by mpt 20260331 计轴区段关联防护道岔ID数组*/
} AxisSectionConfigDataStruct;
extern AxisSectionConfigDataStruct AxisSectionConfigDataStru[AXIS_SECTION_SUM_MAX]; /*定义计轴区段配置数据结构体,cgh-合并CID-2539-1：此处声明不进行初始化，统一放到InitAllStaticDataStr函数中进行初始化，为解决生成内核过大得问题*/
@@ -320,6 +322,22 @@ UINT8 GetAxisSecBorderProperty(const UINT16 axisSectionId);
* Created By LQ 2025.08.05
*/
UINT8 GetAxisSecCbtcProperty(const UINT16 axisSectionId);
/*
* 功能描述： 获取指定ID计轴区段关联防护道岔数目
* 参数说明： const UINT16 wLogicSecId, 计轴区段ID
* 返回值 ： 0: 获取数据失败
* >0: 道岔数目
* 创建 : mpt 20260331
*/
UINT8 GetAxisSecRelateProSwSum(const UINT16 wAxisSecId);
/*
* 功能描述： 获取指定ID计轴区段关联防护道岔结构体
* 参数说明： const UINT16 wLogicSecId, 计轴区段ID
* 返回值 ： NULL: 获取数据失败
* 非NULL: 道岔ID数组指针
* 创建 : mpt 20260331
*/
AxisSwitchStruct* GetAxisSecRelateProSwStru(const UINT16 wAxisSecId);
#ifdef __cplusplus
}
TSCP/src/APP/ciapp/Section/AxisSectionDataManage.c
+45
View File
@@ -855,3 +855,48 @@ void SetAxisSecArbStateCC(const UINT16 axisSectionId, const UINT8 arbState)
; /*不设置*/
}
}
/*
* 功能描述：计轴区段状态处理
* 参数说明：void
* 返 回 值：无
* by cgh 20260327
*/
void AxisSecStateDeal(void)
{
UINT8 cLocalCiId = 0U; /*本地联锁ID*/
UINT16 ii = 0U;
UINT16 wAxisSecSum = 0U; /*本控区计轴区段数量*/
UINT16 wAxisSecId = 0U; /*计轴区段ID*/
UINT8 cAxisSecBlongCiId = 0U; /*计轴区段所属控区*/
UINT8 chAcArbState = 0U; /*计轴区段ARB状态*/
cLocalCiId = GetSystemParaLocalCiId();
wAxisSecSum = GetAxisSecCurSum();
/*遍历本控区计轴区段*/
for (ii = 0U; ii < wAxisSecSum; ii++)
{
wAxisSecId = GetAxisSecId(ii);
cAxisSecBlongCiId = GetAxisSectionBelongCiId(wAxisSecId);
if ((cLocalCiId == cAxisSecBlongCiId) && (0U != cAxisSecBlongCiId))
{
chAcArbState = aam_GetAxisStatusAPI(wAxisSecId);
/* 计轴区段ARB，则逻辑区段ARB */
if (AAM_STATUS_ARB == chAcArbState)
{
/*设置RC计轴区段ARB状态为ARB*/
SetAxisSecArbStateCC(wAxisSecId, AXIS_SECTION_ARB_YES);
}
else
{
/*设置RC计轴区段ARB状态为未ARB*/
SetAxisSecArbStateCC(wAxisSecId, AXIS_SECTION_ARB_NO);
}
}
else
{
; /*不属于本控区，只是异常防护*/
}
}
}

Some files were not shown because too many files have changed in this diff Show More