Commit Graph

106 Commits

Author SHA1 Message Date
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
46507159c5 将零散组合的继电器加载进仿真 2023-11-06 17:32:34 +08:00
a0352ee5e8 实现联锁驱采卡系统功能
调整道岔驱动电路逻辑
2023-11-03 17:26:32 +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
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
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
a8cb4228f5 重新划分屏蔽门系统组件并实现门控箱控制屏蔽门逻辑(ecs) 2023-11-01 16:52:03 +08:00
xzb
31b081f293 物理区段-集中站 2023-10-31 16:53:37 +08:00
xzb
718b89c480 物理区段-集中站 2023-10-31 16:46:13 +08:00
xzb
622f63a21c Merge branch 'master' of https://git.code.tencent.com/jl-framework/rtss_simulation into HEAD 2023-10-31 15:57:07 +08:00
xzb
3a6e690473 axle section request 2023-10-31 15:55:16 +08:00
weizhihong
b0608320d3 Merge branch 'master' of https://git.code.tencent.com/jl-framework/rtss_simulation 2023-10-31 14:42:50 +08:00
weizhihong
ab2036ee89 【增加获取车站code方法】 2023-10-31 14:42:42 +08:00
xzb
ac0609e9fa axle section request 2023-10-31 11:30:17 +08:00
09df862049 道岔添加强制相关组件和逻辑 2023-10-31 11:21:27 +08:00
weizhihong
e21995b695 【修改方法名】 2023-10-31 09:26:36 +08:00
weizhihong
d650595166 【增加获取集中在配置方法】 2023-10-31 09:24:39 +08:00
weizhihong
9885a94cac 【删除多余字段】 2023-10-31 09:21:03 +08:00
weizhihong
a6402e38ae 【增加采集、驱动的位置信息】 2023-10-31 09:10:35 +08:00
weizhihong
97e0974107 【空指针异常】 2023-10-31 08:58:40 +08:00
weizhihong
c5dae5bb22 【增加采集、驱动配置】 2023-10-31 08:55:29 +08:00
weizhihong
d45ee86aa4 【添加集中站配置信息 2023-10-30 16:21:23 +08:00
weizhihong
085bfdc6f9 【删除repository中的采集配置】 2023-10-26 17:15:02 +08:00
weizhihong
50a502ba10 【采集配置】 2023-10-26 17:08:55 +08:00
xzb
f5e9aeecc8 Merge branch 'master' of https://git.code.tencent.com/jl-framework/rtss_simulation into HEAD 2023-10-23 17:40:13 +08:00
xzb
dccb6164f4 计轴区段ecs 2023-10-23 17:39:39 +08:00
51df0c521e 修改屏蔽门相关组件、系统 2023-10-23 17:35:57 +08:00
89dd583d19 修改门控箱/屏蔽门交互及ecs系统逻辑bug 2023-10-20 16:12:42 +08:00
7fb253612e Merge branch 'master' of https://git.code.tencent.com/jl-framework/rtss_simulation 2023-10-20 15:06:51 +08:00
5c41a01e69 调整仿真创建接口返回error
调整一些接口返回添加error
2023-10-20 15:05:56 +08:00
weizhihong
41460f29c1 【增加IBP钥匙组件】 2023-10-20 13:13:44 +08:00
xzb
7e05997668 不带电路的信号机 2023-10-20 10:21:35 +08:00
xzb
4e26ee104f 信号机模型类型 2023-10-20 09:41:49 +08:00
xzb
5d85a92dc4 信号机模型类型 2023-10-20 09:37:31 +08:00
xzb
78c09bc533 信号机模型类型 2023-10-19 18:09:47 +08:00
weizhihong
1c9779ebcf Merge branch 'master' of https://git.code.tencent.com/jl-framework/rtss_simulation
# Conflicts:
#	proto/src/model.proto
#	repository/model/proto/model.pb.go
2023-10-19 17:37:57 +08:00
weizhihong
7ee674a484 【坐标系类型处理】 2023-10-19 17:36:39 +08:00
234882de58 增加门控箱交互接口;修改门控箱构建逻辑bug;增加屏蔽门状态 2023-10-19 17:09:47 +08:00
weizhihong
0505dd3b70 Merge branch 'master' of https://git.code.tencent.com/jl-framework/rtss_simulation 2023-10-19 16:38:54 +08:00
weizhihong
0aa3290e73 【生产地图公里标信息】 2023-10-19 16:38:46 +08:00
xzb
22e91bc1e5 signal 故障 2023-10-19 10:31:05 +08:00
weizhihong
30c4210a5d 【修改按钮带灯属性名称】 2023-10-18 14:08:10 +08:00
weizhihong
a65799ed77 【修改IBP旁路按钮实体】 2023-10-18 11:17:08 +08:00
weizhihong
05de54f450 【IBP构建逻辑】 2023-10-17 17:47:19 +08:00
weizhihong
8b5391554c Merge branch 'master' of https://git.code.tencent.com/jl-framework/rtss_simulation
# Conflicts:
#	repository/repository_manager.go
2023-10-17 15:08:30 +08:00