Commit Graph

569 Commits

Author SHA1 Message Date
xzb
68c0252ec7 计轴rssp 集成 2023-11-10 10:39:41 +08:00
xzb
d0ad082218 计轴rssp 集成 2023-11-09 15:55:40 +08:00
xzb
8cb019147f 计轴rssp 集成 2023-11-09 15:50:34 +08:00
xzb
7b44437fb1 Merge branch 'master' of https://git.code.tencent.com/jl-framework/rtss_simulation into HEAD 2023-11-09 14:59:41 +08:00
xzb
8ba6576eaf 计轴rssp 集成 2023-11-09 14:59:18 +08:00
2f5b628724 修改屏蔽门电路逻辑:没有采驱表数据不再报错 2023-11-09 14:38:35 +08:00
d8efe7c24c Merge branch 'master' of https://git.code.tencent.com/jl-framework/rtss_simulation 2023-11-09 14:26:12 +08:00
c57198c10d 修改零散组合相关继电器及实体的创建 2023-11-09 14:26:08 +08:00
weizhihong
6c09377b4a 【增加根据ID查找设备】 2023-11-09 14:18:02 +08:00
xzb
f007453f53 计轴rssp 集成 2023-11-09 14:04:36 +08:00
weizhihong
fa5ed10810 【获取道岔对应端口的设备关系】 2023-11-09 13:16:42 +08:00
weizhihong
8bc1145eea Merge branch 'master' of https://git.code.tencent.com/jl-framework/rtss_simulation 2023-11-09 13:09:15 +08:00
weizhihong
2b7120831a 【增加获取道岔绑定的物理区段方法】 2023-11-09 13:09:01 +08:00
0dc9d5ba5f Merge branch 'master' of https://git.code.tencent.com/jl-framework/rtss_simulation 2023-11-09 11:08:37 +08:00
d05706b3e5 增加间隙探测继电器及相关逻辑;修改屏蔽门控制逻辑实现 2023-11-09 10:53:18 +08:00
bc160e7ba6 Merge branch 'master' of https://git.code.tencent.com/jl-framework/rtss_simulation 2023-11-09 09:31:41 +08:00
xzb
3c08644dde Merge branch 'master' of https://git.code.tencent.com/jl-framework/rtss_simulation into HEAD
# Conflicts:
#	repository/repository_manager.go
2023-11-07 17:55:59 +08:00
xzb
45b4f4f0fe 计轴rssp 集成 2023-11-07 17:47:41 +08:00
a5d0ae994d Merge branch 'master' of https://git.code.tencent.com/jl-framework/rtss_simulation 2023-11-07 14:37:17 +08:00
43a27a868f 数据消息结构调整 2023-11-07 14:37:12 +08:00
fce28e57e9 Merge remote-tracking branch 'origin/master' 2023-11-07 14:31:08 +08:00
a6dfa6fffb 修改模型数据构建bug;屏蔽门所有继电器都会构建为实体 2023-11-07 14:30:07 +08:00
xzb
3b13603d65 计轴rssp 集成 2023-11-07 13:26:29 +08:00
xzb
51203ce53c 计轴rssp 集成 2023-11-07 13:22:39 +08:00
13af2d6ff9 Merge branch 'master' of https://git.code.tencent.com/jl-framework/rtss_simulation 2023-11-06 17:32:39 +08:00
46507159c5 将零散组合的继电器加载进仿真 2023-11-06 17:32:34 +08:00
xzb
618af297ae 计轴 2023-11-06 15:30:57 +08:00
xzb
81760f5c89 Merge branch 'master' of https://git.code.tencent.com/jl-framework/rtss_simulation into HEAD 2023-11-06 14:36:38 +08:00
xzb
846b48ee20 计轴 2023-11-06 14:35:32 +08:00
a6d555d4f9 Merge remote-tracking branch 'origin/master' 2023-11-06 13:54:45 +08:00
010c822b13 修改屏蔽门故障操作bug 2023-11-06 13:53:59 +08:00
weizhihong
32a8921f9b 【继电器操作返回处理结果信息】 2023-11-06 13:41:57 +08:00
dfe96a977c 增加屏蔽门故障操作及逻辑 2023-11-06 10:52:57 +08:00
4bcc1c0b16 Merge branch 'master' of https://git.code.tencent.com/jl-framework/rtss_simulation 2023-11-03 17:26:37 +08:00
a0352ee5e8 实现联锁驱采卡系统功能
调整道岔驱动电路逻辑
2023-11-03 17:26:32 +08:00
d080a2a1fc 修改屏蔽门状态;修改滑动门ecs实体构建bug 2023-11-03 10:41:47 +08:00
8cf9e419b8 proto重新生成 2023-11-02 16:06:32 +08:00
470f2289aa Merge branch 'master' of https://git.code.tencent.com/jl-framework/rtss_simulation 2023-11-02 15:51:41 +08:00
d77c37055b 增加屏蔽门操作接口;实现屏蔽门操作 2023-11-02 15:49:52 +08:00
weizhihong
ec32973270 【修改SPKS 旁路按钮继电器逻辑】 2023-11-02 14:48:02 +08:00
weizhihong
b87c8425af 【ibp盘电路逻辑处理】 2023-11-02 14:38:17 +08:00
weizhihong
c09a999bb5 【紧急关闭电路逻辑修改】 2023-11-02 13:51:42 +08:00
weizhihong
6a9bb6b286 【IBP灯组件问题】 2023-11-02 13:21:14 +08:00
weizhihong
d3c2cfd003 Merge branch 'master' of https://git.code.tencent.com/jl-framework/rtss_simulation 2023-11-02 13:08:38 +08:00
weizhihong
9a817a4741 【修改按钮带灯实体初始化】 2023-11-02 13:08:31 +08:00
xzb
3e9a1b6543 rssp 2023-11-02 09:24:10 +08:00
xzb
4d34d8f9ea Merge branch 'master' of https://git.code.tencent.com/jl-framework/rtss_simulation into HEAD 2023-11-01 17:47:27 +08:00
xzb
8baf9b876e rssp 2023-11-01 17:46:23 +08:00
d78a861a87 Merge branch 'master' of https://git.code.tencent.com/jl-framework/rtss_simulation 2023-11-01 16:56:55 +08:00
7543b034cd 继电器添加所属车站属性
构思联锁采集、驱动相关组件
2023-11-01 16:55:58 +08:00