Skip to content
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

M/A-COM patch following enhancement #643

Merged
merged 5 commits into from
Feb 28, 2022
Merged

M/A-COM patch following enhancement #643

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5b56230
add printouts to p25_parser.cc for patch debugging
aaknitt Feb 27, 2022
7a2a2a0
additional debug printout
aaknitt Feb 28, 2022
489feac
more debug output
aaknitt Feb 28, 2022
6e6b9c0
m/a-com patch add and delete for grg_g == 0 (unit request) in additio…
aaknitt Feb 28, 2022
02f7c2e
remove debugging code
aaknitt Feb 28, 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
27 changes: 22 additions & 5 deletions trunk-recorder/systems/p25_parser.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -640,23 +640,40 @@ std::vector<TrunkMessage> P25Parser::decode_tsbk(boost::dynamic_bitset<> &tsbk,
harris_patch_data.ga2 = ga;
harris_patch_data.ga3 = ga;
message.patch_data = harris_patch_data;
BOOST_LOG_TRIVIAL(debug) << "tsbk30 M/A-COM PATCH sg TGID is "<<sg<<" patched with TGID "<<ga;
BOOST_LOG_TRIVIAL(debug) << "tsbk30 M/A-COM GROUP REQUEST PATCH sg TGID is "<<sg<<" patched with TGID "<<ga;
}
else{
message.message_type = PATCH_ADD;
PatchData harris_patch_data;
harris_patch_data.sg = sg;
harris_patch_data.ga1 = ga;
harris_patch_data.ga2 = ga;
harris_patch_data.ga3 = ga;
message.patch_data = harris_patch_data;
BOOST_LOG_TRIVIAL(debug) << "tsbk30 M/A-COM UNIT REQUEST PATCH sg TGID is "<<sg<<" patched with TGID "<<ga;
}
else{} // Unit request (currently unhandled)
}
else{ // Deactivate
if (grg_g == 1){ // Group request
//self.del_patch(sg, [sg])
message.message_type = PATCH_DELETE;
PatchData harris_patch_data;
harris_patch_data.sg = sg;
harris_patch_data.ga1 = ga;
harris_patch_data.ga2 = ga;
harris_patch_data.ga3 = ga;
message.patch_data = harris_patch_data;
BOOST_LOG_TRIVIAL(debug) << "tsbk30 M/A-COM PATCH DELETE for sg "<<sg<<" with TGID "<<ga;
BOOST_LOG_TRIVIAL(debug) << "tsbk30 M/A-COM GROUP REQUEST PATCH DELETE for sg "<<sg<<" with TGID "<<ga;
}
else{
message.message_type = PATCH_DELETE;
PatchData harris_patch_data;
harris_patch_data.sg = sg;
harris_patch_data.ga1 = ga;
harris_patch_data.ga2 = ga;
harris_patch_data.ga3 = ga;
message.patch_data = harris_patch_data;
BOOST_LOG_TRIVIAL(debug) << "tsbk30 M/A-COM UNIT REQUEST PATCH DELETE for sg "<<sg<<" with TGID "<<ga;
}
else{} // Unit request (currently unhandled)
}
}
else{
Expand Down