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

Initial command implementation for odin-data. #372

Closed
wants to merge 19 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
86c25d1
Implemented execute and requestCommand control interface in the Frame…
ajgdls Sep 13, 2024
03168c3
Implemented a command in DummyUDPProcessPlugin and tests to verify th…
ajgdls Sep 20, 2024
004b15e
Merge pull request #359 from odin-detector/commands
ajgdls Oct 10, 2024
f24ff1f
Update ipc_tornado_client to correctly manage rejected messages.
ajgdls Nov 15, 2023
68ab94e
implement request_commands and execute_commands for IpcTornadoClient
jsouter Nov 20, 2024
588ce87
Move start_writing and stop_writing logic in FileWriterPlugin to execute
jsouter Oct 24, 2024
bafd2d3
Change integration test to use new start_writing command for FP
jsouter Nov 21, 2024
748f8dd
log error and set_nack on reply when invalid command requested in Fil…
jsouter Nov 21, 2024
9381a6e
Store reject command requests in IpcTornadoClient
jsouter Nov 22, 2024
50faf9e
Renamed FILE_NAME to FILE_PREFIX in the file writer application.
ajgdls Nov 15, 2023
2d78697
Rename decoder parameter from name to class
jsouter Sep 19, 2024
4bfa217
Implement ParameterTree for odin data adapters
ajgdls Nov 15, 2023
52dd958
Update meta adapter to work with new OdinDataAdapter
GDYendell Aug 15, 2024
a402532
Fix ParameterTreeError response typo
jsouter Sep 19, 2024
2a0ba88
Create FrameProcessorController and FrameReceiverController and Adapters
jsouter Sep 19, 2024
ee40c5e
Add devcontainer (#341)
gilesknap Jun 6, 2024
fa6b765
Update container deployment
GDYendell Jun 10, 2024
a99f971
Update odin-control URL to avoid spurious version conflicts
GDYendell Oct 14, 2024
0ea6141
Initial implementation for generic command handling.
ajgdls Nov 29, 2024
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
Prev Previous commit
Next Next commit
Renamed FILE_NAME to FILE_PREFIX in the file writer application.
  • Loading branch information
ajgdls authored and GDYendell committed Nov 27, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
commit 50faf9e4cd1915d8136ed4f1f7321a6c5bb7db31
2 changes: 1 addition & 1 deletion cpp/frameProcessor/include/FileWriterPlugin.h
Original file line number Diff line number Diff line change
@@ -86,7 +86,7 @@ class FileWriterPlugin : public FrameProcessorPlugin
/** Configuration constant for file related items */
static const std::string CONFIG_FILE;
/** Configuration constant for file name */
static const std::string CONFIG_FILE_NAME;
static const std::string CONFIG_FILE_PREFIX;
/** Configuration constant for using automatic file name numbering */
static const std::string CONFIG_FILE_USE_NUMBERS;
/** Configuration constant for starting file number if using numbering */
10 changes: 5 additions & 5 deletions cpp/frameProcessor/src/FileWriterPlugin.cpp
Original file line number Diff line number Diff line change
@@ -33,7 +33,7 @@ const std::string FileWriterPlugin::CONFIG_PROCESS_ALIGNMENT_THRESHOLD = "alignm
const std::string FileWriterPlugin::CONFIG_PROCESS_ALIGNMENT_VALUE = "alignment_value";

const std::string FileWriterPlugin::CONFIG_FILE = "file";
const std::string FileWriterPlugin::CONFIG_FILE_NAME = "name";
const std::string FileWriterPlugin::CONFIG_FILE_PREFIX = "prefix";
const std::string FileWriterPlugin::CONFIG_FILE_USE_NUMBERS = "use_numbers";
const std::string FileWriterPlugin::CONFIG_FILE_NUMBER_START = "first_number";
const std::string FileWriterPlugin::CONFIG_FILE_POSTFIX = "postfix";
@@ -364,7 +364,7 @@ void FileWriterPlugin::requestConfiguration(OdinData::IpcMessage& reply)

std::string file_str = get_name() + "/" + FileWriterPlugin::CONFIG_FILE + "/";
reply.set_param(file_str + FileWriterPlugin::CONFIG_FILE_PATH, next_acquisition_->file_path_);
reply.set_param(file_str + FileWriterPlugin::CONFIG_FILE_NAME, next_acquisition_->configured_filename_);
reply.set_param(file_str + FileWriterPlugin::CONFIG_FILE_PREFIX, next_acquisition_->configured_filename_);
reply.set_param(file_str + FileWriterPlugin::CONFIG_FILE_USE_NUMBERS, use_file_numbering_);
reply.set_param(file_str + FileWriterPlugin::CONFIG_FILE_NUMBER_START, first_file_index_);
reply.set_param(file_str + FileWriterPlugin::CONFIG_FILE_POSTFIX, file_postfix_);
@@ -524,7 +524,7 @@ void FileWriterPlugin::configure_process(OdinData::IpcMessage& config, OdinData:
* This sets up the file writer plugin according to the configuration IpcMessage
* objects that are received. The options are searched for:
* CONFIG_FILE_PATH - Sets the path of the file to write to
* CONFIG_FILE_NAME - Sets the filename of the file to write to
* CONFIG_FILE_PREFIX - Sets the filename of the file to write to
*
* The configuration is not applied if the writer is currently writing.
*
@@ -568,8 +568,8 @@ void FileWriterPlugin::configure_file(OdinData::IpcMessage& config, OdinData::Ip
reply.set_nack(ss.str());
}
}
if (config.has_param(FileWriterPlugin::CONFIG_FILE_NAME)) {
this->next_acquisition_->configured_filename_ = config.get_param<std::string>(FileWriterPlugin::CONFIG_FILE_NAME);
if (config.has_param(FileWriterPlugin::CONFIG_FILE_PREFIX)) {
this->next_acquisition_->configured_filename_ = config.get_param<std::string>(FileWriterPlugin::CONFIG_FILE_PREFIX);
LOG4CXX_DEBUG_LEVEL(1, logger_, "Next file name changed to " << this->next_acquisition_->configured_filename_);
}
if (config.has_param(FileWriterPlugin::CONFIG_FILE_USE_NUMBERS)) {