[openrtm-commit:03379] r1038 - in trunk/OpenRTM-aist-Python/OpenRTM_aist: . examples/StaticFsm

[openrtm ＠ openrtm.org]

Author: miyamoto
Date: 2018-11-21 14:05:10 +0900 (Wed, 21 Nov 2018)
New Revision: 1038

Modified:
   trunk/OpenRTM-aist-Python/OpenRTM_aist/PeriodicECSharedComposite.py
   trunk/OpenRTM-aist-Python/OpenRTM_aist/examples/StaticFsm/Microwave_pyfsm.py
Log:
[compat, bugfix]

Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/PeriodicECSharedComposite.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/PeriodicECSharedComposite.py	2018-11-09 02:12:26 UTC (rev 1037)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/PeriodicECSharedComposite.py	2018-11-21 05:05:10 UTC (rev 1038)
@@ -238,15 +238,17 @@
       self.removeParticipantFromEC(member)
       self.removeOrganizationFromTarget(member)
       self.startOwnedEC(member)
-      rm_rtc.append(member)
+      #rm_rtc.append(member)
+      self._rtcMembers.remove(member)
+      break
 
-    for m in rm_rtc:
-      self._rtcMembers.remove(m)
-            
+    #for m in rm_rtc:
+    #  self._rtcMembers.remove(m)
     result = OpenRTM_aist.Organization_impl.remove_member(self, id)
     return result
 
 
+
   ##
   # @if jp
   # @brief Organization¥á¥ó¥Ð¡¼¤òºï½ü¤¹¤ë

Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/examples/StaticFsm/Microwave_pyfsm.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/examples/StaticFsm/Microwave_pyfsm.py	2018-11-09 02:12:26 UTC (rev 1037)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/examples/StaticFsm/Microwave_pyfsm.py	2018-11-21 05:05:10 UTC (rev 1038)
@@ -68,8 +68,8 @@
 
         
   def onExecute(self, ec_id):
+    self._fsm.run_event()
     
-    
     return RTC.RTC_OK