Merge pull request #80 from pixxelhq/master

v5.8.9-Pixxel.SNAPSHOT-2.6.0
pixxelhq · May 10, 2024 · 3ce236c · 3ce236c
2 parents c5e7f52 + 2470b75
commit 3ce236c
Show file tree

Hide file tree

Showing 30 changed files with 38 additions and 38 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.8.9-Pixxel.SNAPSHOT-2.5.3</version>
+    <version>5.8.9-Pixxel.SNAPSHOT-2.6.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.8.9-Pixxel.SNAPSHOT-2.5.3</version>
+    <version>5.8.9-Pixxel.SNAPSHOT-2.6.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.8.9-Pixxel.SNAPSHOT-2.5.3</version>
+    <version>5.8.9-Pixxel.SNAPSHOT-2.6.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.8.9-Pixxel.SNAPSHOT-2.5.3</version>
+    <version>5.8.9-Pixxel.SNAPSHOT-2.6.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.8.9-Pixxel.SNAPSHOT-2.5.3</version>
+    <version>5.8.9-Pixxel.SNAPSHOT-2.6.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.8.9-Pixxel.SNAPSHOT-2.5.3</version>
+    <version>5.8.9-Pixxel.SNAPSHOT-2.6.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.8.9-Pixxel.SNAPSHOT-2.5.3</version>
+    <version>5.8.9-Pixxel.SNAPSHOT-2.6.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.8.9-Pixxel.SNAPSHOT-2.5.3</version>
+    <version>5.8.9-Pixxel.SNAPSHOT-2.6.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.8.9-Pixxel.SNAPSHOT-2.5.3</version>
+    <version>5.8.9-Pixxel.SNAPSHOT-2.6.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.8.9-Pixxel.SNAPSHOT-2.5.3</version>
+    <version>5.8.9-Pixxel.SNAPSHOT-2.6.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.8.9-Pixxel.SNAPSHOT-2.5.3</version>
+    <version>5.8.9-Pixxel.SNAPSHOT-2.6.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.8.9-Pixxel.SNAPSHOT-2.5.3</version>
+    <version>5.8.9-Pixxel.SNAPSHOT-2.6.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.8.9-Pixxel.SNAPSHOT-2.5.3</version>
+    <version>5.8.9-Pixxel.SNAPSHOT-2.6.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.8.9-Pixxel.SNAPSHOT-2.5.3</version>
+    <version>5.8.9-Pixxel.SNAPSHOT-2.6.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.8.9-Pixxel.SNAPSHOT-2.5.3</version>
+    <version>5.8.9-Pixxel.SNAPSHOT-2.6.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.8.9-Pixxel.SNAPSHOT-2.5.3</version>
+    <version>5.8.9-Pixxel.SNAPSHOT-2.6.0</version>
   </parent>
 
   <artifactId>packet-viewer</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
 	<groupId>org.yamcs</groupId>
 	<artifactId>yamcs</artifactId>
-	<version>5.8.9-Pixxel.SNAPSHOT-2.5.3</version>
+	<version>5.8.9-Pixxel.SNAPSHOT-2.6.0</version>
 
 	<packaging>pom</packaging>
 

diff --git a/simulator/pom.xml b/simulator/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.yamcs</groupId>
     <artifactId>yamcs</artifactId>
-    <version>5.8.9-Pixxel.SNAPSHOT-2.5.3</version>
+    <version>5.8.9-Pixxel.SNAPSHOT-2.6.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.8.9-Pixxel.SNAPSHOT-2.5.3</version>
+		<version>5.8.9-Pixxel.SNAPSHOT-2.6.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.8.9-Pixxel.SNAPSHOT-2.5.3</version>
+    <version>5.8.9-Pixxel.SNAPSHOT-2.6.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.8.9-Pixxel.SNAPSHOT-2.5.3</version>
+    <version>5.8.9-Pixxel.SNAPSHOT-2.6.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.8.9-Pixxel.SNAPSHOT-2.5.3</version>
+    <version>5.8.9-Pixxel.SNAPSHOT-2.6.0</version>
   </parent>
 
   <artifactId>yamcs-core</artifactId>

diff --git a/yamcs-core/src/main/java/org/yamcs/tctm/pus/services/tc/six/ServiceSix.java b/yamcs-core/src/main/java/org/yamcs/tctm/pus/services/tc/six/ServiceSix.java
@@ -60,16 +60,23 @@ public ServiceSix(String yamcsInstance, YConfiguration config) {
 
                     List<Pair<Integer, Integer>> offsets = new ArrayList<>();
                     for (YConfiguration offsetConfig: baseConfig.getConfigList("offsets")) {
-                        offsets.add(new Pair<>(
+                        if (offsetConfig.isList("value")) {
+                            List<Integer> values = offsetConfig.getList("value");
+                            for (int v: values)
+                                offsets.add(new Pair<>(
+                                    v, offsetConfig.getInt("length")
+                                ));
+                        } else
+                            offsets.add(new Pair<>(
                                 offsetConfig.getInt("value"), offsetConfig.getInt("length")
-                        ));
+                            ));
                     }
                     baseIds.put(baseIdValue, offsets);
-                 }
+                }
 
