diff --git a/java/jdevices/src/main/java/MARTE2_STREAMSetup.java b/java/jdevices/src/main/java/MARTE2_STREAMSetup.java
index 1ae01c5014..741b7417b5 100644
--- a/java/jdevices/src/main/java/MARTE2_STREAMSetup.java
+++ b/java/jdevices/src/main/java/MARTE2_STREAMSetup.java
@@ -703,7 +703,7 @@ private void initComponents() {
deviceField14.setIdentifier("");
deviceField14.setLabelString("Timebase div.:");
deviceField14.setNumCols(4);
- deviceField14.setOffsetNid(107);
+ deviceField14.setOffsetNid(1307);
jPanel11.add(deviceField14);
deviceChoice9.setChoiceIntValues(new int[] {1, 0});
@@ -959,7 +959,7 @@ private void initComponents() {
jPanel1.add(jPanel9);
- jPanel10.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 128"));
+ jPanel10.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 8"));
deviceField9.setIdentifier("");
deviceField9.setLabelString("Value: ");
@@ -989,7 +989,7 @@ private void initComponents() {
jPanel1.add(jPanel10);
- jPanel13.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 9"));
+ jPanel13.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 8"));
deviceField23.setIdentifier("");
deviceField23.setLabelString("Value: ");
@@ -1020,7 +1020,7 @@ private void initComponents() {
jPanel1.add(jPanel13);
- jPanel14.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 10"));
+ jPanel14.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 8"));
deviceField25.setIdentifier("");
deviceField25.setLabelString("Value: ");
@@ -1051,7 +1051,7 @@ private void initComponents() {
jPanel1.add(jPanel14);
- jPanel15.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 11"));
+ jPanel15.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 8"));
deviceField27.setIdentifier("");
deviceField27.setLabelString("Value: ");
@@ -1082,7 +1082,7 @@ private void initComponents() {
jPanel1.add(jPanel15);
- jPanel16.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 12"));
+ jPanel16.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 8"));
deviceField29.setIdentifier("");
deviceField29.setLabelString("Value: ");
@@ -1113,7 +1113,7 @@ private void initComponents() {
jPanel1.add(jPanel16);
- jPanel17.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 13"));
+ jPanel17.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 8"));
deviceField31.setIdentifier("");
deviceField31.setLabelString("Value: ");
@@ -1144,7 +1144,7 @@ private void initComponents() {
jPanel1.add(jPanel17);
- jPanel18.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 14"));
+ jPanel18.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 8"));
deviceField33.setIdentifier("");
deviceField33.setLabelString("Value: ");
@@ -1175,7 +1175,7 @@ private void initComponents() {
jPanel1.add(jPanel18);
- jPanel19.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 15"));
+ jPanel19.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 8"));
deviceField35.setIdentifier("");
deviceField35.setLabelString("Value: ");
@@ -1206,7 +1206,7 @@ private void initComponents() {
jPanel1.add(jPanel19);
- jPanel20.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 16"));
+ jPanel20.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 8"));
deviceField37.setIdentifier("");
deviceField37.setLabelString("Value: ");
@@ -1237,7 +1237,7 @@ private void initComponents() {
jPanel1.add(jPanel20);
- jPanel21.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 17"));
+ jPanel21.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 8"));
deviceField39.setIdentifier("");
deviceField39.setLabelString("Value: ");
@@ -1268,7 +1268,7 @@ private void initComponents() {
jPanel1.add(jPanel21);
- jPanel22.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 18"));
+ jPanel22.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 8"));
deviceField41.setIdentifier("");
deviceField41.setLabelString("Value: ");
@@ -1299,7 +1299,7 @@ private void initComponents() {
jPanel1.add(jPanel22);
- jPanel23.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 19"));
+ jPanel23.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 8"));
deviceField43.setIdentifier("");
deviceField43.setLabelString("Value: ");
@@ -1330,7 +1330,7 @@ private void initComponents() {
jPanel1.add(jPanel23);
- jPanel24.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 20"));
+ jPanel24.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 8"));
deviceField45.setIdentifier("");
deviceField45.setLabelString("Value: ");
@@ -1361,7 +1361,7 @@ private void initComponents() {
jPanel1.add(jPanel24);
- jPanel25.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 21"));
+ jPanel25.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 8"));
deviceField47.setIdentifier("");
deviceField47.setLabelString("Value: ");
@@ -1392,7 +1392,7 @@ private void initComponents() {
jPanel1.add(jPanel25);
- jPanel26.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 22"));
+ jPanel26.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 8"));
deviceField49.setIdentifier("");
deviceField49.setLabelString("Value: ");
@@ -1423,7 +1423,7 @@ private void initComponents() {
jPanel1.add(jPanel26);
- jPanel27.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 23"));
+ jPanel27.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 8"));
deviceField51.setIdentifier("");
deviceField51.setLabelString("Value: ");
@@ -1454,7 +1454,7 @@ private void initComponents() {
jPanel1.add(jPanel27);
- jPanel28.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 24"));
+ jPanel28.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 8"));
deviceField53.setIdentifier("");
deviceField53.setLabelString("Value: ");
@@ -1485,7 +1485,7 @@ private void initComponents() {
jPanel1.add(jPanel28);
- jPanel29.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 25"));
+ jPanel29.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 8"));
deviceField55.setIdentifier("");
deviceField55.setLabelString("Value: ");
@@ -1516,7 +1516,7 @@ private void initComponents() {
jPanel1.add(jPanel29);
- jPanel30.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 26"));
+ jPanel30.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 8"));
deviceField57.setIdentifier("");
deviceField57.setLabelString("Value: ");
@@ -1547,7 +1547,7 @@ private void initComponents() {
jPanel1.add(jPanel30);
- jPanel31.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 27"));
+ jPanel31.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 8"));
deviceField59.setIdentifier("");
deviceField59.setLabelString("Value: ");
@@ -1578,7 +1578,7 @@ private void initComponents() {
jPanel1.add(jPanel31);
- jPanel32.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 28"));
+ jPanel32.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 8"));
deviceField61.setIdentifier("");
deviceField61.setLabelString("Value: ");
@@ -1609,7 +1609,7 @@ private void initComponents() {
jPanel1.add(jPanel32);
- jPanel33.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 29"));
+ jPanel33.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 8"));
deviceField63.setIdentifier("");
deviceField63.setLabelString("Value: ");
@@ -1640,7 +1640,7 @@ private void initComponents() {
jPanel1.add(jPanel33);
- jPanel34.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 30"));
+ jPanel34.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 8"));
deviceField65.setIdentifier("");
deviceField65.setLabelString("Value: ");
@@ -1671,7 +1671,7 @@ private void initComponents() {
jPanel1.add(jPanel34);
- jPanel35.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 31"));
+ jPanel35.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 8"));
deviceField67.setIdentifier("");
deviceField67.setLabelString("Value: ");
@@ -1702,7 +1702,7 @@ private void initComponents() {
jPanel1.add(jPanel35);
- jPanel36.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 32"));
+ jPanel36.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 8"));
deviceField69.setIdentifier("");
deviceField69.setLabelString("Value: ");
@@ -1733,7 +1733,7 @@ private void initComponents() {
jPanel1.add(jPanel36);
- jPanel37.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 33"));
+ jPanel37.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 8"));
deviceField71.setIdentifier("");
deviceField71.setLabelString("Value: ");
@@ -1764,7 +1764,7 @@ private void initComponents() {
jPanel1.add(jPanel37);
- jPanel38.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 34"));
+ jPanel38.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 8"));
deviceField73.setIdentifier("");
deviceField73.setLabelString("Value: ");
@@ -1795,7 +1795,7 @@ private void initComponents() {
jPanel1.add(jPanel38);
- jPanel39.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal35"));
+ jPanel39.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 8"));
deviceField75.setIdentifier("");
deviceField75.setLabelString("Value: ");
@@ -1826,7 +1826,7 @@ private void initComponents() {
jPanel1.add(jPanel39);
- jPanel40.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 36"));
+ jPanel40.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 8"));
deviceField77.setIdentifier("");
deviceField77.setLabelString("Value: ");
@@ -1857,7 +1857,7 @@ private void initComponents() {
jPanel1.add(jPanel40);
- jPanel41.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 37"));
+ jPanel41.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 8"));
deviceField79.setIdentifier("");
deviceField79.setLabelString("Value: ");
@@ -1888,7 +1888,7 @@ private void initComponents() {
jPanel1.add(jPanel41);
- jPanel42.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 38"));
+ jPanel42.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 8"));
deviceField81.setIdentifier("");
deviceField81.setLabelString("Value: ");
@@ -1919,7 +1919,7 @@ private void initComponents() {
jPanel1.add(jPanel42);
- jPanel43.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 40"));
+ jPanel43.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 8"));
deviceField83.setIdentifier("");
deviceField83.setLabelString("Value: ");
@@ -1950,7 +1950,7 @@ private void initComponents() {
jPanel1.add(jPanel43);
- jPanel44.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 41"));
+ jPanel44.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 8"));
deviceField85.setIdentifier("");
deviceField85.setLabelString("Value: ");
@@ -1981,7 +1981,7 @@ private void initComponents() {
jPanel1.add(jPanel44);
- jPanel45.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 42"));
+ jPanel45.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 8"));
deviceField87.setIdentifier("");
deviceField87.setLabelString("Value: ");
@@ -2012,7 +2012,7 @@ private void initComponents() {
jPanel1.add(jPanel45);
- jPanel46.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 43"));
+ jPanel46.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 8"));
deviceField89.setIdentifier("");
deviceField89.setLabelString("Value: ");
@@ -2043,7 +2043,7 @@ private void initComponents() {
jPanel1.add(jPanel46);
- jPanel47.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 44"));
+ jPanel47.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 8"));
deviceField91.setIdentifier("");
deviceField91.setLabelString("Value: ");
@@ -2074,7 +2074,7 @@ private void initComponents() {
jPanel1.add(jPanel47);
- jPanel48.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 45"));
+ jPanel48.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 8"));
deviceField93.setIdentifier("");
deviceField93.setLabelString("Value: ");
@@ -2105,7 +2105,7 @@ private void initComponents() {
jPanel1.add(jPanel48);
- jPanel49.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 46"));
+ jPanel49.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 8"));
deviceField95.setIdentifier("");
deviceField95.setLabelString("Value: ");
@@ -2136,7 +2136,7 @@ private void initComponents() {
jPanel1.add(jPanel49);
- jPanel50.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 47"));
+ jPanel50.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 8"));
deviceField97.setIdentifier("");
deviceField97.setLabelString("Value: ");
@@ -2167,7 +2167,7 @@ private void initComponents() {
jPanel1.add(jPanel50);
- jPanel51.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 48"));
+ jPanel51.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 8"));
deviceField99.setIdentifier("");
deviceField99.setLabelString("Value: ");
@@ -2198,7 +2198,7 @@ private void initComponents() {
jPanel1.add(jPanel51);
- jPanel52.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 49"));
+ jPanel52.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 8"));
deviceField101.setIdentifier("");
deviceField101.setLabelString("Value: ");
@@ -2229,7 +2229,7 @@ private void initComponents() {
jPanel1.add(jPanel52);
- jPanel53.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 50"));
+ jPanel53.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 8"));
deviceField103.setIdentifier("");
deviceField103.setLabelString("Value: ");
@@ -2260,7 +2260,7 @@ private void initComponents() {
jPanel1.add(jPanel53);
- jPanel54.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 51"));
+ jPanel54.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 8"));
deviceField105.setIdentifier("");
deviceField105.setLabelString("Value: ");
@@ -2291,7 +2291,7 @@ private void initComponents() {
jPanel1.add(jPanel54);
- jPanel55.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 52"));
+ jPanel55.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 8"));
deviceField107.setIdentifier("");
deviceField107.setLabelString("Value: ");
@@ -2322,7 +2322,7 @@ private void initComponents() {
jPanel1.add(jPanel55);
- jPanel56.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 53"));
+ jPanel56.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 8"));
deviceField109.setIdentifier("");
deviceField109.setLabelString("Value: ");
@@ -2353,7 +2353,7 @@ private void initComponents() {
jPanel1.add(jPanel56);
- jPanel57.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 54"));
+ jPanel57.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 8"));
deviceField111.setIdentifier("");
deviceField111.setLabelString("Value: ");
@@ -2384,7 +2384,7 @@ private void initComponents() {
jPanel1.add(jPanel57);
- jPanel58.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 55"));
+ jPanel58.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 8"));
deviceField113.setIdentifier("");
deviceField113.setLabelString("Value: ");
@@ -2415,7 +2415,7 @@ private void initComponents() {
jPanel1.add(jPanel58);
- jPanel59.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 56"));
+ jPanel59.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 8"));
deviceField115.setIdentifier("");
deviceField115.setLabelString("Value: ");
@@ -2446,7 +2446,7 @@ private void initComponents() {
jPanel1.add(jPanel59);
- jPanel60.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 57"));
+ jPanel60.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 8"));
deviceField117.setIdentifier("");
deviceField117.setLabelString("Value: ");
@@ -2477,7 +2477,7 @@ private void initComponents() {
jPanel1.add(jPanel60);
- jPanel61.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 58"));
+ jPanel61.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 8"));
deviceField119.setIdentifier("");
deviceField119.setLabelString("Value: ");
@@ -2508,7 +2508,7 @@ private void initComponents() {
jPanel1.add(jPanel61);
- jPanel62.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 59"));
+ jPanel62.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 8"));
deviceField121.setIdentifier("");
deviceField121.setLabelString("Value: ");
@@ -2539,7 +2539,7 @@ private void initComponents() {
jPanel1.add(jPanel62);
- jPanel63.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 60"));
+ jPanel63.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 8"));
deviceField123.setIdentifier("");
deviceField123.setLabelString("Value: ");
@@ -2570,7 +2570,7 @@ private void initComponents() {
jPanel1.add(jPanel63);
- jPanel64.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 61"));
+ jPanel64.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 8"));
deviceField125.setIdentifier("");
deviceField125.setLabelString("Value: ");
@@ -2601,7 +2601,7 @@ private void initComponents() {
jPanel1.add(jPanel64);
- jPanel65.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 62"));
+ jPanel65.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 8"));
deviceField127.setIdentifier("");
deviceField127.setLabelString("Value: ");
@@ -2632,7 +2632,7 @@ private void initComponents() {
jPanel1.add(jPanel65);
- jPanel66.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 63"));
+ jPanel66.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 8"));
deviceField129.setIdentifier("");
deviceField129.setLabelString("Value: ");
@@ -2663,7 +2663,7 @@ private void initComponents() {
jPanel1.add(jPanel66);
- jPanel67.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 64"));
+ jPanel67.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 8"));
deviceField131.setIdentifier("");
deviceField131.setLabelString("Value: ");
@@ -2694,7 +2694,7 @@ private void initComponents() {
jPanel1.add(jPanel67);
- jPanel68.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 65"));
+ jPanel68.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 8"));
deviceField133.setIdentifier("");
deviceField133.setLabelString("Value: ");
@@ -2725,7 +2725,7 @@ private void initComponents() {
jPanel1.add(jPanel68);
- jPanel69.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 66"));
+ jPanel69.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 8"));
deviceField135.setIdentifier("");
deviceField135.setLabelString("Value: ");
@@ -2756,7 +2756,7 @@ private void initComponents() {
jPanel1.add(jPanel69);
- jPanel70.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 67"));
+ jPanel70.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 8"));
deviceField137.setIdentifier("");
deviceField137.setLabelString("Value: ");
@@ -2787,7 +2787,7 @@ private void initComponents() {
jPanel1.add(jPanel70);
- jPanel71.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 68"));
+ jPanel71.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 8"));
deviceField139.setIdentifier("");
deviceField139.setLabelString("Value: ");
@@ -2818,7 +2818,7 @@ private void initComponents() {
jPanel1.add(jPanel71);
- jPanel72.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 69"));
+ jPanel72.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 8"));
deviceField141.setIdentifier("");
deviceField141.setLabelString("Value: ");
@@ -2849,7 +2849,7 @@ private void initComponents() {
jPanel1.add(jPanel72);
- jPanel73.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 70"));
+ jPanel73.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 8"));
deviceField143.setIdentifier("");
deviceField143.setLabelString("Value: ");
@@ -2911,7 +2911,7 @@ private void initComponents() {
jPanel1.add(jPanel74);
- jPanel75.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 71"));
+ jPanel75.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 8"));
deviceField147.setIdentifier("");
deviceField147.setLabelString("Value: ");
@@ -2942,7 +2942,7 @@ private void initComponents() {
jPanel1.add(jPanel75);
- jPanel76.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 72"));
+ jPanel76.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 8"));
deviceField149.setIdentifier("");
deviceField149.setLabelString("Value: ");
@@ -2973,7 +2973,7 @@ private void initComponents() {
jPanel1.add(jPanel76);
- jPanel77.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 73"));
+ jPanel77.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 8"));
deviceField151.setIdentifier("");
deviceField151.setLabelString("Value: ");
@@ -3004,7 +3004,7 @@ private void initComponents() {
jPanel1.add(jPanel77);
- jPanel78.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 74"));
+ jPanel78.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 8"));
deviceField153.setIdentifier("");
deviceField153.setLabelString("Value: ");
@@ -3035,7 +3035,7 @@ private void initComponents() {
jPanel1.add(jPanel78);
- jPanel79.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 75"));
+ jPanel79.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 8"));
deviceField155.setIdentifier("");
deviceField155.setLabelString("Value: ");
@@ -3066,7 +3066,7 @@ private void initComponents() {
jPanel1.add(jPanel79);
- jPanel80.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 76"));
+ jPanel80.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 8"));
deviceField157.setIdentifier("");
deviceField157.setLabelString("Value: ");
@@ -3097,7 +3097,7 @@ private void initComponents() {
jPanel1.add(jPanel80);
- jPanel81.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 77"));
+ jPanel81.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 8"));
deviceField159.setIdentifier("");
deviceField159.setLabelString("Value: ");
@@ -3128,7 +3128,7 @@ private void initComponents() {
jPanel1.add(jPanel81);
- jPanel82.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 78"));
+ jPanel82.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 8"));
deviceField161.setIdentifier("");
deviceField161.setLabelString("Value: ");
@@ -3159,7 +3159,7 @@ private void initComponents() {
jPanel1.add(jPanel82);
- jPanel83.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 79"));
+ jPanel83.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 8"));
deviceField163.setIdentifier("");
deviceField163.setLabelString("Value: ");
@@ -3190,7 +3190,7 @@ private void initComponents() {
jPanel1.add(jPanel83);
- jPanel84.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 80"));
+ jPanel84.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 8"));
deviceField165.setIdentifier("");
deviceField165.setLabelString("Value: ");
@@ -3252,7 +3252,7 @@ private void initComponents() {
jPanel1.add(jPanel85);
- jPanel86.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 81"));
+ jPanel86.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 8"));
deviceField169.setIdentifier("");
deviceField169.setLabelString("Value: ");
@@ -3283,7 +3283,7 @@ private void initComponents() {
jPanel1.add(jPanel86);
- jPanel87.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 82"));
+ jPanel87.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 8"));
deviceField171.setIdentifier("");
deviceField171.setLabelString("Value: ");
@@ -3314,7 +3314,7 @@ private void initComponents() {
jPanel1.add(jPanel87);
- jPanel88.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 83"));
+ jPanel88.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 8"));
deviceField173.setIdentifier("");
deviceField173.setLabelString("Value: ");
@@ -3345,7 +3345,7 @@ private void initComponents() {
jPanel1.add(jPanel88);
- jPanel89.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 84"));
+ jPanel89.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 8"));
deviceField175.setIdentifier("");
deviceField175.setLabelString("Value: ");
@@ -3376,7 +3376,7 @@ private void initComponents() {
jPanel1.add(jPanel89);
- jPanel90.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 85"));
+ jPanel90.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 8"));
deviceField177.setIdentifier("");
deviceField177.setLabelString("Value: ");
@@ -3407,7 +3407,7 @@ private void initComponents() {
jPanel1.add(jPanel90);
- jPanel91.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 86"));
+ jPanel91.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 8"));
deviceField179.setIdentifier("");
deviceField179.setLabelString("Value: ");
@@ -3438,7 +3438,7 @@ private void initComponents() {
jPanel1.add(jPanel91);
- jPanel92.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 87"));
+ jPanel92.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 8"));
deviceField181.setIdentifier("");
deviceField181.setLabelString("Value: ");
@@ -3469,7 +3469,7 @@ private void initComponents() {
jPanel1.add(jPanel92);
- jPanel93.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 88"));
+ jPanel93.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 8"));
deviceField183.setIdentifier("");
deviceField183.setLabelString("Value: ");
@@ -3500,7 +3500,7 @@ private void initComponents() {
jPanel1.add(jPanel93);
- jPanel94.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 89"));
+ jPanel94.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 8"));
deviceField185.setIdentifier("");
deviceField185.setLabelString("Value: ");
@@ -3531,7 +3531,7 @@ private void initComponents() {
jPanel1.add(jPanel94);
- jPanel95.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 90"));
+ jPanel95.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 8"));
deviceField187.setIdentifier("");
deviceField187.setLabelString("Value: ");
@@ -3562,7 +3562,7 @@ private void initComponents() {
jPanel1.add(jPanel95);
- jPanel96.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 91"));
+ jPanel96.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 8"));
deviceField189.setIdentifier("");
deviceField189.setLabelString("Value: ");
@@ -3593,7 +3593,7 @@ private void initComponents() {
jPanel1.add(jPanel96);
- jPanel97.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 92"));
+ jPanel97.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 8"));
deviceField191.setIdentifier("");
deviceField191.setLabelString("Value: ");
@@ -3624,7 +3624,7 @@ private void initComponents() {
jPanel1.add(jPanel97);
- jPanel98.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 93"));
+ jPanel98.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 8"));
deviceField193.setIdentifier("");
deviceField193.setLabelString("Value: ");
@@ -3655,7 +3655,7 @@ private void initComponents() {
jPanel1.add(jPanel98);
- jPanel99.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 94"));
+ jPanel99.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 8"));
deviceField195.setIdentifier("");
deviceField195.setLabelString("Value: ");
@@ -3686,7 +3686,7 @@ private void initComponents() {
jPanel1.add(jPanel99);
- jPanel100.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 95"));
+ jPanel100.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 8"));
deviceField197.setIdentifier("");
deviceField197.setLabelString("Value: ");
@@ -3717,7 +3717,7 @@ private void initComponents() {
jPanel1.add(jPanel100);
- jPanel101.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 96"));
+ jPanel101.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 8"));
deviceField295.setIdentifier("");
deviceField295.setLabelString("Value: ");
@@ -3748,7 +3748,7 @@ private void initComponents() {
jPanel1.add(jPanel101);
- jPanel102.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 97"));
+ jPanel102.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 8"));
deviceField298.setIdentifier("");
deviceField298.setLabelString("Value: ");
@@ -3779,7 +3779,7 @@ private void initComponents() {
jPanel1.add(jPanel102);
- jPanel103.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 98"));
+ jPanel103.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 8"));
deviceField301.setIdentifier("");
deviceField301.setLabelString("Value: ");
@@ -3810,7 +3810,7 @@ private void initComponents() {
jPanel1.add(jPanel103);
- jPanel104.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 99"));
+ jPanel104.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 8"));
deviceField304.setIdentifier("");
deviceField304.setLabelString("Value: ");
@@ -3841,7 +3841,7 @@ private void initComponents() {
jPanel1.add(jPanel104);
- jPanel105.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 8100"));
+ jPanel105.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 8"));
deviceField307.setIdentifier("");
deviceField307.setLabelString("Value: ");
@@ -3872,7 +3872,7 @@ private void initComponents() {
jPanel1.add(jPanel105);
- jPanel106.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 101"));
+ jPanel106.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 8"));
deviceField310.setIdentifier("");
deviceField310.setLabelString("Value: ");
@@ -3903,7 +3903,7 @@ private void initComponents() {
jPanel1.add(jPanel106);
- jPanel107.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 102"));
+ jPanel107.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 8"));
deviceField313.setIdentifier("");
deviceField313.setLabelString("Value: ");
@@ -3934,7 +3934,7 @@ private void initComponents() {
jPanel1.add(jPanel107);
- jPanel108.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 103"));
+ jPanel108.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 8"));
deviceField316.setIdentifier("");
deviceField316.setLabelString("Value: ");
@@ -3965,7 +3965,7 @@ private void initComponents() {
jPanel1.add(jPanel108);
- jPanel109.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 104"));
+ jPanel109.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 8"));
deviceField319.setIdentifier("");
deviceField319.setLabelString("Value: ");
@@ -3996,7 +3996,7 @@ private void initComponents() {
jPanel1.add(jPanel109);
- jPanel110.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 105"));
+ jPanel110.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 8"));
deviceField322.setIdentifier("");
deviceField322.setLabelString("Value: ");
@@ -4027,7 +4027,7 @@ private void initComponents() {
jPanel1.add(jPanel110);
- jPanel111.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 106"));
+ jPanel111.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 8"));
deviceField325.setIdentifier("");
deviceField325.setLabelString("Value: ");
@@ -4058,7 +4058,7 @@ private void initComponents() {
jPanel1.add(jPanel111);
- jPanel112.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 107"));
+ jPanel112.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 8"));
deviceField328.setIdentifier("");
deviceField328.setLabelString("Value: ");
@@ -4089,7 +4089,7 @@ private void initComponents() {
jPanel1.add(jPanel112);
- jPanel113.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 108"));
+ jPanel113.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 8"));
deviceField331.setIdentifier("");
deviceField331.setLabelString("Value: ");
@@ -4120,7 +4120,7 @@ private void initComponents() {
jPanel1.add(jPanel113);
- jPanel114.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 109"));
+ jPanel114.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 8"));
deviceField334.setIdentifier("");
deviceField334.setLabelString("Value: ");
@@ -4151,7 +4151,7 @@ private void initComponents() {
jPanel1.add(jPanel114);
- jPanel115.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 110"));
+ jPanel115.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 8"));
deviceField337.setIdentifier("");
deviceField337.setLabelString("Value: ");
@@ -4182,7 +4182,7 @@ private void initComponents() {
jPanel1.add(jPanel115);
- jPanel116.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 111"));
+ jPanel116.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 8"));
deviceField340.setIdentifier("");
deviceField340.setLabelString("Value: ");
@@ -4213,7 +4213,7 @@ private void initComponents() {
jPanel1.add(jPanel116);
- jPanel117.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 112"));
+ jPanel117.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 8"));
deviceField343.setIdentifier("");
deviceField343.setLabelString("Value: ");
@@ -4244,7 +4244,7 @@ private void initComponents() {
jPanel1.add(jPanel117);
- jPanel118.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 113"));
+ jPanel118.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 8"));
deviceField346.setIdentifier("");
deviceField346.setLabelString("Value: ");
@@ -4275,7 +4275,7 @@ private void initComponents() {
jPanel1.add(jPanel118);
- jPanel119.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 114"));
+ jPanel119.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 8"));
deviceField349.setIdentifier("");
deviceField349.setLabelString("Value: ");
@@ -4306,7 +4306,7 @@ private void initComponents() {
jPanel1.add(jPanel119);
- jPanel120.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 8115"));
+ jPanel120.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 8"));
deviceField352.setIdentifier("");
deviceField352.setLabelString("Value: ");
@@ -4337,7 +4337,7 @@ private void initComponents() {
jPanel1.add(jPanel120);
- jPanel121.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 116"));
+ jPanel121.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 8"));
deviceField355.setIdentifier("");
deviceField355.setLabelString("Value: ");
@@ -4368,7 +4368,7 @@ private void initComponents() {
jPanel1.add(jPanel121);
- jPanel122.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 117"));
+ jPanel122.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 8"));
deviceField358.setIdentifier("");
deviceField358.setLabelString("Value: ");
@@ -4399,7 +4399,7 @@ private void initComponents() {
jPanel1.add(jPanel122);
- jPanel123.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 118"));
+ jPanel123.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 8"));
deviceField361.setIdentifier("");
deviceField361.setLabelString("Value: ");
@@ -4430,7 +4430,7 @@ private void initComponents() {
jPanel1.add(jPanel123);
- jPanel124.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 119"));
+ jPanel124.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 8"));
deviceField364.setIdentifier("");
deviceField364.setLabelString("Value: ");
@@ -4461,7 +4461,7 @@ private void initComponents() {
jPanel1.add(jPanel124);
- jPanel125.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 120"));
+ jPanel125.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 8"));
deviceField367.setIdentifier("");
deviceField367.setLabelString("Value: ");
@@ -4492,7 +4492,7 @@ private void initComponents() {
jPanel1.add(jPanel125);
- jPanel126.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 121"));
+ jPanel126.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 8"));
deviceField370.setIdentifier("");
deviceField370.setLabelString("Value: ");
@@ -4523,7 +4523,7 @@ private void initComponents() {
jPanel1.add(jPanel126);
- jPanel127.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 122"));
+ jPanel127.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 8"));
deviceField373.setIdentifier("");
deviceField373.setLabelString("Value: ");
@@ -4554,7 +4554,7 @@ private void initComponents() {
jPanel1.add(jPanel127);
- jPanel128.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 123"));
+ jPanel128.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 8"));
deviceField376.setIdentifier("");
deviceField376.setLabelString("Value: ");
@@ -4585,7 +4585,7 @@ private void initComponents() {
jPanel1.add(jPanel128);
- jPanel129.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 124"));
+ jPanel129.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 8"));
deviceField379.setIdentifier("");
deviceField379.setLabelString("Value: ");
@@ -4616,7 +4616,7 @@ private void initComponents() {
jPanel1.add(jPanel129);
- jPanel130.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 125"));
+ jPanel130.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 8"));
deviceField382.setIdentifier("");
deviceField382.setLabelString("Value: ");
@@ -4647,7 +4647,7 @@ private void initComponents() {
jPanel1.add(jPanel130);
- jPanel131.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 126"));
+ jPanel131.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 8"));
deviceField385.setIdentifier("");
deviceField385.setLabelString("Value: ");
@@ -4678,7 +4678,7 @@ private void initComponents() {
jPanel1.add(jPanel131);
- jPanel132.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 127"));
+ jPanel132.setBorder(javax.swing.BorderFactory.createTitledBorder("Signal 8"));
deviceField388.setIdentifier("");
deviceField388.setLabelString("Value: ");
diff --git a/java/jdevices/src/main/resources/MARTE2_STREAMSetup.form b/java/jdevices/src/main/resources/MARTE2_STREAMSetup.form
index 7970cd6866..94218fd7f0 100644
--- a/java/jdevices/src/main/resources/MARTE2_STREAMSetup.form
+++ b/java/jdevices/src/main/resources/MARTE2_STREAMSetup.form
@@ -61,7 +61,7 @@
-
+
diff --git a/pydevices/RfxDevices/MARTE2_COMPONENT.py b/pydevices/RfxDevices/MARTE2_COMPONENT.py
index 29ceb55759..6bcde5397c 100644
--- a/pydevices/RfxDevices/MARTE2_COMPONENT.py
+++ b/pydevices/RfxDevices/MARTE2_COMPONENT.py
@@ -643,10 +643,10 @@ def isUsedOnAnotherThread(self, threadMap, outValueNode, isSynch):
devList = self.getDevList(threadMap)
for dev in devList:
if not self.onSameThread(threadMap, dev):
- # Check first timebase dependency
+ # Check first timebase dependency
try:
timebaseNode = TreeNode(
- dev, self.getTree).getNode(':TIMEBASE')
+ dev, self.getTree()).getNode(':TIMEBASE')
if timebaseNode.getData().getNid() == outValueNode.getNid():
return isSynch
except:
@@ -676,6 +676,7 @@ def isUsedOnAnotherThread(self, threadMap, outValueNode, isSynch):
'VALUE').getData().getNid()
except:
continue
+
if inputNid == outValueNode.getNid():
if self.sameSynchSource(dev):
@@ -787,6 +788,12 @@ def getMarteGamInfo(self, threadMap, gams, dataSources, gamList, typeDicts):
debugEnabled = configDict['debug']
outPeriod = 0 # If different from 0, this means that the corresponing component is driving the thread timing
+
+ try:
+ syncDiv = self.timebase_div.data()
+ except:
+ syncDiv = 1
+ resampledSyncSigs = [] #Input Signals for which PickSampleGAM is required
# timebase
if isinstance(timebase, Range):
period = timebase.getDescAt(2).data()
@@ -849,7 +856,7 @@ def getMarteGamInfo(self, threadMap, gams, dataSources, gamList, typeDicts):
dataSourceText = ' +'+gamName+'_Timer_Synch = {\n'
dataSourceText += ' Class = RealTimeThreadSynchronisation\n'
- dataSourceText += ' Timeout = 10000\n'
+ dataSourceText += ' Timeout = 1000000\n'
dataSourceText += ' }\n'
dataSources.append(dataSourceText)
@@ -906,7 +913,10 @@ def getMarteGamInfo(self, threadMap, gams, dataSources, gamList, typeDicts):
if self.onSameThread(threadMap, prevTimebase.getParent()):
timerDDB = origName+'_Output_DDB'
else:
- timerDDB = origName+'_Output_Synch'
+ timerDDB = gamName+'_Res_DDB'
+ resampledSyncSigs.append({'name': 'Time', 'datasource': origName+'_Output_Synch',
+ 'type': 'uint32', 'dimensions': 0, 'elements': 1, 'samples':syncDiv})
+# timerDDB = origName+'_Output_Synch'
try:
# Get period from driving synchronizing device
outPeriod = timebase.getDescAt(2).data()
@@ -937,7 +947,7 @@ def getMarteGamInfo(self, threadMap, gams, dataSources, gamList, typeDicts):
gamList.append(gamName+'_Input_Bus_IOGAM')
#Head and parameters
- gamList.append(gamName)
+ # gamList.append(gamName) Afret potential resampler
gamText = ' +'+gamName+' = {\n'
gamText += ' Class = '+gamClass+'\n'
gamText = self.reportParameters(paramDicts, gamText, 1)
@@ -1085,19 +1095,17 @@ def getMarteGamInfo(self, threadMap, gams, dataSources, gamList, typeDicts):
signalDict['datasource'] = sourceGamName + \
'_Output_DDB'
elif self.sameSynchSource(sourceNode):
- gamText += ' DataSource = '+sourceGamName+'_Output_Synch\n'
+ if syncDiv > 1:
+ gamText += ' DataSource = '+gamName+'_Res_DDB\n'
+ else:
+ gamText += ' DataSource = '+sourceGamName+'_Output_Synch\n'
signalDict['name'] = signalGamName
signalDict['datasource'] = sourceGamName + \
'_Output_Synch'
-
- try:
- syncDiv = self.timebase_div.data()
- gamText += ' Samples = ' + \
- str(syncDiv)+'\n'
- forceUsingSamples = True
- except:
- pass # Consider RealTimeSynchronization downsampling only if timebase_div is defined
-
+ if syncDiv > 1:
+ signalDict['datasource'] = sourceGamName+'_Output_Synch'
+ signalDict['samples'] = syncDiv
+ resampledSyncSigs.append(signalDict)
else:
gamText += ' DataSource = '+sourceGamName+'_Output_Asynch\n'
if 'name' in inputDict:
@@ -1132,7 +1140,46 @@ def getMarteGamInfo(self, threadMap, gams, dataSources, gamList, typeDicts):
inputSignals.append(signalDict)
if len(inputDicts) > 0:
gamText += ' }\n'
+
+
+#If some inputs derive from resampled synch sources, instantiate PickSampleGAM
+ if len(resampledSyncSigs) > 0:
+ gamList.append(gamName+'Resampler')
+ pickGamText = ' +'+gamName+'Resampler = {\n'
+ pickGamText += ' Class = PickSampleGAM\n'
+ pickGamText += ' InputSignals = {\n'
+ for sigDict in resampledSyncSigs:
+ pickGamText += ' '+sigDict['name']+' = {\n'
+ pickGamText += ' DataSource = '+sigDict['datasource']+'\n'
+ if 'alias' in sigDict:
+ pickGamText += ' Alias = '+sigDict['alias']+'\n'
+ pickGamText += ' Samples = '+str(sigDict['samples'])+'\n'
+ pickGamText += ' Type = '+sigDict['type']+'\n'
+ pickGamText += ' NumberOfDimensions = '+str(sigDict['dimensions'])+'\n'
+ pickGamText += ' NumberOfElements = '+str(sigDict['elements'])+'\n'
+ pickGamText += ' }\n'
+ pickGamText += ' }\n'
+ pickGamText += ' OutputSignals = {\n'
+ for sigDict in resampledSyncSigs:
+ if 'alias' in sigDict:
+ pickGamText += ' '+sigDict['alias']+' = {\n'
+ else:
+ pickGamText += ' '+sigDict['name']+' = {\n'
+ pickGamText += ' DataSource = '+gamName+'_Res_DDB\n'
+ pickGamText += ' Samples = 1\n'
+ pickGamText += ' Type = '+sigDict['type']+'\n'
+ pickGamText += ' NumberOfDimensions = '+str(sigDict['dimensions'])+'\n'
+ pickGamText += ' NumberOfElements = '+str(sigDict['elements'])+'\n'
+ pickGamText += ' }\n'
+ pickGamText += ' }\n'
+ pickGamText += ' }\n'
+ gams.append(pickGamText)
+ dataSourceText = ' +'+gamName+'_Res_DDB = {\n'
+ dataSourceText += ' Class = GAMDataSource\n'
+ dataSourceText += ' }\n'
+ dataSources.append(dataSourceText)
+ gamList.append(gamName)
######################################################### Output Signals
outputSignals = [] # For debug printout
@@ -1168,9 +1215,9 @@ def getMarteGamInfo(self, threadMap, gams, dataSources, gamList, typeDicts):
outputDict['value_nid'].getParent().getNode('parameters'), gamText)
gamText += ' }\n'
if self.isUsedOnAnotherThread(threadMap, outputDict['value_nid'], True):
- synchThreadSignals.append(outputDict['name'])
+ synchThreadSignals.append(outputDict)
if self.isUsedOnAnotherThread(threadMap, outputDict['value_nid'], False):
- asynchThreadSignals.append(outputDict['name'])
+ asynchThreadSignals.append(outputDict)
outputSignals.append(outputSignalDict)
# --------------------------------------------If this is a structured output
if len(outputDict['fields']) > 0:
@@ -1794,10 +1841,11 @@ def getMarteGamInfo(self, threadMap, gams, dataSources, gamList, typeDicts):
dataSourceText += ' }\n'
dataSources.append(dataSourceText)
- # Some outputs are connected to devices on separate synchronized theads
+ # Some outputs are connected to devices on separate synchronized threads
if len(synchThreadSignals) > 0:
dataSourceText = ' +'+gamName+'_Output_Synch = {\n'
dataSourceText += ' Class = RealTimeThreadSynchronisation\n'
+ dataSourceText += ' Timeout = 1000000\n'
dataSourceText += ' }\n'
dataSources.append(dataSourceText)
@@ -1805,16 +1853,46 @@ def getMarteGamInfo(self, threadMap, gams, dataSources, gamList, typeDicts):
gamText = ' +'+gamName+'_Output_Synch_IOGAM = {\n'
gamText += ' Class = IOGAM\n'
gamText += ' InputSignals = {\n'
- for signal in synchThreadSignals:
- gamText += ' '+signal+' = {\n'
+ for signalDict in synchThreadSignals:
+ gamText += ' '+signalDict['name']+' = {\n'
gamText += ' DataSource = '+gamName+'_Output_DDB\n'
+ gamText += ' Type = '+signalDict['type']+'\n'
+ if 'dimensions' in signalDict:
+ dimensions = signalDict['dimensions']
+ if dimensions == 0:
+ numberOfElements = 1
+ numberOfDimensions = 0
+ else:
+ numberOfDimensions = len(signalDict['dimensions'])
+ numberOfElements = 1
+ for currDim in signalDict['dimensions']:
+ numberOfElements *= currDim
+ gamText += ' NumberOfDimensions = ' + \
+ str(numberOfDimensions)+'\n'
+ gamText += ' NumberOfElements = ' + \
+ str(numberOfElements)+'\n'
gamText += ' }\n'
gamText += ' }\n'
gamText += ' OutputSignals = {\n'
- for signal in synchThreadSignals:
- gamText += ' '+signal+' = {\n'
+ for signalDict in synchThreadSignals:
+ gamText += ' '+signalDict['name']+' = {\n'
gamText += ' DataSource = '+gamName+'_Output_Synch\n'
- gamText += ' Type = '+outputDict['type']+'\n'
+ #Check if it is the reference to a resampled timebase
+ gamText += ' Type = '+signalDict['type']+'\n'
+ if 'dimensions' in signalDict:
+ dimensions = signalDict['dimensions']
+ if dimensions == 0:
+ numberOfElements = 1
+ numberOfDimensions = 0
+ else:
+ numberOfDimensions = len(signalDict['dimensions'])
+ numberOfElements = 1
+ for currDim in signalDict['dimensions']:
+ numberOfElements *= currDim
+ gamText += ' NumberOfDimensions = ' + \
+ str(numberOfDimensions)+'\n'
+ gamText += ' NumberOfElements = ' + \
+ str(numberOfElements)+'\n'
gamText += ' }\n'
gamText += ' }\n'
gamText += ' }\n'
@@ -1831,16 +1909,24 @@ def getMarteGamInfo(self, threadMap, gams, dataSources, gamList, typeDicts):
gamText = ' +'+gamName+'_Output_Asynch_IOGAM = {\n'
gamText += ' Class = IOGAM\n'
gamText += ' InputSignals = {\n'
- for signal in asynchThreadSignals:
- gamText += ' '+signal+' = {\n'
+ for signalDict in asynchThreadSignals:
+ gamText += ' '+signalDict['name']+' = {\n'
gamText += ' DataSource = '+gamName+'_Output_DDB\n'
+ gamText += ' NumberOfDimensions = ' + \
+ str(signalDict['dimensions'])+'\n'
+ gamText += ' NumberOfElements = ' + \
+ str(signalDict['elements'])+'\n'
gamText += ' }\n'
gamText += ' }\n'
gamText += ' OutputSignals = {\n'
- for signal in asynchThreadSignals:
- gamText += ' '+signal+' = {\n'
+ for signalDict in asynchThreadSignals:
+ gamText += ' '+signalDict['name']+' = {\n'
gamText += ' DataSource = '+gamName+'_Output_Asynch\n'
- gamText += ' Type = '+outputDict['type']+'\n'
+ gamText += ' Type = '+signalDict['type']+'\n'
+ gamText += ' NumberOfDimensions = ' + \
+ str(signalDict['dimensions'])+'\n'
+ gamText += ' NumberOfElements = ' + \
+ str(signalDict['elements'])+'\n'
gamText += ' }\n'
gamText += ' }\n'
@@ -1918,6 +2004,8 @@ def getMarteInputInfo(self, threadMap, gams, dataSources, gamList, isSynch):
outputDicts = configDict['outputDicts']
outputTrigger = configDict['outputTrigger']
outPeriod = 0 # If different from 0, this means that the corresponing component is driving the thread timing
+ synchThreadSignals = []
+ asynchThreadSignals = []
startTime = 0
if not isSynch:
@@ -1981,10 +2069,9 @@ def getMarteInputInfo(self, threadMap, gams, dataSources, gamList, isSynch):
# Check if time information is required by another synchronized thread
if self.isUsedOnAnotherThread(threadMap, self.timebase, True):
-
dataSourceText = ' +'+dataSourceName+'_Timer_Synch = {\n'
dataSourceText += ' Class = RealTimeThreadSynchronisation\n'
- dataSourceText += ' Timeout = 10000\n'
+ dataSourceText += ' Timeout = 1000000\n'
dataSourceText += ' }\n'
dataSources.append(dataSourceText)
@@ -2078,7 +2165,14 @@ def getMarteInputInfo(self, threadMap, gams, dataSources, gamList, isSynch):
currTimebase = currTimebase.data()
outPeriod = currTimebase[1] - currTimebase[0]
startTime = currTimebase[0]
-# endif isSynch
+
+
+
+ # Check if time information is required by another synchronized thread Gabriele Jan 2022
+ # for sync input devices, the check has to be performed on output Time
+ if self.isUsedOnAnotherThread(threadMap, self.timebase, True):
+ synchThreadSignals.append({'name':'Time', 'type':'uint32', 'dimensions':0, 'elements': 1})
+ # endif isSynch
#Head and parameters
dataSourceText = ' +'+dataSourceName+' = {\n'
@@ -2093,6 +2187,8 @@ def getMarteInputInfo(self, threadMap, gams, dataSources, gamList, isSynch):
# Output Signals
dataSourceText += ' Signals = {\n'
for outputDict in outputDicts:
+ print('CICCIO')
+ print(outputDict)
dataSourceText += ' '+outputDict['name']+' = {\n'
dataSourceText += ' Type = '+outputDict['type']+'\n'
if outputDict['dimensions'] == 0:
@@ -2229,8 +2325,6 @@ def getMarteInputInfo(self, threadMap, gams, dataSources, gamList, isSynch):
gamText += ' }\n'
gamText += ' OutputSignals = {\n'
- synchThreadSignals = []
- asynchThreadSignals = []
for outputDict in outputDicts:
gamText += ' '+outputDict['name'] + ' = {\n'
gamText += ' DataSource = '+dataSourceName+'_Output_DDB\n'
@@ -2253,9 +2347,9 @@ def getMarteInputInfo(self, threadMap, gams, dataSources, gamList, isSynch):
str(numberOfElements * samples)+'\n'
gamText += ' }\n'
if self.isUsedOnAnotherThread(threadMap, outputDict['value_nid'], True):
- synchThreadSignals.append(outputDict['name'])
+ synchThreadSignals.append(outputDict)
if self.isUsedOnAnotherThread(threadMap, outputDict['value_nid'], False):
- asynchThreadSignals.append(outputDict['name'])
+ asynchThreadSignals.append(outptDict)
gamText += ' }\n'
gamText += ' }\n'
gams.append(gamText)
@@ -2420,6 +2514,7 @@ def getMarteInputInfo(self, threadMap, gams, dataSources, gamList, isSynch):
if len(synchThreadSignals) > 0:
dataSourceText = ' +'+dataSourceName+'_Output_Synch = {\n'
dataSourceText += ' Class = RealTimeThreadSynchronisation\n'
+ dataSourceText += ' Timeout = 1000000\n'
dataSourceText += ' }\n'
dataSources.append(dataSourceText)
@@ -2429,16 +2524,46 @@ def getMarteInputInfo(self, threadMap, gams, dataSources, gamList, isSynch):
gamText += ' Class = IOGAM\n'
gamText += ' InputSignals = {\n'
- for signal in synchThreadSignals:
- gamText += ' '+signal+' = {\n'
+ for signalDict in synchThreadSignals:
+ gamText += ' '+signalDict['name']+' = {\n'
gamText += ' DataSource = '+dataSourceName+'_Output_DDB\n'
+ gamText += ' Type = '+signalDict['type']+'\n'
+ if 'dimensions' in signalDict:
+ dimensions = signalDict['dimensions']
+ if dimensions == 0:
+ numberOfElements = 1
+ numberOfDimensions = 0
+ else:
+ numberOfDimensions = len(signalDict['dimensions'])
+ numberOfElements = 1
+ for currDim in signalDict['dimensions']:
+ numberOfElements *= currDim
+ gamText += ' NumberOfDimensions = ' + \
+ str(numberOfDimensions)+'\n'
+ gamText += ' NumberOfElements = ' + \
+ str(numberOfElements)+'\n'
gamText += ' }\n'
gamText += ' }\n'
gamText += ' OutputSignals = {\n'
- for signal in synchThreadSignals:
- gamText += ' '+signal+' = {\n'
+ for signalDict in synchThreadSignals:
+ gamText += ' '+signalDict['name']+' = {\n'
gamText += ' DataSource = '+dataSourceName+'_Output_Synch\n'
- gamText += ' Type = '+outputDict['type']+'\n'
+ #Check if it is the reference to a resampled timebase
+ gamText += ' Type = '+signalDict['type']+'\n'
+ if 'dimensions' in signalDict:
+ dimensions = signalDict['dimensions']
+ if dimensions == 0:
+ numberOfElements = 1
+ numberOfDimensions = 0
+ else:
+ numberOfDimensions = len(signalDict['dimensions'])
+ numberOfElements = 1
+ for currDim in signalDict['dimensions']:
+ numberOfElements *= currDim
+ gamText += ' NumberOfDimensions = ' + \
+ str(numberOfDimensions)+'\n'
+ gamText += ' NumberOfElements = ' + \
+ str(numberOfElements)+'\n'
gamText += ' }\n'
gamText += ' }\n'
gamText += ' }\n'
@@ -2448,6 +2573,7 @@ def getMarteInputInfo(self, threadMap, gams, dataSources, gamList, isSynch):
if len(asynchThreadSignals) > 0:
dataSourceText = ' +'+dataSourceName+'_Output_Asynch = {\n'
dataSourceText += ' Class = RealTimeThreadAsyncBridge\n'
+ dataSourceText += ' Timeout = 1000000\n'
dataSourceText += ' }\n'
dataSources.append(dataSourceText)
@@ -2455,15 +2581,23 @@ def getMarteInputInfo(self, threadMap, gams, dataSources, gamList, isSynch):
gamText = ' +'+dataSourceName+'_Output_Asynch_IOGAM = {\n'
gamText += ' Class = IOGAM\n'
gamText += ' InputSignals = {\n'
- for signal in asynchThreadSignals:
- gamText += ' '+signal+' = {\n'
+ for signalDict in asynchThreadSignals:
+ gamText += ' '+signalDict['name']+' = {\n'
gamText += ' DataSource = '+dataSourceName+'_Output_DDB\n'
+ gamText += ' NumberOfDimensions = ' + \
+ str(signalDict['dimensions'])+'\n'
+ gamText += ' NumberOfElements = ' + \
+ str(signalDict['elements'])+'\n'
gamText += ' }\n'
gamText += ' }\n'
gamText += ' OutputSignals = {\n'
- for signal in asynchThreadSignals:
- gamText += ' '+signal+' = {\n'
+ for signalDict in asynchThreadSignals:
+ gamText += ' '+signalDict['name']+' = {\n'
gamText += ' DataSource = '+dataSourceName+'_Output_Asynch\n'
+ gamText += ' NumberOfDimensions = ' + \
+ str(signalDict['dimensions'])+'\n'
+ gamText += ' NumberOfElements = ' + \
+ str(signalDict['elements'])+'\n'
gamText += ' }\n'
gamText += ' }\n'
gamText += ' }\n'
@@ -2557,6 +2691,7 @@ def getMarteOutputInfo(self, threadMap, gams, dataSources, gamList):
if self.onSameThread(threadMap, prevTimebase.getParent()):
timerDDB = origName+'_Output_DDB'
else:
+ # timerDDB = origName+'_Output_Synch' Gabriele Jan 2022
timerDDB = origName+'_Output_Synch'
try:
# Get period from driving synchronizing device
@@ -2580,7 +2715,9 @@ def getMarteOutputInfo(self, threadMap, gams, dataSources, gamList):
#Head and parameters
gamList.append(dataSourceName+'_IOGAM')
gamText = ' +'+dataSourceName+'_IOGAM = {\n'
- gamText += ' Class = IOGAM\n'
+# gamText += ' Class = IOGAM\n'
+#NOTE: default behavior for Output is different from that of GAM. Here a single sample is picked when subsampling is defined (syncDiv > 1)
+ gamText += ' Class = PickSampleGAM\n'
# input Signals
gamText += ' InputSignals = {\n'
@@ -2594,7 +2731,16 @@ def getMarteOutputInfo(self, threadMap, gams, dataSources, gamList):
signalNames.append('Time')
gamText += ' Time = {\n'
gamText += ' DataSource = ' + timerDDB+'\n'
- signalSamples.append(1)
+ try:
+ syncDiv = self.timebase_div.data()
+ gamText += ' Samples = ' + \
+ str(syncDiv)+'\n'
+ signalSamples.append(syncDiv)
+ forceUsingSamples = True
+ except:
+ signalSamples.append(1)
+ pass # Consider ealTimeSynchronization downsampling only if timebase_div is defined
+ # signalSamples.append(1) Gabriele Jan 2022
else: # Normal reference
isTreeRef = False
isInputStructField = (
@@ -2686,8 +2832,7 @@ def getMarteOutputInfo(self, threadMap, gams, dataSources, gamList):
idx = 0
for outputDict in inputDicts:
gamText += ' '+signalNames[idx]+' = {\n'
- if signalSamples[idx] > 1:
- gamText += ' Samples = '+str(signalSamples[idx])+'\n'
+ gamText += ' Samples = 1\n'
idx = idx+1
gamText += ' DataSource = '+dataSourceName+'\n'
@@ -2957,12 +3102,8 @@ def checkGeneric(self, threadMap):
syncDiv = 1
inDimensions = inputDict['value'].getParent().getNode(
':DIMENSIONS').getData()
- if syncDiv > 1:
- if inDimensions != 0:
- return 'Dimension mismatch for input '+str(inputIdx)+' getting timebase from another thread'
- else:
- if inDimensions != inputDict['dimensions']:
- return 'Dimension mismatch for input '+str(inputIdx)+': expected '+str(inputDict['dimensions'])+' found '+str(inDimensions)
+ if inDimensions != inputDict['dimensions']:
+ return 'Dimension mismatch for input '+str(inputIdx)+': expected '+str(inputDict['dimensions'])+' found '+str(inDimensions)
return ''
diff --git a/pydevices/RfxDevices/MARTE2_SUPERVISOR.py b/pydevices/RfxDevices/MARTE2_SUPERVISOR.py
index 7d3c27ca36..f4225950b6 100644
--- a/pydevices/RfxDevices/MARTE2_SUPERVISOR.py
+++ b/pydevices/RfxDevices/MARTE2_SUPERVISOR.py
@@ -167,7 +167,8 @@ def getInfo(self):
# except:
# return 'Cannot get timebase for ' + gam, {},{}
gamNids.append(currGamNode.getNid())
- if currPeriod > 0 and threadPeriod > 0:
+ # if currPeriod > 0 and threadPeriod > 0:
+ if currPeriod > 0 and threadPeriod > 0 and currPeriod != threadPeriod:
raise Exception('More than one component driving thread timing for state: '+str(
state+1)+', thread: '+str(thread+1))
else: