Rename robotIpAddress to kinovaControllerIpAddress

clubcapra · May 17, 2023 · 5f1b9f1 · 5f1b9f1
1 parent 9316089
commit 5f1b9f1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/kinova_driver/src/kinova_comm.cpp b/kinova_driver/src/kinova_comm.cpp
@@ -77,7 +77,7 @@ KinovaComm::KinovaComm(const ros::NodeHandle& node_handle, boost::recursive_mute
   node_handle.getParam("ethernet/subnet_mask", subnet_mask);
   node_handle.getParam("ethernet/local_cmd_port", local_cmd_port);
   node_handle.getParam("ethernet/local_broadcast_port", local_bcast_port);
-  node_handle.getParam("robotIpAddress", inet_addr_string);
+  node_handle.getParam("kinovaControllerIpAddress", inet_addr_string);
   ethernet_settings.localCmdport = local_cmd_port;
   ethernet_settings.localBcastPort = local_bcast_port;
   ethernet_settings.localIpAddress = inet_addr(local_IP.c_str());

diff --git a/ovis_bringup/launch/ovis_arm.launch b/ovis_bringup/launch/ovis_arm.launch
@@ -3,14 +3,14 @@
   <arg name="kinova_robotType" default="c2s6s000" />
   <arg name="kinova_robotName" default="ovis" />
   <arg name="kinova_robotSerial" default="not_set" />
-  <arg name="robotIpAddress" default="192.168.84.160" />
+  <arg name="kinovaControllerIpAddress" default="192.168.84.160" />
   <arg name="use_jaco_v1_fingers" default="false" />
   <arg name="feedback_publish_rate" default="0.1" />
 
   <node name="$(arg kinova_robotName)" pkg="kinova_driver" type="kinova_arm_driver" output="screen" cwd="node" args="$(arg kinova_robotType)" respawn="true">
     <rosparam file="$(find ovis_bringup)/launch/config/ovis_parameters.yaml" command="load" />
     <param name="serial_number" value="$(arg kinova_robotSerial)" />
-    <param name="robotIpAddress" value="$(arg robotIpAddress)" />
+    <param name="kinovaControllerIpAddress" value="$(arg kinovaControllerIpAddress)" />
     <param name="robot_name" value="$(arg kinova_robotName)" />
     <param name="robot_type" value="$(arg kinova_robotType)" />
     <param name="use_jaco_v1_fingers" value="$(arg use_jaco_v1_fingers)" />