[openrtm-commit:03002] r3136 - trunk/OpenRTM-aist/examples/StaticFsm

[openrtm ＠ openrtm.org]

Author: miyamoto
Date: 2017-12-12 09:32:20 +0900 (Tue, 12 Dec 2017)
New Revision: 3136

Modified:
   trunk/OpenRTM-aist/examples/StaticFsm/CMakeLists.txt
   trunk/OpenRTM-aist/examples/StaticFsm/DisplayComp.cpp
   trunk/OpenRTM-aist/examples/StaticFsm/InputbuttonComp.cpp
   trunk/OpenRTM-aist/examples/StaticFsm/MicrowaveComp.cpp
Log:
[compat] refs #4391

Modified: trunk/OpenRTM-aist/examples/StaticFsm/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/examples/StaticFsm/CMakeLists.txt	2017-12-11 23:18:44 UTC (rev 3135)
+++ trunk/OpenRTM-aist/examples/StaticFsm/CMakeLists.txt	2017-12-12 00:32:20 UTC (rev 3136)
@@ -119,7 +119,7 @@
 set(standalone_srcs MicrowaveComp.cpp ${srcs})
 
 if(VXWORKS AND NOT RTP)
-	set(standalone_srcs ${standalone_srcs} ${CMAKE_SOURCE_DIR}/src/lib/rtm/DataFlowComponentBase.cpp)
+	set(standalone_srcs ${standalone_srcs} ${CMAKE_SOURCE_DIR}/src/lib/rtm/DataFlowComponentBase.cpp ${CMAKE_SOURCE_DIR}/src/lib/rtm/Macho.cpp)
 	set(libs ${RTCSKEL_PROJECT_NAME})
 
 	add_executable(${target} ${standalone_srcs})
@@ -158,4 +158,4 @@
 	else(RTP)	
 		set_target_properties(${target} PROPERTIES SUFFIX ".out")
 	endif(RTP)
-endif(VXWORKS)
\ No newline at end of file
+endif(VXWORKS)

Modified: trunk/OpenRTM-aist/examples/StaticFsm/DisplayComp.cpp
===================================================================
--- trunk/OpenRTM-aist/examples/StaticFsm/DisplayComp.cpp	2017-12-11 23:18:44 UTC (rev 3135)
+++ trunk/OpenRTM-aist/examples/StaticFsm/DisplayComp.cpp	2017-12-12 00:32:20 UTC (rev 3136)
@@ -12,7 +12,23 @@
 #include <string>
 #include "Display.h"
 
-
+#if defined(RTM_OS_VXWORKS) && not defined(__RTP__)
+int display_main()
+{
+  RTC::Manager* manager = &RTC::Manager::instance();
+  RTC::RtcBase* comp;
+  DisplayInit(manager);
+  comp = manager->createComponent("Display");
+  if(comp)
+  {
+    return 0;
+  }
+  else
+  {
+    return 1;
+  }
+}
+#else
 void MyModuleInit(RTC::Manager* manager)
 {
   DisplayInit(manager);
@@ -75,6 +91,7 @@
   return;
 }
 
+
 int main (int argc, char** argv)
 {
   RTC::Manager* manager;
@@ -96,3 +113,4 @@
 
   return 0;
 }
+#endif

Modified: trunk/OpenRTM-aist/examples/StaticFsm/InputbuttonComp.cpp
===================================================================
--- trunk/OpenRTM-aist/examples/StaticFsm/InputbuttonComp.cpp	2017-12-11 23:18:44 UTC (rev 3135)
+++ trunk/OpenRTM-aist/examples/StaticFsm/InputbuttonComp.cpp	2017-12-12 00:32:20 UTC (rev 3136)
@@ -13,7 +13,23 @@
 #include "Inputbutton.h"
 #include <rtm/NVUtil.h>
 
-
+#if defined(RTM_OS_VXWORKS) && not defined(__RTP__)
+int inputbutton_main()
+{
+  RTC::Manager* manager = &RTC::Manager::instance();
+  RTC::RtcBase* comp;
+  InputbuttonInit(manager);
+  comp = manager->createComponent("Inputbutton");
+  if(comp)
+  {
+    return 0;
+  }
+  else
+  {
+    return 1;
+  }
+}
+#else
 void MyModuleInit(RTC::Manager* manager)
 {
   InputbuttonInit(manager);
@@ -95,3 +111,4 @@
 
   return 0;
 }
+#endif

Modified: trunk/OpenRTM-aist/examples/StaticFsm/MicrowaveComp.cpp
===================================================================
--- trunk/OpenRTM-aist/examples/StaticFsm/MicrowaveComp.cpp	2017-12-11 23:18:44 UTC (rev 3135)
+++ trunk/OpenRTM-aist/examples/StaticFsm/MicrowaveComp.cpp	2017-12-12 00:32:20 UTC (rev 3136)
@@ -12,7 +12,23 @@
 #include <string>
 #include "Microwave.h"
 
-
+#if defined(RTM_OS_VXWORKS) && not defined(__RTP__)
+int microwave_main()
+{
+  RTC::Manager* manager = &RTC::Manager::instance();
+  RTC::RtcBase* comp;
+  MicrowaveInit(manager);
+  comp = manager->createComponent("Microwave");
+  if(comp)
+  {
+    return 0;
+  }
+  else
+  {
+    return 1;
+  }
+}
+#else
 void MyModuleInit(RTC::Manager* manager)
 {
   MicrowaveInit(manager);