Commit Graph

209 Commits

Author SHA1 Message Date
d080a2a1fc 修改屏蔽门状态;修改滑动门ecs实体构建bug 2023-11-03 10:41:47 +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
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
a8cb4228f5 重新划分屏蔽门系统组件并实现门控箱控制屏蔽门逻辑(ecs) 2023-11-01 16:52:03 +08:00
xzb
a612c78c4e 计轴区段 2023-11-01 11:08:24 +08:00
xzb
8743d68657 计轴区段 2023-10-31 17:42:52 +08:00
xzb
a0af120528 计轴区段 2023-10-31 17:39:10 +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
09df862049 道岔添加强制相关组件和逻辑 2023-10-31 11:21:27 +08:00
weizhihong
3afee36ac7 【注释门控箱系统,增加采集数据】 2023-10-26 17:07:48 +08:00
xzb
c9ba683024 计轴区段操作 2023-10-24 13:20:35 +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
xzb
5c39cd418d 计轴区段ecs 2023-10-23 16:21:19 +08:00
xzb
be58664e38 Merge branch 'master' of https://git.code.tencent.com/jl-framework/rtss_simulation into HEAD 2023-10-23 16:09:30 +08:00
xzb
68e270779c 计轴区段ecs 2023-10-23 16:08:05 +08:00
weizhihong
2a57111870 【ibp继电器吸起逻辑处理】 2023-10-23 14:32:25 +08:00
weizhihong
903f4a1ae7 【IBP旁路按钮匹配】 2023-10-23 11:23:15 +08:00
xzb
365f5a50d9 Merge branch 'master' of https://git.code.tencent.com/jl-framework/rtss_simulation into HEAD 2023-10-20 18:01:12 +08:00
xzb
30bff20a28 计轴区段ecs 2023-10-20 18:00:52 +08:00
89dd583d19 修改门控箱/屏蔽门交互及ecs系统逻辑bug 2023-10-20 16:12:42 +08:00
weizhihong
41460f29c1 【增加IBP钥匙组件】 2023-10-20 13:13:44 +08:00
234882de58 增加门控箱交互接口;修改门控箱构建逻辑bug;增加屏蔽门状态 2023-10-19 17:09:47 +08:00
xzb
b1c5ac236d light sys 2023-10-19 16:46:52 +08:00
xzb
9b24b34c25 signal 故障 2023-10-19 13:43:31 +08:00
weizhihong
a65799ed77 【修改IBP旁路按钮实体】 2023-10-18 11:17:08 +08:00
67c416e96d 增加按name查询发布地图接口;增加门控箱ecs内容 2023-10-17 10:26:31 +08:00
xzb
3d3d7dabe7 Merge branch 'master' of https://git.code.tencent.com/jl-framework/rtss_simulation into HEAD 2023-10-16 17:59:53 +08:00
xzb
6a4c488835 signal 2023-10-16 17:59:35 +08:00
b661545d5b 修改失表故障继电器电路实现bug 2023-10-16 16:10:41 +08:00
97b2880c7b 修改断相保护器系统逻辑bug
修改道岔挤岔故障bug
修改计数器系统逻辑bug
2023-10-16 15:40:03 +08:00
93725ce934 修改道岔接口拼写
修改日志打印
2023-10-16 11:11:53 +08:00
1babd47d28 删除信号机中重复定义的Code方法;提交屏蔽门和门控箱的ecs内容 2023-10-13 18:20:15 +08:00
xzb
24c455cc6f Merge branch 'master' of https://git.code.tencent.com/jl-framework/rtss_simulation 2023-10-13 09:32:05 +08:00
xzb
4dbe6e6042 sgianl jdxh 驱采 2023-10-13 09:31:49 +08:00
fe3ce44bdc Merge remote-tracking branch 'origin/master'
# Conflicts:
#	jl-ecs-go
#	proto/src/model.proto
#	repository/model/proto/model.pb.go
2023-10-13 09:09:07 +08:00
18ed7f9214 增加草稿数据列表查询接口;增加屏蔽门ecs相关内容 2023-10-12 17:55:40 +08:00
weizhihong
bfec6804ce Merge branch 'master' of https://git.code.tencent.com/jl-framework/rtss_simulation 2023-10-12 17:47:21 +08:00
weizhihong
abeeb595dc 【初始化IBP盘实例】 2023-10-12 17:46:43 +08:00
xzb
7864f04cba signal jckxh 驱采 2023-10-12 17:33:20 +08:00
xzb
d2e31012db Merge branch 'master' of https://git.code.tencent.com/jl-framework/rtss_simulation 2023-10-12 16:59:25 +08:00
xzb
9a21c4bfd2 signal dcxh 驱采 2023-10-12 16:59:08 +08:00
2d64e2b3bb Merge branch 'master' of https://git.code.tencent.com/jl-framework/rtss_simulation 2023-10-12 16:29:49 +08:00
949c4a883a 添加道岔故障组件、定义、接口、实现逻辑 2023-10-12 16:29:00 +08:00
xzb
e5238067a9 signal 3xh4 驱采 2023-10-12 16:13:56 +08:00
xzb
1180549f1d Merge branch 'master' of https://git.code.tencent.com/jl-framework/rtss_simulation
# Conflicts:
#	jl-ecs-go
2023-10-12 15:13:49 +08:00
xzb
6a9b48b4d3 signal 3xh3 驱采 2023-10-12 15:13:13 +08:00
weizhihong
dbb5eaa417 【IBP操作】 2023-10-12 15:03:11 +08:00
xzb
691a4efdc9 signal 3xh2 驱采 2023-10-12 14:19:00 +08:00
xzb
da8485c036 Merge branch 'master' of https://git.code.tencent.com/jl-framework/rtss_simulation 2023-10-12 13:55:13 +08:00
xzb
c23e141691 signal 3xh1 驱采 2023-10-12 13:54:53 +08:00
weizhihong
dae56425d4 Merge branch 'master' of https://git.code.tencent.com/jl-framework/rtss_simulation 2023-10-12 13:53:38 +08:00
weizhihong
a4fcdd1706 【增加实体初始化】 2023-10-12 13:47:57 +08:00
c5cef5eb4e 双机转辙机添加驱动采集电路相关组件和逻辑 2023-10-12 13:04:38 +08:00
xzb
3e8fe93701 Merge branch 'master' of https://git.code.tencent.com/jl-framework/rtss_simulation 2023-10-12 11:01:12 +08:00
xzb
406cfe6c0a signal 2xh1 驱采 2023-10-12 11:00:56 +08:00
weizhihong
8f59554b2e 【spk、emp采集电路】 2023-10-12 10:25:01 +08:00
xzb
b6bdcc8748 signal 2xh1 驱采 2023-10-12 10:07:40 +08:00
xzb
b5cfb5b8b7 signal 3xh3 2023-10-11 17:44:44 +08:00
xzb
ff32f14e12 signal 3xh2 2023-10-11 17:25:25 +08:00
xzb
412de346bc signal 3xh1 2023-10-11 17:11:13 +08:00
xzb
1d3d8e0150 Merge branch 'master' of https://git.code.tencent.com/jl-framework/rtss_simulation 2023-10-11 16:58:43 +08:00
xzb
819f157f23 signal 3xh1 2023-10-11 16:57:48 +08:00
weizhihong
d81a36634a 【修改人员防护、紧急关闭逻辑】 2023-10-11 15:43:48 +08:00
xzb
1a809f1af4 signal 2xh1 2023-10-11 14:12:51 +08:00
xzb
d3f4111007 灯控制系统 2023-10-11 13:38:33 +08:00
weizhihong
500877bdd0 Merge branch 'master' of https://git.code.tencent.com/jl-framework/rtss_simulation 2023-10-11 10:36:46 +08:00
weizhihong
b3f92a528b 【修改emp逻辑】 2023-10-11 10:36:06 +08:00
0de9e7aed8 Merge branch 'master' of https://git.code.tencent.com/jl-framework/rtss_simulation 2023-10-10 18:32:24 +08:00
9e1d108c77 升级go版本到1.21
切换fmt输出为slog输出
继电器entity构建添加整流型
2023-10-10 18:28:28 +08:00
weizhihong
27a07ade5a 【调整按钮,spk系统,emp系统】 2023-10-10 16:15:56 +08:00
weizhihong
cc578a30bb 【修改spk电路逻辑】 2023-10-10 11:25:09 +08:00
weizhihong
b9166cc079 【按钮操作、人员防护电路】 2023-10-10 11:05:26 +08:00
2f054f0132 submodule提交 2023-10-09 18:07:39 +08:00
xzb
4282b3a5ea signal ecs filter 2023-10-09 13:23:34 +08:00
6592c42a0c Merge branch 'master' of https://git.code.tencent.com/jl-framework/rtss_simulation 2023-10-09 11:19:40 +08:00
0bba8f0934 删除donburi包引用
修改filter导入为从ecs项目导入
整理包结构,将弃用的包放入deprecated文件中
2023-10-09 11:17:25 +08:00
xzb
1a843be8aa signal jdxh 2023-10-09 11:09:29 +08:00
xzb
b09216f783 signal jckxh 2023-10-09 10:30:44 +08:00
xzb
2e1e393987 signal dcxh 2023-10-09 10:07:48 +08:00
xzb
14b3521057 signal dcxh 2023-10-09 10:06:01 +08:00
xzb
07978de264 signal 3xh4 2023-10-08 18:03:07 +08:00
xzb
660465478c signal 3xh3 2023-10-08 17:19:50 +08:00
xzb
4a15ff21f3 signal 3xh2 2023-10-08 16:48:10 +08:00
xzb
3424cee0d6 signal 3xh1 2023-10-08 16:03:36 +08:00
xzb
56e36c1c6f signal 3xh1 2023-10-08 16:00:05 +08:00
xzb
545027d0c3 signal 2xh1 2023-10-08 13:59:15 +08:00
9faf98f1eb 添加计数器系统
断相保护器逻辑修改
转辙机电路代码整理
2023-10-07 17:00:36 +08:00
665adde46e 修改总定/反表更新bug 2023-10-07 15:27:50 +08:00
3b5b62f00d 修改转辙机电路逻辑bug
修改继电器缓放bug
2023-10-07 15:19:03 +08:00
3f221808c5 修改电路和转辙机控制逻辑 2023-10-07 14:37:18 +08:00
18b790eb15 修改1DQJ励磁逻辑bug
修改切断继电器励磁逻辑bug
2023-10-07 13:37:05 +08:00
32ec383b13 修改切断继电器保持电路计时bug 2023-10-07 13:21:41 +08:00
41e22bd7bf 修改ZDJ9双机电路切断继电器保持电路实现方式 2023-10-07 11:16:24 +08:00
0744081d90 道岔位置组件添加定表、反表字段和更新逻辑
修改道岔电路1DQJ励磁逻辑
2023-10-07 10:56:56 +08:00
48e34d673e 修改实体构建问题
创建仿真时添加绑定系统
2023-09-28 18:20:53 +08:00
fb39939e3b 添加道岔位置根据转辙机位置更新的系统 2023-09-28 16:36:25 +08:00
d3a187e00f 添加创建仿真
完善仿真实体加载
2023-09-28 14:34:00 +08:00
c56feb3bdf 道岔电路驱动系统实现
仿真单例组件定义(暂定)
仿真道岔相关实体构建(未完)
2023-09-27 18:39:18 +08:00