diff --git a/cmvr-es/config/devices/agv/src1100.pb.txt b/cmvr-es/config/devices/agv/seer_robokit.pb.txt similarity index 90% rename from cmvr-es/config/devices/agv/src1100.pb.txt rename to cmvr-es/config/devices/agv/seer_robokit.pb.txt index 833bde58..ecde7cff 100644 --- a/cmvr-es/config/devices/agv/src1100.pb.txt +++ b/cmvr-es/config/devices/agv/seer_robokit.pb.txt @@ -8,8 +8,9 @@ agv { } agvs { + # The controller model is SRC1100; this remains the device instance ID. id: "src1100" - src1100_agv { + seer_robokit_agv { ip: "192.168.192.5" port_status: 19204 port_control: 19205 @@ -18,6 +19,7 @@ agv { port_other: 19210 port_push: 19301 recv_timeout_ms: 1000 + control_nick_name: "cmvr-es" enable_state_push: true state_push_interval_ms: 200 state_push_included_fields: "x" diff --git a/cmvr-es/config/manager/device_manager.pb.txt b/cmvr-es/config/manager/device_manager.pb.txt index 5475ff16..088f1555 100644 --- a/cmvr-es/config/manager/device_manager.pb.txt +++ b/cmvr-es/config/manager/device_manager.pb.txt @@ -127,8 +127,8 @@ device_manager { devices { id: "src1100" type: DEVICE_TYPE_AGV - config_file: "devices/agv/src1100.pb.txt" - enable: false + config_file: "devices/agv/seer_robokit.pb.txt" + enable: true } devices { diff --git a/cmvr-es/devices/agv/agv_factory.h b/cmvr-es/devices/agv/agv_factory.h index 79b2f0a3..00e46415 100644 --- a/cmvr-es/devices/agv/agv_factory.h +++ b/cmvr-es/devices/agv/agv_factory.h @@ -7,7 +7,7 @@ #include "common/base/logging/logger.h" #include "devices/agv/abstract_agv.h" #include "devices/agv/my_agv/include/my_agv.h" -#include "devices/agv/src1100/include/src1100_agv.h" +#include "seer_robokit_agv.h" namespace cmvr::device { @@ -31,15 +31,15 @@ public: backend.set_id(cfg.id()); return std::make_shared(backend); } - case config::AGVDeviceConfig::kSrc1100Agv: + case config::AGVDeviceConfig::kSeerRobokitAgv: { - if (!cfg.src1100_agv().id().empty() && cfg.src1100_agv().id() != cfg.id()) { + if (!cfg.seer_robokit_agv().id().empty() && cfg.seer_robokit_agv().id() != cfg.id()) { CMVR_LOG(ERROR) << "[AGVFactory]: AGV id does not match backend id: " << cfg.id(); return nullptr; } - auto backend = cfg.src1100_agv(); + auto backend = cfg.seer_robokit_agv(); backend.set_id(cfg.id()); - return std::make_shared(backend); + return std::make_shared(backend); } case config::AGVDeviceConfig::BACKEND_NOT_SET: diff --git a/protos/cmvr/config/agv_config/agv_config.proto b/protos/cmvr/config/agv_config/agv_config.proto index c8ec8c56..4e579b7f 100644 --- a/protos/cmvr/config/agv_config/agv_config.proto +++ b/protos/cmvr/config/agv_config/agv_config.proto @@ -11,11 +11,11 @@ message MyAgvConfig { int32 port = 3; } -// 仙工 SRC1100 AGV 后端配置。 -message Src1100AgvConfig { +// 仙工 SEER Robokit AGV 后端配置。 +message SeerRobokitAgvConfig { // 设备 id。为空时通常由外层 AGVDeviceConfig.id 补齐。 string id = 1; - // SRC1100 控制器 IP 地址。 + // SEER Robokit 控制器 IP 地址。 string ip = 2; // 是否启用该后端配置。当前设备是否创建仍以设备管理器配置为准。 bool enable = 3; @@ -49,6 +49,8 @@ message Src1100AgvConfig { int32 map_update_interval_ms = 17; // 统一地图更新缓存条数。0 表示使用适配器默认值;缓存满后会丢弃最旧更新。 uint32 map_update_history_size = 18; + // 抢占 SEER Robokit 控制权时上报的稳定昵称。为空时适配器使用 "cmvr-es:"。 + string control_nick_name = 19; } // 单个 AGV 设备配置。 @@ -60,8 +62,8 @@ message AGVDeviceConfig { oneof backend { // 示例/测试 AGV 后端。 MyAgvConfig my_agv = 10; - // 仙工 SRC1100 AGV 后端。 - Src1100AgvConfig src1100_agv = 11; + // 仙工 SEER Robokit AGV 后端。 + SeerRobokitAgvConfig seer_robokit_agv = 11; } }