Merge pull request #38 from clearpathrobotics/lcamero/username

Moved username out of ROS2 section
clearpathrobotics · Oct 30, 2023 · d498757 · d498757
2 parents 2af12f7 + 9333e5d
commit d498757
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 10 deletions.
diff --git a/clearpath_config/sample/a200/a200_default.yaml b/clearpath_config/sample/a200/a200_default.yaml
@@ -1,14 +1,14 @@
 serial_number: a200-0000
 version: 0
 system:
+  username: administrator
   hosts:
     self: cpr-a200-0000
     platform:
       cpr-a200-0000: 192.168.131.1
     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
@@ -1,14 +1,14 @@
 serial_number: a200-0000
 version: 0
 system:
+  username: administrator
   hosts:
     self: cpr-a200-0000
     platform:
       cpr-a200-0000: 192.168.131.1
     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
@@ -1,14 +1,14 @@
 serial_number: a200-0000
 version: 0
 system:
+  username: administrator
   hosts:
     self: cpr-a200-0000
     platform:
       cpr-a200-0000: 192.168.131.1
     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
@@ -1,14 +1,14 @@
 serial_number: a200-0000
 version: 0
 system:
+  username: administrator
   hosts:
     self: cpr-a200-0000
     platform:
       cpr-a200-0000: 192.168.131.1
     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
@@ -1,14 +1,14 @@
 serial_number: j100-0000
 version: 0
 system:
+  username: administrator
   hosts:
     self: cpr-j100-0000
     platform:
       cpr-j100-0000: 192.168.131.1
     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
@@ -1,14 +1,14 @@
 serial_number: j100-0000
 version: 0
 system:
+  username: administrator
   hosts:
     self: cpr-j100-0000
     platform:
       cpr-j100-0000: 192.168.131.1
     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
@@ -1,14 +1,14 @@
 serial_number: j100-0000
 version: 0
 system:
+  username: administrator
   hosts:
     self: cpr-j100-0000
     platform:
       cpr-j100-0000: 192.168.131.1
     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
@@ -1,14 +1,14 @@
 serial_number: j100-0000
 version: 0
 system:
+  username: administrator
   hosts:
     self: cpr-j100-0000
     platform:
       cpr-j100-0000: 192.168.131.1
     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
@@ -1,14 +1,14 @@
 serial_number: w200-0000
 version: 0
 system:
+  username: administrator
   hosts:
     self: cpr-w200-0000
     platform:
       cpr-w200-0000: 192.168.131.1
     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
@@ -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,