lfg2025/archy
1
0
Fork 0
Code Issues 24 Pull Requests 4 Actions Packages Projects Releases 71 Wiki Activity

style: cargo fmt (rnode_settings)

Browse Source 
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
archipelago
2026-08-06 10:49:15 -04:00
co-authored by Claude Fable 5
parent ee9dde9936
commit dfe027a5f3
1 changed files with 39 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/archipelago/src/mesh/rnode_settings.rs
+39 -12
View File
@@ -117,7 +117,10 @@ impl RNodeRfSettings {
bail!("coding rate {} is outside 5–8", self.coding_rate);
}
if self.txpower > 22 {
bail!("tx power {} dBm is above the 22 dBm RNode maximum", self.txpower);
bail!(
"tx power {} dBm is above the 22 dBm RNode maximum",
self.txpower
);
}
for (label, v) in [
("airtime_limit_short", self.airtime_limit_short),
@@ -133,9 +136,9 @@ impl RNodeRfSettings {
// Same shape the flasher accepts: an absolute device node. Keeps
// shell-metacharacter garbage out of the sidecar's argv.
if !port.starts_with("/dev/")
|| port
.chars()
.any(|c| !(c.is_ascii_alphanumeric() || c == '/' || c == '_' || c == '-' || c == '.'))
|| port.chars().any(|c| {
!(c.is_ascii_alphanumeric() || c == '/' || c == '_' || c == '-' || c == '.')
})
{
bail!("port must be an absolute /dev device path");
}
@@ -345,14 +348,38 @@ mod tests {
fn out_of_range_values_are_rejected() {
let base = RNodeRfSettings::default();
for bad in [
RNodeRfSettings { frequency: 100, ..base.clone() },
RNodeRfSettings { bandwidth: 123_456, ..base.clone() },
RNodeRfSettings { spreading_factor: 4, ..base.clone() },
RNodeRfSettings { coding_rate: 9, ..base.clone() },
RNodeRfSettings { txpower: 23, ..base.clone() },
RNodeRfSettings { airtime_limit_short: Some(180.0), ..base.clone() },
RNodeRfSettings { port: Some("ttyACM0".into()), ..base.clone() },
RNodeRfSettings { port: Some("/dev/tty; rm -rf /".into()), ..base.clone() },
RNodeRfSettings {
frequency: 100,
..base.clone()
},
RNodeRfSettings {
bandwidth: 123_456,
..base.clone()
},
RNodeRfSettings {
spreading_factor: 4,
..base.clone()
},
RNodeRfSettings {
coding_rate: 9,
..base.clone()
},
RNodeRfSettings {
txpower: 23,
..base.clone()
},
RNodeRfSettings {
airtime_limit_short: Some(180.0),
..base.clone()
},
RNodeRfSettings {
port: Some("ttyACM0".into()),
..base.clone()
},
RNodeRfSettings {
port: Some("/dev/tty; rm -rf /".into()),
..base.clone()
},
] {
assert!(bad.validate().is_err(), "{bad:?} should fail validation");
}