From a3928a26ec2def41f47ae4247caa6a719615174c Mon Sep 17 00:00:00 2001 From: 30hours Date: Tue, 4 Mar 2025 12:43:18 +0000 Subject: [PATCH 01/11] Updated UHD 4.8 and add detection saving --- CMakeLists.txt | 2 +- Dockerfile | 4 ++-- src/blah2.cpp | 15 ++++++++++++--- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1afd1fe5..bd44c66a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,7 +18,7 @@ find_package(Armadillo CONFIG REQUIRED) find_package(Catch2 CONFIG REQUIRED) set(CMAKE_PREFIX_PATH "/opt/uhd" ${CMAKE_PREFIX_PATH}) -find_package(UHD "4.6.0.0" CONFIG REQUIRED) +find_package(UHD "4.8.0.0" CONFIG REQUIRED) set(PROJECT_ROOT "${PROJECT_SOURCE_DIR}") set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${PROJECT_ROOT}/bin") diff --git a/Dockerfile b/Dockerfile index f9c51c33..0001b90a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,8 +10,8 @@ RUN apt-get update && apt-get install -y software-properties-common \ && DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt-get install -y \ g++ make cmake git curl zip unzip doxygen graphviz \ libfftw3-dev pkg-config gfortran libhackrf-dev \ - libuhd-dev=4.7.0.0-0ubuntu1~jammy1 \ - uhd-host=4.7.0.0-0ubuntu1~jammy1 \ + libuhd-dev=4.8.0.0-0ubuntu1~jammy1 \ + uhd-host=4.8.0.0-0ubuntu1~jammy1 \ libusb-dev libusb-1.0.0-dev \ && apt-get autoremove -y \ && apt-get clean -y \ diff --git a/src/blah2.cpp b/src/blah2.cpp index 70055de7..aec4f8dc 100644 --- a/src/blah2.cpp +++ b/src/blah2.cpp @@ -195,10 +195,11 @@ int main(int argc, char **argv) } // setup output data - bool saveMap; + bool saveMap, saveDetection; tree["save"]["map"] >> saveMap; - std::string savePath, saveMapPath; - if (saveIq || saveMap) + tree["save"]["detection"] >> saveDetection; + std::string savePath, saveMapPath, saveDetectionPath; + if (saveIq || saveMap || saveDetection) { char startTimeStr[16]; struct timeval currentTime = {0, 0}; @@ -210,6 +211,10 @@ int main(int argc, char **argv) { saveMapPath = savePath + ".map"; } + if (saveDetection) + { + saveDetectionPath = savePath + ".detection"; + } // setup output timing uint64_t tStart = current_time_ms(); @@ -296,6 +301,10 @@ int main(int argc, char **argv) detectionJson = detection->delay_bin_to_km(detectionJson, fs); socket_detection.sendData(detectionJson); } + if (saveDetection) + { + detection->save(detectionJson, saveDetectionPath); + } // output tracker data if (isTracker) From 0dee5f89d89a605c5ac4b045d0e6118e1e05179d Mon Sep 17 00:00:00 2001 From: 30hours Date: Mon, 21 Apr 2025 08:18:38 +0000 Subject: [PATCH 02/11] Remove uptime_s and uptime_days from timing display --- html/js/plot_timing.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/html/js/plot_timing.js b/html/js/plot_timing.js index 2d503c4e..3d975329 100644 --- a/html/js/plot_timing.js +++ b/html/js/plot_timing.js @@ -109,7 +109,7 @@ var intervalId = window.setInterval(function () { data_trace = []; keys = Object.keys(data); - keys = keys.filter(item => item !== "timestamp"); + keys = keys.filter(item => item !== "timestamp" && item !== "uptime_s" && item !== "uptime_days"); for (i = 0; i < keys.length; i++) { var trace = { x: data["timestamp"], From 89a06e31bfeb8d61a030b26f2951c88ed1293962 Mon Sep 17 00:00:00 2001 From: 30hours Date: Mon, 30 Jun 2025 11:15:00 +0000 Subject: [PATCH 03/11] Sick of the orange background --- html/controller/index.html | 2 +- html/display/detection/delay-doppler/index.html | 2 +- html/display/detection/delay/index.html | 2 +- html/display/detection/doppler/index.html | 2 +- html/display/map/index.html | 3 ++- html/display/maxhold/index.html | 3 ++- html/display/spectrum/index.html | 3 ++- html/display/timing/index.html | 3 ++- html/index.html | 2 +- html/lib/blah2.css | 5 ++++- 10 files changed, 17 insertions(+), 10 deletions(-) diff --git a/html/controller/index.html b/html/controller/index.html index c30ee9f8..b85cadce 100644 --- a/html/controller/index.html +++ b/html/controller/index.html @@ -14,7 +14,7 @@ - +