Skip to content

Commit

Permalink
Merge pull request #7 from sdr-enthusiasts/Error-checking-fixes,-OOOI…
Browse files Browse the repository at this point in the history
…,-Sub-label-and-last-bit-of-ACARS-decoding

Error checking fixes, oooi, sub label and last bit of acars decoding
  • Loading branch information
fredclausen authored May 26, 2023
2 parents 6975704 + 791ae80 commit 0981f2d
Show file tree
Hide file tree
Showing 9 changed files with 425 additions and 216 deletions.
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ members = [

[workspace.package]
edition = "2021"
version = "0.1.1"
version = "0.1.2"
authors = ["Fred Clausen"]
description = "ACARS Oxide. A utility to receive, via librtlsdr and RTL-SDR dongle(s), ACARS and VDLM2 messages."
documentation = "https://github.com/sdr-enthusiasts/acars-oxide"
Expand Down
5 changes: 4 additions & 1 deletion rust/oxide-bin/src/main.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (C) 2023 Fred Clausen
// Copyright (C) 2023 Fred Clausen

// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
Expand Down Expand Up @@ -29,6 +29,9 @@ use tokio::time::{sleep, Duration};
async fn main() {
let args: OxideInput = OxideInput::parse();
args.logging.enable_logging();
// print current version
info!("ACARS Oxide v{}", env!("CARGO_PKG_VERSION"));

debug!(
"Starting ACARS Oxide with the following options: {:#?}",
args
Expand Down
18 changes: 9 additions & 9 deletions rust/oxide-config/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ const MAX_GAIN: f32 = 60.0;
about,
long_about = "ACARS Oxide is a program that allows you to receive and decode ACARS and VDLM2 messages."
)]
// Copyright (C) 2023 Fred Clausen
// Copyright (C) 2023 Fred Clausen

// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
Expand Down Expand Up @@ -71,7 +71,7 @@ pub struct OxideInput {
long,
env = "AO_SDR1GAIN",
value_parser = parse_sdr_gain,
default_value = "60",
default_value = "42",
hide = true,
requires = "sdr1serial"
)]
Expand Down Expand Up @@ -137,7 +137,7 @@ pub struct OxideInput {
long,
env = "AO_SDR2GAIN",
value_parser = parse_sdr_gain,
default_value = "60",
default_value = "42",
hide = true,
requires = "sdr2serial"
)]
Expand Down Expand Up @@ -203,7 +203,7 @@ pub struct OxideInput {
long,
env = "AO_SDR3GAIN",
value_parser = parse_sdr_gain,
default_value = "60",
default_value = "42",
hide = true,
requires = "sdr3serial"
)]
Expand Down Expand Up @@ -269,7 +269,7 @@ pub struct OxideInput {
long,
env = "AO_SDR4GAIN",
value_parser = parse_sdr_gain,
default_value = "60",
default_value = "42",
hide = true,
requires = "sdr4serial"
)]
Expand Down Expand Up @@ -335,7 +335,7 @@ pub struct OxideInput {
long,
env = "AO_SDR5GAIN",
value_parser = parse_sdr_gain,
default_value = "60",
default_value = "42",
hide = true,
requires = "sdr5serial"
)]
Expand Down Expand Up @@ -401,7 +401,7 @@ pub struct OxideInput {
long,
env = "AO_SDR6GAIN",
value_parser = parse_sdr_gain,
default_value = "60",
default_value = "42",
hide = true,
requires = "sdr6serial"
)]
Expand Down Expand Up @@ -467,7 +467,7 @@ pub struct OxideInput {
long,
env = "AO_SDR7GAIN",
value_parser = parse_sdr_gain,
default_value = "60",
default_value = "42",
hide = true,
requires = "sdr7serial"
)]
Expand Down Expand Up @@ -533,7 +533,7 @@ pub struct OxideInput {
long,
env = "AO_SDR8GAIN",
value_parser = parse_sdr_gain,
default_value = "60",
default_value = "42",
hide = true,
requires = "sdr8serial"
)]
Expand Down
Loading

0 comments on commit 0981f2d

Please sign in to comment.