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

Jump to bottom

Include TDMA slot number in transmission_sink(). #835

Merged
merged 2 commits into from
Jul 12, 2023
Merged

Include TDMA slot number in transmission_sink(). #835

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d21aa48
Send TDMA slot number to the transmission_sink.
tadscottsmith Jul 11, 2023
0e36e33
Update comments to include P25P2 TDMA.
tadscottsmith Jul 12, 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
2 changes: 1 addition & 1 deletion trunk-recorder/call_concluder/call_concluder.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ Call_Data_t Call_Concluder::create_base_filename(Call *call, Call_Data_t call_in
if (call->get_tdma_slot() == -1) {
nchars = snprintf(base_filename, 255, "%s/%ld-%ld_%.0f", base_path_string.c_str(), call->get_talkgroup(), work_start_time, call->get_freq());
} else {
// this is for the case when it is a DMR recorder and 2 wav files are created, the slot is needed to keep them separate.
// this is for the case when it is a P25P2 TDMA or DMR recorder and 2 wav files are created, the slot is needed to keep them separate.
nchars = snprintf(base_filename, 255, "%s/%ld-%ld_%.0f.%d", base_path_string.c_str(), call->get_talkgroup(), work_start_time, call->get_freq(), call->get_tdma_slot());
}
if (nchars >= 255) {
Expand Down
2 changes: 1 addition & 1 deletion trunk-recorder/gr_blocks/transmission_sink.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ void transmission_sink::create_filename() {
if (d_slot == -1) {
nchars = snprintf(current_filename, 255, "%s/%ld-%ld_%.0f.wav", temp_path_string.c_str(), d_current_call_talkgroup, work_start_time, d_current_call_freq);
} else {
// this is for the case when it is a DMR recorder and 2 wav files are created, the slot is needed to keep them separate.
// this is for the case when it is a P25P2 TDMA or DMR recorder and 2 wav files are created, the slot is needed to keep them separate.
nchars = snprintf(current_filename, 255, "%s/%ld-%ld_%.0f.%d.wav", temp_path_string.c_str(), d_current_call_talkgroup, work_start_time, d_current_call_freq, d_slot);
}
if (nchars >= 255) {
Expand Down
8 changes: 7 additions & 1 deletion trunk-recorder/recorders/p25_recorder_decode.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,13 @@ void p25_recorder_decode::stop() {

void p25_recorder_decode::start(Call *call) {
levels->set_k(call->get_system()->get_digital_levels());
wav_sink->start_recording(call);

if(call->get_phase2_tdma()){
wav_sink->start_recording(call, call->get_tdma_slot());
} else {
wav_sink->start_recording(call);
}

d_call = call;
}

Expand Down
Loading