Merge pull request #145 from pixxelhq/master

v5.10.4-Pixxel-3.2.0
pixxelhq · Oct 17, 2024 · 1316234 · 1316234
2 parents d0325d7 + 05288f2
commit 1316234
Showing 27 changed files with 92 additions and 32 deletions.
diff --git a/distribution/pom.xml b/distribution/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.yamcs</groupId>
     <artifactId>yamcs</artifactId>
-    <version>5.10.4-Pixxel-3.1.1</version>
+    <version>5.10.4-Pixxel-3.2.0</version>
   </parent>
 
   <artifactId>distribution</artifactId>

diff --git a/examples/cascading/pom.xml b/examples/cascading/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.yamcs.examples</groupId>
     <artifactId>examples</artifactId>
-    <version>5.10.4-Pixxel-3.1.1</version>
+    <version>5.10.4-Pixxel-3.2.0</version>
   </parent>
 
   <artifactId>cascading</artifactId>

diff --git a/examples/ccsds-frames/pom.xml b/examples/ccsds-frames/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.yamcs.examples</groupId>
     <artifactId>examples</artifactId>
-    <version>5.10.4-Pixxel-3.1.1</version>
+    <version>5.10.4-Pixxel-3.2.0</version>
   </parent>
 
   <artifactId>ccsds-frames</artifactId>

diff --git a/examples/cfdp-udp/pom.xml b/examples/cfdp-udp/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.yamcs.examples</groupId>
     <artifactId>examples</artifactId>
-    <version>5.10.4-Pixxel-3.1.1</version>
+    <version>5.10.4-Pixxel-3.2.0</version>
   </parent>
 
   <artifactId>cfdp-udp</artifactId>

diff --git a/examples/cfdp/pom.xml b/examples/cfdp/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.yamcs.examples</groupId>
     <artifactId>examples</artifactId>
-    <version>5.10.4-Pixxel-3.1.1</version>
+    <version>5.10.4-Pixxel-3.2.0</version>
   </parent>
 
   <artifactId>cfdp</artifactId>

diff --git a/examples/perftest1/pom.xml b/examples/perftest1/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.yamcs.examples</groupId>
     <artifactId>examples</artifactId>
-    <version>5.10.4-Pixxel-3.1.1</version>
+    <version>5.10.4-Pixxel-3.2.0</version>
   </parent>
 
   <artifactId>perftest1</artifactId>

diff --git a/examples/perftest2/pom.xml b/examples/perftest2/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.yamcs.examples</groupId>
     <artifactId>examples</artifactId>
-    <version>5.10.4-Pixxel-3.1.1</version>
+    <version>5.10.4-Pixxel-3.2.0</version>
   </parent>
 
   <artifactId>perftest2</artifactId>

diff --git a/examples/pom.xml b/examples/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.yamcs</groupId>
     <artifactId>yamcs</artifactId>
-    <version>5.10.4-Pixxel-3.1.1</version>
+    <version>5.10.4-Pixxel-3.2.0</version>
   </parent>
 
   <groupId>org.yamcs.examples</groupId>

diff --git a/examples/pus/pom.xml b/examples/pus/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.yamcs.examples</groupId>
     <artifactId>examples</artifactId>
-    <version>5.10.4-Pixxel-3.1.1</version>
+    <version>5.10.4-Pixxel-3.2.0</version>
   </parent>
 
   <artifactId>pus</artifactId>

diff --git a/examples/replication1/pom.xml b/examples/replication1/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.yamcs.examples</groupId>
     <artifactId>examples</artifactId>
-    <version>5.10.4-Pixxel-3.1.1</version>
+    <version>5.10.4-Pixxel-3.2.0</version>
   </parent>
 
   <artifactId>replication1</artifactId>

diff --git a/examples/replication2/pom.xml b/examples/replication2/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.yamcs.examples</groupId>
     <artifactId>examples</artifactId>
-    <version>5.10.4-Pixxel-3.1.1</version>
+    <version>5.10.4-Pixxel-3.2.0</version>
   </parent>
 
   <artifactId>replication2</artifactId>

diff --git a/examples/replication3/pom.xml b/examples/replication3/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.yamcs.examples</groupId>
     <artifactId>examples</artifactId>
-    <version>5.10.4-Pixxel-3.1.1</version>
+    <version>5.10.4-Pixxel-3.2.0</version>
   </parent>
 
   <artifactId>replication3</artifactId>

diff --git a/examples/simulation/pom.xml b/examples/simulation/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.yamcs.examples</groupId>
     <artifactId>examples</artifactId>
