Add arg to disable sequence count check

Changelog

@@ -1,5 +1,16 @@
-Version 5.5.4
-- fixed the CLTU randomization sequence to conform to CCSDS 231.0 issue 4 when LDPC coding is enabled.
+Version 5.5.5 released 20-Oct-2021
+- yamcs-web: fixed display of command arguments in the command history
+
+Version 5.5.4 released 20-Oct-2021
+- Fixed the CLTU randomization sequence to conform to CCSDS 231.0 issue 4 when LDPC coding is enabled.
+- Accept numeric value of an enumeration command argument
+- Fixed lost frame count calculation
+- Allow DataSource=ground for parameters
+- Fixed CFDP reliable option not showing 
+- Fixed duplicate data in the parameter archive
+- Allow specification of generation time in set parameter value requests
+- minor tweaks and fixes
+
 
 Version 5.5.3 released 30-Jul-2021
 - first version of the Yamcs Timeline

distribution/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.yamcs</groupId>
     <artifactId>yamcs</artifactId>
-    <version>5.5.4-SNAPSHOT</version>
+    <version>5.5.6-SNAPSHOT</version>
   </parent>
 
   <artifactId>distribution</artifactId>

docs/requirements.txt

@@ -1,4 +1,4 @@
-Sphinx==3.0.3
+Sphinx
 sphinxcontrib-fulltoc
 protobuf
 pyyaml

docs/server-manual/links/ccsds-frame-processing.rst

@@ -108,6 +108,12 @@ clcwStream (string)
     Can be used to specify the name of the stream where the Command Link Control Words (CLCW) will be sent. The CLCW is the mechanism used by COP-1 to acknolwedge uplinked frames. For TM and USLP frames, there is an OCF flag part of the frame header indicating the presence or not of the CLCW. For AOS frames it has to be configured with the ``ocfPresent`` flag below.
     If present, the CLCW is also extracted from idle frames (i.e. frames that are inserted when no data needs to be transmitted in order to keep the constant bitrate required for downlink).
 
+goodFrameStream (string)
+    If specified, the good frames will be sent on a stream with that name. The stream will be created if it does not exist.
+
+badFrameStream (string)
+    If specified, the bad frames will be sent on a stream with that name. Bad frames are conisdered as those that fail decoding for various reasons: length in the header does not match the size of the data received, frame version does not match, bad CRC, bad spacecraft id, bad vcid. 
+
 virtualChannels (map)
     **Required.** Used to specify the Virtual Channel specific configuration. 
 
@@ -139,6 +145,7 @@ packetPreprocessorClassName and packetPreprocessorArgs
 
 vcaHandlerClassName:
     **Required if the service = VCA** Specifies the name of the class which handles data for this virtual channel. The class has to implement :javadoc:`~org.yamcs.tctm.ccsds.VcDownlinkHandler` interface. Optionally it can implement :javadoc:`~org.yamcs.tctm.Link` interface to appear as a data link (e.g. in yamcs-web). An example implementation of such class can be found in the ccsds-frames example project.
+
 
 
 Telecommand Frame Processing
@@ -206,6 +213,9 @@ virtualChannels (map)
 
 errorDetection (string)
     One of ``NONE`` or ``CRC16``. Specifies the error detection scheme used. If present, the last 2 bytes of the frame will contain an error control field.
+
+frameMaxRate (double)
+    maximum number of command frames to send per second. This option is specific to the UDP TC link.
 
 For each Virtual Channel in the ``virtualChannels`` map, the following parameters can be used:
 
@@ -242,11 +252,7 @@ cop1TxLimit (integer)
 bdAbsolutePriority (false)
     If COP-1 is enabled, this specifies that the BD frames have absolute priority over normal AD frames. This means that if there are a number of AD frames ready to be uplinked and a TC with ``cop1Bypass`` flag is received (see below for an explanation of this flag), it will pass in front of the queue so ti will be the first frame uplinked (once the multiplexer decides to uplink frames from this Virtual Channel). This flag only applies when the COP-1 state is active, if the COP-1 synchnoziation has not taken place, the BD frames are uplinked anyway (because all AD frames are waiting). 
 
-goodFrameStream (string)
-    If specified, the good frames will be sent on a stream with that name. The stream will be created if it does not exist.
-
-badFrameStream (string)
-    If specified, the bad frames will be sent on a stream with that name. Bad frames are conisdered as those that fail decoding for various reasons: length in the header does not match the size of the data received, frame version does not match, bad CRC, bad spacecraft id, bad vcid. 
+
 
 
 Priority Schemes

docs/server-manual/services/global/http-server.rst

@@ -73,6 +73,9 @@ webSocket (map)
 cors (map)
     Configure cross-origin resource sharing for the HTTP API. Detailed below. If unset, CORS is not supported.
 
+nThreads (int)
+    Configure the number of threads that will serve HTTP requests. 0 (default) means two times the number of CPU cores.
+
 
 WebSocket sub-configuration
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^

examples/ccsds-frames/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.yamcs.examples</groupId>
     <artifactId>examples</artifactId>
