Commit Graph

345 Commits

Author SHA1 Message Date
xzb
9a21c4bfd2 signal dcxh 驱采 2023-10-12 16:59:08 +08:00
xzb
a1beb531a6 signal 3xh4 驱采 2023-10-12 16:21:55 +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
ae3495ce62 signal 3xh2 驱采 2023-10-12 14:30:25 +08:00
xzb
9bdb1a5fdc Merge branch 'master' of https://git.code.tencent.com/jl-framework/rtss_simulation
# Conflicts:
#	jl-ecs-go
2023-10-12 14:20:07 +08:00
xzb
691a4efdc9 signal 3xh2 驱采 2023-10-12 14:19:00 +08:00
8fa5d10a87 Merge branch 'master' of https://git.code.tencent.com/jl-framework/rtss_simulation 2023-10-12 14:05:13 +08:00
758d396ad1 调整道岔功能接口使用ecs请求接口实现 2023-10-12 14:05:09 +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
90e373d3fd signal 2xh1 驱采 2023-10-12 11:06:20 +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
059ae03678 灯控制系统 2023-10-11 13:46:34 +08:00
xzb
d3f4111007 灯控制系统 2023-10-11 13:38:33 +08:00
xzb
6b2811ae08 2023-10-11 13:24:05 +08:00
xzb
4539e69881 Merge branch 'master' of https://git.code.tencent.com/jl-framework/rtss_simulation 2023-10-11 13:22:39 +08:00
xzb
9d66798163 2023-10-11 13:22:14 +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
xzb
da71326643 go1.21 fmt 2023-10-11 09:57:00 +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
xzb
bc1cd65d2f 信号机3xh1测试 2023-10-10 18:06:30 +08:00
xzb
dc9be681a1 信号机2xh1测试 2023-10-10 17:26:09 +08:00
xzb
f7d64c1b6b Merge branch 'master' of https://git.code.tencent.com/jl-framework/rtss_simulation
# Conflicts:
#	jl-ecs-go
2023-10-10 16:52:00 +08:00
xzb
528f5b9252 信号机2xh1测试 2023-10-10 16:51:07 +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
xzb
f703158b1c 信号机测试 2023-10-10 09:35:02 +08:00
99ddf43372 Merge branch 'master' of https://git.code.tencent.com/jl-framework/rtss_simulation 2023-10-09 18:07:44 +08:00
2f054f0132 submodule提交 2023-10-09 18:07:39 +08:00
xzb
115241bfc7 fi signal 2023-10-09 17:58:29 +08:00
xzb
fccc6db9d0 fi signal jckxh 2023-10-09 17:53:04 +08:00