diff --git a/demo_test_main.m b/demo_test_main.m index a1de42cd03e8fa099268d38f5617038cbce37a0e..4f44aac0f7b211b7c5c83e26257d61288b132cd1 100644 --- a/demo_test_main.m +++ b/demo_test_main.m @@ -40,12 +40,12 @@ algo_demo1and2_create_marte2_cfg; cd ../../.. %% Transfer gencode and cfg to the realtime machine -fprintf('\n### FILE TRANSFER TO NODE06 ###\n'); +fprintf('\n### FILE COPY TO martecfgs/tests ###\n'); %cd(fileparts(mfilename('fullpath'))); % this goes into /tmp/Editor on scd.epfl.ch if isequal(SCDDSdemo_env.getsite(),'EPFL') -system('scp nodes/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'); +system('cp nodes/marte2cfg/2threads/algo_demo1and2_2threads.cfg ~/martecfgs/tests'); +system('cp gencodes/CodeGenFolder-1/SCDwrap_demo1.so ~/martecfgs/tests'); +system('cp gencodes/CodeGenFolder-1/SCDwrap_demo2.so ~/martecfgs/tests'); elseif isequal(SCDDSdemo_env.getsite(),'PSFC') system('cp nodes/marte2cfg/2threads/algo_demo1and2_2threads.cfg ~/MARTe2/MARTe2-examples/Configurations'); system('cp gencodes/CodeGenFolder-1/SCDwrap_demo1.so ~/MARTe2/MARTe2-examples'); @@ -56,11 +56,11 @@ end switch SCDDSdemo_env.getsite() case 'EPFL' - 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'); + fprintf('\n### MARTE2 RUN ON LOCALHOST (follow it on spcscddev logs) ###\n'); + system('echo -n "Class = Message Destination = ShotStarter Function = INIT" | nc spcscddev 24681'); case 'PSFC' - fprintf('\n### MARTE2 RUN ON LOCALHOST ###\n'); - system('export MARTe2_Components_DIR=~/MARTe2/MARTe2-components; source /etc/profile.d/mdsplus.sh; cd ~/MARTe2/MARTe2-examples; ./runcfs.sh'); + fprintf('\n### MARTE2 RUN ON LOCALHOST ###\n'); + system('export MARTe2_Components_DIR=~/MARTe2/MARTe2-components; source /etc/profile.d/mdsplus.sh; cd ~/MARTe2/MARTe2-examples; ./runcfs.sh'); end % poor man way of waiting MARTe2 job done @@ -69,10 +69,13 @@ end % pause(15); %% MARTe2 output retrieval +% disconnect from mds in case already opened connections. +mdsdisconnect(); + fprintf('\n### MARTE2 DATA RETRIEVAL FROM MDSPLUS ###\n'); switch SCDDSdemo_env.getsite() case 'EPFL' - mdsconnect('scd'); + mdsconnect('spcscddev'); case 'PSFC' mdsconnect('alcdaq6.psfc.mit.edu'); end