@@ -15,70 +15,70 @@ App::~App() {
1515
1616bool App::open_udp_socket (const int &port_id, const char *const remote_host) {
1717 if (!connection_ptr_) {
18- RCLCPP_ERROR_STREAM (rclcpp::get_logger (LOGGER_NAME ),
18+ RCLCPP_ERROR_STREAM (rclcpp::get_logger (LOGGER_NAME () ),
1919 ColorScheme::ERROR << " Connection not configured" << ColorScheme::ENDC );
2020 return false ;
2121 }
22- RCLCPP_INFO_STREAM (rclcpp::get_logger (LOGGER_NAME ),
22+ RCLCPP_INFO_STREAM (rclcpp::get_logger (LOGGER_NAME () ),
2323 ColorScheme::OKBLUE << " Opening UDP socket with port_id '" << ColorScheme::BOLD
2424 << port_id << " '" << ColorScheme::ENDC );
2525 if (!valid_port_ (port_id)) {
2626 return false ;
2727 }
2828 if (connection_ptr_->isOpen ()) {
29- RCLCPP_INFO (rclcpp::get_logger (LOGGER_NAME ), " Socket already open" );
29+ RCLCPP_INFO (rclcpp::get_logger (LOGGER_NAME () ), " Socket already open" );
3030 return true ;
3131 }
3232 if (!connection_ptr_->open (port_id, remote_host)) {
33- RCLCPP_ERROR_STREAM (rclcpp::get_logger (LOGGER_NAME ),
33+ RCLCPP_ERROR_STREAM (rclcpp::get_logger (LOGGER_NAME () ),
3434 ColorScheme::ERROR << " Failed to open socket" << ColorScheme::ENDC );
3535 return false ;
3636 }
37- RCLCPP_INFO_STREAM (rclcpp::get_logger (LOGGER_NAME ),
37+ RCLCPP_INFO_STREAM (rclcpp::get_logger (LOGGER_NAME () ),
3838 ColorScheme::OKGREEN << " Socket opened successfully" << ColorScheme::ENDC );
3939 return true ;
4040}
4141
4242bool App::close_udp_socket () {
4343 if (!connection_ptr_) {
44- RCLCPP_ERROR_STREAM (rclcpp::get_logger (LOGGER_NAME ),
44+ RCLCPP_ERROR_STREAM (rclcpp::get_logger (LOGGER_NAME () ),
4545 ColorScheme::ERROR << " Connection not configured" << ColorScheme::ENDC );
4646 return false ;
4747 }
4848 while (running_) {
49- RCLCPP_INFO (rclcpp::get_logger (LOGGER_NAME ), " Waiting for run thread termination" );
49+ RCLCPP_INFO (rclcpp::get_logger (LOGGER_NAME () ), " Waiting for run thread termination" );
5050 std::this_thread::sleep_for (std::chrono::milliseconds (100 ));
5151 }
52- RCLCPP_INFO_STREAM (rclcpp::get_logger (LOGGER_NAME ),
52+ RCLCPP_INFO_STREAM (rclcpp::get_logger (LOGGER_NAME () ),
5353 ColorScheme::OKBLUE << " Closing UDP socket" << ColorScheme::ENDC );
5454 if (!connection_ptr_->isOpen ()) {
55- RCLCPP_INFO (rclcpp::get_logger (LOGGER_NAME ), " Socket already closed" );
55+ RCLCPP_INFO (rclcpp::get_logger (LOGGER_NAME () ), " Socket already closed" );
5656 return true ;
5757 }
5858 connection_ptr_->close ();
59- RCLCPP_INFO_STREAM (rclcpp::get_logger (LOGGER_NAME ),
59+ RCLCPP_INFO_STREAM (rclcpp::get_logger (LOGGER_NAME () ),
6060 ColorScheme::OKGREEN << " Socket closed successfully" << ColorScheme::ENDC );
6161 return true ;
6262}
6363
6464void App::run_async (int rt_prio) {
6565 if (!async_client_ptr_) {
66- RCLCPP_ERROR_STREAM (rclcpp::get_logger (LOGGER_NAME ),
66+ RCLCPP_ERROR_STREAM (rclcpp::get_logger (LOGGER_NAME () ),
6767 ColorScheme::ERROR << " AsyncClient not configured" << ColorScheme::ENDC );
6868 return ;
6969 }
7070 if (!connection_ptr_) {
71- RCLCPP_ERROR_STREAM (rclcpp::get_logger (LOGGER_NAME ),
71+ RCLCPP_ERROR_STREAM (rclcpp::get_logger (LOGGER_NAME () ),
7272 ColorScheme::ERROR << " Connection not configured" << ColorScheme::ENDC );
7373 return ;
7474 }
7575 if (!connection_ptr_->isOpen ()) {
76- RCLCPP_ERROR_STREAM (rclcpp::get_logger (LOGGER_NAME ),
76+ RCLCPP_ERROR_STREAM (rclcpp::get_logger (LOGGER_NAME () ),
7777 ColorScheme::ERROR << " Connection not open" << ColorScheme::ENDC );
7878 return ;
7979 }
8080 if (!app_ptr_) {
81- RCLCPP_ERROR_STREAM (rclcpp::get_logger (LOGGER_NAME ),
81+ RCLCPP_ERROR_STREAM (rclcpp::get_logger (LOGGER_NAME () ),
8282 ColorScheme::ERROR << " App not configured" << ColorScheme::ENDC );
8383 return ;
8484 }
@@ -95,7 +95,7 @@ void App::perform_work_() {
9595 // may never return
9696 running_ = true ;
9797 if (async_client_ptr_->robotState ().getSessionState () == KUKA ::FRI ::ESessionState::IDLE ) {
98- RCLCPP_INFO (rclcpp::get_logger (LOGGER_NAME ), " LBR in session state idle, exiting" );
98+ RCLCPP_INFO (rclcpp::get_logger (LOGGER_NAME () ), " LBR in session state idle, exiting" );
9999 break ;
100100 }
101101 }
@@ -104,7 +104,7 @@ void App::perform_work_() {
104104
105105bool App::valid_port_ (const int &port_id) {
106106 if (port_id < 30200 || port_id > 30209 ) {
107- RCLCPP_ERROR_STREAM (rclcpp::get_logger (LOGGER_NAME ),
107+ RCLCPP_ERROR_STREAM (rclcpp::get_logger (LOGGER_NAME () ),
108108 ColorScheme::ERROR << " Expected port_id in [30200, 30209], got '"
109109 << ColorScheme::BOLD << port_id << " '"
110110 << ColorScheme::ENDC );
0 commit comments