-    <version>5.5.4-SNAPSHOT</version>
+    <version>5.5.6-SNAPSHOT</version>
   </parent>
 
   <artifactId>ccsds-frames</artifactId>

examples/cfdp/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.yamcs.examples</groupId>
     <artifactId>examples</artifactId>
-    <version>5.5.4-SNAPSHOT</version>
+    <version>5.5.6-SNAPSHOT</version>
   </parent>
 
   <artifactId>cfdp</artifactId>

examples/perftest1/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.yamcs.examples</groupId>
     <artifactId>examples</artifactId>
-    <version>5.5.4-SNAPSHOT</version>
+    <version>5.5.6-SNAPSHOT</version>
   </parent>
 
   <artifactId>perftest1</artifactId>

examples/perftest2/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.yamcs.examples</groupId>
     <artifactId>examples</artifactId>
-    <version>5.5.4-SNAPSHOT</version>
+    <version>5.5.6-SNAPSHOT</version>
   </parent>
 
   <artifactId>perftest2</artifactId>

examples/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.yamcs</groupId>
     <artifactId>yamcs</artifactId>
-    <version>5.5.4-SNAPSHOT</version>
+    <version>5.5.6-SNAPSHOT</version>
   </parent>
 
   <groupId>org.yamcs.examples</groupId>

examples/pus/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.yamcs.examples</groupId>
     <artifactId>examples</artifactId>
-    <version>5.5.4-SNAPSHOT</version>
+    <version>5.5.6-SNAPSHOT</version>
   </parent>
 
   <artifactId>pus</artifactId>

examples/replication1/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.yamcs.examples</groupId>
     <artifactId>examples</artifactId>
-    <version>5.5.4-SNAPSHOT</version>
+    <version>5.5.6-SNAPSHOT</version>
   </parent>
 
   <artifactId>replication1</artifactId>

examples/replication2/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.yamcs.examples</groupId>
     <artifactId>examples</artifactId>
-    <version>5.5.4-SNAPSHOT</version>
+    <version>5.5.6-SNAPSHOT</version>
   </parent>
 
   <artifactId>replication2</artifactId>

examples/replication3/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.yamcs.examples</groupId>
     <artifactId>examples</artifactId>
-    <version>5.5.4-SNAPSHOT</version>
+    <version>5.5.6-SNAPSHOT</version>
   </parent>
 
   <artifactId>replication3</artifactId>

examples/simulation/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.yamcs.examples</groupId>
     <artifactId>examples</artifactId>
-    <version>5.5.4-SNAPSHOT</version>
+    <version>5.5.6-SNAPSHOT</version>
   </parent>
 
   <artifactId>simulation</artifactId>

examples/simulation/src/main/yamcs/etc/yamcs.yaml

@@ -1,6 +1,8 @@
 # System-wide services
 services:
   - class: org.yamcs.http.HttpServer
+    args:
+       nThreads: 0
 
 #instances (or domains). One yarch database will be created for each of them 
 # instance specific properties go into the file yamcs.{instance}.yaml

examples/snippets/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.yamcs.examples</groupId>
     <artifactId>examples</artifactId>
-    <version>5.5.4-SNAPSHOT</version>
+    <version>5.5.6-SNAPSHOT</version>
   </parent>
 
   <artifactId>snippets</artifactId>

examples/templates/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.yamcs.examples</groupId>
     <artifactId>examples</artifactId>
-    <version>5.5.4-SNAPSHOT</version>
+    <version>5.5.6-SNAPSHOT</version>
   </parent>
 
   <artifactId>templates</artifactId>

packet-viewer/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.yamcs</groupId>
     <artifactId>yamcs</artifactId>
-    <version>5.5.4-SNAPSHOT</version>
+    <version>5.5.6-SNAPSHOT</version>
   </parent>
 
   <artifactId>packet-viewer</artifactId>

pom.xml

@@ -4,7 +4,7 @@
 
   <groupId>org.yamcs</groupId>
   <artifactId>yamcs</artifactId>
-  <version>5.5.4-SNAPSHOT</version>
+  <version>5.5.6-SNAPSHOT</version>
 
   <packaging>pom</packaging>
 
@@ -160,6 +160,11 @@
         <artifactId>janino</artifactId>
         <version>2.7.6</version>
       </dependency>
+      <dependency>
+        <groupId>org.mockito</groupId>
+        <artifactId>mockito-core</artifactId>
+        <version>4.0.0</version>
+      </dependency>
       <dependency>
         <groupId>org.python</groupId>
         <artifactId>jython-standalone</artifactId>

simulator/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.yamcs</groupId>
     <artifactId>yamcs</artifactId>
-    <version>5.5.4-SNAPSHOT</version>
+    <version>5.5.6-SNAPSHOT</version>
   </parent>
 
   <artifactId>simulator</artifactId>

yamcs-api/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.yamcs</groupId>
     <artifactId>yamcs</artifactId>
