Merge pull request #158 from pixxelhq/master

v5.10.5-Pixxel-3.10.1
pixxelhq · Nov 7, 2024 · 3b7862e · 3b7862e
2 parents 8847d11 + c50eae1
commit 3b7862e
Show file tree

Hide file tree

Showing 27 changed files with 31 additions and 25 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.5-Pixxel-3.9.0</version>
+    <version>5.10.5-Pixxel-3.10.1</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.5-Pixxel-3.9.0</version>
+    <version>5.10.5-Pixxel-3.10.1</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.5-Pixxel-3.9.0</version>
+    <version>5.10.5-Pixxel-3.10.1</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.5-Pixxel-3.9.0</version>
+    <version>5.10.5-Pixxel-3.10.1</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.5-Pixxel-3.9.0</version>
+    <version>5.10.5-Pixxel-3.10.1</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.5-Pixxel-3.9.0</version>
+    <version>5.10.5-Pixxel-3.10.1</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.5-Pixxel-3.9.0</version>
+    <version>5.10.5-Pixxel-3.10.1</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.5-Pixxel-3.9.0</version>
+    <version>5.10.5-Pixxel-3.10.1</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.5-Pixxel-3.9.0</version>
+    <version>5.10.5-Pixxel-3.10.1</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.5-Pixxel-3.9.0</version>
+    <version>5.10.5-Pixxel-3.10.1</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.5-Pixxel-3.9.0</version>
+    <version>5.10.5-Pixxel-3.10.1</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.5-Pixxel-3.9.0</version>
+    <version>5.10.5-Pixxel-3.10.1</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.5-Pixxel-3.9.0</version>
+    <version>5.10.5-Pixxel-3.10.1</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.5-Pixxel-3.9.0</version>
+    <version>5.10.5-Pixxel-3.10.1</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.5-Pixxel-3.9.0</version>
+    <version>5.10.5-Pixxel-3.10.1</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.5-Pixxel-3.9.0</version>
+    <version>5.10.5-Pixxel-3.10.1</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.5-Pixxel-3.9.0</version>
+	<version>5.10.5-Pixxel-3.10.1</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.10.5-Pixxel-3.9.0</version>
+    <version>5.10.5-Pixxel-3.10.1</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.5-Pixxel-3.9.0</version>
+		<version>5.10.5-Pixxel-3.10.1</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.5-Pixxel-3.9.0</version>
+    <version>5.10.5-Pixxel-3.10.1</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.5-Pixxel-3.9.0</version>
+    <version>5.10.5-Pixxel-3.10.1</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.5-Pixxel-3.9.0</version>
+    <version>5.10.5-Pixxel-3.10.1</version>
   </parent>
 
   <artifactId>yamcs-core</artifactId>

diff --git a/yamcs-core/src/main/java/org/yamcs/tctm/pus/services/tm/one/SubServiceEight.java b/yamcs-core/src/main/java/org/yamcs/tctm/pus/services/tm/one/SubServiceEight.java
@@ -38,18 +38,21 @@ public ArrayList<TmPacket> process(TmPacket tmPacket) {
 
         byte[] failureNotice = Arrays.copyOfRange(dataField, ServiceOne.REQUEST_ID_LENGTH, dataField.length);
         long errorCode = ByteArrayUtils.decodeCustomInteger(failureNotice, 0, ServiceOne.failureCodeSize);
+        long errorReason = ByteArrayUtils.decodeCustomInteger(failureNotice, ServiceOne.failureCodeSize, ServiceOne.failureDataSize);
 
         try {
             eventProducer.sendCritical(TC_COMPLETION_EXECUTION_FAILED,
                 "TC with (Source ID: " + pPkt.getDestinationID() + " | Apid: " + ServiceOne.CcsdsApid.fromValue(tcCcsdsApid) + " | Packet Seq Count: "
                         + tcCcsdsSeqCount
                         + ") has failed to complete execution | Error Code: " + ServiceOne.FailureCode.fromValue((int) errorCode).toString()
+                        + "| Failure reason: " + errorReason
             );
         } catch (Exception e) {
             eventProducer.sendCritical(TC_COMPLETION_EXECUTION_FAILED,
                 "TC with (Source ID: " + pPkt.getDestinationID() + " | Apid: " + ServiceOne.CcsdsApid.fromValue(tcCcsdsApid) + " | Packet Seq Count: "
                         + tcCcsdsSeqCount
                         + ") has failed to complete execution | Error Code: " + errorCode + " (No enumeration found)"
+                        + "| Failure reason: " + errorReason
             );
         }
 

diff --git a/yamcs-core/src/main/java/org/yamcs/tctm/pus/services/tm/one/SubServiceTwo.java b/yamcs-core/src/main/java/org/yamcs/tctm/pus/services/tm/one/SubServiceTwo.java
@@ -38,18 +38,21 @@ public ArrayList<TmPacket> process(TmPacket tmPacket) {
 
         byte[] failureNotice = Arrays.copyOfRange(dataField, ServiceOne.REQUEST_ID_LENGTH, dataField.length);
         long errorCode = ByteArrayUtils.decodeCustomInteger(failureNotice, 0, ServiceOne.failureCodeSize);
+        long errorReason = ByteArrayUtils.decodeCustomInteger(failureNotice, ServiceOne.failureCodeSize, ServiceOne.failureDataSize);
 
         try {
             eventProducer.sendCritical(TC_ACCEPTANCE_FAILED,
                 "TC with (Source ID: " + pPkt.getDestinationID() + " | Apid: " + ServiceOne.CcsdsApid.fromValue(tcCcsdsApid) + " | Packet Seq Count: "
                         + tcCcsdsSeqCount
                         + ") has been rejected | Error Code: " + ServiceOne.FailureCode.fromValue((int) errorCode).toString()
+                        + "| Failure reason: " + errorReason
             );
         } catch (Exception e) {
             eventProducer.sendCritical(TC_ACCEPTANCE_FAILED,
                 "TC with (Source ID: " + pPkt.getDestinationID() + " | Apid: " + ServiceOne.CcsdsApid.fromValue(tcCcsdsApid) + " | Packet Seq Count: "
                         + tcCcsdsSeqCount
                         + ") has been rejected | Error Code: " + errorCode + " (No enumeration found)"
+                        + "| Failure reason: " + errorReason
             );
         }
 

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.5-Pixxel-3.9.0</version>
+    <version>5.10.5-Pixxel-3.10.1</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.5-Pixxel-3.9.0</version>
+    <version>5.10.5-Pixxel-3.10.1</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.5-Pixxel-3.9.0</version>
+    <version>5.10.5-Pixxel-3.10.1</version>
   </parent>
 
   <artifactId>yamcs-xtce</artifactId>