Commit Graph

1159 Commits

Author SHA1 Message Date
cc71c128cf Merge remote-tracking branch 'origin/develop' into develop 2024-10-21 14:48:13 +08:00
7ee68a4ae8 [修改]11号线信号机联锁通信bug 2024-10-21 14:47:58 +08:00
tiger_zhou
f43de7bf71 列车连接三方服务调整
All checks were successful
local-test分支打包构建docker并发布运行 / Docker-Build (push) Successful in 1m55s
2024-10-17 17:06:57 +08:00
tiger_zhou
c2fc8f61dd 过/欠标调整
Some checks failed
local-test分支打包构建docker并发布运行 / Docker-Build (push) Has been cancelled
2024-10-17 16:54:50 +08:00
tiger_zhou
27322532e0 列车动力学添加车组,仿真内添加列车添加车组
All checks were successful
local-test分支打包构建docker并发布运行 / Docker-Build (push) Successful in 1m51s
2024-10-15 09:16:35 +08:00
tiger_zhou
c6fe82c7e6 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
local-test分支打包构建docker并发布运行 / Docker-Build (push) Successful in 19m32s
2024-10-09 18:05:20 +08:00
tiger_zhou
0dd0d5db67 权限不足添加对应的错误code,所有http get请求直接放过 2024-10-09 18:02:42 +08:00
54e2d88db3 [新增]11号线联锁、12号线联锁、12号计轴第三方通信服务的状态采集
Some checks failed
local-test分支打包构建docker并发布运行 / Docker-Build (push) Failing after 5m19s
2024-10-09 17:38:52 +08:00
tiger_zhou
0921835d27 车载不接收动力学速度为负数 2024-10-08 18:17:45 +08:00
81c36c6fb1 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
local-test分支打包构建docker并发布运行 / Docker-Build (push) Successful in 18m19s
2024-09-30 16:24:16 +08:00
735423ca67 [修改]11号线通信服务结束时,调用服务上下文中的cancelFunc以结束死循环协程 2024-09-30 16:24:02 +08:00
tiger_zhou
76183883da 动力学初始化停车点数据 2024-09-29 09:33:00 +08:00
tiger_zhou
2463edd996 停车点构建proto 2024-09-25 11:19:18 +08:00
3a22950790 [修改]11号线联锁通信逻辑忽略配置中的集中站,全线通信;创建仿真时,通过设置继电器状态,初始化道岔位置到定位 2024-09-18 11:40:20 +08:00
tiger_zhou
c6cfc42774 列车连接三方服务调整 2024-09-14 10:12:46 +08:00
tiger_zhou
15bdc45892 列车折返rm模式调整
All checks were successful
local-test分支打包构建docker并发布运行 / Docker-Build (push) Successful in 2m58s
2024-09-11 21:19:42 +08:00
tiger_zhou
449162856b 折返速度调整 2024-09-11 13:28:56 +08:00
tiger_zhou
8b5ef2e597 列车换端计算,里程ato调整 2024-09-10 18:55:15 +08:00
tiger_zhou
903fd14a61 列车折返12号线激活调整 2024-09-10 18:05:04 +08:00
tiger_zhou
9809df4b27 折返 2024-09-10 18:00:44 +08:00
tiger_zhou
9a5e8be378 折返 2024-09-10 16:12:39 +08:00
tiger_zhou
f144f29386 折返 2024-09-10 15:51:59 +08:00
tiger_zhou
efe1ff69c9 Merge branch 'develop' of http://120.46.212.6:3000/joylink/rts-sim-testing-service into develop_t
# Conflicts:
#	rts-sim-module
2024-09-10 15:38:31 +08:00
tiger_zhou
f9ffa1cf10 折返 2024-09-10 15:37:40 +08:00
3d66efe8f4 [修改]11号线模式口采集和驱动逻辑调通 2024-09-05 15:14:39 +08:00
tiger_zhou
39b4ffb633 列车11号线btm调整 2024-09-05 09:22:19 +08:00
tiger_zhou
f485e7a639 列车11号线btm调整 2024-09-05 09:21:49 +08:00
tiger_zhou
cf3d38a2f5 列车驾驶ato牵引,制动初始版,添加列车紧急制动属性,添加ato开关门指示灯
Some checks failed
local-test分支打包构建docker并发布运行 / Docker-Build (push) Failing after 3m4s
2024-08-30 18:08:14 +08:00
tiger_zhou
13baeda0a0 列车模型调整
All checks were successful
local-test分支打包构建docker并发布运行 / Docker-Build (push) Successful in 3m55s
2024-08-29 17:18:13 +08:00
tiger_zhou
d1504e7bf0 列车12号线操控调整
All checks were successful
local-test分支打包构建docker并发布运行 / Docker-Build (push) Successful in 2m5s
2024-08-29 16:09:07 +08:00
6c1ef600a8 Merge remote-tracking branch 'origin/develop' into develop 2024-08-28 11:32:47 +08:00
2af5007698 [修改]11号线联锁通信暂时提交 2024-08-28 11:32:27 +08:00
tiger_zhou
c50b1b640d 列车操控
All checks were successful
local-test分支打包构建docker并发布运行 / Docker-Build (push) Successful in 1m53s
2024-08-27 11:58:08 +08:00
dcdb4610f8 [修改]移除屏蔽门继电器的自保持逻辑(因为自保持会导致12号线联锁宕机) 2024-08-26 11:23:51 +08:00
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
016ce0e8bb [修改]设备状态proto消息中增加计轴区段状态,原“所有区段状态”改为物理区段状态“ 2024-08-12 15:18:52 +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