Commit Graph

227 Commits

Author SHA1 Message Date
xzb
8e6a39a7ca Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtsts-server-go 2023-10-20 09:15:56 +08:00
xzb
23c1b2dc6e 信号机模型类型 2023-10-20 09:14:54 +08:00
weizhihong
94255947e6 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtsts-server-go 2023-10-19 18:04:29 +08:00
weizhihong
a82728e09e 【列车位置处理逻辑】 2023-10-19 18:04:21 +08:00
xzb
2e4083a75a 信号机模型类型 2023-10-19 17:53:08 +08:00
weizhihong
9f4a044e95 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtsts-server-go
# Conflicts:
#	api/simulation.go
#	ats/verify/protos/state/device_state.pb.go
#	ats/verify/simulation/wayside/memory/wayside_memory_ibp.go
2023-10-19 17:46:26 +08:00
weizhihong
73f1d60fac 【返回列车公里标修改】 2023-10-19 17:42:01 +08:00
7fa7257ff6 增加屏蔽门状态返回 2023-10-19 17:31:27 +08:00
d8b93dc309 增加门控箱交互接口;修改门控箱构建逻辑bug;增加屏蔽门状态 2023-10-19 17:09:57 +08:00
xzb
1d450bc1e1 signal 故障 2023-10-19 15:27:35 +08:00
xzb
afa8ce8a89 signal 故障 2023-10-19 15:14:41 +08:00
weizhihong
281de9da77 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtsts-server-go
# Conflicts:
#	third_party/semi_physical_train/semi_physical_train.go
2023-10-19 14:46:17 +08:00
weizhihong
2e9727db77 【调整动力学、半实物代码】 2023-10-19 14:44:10 +08:00
xzb
8b2333dd8b signal 故障 2023-10-19 14:17:37 +08:00
weizhihong
ce10a3198c Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtsts-server-go
# Conflicts:
#	ats/verify/simulation/simulation_manage.go
2023-10-19 10:18:31 +08:00
0f9912af30 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtsts-server-go 2023-10-19 09:40:11 +08:00
81724bd707 重构动力学、半实物接口(结构完成,实现未完) 2023-10-19 09:33:40 +08:00
weizhihong
fc28cb6f6d 【修改延时时间逻辑】 2023-10-18 17:23:44 +08:00
weizhihong
bd36ffcf07 【删除连接中断逻辑】 2023-10-18 16:41:41 +08:00
weizhihong
e4aa56bef1 【增加列车控制延迟时间默认值】 2023-10-18 14:58:04 +08:00
weizhihong
696bb9ffd6 【修改获取IBP盘信息消息逻辑】 2023-10-18 14:56:24 +08:00
weizhihong
584c6311dd 【修改获取IBP UID集合逻辑】 2023-10-18 14:15:04 +08:00
weizhihong
ec9f8a380e 【处理按钮带灯逻辑】 2023-10-18 14:09:36 +08:00
weizhihong
522a065720 【IBP操作,状态发送】 2023-10-18 13:53:17 +08:00
weizhihong
1d3727ebca 【空指针问题】 2023-10-18 10:39:34 +08:00
weizhihong
a7e2368878 【增加延时逻辑】 2023-10-18 08:59:58 +08:00
weizhihong
9cc0713686 【增加半实物与动力学延时时间】 2023-10-18 08:50:53 +08:00
weizhihong
c092f53823 【增加动力学与半实物延时字段】 2023-10-17 18:19:31 +08:00
weizhihong
836c34ada4 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtsts-server-go 2023-10-17 17:51:32 +08:00
weizhihong
468f705392 【消息构建】 2023-10-17 17:51:26 +08:00
xzb
8f754984b6 signal 2023-10-17 17:39:05 +08:00
xzb
476bd9f9d3 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtsts-server-go 2023-10-17 15:09:58 +08:00
xzb
3516adb2de signal 2023-10-17 15:09:37 +08:00
weizhihong
774fdd3a1d 【增加ibp、psl消息】【删除部分日志、无用代码】 2023-10-17 14:35:56 +08:00
xzb
dfe084bbaa signal 2023-10-17 10:16:11 +08:00
xzb
169e79f481 signal 2023-10-17 09:44:31 +08:00
xzb
963ffe3e78 signal 2023-10-17 09:27:12 +08:00
xzb
411c22e367 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtsts-server-go 2023-10-17 09:24:00 +08:00
xzb
294c608a88 signal 2023-10-17 09:23:40 +08:00
weizhihong
32f2360f67 【修改半实物参数】 2023-10-16 17:37:27 +08:00
weizhihong
3acff508ec 【调整半实物参数占用位数】 2023-10-16 15:48:58 +08:00
weizhihong
ab806b8920 【半实物参数修改】 2023-10-16 15:24:04 +08:00
weizhihong
cd0bffcd36 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtsts-server-go
# Conflicts:
#	ats/verify/simulation/wayside/memory/wayside_simulation.go
2023-10-16 15:05:40 +08:00
weizhihong
ac5e8f843b 【增加IBP盘对象映射】【半实物协议增加阻力等信息】 2023-10-16 14:52:58 +08:00
xzb
2dc698ccfc signal 2023-10-16 14:06:47 +08:00
xzb
b698316777 signal 2023-10-16 11:28:09 +08:00
xzb
d9928acd11 signal 2023-10-16 11:22:25 +08:00
xzb
c986ea599c signal 2023-10-16 11:18:52 +08:00
xzb
c77c1f4b41 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtsts-server-go 2023-10-16 11:16:39 +08:00
xzb
c7eaeb5674 signal 2023-10-16 11:16:09 +08:00