From 894e30f47f44b44d3267c3e6eaf8e7240edb0445 Mon Sep 17 00:00:00 2001
From: beuchatp <beuchatp@control.ee.ethz.ch>
Date: Mon, 4 Dec 2017 15:39:22 +0100
Subject: [PATCH] Small ros info stream changes
---
pps_ws/src/d_fall_pps/src/CustomControllerService.cpp | 4 ++--
pps_ws/src/d_fall_pps/src/PPSClient.cpp | 4 ++--
pps_ws/src/d_fall_pps/src/ParameterService.cpp | 2 +-
pps_ws/src/d_fall_pps/src/SafeControllerService.cpp | 4 ++--
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/pps_ws/src/d_fall_pps/src/CustomControllerService.cpp b/pps_ws/src/d_fall_pps/src/CustomControllerService.cpp
index 678b1ba3..b4599096 100644
--- a/pps_ws/src/d_fall_pps/src/CustomControllerService.cpp
+++ b/pps_ws/src/d_fall_pps/src/CustomControllerService.cpp
@@ -815,7 +815,7 @@ void yamlReadyForFetchCallback(const std_msgs::Int32& msg)
case FETCH_YAML_CUSTOM_CONTROLLER_COORDINATOR:
{
// Let the user know that this message was received
- ROS_INFO("The CustomControllerService received the message that YAML parameters were (re-)loaded.\r> Now fetching the parameter values from the this machine.");
+ ROS_INFO("The CustomControllerService received the message that YAML parameters were (re-)loaded. > Now fetching the parameter values from the coordinator.");
// Create a node handle to the parameter service running on the coordinator machine
ros::NodeHandle nodeHandle_to_coordinator_parameter_service = ros::NodeHandle(namespace_to_coordinator_parameter_service);
// Call the function that fetches the parameters
@@ -826,7 +826,7 @@ void yamlReadyForFetchCallback(const std_msgs::Int32& msg)
case FETCH_YAML_CUSTOM_CONTROLLER_AGENT:
{
// Let the user know that this message was received
- ROS_INFO("The CustomControllerService received the message that YAML parameters were (re-)loaded.\r> Now fetching the parameter values from the this machine");
+ ROS_INFO("The CustomControllerService received the message that YAML parameters were (re-)loaded.\r> Now fetching the parameter values from this machine.");
// Create a node handle to the parameter service running on this agent's machine
ros::NodeHandle nodeHandle_to_own_agent_parameter_service = ros::NodeHandle(namespace_to_own_agent_parameter_service);
// Call the function that fetches the parameters
diff --git a/pps_ws/src/d_fall_pps/src/PPSClient.cpp b/pps_ws/src/d_fall_pps/src/PPSClient.cpp
index 244dd7e1..bc5adb61 100755
--- a/pps_ws/src/d_fall_pps/src/PPSClient.cpp
+++ b/pps_ws/src/d_fall_pps/src/PPSClient.cpp
@@ -793,7 +793,7 @@ void yamlReadyForFetchCallback(const std_msgs::Int32& msg)
{
// Let the user know that this message was received
// > and also from where the paramters are being fetched
- ROS_INFO("The PPSClient received the message that YAML parameters were (re-)loaded for the Safe Controller.\r>Now fetching the parameter values from the coordinator.");
+ ROS_INFO("The PPSClient received the message that YAML parameters were (re-)loaded for the Safe Controller. >Now fetching the parameter values from the coordinator.");
// Create a node handle to the parameter service running on the coordinator machine
ros::NodeHandle nodeHandle_to_coordinator_parameter_service = ros::NodeHandle(namespace_to_coordinator_parameter_service);
// Call the function that fetches the parameters
@@ -804,7 +804,7 @@ void yamlReadyForFetchCallback(const std_msgs::Int32& msg)
case FETCH_YAML_SAFE_CONTROLLER_AGENT:
{
// Let the user know that this message was received
- ROS_INFO("The PPSClient received the message that YAML parameters were (re-)loaded for the Safe Controller.\r> Now fetching the parameter values from the this machine");
+ ROS_INFO("The PPSClient received the message that YAML parameters were (re-)loaded for the Safe Controller. > Now fetching the parameter values from this machine.");
// Let the user know which paramters are being fetch
ROS_INFO("");
// Create a node handle to the parameter service running on this agent's machine
diff --git a/pps_ws/src/d_fall_pps/src/ParameterService.cpp b/pps_ws/src/d_fall_pps/src/ParameterService.cpp
index 53ca8f64..33a2b0fc 100755
--- a/pps_ws/src/d_fall_pps/src/ParameterService.cpp
+++ b/pps_ws/src/d_fall_pps/src/ParameterService.cpp
@@ -219,7 +219,7 @@ void requestLoadControllerYamlCallback(const std_msgs::Int32& msg)
if (isValidToAttemptLoad)
{
// Let the user know what is about to happen
- ROS_INFO_STREAM("> The following path will be used for locating the .yaml file:\r" << d_fall_pps_path << "\rThe comand line string sent to the 'system' is:\r" << cmd );
+ ROS_INFO_STREAM("> The following path will be used for locating the .yaml file: " << d_fall_pps_path << " The comand line string sent to the 'system' is: " << cmd );
// Re-load the parameters by pass the command line string via a "system" call
// > i.e., this replicates pasting this string in a new terminal window and pressing enter
diff --git a/pps_ws/src/d_fall_pps/src/SafeControllerService.cpp b/pps_ws/src/d_fall_pps/src/SafeControllerService.cpp
index afd88060..ff24c9eb 100755
--- a/pps_ws/src/d_fall_pps/src/SafeControllerService.cpp
+++ b/pps_ws/src/d_fall_pps/src/SafeControllerService.cpp
@@ -386,7 +386,7 @@ void yamlReadyForFetchCallback(const std_msgs::Int32& msg)
case FETCH_YAML_SAFE_CONTROLLER_COORDINATOR:
{
// Let the user know that this message was received
- ROS_INFO("The SafeControllerService received the message that YAML parameters were (re-)loaded.\r> Now fetching the parameter values from the coordinator.");
+ ROS_INFO("The SafeControllerService received the message that YAML parameters were (re-)loaded. > Now fetching the parameter values from the coordinator.");
// Create a node handle to the parameter service running on the coordinator machine
ros::NodeHandle nodeHandle_to_coordinator_parameter_service = ros::NodeHandle(namespace_to_coordinator_parameter_service);
// Call the function that fetches the parameters
@@ -397,7 +397,7 @@ void yamlReadyForFetchCallback(const std_msgs::Int32& msg)
case FETCH_YAML_SAFE_CONTROLLER_AGENT:
{
// Let the user know that this message was received
- ROS_INFO("The SafeControllerService received the message that YAML parameters were (re-)loaded.\r> Now fetching the parameter values from the this machine.");
+ ROS_INFO("The SafeControllerService received the message that YAML parameters were (re-)loaded. > Now fetching the parameter values from this machine.");
// Create a node handle to the parameter service running on this agent's machine
ros::NodeHandle nodeHandle_to_own_agent_parameter_service = ros::NodeHandle(namespace_to_own_agent_parameter_service);
// Call the function that fetches the parameters
--
GitLab