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

Fix #902 - Report transmit amplitude

Browse Source
This commit is contained in:
colt
2022-07-06 22:34:26 -05:00
parent 34cbbe7330
commit 151b431c64
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -456,10 +456,17 @@ int tx_callback(hackrf_transfer* transfer) {
size_t bytes_read; size_t bytes_read;
unsigned int i; unsigned int i;
if( file != NULL ) if (file == NULL && transceiver_mode != TRANSCEIVER_MODE_SS) {
{ return -1;
}
byte_count += transfer->valid_length; byte_count += transfer->valid_length;
bytes_to_read = transfer->valid_length; bytes_to_read = transfer->valid_length;
for (i = 0; i < bytes_to_read; i++) {
stream_amplitude += abs((signed char)transfer->buffer[i]);
}
if( file != NULL )
{
if (limit_num_samples) { if (limit_num_samples) {
if (bytes_to_read >= bytes_to_xfer) { if (bytes_to_read >= bytes_to_xfer) {
/* /*
@ -487,10 +494,8 @@ int tx_callback(hackrf_transfer* transfer) {
} else { } else {
return 0; return 0;
} }
} else if (transceiver_mode == TRANSCEIVER_MODE_SS) { } else { // transceiver_mode == TRANSCEIVER_MODE_SS
/* Transmit continuous wave with specific amplitude */ /* Transmit continuous wave with specific amplitude */
byte_count += transfer->valid_length;
bytes_to_read = transfer->valid_length;
if (limit_num_samples) { if (limit_num_samples) {
if (bytes_to_read >= bytes_to_xfer) { if (bytes_to_read >= bytes_to_xfer) {
bytes_to_read = bytes_to_xfer; bytes_to_read = bytes_to_xfer;
@ -506,8 +511,6 @@ int tx_callback(hackrf_transfer* transfer) {
} else { } else {
return 0; return 0;
} }
} else {
return -1;
} }
} }
@ -1146,8 +1149,6 @@ int main(int argc, char** argv) {
// This is only an approximate measure, to assist getting receive levels right: // This is only an approximate measure, to assist getting receive levels right:
double full_scale_ratio = ((double)stream_amplitude_now / (byte_count_now ? byte_count_now : 1))/128; double full_scale_ratio = ((double)stream_amplitude_now / (byte_count_now ? byte_count_now : 1))/128;
double dB_full_scale_ratio = 10*log10(full_scale_ratio); double dB_full_scale_ratio = 10*log10(full_scale_ratio);
if (dB_full_scale_ratio > 1)
dB_full_scale_ratio = NAN; // Guard against ridiculous reports
fprintf(stderr, "%4.1f MiB / %5.3f sec = %4.1f MiB/second, amplitude %3.1f dBfs", fprintf(stderr, "%4.1f MiB / %5.3f sec = %4.1f MiB/second, amplitude %3.1f dBfs",
(byte_count_now / 1e6f), (byte_count_now / 1e6f),
time_difference, time_difference,
@ -1169,6 +1170,8 @@ int main(int argc, char** argv) {
} else { } else {
fprintf(stderr, "\n"); fprintf(stderr, "\n");
} }
if (dB_full_scale_ratio > 1 || dB_full_scale_ratio == -INFINITY) // Guard against ridiculous reports
dB_full_scale_ratio = -0.0;
} }
time_start = time_now; time_start = time_now;