Update RTC's Type (#29)

* Update package version * Updated the schema * update types to immediate_load, immediate_activate, immediate_command * remove model from immediate_load and imediate_activate * Update test
NASA-AMMOS · Dec 9, 2024 · d44ba82 · d44ba82
1 parent 3d4fddd
commit d44ba82
Show file tree

Hide file tree

Showing 7 changed files with 77 additions and 19 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nasa-jpl/seq-json-schema",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "license": "MIT",
   "type": "module",
   "repository": {

diff --git a/schema.json b/schema.json
@@ -1,5 +1,5 @@
 {
-  "$id": "https://github.com/NASA-AMMOS/seq-json-schema/tree/v1.1.0",
+  "$id": "https://github.com/NASA-AMMOS/seq-json-schema/tree/v1.2.0",
   "$schema": "https://json-schema.org/draft/2020-12/schema",
   "$defs": {
     "immediate_activate": {
@@ -34,7 +34,7 @@
           "description": "Onboard path and filename of sequence to be loaded."
         },
         "type": {
-          "const": "activate"
+          "const": "immediate_activate"
         }
       },
       "required": ["sequence", "type"],
@@ -120,12 +120,18 @@
         "metadata": {
           "$ref": "#/$defs/metadata"
         },
+        "models": {
+          "items": {
+            "$ref": "#/$defs/model"
+          },
+          "type": "array"
+        },
         "stem": {
           "type": "string",
           "description": "Command stem"
         },
         "type": {
-          "const": "command"
+          "const": "immediate_command"
         }
       },
       "required": ["stem", "args"],
@@ -284,7 +290,7 @@
           "description": "Onboard path and filename of sequence to be loaded."
         },
         "type": {
-          "const": "load"
+          "const": "immediate_load"
         }
       },
       "required": ["sequence", "type"],

diff --git a/test/invalid-seq-json/immediate-activate-with-time.seq.json b/test/invalid-seq-json/immediate-activate-with-time.seq.json
@@ -6,7 +6,7 @@
       "args": [],
       "sequence": "d:/eng/test.mod",
       "description": "immediate activate with time field",
-      "type": "activate",
+      "type": "immediate_activate",
       "time": {
         "type": "COMMAND_RELATIVE"
       }

diff --git a/test/invalid-seq-json/immediate-command-with-time.seq.json b/test/invalid-seq-json/immediate-command-with-time.seq.json
@@ -11,7 +11,8 @@
       "args": [],
       "time": {
         "type": "COMMAND_COMPLETE"
-      }
+      },
+      "type": "immediate_command"
     }
   ]
 }
diff --git a/test/invalid-seq-json/immediate-load-with-time.seq.json b/test/invalid-seq-json/immediate-load-with-time.seq.json
@@ -6,7 +6,7 @@
       "args": [],
       "sequence": "d:/eng/test.mod",
       "description": "immediate load with time field",
-      "type": "load",
+      "type": "immediate_load",
       "time": {
         "type": "COMMAND_RELATIVE"
       }

diff --git a/test/valid-seq-json/rtc.seq.json b/test/valid-seq-json/rtc.seq.json
@@ -34,6 +34,13 @@
       "metadata": {
         "processor": "VC1A"
       },
+      "models": [
+        {
+          "offset": "00:10:00.000",
+          "variable": "model_var_float",
+          "value": "1.62"
+        }
+      ],
       "args": []
     },
     {
@@ -42,8 +49,9 @@
       "metadata": {
         "processor": "VC1A"
       },
+
       "args": [],
-      "type": "command"
+      "type": "immediate_command"
     },
     {
       "args": [
@@ -63,7 +71,7 @@
         }
       ],
       "sequence": "d:/eng/test.mod",
-      "type": "activate",
+      "type": "immediate_activate",
       "metadata": {
         "metadata_arg": "metadata_value"
       }
@@ -86,7 +94,7 @@
         }
       ],
       "sequence": "d:/eng/test.mod",
-      "type": "load",
+      "type": "immediate_load",
       "metadata": {
         "metadata_arg": "metadata_value"
       }