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

Fix p25 parse #806

Merged
merged 14 commits into from
May 7, 2023
+12 −14
Merged

Fix p25 parse #806

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
1718ea5
Update p25_frame_assembler_impl.cc
gisforgirard May 2, 2023
9be8181
Update p25_frame_assembler_impl.cc
robotastic May 5, 2023
8cabd46
Merge pull request #800 from gisforgirard/patch-3
robotastic May 5, 2023
d62f678
Setup Trunk Message queues for each system
robotastic May 5, 2023
49d06ba
It builds
robotastic May 5, 2023
e33e441
Merge branch 'remove_sys_num'
robotastic May 5, 2023
9313863
Update main.cc
robotastic May 7, 2023
9d02d33
testing
robotastic May 7, 2023
876b471
messaeg count
robotastic May 7, 2023
7ff8bec
duh
robotastic May 7, 2023
6b13899
fix count
robotastic May 7, 2023
9681cbd
Update main.cc
robotastic May 7, 2023
0e70af7
Update p25p1_fdma.cc
robotastic May 7, 2023
93a5755
Merge branch 'master' into fix-p25-parse
robotastic May 7, 2023
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
Prev Previous commit
Next Next commit
fix count
@robotastic
robotastic committed May 7, 2023

Unverified

The committer email address is not verified.
Learn about vigilant mode
commit 6b13899ebc2cf7ae7ef1fdd20373352d6bc49774
8 changes: 5 additions & 3 deletions trunk-recorder/main.cc
View file
Original file line number Diff line number Diff line change
@@ -1471,12 +1471,13 @@ for (vector<System *>::iterator sys_it = systems.begin(); sys_it != systems.end(
System_impl *system = (System_impl *)*sys_it;

if ((system->get_system_type() == "p25") || (system->get_system_type() == "smartnet") ) {

while ((msg = system->get_msg_queue()->delete_head_nowait()) != 0) {
msg.reset();
msg = system->get_msg_queue()->delete_head_nowait()
while (msg != 0) {



system->set_message_count(sys->get_message_count() + 1);
system->set_message_count(system->get_message_count() + 1);

if (system->get_system_type() == "smartnet") {
trunk_messages = smartnet_parser->parse_message(msg->to_string(), system);
@@ -1494,6 +1495,7 @@ for (vector<System *>::iterator sys_it = systems.begin(); sys_it != systems.end(
}

msg.reset();
msg = system->get_msg_queue()->delete_head_nowait()
}
}
}