Skip to content

Commit

Permalink
Merge pull request #178 from pixxelhq/master
Browse files Browse the repository at this point in the history 
v5.10.8-Pixxel-5.7.1
  • Loading branch information
@swarup-n
swarup-n authored Nov 30, 2024
2 parents dcfb9ce + 8c4818e commit 48d7a2c
Show file tree
Hide file tree
Showing 27 changed files with 30 additions and 45 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.8-Pixxel-5.7.0</version>
<version>5.10.8-Pixxel-5.7.1</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.8-Pixxel-5.7.0</version>
<version>5.10.8-Pixxel-5.7.1</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.8-Pixxel-5.7.0</version>
<version>5.10.8-Pixxel-5.7.1</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.8-Pixxel-5.7.0</version>
<version>5.10.8-Pixxel-5.7.1</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.8-Pixxel-5.7.0</version>
<version>5.10.8-Pixxel-5.7.1</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.8-Pixxel-5.7.0</version>
<version>5.10.8-Pixxel-5.7.1</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.8-Pixxel-5.7.0</version>
<version>5.10.8-Pixxel-5.7.1</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.8-Pixxel-5.7.0</version>
<version>5.10.8-Pixxel-5.7.1</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.8-Pixxel-5.7.0</version>
<version>5.10.8-Pixxel-5.7.1</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.8-Pixxel-5.7.0</version>
<version>5.10.8-Pixxel-5.7.1</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.8-Pixxel-5.7.0</version>
<version>5.10.8-Pixxel-5.7.1</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.8-Pixxel-5.7.0</version>
<version>5.10.8-Pixxel-5.7.1</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.8-Pixxel-5.7.0</version>
<version>5.10.8-Pixxel-5.7.1</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.8-Pixxel-5.7.0</version>
<version>5.10.8-Pixxel-5.7.1</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.8-Pixxel-5.7.0</version>
<version>5.10.8-Pixxel-5.7.1</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.8-Pixxel-5.7.0</version>
<version>5.10.8-Pixxel-5.7.1</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.8-Pixxel-5.7.0</version>
<version>5.10.8-Pixxel-5.7.1</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.8-Pixxel-5.7.0</version>
<version>5.10.8-Pixxel-5.7.1</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.8-Pixxel-5.7.0</version>
<version>5.10.8-Pixxel-5.7.1</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.8-Pixxel-5.7.0</version>
<version>5.10.8-Pixxel-5.7.1</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.8-Pixxel-5.7.0</version>
<version>5.10.8-Pixxel-5.7.1</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.8-Pixxel-5.7.0</version>
<version>5.10.8-Pixxel-5.7.1</version>
</parent>

<artifactId>yamcs-core</artifactId>
Expand Down
11 changes: 5 additions & 6 deletions yamcs-core/src/main/java/org/yamcs/mdb/ConditionParser.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import org.yamcs.xtce.Parameter;
import org.yamcs.xtce.ParameterInstanceRef;
import org.yamcs.xtce.util.NameReference;
import org.yamcs.xtce.util.ParameterReference;

/**
* used by the SpreadsheetLoader to parse conditions
Expand Down Expand Up @@ -222,9 +223,6 @@ public Comparison toComparison(String comparisonString) throws ParseException {
if ("raw".equals(t)) {
pname = pname.substring(0, idx);
useCalibrated = false;
} else {
throw new ParseException("Cannot parse parameter for comparison '" + pname
+ "'. Use parameterName or parameterName.raw", 0);
}
}

Expand Down Expand Up @@ -253,9 +251,10 @@ public Comparison toComparison(String comparisonString) throws ParseException {
final ParameterInstanceRef pInstRef = new ParameterInstanceRef(useCalibrated);
final Comparison ucomp = new Comparison(pInstRef, value, opType);

NameReference pref = prefFactory.getReference(pname);
pref.addResolvedAction(nd -> {
pInstRef.setParameter((Parameter) nd);
ParameterReference pref = (ParameterReference) prefFactory.getReference(pname);
pref.addResolvedAction((p, path) -> {
pInstRef.setParameter(p);
pInstRef.setMemberPath(path);
ucomp.validateValueType();
});

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.10.8-Pixxel-5.7.0</version>
<version>5.10.8-Pixxel-5.7.1</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.10.8-Pixxel-5.7.0</version>
<version>5.10.8-Pixxel-5.7.1</version>
</parent>

<artifactId>yamcs-web</artifactId>
Expand Down
14 changes: 0 additions & 14 deletions .../webapp/projects/webapp/src/app/telemetry/parameters/parameters/parameters.component.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,20 +143,6 @@
</td>
</ng-container>

<ng-container matColumnDef="gentime">
<th mat-header-cell *matHeaderCellDef>Generation Time</th>
<td mat-cell *matCellDef="let item">
{{ (item.pval?.generationTime) || "-" }}
</td>
</ng-container>

<ng-container matColumnDef="rectime">
<th mat-header-cell *matHeaderCellDef>Reception Time</th>
<td mat-cell *matCellDef="let item">
{{ (item.pval?.acquisitionTime) || "-" }}
</td>
</ng-container>

<ng-container matColumnDef="shortDescription">
<th mat-header-cell *matHeaderCellDef class="wrap200">Description</th>
<td mat-cell *matCellDef="let item">
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.10.8-Pixxel-5.7.0</version>
<version>5.10.8-Pixxel-5.7.1</version>
</parent>

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

0 comments on commit 48d7a2c

Please sign in to comment.