From 9333e5d8d72dab3c64d46901934fea8d036ea38c Mon Sep 17 00:00:00 2001 From: Luis Camero Date: Wed, 25 Oct 2023 10:19:02 -0400 Subject: [PATCH] Moved username out of ros2 section --- clearpath_config/sample/a200/a200_default.yaml | 2 +- clearpath_config/sample/a200/a200_dual_laser.yaml | 2 +- clearpath_config/sample/a200/a200_sample.yaml | 2 +- clearpath_config/sample/a200/a200_velodyne.yaml | 2 +- clearpath_config/sample/j100/j100_default.yaml | 2 +- clearpath_config/sample/j100/j100_dual_laser.yaml | 2 +- clearpath_config/sample/j100/j100_sample.yaml | 2 +- clearpath_config/sample/j100/j100_velodyne.yaml | 2 +- clearpath_config/sample/w200/w200_default.yaml | 2 +- clearpath_config/system/system.py | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/clearpath_config/sample/a200/a200_default.yaml b/clearpath_config/sample/a200/a200_default.yaml index 8d25bd2..f043733 100644 --- a/clearpath_config/sample/a200/a200_default.yaml +++ b/clearpath_config/sample/a200/a200_default.yaml @@ -1,6 +1,7 @@ serial_number: a200-0000 version: 0 system: + username: administrator hosts: self: cpr-a200-0000 platform: @@ -8,7 +9,6 @@ system: onboard: {} remote: {} ros2: - username: administrator namespace: a200_0000 domain_id: 0 rmw_implementation: rmw_fastrtps_cpp diff --git a/clearpath_config/sample/a200/a200_dual_laser.yaml b/clearpath_config/sample/a200/a200_dual_laser.yaml index 64bd89e..61f1f53 100644 --- a/clearpath_config/sample/a200/a200_dual_laser.yaml +++ b/clearpath_config/sample/a200/a200_dual_laser.yaml @@ -1,6 +1,7 @@ serial_number: a200-0000 version: 0 system: + username: administrator hosts: self: cpr-a200-0000 platform: @@ -8,7 +9,6 @@ system: onboard: {} remote: {} ros2: - username: administrator namespace: a200_0000 domain_id: 0 rmw_implementation: rmw_fastrtps_cpp diff --git a/clearpath_config/sample/a200/a200_sample.yaml b/clearpath_config/sample/a200/a200_sample.yaml index 13e1b08..9a9300b 100644 --- a/clearpath_config/sample/a200/a200_sample.yaml +++ b/clearpath_config/sample/a200/a200_sample.yaml @@ -1,6 +1,7 @@ serial_number: a200-0000 version: 0 system: + username: administrator hosts: self: cpr-a200-0000 platform: @@ -8,7 +9,6 @@ system: onboard: {} remote: {} ros2: - username: administrator namespace: a200_0000 domain_id: 0 rmw_implementation: rmw_fastrtps_cpp diff --git a/clearpath_config/sample/a200/a200_velodyne.yaml b/clearpath_config/sample/a200/a200_velodyne.yaml index a8eb08e..d112943 100644 --- a/clearpath_config/sample/a200/a200_velodyne.yaml +++ b/clearpath_config/sample/a200/a200_velodyne.yaml @@ -1,6 +1,7 @@ serial_number: a200-0000 version: 0 system: + username: administrator hosts: self: cpr-a200-0000 platform: @@ -8,7 +9,6 @@ system: onboard: {} remote: {} ros2: - username: administrator namespace: a200_0000 domain_id: 0 rmw_implementation: rmw_fastrtps_cpp diff --git a/clearpath_config/sample/j100/j100_default.yaml b/clearpath_config/sample/j100/j100_default.yaml index f727899..ca003e8 100644 --- a/clearpath_config/sample/j100/j100_default.yaml +++ b/clearpath_config/sample/j100/j100_default.yaml @@ -1,6 +1,7 @@ serial_number: j100-0000 version: 0 system: + username: administrator hosts: self: cpr-j100-0000 platform: @@ -8,7 +9,6 @@ system: onboard: {} remote: {} ros2: - username: administrator namespace: j100_0000 domain_id: 0 rmw_implementation: rmw_fastrtps_cpp diff --git a/clearpath_config/sample/j100/j100_dual_laser.yaml b/clearpath_config/sample/j100/j100_dual_laser.yaml index 4d46089..4e5b060 100644 --- a/clearpath_config/sample/j100/j100_dual_laser.yaml +++ b/clearpath_config/sample/j100/j100_dual_laser.yaml @@ -1,6 +1,7 @@ serial_number: j100-0000 version: 0 system: + username: administrator hosts: self: cpr-j100-0000 platform: @@ -8,7 +9,6 @@ system: onboard: {} remote: {} ros2: - username: administrator namespace: j100_0000 domain_id: 0 rmw_implementation: rmw_fastrtps_cpp diff --git a/clearpath_config/sample/j100/j100_sample.yaml b/clearpath_config/sample/j100/j100_sample.yaml index b0b3485..603cfe5 100644 --- a/clearpath_config/sample/j100/j100_sample.yaml +++ b/clearpath_config/sample/j100/j100_sample.yaml @@ -1,6 +1,7 @@ serial_number: j100-0000 version: 0 system: + username: administrator hosts: self: cpr-j100-0000 platform: @@ -8,7 +9,6 @@ system: onboard: {} remote: {} ros2: - username: administrator namespace: j100_0000 domain_id: 0 rmw_implementation: rmw_fastrtps_cpp diff --git a/clearpath_config/sample/j100/j100_velodyne.yaml b/clearpath_config/sample/j100/j100_velodyne.yaml index 9e51798..29d387a 100644 --- a/clearpath_config/sample/j100/j100_velodyne.yaml +++ b/clearpath_config/sample/j100/j100_velodyne.yaml @@ -1,6 +1,7 @@ serial_number: j100-0000 version: 0 system: + username: administrator hosts: self: cpr-j100-0000 platform: @@ -8,7 +9,6 @@ system: onboard: {} remote: {} ros2: - username: administrator namespace: j100_0000 domain_id: 0 rmw_implementation: rmw_fastrtps_cpp diff --git a/clearpath_config/sample/w200/w200_default.yaml b/clearpath_config/sample/w200/w200_default.yaml index d87d977..e257e9c 100644 --- a/clearpath_config/sample/w200/w200_default.yaml +++ b/clearpath_config/sample/w200/w200_default.yaml @@ -1,6 +1,7 @@ serial_number: w200-0000 version: 0 system: + username: administrator hosts: self: cpr-w200-0000 platform: @@ -8,7 +9,6 @@ system: onboard: {} remote: {} ros2: - username: administrator namespace: w200_0000 domain_id: 0 rmw_implementation: rmw_fastrtps_cpp diff --git a/clearpath_config/system/system.py b/clearpath_config/system/system.py index 9a726da..efffece 100644 --- a/clearpath_config/system/system.py +++ b/clearpath_config/system/system.py @@ -50,8 +50,8 @@ class SystemConfig(BaseConfig): SYSTEM: { SELF: SELF, HOSTS: HOSTS, + USERNAME: USERNAME, ROS2: { - USERNAME: USERNAME, NAMESPACE: NAMESPACE, DOMAIN_ID: DOMAIN_ID, RMW: RMW,