Commit Graph

275 Commits

Author SHA1 Message Date
tiger_zhou
ff67c84f18 列车控制连接多车调整,连接状态显示调整
All checks were successful
local-test分支打包构建docker并发布运行 / Docker-Build (push) Successful in 4m7s
2024-07-19 15:24:28 +08:00
ccaf53ec67 [修改]北京12号线连锁rsd、sse、ssr编解码算法 2024-07-17 15:44:47 +08:00
tiger_zhou
2fa2e90d57 列车控制连接,重新连接调整 2024-07-15 15:00:33 +08:00
tiger_zhou
037cf2f1be 12号线列车控制基本调试 2024-07-11 14:58:34 +08:00
aa04a9fbf4 [bug]北京12号线计轴通信编解码bug 2024-07-11 09:20:51 +08:00
8a6de531c8 [修改]北京12号线计轴通信配置 2024-07-08 16:14:26 +08:00
4bdd91c18b [修改]北京12号线计轴通信crc、svc等编码及校验逻辑 2024-07-08 10:33:19 +08:00
731aea8c8d [重写]北京12号线计轴通信交互逻辑(未完,主要是安全校验域计算逻辑) 2024-07-04 13:59:39 +08:00
tiger_zhou
1166d7ffe5 列车调整连接12号线车载,静态情况 2024-07-04 09:26:37 +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
d610a15fdb [新增]ecs物理区段增加区段电路组件及逻辑;
[修改]12号线联锁通信服务如果启动失败,则启动参数无法更换bug
2024-06-21 15:53:17 +08:00
tiger_zhou
6211f61ecd 日志调整及现场测试 2024-06-18 17:10:21 +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
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
tiger_zhou
e0b0ae4566 列车pc仿真调整
All checks were successful
local-test分支打包构建docker并发布运行 / Docker-Build (push) Successful in 1m43s
2024-04-13 09:40:25 +08:00
tiger_zhou
e011e5d409 列车pc仿真调整 2024-04-11 08:55:12 +08:00
tiger_zhou
7de95e55f2 列车pc仿真测试调整
All checks were successful
local-test分支打包构建docker并发布运行 / Docker-Build (push) Successful in 1m35s
2024-04-09 08:55:33 +08:00
tiger_zhou
b4b2fc9e72 列车pc仿真 2024-04-02 18:29:00 +08:00
tiger_zhou
edf154afa3 列车pc仿真 2024-04-02 18:24:46 +08:00
tiger_zhou
9b58348297 列车pc仿真 2024-04-02 18:20:10 +08:00
23d441981c 修改添加列车时初速度的处理逻辑;修改本地模拟半实物逻辑 2024-02-26 10:48:45 +08:00
a040d2f502 修改列车BTM信息的报文为最后收到的报文;修改BTM探测逻辑执行不需要【车载应答器天线功率放大器】为开启状态;修改车尾位置计算bug 2024-02-21 14:54:17 +08:00
a2487c225b 列车状态增加BTM状态(逻辑中为BTM状态字段赋值) 2024-02-06 16:39:56 +08:00
46f8eba8c2 增加应答器停止发送报文故障;增加应答器工作状态状态;增加列车车尾位置(仅数据结构,无赋值逻辑) 2024-02-06 09:30:58 +08:00
tiger_zhou
ce71540de2 列车添加参数调整,列车全部删除,摁钮旁路,旁路复位功能 2024-02-04 18:22:52 +08:00
tiger_zhou
c2a2332ff1 proto文件调整 2024-01-29 18:05:14 +08:00
09ebf4293f Merge remote-tracking branch 'origin/master'
# Conflicts:
#	bj-rtss-message
#	dto/state_proto/device_state.pb.go
2024-01-29 14:42:57 +08:00
f50f847819 增加继电器驱采表状态;修改Repo构建时基础检查逻辑 2024-01-29 14:42:12 +08:00
tiger_zhou
1a7385e513 动力学列车故障参数调整 2024-01-29 14:22:12 +08:00
tiger_zhou
30ec740426 加速计 2024-01-26 17:57:35 +08:00
tiger_zhou
15de5df5fa 雷达发送功能调整 2024-01-25 10:57:34 +08:00
tiger_zhou
51d8716d4f 雷达发送功能调整 2024-01-25 09:57:17 +08:00
tiger_zhou
b89f4e4b3f 列车参数请求动力学url调整 2024-01-25 09:30:19 +08:00
tiger_zhou
5ee14ba52e 雷达发送功能 2024-01-24 17:12:34 +08:00
9abb18e3b6 udp服务停止问题调整 2024-01-24 13:25:00 +08:00
tiger_zhou
6b16afc7b3 雷达与VOBC协议解码,调整 2024-01-23 10:19:41 +08:00
tiger_zhou
5379bc11f3 雷达与VOBC协议解码,调整 2024-01-23 09:58:17 +08:00
5c0f16e352 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtsts-server-go 2024-01-23 09:37:36 +08:00
93d71f6125 添加第三方服务状态发送
修改仿真状态发送为定时发送
2024-01-23 09:37:31 +08:00
tiger_zhou
d7a6b9a1c5 Merge remote-tracking branch 'origin/master' 2024-01-22 16:36:03 +08:00
tiger_zhou
dd001348c6 雷达与VOBC协议解码,调整 2024-01-22 16:35:50 +08:00
78a9e1d07e Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtsts-server-go 2024-01-22 15:56:46 +08:00
71bda3db44 区段操作调整 2024-01-22 15:56:40 +08:00
tiger_zhou
5e76894404 雷达与VOBC协议解码 2024-01-22 15:08:46 +08:00