Commit Graph

185 Commits

Author SHA1 Message Date
thesai 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
thesai 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
joylink_zhangsai ec48b5f48a 应答器增加可变报文状态及操作 2024-01-24 17:45:16 +08:00
tiger_zhou 5ee14ba52e 雷达发送功能 2024-01-24 17:12:34 +08:00
walker cf1d1598c3 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtsts-server-go 2024-01-24 13:25:04 +08:00
walker 9abb18e3b6 udp服务停止问题调整 2024-01-24 13:25:00 +08:00
joylink_zhangsai 4dfe137658 修改屏蔽门操作请求 2024-01-23 18:02:39 +08:00
joylink_zhangsai 007ec388b8 Merge remote-tracking branch 'origin/master' 2024-01-23 16:46:20 +08:00
walker 7816c447fa 删除defer 2024-01-23 09:41:54 +08:00
walker 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
walker 93d71f6125 添加第三方服务状态发送
修改仿真状态发送为定时发送
2024-01-23 09:37:31 +08:00
joylink_zhangsai 19c67811d0 Merge remote-tracking branch 'origin/master' 2024-01-23 09:20:10 +08:00
joylink_zhangsai f96797d6e3 修改重置应答器报文bug;修改转发列车控制消息逻辑bug 2024-01-23 09:19:01 +08:00
tiger_zhou 7a92dab7b3 动力学列车数据配置调整 2024-01-22 17:46:26 +08:00
walker 71bda3db44 区段操作调整 2024-01-22 15:56:40 +08:00
joylink_zhangsai f6a6ef3175 修改proto文件[应答器固定用户报文]字段名 2024-01-22 11:27:18 +08:00
joylink_zhangsai d184cd961d 应答器增加[固定报文]和[固定用户报文]状态及修改功能 2024-01-22 11:06:30 +08:00
joylink_zhangsai 46552b9b9d 修改发送给动力学的道岔信息的code 2024-01-19 11:17:36 +08:00
tiger_zhou dff8cbab87 动力学列车数据配置 2024-01-18 17:17:48 +08:00
tiger_zhou 118fe91900 动力学列车数据配置 2024-01-18 16:33:27 +08:00
walker 1237abc9e9 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtsts-server-go 2024-01-18 14:11:52 +08:00
walker 21484afa21 道岔、信号机状态调整 2024-01-18 14:11:47 +08:00
tiger_zhou 21d04e9e4c 动力学列车数据配置 2024-01-18 13:57:57 +08:00
walker b253a18791 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtsts-server-go 2024-01-18 13:11:55 +08:00
walker 4c229abc03 道岔,信号机设置参数功能开发实现 2024-01-18 13:10:28 +08:00
tiger_zhou 550049efa6 动力学列车数据配置 2024-01-18 10:48:04 +08:00
walker 1db384297b Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtsts-server-go 2024-01-18 10:20:40 +08:00
joylink_zhangsai 66d31f80f2 修改应答器移位操作的报错提示信息 2024-01-18 10:08:55 +08:00
walker bf9d65c5a7 信号机强制点灯开发 2024-01-18 09:26:04 +08:00
walker 6e36afa3ec Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtsts-server-go 2024-01-17 17:51:38 +08:00
walker 7266cd32f8 道岔和信号机操作功能调整 2024-01-17 17:49:11 +08:00
joylink_zhangsai 9595fe9f6f 处理应答器报文数据类型问题 2024-01-17 17:15:35 +08:00
joylink_zhangsai 5198855faa Merge remote-tracking branch 'origin/master' 2024-01-17 17:03:41 +08:00
joylink_zhangsai 886e6d46f6 Merge remote-tracking branch 'origin/master' 2024-01-17 17:02:46 +08:00
tiger_zhou 79356df717 动力学列车数据配置 2024-01-17 17:02:17 +08:00
joylink_zhangsai 2b6093af4f 修改道岔状态数据结构 2024-01-17 17:01:43 +08:00
tiger_zhou 8f54503ab3 动力学列车数据配置 2024-01-17 15:53:14 +08:00
tiger_zhou 72374630de 动力学列车数据配置 2024-01-17 13:09:45 +08:00
walker cc2b2e6715 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtsts-server-go 2024-01-17 09:32:20 +08:00
walker 87d81c58b3 删除旧代码 2024-01-17 09:27:00 +08:00
tiger_zhou 7833e4bb55 动力学列车数据配置 2024-01-16 17:53:54 +08:00
joylink_zhangsai 14896b2dce 与前端传递的应答器报文改为16进制字符串 2024-01-16 13:44:28 +08:00
joylink_zhangsai b22202ac21 修改应答器移位操作:必须在link边界或相邻应答器之间,越过或重叠时报错 2024-01-11 13:55:19 +08:00
joylink_zhangsai 49ec42e546 修改proto文件编译逻辑;修改proto文件编译位置并修改其它文件对生成的文件的引用 2024-01-11 10:24:56 +08:00
joylink_zhangsai d4f8d3416f 解决代码冲突 2024-01-10 14:17:15 +08:00
joylink_zhangsai 41839e2210 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	bj-rtss-message
#	rtss_simulation
#	ts/protos/state/device_state.pb.go
#	ts/simulation/wayside/memory/wayside_memory_transponder.go
2024-01-10 14:09:23 +08:00
joylink_zhangsai 0818438098 proto文件增加设备状态;实现应答器的相关接口 2024-01-10 14:06:01 +08:00
walker c27ef7c675 merge调整 2024-01-10 11:17:32 +08:00