-    <version>5.5.4-SNAPSHOT</version>
+    <version>5.5.6-SNAPSHOT</version>
   </parent>
 
   <artifactId>yamcs-api</artifactId>

yamcs-api/src/main/proto/yamcs/protobuf/mdb/mdb.proto

@@ -294,9 +294,16 @@ message ArgumentMemberInfo {
   optional ArgumentTypeInfo type = 6;
 }
 
+message ParameterDimensionInfo {
+  optional int64 fixedValue = 1;
+  optional ParameterInfo parameter = 2;
+  optional int64 slope = 3;
+  optional int64 intercept = 4;
+}
+
 message ArrayInfo {
   optional ParameterTypeInfo type = 1;
-  optional int32 dimensions = 2;
+  repeated ParameterDimensionInfo dimensions = 3;
 }
 
 message UsedByInfo {

yamcs-api/src/main/proto/yamcs/protobuf/processing/processing.proto

@@ -318,6 +318,10 @@ message SetParameterValueRequest {
 
   // The new value.
   optional Value value = 4;
+
+  // The generation time of the value. If specified, must be a date
+  // string in ISO 8601 format.
+  optional google.protobuf.Timestamp generationTime = 5;
 }
 
 message BatchGetParameterValuesRequest {
@@ -342,6 +346,10 @@ message BatchSetParameterValuesRequest {
   message SetParameterValueRequest {
     optional NamedObjectId id = 1;
     optional Value value = 2;
+
+    // The generation time of the value. If specified, must be a date
+    // string in ISO 8601 format.
+    optional google.protobuf.Timestamp generationTime = 3;
   }
 
   // Yamcs instance name.

yamcs-client/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.yamcs</groupId>
     <artifactId>yamcs</artifactId>
-    <version>5.5.4-SNAPSHOT</version>
+    <version>5.5.6-SNAPSHOT</version>
   </parent>
 
   <artifactId>yamcs-client</artifactId>

yamcs-core/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.yamcs</groupId>
     <artifactId>yamcs</artifactId>
-    <version>5.5.4-SNAPSHOT</version>
+    <version>5.5.6-SNAPSHOT</version>
   </parent>
 
   <artifactId>yamcs-core</artifactId>
@@ -80,6 +80,11 @@
       <artifactId>jython-standalone</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <build>

yamcs-core/src/main/java/org/yamcs/http/HttpServer.java

@@ -136,6 +136,8 @@ public class HttpServer extends AbstractYamcsService {
     // we want to give the possiblity to make request-scoped instances
     private Map<String, Supplier<Handler>> extraHandlers = new HashMap<>();
 
+    private int nThreads;
+
     @Override
     public Spec getSpec() {
         Spec gpbSpec = new Spec();
@@ -191,6 +193,7 @@ public Spec getSpec() {
         spec.mutuallyExclusive("tlsKey", "bindings");
 
         spec.requireTogether("tlsCert", "tlsKey");
+        spec.addOption("nThreads", OptionType.INTEGER).withDefault(0);
         return spec;
     }
 
@@ -264,6 +267,7 @@ public void init(String yamcsInstance, String serviceName, YConfiguration config
                     HttpHeaderNames.AUTHORIZATION, HttpHeaderNames.ORIGIN);
             corsConfig = corsb.build();
         }
+        nThreads = config.getInt("nThreads");
 
         addApi(new AlarmsApi());
         addApi(new BucketsApi());
@@ -359,7 +363,7 @@ public void startServer() throws InterruptedException, SSLException, Certificate
 
         // Note that by default (i.e. with nThreads = 0), Netty will limit the number
         // of worker threads to 2*number of CPU cores
-        workerGroup = new NioEventLoopGroup(0,
+        workerGroup = new NioEventLoopGroup(nThreads,
                 new ThreadPerTaskExecutor(new DefaultThreadFactory("YamcsHttpServer")));
 
         for (Binding binding : bindings) {

yamcs-core/src/main/java/org/yamcs/http/api/ProcessingApi.java

@@ -280,6 +280,10 @@ public void setParameterValue(Context ctx, SetParameterValueRequest request, Obs
             pv = new PartialParameterValue(p, pid.getPath());
         }
         pv.setEngValue(v);
+        if (request.hasGenerationTime()) {
+            pv.setGenerationTime(TimeEncoding
+                    .fromProtobufTimestamp(request.getGenerationTime()));
+        }
         try {
             mgr.updateParameters(Arrays.asList(pv));
         } catch (IllegalArgumentException e) {
@@ -386,6 +390,10 @@ public void batchSetParameterValues(Context ctx, BatchSetParameterValuesRequest
                 pv = new PartialParameterValue(p, pid.getPath());
             }
             pv.setEngValue(ValueUtility.fromGpb(r.getValue()));
+            if (r.hasGenerationTime()) {
+                pv.setGenerationTime(TimeEncoding
+                        .fromProtobufTimestamp(r.getGenerationTime()));
+            }
             List<org.yamcs.parameter.ParameterValue> l = pvmap.computeIfAbsent(p.getDataSource(),
                     k -> new ArrayList<>());
             l.add(pv);