Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update RTC's Type #29

Merged
merged 3 commits into from
Dec 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 51 additions & 8 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@nasa-jpl/seq-json-schema",
"version": "1.1.0",
"version": "1.2.0",
"license": "MIT",
"type": "module",
"repository": {
Expand Down
14 changes: 10 additions & 4 deletions schema.json
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down Expand Up @@ -34,7 +34,7 @@
"description": "Onboard path and filename of sequence to be loaded."
},
"type": {
"const": "activate"
"const": "immediate_activate"
}
},
"required": ["sequence", "type"],
Expand Down Expand Up @@ -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"],
Expand Down Expand Up @@ -284,7 +290,7 @@
"description": "Onboard path and filename of sequence to be loaded."
},
"type": {
"const": "load"
"const": "immediate_load"
}
},
"required": ["sequence", "type"],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@
"args": [],
"time": {
"type": "COMMAND_COMPLETE"
}
},
"type": "immediate_command"
}
]
}
2 changes: 1 addition & 1 deletion test/invalid-seq-json/immediate-load-with-time.seq.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
14 changes: 11 additions & 3 deletions test/valid-seq-json/rtc.seq.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,13 @@
"metadata": {
"processor": "VC1A"
},
"models": [
{
"offset": "00:10:00.000",
"variable": "model_var_float",
"value": "1.62"
}
],
"args": []
},
{
Expand All @@ -42,8 +49,9 @@
"metadata": {
"processor": "VC1A"
},

"args": [],
"type": "command"
"type": "immediate_command"
},
{
"args": [
Expand All @@ -63,7 +71,7 @@
}
],
"sequence": "d:/eng/test.mod",
"type": "activate",
"type": "immediate_activate",
"metadata": {
"metadata_arg": "metadata_value"
}
Expand All @@ -86,7 +94,7 @@
}
],
"sequence": "d:/eng/test.mod",
"type": "load",
"type": "immediate_load",
"metadata": {
"metadata_arg": "metadata_value"
}
Expand Down
Loading