Commit Graph

1157 Commits

Author SHA1 Message Date
thesai f1e406a678 Merge remote-tracking branch 'origin/develop' into develop 2024-06-12 17:49:13 +08:00
thesai 518c3d3f6e [新增]11号线联锁通信逻辑(未完);
[修改]proto编译插件指定版本
2024-06-12 17:49:02 +08:00
tiger_zhou 8a6b5a0145 Merge branch 'develop' into local-test
local-test分支打包构建docker并发布运行 / Docker-Build (push) Successful in 1m45s Details
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
local-test分支打包构建docker并发布运行 / Docker-Build (push) Successful in 1m36s Details
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
local-test分支打包构建docker并发布运行 / Docker-Build (push) Successful in 1m30s Details
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
local-test分支打包构建docker并发布运行 / Docker-Build (push) Successful in 2m29s Details
# 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
thesai c23c70ce05 [修改]12号线联锁通信增加日志;
local-test分支打包构建docker并发布运行 / Docker-Build (push) Successful in 1m37s Details
[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 日志调整及现场测试
local-test分支打包构建docker并发布运行 / Docker-Build (push) Successful in 1m42s Details
2024-06-04 16:19:41 +08:00
thesai 497bbad8ed [修改]11号线联锁数据解析删除洗车机数据;删除紧急停车后两个命令
local-test分支打包构建docker并发布运行 / Docker-Build (push) Successful in 1m37s Details
2024-05-31 14:25:59 +08:00
thesai 0a25ee3170 [修改]11号线联锁数据解析删除数据长度校验
local-test分支打包构建docker并发布运行 / Docker-Build (push) Successful in 1m41s Details
2024-05-30 16:58:02 +08:00
thesai a83952f7b4 [修改]11号线联锁解析err类型
local-test分支打包构建docker并发布运行 / Docker-Build (push) Successful in 1m34s Details
2024-05-29 17:23:31 +08:00
thesai cac309f4b1 [新增]11号线联锁通信所属线路配置;11号线联锁通信原始数据及解析后的json数据日志
local-test分支打包构建docker并发布运行 / Docker-Build (push) Successful in 1m31s Details
2024-05-29 17:20:51 +08:00
tiger_zhou 61e60e4e64 Merge branch 'develop' into local-test
local-test分支打包构建docker并发布运行 / Docker-Build (push) Successful in 1m31s Details
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
local-test分支打包构建docker并发布运行 / Docker-Build (push) Successful in 1m31s Details
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
local-test分支打包构建docker并发布运行 / Docker-Build (push) Successful in 1m37s Details
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
local-test分支打包构建docker并发布运行 / Docker-Build (push) Successful in 1m36s Details
2024-05-29 12:10:14 +08:00
tiger_zhou 550218e9e0 日志调整及现场测试 2024-05-29 12:10:01 +08:00
tiger_zhou 3dcafa50e8 Merge branch 'develop' into local-test
local-test分支打包构建docker并发布运行 / Docker-Build (push) Successful in 1m43s Details
2024-05-29 11:48:25 +08:00
tiger_zhou d529c283f2 日志调整及现场测试 2024-05-29 11:48:04 +08:00
tiger_zhou bc6e0369a1 Merge branch 'develop' into local-test
local-test分支打包构建docker并发布运行 / Docker-Build (push) Successful in 1m38s Details
2024-05-27 14:59:38 +08:00
tiger_zhou 5df2b1c810 加速度计编码调整,pc仿真添加日志 2024-05-27 14:59:17 +08:00
thesai 8bb725f234 Merge remote-tracking branch 'origin/local-test' into local-test
local-test分支打包构建docker并发布运行 / Docker-Build (push) Successful in 1m36s Details
2024-05-27 10:18:05 +08:00
thesai c919c59b49 Merge branch 'develop' into local-test 2024-05-27 10:17:49 +08:00
thesai 91e63a9763 [修改]联锁通信日志级别;采集状态发送频率 2024-05-27 10:17:29 +08:00
tiger_zhou 4b9e398f67 Merge branch 'develop' into local-test
local-test分支打包构建docker并发布运行 / Docker-Build (push) Successful in 1m30s Details
2024-05-24 09:01:24 +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
thesai 5d232cf4e8 Merge branch 'develop' into local-test
local-test分支打包构建docker并发布运行 / Docker-Build (push) Successful in 1m55s Details
2024-05-23 19:21:26 +08:00
thesai 9fbc60e93a [修改]联锁通信日志格式 2024-05-23 19:19:51 +08:00
thesai 42f299f553 [bug]修改联锁通信逻辑中的编码bug 2024-05-23 19:14:10 +08:00
tiger_zhou a4b761f720 Merge remote-tracking branch 'origin/develop' into develop 2024-05-23 19:09:37 +08:00
tiger_zhou fca6610047 列车pc仿真调整 2024-05-23 19:08:46 +08:00
thesai fd23150725 Merge remote-tracking branch 'origin/local-test' into local-test
local-test分支打包构建docker并发布运行 / Docker-Build (push) Failing after 47s Details
2024-05-23 16:36:21 +08:00
thesai c700a78613 Merge branch 'develop' into local-test 2024-05-23 16:35:01 +08:00
thesai 78c55b3b21 [+log]增加联锁通信收到及发送数据的日志 2024-05-23 16:34:22 +08:00
tiger_zhou 8b9c8a6156 列车pc仿真调整 2024-05-23 16:17:12 +08:00
tiger_zhou 736052740a Merge branch 'develop' into local-test
local-test分支打包构建docker并发布运行 / Docker-Build (push) Successful in 1m39s Details
2024-05-20 18:00:02 +08:00
tiger_zhou 968a46fbe7 列车pc仿真调整 2024-05-20 17:59:40 +08:00
tiger_zhou e7f6f8e74d Merge branch 'develop' into local-test
local-test分支打包构建docker并发布运行 / Docker-Build (push) Successful in 1m30s Details
2024-05-20 17:23:50 +08:00
tiger_zhou 531950f272 列车删除调整 2024-05-20 17:23:22 +08:00
tiger_zhou 2569265a1f Merge branch 'develop' into local-test
local-test分支打包构建docker并发布运行 / Docker-Build (push) Successful in 2m42s Details
2024-05-20 15:23:20 +08:00