cfs12combined 1 thread martecfg generator working

algos/cfs12combined/marte2cfg/1thread/algo_cfs1and2_create_marte2_cfg.m

@@ -72,12 +72,12 @@ cfs2outputbusflat=genbusstructstub('OUTPUTBUSSTRUCT2.cfg',algo_cfs2_outBus,'outp
 
 algo_cfs1_procout=Simulink.data.evalinGlobal('algo_cfs1','algo_cfs1_procout');
 algo_cfs2_procout=Simulink.data.evalinGlobal('algo_cfs2','algo_cfs2_procout');
-algo_cfs12_procin=Simulink.data.evalinGlobal('algo_cfs1','algo_cfs12_procin');
+%algo_cfs12_procin=Simulink.data.evalinGlobal('algo_cfs1','algo_cfs12_procin');
 
 fid=fopen('TYPEDEF.cfg','w');
 bus2marte2type(algo_cfs1_procout, 'algo_cfs1_procout', fid);
 bus2marte2type(algo_cfs2_procout, 'algo_cfs2_procout', fid);
-bus2marte2type(algo_cfs12_procin, 'algo_cfs12_procin', fid);
+%bus2marte2type(algo_cfs12_procin, 'algo_cfs12_procin', fid);
 fclose(fid);
 
 %% Clean

algos/cfs12combined/marte2cfg/1thread/rtapp-simulinkwrapper.cfgsrc

+   
         +ProcRouter = {
             Class = IOGAM
             InputSignals = {
@@ -5,10 +6,10 @@
                 proc_out_2    = { DataSource = DDB1 Type = algo_cfs2_procout }
             }
             OutputSignals = {
-                proc_in       = { DataSource = DDB1 Type = algo_cfs12_procin }
+                proc_in_2     = { DataSource = DDB1 Type = algo_cfs1_procout }
+                proc_in_1     = { DataSource = DDB1 Type = algo_cfs2_procout }
             }
         }
-
         +GAMSimulink1 = {
  			Class = SimulinkWrapperGAM
 			Library = "/root/MARTe2-examples/Simulinkso/algo_cfs1.so"			
@@ -23,7 +24,7 @@
 			InputSignals = {		
 				realtime	= { DataSource = DDB1 Type = float32 NumberOfElements = 1 NumberOfDimensions=0 Alias = TimeSec }
                 >INPUTBUSSTRUCT1<
-                proc_in     = { DataSource = DDB1 Type = algo_cfs12_procin }
+                proc_in     = { DataSource = DDB1 Type = algo_cfs2_procout Alias = proc_in_1 }
  			}
  			OutputSignals = { 
                 >OUTPUTBUSSTRUCT1<
@@ -49,7 +50,7 @@
 			InputSignals = {		
 				realtime	= { DataSource = DDB1 Type = float32 NumberOfElements = 1 NumberOfDimensions=0 Alias = TimeSec }
                 >INPUTBUSSTRUCT2<
-                proc_in     = { DataSource = DDB1 Type = algo_cfs12_procin }
+                proc_in     = { DataSource = DDB1 Type = algo_cfs1_procout Alias = proc_in_2 }
  			}
  			OutputSignals = { 
                 >OUTPUTBUSSTRUCT2<