diff --git a/ft8/CMakeLists.txt b/ft8/CMakeLists.txt index de077eddd..d8fafc568 100644 --- a/ft8/CMakeLists.txt +++ b/ft8/CMakeLists.txt @@ -20,6 +20,7 @@ set(ft8_HEADERS include_directories( ${CMAKE_SOURCE_DIR}/exports + ${CMAKE_SOURCE_DIR}/sdrbase ) add_library(ft8 SHARED @@ -29,6 +30,7 @@ add_library(ft8 SHARED target_link_libraries(ft8 ${FFTW3F_LIBRARIES} Qt::Core + sdrbase ) install(TARGETS ft8 DESTINATION ${INSTALL_LIB_DIR}) diff --git a/ft8/ft8.cpp b/ft8/ft8.cpp index c24f0fbea..1360981fa 100644 --- a/ft8/ft8.cpp +++ b/ft8/ft8.cpp @@ -36,10 +36,7 @@ #include #include #include -#include #include -#include -#include #include #include #include diff --git a/ft8/util.cpp b/ft8/util.cpp index d55cb5e5f..2c21eada8 100644 --- a/ft8/util.cpp +++ b/ft8/util.cpp @@ -21,34 +21,20 @@ #include #include #include -#include #include #include #include +#include "util/timeutil.h" #include "util.h" namespace FT8 { double now() { - struct timeval tv; - gettimeofday(&tv, 0); - return tv.tv_sec + tv.tv_usec / 1000000.0; -} - -void writetxt(std::vector v, const char *filename) -{ - FILE *fp = fopen(filename, "w"); - if (fp == 0) - { - fprintf(stderr, "could not write %s\n", filename); - exit(1); - } - for (ulong i = 0; i < v.size(); i++) - { - fprintf(fp, "%f\n", v[i]); - } - fclose(fp); + return TimeUtil::nowus() / 1000000.0; + // struct timeval tv; + // gettimeofday(&tv, 0); + // return tv.tv_sec + tv.tv_usec / 1000000.0; } // diff --git a/ft8/util.h b/ft8/util.h index 5e5526a66..c67678866 100644 --- a/ft8/util.h +++ b/ft8/util.h @@ -27,7 +27,6 @@ namespace FT8 { double now(); -void writetxt(std::vector v, const char *filename); std::complex goertzel(std::vector v, int rate, int i0, int n, float hz); float vmax(const std::vector &v); std::vector vreal(const std::vector> &a);