Skip to content

Commit

Permalink
Merge pull request #79 from pixxelhq/master
Browse files Browse the repository at this point in the history 
v5.8.9-Pixxel.SNAPSHOT-2.5.3
  • Loading branch information
@swarup-n
swarup-n authored May 7, 2024
2 parents 69d1bd8 + 06a37b9 commit c5e7f52
Show file tree
Hide file tree
Showing 26 changed files with 26 additions and 28 deletions.
2 changes: 1 addition & 1 deletion distribution/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.yamcs</groupId>
<artifactId>yamcs</artifactId>
<version>5.8.9-Pixxel.SNAPSHOT-2.5.2</version>
<version>5.8.9-Pixxel.SNAPSHOT-2.5.3</version>
</parent>

<artifactId>distribution</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion examples/cascading/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.yamcs.examples</groupId>
<artifactId>examples</artifactId>
<version>5.8.9-Pixxel.SNAPSHOT-2.5.2</version>
<version>5.8.9-Pixxel.SNAPSHOT-2.5.3</version>
</parent>

<artifactId>cascading</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion examples/ccsds-frames/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.yamcs.examples</groupId>
<artifactId>examples</artifactId>
<version>5.8.9-Pixxel.SNAPSHOT-2.5.2</version>
<version>5.8.9-Pixxel.SNAPSHOT-2.5.3</version>
</parent>

<artifactId>ccsds-frames</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion examples/cfdp-udp/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.yamcs.examples</groupId>
<artifactId>examples</artifactId>
<version>5.8.9-Pixxel.SNAPSHOT-2.5.2</version>
<version>5.8.9-Pixxel.SNAPSHOT-2.5.3</version>
</parent>

<artifactId>cfdp-udp</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion examples/cfdp/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.yamcs.examples</groupId>
<artifactId>examples</artifactId>
<version>5.8.9-Pixxel.SNAPSHOT-2.5.2</version>
<version>5.8.9-Pixxel.SNAPSHOT-2.5.3</version>
</parent>

<artifactId>cfdp</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion examples/perftest1/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.yamcs.examples</groupId>
<artifactId>examples</artifactId>
<version>5.8.9-Pixxel.SNAPSHOT-2.5.2</version>
<version>5.8.9-Pixxel.SNAPSHOT-2.5.3</version>
</parent>

<artifactId>perftest1</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion examples/perftest2/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.yamcs.examples</groupId>
<artifactId>examples</artifactId>
<version>5.8.9-Pixxel.SNAPSHOT-2.5.2</version>
<version>5.8.9-Pixxel.SNAPSHOT-2.5.3</version>
</parent>

<artifactId>perftest2</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion examples/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.yamcs</groupId>
<artifactId>yamcs</artifactId>
<version>5.8.9-Pixxel.SNAPSHOT-2.5.2</version>
<version>5.8.9-Pixxel.SNAPSHOT-2.5.3</version>
</parent>

<groupId>org.yamcs.examples</groupId>
Expand Down
2 changes: 1 addition & 1 deletion examples/pus/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.yamcs.examples</groupId>
<artifactId>examples</artifactId>
<version>5.8.9-Pixxel.SNAPSHOT-2.5.2</version>
<version>5.8.9-Pixxel.SNAPSHOT-2.5.3</version>
</parent>

<artifactId>pus</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion examples/replication1/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.yamcs.examples</groupId>
<artifactId>examples</artifactId>
<version>5.8.9-Pixxel.SNAPSHOT-2.5.2</version>
<version>5.8.9-Pixxel.SNAPSHOT-2.5.3</version>
</parent>

<artifactId>replication1</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion examples/replication2/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.yamcs.examples</groupId>
<artifactId>examples</artifactId>
<version>5.8.9-Pixxel.SNAPSHOT-2.5.2</version>
<version>5.8.9-Pixxel.SNAPSHOT-2.5.3</version>
</parent>

<artifactId>replication2</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion examples/replication3/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.yamcs.examples</groupId>
<artifactId>examples</artifactId>
<version>5.8.9-Pixxel.SNAPSHOT-2.5.2</version>
<version>5.8.9-Pixxel.SNAPSHOT-2.5.3</version>
</parent>

<artifactId>replication3</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion examples/simulation/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.yamcs.examples</groupId>
<artifactId>examples</artifactId>
<version>5.8.9-Pixxel.SNAPSHOT-2.5.2</version>
<version>5.8.9-Pixxel.SNAPSHOT-2.5.3</version>
</parent>

<artifactId>simulation</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion examples/snippets/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.yamcs.examples</groupId>
<artifactId>examples</artifactId>
<version>5.8.9-Pixxel.SNAPSHOT-2.5.2</version>
<version>5.8.9-Pixxel.SNAPSHOT-2.5.3</version>
</parent>

