Skip to content

Fix command-line processing of p/P option. #7

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

Open
wants to merge 3 commits into
base: dev
Choose a base branch
from
Open

Fix command-line processing of p/P option. #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cf88718
Fix command-line processing of p/P option.
mutability Oct 6, 2022
45760bb
More p/P fixes
mutability Oct 6, 2022
f71f645
More different p/P fixes
mutability Oct 6, 2022
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
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ The available settings are:
* i/I: FEC enabled / FEC disabled
* j/J: Mode A/C disabled / Mode A/C enabled
* k/K: no special filtering / do not send DF0/4/5 (only in Beast-Classic mode)
* p/P: disable/enable position-message reporting (only in Radarcape mode)

The h/H setting is understood but ignored; hardware flow control is always
used.
Expand Down
17 changes: 14 additions & 3 deletions beast_settings.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ namespace beast {

Settings::Settings(std::uint8_t b) : radarcape(true), binary_format((b & 0x01) != 0), filter_11_17_18((b & 0x02) != 0), avrmlat((b & 0x04) != 0), crc_disable((b & 0x08) != 0), gps_timestamps((b & 0x10) != 0), rts_handshake((b & 0x20) != 0), fec_disable((b & 0x40) != 0), modeac_enable((b & 0x80) != 0) {}

Settings::Settings(const modes::Filter &filter) : filter_11_17_18(true), crc_disable(filter.receive_bad_crc), gps_timestamps(filter.receive_gps_timestamps), fec_disable(!filter.receive_fec), modeac_enable(filter.receive_modeac), filter_0_4_5(!filter.receive_df[0] && !filter.receive_df[4] && filter.receive_df[5]) {
Settings::Settings(const modes::Filter &filter) : filter_11_17_18(true), crc_disable(filter.receive_bad_crc), gps_timestamps(filter.receive_gps_timestamps), fec_disable(!filter.receive_fec), modeac_enable(filter.receive_modeac), filter_0_4_5(!filter.receive_df[0] && !filter.receive_df[4] && filter.receive_df[5]), position_enable(filter.receive_positions) {
for (auto i = 0; i < 32; ++i) {
if (filter.receive_df[i] && i != 11 && i != 17 && i != 18) {
filter_11_17_18 = false;
Expand Down Expand Up @@ -118,13 +118,21 @@ namespace beast {
case 'V':
verbatim = true;
break;
case 'p':
position_enable = false;
break;
case 'P':
position_enable = true;
break;
}
}

// ensure settings are selfconsistent
if (radarcape.off() && !gps_timestamps.dontcare())
gps_timestamps = false;
else if (radarcape.on() && !filter_0_4_5.dontcare())
if (radarcape.off() && !position_enable.dontcare())
position_enable = false;
if (radarcape.on() && !filter_0_4_5.dontcare())
filter_0_4_5 = false;
}

Expand All @@ -141,6 +149,7 @@ namespace beast {
s.filter_0_4_5 |= other.filter_0_4_5;
s.radarcape |= other.radarcape;
s.verbatim |= other.verbatim;
s.position_enable |= other.position_enable;
return s;
}

Expand Down Expand Up @@ -209,6 +218,7 @@ namespace beast {
add_setting(msg, fec_disable);
add_setting(msg, modeac_enable);
add_setting(msg, verbatim);
// p/P is not a real setting

return msg;
}
Expand All @@ -226,12 +236,13 @@ namespace beast {
s.radarcape = (bool)radarcape;
s.filter_0_4_5 = (bool)filter_0_4_5;
s.verbatim = (bool)verbatim;
s.position_enable = (bool)position_enable;
return s;
}

bool Settings::operator==(const Settings &other) const {
return radarcape == other.radarcape && binary_format == other.binary_format && filter_11_17_18 == other.filter_11_17_18 && avrmlat == other.avrmlat && crc_disable == other.crc_disable && gps_timestamps == other.gps_timestamps && rts_handshake == other.rts_handshake && fec_disable == other.fec_disable && modeac_enable == other.modeac_enable && filter_0_4_5 == other.filter_0_4_5 && position_enable == other.position_enable && verbatim == other.verbatim;
}

std::ostream &operator<<(std::ostream &os, const Settings &s) { return (os << s.radarcape << s.binary_format << s.filter_11_17_18 << s.avrmlat << s.crc_disable << s.gps_timestamps << s.rts_handshake << s.fec_disable << s.modeac_enable << s.filter_0_4_5 << s.verbatim); }
std::ostream &operator<<(std::ostream &os, const Settings &s) { return (os << s.radarcape << s.binary_format << s.filter_11_17_18 << s.avrmlat << s.crc_disable << s.gps_timestamps << s.rts_handshake << s.fec_disable << s.modeac_enable << s.filter_0_4_5 << s.verbatim << s.position_enable); }
}; // namespace beast
2 changes: 1 addition & 1 deletion splitter_main.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ namespace beast {
po::validators::check_first_occurrence(v);
const std::string &s = po::validators::get_single_string(values);

static const boost::regex r("[cdefghijbrvCDEFGHIJBRV]*");
static const boost::regex r("[cdefghijbrvpCDEFGHIJBRVP]*");
if (boost::regex_match(s, r)) {
v = boost::any(beast::Settings(s));
} else {
Expand Down