sjg/trx-rs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[fix](trx-client): use default remote name in config

Browse Source 
Use the remote short name for the HTTP frontend default selection and
keep `default_rig_id` as a serde alias for backward compatibility.

Co-authored-by: OpenAI Codex <noreply@openai.com>
Signed-off-by: Stan Grams <sjg@haxx.space>
This commit is contained in:
Stan Grams
2026-03-23 21:54:37 +01:00
parent 9cd172ce64
commit 2db13da706
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/trx-client/src/config.rs
+6 -5
View File
@@ -269,7 +269,8 @@ pub struct HttpFrontendConfig {
/// Listen port /// Listen port
pub port: u16, pub port: u16,
/// Default rig selected in the web UI on startup. /// Default rig selected in the web UI on startup.
pub default_rig_id: Option<String>, #[serde(alias = "default_rig_id")]
pub default_rig_name: Option<String>,
/// Initial zoom level for the APRS map when receiver coordinates are known. /// Initial zoom level for the APRS map when receiver coordinates are known.
pub initial_map_zoom: u8, pub initial_map_zoom: u8,
/// Spectrum center-retune guard margin on each side of the selected bandwidth. /// Spectrum center-retune guard margin on each side of the selected bandwidth.
@@ -292,7 +293,7 @@ impl Default for HttpFrontendConfig {
enabled: true, enabled: true,
listen: IpAddr::from([127, 0, 0, 1]), listen: IpAddr::from([127, 0, 0, 1]),
port: 8080, port: 8080,
default_rig_id: None, default_rig_name: None,
initial_map_zoom: 10, initial_map_zoom: 10,
spectrum_coverage_margin_hz: 50_000, spectrum_coverage_margin_hz: 50_000,
spectrum_usable_span_ratio: 0.92, spectrum_usable_span_ratio: 0.92,
@@ -479,10 +480,10 @@ impl ClientConfig {
if self.frontends.http.enabled && self.frontends.http.port == 0 { if self.frontends.http.enabled && self.frontends.http.port == 0 {
return Err("[frontends.http].port must be > 0 when enabled".to_string()); return Err("[frontends.http].port must be > 0 when enabled".to_string());
} }
if let Some(rig_id) = &self.frontends.http.default_rig_id { if let Some(rig_id) = &self.frontends.http.default_rig_name {
if rig_id.trim().is_empty() { if rig_id.trim().is_empty() {
return Err( return Err(
"[frontends.http].default_rig_id must not be empty when set".to_string() "[frontends.http].default_rig_name must not be empty when set".to_string()
); );
} }
} }
@@ -623,7 +624,7 @@ impl ClientConfig {
enabled: true, enabled: true,
listen: IpAddr::from([127, 0, 0, 1]), listen: IpAddr::from([127, 0, 0, 1]),
port: 8080, port: 8080,
default_rig_id: Some("home-hf".to_string()), default_rig_name: Some("home-hf".to_string()),
initial_map_zoom: 10, initial_map_zoom: 10,
spectrum_coverage_margin_hz: 50_000, spectrum_coverage_margin_hz: 50_000,
spectrum_usable_span_ratio: 0.92, spectrum_usable_span_ratio: 0.92,
src/trx-client/src/main.rs
+1 -1
View File
@@ -223,7 +223,7 @@ async fn async_init() -> DynResult<AppState> {
let default_rig = cli let default_rig = cli
.rig_id .rig_id
.clone() .clone()
.or_else(|| cfg.frontends.http.default_rig_id.clone()) .or_else(|| cfg.frontends.http.default_rig_name.clone())
.or_else(|| resolved_remotes.first().map(|e| e.name.clone())); .or_else(|| resolved_remotes.first().map(|e| e.name.clone()));
if let Ok(mut guard) = frontend_runtime.remote_active_rig_id.lock() { if let Ok(mut guard) = frontend_runtime.remote_active_rig_id.lock() {
*guard = default_rig.clone(); *guard = default_rig.clone();