Skip to content

Commit

Permalink
Merge pull request #186 from pixxelhq/master
Browse files Browse the repository at this point in the history 
v5.10.9-Pixxel-6.4.0
  • Loading branch information
@swarup-n
swarup-n authored Jan 2, 2025
2 parents 2db0209 + 8f3d66d commit f9a6f3c
Show file tree
Hide file tree
Showing 35 changed files with 67 additions and 137 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.10.9-Pixxel-6.3.0</version>
<version>5.10.9-Pixxel-6.4.0</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.10.9-Pixxel-6.3.0</version>
<version>5.10.9-Pixxel-6.4.0</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.10.9-Pixxel-6.3.0</version>
<version>5.10.9-Pixxel-6.4.0</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.10.9-Pixxel-6.3.0</version>
<version>5.10.9-Pixxel-6.4.0</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.10.9-Pixxel-6.3.0</version>
<version>5.10.9-Pixxel-6.4.0</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.10.9-Pixxel-6.3.0</version>
<version>5.10.9-Pixxel-6.4.0</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.10.9-Pixxel-6.3.0</version>
<version>5.10.9-Pixxel-6.4.0</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.10.9-Pixxel-6.3.0</version>
<version>5.10.9-Pixxel-6.4.0</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.10.9-Pixxel-6.3.0</version>
<version>5.10.9-Pixxel-6.4.0</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.10.9-Pixxel-6.3.0</version>
<version>5.10.9-Pixxel-6.4.0</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.10.9-Pixxel-6.3.0</version>
<version>5.10.9-Pixxel-6.4.0</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.10.9-Pixxel-6.3.0</version>
<version>5.10.9-Pixxel-6.4.0</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.10.9-Pixxel-6.3.0</version>
<version>5.10.9-Pixxel-6.4.0</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.10.9-Pixxel-6.3.0</version>
<version>5.10.9-Pixxel-6.4.0</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.10.9-Pixxel-6.3.0</version>
<version>5.10.9-Pixxel-6.4.0</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.10.9-Pixxel-6.3.0</version>
<version>5.10.9-Pixxel-6.4.0</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 @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.yamcs</groupId>
<artifactId>yamcs</artifactId>
<version>5.10.9-Pixxel-6.3.0</version>
<version>5.10.9-Pixxel-6.4.0</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.10.9-Pixxel-6.3.0</version>
<version>5.10.9-Pixxel-6.4.0</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.10.9-Pixxel-6.3.0</version>
<version>5.10.9-Pixxel-6.4.0</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.10.9-Pixxel-6.3.0</version>
<version>5.10.9-Pixxel-6.4.0</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.10.9-Pixxel-6.3.0</version>
<version>5.10.9-Pixxel-6.4.0</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.10.9-Pixxel-6.3.0</version>
<version>5.10.9-Pixxel-6.4.0</version>
</parent>