<artifactId>snippets</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion examples/templates/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.yamcs.examples</groupId>
<artifactId>examples</artifactId>
<version>5.8.9-Pixxel.SNAPSHOT-2.5.2</version>
<version>5.8.9-Pixxel.SNAPSHOT-2.5.3</version>
</parent>

<artifactId>templates</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion packet-viewer/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.yamcs</groupId>
<artifactId>yamcs</artifactId>
<version>5.8.9-Pixxel.SNAPSHOT-2.5.2</version>
<version>5.8.9-Pixxel.SNAPSHOT-2.5.3</version>
</parent>

<artifactId>packet-viewer</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<groupId>org.yamcs</groupId>
<artifactId>yamcs</artifactId>
<version>5.8.9-Pixxel.SNAPSHOT-2.5.2</version>
<version>5.8.9-Pixxel.SNAPSHOT-2.5.3</version>

<packaging>pom</packaging>

Expand Down
2 changes: 1 addition & 1 deletion simulator/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.yamcs</groupId>
<artifactId>yamcs</artifactId>
<version>5.8.9-Pixxel.SNAPSHOT-2.5.2</version>
<version>5.8.9-Pixxel.SNAPSHOT-2.5.3</version>
</parent>

<artifactId>simulator</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion tests/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.yamcs</groupId>
<artifactId>yamcs</artifactId>
<version>5.8.9-Pixxel.SNAPSHOT-2.5.2</version>
<version>5.8.9-Pixxel.SNAPSHOT-2.5.3</version>
</parent>

<artifactId>tests</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion yamcs-api/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.yamcs</groupId>
<artifactId>yamcs</artifactId>
<version>5.8.9-Pixxel.SNAPSHOT-2.5.2</version>
<version>5.8.9-Pixxel.SNAPSHOT-2.5.3</version>
</parent>

<artifactId>yamcs-api</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion yamcs-client/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.yamcs</groupId>
<artifactId>yamcs</artifactId>
<version>5.8.9-Pixxel.SNAPSHOT-2.5.2</version>
<version>5.8.9-Pixxel.SNAPSHOT-2.5.3</version>
</parent>

<artifactId>yamcs-client</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion yamcs-core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.yamcs</groupId>
<artifactId>yamcs</artifactId>
<version>5.8.9-Pixxel.SNAPSHOT-2.5.2</version>
<version>5.8.9-Pixxel.SNAPSHOT-2.5.3</version>
</parent>

<artifactId>yamcs-core</artifactId>
Expand Down
4 changes: 1 addition & 3 deletions .../src/main/java/org/yamcs/tctm/pus/services/filetransfer/thirteen/S13OutgoingTransfer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@
import org.yamcs.yarch.Bucket;
import org.yamcs.yarch.Stream;

import com.google.protobuf.compiler.PluginProtos.CodeGeneratorResponse.File;

public class S13OutgoingTransfer extends OngoingS13Transfer{

private enum OutTxState {
Expand Down Expand Up @@ -111,7 +109,7 @@ private static S13TransactionId makeTransactionId(long remoteId, long transferIn
* Start the transfer
*/
public void start() {
packetSendingSchedule = executor.scheduleAtFixedRate(this::sendS13Packet, 0, sleepBetweenPackets, TimeUnit.MILLISECONDS);
packetSendingSchedule = executor.scheduleWithFixedDelay(this::sendS13Packet, 0, sleepBetweenPackets, TimeUnit.MILLISECONDS);
}

public byte[] getFilePart() {
Expand Down
2 changes: 1 addition & 1 deletion yamcs-tse/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.yamcs</groupId>
<artifactId>yamcs</artifactId>
<version>5.8.9-Pixxel.SNAPSHOT-2.5.2</version>
<version>5.8.9-Pixxel.SNAPSHOT-2.5.3</version>
</parent>

<artifactId>yamcs-tse</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion yamcs-web/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.yamcs</groupId>
<artifactId>yamcs</artifactId>
<version>5.8.9-Pixxel.SNAPSHOT-2.5.2</version>
<version>5.8.9-Pixxel.SNAPSHOT-2.5.3</version>
</parent>

<artifactId>yamcs-web</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion yamcs-xtce/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.yamcs</groupId>
<artifactId>yamcs</artifactId>
<version>5.8.9-Pixxel.SNAPSHOT-2.5.2</version>
<version>5.8.9-Pixxel.SNAPSHOT-2.5.3</version>
</parent>

<artifactId>yamcs-xtce</artifactId>
Expand Down

0 comments on commit c5e7f52

Please sign in to comment.