Sojus07/hackrf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix empty report when TX ends soon after the last report.

Browse Source
This commit is contained in:
Martin Ling
2022-09-22 02:08:28 +01:00
committed by Michael Ossmann
parent 14093fe73b
commit eae7049284
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
host/hackrf-tools/src/hackrf_transfer.c
View File

@ -324,6 +324,7 @@ char* u64toa(uint64_t val, t_u64toa* str)
static volatile bool do_exit = false; static volatile bool do_exit = false;
static volatile bool interrupted = false; static volatile bool interrupted = false;
static volatile bool tx_complete = false; static volatile bool tx_complete = false;
static volatile bool flush_complete = false;
#ifdef _WIN32 #ifdef _WIN32
static HANDLE interrupt_handle; static HANDLE interrupt_handle;
#endif #endif
@ -588,6 +589,7 @@ static void tx_complete_callback(hackrf_transfer* transfer, int success)
static void flush_callback(void* flush_ctx) static void flush_callback(void* flush_ctx)
{ {
flush_complete = true;
stop_main_loop(); stop_main_loop();
} }
@ -1369,7 +1371,7 @@ int main(int argc, char** argv)
rate = (float) completed_count_now / time_difference; rate = (float) completed_count_now / time_difference;
if ((completed_count_now == 0) && (hw_sync)) { if ((completed_count_now == 0) && (hw_sync)) {
fprintf(stderr, "Waiting for trigger...\n"); fprintf(stderr, "Waiting for trigger...\n");
} else { } else if (!((completed_count_now == 0) && (flush_complete))) {
double full_scale_ratio = (double) stream_power_now / double full_scale_ratio = (double) stream_power_now /
(completed_count_now * 127 * 127); (completed_count_now * 127 * 127);
double dB_full_scale = 10 * log10(full_scale_ratio) + 3.0; double dB_full_scale = 10 * log10(full_scale_ratio) + 3.0;
@ -1405,7 +1407,8 @@ int main(int argc, char** argv)
time_start = time_now; time_start = time_now;
if ((completed_count_now == 0) && (!hw_sync) && (!tx_complete)) { if ((completed_count_now == 0) && (!hw_sync) &&
(!flush_complete)) {
exit_code = EXIT_FAILURE; exit_code = EXIT_FAILURE;
fprintf(stderr, fprintf(stderr,
"\nCouldn't transfer any bytes for one second.\n"); "\nCouldn't transfer any bytes for one second.\n");