Rename canBusLauncher app to launchCanBus

programs/CMakeLists.txt

@@ -1,8 +1,8 @@
 # Copyright: Universidad Carlos III de Madrid (C) 2013-2014
 # Authors: Juan G. Victores & Raúl de Santos Rico
 
-add_subdirectory(canBusLauncher)
 #add_subdirectory(checkCanBus)
 add_subdirectory(dumpCanBus)
 add_subdirectory(grabberControls2Gui)
+add_subdirectory(launchCanBus)
 add_subdirectory(sensorReader)

programs/launchCanBus/CMakeLists.txt

@@ -0,0 +1,17 @@
+option(ENABLE_launchCanBus "Enable/disable launchCanBus program" ON)
+
+if(ENABLE_launchCanBus)
+
+    add_executable(launchCanBus main.cpp
+                                LaunchCanBus.hpp
+                                LaunchCanBus.cpp)
+
+    target_link_libraries(launchCanBus YARP::YARP_OS
+                                       YARP::YARP_dev
+                                       YARP::YARP_init
+                                       ROBOTICSLAB::ColorDebug)
+
+    install(TARGETS launchCanBus
+            DESTINATION ${CMAKE_INSTALL_BINDIR})
+
+endif()

programs/canBusLauncher/CanBusLauncher.cpp → programs/launchCanBus/LaunchCanBus.cpp

@@ -1,6 +1,6 @@
 // -*- mode:C++; tab-width:4; c-basic-offset:4; indent-tabs-mode:nil -*-
 
-#include "CanBusLauncher.hpp"
+#include "LaunchCanBus.hpp"
 
 #include <cstdio>
 #include <string>
@@ -23,11 +23,11 @@ using namespace roboticslab;
 
 /************************************************************************/
 
-bool CanBusLauncher::configure(yarp::os::ResourceFinder &rf)
+bool LaunchCanBus::configure(yarp::os::ResourceFinder &rf)
 {
     if (rf.check("help"))
     {
-        std::printf("CanBusLauncher options:\n");
+        std::printf("LaunchCanBus options:\n");
         std::printf("\t--help (this help)\t--from [file.ini]\t--context [path]\t--mode [pos]\t--homePoss\n\n");
         CD_DEBUG_NO_HEADER("%s\n", rf.toString().c_str());
         return false;
@@ -252,21 +252,21 @@ bool CanBusLauncher::configure(yarp::os::ResourceFinder &rf)
 
 /************************************************************************/
 
-bool CanBusLauncher::updateModule()
+bool LaunchCanBus::updateModule()
 {
     return true;
 }
 
 /************************************************************************/
 
-double CanBusLauncher::getPeriod()
+double LaunchCanBus::getPeriod()
 {
     return 3.0;
 }
 
 /************************************************************************/
 
-bool CanBusLauncher::close()
+bool LaunchCanBus::close()
 {
     for (int i = 0; i < wrapperDevices.size(); i++)
     {

programs/canBusLauncher/CanBusLauncher.hpp → programs/launchCanBus/LaunchCanBus.hpp

@@ -1,7 +1,7 @@
 // -*- mode:C++; tab-width:4; c-basic-offset:4; indent-tabs-mode:nil -*-
 
-#ifndef __CAN_BUS_LAUNCHER__
-#define __CAN_BUS_LAUNCHER__
+#ifndef __LAUNCH_CAN_BUS__
+#define __LAUNCH_CAN_BUS__
 
 #include <yarp/os/RFModule.h>
 #include <yarp/dev/PolyDriverList.h>
@@ -10,14 +10,14 @@ namespace roboticslab
 {
 
 /**
- * @ingroup canBusLauncher
+ * @ingroup launchCanBus
  *
  * @brief Launches one or more bus drivers, and controlboardwrapper2 instances
  * that wrap corresponding nodes. A controlboardwrapper2 may be used through a
  * YARP remote_controlboard or directly through low-level YARP controlboardwrapper2
  * RPC commands.
  */
-class CanBusLauncher : public yarp::os::RFModule
+class LaunchCanBus : public yarp::os::RFModule
 {
 public:
     bool configure(yarp::os::ResourceFinder &rf);
@@ -33,4 +33,4 @@ class CanBusLauncher : public yarp::os::RFModule
 
 }  // namespace roboticslab
 
-#endif  // __CAN_BUS_LAUNCHER__
+#endif  // __LAUNCH_CAN_BUS__

programs/canBusLauncher/main.cpp → programs/launchCanBus/main.cpp

@@ -3,24 +3,24 @@
 /**
  *
  * @ingroup yarp_devices_programs
- * \defgroup canBusLauncher canBusLauncher
+ * \defgroup launchCanBus launchCanBus
  *
- * @brief Creates an instance of roboticslab::CanBusLauncher.
+ * @brief Creates an instance of roboticslab::launchCanBus.
  */
 
 #include <yarp/os/Network.h>
 #include <yarp/os/ResourceFinder.h>
 
 #include <ColorDebug.h>
 
-#include "CanBusLauncher.hpp"
+#include "LaunchCanBus.hpp"
 
 int main(int argc, char *argv[])
 {
     yarp::os::ResourceFinder rf;
     rf.setVerbose(true);
-    rf.setDefaultContext("canBusLauncher");
-    rf.setDefaultConfigFile("canBusLauncher.ini");
+    rf.setDefaultContext("launchCanBus");
+    rf.setDefaultConfigFile("launchCanBus.ini");
     rf.configure(argc, argv);
 
     CD_INFO("Checking for yarp network... ");
@@ -35,7 +35,7 @@ int main(int argc, char *argv[])
 
     CD_SUCCESS_NO_HEADER("[ok]\n");
 
-    roboticslab::CanBusLauncher mod;
+    roboticslab::LaunchCanBus mod;
 
     if (mod.configure(rf))
     {

share/CMakeLists.txt

@@ -7,10 +7,6 @@ yarp_install(FILES ymanager.ini
 
 ### Go through single applications
 
-if(ENABLE_canBusLauncher)
-    add_subdirectory(canBusLauncher)
-endif()
-
 if(ENABLE_checkCanBus)
     add_subdirectory(checkCanBus)
 endif()
@@ -19,6 +15,10 @@ if(ENABLE_dumpCanBus)
     add_subdirectory(dumpCanBus)
 endif()
 
+if(ENABLE_launchCanBus)
+    add_subdirectory(launchCanBus)
+endif()
+
 if(ENABLE_SpaceNavigator)
     add_subdirectory(spaceNavigator)
 endif()

share/canBusLauncher/CMakeLists.txt → share/launchCanBus/CMakeLists.txt

@@ -7,4 +7,4 @@ yarp_install(FILES conf/oneCanBusOneWrapper.ini
                    conf/oneCanBusOneWrapper-left-arm.ini
                    conf/oneCanBusOneWrapper-right-arm.ini
                    conf/twoCanBusThreeWrappers.ini
-             DESTINATION ${ROBOTICSLAB-YARP-DEVICES_CONTEXTS_INSTALL_DIR}/canBusLauncher)
+             DESTINATION ${ROBOTICSLAB-YARP-DEVICES_CONTEXTS_INSTALL_DIR}/launchCanBus)