Index: qs_read_process.cpp =================================================================== --- qs_read_process.cpp (revisione 542) +++ qs_read_process.cpp (copia locale) @@ -55,7 +55,11 @@ if (recv0 == NULL) { std::cout << "QSReadProcess::run(): read/process stopped. recv0 was NULL" << std::endl; +#if defined __linux + return 1; +#else return ERROR; +#endif } std::cout << "QSReadProcess::run" << std::endl; @@ -106,7 +110,11 @@ m_thread_go = false; std::cout << "QSReadProcess::run(): error - read/process stopped!" << std::endl; std::cout << "QSReadProcess::run(): Check QS1R board!" << std::endl; +#if defined __linux + sleep(1); +#else Sleep(1); +#endif running = false; break; } Index: qs_writer.cpp =================================================================== --- qs_writer.cpp (revisione 542) +++ qs_writer.cpp (copia locale) @@ -73,7 +73,11 @@ while (readproc_obj->cpx_ring->size() < (3 * bsize)) { +#if defined __linux + sleep(100); +#else Sleep(100); +#endif } is_running = true; @@ -98,7 +102,11 @@ else { std::cout << "CPX FIFO EMPTY" << std::endl; +#if defined __linux + usleep (sleep_delay_ms/1000); +#else Sleep(sleep_delay_ms); +#endif } } Index: qs_qs1rio.cpp =================================================================== --- qs_qs1rio.cpp (revisione 542) +++ qs_qs1rio.cpp (copia locale) @@ -616,14 +616,18 @@ return (false); } - // LOAD FIRMWARE FILE - //FILE *f = fopen(filename.toUtf8().data(), "r"); + // LOAD FIRMWARE FILE +#if defined __linux + FILE *f = fopen(filename.c_str(), "r"); + if ((f = fopen(filename.c_str(), "r")) == 0) +#else FILE *f; errno_t err; - if ((err = fopen_s(&f, filename.c_str(), "r")) != 0) + if ((err = fopen_s(&f, filename.c_str(), "r")) != 0) +#endif { - qs_print("Qs1rIO::loadFirmware: filename does not exit"); + qs_print("Qs1rIO::loadFirmware: filename does not exist"); return false; } @@ -693,12 +697,16 @@ qs_print("Qs1rIO::loadFpga: please call initQS1R() first!"); return false; } - - //FILE *f = fopen(filename.toUtf8().data(), "rb"); + +#if defined __linux + FILE *f;; + if ((f = fopen (filename.c_str(), "rb")) == 0) +#else FILE *f; errno_t err; - if ((err = fopen_s(&f, filename.c_str(), "rb")) != 0) + if ((err = fopen_s(&f, filename.c_str(), "rb")) != 0) +#endif { qs_print("Qs1rIO::loadFpga: error, could not find fpga file"); return false; Index: qs_fft.h =================================================================== --- qs_fft.h (revisione 542) +++ qs_fft.h (copia locale) @@ -29,7 +29,8 @@ #include "qs_constants.h" #include -#include "fftw3/fftw3.h" +//#include "fftw3/fftw3.h" +#include #include "qs_complex.h" class FFT Index: qs_filter.h =================================================================== --- qs_filter.h (revisione 542) +++ qs_filter.h (copia locale) @@ -31,8 +31,10 @@ #include "qs_fft.h" #include "qs_complex.h" #include "qs_invsinc_coeff.h" -#include +#include +#include + #define ONEPI 3.14159265358979323846264338328 #define TWOPI 6.28318530717958647692528676656 Index: qs_data_server.h =================================================================== --- qs_data_server.h (revisione 542) +++ qs_data_server.h (copia locale) @@ -90,4 +90,4 @@ void stop(); }; -#endif /* _QSDATASERVER_H */ \ No newline at end of file +#endif /* _QSDATASERVER_H */ Index: qs_spectrum_reader.cpp =================================================================== --- qs_spectrum_reader.cpp (revisione 542) +++ qs_spectrum_reader.cpp (copia locale) @@ -89,7 +89,11 @@ filt->ProcessAndDecimate(buf, deci, m_bsize); if (specobj) specobj->ProcessBlock(deci, m_bsize); +#if defined __linux + usleep(50000); +#else Sleep(50); +#endif } else { @@ -133,4 +137,4 @@ void QSSpectrumReader::run() { m_result = ThreadHandlerProc(); -} \ No newline at end of file +} Index: qs_control.cpp =================================================================== --- qs_control.cpp (revisione 542) +++ qs_control.cpp (copia locale) @@ -307,7 +307,7 @@ int QSControl::calculateCICGain(int stages, int bits_in, int decimation) { - return ((int)ceil((stages * log2(decimation)) + bits_in) - 1 ); + return ((int)ceil((stages * log2((float)decimation)) + bits_in) - 1 ); } void QSControl::setCh0Rate(float rate) { Index: qs_qs1rio.h =================================================================== --- qs_qs1rio.h (revisione 542) +++ qs_qs1rio.h (copia locale) @@ -25,9 +25,12 @@ #ifndef QS1RIO_H #define QS1RIO_H - -//#include -#include "libusb/usb.h" + +#if defined __linux +#include +#else +#include "libusb/usb.h" +#endif #include #include #include