Commit Graph

315 Commits

Author SHA1 Message Date
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
xzb
19eee6acfd fi signal dcxh 2023-10-09 17:13:16 +08:00
xzb
92c1f38ff1 fi signal 3xh4 2023-10-09 16:42:16 +08:00
xzb
3ca0187dd0 fi signal 3xh3 2023-10-09 16:22:29 +08:00
xzb
52478b0955 fi signal 3xh2 2023-10-09 15:48:58 +08:00
xzb
f514c1efdd fi signal 2xh1 2023-10-09 15:13:24 +08:00
xzb
de8b470ed3 Merge branch 'master' of https://git.code.tencent.com/jl-framework/rtss_simulation 2023-10-09 15:05:59 +08:00
xzb
0a658de4c0 fi signal 3xh1 2023-10-09 15:05:34 +08:00
6baeb0d0f2 Merge branch 'master' of https://git.code.tencent.com/jl-framework/rtss_simulation 2023-10-09 14:24:59 +08:00
1dc64115db ecs接口变化,实体创建接口相应调整 2023-10-09 14:24:53 +08:00
xzb
73a3f878e5 fi signal 2xh1 2023-10-09 14:19:57 +08:00
xzb
4282b3a5ea signal ecs filter 2023-10-09 13:23:34 +08:00
xzb
0cadfa97b9 ecs filter 2023-10-09 13:13:30 +08:00
xzb
b9ff98a3fb ecs filter 2023-10-09 11:30:15 +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
xzb
964f697409 Merge branch 'master' of https://git.code.tencent.com/jl-framework/rtss_simulation 2023-10-08 13:11:55 +08:00
xzb
b12b050f5a signal 2xh1 2023-10-08 13:11:34 +08:00
3a6da100d4 bug修复 2023-10-08 10:28:50 +08:00
6444007ba2 修改继电器接口bug 2023-10-08 10:26:24 +08:00
6a6d0657ca 添加继电器控制接口 2023-10-08 09:59:59 +08:00