-    <version>5.10.4-Pixxel-3.1.1</version>
+    <version>5.10.4-Pixxel-3.2.0</version>
   </parent>
 
   <artifactId>simulation</artifactId>

diff --git a/examples/snippets/pom.xml b/examples/snippets/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.yamcs.examples</groupId>
     <artifactId>examples</artifactId>
-    <version>5.10.4-Pixxel-3.1.1</version>
+    <version>5.10.4-Pixxel-3.2.0</version>
   </parent>
 
   <artifactId>snippets</artifactId>

diff --git a/examples/templates/pom.xml b/examples/templates/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.yamcs.examples</groupId>
     <artifactId>examples</artifactId>
-    <version>5.10.4-Pixxel-3.1.1</version>
+    <version>5.10.4-Pixxel-3.2.0</version>
   </parent>
 
   <artifactId>templates</artifactId>

diff --git a/packet-viewer/pom.xml b/packet-viewer/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.yamcs</groupId>
     <artifactId>yamcs</artifactId>
-    <version>5.10.4-Pixxel-3.1.1</version>
+    <version>5.10.4-Pixxel-3.2.0</version>
   </parent>
 
   <artifactId>packet-viewer</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.yamcs</groupId>
 	<artifactId>yamcs</artifactId>
-	<version>5.10.4-Pixxel-3.1.1</version>
+	<version>5.10.4-Pixxel-3.2.0</version>
 	<packaging>pom</packaging>
 
 	<name>Yamcs</name>

diff --git a/simulator/pom.xml b/simulator/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.yamcs</groupId>
     <artifactId>yamcs</artifactId>
-    <version>5.10.4-Pixxel-3.1.1</version>
+    <version>5.10.4-Pixxel-3.2.0</version>
   </parent>
 
   <artifactId>simulator</artifactId>

diff --git a/tests/pom.xml b/tests/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.yamcs</groupId>
 		<artifactId>yamcs</artifactId>
-		<version>5.10.4-Pixxel-3.1.1</version>
+		<version>5.10.4-Pixxel-3.2.0</version>
 	</parent>
 
 	<artifactId>tests</artifactId>

diff --git a/yamcs-api/pom.xml b/yamcs-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.yamcs</groupId>
     <artifactId>yamcs</artifactId>
-    <version>5.10.4-Pixxel-3.1.1</version>
+    <version>5.10.4-Pixxel-3.2.0</version>
   </parent>
 
   <artifactId>yamcs-api</artifactId>

diff --git a/yamcs-client/pom.xml b/yamcs-client/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.yamcs</groupId>
     <artifactId>yamcs</artifactId>
-    <version>5.10.4-Pixxel-3.1.1</version>
+    <version>5.10.4-Pixxel-3.2.0</version>
   </parent>
 
   <artifactId>yamcs-client</artifactId>

diff --git a/yamcs-core/pom.xml b/yamcs-core/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.yamcs</groupId>
     <artifactId>yamcs</artifactId>
-    <version>5.10.4-Pixxel-3.1.1</version>
+    <version>5.10.4-Pixxel-3.2.0</version>
   </parent>
 
   <artifactId>yamcs-core</artifactId>

diff --git a/yamcs-core/src/main/java/org/yamcs/tctm/ccsds/AbstractTmFrameLink.java b/yamcs-core/src/main/java/org/yamcs/tctm/ccsds/AbstractTmFrameLink.java
@@ -8,7 +8,7 @@
 import java.util.concurrent.atomic.AtomicLong;
 
 import org.yamcs.ConfigurationException;
-import org.yamcs.tctm.pus.tuples.Quattro;
+import org.yamcs.tctm.pus.tuples.Penta;
 import org.yamcs.Spec;
 import org.yamcs.Spec.OptionType;
 import org.yamcs.StandardTupleDefinitions;
@@ -40,7 +40,7 @@ public abstract class AbstractTmFrameLink extends AbstractLink implements Aggreg
     protected RawFrameEnDec rawFrameDecoder;
 
     // Redirection
-    Map<byte[], Quattro<Integer, Integer, Stream, String>> redirection;  // offset, size, stream
+    Map<byte[], Penta<Integer, Integer, Stream, String, String>> redirection;  // offset, size, stream
     protected Map<String, AtomicLong> redirectionCounters = new HashMap<>();
 
     // srs3
@@ -133,9 +133,10 @@ public void init(String instance, String name, YConfiguration config) throws Con
                 int size = yc.getInt("size");
                 Stream stream = ydb.getStream(yc.getString("stream"));
                 String rName = yc.getString("name");
