Commit Graph

287 Commits

Author SHA1 Message Date
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
tiger_zhou
3a7795c875 列车btm vobc 连接功能 2024-05-29 13:34:50 +08:00
tiger_zhou
5df2b1c810 加速度计编码调整,pc仿真添加日志 2024-05-27 14:59:17 +08:00
tiger_zhou
6b5932c617 列车pc仿真调整支持多个 2024-05-24 09:00:43 +08:00
tiger_zhou
968a46fbe7 列车pc仿真调整 2024-05-20 17:59:40 +08:00
tiger_zhou
531950f272 列车删除调整 2024-05-20 17:23:22 +08:00
tiger_zhou
11a14b2ef6 列车激活方向调整 2024-05-20 15:21:22 +08:00
37799cd2c9 [修改]区段、Link、运营方向/位置之间互相转换的函数的bug 2024-05-17 14:39:26 +08:00
b3270c5921 [修改]区段、Link、运营方向/位置之间互相转换的函数的bug 2024-05-17 14:38:14 +08:00
59520435d2 [新增]区段、Link、运营方向/位置之间互相转换的函数 2024-05-16 21:19:53 +08:00
tiger_zhou
a6119b890f 列车控制调整 2024-05-10 08:23:50 +08:00
tiger_zhou
6fa4c6e6a9 列车控制调整 2024-05-09 14:36:13 +08:00
tiger_zhou
0b25327b28 列车控制,方向设置“0”问题调整 2024-05-08 14:39:23 +08:00
tiger_zhou
7ed8fcbed7 列车pc仿真调整 2024-05-08 10:00:53 +08:00
tiger_zhou
a298e11da2 列车pc仿真调整 2024-05-07 15:09:08 +08:00
tiger_zhou
4f8eab5a7a 列车pc仿真调整 上下行方向,紧急停车 2024-05-07 15:00:59 +08:00
tiger_zhou
34aa20ca65 列车默认值 2024-04-30 10:15:20 +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
4666c84860 列车pc仿真调整 2024-04-18 11:14:05 +08:00
tiger_zhou
29fc4e265b 列车pc仿真调整
All checks were successful
local-test分支打包构建docker并发布运行 / Docker-Build (push) Successful in 1m37s
2024-04-17 09:32:25 +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
117ff89562 列车pc仿真调整
All checks were successful
local-test分支打包构建docker并发布运行 / Docker-Build (push) Successful in 1m33s
2024-04-15 09:51:02 +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
225279dbd2 列车pc仿真调整
All checks were successful
local-test分支打包构建docker并发布运行 / Docker-Build (push) Successful in 1m41s
2024-04-09 10:40:18 +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
1facbfeb2b 【bug】车库门强制开关门无效;洗车机取消故障后依然有紧急停车
All checks were successful
local-test分支打包构建docker并发布运行 / Docker-Build (push) Successful in 1m38s
2024-04-07 13:38:30 +08:00
tiger_zhou
9b58348297 列车pc仿真 2024-04-02 18:20:10 +08:00
f12b72cc04 【bug】洗车机状态发送及洗车机操作 2024-04-02 15:59:55 +08:00
49e3199c06 【新增】洗车机模型构建、ecs实体构建
【修改】洗车机ecs电路系统逻辑
2024-04-02 14:09:42 +08:00
c9dda72725 【新增】继电器组合的设备类型是防淹门时,视同车库门 2024-04-01 14:07:56 +08:00
3ae2f14a16 【新增】防淹门构建为车库门模型逻辑
【bug】当缺少继电器时,车库门的ecs系统逻辑和状态发送逻辑执行出错
2024-04-01 13:31:38 +08:00
32c575125f 【修改】车库门继电器状态丢失的故障由应用层实现;不再影响继电器的实际状态;也不再导致门故障继电器接通; 2024-03-29 16:46:31 +08:00
6f327f751b 【新增】防淹门模型构建(暂时与车库门用相同模型)
【修改】因车库门PSL盘对象被删除,修改相应的构建逻辑
2024-03-29 14:59:20 +08:00
ef9e431afd 【bug】车库门操作、状态发送等逻辑中的bug 2024-03-27 14:15:35 +08:00
141cc633b9 【新增】车库门PSL模型构建及相关ecs逻辑;
【改动】车库门ecs逻辑
2024-03-26 13:12:17 +08:00
da98777b04 【新增】车库门及车库门控制盒操作接口 2024-03-20 14:35:35 +08:00
tiger_zhou
774355ca4d 列车前端操作接口,列车连接三方映射接口及ws返回列车连接状态 2024-03-19 14:49:44 +08:00
tiger_zhou
6958259e03 列车前端操作接口,列车连接三方映射接口及ws返回列车连接状态 2024-03-19 11:00:19 +08:00
tiger_zhou
38f586dea4 列车前端操作接口,列车连接三方映射接口及ws返回列车连接状态 2024-03-19 09:58:06 +08:00
tiger_zhou
752dfa11eb 列车前端操作接口,列车连接三方映射接口及ws返回列车连接状态 2024-03-19 09:54:32 +08:00
tiger_zhou
82979f5ab1 列车前端操作接口,列车连接三方映射接口及ws返回列车连接状态 2024-03-19 09:19:38 +08:00
tiger_zhou
12145b8539 列车前端操作接口,列车连接三方映射接口及ws返回列车连接状态 2024-03-19 08:28:50 +08:00
tiger_zhou
51a715bf7a 列车前端操作接口,列车连接三方映射接口及ws返回列车连接状态 2024-03-15 17:50:18 +08:00
tiger_zhou
837c39f11f 列车前端操作接口,列车连接三方映射接口及ws返回列车连接状态 2024-03-15 16:03:47 +08:00
tiger_zhou
4540528528 速传,雷达输出数值功能 2024-03-11 16:15:02 +08:00
23d441981c 修改添加列车时初速度的处理逻辑;修改本地模拟半实物逻辑 2024-02-26 10:48:45 +08:00
fee0bed151 删除列车后可再次添加相同编号列车 2024-02-23 10:43:06 +08:00
a040d2f502 修改列车BTM信息的报文为最后收到的报文;修改BTM探测逻辑执行不需要【车载应答器天线功率放大器】为开启状态;修改车尾位置计算bug 2024-02-21 14:54:17 +08:00
2c197360e8 修改【取消停止发送报文】接口无效bug 2024-02-20 14:48:40 +08:00
0c6e9a37d8 修改IBP盘构建逻辑、操作接口、状态收集逻辑;修改PSL构建bug 2024-02-20 14:18:42 +08:00
420b18fccd 修改PSL和IBP构建模型的逻辑 2024-02-20 09:20:52 +08:00
ef05b8a253 门控箱相关继电器不再能直接控制屏蔽门,而是被联锁采集后由联锁发起控制;MPJ和JXTCPLJ改为仅供联锁采集 2024-02-18 18:26:13 +08:00
0bdc8481e2 增加车尾设备及偏移量状态赋值逻辑 2024-02-06 18:00:39 +08:00
a2487c225b 列车状态增加BTM状态(逻辑中为BTM状态字段赋值) 2024-02-06 16:39:56 +08:00
tiger_zhou
b525015853 摁钮旁路及旁路复位还原 2024-02-06 10:51:25 +08:00
46f8eba8c2 增加应答器停止发送报文故障;增加应答器工作状态状态;增加列车车尾位置(仅数据结构,无赋值逻辑) 2024-02-06 09:30:58 +08:00
tiger_zhou
ce71540de2 列车添加参数调整,列车全部删除,摁钮旁路,旁路复位功能 2024-02-04 18:22:52 +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
ec48b5f48a 应答器增加可变报文状态及操作 2024-01-24 17:45:16 +08:00
tiger_zhou
5ee14ba52e 雷达发送功能 2024-01-24 17:12:34 +08:00
4dfe137658 修改屏蔽门操作请求 2024-01-23 18:02:39 +08:00
007ec388b8 Merge remote-tracking branch 'origin/master' 2024-01-23 16:46:20 +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
19c67811d0 Merge remote-tracking branch 'origin/master' 2024-01-23 09:20:10 +08:00
f96797d6e3 修改重置应答器报文bug;修改转发列车控制消息逻辑bug 2024-01-23 09:19:01 +08:00
tiger_zhou
7a92dab7b3 动力学列车数据配置调整 2024-01-22 17:46:26 +08:00
71bda3db44 区段操作调整 2024-01-22 15:56:40 +08:00
f6a6ef3175 修改proto文件[应答器固定用户报文]字段名 2024-01-22 11:27:18 +08:00
d184cd961d 应答器增加[固定报文]和[固定用户报文]状态及修改功能 2024-01-22 11:06:30 +08:00
46552b9b9d 修改发送给动力学的道岔信息的code 2024-01-19 11:17:36 +08:00
tiger_zhou
dff8cbab87 动力学列车数据配置 2024-01-18 17:17:48 +08:00