Commit Graph

205 Commits

Author SHA1 Message Date
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
099cb89bbb 日志调整及现场测试 2024-05-29 15:19:04 +08:00
tiger_zhou
c04c0afba5 日志调整及现场测试 2024-05-29 13:55:21 +08:00
tiger_zhou
3a7795c875 列车btm vobc 连接功能 2024-05-29 13:34:50 +08:00
tiger_zhou
550218e9e0 日志调整及现场测试 2024-05-29 12:10:01 +08:00
tiger_zhou
d529c283f2 日志调整及现场测试 2024-05-29 11:48:04 +08:00
tiger_zhou
5df2b1c810 加速度计编码调整,pc仿真添加日志 2024-05-27 14:59:17 +08:00
91e63a9763 [修改]联锁通信日志级别;采集状态发送频率 2024-05-27 10:17:29 +08:00
tiger_zhou
088740408e Merge remote-tracking branch 'origin/develop' into develop 2024-05-24 09:00:53 +08:00
tiger_zhou
6b5932c617 列车pc仿真调整支持多个 2024-05-24 09:00:43 +08:00
9fbc60e93a [修改]联锁通信日志格式 2024-05-23 19:19:51 +08:00
42f299f553 [bug]修改联锁通信逻辑中的编码bug 2024-05-23 19:14:10 +08:00
78c55b3b21 [+log]增加联锁通信收到及发送数据的日志 2024-05-23 16:34:22 +08:00
tiger_zhou
531950f272 列车删除调整 2024-05-20 17:23:22 +08:00
tiger_zhou
11a14b2ef6 列车激活方向调整 2024-05-20 15:21:22 +08:00
149678b3f0 Merge remote-tracking branch 'origin/develop' into develop 2024-05-13 13:17:43 +08:00
509d06e39e [新增]增加GJ继电器相关逻辑 2024-05-13 13:17:16 +08:00
tiger_zhou
7ed8fcbed7 列车pc仿真调整 2024-05-08 10:00:53 +08:00
tiger_zhou
4b77a87785 仿真列车连接调整 2024-04-29 13:58:14 +08:00
tiger_zhou
4901c00199 仿真测试调试 2024-04-28 11:01:12 +08:00
tiger_zhou
20f9ac94c9 列车pc仿真调整 2024-04-19 16:55:51 +08:00
tiger_zhou
a13a01f99f 列车pc仿真调整 2024-04-18 11:18:26 +08:00
tiger_zhou
4666c84860 列车pc仿真调整 2024-04-18 11:14:05 +08:00
tiger_zhou
5a7b371005 列车pc仿真调整
All checks were successful
local-test分支打包构建docker并发布运行 / Docker-Build (push) Successful in 1m37s
2024-04-16 18:03:02 +08:00
tiger_zhou
92d21d559f 列车pc仿真调整
All checks were successful
local-test分支打包构建docker并发布运行 / Docker-Build (push) Successful in 1m55s
2024-04-16 17:26:37 +08:00
tiger_zhou
d45752ddb5 列车pc仿真调整
All checks were successful
local-test分支打包构建docker并发布运行 / Docker-Build (push) Successful in 1m40s
2024-04-15 08:44:37 +08:00