--- a/tests/linux/test_master_DS401GUI/methods.py	Thu Oct 08 11:09:01 2009 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,66 +0,0 @@
-logger.write_error("Welcome to the Beremiz Demo\n\n")            
-logger.write("This demo provides a PLC working with the CANopen plugin\n")
-logger.write("""Some external programs are also provided:\n
-- a CAN TCP server to simulate the CANopen network
-- a virtual slave node to simulate input block
-- a virtual slave node to simulate output block
-""")
-logger.write("\nInfo: For this demo, %s plugin has some special methods to run external programs.\nThese methods are defined in methods.py\n" % (PlugName or "Root"))
-#open_pdf(os.path.join(os.path.split(__file__)[0], "doc", "manual_beremiz.pdf"), pagenum=21)
-
-if wx.Platform == '__WXMSW__':
-    self.listLaunchProg = [
-        {'name' : 'Can Tcp Server',
-         'command' : 'can_tcp_win32_server.exe',
-         'keyword' : 'Accepts',
-         'pid' : None,
-         'no_gui' : True},
-        {'name' : 'DS401 Slave Gui NodeId 32',
-         'command' : 'DS401_Slave_Gui.exe -sI -l can_tcp_win32.dll -b 127.0.0.1 -i 20 -B 125K',
-         'keyword' : '[OK]',
-         'pid' : None,
-         'no_gui' : False},
-        {'name' : 'DS401 Slave Gui NodeId 16',
-         'command' : 'DS401_Slave_Gui.exe -sO -l can_tcp_win32.dll -b 127.0.0.1 -i 10 -B 125K',
-         'keyword' : '[OK]',
-         'pid' : None,
-         'no_gui' : False}
-    ]
-else:
-    self.listLaunchProg = [
-        {'name' : 'DS401 Slave Gui NodeId 32',
-         'command' : '../CanFestival-3/examples/DS401_Slave_Gui/DS401_Slave_Gui -sI -l ../CanFestival-3/drivers/can_socket/libcanfestival_can_socket.so -b vcan0 -i 20 -B 125K',
-         'keyword' : '[OK]',
-         'pid' : None,
-         'no_gui' : False},
-        {'name' : 'DS401 Slave Gui NodeId 16',
-         'command' : '../CanFestival-3/examples/DS401_Slave_Gui/DS401_Slave_Gui -sO -l ../CanFestival-3/drivers/can_socket/libcanfestival_can_socket.so -b vcan0 -i 10 -B 125K',
-         'keyword' : '[OK]',
-         'pid' : None,
-         'no_gui' : False}
-    ]
-
-
-def my_methods(self): 
-    def _Run(logger):        
-        # External programs list 
-        # Launch them and get their pid
-        for prog in self.listLaunchProg:
-            logger.write("Starting %s\n" % prog['name'])
-            prog['pid'] = ProcessLogger(logger, prog['command'], no_gui=prog['no_gui'])
-            prog['pid'].spin(
-            		 timeout=200,
-                     keyword = prog['keyword'],
-                     kill_it = False)
-        
-        PluginsRoot._Run(self,logger)
-
-    def _Stop(logger):
-        PluginsRoot._Stop(self,logger)
-        for prog in self.listLaunchProg:
-            logger.write("Stopping %s\n" % prog['name'])
-            prog['pid'].kill()
-    
-    return _Run, _Stop
-   
-self._Run, self._Stop = my_methods(self)
\ No newline at end of file