<artifactId>yamcs-core</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions yamcs-core/src/main/java/org/yamcs/tctm/pus/services/tm/eleven/SubServiceThirteen.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
import org.yamcs.tctm.pus.PusTmManager;
import org.yamcs.tctm.pus.services.PusSubService;
import org.yamcs.tctm.pus.services.tm.PusTmCcsdsPacket;
import org.yamcs.tctm.pus.services.tm.one.ServiceOne.CcsdsApid;
import org.yamcs.tctm.pus.services.tm.one.ServiceOne;
import org.yamcs.utils.ByteArrayUtils;
import org.yamcs.yarch.Bucket;
import org.yamcs.yarch.YarchException;
Expand Down Expand Up @@ -175,7 +175,7 @@ public void generateTimetagScheduleSummaryReport(long gentime, Map<Long, ArrayLi
).format(DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss'Z'"));

int sourceId = requestId.get(0);
String commandApid = CcsdsApid.fromValue(requestId.get(1)).name();
String commandApid = ServiceOne.ccsdsApids.get(requestId.get(1));
int commandCcsdsSeqCount = requestId.get(2);

writer.write(timetagStr + "," + sourceId + "," + commandApid + "," + commandCcsdsSeqCount);
Expand Down
6 changes: 3 additions & 3 deletions yamcs-core/src/main/java/org/yamcs/tctm/pus/services/tm/five/SubServiceFour.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
import org.yamcs.tctm.pus.services.PusSubService;
import org.yamcs.tctm.pus.services.tm.PusTmCcsdsPacket;
import org.yamcs.tctm.pus.services.tm.five.ServiceFive.Endianess;
import org.yamcs.tctm.pus.services.tm.one.ServiceOne.CcsdsApid;
import org.yamcs.tctm.pus.services.tm.one.ServiceOne;
import org.yamcs.tctm.pus.tuples.Pair;
import org.yamcs.tctm.pus.tuples.Quattro;
import org.yamcs.utils.ByteArrayUtils;
Expand Down Expand Up @@ -96,10 +96,10 @@ public ArrayList<TmPacket> process(TmPacket tmPacket) {
}

eventProducer = EventProducerFactory.getEventProducer(yamcsInstance, this.getClass().getSimpleName(), 120000);
eventProducer.setSource(source + " | " + CcsdsApid.fromValue(apid).name());
eventProducer.setSource(source + " | " + ServiceOne.ccsdsApids.get(apid));

eventDec += " is thrown";
eventProducer.sendEvent(EventSeverity.CRITICAL, CcsdsApid.fromValue(apid).name(), eventDec, tmPacket.getGenerationTime());
eventProducer.sendEvent(EventSeverity.CRITICAL, ServiceOne.ccsdsApids.get(apid), eventDec, tmPacket.getGenerationTime());

ArrayList<TmPacket> pPkts = new ArrayList<>();
pPkts.add(tmPacket);
Expand Down
6 changes: 3 additions & 3 deletions yamcs-core/src/main/java/org/yamcs/tctm/pus/services/tm/five/SubServiceOne.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
import org.yamcs.tctm.pus.services.PusSubService;
import org.yamcs.tctm.pus.services.tm.PusTmCcsdsPacket;
import org.yamcs.tctm.pus.services.tm.five.ServiceFive.Endianess;
import org.yamcs.tctm.pus.services.tm.one.ServiceOne.CcsdsApid;
import org.yamcs.tctm.pus.services.tm.one.ServiceOne;
import org.yamcs.tctm.pus.tuples.Pair;
import org.yamcs.tctm.pus.tuples.Quattro;
import org.yamcs.utils.ByteArrayUtils;
Expand Down Expand Up @@ -98,10 +98,10 @@ public ArrayList<TmPacket> process(TmPacket tmPacket) {
}

eventProducer = EventProducerFactory.getEventProducer(yamcsInstance, this.getClass().getSimpleName(), 120000);
eventProducer.setSource(source + " | " + CcsdsApid.fromValue(apid).name());
eventProducer.setSource(source + " | " + ServiceOne.ccsdsApids.get(apid));

eventDec += " is thrown";
eventProducer.sendEvent(EventSeverity.WATCH, CcsdsApid.fromValue(apid).name(), eventDec, tmPacket.getGenerationTime());
eventProducer.sendEvent(EventSeverity.WATCH, ServiceOne.ccsdsApids.get(apid), eventDec, tmPacket.getGenerationTime());

ArrayList<TmPacket> pPkts = new ArrayList<>();
pPkts.add(tmPacket);
Expand Down
6 changes: 3 additions & 3 deletions yamcs-core/src/main/java/org/yamcs/tctm/pus/services/tm/five/SubServiceThree.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
import org.yamcs.tctm.pus.services.PusSubService;
import org.yamcs.tctm.pus.services.tm.PusTmCcsdsPacket;
import org.yamcs.tctm.pus.services.tm.five.ServiceFive.Endianess;
import org.yamcs.tctm.pus.services.tm.one.ServiceOne.CcsdsApid;
import org.yamcs.tctm.pus.services.tm.one.ServiceOne;
import org.yamcs.tctm.pus.tuples.Pair;
import org.yamcs.tctm.pus.tuples.Quattro;
import org.yamcs.utils.ByteArrayUtils;
Expand Down Expand Up @@ -97,10 +97,10 @@ public ArrayList<TmPacket> process(TmPacket tmPacket) {
}

eventProducer = EventProducerFactory.getEventProducer(yamcsInstance, this.getClass().getSimpleName(), 120000);
eventProducer.setSource(source + " | " + CcsdsApid.fromValue(apid).name());
eventProducer.setSource(source + " | " + ServiceOne.ccsdsApids.get(apid));

eventDec += " is thrown";
eventProducer.sendEvent(EventSeverity.DISTRESS, CcsdsApid.fromValue(apid).name(), eventDec, tmPacket.getGenerationTime());
eventProducer.sendEvent(EventSeverity.DISTRESS, ServiceOne.ccsdsApids.get(apid), eventDec, tmPacket.getGenerationTime());

ArrayList<TmPacket> pPkts = new ArrayList<>();
pPkts.add(tmPacket);
Expand Down
6 changes: 3 additions & 3 deletions yamcs-core/src/main/java/org/yamcs/tctm/pus/services/tm/five/SubServiceTwo.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
import org.yamcs.tctm.pus.services.PusSubService;
import org.yamcs.tctm.pus.services.tm.PusTmCcsdsPacket;
import org.yamcs.tctm.pus.services.tm.five.ServiceFive.Endianess;
import org.yamcs.tctm.pus.services.tm.one.ServiceOne.CcsdsApid;
import org.yamcs.tctm.pus.services.tm.one.ServiceOne;
import org.yamcs.tctm.pus.tuples.Pair;
import org.yamcs.tctm.pus.tuples.Quattro;
import org.yamcs.utils.ByteArrayUtils;
Expand Down Expand Up @@ -96,10 +96,10 @@ public ArrayList<TmPacket> process(TmPacket tmPacket) {
}

eventProducer = EventProducerFactory.getEventProducer(yamcsInstance, this.getClass().getSimpleName(), 120000);
eventProducer.setSource(source + " | " + CcsdsApid.fromValue(apid).name());
eventProducer.setSource(source + " | " + ServiceOne.ccsdsApids.get(apid));

eventDec += " is thrown";
eventProducer.sendEvent(EventSeverity.WARNING, CcsdsApid.fromValue(apid).name(), eventDec, tmPacket.getGenerationTime());
eventProducer.sendEvent(EventSeverity.WARNING, ServiceOne.ccsdsApids.get(apid), eventDec, tmPacket.getGenerationTime());

ArrayList<TmPacket> pPkts = new ArrayList<>();
pPkts.add(tmPacket);
Expand Down
Loading

0 comments on commit f9a6f3c

Please sign in to comment.