datastates -> data and states in cfs1and2 1 thread marte2cfg

algos/cfs1/marte2cfg/1and2_1thread/algo_cfs1and2_1thread.cfgsrc

@@ -3,4 +3,5 @@
 >RTAPPPRESL<
 >RTAPPSL<
 >RTAPPPOSTSL<
->DATASTATES<
+>DATA<
+>STATES<

algos/cfs1/marte2cfg/1and2_1thread/algo_cfs1and2_create_marte2_cfg.m

@@ -108,7 +108,8 @@ system('sed -i -e "/>MDSPARAMS2</r MDSPARAMS2.cfg" -e "/>MDSPARAMS2</d" algo_cfs
 system('sed -i -e "/>RTAPPPRESL</r rtapp-presl.cfgsrc" -e "/>RTAPPPRESL</d" algo_cfs1and2_1thread.cfg');
 system('sed -i -e "/>RTAPPSL</r rtapp-simulinkwrapper.cfgsrc" -e "/>RTAPPSL</d" algo_cfs1and2_1thread.cfg');
 system('sed -i -e "/>RTAPPPOSTSL</r rtapp-postsl.cfgsrc" -e "/>RTAPPPOSTSL</d" algo_cfs1and2_1thread.cfg');
-system('sed -i -e "/>DATASTATES</r data_states.cfgsrc" -e "/>DATASTATES</d" algo_cfs1and2_1thread.cfg');
+system('sed -i -e "/>DATA</r data.cfgsrc" -e "/>DATA</d" algo_cfs1and2_1thread.cfg');
+system('sed -i -e "/>STATES</r states.cfgsrc" -e "/>STATES</d" algo_cfs1and2_1thread.cfg');
 
 system('sed -i -e "/>INPUTBUS1DDB1FLAT</r INPUTBUS1DDB1FLAT.cfg" -e "/>INPUTBUS1DDB1FLAT</d" algo_cfs1and2_1thread.cfg');
 system('sed -i -e "/>INPUTBUS2DDB2FLAT</r INPUTBUS2DDB2FLAT.cfg" -e "/>INPUTBUS2DDB2FLAT</d" algo_cfs1and2_1thread.cfg');

algos/cfs1/marte2cfg/1and2_1thread/data_states.cfgsrc → algos/cfs1/marte2cfg/1and2_1thread/data.cfgsrc

@@ -110,36 +110,3 @@
             }
         }
     }
-    +States = {
-        Class = ReferenceContainer
-        +State1 = {
-            Class = RealTimeState
-            +Threads = {
-                Class = ReferenceContainer
-                +Thread1 = {
-                    Class = RealTimeThread 
-                    CPUs = 0x4
-                    Functions = {
-                      GAMTimer  
-                      TimeConversion
-                      Constants
-                      Wavegen1TimeBroker
-                      Wavegen1DataBroker
-                      Wavegen2TimeBroker
-                      Wavegen2DataBroker
-                      ProcRouter
-                      GAMSimulink1
-                      GAMSimulink2
-                      StorageBroker1
-                      StorageBroker2
-                      //LoggerBroker
-                    }
-                }
-            }
-        }        
-    }
-    +Scheduler = {
-        Class = GAMScheduler
-        TimingDataSource = Timings
-    }
-}

algos/cfs1/marte2cfg/1and2_1thread/states.cfgsrc

+    +States = {
+        Class = ReferenceContainer
+        +State1 = {
+            Class = RealTimeState
+            +Threads = {
+                Class = ReferenceContainer
+                +Thread1 = {
+                    Class = RealTimeThread 
+                    CPUs = 0x4
+                    Functions = {
+                      GAMTimer  
+                      TimeConversion
+                      Constants
+                      Wavegen1TimeBroker
+                      Wavegen1DataBroker
+                      Wavegen2TimeBroker
+                      Wavegen2DataBroker
+                      ProcRouter
+                      GAMSimulink1
+                      GAMSimulink2
+                      StorageBroker1
+                      StorageBroker2
+                      //LoggerBroker
+                    }
+                }
+            }
+        }        
+    }
+    +Scheduler = {
+        Class = GAMScheduler
+        TimingDataSource = Timings
+    }
+}