From edcdf1c5cb0055b8dac4ed471b601b39fd200345 Mon Sep 17 00:00:00 2001 From: paul Date: Thu, 9 Sep 2021 18:00:04 +0200 Subject: [PATCH] TX update --- SoapyRadioberry-Release.vgdbsettings | 2 +- SoapyRadioberry.vcxproj | 2 +- SoapyRadioberryStreaming.cpp | 17 ++++++++--------- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/SoapyRadioberry-Release.vgdbsettings b/SoapyRadioberry-Release.vgdbsettings index ec5d554..4d11b5b 100644 --- a/SoapyRadioberry-Release.vgdbsettings +++ b/SoapyRadioberry-Release.vgdbsettings @@ -8,7 +8,7 @@ true - 192.168.89.252 + 192.168.88.81 SSH pi diff --git a/SoapyRadioberry.vcxproj b/SoapyRadioberry.vcxproj index 2f0da6e..67ea350 100644 --- a/SoapyRadioberry.vcxproj +++ b/SoapyRadioberry.vcxproj @@ -37,7 +37,7 @@ libSoapyRadioberrySDR - 192.168.89.252 + 192.168.88.81 com.sysprogs.toolchain.default-gcc DynamicLibrary diff --git a/SoapyRadioberryStreaming.cpp b/SoapyRadioberryStreaming.cpp index b852262..a80b04d 100644 --- a/SoapyRadioberryStreaming.cpp +++ b/SoapyRadioberryStreaming.cpp @@ -215,25 +215,24 @@ int SoapyRadioberry::writeStream(SoapySDR::Stream *stream, const void * const *b { //printf("%x %x %x %x\n", (itarget_buffer[j] & 0xFF00) >> 8, (itarget_buffer[j] & 0x00FF), (itarget_buffer[j+1] & 0xFF00) >> 8, (itarget_buffer[j+1] & 0x00FF)); - tx.i8TxBuffer[2] = (unsigned char)((itarget_buffer[j] & 0xff00) >> 8); - tx.i8TxBuffer[3] = (unsigned char)(itarget_buffer[j] & 0xff); - tx.i8TxBuffer[0] = (unsigned char)((itarget_buffer[j + 1] & 0xff00) >> 8); - tx.i8TxBuffer[1] = (unsigned char)(itarget_buffer[j + 1] & 0xff); - - ret = write(fd_rb, &tx, sizeof(uint32_t)); + tx.i8TxBuffer[0] = (unsigned char)((itarget_buffer[j] & 0xff00) >> 8); + tx.i8TxBuffer[1] = (unsigned char)(itarget_buffer[j] & 0xff); + tx.i8TxBuffer[2] = (unsigned char)((itarget_buffer[j + 1] & 0xff00) >> 8); + tx.i8TxBuffer[3] = (unsigned char)(itarget_buffer[j + 1] & 0xff); + ret = write(fd_rb, &tx, sizeof(uint32_t)); j += 2; m_count++; if (ret == 0) { //printf("radioberry buffer full\n"); - usleep(19200); //50 samples sleep (1/48K about 20usec /sample * 50) + usleep(20000); //50 samples sleep (1/48K about 20usec /sample * 50) } - if(m_count > 2048) + /*if(m_count > 2048) { m_count -= 1024; usleep(19200); //64 samples sleep (1/48K about 20usec /sample * 64) - } + }*/ } } return numElems;