Merge pull request #83 from pixxelhq/master

v5.8.9-Pixxel.SNAPSHOT-2.7.2
pixxelhq · May 13, 2024 · 31b27f3 · 31b27f3
2 parents ce21756 + ed7a38a
commit 31b27f3
Show file tree

Hide file tree

Showing 30 changed files with 34 additions and 33 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.7.1</version>
+    <version>5.8.9-Pixxel.SNAPSHOT-2.7.2</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.7.1</version>
+    <version>5.8.9-Pixxel.SNAPSHOT-2.7.2</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.7.1</version>
+    <version>5.8.9-Pixxel.SNAPSHOT-2.7.2</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.7.1</version>
+    <version>5.8.9-Pixxel.SNAPSHOT-2.7.2</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.7.1</version>
+    <version>5.8.9-Pixxel.SNAPSHOT-2.7.2</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.7.1</version>
+    <version>5.8.9-Pixxel.SNAPSHOT-2.7.2</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.7.1</version>
+    <version>5.8.9-Pixxel.SNAPSHOT-2.7.2</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.7.1</version>
+    <version>5.8.9-Pixxel.SNAPSHOT-2.7.2</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.7.1</version>
+    <version>5.8.9-Pixxel.SNAPSHOT-2.7.2</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.7.1</version>
+    <version>5.8.9-Pixxel.SNAPSHOT-2.7.2</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.7.1</version>
+    <version>5.8.9-Pixxel.SNAPSHOT-2.7.2</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.7.1</version>
+    <version>5.8.9-Pixxel.SNAPSHOT-2.7.2</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.7.1</version>
+    <version>5.8.9-Pixxel.SNAPSHOT-2.7.2</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.7.1</version>
+    <version>5.8.9-Pixxel.SNAPSHOT-2.7.2</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.7.1</version>
+    <version>5.8.9-Pixxel.SNAPSHOT-2.7.2</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.7.1</version>
+    <version>5.8.9-Pixxel.SNAPSHOT-2.7.2</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.7.1</version>
+	<version>5.8.9-Pixxel.SNAPSHOT-2.7.2</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.7.1</version>
+    <version>5.8.9-Pixxel.SNAPSHOT-2.7.2</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.7.1</version>
+		<version>5.8.9-Pixxel.SNAPSHOT-2.7.2</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.7.1</version>
+    <version>5.8.9-Pixxel.SNAPSHOT-2.7.2</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.7.1</version>
+    <version>5.8.9-Pixxel.SNAPSHOT-2.7.2</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.7.1</version>
+    <version>5.8.9-Pixxel.SNAPSHOT-2.7.2</version>
   </parent>
 
   <artifactId>yamcs-core</artifactId>

diff --git a/yamcs-core/src/main/java/org/yamcs/cfdp/pdu/ConditionCode.java b/yamcs-core/src/main/java/org/yamcs/cfdp/pdu/ConditionCode.java
@@ -46,6 +46,10 @@ private static ConditionCode fromCode(byte code) {
         }
     }
 
+    public static ConditionCode reaConditionCodeAsIs(byte b) {
+        return ConditionCode.fromCode(b);
+    }
+
     public static ConditionCode readConditionCode(byte b) {
         return ConditionCode.fromCode((byte) ((b >> 4)&0x0F));
     }