-                 memoryIds.put(new Pair<>(
-                         memoryIdMap.getInt("apid"), memoryIdMap.getInt("value")
-                 ), baseIds);
+                memoryIds.put(new Pair<>(
+                        memoryIdMap.getInt("apid"), memoryIdMap.getInt("value")
+                ), baseIds);
 
             } else {
                 throw new ConfigurationException("Provided memoryId: " + memoryId + " does not exist in the config");

diff --git a/yamcs-core/src/main/java/org/yamcs/tctm/pus/services/tc/six/SubServiceOne.java b/yamcs-core/src/main/java/org/yamcs/tctm/pus/services/tc/six/SubServiceOne.java
@@ -3,18 +3,15 @@
 import org.yamcs.TmPacket;
 import org.yamcs.YConfiguration;
 import org.yamcs.commanding.PreparedCommand;
-import org.yamcs.mdb.CommandEncodingException;
 import org.yamcs.tctm.pus.PusTcManager;
 import org.yamcs.tctm.pus.services.PusSubService;
 import org.yamcs.tctm.pus.services.tc.PusTcCcsdsPacket;
 import org.yamcs.utils.ByteArrayUtils;
-import org.yamcs.utils.StringConverter;
 
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import java.util.Map;
 
 public class SubServiceOne implements PusSubService {
     String yamcsInstance;

diff --git a/yamcs-core/src/main/java/org/yamcs/tctm/pus/services/tc/six/SubServiceSeven.java b/yamcs-core/src/main/java/org/yamcs/tctm/pus/services/tc/six/SubServiceSeven.java
@@ -3,7 +3,6 @@
 import org.yamcs.TmPacket;
 import org.yamcs.YConfiguration;
 import org.yamcs.commanding.PreparedCommand;
-import org.yamcs.mdb.CommandEncodingException;
 import org.yamcs.tctm.pus.PusTcManager;
 import org.yamcs.tctm.pus.services.PusSubService;
 import org.yamcs.tctm.pus.services.tc.PusTcCcsdsPacket;

diff --git a/yamcs-core/src/main/java/org/yamcs/tctm/pus/services/tm/PusTmCcsdsPacket.java b/yamcs-core/src/main/java/org/yamcs/tctm/pus/services/tm/PusTmCcsdsPacket.java
@@ -45,14 +45,12 @@ public byte[] getDataField() {
     }
 
     public byte[] getSpareField() {
-        byte[] b = bb.duplicate().array();
         byte[] secondaryHeader = getSecondaryHeader();
 
         return Arrays.copyOfRange(secondaryHeader, PusTmManager.PUS_HEADER_LENGTH, secondaryHeader.length);
     }
 
     public byte[] getPusHeaderField() {
-        byte[] b = bb.duplicate().array();
         byte[] secondaryHeader = getSecondaryHeader();
 
         return Arrays.copyOfRange(secondaryHeader, 0, PusTmManager.PUS_HEADER_LENGTH);

diff --git a/yamcs-core/src/main/java/org/yamcs/tctm/pus/services/tm/six/SubServiceFour.java b/yamcs-core/src/main/java/org/yamcs/tctm/pus/services/tm/six/SubServiceFour.java
@@ -5,7 +5,6 @@
 import org.yamcs.commanding.PreparedCommand;
 import org.yamcs.tctm.pus.services.PusSubService;
 import org.yamcs.tctm.pus.services.tm.PusTmCcsdsPacket;
-import org.yamcs.tctm.pus.services.tm.fourteen.ServiceFourteen;
 import org.yamcs.utils.ByteArrayUtils;
 
 import java.nio.ByteBuffer;

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.8.9-Pixxel.SNAPSHOT-2.5.3</version>
+    <version>5.8.9-Pixxel.SNAPSHOT-2.6.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.8.9-Pixxel.SNAPSHOT-2.5.3</version>
+    <version>5.8.9-Pixxel.SNAPSHOT-2.6.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.8.9-Pixxel.SNAPSHOT-2.5.3</version>
+    <version>5.8.9-Pixxel.SNAPSHOT-2.6.0</version>
   </parent>
 
   <artifactId>yamcs-xtce</artifactId>