joylink/xian-ncc-da-message
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
joylink_zhangsai 2023-07-14 10:21:48 +08:00
commit f34687558e
3 changed files with 59 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
protos/device_info.proto
View File

@ -26,7 +26,7 @@ message Section {
} }
// 道岔 // 道岔
message Switch { message Turnout {
string id = 1; string id = 1;

66
protos/device_status.proto
View File

@ -12,11 +12,10 @@ enum DeviceType{
TRACK = 5; TRACK = 5;
ENTRY = 6; ENTRY = 6;
PLATFORM = 7; PLATFORM = 7;
SCADA = 8; SCADA = 9;
WATERPROOF_DOOR = 9; WATERPROOF_DOOR = 11;
WORK_AREA = 10; WORK_AREA = 12;
GAMA = 11; GAMA = 13;
} }
message Rtu { message Rtu {
@ -94,33 +93,33 @@ message Entry{
} }
message Switch { message Switch {
bool ipSingleSwitchStusCiOccupied = 1; bool ipSingleSwitchStusCiOccupied = 1; // 连锁报告道岔占用
bool ipSingleSwitchStusCbtcOccupied = 2; bool ipSingleSwitchStusCbtcOccupied = 2; // CBTC报告道岔占用
bool ipSingleSwitchStusLocked = 3; bool ipSingleSwitchStusLocked = 3; // 道岔锁闭
bool ipSingleSwitchStusFailLocked = 4; bool ipSingleSwitchStusFailLocked = 4; // 道岔故障锁闭
bool ipSingleSwitchStusNormal = 5; bool ipSingleSwitchStusNormal = 5; // 定位
bool ipSingleSwitchStusReverse = 6; bool ipSingleSwitchStusReverse = 6; // 反位
bool ipSingleSwitchStusBlocked1 = 7; bool ipSingleSwitchStusBlocked1 = 7; // 单锁
bool ipSingleSwitchStusJammed = 8; bool ipSingleSwitchStusJammed = 8; // 挤岔
bool ipSingleSwitchStusExpectLock = 9; // bool ipSingleSwitchStusExpectLock = 9; // 期望锁闭
bool ipSingleSwitchStusExpectUnlock = 10; // bool ipSingleSwitchStusExpectUnlock = 10; // 期望锁闭解除
bool ipSingleSwitchStusExpectNormal = 11; // bool ipSingleSwitchStusExpectNormal = 11; // 期望道岔定位
bool ipSingleSwitchStusExpectReverse = 12; // bool ipSingleSwitchStusExpectReverse = 12; // 期望道岔反位
bool ipSingleSwitchStusExpectBlock = 13; // bool ipSingleSwitchStusExpectBlock = 13; // 期望道岔单锁
bool ipSingleSwitchStusExpectUnblock = 14; // bool ipSingleSwitchStusExpectUnblock = 14; // 期望道岔解除单锁
bool ipSingleSwitchStusInRoute = 15; // bool ipSingleSwitchStusInRoute = 15; // 是否在进路中锁闭
bool ipSingleSwitchStusManualMode = 16; // bool ipSingleSwitchStusManualMode = 16; // 道岔为手动操作模式
bool ipSingleSwitchStusCut = 17; bool ipSingleSwitchStusCut = 17; // 道岔切除
bool ipSingleSwitchStusAtcInvalid = 18; bool ipSingleSwitchStusAtcInvalid = 18; // 道岔区段被ATC报告失效
bool ipSingleSwitchStusOverlap = 19; bool ipSingleSwitchStusOverlap = 19; // OVERLAP
bool ipSingleSwitchStusTsrCbtcMain = 20; bool ipSingleSwitchStusTsrCbtcMain = 20; // CBTC岔前限速
bool ipSingleSwitchStusTsrCbtcNormal = 21; bool ipSingleSwitchStusTsrCbtcNormal = 21; // CBTC定位限速
bool ipSingleSwitchStusTsrCbtcReverse = 22; bool ipSingleSwitchStusTsrCbtcReverse = 22; // CBTC反位限速
bool ipSingleSwitchStusTsrBmMain = 23; bool ipSingleSwitchStusTsrBmMain = 23; // BM岔前限速
bool ipSingleSwitchStusTsrBmNormal = 24; bool ipSingleSwitchStusTsrBmNormal = 24; // BM定位限速
bool ipSingleSwitchStusTsrBmReverse = 25; bool ipSingleSwitchStusTsrBmReverse = 25; // BM反位限速
bool ipSingleSwitchStusBlocked2 = 26; bool ipSingleSwitchStusBlocked2 = 26; // 道岔封锁
bool ipSingleSwitchStusLostIndication = 27; bool ipSingleSwitchStusLostIndication = 27; // 道岔失表示
//设备唯一识别码，一般为设备名称 //设备唯一识别码，一般为设备名称
string id = 28; string id = 28;
//限速值KM/H //限速值KM/H
@ -262,6 +261,3 @@ message OccNccFepNetwork{
// false 代表断开 // false 代表断开
bool active = 2; bool active = 2;
} }

7
protos/stationLayoutGraphics.proto
View File

@ -200,10 +200,10 @@ message Section {
CommonInfo common = 1; CommonInfo common = 1;
string code = 2; string code = 2;
repeated Point points = 3; repeated Point points = 3;
RelatedRef paRef = 4; // 区段A端关联的设备 RelatedRef paRef = 4; // 区段A端关联的设备(非岔区)
RelatedRef pbRef = 5; // 区段B端关联的设备 RelatedRef pbRef = 5; // 区段B端关联的设备(非岔区)
SectionType sectionType = 6; // 区段类型 SectionType sectionType = 6; // 区段类型
repeated string children = 7; // 物理区段的下属逻辑区段/道岔物理区段的下属道岔 repeated string axleCountings = 7; // 关联的计轴
} }
message KilometerPoint { message KilometerPoint {
@ -218,6 +218,7 @@ message PathLine {
repeated Point points = 3; repeated Point points = 3;
bool isUp = 4; bool isUp = 4;
repeated KilometerPoint kilometerPoints = 5; repeated KilometerPoint kilometerPoints = 5;
bool aToB = 6;
} }
//关联设备 //关联设备