Commit Graph

242 Commits

Author SHA1 Message Date
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
d4915b2588 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtsts-server-go 2024-01-22 13:10:18 +08:00
62b44a0cc6 添加UDP网络延时记录器
动力学和半实物接口添加UDP网络监控功能
2024-01-22 13:10:10 +08:00
d184cd961d 应答器增加[固定报文]和[固定用户报文]状态及修改功能 2024-01-22 11:06:30 +08:00
tiger_zhou
dff8cbab87 动力学列车数据配置 2024-01-18 17:17:48 +08:00
tiger_zhou
118fe91900 动力学列车数据配置 2024-01-18 16:33:27 +08:00
886e6d46f6 Merge remote-tracking branch 'origin/master' 2024-01-17 17:02:46 +08:00
2b6093af4f 修改道岔状态数据结构 2024-01-17 17:01:43 +08:00
tiger_zhou
8f54503ab3 动力学列车数据配置 2024-01-17 15:53:14 +08:00
tiger_zhou
7833e4bb55 动力学列车数据配置 2024-01-16 17:53:54 +08:00
49ec42e546 修改proto文件编译逻辑;修改proto文件编译位置并修改其它文件对生成的文件的引用 2024-01-11 10:24:56 +08:00
fef6fe46a4 适配IOT模块调整 2023-12-20 14:13:23 +08:00
ee4c04cf3d 修改modbus驱采仿真更新逻辑使用注册驱采处理任务方式实现 2023-12-18 17:59:56 +08:00
d527e528fd iot接口适配 2023-12-18 16:26:17 +08:00
20c38ec96d 修改命名 2023-12-13 11:24:22 +08:00
f0fd68b5d6 初步实现联锁驱采Modbus服务 2023-12-13 11:22:30 +08:00
xzb
e0dc136e82 balise detect 预测实现 2023-12-06 10:23:00 +08:00
xzb
8b488ed037 balise detect 预测实现 2023-12-05 13:49:22 +08:00
xzb
3218fddb7d balise detect 预测实现 2023-12-05 11:24:43 +08:00
xzb
83a5ee52e8 balise detect 预测实现 2023-12-05 10:57:31 +08:00
xzb
163c0f53c2 balise detect 预测实现 2023-12-05 09:37:34 +08:00
xzb
14af6608ea balise detect 预测实现 2023-12-01 15:38:26 +08:00
xzb
7c687972b4 balise detect 2023-11-30 09:57:20 +08:00
xzb
f3f1f07fd0 balise detect 2023-11-29 17:28:42 +08:00
xzb
01cf27edb5 btm 2023-11-29 14:10:25 +08:00
xzb
c59d3e35ba btm 2023-11-29 13:04:07 +08:00
xzb
7cdde1b7ef btm 2023-11-28 13:30:10 +08:00
xzb
c8fb7eb999 btm 2023-11-27 15:09:10 +08:00
xzb
0138e76481 btm 2023-11-27 09:14:20 +08:00
xzb
f66960b9f4 btm 2023-11-24 16:01:28 +08:00
xzb
5a20d78aa3 btm 2023-11-24 15:20:05 +08:00
xzb
1784f3a66b btm 2023-11-23 18:14:01 +08:00
xzb
be1e0d59d2 btm 2023-11-23 16:30:48 +08:00
xzb
5f005630f5 btm 2023-11-23 15:16:42 +08:00