+                String rLink = yc.getString("link", null);
 
                 redirectionCounters.put(rName, new AtomicLong(0));
-                redirection.put(header, new Quattro<>(offset, size, stream, rName));
+                redirection.put(header, new Penta<>(offset, size, stream, rName, rLink));
             }
         }
 
@@ -201,19 +202,23 @@ protected void handleFrame(Instant ert, byte[] data, int offset, int length) {
             }
 
             if (redirection != null) {
-                for(Map.Entry<byte[], Quattro<Integer, Integer, Stream, String>> mc: redirection.entrySet()) {
-                    Quattro<Integer, Integer, Stream, String> value = mc.getValue();
+                for(Map.Entry<byte[], Penta<Integer, Integer, Stream, String, String>> mc: redirection.entrySet()) {
+                    Penta<Integer, Integer, Stream, String, String> value = mc.getValue();
 
                     int roffset = value.getFirst();
                     int rsize = value.getSecond();
                     Stream rstream = value.getThird();
                     String rName = value.getFourth();
+                    String rLink = value.getFifth();
+
+                    // Set linkName via the config if present
+                    String ll = rLink != null? rLink: linkName;
 
                     byte[] contention = Arrays.copyOfRange(data, offset + roffset, offset + roffset + rsize);
                     if (Arrays.equals(mc.getKey(), contention)) {
                         data = Arrays.copyOfRange(data, offset + stripHeader, offset + length);
-                        Tuple t = new Tuple(StandardTupleDefinitions.TM, new Object[] { null, null, timeService.getMissionTime(), null,
-                                                data, timeService.getHresMissionTime(), null, linkName, null});
+                        Tuple t = new Tuple(StandardTupleDefinitions.TM, new Object[] {timeService.getMissionTime(), 0, timeService.getMissionTime(), 0,
+                                                data, timeService.getHresMissionTime(), null, ll, null});
                         rstream.emitTuple(t);
 
                         // Update redirection counter

diff --git a/yamcs-core/src/main/java/org/yamcs/tctm/pus/tuples/Penta.java b/yamcs-core/src/main/java/org/yamcs/tctm/pus/tuples/Penta.java
@@ -0,0 +1,55 @@
+package org.yamcs.tctm.pus.tuples;
+
+import java.util.Objects;
+
+public class Penta<K, V, L, M, N> {
+    private final K first;
+    private final V second;
+    private final L third;
+    private final M fourth;
+    private final N fifth;
+
+    public Penta(K first, V second, L third, M fourth, N fifth) {
+        this.first = first;
+        this.second = second;
+        this.third = third;
+        this.fourth = fourth;
+        this.fifth = fifth;
+    }
+
+    public K getFirst() {
+        return first;
+    }
+
+    public V getSecond() {
+        return second;
+    }
+
+    public L getThird() {
+        return third;
+    }
+
+    public M getFourth() {
+        return fourth;
+    }
+
+    public N getFifth() {
+        return fifth;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o)
+            return true;
+        if (o == null || getClass() != o.getClass())
+            return false;
+        Penta<?, ?, ?, ?, ?> penta = (Penta<?, ?, ?, ?, ?>) o;
+
+        return Objects.equals(first, penta.first) && Objects.equals(second, penta.second) && Objects.equals(third, penta.third) && Objects.equals(fourth, penta.fourth) && Objects.equals(fifth, penta.fifth);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(first, second, third, fourth, fifth);
+    }
+}
diff --git a/yamcs-tse/pom.xml b/yamcs-tse/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.yamcs</groupId>
     <artifactId>yamcs</artifactId>
-    <version>5.10.4-Pixxel-3.1.1</version>
+    <version>5.10.4-Pixxel-3.2.0</version>
   </parent>
 
   <artifactId>yamcs-tse</artifactId>

diff --git a/yamcs-web/pom.xml b/yamcs-web/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.yamcs</groupId>
     <artifactId>yamcs</artifactId>
-    <version>5.10.4-Pixxel-3.1.1</version>
+    <version>5.10.4-Pixxel-3.2.0</version>
   </parent>
 
   <artifactId>yamcs-web</artifactId>

diff --git a/yamcs-xtce/pom.xml b/yamcs-xtce/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.yamcs</groupId>
     <artifactId>yamcs</artifactId>
-    <version>5.10.4-Pixxel-3.1.1</version>
+    <version>5.10.4-Pixxel-3.2.0</version>
   </parent>
 
   <artifactId>yamcs-xtce</artifactId>