Merge pull request #108 from kochigami/add-initializing-message

* add naoqi_driver initialized message * modify the message of service and subscriber registering process
ros-naoqi · May 3, 2018 · d12752d · d12752d
2 parents 9869a3d + 06ff49c
commit d12752d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/include/naoqi_driver/service/service.hpp b/include/naoqi_driver/service/service.hpp
@@ -60,6 +60,7 @@ class Service
   {
     std::cout << name() << " is resetting" << std::endl;
     srvPtr_->reset( nh );
+    std::cout << name() << " reset" << std::endl;
   }
 
   /**

diff --git a/src/external_registration.cpp b/src/external_registration.cpp
@@ -91,6 +91,7 @@ int main(int argc, char** argv)
     bs->init();
   }
 
+  std::cout << BOLDYELLOW << "naoqi_driver initialized" << RESETCOLOR << std::endl;
   app.run();
   bs->stopService();
   app.session()->close();

diff --git a/src/naoqi_driver.cpp b/src/naoqi_driver.cpp
@@ -890,9 +890,9 @@ void Driver::registerService( service::Service srv )
 
 void Driver::registerDefaultServices()
 {
-  registerService( boost::make_shared<service::RobotConfigService>("robot config service", "/naoqi_driver/get_robot_config", sessionPtr_) );
-  registerService( boost::make_shared<service::SetLanguageService>("set language service", "/naoqi_driver/set_language", sessionPtr_) );
-  registerService( boost::make_shared<service::GetLanguageService>("get language service", "/naoqi_driver/get_language", sessionPtr_) );
+  registerService( boost::make_shared<service::RobotConfigService>("get_robot_config", "/naoqi_driver/get_robot_config", sessionPtr_) );
+  registerService( boost::make_shared<service::SetLanguageService>("set_language", "/naoqi_driver/set_language", sessionPtr_) );
+  registerService( boost::make_shared<service::GetLanguageService>("get_language", "/naoqi_driver/get_language", sessionPtr_) );
 }
 
 std::vector<std::string> Driver::getAvailableConverters()
@@ -964,13 +964,11 @@ void Driver::setMasterURINet( const std::string& uri, const std::string& network
 
     for_each( subscriber::Subscriber& sub, subscribers_ )
     {
-      std::cout << "resetting subscriber " << sub.name() << std::endl;
       sub.reset( *nhPtr_ );
     }
 
     for_each( service::Service& srv, services_ )
     {
-      std::cout << "resetting service " << srv.name() << std::endl;
       srv.reset( *nhPtr_ );
     }
   }