Implement sequences #12
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,187 @@ | ||
| { | ||
| "$schema": "http://json-schema.org/draft-07/schema", | ||
| "$defs": { | ||
| "setParam": { | ||
| "type": "object", | ||
| "additionalProperties": false, | ||
| "required": [ | ||
| "timestamp", | ||
| "param", | ||
| "value" | ||
| ], | ||
| "properties": { | ||
| "timestamp": { | ||
| "type": "number" | ||
| }, | ||
| "param": { | ||
| "type": "string" | ||
| }, | ||
| "value": { | ||
| "type": "number" | ||
| } | ||
| } | ||
| }, | ||
| "holdcondition": { | ||
| "type": "object", | ||
| "additionalProperties": false, | ||
| "required": [ | ||
| "field", | ||
| "is", | ||
| "value" | ||
| ], | ||
| "properties": { | ||
| "field": { | ||
| "type": "string" | ||
| }, | ||
| "is": { | ||
| "enum": [ | ||
| "equal", | ||
| "not_eq", | ||
| "less", | ||
| "less_eq", | ||
| "greater", | ||
| "greater_eq" | ||
| ] | ||
| }, | ||
| "value": { | ||
| "type": "number" | ||
| } | ||
| } | ||
| } | ||
| }, | ||
| "title": "FerroFlow-Sequence", | ||
| "type": "object", | ||
| "additionalProperties": false, | ||
| "required": [ | ||
| "name", | ||
| "globals", | ||
| "steps" | ||
| ], | ||
| "properties": { | ||
| "$schema": { | ||
| "type": "string" | ||
| }, | ||
| "name": { | ||
| "type": "string" | ||
| }, | ||
| "globals": { | ||
| "type": "object", | ||
| "additionalProperties": false, | ||
| "required": [ | ||
| "start_time", | ||
| "end_time", | ||
| "interpolations", | ||
| "interpolation_interval" | ||
| ], | ||
| "properties": { | ||
| "start_time": { | ||
| "type": "number" | ||
| }, | ||
| "end_time": { | ||
| "type": "number" | ||
| }, | ||
| "interpolation_interval": { | ||
| "type": "number", | ||
| "exclusiveMinimum": 0 | ||
| }, | ||
| "interpolations": { | ||
| "type": "object", | ||
| "patternProperties": { | ||
| "^.+$": { | ||
| "type": "string", | ||
| "enum": [ | ||
| "linear", | ||
| "none" | ||
| ] | ||
| } | ||
| } | ||
| } | ||
| } | ||
| }, | ||
| "steps": { | ||
| "type": "array", | ||
| "items": { | ||
| "anyOf": [ | ||
| { | ||
| "type": "object", | ||
| "additionalProperties": false, | ||
| "required": [ | ||
| "name", | ||
| "timestamp", | ||
| "hold" | ||
| ], | ||
| "properties": { | ||
| "name": { | ||
| "type": "string" | ||
| }, | ||
| "description": { | ||
| "type": "string" | ||
| }, | ||
| "timestamp": { | ||
| "type": "number" | ||
| }, | ||
| "hold": { | ||
| "type": "array", | ||
| "minItems": 1, | ||
| "items": { | ||
| "$ref": "#/$defs/holdcondition" | ||
| } | ||
| } | ||
| } | ||
| }, | ||
| { | ||
| "type": "object", | ||
| "additionalProperties": false, | ||
| "required": [ | ||
| "name", | ||
| "timestamp", | ||
| "hold" | ||
| ], | ||
| "properties": { | ||
| "name": { | ||
| "type": "string" | ||
| }, | ||
| "description": { | ||
| "type": "string" | ||
| }, | ||
| "timestamp": { | ||
| "type": "number" | ||
| }, | ||
| "hold": { | ||
| "type": "string", | ||
| "const": "always" | ||
| } | ||
| } | ||
| }, | ||
| { | ||
| "type": "object", | ||
| "additionalProperties": false, | ||
| "required": [ | ||
| "name", | ||
| "timestamp", | ||
| "set_params" | ||
| ], | ||
| "properties": { | ||
| "name": { | ||
| "type": "string" | ||
| }, | ||
| "description": { | ||
| "type": "string" | ||
| }, | ||
| "timestamp": { | ||
| "type": "number" | ||
| }, | ||
| "set_params": { | ||
| "type": "array", | ||
| "minItems": 1, | ||
| "items": { | ||
| "$ref": "#/$defs/setParam" | ||
| } | ||
| } | ||
| } | ||
| } | ||
| ] | ||
| } | ||
| } | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,88 +1,77 @@ | ||
| //! Code for managing and running sequences. | ||
|
|
||
| mod sequence_builder; | ||
| mod sequence_definition; | ||
| mod sequence_runner; | ||
| mod sequence_validation; | ||
|
|
||
| use std::path::Path; | ||
|
|
||
| use crate::{ | ||
| events, | ||
| sequence::{ | ||
| sequence_definition::Sequence, | ||
| sequence_runner::{SequenceCmd, SequenceRunner}, | ||
| }, | ||
| }; | ||
|
|
||
| pub fn spawn_sequence_runner_thread<'scope>( | ||
| event_dispatcher: &'scope events::EventDispatcher, | ||
| scope: &'scope std::thread::Scope<'scope, '_>, | ||
| ) { | ||
| scope.spawn(move || { | ||
| let (tx, rx) = std::sync::mpsc::channel::<events::Event>(); | ||
| event_dispatcher.subscribe(tx, "Sequence Runner thread"); | ||
| let mut sequence_runner = SequenceRunner::new(event_dispatcher, scope); | ||
|
|
||
| while let Ok(event) = rx.recv() { | ||
| match event { | ||
| events::Event::Shutdown => { | ||
| sequence_runner.control_sequence(SequenceCmd::Shutdown); | ||
| break; | ||
| } | ||
| events::Event::StartSequence { | ||
| seq_name, | ||
| abort_seq_name, | ||
| } => { | ||
| // TODO: replace with loading sequences from the frontend | ||
| let seq_dir = Path::new(env!("CARGO_MANIFEST_DIR")).join("sequences"); | ||
| let seq = Sequence::load_from_path(&seq_dir.join(&seq_name)); | ||
| let abort_seq = Sequence::load_from_path(&seq_dir.join(&abort_seq_name)); | ||
|
Comment on lines
+33
to
+40
Member
There was a problem hiding this comment. Can you change the StartSequence Event to take the actual sequence string instead of path? Because that's how it's going to work with the socket later on and it shouldn't really change anything for the tests |
||
|
|
||
| let seq = match seq { | ||
| Ok(seq) => seq, | ||
| Err(err) => { | ||
| eprintln!("Error while loading sequence '{seq_name}': {err:#}"); | ||
| continue; | ||
| } | ||
| }; | ||
| let abort_seq = match abort_seq { | ||
| Ok(abort_seq) => abort_seq, | ||
| Err(err) => { | ||
| eprintln!( | ||
| "Error while loading abort sequence '{abort_seq_name}': {err:#}" | ||
| ); | ||
| continue; | ||
| } | ||
| }; | ||
|
|
||
| let result = sequence_runner.run_sequence(seq, abort_seq); | ||
| if let Err(err) = result { | ||
| eprintln!("Error while running sequence: {err:#}"); | ||
| } | ||
| } | ||
| events::Event::PauseSequence => { | ||
| sequence_runner.control_sequence(SequenceCmd::Pause) | ||
| } | ||
| events::Event::ResumeSequence => { | ||
| sequence_runner.control_sequence(SequenceCmd::Resume) | ||
| } | ||
| events::Event::AbortSequence => { | ||
| sequence_runner.control_sequence(SequenceCmd::Abort) | ||
| } | ||
| _ => continue, | ||
| }; | ||
| } | ||
| }); | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.