Commit Graph

1131 Commits

Author SHA1 Message Date
tiger_zhou
1166d7ffe5 列车调整连接12号线车载,静态情况 2024-07-04 09:26:37 +08:00
6ed9aec51a [新增]继电器设置初始位置逻辑
All checks were successful
local-test分支打包构建docker并发布运行 / Docker-Build (push) Successful in 2m51s
2024-06-28 11:10:10 +08:00
fe49cd4665 更新引用的镜像从国内镜像源拉
All checks were successful
local-test分支打包构建docker并发布运行 / Docker-Build (push) Successful in 2m46s
2024-06-27 17:45:42 +08:00
tiger_zhou
df0c9f77c8 仿真列车模拟量输出修改
Some checks failed
local-test分支打包构建docker并发布运行 / Docker-Build (push) Failing after 2m6s
2024-06-27 10:37:52 +08:00
ff7abeb414 [修改]车站EMP继电器组合缺少蜂鸣器等元素时不再报错;
[新增]车站电子元件组合构建逻辑
2024-06-26 17:27:48 +08:00
d3e9041760 [回滚]成工院本地配置
Some checks failed
local-test分支打包构建docker并发布运行 / Docker-Build (push) Failing after 2m7s
2024-06-21 19:48:44 +08:00
d610a15fdb [新增]ecs物理区段增加区段电路组件及逻辑;
[修改]12号线联锁通信服务如果启动失败,则启动参数无法更换bug
2024-06-21 15:53:17 +08:00
tiger_zhou
6211f61ecd 日志调整及现场测试 2024-06-18 17:10:21 +08:00
2a380347c6 [修改]日志中的堆栈信息无换行问题 2024-06-16 12:26:48 +08:00
tiger_zhou
815b181a0c 日志调整及现场测试 2024-06-14 16:48:59 +08:00
tiger_zhou
8aebff96a5 日志调整及现场测试
All checks were successful
local-test分支打包构建docker并发布运行 / Docker-Build (push) Successful in 1m41s
2024-06-14 13:19:04 +08:00
38b1a79633 [bug]半实物服务意料之外的报错 2024-06-14 12:17:08 +08:00
0018492f8d Merge remote-tracking branch 'origin/develop' into develop 2024-06-14 11:37:25 +08:00
1a114a9c44 [bug]12号线联锁通信服务TCP连接失败后再次启动会提示任务已启动 2024-06-14 11:37:15 +08:00
tiger_zhou
cbd2c4a0ab 日志调整及现场测试
All checks were successful
local-test分支打包构建docker并发布运行 / Docker-Build (push) Successful in 1m45s
2024-06-14 09:21:51 +08:00
807bce391c [修改]平西府配置文件;
[新增]11号线联锁数据整理(未完)
2024-06-13 18:35:17 +08:00
tiger_zhou
1b3f130e4e 日志调整及现场测试
All checks were successful
local-test分支打包构建docker并发布运行 / Docker-Build (push) Successful in 1m45s
2024-06-13 18:13:21 +08:00
tiger_zhou
081581140e Merge branch 'develop' into local-test
All checks were successful
local-test分支打包构建docker并发布运行 / Docker-Build (push) Successful in 1m38s
# Conflicts:
#	third_party/interlock/beijing12/interlock.go
2024-06-13 14:17:17 +08:00
tiger_zhou
bec948357a 日志调整及现场测试 2024-06-13 14:16:52 +08:00
bff5c61cf4 [修改]12号线通信方式改为TCP 2024-06-13 11:10:42 +08:00
1afa01bffb Merge remote-tracking branch 'origin/develop' into develop 2024-06-13 10:25:13 +08:00
tiger_zhou
a808f8f73e 日志调整及现场测试 2024-06-13 10:06:54 +08:00
e2c537d381 Merge remote-tracking branch 'origin/develop' into develop 2024-06-13 09:07:35 +08:00
tiger_zhou
35920fbfeb 日志调整及现场测试 2024-06-12 19:50:36 +08:00
f1e406a678 Merge remote-tracking branch 'origin/develop' into develop 2024-06-12 17:49:13 +08:00
518c3d3f6e [新增]11号线联锁通信逻辑(未完);
[修改]proto编译插件指定版本
2024-06-12 17:49:02 +08:00
tiger_zhou
8a6b5a0145 Merge branch 'develop' into local-test
All checks were successful
local-test分支打包构建docker并发布运行 / Docker-Build (push) Successful in 1m45s
2024-06-12 17:46:02 +08:00
tiger_zhou
a8c2a61106 日志调整及现场测试 2024-06-12 17:45:47 +08:00
tiger_zhou
63032efdba Merge branch 'develop' into local-test
All checks were successful
local-test分支打包构建docker并发布运行 / Docker-Build (push) Successful in 1m36s
2024-06-12 16:23:03 +08:00
tiger_zhou
3bf7a146af 日志调整及现场测试 2024-06-12 16:22:31 +08:00
tiger_zhou
cdfffc65e8 Merge branch 'develop' into local-test
All checks were successful
local-test分支打包构建docker并发布运行 / Docker-Build (push) Successful in 1m30s
2024-06-12 14:33:28 +08:00
tiger_zhou
650488e1c7 日志调整及现场测试 2024-06-12 14:26:47 +08:00
tiger_zhou
c22ddfcae9 Merge branch 'develop' into local-test
All checks were successful
local-test分支打包构建docker并发布运行 / Docker-Build (push) Successful in 2m29s
# Conflicts:
#	third_party/btm_vobc/btm_vobc.go
2024-06-07 13:27:46 +08:00
tiger_zhou
ed4dc9a224 修改列车删除或更改连接时电机继续转动的情况 2024-06-07 13:26:46 +08:00
tiger_zhou
31180597a5 btm vobc 模块功能 2024-06-06 18:56:25 +08:00
c23c70ce05 [修改]12号线联锁通信增加日志;
All checks were successful
local-test分支打包构建docker并发布运行 / Docker-Build (push) Successful in 1m37s
[bug]12号线联锁驱动字节解析bug
2024-06-06 18:40:48 +08:00
tiger_zhou
a58a4350c2 btm vobc 模块功能 2024-06-06 17:57:30 +08:00
tiger_zhou
e7b7ff6781 日志调整及现场测试
All checks were successful
local-test分支打包构建docker并发布运行 / Docker-Build (push) Successful in 1m42s
2024-06-04 16:19:41 +08:00
497bbad8ed [修改]11号线联锁数据解析删除洗车机数据;删除紧急停车后两个命令
All checks were successful
local-test分支打包构建docker并发布运行 / Docker-Build (push) Successful in 1m37s
2024-05-31 14:25:59 +08:00
0a25ee3170 [修改]11号线联锁数据解析删除数据长度校验
All checks were successful
local-test分支打包构建docker并发布运行 / Docker-Build (push) Successful in 1m41s
2024-05-30 16:58:02 +08:00
a83952f7b4 [修改]11号线联锁解析err类型
All checks were successful
local-test分支打包构建docker并发布运行 / Docker-Build (push) Successful in 1m34s
2024-05-29 17:23:31 +08:00
cac309f4b1 [新增]11号线联锁通信所属线路配置;11号线联锁通信原始数据及解析后的json数据日志
All checks were successful
local-test分支打包构建docker并发布运行 / Docker-Build (push) Successful in 1m31s
2024-05-29 17:20:51 +08:00
tiger_zhou
61e60e4e64 Merge branch 'develop' into local-test
All checks were successful
local-test分支打包构建docker并发布运行 / Docker-Build (push) Successful in 1m31s
2024-05-29 15:19:19 +08:00
tiger_zhou
099cb89bbb 日志调整及现场测试 2024-05-29 15:19:04 +08:00
tiger_zhou
5627ca5315 Merge branch 'develop' into local-test
All checks were successful
local-test分支打包构建docker并发布运行 / Docker-Build (push) Successful in 1m31s
2024-05-29 13:55:35 +08:00
tiger_zhou
c04c0afba5 日志调整及现场测试 2024-05-29 13:55:21 +08:00
tiger_zhou
fc1c773298 Merge branch 'develop' into local-test
All checks were successful
local-test分支打包构建docker并发布运行 / Docker-Build (push) Successful in 1m37s
2024-05-29 13:35:17 +08:00
tiger_zhou
3a7795c875 列车btm vobc 连接功能 2024-05-29 13:34:50 +08:00
tiger_zhou
70da3d6dfd Merge branch 'develop' into local-test
All checks were successful
local-test分支打包构建docker并发布运行 / Docker-Build (push) Successful in 1m36s
2024-05-29 12:10:14 +08:00
tiger_zhou
550218e9e0 日志调整及现场测试 2024-05-29 12:10:01 +08:00