diff --git a/...core/src/main/java/org/yamcs/tctm/pus/services/filetransfer/thirteen/ServiceThirteen.java b/...core/src/main/java/org/yamcs/tctm/pus/services/filetransfer/thirteen/ServiceThirteen.java
@@ -473,7 +473,7 @@ public void onTuple(Stream stream, Tuple tuple) {
             FileTransfer filetransfer = getOngoingUploadFileTransfer(packet.getUniquenessId().getLargePacketTransactionId());
             if (filetransfer != null) {
                 S13OutgoingTransfer outgoingTransfer = (S13OutgoingTransfer) filetransfer;
-                outgoingTransfer.cancel(ConditionCode.readConditionCode((byte) packet.getFailureCode().byteValue()));
+                outgoingTransfer.cancel(ConditionCode.reaConditionCodeAsIs((byte) packet.getFailureCode().byteValue()));
 
             } else {
                 log.warn("Erroneous Uplink abortion request received");

diff --git a/...ain/java/org/yamcs/tctm/pus/services/filetransfer/thirteen/packets/DownlinkS13Packet.java b/...ain/java/org/yamcs/tctm/pus/services/filetransfer/thirteen/packets/DownlinkS13Packet.java
@@ -61,13 +61,11 @@ public static PacketType fromString(String text) {
 
     public static DownlinkS13Packet fromTuple(Tuple t) {
         long largePacketTransactionId = (Long) t.getLongColumn(COL_LARGE_PACKET_TRANSACTION_ID);
-        long partSequenceNumber = (Long) t.getLongColumn(COL_PART_SEQUENCE_NUMBER);
-        byte[] filePart = (byte[]) t.getColumn(COL_FILE_PART);
         PacketType packetType = PacketType.fromString((String) t.getColumn(COL_PACKET_TYPE));
         int failureCode = (Integer) t.getColumn(COL_FAILURE_REASON);
 
         // In the case of S13, largePacketTransactionId is the sourceId (i.e the remoteId)
-        return new DownlinkS13Packet(new S13UniqueId(largePacketTransactionId, TransferDirection.DOWNLOAD), partSequenceNumber, filePart, packetType, failureCode);
+        return new DownlinkS13Packet(new S13UniqueId(largePacketTransactionId, TransferDirection.DOWNLOAD), -1, null, packetType, failureCode);
     }
 
     public PacketType getPacketType() {

diff --git a/yamcs-core/src/main/java/org/yamcs/tctm/pus/services/tm/thirteen/SubServiceSixteen.java b/yamcs-core/src/main/java/org/yamcs/tctm/pus/services/tm/thirteen/SubServiceSixteen.java
@@ -22,7 +22,6 @@ public SubServiceSixteen(String yamcsInstance, YConfiguration subServiceSixConfi
 
     @Override
     public PreparedCommand process(PreparedCommand pusTelecommand) {
-        // TODO Auto-generated method stub
         throw new UnsupportedOperationException("Unimplemented method 'process'");
     }
 
@@ -32,15 +31,15 @@ public ArrayList<TmPacket> process(TmPacket tmPacket) {
 
         byte[] dataField = pkt.getDataField();
 
-        int largePacketTransactionId = (int) ByteArrayUtils.decodeCustomInteger(dataField, 0, ServiceThirteen.largePacketTransactionIdSize);
+        long largePacketTransactionId = ByteArrayUtils.decodeCustomInteger(dataField, 0, ServiceThirteen.largePacketTransactionIdSize);
         int failureReason = (int) ByteArrayUtils.decodeCustomInteger(dataField, ServiceThirteen.largePacketTransactionIdSize, ServiceThirteen.failureReasonSize);
 
         TupleDefinition td = S13_TM.copy();
         ServiceThirteen.s13In.emitTuple(new Tuple(td, new Object[] {
             largePacketTransactionId,
             null,
             null,
-            null,
+            "ABORTION",
             failureReason
         }));
 

diff --git a/yamcs-core/src/main/java/org/yamcs/xtce/xlsv7/V7Loader.java b/yamcs-core/src/main/java/org/yamcs/xtce/xlsv7/V7Loader.java
@@ -435,7 +435,7 @@ protected void loadCalibrationSheet(SpaceSystem spaceSystem, String sheetName) {
                     cells = jumpToRow(sheet, j);
                     if (CALIB_TYPE_ENUMERATION.equalsIgnoreCase(type)) {
                         try {
-                            long raw = Integer.decode(getContent(cells, CN_CALIB_CALIB1));
+                            long raw = Long.decode(getContent(cells, CN_CALIB_CALIB1));
                             ValueEnumeration ve = new ValueEnumeration(raw, getContent(cells, CN_CALIB_CALIB2));
                             ve.setDescription(getContent(cells, CN_CALIB_DESCRIPTION, null));
                             enumeration.values.add(ve);

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.7.1</version>
+    <version>5.8.9-Pixxel.SNAPSHOT-2.7.2</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.7.1</version>
+    <version>5.8.9-Pixxel.SNAPSHOT-2.7.2</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.7.1</version>
+    <version>5.8.9-Pixxel.SNAPSHOT-2.7.2</version>
   </parent>
 
   <artifactId>yamcs-xtce</artifactId>