reverting back to cfs-epfl version

algos/demo1/algoobj_demo1.m

@@ -14,7 +14,7 @@ obj=obj.addtunparamstruct('algo_demo1_tp', @()algo_demo1_loadtp(), false);
 
 %% Tunable parameters
 parshot=2;
-mdsserver='scd.epfl.ch';
+mdsserver='alcdaq6.psfc.mit.edu';
 mdstree  ='scdds';
 obj=obj.addparameter(SCDclass_mdsparnumeric('demo1.params.enable.value'        ,'enable'          ,'mdshelp','a bool param',...
     'mdsvalid','1','srcsrv',mdsserver,'srctree',mdstree)); 

algos/demo2/algoobj_demo2.m

@@ -14,7 +14,7 @@ obj=obj.addtunparamstruct('algo_demo2_tp', @()algo_demo2_loadtp(), false);
 
 %% Tunable parameters
 parshot=2;
-mdsserver='scd.epfl.ch';
+mdsserver='alcdaq6.psfc.mit.edu';
 mdstree  ='scdds';
 obj=obj.addparameter(SCDclass_mdsparnumeric('demo2.params.enable.value'        ,'enable'          ,'mdshelp','a bool param',...
     'mdsvalid','1','srcsrv',mdsserver,'srctree',mdstree)); 

core @ 32a494f3

-Subproject commit ced0e70e375fb8bf9e56ae96d97be9af010c5ebf
+Subproject commit 32a494f3b3d3ff28b21e225b424b71a5d19f9ebe

nodes/demo12node_test.m

@@ -27,14 +27,14 @@ algo_demo1and2_create_marte2_cfg;
 cd ../..
 
 %% Transfer gencode and cfg to the realtime machine
-fprintf('\n### FILE TRANSFER TO NODE06 ###\n');
-system('scp marte2cfg/2threads/algo_demo1and2_2threads.cfg    tcv_oper@tcvrt17.crpp.tcv:martecfgs/tests');
-system('scp ../gencodes/CodeGenFolder-1/SCDwrap_demo1.so      tcv_oper@tcvrt17.crpp.tcv:martecfgs/tests');
-system('scp ../gencodes/CodeGenFolder-1/SCDwrap_demo2.so      tcv_oper@tcvrt17.crpp.tcv:martecfgs/tests');
+fprintf('\n### FILE TRANSFER TO MARTE2 ###\n');
+system('cp marte2cfg/2threads/algo_demo1and2_2threads.cfg    ~/MARTe2-examples/Configurations');
+system('cp ../gencodes/CodeGenFolder-/SCDwrap_demo1.so      ~/MARTe2-examples');
+system('cp ../gencodes/CodeGenFolder-/SCDwrap_demo2.so      ~/MARTe2-examples');
 
-%% MARTe2 run via scdstarter
-fprintf('\n### MARTE2 RUN ON NODE06 (follow it on node06 logs of scd server) ###\n');
-system('echo -n "Class = Message Destination = ShotStarter Function = INIT" | nc tcvrt17.crpp.tcv 24681');
+%% MARTe2 run via cmdline 
+fprintf('\n### MARTE2 RUN ###\n');
+system('cd /home/galperti/MARTe2-examples; ./runcfs.sh');
 
 % poor man way of waiting MARTe2 job done
 % MARTe2 is launched with a timeout of 10 seconds
@@ -43,7 +43,7 @@ system('echo -n "Class = Message Destination = ShotStarter Function = INIT" | nc
 
 %% MARTe2 output retrieval
 fprintf('\n### MARTE2 DATA RETRIEVAL FROM MDSPLUS ###\n');
-mdsconnect('scd');
+mdsconnect('alcdaq');
 marteshot=mdsopen('scdds',0)
 
 demo1signal1marte2=tdi('demo1.outputs.demo1.signal1');

nodes/marte2cfg/2threads/rtapp-thread1.cfgsrc

@@ -88,7 +88,7 @@ $TestApp = {
         }
 		+GAMSimulink1 = {
  			Class = SimulinkWrapperGAM
-			Library = "/home/tcv_oper/martecfgs/tests/SCDwrap_demo1.so"			
+			Library = "/home/galperti/MARTe2-examples/SCDwrap_demo1.so"			
 			SymbolPrefix = "SCDwrap_demo1"			
 			Verbosity = VERBOSITY
 			SkipInvalidTunableParams = 0

nodes/marte2cfg/2threads/rtapp-thread2.cfgsrc

@@ -59,7 +59,7 @@
         }
 		+GAMSimulink2 = {
  			Class = SimulinkWrapperGAM
-			Library = "/home/tcv_oper/martecfgs/tests/SCDwrap_demo2.so"			
+			Library = "/home/galperti/MARTe2-examples/SCDwrap_demo2.so"			
 			SymbolPrefix = "SCDwrap_demo2"			
 			Verbosity = VERBOSITY
 			SkipInvalidTunableParams = 0