Commit Graph

298 Commits

Author SHA1 Message Date
a165321c39 [新增]设备公里表长短链校正 2024-08-22 14:03:33 +08:00
tiger_zhou
fa600673a6 列车控制支持门模式更新
All checks were successful
local-test分支打包构建docker并发布运行 / Docker-Build (push) Successful in 3m15s
2024-08-22 13:12:03 +08:00
f8517f0ead [修改]暂时注释掉12号线联锁和计轴的大段日志 2024-08-21 09:18:55 +08:00
tiger_zhou
0de305b397 列车操控调整 2024-08-16 15:33:30 +08:00
tiger_zhou
15c015a9a5 列车应答器调整 2024-08-15 14:54:16 +08:00
eae1b8d6df [bug]之前,在仿真运行时联锁配置中的code被替换为了车站uid,后来我只是简单将此转换去掉了,导致有些将此code当uid使用的场景出错 2024-08-15 14:43:20 +08:00
tiger_zhou
270f5a9772 列车btm调整重构
All checks were successful
local-test分支打包构建docker并发布运行 / Docker-Build (push) Successful in 1m41s
2024-08-13 17:33:57 +08:00
tiger_zhou
30c932f178 列车btm调整重构 2024-08-13 17:32:49 +08:00
98310f427b Merge branch 'local-test' into develop 2024-08-13 11:01:02 +08:00
5e70ad158e [修改]11号线联锁通信,区段状态从物理区段改为计轴区段
Some checks failed
local-test分支打包构建docker并发布运行 / Docker-Build (push) Failing after 50s
2024-08-13 11:00:27 +08:00
tiger_zhou
06a4331135 应答器修改 2024-08-13 09:09:25 +08:00
4044b7f4c2 [新增]计轴区段的模型、ecs实体、ecs系统、发给前端的状态
All checks were successful
local-test分支打包构建docker并发布运行 / Docker-Build (push) Successful in 1m44s
2024-08-12 18:57:36 +08:00
tiger_zhou
272274a5c4 列车应答器添加可变报文,修改列车初始化制动力及列车行驶制动力
All checks were successful
local-test分支打包构建docker并发布运行 / Docker-Build (push) Successful in 2m54s
2024-08-09 16:41:41 +08:00
85d5781122 [bug]现在ESB已经不是按钮了,去掉状态采集;构建repo时没有对站台方向赋值 2024-08-09 11:38:53 +08:00
3da710891e [bug]ESB模型构建bug 2024-08-09 11:19:19 +08:00
f1efd5a2f2 [补充]12号线联锁通信应答器数据解析;
[修改]联锁配置中的车站编号不再改为车站uid
2024-08-08 13:23:25 +08:00
2d38a7bd63 [bug]uid和继电器编号对不上导致的缺继电器问题 2024-08-07 16:46:18 +08:00
844560ae1e Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	rts-sim-module
2024-08-07 14:54:37 +08:00
5fa5345981 [补充]11号线联锁通信 2024-08-07 14:53:57 +08:00
tiger_zhou
bedb2bf413 列车控制修复“测速测距”失败问题 2024-08-07 09:31:46 +08:00
tiger_zhou
961b9dc5ff 列车控制连接版本记录1 2024-08-05 16:32:21 +08:00
fc6b51cc24 [bug]信号机电路系统逻辑没有正确处理驱动状态
All checks were successful
local-test分支打包构建docker并发布运行 / Docker-Build (push) Successful in 5m29s
2024-08-01 14:25:45 +08:00
5433ae43d6 [重写]计轴的组件、实体、系统、预复位/复位逻辑 2024-07-31 17:08:54 +08:00
afaf9d64c7 [修改]北京12号线连锁rsd、sse、ssr编解码算法及交互流程 2024-07-29 13:53:46 +08:00
tiger_zhou
8a34935d0f 列车车载应答器调试初始 2024-07-25 14:55:46 +08:00
tiger_zhou
ff67c84f18 列车控制连接多车调整,连接状态显示调整
All checks were successful
local-test分支打包构建docker并发布运行 / Docker-Build (push) Successful in 4m7s
2024-07-19 15:24:28 +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
8a6de531c8 [修改]北京12号线计轴通信配置 2024-07-08 16:14:26 +08:00
tiger_zhou
b8dc207a0e 列车控制消息
All checks were successful
local-test分支打包构建docker并发布运行 / Docker-Build (push) Successful in 1m48s
2024-07-04 17:39:56 +08:00
tiger_zhou
a0cf17c845 列车控制消息 2024-07-04 17:26:46 +08:00
tiger_zhou
0947fd9b73 列车控制btn调整 2024-07-04 14:47:24 +08:00
731aea8c8d [重写]北京12号线计轴通信交互逻辑(未完,主要是安全校验域计算逻辑) 2024-07-04 13:59:39 +08:00
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
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
d610a15fdb [新增]ecs物理区段增加区段电路组件及逻辑;
[修改]12号线联锁通信服务如果启动失败,则启动参数无法更换bug
2024-06-21 15:53: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
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
518c3d3f6e [新增]11号线联锁通信逻辑(未完);
[修改]proto编译插件指定版本
2024-06-12 17:49:02 +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
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