Skip to content

Warn if parameter/command IDs conflict and skip them #2

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.

Sign up for GitHub

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

Merged
xpromache merged 2 commits into from
Jul 31, 2026
+14 −2
Merged

Warn if parameter/command IDs conflict and skip them #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6a14cc8
Bugfix: overriding of parameter/command definitions
Jul 10, 2026
28136be
Bump ygw version
Jul 29, 2026
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
2 changes: 1 addition & 1 deletion ygw/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "ygw"
version = "0.8.0"
version = "0.8.1"
edition = "2021"
license = "MIT"
description = "The goal of Yamcs Gateway is to allow Yamcs to control instruments/payloads as part of an EGSE."
Expand Down
14 changes: 13 additions & 1 deletion ygw/src/ygw_server.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ impl Server {
/// * One acceptor task for accepting Yamcs connections.
/// * One encoder task for encoding messages from nodes and sending them to Yamcs
/// * One decoder task for decoding messages from Yamcs and sending them to nodes
///
///
///
pub async fn start(mut self) -> Result<ServerHandle> {
let mut node_tx_map = HashMap::new();
Expand Down Expand Up @@ -396,6 +396,12 @@ async fn encoder_task(
YgwMessage::ParameterDefinitions(addr, pdefs) => {
if let Some(node) = nodes.get_mut(&addr.node_id()) {
for def in pdefs.definitions {
// If there exists a parameter with the same ID but a different relative name, we don't want to override it
if let Some(other_with_same_id) = node.para_defs.definitions.iter().find(|x| x.relative_name != def.relative_name && x.id == def.id) {
log::warn!("Parameter {} with ID {} would override existing parameter {} with same ID, not updating it", def.relative_name, def.id, other_with_same_id.relative_name);
continue;
}

if let Some(pos) = node.para_defs.definitions.iter().position(|x| x.relative_name == def.relative_name) {
node.para_defs.definitions[pos] = def;
} else {
Expand All @@ -417,6 +423,12 @@ async fn encoder_task(
YgwMessage::CommandDefinitions(addr, cmd_defs) => {
if let Some(node) = nodes.get_mut(&addr.node_id()) {
for def in cmd_defs.definitions {
// If there exists a command with the same ID but a different relative name, we don't want to override it
if let Some(other_with_same_id) = node.cmd_defs.definitions.iter().find(|x| x.relative_name != def.relative_name && x.ygw_cmd_id == def.ygw_cmd_id) {
log::warn!("Command {} with ID {} would override existing command {} with same ID, not updating it", def.relative_name, def.ygw_cmd_id, other_with_same_id.relative_name);
continue;
}

if let Some(pos) = node.cmd_defs.definitions.iter().position(|x| x.relative_name == def.relative_name) {
node.cmd_defs.definitions[pos] = def;
} else {
Expand Down