From 624994d65c02ad414a01b29c84154260912f4e4f Mon Sep 17 00:00:00 2001 From: Robert Ghilduta Date: Mon, 26 Feb 2024 00:52:44 -0800 Subject: [PATCH 001/238] libbladeRF: fix up sync TX initialization bug --- host/libraries/libbladeRF/src/streaming/sync.c | 1 + 1 file changed, 1 insertion(+) diff --git a/host/libraries/libbladeRF/src/streaming/sync.c b/host/libraries/libbladeRF/src/streaming/sync.c index 1b3590cc..feef101b 100644 --- a/host/libraries/libbladeRF/src/streaming/sync.c +++ b/host/libraries/libbladeRF/src/streaming/sync.c @@ -281,6 +281,7 @@ int sync_init(struct bladerf_sync *sync, sync->buf_mgmt.status[i] = SYNC_BUFFER_EMPTY; } + sync->meta.msg_timestamp = 0; sync->meta.in_burst = false; sync->meta.now = false; break; From 5aa65256a7f4e93ac220253577621f912b482fff Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Fri, 1 Mar 2024 12:59:23 -0600 Subject: [PATCH 002/238] hdl: fifo_writer: eight_bit_mode default value set This fixes the adsb builds. --- hdl/fpga/ip/nuand/synthesis/fifo_writer.vhd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hdl/fpga/ip/nuand/synthesis/fifo_writer.vhd b/hdl/fpga/ip/nuand/synthesis/fifo_writer.vhd index 0723306f..a6cdfed9 100644 --- a/hdl/fpga/ip/nuand/synthesis/fifo_writer.vhd +++ b/hdl/fpga/ip/nuand/synthesis/fifo_writer.vhd @@ -41,7 +41,7 @@ entity fifo_writer is usb_speed : in std_logic; meta_en : in std_logic; packet_en : in std_logic; - eight_bit_mode_en : in std_logic; + eight_bit_mode_en : in std_logic := '0'; timestamp : in unsigned(63 downto 0); mini_exp : in std_logic_vector(1 downto 0); From 38ab0517bc5389ad82b02f6c22f79cfbc20e7085 Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Fri, 1 Mar 2024 14:19:44 -0600 Subject: [PATCH 003/238] test: regression: added cmake version guard for FetchContent --- host/libraries/libbladeRF_test/test_regression/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/host/libraries/libbladeRF_test/test_regression/CMakeLists.txt b/host/libraries/libbladeRF_test/test_regression/CMakeLists.txt index 9e735439..342d0f92 100644 --- a/host/libraries/libbladeRF_test/test_regression/CMakeLists.txt +++ b/host/libraries/libbladeRF_test/test_regression/CMakeLists.txt @@ -1,3 +1,4 @@ +cmake_minimum_required(VERSION 3.11) # FetchContent is available in 3.11 project(libbladeRF_test_regression VERSION 3.11 LANGUAGES CXX) From e50f28fba3c09aadbe503c4144796a07ff119dc6 Mon Sep 17 00:00:00 2001 From: Ben Morse Date: Mon, 4 Mar 2024 13:49:31 -0800 Subject: [PATCH 004/238] libbladeRF: fix compliation of regression tests with an older g++ --- host/libraries/libbladeRF_test/test_regression/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/host/libraries/libbladeRF_test/test_regression/CMakeLists.txt b/host/libraries/libbladeRF_test/test_regression/CMakeLists.txt index 342d0f92..cea300cc 100644 --- a/host/libraries/libbladeRF_test/test_regression/CMakeLists.txt +++ b/host/libraries/libbladeRF_test/test_regression/CMakeLists.txt @@ -3,6 +3,8 @@ project(libbladeRF_test_regression VERSION 3.11 LANGUAGES CXX) +set(CMAKE_CXX_STANDARD 17) + include(GoogleTest) include(FetchContent) enable_testing() From 2e44a61876f2f8cc01067c6821460987c01dc46d Mon Sep 17 00:00:00 2001 From: Robert Ghilduta Date: Thu, 7 Mar 2024 02:59:37 -0800 Subject: [PATCH 005/238] test: reset software timestamp timekeeping to 0 anytime we touch module enable --- host/libraries/libbladeRF/src/board/bladerf2/bladerf2.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/host/libraries/libbladeRF/src/board/bladerf2/bladerf2.c b/host/libraries/libbladeRF/src/board/bladerf2/bladerf2.c index 93e7ce82..15f27823 100644 --- a/host/libraries/libbladeRF/src/board/bladerf2/bladerf2.c +++ b/host/libraries/libbladeRF/src/board/bladerf2/bladerf2.c @@ -725,6 +725,8 @@ static int bladerf2_enable_module(struct bladerf *dev, struct bladerf2_board_data *board_data = dev->board_data; + WITH_MUTEX(&board_data->sync[channel2direction(ch)].lock, + { board_data->sync[channel2direction(ch)].meta.msg_timestamp = 0; }); return board_data->rfic->enable_module(dev, ch, enable); } From 1034fe0d41b78ea0a92fede2b5d4f76f5850b454 Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Fri, 5 Jan 2024 09:52:18 -0600 Subject: [PATCH 006/238] test: added FPGA load test --- host/libraries/libbladeRF_test/CMakeLists.txt | 1 + .../test_fpga_load/CMakeLists.txt | 12 ++ .../libbladeRF_test/test_fpga_load/src/main.c | 119 ++++++++++++++++++ 3 files changed, 132 insertions(+) create mode 100644 host/libraries/libbladeRF_test/test_fpga_load/CMakeLists.txt create mode 100644 host/libraries/libbladeRF_test/test_fpga_load/src/main.c diff --git a/host/libraries/libbladeRF_test/CMakeLists.txt b/host/libraries/libbladeRF_test/CMakeLists.txt index a1419a14..bd75e4aa 100644 --- a/host/libraries/libbladeRF_test/CMakeLists.txt +++ b/host/libraries/libbladeRF_test/CMakeLists.txt @@ -24,6 +24,7 @@ add_subdirectory(test_version) add_subdirectory(test_digital_loopback) add_subdirectory(test_interleaver) add_subdirectory(test_rx_meta) +add_subdirectory(test_fpga_load) option(TEST_REGRESSION "Include regression tests" OFF) if(TEST_REGRESSION) diff --git a/host/libraries/libbladeRF_test/test_fpga_load/CMakeLists.txt b/host/libraries/libbladeRF_test/test_fpga_load/CMakeLists.txt new file mode 100644 index 00000000..bcb26fda --- /dev/null +++ b/host/libraries/libbladeRF_test/test_fpga_load/CMakeLists.txt @@ -0,0 +1,12 @@ +cmake_minimum_required(VERSION 3.5) +project(libbladeRF_test_fpga_load C) + +set(INCLUDES ${libbladeRF_SOURCE_DIR}/include) +if(MSVC) + set(INCLUDES ${INCLUDES} ${MSVC_C99_INCLUDES}) +endif() + +include_directories(${INCLUDES} ${CURL_INCLUDE_DIR} include) +add_executable(${PROJECT_NAME} src/main.c) + +target_link_libraries(${PROJECT_NAME} libbladerf_shared) diff --git a/host/libraries/libbladeRF_test/test_fpga_load/src/main.c b/host/libraries/libbladeRF_test/test_fpga_load/src/main.c new file mode 100644 index 00000000..25450bea --- /dev/null +++ b/host/libraries/libbladeRF_test/test_fpga_load/src/main.c @@ -0,0 +1,119 @@ +/* + * This file is part of the bladeRF project: + * http://www.github.com/nuand/bladeRF + * + * Copyright (C) 2024 Nuand LLC + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + * + * This program is intended to verify that C programs build against + * libbladeRF without any unintended dependencies. + */ +#include +#include +#include +#include + +#define CHECK_STATUS(fn) \ + do { \ + status = (fn); \ + if (status != 0) { \ + fprintf(stderr, "Error at %s:%d (%s): Status %d\n", __FILE__, __LINE__, __func__, status); \ + goto error; \ + } \ + } while (0) + +int main(int argc, char *argv[]) +{ + int status; + struct bladerf *dev = NULL; + const char *fpga_file = "latest.rbf"; + const char *device_string = NULL; + int c; + + bladerf_log_set_verbosity(BLADERF_LOG_LEVEL_ERROR); + + while (1) { + int option_index = 0; + static struct option long_options[] = { + {"device", required_argument , 0, 'd'}, + {"fpga", required_argument , 0, 'f'}, + {"verbosity", no_argument , 0, 'v'}, + {0, 0, 0, 0 } + }; + + c = getopt_long(argc, argv, "d:f:v", long_options, &option_index); + if (c == -1) + break; + + switch (c) { + case 'd': + device_string = optarg; + printf("Using device: %s\n", optarg); + break; + + case 'f': + fpga_file = optarg; + printf("Using FPGA file: %s\n", fpga_file); + break; + + case 'v': + printf("Setting verbosity to verbose\n"); + bladerf_log_set_verbosity(BLADERF_LOG_LEVEL_VERBOSE); + break; + + case '?': + // getopt_long already printed an error message. + exit(EXIT_FAILURE); + + default: + printf("?? getopt returned character code 0%o ??\n", c); + } + } + + if (device_string == NULL) { + fprintf(stderr, "No device specified.\n"); + exit(EXIT_FAILURE); + } + + printf("Opening device...\n"); + CHECK_STATUS(bladerf_open(&dev, device_string)); + + printf("Loading FPGA image...\n"); + CHECK_STATUS(bladerf_load_fpga(dev, fpga_file)); + + printf("Setting sample rate to 10e6...\n"); + CHECK_STATUS(bladerf_set_sample_rate(dev, BLADERF_MODULE_RX, 10e6, NULL)); + + printf("Reloading the FPGA image...\n"); + CHECK_STATUS(bladerf_load_fpga(dev, fpga_file)); + + printf("Setting tuning mode to FPGA...\n"); + CHECK_STATUS(bladerf_set_tuning_mode(dev, BLADERF_TUNING_MODE_FPGA)); + + printf("Setting sample rate again to 10e6...\n"); + CHECK_STATUS(bladerf_set_sample_rate(dev, BLADERF_MODULE_RX, 10e6, NULL)); + + printf("Passed!\n"); +error: + if (dev) { + bladerf_close(dev); + } + return status; +} From 0fcb4cfe037511ce5da8703da824158ef2f79367 Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Mon, 1 Apr 2024 14:09:01 -0500 Subject: [PATCH 007/238] libbladeRF: reinitialize the RFIC on FPGA load This fixes a silent failure where an FPGA reload will loose communication to the RFIC. --- host/libraries/libbladeRF/src/board/bladerf2/bladerf2.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/host/libraries/libbladeRF/src/board/bladerf2/bladerf2.c b/host/libraries/libbladeRF/src/board/bladerf2/bladerf2.c index 93e7ce82..a1d67217 100644 --- a/host/libraries/libbladeRF/src/board/bladerf2/bladerf2.c +++ b/host/libraries/libbladeRF/src/board/bladerf2/bladerf2.c @@ -2240,9 +2240,11 @@ static int bladerf2_load_fpga(struct bladerf *dev, RETURN_INVAL("fpga file", "incorrect file size"); } - CHECK_STATUS(dev->backend->load_fpga(dev, buf, length)); + if (dev->backend->is_fpga_configured(dev)) { + CHECK_STATUS(board_data->rfic->standby(dev)); + } - /* Update device state */ + CHECK_STATUS(dev->backend->load_fpga(dev, buf, length)); board_data->state = STATE_FPGA_LOADED; CHECK_STATUS(_bladerf2_initialize(dev)); From ac3e5aeb3f251ad377b94f0b5c2442567b48305a Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Tue, 2 Apr 2024 13:05:50 -0500 Subject: [PATCH 008/238] doc: updated default tuning mode to host --- host/libraries/libbladeRF/include/libbladeRF.h | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/host/libraries/libbladeRF/include/libbladeRF.h b/host/libraries/libbladeRF/include/libbladeRF.h index 4c871965..6fc323f1 100644 --- a/host/libraries/libbladeRF/include/libbladeRF.h +++ b/host/libraries/libbladeRF/include/libbladeRF.h @@ -3590,19 +3590,15 @@ int CALL_CONV bladerf_trim_dac_read(struct bladerf *dev, uint16_t *val); /** * Frequency tuning modes * - * ::BLADERF_TUNING_MODE_HOST is the default if either of the following - * conditions are true: - * - libbladeRF < v1.3.0 - * - FPGA < v0.2.0 + * The default tuning mode, `BLADERF_TUNING_MODE_HOST`, can be overridden by + * setting a BLADERF_DEFAULT_TUNING_MODE environment variable to `host` or `fpga`. * - * ::BLADERF_TUNING_MODE_FPGA is the default if both of the following - * conditions are true: + * ::BLADERF_TUNING_MODE_HOST is the default tuning mode. + * + * ::BLADERF_TUNING_MODE_FPGA requirements: * - libbladeRF >= v1.3.0 * - FPGA >= v0.2.0 * - * The default mode can be overridden by setting a BLADERF_DEFAULT_TUNING_MODE - * environment variable to `host` or `fpga`. - * * @note Overriding this value with a mode not supported by the FPGA will result * in failures or unexpected behavior. */ From 88a19293942a870554fc82d5abf841d28355f553 Mon Sep 17 00:00:00 2001 From: Robert Ghilduta Date: Mon, 26 Feb 2024 00:52:44 -0800 Subject: [PATCH 009/238] libbladeRF: fix up sync TX initialization bug --- host/libraries/libbladeRF/src/streaming/sync.c | 1 + 1 file changed, 1 insertion(+) diff --git a/host/libraries/libbladeRF/src/streaming/sync.c b/host/libraries/libbladeRF/src/streaming/sync.c index 1b3590cc..feef101b 100644 --- a/host/libraries/libbladeRF/src/streaming/sync.c +++ b/host/libraries/libbladeRF/src/streaming/sync.c @@ -281,6 +281,7 @@ int sync_init(struct bladerf_sync *sync, sync->buf_mgmt.status[i] = SYNC_BUFFER_EMPTY; } + sync->meta.msg_timestamp = 0; sync->meta.in_burst = false; sync->meta.now = false; break; From 473f5f08659deb1cb19853dad0496bdc40e96065 Mon Sep 17 00:00:00 2001 From: Robert Ghilduta Date: Sat, 13 Apr 2024 20:00:57 -0700 Subject: [PATCH 010/238] hdl: add false path for timing closure of common_dcfifo Note: common_dcfifo impacts all bladeRF FIFOs, including sample and meta FIFOs. --- hdl/fpga/ip/altera/common_dcfifo/common_dcfifo.vhd | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/hdl/fpga/ip/altera/common_dcfifo/common_dcfifo.vhd b/hdl/fpga/ip/altera/common_dcfifo/common_dcfifo.vhd index fbbcd8f6..dfc560cf 100644 --- a/hdl/fpga/ip/altera/common_dcfifo/common_dcfifo.vhd +++ b/hdl/fpga/ip/altera/common_dcfifo/common_dcfifo.vhd @@ -134,6 +134,10 @@ end entity; architecture arch of common_dcfifo is + attribute ALTERA_ATTRIBUTE : string; + + attribute ALTERA_ATTRIBUTE of arch : architecture is "-name SDC_STATEMENT ""set_false_path -to [get_registers {*fifo_gen:U_dcfifo_mixed_widths|dcfifo_*:auto_generated|dffpipe_*:wraclr|dffe*a[0]}] """; + function valid_width_ratio( width : natural; width_r : natural ) return boolean is variable r : natural := 0; variable rv : boolean := false; From 4b62a41797f5b069192c384844cd12f7f6f778b8 Mon Sep 17 00:00:00 2001 From: Robert Ghilduta Date: Sun, 14 Apr 2024 23:14:39 -0700 Subject: [PATCH 011/238] hdl: bladeRF-micro redefine JTAG SDC --- hdl/fpga/platforms/bladerf-micro/constraints/bladerf.sdc | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/hdl/fpga/platforms/bladerf-micro/constraints/bladerf.sdc b/hdl/fpga/platforms/bladerf-micro/constraints/bladerf.sdc index 85b16c3e..d01c8a29 100644 --- a/hdl/fpga/platforms/bladerf-micro/constraints/bladerf.sdc +++ b/hdl/fpga/platforms/bladerf-micro/constraints/bladerf.sdc @@ -71,10 +71,11 @@ set_false_path -from exp_present -to * set_false_path -from pwr_status -to * # JTAG settings -set_clock_groups -exclusive -group [get_clocks altera_reserved_tck] -set_input_delay -clock [get_clocks altera_reserved_tck] 2.0 [get_ports altera_reserved_tdi] -set_input_delay -clock [get_clocks altera_reserved_tck] 2.0 [get_ports altera_reserved_tms] -set_output_delay -clock [get_clocks altera_reserved_tck] 2.0 [get_ports altera_reserved_tdo] +create_clock -name {altera_reserved_tck} -period 10 [get_ports {altera_reserved_tck}] +set_clock_groups -asynchronous -group {altera_reserved_tck} +set_false_path -from [get_ports {altera_reserved_tms}] +set_false_path -from [get_ports {altera_reserved_tdi}] +set_false_path -to [get_ports {altera_reserved_tdo}] # Exceptions From 2fbae2c38b377cfbee98c281789cd43d1f1b55e4 Mon Sep 17 00:00:00 2001 From: Robert Ghilduta Date: Sun, 14 Apr 2024 23:25:59 -0700 Subject: [PATCH 012/238] libbladeRF_test: bump dependency versions --- host/libraries/libbladeRF_test/requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/host/libraries/libbladeRF_test/requirements.txt b/host/libraries/libbladeRF_test/requirements.txt index b11c20a9..e777159e 100644 --- a/host/libraries/libbladeRF_test/requirements.txt +++ b/host/libraries/libbladeRF_test/requirements.txt @@ -1,12 +1,12 @@ contourpy==1.1.0 cycler==0.11.0 -fonttools==4.42.1 +fonttools==4.43.0 kiwisolver==1.4.5 matplotlib==3.7.2 numpy==1.25.2 packaging==23.1 pandas==2.0.3 -Pillow==10.0.1 +Pillow==10.3.0 pyparsing==3.0.9 python-dateutil==2.8.2 pytz==2023.3 From b40cd829be0b2bc2d17e77ca92c08045667912d8 Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Wed, 1 May 2024 16:02:28 -0500 Subject: [PATCH 013/238] revert "libbladeRF: reinitialize the RFIC on FPGA load" This reverts commit 0fcb4cfe037511ce5da8703da824158ef2f79367. --- host/libraries/libbladeRF/src/board/bladerf2/bladerf2.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/host/libraries/libbladeRF/src/board/bladerf2/bladerf2.c b/host/libraries/libbladeRF/src/board/bladerf2/bladerf2.c index a1d67217..93e7ce82 100644 --- a/host/libraries/libbladeRF/src/board/bladerf2/bladerf2.c +++ b/host/libraries/libbladeRF/src/board/bladerf2/bladerf2.c @@ -2240,11 +2240,9 @@ static int bladerf2_load_fpga(struct bladerf *dev, RETURN_INVAL("fpga file", "incorrect file size"); } - if (dev->backend->is_fpga_configured(dev)) { - CHECK_STATUS(board_data->rfic->standby(dev)); - } - CHECK_STATUS(dev->backend->load_fpga(dev, buf, length)); + + /* Update device state */ board_data->state = STATE_FPGA_LOADED; CHECK_STATUS(_bladerf2_initialize(dev)); From f24abc356a30ecd7ba19d64fdd6458012df3729a Mon Sep 17 00:00:00 2001 From: Robert Ghilduta Date: Fri, 12 Jul 2024 04:09:00 -0400 Subject: [PATCH 014/238] debian: update change --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 4dda228d..7cc39122 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +bladerf (2024.07) noble; urgency=medium + + * 2024.07 Release 2024.07 + + -- Robert Ghilduta (Nuand LLC) Fri, 12 Jul 2024 03:32:13 -0400 + bladerf (2021.10) unstable; urgency=low * Release for 2021.10 tag From cefdb2887ce4151e0fa8b219ceabaf01781acdbc Mon Sep 17 00:00:00 2001 From: Robert Ghilduta Date: Tue, 16 Apr 2024 02:29:29 -0700 Subject: [PATCH 015/238] hdl: fixup more timing issues --- hdl/fpga/ip/nuand/synthesis/fifo_reader.vhd | 23 +++++++++++++------ hdl/fpga/ip/nuand/synthesis/fifo_writer.vhd | 20 ++++++++++++---- .../bladerf-micro/constraints/bladerf.sdc | 2 +- 3 files changed, 33 insertions(+), 12 deletions(-) diff --git a/hdl/fpga/ip/nuand/synthesis/fifo_reader.vhd b/hdl/fpga/ip/nuand/synthesis/fifo_reader.vhd index a525ab2b..d1d156c5 100644 --- a/hdl/fpga/ip/nuand/synthesis/fifo_reader.vhd +++ b/hdl/fpga/ip/nuand/synthesis/fifo_reader.vhd @@ -92,7 +92,10 @@ architecture simple of fifo_reader is meta_read : std_logic; meta_cache : std_logic_vector(META_FIFO_DATA_WIDTH-1 downto 0); meta_p_time : unsigned(63 downto 0); + meta_p_time_r : unsigned(63 downto 0); meta_time_go : std_logic; + meta_fifo_empty : std_logic; + meta_fifo_data : std_logic_vector(META_FIFO_DATA_WIDTH-1 downto 0); end record; constant META_FSM_RESET_VALUE : meta_fsm_t := ( @@ -104,7 +107,10 @@ architecture simple of fifo_reader is meta_read => '0', meta_cache => (others => '0'), meta_p_time => (others => '-'), - meta_time_go => '0' + meta_p_time_r => (others => '-'), + meta_time_go => '0', + meta_fifo_empty => '0', + meta_fifo_data => (others => '0') ); signal meta_current : meta_fsm_t := META_FSM_RESET_VALUE; @@ -193,7 +199,7 @@ begin end if; end process; - packet_empty <= '1' when ( meta_fifo_empty = '1' and meta_current.state /= META_WAIT ) else '0' ; + packet_empty <= '1' when ( meta_current.meta_fifo_empty = '1' and meta_current.state /= META_WAIT ) else '0' ; -- Meta FIFO combinatorial process meta_fsm_comb : process( all ) @@ -205,26 +211,29 @@ begin meta_future.meta_read <= '0'; meta_future.meta_pkt_sop <= '0'; meta_future.meta_pkt_eop <= '0'; + meta_future.meta_fifo_empty <= meta_fifo_empty; + meta_future.meta_fifo_data <= meta_fifo_data; + meta_time := unsigned(meta_current.meta_fifo_data(95 downto 32)) - 1; + meta_future.meta_p_time_r <= meta_time; case meta_current.state is when META_LOAD => meta_future.skip_padding <= '0'; - meta_time := unsigned(meta_fifo_data(95 downto 32)) - 1; - meta_future.meta_p_time <= meta_time; - meta_future.meta_cache <= meta_fifo_data; + meta_future.meta_p_time <= meta_current.meta_p_time_r; + meta_future.meta_cache <= meta_current.meta_fifo_data; if( meta_current.dma_downcount = NUM_STREAMS ) then meta_future.dma_downcount <= 0; end if; if( fifo_current.ch_shift = 0 ) then - if( meta_fifo_empty = '0' and (packet_en = '0' or + if( meta_current.meta_fifo_empty = '0' and (packet_en = '0' or (packet_en = '1' and packet_ready = '1') ) ) then meta_future.meta_read <= '1'; meta_future.state <= META_WAIT; - if( packet_en = '1' or meta_time /= timestamp ) then + if( packet_en = '1' or meta_current.meta_p_time_r /= timestamp ) then meta_future.meta_time_go <= '0'; else meta_future.meta_time_go <= '1'; diff --git a/hdl/fpga/ip/nuand/synthesis/fifo_writer.vhd b/hdl/fpga/ip/nuand/synthesis/fifo_writer.vhd index a6cdfed9..491994e4 100644 --- a/hdl/fpga/ip/nuand/synthesis/fifo_writer.vhd +++ b/hdl/fpga/ip/nuand/synthesis/fifo_writer.vhd @@ -136,6 +136,9 @@ architecture simple of fifo_writer is signal sync_mini_exp: std_logic_vector(1 downto 0); + signal meta_fifo_used_v_r : unsigned(meta_fifo_usedw'length downto 0) := (others => '0'); + signal fifo_used_v_r : unsigned(fifo_usedw'length downto 0) := (others => '0'); + begin -- Throw an error if port widths don't make sense @@ -167,11 +170,21 @@ begin if( reset = '1' ) then fifo_enough <= false; fifo_used_v := (others => '0'); + meta_fifo_used_v_r <= (others => '0'); + fifo_used_v_r <= (others => '0'); elsif( rising_edge(clock) ) then + -- the outputs of the dcfifo are not registered so give the long combinatorial + -- data path, let's register the values. one extra clock cycle will not change + -- the fidelity of the result. the meta_fifo represents at minimum 204 timestamps. + -- there is no way for an off by 1 clock cycle timing to overflow the meta fifo + -- when the buffer leaves 4 full meta buffers empty fifo_used_v := unsigned(fifo_full & fifo_usedw); + fifo_used_v_r <= fifo_used_v; meta_fifo_used_v := unsigned(meta_fifo_full & meta_fifo_usedw); - if( fifo_full = '0' and ((FIFO_MAX - fifo_used_v) > ( dma_buf_size * 4 )) and - ( ( meta_en = '1' and meta_fifo_full = '0' and ( META_MAX - 4 ) > meta_fifo_used_v ) + meta_fifo_used_v_r <= meta_fifo_used_v; + + if( fifo_full = '0' and ((FIFO_MAX - fifo_used_v_r) > ( dma_buf_size * 4 )) and + ( ( meta_en = '1' and meta_fifo_full = '0' and ( META_MAX - 4 ) > meta_fifo_used_v_r ) or (meta_en = '0') ) ) then fifo_enough <= true; else @@ -263,11 +276,10 @@ begin when META_WRITE => for i in in_samples'range loop - if (meta_fifo_full = '0') and (in_samples(i).data_v = '1') then + if (meta_fifo_full = '0' and in_samples(i).data_v = '1') then meta_future.meta_write <= '1'; meta_future.meta_written <= '1'; meta_future.state <= META_DOWNCOUNT; - exit; -- Exit loop after first match end if; end loop; diff --git a/hdl/fpga/platforms/bladerf-micro/constraints/bladerf.sdc b/hdl/fpga/platforms/bladerf-micro/constraints/bladerf.sdc index d01c8a29..41b5ca59 100644 --- a/hdl/fpga/platforms/bladerf-micro/constraints/bladerf.sdc +++ b/hdl/fpga/platforms/bladerf-micro/constraints/bladerf.sdc @@ -71,7 +71,7 @@ set_false_path -from exp_present -to * set_false_path -from pwr_status -to * # JTAG settings -create_clock -name {altera_reserved_tck} -period 10 [get_ports {altera_reserved_tck}] +create_clock -name {altera_reserved_tck} -period 100 [get_ports {altera_reserved_tck}] set_clock_groups -asynchronous -group {altera_reserved_tck} set_false_path -from [get_ports {altera_reserved_tms}] set_false_path -from [get_ports {altera_reserved_tdi}] From 58727ab7a1d7f9cd0925feab97a655c0c7980a28 Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Tue, 16 Apr 2024 17:12:02 -0500 Subject: [PATCH 016/238] hdl: init meta_fifo_empty to 1 [==========] 32 tests from 1 test suite ran. (1785986 ms total) [ PASSED ] 20 tests. [ FAILED ] 12 tests, listed below: [ FAILED ] hdl/verify.fx3_gpif_iq_8bit_tb/16b01, where GetParam() = (false, false, true) [ FAILED ] hdl/verify.fx3_gpif_iq_8bit_tb/16b10, where GetParam() = (false, true, false) [ FAILED ] hdl/verify.fx3_gpif_iq_8bit_tb/16b11, where GetParam() = (false, true, true) [ FAILED ] hdl/verify.fx3_gpif_iq_8bit_tb/8b01, where GetParam() = (true, false, true) [ FAILED ] hdl/verify.fx3_gpif_iq_8bit_tb/8b10, where GetParam() = (true, true, false) [ FAILED ] hdl/verify.fx3_gpif_iq_8bit_tb/8b11, where GetParam() = (true, true, true) [ FAILED ] hdl/verify.rx_counter_8bit_tb/16b01, where GetParam() = (false, false, true) [ FAILED ] hdl/verify.rx_counter_8bit_tb/16b10, where GetParam() = (false, true, false) [ FAILED ] hdl/verify.rx_counter_8bit_tb/16b11, where GetParam() = (false, true, true) [ FAILED ] hdl/verify.rx_counter_8bit_tb/8b01, where GetParam() = (true, false, true) [ FAILED ] hdl/verify.rx_counter_8bit_tb/8b10, where GetParam() = (true, true, false) [ FAILED ] hdl/verify.rx_counter_8bit_tb/8b11, where GetParam() = (true, true, true) 12 FAILED TESTS --- hdl/fpga/ip/nuand/synthesis/fifo_reader.vhd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hdl/fpga/ip/nuand/synthesis/fifo_reader.vhd b/hdl/fpga/ip/nuand/synthesis/fifo_reader.vhd index d1d156c5..d4cfb406 100644 --- a/hdl/fpga/ip/nuand/synthesis/fifo_reader.vhd +++ b/hdl/fpga/ip/nuand/synthesis/fifo_reader.vhd @@ -109,7 +109,7 @@ architecture simple of fifo_reader is meta_p_time => (others => '-'), meta_p_time_r => (others => '-'), meta_time_go => '0', - meta_fifo_empty => '0', + meta_fifo_empty => '1', meta_fifo_data => (others => '0') ); From fcb33420a016757e658423e59697f370a0e258d9 Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Wed, 17 Apr 2024 11:31:00 -0500 Subject: [PATCH 017/238] hdl: fix first sample drop in fifo_writer This fixes the first sample being dropped in both meta and non-meta modes. fifo_write is now asserted through procedure and executes on HOLDOFF exit. Regression test results: $ make test_libbladeRF [ OK ] libbladeRF.scheduled_retune (19450 ms) [----------] 29 tests from libbladeRF (297804 ms total) [==========] 29 tests from 1 test suite ran. (297804 ms total) [ PASSED ] 29 tests. $ make test_hdl [----------] 31 tests from hdl (1354828 ms total) [----------] 32 tests from hdl/verify (2319711 ms total) [==========] 63 tests from 2 test suites ran. (3674539 ms total) [ PASSED ] 63 tests. --- hdl/fpga/ip/nuand/synthesis/fifo_writer.vhd | 103 ++++++++++++++------ 1 file changed, 73 insertions(+), 30 deletions(-) diff --git a/hdl/fpga/ip/nuand/synthesis/fifo_writer.vhd b/hdl/fpga/ip/nuand/synthesis/fifo_writer.vhd index 491994e4..9ae1d24e 100644 --- a/hdl/fpga/ip/nuand/synthesis/fifo_writer.vhd +++ b/hdl/fpga/ip/nuand/synthesis/fifo_writer.vhd @@ -119,6 +119,8 @@ architecture simple of fifo_writer is fifo_write : std_logic; fifo_data : unsigned(fifo_data'range); samples_left : natural range 0 to in_sample_controls'length; + in_sample_controls_r: sample_controls_t(0 to NUM_STREAMS-1); + in_samples_r : sample_streams_t(0 to NUM_STREAMS-1); eight_bit_delay : std_logic; end record; @@ -128,6 +130,8 @@ architecture simple of fifo_writer is fifo_write => '0', fifo_data => (others => '-'), samples_left => 0, + in_sample_controls_r=> (others => SAMPLE_CONTROL_DISABLE), + in_samples_r => (others => ZERO_SAMPLE), eight_bit_delay => '0' ); @@ -426,6 +430,48 @@ begin return rv; end function; + procedure handle_fifo_write( + signal fifo_current : in fifo_fsm_t; + signal meta_current : in meta_fsm_t; + signal meta_en : in std_logic; + signal eight_bit_mode_en : in std_logic; + variable write_req : out std_logic; + signal fifo_future : out fifo_fsm_t + ) is + variable in_sample_controls : sample_controls_t(0 to NUM_STREAMS-1); + variable in_samples : sample_streams_t(0 to NUM_STREAMS-1); + begin + in_sample_controls := fifo_current.in_sample_controls_r; + in_samples := fifo_current.in_samples_r; + + if( ((meta_current.meta_written = '1') or (meta_en = '0')) ) then + -- Check for valid data + write_req := '0'; + for i in in_sample_controls'range loop + if( in_sample_controls(i).enable = '1' ) then + write_req := write_req or in_samples(i).data_v; + end if; + end loop; + + -- Received valid data + if( write_req = '1' ) then + if( fifo_current.samples_left = 0 ) then + fifo_future.samples_left <= NUM_STREAMS - count_enabled_channels(in_sample_controls); + if( eight_bit_mode_en = '1' ) then + fifo_future.fifo_write <= write_req and fifo_current.eight_bit_delay; + fifo_future.eight_bit_delay <= not fifo_current.eight_bit_delay; + else + fifo_future.fifo_write <= write_req; + end if; + else + -- MIMO PACKER: STEP 3 of 3 + fifo_future.samples_left <= fifo_current.samples_left - 1; + end if; + end if; + else + fifo_future.fifo_write <= '0'; + end if; + end; variable write_req : std_logic := '0'; @@ -436,12 +482,19 @@ begin fifo_future.fifo_clear <= '0'; fifo_future.fifo_write <= '0'; + fifo_future.in_samples_r <= in_samples; + fifo_future.in_sample_controls_r <= in_sample_controls; + -- MIMO PACKER: STEP 1 of 3 if( packet_en = '0' ) then if( eight_bit_mode_en = '1' ) then - fifo_future.fifo_data <= pack_eight_bit_mode(in_sample_controls, in_samples, fifo_current.fifo_data); + fifo_future.fifo_data <= pack_eight_bit_mode(fifo_current.in_sample_controls_r, + fifo_current.in_samples_r, + fifo_current.fifo_data); else - fifo_future.fifo_data <= pack(in_sample_controls, in_samples, fifo_current.fifo_data); + fifo_future.fifo_data <= pack(fifo_current.in_sample_controls_r, + fifo_current.in_samples_r, + fifo_current.fifo_data); end if; end if; @@ -511,34 +564,14 @@ begin when WRITE_SAMPLES => - if( ((meta_current.meta_written = '1') or (meta_en = '0')) ) then - - -- Check for valid data - write_req := '0'; - for i in in_sample_controls'range loop - if( in_sample_controls(i).enable = '1' ) then - write_req := write_req or in_samples(i).data_v; - end if; - end loop; - - -- Received valid data - if( write_req = '1' ) then - if( fifo_current.samples_left = 0 ) then - fifo_future.samples_left <= NUM_STREAMS - count_enabled_channels(in_sample_controls); - if( eight_bit_mode_en = '1' ) then - fifo_future.fifo_write <= write_req and fifo_current.eight_bit_delay; - fifo_future.eight_bit_delay <= not fifo_current.eight_bit_delay; - else - fifo_future.fifo_write <= write_req; - end if; - else - -- MIMO PACKER: STEP 3 of 3 - fifo_future.samples_left <= fifo_current.samples_left - 1; - end if; - end if; - else - fifo_future.fifo_write <= '0'; - end if; + handle_fifo_write( + fifo_current => fifo_current, + meta_current => meta_current, + meta_en => meta_en, + eight_bit_mode_en => eight_bit_mode_en, + write_req => write_req, + fifo_future => fifo_future + ); if( fifo_full = '1' or ( meta_current.meta_written = '0' and meta_en = '1') ) then fifo_future.fifo_write <= '0'; @@ -549,6 +582,16 @@ begin if( fifo_enough ) then fifo_future.state <= WRITE_SAMPLES; + + handle_fifo_write( + fifo_current => fifo_current, + meta_current => meta_current, + meta_en => meta_en, + eight_bit_mode_en => eight_bit_mode_en, + write_req => write_req, + fifo_future => fifo_future + ); + end if; when others => From fd5dde022fabd7b8194c96d3f31b2e9680256eff Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Thu, 2 May 2024 19:21:51 -0500 Subject: [PATCH 018/238] hdl: nios: add response delay if new clock is selected --- .../software/bladeRF_nios/src/devices_inline.h | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/hdl/fpga/platforms/common/bladerf/software/bladeRF_nios/src/devices_inline.h b/hdl/fpga/platforms/common/bladerf/software/bladeRF_nios/src/devices_inline.h index 7339b94d..430fbefc 100644 --- a/hdl/fpga/platforms/common/bladerf/software/bladeRF_nios/src/devices_inline.h +++ b/hdl/fpga/platforms/common/bladerf/software/bladeRF_nios/src/devices_inline.h @@ -27,6 +27,7 @@ #include #include +#include #include "system.h" #include "altera_avalon_spi.h" @@ -41,7 +42,23 @@ static inline uint32_t control_reg_read(void) static inline void control_reg_write(uint32_t value) { + const size_t CFG_GPIO_CLOCK_SELECT = 18; // Refer to bladerf2_common.h + const uint32_t CLK_SEL_MASK = (1 << CFG_GPIO_CLOCK_SELECT); + uint32_t current_clock_select, requested_clock_select; + bool delay_nios_response = false; + + current_clock_select = control_reg_read() & CLK_SEL_MASK; + requested_clock_select = value & CLK_SEL_MASK; + delay_nios_response = current_clock_select != requested_clock_select; + IOWR_ALTERA_AVALON_PIO_DATA(CONTROL_BASE, value); + + // Adding a delay to allow the Nios and FX3 Plls + // to stabilize before we send back the Nios response. + if (delay_nios_response) { + DBG("__resp_delay__"); + usleep(5); + } } static inline uint32_t rffe_csr_read(void) From 24babc361e17aa8f7d3d50751a198104b721c99d Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Thu, 16 May 2024 13:28:16 -0500 Subject: [PATCH 019/238] hdl: add clock control blocks for system and fx3 plls Resolves Nios and FX3 lockup when SI53304 clock select assignments are made. The FX3 pclk and Nios system PLLs lose lock when the SI53304 transitions between clock sources and this prevents invalid cycles from making it through. --- hdl/fpga/ip/altera/clk_ctrl/clk_ctrl.vhd | 61 +++++++++++++++++++ .../bladerf-micro/bladerf-hosted.qip | 1 + .../bladerf-micro/vhdl/bladerf-hosted.vhd | 20 +++++- .../bladerf-micro/vhdl/bladerf_p.vhd | 8 +++ 4 files changed, 88 insertions(+), 2 deletions(-) create mode 100644 hdl/fpga/ip/altera/clk_ctrl/clk_ctrl.vhd diff --git a/hdl/fpga/ip/altera/clk_ctrl/clk_ctrl.vhd b/hdl/fpga/ip/altera/clk_ctrl/clk_ctrl.vhd new file mode 100644 index 00000000..08747087 --- /dev/null +++ b/hdl/fpga/ip/altera/clk_ctrl/clk_ctrl.vhd @@ -0,0 +1,61 @@ +-- Copyright (c) 2024 Nuand LLC +-- +-- Permission is hereby granted, free of charge, to any person obtaining a copy +-- of this software and associated documentation files (the "Software"), to deal +-- in the Software without restriction, including without limitation the rights +-- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +-- copies of the Software, and to permit persons to whom the Software is +-- furnished to do so, subject to the following conditions: +-- +-- The above copyright notice and this permission notice shall be included in +-- all copies or substantial portions of the Software. +-- +-- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +-- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +-- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +-- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +-- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +-- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +-- THE SOFTWARE. + +library ieee; + use ieee.std_logic_1164.all; + use ieee.math_real.all; + +entity clk_ctrl is + port ( + inclk :in std_logic; + ena :in std_logic; + outclk :out std_logic + ); +end entity clk_ctrl; + +architecture rtl of clk_ctrl is + + component altclkctrl + generic ( + clock_type : string := "Auto"; + ena_register_mode : string := "none"; + number_of_clocks : integer := 1 + ); + port ( + inclk : in std_logic_vector(0 downto 0); + ena : in std_logic; + outclk : out std_logic + ); + end component; + + signal clk_ctrl_out : std_logic; + +begin + + clkctrl : altclkctrl + port map ( + inclk => (0 => inclk), + ena => ena, + outclk => clk_ctrl_out + ); + + outclk <= clk_ctrl_out; + +end architecture rtl; diff --git a/hdl/fpga/platforms/bladerf-micro/bladerf-hosted.qip b/hdl/fpga/platforms/bladerf-micro/bladerf-hosted.qip index 0fc25dad..42f5e944 100644 --- a/hdl/fpga/platforms/bladerf-micro/bladerf-hosted.qip +++ b/hdl/fpga/platforms/bladerf-micro/bladerf-hosted.qip @@ -8,6 +8,7 @@ set opencores_ip [file normalize [file join $here ../../ip/opencores]] # Altera IP set_global_assignment -name VHDL_FILE [file normalize [file join $altera_ip common_dcfifo/common_dcfifo.vhd]] +set_global_assignment -name VHDL_FILE [file normalize [file join $altera_ip clk_ctrl/clk_ctrl.vhd]] set_global_assignment -name VHDL_FILE [file normalize [file join $here vhdl/wrappers/tx_fifo.vhd]] set_global_assignment -name VHDL_FILE [file normalize [file join $here vhdl/wrappers/tx_meta_fifo.vhd]] set_global_assignment -name VHDL_FILE [file normalize [file join $here vhdl/wrappers/rx_fifo.vhd]] diff --git a/hdl/fpga/platforms/bladerf-micro/vhdl/bladerf-hosted.vhd b/hdl/fpga/platforms/bladerf-micro/vhdl/bladerf-hosted.vhd index 009b2a23..5d634e5d 100644 --- a/hdl/fpga/platforms/bladerf-micro/vhdl/bladerf-hosted.vhd +++ b/hdl/fpga/platforms/bladerf-micro/vhdl/bladerf-hosted.vhd @@ -39,10 +39,12 @@ architecture hosted_bladerf of bladerf is signal sys_reset : std_logic; signal sys_clock : std_logic; + signal sys_clock_out : std_logic; signal sys_pll_locked : std_logic; signal sys_pll_reset : std_logic; signal fx3_pclk_pll : std_logic; + signal fx3_pclk_pll_out : std_logic; signal fx3_pclk_pll_locked : std_logic; signal fx3_pclk_pll_reset : std_logic; @@ -202,10 +204,17 @@ begin port map ( refclk => c5_clock2, rst => sys_pll_reset, - outclk_0 => sys_clock, + outclk_0 => sys_clock_out, locked => sys_pll_locked ); + U_system_pll_ctrl : component clk_ctrl + port map ( + inclk => sys_clock_out, + ena => sys_pll_locked, + outclk => sys_clock + ); + U_pll_reset_pll : entity work.pll_reset generic map ( SYS_CLOCK_FREQ_HZ => 38_400_000, @@ -223,10 +232,17 @@ begin port map ( refclk => fx3_pclk, rst => fx3_pclk_pll_reset, - outclk_0 => fx3_pclk_pll, + outclk_0 => fx3_pclk_pll_out, locked => fx3_pclk_pll_locked ); + U_fx3_pll_ctrl : component clk_ctrl + port map ( + inclk => fx3_pclk_pll_out, + ena => fx3_pclk_pll_locked, + outclk => fx3_pclk_pll + ); + U_pll_reset_fx3_pll : entity work.pll_reset generic map ( SYS_CLOCK_FREQ_HZ => 100_000_000, diff --git a/hdl/fpga/platforms/bladerf-micro/vhdl/bladerf_p.vhd b/hdl/fpga/platforms/bladerf-micro/vhdl/bladerf_p.vhd index 8555b527..519d57db 100644 --- a/hdl/fpga/platforms/bladerf-micro/vhdl/bladerf_p.vhd +++ b/hdl/fpga/platforms/bladerf-micro/vhdl/bladerf_p.vhd @@ -50,6 +50,14 @@ package bladerf_p is ); end component; + component clk_ctrl + port ( + inclk :in std_logic; + ena :in std_logic; + outclk :out std_logic + ); + end component; + component nios_system is port ( clk_clk : in std_logic := 'X'; From 044fb54d61d384747df58231d072c4193c6b6a23 Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Tue, 4 Jun 2024 15:47:20 -0500 Subject: [PATCH 020/238] test: libbladeRF: added bladerf_get_gain_modes to gain test The bladeRF 1.0 should pass at this commit. The bladeRF 2.0 should pass on the subsequent commit. --- .../libbladeRF_test/test_ctrl/src/test_gain.c | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/host/libraries/libbladeRF_test/test_ctrl/src/test_gain.c b/host/libraries/libbladeRF_test/test_ctrl/src/test_gain.c index 6cd8474b..31783483 100644 --- a/host/libraries/libbladeRF_test/test_ctrl/src/test_gain.c +++ b/host/libraries/libbladeRF_test/test_ctrl/src/test_gain.c @@ -262,6 +262,8 @@ failure_count test_gain(struct bladerf *dev, struct app_params *p, bool quiet) FOR_EACH_CHANNEL(dir, bladerf_get_channel_count(dev, dir), i, ch) { bladerf_gain_mode old_mode; + const struct bladerf_gain_modes *modes; + int num_gain_modes = 0; int status; /* NOTE: This is a workaround for a bug in fpga v0.10.2 on bladerf2, @@ -274,7 +276,27 @@ failure_count test_gain(struct bladerf *dev, struct app_params *p, bool quiet) return status; } + num_gain_modes = bladerf_get_gain_modes(dev, ch, NULL); + if (num_gain_modes < 0) { + PR_ERROR("Failed to get gain modes on channel %s: %s\n", + channel2str(ch), bladerf_strerror(num_gain_modes)); + failures += 1; + } + + printf("Channel %s has %d gain modes\n", channel2str(ch), num_gain_modes); + + status = bladerf_get_gain_modes(dev, ch, &modes); + if (status < 0) { + PR_ERROR("Failed to get gain modes on channel %s: %s\n", + channel2str(ch), bladerf_strerror(status)); + failures += 1; + } + if (!BLADERF_CHANNEL_IS_TX(ch)) { + for (int mode_idx = 0; mode_idx < num_gain_modes; mode_idx++) { + printf("Gain mode %d: %s\n", mode_idx, modes[mode_idx].name); + } + /* Switch to manual gain control */ status = bladerf_get_gain_mode(dev, ch, &old_mode); if (status < 0 && status != BLADERF_ERR_UNSUPPORTED) { From 9f2f09fb76de4ec491b1e64c9acd71789c90065e Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Tue, 4 Jun 2024 15:52:17 -0500 Subject: [PATCH 021/238] libbladeRF: corrected bladeRF 2.0 gain mode count retrieval bladerf_get_gain_modes() now returns the number of available bladeRF 2.0 gain modes when the modes argument is NULL. Fixes#968 --- host/libraries/libbladeRF/src/board/bladerf2/bladerf2.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/host/libraries/libbladeRF/src/board/bladerf2/bladerf2.c b/host/libraries/libbladeRF/src/board/bladerf2/bladerf2.c index 93e7ce82..51e8b0c1 100644 --- a/host/libraries/libbladeRF/src/board/bladerf2/bladerf2.c +++ b/host/libraries/libbladeRF/src/board/bladerf2/bladerf2.c @@ -786,8 +786,6 @@ static int bladerf2_get_gain_modes(struct bladerf *dev, bladerf_channel ch, struct bladerf_gain_modes const **modes) { - NULL_CHECK(modes); - struct bladerf_gain_modes const *mode_infos; unsigned int mode_infos_len; @@ -799,7 +797,9 @@ static int bladerf2_get_gain_modes(struct bladerf *dev, mode_infos_len = ARRAY_SIZE(bladerf2_rx_gain_modes); } - *modes = mode_infos; + if (modes != NULL) { + *modes = mode_infos; + } return mode_infos_len; } From ffe66c5dfac87fda087927c6d6389f3c9a5474eb Mon Sep 17 00:00:00 2001 From: Ben Morse Date: Wed, 10 Jul 2024 10:38:27 -0700 Subject: [PATCH 022/238] host: update Eclipse instructions for NIOS software development on modern Quartus 20.1 --- .../common/bladerf/software/README.md | 77 +++++++++++++++---- hdl/quartus/launch_eclipse.sh | 34 ++++---- 2 files changed, 84 insertions(+), 27 deletions(-) diff --git a/hdl/fpga/platforms/common/bladerf/software/README.md b/hdl/fpga/platforms/common/bladerf/software/README.md index 77ad9cfa..da8ca1b0 100644 --- a/hdl/fpga/platforms/common/bladerf/software/README.md +++ b/hdl/fpga/platforms/common/bladerf/software/README.md @@ -88,6 +88,12 @@ It is possible to build, load, and debug the Nios software over JTAG using the I (***Linux Users: Ensure you've installed udev rules for your JTAG debugger***) +On Ubuntu 20.04 or similar, you will need these extra dependencies: + +```bash +sudo apt install -y libncursesw5 +``` + Command-Line Debugging with GDB ============================ @@ -176,6 +182,31 @@ To increase the Nios RAM size: - Find the `get_qsys_ram` function, and change the return value to be the nearest power of 2 larger than the required memory size from the above. Sometimes simply doubling the existing return value is good enough. - Rebuild the FPGA in its entirety. This is required because the FPGA needs to instantiate more block RAMs to fit the larger Nios, and it will need to re-fit the surrounding logic. +Install Eclipse +===================== +Before Eclipse can be used, it must be installed. This step is a new change as of recent Quartus versions, and is required for Quartus 20.1. + +These steps will download eclipse, get a new jdk, and replace the jdk. Edit the first line if needed for your install path and version. + +```bash +export QUARTUS_INSTALL_DIR=~/intelFPGA_lite/20.1/ + +sudo apt install -y openjdk-8-jdk +cd $QUARTUS_INSTALL_DIR/nios2eds/bin/ +wget https://archive.eclipse.org/technology/epp/downloads/release/mars/2/eclipse-cpp-mars-2-linux-gtk-x86_64.tar.gz +tar -xf eclipse-cpp-mars-2-linux-gtk-x86_64.tar.gz +mv eclipse eclipse_nios2 +tar -xf eclipse_nios2_plugins.tar.gz +mv jre64 jre64_old +ln -svf /lib/jvm/java-8-openjdk-amd64/jre/ jre64 +``` + +This will install eclipse, however you must launch eclipse using our script, located at `hdl/quartus/launch_eclipse.sh` + +These two pages are reference for this section: +* https://www.intel.com/content/www/us/en/support/programmable/articles/000086893.html +* https://community.intel.com/t5/Intel-Quartus-Prime-Software/Nios-Eclipse-crashes-free-invalid-pointer/m-p/1215921#M66524 + Eclipse GUI Debugging ===================== @@ -194,13 +225,17 @@ $ build_bladerf.sh -b -s -r - Load the FPGA with the resulting image using the bladeRF-cli. The NIOS II will be loaded and reset in a following step. This is required to ensure the PCLK from the FX3 is provided to the NIOS II core. -- Launch the Eclipse version provided with Quartus II 15.0, contained located at: `$QUARTUS_INSTALL_DIR/nios2eds/bin/eclipse-nios2`. Create a workspace wherever you see fit. +- Launch the Eclipse with our provided script. When prompted, create a workspace wherever you see fit. +```bash +cd $BLADERF_DIR +./hdl/quartus/launch_eclipse.sh hdl/quartus/work/-- +``` - Import the bladeRF_nios_bsp project: - - From the project explorer, right click and select *Import...* + - From the project explorer pane, right click and select *Import...* - Select *General --> Existing projects into Workspace* - - Select *Root Directory* - - Select this directory. You should see a project labeled `bladeRF_nios_bsp` checked in the *Projects* pane. + - Click *Browse...* next to *Root Directory*, and select `hdl/fpga/platforms/common/bladerf/software/bladeRF_nios_bsp` + - You should see a project labeled `bladeRF_nios_bsp` checked in the *Projects* pane. - Click Finish - Import the bladeRF_nios projects: @@ -231,22 +266,36 @@ $ build_bladerf.sh -b -s -r - `` is the FPGA size (e.g. 40, 115, A4, A9) - `` is the project revision (typically 'hosted') - Click *OK* - - The `bladeRF_nios` project should now build successfully. - **Remember to update this variable if targeting a different platform later!** -- Create a debug target: - - Click *Debug Configurations...* - - Create a new *NIOS II Hardware v2 (beta)* target - - For *Project*, select bladeRF_nios - - For *ELF:*, select bladeRF_nios.elf - - Under *Connections* -> *Processor*, click *Browse...*. It should detect the NIOS II via the JTAG device and display a string describing its location in the scan chain. - - *Optional* Repeat the above for the *JTAG UART* field, if you wish to use have a console over JTAG. Be careful when using this, as it will significantly affect execution time. - - Uncheck *Check Unique ID* and *Check timestamp*. +- You need to build the BSP once, then the project. + - Right click "bladeRF_nios_bsp" and select "Nios II" -> "Generate BSP" + - Right click "bladeRF_nios" in the Project Explorer pane, and select "Build Project" + - The `bladeRF_nios` project should now build successfully. + - Subsequent changes to the project only require a rebuild of the Project, not the BSP. + +- Create a debug target (see alternative method below): + - Right click "bladeRF_nios" in the Project Explorer pane, and select "Debug As" -> "Debug Configurations..." + - Right click "Nios II Hardware" and select "New" + - On the "Project" tab + - Click "Enable browse for filesystem ELF File + - Click "..." And browse to `hdl/quartus/work/--/bladeRF_nios/bladeRF_nios.elf` + - On the "Target Connection" tab + - check "Ignore mismatched system ID" and "Ignore mismatched system timestamp" + - Find USB-Blaster in "Connections". (Click "Refresh Connections" if it does not show up) + - click apply + - "Debug" button should be clickable - If you wish to download code to the device, reset, and run it... - Check *Download ELF*, *Reset Processor*, and *Start Processor* - If you only wish to inspect the state of the NIOS after observing an issue on the host side... - Ensure all of the aforementioned items are unchecked - - At this point, you may apply the settings and start a debug session. +- Create a debug target V2 (Beta): + - Right click "bladeRF_nios" in the Project Explorer pane, and select "Debug As" -> "Debug Configurations..." + - Right click "Nios II Hardware v2 (beta)" and select "New" + - On the "Main" tab + - For *ELF:*, select `hdl/quartus/work/--/bladeRF_nios/bladeRF_nios.elf` + - Under *Connections* -> *Processor*, click *Browse...*. It should detect the NIOS II via the JTAG device and display a string describing its location in the scan chain. + - *Optional* Repeat the above for the *JTAG UART* field, if you wish to use have a console over JTAG. Be careful when using this, as it will significantly affect execution time. **Note:** You may have to repeat the step(s) where you browse for the device after unplugging and re-connecting the JTAG debugger. diff --git a/hdl/quartus/launch_eclipse.sh b/hdl/quartus/launch_eclipse.sh index b93717b2..2c09ffe9 100755 --- a/hdl/quartus/launch_eclipse.sh +++ b/hdl/quartus/launch_eclipse.sh @@ -4,24 +4,32 @@ cat << EOF To be able to run NiOS's Eclipse the following steps must be taken: #1) ./build_bladerf.sh must finish successfully #2) Ensure eclipse-nios2 is installed. Read Intel's guide at: - https://www.intel.com/content/altera-www/global/en_us/index/support/support-resources/knowledge-base/tools/2019/why-does-the-nios--ii-not-installed-after-full-installation-of-t.html - #3) ./launch_eclipse.sh must be called from hdl/quartus and provided with a + https://www.intel.com/content/www/us/en/support/programmable/articles/000086893.html + #3) Replace Quartus bundled JVM with OpenJDK 8: + Reference: https://community.intel.com/t5/Intel-Quartus-Prime-Software/Nios-Eclipse-crashes-free-invalid-pointer/m-p/1215921#M66524 + sudo apt update + sudo apt install openjdk-8-jdk + cd /intelFPGA/20.1/quartus/linux64 + mv jre64 jre64_old + ln -s /lib/jvm/java-1.8.0-openjdk-amd64/jre jre64 + #4) ./launch_eclipse.sh must be called from hdl/quartus and provided with a path to the build directory, see ./launch_eclipse.sh for example - #4) Once Eclipse is launched, go to File -> Import -> General -> Existing Projects into Workspace. - #5) Click "Select root directory" and supply the path to the bladeRF git repository. - #6) Select and import 2 projects: the bladeRF_nios_bsp project and the corresponding bladeRF project for the target bladeRF: + #5) Once Eclipse is launched, go to File -> Import -> General -> Existing Projects into Workspace. + #6) Click "Select root directory" and supply the path to the bladeRF git repository. + #7) Select and import 2 projects: the bladeRF_nios_bsp project and the corresponding bladeRF project for the target bladeRF: a) bladeRF_nios_bsp should be in hdl/fpga/platforms/common/bladerf/software/bladeRF_nios_bsp/ b) bladeRF (select hdl/fpga/platforms/bladerf for bladeRF 1.0 targets, select hdl/fpga/platforms/bladerf-micro for bladeRF 2.0 targets) - #7) Once imported and available on the Project Explorer pane, right click "bladeRF_nios_bsp" and select "Nios II" -> "Generate BSP" - #8) Right click "bladeRF" in the Project Explorer pane, and select "Build Project" + #8) Once imported and available on the Project Explorer pane, right click "bladeRF_nios_bsp" and select "Nios II" -> "Generate BSP" + #9) Right click "bladeRF" in the Project Explorer pane, and select "Build Project" Optionally to debug, - #1) Right click "bladeRF" in the Project Explorer pane, and select "Debug As" -> "Debug Configurations..." - #2) Right click "Nios II Hardware" and select "New", select "New_configuation" - #3) Under the "Project" tab, fill in the path to the recently generated Nios II ELF file - #4) Under the "Target connection" tab, check "Ignore mismatched system ID" and "Ignore mismatched system timestamp" - #5) Find USB-Blaster in "Connections", click "Refresh Connections" if it does not show up - #6) "Debug" button should be clickable + #1) sudo apt install -y libncursesw5 # for Ubuntu 20.04 + #2) Right click "bladeRF" in the Project Explorer pane, and select "Debug As" -> "Debug Configurations..." + #3) Right click "Nios II Hardware" and select "New", select "New_configuation" + #4) Under the "Project" tab, fill in the path to the recently generated Nios II ELF file + #5) Under the "Target connection" tab, check "Ignore mismatched system ID" and "Ignore mismatched system timestamp" + #6) Find USB-Blaster in "Connections", click "Refresh Connections" if it does not show up + #7) "Debug" button should be clickable If on Linux, consider adding a udev rule to grant access to the USB-Blaster to the plugdev group by adding two lines to /etc/udev/rules.d/91-usb.rules: From effe3eb2df0d1f6290eff62b790e1f399249a730 Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Tue, 23 Apr 2024 15:43:34 -0500 Subject: [PATCH 023/238] libbladeRF: added error log for failed nios_config_write --- host/libraries/libbladeRF/src/backend/usb/nios_access.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/host/libraries/libbladeRF/src/backend/usb/nios_access.c b/host/libraries/libbladeRF/src/backend/usb/nios_access.c index b2c49172..d6b7e7f8 100644 --- a/host/libraries/libbladeRF/src/backend/usb/nios_access.c +++ b/host/libraries/libbladeRF/src/backend/usb/nios_access.c @@ -438,6 +438,8 @@ int nios_config_write(struct bladerf *dev, uint32_t val) if (status == 0) { log_verbose("%s: Wrote 0x%08x\n", __FUNCTION__, val); + } else { + log_error("%s: Failed to write 0x%08x\n", __FUNCTION__, val); } return status; From 03ccc0028a12fb95e0dfe6b630e5c86582a132b9 Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Wed, 24 Apr 2024 16:05:38 -0500 Subject: [PATCH 024/238] hdl: nios: debug print on failed pkt_8x32 r/w --- .../common/bladerf/software/bladeRF_nios/src/pkt_8x32.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/hdl/fpga/platforms/common/bladerf/software/bladeRF_nios/src/pkt_8x32.c b/hdl/fpga/platforms/common/bladerf/software/bladeRF_nios/src/pkt_8x32.c index dbfa9a81..207bc758 100644 --- a/hdl/fpga/platforms/common/bladerf/software/bladeRF_nios/src/pkt_8x32.c +++ b/hdl/fpga/platforms/common/bladerf/software/bladeRF_nios/src/pkt_8x32.c @@ -126,5 +126,13 @@ void pkt_8x32(struct pkt_buf *b) success = perform_read(id, addr, &data); } + if (!success && is_write) { + DBG("Failed to write 0x%08x to 0x%02x\n", data, addr); + } + + if (!success && !is_write) { + DBG("Failed to read from 0x%02x\n", addr); + } + nios_pkt_8x32_resp_pack(b->resp, id, is_write, addr, data, success); } From ffb55acd050ca1e928160a2b7868783a8be0eca7 Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Fri, 17 May 2024 15:18:45 -0500 Subject: [PATCH 025/238] libbladeRF: added log_debug_8x32_pkt for nios r/w failures --- fpga_common/include/nios_pkt_8x32.h | 27 +++++++++++++++++++ .../libbladeRF/src/backend/usb/nios_access.c | 27 +++++++++++++++++++ 2 files changed, 54 insertions(+) diff --git a/fpga_common/include/nios_pkt_8x32.h b/fpga_common/include/nios_pkt_8x32.h index 50cb16f3..27e6373a 100644 --- a/fpga_common/include/nios_pkt_8x32.h +++ b/fpga_common/include/nios_pkt_8x32.h @@ -118,6 +118,33 @@ #define NIOS_PKT_8x32_FLAG_WRITE (1 << 0) #define NIOS_PKT_8x32_FLAG_SUCCESS (1 << 1) +/* Function to convert target ID to string */ +static inline const char* target2str(uint8_t target_id) { + switch (target_id) { + case NIOS_PKT_8x32_TARGET_VERSION: + return "FPGA Version"; + case NIOS_PKT_8x32_TARGET_CONTROL: + return "FPGA Control/Config Register"; + case NIOS_PKT_8x32_TARGET_ADF4351: + return "XB-200 ADF4351 Register (Write-Only)"; + case NIOS_PKT_8x32_TARGET_RFFE_CSR: + return "RFFE Control & Status GPIO"; + case NIOS_PKT_8x32_TARGET_ADF400X: + return "ADF400x Config"; + case NIOS_PKT_8x32_TARGET_FASTLOCK: + return "AD9361 Fast Lock Profile"; + + /* Reserved for user customizations */ + case NIOS_PKT_8x32_TARGET_USR1: + return "User Defined 1"; + case NIOS_PKT_8x32_TARGET_USR128: + return "User Defined 128"; + + default: + return "Unknown Target ID"; + } +} + /* Pack the request buffer */ static inline void nios_pkt_8x32_pack(uint8_t *buf, uint8_t target, bool write, uint8_t addr, uint32_t data) diff --git a/host/libraries/libbladeRF/src/backend/usb/nios_access.c b/host/libraries/libbladeRF/src/backend/usb/nios_access.c index d6b7e7f8..354d80b2 100644 --- a/host/libraries/libbladeRF/src/backend/usb/nios_access.c +++ b/host/libraries/libbladeRF/src/backend/usb/nios_access.c @@ -207,6 +207,31 @@ static int nios_8x16_write(struct bladerf *dev, uint8_t id, } } +static void log_debug_8x32_pkt(const uint8_t *buf) { + if (buf == NULL) { + log_debug("Failed to log packet: packet buffer is NULL\n"); + return; + } + + uint8_t target_id; + bool write; + uint8_t addr; + uint32_t data; + bool success; + + nios_pkt_8x32_resp_unpack(buf, &target_id, &write, &addr, &data, &success); + + const char *operation = write ? "Write" : "Read"; + const char *status = success ? "Success" : "Failure"; + + log_debug("Packet Magic: 0x%02x\n", buf[NIOS_PKT_8x32_IDX_MAGIC]); + log_debug("Packet Target: %s\n", target2str(target_id)); + log_debug("Packet Operation: %s\n", operation); + log_debug("Packet Address: 0x%02x\n", addr); + log_debug("Packet Data: 0x%08x\n", data); + log_debug("Packet Status: %s\n", status); +} + static int nios_8x32_read(struct bladerf *dev, uint8_t id, uint8_t addr, uint32_t *data) { @@ -228,6 +253,7 @@ static int nios_8x32_read(struct bladerf *dev, uint8_t id, } else { *data = 0; log_debug("%s: response packet reported failure.\n", __FUNCTION__); + log_debug_8x32_pkt(buf); return BLADERF_ERR_FPGA_OP; } } @@ -252,6 +278,7 @@ static int nios_8x32_write(struct bladerf *dev, uint8_t id, return 0; } else { log_debug("%s: response packet reported failure.\n", __FUNCTION__); + log_debug_8x32_pkt(buf); return BLADERF_ERR_FPGA_OP; } } From a34f6aaf1b1ff967a3044a262c52610a7497bf03 Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Fri, 3 May 2024 19:16:30 -0500 Subject: [PATCH 026/238] test: added clock select test --- host/libraries/libbladeRF_test/CMakeLists.txt | 1 + .../test_clock_select/CMakeLists.txt | 12 ++ .../test_clock_select/src/main.c | 199 ++++++++++++++++++ 3 files changed, 212 insertions(+) create mode 100644 host/libraries/libbladeRF_test/test_clock_select/CMakeLists.txt create mode 100644 host/libraries/libbladeRF_test/test_clock_select/src/main.c diff --git a/host/libraries/libbladeRF_test/CMakeLists.txt b/host/libraries/libbladeRF_test/CMakeLists.txt index bd75e4aa..cd9f17b5 100644 --- a/host/libraries/libbladeRF_test/CMakeLists.txt +++ b/host/libraries/libbladeRF_test/CMakeLists.txt @@ -4,6 +4,7 @@ add_subdirectory(test_async) add_subdirectory(test_bootloader_recovery) add_subdirectory(test_c) #add_subdirectory(test_config_file) +add_subdirectory(test_clock_select) add_subdirectory(test_cpp) add_subdirectory(test_ctrl) add_subdirectory(test_freq_hop) diff --git a/host/libraries/libbladeRF_test/test_clock_select/CMakeLists.txt b/host/libraries/libbladeRF_test/test_clock_select/CMakeLists.txt new file mode 100644 index 00000000..1087fba6 --- /dev/null +++ b/host/libraries/libbladeRF_test/test_clock_select/CMakeLists.txt @@ -0,0 +1,12 @@ +cmake_minimum_required(VERSION 3.5) +project(libbladeRF_test_clock_select C) + +set(INCLUDES ${libbladeRF_SOURCE_DIR}/include) +if(MSVC) + set(INCLUDES ${INCLUDES} ${MSVC_C99_INCLUDES}) +endif() + +include_directories(${INCLUDES} ${CURL_INCLUDE_DIR} include) +add_executable(${PROJECT_NAME} src/main.c) + +target_link_libraries(${PROJECT_NAME} libbladerf_shared) diff --git a/host/libraries/libbladeRF_test/test_clock_select/src/main.c b/host/libraries/libbladeRF_test/test_clock_select/src/main.c new file mode 100644 index 00000000..856aeff4 --- /dev/null +++ b/host/libraries/libbladeRF_test/test_clock_select/src/main.c @@ -0,0 +1,199 @@ +/* + * This file is part of the bladeRF project: + * http://www.github.com/nuand/bladeRF + * + * Copyright (C) 2024 Nuand LLC + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + * + * This program is intended to verify that C programs build against + * libbladeRF without any unintended dependencies. + */ +#include +#include +#include +#include +#include +#include +#include "libbladeRF.h" + +#define CHECK_STATUS(fn) \ + do { \ + status = (fn); \ + if (status != 0) { \ + fprintf(stderr, "Error at %s:%d (%s): Status %d\n", __FILE__, __LINE__, __func__, status); \ + goto error; \ + } \ + } while (0) + +static volatile bool done = false; +void handle_sigint(int sig) { + fprintf(stderr, "\nSIGINT caught. Closing test..."); + done = true; +} + +void usage(const char *progname) { + fprintf(stderr, "Usage: %s [options]\n", progname); + fprintf(stderr, "Options:\n"); + fprintf(stderr, " -d, --device Specify the device string (defaults to 'auto')\n"); + fprintf(stderr, " -l, --load Specify the FPGA bitstream file to load\n"); + fprintf(stderr, " -i, --iterations Specify the number of test iterations (default 100)\n"); + fprintf(stderr, " -p, --power_reset Perform a power reset before each iteration if specified\n"); + fprintf(stderr, " -r, --reopen Reopen the device before each iteration if specified\n"); + fprintf(stderr, " -v, --verbosity Enable verbose logging\n"); + fprintf(stderr, " -h, --help Display this help message and exit\n"); +} + +static struct option long_options[] = { + {"device", required_argument , 0, 'd'}, + {"load", required_argument , 0, 'l'}, + {"iterations", required_argument , 0, 'i'}, + {"power_reset", no_argument , 0, 'p'}, + {"reopen", no_argument , 0, 'r'}, + {"verbosity", no_argument , 0, 'v'}, + {"help", no_argument , 0, 'h'}, + {0, 0, 0, 0 } +}; + +int main(int argc, char *argv[]) +{ + int status = 0; + struct bladerf *dev = NULL; + const char *device_string = NULL; + const char *fpga_file = NULL; + int c; + size_t num_test_iterations = 100; + size_t num_failures = 0; + bool power_reset = false; + bool reopen = false; + time_t start_time, current_time, last_print_time = 0; + size_t i = 0; + + while ((c = getopt_long(argc, argv, "d:l:i:prvh", long_options, NULL)) != -1) { + switch (c) { + case 'd': + device_string = optarg; + break; + + case 'l': + fpga_file = optarg; + break; + + case 'i': + num_test_iterations = atoi(optarg); + if (num_test_iterations == 0) { + fprintf(stderr, "Invalid number of iterations: %s\n", optarg); + exit(EXIT_FAILURE); + } + break; + + case 'p': + power_reset = true; + break; + + case 'r': + reopen = true; + break; + + case 'v': + printf("Setting verbosity to verbose\n"); + bladerf_log_set_verbosity(BLADERF_LOG_LEVEL_VERBOSE); + break; + + case 'h': + usage(argv[0]); + exit(EXIT_SUCCESS); + + case '?': + usage(argv[0]); + exit(EXIT_FAILURE); + + default: + printf("?? getopt returned character code 0%o ??\n", c); + } + } + + printf("Iterations: %zu\n", num_test_iterations); + printf("Device str: %s\n", (device_string == NULL) ? "auto" : device_string); + printf("FPGA file: %s\n", fpga_file ? fpga_file : "None"); + printf("Force reopen: %s\n", reopen ? "true" : "false"); + printf("Power reset: %s\n", power_reset ? "true" : "false"); + + if (reopen == false) + CHECK_STATUS(bladerf_open(&dev, device_string)); + + time(&start_time); + signal(SIGINT, handle_sigint); + for (i = 0; i < num_test_iterations; i++) { + time(¤t_time); + if (current_time - last_print_time >= 1) { + printf("Failures: %zu/%zu of %zu\n", num_failures, i + 1, num_test_iterations); + last_print_time = current_time; + } + + if (power_reset) { + const char* cmd_restart_bladerf = + "cd ../libraries/libbladeRF_test/common/arduino/power-toggle &&" + "./turn.sh off &&" + "./turn.sh on"; + + CHECK_STATUS(system(cmd_restart_bladerf)); + } + + if (reopen) + CHECK_STATUS(bladerf_open(&dev, device_string)); + + if (fpga_file) + CHECK_STATUS(bladerf_load_fpga(dev, fpga_file)); + + status = bladerf_set_clock_select(dev, CLOCK_SELECT_EXTERNAL); + if (status == 0) + status = bladerf_set_clock_select(dev, CLOCK_SELECT_ONBOARD); + + if (status != 0) { + fprintf(stderr, "Failed to set clock select: %s\n", bladerf_strerror(status)); + num_failures ++; + + fprintf(stderr, "Attempting to reopen device...\n"); + bladerf_close(dev); + dev = NULL; + sleep(3); + CHECK_STATUS(bladerf_open(&dev, device_string)); + } + + if (reopen) { + bladerf_close(dev); + dev = NULL; + } + + if (done) + break; + } + +error: + printf("\nFailures: %zu/%zu\n", num_failures, i + 1); + + if (dev) + bladerf_close(dev); + + if (status != 0 || num_failures > 0) + return EXIT_FAILURE; + + return EXIT_SUCCESS; +} From b7a6173edd5547bb2d6400a2485a233673f10d00 Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Fri, 10 May 2024 10:55:16 -0500 Subject: [PATCH 027/238] libbladeRF: added log message for failed FPGA image read --- host/libraries/libbladeRF/src/bladerf.c | 1 + 1 file changed, 1 insertion(+) diff --git a/host/libraries/libbladeRF/src/bladerf.c b/host/libraries/libbladeRF/src/bladerf.c index 4ebd326e..4ba5c7b8 100644 --- a/host/libraries/libbladeRF/src/bladerf.c +++ b/host/libraries/libbladeRF/src/bladerf.c @@ -1175,6 +1175,7 @@ int bladerf_load_fpga(struct bladerf *dev, const char *fpga_file) status = file_read_buffer(fpga_file, &buf, &buf_size); if (status != 0) { + log_error("Failed to read FPGA image: %s\n", bladerf_strerror(status)); goto exit; } From 50d26e2e53f4ecbf5bc89cdcfc7c1b4dc3bf0750 Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Thu, 23 May 2024 13:49:31 -0500 Subject: [PATCH 028/238] libbladeRF: issue warning for USB 2.0 clock select assignments --- host/libraries/libbladeRF/src/board/bladerf2/bladerf2.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/host/libraries/libbladeRF/src/board/bladerf2/bladerf2.c b/host/libraries/libbladeRF/src/board/bladerf2/bladerf2.c index 51e8b0c1..c6961ec5 100644 --- a/host/libraries/libbladeRF/src/board/bladerf2/bladerf2.c +++ b/host/libraries/libbladeRF/src/board/bladerf2/bladerf2.c @@ -3574,6 +3574,10 @@ int bladerf_set_clock_select(struct bladerf *dev, bladerf_clock_select sel) CHECK_BOARD_IS_BLADERF2(dev); CHECK_BOARD_STATE(STATE_FPGA_LOADED); + if (bladerf_device_speed(dev) == BLADERF_DEVICE_SPEED_HIGH) { + log_warning("USB 3.0 recommended for reliable clock select assignment.\n"); + } + WITH_MUTEX(&dev->lock, { uint32_t gpio; From acdb03af431d3bb11e93b1719e14cb4af54f8656 Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Wed, 22 Nov 2023 17:10:48 -0600 Subject: [PATCH 029/238] doc: added bladerf_alloc_image parameter descriptions --- host/libraries/libbladeRF/include/libbladeRF.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/host/libraries/libbladeRF/include/libbladeRF.h b/host/libraries/libbladeRF/include/libbladeRF.h index 6fc323f1..952cce7a 100644 --- a/host/libraries/libbladeRF/include/libbladeRF.h +++ b/host/libraries/libbladeRF/include/libbladeRF.h @@ -3371,6 +3371,11 @@ struct bladerf_image { * The `address` and `length` fields should be set 0 when reading an image from * a file. * + * @param[in] dev Device handle + * @param[in] type Image type to be created, represented by `bladerf_image_type` + * @param[in] address Address in flash memory where the image is stored. Use 0xffffffff if not applicable. + * @param[in] length Length of the image data in bytes + * * @return Pointer to allocated and initialized structure on success, * `NULL` on memory allocation failure or invalid address/length. */ From 85962723912cbac68c2538a44734211a2eba4cfb Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Wed, 6 Dec 2023 11:57:10 -0600 Subject: [PATCH 030/238] gitignore: python venvs, build dirs, and vscode --- .gitignore | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 8639db62..3eb0b22f 100644 --- a/.gitignore +++ b/.gitignore @@ -34,9 +34,7 @@ hdl/quartus/qpsk_txx* fx3_firmware/make/toolchain.mk fx3_firmware/build/* -build/* - -host/build/* +build/ host/examples/gnuradio/frs/bladeRF_frs.py @@ -54,3 +52,10 @@ host/misc/windows/scripts/work **/modelsim/*.wlf **/modelsim/work/ **/modelsim/nuand/ + +# Common Python virtual environment names +env/ +venv/ +ENV/ + +.vscode/ From 87337ccec0a3897ede19023c5e09d5f95255c39e Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Wed, 30 Aug 2023 15:07:15 -0500 Subject: [PATCH 031/238] libbladeRF: test: test_hwloop target added Builds the python virtual environment for python based bladeRF tests. --- .../libbladeRF_test/test_timestamps/CMakeLists.txt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/host/libraries/libbladeRF_test/test_timestamps/CMakeLists.txt b/host/libraries/libbladeRF_test/test_timestamps/CMakeLists.txt index f1561704..4c5b752b 100644 --- a/host/libraries/libbladeRF_test/test_timestamps/CMakeLists.txt +++ b/host/libraries/libbladeRF_test/test_timestamps/CMakeLists.txt @@ -85,6 +85,11 @@ add_executable(libbladeRF_test_txrx_hwloop ${SRC}) target_link_libraries(libbladeRF_test_txrx_hwloop ${LIBS}) configure_file(scripts/test_txrx_hwloop.py - ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libbladeRF_test_txrx_hwloop.py + ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${BIN_NAME}.py FILE_PERMISSIONS OWNER_EXECUTE OWNER_READ COPYONLY) + +add_custom_target(test_hwloop + COMMAND ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/setup_env.sh + DEPENDS ${PROJECT_NAME} + WORKING_DIRECTORY ${CMAKE_BINARY_DIR}) From f28c6650246b5c3592b6d4248cba2d2f936ea331 Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Thu, 21 Dec 2023 10:40:38 -0600 Subject: [PATCH 032/238] libbladeRF: test: fixed "unrecognized option '--gtest_list_tests'" on make --- host/libraries/libbladeRF_test/test_regression/CMakeLists.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/host/libraries/libbladeRF_test/test_regression/CMakeLists.txt b/host/libraries/libbladeRF_test/test_regression/CMakeLists.txt index cea300cc..e5bf0f7c 100644 --- a/host/libraries/libbladeRF_test/test_regression/CMakeLists.txt +++ b/host/libraries/libbladeRF_test/test_regression/CMakeLists.txt @@ -87,8 +87,6 @@ target_link_libraries( absl::strings ) -gtest_discover_tests(${PROJECT_NAME}) - ################################################################ # Find the nios2_command_shell ################################################################ From a87ad2208b77380994819aa9b83e68cc5da46143 Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Thu, 29 Feb 2024 15:45:25 -0600 Subject: [PATCH 033/238] libbladeRF: test: null and status checks in test_common.h --- .../common/include/test_common.h | 56 +++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/host/libraries/libbladeRF_test/common/include/test_common.h b/host/libraries/libbladeRF_test/common/include/test_common.h index 73b776f6..c965e85b 100644 --- a/host/libraries/libbladeRF_test/common/include/test_common.h +++ b/host/libraries/libbladeRF_test/common/include/test_common.h @@ -1,8 +1,10 @@ #ifndef TEST_COMMON_H_ #define TEST_COMMON_H_ +#include #include #include +#include "libbladeRF.h" #include "host_config.h" #include "rel_assert.h" @@ -10,6 +12,60 @@ # include "clock_gettime.h" #endif +/** + * @brief Checks if any of the provided arguments are NULL. + * + * This macro iterates over each argument provided to it and checks if it is NULL. + * If a NULL argument is found, it logs an error message indicating the argument + * position that is NULL and returns a `BLADERF_ERR_INVAL` error code to indicate + * an invalid parameter was passed. + * + * @param[in] __VA_ARGS__ A list of pointers to check for NULL. This list must be + * terminated by a NULL pointer. + */ +#define CHECK_NULL(...) do { \ + const void* _args[] = { __VA_ARGS__, NULL }; \ + for (size_t _i = 0; _args[_i] != NULL; ++_i) { \ + if (_args[_i] == NULL) { \ + log_error("%s:%d: Argument %zu is a NULL pointer\n", __FILE__, __LINE__, _i + 1); \ + return BLADERF_ERR_INVAL; \ + } \ + } \ +} while (0) + +/** + * @brief Checks the status returned by a function and logs an error if it indicates failure. + * + * This macro invokes a function and checks its return value. If the return value + * indicates a failure (non-zero), it logs an error message including the file name, + * line number, function name, and a string describing the error based on the status code. + * After logging the error, it jumps to a label `error` for error handling. + * + * @param[in] fn The function to invoke, which should return an integer status code. + */ +#define CHECK_STATUS(fn) do { \ + status = fn; \ + if (status != 0) { \ + log_error("%s:%d: %s failed: %s\n", __FILE__, __LINE__, #fn, \ + bladerf_strerror(status)); \ + goto error; \ + } \ + } while (0) + +/** + * @brief Converts bytes to double words. + * + * Calculates the number of 32-bit double words (DWORDs) required to hold a given number of bytes. + * It assumes that 1 DWORD is equivalent to 4 bytes (32 bits). + * + * @param bytes The number of bytes to convert to DWORDs. The value should be non-negative. + * + * @return The minimum number of DWORDs required to hold the specified number of bytes. + */ +static inline size_t bytes_to_dwords(int bytes) { + return (bytes + 3) / 4; +} + /** * Initialize a seed for use with randval_update * From 09fcacc9bcc562fd4f2e5a6e4a441711b20075ff Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Mon, 30 Oct 2023 11:41:13 -0500 Subject: [PATCH 034/238] libbladeRF: test: gain_compare: comparing RX power with MIMO and SISO configs This provides a way to test MIMO and SISO power measurements through the CLI. The power for both channels under SISO and MIMO should be about the same. Instructions --------------- python -m venv env source ./env/bin/activate pip install -r requirements.txt Ch1 & Ch2: bladeRF-cli -s bladerf_script_ch12.sh python view_binary.py -n 2 Ch1: bladeRF-cli -s bladerf_script_ch1.sh python view_binary.py -n 1 Ch2: bladeRF-cli -s bladerf_script_ch2.sh python view_binary.py -n 1 --- .../test_gain_compare/bladerf_script_ch1.sh | 7 + .../test_gain_compare/bladerf_script_ch12.sh | 8 ++ .../test_gain_compare/bladerf_script_ch2.sh | 7 + .../test_gain_compare/requirements.txt | 11 ++ .../test_gain_compare/view_binary.py | 124 ++++++++++++++++++ 5 files changed, 157 insertions(+) create mode 100644 host/libraries/libbladeRF_test/test_gain_compare/bladerf_script_ch1.sh create mode 100644 host/libraries/libbladeRF_test/test_gain_compare/bladerf_script_ch12.sh create mode 100644 host/libraries/libbladeRF_test/test_gain_compare/bladerf_script_ch2.sh create mode 100644 host/libraries/libbladeRF_test/test_gain_compare/requirements.txt create mode 100644 host/libraries/libbladeRF_test/test_gain_compare/view_binary.py diff --git a/host/libraries/libbladeRF_test/test_gain_compare/bladerf_script_ch1.sh b/host/libraries/libbladeRF_test/test_gain_compare/bladerf_script_ch1.sh new file mode 100644 index 00000000..d47be9f9 --- /dev/null +++ b/host/libraries/libbladeRF_test/test_gain_compare/bladerf_script_ch1.sh @@ -0,0 +1,7 @@ +rx config file=dual_test.bin n=5M channel=1 +set frequency rx 2211.5e6 +set samplerate 2e6 +set agc 0 +set gain rx1 60 +rx start +rx wait diff --git a/host/libraries/libbladeRF_test/test_gain_compare/bladerf_script_ch12.sh b/host/libraries/libbladeRF_test/test_gain_compare/bladerf_script_ch12.sh new file mode 100644 index 00000000..35d9aa24 --- /dev/null +++ b/host/libraries/libbladeRF_test/test_gain_compare/bladerf_script_ch12.sh @@ -0,0 +1,8 @@ +rx config file=dual_test.bin n=10M channel=1,2 +set frequency rx 915e6 +set samplerate 2e6 +set agc 0 +set clock_ref 1 +rx start +p +rx wait \ No newline at end of file diff --git a/host/libraries/libbladeRF_test/test_gain_compare/bladerf_script_ch2.sh b/host/libraries/libbladeRF_test/test_gain_compare/bladerf_script_ch2.sh new file mode 100644 index 00000000..4db3f10b --- /dev/null +++ b/host/libraries/libbladeRF_test/test_gain_compare/bladerf_script_ch2.sh @@ -0,0 +1,7 @@ +rx config file=dual_test.bin n=5M channel=2 +set frequency rx 2211.5e6 +set samplerate 2e6 +set agc 0 +set gain rx2 60 +rx start +rx wait diff --git a/host/libraries/libbladeRF_test/test_gain_compare/requirements.txt b/host/libraries/libbladeRF_test/test_gain_compare/requirements.txt new file mode 100644 index 00000000..2cc080d4 --- /dev/null +++ b/host/libraries/libbladeRF_test/test_gain_compare/requirements.txt @@ -0,0 +1,11 @@ +contourpy==1.1.1 +cycler==0.12.0 +fonttools==4.43.1 +kiwisolver==1.4.5 +matplotlib==3.8.0 +numpy==1.26.0 +packaging==23.2 +Pillow==10.0.1 +pyparsing==3.1.1 +python-dateutil==2.8.2 +six==1.16.0 diff --git a/host/libraries/libbladeRF_test/test_gain_compare/view_binary.py b/host/libraries/libbladeRF_test/test_gain_compare/view_binary.py new file mode 100644 index 00000000..7fd64148 --- /dev/null +++ b/host/libraries/libbladeRF_test/test_gain_compare/view_binary.py @@ -0,0 +1,124 @@ +import numpy as np +import matplotlib.pyplot as plt +import argparse +import os + + +def read_samples(file_name, num_channels): + """Read samples from a file and split them into channels.""" + int12_max = 2047 + samples = np.fromfile(file_name, dtype=np.int16) + samples = samples[int(40e3):] # Flush out garbage samples + if num_channels > 1: + samples_ch1 = samples[::4] + 1j*samples[1::4] + samples_ch2 = samples[2::4] + 1j*samples[3::4] + else: + samples_ch1 = samples[::2] + 1j*samples[1::2] + + return samples_ch1, samples_ch2 if num_channels > 1 else None + +def calculate_fft_dbfs(samples, adc_max_value=2047): + """Calculate the FFT and convert it to dBFS for given samples.""" + + fft_result = np.fft.fftshift(np.fft.fft(samples, n=4096)) + normalized_magnitude = np.abs(fft_result) / len(np.abs(fft_result)) + # Convert to dBFS + magnitude_dbfs = 20 * np.log10(normalized_magnitude / adc_max_value) + avg_dbfs = np.mean(magnitude_dbfs[magnitude_dbfs != -np.inf]) # Avoid log(0) which results in -inf + + return magnitude_dbfs, avg_dbfs + +def plot_data(samples_ch1, samples_ch2=None, alpha=0.95): + """Plot the sample data in decibel scale.""" + + # Time domain plot in linear scale (if you want it in dB, convert to dB) + plt.figure() + plt.plot( + np.abs(samples_ch1), + label=f"CH1: avg = {np.abs(samples_ch1).mean():.2f}", + alpha=alpha, + ) + + if samples_ch2 is not None: + plt.plot( + np.abs(samples_ch2), + label=f"CH2: avg = {np.abs(samples_ch2).mean():.2f}", + alpha=alpha, + ) + + plt.ylim(0, np.abs(2047 + 1j * 2047)) + plt.title('Time-domain Signal') + plt.xlabel('Sample Number') + plt.ylabel('Amplitude') + plt.legend(loc="upper right") + + # FFT computation and dBFS conversion + plt.figure() + CH1_mag_dbfs, CH1_avg_dbfs = calculate_fft_dbfs(samples_ch1) + + plt.plot( + CH1_mag_dbfs, + label=f"CH1", + alpha=alpha, + ) + + plt.axhline( + y=CH1_avg_dbfs, + color="g", + linestyle="--", + label=f"CH1 Avg: {CH1_avg_dbfs:.2f} dBFS", + ) + + if samples_ch2 is not None: + CH2_mag_dbfs, CH2_avg_dbfs = calculate_fft_dbfs(samples_ch2) + + plt.plot( + CH2_mag_dbfs, + label=f"CH2", + alpha=alpha, + ) + + plt.axhline( + y=CH2_avg_dbfs, + color="r", + linestyle="--", + label=f"CH2 Avg: {CH2_avg_dbfs:.2f} dBFS", + ) + + plt.title('Frequency-domain Signal (FFT in dBFS)') + plt.xlabel('Frequency Bin') + plt.ylabel('Magnitude (dBFS)') + plt.legend(loc="upper right") + plt.show() + +def main(): + parser = argparse.ArgumentParser(description="Sample Configuration") + + parser.add_argument("-f", "--file", type=str, default="dual_test.bin", help="File name") + parser.add_argument( + "-n", + "--num_channels", + type=int, + default=1, + help="Number of channels (default: 1)", + ) + args = parser.parse_args() + + if args.num_channels <= 0: + raise ValueError("Number of channels must be a positive integer.") + + print("Configuration:") + print(f"File Name: {args.file}") + print(f"Number of Channels: {args.num_channels}") + + try: + samples_ch1, samples_ch2 = read_samples(args.file, args.num_channels) + plot_data(samples_ch1, samples_ch2) + except FileNotFoundError: + print(f"Error: File '{args.file}' not found.") + except Exception as e: + print(f"An error occurred: {e}") + + +if __name__ == "__main__": + main() From afc636073e9d987eb962fd0c188242e4cbb93c47 Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Tue, 5 Dec 2023 18:20:38 -0600 Subject: [PATCH 035/238] libbladeRF: test: gain_compare: C test added This isolates the gain differentiation on init from the CLI or Gnuradio. Refer to the instructions below. Instructions: cd bladeRF/host/libraries/libbladeRF_test/test_gain_compare/ python -m venv env source ./env/bin/activate pip3 install -r requirements.txt cd bladeRF/host/build make -j`nproc` && sudo make install ./output/libbladeRF_test_gain_compare cd ../libraries/libbladeRF_test/test_gain_compare/ mv ~/code/bladeRF/host/build/dual_test.bin . python3 view_binary.py -n 2 --- host/libraries/libbladeRF_test/CMakeLists.txt | 1 + .../test_gain_compare/CMakeLists.txt | 23 +++++ .../test_gain_compare/src/main.c | 97 +++++++++++++++++++ 3 files changed, 121 insertions(+) create mode 100644 host/libraries/libbladeRF_test/test_gain_compare/CMakeLists.txt create mode 100644 host/libraries/libbladeRF_test/test_gain_compare/src/main.c diff --git a/host/libraries/libbladeRF_test/CMakeLists.txt b/host/libraries/libbladeRF_test/CMakeLists.txt index cd9f17b5..118339a1 100644 --- a/host/libraries/libbladeRF_test/CMakeLists.txt +++ b/host/libraries/libbladeRF_test/CMakeLists.txt @@ -12,6 +12,7 @@ add_subdirectory(test_fw_check) add_subdirectory(test_open) add_subdirectory(test_parse) add_subdirectory(test_peripheral_timing) +add_subdirectory(test_gain_compare) add_subdirectory(test_repeater) add_subdirectory(test_quick_retune) add_subdirectory(test_repeated_stream) diff --git a/host/libraries/libbladeRF_test/test_gain_compare/CMakeLists.txt b/host/libraries/libbladeRF_test/test_gain_compare/CMakeLists.txt new file mode 100644 index 00000000..7ebe543e --- /dev/null +++ b/host/libraries/libbladeRF_test/test_gain_compare/CMakeLists.txt @@ -0,0 +1,23 @@ +cmake_minimum_required(VERSION 3.5) +project(libbladeRF_test_gain_compare C) + +set(INCLUDES + ${libbladeRF_SOURCE_DIR}/include + ${BLADERF_HOST_COMMON_INCLUDE_DIRS} + ${CMAKE_CURRENT_SOURCE_DIR}/../common/include + ${CMAKE_CURRENT_SOURCE_DIR}/../../libbladeRF/src/streaming +) + +set(LIBS libbladerf_shared) + +add_definitions(-DLOGGING_ENABLED=1) +set(SRC + src/main.c + ${BLADERF_HOST_COMMON_SOURCE_DIR}/conversions.c + ${BLADERF_HOST_COMMON_SOURCE_DIR}/log.c +) + +include_directories(${INCLUDES}) +add_executable(libbladeRF_test_gain_compare ${SRC}) +target_link_libraries(libbladeRF_test_gain_compare ${LIBS}) + diff --git a/host/libraries/libbladeRF_test/test_gain_compare/src/main.c b/host/libraries/libbladeRF_test/test_gain_compare/src/main.c new file mode 100644 index 00000000..631507c6 --- /dev/null +++ b/host/libraries/libbladeRF_test/test_gain_compare/src/main.c @@ -0,0 +1,97 @@ +#include +#include +#include +#include +#include "log.h" + +#define CHECK(func_call) do { \ + status = (func_call); \ + if (status != 0) { \ + fprintf(stderr, "Failed at %s: %s\n", #func_call, bladerf_strerror(status)); \ + status = EXIT_FAILURE; \ + goto out; \ + } \ +} while (0) + +static int init_sync(struct bladerf *dev, const size_t NUM_CHANNELS, bladerf_sample_rate samp_rate) +{ + int status; + const unsigned int num_buffers = 10*512; + const unsigned int buffer_size = 2*8192; /* Must be a multiple of 1024 */ + const unsigned int num_transfers = 64; + const unsigned int timeout_ms = 3500; + const bladerf_frequency freq = 915e6; + + CHECK(bladerf_sync_config(dev, BLADERF_RX_X2, BLADERF_FORMAT_SC16_Q11, + num_buffers, buffer_size, num_transfers, + timeout_ms)); + + for (size_t i = 0; i < NUM_CHANNELS; i++) { + CHECK(bladerf_set_frequency(dev, BLADERF_CHANNEL_RX(i), (bladerf_frequency)freq)); + CHECK(bladerf_set_sample_rate(dev, BLADERF_CHANNEL_RX(i), samp_rate, NULL)); + CHECK(bladerf_set_gain_mode(dev, BLADERF_CHANNEL_RX(i), BLADERF_GAIN_MGC)); + CHECK(bladerf_set_gain(dev, BLADERF_CHANNEL_RX(i), 60)); + } + +out: + return status; +} + +int main(int argc, char *argv[]) { + int status; + struct bladerf *dev; + char *devstr = NULL; + bladerf_sample_rate samp_rate = 2e6; + + const size_t NUM_CHANNELS = 2; + const int NUM_SAMPLES = 10e6; + int16_t *samples = NULL; + FILE *fp = NULL; + + bladerf_log_set_verbosity(BLADERF_LOG_LEVEL_DEBUG); + + samples = (int16_t *)malloc(2 * NUM_CHANNELS * NUM_SAMPLES * sizeof(int16_t)); + if (samples == NULL) { + fprintf(stderr, "Failed to allocate memory for samples\n"); + status = EXIT_FAILURE; + goto out; + } + + CHECK(bladerf_open(&dev, devstr)); + CHECK(init_sync(dev, NUM_CHANNELS, samp_rate)); + + CHECK(bladerf_enable_module(dev, BLADERF_CHANNEL_RX(0), true)); + CHECK(bladerf_enable_module(dev, BLADERF_CHANNEL_RX(1), true)); + CHECK(bladerf_sync_rx(dev, samples, NUM_CHANNELS * NUM_SAMPLES, NULL, 5000)); + + fp = fopen("dual_test.bin", "wb"); + if (fp == NULL) { + fprintf(stderr, "Failed to open file for writing\n"); + status = EXIT_FAILURE; + goto out; + } + + usleep(1e6 * NUM_SAMPLES / samp_rate); + + printf("Sample Preview:\n"); + for (size_t i = 0; i < 10; i++) { + printf("[ch1]%" PRIi16 ", %" PRIi16 "\n", samples[4*i], samples[4*i+1]); + printf("[ch2]%" PRIi16 ", %" PRIi16 "\n", samples[4*i+2], samples[4*i+3]); + } + + if (fwrite(samples, sizeof(int16_t), 2 * NUM_CHANNELS * NUM_SAMPLES, fp) != 2 * NUM_CHANNELS * NUM_SAMPLES) { + perror("Failed to write to file"); + status = EXIT_FAILURE; + } + +out: + if (fp != NULL) + fclose(fp); + + CHECK(bladerf_enable_module(dev, BLADERF_CHANNEL_RX(0), false)); + CHECK(bladerf_enable_module(dev, BLADERF_CHANNEL_RX(1), false)); + bladerf_close(dev); + + free(samples); + return status; +} From c5b03ae93fa0a4c784c59d2f2bf238581adb7e5d Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Tue, 28 May 2024 17:05:28 -0500 Subject: [PATCH 036/238] libbladeRF: added CHECK_NULL(...) to bladeRF.c --- host/libraries/libbladeRF/src/bladerf.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/host/libraries/libbladeRF/src/bladerf.c b/host/libraries/libbladeRF/src/bladerf.c index 4ba5c7b8..5a5bc93b 100644 --- a/host/libraries/libbladeRF/src/bladerf.c +++ b/host/libraries/libbladeRF/src/bladerf.c @@ -50,6 +50,16 @@ #include "helpers/have_cap.h" #include "helpers/interleave.h" +#define CHECK_NULL(...) do { \ + const void* _args[] = { __VA_ARGS__, NULL }; \ + for (size_t _i = 0; _args[_i] != NULL; ++_i) { \ + if (_args[_i] == NULL) { \ + log_error("%s:%d: Argument %zu is a NULL pointer\n", __FILE__, __LINE__, _i + 1); \ + return BLADERF_ERR_INVAL; \ + } \ + } \ +} while (0) + /******************************************************************************/ /* Private Function Declarations */ From a91b51974d9442649a320beb7342ac55c7121e3e Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Wed, 7 Feb 2024 12:59:40 -0600 Subject: [PATCH 037/238] libbladeRF: added bladerf_print_quick_tune() Outputs the current quick retune parameters of a bladeRF device to standard output. It is useful for debugging and verifying the configuration of quick tune settings. --- .../libbladeRF/doc/examples/quick_tune.c | 10 ++++++ .../libraries/libbladeRF/include/libbladeRF.h | 19 +++++++++++ host/libraries/libbladeRF/src/bladerf.c | 33 +++++++++++++++++++ 3 files changed, 62 insertions(+) diff --git a/host/libraries/libbladeRF/doc/examples/quick_tune.c b/host/libraries/libbladeRF/doc/examples/quick_tune.c index 6ff97ffc..e8858f24 100644 --- a/host/libraries/libbladeRF/doc/examples/quick_tune.c +++ b/host/libraries/libbladeRF/doc/examples/quick_tune.c @@ -40,6 +40,16 @@ int example(struct bladerf *dev, bladerf_channel ch) frequencies[i], bladerf_strerror(status)); return status; } + + printf("Frequency: %u Hz\n", frequencies[i]); + status = bladerf_print_quick_tune(dev, &quick_tunes[i]); + if (status != 0) { + fprintf(stderr, "Failed to print quick tune for %u Hz: %s\n", + frequencies[i], bladerf_strerror(status)); + return status; + } + + printf("\n"); } for (i = j = 0; i < ITERATIONS; i++) { diff --git a/host/libraries/libbladeRF/include/libbladeRF.h b/host/libraries/libbladeRF/include/libbladeRF.h index 952cce7a..1356eaa8 100644 --- a/host/libraries/libbladeRF/include/libbladeRF.h +++ b/host/libraries/libbladeRF/include/libbladeRF.h @@ -1931,6 +1931,25 @@ int CALL_CONV bladerf_get_quick_tune(struct bladerf *dev, bladerf_channel ch, struct bladerf_quick_tune *quick_tune); +/** + * @brief Prints the quick retune parameters for a bladeRF device. + * + * Outputs the current quick retune parameters of a bladeRF device + * to standard output. It is useful for debugging and verifying the + * configuration of quick tune settings. + * + * @note supported devices: bladeRF1, bladeRF2 + * + * @param[in] dev Device handle. Must not be NULL. + * @param[in] qt Pointer to the `bladerf_quick_tune` structure containing + * the quick retune parameters. Must not be NULL. + * + * @return 0 on success, value from \ref RETCODES list on failure + */ +API_EXPORT +int bladerf_print_quick_tune(struct bladerf *dev, + const struct bladerf_quick_tune *qt); + /** @} (End of FN_SCHEDULED_TUNING) */ /** diff --git a/host/libraries/libbladeRF/src/bladerf.c b/host/libraries/libbladeRF/src/bladerf.c index 5a5bc93b..d51dcb46 100644 --- a/host/libraries/libbladeRF/src/bladerf.c +++ b/host/libraries/libbladeRF/src/bladerf.c @@ -876,6 +876,39 @@ int bladerf_get_quick_tune(struct bladerf *dev, return status; } +int bladerf_print_quick_tune(struct bladerf *dev, const struct bladerf_quick_tune *qt) { + if (dev == NULL || qt == NULL) { + log_error("Device handle or quick tune structure is NULL.\n"); + return BLADERF_ERR_INVAL; + } + + const char *board_name = bladerf_get_board_name(dev); + if (board_name == NULL) { + log_error("Failed to get board name.\n"); + return BLADERF_ERR_UNEXPECTED; + } + + printf("board: %s\n", board_name); + if (strcmp(board_name, "bladerf1") == 0) { + printf("freqsel: %u\n", qt->freqsel); + printf("vcocap: %u\n", qt->vcocap); + printf("nint: %u\n", qt->nint); + printf("nfrac: %u\n", qt->nfrac); + printf("flags: %u\n", qt->flags); + printf("xb_gpio: %u\n", qt->xb_gpio); + } else if (strcmp(board_name, "bladerf2") == 0) { + printf("nios_profile: %u\n", qt->nios_profile); + printf("rffe_profile: %u\n", qt->rffe_profile); + printf("port: %u\n", qt->port); + printf("spdt: %u\n", qt->spdt); + } else { + log_error("Unknown bladeRF board name: %s\n", board_name); + return BLADERF_ERR_UNEXPECTED; + } + + return 0; +} + int bladerf_schedule_retune(struct bladerf *dev, bladerf_channel ch, bladerf_timestamp timestamp, From 11adedda2e03a8419fe974e8c38e3c07f17a6cfb Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Tue, 30 Jan 2024 16:20:05 -0600 Subject: [PATCH 038/238] libbladeRF: added CHECK_STATUS macro to bladeRF.c --- host/libraries/libbladeRF/src/bladerf.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/host/libraries/libbladeRF/src/bladerf.c b/host/libraries/libbladeRF/src/bladerf.c index d51dcb46..d7b95241 100644 --- a/host/libraries/libbladeRF/src/bladerf.c +++ b/host/libraries/libbladeRF/src/bladerf.c @@ -60,6 +60,16 @@ } \ } while (0) +#define CHECK_STATUS(fn) \ + do { \ + status = fn; \ + if (status != 0) { \ + log_error("%s: %s %s\n", __FUNCTION__, #fn, \ + bladerf_strerror(status)); \ + goto error; \ + } \ + } while (0) + /******************************************************************************/ /* Private Function Declarations */ From 452af25b50589534934a43de72a67dc6d2ed2964 Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Fri, 9 Feb 2024 12:14:10 -0600 Subject: [PATCH 039/238] libbladeRF: examples: frequency range sweep --- .../libbladeRF/doc/examples/CMakeLists.txt | 3 + .../doc/examples/freq_range_sweep.c | 117 ++++++++++++++++++ 2 files changed, 120 insertions(+) create mode 100644 host/libraries/libbladeRF/doc/examples/freq_range_sweep.c diff --git a/host/libraries/libbladeRF/doc/examples/CMakeLists.txt b/host/libraries/libbladeRF/doc/examples/CMakeLists.txt index cdac5ecc..b5670f2f 100644 --- a/host/libraries/libbladeRF/doc/examples/CMakeLists.txt +++ b/host/libraries/libbladeRF/doc/examples/CMakeLists.txt @@ -35,3 +35,6 @@ target_link_libraries(libbladeRF_example_boilerplate ${LIBS}) add_executable(libbladeRF_example_quick_tune quick_tune.c) target_link_libraries(libbladeRF_example_quick_tune ${LIBS}) + +add_executable(libbladeRF_example_freq_range_sweep freq_range_sweep.c) +target_link_libraries(libbladeRF_example_freq_range_sweep ${LIBS}) diff --git a/host/libraries/libbladeRF/doc/examples/freq_range_sweep.c b/host/libraries/libbladeRF/doc/examples/freq_range_sweep.c new file mode 100644 index 00000000..f969ce6f --- /dev/null +++ b/host/libraries/libbladeRF/doc/examples/freq_range_sweep.c @@ -0,0 +1,117 @@ +#include +#include +#include +#include + +#define FREQ_HOP_SPACING (bladerf_frequency)40e6 +#define ITERATIONS 10000 + +#define CHECK_STATUS(_fn) do { \ + status = _fn; \ + if (status != 0) { \ + fprintf(stderr, "[Error] %s:%d: %s\n", __FUNCTION__, __LINE__, \ + bladerf_strerror(status)); \ + goto error; \ + } \ + } while (0) + +#define CHECK_NULL(_ptr) do { \ + if (_ptr == NULL) { \ + fprintf(stderr, "Error: failed to alloc memory for %s\n", #_ptr); \ + status = BLADERF_ERR_MEM; \ + goto error; \ + } \ + } while (0) + +struct { + bladerf_channel ch; + bladerf_frequency frequency; +} state; + +int main(int argc, char *argv[]) +{ + int status = -1; + unsigned int i, j; + + struct bladerf *dev = NULL; + struct bladerf_devinfo dev_info; + + const struct bladerf_range *freq_range = NULL; + bladerf_frequency freq_min, freq_max; + bladerf_timestamp timestamp; + bladerf_frequency *frequencies = NULL; + const bladerf_channel ch = BLADERF_CHANNEL_RX(0); + struct bladerf_quick_tune *quick_tunes = NULL; + + bladerf_init_devinfo(&dev_info); + + /* Request a device with the provided serial number. + * Invalid strings should simply fail to match a device. */ + if (argc >= 2) { + strncpy(dev_info.serial, argv[1], sizeof(dev_info.serial) - 1); + } + + CHECK_STATUS(bladerf_open_with_devinfo(&dev, &dev_info)); + CHECK_STATUS(bladerf_set_sample_rate(dev, BLADERF_RX, FREQ_HOP_SPACING, NULL)); + + CHECK_STATUS(bladerf_get_frequency_range(dev, ch, &freq_range)); + freq_min = freq_range->min * freq_range->scale; + freq_max = freq_range->max * freq_range->scale; + + size_t num_frequencies = (freq_max - freq_min) / FREQ_HOP_SPACING + 2; + frequencies = malloc(num_frequencies * sizeof(bladerf_frequency)); + CHECK_NULL(frequencies); + + for(i = 0; i < num_frequencies; i++) { + bladerf_frequency frequency = freq_min + i * FREQ_HOP_SPACING; + frequencies[i] = frequency; + + if (frequency > freq_max) { + frequencies[i] = freq_max; + } + } + + /* Get our quick tune parameters for each frequency we'll be using */ + quick_tunes = malloc(num_frequencies * sizeof(struct bladerf_quick_tune)); + CHECK_NULL(quick_tunes); + + for (i = 0; i < num_frequencies; i++) { + status = bladerf_set_frequency(dev, ch, frequencies[i]); + if (status != 0) { + fprintf(stderr, "Failed to set frequency to %lu Hz: %s\n", + frequencies[i], bladerf_strerror(status)); + return status; + } + + bladerf_log_set_verbosity(BLADERF_LOG_LEVEL_VERBOSE); + printf("Frequency: %lu Hz\n", frequencies[i]); + status = bladerf_get_quick_tune(dev, ch, &quick_tunes[i]); + if (status != 0) { + fprintf(stderr, "Failed to get quick tune for %lu Hz: %s\n", + frequencies[i], bladerf_strerror(status)); + return status; + } + bladerf_log_set_verbosity(BLADERF_LOG_LEVEL_INFO); + + } + + CHECK_STATUS(bladerf_sync_config(dev, BLADERF_RX_X1, BLADERF_FORMAT_SC16_Q11_META, 1024, 8192, 16, 1000)); + + printf("Starting frequency hopping...\n"); + CHECK_STATUS(bladerf_enable_module(dev, BLADERF_RX, true)); + bladerf_get_timestamp(dev, BLADERF_RX, ×tamp); + timestamp += 1000; + for (i = j = 0; i < ITERATIONS; i++) { + CHECK_STATUS(bladerf_schedule_retune(dev, ch, timestamp, frequencies[i % num_frequencies], &quick_tunes[j])); + + j = (j + 1) % num_frequencies; + timestamp += 256; + } + +error: + free(frequencies); + free(quick_tunes); + bladerf_enable_module(dev, BLADERF_RX, false); + bladerf_close(dev); + return status; +} From ca68dfdb822e786d6ab7d54ad813ba3e1e288233 Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Thu, 1 Aug 2024 13:31:17 -0500 Subject: [PATCH 040/238] libbladeRF: automatically set manual gain control if gain is set --- host/libraries/libbladeRF/src/bladerf.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/host/libraries/libbladeRF/src/bladerf.c b/host/libraries/libbladeRF/src/bladerf.c index d7b95241..08cf1724 100644 --- a/host/libraries/libbladeRF/src/bladerf.c +++ b/host/libraries/libbladeRF/src/bladerf.c @@ -539,10 +539,30 @@ int bladerf_enable_module(struct bladerf *dev, bladerf_channel ch, bool enable) int bladerf_set_gain(struct bladerf *dev, bladerf_channel ch, int gain) { int status; + bladerf_gain_mode gain_mode; MUTEX_LOCK(&dev->lock); + /* Change gain mode to manual if ch = RX */ + if (BLADERF_CHANNEL_IS_TX(ch) == false) { + status = dev->board->get_gain_mode(dev, ch, &gain_mode); + if (status != 0) { + log_error("Failed to get gain mode\n"); + goto error; + } + + if (gain_mode != BLADERF_GAIN_MGC) { + log_warning("Setting gain mode to manual\n"); + status = dev->board->set_gain_mode(dev, ch, BLADERF_GAIN_MGC); + if (status != 0) { + log_error("Failed to set gain mode\n"); + goto error; + } + } + } + status = dev->board->set_gain(dev, ch, gain); +error: MUTEX_UNLOCK(&dev->lock); return status; } From 02196a2e9bc0562733cd071378582be5557addc2 Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Fri, 1 Dec 2023 15:26:07 -0600 Subject: [PATCH 041/238] libbladeRF: bladerf_sync_tx: null check for TX samples "Invalid operation or parameter" was the bladeRF error code returned when samples were unallocated. Now, a log error is triggered saying "bladerf_sync_tx: samples is null" and the return value is a bladeRF memory error. --- host/libraries/libbladeRF/src/bladerf.c | 1 + 1 file changed, 1 insertion(+) diff --git a/host/libraries/libbladeRF/src/bladerf.c b/host/libraries/libbladeRF/src/bladerf.c index 08cf1724..528f155f 100644 --- a/host/libraries/libbladeRF/src/bladerf.c +++ b/host/libraries/libbladeRF/src/bladerf.c @@ -1195,6 +1195,7 @@ int bladerf_sync_tx(struct bladerf *dev, struct bladerf_metadata *metadata, unsigned int timeout_ms) { + CHECK_NULL(samples); return dev->board->sync_tx(dev, samples, num_samples, metadata, timeout_ms); } From 1d3fabfe6bf0dc997a859d1a42179fcaf3e24668 Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Tue, 13 Feb 2024 13:05:20 -0600 Subject: [PATCH 042/238] libbladeRF: added save_fastlock_profile() to rfic struct --- .../libbladeRF/src/board/bladerf2/common.h | 5 +++++ .../libbladeRF/src/board/bladerf2/rfic_host.c | 18 ++++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/host/libraries/libbladeRF/src/board/bladerf2/common.h b/host/libraries/libbladeRF/src/board/bladerf2/common.h index 09d413c8..0f1380fe 100644 --- a/host/libraries/libbladeRF/src/board/bladerf2/common.h +++ b/host/libraries/libbladeRF/src/board/bladerf2/common.h @@ -124,6 +124,11 @@ struct controller_fns { bladerf_channel ch, uint32_t profile); + int (*save_fastlock_profile)(struct bladerf *dev, + bladerf_channel ch, + uint32_t profile, + uint8_t *values); + enum bladerf2_rfic_command_mode const command_mode; }; diff --git a/host/libraries/libbladeRF/src/board/bladerf2/rfic_host.c b/host/libraries/libbladeRF/src/board/bladerf2/rfic_host.c index 51d8cc6d..7cccbe67 100644 --- a/host/libraries/libbladeRF/src/board/bladerf2/rfic_host.c +++ b/host/libraries/libbladeRF/src/board/bladerf2/rfic_host.c @@ -990,6 +990,23 @@ static int _rfic_host_store_fastlock_profile(struct bladerf *dev, return 0; } +static int _rfic_host_save_fastlock_profile(struct bladerf *dev, + bladerf_channel ch, + uint32_t profile, + uint8_t *values) +{ + struct bladerf2_board_data *board_data = dev->board_data; + struct ad9361_rf_phy *phy = board_data->phy; + + if (BLADERF_CHANNEL_IS_TX(ch)) { + CHECK_AD936X(ad9361_tx_fastlock_save(phy, profile, values)); + } else { + CHECK_AD936X(ad9361_rx_fastlock_save(phy, profile, values)); + } + + return 0; +} + /******************************************************************************/ /* Function pointers */ @@ -1035,6 +1052,7 @@ struct controller_fns const rfic_host_control = { FIELD_INIT(.set_txmute, _rfic_host_set_txmute), FIELD_INIT(.store_fastlock_profile, _rfic_host_store_fastlock_profile), + FIELD_INIT(.save_fastlock_profile, _rfic_host_save_fastlock_profile), FIELD_INIT(.command_mode, RFIC_COMMAND_HOST), }; From fcfd174ca8bbf68e2aea1bf2a731b6fd32d3c553 Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Wed, 14 Feb 2024 10:37:35 -0600 Subject: [PATCH 043/238] libbladeRF: added CHECK_STATUS_GOTO macro for bladerf2 board --- .../libbladeRF/src/board/bladerf2/common.h | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/host/libraries/libbladeRF/src/board/bladerf2/common.h b/host/libraries/libbladeRF/src/board/bladerf2/common.h index 0f1380fe..5a88cb41 100644 --- a/host/libraries/libbladeRF/src/board/bladerf2/common.h +++ b/host/libraries/libbladeRF/src/board/bladerf2/common.h @@ -343,6 +343,23 @@ extern char const *bladerf2_state_to_string[4]; } \ } while (0) +/** + * @brief Call a function and goto error if it fails + * + * @param _fn The function + * + * @note `int status` must be declared in the including scope + */ +#define CHECK_STATUS_GOTO(_fn) \ + do { \ + status = _fn; \ + if (status < 0) { \ + log_error("%s: %i failed: %s\n", #_fn, status, \ + bladerf_strerror(status)); \ + goto error; \ + } \ + } while (0) + /** * @brief Call a function and, if it fails, unlock the mutex and return * From f8b7de85397137e362753d2328cfbf77e2631627 Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Thu, 1 Aug 2024 13:20:02 -0500 Subject: [PATCH 044/238] libbladeRF: do not enforce flash byte alignment for placeholder image --- host/libraries/libbladeRF/src/board/bladerf1/image.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/host/libraries/libbladeRF/src/board/bladerf1/image.c b/host/libraries/libbladeRF/src/board/bladerf1/image.c index 64665fb4..b1742145 100644 --- a/host/libraries/libbladeRF/src/board/bladerf1/image.c +++ b/host/libraries/libbladeRF/src/board/bladerf1/image.c @@ -320,7 +320,7 @@ int bladerf_image_write(struct bladerf *dev, /* If the type is RAW, we should only allow erase-block aligned * addresses and lengths */ - if (img->type == BLADERF_IMAGE_TYPE_RAW) { + if (img->type == BLADERF_IMAGE_TYPE_RAW && img->address != 0xffffffff) { if (img->address % dev->flash_arch->ebsize_bytes != 0) { log_debug("Image address must be erase block-aligned for RAW.\n"); rv = BLADERF_ERR_INVAL; From 3583aaca8e3a723097fa18335ca8f12c9b43330f Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Tue, 6 Aug 2024 14:51:09 -0500 Subject: [PATCH 045/238] libbladeRF: gain_calibration: init Adds the gain calibration tables along with the prototype for bladerf_load_gain_calibration(). Also copies the stored calibration references to the output directory. --- .../libraries/libbladeRF/include/libbladeRF.h | 39 +++++++++++++++ host/libraries/libbladeRF_test/CMakeLists.txt | 1 + .../test_gain_calibration/CMakeLists.txt | 24 +++++++++ .../test_gain_calibration/src/main.c | 50 +++++++++++++++++++ 4 files changed, 114 insertions(+) create mode 100644 host/libraries/libbladeRF_test/test_gain_calibration/CMakeLists.txt create mode 100644 host/libraries/libbladeRF_test/test_gain_calibration/src/main.c diff --git a/host/libraries/libbladeRF/include/libbladeRF.h b/host/libraries/libbladeRF/include/libbladeRF.h index 1356eaa8..105122c9 100644 --- a/host/libraries/libbladeRF/include/libbladeRF.h +++ b/host/libraries/libbladeRF/include/libbladeRF.h @@ -4134,6 +4134,45 @@ int CALL_CONV bladerf_get_feature(struct bladerf *dev, /** @} (End of FN_SF) */ +/** + * @defgroup FN_CAL Gain Calibration + * + * These functions are thread-safe. + * + * @{ + */ + +/** + * @brief Individual gain calibration entry. Each entry associates a frequency + * with a corresponding gain correction factor. + */ +struct bladerf_gain_cal_entry { + bladerf_frequency freq; /**< Frequency (Hz) */ + double gain_corr; /**< Gain correction factor */ +}; + +/** + * @brief Gain calibration table. The table contains a series of + * entries, each associating a frequency with a gain correction factor. Entries + * are sorted by frequency, from start_freq to stop_freq. + */ +struct bladerf_gain_cal_tbl { + struct bladerf_version version; /**< Table format version */ + bladerf_channel ch; /**< Channel */ + uint32_t n_entries; /**< Number of entries */ + bladerf_frequency start_freq; /**< Start frequency (Hz) */ + bladerf_frequency stop_freq; /**< Stop frequency (Hz) */ + struct bladerf_gain_cal_entry *entries; /**< Sorted calibration entries */ + bladerf_gain gain_target; /**< Compensated gain */ + enum gain_cal_state { + BLADERF_GAIN_CAL_UNINITIALIZED, + BLADERF_GAIN_CAL_LOADED, + BLADERF_GAIN_CAL_UNLOADED + } state; /**< Calibration state */ +}; + +/** @} (End of FN_CAL) */ + /** * @defgroup FN_XB Expansion board support * diff --git a/host/libraries/libbladeRF_test/CMakeLists.txt b/host/libraries/libbladeRF_test/CMakeLists.txt index 118339a1..17ecdc09 100644 --- a/host/libraries/libbladeRF_test/CMakeLists.txt +++ b/host/libraries/libbladeRF_test/CMakeLists.txt @@ -13,6 +13,7 @@ add_subdirectory(test_open) add_subdirectory(test_parse) add_subdirectory(test_peripheral_timing) add_subdirectory(test_gain_compare) +add_subdirectory(test_gain_calibration) add_subdirectory(test_repeater) add_subdirectory(test_quick_retune) add_subdirectory(test_repeated_stream) diff --git a/host/libraries/libbladeRF_test/test_gain_calibration/CMakeLists.txt b/host/libraries/libbladeRF_test/test_gain_calibration/CMakeLists.txt new file mode 100644 index 00000000..10c440b6 --- /dev/null +++ b/host/libraries/libbladeRF_test/test_gain_calibration/CMakeLists.txt @@ -0,0 +1,24 @@ +cmake_minimum_required(VERSION 3.5) +project(libbladeRF_test_gain_calibration C) + +set(INCLUDES + ${libbladeRF_SOURCE_DIR}/include + ${libbladeRF_SOURCE_DIR}/src + ${BLADERF_HOST_COMMON_INCLUDE_DIRS} +) + +if(LIBBLADERF_SEARCH_PREFIX_OVERRIDE) + add_definitions(-DLIBBLADERF_SEARCH_PREFIX="${LIBBLADERF_SEARCH_PREFIX_OVERRIDE}") +else() + add_definitions(-DLIBBLADERF_SEARCH_PREFIX="${CMAKE_INSTALL_PREFIX}") +endif() + +set(SRC + src/main.c + ${libbladeRF_SOURCE_DIR}/src/helpers/file.c + ${BLADERF_HOST_COMMON_SOURCE_DIR}/log.c +) + +include_directories(${INCLUDES}) +add_executable(libbladeRF_test_gain_calibration ${SRC}) +target_link_libraries(libbladeRF_test_gain_calibration libbladerf_shared m) diff --git a/host/libraries/libbladeRF_test/test_gain_calibration/src/main.c b/host/libraries/libbladeRF_test/test_gain_calibration/src/main.c new file mode 100644 index 00000000..7f37b797 --- /dev/null +++ b/host/libraries/libbladeRF_test/test_gain_calibration/src/main.c @@ -0,0 +1,50 @@ +/* + * This file is part of the bladeRF project: + * http://www.github.com/nuand/bladeRF + * + * Copyright (C) 2024 Nuand LLC + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ +#include +#include +#include +#include "libbladeRF.h" +#include "log.h" +#include "helpers/file.h" + +#define CHECK(func_call) do { \ + status = (func_call); \ + if (status != 0) { \ + fprintf(stderr, "Failed at %s: %s\n", #func_call, bladerf_strerror(status)); \ + status = EXIT_FAILURE; \ + goto out; \ + } \ +} while (0) + +int main(int argc, char *argv[]) { + int status; + struct bladerf *dev; + char *devstr = NULL; + + bladerf_log_set_verbosity(BLADERF_LOG_LEVEL_DEBUG); + + CHECK(bladerf_open(&dev, devstr)); + +out: + bladerf_close(dev); + return status; +} + From f41966dcf8b6338b4524ae8840d3d462ea329cbf Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Tue, 21 Nov 2023 14:08:24 -0600 Subject: [PATCH 046/238] libbladeRF: gain_calibration: example sweeps added --- .../test_gain_calibration/CMakeLists.txt | 20 + .../example_measurements/rx_pwr_cal.csv | 1189 ++++ .../example_measurements/rx_sweep_0.csv | 1188 ++++ .../example_measurements/tx_sweep_60.csv | 1189 ++++ .../example_measurements/tx_sweep_60_fine.csv | 5937 +++++++++++++++++ 5 files changed, 9523 insertions(+) create mode 100644 host/libraries/libbladeRF_test/test_gain_calibration/example_measurements/rx_pwr_cal.csv create mode 100644 host/libraries/libbladeRF_test/test_gain_calibration/example_measurements/rx_sweep_0.csv create mode 100644 host/libraries/libbladeRF_test/test_gain_calibration/example_measurements/tx_sweep_60.csv create mode 100644 host/libraries/libbladeRF_test/test_gain_calibration/example_measurements/tx_sweep_60_fine.csv diff --git a/host/libraries/libbladeRF_test/test_gain_calibration/CMakeLists.txt b/host/libraries/libbladeRF_test/test_gain_calibration/CMakeLists.txt index 10c440b6..48c68ff4 100644 --- a/host/libraries/libbladeRF_test/test_gain_calibration/CMakeLists.txt +++ b/host/libraries/libbladeRF_test/test_gain_calibration/CMakeLists.txt @@ -22,3 +22,23 @@ set(SRC include_directories(${INCLUDES}) add_executable(libbladeRF_test_gain_calibration ${SRC}) target_link_libraries(libbladeRF_test_gain_calibration libbladerf_shared m) + +configure_file(example_measurements/rx_sweep_0.csv + ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/rx_sweep_0.csv + FILE_PERMISSIONS OWNER_READ + COPYONLY) + +configure_file(example_measurements/tx_sweep_60.csv + ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/tx_sweep_60.csv + FILE_PERMISSIONS OWNER_READ + COPYONLY) + +configure_file(example_measurements/tx_sweep_60_fine.csv + ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/tx_sweep_60_fine.csv + FILE_PERMISSIONS OWNER_READ + COPYONLY) + +configure_file(example_measurements/rx_pwr_cal.csv + ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/rx_pwr_cal.csv + FILE_PERMISSIONS OWNER_READ + COPYONLY) diff --git a/host/libraries/libbladeRF_test/test_gain_calibration/example_measurements/rx_pwr_cal.csv b/host/libraries/libbladeRF_test/test_gain_calibration/example_measurements/rx_pwr_cal.csv new file mode 100644 index 00000000..d063de31 --- /dev/null +++ b/host/libraries/libbladeRF_test/test_gain_calibration/example_measurements/rx_pwr_cal.csv @@ -0,0 +1,1189 @@ +Frequency (Hz),Power (dBm) +65000000,-2.8 +70000000,-2.8 +75000000,-2.7 +80000000,-2.7 +85000000,-2.8 +90000000,-3.0 +95000000,-3.0 +100000000,-3.2 +105000000,-3.3 +110000000,-2.9 +115000000,-4.3 +120000000,-3.3 +125000000,-4.1 +130000000,-3.7 +135000000,-2.7 +140000000,-2.8 +145000000,-2.9 +150000000,-3.8 +155000000,-2.8 +160000000,-3.8 +165000000,-3.8 +170000000,-3.8 +175000000,-3.0 +180000000,-3.2 +185000000,-3.7 +190000000,-3.3 +195000000,-3.2 +200000000,-3.3 +205000000,-3.4 +210000000,-3.5 +215000000,-3.5 +220000000,-3.7 +225000000,-3.7 +230000000,-3.7 +235000000,-3.6 +240000000,-3.7 +245000000,-3.7 +250000000,-3.7 +255000000,-3.7 +260000000,-3.7 +265000000,-3.8 +270000000,-3.8 +275000000,-3.8 +280000000,-3.9 +285000000,-3.9 +290000000,-3.9 +295000000,-3.9 +300000000,-3.9 +305000000,-4.0 +310000000,-4.0 +315000000,-4.0 +320000000,-4.0 +325000000,-4.0 +330000000,-4.0 +335000000,-4.1 +340000000,-4.1 +345000000,-4.1 +350000000,-4.1 +355000000,-4.1 +360000000,-4.1 +365000000,-4.1 +370000000,-4.1 +375000000,-4.2 +380000000,-4.1 +385000000,-4.1 +390000000,-4.1 +395000000,-4.1 +400000000,-4.2 +405000000,-4.2 +410000000,-4.2 +415000000,-4.2 +420000000,-4.2 +425000000,-4.2 +430000000,-4.2 +435000000,-4.2 +440000000,-4.2 +445000000,-4.2 +450000000,-4.2 +455000000,-4.2 +460000000,-4.2 +465000000,-4.2 +470000000,-4.2 +475000000,-4.3 +480000000,-4.3 +485000000,-4.3 +490000000,-4.3 +495000000,-4.3 +500000000,-4.4 +505000000,-4.4 +510000000,-4.4 +515000000,-4.5 +520000000,-4.5 +525000000,-4.6 +530000000,-4.6 +535000000,-4.6 +540000000,-4.7 +545000000,-4.7 +550000000,-4.8 +555000000,-4.8 +560000000,-4.8 +565000000,-4.9 +570000000,-4.9 +575000000,-5.0 +580000000,-5.0 +585000000,-5.1 +590000000,-5.1 +595000000,-5.2 +600000000,-5.3 +605000000,-5.3 +610000000,-5.3 +615000000,-5.4 +620000000,-5.4 +625000000,-5.4 +630000000,-5.4 +635000000,-5.5 +640000000,-5.5 +645000000,-5.5 +650000000,-5.5 +655000000,-5.6 +660000000,-5.6 +665000000,-5.6 +670000000,-5.6 +675000000,-5.6 +680000000,-5.6 +685000000,-5.7 +690000000,-5.7 +695000000,-5.7 +700000000,-5.7 +705000000,-5.7 +710000000,-5.7 +715000000,-5.7 +720000000,-5.7 +725000000,-5.7 +730000000,-5.7 +735000000,-5.7 +740000000,-5.7 +745000000,-5.7 +750000000,-5.7 +755000000,-5.7 +760000000,-5.7 +765000000,-5.7 +770000000,-5.7 +775000000,-5.6 +780000000,-5.5 +785000000,-5.5 +790000000,-5.4 +795000000,-5.4 +800000000,-5.4 +805000000,-5.3 +810000000,-5.3 +815000000,-5.4 +820000000,-5.4 +825000000,-5.4 +830000000,-5.4 +835000000,-5.4 +840000000,-5.4 +845000000,-5.4 +850000000,-5.5 +855000000,-5.5 +860000000,-5.5 +865000000,-5.5 +870000000,-5.6 +875000000,-5.6 +880000000,-5.6 +885000000,-5.6 +890000000,-5.6 +895000000,-5.6 +900000000,-5.6 +905000000,-5.7 +910000000,-5.6 +915000000,-5.6 +920000000,-5.6 +925000000,-5.6 +930000000,-5.6 +935000000,-5.6 +940000000,-5.6 +945000000,-5.6 +950000000,-5.6 +955000000,-5.5 +960000000,-5.5 +965000000,-5.5 +970000000,-5.4 +975000000,-5.4 +980000000,-5.4 +985000000,-5.3 +990000000,-5.3 +995000000,-5.3 +1000000000,-5.4 +1005000000,-5.3 +1010000000,-5.3 +1015000000,-5.2 +1020000000,-5.2 +1025000000,-5.2 +1030000000,-5.1 +1035000000,-5.1 +1040000000,-5.1 +1045000000,-5.0 +1050000000,-5.0 +1055000000,-5.0 +1060000000,-5.0 +1065000000,-4.9 +1070000000,-4.9 +1075000000,-4.9 +1080000000,-4.9 +1085000000,-4.9 +1090000000,-4.9 +1095000000,-4.9 +1100000000,-4.9 +1105000000,-4.9 +1110000000,-4.9 +1115000000,-5.0 +1120000000,-5.0 +1125000000,-5.0 +1130000000,-5.0 +1135000000,-5.1 +1140000000,-5.1 +1145000000,-5.2 +1150000000,-5.3 +1155000000,-5.4 +1160000000,-5.4 +1165000000,-5.5 +1170000000,-5.6 +1175000000,-5.6 +1180000000,-5.6 +1185000000,-5.6 +1190000000,-5.6 +1195000000,-5.6 +1200000000,-5.6 +1205000000,-5.6 +1210000000,-5.6 +1215000000,-5.7 +1220000000,-5.7 +1225000000,-5.7 +1230000000,-5.8 +1235000000,-5.8 +1240000000,-5.9 +1245000000,-6.0 +1250000000,-6.0 +1255000000,-6.1 +1260000000,-6.1 +1265000000,-6.2 +1270000000,-6.3 +1275000000,-6.4 +1280000000,-6.4 +1285000000,-6.5 +1290000000,-6.6 +1295000000,-6.6 +1300000000,-6.7 +1305000000,-6.8 +1310000000,-6.9 +1315000000,-6.9 +1320000000,-7.0 +1325000000,-7.0 +1330000000,-7.1 +1335000000,-7.1 +1340000000,-7.2 +1345000000,-7.2 +1350000000,-7.3 +1355000000,-7.3 +1360000000,-7.4 +1365000000,-7.4 +1370000000,-7.4 +1375000000,-7.5 +1380000000,-7.5 +1385000000,-7.5 +1390000000,-7.5 +1395000000,-7.6 +1400000000,-7.6 +1405000000,-7.6 +1410000000,-7.6 +1415000000,-7.6 +1420000000,-7.6 +1425000000,-7.6 +1430000000,-7.6 +1435000000,-7.7 +1440000000,-7.7 +1445000000,-7.7 +1450000000,-7.7 +1455000000,-7.7 +1460000000,-7.8 +1465000000,-7.8 +1470000000,-7.8 +1475000000,-7.9 +1480000000,-7.9 +1485000000,-7.9 +1490000000,-8.0 +1495000000,-8.0 +1500000000,-8.1 +1505000000,-8.2 +1510000000,-8.3 +1515000000,-8.3 +1520000000,-8.4 +1525000000,-8.4 +1530000000,-8.5 +1535000000,-8.5 +1540000000,-8.6 +1545000000,-8.6 +1550000000,-8.7 +1555000000,-8.7 +1560000000,-8.8 +1565000000,-8.9 +1570000000,-8.9 +1575000000,-8.9 +1580000000,-9.0 +1585000000,-9.0 +1590000000,-9.0 +1595000000,-9.1 +1600000000,-9.1 +1605000000,-9.4 +1610000000,-9.4 +1615000000,-9.4 +1620000000,-9.4 +1625000000,-9.4 +1630000000,-9.4 +1635000000,-9.3 +1640000000,-9.3 +1645000000,-9.3 +1650000000,-9.3 +1655000000,-9.3 +1660000000,-9.3 +1665000000,-9.2 +1670000000,-9.2 +1675000000,-9.2 +1680000000,-9.1 +1685000000,-9.1 +1690000000,-9.0 +1695000000,-9.0 +1700000000,-8.9 +1705000000,-8.9 +1710000000,-8.8 +1715000000,-8.8 +1720000000,-8.7 +1725000000,-8.7 +1730000000,-8.6 +1735000000,-8.6 +1740000000,-8.5 +1745000000,-8.5 +1750000000,-8.4 +1755000000,-8.4 +1760000000,-8.3 +1765000000,-8.3 +1770000000,-8.3 +1775000000,-8.2 +1780000000,-8.2 +1785000000,-8.2 +1790000000,-8.1 +1795000000,-8.1 +1800000000,-8.0 +1805000000,-8.0 +1810000000,-8.0 +1815000000,-8.0 +1820000000,-7.9 +1825000000,-7.9 +1830000000,-7.9 +1835000000,-7.9 +1840000000,-7.8 +1845000000,-7.8 +1850000000,-7.8 +1855000000,-7.8 +1860000000,-7.8 +1865000000,-7.7 +1870000000,-7.7 +1875000000,-7.7 +1880000000,-7.7 +1885000000,-7.6 +1890000000,-7.6 +1895000000,-7.6 +1900000000,-7.6 +1905000000,-7.5 +1910000000,-7.5 +1915000000,-7.5 +1920000000,-7.5 +1925000000,-7.4 +1930000000,-7.4 +1935000000,-7.4 +1940000000,-7.4 +1945000000,-7.4 +1950000000,-7.4 +1955000000,-7.4 +1960000000,-7.3 +1965000000,-7.3 +1970000000,-7.3 +1975000000,-7.3 +1980000000,-7.3 +1985000000,-7.3 +1990000000,-7.3 +1995000000,-7.4 +2000000000,-7.4 +2005000000,-7.4 +2010000000,-7.4 +2015000000,-7.5 +2020000000,-7.5 +2025000000,-7.5 +2030000000,-7.6 +2035000000,-7.6 +2040000000,-7.7 +2045000000,-7.7 +2050000000,-7.8 +2055000000,-7.9 +2060000000,-7.9 +2065000000,-8.0 +2070000000,-8.1 +2075000000,-8.1 +2080000000,-8.2 +2085000000,-8.2 +2090000000,-8.3 +2095000000,-8.3 +2100000000,-8.4 +2105000000,-8.4 +2110000000,-8.5 +2115000000,-8.6 +2120000000,-8.6 +2125000000,-8.7 +2130000000,-8.7 +2135000000,-8.8 +2140000000,-8.9 +2145000000,-9.0 +2150000000,-9.0 +2155000000,-9.1 +2160000000,-9.2 +2165000000,-9.3 +2170000000,-9.4 +2175000000,-9.4 +2180000000,-9.5 +2185000000,-9.6 +2190000000,-9.7 +2195000000,-9.8 +2200000000,-9.9 +2205000000,-10.0 +2210000000,-10.1 +2215000000,-10.2 +2220000000,-10.3 +2225000000,-10.4 +2230000000,-10.4 +2235000000,-10.5 +2240000000,-10.6 +2245000000,-10.7 +2250000000,-10.8 +2255000000,-10.9 +2260000000,-11.0 +2265000000,-11.0 +2270000000,-11.1 +2275000000,-11.2 +2280000000,-11.3 +2285000000,-11.4 +2290000000,-11.4 +2295000000,-11.5 +2300000000,-11.6 +2305000000,-11.6 +2310000000,-11.7 +2315000000,-11.7 +2320000000,-11.8 +2325000000,-11.8 +2330000000,-11.9 +2335000000,-12.0 +2340000000,-12.0 +2345000000,-12.1 +2350000000,-12.1 +2355000000,-12.4 +2360000000,-12.5 +2365000000,-12.6 +2370000000,-12.7 +2375000000,-12.7 +2380000000,-12.8 +2385000000,-12.9 +2390000000,-12.9 +2395000000,-13.0 +2400000000,-13.1 +2405000000,-13.1 +2410000000,-13.1 +2415000000,-13.1 +2420000000,-13.1 +2425000000,-13.1 +2430000000,-13.1 +2435000000,-13.1 +2440000000,-13.1 +2445000000,-13.0 +2450000000,-13.0 +2455000000,-12.9 +2460000000,-12.9 +2465000000,-12.8 +2470000000,-12.7 +2475000000,-12.6 +2480000000,-12.5 +2485000000,-12.4 +2490000000,-12.3 +2495000000,-12.3 +2500000000,-12.2 +2505000000,-12.1 +2510000000,-12.1 +2515000000,-12.0 +2520000000,-12.0 +2525000000,-11.9 +2530000000,-11.9 +2535000000,-11.9 +2540000000,-11.9 +2545000000,-12.0 +2550000000,-12.0 +2555000000,-12.1 +2560000000,-12.2 +2565000000,-12.3 +2570000000,-12.3 +2575000000,-12.4 +2580000000,-12.6 +2585000000,-12.7 +2590000000,-12.7 +2595000000,-12.9 +2600000000,-13.0 +2605000000,-13.0 +2610000000,-13.1 +2615000000,-13.2 +2620000000,-13.3 +2625000000,-13.3 +2630000000,-13.4 +2635000000,-13.4 +2640000000,-13.5 +2645000000,-13.5 +2650000000,-13.5 +2655000000,-13.5 +2660000000,-13.5 +2665000000,-13.5 +2670000000,-13.4 +2675000000,-13.4 +2680000000,-13.3 +2685000000,-13.2 +2690000000,-13.2 +2695000000,-13.1 +2700000000,-13.1 +2705000000,-12.9 +2710000000,-12.8 +2715000000,-12.7 +2720000000,-12.6 +2725000000,-12.4 +2730000000,-12.3 +2735000000,-12.2 +2740000000,-12.1 +2745000000,-11.9 +2750000000,-11.8 +2755000000,-11.7 +2760000000,-11.6 +2765000000,-11.5 +2770000000,-11.3 +2775000000,-11.2 +2780000000,-11.1 +2785000000,-11.1 +2790000000,-11.0 +2795000000,-10.9 +2800000000,-10.8 +2805000000,-10.8 +2810000000,-10.7 +2815000000,-10.7 +2820000000,-10.7 +2825000000,-10.7 +2830000000,-10.6 +2835000000,-10.6 +2840000000,-10.6 +2845000000,-10.6 +2850000000,-10.6 +2855000000,-10.6 +2860000000,-10.7 +2865000000,-10.7 +2870000000,-10.7 +2875000000,-10.8 +2880000000,-10.8 +2885000000,-10.8 +2890000000,-10.9 +2895000000,-10.9 +2900000000,-10.9 +2905000000,-11.0 +2910000000,-11.0 +2915000000,-11.0 +2920000000,-11.0 +2925000000,-11.1 +2930000000,-11.1 +2935000000,-11.1 +2940000000,-11.1 +2945000000,-11.2 +2950000000,-11.2 +2955000000,-11.2 +2960000000,-11.2 +2965000000,-11.2 +2970000000,-11.2 +2975000000,-11.2 +2980000000,-11.2 +2985000000,-11.2 +2990000000,-11.2 +2995000000,-11.2 +3000000000,-11.2 +3005000000,-11.8 +3010000000,-11.7 +3015000000,-11.6 +3020000000,-11.5 +3025000000,-11.4 +3030000000,-11.4 +3035000000,-11.3 +3040000000,-11.2 +3045000000,-11.1 +3050000000,-11.0 +3055000000,-10.9 +3060000000,-10.8 +3065000000,-10.7 +3070000000,-10.6 +3075000000,-10.5 +3080000000,-10.4 +3085000000,-10.3 +3090000000,-10.2 +3095000000,-10.1 +3100000000,-10.0 +3105000000,-10.0 +3110000000,-9.9 +3115000000,-9.9 +3120000000,-9.8 +3125000000,-9.8 +3130000000,-9.7 +3135000000,-9.7 +3140000000,-9.7 +3145000000,-9.7 +3150000000,-9.7 +3155000000,-9.7 +3160000000,-9.7 +3165000000,-9.7 +3170000000,-9.7 +3175000000,-9.7 +3180000000,-9.8 +3185000000,-9.8 +3190000000,-9.8 +3195000000,-9.9 +3200000000,-9.9 +3205000000,-9.9 +3210000000,-10.0 +3215000000,-10.0 +3220000000,-10.0 +3225000000,-10.1 +3230000000,-10.1 +3235000000,-10.2 +3240000000,-10.2 +3245000000,-10.2 +3250000000,-10.2 +3255000000,-10.3 +3260000000,-10.3 +3265000000,-10.3 +3270000000,-10.3 +3275000000,-10.3 +3280000000,-10.3 +3285000000,-10.3 +3290000000,-10.4 +3295000000,-10.4 +3300000000,-10.4 +3305000000,-10.4 +3310000000,-10.4 +3315000000,-10.4 +3320000000,-10.4 +3325000000,-10.3 +3330000000,-10.3 +3335000000,-10.3 +3340000000,-10.3 +3345000000,-10.3 +3350000000,-10.3 +3355000000,-10.3 +3360000000,-10.3 +3365000000,-10.3 +3370000000,-10.2 +3375000000,-10.2 +3380000000,-10.2 +3385000000,-10.2 +3390000000,-10.2 +3395000000,-10.2 +3400000000,-10.2 +3405000000,-10.2 +3410000000,-10.2 +3415000000,-10.2 +3420000000,-10.2 +3425000000,-10.2 +3430000000,-10.2 +3435000000,-10.3 +3440000000,-10.3 +3445000000,-10.3 +3450000000,-10.3 +3455000000,-10.4 +3460000000,-10.4 +3465000000,-10.4 +3470000000,-10.5 +3475000000,-10.5 +3480000000,-10.6 +3485000000,-10.6 +3490000000,-10.7 +3495000000,-10.7 +3500000000,-10.8 +3505000000,-10.8 +3510000000,-10.9 +3515000000,-11.0 +3520000000,-11.0 +3525000000,-11.1 +3530000000,-11.2 +3535000000,-11.2 +3540000000,-11.3 +3545000000,-11.4 +3550000000,-11.5 +3555000000,-11.5 +3560000000,-11.6 +3565000000,-11.7 +3570000000,-11.8 +3575000000,-11.9 +3580000000,-12.0 +3585000000,-12.1 +3590000000,-12.1 +3595000000,-12.2 +3600000000,-12.3 +3605000000,-12.4 +3610000000,-12.5 +3615000000,-12.6 +3620000000,-12.6 +3625000000,-12.7 +3630000000,-12.8 +3635000000,-12.9 +3640000000,-12.9 +3645000000,-13.0 +3650000000,-13.0 +3655000000,-13.1 +3660000000,-13.1 +3665000000,-13.2 +3670000000,-13.2 +3675000000,-13.3 +3680000000,-13.3 +3685000000,-13.4 +3690000000,-13.4 +3695000000,-13.4 +3700000000,-13.5 +3705000000,-13.5 +3710000000,-13.6 +3715000000,-13.6 +3720000000,-13.6 +3725000000,-13.7 +3730000000,-13.7 +3735000000,-13.7 +3740000000,-13.8 +3745000000,-13.8 +3750000000,-13.9 +3755000000,-13.9 +3760000000,-14.0 +3765000000,-14.0 +3770000000,-14.1 +3775000000,-14.1 +3780000000,-14.2 +3785000000,-14.2 +3790000000,-14.3 +3795000000,-14.3 +3800000000,-14.4 +3805000000,-14.5 +3810000000,-14.5 +3815000000,-14.6 +3820000000,-14.6 +3825000000,-14.7 +3830000000,-14.7 +3835000000,-14.8 +3840000000,-14.8 +3845000000,-14.9 +3850000000,-14.9 +3855000000,-15.0 +3860000000,-15.0 +3865000000,-15.1 +3870000000,-15.1 +3875000000,-15.1 +3880000000,-15.2 +3885000000,-15.2 +3890000000,-15.2 +3895000000,-15.2 +3900000000,-15.3 +3905000000,-15.3 +3910000000,-15.3 +3915000000,-15.3 +3920000000,-15.3 +3925000000,-15.3 +3930000000,-15.3 +3935000000,-15.3 +3940000000,-15.3 +3945000000,-15.3 +3950000000,-15.3 +3955000000,-15.3 +3960000000,-15.3 +3965000000,-15.3 +3970000000,-15.3 +3975000000,-15.3 +3980000000,-15.3 +3985000000,-15.2 +3990000000,-15.2 +3995000000,-15.2 +4000000000,-15.4 +4005000000,-15.3 +4010000000,-15.3 +4015000000,-15.3 +4020000000,-15.3 +4025000000,-15.3 +4030000000,-15.3 +4035000000,-15.3 +4040000000,-15.3 +4045000000,-15.4 +4050000000,-15.4 +4055000000,-15.4 +4060000000,-15.4 +4065000000,-15.5 +4070000000,-15.5 +4075000000,-15.5 +4080000000,-15.5 +4085000000,-15.6 +4090000000,-15.6 +4095000000,-15.6 +4100000000,-15.7 +4105000000,-15.7 +4110000000,-15.7 +4115000000,-15.7 +4120000000,-15.7 +4125000000,-15.7 +4130000000,-15.7 +4135000000,-15.7 +4140000000,-15.7 +4145000000,-15.7 +4150000000,-15.7 +4155000000,-15.7 +4160000000,-15.7 +4165000000,-15.7 +4170000000,-15.7 +4175000000,-15.6 +4180000000,-15.6 +4185000000,-15.6 +4190000000,-15.5 +4195000000,-15.5 +4200000000,-15.4 +4205000000,-15.4 +4210000000,-15.3 +4215000000,-15.3 +4220000000,-15.2 +4225000000,-15.1 +4230000000,-15.1 +4235000000,-15.0 +4240000000,-14.9 +4245000000,-14.8 +4250000000,-14.8 +4255000000,-14.7 +4260000000,-14.6 +4265000000,-14.5 +4270000000,-14.4 +4275000000,-14.4 +4280000000,-14.3 +4285000000,-14.2 +4290000000,-14.1 +4295000000,-14.1 +4300000000,-14.0 +4305000000,-14.0 +4310000000,-13.9 +4315000000,-13.9 +4320000000,-13.9 +4325000000,-13.9 +4330000000,-13.8 +4335000000,-13.8 +4340000000,-13.8 +4345000000,-13.8 +4350000000,-13.8 +4355000000,-13.8 +4360000000,-13.8 +4365000000,-13.8 +4370000000,-13.9 +4375000000,-13.9 +4380000000,-14.0 +4385000000,-14.0 +4390000000,-14.0 +4395000000,-14.1 +4400000000,-14.1 +4405000000,-14.2 +4410000000,-14.2 +4415000000,-14.3 +4420000000,-14.3 +4425000000,-14.3 +4430000000,-14.3 +4435000000,-14.3 +4440000000,-14.4 +4445000000,-14.4 +4450000000,-14.5 +4455000000,-14.5 +4460000000,-14.5 +4465000000,-14.5 +4470000000,-14.6 +4475000000,-14.6 +4480000000,-14.6 +4485000000,-14.6 +4490000000,-14.6 +4495000000,-14.6 +4500000000,-14.6 +4505000000,-14.6 +4510000000,-14.6 +4515000000,-14.5 +4520000000,-14.5 +4525000000,-14.5 +4530000000,-14.4 +4535000000,-14.4 +4540000000,-14.4 +4545000000,-14.3 +4550000000,-14.3 +4555000000,-14.3 +4560000000,-14.2 +4565000000,-14.2 +4570000000,-14.2 +4575000000,-14.2 +4580000000,-14.1 +4585000000,-14.1 +4590000000,-14.1 +4595000000,-14.1 +4600000000,-14.1 +4605000000,-14.1 +4610000000,-14.2 +4615000000,-14.1 +4620000000,-14.2 +4625000000,-14.2 +4630000000,-14.2 +4635000000,-14.2 +4640000000,-14.3 +4645000000,-14.3 +4650000000,-14.3 +4655000000,-14.3 +4660000000,-14.3 +4665000000,-14.4 +4670000000,-14.4 +4675000000,-14.4 +4680000000,-14.4 +4685000000,-14.4 +4690000000,-14.5 +4695000000,-14.5 +4700000000,-14.5 +4705000000,-14.5 +4710000000,-14.5 +4715000000,-14.5 +4720000000,-14.5 +4725000000,-14.5 +4730000000,-14.5 +4735000000,-14.5 +4740000000,-14.5 +4745000000,-14.5 +4750000000,-14.5 +4755000000,-14.5 +4760000000,-14.5 +4765000000,-14.5 +4770000000,-14.5 +4775000000,-14.6 +4780000000,-14.6 +4785000000,-14.6 +4790000000,-14.6 +4795000000,-14.7 +4800000000,-14.7 +4805000000,-14.7 +4810000000,-14.7 +4815000000,-14.8 +4820000000,-14.8 +4825000000,-14.8 +4830000000,-14.9 +4835000000,-14.9 +4840000000,-14.9 +4845000000,-15.0 +4850000000,-15.0 +4855000000,-15.0 +4860000000,-15.1 +4865000000,-15.1 +4870000000,-15.1 +4875000000,-15.1 +4880000000,-15.1 +4885000000,-15.1 +4890000000,-15.1 +4895000000,-15.1 +4900000000,-15.1 +4905000000,-15.1 +4910000000,-15.1 +4915000000,-15.0 +4920000000,-15.0 +4925000000,-14.9 +4930000000,-14.9 +4935000000,-14.8 +4940000000,-14.8 +4945000000,-14.8 +4950000000,-14.7 +4955000000,-14.7 +4960000000,-14.6 +4965000000,-14.5 +4970000000,-14.5 +4975000000,-14.4 +4980000000,-14.3 +4985000000,-14.3 +4990000000,-14.2 +4995000000,-14.2 +5000000000,-14.2 +5005000000,-14.1 +5010000000,-14.1 +5015000000,-14.0 +5020000000,-13.9 +5025000000,-13.9 +5030000000,-13.8 +5035000000,-13.8 +5040000000,-13.8 +5045000000,-13.7 +5050000000,-13.7 +5055000000,-13.7 +5060000000,-13.7 +5065000000,-13.7 +5070000000,-13.7 +5075000000,-13.7 +5080000000,-13.8 +5085000000,-13.8 +5090000000,-13.8 +5095000000,-13.8 +5100000000,-13.9 +5105000000,-14.0 +5110000000,-14.0 +5115000000,-14.0 +5120000000,-14.1 +5125000000,-14.1 +5130000000,-14.2 +5135000000,-14.2 +5140000000,-14.2 +5145000000,-14.3 +5150000000,-14.3 +5155000000,-14.4 +5160000000,-14.4 +5165000000,-14.4 +5170000000,-14.5 +5175000000,-14.5 +5180000000,-14.5 +5185000000,-14.5 +5190000000,-14.5 +5195000000,-14.6 +5200000000,-14.6 +5205000000,-14.6 +5210000000,-14.6 +5215000000,-14.6 +5220000000,-14.6 +5225000000,-14.6 +5230000000,-14.6 +5235000000,-14.6 +5240000000,-14.6 +5245000000,-14.7 +5250000000,-14.7 +5255000000,-14.7 +5260000000,-14.8 +5265000000,-14.8 +5270000000,-14.8 +5275000000,-14.9 +5280000000,-15.0 +5285000000,-15.0 +5290000000,-15.1 +5295000000,-15.1 +5300000000,-15.2 +5305000000,-15.3 +5310000000,-15.3 +5315000000,-15.4 +5320000000,-15.5 +5325000000,-15.6 +5330000000,-15.7 +5335000000,-15.8 +5340000000,-15.9 +5345000000,-15.9 +5350000000,-16.1 +5355000000,-16.1 +5360000000,-16.2 +5365000000,-16.3 +5370000000,-16.4 +5375000000,-16.5 +5380000000,-16.5 +5385000000,-16.6 +5390000000,-16.7 +5395000000,-16.8 +5400000000,-16.9 +5405000000,-16.9 +5410000000,-17.0 +5415000000,-17.1 +5420000000,-17.2 +5425000000,-17.2 +5430000000,-17.3 +5435000000,-17.3 +5440000000,-17.4 +5445000000,-17.4 +5450000000,-17.5 +5455000000,-17.5 +5460000000,-17.5 +5465000000,-17.6 +5470000000,-17.6 +5475000000,-17.6 +5480000000,-17.7 +5485000000,-17.7 +5490000000,-17.7 +5495000000,-17.7 +5500000000,-17.7 +5505000000,-17.7 +5510000000,-17.7 +5515000000,-17.8 +5520000000,-17.8 +5525000000,-17.8 +5530000000,-17.8 +5535000000,-17.8 +5540000000,-17.8 +5545000000,-17.8 +5550000000,-17.8 +5555000000,-17.9 +5560000000,-17.9 +5565000000,-17.9 +5570000000,-17.9 +5575000000,-18.0 +5580000000,-18.0 +5585000000,-18.0 +5590000000,-18.0 +5595000000,-18.1 +5600000000,-18.1 +5605000000,-18.2 +5610000000,-18.2 +5615000000,-18.2 +5620000000,-18.3 +5625000000,-18.3 +5630000000,-18.4 +5635000000,-18.4 +5640000000,-18.5 +5645000000,-18.5 +5650000000,-18.6 +5655000000,-18.6 +5660000000,-18.7 +5665000000,-18.7 +5670000000,-18.8 +5675000000,-18.8 +5680000000,-18.9 +5685000000,-18.9 +5690000000,-18.9 +5695000000,-19.0 +5700000000,-19.0 +5705000000,-19.1 +5710000000,-19.1 +5715000000,-19.1 +5720000000,-19.2 +5725000000,-19.2 +5730000000,-19.2 +5735000000,-19.2 +5740000000,-19.2 +5745000000,-19.2 +5750000000,-19.3 +5755000000,-19.3 +5760000000,-19.2 +5765000000,-19.2 +5770000000,-19.2 +5775000000,-19.2 +5780000000,-19.2 +5785000000,-19.1 +5790000000,-19.1 +5795000000,-19.1 +5800000000,-19.0 +5805000000,-19.0 +5810000000,-18.9 +5815000000,-18.8 +5820000000,-18.7 +5825000000,-18.6 +5830000000,-18.5 +5835000000,-18.4 +5840000000,-18.3 +5845000000,-18.2 +5850000000,-18.1 +5855000000,-18.0 +5860000000,-17.9 +5865000000,-17.7 +5870000000,-17.6 +5875000000,-17.5 +5880000000,-17.4 +5885000000,-17.3 +5890000000,-17.2 +5895000000,-17.1 +5900000000,-17.0 +5905000000,-16.9 +5910000000,-16.8 +5915000000,-16.8 +5920000000,-16.7 +5925000000,-16.6 +5930000000,-16.6 +5935000000,-16.5 +5940000000,-16.5 +5945000000,-16.4 +5950000000,-16.4 +5955000000,-16.3 +5960000000,-16.3 +5965000000,-16.3 +5970000000,-16.2 +5975000000,-16.2 +5980000000,-16.2 +5985000000,-16.2 +5990000000,-16.2 +5995000000,-16.1 +6000000000,-16.1 diff --git a/host/libraries/libbladeRF_test/test_gain_calibration/example_measurements/rx_sweep_0.csv b/host/libraries/libbladeRF_test/test_gain_calibration/example_measurements/rx_sweep_0.csv new file mode 100644 index 00000000..1e2830b2 --- /dev/null +++ b/host/libraries/libbladeRF_test/test_gain_calibration/example_measurements/rx_sweep_0.csv @@ -0,0 +1,1188 @@ +Frequency (Hz),Power (dBFS) target: -30.00 +70000000,-28.028379 +75000000,-27.946437 +80000000,-27.957057 +85000000,-27.998519 +90000000,-27.887419 +95000000,-27.762463 +100000000,-27.677220 +105000000,-27.584060 +110000000,-28.520019 +115000000,-28.465138 +120000000,-28.430087 +125000000,-28.368954 +130000000,-28.256707 +135000000,-28.209681 +140000000,-28.269471 +145000000,-28.155402 +150000000,-28.158098 +155000000,-28.154281 +160000000,-28.160755 +165000000,-28.108179 +170000000,-28.099283 +175000000,-28.081720 +180000000,-28.049232 +185000000,-28.028350 +190000000,-28.008590 +195000000,-28.028655 +200000000,-27.999490 +205000000,-28.018397 +210000000,-28.895608 +215000000,-28.689883 +220000000,-28.554497 +225000000,-28.446290 +230000000,-28.349612 +235000000,-28.329855 +240000000,-28.331290 +245000000,-28.310208 +250000000,-28.335177 +255000000,-28.306956 +260000000,-28.278737 +265000000,-28.296393 +270000000,-28.236291 +275000000,-28.263352 +280000000,-28.275184 +285000000,-28.317032 +290000000,-28.273283 +295000000,-28.273221 +300000000,-28.362624 +305000000,-28.365356 +310000000,-28.402633 +315000000,-28.404997 +320000000,-28.415919 +325000000,-28.445394 +330000000,-28.452890 +335000000,-28.410668 +340000000,-28.433448 +345000000,-28.436681 +350000000,-28.408225 +355000000,-28.415086 +360000000,-28.443329 +365000000,-28.418340 +370000000,-28.316838 +375000000,-28.365033 +380000000,-28.327431 +385000000,-28.326416 +390000000,-28.271844 +395000000,-28.241526 +400000000,-28.215605 +405000000,-28.227700 +410000000,-28.206383 +415000000,-28.194484 +420000000,-28.131771 +425000000,-28.096047 +430000000,-28.068600 +435000000,-28.009796 +440000000,-27.994054 +445000000,-27.957355 +450000000,-27.870630 +455000000,-27.800844 +460000000,-27.743589 +465000000,-27.816406 +470000000,-27.790466 +475000000,-27.757579 +480000000,-27.720559 +485000000,-27.680910 +490000000,-27.693127 +495000000,-27.689830 +500000000,-27.686506 +505000000,-27.728873 +510000000,-27.712715 +515000000,-27.673972 +520000000,-27.686947 +525000000,-27.697823 +530000000,-27.724401 +535000000,-27.753642 +540000000,-27.737337 +545000000,-27.740897 +550000000,-27.736693 +555000000,-27.704816 +560000000,-27.736572 +565000000,-27.688278 +570000000,-27.657088 +575000000,-27.626062 +580000000,-27.587411 +585000000,-27.560788 +590000000,-27.565379 +595000000,-27.557927 +600000000,-27.515137 +605000000,-27.529846 +610000000,-28.410361 +615000000,-28.163554 +620000000,-27.980270 +625000000,-27.854260 +630000000,-27.726612 +635000000,-27.641160 +640000000,-27.531438 +645000000,-27.452661 +650000000,-27.400822 +655000000,-27.302241 +660000000,-27.244247 +665000000,-27.170733 +670000000,-27.094400 +675000000,-27.999139 +680000000,-27.742952 +685000000,-27.606874 +690000000,-27.422085 +695000000,-27.379484 +700000000,-27.347298 +705000000,-27.352978 +710000000,-27.284333 +715000000,-27.294407 +720000000,-27.307468 +725000000,-27.338195 +730000000,-27.388898 +735000000,-27.456967 +740000000,-28.500395 +745000000,-28.339108 +750000000,-28.232134 +755000000,-28.133726 +760000000,-28.006027 +765000000,-27.854825 +770000000,-27.763420 +775000000,-27.677723 +780000000,-27.648146 +785000000,-27.589897 +790000000,-27.546685 +795000000,-27.506221 +800000000,-27.479948 +805000000,-27.486820 +810000000,-27.509614 +815000000,-27.538353 +820000000,-27.583881 +825000000,-27.620606 +830000000,-27.632707 +835000000,-27.615917 +840000000,-27.702309 +845000000,-27.783213 +850000000,-27.821556 +855000000,-27.869415 +860000000,-27.949003 +865000000,-27.972296 +870000000,-28.007281 +875000000,-28.067182 +880000000,-28.170049 +885000000,-28.179579 +890000000,-28.175099 +895000000,-28.222031 +900000000,-29.240959 +905000000,-29.121455 +910000000,-28.961103 +915000000,-28.943823 +920000000,-28.938118 +925000000,-28.963923 +930000000,-29.012429 +935000000,-29.033487 +940000000,-29.072017 +945000000,-29.129124 +950000000,-29.155014 +955000000,-29.223389 +960000000,-29.196702 +965000000,-29.281231 +970000000,-29.328712 +975000000,-30.365281 +980000000,-30.249639 +985000000,-30.143943 +990000000,-30.079544 +995000000,-30.011063 +1000000000,-30.157208 +1005000000,-30.147297 +1010000000,-30.137244 +1015000000,-30.114458 +1020000000,-30.113238 +1025000000,-30.105264 +1030000000,-30.085370 +1035000000,-31.043230 +1040000000,-30.883856 +1045000000,-30.731552 +1050000000,-30.590343 +1055000000,-30.487942 +1060000000,-30.485493 +1065000000,-30.454452 +1070000000,-30.374754 +1075000000,-30.320453 +1080000000,-30.284037 +1085000000,-30.272633 +1090000000,-30.153051 +1095000000,-30.190069 +1100000000,-30.206284 +1105000000,-30.145615 +1110000000,-31.124815 +1115000000,-30.915903 +1120000000,-30.694475 +1125000000,-30.587938 +1130000000,-30.460536 +1135000000,-30.397687 +1140000000,-30.381307 +1145000000,-30.402212 +1150000000,-30.409981 +1155000000,-30.385471 +1160000000,-30.449974 +1165000000,-30.526810 +1170000000,-30.614454 +1175000000,-30.729071 +1180000000,-30.910871 +1185000000,-30.955556 +1190000000,-30.972832 +1195000000,-31.021033 +1200000000,-31.008386 +1205000000,-31.008345 +1210000000,-31.033208 +1215000000,-31.060269 +1220000000,-31.054007 +1225000000,-31.027524 +1230000000,-31.007088 +1235000000,-30.999276 +1240000000,-31.025299 +1245000000,-31.033557 +1250000000,-31.031748 +1255000000,-31.101138 +1260000000,-31.162192 +1265000000,-31.179883 +1270000000,-31.160519 +1275000000,-31.170180 +1280000000,-31.150157 +1285000000,-31.142915 +1290000000,-31.143916 +1295000000,-31.138577 +1300000000,-31.139797 +1305000000,-31.166755 +1310000000,-31.133309 +1315000000,-31.116790 +1320000000,-31.116529 +1325000000,-31.122583 +1330000000,-31.118284 +1335000000,-31.095979 +1340000000,-31.052436 +1345000000,-30.947403 +1350000000,-30.813885 +1355000000,-30.825391 +1360000000,-30.791576 +1365000000,-30.763557 +1370000000,-30.705677 +1375000000,-30.644928 +1380000000,-30.560898 +1385000000,-30.406851 +1390000000,-30.401484 +1395000000,-30.363685 +1400000000,-30.328038 +1405000000,-30.265296 +1410000000,-30.141533 +1415000000,-30.179337 +1420000000,-30.061455 +1425000000,-31.043563 +1430000000,-30.792021 +1435000000,-30.618730 +1440000000,-30.480235 +1445000000,-30.353478 +1450000000,-30.223514 +1455000000,-30.155986 +1460000000,-30.079128 +1465000000,-30.006159 +1470000000,-29.964152 +1475000000,-29.923381 +1480000000,-29.925120 +1485000000,-30.898957 +1490000000,-30.669388 +1495000000,-30.551682 +1500000000,-30.437671 +1505000000,-30.375625 +1510000000,-30.308656 +1515000000,-30.293212 +1520000000,-30.278437 +1525000000,-30.257674 +1530000000,-30.248908 +1535000000,-30.261207 +1540000000,-30.274425 +1545000000,-30.253085 +1550000000,-30.266741 +1555000000,-30.304253 +1560000000,-30.343254 +1565000000,-30.354455 +1570000000,-30.427491 +1575000000,-30.471830 +1580000000,-30.506403 +1585000000,-30.529067 +1590000000,-30.588389 +1595000000,-31.587556 +1600000000,-31.467170 +1605000000,-31.499709 +1610000000,-31.419131 +1615000000,-31.403105 +1620000000,-31.408906 +1625000000,-31.418177 +1630000000,-31.437838 +1635000000,-31.421417 +1640000000,-31.436185 +1645000000,-31.450441 +1650000000,-31.554702 +1655000000,-31.614196 +1660000000,-31.684023 +1665000000,-31.781823 +1670000000,-31.815000 +1675000000,-31.885238 +1680000000,-31.954791 +1685000000,-31.917824 +1690000000,-32.051558 +1695000000,-32.129283 +1700000000,-32.159515 +1705000000,-32.245674 +1710000000,-32.302495 +1715000000,-32.380223 +1720000000,-32.442541 +1725000000,-32.496520 +1730000000,-32.542701 +1735000000,-32.614668 +1740000000,-32.649835 +1745000000,-32.691834 +1750000000,-32.634137 +1755000000,-33.576237 +1760000000,-33.397550 +1765000000,-33.289048 +1770000000,-33.223691 +1775000000,-33.136615 +1780000000,-33.086545 +1785000000,-33.096022 +1790000000,-33.093610 +1795000000,-33.108095 +1800000000,-33.097393 +1805000000,-33.145410 +1810000000,-33.136853 +1815000000,-33.121723 +1820000000,-33.212120 +1825000000,-33.328097 +1830000000,-33.349352 +1835000000,-33.415362 +1840000000,-33.507370 +1845000000,-33.461014 +1850000000,-33.583311 +1855000000,-33.660687 +1860000000,-33.644650 +1865000000,-33.725972 +1870000000,-33.835880 +1875000000,-33.870959 +1880000000,-33.978001 +1885000000,-34.145150 +1890000000,-34.248207 +1895000000,-34.293982 +1900000000,-34.391706 +1905000000,-34.442963 +1910000000,-34.462418 +1915000000,-34.546500 +1920000000,-34.571524 +1925000000,-34.739198 +1930000000,-34.771840 +1935000000,-34.824592 +1940000000,-34.952726 +1945000000,-35.007020 +1950000000,-34.992662 +1955000000,-35.095672 +1960000000,-36.106741 +1965000000,-35.997774 +1970000000,-35.897343 +1975000000,-35.848761 +1980000000,-35.826906 +1985000000,-35.769881 +1990000000,-35.748945 +1995000000,-35.783471 +2000000000,-35.777089 +2005000000,-35.781630 +2010000000,-35.770163 +2015000000,-35.791600 +2020000000,-35.833398 +2025000000,-35.844048 +2030000000,-35.833789 +2035000000,-35.814483 +2040000000,-35.870431 +2045000000,-35.818913 +2050000000,-36.780051 +2055000000,-36.583721 +2060000000,-36.399831 +2065000000,-36.316057 +2070000000,-36.065260 +2075000000,-36.079666 +2080000000,-36.082645 +2085000000,-36.073261 +2090000000,-36.026521 +2095000000,-35.998843 +2100000000,-36.003383 +2105000000,-35.958477 +2110000000,-35.931665 +2115000000,-35.922111 +2120000000,-35.930763 +2125000000,-35.856002 +2130000000,-35.892114 +2135000000,-35.879942 +2140000000,-35.878890 +2145000000,-35.816874 +2150000000,-35.828629 +2155000000,-35.831547 +2160000000,-35.825084 +2165000000,-35.781349 +2170000000,-35.766204 +2175000000,-36.707364 +2180000000,-36.397587 +2185000000,-36.264116 +2190000000,-36.208838 +2195000000,-36.106604 +2200000000,-36.101390 +2205000000,-36.055264 +2210000000,-36.033959 +2215000000,-36.017536 +2220000000,-36.032175 +2225000000,-36.067368 +2230000000,-36.081326 +2235000000,-36.077274 +2240000000,-36.104919 +2245000000,-36.189909 +2250000000,-36.208349 +2255000000,-36.188316 +2260000000,-36.198014 +2265000000,-36.244382 +2270000000,-36.258097 +2275000000,-36.280371 +2280000000,-36.231568 +2285000000,-36.205789 +2290000000,-36.264316 +2295000000,-36.239320 +2300000000,-36.213580 +2305000000,-36.248808 +2310000000,-36.261021 +2315000000,-36.231932 +2320000000,-36.174861 +2325000000,-36.101967 +2330000000,-36.042610 +2335000000,-35.986847 +2340000000,-35.903657 +2345000000,-35.845374 +2350000000,-35.790182 +2355000000,-35.712955 +2360000000,-35.614448 +2365000000,-35.510844 +2370000000,-36.402133 +2375000000,-36.128145 +2380000000,-35.887141 +2385000000,-35.736195 +2390000000,-35.560728 +2395000000,-35.440097 +2400000000,-35.339240 +2405000000,-35.153717 +2410000000,-35.043611 +2415000000,-34.982997 +2420000000,-34.918137 +2425000000,-34.901057 +2430000000,-34.846044 +2435000000,-34.825711 +2440000000,-34.799890 +2445000000,-34.773607 +2450000000,-34.772576 +2455000000,-34.710619 +2460000000,-34.750431 +2465000000,-34.714894 +2470000000,-34.684664 +2475000000,-34.712210 +2480000000,-34.723419 +2485000000,-34.767062 +2490000000,-34.772136 +2495000000,-34.778162 +2500000000,-34.794866 +2505000000,-34.812446 +2510000000,-34.825828 +2515000000,-34.888117 +2520000000,-34.944954 +2525000000,-34.944792 +2530000000,-35.038092 +2535000000,-35.068576 +2540000000,-35.181345 +2545000000,-35.219605 +2550000000,-35.269047 +2555000000,-35.321098 +2560000000,-35.363714 +2565000000,-35.391929 +2570000000,-35.444102 +2575000000,-36.393037 +2580000000,-36.237815 +2585000000,-36.145291 +2590000000,-35.990569 +2595000000,-36.099172 +2600000000,-36.098093 +2605000000,-36.114751 +2610000000,-36.167197 +2615000000,-36.119135 +2620000000,-36.133266 +2625000000,-36.335970 +2630000000,-36.419124 +2635000000,-36.550719 +2640000000,-36.609771 +2645000000,-36.657831 +2650000000,-36.793748 +2655000000,-36.923492 +2660000000,-37.022286 +2665000000,-37.080990 +2670000000,-37.141033 +2675000000,-38.193090 +2680000000,-38.058393 +2685000000,-38.002520 +2690000000,-37.925886 +2695000000,-37.919539 +2700000000,-38.057535 +2705000000,-38.142416 +2710000000,-38.161504 +2715000000,-38.142128 +2720000000,-38.106831 +2725000000,-39.151586 +2730000000,-38.890324 +2735000000,-38.819793 +2740000000,-38.764827 +2745000000,-38.670885 +2750000000,-38.673481 +2755000000,-38.639637 +2760000000,-38.750379 +2765000000,-38.779360 +2770000000,-38.771924 +2775000000,-38.842631 +2780000000,-38.969488 +2785000000,-39.006360 +2790000000,-39.005459 +2795000000,-39.090778 +2800000000,-39.117478 +2805000000,-39.120165 +2810000000,-39.145731 +2815000000,-39.180505 +2820000000,-39.280699 +2825000000,-39.309140 +2830000000,-39.165336 +2835000000,-39.322612 +2840000000,-39.375764 +2845000000,-39.462034 +2850000000,-39.391339 +2855000000,-39.532388 +2860000000,-39.578348 +2865000000,-39.734458 +2870000000,-39.817070 +2875000000,-39.964136 +2880000000,-39.991986 +2885000000,-40.158759 +2890000000,-40.153472 +2895000000,-40.315949 +2900000000,-40.400936 +2905000000,-40.452596 +2910000000,-40.562836 +2915000000,-40.549178 +2920000000,-40.743720 +2925000000,-40.813800 +2930000000,-40.874633 +2935000000,-41.014840 +2940000000,-41.104460 +2945000000,-41.239335 +2950000000,-41.299780 +2955000000,-41.381840 +2960000000,-41.556152 +2965000000,-41.621403 +2970000000,-41.696320 +2975000000,-41.786836 +2980000000,-41.851111 +2985000000,-41.933041 +2990000000,-41.995382 +2995000000,-42.029568 +3000000000,-42.153568 +3005000000,-39.411475 +3010000000,-39.642929 +3015000000,-39.739056 +3020000000,-39.816305 +3025000000,-39.897309 +3030000000,-39.971506 +3035000000,-40.013611 +3040000000,-40.048205 +3045000000,-40.094961 +3050000000,-40.104667 +3055000000,-40.093667 +3060000000,-40.099391 +3065000000,-40.115521 +3070000000,-40.100094 +3075000000,-40.075883 +3080000000,-40.052674 +3085000000,-40.017142 +3090000000,-40.016028 +3095000000,-39.968293 +3100000000,-39.946904 +3105000000,-39.914983 +3110000000,-39.875287 +3115000000,-39.853693 +3120000000,-39.787362 +3125000000,-39.759723 +3130000000,-39.727438 +3135000000,-39.694642 +3140000000,-39.671632 +3145000000,-39.636261 +3150000000,-39.599461 +3155000000,-39.573208 +3160000000,-39.549877 +3165000000,-39.549106 +3170000000,-39.517931 +3175000000,-39.516883 +3180000000,-39.495938 +3185000000,-39.488741 +3190000000,-39.473578 +3195000000,-39.495631 +3200000000,-39.522815 +3205000000,-39.515635 +3210000000,-39.536368 +3215000000,-39.543665 +3220000000,-39.583189 +3225000000,-39.599270 +3230000000,-39.626483 +3235000000,-39.659791 +3240000000,-39.692979 +3245000000,-39.712752 +3250000000,-39.756683 +3255000000,-39.792782 +3260000000,-39.833291 +3265000000,-39.857105 +3270000000,-39.902992 +3275000000,-39.917896 +3280000000,-39.958377 +3285000000,-40.011847 +3290000000,-40.012653 +3295000000,-40.047273 +3300000000,-40.063018 +3305000000,-40.075979 +3310000000,-40.082576 +3315000000,-40.090714 +3320000000,-40.087986 +3325000000,-40.096242 +3330000000,-40.074069 +3335000000,-40.064566 +3340000000,-40.046651 +3345000000,-40.020313 +3350000000,-39.993444 +3355000000,-39.972468 +3360000000,-39.922490 +3365000000,-39.897014 +3370000000,-39.836101 +3375000000,-39.811945 +3380000000,-39.755135 +3385000000,-39.712419 +3390000000,-39.645375 +3395000000,-39.595750 +3400000000,-39.517291 +3405000000,-39.460827 +3410000000,-39.396197 +3415000000,-39.321723 +3420000000,-39.241331 +3425000000,-39.175196 +3430000000,-39.090461 +3435000000,-39.014167 +3440000000,-38.941627 +3445000000,-38.863250 +3450000000,-38.775972 +3455000000,-38.691755 +3460000000,-38.608328 +3465000000,-38.528679 +3470000000,-38.456597 +3475000000,-38.371266 +3480000000,-38.291192 +3485000000,-38.218836 +3490000000,-38.167192 +3495000000,-38.096504 +3500000000,-38.029291 +3505000000,-37.965754 +3510000000,-37.901152 +3515000000,-37.867496 +3520000000,-37.808419 +3525000000,-37.748179 +3530000000,-37.724549 +3535000000,-37.681495 +3540000000,-37.656305 +3545000000,-37.640749 +3550000000,-37.596516 +3555000000,-37.586905 +3560000000,-37.576184 +3565000000,-37.555714 +3570000000,-37.540392 +3575000000,-37.525547 +3580000000,-37.514025 +3585000000,-37.497275 +3590000000,-37.518693 +3595000000,-37.495413 +3600000000,-37.703739 +3605000000,-37.685539 +3610000000,-37.659755 +3615000000,-37.634275 +3620000000,-37.596645 +3625000000,-37.585340 +3630000000,-37.574032 +3635000000,-37.544830 +3640000000,-37.526344 +3645000000,-37.509473 +3650000000,-37.493616 +3655000000,-37.465101 +3660000000,-37.441887 +3665000000,-37.423999 +3670000000,-37.399343 +3675000000,-37.359779 +3680000000,-37.319744 +3685000000,-37.294330 +3690000000,-37.246136 +3695000000,-37.218149 +3700000000,-37.181227 +3705000000,-37.147854 +3710000000,-37.097534 +3715000000,-37.072781 +3720000000,-37.046737 +3725000000,-36.997450 +3730000000,-36.968706 +3735000000,-36.913598 +3740000000,-36.888144 +3745000000,-36.845538 +3750000000,-36.800576 +3755000000,-36.761877 +3760000000,-36.728360 +3765000000,-36.696574 +3770000000,-36.644133 +3775000000,-36.610482 +3780000000,-36.565233 +3785000000,-36.526951 +3790000000,-36.514113 +3795000000,-36.470730 +3800000000,-36.447618 +3805000000,-36.420044 +3810000000,-36.400795 +3815000000,-36.366341 +3820000000,-36.347179 +3825000000,-36.330269 +3830000000,-36.310626 +3835000000,-36.290344 +3840000000,-36.287092 +3845000000,-36.277678 +3850000000,-36.266362 +3855000000,-36.253707 +3860000000,-36.234368 +3865000000,-36.251970 +3870000000,-36.240744 +3875000000,-36.235190 +3880000000,-36.246295 +3885000000,-36.246840 +3890000000,-36.225558 +3895000000,-36.235719 +3900000000,-36.250097 +3905000000,-36.263727 +3910000000,-36.269877 +3915000000,-36.285963 +3920000000,-36.300642 +3925000000,-36.312699 +3930000000,-36.327765 +3935000000,-36.330799 +3940000000,-36.348280 +3945000000,-36.360014 +3950000000,-36.373343 +3955000000,-36.382336 +3960000000,-36.404091 +3965000000,-36.421365 +3970000000,-36.444774 +3975000000,-36.469241 +3980000000,-36.477091 +3985000000,-36.489345 +3990000000,-36.510344 +3995000000,-36.522426 +4000000000,-36.698126 +4005000000,-38.377010 +4010000000,-38.417433 +4015000000,-38.424164 +4020000000,-38.425164 +4025000000,-38.419408 +4030000000,-38.416379 +4035000000,-38.449257 +4040000000,-38.438749 +4045000000,-38.445536 +4050000000,-38.450447 +4055000000,-38.475155 +4060000000,-38.486708 +4065000000,-38.491289 +4070000000,-38.487795 +4075000000,-38.492960 +4080000000,-38.492952 +4085000000,-38.480817 +4090000000,-38.491742 +4095000000,-38.480846 +4100000000,-38.479800 +4105000000,-38.474948 +4110000000,-38.462349 +4115000000,-38.488147 +4120000000,-38.463987 +4125000000,-38.453720 +4130000000,-38.449327 +4135000000,-38.437923 +4140000000,-38.414104 +4145000000,-38.420252 +4150000000,-38.409836 +4155000000,-38.414530 +4160000000,-38.398061 +4165000000,-38.396260 +4170000000,-38.381233 +4175000000,-38.375981 +4180000000,-38.358204 +4185000000,-38.347319 +4190000000,-38.368671 +4195000000,-38.348891 +4200000000,-38.360016 +4205000000,-38.356350 +4210000000,-38.335929 +4215000000,-38.323329 +4220000000,-38.337148 +4225000000,-38.334423 +4230000000,-38.349709 +4235000000,-38.342159 +4240000000,-38.357516 +4245000000,-38.353564 +4250000000,-38.358769 +4255000000,-38.385812 +4260000000,-38.381301 +4265000000,-38.390807 +4270000000,-38.406989 +4275000000,-38.421021 +4280000000,-38.439237 +4285000000,-38.450173 +4290000000,-38.481652 +4295000000,-38.515952 +4300000000,-38.538007 +4305000000,-38.542326 +4310000000,-38.571139 +4315000000,-38.604544 +4320000000,-38.618597 +4325000000,-38.645814 +4330000000,-38.704340 +4335000000,-38.704614 +4340000000,-38.724615 +4345000000,-38.761570 +4350000000,-38.794819 +4355000000,-38.837011 +4360000000,-38.862852 +4365000000,-38.863734 +4370000000,-38.905231 +4375000000,-38.920365 +4380000000,-38.951811 +4385000000,-38.971645 +4390000000,-38.995950 +4395000000,-39.015370 +4400000000,-39.037947 +4405000000,-39.071204 +4410000000,-39.085020 +4415000000,-39.096156 +4420000000,-39.136619 +4425000000,-39.152076 +4430000000,-39.187021 +4435000000,-39.187491 +4440000000,-39.220656 +4445000000,-39.245936 +4450000000,-39.268845 +4455000000,-39.275492 +4460000000,-39.313869 +4465000000,-39.318711 +4470000000,-39.316847 +4475000000,-39.330449 +4480000000,-39.345264 +4485000000,-39.354034 +4490000000,-39.356879 +4495000000,-39.363997 +4500000000,-39.398979 +4505000000,-39.401322 +4510000000,-39.424486 +4515000000,-39.436775 +4520000000,-39.438853 +4525000000,-39.451539 +4530000000,-39.480085 +4535000000,-39.482701 +4540000000,-39.523526 +4545000000,-39.534660 +4550000000,-39.563196 +4555000000,-39.574607 +4560000000,-39.592895 +4565000000,-39.603155 +4570000000,-39.630565 +4575000000,-39.654084 +4580000000,-39.650935 +4585000000,-39.679679 +4590000000,-39.719322 +4595000000,-39.705913 +4600000000,-39.737099 +4605000000,-39.756573 +4610000000,-39.768439 +4615000000,-39.794487 +4620000000,-39.812069 +4625000000,-39.818055 +4630000000,-39.836277 +4635000000,-39.858100 +4640000000,-39.882801 +4645000000,-39.880263 +4650000000,-39.904244 +4655000000,-39.900288 +4660000000,-39.925785 +4665000000,-39.937151 +4670000000,-39.933267 +4675000000,-39.947521 +4680000000,-39.976735 +4685000000,-39.999134 +4690000000,-39.997285 +4695000000,-40.016988 +4700000000,-40.013800 +4705000000,-40.025050 +4710000000,-40.060281 +4715000000,-40.058888 +4720000000,-40.073565 +4725000000,-40.084364 +4730000000,-40.100676 +4735000000,-40.121512 +4740000000,-40.133868 +4745000000,-40.135990 +4750000000,-40.139570 +4755000000,-40.133130 +4760000000,-40.158912 +4765000000,-40.152356 +4770000000,-40.139985 +4775000000,-40.165143 +4780000000,-40.160982 +4785000000,-40.177024 +4790000000,-40.186087 +4795000000,-40.181971 +4800000000,-40.192882 +4805000000,-40.208651 +4810000000,-40.208953 +4815000000,-40.237447 +4820000000,-40.239497 +4825000000,-40.249796 +4830000000,-40.265321 +4835000000,-40.292966 +4840000000,-40.283522 +4845000000,-40.301931 +4850000000,-40.286631 +4855000000,-40.307887 +4860000000,-40.280923 +4865000000,-40.290541 +4870000000,-40.302361 +4875000000,-40.305778 +4880000000,-40.297521 +4885000000,-40.295567 +4890000000,-40.316589 +4895000000,-40.314676 +4900000000,-40.333281 +4905000000,-40.310560 +4910000000,-40.346862 +4915000000,-40.349451 +4920000000,-40.336457 +4925000000,-40.348983 +4930000000,-40.362465 +4935000000,-40.347339 +4940000000,-40.349429 +4945000000,-40.354804 +4950000000,-40.347005 +4955000000,-40.349418 +4960000000,-40.363590 +4965000000,-40.353185 +4970000000,-40.348812 +4975000000,-40.342338 +4980000000,-40.356583 +4985000000,-40.339050 +4990000000,-40.340898 +4995000000,-40.365697 +5000000000,-40.377274 +5005000000,-40.339650 +5010000000,-40.327161 +5015000000,-40.314203 +5020000000,-40.291252 +5025000000,-40.292946 +5030000000,-40.265604 +5035000000,-40.255428 +5040000000,-40.266196 +5045000000,-40.244840 +5050000000,-40.243973 +5055000000,-40.246368 +5060000000,-40.219614 +5065000000,-40.231516 +5070000000,-40.233628 +5075000000,-40.216699 +5080000000,-40.236049 +5085000000,-40.245894 +5090000000,-40.247390 +5095000000,-40.254940 +5100000000,-40.244521 +5105000000,-40.265886 +5110000000,-40.258355 +5115000000,-40.264552 +5120000000,-40.283245 +5125000000,-40.280724 +5130000000,-40.294916 +5135000000,-40.284063 +5140000000,-40.296812 +5145000000,-40.311779 +5150000000,-40.323188 +5155000000,-40.337776 +5160000000,-40.355431 +5165000000,-40.363348 +5170000000,-40.403185 +5175000000,-40.416302 +5180000000,-40.408019 +5185000000,-40.439381 +5190000000,-40.458820 +5195000000,-40.467732 +5200000000,-40.498132 +5205000000,-40.528109 +5210000000,-40.544879 +5215000000,-40.588057 +5220000000,-40.613818 +5225000000,-40.628332 +5230000000,-40.655709 +5235000000,-40.691636 +5240000000,-40.708917 +5245000000,-40.748866 +5250000000,-40.781466 +5255000000,-40.790099 +5260000000,-40.814502 +5265000000,-40.872628 +5270000000,-40.905456 +5275000000,-40.937949 +5280000000,-40.960983 +5285000000,-41.000394 +5290000000,-41.037129 +5295000000,-41.070213 +5300000000,-41.110949 +5305000000,-41.144739 +5310000000,-41.187230 +5315000000,-41.208237 +5320000000,-41.264493 +5325000000,-41.317014 +5330000000,-41.357737 +5335000000,-41.407867 +5340000000,-41.454652 +5345000000,-41.499035 +5350000000,-41.537784 +5355000000,-41.620004 +5360000000,-41.667587 +5365000000,-41.768118 +5370000000,-41.818484 +5375000000,-41.904965 +5380000000,-41.968994 +5385000000,-42.041870 +5390000000,-42.109454 +5395000000,-42.171761 +5400000000,-42.254179 +5405000000,-42.302742 +5410000000,-42.379283 +5415000000,-42.430759 +5420000000,-42.499839 +5425000000,-42.571658 +5430000000,-42.634877 +5435000000,-42.684733 +5440000000,-42.752118 +5445000000,-42.800368 +5450000000,-42.854562 +5455000000,-42.889228 +5460000000,-42.931897 +5465000000,-42.986674 +5470000000,-43.046853 +5475000000,-43.080174 +5480000000,-43.125079 +5485000000,-43.168524 +5490000000,-43.201448 +5495000000,-43.224931 +5500000000,-43.244707 +5505000000,-43.254263 +5510000000,-43.246224 +5515000000,-43.261062 +5520000000,-43.259880 +5525000000,-43.250766 +5530000000,-43.266453 +5535000000,-43.261639 +5540000000,-43.244421 +5545000000,-43.245542 +5550000000,-43.242558 +5555000000,-43.258975 +5560000000,-43.250316 +5565000000,-43.257793 +5570000000,-43.228082 +5575000000,-43.229901 +5580000000,-43.274085 +5585000000,-43.297609 +5590000000,-43.301201 +5595000000,-43.337880 +5600000000,-43.366400 +5605000000,-43.422734 +5610000000,-43.496176 +5615000000,-43.534503 +5620000000,-43.627985 +5625000000,-43.698283 +5630000000,-43.775442 +5635000000,-43.883812 +5640000000,-43.982625 +5645000000,-44.065800 +5650000000,-44.187325 +5655000000,-44.289270 +5660000000,-44.385914 +5665000000,-44.501974 +5670000000,-44.603174 +5675000000,-44.686149 +5680000000,-44.776098 +5685000000,-44.888824 +5690000000,-44.984128 +5695000000,-45.086452 +5700000000,-45.181570 +5705000000,-45.247797 +5710000000,-45.337757 +5715000000,-45.431559 +5720000000,-45.507271 +5725000000,-45.582870 +5730000000,-45.656678 +5735000000,-45.678922 +5740000000,-45.725255 +5745000000,-45.808510 +5750000000,-45.847144 +5755000000,-45.888858 +5760000000,-45.894549 +5765000000,-45.933831 +5770000000,-45.947918 +5775000000,-45.989375 +5780000000,-45.951614 +5785000000,-45.977565 +5790000000,-45.974638 +5795000000,-45.996557 +5800000000,-45.924658 +5805000000,-45.938760 +5810000000,-45.905904 +5815000000,-45.893793 +5820000000,-45.843336 +5825000000,-45.834020 +5830000000,-45.781804 +5835000000,-45.759896 +5840000000,-45.707772 +5845000000,-45.660371 +5850000000,-45.610800 +5855000000,-45.529262 +5860000000,-45.470110 +5865000000,-45.418185 +5870000000,-45.325791 +5875000000,-45.252662 +5880000000,-45.194378 +5885000000,-45.095804 +5890000000,-45.024437 +5895000000,-44.981543 +5900000000,-44.894381 +5905000000,-44.836685 +5910000000,-44.783624 +5915000000,-44.685037 +5920000000,-44.661137 +5925000000,-44.536646 +5930000000,-44.510948 +5935000000,-44.472568 +5940000000,-44.502263 +5945000000,-44.490905 +5950000000,-44.514662 +5955000000,-44.519597 +5960000000,-44.588718 +5965000000,-44.618940 +5970000000,-44.652678 +5975000000,-44.690585 +5980000000,-44.810453 +5985000000,-44.880211 +5990000000,-44.945488 +5995000000,-45.023000 +6000000000,-45.124071 diff --git a/host/libraries/libbladeRF_test/test_gain_calibration/example_measurements/tx_sweep_60.csv b/host/libraries/libbladeRF_test/test_gain_calibration/example_measurements/tx_sweep_60.csv new file mode 100644 index 00000000..cb42a8ef --- /dev/null +++ b/host/libraries/libbladeRF_test/test_gain_calibration/example_measurements/tx_sweep_60.csv @@ -0,0 +1,1189 @@ +Frequency (Hz),Power (dBm) target 0.00 +65000000,6.157315 +70000000,6.194271 +75000000,6.226159 +80000000,6.245490 +85000000,6.205765 +90000000,6.113249 +95000000,6.111689 +100000000,5.989951 +105000000,5.983249 +110000000,5.564828 +115000000,6.343126 +120000000,6.540452 +125000000,5.910416 +130000000,6.152011 +135000000,6.526889 +140000000,6.054581 +145000000,6.248009 +150000000,5.436107 +155000000,5.976462 +160000000,5.568224 +165000000,5.388494 +170000000,5.947269 +175000000,5.673866 +180000000,5.893869 +185000000,5.549165 +190000000,5.757005 +195000000,5.756159 +200000000,5.520930 +205000000,5.790328 +210000000,5.781390 +215000000,5.484811 +220000000,5.424579 +225000000,5.395431 +230000000,5.671071 +235000000,5.590558 +240000000,5.449643 +245000000,5.425057 +250000000,5.556659 +255000000,5.490192 +260000000,5.402726 +265000000,5.424587 +270000000,5.423673 +275000000,5.391278 +280000000,5.387480 +285000000,5.389969 +290000000,5.400196 +295000000,5.411664 +300000000,5.416732 +305000000,5.420398 +310000000,5.440248 +315000000,5.462807 +320000000,5.477963 +325000000,5.519431 +330000000,5.553458 +335000000,5.596711 +340000000,5.634841 +345000000,5.653214 +350000000,5.670786 +355000000,5.670883 +360000000,5.668317 +365000000,5.659184 +370000000,5.653855 +375000000,5.647157 +380000000,5.688111 +385000000,5.653699 +390000000,5.644187 +395000000,5.621721 +400000000,5.590566 +405000000,5.573229 +410000000,5.581023 +415000000,5.561993 +420000000,5.541164 +425000000,5.522679 +430000000,5.519882 +435000000,5.500000 +440000000,5.501656 +445000000,5.501833 +450000000,5.477400 +455000000,5.457675 +460000000,5.447329 +465000000,5.419536 +470000000,5.418009 +475000000,5.381907 +480000000,5.361383 +485000000,5.336582 +490000000,5.333523 +495000000,5.295510 +500000000,5.271069 +505000000,5.246830 +510000000,5.204310 +515000000,5.171904 +520000000,5.147884 +525000000,5.091698 +530000000,5.045176 +535000000,5.001130 +540000000,4.971303 +545000000,4.929385 +550000000,4.884841 +555000000,4.834138 +560000000,4.771875 +565000000,4.714249 +570000000,4.664798 +575000000,4.625771 +580000000,4.577745 +585000000,4.535188 +590000000,4.492224 +595000000,4.428917 +600000000,4.266828 +605000000,4.274719 +610000000,4.231307 +615000000,4.207132 +620000000,4.179665 +625000000,4.157872 +630000000,4.140516 +635000000,4.106554 +640000000,4.109521 +645000000,4.066630 +650000000,4.041077 +655000000,4.036797 +660000000,3.994056 +665000000,3.982641 +670000000,3.961875 +675000000,3.977424 +680000000,3.971622 +685000000,3.964635 +690000000,3.976649 +695000000,3.979792 +700000000,3.951413 +705000000,3.974021 +710000000,4.009081 +715000000,3.988812 +720000000,4.022719 +725000000,4.050709 +730000000,4.026056 +735000000,4.035996 +740000000,4.073856 +745000000,4.070107 +750000000,4.078394 +755000000,4.040640 +760000000,4.050506 +765000000,4.104349 +770000000,4.153644 +775000000,4.192030 +780000000,4.284631 +785000000,4.327083 +790000000,4.410788 +795000000,4.439881 +800000000,4.431264 +805000000,4.458802 +810000000,4.475099 +815000000,4.446762 +820000000,4.474157 +825000000,4.463331 +830000000,4.449224 +835000000,4.414241 +840000000,4.427465 +845000000,4.402532 +850000000,4.399415 +855000000,4.376016 +860000000,4.392669 +865000000,4.344771 +870000000,4.366180 +875000000,4.355702 +880000000,4.331394 +885000000,4.323904 +890000000,4.337420 +895000000,4.323852 +900000000,4.340883 +905000000,4.337534 +910000000,4.344502 +915000000,4.363385 +920000000,4.354096 +925000000,4.398818 +930000000,4.396164 +935000000,4.412478 +940000000,4.475004 +945000000,4.462936 +950000000,4.523760 +955000000,4.521073 +960000000,4.584322 +965000000,4.585669 +970000000,4.642306 +975000000,4.685823 +980000000,4.711813 +985000000,4.754529 +990000000,4.757298 +995000000,4.814005 +1000000000,4.664590 +1005000000,4.706833 +1010000000,4.760135 +1015000000,4.803568 +1020000000,4.831757 +1025000000,4.855049 +1030000000,4.903735 +1035000000,4.912014 +1040000000,4.954856 +1045000000,4.956369 +1050000000,4.980084 +1055000000,5.004787 +1060000000,4.995125 +1065000000,5.035309 +1070000000,5.036716 +1075000000,5.021716 +1080000000,5.013829 +1085000000,4.994242 +1090000000,4.993754 +1095000000,4.997429 +1100000000,4.995907 +1105000000,4.946068 +1110000000,4.962966 +1115000000,4.921851 +1120000000,4.874667 +1125000000,4.844695 +1130000000,4.802468 +1135000000,4.778435 +1140000000,4.722374 +1145000000,4.678345 +1150000000,4.586853 +1155000000,4.512462 +1160000000,4.436592 +1165000000,4.370219 +1170000000,4.292622 +1175000000,4.297106 +1180000000,4.298933 +1185000000,4.270884 +1190000000,4.283187 +1195000000,4.278198 +1200000000,4.277487 +1205000000,4.213075 +1210000000,4.181646 +1215000000,4.131293 +1220000000,4.100438 +1225000000,4.049147 +1230000000,3.972303 +1235000000,3.930839 +1240000000,3.825055 +1245000000,3.754131 +1250000000,3.677232 +1255000000,3.598744 +1260000000,3.547331 +1265000000,3.447058 +1270000000,3.376575 +1275000000,3.297891 +1280000000,3.204322 +1285000000,3.102885 +1290000000,3.018719 +1295000000,2.969577 +1300000000,2.852631 +1305000000,2.783763 +1310000000,2.714958 +1315000000,2.657315 +1320000000,2.584953 +1325000000,2.487319 +1330000000,2.467946 +1335000000,2.386075 +1340000000,2.346135 +1345000000,2.267217 +1350000000,2.252175 +1355000000,2.179123 +1360000000,2.144489 +1365000000,2.102325 +1370000000,2.115026 +1375000000,2.090653 +1380000000,2.019809 +1385000000,2.037845 +1390000000,1.979275 +1395000000,2.001224 +1400000000,1.946928 +1405000000,1.959997 +1410000000,1.925479 +1415000000,1.915818 +1420000000,1.904243 +1425000000,1.888241 +1430000000,1.904377 +1435000000,1.873078 +1440000000,1.855853 +1445000000,1.844853 +1450000000,1.879914 +1455000000,1.805031 +1460000000,1.826788 +1465000000,1.805223 +1470000000,1.730626 +1475000000,1.748526 +1480000000,1.696148 +1485000000,1.652654 +1490000000,1.604901 +1495000000,1.606768 +1500000000,1.552216 +1505000000,1.425203 +1510000000,1.371219 +1515000000,1.316267 +1520000000,1.290547 +1525000000,1.196805 +1530000000,1.124661 +1535000000,1.124374 +1540000000,1.070419 +1545000000,0.993565 +1550000000,0.940391 +1555000000,0.887041 +1560000000,0.862129 +1565000000,0.767384 +1570000000,0.782018 +1575000000,0.686502 +1580000000,0.701371 +1585000000,0.630841 +1590000000,0.618903 +1595000000,0.622277 +1600000000,0.509870 +1605000000,0.297171 +1610000000,0.339825 +1615000000,0.367740 +1620000000,0.315059 +1625000000,0.389733 +1630000000,0.393692 +1635000000,0.395558 +1640000000,0.408229 +1645000000,0.419802 +1650000000,0.473067 +1655000000,0.503268 +1660000000,0.525558 +1665000000,0.571682 +1670000000,0.605691 +1675000000,0.657424 +1680000000,0.721893 +1685000000,0.732394 +1690000000,0.824690 +1695000000,0.842697 +1700000000,0.912860 +1705000000,0.952515 +1710000000,0.993439 +1715000000,1.061201 +1720000000,1.137833 +1725000000,1.213038 +1730000000,1.286669 +1735000000,1.343230 +1740000000,1.380826 +1745000000,1.434395 +1750000000,1.524215 +1755000000,1.558843 +1760000000,1.601981 +1765000000,1.600711 +1770000000,1.692749 +1775000000,1.700694 +1780000000,1.727584 +1785000000,1.764201 +1790000000,1.813105 +1795000000,1.841696 +1800000000,1.891276 +1805000000,1.909778 +1810000000,1.984736 +1815000000,2.009776 +1820000000,2.001649 +1825000000,2.066825 +1830000000,2.089736 +1835000000,2.118825 +1840000000,2.099078 +1845000000,2.159010 +1850000000,2.189224 +1855000000,2.213140 +1860000000,2.239182 +1865000000,2.215739 +1870000000,2.284753 +1875000000,2.290163 +1880000000,2.323972 +1885000000,2.299843 +1890000000,2.343372 +1895000000,2.329090 +1900000000,2.351758 +1905000000,2.366384 +1910000000,2.436590 +1915000000,2.405718 +1920000000,2.429339 +1925000000,2.431358 +1930000000,2.446137 +1935000000,2.457880 +1940000000,2.485786 +1945000000,2.483284 +1950000000,2.524343 +1955000000,2.485766 +1960000000,2.476283 +1965000000,2.515176 +1970000000,2.492360 +1975000000,2.464866 +1980000000,2.464670 +1985000000,2.421476 +1990000000,2.453880 +1995000000,2.421014 +2000000000,2.377888 +2005000000,2.329475 +2010000000,2.300027 +2015000000,2.224594 +2020000000,2.172511 +2025000000,2.145190 +2030000000,2.092208 +2035000000,1.993430 +2040000000,1.924242 +2045000000,1.878212 +2050000000,1.843794 +2055000000,1.742200 +2060000000,1.646735 +2065000000,1.618123 +2070000000,1.551263 +2075000000,1.446084 +2080000000,1.395669 +2085000000,1.332592 +2090000000,1.252534 +2095000000,1.179021 +2100000000,1.113951 +2105000000,1.050944 +2110000000,1.019366 +2115000000,0.975872 +2120000000,0.874885 +2125000000,0.821672 +2130000000,0.740506 +2135000000,0.625614 +2140000000,0.546228 +2145000000,0.476276 +2150000000,0.419359 +2155000000,0.360683 +2160000000,0.252352 +2165000000,0.190402 +2170000000,0.087917 +2175000000,0.009236 +2180000000,-0.084984 +2185000000,-0.205622 +2190000000,-0.284235 +2195000000,-0.409686 +2200000000,-0.461143 +2205000000,-0.617624 +2210000000,-0.715468 +2215000000,-0.752536 +2220000000,-0.828852 +2225000000,-0.983595 +2230000000,-1.001923 +2235000000,-1.125091 +2240000000,-1.240782 +2245000000,-1.278592 +2250000000,-1.415938 +2255000000,-1.440507 +2260000000,-1.570906 +2265000000,-1.603520 +2270000000,-1.674505 +2275000000,-1.755123 +2280000000,-1.830823 +2285000000,-1.933833 +2290000000,-1.980245 +2295000000,-2.051872 +2300000000,-2.103732 +2305000000,-2.143807 +2310000000,-2.205478 +2315000000,-2.224656 +2320000000,-2.343553 +2325000000,-2.329161 +2330000000,-2.430669 +2335000000,-2.475823 +2340000000,-2.469844 +2345000000,-2.552999 +2350000000,-2.511322 +2355000000,-2.619841 +2360000000,-2.598087 +2365000000,-2.678565 +2370000000,-2.684619 +2375000000,-2.729602 +2380000000,-2.695597 +2385000000,-2.765572 +2390000000,-2.789345 +2395000000,-2.725096 +2400000000,-2.742034 +2405000000,-2.762686 +2410000000,-2.795109 +2415000000,-2.792604 +2420000000,-2.885373 +2425000000,-2.840652 +2430000000,-2.878648 +2435000000,-2.932694 +2440000000,-2.866820 +2445000000,-2.876055 +2450000000,-2.928536 +2455000000,-2.957514 +2460000000,-2.907467 +2465000000,-3.010294 +2470000000,-3.015829 +2475000000,-2.927257 +2480000000,-3.030023 +2485000000,-2.946897 +2490000000,-2.974939 +2495000000,-3.003124 +2500000000,-2.960959 +2505000000,-2.963263 +2510000000,-3.055599 +2515000000,-2.981767 +2520000000,-2.971908 +2525000000,-3.005410 +2530000000,-2.983496 +2535000000,-3.029925 +2540000000,-3.014501 +2545000000,-2.977782 +2550000000,-3.058471 +2555000000,-3.048831 +2560000000,-3.042221 +2565000000,-2.984466 +2570000000,-2.978943 +2575000000,-3.008674 +2580000000,-3.028343 +2585000000,-2.971436 +2590000000,-2.998232 +2595000000,-2.990061 +2600000000,-3.008856 +2605000000,-3.001939 +2610000000,-2.921437 +2615000000,-2.916478 +2620000000,-2.945935 +2625000000,-2.853171 +2630000000,-2.859403 +2635000000,-2.873751 +2640000000,-2.822309 +2645000000,-2.758385 +2650000000,-2.716194 +2655000000,-2.687366 +2660000000,-2.684466 +2665000000,-2.666037 +2670000000,-2.672144 +2675000000,-2.581993 +2680000000,-2.552328 +2685000000,-2.583584 +2690000000,-2.461131 +2695000000,-2.503377 +2700000000,-2.661808 +2705000000,-2.596282 +2710000000,-2.569253 +2715000000,-2.427691 +2720000000,-2.446502 +2725000000,-2.378271 +2730000000,-2.349348 +2735000000,-2.291178 +2740000000,-2.252805 +2745000000,-2.184018 +2750000000,-2.096658 +2755000000,-2.035549 +2760000000,-2.063746 +2765000000,-2.018872 +2770000000,-1.924388 +2775000000,-1.929105 +2780000000,-1.890126 +2785000000,-1.853969 +2790000000,-1.754166 +2795000000,-1.704751 +2800000000,-1.739063 +2805000000,-1.702782 +2810000000,-1.602551 +2815000000,-1.582499 +2820000000,-1.542551 +2825000000,-1.577136 +2830000000,-1.479176 +2835000000,-1.467112 +2840000000,-1.493050 +2845000000,-1.466895 +2850000000,-1.433092 +2855000000,-1.366750 +2860000000,-1.325558 +2865000000,-1.315374 +2870000000,-1.263977 +2875000000,-1.316776 +2880000000,-1.289560 +2885000000,-1.209416 +2890000000,-1.237507 +2895000000,-1.188110 +2900000000,-1.233459 +2905000000,-1.156440 +2910000000,-1.216489 +2915000000,-1.209851 +2920000000,-1.139529 +2925000000,-1.173558 +2930000000,-1.126354 +2935000000,-1.176225 +2940000000,-1.139454 +2945000000,-1.125853 +2950000000,-1.193493 +2955000000,-1.156007 +2960000000,-1.149110 +2965000000,-1.157015 +2970000000,-1.187706 +2975000000,-1.222096 +2980000000,-1.208323 +2985000000,-1.245603 +2990000000,-1.204650 +2995000000,-1.235167 +3000000000,-1.266082 +3005000000,-1.960639 +3010000000,-1.970146 +3015000000,-1.938210 +3020000000,-1.925984 +3025000000,-1.872141 +3030000000,-1.839992 +3035000000,-1.816934 +3040000000,-1.785396 +3045000000,-1.727375 +3050000000,-1.736957 +3055000000,-1.696620 +3060000000,-1.609125 +3065000000,-1.611800 +3070000000,-1.527435 +3075000000,-1.546850 +3080000000,-1.512411 +3085000000,-1.405248 +3090000000,-1.379947 +3095000000,-1.328709 +3100000000,-1.285617 +3105000000,-1.271251 +3110000000,-1.211155 +3115000000,-1.213168 +3120000000,-1.136016 +3125000000,-1.137718 +3130000000,-1.076665 +3135000000,-1.022864 +3140000000,-0.991480 +3145000000,-0.967779 +3150000000,-0.958335 +3155000000,-0.915860 +3160000000,-0.850648 +3165000000,-0.856686 +3170000000,-0.828238 +3175000000,-0.797474 +3180000000,-0.768232 +3185000000,-0.777714 +3190000000,-0.718090 +3195000000,-0.706568 +3200000000,-0.706666 +3205000000,-0.692855 +3210000000,-0.658891 +3215000000,-0.646656 +3220000000,-0.606466 +3225000000,-0.598518 +3230000000,-0.544009 +3235000000,-0.560795 +3240000000,-0.522687 +3245000000,-0.507645 +3250000000,-0.517810 +3255000000,-0.480977 +3260000000,-0.498552 +3265000000,-0.491097 +3270000000,-0.452907 +3275000000,-0.463321 +3280000000,-0.470982 +3285000000,-0.441346 +3290000000,-0.465790 +3295000000,-0.443138 +3300000000,-0.455444 +3305000000,-0.455838 +3310000000,-0.432548 +3315000000,-0.459950 +3320000000,-0.437016 +3325000000,-0.467134 +3330000000,-0.473845 +3335000000,-0.484154 +3340000000,-0.489584 +3345000000,-0.483100 +3350000000,-0.514470 +3355000000,-0.533884 +3360000000,-0.564584 +3365000000,-0.566304 +3370000000,-0.572861 +3375000000,-0.619513 +3380000000,-0.636377 +3385000000,-0.639174 +3390000000,-0.683683 +3395000000,-0.709408 +3400000000,-0.738171 +3405000000,-0.776091 +3410000000,-0.801868 +3415000000,-0.820676 +3420000000,-0.881875 +3425000000,-0.921096 +3430000000,-0.946110 +3435000000,-0.974918 +3440000000,-1.012452 +3445000000,-1.053351 +3450000000,-1.115051 +3455000000,-1.170181 +3460000000,-1.207721 +3465000000,-1.262281 +3470000000,-1.309856 +3475000000,-1.371762 +3480000000,-1.407915 +3485000000,-1.451914 +3490000000,-1.533182 +3495000000,-1.567446 +3500000000,-1.611837 +3505000000,-1.700005 +3510000000,-1.726307 +3515000000,-1.790855 +3520000000,-1.864079 +3525000000,-1.929966 +3530000000,-1.971062 +3535000000,-2.052109 +3540000000,-2.097484 +3545000000,-2.148169 +3550000000,-2.242856 +3555000000,-2.292848 +3560000000,-2.364241 +3565000000,-2.437516 +3570000000,-2.511381 +3575000000,-2.584179 +3580000000,-2.655089 +3585000000,-2.725464 +3590000000,-2.806837 +3595000000,-2.887261 +3600000000,-2.933178 +3605000000,-3.011276 +3610000000,-3.116931 +3615000000,-3.167913 +3620000000,-3.284764 +3625000000,-3.367234 +3630000000,-3.416110 +3635000000,-3.497431 +3640000000,-3.612337 +3645000000,-3.685213 +3650000000,-3.712018 +3655000000,-3.824355 +3660000000,-3.853952 +3665000000,-3.968754 +3670000000,-4.038305 +3675000000,-4.072322 +3680000000,-4.163419 +3685000000,-4.258184 +3690000000,-4.316054 +3695000000,-4.419275 +3700000000,-4.452757 +3705000000,-4.541396 +3710000000,-4.624912 +3715000000,-4.709858 +3720000000,-4.778104 +3725000000,-4.839333 +3730000000,-4.936354 +3735000000,-4.958810 +3740000000,-5.040029 +3745000000,-5.135597 +3750000000,-5.199320 +3755000000,-5.243915 +3760000000,-5.292261 +3765000000,-5.397586 +3770000000,-5.420866 +3775000000,-5.514759 +3780000000,-5.551617 +3785000000,-5.653265 +3790000000,-5.686248 +3795000000,-5.724990 +3800000000,-5.822475 +3805000000,-5.817909 +3810000000,-5.917957 +3815000000,-5.951622 +3820000000,-6.002161 +3825000000,-6.042884 +3830000000,-6.049035 +3835000000,-6.096583 +3840000000,-6.125148 +3845000000,-6.165952 +3850000000,-6.207740 +3855000000,-6.172299 +3860000000,-6.246242 +3865000000,-6.209689 +3870000000,-6.291309 +3875000000,-6.244645 +3880000000,-6.259151 +3885000000,-6.323634 +3890000000,-6.316745 +3895000000,-6.351768 +3900000000,-6.353438 +3905000000,-6.317777 +3910000000,-6.328501 +3915000000,-6.294513 +3920000000,-6.331765 +3925000000,-6.334209 +3930000000,-6.325838 +3935000000,-6.291991 +3940000000,-6.320036 +3945000000,-6.288643 +3950000000,-6.268538 +3955000000,-6.224867 +3960000000,-6.260699 +3965000000,-6.192409 +3970000000,-6.189822 +3975000000,-6.208439 +3980000000,-6.192643 +3985000000,-6.176109 +3990000000,-6.078364 +3995000000,-6.027975 +4000000000,-6.362748 +4005000000,-6.256133 +4010000000,-6.280971 +4015000000,-6.248119 +4020000000,-6.238391 +4025000000,-6.214219 +4030000000,-6.248925 +4035000000,-6.230893 +4040000000,-6.254195 +4045000000,-6.229074 +4050000000,-6.259277 +4055000000,-6.232249 +4060000000,-6.267193 +4065000000,-6.276496 +4070000000,-6.322331 +4075000000,-6.283757 +4080000000,-6.318350 +4085000000,-6.354909 +4090000000,-6.420818 +4095000000,-6.416263 +4100000000,-6.406043 +4105000000,-6.448186 +4110000000,-6.501165 +4115000000,-6.450834 +4120000000,-6.489384 +4125000000,-6.486720 +4130000000,-6.459705 +4135000000,-6.524612 +4140000000,-6.488146 +4145000000,-6.480842 +4150000000,-6.460068 +4155000000,-6.474310 +4160000000,-6.411806 +4165000000,-6.390198 +4170000000,-6.396223 +4175000000,-6.394746 +4180000000,-6.343924 +4185000000,-6.265794 +4190000000,-6.247101 +4195000000,-6.232328 +4200000000,-6.140326 +4205000000,-6.081051 +4210000000,-6.003890 +4215000000,-5.975864 +4220000000,-5.867729 +4225000000,-5.825725 +4230000000,-5.718879 +4235000000,-5.645657 +4240000000,-5.561522 +4245000000,-5.485623 +4250000000,-5.428094 +4255000000,-5.300167 +4260000000,-5.215176 +4265000000,-5.170235 +4270000000,-5.053907 +4275000000,-5.002403 +4280000000,-4.911993 +4285000000,-4.798095 +4290000000,-4.760660 +4295000000,-4.670782 +4300000000,-4.619973 +4305000000,-4.558874 +4310000000,-4.473040 +4315000000,-4.481138 +4320000000,-4.483784 +4325000000,-4.488703 +4330000000,-4.418366 +4335000000,-4.330986 +4340000000,-4.309116 +4345000000,-4.311307 +4350000000,-4.340278 +4355000000,-4.317851 +4360000000,-4.346290 +4365000000,-4.355606 +4370000000,-4.375773 +4375000000,-4.420459 +4380000000,-4.451074 +4385000000,-4.458198 +4390000000,-4.520814 +4395000000,-4.559633 +4400000000,-4.566433 +4405000000,-4.622387 +4410000000,-4.678807 +4415000000,-4.684636 +4420000000,-4.743956 +4425000000,-4.771303 +4430000000,-4.774988 +4435000000,-4.829123 +4440000000,-4.845451 +4445000000,-4.863772 +4450000000,-4.846246 +4455000000,-4.859007 +4460000000,-4.895512 +4465000000,-4.869217 +4470000000,-4.902903 +4475000000,-4.905620 +4480000000,-4.901393 +4485000000,-4.892632 +4490000000,-4.884386 +4495000000,-4.848935 +4500000000,-4.823350 +4505000000,-4.814664 +4510000000,-4.788419 +4515000000,-4.764647 +4520000000,-4.751015 +4525000000,-4.734656 +4530000000,-4.694889 +4535000000,-4.697107 +4540000000,-4.673812 +4545000000,-4.650190 +4550000000,-4.603728 +4555000000,-4.581684 +4560000000,-4.567472 +4565000000,-4.581973 +4570000000,-4.577948 +4575000000,-4.564536 +4580000000,-4.547091 +4585000000,-4.572668 +4590000000,-4.551495 +4595000000,-4.571643 +4600000000,-4.590979 +4605000000,-4.591138 +4610000000,-4.604135 +4615000000,-4.639191 +4620000000,-4.648516 +4625000000,-4.664522 +4630000000,-4.675708 +4635000000,-4.721400 +4640000000,-4.728466 +4645000000,-4.765254 +4650000000,-4.785020 +4655000000,-4.821343 +4660000000,-4.840892 +4665000000,-4.846614 +4670000000,-4.871758 +4675000000,-4.887177 +4680000000,-4.876889 +4685000000,-4.892384 +4690000000,-4.914825 +4695000000,-4.918875 +4700000000,-4.911019 +4705000000,-4.926798 +4710000000,-4.931108 +4715000000,-4.937549 +4720000000,-4.954839 +4725000000,-4.940693 +4730000000,-4.962544 +4735000000,-4.951514 +4740000000,-4.965979 +4745000000,-4.954297 +4750000000,-4.956107 +4755000000,-4.977296 +4760000000,-4.975224 +4765000000,-4.978626 +4770000000,-4.983588 +4775000000,-4.976986 +4780000000,-4.997716 +4785000000,-4.994004 +4790000000,-5.014787 +4795000000,-5.014830 +4800000000,-5.046136 +4805000000,-5.047477 +4810000000,-5.074415 +4815000000,-5.092706 +4820000000,-5.108905 +4825000000,-5.144098 +4830000000,-5.170357 +4835000000,-5.192399 +4840000000,-5.221025 +4845000000,-5.250779 +4850000000,-5.268761 +4855000000,-5.298629 +4860000000,-5.317846 +4865000000,-5.350112 +4870000000,-5.365134 +4875000000,-5.376642 +4880000000,-5.376254 +4885000000,-5.381342 +4890000000,-5.394405 +4895000000,-5.390727 +4900000000,-5.381348 +4905000000,-5.368480 +4910000000,-5.356814 +4915000000,-5.341257 +4920000000,-5.308777 +4925000000,-5.275202 +4930000000,-5.238776 +4935000000,-5.199423 +4940000000,-5.158176 +4945000000,-5.116584 +4950000000,-5.067598 +4955000000,-5.021660 +4960000000,-4.958210 +4965000000,-4.896855 +4970000000,-4.841685 +4975000000,-4.770369 +4980000000,-4.703683 +4985000000,-4.631795 +4990000000,-4.558592 +4995000000,-4.486700 +5000000000,-4.600579 +5005000000,-4.471837 +5010000000,-4.380270 +5015000000,-4.298423 +5020000000,-4.219722 +5025000000,-4.150962 +5030000000,-4.084023 +5035000000,-4.026279 +5040000000,-3.970628 +5045000000,-3.928150 +5050000000,-3.891762 +5055000000,-3.869136 +5060000000,-3.859319 +5065000000,-3.854393 +5070000000,-3.860305 +5075000000,-3.872154 +5080000000,-3.894505 +5085000000,-3.922629 +5090000000,-3.954026 +5095000000,-3.991840 +5100000000,-4.039018 +5105000000,-4.084606 +5110000000,-4.132808 +5115000000,-4.184277 +5120000000,-4.243064 +5125000000,-4.296095 +5130000000,-4.349993 +5135000000,-4.404528 +5140000000,-4.452222 +5145000000,-4.503585 +5150000000,-4.552038 +5155000000,-4.591118 +5160000000,-4.626962 +5165000000,-4.661806 +5170000000,-4.690940 +5175000000,-4.721218 +5180000000,-4.746052 +5185000000,-4.767991 +5190000000,-4.784779 +5195000000,-4.799156 +5200000000,-4.813319 +5205000000,-4.816093 +5210000000,-4.815265 +5215000000,-4.817170 +5220000000,-4.817599 +5225000000,-4.823545 +5230000000,-4.823767 +5235000000,-4.835605 +5240000000,-4.835308 +5245000000,-4.844776 +5250000000,-4.861635 +5255000000,-4.861294 +5260000000,-4.883040 +5265000000,-4.910737 +5270000000,-4.943463 +5275000000,-4.986531 +5280000000,-5.030290 +5285000000,-5.086550 +5290000000,-5.149877 +5295000000,-5.217388 +5300000000,-5.275929 +5305000000,-5.350676 +5310000000,-5.444845 +5315000000,-5.526888 +5320000000,-5.620727 +5325000000,-5.725436 +5330000000,-5.830289 +5335000000,-5.926002 +5340000000,-6.019547 +5345000000,-6.132871 +5350000000,-6.245574 +5355000000,-6.332162 +5360000000,-6.442909 +5365000000,-6.524044 +5370000000,-6.621444 +5375000000,-6.716202 +5380000000,-6.800332 +5385000000,-6.890193 +5390000000,-6.972522 +5395000000,-7.049019 +5400000000,-7.104415 +5405000000,-7.161884 +5410000000,-7.238161 +5415000000,-7.287354 +5420000000,-7.332627 +5425000000,-7.388327 +5430000000,-7.415294 +5435000000,-7.450847 +5440000000,-7.505895 +5445000000,-7.521805 +5450000000,-7.548616 +5455000000,-7.557241 +5460000000,-7.590254 +5465000000,-7.610232 +5470000000,-7.621939 +5475000000,-7.612346 +5480000000,-7.620862 +5485000000,-7.647417 +5490000000,-7.637327 +5495000000,-7.665876 +5500000000,-7.675509 +5505000000,-7.662704 +5510000000,-7.672391 +5515000000,-7.691847 +5520000000,-7.723227 +5525000000,-7.734825 +5530000000,-7.737383 +5535000000,-7.767747 +5540000000,-7.817464 +5545000000,-7.813915 +5550000000,-7.847756 +5555000000,-7.891564 +5560000000,-7.953327 +5565000000,-7.967525 +5570000000,-8.044600 +5575000000,-8.061849 +5580000000,-8.142838 +5585000000,-8.163649 +5590000000,-8.229673 +5595000000,-8.267892 +5600000000,-8.328613 +5605000000,-8.407277 +5610000000,-8.458200 +5615000000,-8.478477 +5620000000,-8.563039 +5625000000,-8.597312 +5630000000,-8.656247 +5635000000,-8.667915 +5640000000,-8.753557 +5645000000,-8.749933 +5650000000,-8.772959 +5655000000,-8.861572 +5660000000,-8.882436 +5665000000,-8.926724 +5670000000,-8.930769 +5675000000,-8.935517 +5680000000,-8.955722 +5685000000,-8.977546 +5690000000,-8.973367 +5695000000,-9.003789 +5700000000,-9.041940 +5705000000,-9.011822 +5710000000,-8.991362 +5715000000,-8.982888 +5720000000,-8.942077 +5725000000,-8.939933 +5730000000,-8.905303 +5735000000,-8.870887 +5740000000,-8.805657 +5745000000,-8.770426 +5750000000,-8.732713 +5755000000,-8.695408 +5760000000,-8.634218 +5765000000,-8.620699 +5770000000,-8.575680 +5775000000,-8.494568 +5780000000,-8.424516 +5785000000,-8.392766 +5790000000,-8.335726 +5795000000,-8.295343 +5800000000,-8.271581 +5805000000,-8.188282 +5810000000,-8.112962 +5815000000,-8.010562 +5820000000,-7.955126 +5825000000,-7.908866 +5830000000,-7.843808 +5835000000,-7.756644 +5840000000,-7.741780 +5845000000,-7.705113 +5850000000,-7.630767 +5855000000,-7.558268 +5860000000,-7.516462 +5865000000,-7.460656 +5870000000,-7.372637 +5875000000,-7.343368 +5880000000,-7.273826 +5885000000,-7.203378 +5890000000,-7.155618 +5895000000,-7.124391 +5900000000,-7.083232 +5905000000,-7.036884 +5910000000,-6.960260 +5915000000,-6.899077 +5920000000,-6.860135 +5925000000,-6.786713 +5930000000,-6.729443 +5935000000,-6.700472 +5940000000,-6.617006 +5945000000,-6.565607 +5950000000,-6.532889 +5955000000,-6.482465 +5960000000,-6.392723 +5965000000,-6.391502 +5970000000,-6.314221 +5975000000,-6.261764 +5980000000,-6.203083 +5985000000,-6.143503 +5990000000,-6.109385 +5995000000,-6.039283 +6000000000,-6.006108 diff --git a/host/libraries/libbladeRF_test/test_gain_calibration/example_measurements/tx_sweep_60_fine.csv b/host/libraries/libbladeRF_test/test_gain_calibration/example_measurements/tx_sweep_60_fine.csv new file mode 100644 index 00000000..f2ac0f5c --- /dev/null +++ b/host/libraries/libbladeRF_test/test_gain_calibration/example_measurements/tx_sweep_60_fine.csv @@ -0,0 +1,5937 @@ +Frequency (Hz),Power (dBm) target 0.00 +65000000,6.095180 +66000000,6.134825 +67000000,6.134475 +68000000,6.149721 +69000000,6.173798 +70000000,6.174324 +71000000,6.192856 +72000000,6.206735 +73000000,6.207562 +74000000,6.224237 +75000000,6.235372 +76000000,6.238180 +77000000,6.254482 +78000000,6.231552 +79000000,6.263179 +80000000,6.245930 +81000000,6.250209 +82000000,6.235735 +83000000,6.246389 +84000000,6.228948 +85000000,6.196385 +86000000,6.159401 +87000000,6.145507 +88000000,6.134266 +89000000,6.088015 +90000000,6.090806 +91000000,6.122921 +92000000,6.082475 +93000000,6.119954 +94000000,6.062070 +95000000,6.074687 +96000000,6.012952 +97000000,6.040717 +98000000,5.974099 +99000000,5.964278 +100000000,5.958210 +101000000,5.908811 +102000000,5.871531 +103000000,5.894210 +104000000,5.913200 +105000000,5.922883 +106000000,5.928870 +107000000,5.958634 +108000000,5.985472 +109000000,6.009648 +110000000,6.268659 +111000000,6.093931 +112000000,6.401894 +113000000,6.001730 +114000000,6.253098 +115000000,6.300369 +116000000,5.487619 +117000000,6.180229 +118000000,6.179742 +119000000,5.988515 +120000000,6.200720 +121000000,6.136935 +122000000,5.769738 +123000000,6.320447 +124000000,6.368327 +125000000,5.916337 +126000000,5.583113 +127000000,5.649484 +128000000,5.678639 +129000000,5.722863 +130000000,5.142885 +131000000,6.120243 +132000000,6.483933 +133000000,6.483067 +134000000,6.159434 +135000000,5.616882 +136000000,6.159491 +137000000,6.093743 +138000000,6.149823 +139000000,6.190628 +140000000,5.290653 +141000000,5.237770 +142000000,5.665444 +143000000,5.997650 +144000000,6.075734 +145000000,5.669076 +146000000,6.107027 +147000000,5.994604 +148000000,5.377302 +149000000,5.500758 +150000000,5.398358 +151000000,5.641650 +152000000,5.546554 +153000000,6.156270 +154000000,5.724666 +155000000,6.220493 +156000000,6.169183 +157000000,6.086481 +158000000,6.077215 +159000000,5.948016 +160000000,5.695058 +161000000,5.530112 +162000000,5.998820 +163000000,5.567463 +164000000,5.425029 +165000000,5.663456 +166000000,6.052933 +167000000,5.383109 +168000000,5.866548 +169000000,5.543086 +170000000,6.009529 +171000000,5.879372 +172000000,5.604723 +173000000,6.018096 +174000000,5.399407 +175000000,6.026539 +176000000,5.401800 +177000000,5.401101 +178000000,5.707199 +179000000,5.548560 +180000000,5.374239 +181000000,5.374235 +182000000,5.455093 +183000000,5.807650 +184000000,5.381843 +185000000,5.666472 +186000000,5.768215 +187000000,5.844796 +188000000,5.886905 +189000000,5.611002 +190000000,5.874671 +191000000,5.526523 +192000000,5.730986 +193000000,5.357332 +194000000,5.596204 +195000000,5.533214 +196000000,5.351596 +197000000,5.394820 +198000000,5.698002 +199000000,5.755638 +200000000,5.375691 +201000000,5.518420 +202000000,5.635077 +203000000,5.676420 +204000000,5.729866 +205000000,5.680953 +206000000,5.795653 +207000000,5.747205 +208000000,5.426494 +209000000,5.761891 +210000000,5.620619 +211000000,5.751639 +212000000,5.351452 +213000000,5.484294 +214000000,5.416379 +215000000,5.644864 +216000000,5.669087 +217000000,5.726552 +218000000,5.705423 +219000000,5.537065 +220000000,5.648707 +221000000,5.423139 +222000000,5.411500 +223000000,5.469301 +224000000,5.661745 +225000000,5.572792 +226000000,5.457317 +227000000,5.654307 +228000000,5.420251 +229000000,5.436475 +230000000,5.400839 +231000000,5.638664 +232000000,5.605632 +233000000,5.508640 +234000000,5.380642 +235000000,5.512546 +236000000,5.614465 +237000000,5.616067 +238000000,5.594652 +239000000,5.369440 +240000000,5.377533 +241000000,5.442570 +242000000,5.403628 +243000000,5.514000 +244000000,5.553468 +245000000,5.547902 +246000000,5.479371 +247000000,5.441247 +248000000,5.505889 +249000000,5.551378 +250000000,5.503985 +251000000,5.365997 +252000000,5.516103 +253000000,5.525590 +254000000,5.516694 +255000000,5.524133 +256000000,5.371720 +257000000,5.486146 +258000000,5.442027 +259000000,5.356020 +260000000,5.441216 +261000000,5.395360 +262000000,5.414155 +263000000,5.438969 +264000000,5.360837 +265000000,5.429720 +266000000,5.398807 +267000000,5.365925 +268000000,5.391313 +269000000,5.380422 +270000000,5.402050 +271000000,5.359681 +272000000,5.365106 +273000000,5.372299 +274000000,5.383783 +275000000,5.367542 +276000000,5.376436 +277000000,5.374507 +278000000,5.378484 +279000000,5.361108 +280000000,5.371661 +281000000,5.363446 +282000000,5.372701 +283000000,5.375801 +284000000,5.363026 +285000000,5.367331 +286000000,5.366874 +287000000,5.375962 +288000000,5.361092 +289000000,5.369115 +290000000,5.374130 +291000000,5.379733 +292000000,5.363400 +293000000,5.366697 +294000000,5.376306 +295000000,5.383379 +296000000,5.374761 +297000000,5.376551 +298000000,5.380909 +299000000,5.385176 +300000000,5.382308 +301000000,5.396382 +302000000,5.396268 +303000000,5.395373 +304000000,5.394305 +305000000,5.398045 +306000000,5.403039 +307000000,5.410289 +308000000,5.419222 +309000000,5.421275 +310000000,5.418436 +311000000,5.430134 +312000000,5.423794 +313000000,5.436474 +314000000,5.431373 +315000000,5.434791 +316000000,5.437852 +317000000,5.449310 +318000000,5.449032 +319000000,5.446579 +320000000,5.466875 +321000000,5.469825 +322000000,5.476727 +323000000,5.468405 +324000000,5.483843 +325000000,5.489185 +326000000,5.497939 +327000000,5.502474 +328000000,5.495173 +329000000,5.518411 +330000000,5.524215 +331000000,5.522345 +332000000,5.547043 +333000000,5.553570 +334000000,5.559629 +335000000,5.573233 +336000000,5.572371 +337000000,5.590152 +338000000,5.580391 +339000000,5.589493 +340000000,5.593047 +341000000,5.598430 +342000000,5.618530 +343000000,5.619436 +344000000,5.619012 +345000000,5.621475 +346000000,5.641455 +347000000,5.640986 +348000000,5.629028 +349000000,5.640821 +350000000,5.632279 +351000000,5.644645 +352000000,5.636469 +353000000,5.644394 +354000000,5.638584 +355000000,5.645518 +356000000,5.642269 +357000000,5.643367 +358000000,5.657517 +359000000,5.654381 +360000000,5.652515 +361000000,5.641505 +362000000,5.638202 +363000000,5.641867 +364000000,5.649856 +365000000,5.645965 +366000000,5.640808 +367000000,5.631485 +368000000,5.628940 +369000000,5.633746 +370000000,5.628425 +371000000,5.631017 +372000000,5.625671 +373000000,5.623276 +374000000,5.636743 +375000000,5.622975 +376000000,5.664051 +377000000,5.660060 +378000000,5.671695 +379000000,5.662841 +380000000,5.644893 +381000000,5.645672 +382000000,5.649279 +383000000,5.640231 +384000000,5.652255 +385000000,5.628315 +386000000,5.636936 +387000000,5.637112 +388000000,5.614889 +389000000,5.619618 +390000000,5.623898 +391000000,5.603803 +392000000,5.597704 +393000000,5.589379 +394000000,5.593376 +395000000,5.586609 +396000000,5.571018 +397000000,5.575780 +398000000,5.563721 +399000000,5.570771 +400000000,5.584794 +401000000,5.554487 +402000000,5.566178 +403000000,5.541044 +404000000,5.555970 +405000000,5.557481 +406000000,5.536551 +407000000,5.528389 +408000000,5.533159 +409000000,5.539707 +410000000,5.538481 +411000000,5.520307 +412000000,5.538468 +413000000,5.532610 +414000000,5.513591 +415000000,5.510803 +416000000,5.527138 +417000000,5.520904 +418000000,5.527296 +419000000,5.528252 +420000000,5.494914 +421000000,5.515848 +422000000,5.516086 +423000000,5.500311 +424000000,5.513512 +425000000,5.507677 +426000000,5.506662 +427000000,5.489768 +428000000,5.501982 +429000000,5.514167 +430000000,5.505387 +431000000,5.495756 +432000000,5.477826 +433000000,5.502875 +434000000,5.494428 +435000000,5.466270 +436000000,5.482256 +437000000,5.486428 +438000000,5.477788 +439000000,5.469792 +440000000,5.470141 +441000000,5.453335 +442000000,5.448118 +443000000,5.480833 +444000000,5.441069 +445000000,5.474019 +446000000,5.436793 +447000000,5.437008 +448000000,5.433073 +449000000,5.464124 +450000000,5.456298 +451000000,5.454992 +452000000,5.416357 +453000000,5.429364 +454000000,5.436689 +455000000,5.408851 +456000000,5.407014 +457000000,5.400272 +458000000,5.397317 +459000000,5.423534 +460000000,5.401330 +461000000,5.411947 +462000000,5.383045 +463000000,5.395978 +464000000,5.403415 +465000000,5.388908 +466000000,5.368720 +467000000,5.366164 +468000000,5.377649 +469000000,5.382532 +470000000,5.386413 +471000000,5.353440 +472000000,5.381462 +473000000,5.371396 +474000000,5.360009 +475000000,5.366942 +476000000,5.348418 +477000000,5.337352 +478000000,5.333592 +479000000,5.328712 +480000000,5.309973 +481000000,5.312553 +482000000,5.321452 +483000000,5.301036 +484000000,5.298664 +485000000,5.291638 +486000000,5.298887 +487000000,5.281650 +488000000,5.269982 +489000000,5.265529 +490000000,5.275010 +491000000,5.291850 +492000000,5.262118 +493000000,5.262765 +494000000,5.239742 +495000000,5.259594 +496000000,5.256395 +497000000,5.234461 +498000000,5.230326 +499000000,5.248649 +500000000,5.211623 +501000000,5.229493 +502000000,5.228179 +503000000,5.192105 +504000000,5.200077 +505000000,5.204984 +506000000,5.180459 +507000000,5.166309 +508000000,5.170252 +509000000,5.149395 +510000000,5.170286 +511000000,5.166379 +512000000,5.149236 +513000000,5.141641 +514000000,5.112365 +515000000,5.110657 +516000000,5.099440 +517000000,5.092476 +518000000,5.101600 +519000000,5.101465 +520000000,5.083305 +521000000,5.072221 +522000000,5.086961 +523000000,5.080109 +524000000,5.047744 +525000000,5.029326 +526000000,5.031174 +527000000,5.042887 +528000000,5.040438 +529000000,4.995321 +530000000,5.024227 +531000000,5.009883 +532000000,5.005738 +533000000,4.980390 +534000000,4.986372 +535000000,4.954238 +536000000,4.968211 +537000000,4.925040 +538000000,4.946406 +539000000,4.938799 +540000000,4.921826 +541000000,4.904523 +542000000,4.890541 +543000000,4.871457 +544000000,4.884665 +545000000,4.848776 +546000000,4.858262 +547000000,4.860029 +548000000,4.848921 +549000000,4.838482 +550000000,4.802601 +551000000,4.799634 +552000000,4.795170 +553000000,4.790852 +554000000,4.765708 +555000000,4.757058 +556000000,4.746296 +557000000,4.768166 +558000000,4.734704 +559000000,4.717711 +560000000,4.704825 +561000000,4.706570 +562000000,4.709025 +563000000,4.690345 +564000000,4.695394 +565000000,4.671633 +566000000,4.669555 +567000000,4.631514 +568000000,4.650125 +569000000,4.647530 +570000000,4.601871 +571000000,4.592520 +572000000,4.584185 +573000000,4.606034 +574000000,4.572810 +575000000,4.551290 +576000000,4.539650 +577000000,4.528735 +578000000,4.537796 +579000000,4.548794 +580000000,4.500671 +581000000,4.506051 +582000000,4.480665 +583000000,4.501547 +584000000,4.459285 +585000000,4.483185 +586000000,4.474808 +587000000,4.467397 +588000000,4.430464 +589000000,4.421555 +590000000,4.409814 +591000000,4.394714 +592000000,4.383173 +593000000,4.391426 +594000000,4.367557 +595000000,4.390712 +596000000,4.376734 +597000000,4.340836 +598000000,4.335090 +599000000,4.357698 +600000000,4.182336 +601000000,4.221098 +602000000,4.250075 +603000000,4.232288 +604000000,4.253258 +605000000,4.237882 +606000000,4.215424 +607000000,4.246911 +608000000,4.215836 +609000000,4.222097 +610000000,4.227542 +611000000,4.207090 +612000000,4.217631 +613000000,4.223104 +614000000,4.210111 +615000000,4.188691 +616000000,4.214344 +617000000,4.189269 +618000000,4.175667 +619000000,4.171903 +620000000,4.190107 +621000000,4.170401 +622000000,4.156794 +623000000,4.169266 +624000000,4.156491 +625000000,4.156386 +626000000,4.132551 +627000000,4.145051 +628000000,4.140612 +629000000,4.163196 +630000000,4.113592 +631000000,4.121226 +632000000,4.145895 +633000000,4.103040 +634000000,4.141544 +635000000,4.135638 +636000000,4.109189 +637000000,4.130648 +638000000,4.127586 +639000000,4.075877 +640000000,4.091664 +641000000,4.100845 +642000000,4.090876 +643000000,4.102380 +644000000,4.096380 +645000000,4.091047 +646000000,4.045899 +647000000,4.057692 +648000000,4.070696 +649000000,4.030880 +650000000,4.040151 +651000000,4.060155 +652000000,4.025256 +653000000,4.052817 +654000000,4.002775 +655000000,4.037176 +656000000,3.994166 +657000000,4.029149 +658000000,3.998491 +659000000,3.989184 +660000000,4.024487 +661000000,3.995831 +662000000,3.985903 +663000000,4.018513 +664000000,4.006644 +665000000,3.972591 +666000000,4.006261 +667000000,4.007444 +668000000,4.005068 +669000000,3.976993 +670000000,3.976047 +671000000,3.985841 +672000000,3.992114 +673000000,3.961916 +674000000,3.961535 +675000000,3.948446 +676000000,3.987293 +677000000,3.949000 +678000000,3.951202 +679000000,3.985461 +680000000,3.981004 +681000000,3.948194 +682000000,3.982320 +683000000,3.965671 +684000000,3.981828 +685000000,3.984564 +686000000,3.952969 +687000000,3.963812 +688000000,3.965338 +689000000,3.985847 +690000000,3.964502 +691000000,3.967762 +692000000,3.952538 +693000000,3.988824 +694000000,3.983547 +695000000,3.984482 +696000000,3.956444 +697000000,3.971978 +698000000,3.962099 +699000000,3.973718 +700000000,3.993649 +701000000,4.001308 +702000000,3.999294 +703000000,4.005499 +704000000,3.967023 +705000000,3.993062 +706000000,3.994415 +707000000,3.992996 +708000000,3.984643 +709000000,4.018038 +710000000,4.025907 +711000000,4.027197 +712000000,3.992565 +713000000,4.029291 +714000000,4.033762 +715000000,4.033960 +716000000,3.994057 +717000000,4.039954 +718000000,4.009048 +719000000,4.005143 +720000000,4.024530 +721000000,4.028260 +722000000,4.012467 +723000000,4.044321 +724000000,4.049591 +725000000,4.022028 +726000000,4.031561 +727000000,4.040858 +728000000,4.036152 +729000000,4.039484 +730000000,4.073208 +731000000,4.041359 +732000000,4.080058 +733000000,4.078547 +734000000,4.039404 +735000000,4.060757 +736000000,4.079734 +737000000,4.073784 +738000000,4.045038 +739000000,4.046566 +740000000,4.068535 +741000000,4.054281 +742000000,4.070990 +743000000,4.068831 +744000000,4.062821 +745000000,4.100331 +746000000,4.055694 +747000000,4.094509 +748000000,4.095297 +749000000,4.061257 +750000000,4.064231 +751000000,4.083055 +752000000,4.086364 +753000000,4.062392 +754000000,4.048106 +755000000,4.051464 +756000000,4.087170 +757000000,4.090951 +758000000,4.074911 +759000000,4.051620 +760000000,4.064263 +761000000,4.086233 +762000000,4.091304 +763000000,4.088328 +764000000,4.087171 +765000000,4.118617 +766000000,4.084018 +767000000,4.119496 +768000000,4.113736 +769000000,4.155989 +770000000,4.146665 +771000000,4.139695 +772000000,4.180371 +773000000,4.165676 +774000000,4.204027 +775000000,4.233269 +776000000,4.206842 +777000000,4.258096 +778000000,4.240094 +779000000,4.265571 +780000000,4.292155 +781000000,4.282790 +782000000,4.288457 +783000000,4.336256 +784000000,4.327702 +785000000,4.336095 +786000000,4.371720 +787000000,4.387178 +788000000,4.397091 +789000000,4.362090 +790000000,4.397543 +791000000,4.414233 +792000000,4.407052 +793000000,4.431084 +794000000,4.406460 +795000000,4.404160 +796000000,4.415593 +797000000,4.450750 +798000000,4.444016 +799000000,4.436647 +800000000,4.440641 +801000000,4.430109 +802000000,4.465538 +803000000,4.435222 +804000000,4.433816 +805000000,4.470015 +806000000,4.440829 +807000000,4.465854 +808000000,4.431057 +809000000,4.462058 +810000000,4.440511 +811000000,4.472966 +812000000,4.433439 +813000000,4.457224 +814000000,4.440129 +815000000,4.470574 +816000000,4.426402 +817000000,4.426128 +818000000,4.457293 +819000000,4.463145 +820000000,4.463224 +821000000,4.448601 +822000000,4.417720 +823000000,4.426724 +824000000,4.436673 +825000000,4.440655 +826000000,4.415958 +827000000,4.411304 +828000000,4.438965 +829000000,4.428884 +830000000,4.442483 +831000000,4.413099 +832000000,4.396485 +833000000,4.390318 +834000000,4.410958 +835000000,4.384955 +836000000,4.383085 +837000000,4.417763 +838000000,4.377141 +839000000,4.372205 +840000000,4.413932 +841000000,4.387236 +842000000,4.409601 +843000000,4.406989 +844000000,4.377877 +845000000,4.356751 +846000000,4.366720 +847000000,4.393267 +848000000,4.369606 +849000000,4.389465 +850000000,4.382856 +851000000,4.348481 +852000000,4.363488 +853000000,4.369960 +854000000,4.376947 +855000000,4.356055 +856000000,4.347359 +857000000,4.354789 +858000000,4.324026 +859000000,4.355214 +860000000,4.345587 +861000000,4.321745 +862000000,4.324715 +863000000,4.322675 +864000000,4.306499 +865000000,4.334839 +866000000,4.319018 +867000000,4.317852 +868000000,4.336237 +869000000,4.302056 +870000000,4.298691 +871000000,4.301998 +872000000,4.301105 +873000000,4.301259 +874000000,4.294702 +875000000,4.289532 +876000000,4.322692 +877000000,4.290892 +878000000,4.303319 +879000000,4.325871 +880000000,4.319713 +881000000,4.281543 +882000000,4.305619 +883000000,4.276394 +884000000,4.318348 +885000000,4.275716 +886000000,4.275215 +887000000,4.309988 +888000000,4.276911 +889000000,4.297385 +890000000,4.288712 +891000000,4.308539 +892000000,4.299835 +893000000,4.265989 +894000000,4.266263 +895000000,4.265075 +896000000,4.307920 +897000000,4.309085 +898000000,4.285371 +899000000,4.273709 +900000000,4.296747 +901000000,4.264297 +902000000,4.280555 +903000000,4.301953 +904000000,4.278227 +905000000,4.312096 +906000000,4.307381 +907000000,4.314074 +908000000,4.311381 +909000000,4.274806 +910000000,4.283719 +911000000,4.284039 +912000000,4.292693 +913000000,4.296296 +914000000,4.319002 +915000000,4.319043 +916000000,4.314547 +917000000,4.337873 +918000000,4.338958 +919000000,4.327800 +920000000,4.307168 +921000000,4.346395 +922000000,4.316651 +923000000,4.348884 +924000000,4.335315 +925000000,4.354139 +926000000,4.349200 +927000000,4.338523 +928000000,4.341804 +929000000,4.373032 +930000000,4.370111 +931000000,4.370790 +932000000,4.391081 +933000000,4.395745 +934000000,4.388426 +935000000,4.358200 +936000000,4.373972 +937000000,4.383647 +938000000,4.388720 +939000000,4.383194 +940000000,4.436757 +941000000,4.435705 +942000000,4.441277 +943000000,4.401411 +944000000,4.436770 +945000000,4.415250 +946000000,4.446643 +947000000,4.435612 +948000000,4.443255 +949000000,4.477236 +950000000,4.485695 +951000000,4.480898 +952000000,4.497795 +953000000,4.496741 +954000000,4.480580 +955000000,4.471830 +956000000,4.513853 +957000000,4.493329 +958000000,4.504426 +959000000,4.511053 +960000000,4.511371 +961000000,4.552393 +962000000,4.567866 +963000000,4.557602 +964000000,4.542418 +965000000,4.543780 +966000000,4.565497 +967000000,4.575009 +968000000,4.598432 +969000000,4.569756 +970000000,4.592278 +971000000,4.579204 +972000000,4.613980 +973000000,4.607734 +974000000,4.629886 +975000000,4.622672 +976000000,4.627124 +977000000,4.650099 +978000000,4.634895 +979000000,4.676913 +980000000,4.672935 +981000000,4.675663 +982000000,4.677997 +983000000,4.694796 +984000000,4.722924 +985000000,4.690516 +986000000,4.739394 +987000000,4.724514 +988000000,4.709799 +989000000,4.719967 +990000000,4.766731 +991000000,4.772317 +992000000,4.773419 +993000000,4.778899 +994000000,4.757266 +995000000,4.793665 +996000000,4.777394 +997000000,4.820253 +998000000,4.803094 +999000000,4.792067 +1000000000,4.608583 +1001000000,4.658913 +1002000000,4.654458 +1003000000,4.688184 +1004000000,4.719105 +1005000000,4.738833 +1006000000,4.736839 +1007000000,4.773062 +1008000000,4.748154 +1009000000,4.768506 +1010000000,4.775889 +1011000000,4.783689 +1012000000,4.799346 +1013000000,4.826010 +1014000000,4.853122 +1015000000,4.828050 +1016000000,4.835430 +1017000000,4.851803 +1018000000,4.880463 +1019000000,4.891783 +1020000000,4.888959 +1021000000,4.901740 +1022000000,4.919066 +1023000000,4.888186 +1024000000,4.906162 +1025000000,4.923923 +1026000000,4.917993 +1027000000,4.936176 +1028000000,4.959923 +1029000000,4.962371 +1030000000,4.937730 +1031000000,4.938138 +1032000000,4.988364 +1033000000,4.970926 +1034000000,4.962313 +1035000000,4.997365 +1036000000,4.987685 +1037000000,4.987727 +1038000000,4.973293 +1039000000,4.999002 +1040000000,4.991687 +1041000000,5.029942 +1042000000,5.010837 +1043000000,5.019472 +1044000000,5.029155 +1045000000,5.006852 +1046000000,5.017582 +1047000000,5.033103 +1048000000,5.045602 +1049000000,5.045101 +1050000000,5.039173 +1051000000,5.027297 +1052000000,5.034931 +1053000000,5.068491 +1054000000,5.049406 +1055000000,5.065986 +1056000000,5.049828 +1057000000,5.045390 +1058000000,5.052073 +1059000000,5.058873 +1060000000,5.052886 +1061000000,5.069691 +1062000000,5.062333 +1063000000,5.047817 +1064000000,5.080318 +1065000000,5.076231 +1066000000,5.070224 +1067000000,5.070553 +1068000000,5.054870 +1069000000,5.084000 +1070000000,5.069186 +1071000000,5.077480 +1072000000,5.081108 +1073000000,5.074661 +1074000000,5.067492 +1075000000,5.087665 +1076000000,5.076541 +1077000000,5.047691 +1078000000,5.066185 +1079000000,5.073092 +1080000000,5.086512 +1081000000,5.075855 +1082000000,5.068269 +1083000000,5.082691 +1084000000,5.083070 +1085000000,5.081707 +1086000000,5.045889 +1087000000,5.039861 +1088000000,5.038437 +1089000000,5.033178 +1090000000,5.036311 +1091000000,5.031328 +1092000000,5.062154 +1093000000,5.044675 +1094000000,5.059104 +1095000000,5.032792 +1096000000,5.021788 +1097000000,5.033127 +1098000000,5.023890 +1099000000,5.045544 +1100000000,5.017449 +1101000000,5.040693 +1102000000,5.035144 +1103000000,5.016075 +1104000000,4.986822 +1105000000,4.997873 +1106000000,5.000206 +1107000000,5.016496 +1108000000,4.996712 +1109000000,5.005433 +1110000000,4.991777 +1111000000,4.988727 +1112000000,4.968765 +1113000000,4.985619 +1114000000,4.948595 +1115000000,4.976441 +1116000000,4.973471 +1117000000,4.936724 +1118000000,4.938488 +1119000000,4.941698 +1120000000,4.930463 +1121000000,4.923063 +1122000000,4.904052 +1123000000,4.892515 +1124000000,4.915061 +1125000000,4.871751 +1126000000,4.873966 +1127000000,4.893671 +1128000000,4.887605 +1129000000,4.844383 +1130000000,4.858247 +1131000000,4.849784 +1132000000,4.812032 +1133000000,4.825706 +1134000000,4.795371 +1135000000,4.791002 +1136000000,4.810075 +1137000000,4.767918 +1138000000,4.783669 +1139000000,4.779480 +1140000000,4.743831 +1141000000,4.753735 +1142000000,4.743043 +1143000000,4.707572 +1144000000,4.717380 +1145000000,4.693199 +1146000000,4.666267 +1147000000,4.687208 +1148000000,4.642981 +1149000000,4.630583 +1150000000,4.644385 +1151000000,4.629128 +1152000000,4.579170 +1153000000,4.560765 +1154000000,4.575694 +1155000000,4.562592 +1156000000,4.550885 +1157000000,4.498737 +1158000000,4.501280 +1159000000,4.500968 +1160000000,4.463390 +1161000000,4.435414 +1162000000,4.452122 +1163000000,4.422997 +1164000000,4.383102 +1165000000,4.408650 +1166000000,4.357809 +1167000000,4.377894 +1168000000,4.330812 +1169000000,4.359789 +1170000000,4.352275 +1171000000,4.309827 +1172000000,4.318162 +1173000000,4.309287 +1174000000,4.305290 +1175000000,4.287917 +1176000000,4.302324 +1177000000,4.305975 +1178000000,4.311596 +1179000000,4.326897 +1180000000,4.318658 +1181000000,4.320551 +1182000000,4.306772 +1183000000,4.288271 +1184000000,4.295014 +1185000000,4.305210 +1186000000,4.296011 +1187000000,4.336402 +1188000000,4.310760 +1189000000,4.294507 +1190000000,4.297389 +1191000000,4.293680 +1192000000,4.291892 +1193000000,4.305950 +1194000000,4.320362 +1195000000,4.326528 +1196000000,4.323162 +1197000000,4.278152 +1198000000,4.308831 +1199000000,4.292415 +1200000000,4.303796 +1201000000,4.259664 +1202000000,4.260242 +1203000000,4.263156 +1204000000,4.257454 +1205000000,4.263199 +1206000000,4.270376 +1207000000,4.227073 +1208000000,4.206751 +1209000000,4.227212 +1210000000,4.190395 +1211000000,4.220046 +1212000000,4.223550 +1213000000,4.213232 +1214000000,4.188313 +1215000000,4.147841 +1216000000,4.185554 +1217000000,4.178337 +1218000000,4.133825 +1219000000,4.108945 +1220000000,4.144560 +1221000000,4.093921 +1222000000,4.078233 +1223000000,4.091267 +1224000000,4.048501 +1225000000,4.078745 +1226000000,4.042047 +1227000000,4.043124 +1228000000,3.994392 +1229000000,3.986033 +1230000000,4.017426 +1231000000,3.995641 +1232000000,3.952492 +1233000000,3.933164 +1234000000,3.910604 +1235000000,3.899671 +1236000000,3.931006 +1237000000,3.866534 +1238000000,3.855352 +1239000000,3.887340 +1240000000,3.839824 +1241000000,3.828564 +1242000000,3.814349 +1243000000,3.802688 +1244000000,3.805442 +1245000000,3.765108 +1246000000,3.763281 +1247000000,3.717297 +1248000000,3.747774 +1249000000,3.699183 +1250000000,3.673056 +1251000000,3.665066 +1252000000,3.675044 +1253000000,3.667139 +1254000000,3.605673 +1255000000,3.635368 +1256000000,3.573280 +1257000000,3.558988 +1258000000,3.553521 +1259000000,3.525936 +1260000000,3.514859 +1261000000,3.510780 +1262000000,3.512581 +1263000000,3.499151 +1264000000,3.482636 +1265000000,3.465782 +1266000000,3.404453 +1267000000,3.386753 +1268000000,3.382051 +1269000000,3.351693 +1270000000,3.377378 +1271000000,3.331748 +1272000000,3.341685 +1273000000,3.284556 +1274000000,3.265658 +1275000000,3.280758 +1276000000,3.235867 +1277000000,3.243419 +1278000000,3.233965 +1279000000,3.189302 +1280000000,3.202552 +1281000000,3.162613 +1282000000,3.167983 +1283000000,3.150950 +1284000000,3.092045 +1285000000,3.073433 +1286000000,3.068108 +1287000000,3.060329 +1288000000,3.046271 +1289000000,3.007581 +1290000000,3.008028 +1291000000,3.015718 +1292000000,2.954044 +1293000000,2.977547 +1294000000,2.952539 +1295000000,2.928132 +1296000000,2.930146 +1297000000,2.886643 +1298000000,2.862458 +1299000000,2.838795 +1300000000,2.824195 +1301000000,2.817444 +1302000000,2.825879 +1303000000,2.778611 +1304000000,2.778326 +1305000000,2.768520 +1306000000,2.753836 +1307000000,2.755685 +1308000000,2.695753 +1309000000,2.725644 +1310000000,2.664739 +1311000000,2.647467 +1312000000,2.632849 +1313000000,2.630703 +1314000000,2.651214 +1315000000,2.614502 +1316000000,2.621326 +1317000000,2.561060 +1318000000,2.561962 +1319000000,2.530699 +1320000000,2.552252 +1321000000,2.551104 +1322000000,2.498664 +1323000000,2.524089 +1324000000,2.466907 +1325000000,2.497334 +1326000000,2.485174 +1327000000,2.455145 +1328000000,2.430514 +1329000000,2.451649 +1330000000,2.433159 +1331000000,2.414300 +1332000000,2.385595 +1333000000,2.361417 +1334000000,2.394092 +1335000000,2.331283 +1336000000,2.361518 +1337000000,2.319785 +1338000000,2.326387 +1339000000,2.326263 +1340000000,2.281098 +1341000000,2.298828 +1342000000,2.309394 +1343000000,2.266921 +1344000000,2.254305 +1345000000,2.272721 +1346000000,2.269753 +1347000000,2.262409 +1348000000,2.249930 +1349000000,2.225135 +1350000000,2.185971 +1351000000,2.209633 +1352000000,2.200609 +1353000000,2.208769 +1354000000,2.148598 +1355000000,2.140672 +1356000000,2.188089 +1357000000,2.179878 +1358000000,2.162928 +1359000000,2.106621 +1360000000,2.154335 +1361000000,2.130756 +1362000000,2.133948 +1363000000,2.080294 +1364000000,2.078596 +1365000000,2.067881 +1366000000,2.080358 +1367000000,2.105177 +1368000000,2.045883 +1369000000,2.068995 +1370000000,2.054041 +1371000000,2.082483 +1372000000,2.021061 +1373000000,2.077786 +1374000000,2.029579 +1375000000,2.053888 +1376000000,2.054384 +1377000000,2.058168 +1378000000,1.991287 +1379000000,1.990940 +1380000000,2.008359 +1381000000,2.039765 +1382000000,2.024018 +1383000000,2.020158 +1384000000,1.966805 +1385000000,2.022881 +1386000000,2.019490 +1387000000,1.966664 +1388000000,1.991828 +1389000000,1.993491 +1390000000,2.005265 +1391000000,1.942940 +1392000000,1.948074 +1393000000,1.996770 +1394000000,1.978022 +1395000000,1.930159 +1396000000,1.977859 +1397000000,1.980282 +1398000000,1.972942 +1399000000,1.922602 +1400000000,1.977603 +1401000000,1.973831 +1402000000,1.920617 +1403000000,1.953994 +1404000000,1.946494 +1405000000,1.955210 +1406000000,1.951669 +1407000000,1.938522 +1408000000,1.954517 +1409000000,1.951953 +1410000000,1.908734 +1411000000,1.905956 +1412000000,1.928325 +1413000000,1.958193 +1414000000,1.924745 +1415000000,1.909079 +1416000000,1.959654 +1417000000,1.945792 +1418000000,1.936362 +1419000000,1.953422 +1420000000,1.920422 +1421000000,1.951366 +1422000000,1.929278 +1423000000,1.937073 +1424000000,1.942466 +1425000000,1.922256 +1426000000,1.897032 +1427000000,1.948086 +1428000000,1.883499 +1429000000,1.886808 +1430000000,1.943305 +1431000000,1.896173 +1432000000,1.899103 +1433000000,1.894019 +1434000000,1.944719 +1435000000,1.893973 +1436000000,1.897594 +1437000000,1.928968 +1438000000,1.926857 +1439000000,1.871880 +1440000000,1.931313 +1441000000,1.927489 +1442000000,1.904722 +1443000000,1.898747 +1444000000,1.880622 +1445000000,1.902000 +1446000000,1.896817 +1447000000,1.870906 +1448000000,1.911926 +1449000000,1.893886 +1450000000,1.891003 +1451000000,1.893258 +1452000000,1.851530 +1453000000,1.887395 +1454000000,1.841034 +1455000000,1.878564 +1456000000,1.880879 +1457000000,1.829382 +1458000000,1.821307 +1459000000,1.858461 +1460000000,1.832928 +1461000000,1.858724 +1462000000,1.829296 +1463000000,1.861506 +1464000000,1.793639 +1465000000,1.832433 +1466000000,1.810094 +1467000000,1.783013 +1468000000,1.819803 +1469000000,1.777628 +1470000000,1.806167 +1471000000,1.824694 +1472000000,1.810838 +1473000000,1.769036 +1474000000,1.741448 +1475000000,1.791691 +1476000000,1.734026 +1477000000,1.736752 +1478000000,1.747347 +1479000000,1.707403 +1480000000,1.702874 +1481000000,1.761858 +1482000000,1.745551 +1483000000,1.748823 +1484000000,1.735948 +1485000000,1.680612 +1486000000,1.696481 +1487000000,1.651541 +1488000000,1.669903 +1489000000,1.638071 +1490000000,1.646915 +1491000000,1.683141 +1492000000,1.620043 +1493000000,1.596459 +1494000000,1.632954 +1495000000,1.633659 +1496000000,1.585726 +1497000000,1.585502 +1498000000,1.581941 +1499000000,1.578868 +1500000000,1.570455 +1501000000,1.484661 +1502000000,1.517632 +1503000000,1.448331 +1504000000,1.432576 +1505000000,1.422193 +1506000000,1.432773 +1507000000,1.399450 +1508000000,1.432744 +1509000000,1.438856 +1510000000,1.433156 +1511000000,1.365037 +1512000000,1.348033 +1513000000,1.399199 +1514000000,1.384133 +1515000000,1.356111 +1516000000,1.368092 +1517000000,1.312998 +1518000000,1.283807 +1519000000,1.271813 +1520000000,1.288828 +1521000000,1.290985 +1522000000,1.296993 +1523000000,1.269888 +1524000000,1.231800 +1525000000,1.200029 +1526000000,1.242611 +1527000000,1.174528 +1528000000,1.225409 +1529000000,1.179440 +1530000000,1.186716 +1531000000,1.129591 +1532000000,1.183899 +1533000000,1.157841 +1534000000,1.097237 +1535000000,1.101925 +1536000000,1.136116 +1537000000,1.075654 +1538000000,1.047378 +1539000000,1.034803 +1540000000,1.036511 +1541000000,1.038619 +1542000000,1.005561 +1543000000,1.036479 +1544000000,1.042744 +1545000000,1.001053 +1546000000,0.975525 +1547000000,0.959961 +1548000000,0.987361 +1549000000,0.942801 +1550000000,0.958359 +1551000000,0.947516 +1552000000,0.946646 +1553000000,0.897714 +1554000000,0.922945 +1555000000,0.915708 +1556000000,0.854208 +1557000000,0.888749 +1558000000,0.882562 +1559000000,0.850547 +1560000000,0.849664 +1561000000,0.850306 +1562000000,0.772604 +1563000000,0.772078 +1564000000,0.756227 +1565000000,0.746960 +1566000000,0.795569 +1567000000,0.790477 +1568000000,0.776930 +1569000000,0.770630 +1570000000,0.704672 +1571000000,0.754417 +1572000000,0.740936 +1573000000,0.692589 +1574000000,0.723647 +1575000000,0.651564 +1576000000,0.700827 +1577000000,0.648306 +1578000000,0.695734 +1579000000,0.683587 +1580000000,0.608936 +1581000000,0.662185 +1582000000,0.663343 +1583000000,0.623679 +1584000000,0.650213 +1585000000,0.593168 +1586000000,0.634205 +1587000000,0.623683 +1588000000,0.582744 +1589000000,0.573320 +1590000000,0.594328 +1591000000,0.553647 +1592000000,0.539067 +1593000000,0.590692 +1594000000,0.512867 +1595000000,0.574008 +1596000000,0.529526 +1597000000,0.505313 +1598000000,0.524451 +1599000000,0.524333 +1600000000,0.502644 +1601000000,0.172800 +1602000000,0.224211 +1603000000,0.259849 +1604000000,0.263792 +1605000000,0.322588 +1606000000,0.333158 +1607000000,0.332091 +1608000000,0.326961 +1609000000,0.325074 +1610000000,0.371190 +1611000000,0.364136 +1612000000,0.342351 +1613000000,0.326156 +1614000000,0.369851 +1615000000,0.308765 +1616000000,0.318011 +1617000000,0.388583 +1618000000,0.373405 +1619000000,0.324245 +1620000000,0.348785 +1621000000,0.332331 +1622000000,0.394966 +1623000000,0.316885 +1624000000,0.394548 +1625000000,0.324038 +1626000000,0.326522 +1627000000,0.388208 +1628000000,0.323973 +1629000000,0.404325 +1630000000,0.387128 +1631000000,0.400648 +1632000000,0.381304 +1633000000,0.412174 +1634000000,0.332615 +1635000000,0.414867 +1636000000,0.389616 +1637000000,0.366758 +1638000000,0.387234 +1639000000,0.391599 +1640000000,0.372274 +1641000000,0.419053 +1642000000,0.382931 +1643000000,0.402466 +1644000000,0.400030 +1645000000,0.434998 +1646000000,0.440263 +1647000000,0.368424 +1648000000,0.378439 +1649000000,0.436965 +1650000000,0.458184 +1651000000,0.383533 +1652000000,0.393826 +1653000000,0.446590 +1654000000,0.458423 +1655000000,0.407924 +1656000000,0.478710 +1657000000,0.468001 +1658000000,0.438573 +1659000000,0.505088 +1660000000,0.521156 +1661000000,0.509626 +1662000000,0.526264 +1663000000,0.485445 +1664000000,0.529047 +1665000000,0.499117 +1666000000,0.511244 +1667000000,0.499323 +1668000000,0.559447 +1669000000,0.517096 +1670000000,0.585190 +1671000000,0.585268 +1672000000,0.594889 +1673000000,0.575859 +1674000000,0.576060 +1675000000,0.588669 +1676000000,0.584393 +1677000000,0.659553 +1678000000,0.617708 +1679000000,0.660844 +1680000000,0.659346 +1681000000,0.692525 +1682000000,0.641654 +1683000000,0.664340 +1684000000,0.693240 +1685000000,0.688913 +1686000000,0.727434 +1687000000,0.693950 +1688000000,0.762258 +1689000000,0.750981 +1690000000,0.738925 +1691000000,0.785431 +1692000000,0.805590 +1693000000,0.753985 +1694000000,0.791920 +1695000000,0.845656 +1696000000,0.789405 +1697000000,0.837768 +1698000000,0.846130 +1699000000,0.825814 +1700000000,0.857106 +1701000000,0.847215 +1702000000,0.860097 +1703000000,0.874297 +1704000000,0.898440 +1705000000,0.906096 +1706000000,0.904958 +1707000000,0.929314 +1708000000,0.989785 +1709000000,0.943428 +1710000000,1.018103 +1711000000,1.010725 +1712000000,0.979695 +1713000000,1.046046 +1714000000,1.003855 +1715000000,1.033593 +1716000000,1.094087 +1717000000,1.101253 +1718000000,1.069343 +1719000000,1.072207 +1720000000,1.109421 +1721000000,1.135544 +1722000000,1.113661 +1723000000,1.119757 +1724000000,1.158811 +1725000000,1.149488 +1726000000,1.164524 +1727000000,1.223136 +1728000000,1.188585 +1729000000,1.237783 +1730000000,1.240761 +1731000000,1.281612 +1732000000,1.244748 +1733000000,1.278467 +1734000000,1.270927 +1735000000,1.303225 +1736000000,1.316711 +1737000000,1.356574 +1738000000,1.358299 +1739000000,1.392709 +1740000000,1.409167 +1741000000,1.402884 +1742000000,1.398382 +1743000000,1.447742 +1744000000,1.450662 +1745000000,1.465769 +1746000000,1.473312 +1747000000,1.489977 +1748000000,1.471106 +1749000000,1.469376 +1750000000,1.517033 +1751000000,1.495656 +1752000000,1.560601 +1753000000,1.513068 +1754000000,1.530234 +1755000000,1.561030 +1756000000,1.570299 +1757000000,1.556827 +1758000000,1.614137 +1759000000,1.563912 +1760000000,1.573185 +1761000000,1.618126 +1762000000,1.591749 +1763000000,1.613509 +1764000000,1.670889 +1765000000,1.671574 +1766000000,1.643966 +1767000000,1.667943 +1768000000,1.707272 +1769000000,1.678822 +1770000000,1.661855 +1771000000,1.722024 +1772000000,1.692819 +1773000000,1.686892 +1774000000,1.745003 +1775000000,1.770560 +1776000000,1.775224 +1777000000,1.730259 +1778000000,1.768456 +1779000000,1.775587 +1780000000,1.809440 +1781000000,1.761710 +1782000000,1.794805 +1783000000,1.838999 +1784000000,1.848508 +1785000000,1.841230 +1786000000,1.819438 +1787000000,1.841408 +1788000000,1.831913 +1789000000,1.892465 +1790000000,1.887389 +1791000000,1.901966 +1792000000,1.907946 +1793000000,1.914127 +1794000000,1.875880 +1795000000,1.936935 +1796000000,1.898392 +1797000000,1.944402 +1798000000,1.946727 +1799000000,1.971620 +1800000000,1.937092 +1801000000,1.995227 +1802000000,1.940385 +1803000000,2.001392 +1804000000,1.992090 +1805000000,2.018153 +1806000000,2.029369 +1807000000,2.034774 +1808000000,1.976194 +1809000000,2.043805 +1810000000,2.052449 +1811000000,2.061363 +1812000000,2.051255 +1813000000,2.056652 +1814000000,2.048246 +1815000000,2.025489 +1816000000,2.029811 +1817000000,2.057307 +1818000000,2.055031 +1819000000,2.085184 +1820000000,2.070031 +1821000000,2.118918 +1822000000,2.119482 +1823000000,2.105473 +1824000000,2.119779 +1825000000,2.121403 +1826000000,2.105915 +1827000000,2.156738 +1828000000,2.133388 +1829000000,2.102812 +1830000000,2.107280 +1831000000,2.174961 +1832000000,2.173470 +1833000000,2.121357 +1834000000,2.127686 +1835000000,2.147879 +1836000000,2.158871 +1837000000,2.202147 +1838000000,2.190237 +1839000000,2.201798 +1840000000,2.183423 +1841000000,2.188656 +1842000000,2.200759 +1843000000,2.232556 +1844000000,2.189400 +1845000000,2.188594 +1846000000,2.185525 +1847000000,2.245205 +1848000000,2.214078 +1849000000,2.253610 +1850000000,2.196606 +1851000000,2.208727 +1852000000,2.231923 +1853000000,2.269547 +1854000000,2.264066 +1855000000,2.212931 +1856000000,2.283685 +1857000000,2.252923 +1858000000,2.260226 +1859000000,2.231085 +1860000000,2.232133 +1861000000,2.239396 +1862000000,2.248559 +1863000000,2.258316 +1864000000,2.313432 +1865000000,2.317676 +1866000000,2.299606 +1867000000,2.293871 +1868000000,2.316538 +1869000000,2.311284 +1870000000,2.278096 +1871000000,2.273479 +1872000000,2.274505 +1873000000,2.282360 +1874000000,2.346630 +1875000000,2.298888 +1876000000,2.327871 +1877000000,2.292095 +1878000000,2.327352 +1879000000,2.299141 +1880000000,2.301900 +1881000000,2.351410 +1882000000,2.337364 +1883000000,2.368095 +1884000000,2.331893 +1885000000,2.361676 +1886000000,2.385335 +1887000000,2.344759 +1888000000,2.369452 +1889000000,2.369966 +1890000000,2.340397 +1891000000,2.366649 +1892000000,2.378278 +1893000000,2.372369 +1894000000,2.381274 +1895000000,2.351547 +1896000000,2.385512 +1897000000,2.418311 +1898000000,2.373720 +1899000000,2.422166 +1900000000,2.394427 +1901000000,2.406383 +1902000000,2.386295 +1903000000,2.434168 +1904000000,2.399837 +1905000000,2.444651 +1906000000,2.406669 +1907000000,2.414689 +1908000000,2.434367 +1909000000,2.443212 +1910000000,2.434219 +1911000000,2.452396 +1912000000,2.406244 +1913000000,2.465489 +1914000000,2.418454 +1915000000,2.406667 +1916000000,2.414859 +1917000000,2.457563 +1918000000,2.470092 +1919000000,2.477436 +1920000000,2.449610 +1921000000,2.465765 +1922000000,2.479378 +1923000000,2.438563 +1924000000,2.431389 +1925000000,2.430166 +1926000000,2.432151 +1927000000,2.441795 +1928000000,2.446903 +1929000000,2.472821 +1930000000,2.500268 +1931000000,2.448299 +1932000000,2.441448 +1933000000,2.490467 +1934000000,2.491151 +1935000000,2.497390 +1936000000,2.449570 +1937000000,2.493595 +1938000000,2.491804 +1939000000,2.476310 +1940000000,2.464023 +1941000000,2.498786 +1942000000,2.507700 +1943000000,2.497018 +1944000000,2.490704 +1945000000,2.490889 +1946000000,2.495354 +1947000000,2.494689 +1948000000,2.464195 +1949000000,2.474574 +1950000000,2.472515 +1951000000,2.490106 +1952000000,2.467182 +1953000000,2.497494 +1954000000,2.496622 +1955000000,2.478874 +1956000000,2.461428 +1957000000,2.507639 +1958000000,2.509442 +1959000000,2.481122 +1960000000,2.463597 +1961000000,2.470137 +1962000000,2.467858 +1963000000,2.512814 +1964000000,2.476755 +1965000000,2.509675 +1966000000,2.467935 +1967000000,2.508409 +1968000000,2.461016 +1969000000,2.502685 +1970000000,2.456474 +1971000000,2.454580 +1972000000,2.486881 +1973000000,2.469051 +1974000000,2.437508 +1975000000,2.450671 +1976000000,2.447258 +1977000000,2.479526 +1978000000,2.466024 +1979000000,2.445804 +1980000000,2.442672 +1981000000,2.428863 +1982000000,2.472863 +1983000000,2.467444 +1984000000,2.463759 +1985000000,2.436854 +1986000000,2.409669 +1987000000,2.416492 +1988000000,2.449625 +1989000000,2.396960 +1990000000,2.427264 +1991000000,2.415950 +1992000000,2.373787 +1993000000,2.425797 +1994000000,2.355220 +1995000000,2.373084 +1996000000,2.375967 +1997000000,2.340869 +1998000000,2.362194 +1999000000,2.379292 +2000000000,2.358154 +2001000000,2.362530 +2002000000,2.339417 +2003000000,2.354245 +2004000000,2.353254 +2005000000,2.297747 +2006000000,2.305918 +2007000000,2.283274 +2008000000,2.259154 +2009000000,2.285217 +2010000000,2.248160 +2011000000,2.252127 +2012000000,2.271128 +2013000000,2.275843 +2014000000,2.216230 +2015000000,2.215291 +2016000000,2.180535 +2017000000,2.221703 +2018000000,2.219715 +2019000000,2.213237 +2020000000,2.205963 +2021000000,2.196636 +2022000000,2.158886 +2023000000,2.166882 +2024000000,2.129428 +2025000000,2.128766 +2026000000,2.121203 +2027000000,2.077780 +2028000000,2.119274 +2029000000,2.046876 +2030000000,2.064010 +2031000000,2.048989 +2032000000,2.053750 +2033000000,1.990220 +2034000000,1.975019 +2035000000,2.002234 +2036000000,2.004306 +2037000000,1.938511 +2038000000,1.921574 +2039000000,1.915220 +2040000000,1.893667 +2041000000,1.942346 +2042000000,1.935128 +2043000000,1.901113 +2044000000,1.853654 +2045000000,1.893253 +2046000000,1.823448 +2047000000,1.840568 +2048000000,1.834040 +2049000000,1.796381 +2050000000,1.762071 +2051000000,1.736798 +2052000000,1.798629 +2053000000,1.708222 +2054000000,1.694921 +2055000000,1.717971 +2056000000,1.733996 +2057000000,1.652150 +2058000000,1.681829 +2059000000,1.649337 +2060000000,1.626508 +2061000000,1.641546 +2062000000,1.580130 +2063000000,1.574666 +2064000000,1.619073 +2065000000,1.554363 +2066000000,1.523227 +2067000000,1.529384 +2068000000,1.496649 +2069000000,1.538154 +2070000000,1.522022 +2071000000,1.471540 +2072000000,1.475189 +2073000000,1.446015 +2074000000,1.410735 +2075000000,1.445917 +2076000000,1.422543 +2077000000,1.398158 +2078000000,1.423721 +2079000000,1.341573 +2080000000,1.349012 +2081000000,1.323469 +2082000000,1.369015 +2083000000,1.342505 +2084000000,1.342831 +2085000000,1.288736 +2086000000,1.309673 +2087000000,1.274269 +2088000000,1.230910 +2089000000,1.211943 +2090000000,1.199482 +2091000000,1.205274 +2092000000,1.227358 +2093000000,1.199874 +2094000000,1.151188 +2095000000,1.195106 +2096000000,1.139930 +2097000000,1.125169 +2098000000,1.164401 +2099000000,1.092364 +2100000000,1.100106 +2101000000,1.123257 +2102000000,1.086222 +2103000000,1.087403 +2104000000,1.055939 +2105000000,1.029823 +2106000000,1.036360 +2107000000,1.021338 +2108000000,0.983535 +2109000000,0.973217 +2110000000,0.966389 +2111000000,0.943719 +2112000000,0.933980 +2113000000,0.920109 +2114000000,0.978136 +2115000000,0.912768 +2116000000,0.889488 +2117000000,0.869912 +2118000000,0.924109 +2119000000,0.892840 +2120000000,0.845260 +2121000000,0.832554 +2122000000,0.808590 +2123000000,0.856565 +2124000000,0.847040 +2125000000,0.790865 +2126000000,0.750682 +2127000000,0.742394 +2128000000,0.731168 +2129000000,0.762288 +2130000000,0.698259 +2131000000,0.703002 +2132000000,0.715946 +2133000000,0.682035 +2134000000,0.703637 +2135000000,0.641140 +2136000000,0.663165 +2137000000,0.664940 +2138000000,0.651808 +2139000000,0.562857 +2140000000,0.558112 +2141000000,0.554290 +2142000000,0.525538 +2143000000,0.580144 +2144000000,0.504436 +2145000000,0.499479 +2146000000,0.461019 +2147000000,0.504029 +2148000000,0.504473 +2149000000,0.484153 +2150000000,0.468693 +2151000000,0.400444 +2152000000,0.387540 +2153000000,0.427407 +2154000000,0.412253 +2155000000,0.343311 +2156000000,0.346820 +2157000000,0.299427 +2158000000,0.326079 +2159000000,0.260180 +2160000000,0.235517 +2161000000,0.281585 +2162000000,0.209188 +2163000000,0.271905 +2164000000,0.168050 +2165000000,0.223549 +2166000000,0.204283 +2167000000,0.167470 +2168000000,0.164475 +2169000000,0.143064 +2170000000,0.155482 +2171000000,0.054414 +2172000000,0.097449 +2173000000,0.055134 +2174000000,0.004629 +2175000000,0.053287 +2176000000,0.030681 +2177000000,0.009539 +2178000000,0.020490 +2179000000,-0.078022 +2180000000,-0.100444 +2181000000,-0.098190 +2182000000,-0.059043 +2183000000,-0.117498 +2184000000,-0.076163 +2185000000,-0.153478 +2186000000,-0.124145 +2187000000,-0.175771 +2188000000,-0.216746 +2189000000,-0.253966 +2190000000,-0.268191 +2191000000,-0.291113 +2192000000,-0.227840 +2193000000,-0.233885 +2194000000,-0.332911 +2195000000,-0.359386 +2196000000,-0.296254 +2197000000,-0.326950 +2198000000,-0.404753 +2199000000,-0.373464 +2200000000,-0.398633 +2201000000,-0.378313 +2202000000,-0.477360 +2203000000,-0.408863 +2204000000,-0.495961 +2205000000,-0.458813 +2206000000,-0.517439 +2207000000,-0.527818 +2208000000,-0.536827 +2209000000,-0.511320 +2210000000,-0.528137 +2211000000,-0.635755 +2212000000,-0.653461 +2213000000,-0.579692 +2214000000,-0.676742 +2215000000,-0.676622 +2216000000,-0.639383 +2217000000,-0.652012 +2218000000,-0.676030 +2219000000,-0.718106 +2220000000,-0.706293 +2221000000,-0.720419 +2222000000,-0.799018 +2223000000,-0.794156 +2224000000,-0.859584 +2225000000,-0.835077 +2226000000,-0.816660 +2227000000,-0.900541 +2228000000,-0.926378 +2229000000,-0.869400 +2230000000,-0.921891 +2231000000,-0.978148 +2232000000,-0.990226 +2233000000,-0.931460 +2234000000,-1.021067 +2235000000,-1.033081 +2236000000,-1.043302 +2237000000,-1.077050 +2238000000,-1.084530 +2239000000,-1.116126 +2240000000,-1.120868 +2241000000,-1.082566 +2242000000,-1.097971 +2243000000,-1.146876 +2244000000,-1.118185 +2245000000,-1.134887 +2246000000,-1.218810 +2247000000,-1.205871 +2248000000,-1.261958 +2249000000,-1.266574 +2250000000,-1.219584 +2251000000,-1.314864 +2252000000,-1.329618 +2253000000,-1.348240 +2254000000,-1.294284 +2255000000,-1.376623 +2256000000,-1.316826 +2257000000,-1.339940 +2258000000,-1.368665 +2259000000,-1.400338 +2260000000,-1.401818 +2261000000,-1.478818 +2262000000,-1.437008 +2263000000,-1.435267 +2264000000,-1.524297 +2265000000,-1.467186 +2266000000,-1.534193 +2267000000,-1.513552 +2268000000,-1.576390 +2269000000,-1.605126 +2270000000,-1.542457 +2271000000,-1.609650 +2272000000,-1.602450 +2273000000,-1.591477 +2274000000,-1.612456 +2275000000,-1.645445 +2276000000,-1.695017 +2277000000,-1.649208 +2278000000,-1.730556 +2279000000,-1.758417 +2280000000,-1.772579 +2281000000,-1.744606 +2282000000,-1.789695 +2283000000,-1.781653 +2284000000,-1.788334 +2285000000,-1.801168 +2286000000,-1.863034 +2287000000,-1.880558 +2288000000,-1.867557 +2289000000,-1.860465 +2290000000,-1.840701 +2291000000,-1.885359 +2292000000,-1.922970 +2293000000,-1.887214 +2294000000,-1.947135 +2295000000,-1.969206 +2296000000,-1.984548 +2297000000,-1.973352 +2298000000,-1.956438 +2299000000,-1.967747 +2300000000,-2.029959 +2301000000,-2.059155 +2302000000,-2.079907 +2303000000,-2.085762 +2304000000,-2.030301 +2305000000,-2.127212 +2306000000,-2.134513 +2307000000,-2.133468 +2308000000,-2.106163 +2309000000,-2.091488 +2310000000,-2.140636 +2311000000,-2.113547 +2312000000,-2.164931 +2313000000,-2.185788 +2314000000,-2.150134 +2315000000,-2.211713 +2316000000,-2.192558 +2317000000,-2.231691 +2318000000,-2.192454 +2319000000,-2.261974 +2320000000,-2.309716 +2321000000,-2.292512 +2322000000,-2.317219 +2323000000,-2.332060 +2324000000,-2.270432 +2325000000,-2.274202 +2326000000,-2.372238 +2327000000,-2.289839 +2328000000,-2.352798 +2329000000,-2.343863 +2330000000,-2.346347 +2331000000,-2.334930 +2332000000,-2.428100 +2333000000,-2.347990 +2334000000,-2.382730 +2335000000,-2.407950 +2336000000,-2.457079 +2337000000,-2.490293 +2338000000,-2.491219 +2339000000,-2.450023 +2340000000,-2.514378 +2341000000,-2.515045 +2342000000,-2.444000 +2343000000,-2.487759 +2344000000,-2.461190 +2345000000,-2.549289 +2346000000,-2.478697 +2347000000,-2.477800 +2348000000,-2.501548 +2349000000,-2.499713 +2350000000,-2.510732 +2351000000,-2.584120 +2352000000,-2.619141 +2353000000,-2.534350 +2354000000,-2.648606 +2355000000,-2.598815 +2356000000,-2.567819 +2357000000,-2.669865 +2358000000,-2.635196 +2359000000,-2.577381 +2360000000,-2.696007 +2361000000,-2.701900 +2362000000,-2.604258 +2363000000,-2.711480 +2364000000,-2.708953 +2365000000,-2.679512 +2366000000,-2.638578 +2367000000,-2.742382 +2368000000,-2.670999 +2369000000,-2.675612 +2370000000,-2.759154 +2371000000,-2.748147 +2372000000,-2.781562 +2373000000,-2.742748 +2374000000,-2.763110 +2375000000,-2.691568 +2376000000,-2.789448 +2377000000,-2.738486 +2378000000,-2.707647 +2379000000,-2.802869 +2380000000,-2.749062 +2381000000,-2.767271 +2382000000,-2.769235 +2383000000,-2.846031 +2384000000,-2.844815 +2385000000,-2.800195 +2386000000,-2.761757 +2387000000,-2.767257 +2388000000,-2.856048 +2389000000,-2.779738 +2390000000,-2.790659 +2391000000,-2.877091 +2392000000,-2.797905 +2393000000,-2.807441 +2394000000,-2.811164 +2395000000,-2.810694 +2396000000,-2.922313 +2397000000,-2.828058 +2398000000,-2.881580 +2399000000,-2.930744 +2400000000,-2.859680 +2401000000,-2.927225 +2402000000,-2.903341 +2403000000,-2.906239 +2404000000,-2.895355 +2405000000,-2.944822 +2406000000,-2.860193 +2407000000,-2.890821 +2408000000,-2.942665 +2409000000,-2.891023 +2410000000,-2.976178 +2411000000,-2.968396 +2412000000,-3.001291 +2413000000,-2.892533 +2414000000,-3.001049 +2415000000,-2.935849 +2416000000,-2.897484 +2417000000,-2.906552 +2418000000,-2.945467 +2419000000,-2.919313 +2420000000,-3.031575 +2421000000,-3.001477 +2422000000,-3.014922 +2423000000,-2.955027 +2424000000,-2.977832 +2425000000,-2.981072 +2426000000,-2.981401 +2427000000,-2.934212 +2428000000,-2.935351 +2429000000,-3.019314 +2430000000,-3.005988 +2431000000,-2.958269 +2432000000,-3.075236 +2433000000,-3.075465 +2434000000,-2.967550 +2435000000,-2.983256 +2436000000,-2.965555 +2437000000,-2.961136 +2438000000,-3.090823 +2439000000,-3.047295 +2440000000,-3.087615 +2441000000,-2.995626 +2442000000,-3.006292 +2443000000,-3.071164 +2444000000,-3.093736 +2445000000,-3.102951 +2446000000,-3.096553 +2447000000,-3.030302 +2448000000,-2.993906 +2449000000,-3.021124 +2450000000,-3.005634 +2451000000,-3.067208 +2452000000,-2.997650 +2453000000,-3.114239 +2454000000,-3.089800 +2455000000,-3.053435 +2456000000,-3.008425 +2457000000,-3.117312 +2458000000,-2.999564 +2459000000,-3.110926 +2460000000,-3.005958 +2461000000,-3.044043 +2462000000,-2.998700 +2463000000,-2.998108 +2464000000,-3.071625 +2465000000,-3.065536 +2466000000,-3.034787 +2467000000,-3.111856 +2468000000,-3.120857 +2469000000,-3.120319 +2470000000,-3.118827 +2471000000,-3.050621 +2472000000,-3.090634 +2473000000,-3.062262 +2474000000,-3.001270 +2475000000,-2.999782 +2476000000,-3.041439 +2477000000,-3.114010 +2478000000,-3.061054 +2479000000,-3.109008 +2480000000,-3.094959 +2481000000,-3.102934 +2482000000,-3.075862 +2483000000,-3.114418 +2484000000,-3.022182 +2485000000,-3.025396 +2486000000,-3.112457 +2487000000,-2.991576 +2488000000,-3.007099 +2489000000,-3.079770 +2490000000,-3.089515 +2491000000,-3.051981 +2492000000,-3.067793 +2493000000,-3.092192 +2494000000,-2.995481 +2495000000,-3.103578 +2496000000,-3.092938 +2497000000,-3.017035 +2498000000,-3.078287 +2499000000,-2.983071 +2500000000,-3.060135 +2501000000,-3.062112 +2502000000,-3.056410 +2503000000,-2.979556 +2504000000,-2.989737 +2505000000,-3.034682 +2506000000,-2.972870 +2507000000,-3.068342 +2508000000,-2.969691 +2509000000,-3.058509 +2510000000,-3.015075 +2511000000,-3.008416 +2512000000,-3.035006 +2513000000,-3.055616 +2514000000,-2.998919 +2515000000,-2.975837 +2516000000,-3.063473 +2517000000,-3.066614 +2518000000,-2.955513 +2519000000,-3.000715 +2520000000,-3.056485 +2521000000,-2.955982 +2522000000,-3.011063 +2523000000,-2.945929 +2524000000,-2.956598 +2525000000,-2.968813 +2526000000,-3.035074 +2527000000,-3.025933 +2528000000,-2.938084 +2529000000,-3.005888 +2530000000,-2.952774 +2531000000,-2.979861 +2532000000,-2.950256 +2533000000,-2.976277 +2534000000,-3.033539 +2535000000,-2.971421 +2536000000,-2.924685 +2537000000,-2.970782 +2538000000,-2.997345 +2539000000,-2.972505 +2540000000,-3.018848 +2541000000,-2.924387 +2542000000,-3.009829 +2543000000,-2.973008 +2544000000,-2.907217 +2545000000,-2.909767 +2546000000,-2.957994 +2547000000,-2.911389 +2548000000,-2.922499 +2549000000,-2.921087 +2550000000,-2.893046 +2551000000,-2.907166 +2552000000,-2.948472 +2553000000,-2.887731 +2554000000,-2.990628 +2555000000,-2.988753 +2556000000,-2.891349 +2557000000,-2.987599 +2558000000,-2.935257 +2559000000,-2.977747 +2560000000,-2.908210 +2561000000,-2.925475 +2562000000,-2.902271 +2563000000,-2.908167 +2564000000,-2.928864 +2565000000,-2.972162 +2566000000,-2.897954 +2567000000,-2.964289 +2568000000,-2.967866 +2569000000,-2.939618 +2570000000,-2.897007 +2571000000,-2.925332 +2572000000,-2.921243 +2573000000,-2.885009 +2574000000,-2.855313 +2575000000,-2.855240 +2576000000,-2.860722 +2577000000,-2.901417 +2578000000,-2.850254 +2579000000,-2.844820 +2580000000,-2.853217 +2581000000,-2.936942 +2582000000,-2.909636 +2583000000,-2.934756 +2584000000,-2.834704 +2585000000,-2.933031 +2586000000,-2.926348 +2587000000,-2.832030 +2588000000,-2.833271 +2589000000,-2.917159 +2590000000,-2.895573 +2591000000,-2.818779 +2592000000,-2.816275 +2593000000,-2.815423 +2594000000,-2.808244 +2595000000,-2.912615 +2596000000,-2.843892 +2597000000,-2.801254 +2598000000,-2.806491 +2599000000,-2.838498 +2600000000,-2.863150 +2601000000,-2.814723 +2602000000,-2.791164 +2603000000,-2.807237 +2604000000,-2.856201 +2605000000,-2.808185 +2606000000,-2.777740 +2607000000,-2.855008 +2608000000,-2.782830 +2609000000,-2.777240 +2610000000,-2.773353 +2611000000,-2.840557 +2612000000,-2.847426 +2613000000,-2.769263 +2614000000,-2.857543 +2615000000,-2.765834 +2616000000,-2.852655 +2617000000,-2.781786 +2618000000,-2.778943 +2619000000,-2.839893 +2620000000,-2.744136 +2621000000,-2.751875 +2622000000,-2.774085 +2623000000,-2.793371 +2624000000,-2.757012 +2625000000,-2.733934 +2626000000,-2.733324 +2627000000,-2.742450 +2628000000,-2.739939 +2629000000,-2.718563 +2630000000,-2.710725 +2631000000,-2.804394 +2632000000,-2.724300 +2633000000,-2.703477 +2634000000,-2.736348 +2635000000,-2.731866 +2636000000,-2.687727 +2637000000,-2.774868 +2638000000,-2.710404 +2639000000,-2.780556 +2640000000,-2.754260 +2641000000,-2.676860 +2642000000,-2.719344 +2643000000,-2.758067 +2644000000,-2.764553 +2645000000,-2.686066 +2646000000,-2.688152 +2647000000,-2.723480 +2648000000,-2.721113 +2649000000,-2.631192 +2650000000,-2.636354 +2651000000,-2.625341 +2652000000,-2.648514 +2653000000,-2.733330 +2654000000,-2.681743 +2655000000,-2.704910 +2656000000,-2.717086 +2657000000,-2.717446 +2658000000,-2.608242 +2659000000,-2.691015 +2660000000,-2.697719 +2661000000,-2.593124 +2662000000,-2.704389 +2663000000,-2.686175 +2664000000,-2.581082 +2665000000,-2.613981 +2666000000,-2.618183 +2667000000,-2.663272 +2668000000,-2.619735 +2669000000,-2.603438 +2670000000,-2.611374 +2671000000,-2.659637 +2672000000,-2.663481 +2673000000,-2.654668 +2674000000,-2.562071 +2675000000,-2.542602 +2676000000,-2.545098 +2677000000,-2.647322 +2678000000,-2.624561 +2679000000,-2.530980 +2680000000,-2.556434 +2681000000,-2.583224 +2682000000,-2.577680 +2683000000,-2.525699 +2684000000,-2.533432 +2685000000,-2.540845 +2686000000,-2.538026 +2687000000,-2.592825 +2688000000,-2.548378 +2689000000,-2.566484 +2690000000,-2.482595 +2691000000,-2.579748 +2692000000,-2.578180 +2693000000,-2.523256 +2694000000,-2.527836 +2695000000,-2.516037 +2696000000,-2.533644 +2697000000,-2.451125 +2698000000,-2.551908 +2699000000,-2.534856 +2700000000,-2.699539 +2701000000,-2.653680 +2702000000,-2.612124 +2703000000,-2.607916 +2704000000,-2.603127 +2705000000,-2.559267 +2706000000,-2.580312 +2707000000,-2.617482 +2708000000,-2.618294 +2709000000,-2.492706 +2710000000,-2.486213 +2711000000,-2.576147 +2712000000,-2.537863 +2713000000,-2.548926 +2714000000,-2.450246 +2715000000,-2.438544 +2716000000,-2.422811 +2717000000,-2.497551 +2718000000,-2.400714 +2719000000,-2.489987 +2720000000,-2.379589 +2721000000,-2.400988 +2722000000,-2.436335 +2723000000,-2.439081 +2724000000,-2.388019 +2725000000,-2.403042 +2726000000,-2.339522 +2727000000,-2.421667 +2728000000,-2.341404 +2729000000,-2.304303 +2730000000,-2.329992 +2731000000,-2.286572 +2732000000,-2.382245 +2733000000,-2.287976 +2734000000,-2.274027 +2735000000,-2.360891 +2736000000,-2.258414 +2737000000,-2.354686 +2738000000,-2.346569 +2739000000,-2.232206 +2740000000,-2.236831 +2741000000,-2.319634 +2742000000,-2.264712 +2743000000,-2.310480 +2744000000,-2.299253 +2745000000,-2.249434 +2746000000,-2.198889 +2747000000,-2.257831 +2748000000,-2.245824 +2749000000,-2.162139 +2750000000,-2.235475 +2751000000,-2.244298 +2752000000,-2.210774 +2753000000,-2.142233 +2754000000,-2.226764 +2755000000,-2.147303 +2756000000,-2.207181 +2757000000,-2.150182 +2758000000,-2.120627 +2759000000,-2.081659 +2760000000,-2.148225 +2761000000,-2.071214 +2762000000,-2.069985 +2763000000,-2.109390 +2764000000,-2.151975 +2765000000,-2.138810 +2766000000,-2.108056 +2767000000,-2.041883 +2768000000,-2.026851 +2769000000,-2.086518 +2770000000,-2.095351 +2771000000,-2.100882 +2772000000,-2.027352 +2773000000,-2.038829 +2774000000,-1.997473 +2775000000,-1.966006 +2776000000,-2.017246 +2777000000,-1.955179 +2778000000,-1.943133 +2779000000,-1.988676 +2780000000,-1.962155 +2781000000,-1.923089 +2782000000,-1.923911 +2783000000,-1.948183 +2784000000,-1.904313 +2785000000,-1.966862 +2786000000,-1.916014 +2787000000,-1.917113 +2788000000,-1.955293 +2789000000,-1.950579 +2790000000,-1.857872 +2791000000,-1.939539 +2792000000,-1.949286 +2793000000,-1.890825 +2794000000,-1.928460 +2795000000,-1.849774 +2796000000,-1.859349 +2797000000,-1.891423 +2798000000,-1.827503 +2799000000,-1.808784 +2800000000,-1.786524 +2801000000,-1.781499 +2802000000,-1.798958 +2803000000,-1.769723 +2804000000,-1.861789 +2805000000,-1.754164 +2806000000,-1.779629 +2807000000,-1.793093 +2808000000,-1.819887 +2809000000,-1.822265 +2810000000,-1.771805 +2811000000,-1.771756 +2812000000,-1.800176 +2813000000,-1.768390 +2814000000,-1.685150 +2815000000,-1.714409 +2816000000,-1.773632 +2817000000,-1.697606 +2818000000,-1.668950 +2819000000,-1.655024 +2820000000,-1.732142 +2821000000,-1.651775 +2822000000,-1.626970 +2823000000,-1.657987 +2824000000,-1.612319 +2825000000,-1.650766 +2826000000,-1.601942 +2827000000,-1.616250 +2828000000,-1.678155 +2829000000,-1.665049 +2830000000,-1.660653 +2831000000,-1.659702 +2832000000,-1.640188 +2833000000,-1.570726 +2834000000,-1.628862 +2835000000,-1.540658 +2836000000,-1.541732 +2837000000,-1.531158 +2838000000,-1.565996 +2839000000,-1.594904 +2840000000,-1.502614 +2841000000,-1.595248 +2842000000,-1.543589 +2843000000,-1.476865 +2844000000,-1.568946 +2845000000,-1.538810 +2846000000,-1.454166 +2847000000,-1.544223 +2848000000,-1.461234 +2849000000,-1.447039 +2850000000,-1.450867 +2851000000,-1.439500 +2852000000,-1.499453 +2853000000,-1.468988 +2854000000,-1.394630 +2855000000,-1.386630 +2856000000,-1.380281 +2857000000,-1.463261 +2858000000,-1.374021 +2859000000,-1.359775 +2860000000,-1.384670 +2861000000,-1.377230 +2862000000,-1.438718 +2863000000,-1.331904 +2864000000,-1.322698 +2865000000,-1.402657 +2866000000,-1.379931 +2867000000,-1.383019 +2868000000,-1.391103 +2869000000,-1.382585 +2870000000,-1.319920 +2871000000,-1.343949 +2872000000,-1.299477 +2873000000,-1.318041 +2874000000,-1.336618 +2875000000,-1.315537 +2876000000,-1.258034 +2877000000,-1.253746 +2878000000,-1.263668 +2879000000,-1.297192 +2880000000,-1.237008 +2881000000,-1.229838 +2882000000,-1.256691 +2883000000,-1.292722 +2884000000,-1.207558 +2885000000,-1.211532 +2886000000,-1.205437 +2887000000,-1.227127 +2888000000,-1.274594 +2889000000,-1.210913 +2890000000,-1.195809 +2891000000,-1.159549 +2892000000,-1.157388 +2893000000,-1.238875 +2894000000,-1.218235 +2895000000,-1.202121 +2896000000,-1.178200 +2897000000,-1.210694 +2898000000,-1.157533 +2899000000,-1.128943 +2900000000,-1.210084 +2901000000,-1.130258 +2902000000,-1.202314 +2903000000,-1.156565 +2904000000,-1.170575 +2905000000,-1.103331 +2906000000,-1.122946 +2907000000,-1.140882 +2908000000,-1.106178 +2909000000,-1.106477 +2910000000,-1.090404 +2911000000,-1.098062 +2912000000,-1.089071 +2913000000,-1.066656 +2914000000,-1.153970 +2915000000,-1.151492 +2916000000,-1.150380 +2917000000,-1.071814 +2918000000,-1.076793 +2919000000,-1.111219 +2920000000,-1.094976 +2921000000,-1.048276 +2922000000,-1.109507 +2923000000,-1.112871 +2924000000,-1.101570 +2925000000,-1.097426 +2926000000,-1.103780 +2927000000,-1.082648 +2928000000,-1.099809 +2929000000,-1.115248 +2930000000,-1.088892 +2931000000,-1.020942 +2932000000,-1.062374 +2933000000,-1.106427 +2934000000,-1.105716 +2935000000,-1.015074 +2936000000,-1.014341 +2937000000,-1.086104 +2938000000,-1.081839 +2939000000,-1.011740 +2940000000,-1.093023 +2941000000,-1.020059 +2942000000,-1.090544 +2943000000,-1.096706 +2944000000,-1.006031 +2945000000,-1.077091 +2946000000,-1.091800 +2947000000,-1.055058 +2948000000,-1.017015 +2949000000,-1.011212 +2950000000,-1.003418 +2951000000,-1.045652 +2952000000,-1.003755 +2953000000,-1.023391 +2954000000,-1.031376 +2955000000,-1.020783 +2956000000,-1.030369 +2957000000,-1.043545 +2958000000,-1.059830 +2959000000,-1.019289 +2960000000,-1.015807 +2961000000,-1.038381 +2962000000,-1.070190 +2963000000,-1.018881 +2964000000,-1.083079 +2965000000,-1.047769 +2966000000,-1.034998 +2967000000,-1.033682 +2968000000,-1.088170 +2969000000,-1.080079 +2970000000,-1.092311 +2971000000,-1.057252 +2972000000,-1.079435 +2973000000,-1.061897 +2974000000,-1.053783 +2975000000,-1.082380 +2976000000,-1.113447 +2977000000,-1.099085 +2978000000,-1.120710 +2979000000,-1.113295 +2980000000,-1.051286 +2981000000,-1.123577 +2982000000,-1.132648 +2983000000,-1.121860 +2984000000,-1.067654 +2985000000,-1.095158 +2986000000,-1.062462 +2987000000,-1.127592 +2988000000,-1.070360 +2989000000,-1.086741 +2990000000,-1.084801 +2991000000,-1.073028 +2992000000,-1.093143 +2993000000,-1.156240 +2994000000,-1.151367 +2995000000,-1.120400 +2996000000,-1.089431 +2997000000,-1.139895 +2998000000,-1.156495 +2999000000,-1.097511 +3000000000,-1.108335 +3001000000,-1.889718 +3002000000,-1.838976 +3003000000,-1.877323 +3004000000,-1.835928 +3005000000,-1.865788 +3006000000,-1.825347 +3007000000,-1.823439 +3008000000,-1.860603 +3009000000,-1.877064 +3010000000,-1.817941 +3011000000,-1.865277 +3012000000,-1.829676 +3013000000,-1.815512 +3014000000,-1.881816 +3015000000,-1.881221 +3016000000,-1.873791 +3017000000,-1.819132 +3018000000,-1.789595 +3019000000,-1.850037 +3020000000,-1.798929 +3021000000,-1.784328 +3022000000,-1.835159 +3023000000,-1.858139 +3024000000,-1.766540 +3025000000,-1.761354 +3026000000,-1.823632 +3027000000,-1.794091 +3028000000,-1.768819 +3029000000,-1.745409 +3030000000,-1.782052 +3031000000,-1.738301 +3032000000,-1.825686 +3033000000,-1.763642 +3034000000,-1.791908 +3035000000,-1.757313 +3036000000,-1.787234 +3037000000,-1.798270 +3038000000,-1.790213 +3039000000,-1.707472 +3040000000,-1.702610 +3041000000,-1.702969 +3042000000,-1.766386 +3043000000,-1.721793 +3044000000,-1.698972 +3045000000,-1.763474 +3046000000,-1.761465 +3047000000,-1.735425 +3048000000,-1.678723 +3049000000,-1.725541 +3050000000,-1.759218 +3051000000,-1.721781 +3052000000,-1.751956 +3053000000,-1.688935 +3054000000,-1.689032 +3055000000,-1.689086 +3056000000,-1.706216 +3057000000,-1.647272 +3058000000,-1.717708 +3059000000,-1.710946 +3060000000,-1.696999 +3061000000,-1.629847 +3062000000,-1.628987 +3063000000,-1.609192 +3064000000,-1.671471 +3065000000,-1.655252 +3066000000,-1.594991 +3067000000,-1.685064 +3068000000,-1.680247 +3069000000,-1.663322 +3070000000,-1.648961 +3071000000,-1.669895 +3072000000,-1.628440 +3073000000,-1.600992 +3074000000,-1.635368 +3075000000,-1.652709 +3076000000,-1.586780 +3077000000,-1.645568 +3078000000,-1.578454 +3079000000,-1.634308 +3080000000,-1.629500 +3081000000,-1.624230 +3082000000,-1.613336 +3083000000,-1.537921 +3084000000,-1.605451 +3085000000,-1.589890 +3086000000,-1.552043 +3087000000,-1.567536 +3088000000,-1.516864 +3089000000,-1.499588 +3090000000,-1.548925 +3091000000,-1.478137 +3092000000,-1.485260 +3093000000,-1.546801 +3094000000,-1.556557 +3095000000,-1.550946 +3096000000,-1.456412 +3097000000,-1.543287 +3098000000,-1.451684 +3099000000,-1.458623 +3100000000,-1.532002 +3101000000,-1.448471 +3102000000,-1.510644 +3103000000,-1.495865 +3104000000,-1.442544 +3105000000,-1.471464 +3106000000,-1.421158 +3107000000,-1.505496 +3108000000,-1.476445 +3109000000,-1.488141 +3110000000,-1.394435 +3111000000,-1.389580 +3112000000,-1.442279 +3113000000,-1.422314 +3114000000,-1.466008 +3115000000,-1.368196 +3116000000,-1.452793 +3117000000,-1.436641 +3118000000,-1.349971 +3119000000,-1.366954 +3120000000,-1.414023 +3121000000,-1.430390 +3122000000,-1.383144 +3123000000,-1.417670 +3124000000,-1.320674 +3125000000,-1.316797 +3126000000,-1.333904 +3127000000,-1.396832 +3128000000,-1.366936 +3129000000,-1.351821 +3130000000,-1.305576 +3131000000,-1.281293 +3132000000,-1.371656 +3133000000,-1.363371 +3134000000,-1.267420 +3135000000,-1.259514 +3136000000,-1.343923 +3137000000,-1.270807 +3138000000,-1.270133 +3139000000,-1.312432 +3140000000,-1.247953 +3141000000,-1.291022 +3142000000,-1.313767 +3143000000,-1.221687 +3144000000,-1.206687 +3145000000,-1.291797 +3146000000,-1.286640 +3147000000,-1.279240 +3148000000,-1.185407 +3149000000,-1.176832 +3150000000,-1.183540 +3151000000,-1.194337 +3152000000,-1.251252 +3153000000,-1.200736 +3154000000,-1.151107 +3155000000,-1.232292 +3156000000,-1.137120 +3157000000,-1.129717 +3158000000,-1.180791 +3159000000,-1.172814 +3160000000,-1.162537 +3161000000,-1.184461 +3162000000,-1.129054 +3163000000,-1.187631 +3164000000,-1.094063 +3165000000,-1.132911 +3166000000,-1.169979 +3167000000,-1.139831 +3168000000,-1.128355 +3169000000,-1.099654 +3170000000,-1.145207 +3171000000,-1.089141 +3172000000,-1.129846 +3173000000,-1.128003 +3174000000,-1.097510 +3175000000,-1.070379 +3176000000,-1.116471 +3177000000,-1.117700 +3178000000,-1.114511 +3179000000,-1.076655 +3180000000,-1.098141 +3181000000,-1.043438 +3182000000,-1.092909 +3183000000,-1.078352 +3184000000,-1.020278 +3185000000,-1.007886 +3186000000,-1.062774 +3187000000,-1.057649 +3188000000,-0.990500 +3189000000,-1.013198 +3190000000,-1.001011 +3191000000,-1.006207 +3192000000,-0.984628 +3193000000,-1.000060 +3194000000,-0.951911 +3195000000,-0.948912 +3196000000,-0.999948 +3197000000,-0.981345 +3198000000,-0.967479 +3199000000,-0.945039 +3200000000,-0.956329 +3201000000,-0.959256 +3202000000,-0.966183 +3203000000,-0.961199 +3204000000,-0.929689 +3205000000,-0.953666 +3206000000,-0.933074 +3207000000,-0.874294 +3208000000,-0.908657 +3209000000,-0.918313 +3210000000,-0.901076 +3211000000,-0.912195 +3212000000,-0.852314 +3213000000,-0.894343 +3214000000,-0.865155 +3215000000,-0.858571 +3216000000,-0.815250 +3217000000,-0.833770 +3218000000,-0.803082 +3219000000,-0.856380 +3220000000,-0.809748 +3221000000,-0.782197 +3222000000,-0.806633 +3223000000,-0.833810 +3224000000,-0.827228 +3225000000,-0.768978 +3226000000,-0.813425 +3227000000,-0.783602 +3228000000,-0.783418 +3229000000,-0.732052 +3230000000,-0.736863 +3231000000,-0.735888 +3232000000,-0.708291 +3233000000,-0.720027 +3234000000,-0.755941 +3235000000,-0.687789 +3236000000,-0.687761 +3237000000,-0.693323 +3238000000,-0.701514 +3239000000,-0.675558 +3240000000,-0.713503 +3241000000,-0.659901 +3242000000,-0.709030 +3243000000,-0.705213 +3244000000,-0.649776 +3245000000,-0.660205 +3246000000,-0.672691 +3247000000,-0.653313 +3248000000,-0.648697 +3249000000,-0.646500 +3250000000,-0.665559 +3251000000,-0.625991 +3252000000,-0.606688 +3253000000,-0.604874 +3254000000,-0.635136 +3255000000,-0.620488 +3256000000,-0.623535 +3257000000,-0.587713 +3258000000,-0.579002 +3259000000,-0.606886 +3260000000,-0.575466 +3261000000,-0.609602 +3262000000,-0.550526 +3263000000,-0.600839 +3264000000,-0.595784 +3265000000,-0.540535 +3266000000,-0.534543 +3267000000,-0.564278 +3268000000,-0.573492 +3269000000,-0.526696 +3270000000,-0.557855 +3271000000,-0.561217 +3272000000,-0.508947 +3273000000,-0.513322 +3274000000,-0.502641 +3275000000,-0.543349 +3276000000,-0.494855 +3277000000,-0.520109 +3278000000,-0.503742 +3279000000,-0.500422 +3280000000,-0.489261 +3281000000,-0.470353 +3282000000,-0.464972 +3283000000,-0.478881 +3284000000,-0.456732 +3285000000,-0.451086 +3286000000,-0.452127 +3287000000,-0.451967 +3288000000,-0.450673 +3289000000,-0.439885 +3290000000,-0.482247 +3291000000,-0.433385 +3292000000,-0.478627 +3293000000,-0.475300 +3294000000,-0.448398 +3295000000,-0.419568 +3296000000,-0.462278 +3297000000,-0.463690 +3298000000,-0.462273 +3299000000,-0.409159 +3300000000,-0.410273 +3301000000,-0.438038 +3302000000,-0.402718 +3303000000,-0.426020 +3304000000,-0.445104 +3305000000,-0.416341 +3306000000,-0.438206 +3307000000,-0.440626 +3308000000,-0.389599 +3309000000,-0.430865 +3310000000,-0.418812 +3311000000,-0.385765 +3312000000,-0.385910 +3313000000,-0.383612 +3314000000,-0.395318 +3315000000,-0.406439 +3316000000,-0.430898 +3317000000,-0.432554 +3318000000,-0.399345 +3319000000,-0.392462 +3320000000,-0.398985 +3321000000,-0.401911 +3322000000,-0.412017 +3323000000,-0.382122 +3324000000,-0.404626 +3325000000,-0.395335 +3326000000,-0.383880 +3327000000,-0.402526 +3328000000,-0.400292 +3329000000,-0.409263 +3330000000,-0.420161 +3331000000,-0.413835 +3332000000,-0.428193 +3333000000,-0.395698 +3334000000,-0.428436 +3335000000,-0.396471 +3336000000,-0.399677 +3337000000,-0.394875 +3338000000,-0.393808 +3339000000,-0.415648 +3340000000,-0.406079 +3341000000,-0.410826 +3342000000,-0.436254 +3343000000,-0.403902 +3344000000,-0.441743 +3345000000,-0.444007 +3346000000,-0.413125 +3347000000,-0.458184 +3348000000,-0.437881 +3349000000,-0.418606 +3350000000,-0.465779 +3351000000,-0.448325 +3352000000,-0.460414 +3353000000,-0.438771 +3354000000,-0.453801 +3355000000,-0.469090 +3356000000,-0.434771 +3357000000,-0.463636 +3358000000,-0.444253 +3359000000,-0.492464 +3360000000,-0.472856 +3361000000,-0.465110 +3362000000,-0.469715 +3363000000,-0.481408 +3364000000,-0.519387 +3365000000,-0.482420 +3366000000,-0.527300 +3367000000,-0.528140 +3368000000,-0.533230 +3369000000,-0.542831 +3370000000,-0.511253 +3371000000,-0.549774 +3372000000,-0.535672 +3373000000,-0.539523 +3374000000,-0.552916 +3375000000,-0.548135 +3376000000,-0.578731 +3377000000,-0.575267 +3378000000,-0.564780 +3379000000,-0.581163 +3380000000,-0.564487 +3381000000,-0.591786 +3382000000,-0.590761 +3383000000,-0.577248 +3384000000,-0.614940 +3385000000,-0.628824 +3386000000,-0.593887 +3387000000,-0.601408 +3388000000,-0.621592 +3389000000,-0.649854 +3390000000,-0.649217 +3391000000,-0.629099 +3392000000,-0.678891 +3393000000,-0.642499 +3394000000,-0.648966 +3395000000,-0.671860 +3396000000,-0.687506 +3397000000,-0.683531 +3398000000,-0.679504 +3399000000,-0.727160 +3400000000,-0.731013 +3401000000,-0.704161 +3402000000,-0.720234 +3403000000,-0.723145 +3404000000,-0.764866 +3405000000,-0.751074 +3406000000,-0.781060 +3407000000,-0.761555 +3408000000,-0.802033 +3409000000,-0.808802 +3410000000,-0.783513 +3411000000,-0.827102 +3412000000,-0.820804 +3413000000,-0.806691 +3414000000,-0.810087 +3415000000,-0.857058 +3416000000,-0.836902 +3417000000,-0.871879 +3418000000,-0.892654 +3419000000,-0.902172 +3420000000,-0.869282 +3421000000,-0.916639 +3422000000,-0.926495 +3423000000,-0.917172 +3424000000,-0.948847 +3425000000,-0.960972 +3426000000,-0.969529 +3427000000,-0.955392 +3428000000,-0.976491 +3429000000,-0.997606 +3430000000,-1.001973 +3431000000,-0.983671 +3432000000,-1.016105 +3433000000,-1.008665 +3434000000,-1.008866 +3435000000,-1.042363 +3436000000,-1.030976 +3437000000,-1.081515 +3438000000,-1.052493 +3439000000,-1.100219 +3440000000,-1.085283 +3441000000,-1.121025 +3442000000,-1.100555 +3443000000,-1.149562 +3444000000,-1.155117 +3445000000,-1.178384 +3446000000,-1.147710 +3447000000,-1.162500 +3448000000,-1.186471 +3449000000,-1.178131 +3450000000,-1.218586 +3451000000,-1.204653 +3452000000,-1.253410 +3453000000,-1.241953 +3454000000,-1.280273 +3455000000,-1.301058 +3456000000,-1.294412 +3457000000,-1.288359 +3458000000,-1.335568 +3459000000,-1.350062 +3460000000,-1.339704 +3461000000,-1.333420 +3462000000,-1.356288 +3463000000,-1.378967 +3464000000,-1.378438 +3465000000,-1.384045 +3466000000,-1.441548 +3467000000,-1.414752 +3468000000,-1.465506 +3469000000,-1.472479 +3470000000,-1.493135 +3471000000,-1.476142 +3472000000,-1.514057 +3473000000,-1.496216 +3474000000,-1.542673 +3475000000,-1.545798 +3476000000,-1.551567 +3477000000,-1.579815 +3478000000,-1.590221 +3479000000,-1.604899 +3480000000,-1.609796 +3481000000,-1.619342 +3482000000,-1.652038 +3483000000,-1.662833 +3484000000,-1.627637 +3485000000,-1.676962 +3486000000,-1.663534 +3487000000,-1.711723 +3488000000,-1.729996 +3489000000,-1.741437 +3490000000,-1.704238 +3491000000,-1.770371 +3492000000,-1.751915 +3493000000,-1.766046 +3494000000,-1.804601 +3495000000,-1.810807 +3496000000,-1.842858 +3497000000,-1.856990 +3498000000,-1.846523 +3499000000,-1.884721 +3500000000,-1.850238 +3501000000,-1.889082 +3502000000,-1.916547 +3503000000,-1.885835 +3504000000,-1.941311 +3505000000,-1.925988 +3506000000,-1.951284 +3507000000,-1.964402 +3508000000,-1.971606 +3509000000,-2.007757 +3510000000,-2.030810 +3511000000,-2.026697 +3512000000,-2.015101 +3513000000,-2.058704 +3514000000,-2.092117 +3515000000,-2.092893 +3516000000,-2.105432 +3517000000,-2.131040 +3518000000,-2.148018 +3519000000,-2.124937 +3520000000,-2.134370 +3521000000,-2.187809 +3522000000,-2.163032 +3523000000,-2.218699 +3524000000,-2.185628 +3525000000,-2.234676 +3526000000,-2.210825 +3527000000,-2.242144 +3528000000,-2.280860 +3529000000,-2.264608 +3530000000,-2.304603 +3531000000,-2.302100 +3532000000,-2.342521 +3533000000,-2.312728 +3534000000,-2.329196 +3535000000,-2.359469 +3536000000,-2.368262 +3537000000,-2.418417 +3538000000,-2.419545 +3539000000,-2.400606 +3540000000,-2.462852 +3541000000,-2.438356 +3542000000,-2.469131 +3543000000,-2.469237 +3544000000,-2.513364 +3545000000,-2.510784 +3546000000,-2.517544 +3547000000,-2.565114 +3548000000,-2.576390 +3549000000,-2.592141 +3550000000,-2.558890 +3551000000,-2.620085 +3552000000,-2.608332 +3553000000,-2.621972 +3554000000,-2.668431 +3555000000,-2.635359 +3556000000,-2.671361 +3557000000,-2.702095 +3558000000,-2.722850 +3559000000,-2.713484 +3560000000,-2.704157 +3561000000,-2.764831 +3562000000,-2.783014 +3563000000,-2.797244 +3564000000,-2.760245 +3565000000,-2.823722 +3566000000,-2.834688 +3567000000,-2.847426 +3568000000,-2.872225 +3569000000,-2.883563 +3570000000,-2.876805 +3571000000,-2.902969 +3572000000,-2.881818 +3573000000,-2.944243 +3574000000,-2.959653 +3575000000,-2.974915 +3576000000,-2.960975 +3577000000,-2.967231 +3578000000,-3.017069 +3579000000,-3.004652 +3580000000,-3.010090 +3581000000,-3.030915 +3582000000,-3.071511 +3583000000,-3.076231 +3584000000,-3.114392 +3585000000,-3.101160 +3586000000,-3.132262 +3587000000,-3.150439 +3588000000,-3.137014 +3589000000,-3.135734 +3590000000,-3.193547 +3591000000,-3.213094 +3592000000,-3.227961 +3593000000,-3.241564 +3594000000,-3.248585 +3595000000,-3.230969 +3596000000,-3.245766 +3597000000,-3.266532 +3598000000,-3.300333 +3599000000,-3.272833 +3600000000,-3.285583 +3601000000,-3.346819 +3602000000,-3.338271 +3603000000,-3.383257 +3604000000,-3.367581 +3605000000,-3.413520 +3606000000,-3.374396 +3607000000,-3.440313 +3608000000,-3.416281 +3609000000,-3.422139 +3610000000,-3.465162 +3611000000,-3.442799 +3612000000,-3.511599 +3613000000,-3.501607 +3614000000,-3.483477 +3615000000,-3.548636 +3616000000,-3.532231 +3617000000,-3.578085 +3618000000,-3.550302 +3619000000,-3.582466 +3620000000,-3.617429 +3621000000,-3.604937 +3622000000,-3.593472 +3623000000,-3.632307 +3624000000,-3.630841 +3625000000,-3.686550 +3626000000,-3.657348 +3627000000,-3.663214 +3628000000,-3.669595 +3629000000,-3.730085 +3630000000,-3.692220 +3631000000,-3.742413 +3632000000,-3.732640 +3633000000,-3.731720 +3634000000,-3.804822 +3635000000,-3.824988 +3636000000,-3.770111 +3637000000,-3.844071 +3638000000,-3.855940 +3639000000,-3.814689 +3640000000,-3.887206 +3641000000,-3.867280 +3642000000,-3.846321 +3643000000,-3.878367 +3644000000,-3.914810 +3645000000,-3.882049 +3646000000,-3.941614 +3647000000,-3.888649 +3648000000,-3.900758 +3649000000,-3.977467 +3650000000,-3.958645 +3651000000,-3.938636 +3652000000,-3.958549 +3653000000,-3.968385 +3654000000,-3.977322 +3655000000,-4.000189 +3656000000,-3.981046 +3657000000,-4.042940 +3658000000,-3.999261 +3659000000,-4.041322 +3660000000,-4.075374 +3661000000,-4.045707 +3662000000,-4.059214 +3663000000,-4.080460 +3664000000,-4.121425 +3665000000,-4.071352 +3666000000,-4.074187 +3667000000,-4.114622 +3668000000,-4.138455 +3669000000,-4.103687 +3670000000,-4.171396 +3671000000,-4.127531 +3672000000,-4.177411 +3673000000,-4.157603 +3674000000,-4.202378 +3675000000,-4.165437 +3676000000,-4.210443 +3677000000,-4.204812 +3678000000,-4.262151 +3679000000,-4.203330 +3680000000,-4.274609 +3681000000,-4.233019 +3682000000,-4.234424 +3683000000,-4.314999 +3684000000,-4.251883 +3685000000,-4.326365 +3686000000,-4.293020 +3687000000,-4.345260 +3688000000,-4.364221 +3689000000,-4.313952 +3690000000,-4.317834 +3691000000,-4.400406 +3692000000,-4.365362 +3693000000,-4.347723 +3694000000,-4.405730 +3695000000,-4.435108 +3696000000,-4.397908 +3697000000,-4.418431 +3698000000,-4.455586 +3699000000,-4.418805 +3700000000,-4.425942 +3701000000,-4.447822 +3702000000,-4.446652 +3703000000,-4.532308 +3704000000,-4.506496 +3705000000,-4.497090 +3706000000,-4.530868 +3707000000,-4.577651 +3708000000,-4.516894 +3709000000,-4.600607 +3710000000,-4.610487 +3711000000,-4.623978 +3712000000,-4.569776 +3713000000,-4.583623 +3714000000,-4.615504 +3715000000,-4.608814 +3716000000,-4.676915 +3717000000,-4.694380 +3718000000,-4.695638 +3719000000,-4.721335 +3720000000,-4.710738 +3721000000,-4.709335 +3722000000,-4.678921 +3723000000,-4.769520 +3724000000,-4.719978 +3725000000,-4.732982 +3726000000,-4.763114 +3727000000,-4.805313 +3728000000,-4.777572 +3729000000,-4.769476 +3730000000,-4.779128 +3731000000,-4.847052 +3732000000,-4.796455 +3733000000,-4.825592 +3734000000,-4.893380 +3735000000,-4.906747 +3736000000,-4.922952 +3737000000,-4.870430 +3738000000,-4.905328 +3739000000,-4.956939 +3740000000,-4.913834 +3741000000,-4.980010 +3742000000,-4.994149 +3743000000,-4.997185 +3744000000,-5.022486 +3745000000,-4.993672 +3746000000,-4.972090 +3747000000,-4.991874 +3748000000,-5.066403 +3749000000,-5.083376 +3750000000,-5.024889 +3751000000,-5.038616 +3752000000,-5.095910 +3753000000,-5.145536 +3754000000,-5.121149 +3755000000,-5.094299 +3756000000,-5.165184 +3757000000,-5.189681 +3758000000,-5.207175 +3759000000,-5.211490 +3760000000,-5.242695 +3761000000,-5.217196 +3762000000,-5.263715 +3763000000,-5.230327 +3764000000,-5.218926 +3765000000,-5.283240 +3766000000,-5.259317 +3767000000,-5.267562 +3768000000,-5.290486 +3769000000,-5.290157 +3770000000,-5.304041 +3771000000,-5.314557 +3772000000,-5.361897 +3773000000,-5.352309 +3774000000,-5.364707 +3775000000,-5.405728 +3776000000,-5.394359 +3777000000,-5.422483 +3778000000,-5.432286 +3779000000,-5.438746 +3780000000,-5.449963 +3781000000,-5.539037 +3782000000,-5.485960 +3783000000,-5.585849 +3784000000,-5.520053 +3785000000,-5.559836 +3786000000,-5.630288 +3787000000,-5.562165 +3788000000,-5.654476 +3789000000,-5.591090 +3790000000,-5.610722 +3791000000,-5.687615 +3792000000,-5.730664 +3793000000,-5.670892 +3794000000,-5.754743 +3795000000,-5.705439 +3796000000,-5.794104 +3797000000,-5.786445 +3798000000,-5.826843 +3799000000,-5.833332 +3800000000,-5.794336 +3801000000,-5.836277 +3802000000,-5.834351 +3803000000,-5.869141 +3804000000,-5.915588 +3805000000,-5.926384 +3806000000,-5.947880 +3807000000,-5.901794 +3808000000,-5.911205 +3809000000,-5.979657 +3810000000,-5.966432 +3811000000,-6.030287 +3812000000,-5.953370 +3813000000,-6.014223 +3814000000,-6.072365 +3815000000,-6.066591 +3816000000,-6.026964 +3817000000,-6.041419 +3818000000,-6.039211 +3819000000,-6.056513 +3820000000,-6.089054 +3821000000,-6.112223 +3822000000,-6.101925 +3823000000,-6.118574 +3824000000,-6.225186 +3825000000,-6.143535 +3826000000,-6.259547 +3827000000,-6.212085 +3828000000,-6.226599 +3829000000,-6.202337 +3830000000,-6.269822 +3831000000,-6.227862 +3832000000,-6.246608 +3833000000,-6.324194 +3834000000,-6.268176 +3835000000,-6.347247 +3836000000,-6.397062 +3837000000,-6.415291 +3838000000,-6.348347 +3839000000,-6.413812 +3840000000,-6.455361 +3841000000,-6.472171 +3842000000,-6.404415 +3843000000,-6.390901 +3844000000,-6.509252 +3845000000,-6.426299 +3846000000,-6.479145 +3847000000,-6.554780 +3848000000,-6.456621 +3849000000,-6.543626 +3850000000,-6.488044 +3851000000,-6.519639 +3852000000,-6.567503 +3853000000,-6.609756 +3854000000,-6.563027 +3855000000,-6.592515 +3856000000,-6.626960 +3857000000,-6.671053 +3858000000,-6.606468 +3859000000,-6.633097 +3860000000,-6.591880 +3861000000,-6.716358 +3862000000,-6.722507 +3863000000,-6.676301 +3864000000,-6.656308 +3865000000,-6.647511 +3866000000,-6.666211 +3867000000,-6.784157 +3868000000,-6.718188 +3869000000,-6.802908 +3870000000,-6.795500 +3871000000,-6.704053 +3872000000,-6.766468 +3873000000,-6.724628 +3874000000,-6.824375 +3875000000,-6.738383 +3876000000,-6.766780 +3877000000,-6.757095 +3878000000,-6.855844 +3879000000,-6.839487 +3880000000,-6.899237 +3881000000,-6.835006 +3882000000,-6.848433 +3883000000,-6.838851 +3884000000,-6.935036 +3885000000,-6.937241 +3886000000,-6.842098 +3887000000,-6.863455 +3888000000,-6.886500 +3889000000,-6.970668 +3890000000,-6.980205 +3891000000,-6.914957 +3892000000,-6.987552 +3893000000,-6.910788 +3894000000,-6.998745 +3895000000,-6.923711 +3896000000,-6.937384 +3897000000,-6.936281 +3898000000,-6.983601 +3899000000,-7.047526 +3900000000,-6.958619 +3901000000,-7.055382 +3902000000,-6.959254 +3903000000,-6.989890 +3904000000,-6.996512 +3905000000,-7.045101 +3906000000,-7.021938 +3907000000,-7.012094 +3908000000,-6.987466 +3909000000,-7.019585 +3910000000,-7.039617 +3911000000,-7.073921 +3912000000,-6.996010 +3913000000,-6.999737 +3914000000,-6.998164 +3915000000,-7.008127 +3916000000,-7.055316 +3917000000,-7.014310 +3918000000,-7.082496 +3919000000,-7.023912 +3920000000,-7.039607 +3921000000,-7.017285 +3922000000,-7.017252 +3923000000,-7.056766 +3924000000,-7.052634 +3925000000,-7.120358 +3926000000,-7.029559 +3927000000,-7.052686 +3928000000,-7.034121 +3929000000,-7.020179 +3930000000,-7.109359 +3931000000,-7.115562 +3932000000,-7.059457 +3933000000,-7.097603 +3934000000,-7.096913 +3935000000,-7.113456 +3936000000,-7.078993 +3937000000,-7.023366 +3938000000,-7.100980 +3939000000,-7.046793 +3940000000,-7.005794 +3941000000,-7.032939 +3942000000,-7.005719 +3943000000,-7.103121 +3944000000,-7.098441 +3945000000,-6.990947 +3946000000,-6.995059 +3947000000,-7.020810 +3948000000,-7.071187 +3949000000,-7.044125 +3950000000,-7.037145 +3951000000,-7.063875 +3952000000,-7.051383 +3953000000,-6.994922 +3954000000,-6.988919 +3955000000,-7.032866 +3956000000,-6.958695 +3957000000,-6.953672 +3958000000,-7.035176 +3959000000,-6.929243 +3960000000,-6.945651 +3961000000,-7.010174 +3962000000,-7.011015 +3963000000,-6.899254 +3964000000,-6.994750 +3965000000,-6.907597 +3966000000,-6.964733 +3967000000,-6.967173 +3968000000,-6.961527 +3969000000,-6.940413 +3970000000,-6.947544 +3971000000,-6.908084 +3972000000,-6.823325 +3973000000,-6.813119 +3974000000,-6.806277 +3975000000,-6.886491 +3976000000,-6.784735 +3977000000,-6.776766 +3978000000,-6.809706 +3979000000,-6.863875 +3980000000,-6.751699 +3981000000,-6.820253 +3982000000,-6.801453 +3983000000,-6.813123 +3984000000,-6.733990 +3985000000,-6.810950 +3986000000,-6.726949 +3987000000,-6.628818 +3988000000,-6.643681 +3989000000,-6.698780 +3990000000,-6.631745 +3991000000,-6.572523 +3992000000,-6.607359 +3993000000,-6.558671 +3994000000,-6.668992 +3995000000,-6.530161 +3996000000,-6.531201 +3997000000,-6.523272 +3998000000,-6.516781 +3999000000,-6.607653 +4000000000,-6.889564 +4001000000,-6.723291 +4002000000,-6.746915 +4003000000,-6.672757 +4004000000,-6.633310 +4005000000,-6.645661 +4006000000,-6.598667 +4007000000,-6.584435 +4008000000,-6.661383 +4009000000,-6.649978 +4010000000,-6.645872 +4011000000,-6.580159 +4012000000,-6.614886 +4013000000,-6.601661 +4014000000,-6.494253 +4015000000,-6.580997 +4016000000,-6.454654 +4017000000,-6.551397 +4018000000,-6.487922 +4019000000,-6.506423 +4020000000,-6.404566 +4021000000,-6.465494 +4022000000,-6.454837 +4023000000,-6.477625 +4024000000,-6.397444 +4025000000,-6.442255 +4026000000,-6.364652 +4027000000,-6.367418 +4028000000,-6.388670 +4029000000,-6.360590 +4030000000,-6.364257 +4031000000,-6.336459 +4032000000,-6.340786 +4033000000,-6.378087 +4034000000,-6.382535 +4035000000,-6.257795 +4036000000,-6.282224 +4037000000,-6.316133 +4038000000,-6.340493 +4039000000,-6.266849 +4040000000,-6.250344 +4041000000,-6.292781 +4042000000,-6.206546 +4043000000,-6.230376 +4044000000,-6.182241 +4045000000,-6.282527 +4046000000,-6.280670 +4047000000,-6.158705 +4048000000,-6.265745 +4049000000,-6.164231 +4050000000,-6.163221 +4051000000,-6.136791 +4052000000,-6.192033 +4053000000,-6.235287 +4054000000,-6.226823 +4055000000,-6.227215 +4056000000,-6.203258 +4057000000,-6.107768 +4058000000,-6.107883 +4059000000,-6.150988 +4060000000,-6.200577 +4061000000,-6.119910 +4062000000,-6.201304 +4063000000,-6.090676 +4064000000,-6.160890 +4065000000,-6.094771 +4066000000,-6.094224 +4067000000,-6.105474 +4068000000,-6.090166 +4069000000,-6.156569 +4070000000,-6.141843 +4071000000,-6.089084 +4072000000,-6.181396 +4073000000,-6.110336 +4074000000,-6.103295 +4075000000,-6.209226 +4076000000,-6.201487 +4077000000,-6.108235 +4078000000,-6.112392 +4079000000,-6.126875 +4080000000,-6.199883 +4081000000,-6.233930 +4082000000,-6.198915 +4083000000,-6.127142 +4084000000,-6.133758 +4085000000,-6.245423 +4086000000,-6.256066 +4087000000,-6.189555 +4088000000,-6.173304 +4089000000,-6.180551 +4090000000,-6.281611 +4091000000,-6.178278 +4092000000,-6.290512 +4093000000,-6.300547 +4094000000,-6.232049 +4095000000,-6.289717 +4096000000,-6.259518 +4097000000,-6.216347 +4098000000,-6.219563 +4099000000,-6.305148 +4100000000,-6.344023 +4101000000,-6.322245 +4102000000,-6.315363 +4103000000,-6.372528 +4104000000,-6.294982 +4105000000,-6.354034 +4106000000,-6.396258 +4107000000,-6.324820 +4108000000,-6.319512 +4109000000,-6.421410 +4110000000,-6.431781 +4111000000,-6.405398 +4112000000,-6.451839 +4113000000,-6.342026 +4114000000,-6.469630 +4115000000,-6.430334 +4116000000,-6.484458 +4117000000,-6.494825 +4118000000,-6.450383 +4119000000,-6.515877 +4120000000,-6.483932 +4121000000,-6.500841 +4122000000,-6.541613 +4123000000,-6.502848 +4124000000,-6.441260 +4125000000,-6.567322 +4126000000,-6.492772 +4127000000,-6.518044 +4128000000,-6.508275 +4129000000,-6.591638 +4130000000,-6.496875 +4131000000,-6.533428 +4132000000,-6.539152 +4133000000,-6.530206 +4134000000,-6.614862 +4135000000,-6.654414 +4136000000,-6.623207 +4137000000,-6.671801 +4138000000,-6.660025 +4139000000,-6.665185 +4140000000,-6.620731 +4141000000,-6.616792 +4142000000,-6.699762 +4143000000,-6.691379 +4144000000,-6.760238 +4145000000,-6.774475 +4146000000,-6.708510 +4147000000,-6.683918 +4148000000,-6.709958 +4149000000,-6.697159 +4150000000,-6.790472 +4151000000,-6.749898 +4152000000,-6.828875 +4153000000,-6.791530 +4154000000,-6.802294 +4155000000,-6.839260 +4156000000,-6.780785 +4157000000,-6.788305 +4158000000,-6.851858 +4159000000,-6.816519 +4160000000,-6.834392 +4161000000,-6.935501 +4162000000,-6.837633 +4163000000,-6.902572 +4164000000,-6.910971 +4165000000,-6.858748 +4166000000,-6.950799 +4167000000,-6.969885 +4168000000,-6.880440 +4169000000,-6.993979 +4170000000,-7.017055 +4171000000,-7.020761 +4172000000,-7.013846 +4173000000,-6.951056 +4174000000,-7.038934 +4175000000,-6.956785 +4176000000,-6.947236 +4177000000,-6.994517 +4178000000,-7.082714 +4179000000,-7.089689 +4180000000,-7.082789 +4181000000,-7.015631 +4182000000,-7.009656 +4183000000,-7.027786 +4184000000,-7.008553 +4185000000,-7.107872 +4186000000,-7.014053 +4187000000,-7.118912 +4188000000,-7.129087 +4189000000,-7.064321 +4190000000,-7.146676 +4191000000,-7.046209 +4192000000,-7.161209 +4193000000,-7.051287 +4194000000,-7.076363 +4195000000,-7.173829 +4196000000,-7.177182 +4197000000,-7.064703 +4198000000,-7.154123 +4199000000,-7.065634 +4200000000,-7.121777 +4201000000,-7.078704 +4202000000,-7.185256 +4203000000,-7.154948 +4204000000,-7.192862 +4205000000,-7.166913 +4206000000,-7.077920 +4207000000,-7.075454 +4208000000,-7.190558 +4209000000,-7.084227 +4210000000,-7.183754 +4211000000,-7.097145 +4212000000,-7.184749 +4213000000,-7.088484 +4214000000,-7.121422 +4215000000,-7.173014 +4216000000,-7.094773 +4217000000,-7.143286 +4218000000,-7.098001 +4219000000,-7.109447 +4220000000,-7.046309 +4221000000,-7.102113 +4222000000,-7.110022 +4223000000,-7.083999 +4224000000,-7.041120 +4225000000,-7.125146 +4226000000,-7.083852 +4227000000,-7.058147 +4228000000,-7.111098 +4229000000,-7.065843 +4230000000,-7.036402 +4231000000,-7.080900 +4232000000,-7.034385 +4233000000,-6.974701 +4234000000,-6.987839 +4235000000,-7.044758 +4236000000,-6.941850 +4237000000,-6.959686 +4238000000,-6.981844 +4239000000,-7.016623 +4240000000,-7.010313 +4241000000,-6.967344 +4242000000,-6.889096 +4243000000,-6.984427 +4244000000,-6.891522 +4245000000,-6.931063 +4246000000,-6.943010 +4247000000,-6.838558 +4248000000,-6.834830 +4249000000,-6.818107 +4250000000,-6.808163 +4251000000,-6.879107 +4252000000,-6.844185 +4253000000,-6.785169 +4254000000,-6.847277 +4255000000,-6.749593 +4256000000,-6.834973 +4257000000,-6.726938 +4258000000,-6.818226 +4259000000,-6.742686 +4260000000,-6.790487 +4261000000,-6.782333 +4262000000,-6.693534 +4263000000,-6.748179 +4264000000,-6.651982 +4265000000,-6.617705 +4266000000,-6.613007 +4267000000,-6.604958 +4268000000,-6.680125 +4269000000,-6.632835 +4270000000,-6.652268 +4271000000,-6.573274 +4272000000,-6.549859 +4273000000,-6.555830 +4274000000,-6.494622 +4275000000,-6.463994 +4276000000,-6.528854 +4277000000,-6.534583 +4278000000,-6.517135 +4279000000,-6.440256 +4280000000,-6.391195 +4281000000,-6.399703 +4282000000,-6.395455 +4283000000,-6.428328 +4284000000,-6.394211 +4285000000,-6.301288 +4286000000,-6.331009 +4287000000,-6.299013 +4288000000,-6.298975 +4289000000,-6.207000 +4290000000,-6.201469 +4291000000,-6.254462 +4292000000,-6.200785 +4293000000,-6.241597 +4294000000,-6.225932 +4295000000,-6.196161 +4296000000,-6.113802 +4297000000,-6.090188 +4298000000,-6.038977 +4299000000,-6.027443 +4300000000,-6.004493 +4301000000,-6.091252 +4302000000,-6.069007 +4303000000,-5.969251 +4304000000,-5.923929 +4305000000,-6.017983 +4306000000,-5.996910 +4307000000,-5.903236 +4308000000,-5.919192 +4309000000,-5.895734 +4310000000,-5.860235 +4311000000,-5.798631 +4312000000,-5.824902 +4313000000,-5.785699 +4314000000,-5.845804 +4315000000,-5.820910 +4316000000,-5.805503 +4317000000,-5.746553 +4318000000,-5.785479 +4319000000,-5.788357 +4320000000,-5.743056 +4321000000,-5.753210 +4322000000,-5.735445 +4323000000,-5.663532 +4324000000,-5.654476 +4325000000,-5.631485 +4326000000,-5.711374 +4327000000,-5.580865 +4328000000,-5.594428 +4329000000,-5.586084 +4330000000,-5.609924 +4331000000,-5.560879 +4332000000,-5.552775 +4333000000,-5.519748 +4334000000,-5.479963 +4335000000,-5.432532 +4336000000,-5.408123 +4337000000,-5.423278 +4338000000,-5.359110 +4339000000,-5.411120 +4340000000,-5.411862 +4341000000,-5.364113 +4342000000,-5.378654 +4343000000,-5.325678 +4344000000,-5.363727 +4345000000,-5.290180 +4346000000,-5.330401 +4347000000,-5.317328 +4348000000,-5.304903 +4349000000,-5.293890 +4350000000,-5.237170 +4351000000,-5.283603 +4352000000,-5.243370 +4353000000,-5.230934 +4354000000,-5.199461 +4355000000,-5.228498 +4356000000,-5.180196 +4357000000,-5.230129 +4358000000,-5.172577 +4359000000,-5.220346 +4360000000,-5.148221 +4361000000,-5.220377 +4362000000,-5.216419 +4363000000,-5.196099 +4364000000,-5.190397 +4365000000,-5.158922 +4366000000,-5.185703 +4367000000,-5.162547 +4368000000,-5.140714 +4369000000,-5.208946 +4370000000,-5.183857 +4371000000,-5.214453 +4372000000,-5.141647 +4373000000,-5.202563 +4374000000,-5.138479 +4375000000,-5.227895 +4376000000,-5.157664 +4377000000,-5.188093 +4378000000,-5.161938 +4379000000,-5.244234 +4380000000,-5.212178 +4381000000,-5.249879 +4382000000,-5.234670 +4383000000,-5.242039 +4384000000,-5.267981 +4385000000,-5.226193 +4386000000,-5.313462 +4387000000,-5.299524 +4388000000,-5.329976 +4389000000,-5.267013 +4390000000,-5.287495 +4391000000,-5.291729 +4392000000,-5.364053 +4393000000,-5.407101 +4394000000,-5.416760 +4395000000,-5.432851 +4396000000,-5.434878 +4397000000,-5.396531 +4398000000,-5.483576 +4399000000,-5.410473 +4400000000,-5.513724 +4401000000,-5.503762 +4402000000,-5.494225 +4403000000,-5.517349 +4404000000,-5.518490 +4405000000,-5.580795 +4406000000,-5.556125 +4407000000,-5.604168 +4408000000,-5.642737 +4409000000,-5.592829 +4410000000,-5.683396 +4411000000,-5.682940 +4412000000,-5.732414 +4413000000,-5.724858 +4414000000,-5.760717 +4415000000,-5.810810 +4416000000,-5.832898 +4417000000,-5.841768 +4418000000,-5.829003 +4419000000,-5.850198 +4420000000,-5.874517 +4421000000,-5.923439 +4422000000,-5.922253 +4423000000,-5.997670 +4424000000,-6.013603 +4425000000,-6.028043 +4426000000,-5.979999 +4427000000,-6.087149 +4428000000,-6.069926 +4429000000,-6.135301 +4430000000,-6.078028 +4431000000,-6.175120 +4432000000,-6.175985 +4433000000,-6.125593 +4434000000,-6.174376 +4435000000,-6.239331 +4436000000,-6.215936 +4437000000,-6.307072 +4438000000,-6.253142 +4439000000,-6.321895 +4440000000,-6.354669 +4441000000,-6.322639 +4442000000,-6.369552 +4443000000,-6.422300 +4444000000,-6.469764 +4445000000,-6.432713 +4446000000,-6.430053 +4447000000,-6.547996 +4448000000,-6.462722 +4449000000,-6.516376 +4450000000,-6.521760 +4451000000,-6.559628 +4452000000,-6.556990 +4453000000,-6.633021 +4454000000,-6.703612 +4455000000,-6.618929 +4456000000,-6.664150 +4457000000,-6.689619 +4458000000,-6.781183 +4459000000,-6.770466 +4460000000,-6.739498 +4461000000,-6.805578 +4462000000,-6.833538 +4463000000,-6.856168 +4464000000,-6.900683 +4465000000,-6.914190 +4466000000,-6.867981 +4467000000,-6.871875 +4468000000,-6.878529 +4469000000,-6.893191 +4470000000,-6.947597 +4471000000,-6.995888 +4472000000,-6.991380 +4473000000,-7.048476 +4474000000,-7.003571 +4475000000,-7.103142 +4476000000,-7.046136 +4477000000,-7.112586 +4478000000,-7.097269 +4479000000,-7.136450 +4480000000,-7.203264 +4481000000,-7.105039 +4482000000,-7.186433 +4483000000,-7.207903 +4484000000,-7.253823 +4485000000,-7.177055 +4486000000,-7.236908 +4487000000,-7.204482 +4488000000,-7.226707 +4489000000,-7.339514 +4490000000,-7.353131 +4491000000,-7.248498 +4492000000,-7.335711 +4493000000,-7.300857 +4494000000,-7.317743 +4495000000,-7.309252 +4496000000,-7.344014 +4497000000,-7.354313 +4498000000,-7.332515 +4499000000,-7.450245 +4500000000,-7.455394 +4501000000,-7.361586 +4502000000,-7.490400 +4503000000,-7.447659 +4504000000,-7.451905 +4505000000,-7.503289 +4506000000,-7.463629 +4507000000,-7.411436 +4508000000,-7.441795 +4509000000,-7.425806 +4510000000,-7.519984 +4511000000,-7.462879 +4512000000,-7.545584 +4513000000,-7.543150 +4514000000,-7.535136 +4515000000,-7.513263 +4516000000,-7.551959 +4517000000,-7.486296 +4518000000,-7.475069 +4519000000,-7.572943 +4520000000,-7.474399 +4521000000,-7.595010 +4522000000,-7.484253 +4523000000,-7.501345 +4524000000,-7.613564 +4525000000,-7.599091 +4526000000,-7.496545 +4527000000,-7.544753 +4528000000,-7.596673 +4529000000,-7.558757 +4530000000,-7.540606 +4531000000,-7.505989 +4532000000,-7.591260 +4533000000,-7.591465 +4534000000,-7.540091 +4535000000,-7.596649 +4536000000,-7.515413 +4537000000,-7.514201 +4538000000,-7.508025 +4539000000,-7.577441 +4540000000,-7.577408 +4541000000,-7.593394 +4542000000,-7.624203 +4543000000,-7.628696 +4544000000,-7.505885 +4545000000,-7.503041 +4546000000,-7.549287 +4547000000,-7.546582 +4548000000,-7.626020 +4549000000,-7.526480 +4550000000,-7.561455 +4551000000,-7.613792 +4552000000,-7.528615 +4553000000,-7.582737 +4554000000,-7.518299 +4555000000,-7.564830 +4556000000,-7.575115 +4557000000,-7.522963 +4558000000,-7.478847 +4559000000,-7.590482 +4560000000,-7.537994 +4561000000,-7.471598 +4562000000,-7.566319 +4563000000,-7.493853 +4564000000,-7.569867 +4565000000,-7.450531 +4566000000,-7.560954 +4567000000,-7.448044 +4568000000,-7.531453 +4569000000,-7.535029 +4570000000,-7.435913 +4571000000,-7.504740 +4572000000,-7.434148 +4573000000,-7.537343 +4574000000,-7.515159 +4575000000,-7.422019 +4576000000,-7.413859 +4577000000,-7.409540 +4578000000,-7.408322 +4579000000,-7.464861 +4580000000,-7.392056 +4581000000,-7.409404 +4582000000,-7.388288 +4583000000,-7.493690 +4584000000,-7.472402 +4585000000,-7.489047 +4586000000,-7.442359 +4587000000,-7.454883 +4588000000,-7.474524 +4589000000,-7.452779 +4590000000,-7.348727 +4591000000,-7.347712 +4592000000,-7.414329 +4593000000,-7.343622 +4594000000,-7.386117 +4595000000,-7.366876 +4596000000,-7.436088 +4597000000,-7.450923 +4598000000,-7.416849 +4599000000,-7.441541 +4600000000,-7.334278 +4601000000,-7.331480 +4602000000,-7.318149 +4603000000,-7.320483 +4604000000,-7.347009 +4605000000,-7.360233 +4606000000,-7.375259 +4607000000,-7.386288 +4608000000,-7.420269 +4609000000,-7.326222 +4610000000,-7.409266 +4611000000,-7.354051 +4612000000,-7.301324 +4613000000,-7.334702 +4614000000,-7.299810 +4615000000,-7.329145 +4616000000,-7.340230 +4617000000,-7.408818 +4618000000,-7.310069 +4619000000,-7.315867 +4620000000,-7.403990 +4621000000,-7.401862 +4622000000,-7.290552 +4623000000,-7.293602 +4624000000,-7.361439 +4625000000,-7.301135 +4626000000,-7.373115 +4627000000,-7.400680 +4628000000,-7.341680 +4629000000,-7.358164 +4630000000,-7.377874 +4631000000,-7.399819 +4632000000,-7.295110 +4633000000,-7.341265 +4634000000,-7.381852 +4635000000,-7.391060 +4636000000,-7.336263 +4637000000,-7.296966 +4638000000,-7.381639 +4639000000,-7.342839 +4640000000,-7.314644 +4641000000,-7.323023 +4642000000,-7.311570 +4643000000,-7.391450 +4644000000,-7.388988 +4645000000,-7.375612 +4646000000,-7.300428 +4647000000,-7.366439 +4648000000,-7.329451 +4649000000,-7.309396 +4650000000,-7.304127 +4651000000,-7.381272 +4652000000,-7.356133 +4653000000,-7.390267 +4654000000,-7.350133 +4655000000,-7.376512 +4656000000,-7.399802 +4657000000,-7.318921 +4658000000,-7.391534 +4659000000,-7.387544 +4660000000,-7.332351 +4661000000,-7.380381 +4662000000,-7.363272 +4663000000,-7.307133 +4664000000,-7.332279 +4665000000,-7.306788 +4666000000,-7.351824 +4667000000,-7.307705 +4668000000,-7.299729 +4669000000,-7.331305 +4670000000,-7.299782 +4671000000,-7.345438 +4672000000,-7.299165 +4673000000,-7.384578 +4674000000,-7.294451 +4675000000,-7.289173 +4676000000,-7.287895 +4677000000,-7.325413 +4678000000,-7.324193 +4679000000,-7.343434 +4680000000,-7.305305 +4681000000,-7.293367 +4682000000,-7.276557 +4683000000,-7.250951 +4684000000,-7.285258 +4685000000,-7.309419 +4686000000,-7.311165 +4687000000,-7.272995 +4688000000,-7.270326 +4689000000,-7.301265 +4690000000,-7.244404 +4691000000,-7.214047 +4692000000,-7.274577 +4693000000,-7.216009 +4694000000,-7.270050 +4695000000,-7.267107 +4696000000,-7.270161 +4697000000,-7.235356 +4698000000,-7.204977 +4699000000,-7.196547 +4700000000,-7.252555 +4701000000,-7.180225 +4702000000,-7.259913 +4703000000,-7.244853 +4704000000,-7.198944 +4705000000,-7.165891 +4706000000,-7.242523 +4707000000,-7.232690 +4708000000,-7.158941 +4709000000,-7.163626 +4710000000,-7.230541 +4711000000,-7.218566 +4712000000,-7.178022 +4713000000,-7.218004 +4714000000,-7.168232 +4715000000,-7.125313 +4716000000,-7.161716 +4717000000,-7.154161 +4718000000,-7.153639 +4719000000,-7.145034 +4720000000,-7.140369 +4721000000,-7.098065 +4722000000,-7.141840 +4723000000,-7.079870 +4724000000,-7.151884 +4725000000,-7.064861 +4726000000,-7.091902 +4727000000,-7.127459 +4728000000,-7.117903 +4729000000,-7.042281 +4730000000,-7.062167 +4731000000,-7.031774 +4732000000,-7.066842 +4733000000,-7.054568 +4734000000,-7.077029 +4735000000,-7.043183 +4736000000,-7.006558 +4737000000,-7.051756 +4738000000,-6.975983 +4739000000,-7.032103 +4740000000,-6.949110 +4741000000,-7.009449 +4742000000,-6.999300 +4743000000,-6.958009 +4744000000,-6.965728 +4745000000,-6.964008 +4746000000,-6.906538 +4747000000,-6.940977 +4748000000,-6.883510 +4749000000,-6.920799 +4750000000,-6.907762 +4751000000,-6.927062 +4752000000,-6.926579 +4753000000,-6.915475 +4754000000,-6.842829 +4755000000,-6.883779 +4756000000,-6.833323 +4757000000,-6.875547 +4758000000,-6.850362 +4759000000,-6.786023 +4760000000,-6.792011 +4761000000,-6.769264 +4762000000,-6.796562 +4763000000,-6.754784 +4764000000,-6.779326 +4765000000,-6.791962 +4766000000,-6.745777 +4767000000,-6.763816 +4768000000,-6.722748 +4769000000,-6.767814 +4770000000,-6.697229 +4771000000,-6.715705 +4772000000,-6.750705 +4773000000,-6.714013 +4774000000,-6.708249 +4775000000,-6.703346 +4776000000,-6.686443 +4777000000,-6.711934 +4778000000,-6.697328 +4779000000,-6.667325 +4780000000,-6.637999 +4781000000,-6.642632 +4782000000,-6.606925 +4783000000,-6.655356 +4784000000,-6.594026 +4785000000,-6.634732 +4786000000,-6.641780 +4787000000,-6.642988 +4788000000,-6.570546 +4789000000,-6.564706 +4790000000,-6.569438 +4791000000,-6.558511 +4792000000,-6.598914 +4793000000,-6.563603 +4794000000,-6.573838 +4795000000,-6.551558 +4796000000,-6.530447 +4797000000,-6.576094 +4798000000,-6.586883 +4799000000,-6.583858 +4800000000,-6.521387 +4801000000,-6.564039 +4802000000,-6.575727 +4803000000,-6.520546 +4804000000,-6.580983 +4805000000,-6.576076 +4806000000,-6.541257 +4807000000,-6.564035 +4808000000,-6.568284 +4809000000,-6.511535 +4810000000,-6.526008 +4811000000,-6.532449 +4812000000,-6.570588 +4813000000,-6.501212 +4814000000,-6.553591 +4815000000,-6.527968 +4816000000,-6.572719 +4817000000,-6.540063 +4818000000,-6.545984 +4819000000,-6.541358 +4820000000,-6.535770 +4821000000,-6.555495 +4822000000,-6.582806 +4823000000,-6.566079 +4824000000,-6.511908 +4825000000,-6.589582 +4826000000,-6.513824 +4827000000,-6.514816 +4828000000,-6.562007 +4829000000,-6.601212 +4830000000,-6.580584 +4831000000,-6.570642 +4832000000,-6.590675 +4833000000,-6.591554 +4834000000,-6.549063 +4835000000,-6.579834 +4836000000,-6.617782 +4837000000,-6.638509 +4838000000,-6.607555 +4839000000,-6.622617 +4840000000,-6.595645 +4841000000,-6.578773 +4842000000,-6.594189 +4843000000,-6.597012 +4844000000,-6.618894 +4845000000,-6.674905 +4846000000,-6.681142 +4847000000,-6.609319 +4848000000,-6.631284 +4849000000,-6.649327 +4850000000,-6.626512 +4851000000,-6.659232 +4852000000,-6.709022 +4853000000,-6.692846 +4854000000,-6.732813 +4855000000,-6.677899 +4856000000,-6.744035 +4857000000,-6.704066 +4858000000,-6.672804 +4859000000,-6.762658 +4860000000,-6.748948 +4861000000,-6.769351 +4862000000,-6.702865 +4863000000,-6.778892 +4864000000,-6.726712 +4865000000,-6.774279 +4866000000,-6.790770 +4867000000,-6.732435 +4868000000,-6.752815 +4869000000,-6.760655 +4870000000,-6.804747 +4871000000,-6.769587 +4872000000,-6.755973 +4873000000,-6.809253 +4874000000,-6.817923 +4875000000,-6.770241 +4876000000,-6.774288 +4877000000,-6.826540 +4878000000,-6.788168 +4879000000,-6.815029 +4880000000,-6.797700 +4881000000,-6.859443 +4882000000,-6.846180 +4883000000,-6.879679 +4884000000,-6.881730 +4885000000,-6.881361 +4886000000,-6.881067 +4887000000,-6.821368 +4888000000,-6.874335 +4889000000,-6.830199 +4890000000,-6.836661 +4891000000,-6.869533 +4892000000,-6.901759 +4893000000,-6.909326 +4894000000,-6.905906 +4895000000,-6.913448 +4896000000,-6.884180 +4897000000,-6.917649 +4898000000,-6.876864 +4899000000,-6.917277 +4900000000,-6.862224 +4901000000,-6.865469 +4902000000,-6.916652 +4903000000,-6.882369 +4904000000,-6.904355 +4905000000,-6.926341 +4906000000,-6.896673 +4907000000,-6.900336 +4908000000,-6.882223 +4909000000,-6.903662 +4910000000,-6.863305 +4911000000,-6.909476 +4912000000,-6.879194 +4913000000,-6.892512 +4914000000,-6.902182 +4915000000,-6.896771 +4916000000,-6.882159 +4917000000,-6.835385 +4918000000,-6.890290 +4919000000,-6.879700 +4920000000,-6.849877 +4921000000,-6.868054 +4922000000,-6.824293 +4923000000,-6.862421 +4924000000,-6.836133 +4925000000,-6.806673 +4926000000,-6.837854 +4927000000,-6.837425 +4928000000,-6.804385 +4929000000,-6.796096 +4930000000,-6.829255 +4931000000,-6.814372 +4932000000,-6.780216 +4933000000,-6.757113 +4934000000,-6.755502 +4935000000,-6.761887 +4936000000,-6.740270 +4937000000,-6.788358 +4938000000,-6.769064 +4939000000,-6.767312 +4940000000,-6.715994 +4941000000,-6.753502 +4942000000,-6.709568 +4943000000,-6.697133 +4944000000,-6.696561 +4945000000,-6.717034 +4946000000,-6.712676 +4947000000,-6.700850 +4948000000,-6.670802 +4949000000,-6.679999 +4950000000,-6.660453 +4951000000,-6.583090 +4952000000,-6.644104 +4953000000,-6.560446 +4954000000,-6.566772 +4955000000,-6.586303 +4956000000,-6.547477 +4957000000,-6.559716 +4958000000,-6.513913 +4959000000,-6.479070 +4960000000,-6.513551 +4961000000,-6.512751 +4962000000,-6.470878 +4963000000,-6.456317 +4964000000,-6.411938 +4965000000,-6.434842 +4966000000,-6.418372 +4967000000,-6.428471 +4968000000,-6.390057 +4969000000,-6.382808 +4970000000,-6.382062 +4971000000,-6.324197 +4972000000,-6.306133 +4973000000,-6.329325 +4974000000,-6.247734 +4975000000,-6.276319 +4976000000,-6.245209 +4977000000,-6.253515 +4978000000,-6.224082 +4979000000,-6.211963 +4980000000,-6.180524 +4981000000,-6.178232 +4982000000,-6.119798 +4983000000,-6.065605 +4984000000,-6.075456 +4985000000,-6.075443 +4986000000,-6.019176 +4987000000,-6.038245 +4988000000,-5.987110 +4989000000,-5.945717 +4990000000,-5.969335 +4991000000,-5.938059 +4992000000,-5.927876 +4993000000,-5.908290 +4994000000,-5.901607 +4995000000,-5.825641 +4996000000,-5.801910 +4997000000,-5.834002 +4998000000,-5.768694 +4999000000,-5.788083 +5000000000,-5.895145 +5001000000,-5.867517 +5002000000,-5.797498 +5003000000,-5.757179 +5004000000,-5.694491 +5005000000,-5.660324 +5006000000,-5.677663 +5007000000,-5.600016 +5008000000,-5.618290 +5009000000,-5.523164 +5010000000,-5.534625 +5011000000,-5.519915 +5012000000,-5.474049 +5013000000,-5.458762 +5014000000,-5.379993 +5015000000,-5.395214 +5016000000,-5.315860 +5017000000,-5.337577 +5018000000,-5.280873 +5019000000,-5.281403 +5020000000,-5.198121 +5021000000,-5.206039 +5022000000,-5.194843 +5023000000,-5.135367 +5024000000,-5.151949 +5025000000,-5.111073 +5026000000,-5.099887 +5027000000,-5.065778 +5028000000,-5.007980 +5029000000,-5.015293 +5030000000,-4.986862 +5031000000,-4.958491 +5032000000,-4.927227 +5033000000,-4.875717 +5034000000,-4.877251 +5035000000,-4.848218 +5036000000,-4.807506 +5037000000,-4.811662 +5038000000,-4.771953 +5039000000,-4.766837 +5040000000,-4.758477 +5041000000,-4.745986 +5042000000,-4.684274 +5043000000,-4.702094 +5044000000,-4.680290 +5045000000,-4.673492 +5046000000,-4.605228 +5047000000,-4.608076 +5048000000,-4.619541 +5049000000,-4.554505 +5050000000,-4.558166 +5051000000,-4.528070 +5052000000,-4.543849 +5053000000,-4.508584 +5054000000,-4.519850 +5055000000,-4.493553 +5056000000,-4.486704 +5057000000,-4.445194 +5058000000,-4.436262 +5059000000,-4.423635 +5060000000,-4.407334 +5061000000,-4.417913 +5062000000,-4.434919 +5063000000,-4.403732 +5064000000,-4.380506 +5065000000,-4.398372 +5066000000,-4.372793 +5067000000,-4.357223 +5068000000,-4.358661 +5069000000,-4.345188 +5070000000,-4.335608 +5071000000,-4.368733 +5072000000,-4.349884 +5073000000,-4.341518 +5074000000,-4.361175 +5075000000,-4.357630 +5076000000,-4.339404 +5077000000,-4.318202 +5078000000,-4.343118 +5079000000,-4.328926 +5080000000,-4.359302 +5081000000,-4.319583 +5082000000,-4.333918 +5083000000,-4.327009 +5084000000,-4.336860 +5085000000,-4.350433 +5086000000,-4.343482 +5087000000,-4.369151 +5088000000,-4.385480 +5089000000,-4.356845 +5090000000,-4.395913 +5091000000,-4.354299 +5092000000,-4.406787 +5093000000,-4.414019 +5094000000,-4.421820 +5095000000,-4.411041 +5096000000,-4.391463 +5097000000,-4.445154 +5098000000,-4.435729 +5099000000,-4.422214 +5100000000,-4.465517 +5101000000,-4.488866 +5102000000,-4.467453 +5103000000,-4.474474 +5104000000,-4.522218 +5105000000,-4.523274 +5106000000,-4.492422 +5107000000,-4.505359 +5108000000,-4.529059 +5109000000,-4.572287 +5110000000,-4.558145 +5111000000,-4.557443 +5112000000,-4.571202 +5113000000,-4.619478 +5114000000,-4.638677 +5115000000,-4.608386 +5116000000,-4.658519 +5117000000,-4.681485 +5118000000,-4.690366 +5119000000,-4.693314 +5120000000,-4.695990 +5121000000,-4.707169 +5122000000,-4.760069 +5123000000,-4.776721 +5124000000,-4.794025 +5125000000,-4.784122 +5126000000,-4.813436 +5127000000,-4.821220 +5128000000,-4.857839 +5129000000,-4.872467 +5130000000,-4.886082 +5131000000,-4.864006 +5132000000,-4.898635 +5133000000,-4.916982 +5134000000,-4.954956 +5135000000,-4.926905 +5136000000,-4.980323 +5137000000,-4.996078 +5138000000,-5.001031 +5139000000,-5.024794 +5140000000,-5.017736 +5141000000,-5.019540 +5142000000,-5.047495 +5143000000,-5.054895 +5144000000,-5.078418 +5145000000,-5.087131 +5146000000,-5.141084 +5147000000,-5.141228 +5148000000,-5.144918 +5149000000,-5.172948 +5150000000,-5.187814 +5151000000,-5.195702 +5152000000,-5.186861 +5153000000,-5.233889 +5154000000,-5.232469 +5155000000,-5.255292 +5156000000,-5.287366 +5157000000,-5.252480 +5158000000,-5.271525 +5159000000,-5.327651 +5160000000,-5.321016 +5161000000,-5.318642 +5162000000,-5.335380 +5163000000,-5.372649 +5164000000,-5.384436 +5165000000,-5.385253 +5166000000,-5.410670 +5167000000,-5.407887 +5168000000,-5.418372 +5169000000,-5.419808 +5170000000,-5.454513 +5171000000,-5.465250 +5172000000,-5.457862 +5173000000,-5.434904 +5174000000,-5.447962 +5175000000,-5.456866 +5176000000,-5.465975 +5177000000,-5.497677 +5178000000,-5.484187 +5179000000,-5.524877 +5180000000,-5.545940 +5181000000,-5.517680 +5182000000,-5.562216 +5183000000,-5.545768 +5184000000,-5.540630 +5185000000,-5.539391 +5186000000,-5.544797 +5187000000,-5.588534 +5188000000,-5.597035 +5189000000,-5.582354 +5190000000,-5.601847 +5191000000,-5.622126 +5192000000,-5.583033 +5193000000,-5.627673 +5194000000,-5.601680 +5195000000,-5.605567 +5196000000,-5.630824 +5197000000,-5.624989 +5198000000,-5.634013 +5199000000,-5.641175 +5200000000,-5.638491 +5201000000,-5.671468 +5202000000,-5.621519 +5203000000,-5.638507 +5204000000,-5.677215 +5205000000,-5.632747 +5206000000,-5.647615 +5207000000,-5.641701 +5208000000,-5.628152 +5209000000,-5.680080 +5210000000,-5.629481 +5211000000,-5.680228 +5212000000,-5.634329 +5213000000,-5.667699 +5214000000,-5.676330 +5215000000,-5.673110 +5216000000,-5.660133 +5217000000,-5.676146 +5218000000,-5.630743 +5219000000,-5.625176 +5220000000,-5.622975 +5221000000,-5.630977 +5222000000,-5.653827 +5223000000,-5.659049 +5224000000,-5.623200 +5225000000,-5.646499 +5226000000,-5.648178 +5227000000,-5.665678 +5228000000,-5.660287 +5229000000,-5.614791 +5230000000,-5.660229 +5231000000,-5.616160 +5232000000,-5.652011 +5233000000,-5.602805 +5234000000,-5.603417 +5235000000,-5.637641 +5236000000,-5.602357 +5237000000,-5.596512 +5238000000,-5.619030 +5239000000,-5.638361 +5240000000,-5.608373 +5241000000,-5.617623 +5242000000,-5.587535 +5243000000,-5.631301 +5244000000,-5.581311 +5245000000,-5.626031 +5246000000,-5.599111 +5247000000,-5.625078 +5248000000,-5.615378 +5249000000,-5.575188 +5250000000,-5.613126 +5251000000,-5.588441 +5252000000,-5.558369 +5253000000,-5.594869 +5254000000,-5.557392 +5255000000,-5.568115 +5256000000,-5.556911 +5257000000,-5.580347 +5258000000,-5.572466 +5259000000,-5.584325 +5260000000,-5.542957 +5261000000,-5.591172 +5262000000,-5.584710 +5263000000,-5.590980 +5264000000,-5.584825 +5265000000,-5.562814 +5266000000,-5.586351 +5267000000,-5.570977 +5268000000,-5.567329 +5269000000,-5.547981 +5270000000,-5.554165 +5271000000,-5.548825 +5272000000,-5.598890 +5273000000,-5.597886 +5274000000,-5.566329 +5275000000,-5.607764 +5276000000,-5.559930 +5277000000,-5.563681 +5278000000,-5.584357 +5279000000,-5.575713 +5280000000,-5.602467 +5281000000,-5.630334 +5282000000,-5.619994 +5283000000,-5.634720 +5284000000,-5.647874 +5285000000,-5.644225 +5286000000,-5.642044 +5287000000,-5.645185 +5288000000,-5.626655 +5289000000,-5.644719 +5290000000,-5.686990 +5291000000,-5.643090 +5292000000,-5.697915 +5293000000,-5.700604 +5294000000,-5.700897 +5295000000,-5.725975 +5296000000,-5.739505 +5297000000,-5.750636 +5298000000,-5.750956 +5299000000,-5.756966 +5300000000,-5.740981 +5301000000,-5.774027 +5302000000,-5.754660 +5303000000,-5.802402 +5304000000,-5.799523 +5305000000,-5.832396 +5306000000,-5.842141 +5307000000,-5.850542 +5308000000,-5.872808 +5309000000,-5.887723 +5310000000,-5.901747 +5311000000,-5.895755 +5312000000,-5.888159 +5313000000,-5.942294 +5314000000,-5.928337 +5315000000,-5.936384 +5316000000,-5.984882 +5317000000,-6.005736 +5318000000,-5.987986 +5319000000,-6.017448 +5320000000,-6.046567 +5321000000,-6.063604 +5322000000,-6.052864 +5323000000,-6.089577 +5324000000,-6.138295 +5325000000,-6.172954 +5326000000,-6.139076 +5327000000,-6.181927 +5328000000,-6.232486 +5329000000,-6.239779 +5330000000,-6.269244 +5331000000,-6.265809 +5332000000,-6.313540 +5333000000,-6.295395 +5334000000,-6.351091 +5335000000,-6.351263 +5336000000,-6.382291 +5337000000,-6.405602 +5338000000,-6.377594 +5339000000,-6.401993 +5340000000,-6.467815 +5341000000,-6.474203 +5342000000,-6.491934 +5343000000,-6.531936 +5344000000,-6.562559 +5345000000,-6.582901 +5346000000,-6.560623 +5347000000,-6.624613 +5348000000,-6.648352 +5349000000,-6.657146 +5350000000,-6.668012 +5351000000,-6.703144 +5352000000,-6.719800 +5353000000,-6.760044 +5354000000,-6.794384 +5355000000,-6.763782 +5356000000,-6.832343 +5357000000,-6.854799 +5358000000,-6.863729 +5359000000,-6.854904 +5360000000,-6.894878 +5361000000,-6.907022 +5362000000,-6.964166 +5363000000,-6.993742 +5364000000,-6.984219 +5365000000,-7.004197 +5366000000,-7.022745 +5367000000,-7.082241 +5368000000,-7.096995 +5369000000,-7.118768 +5370000000,-7.108867 +5371000000,-7.175859 +5372000000,-7.152534 +5373000000,-7.186620 +5374000000,-7.205908 +5375000000,-7.258946 +5376000000,-7.261265 +5377000000,-7.301682 +5378000000,-7.299261 +5379000000,-7.339362 +5380000000,-7.313618 +5381000000,-7.348302 +5382000000,-7.384970 +5383000000,-7.424766 +5384000000,-7.409358 +5385000000,-7.463191 +5386000000,-7.485963 +5387000000,-7.509643 +5388000000,-7.526246 +5389000000,-7.555120 +5390000000,-7.558113 +5391000000,-7.549623 +5392000000,-7.553054 +5393000000,-7.621158 +5394000000,-7.624147 +5395000000,-7.606102 +5396000000,-7.638943 +5397000000,-7.697418 +5398000000,-7.713341 +5399000000,-7.693190 +5400000000,-7.696635 +5401000000,-7.730493 +5402000000,-7.778509 +5403000000,-7.744286 +5404000000,-7.781556 +5405000000,-7.813496 +5406000000,-7.785855 +5407000000,-7.797086 +5408000000,-7.862664 +5409000000,-7.846117 +5410000000,-7.883627 +5411000000,-7.902882 +5412000000,-7.901712 +5413000000,-7.895051 +5414000000,-7.897685 +5415000000,-7.913330 +5416000000,-7.968259 +5417000000,-7.935276 +5418000000,-7.970362 +5419000000,-7.960746 +5420000000,-7.971509 +5421000000,-7.994725 +5422000000,-8.026220 +5423000000,-8.045184 +5424000000,-8.061605 +5425000000,-8.034641 +5426000000,-8.077071 +5427000000,-8.047799 +5428000000,-8.064153 +5429000000,-8.079828 +5430000000,-8.082121 +5431000000,-8.133170 +5432000000,-8.095976 +5433000000,-8.114590 +5434000000,-8.116698 +5435000000,-8.170761 +5436000000,-8.180775 +5437000000,-8.179131 +5438000000,-8.190295 +5439000000,-8.198957 +5440000000,-8.208532 +5441000000,-8.188778 +5442000000,-8.223898 +5443000000,-8.188576 +5444000000,-8.196960 +5445000000,-8.197802 +5446000000,-8.227117 +5447000000,-8.217561 +5448000000,-8.201518 +5449000000,-8.235411 +5450000000,-8.252599 +5451000000,-8.226301 +5452000000,-8.263554 +5453000000,-8.239595 +5454000000,-8.239763 +5455000000,-8.278380 +5456000000,-8.249398 +5457000000,-8.255415 +5458000000,-8.249484 +5459000000,-8.237888 +5460000000,-8.236525 +5461000000,-8.243330 +5462000000,-8.243647 +5463000000,-8.273954 +5464000000,-8.258276 +5465000000,-8.244170 +5466000000,-8.251786 +5467000000,-8.247083 +5468000000,-8.264981 +5469000000,-8.271660 +5470000000,-8.292933 +5471000000,-8.240702 +5472000000,-8.267612 +5473000000,-8.252653 +5474000000,-8.288402 +5475000000,-8.256837 +5476000000,-8.248419 +5477000000,-8.252795 +5478000000,-8.257988 +5479000000,-8.252847 +5480000000,-8.269368 +5481000000,-8.260724 +5482000000,-8.257898 +5483000000,-8.268410 +5484000000,-8.246049 +5485000000,-8.240553 +5486000000,-8.210879 +5487000000,-8.243718 +5488000000,-8.226183 +5489000000,-8.252051 +5490000000,-8.249264 +5491000000,-8.190151 +5492000000,-8.199344 +5493000000,-8.227162 +5494000000,-8.223359 +5495000000,-8.176785 +5496000000,-8.191836 +5497000000,-8.212706 +5498000000,-8.188841 +5499000000,-8.191578 +5500000000,-8.195282 +5501000000,-8.167384 +5502000000,-8.167370 +5503000000,-8.184142 +5504000000,-8.186904 +5505000000,-8.160252 +5506000000,-8.167913 +5507000000,-8.151269 +5508000000,-8.131089 +5509000000,-8.161002 +5510000000,-8.154995 +5511000000,-8.109084 +5512000000,-8.123986 +5513000000,-8.114925 +5514000000,-8.116330 +5515000000,-8.141338 +5516000000,-8.100504 +5517000000,-8.091566 +5518000000,-8.085573 +5519000000,-8.082668 +5520000000,-8.104611 +5521000000,-8.083492 +5522000000,-8.110788 +5523000000,-8.056201 +5524000000,-8.067762 +5525000000,-8.053277 +5526000000,-8.073565 +5527000000,-8.078010 +5528000000,-8.059608 +5529000000,-8.077391 +5530000000,-8.050947 +5531000000,-8.086034 +5532000000,-8.076625 +5533000000,-8.072992 +5534000000,-8.067373 +5535000000,-8.061851 +5536000000,-8.065339 +5537000000,-8.025603 +5538000000,-8.045974 +5539000000,-8.041422 +5540000000,-8.014551 +5541000000,-8.052635 +5542000000,-8.022303 +5543000000,-8.055547 +5544000000,-8.043344 +5545000000,-8.025521 +5546000000,-8.017119 +5547000000,-8.034250 +5548000000,-8.044444 +5549000000,-8.024251 +5550000000,-8.003358 +5551000000,-8.002409 +5552000000,-8.053016 +5553000000,-8.008823 +5554000000,-8.008997 +5555000000,-8.019274 +5556000000,-8.041347 +5557000000,-8.032163 +5558000000,-8.020703 +5559000000,-8.036595 +5560000000,-8.026489 +5561000000,-8.054247 +5562000000,-8.032532 +5563000000,-8.044574 +5564000000,-8.031385 +5565000000,-8.054450 +5566000000,-8.038888 +5567000000,-8.038541 +5568000000,-8.057275 +5569000000,-8.093897 +5570000000,-8.065973 +5571000000,-8.074027 +5572000000,-8.067111 +5573000000,-8.115094 +5574000000,-8.119755 +5575000000,-8.080105 +5576000000,-8.131217 +5577000000,-8.108673 +5578000000,-8.139182 +5579000000,-8.119759 +5580000000,-8.117757 +5581000000,-8.138998 +5582000000,-8.168414 +5583000000,-8.170628 +5584000000,-8.149620 +5585000000,-8.187304 +5586000000,-8.186296 +5587000000,-8.208574 +5588000000,-8.177846 +5589000000,-8.187692 +5590000000,-8.210865 +5591000000,-8.202363 +5592000000,-8.210174 +5593000000,-8.219795 +5594000000,-8.234298 +5595000000,-8.244316 +5596000000,-8.288781 +5597000000,-8.256815 +5598000000,-8.272982 +5599000000,-8.316842 +5600000000,-8.313390 +5601000000,-8.326319 +5602000000,-8.314968 +5603000000,-8.330594 +5604000000,-8.354654 +5605000000,-8.340955 +5606000000,-8.386266 +5607000000,-8.361249 +5608000000,-8.374364 +5609000000,-8.386411 +5610000000,-8.394563 +5611000000,-8.409496 +5612000000,-8.446806 +5613000000,-8.430791 +5614000000,-8.472682 +5615000000,-8.478192 +5616000000,-8.467264 +5617000000,-8.509575 +5618000000,-8.514615 +5619000000,-8.542636 +5620000000,-8.544073 +5621000000,-8.568540 +5622000000,-8.578240 +5623000000,-8.568654 +5624000000,-8.584931 +5625000000,-8.585796 +5626000000,-8.610890 +5627000000,-8.602154 +5628000000,-8.656614 +5629000000,-8.647289 +5630000000,-8.676901 +5631000000,-8.669582 +5632000000,-8.705866 +5633000000,-8.676860 +5634000000,-8.710643 +5635000000,-8.726415 +5636000000,-8.751314 +5637000000,-8.742202 +5638000000,-8.766968 +5639000000,-8.754082 +5640000000,-8.802439 +5641000000,-8.807783 +5642000000,-8.804944 +5643000000,-8.842943 +5644000000,-8.845522 +5645000000,-8.854912 +5646000000,-8.865518 +5647000000,-8.857724 +5648000000,-8.857988 +5649000000,-8.903374 +5650000000,-8.916473 +5651000000,-8.931596 +5652000000,-8.910264 +5653000000,-8.952943 +5654000000,-8.959209 +5655000000,-8.978154 +5656000000,-8.998262 +5657000000,-8.978235 +5658000000,-9.019352 +5659000000,-9.019901 +5660000000,-9.041337 +5661000000,-9.055708 +5662000000,-9.068560 +5663000000,-9.039730 +5664000000,-9.089349 +5665000000,-9.060598 +5666000000,-9.074764 +5667000000,-9.092266 +5668000000,-9.134739 +5669000000,-9.109598 +5670000000,-9.123981 +5671000000,-9.165764 +5672000000,-9.143861 +5673000000,-9.188827 +5674000000,-9.201428 +5675000000,-9.201224 +5676000000,-9.223715 +5677000000,-9.192869 +5678000000,-9.203959 +5679000000,-9.220530 +5680000000,-9.225829 +5681000000,-9.271257 +5682000000,-9.236931 +5683000000,-9.248320 +5684000000,-9.291834 +5685000000,-9.296300 +5686000000,-9.268752 +5687000000,-9.295883 +5688000000,-9.323267 +5689000000,-9.335001 +5690000000,-9.318121 +5691000000,-9.310554 +5692000000,-9.352675 +5693000000,-9.325081 +5694000000,-9.360413 +5695000000,-9.375380 +5696000000,-9.384238 +5697000000,-9.367854 +5698000000,-9.375092 +5699000000,-9.383069 +5700000000,-9.403057 +5701000000,-9.394196 +5702000000,-9.405932 +5703000000,-9.390367 +5704000000,-9.420263 +5705000000,-9.390998 +5706000000,-9.410298 +5707000000,-9.382089 +5708000000,-9.399852 +5709000000,-9.418469 +5710000000,-9.403474 +5711000000,-9.394343 +5712000000,-9.431625 +5713000000,-9.420762 +5714000000,-9.427064 +5715000000,-9.401982 +5716000000,-9.408630 +5717000000,-9.406429 +5718000000,-9.425332 +5719000000,-9.435769 +5720000000,-9.410753 +5721000000,-9.407406 +5722000000,-9.429129 +5723000000,-9.418435 +5724000000,-9.436483 +5725000000,-9.410446 +5726000000,-9.405143 +5727000000,-9.428441 +5728000000,-9.415283 +5729000000,-9.408277 +5730000000,-9.415254 +5731000000,-9.392538 +5732000000,-9.421644 +5733000000,-9.410192 +5734000000,-9.390218 +5735000000,-9.415674 +5736000000,-9.383643 +5737000000,-9.390091 +5738000000,-9.406777 +5739000000,-9.401988 +5740000000,-9.393975 +5741000000,-9.381979 +5742000000,-9.385701 +5743000000,-9.368962 +5744000000,-9.366819 +5745000000,-9.346868 +5746000000,-9.363845 +5747000000,-9.340457 +5748000000,-9.351872 +5749000000,-9.349813 +5750000000,-9.335006 +5751000000,-9.327819 +5752000000,-9.308270 +5753000000,-9.329919 +5754000000,-9.318967 +5755000000,-9.314847 +5756000000,-9.307837 +5757000000,-9.267527 +5758000000,-9.281844 +5759000000,-9.249372 +5760000000,-9.242389 +5761000000,-9.257843 +5762000000,-9.232374 +5763000000,-9.222404 +5764000000,-9.229113 +5765000000,-9.210887 +5766000000,-9.208439 +5767000000,-9.203524 +5768000000,-9.173225 +5769000000,-9.170136 +5770000000,-9.175660 +5771000000,-9.146995 +5772000000,-9.139770 +5773000000,-9.122164 +5774000000,-9.132757 +5775000000,-9.098298 +5776000000,-9.088191 +5777000000,-9.100591 +5778000000,-9.068846 +5779000000,-9.078536 +5780000000,-9.058184 +5781000000,-9.045314 +5782000000,-9.023758 +5783000000,-9.011753 +5784000000,-9.000594 +5785000000,-8.989263 +5786000000,-8.997223 +5787000000,-8.961283 +5788000000,-8.966503 +5789000000,-8.965535 +5790000000,-8.929112 +5791000000,-8.939627 +5792000000,-8.923124 +5793000000,-8.901167 +5794000000,-8.881587 +5795000000,-8.881238 +5796000000,-8.860334 +5797000000,-8.851913 +5798000000,-8.847983 +5799000000,-8.829206 +5800000000,-8.824961 +5801000000,-8.814891 +5802000000,-8.783494 +5803000000,-8.767006 +5804000000,-8.767550 +5805000000,-8.729514 +5806000000,-8.713219 +5807000000,-8.696482 +5808000000,-8.687936 +5809000000,-8.665585 +5810000000,-8.637255 +5811000000,-8.634368 +5812000000,-8.601737 +5813000000,-8.597887 +5814000000,-8.579998 +5815000000,-8.547049 +5816000000,-8.533352 +5817000000,-8.528435 +5818000000,-8.497405 +5819000000,-8.475216 +5820000000,-8.461643 +5821000000,-8.438897 +5822000000,-8.427648 +5823000000,-8.408625 +5824000000,-8.404579 +5825000000,-8.384060 +5826000000,-8.354006 +5827000000,-8.347092 +5828000000,-8.324502 +5829000000,-8.311365 +5830000000,-8.279031 +5831000000,-8.261942 +5832000000,-8.256936 +5833000000,-8.226755 +5834000000,-8.213045 +5835000000,-8.207158 +5836000000,-8.188927 +5837000000,-8.174971 +5838000000,-8.142392 +5839000000,-8.123537 +5840000000,-8.110909 +5841000000,-8.103709 +5842000000,-8.114420 +5843000000,-8.094182 +5844000000,-8.081073 +5845000000,-8.059805 +5846000000,-8.040300 +5847000000,-8.023141 +5848000000,-8.012733 +5849000000,-7.993522 +5850000000,-7.978124 +5851000000,-7.947666 +5852000000,-7.934761 +5853000000,-7.920279 +5854000000,-7.890284 +5855000000,-7.882352 +5856000000,-7.860525 +5857000000,-7.840856 +5858000000,-7.810734 +5859000000,-7.790846 +5860000000,-7.782825 +5861000000,-7.758412 +5862000000,-7.736529 +5863000000,-7.730340 +5864000000,-7.702909 +5865000000,-7.681242 +5866000000,-7.668824 +5867000000,-7.648948 +5868000000,-7.634628 +5869000000,-7.607969 +5870000000,-7.594958 +5871000000,-7.572814 +5872000000,-7.562022 +5873000000,-7.546817 +5874000000,-7.521096 +5875000000,-7.499892 +5876000000,-7.486047 +5877000000,-7.476803 +5878000000,-7.448607 +5879000000,-7.436228 +5880000000,-7.413970 +5881000000,-7.401212 +5882000000,-7.385271 +5883000000,-7.376012 +5884000000,-7.359440 +5885000000,-7.335949 +5886000000,-7.327023 +5887000000,-7.307196 +5888000000,-7.292228 +5889000000,-7.280123 +5890000000,-7.263466 +5891000000,-7.244878 +5892000000,-7.229846 +5893000000,-7.225224 +5894000000,-7.215693 +5895000000,-7.198992 +5896000000,-7.177111 +5897000000,-7.170039 +5898000000,-7.149445 +5899000000,-7.135916 +5900000000,-7.127260 +5901000000,-7.106435 +5902000000,-7.094691 +5903000000,-7.074205 +5904000000,-7.060817 +5905000000,-7.044557 +5906000000,-7.026757 +5907000000,-7.010111 +5908000000,-6.996128 +5909000000,-6.983067 +5910000000,-6.966697 +5911000000,-6.951649 +5912000000,-6.936551 +5913000000,-6.921557 +5914000000,-6.907279 +5915000000,-6.889251 +5916000000,-6.869800 +5917000000,-6.862753 +5918000000,-6.848921 +5919000000,-6.832191 +5920000000,-6.815387 +5921000000,-6.795881 +5922000000,-6.787869 +5923000000,-6.770658 +5924000000,-6.761683 +5925000000,-6.738647 +5926000000,-6.725311 +5927000000,-6.722851 +5928000000,-6.707579 +5929000000,-6.696885 +5930000000,-6.677649 +5931000000,-6.664788 +5932000000,-6.654669 +5933000000,-6.641927 +5934000000,-6.630940 +5935000000,-6.614163 +5936000000,-6.599362 +5937000000,-6.588331 +5938000000,-6.580686 +5939000000,-6.570078 +5940000000,-6.550134 +5941000000,-6.539009 +5942000000,-6.527410 +5943000000,-6.513552 +5944000000,-6.500439 +5945000000,-6.490602 +5946000000,-6.478744 +5947000000,-6.467261 +5948000000,-6.455702 +5949000000,-6.444611 +5950000000,-6.437851 +5951000000,-6.424897 +5952000000,-6.409781 +5953000000,-6.403734 +5954000000,-6.387779 +5955000000,-6.381892 +5956000000,-6.369540 +5957000000,-6.360882 +5958000000,-6.350751 +5959000000,-6.337378 +5960000000,-6.325506 +5961000000,-6.313272 +5962000000,-6.305999 +5963000000,-6.293311 +5964000000,-6.287086 +5965000000,-6.300553 +5966000000,-6.290752 +5967000000,-6.284952 +5968000000,-6.273307 +5969000000,-6.259460 +5970000000,-6.248449 +5971000000,-6.236686 +5972000000,-6.229088 +5973000000,-6.220605 +5974000000,-6.210827 +5975000000,-6.203440 +5976000000,-6.193140 +5977000000,-6.186417 +5978000000,-6.177867 +5979000000,-6.167704 +5980000000,-6.156894 +5981000000,-6.150550 +5982000000,-6.138919 +5983000000,-6.131430 +5984000000,-6.118782 +5985000000,-6.112826 +5986000000,-6.104535 +5987000000,-6.099703 +5988000000,-6.087829 +5989000000,-6.078998 +5990000000,-6.071156 +5991000000,-6.061865 +5992000000,-6.055512 +5993000000,-6.046406 +5994000000,-6.036323 +5995000000,-6.029934 +5996000000,-6.020599 +5997000000,-6.016926 +5998000000,-6.007914 +5999000000,-6.002384 +6000000000,-5.993219 From 838c177eba9bb3701d14913a3324337b76912da3 Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Tue, 28 May 2024 16:58:05 -0500 Subject: [PATCH 047/238] libbladeRF: gain_calibration: load function initialized --- .../libraries/libbladeRF/include/libbladeRF.h | 27 ++++ host/libraries/libbladeRF/src/bladerf.c | 25 +++- .../libbladeRF/src/device_calibration.c | 138 ++++++++++++++++++ .../test_gain_calibration/src/main.c | 5 + 4 files changed, 194 insertions(+), 1 deletion(-) create mode 100644 host/libraries/libbladeRF/src/device_calibration.c diff --git a/host/libraries/libbladeRF/include/libbladeRF.h b/host/libraries/libbladeRF/include/libbladeRF.h index 105122c9..129ed0d9 100644 --- a/host/libraries/libbladeRF/include/libbladeRF.h +++ b/host/libraries/libbladeRF/include/libbladeRF.h @@ -4171,6 +4171,33 @@ struct bladerf_gain_cal_tbl { } state; /**< Calibration state */ }; + +/** + * @brief Loads and applies gain calibration for a specified channel from a + * file. + * + * This function adjusts the specified channel's gain settings on the bladeRF + * device using calibration data from the provided file path. It supports + * calibration files in CSV format, automatically converting them to binary + * format as required by the device. This ensures the device operates with + * optimized gain settings across its frequency range. The operation is + * protected by mutex locks to maintain thread safety. + * + * @param[in] dev Pointer to the initialized bladeRF device. + * @param[in] ch The target channel (RX or TX) for gain calibration. + * @param[in] cal_file_loc Path to the calibration file, either in CSV or binary + * format. CSV files are converted to binary format during the process. + * + * @return 0 on success, indicating that the calibration data was successfully + * applied to the channel. Returns BLADERF_ERR_UNSUPPORTED if the device or + * channel does not support gain calibration. Other BLADERF_ERR_* error codes + * indicate specific failures, such as file access issues or conversion errors. + */ +API_EXPORT +int CALL_CONV bladerf_load_gain_calibration(struct bladerf *dev, + bladerf_channel ch, + const char* cal_file_loc); + /** @} (End of FN_CAL) */ /** diff --git a/host/libraries/libbladeRF/src/bladerf.c b/host/libraries/libbladeRF/src/bladerf.c index 528f155f..b35a9152 100644 --- a/host/libraries/libbladeRF/src/bladerf.c +++ b/host/libraries/libbladeRF/src/bladerf.c @@ -2137,4 +2137,27 @@ int bladerf_set_oversample_register_config(struct bladerf *dev) { bladerf_set_rfic_register(dev,0x3f6,0x03); return 0; -} \ No newline at end of file +} + +/******************************************************************************/ +/* Calibration */ +/******************************************************************************/ + +int bladerf_load_gain_calibration(struct bladerf *dev, bladerf_channel ch, const char* cal_file_loc) +{ + int status = 0; + const char *board_name; + log_debug("Loading gain calibration\n"); + MUTEX_LOCK(&dev->lock); + + board_name = bladerf_get_board_name(dev); + if (strcmp(board_name, "bladerf2") != 0) { + log_error("Gain calibration unsupported on this device: %s\n", board_name); + status = BLADERF_ERR_UNSUPPORTED; + goto error; + } + +error: + MUTEX_UNLOCK(&dev->lock); + return status; +} diff --git a/host/libraries/libbladeRF/src/device_calibration.c b/host/libraries/libbladeRF/src/device_calibration.c new file mode 100644 index 00000000..8fbb8252 --- /dev/null +++ b/host/libraries/libbladeRF/src/device_calibration.c @@ -0,0 +1,138 @@ +/* + * This file is part of the bladeRF project: + * http://www.github.com/nuand/bladeRF + * + * Copyright (C) 2023 Nuand LLC + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + + +#include +#include +#include +#include "libbladeRF.h" +#include "board/board.h" +#include "device_calibration.h" +#include "log.h" +#include "common.h" + +int gain_cal_csv_to_bin(const char *csv_path, const char *binary_path) +{ + uint64_t frequency; + float power; + char line[256]; + char current_dir[1000]; + int status = 0; + + FILE *csvFile = fopen(csv_path, "r"); + FILE *binaryFile = fopen(binary_path, "wb"); + if (!csvFile || !binaryFile) { + status = BLADERF_ERR_NO_FILE; + if (getcwd(current_dir, sizeof(current_dir)) != NULL) { + log_error("Error opening calibration file: %s\n", strcat(current_dir, csv_path)); + } else { + log_error("Error opening calibration file\n"); + } + goto error; + } + + /** Check for empty CSV */ + if (!fgets(line, sizeof(line), csvFile)) { + status = BLADERF_ERR_INVAL; + log_error("Error reading header from CSV file or file is empty.\n"); + goto error; + } + + /** Transfer CSV data to binary */ + while (fgets(line, sizeof(line), csvFile)) { + sscanf(line, "%lu,%f", &frequency, &power); + fwrite(&frequency, sizeof(uint64_t), 1, binaryFile); + fwrite(&power, sizeof(float), 1, binaryFile); + } + +error: + if (csvFile) + fclose(csvFile); + if (binaryFile) + fclose(binaryFile); + return status; +} + +static int gain_cal_tbl_init(struct gain_cal_tbl *tbl, uint32_t num_entries) { + if (tbl == NULL) { + log_error("calibration table is NULL\n"); + return BLADERF_ERR_MEM; + } + + tbl->version = (struct bladerf_version){0, 0, 0, NULL}; + tbl->n_entries = num_entries; + tbl->start_freq = 0; + tbl->stop_freq = 0; + + tbl->entries = malloc(num_entries * sizeof(struct gain_cal_entry)); + if (tbl->entries == NULL) { + log_error("failed to allocate memory for calibration table entries\n"); + return BLADERF_ERR_MEM; + } + + tbl->state = BLADERF_GAIN_CAL_LOADED; + return 0; +} + +int load_gain_calibration(struct bladerf *dev, bladerf_channel ch, const char *binary_path) { + int num_channels = 4; + struct gain_cal_tbl gain_tbls[num_channels]; + uint64_t frequency; + float power; + int entry_counter; + int status = 0; + + FILE *binaryFile = fopen(binary_path, "rb"); + if (!binaryFile) { + log_error("Error opening binary file.\n"); + status = BLADERF_ERR_NO_FILE; + goto error; + } + + status = gain_cal_tbl_init(&gain_tbls[ch], (uint32_t) 10e3); + if (status != 0) { + log_error("Error initializing gain calibration table\n"); + status = BLADERF_ERR_MEM; + goto error; + } + + entry_counter = 0; + while (fread(&frequency, sizeof(uint64_t), 1, binaryFile) && fread(&power, sizeof(float), 1, binaryFile)) { + gain_tbls[ch].entries[entry_counter].freq = frequency; + gain_tbls[ch].entries[entry_counter].gain_corr = power; + entry_counter++; + } + + gain_tbls[ch].start_freq = gain_tbls[ch].entries[0].freq; + gain_tbls[ch].stop_freq = gain_tbls[ch].entries[entry_counter-1].freq; + gain_tbls[ch].n_entries = entry_counter; + gain_tbls[ch].ch = ch; + gain_tbls[ch].state = BLADERF_GAIN_CAL_LOADED; + gain_tbls[ch].enabled = true; + + free(dev->gain_tbls[ch].entries); + dev->gain_tbls[ch] = gain_tbls[ch]; + +error: + if (binaryFile) + fclose(binaryFile); + return status; +} diff --git a/host/libraries/libbladeRF_test/test_gain_calibration/src/main.c b/host/libraries/libbladeRF_test/test_gain_calibration/src/main.c index 7f37b797..b98ef494 100644 --- a/host/libraries/libbladeRF_test/test_gain_calibration/src/main.c +++ b/host/libraries/libbladeRF_test/test_gain_calibration/src/main.c @@ -38,11 +38,16 @@ int main(int argc, char *argv[]) { int status; struct bladerf *dev; char *devstr = NULL; + const char *cal_rx_file_loc = "rx_pwr_cal.bin"; + bladerf_channel ch; bladerf_log_set_verbosity(BLADERF_LOG_LEVEL_DEBUG); CHECK(bladerf_open(&dev, devstr)); + ch = BLADERF_CHANNEL_RX(0); + CHECK(bladerf_load_gain_calibration(dev, ch, cal_rx_file_loc)); + out: bladerf_close(dev); return status; From b51057d774d88ff1a5911acf4b7c9fbedb374234 Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Fri, 10 Nov 2023 11:51:39 -0600 Subject: [PATCH 048/238] libbladeRF: gain_calibration: load gain implementation + Automatic csv to bin file conversion + Gain tables for each channel --- host/libraries/libbladeRF/CMakeLists.txt | 1 + .../libbladeRF/include/device_calibration.h | 53 +++++++++++++++++++ host/libraries/libbladeRF/src/bladerf.c | 39 ++++++++++++++ host/libraries/libbladeRF/src/board/board.h | 8 +++ .../libbladeRF/src/device_calibration.c | 7 ++- .../test_gain_calibration/CMakeLists.txt | 2 + .../include/file_operations.h | 35 ++++++++++++ .../src/file_operations.c | 49 +++++++++++++++++ .../test_gain_calibration/src/main.c | 8 ++- 9 files changed, 196 insertions(+), 6 deletions(-) create mode 100644 host/libraries/libbladeRF/include/device_calibration.h create mode 100644 host/libraries/libbladeRF_test/test_gain_calibration/include/file_operations.h create mode 100644 host/libraries/libbladeRF_test/test_gain_calibration/src/file_operations.c diff --git a/host/libraries/libbladeRF/CMakeLists.txt b/host/libraries/libbladeRF/CMakeLists.txt index 2ba58919..35b5f8d6 100644 --- a/host/libraries/libbladeRF/CMakeLists.txt +++ b/host/libraries/libbladeRF/CMakeLists.txt @@ -352,6 +352,7 @@ set(LIBBLADERF_SOURCE src/helpers/configfile.c src/version.h src/devinfo.c + src/device_calibration.c src/bladerf.c ${BLADERF_HOST_COMMON_SOURCE_DIR}/sha256.c ${BLADERF_HOST_COMMON_SOURCE_DIR}/conversions.c diff --git a/host/libraries/libbladeRF/include/device_calibration.h b/host/libraries/libbladeRF/include/device_calibration.h new file mode 100644 index 00000000..c68856c8 --- /dev/null +++ b/host/libraries/libbladeRF/include/device_calibration.h @@ -0,0 +1,53 @@ +/* + * This file is part of the bladeRF project: + * http://www.github.com/nuand/bladeRF + * + * Copyright (C) 2023 Nuand LLC + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef BLADERF2_CALIBRATION_H_ +#define BLADERF2_CALIBRATION_H_ + +#include +#include "libbladeRF.h" + +/** + * @brief Converts gain calibration CSV data to a binary format. + * + * This function reads frequency and gain data from a CSV file and writes it + * to a binary file. + * + * @param csv_path Path to the input CSV file. + * @param binary_path Path to the output binary file. + * @return 0 on success, BLADERF_ERR_* code on failure. + */ +int gain_cal_csv_to_bin(const char *csv_path, const char *binary_path); + +/** + * @brief Loads gain calibration data from a binary file into a bladeRF device. + * + * This function reads frequency and gain calibration data from a binary file and + * loads it into the specified bladeRF device. + * + * @param dev Pointer to the bladeRF device structure. + * @param ch Channel for which the gain calibration data is loaded. + * @param binary_path Path to the binary file containing frequency-gain data. + * @return 0 on success, BLADERF_ERR_* code on failure. + */ +int load_gain_calibration(struct bladerf *dev, bladerf_channel ch, const char *binary_path); + +#endif diff --git a/host/libraries/libbladeRF/src/bladerf.c b/host/libraries/libbladeRF/src/bladerf.c index b35a9152..b6536e8b 100644 --- a/host/libraries/libbladeRF/src/bladerf.c +++ b/host/libraries/libbladeRF/src/bladerf.c @@ -37,6 +37,7 @@ #include "backend/usb/usb.h" #include "board/board.h" #include "driver/fx3_fw.h" +#include "device_calibration.h" #include "streaming/async.h" #include "version.h" @@ -2147,6 +2148,10 @@ int bladerf_load_gain_calibration(struct bladerf *dev, bladerf_channel ch, const { int status = 0; const char *board_name; + char *full_path = NULL; + char *full_path_bin = NULL; + char *ext; + log_debug("Loading gain calibration\n"); MUTEX_LOCK(&dev->lock); @@ -2157,7 +2162,41 @@ int bladerf_load_gain_calibration(struct bladerf *dev, bladerf_channel ch, const goto error; } + full_path = file_find(cal_file_loc); + if (full_path == NULL) { + status = BLADERF_ERR_NO_FILE; + goto error; + } + + /** Convert to binary format if CSV */ + full_path_bin = (char*)malloc(strlen(full_path) + 1); + strcpy(full_path_bin, full_path); + ext = strstr(full_path_bin, ".csv"); + if (ext) { + log_debug("Converting gain calibration to binary format\n"); + strcpy(ext, ".tbl"); + status = gain_cal_csv_to_bin(full_path, full_path_bin); + if (status != 0) { + log_error("Failed to convert csv to binary: %s -> %s\n", + full_path, full_path_bin); + status = EXIT_FAILURE; + goto error; + } + } + + status = load_gain_calibration(dev, ch, full_path_bin); + if (status != 0) { + log_error("Failed to load calibration\n"); + status = BLADERF_ERR_UNEXPECTED; + goto error; + } + error: + if (full_path) + free(full_path); + if (full_path_bin) + free(full_path_bin); + MUTEX_UNLOCK(&dev->lock); return status; } diff --git a/host/libraries/libbladeRF/src/board/board.h b/host/libraries/libbladeRF/src/board/board.h index cbd449de..279a0c12 100644 --- a/host/libraries/libbladeRF/src/board/board.h +++ b/host/libraries/libbladeRF/src/board/board.h @@ -161,6 +161,11 @@ */ #define BLADERF_CAP_FPGA_8BIT_SAMPLES (((uint64_t)1) << 39) +/** + * Max number of gain calibration tables associated to max number of channels + */ +#define NUM_GAIN_CAL_TBLS 4 + struct bladerf { /* Handle lock - to ensure atomic access to control and configuration * operations */ @@ -192,6 +197,9 @@ struct bladerf { /* Enabled feature */ bladerf_feature feature; + + /* Calibration */ + struct bladerf_gain_cal_tbl gain_tbls[NUM_GAIN_CAL_TBLS]; }; struct board_fns { diff --git a/host/libraries/libbladeRF/src/device_calibration.c b/host/libraries/libbladeRF/src/device_calibration.c index 8fbb8252..20baa3f1 100644 --- a/host/libraries/libbladeRF/src/device_calibration.c +++ b/host/libraries/libbladeRF/src/device_calibration.c @@ -71,7 +71,7 @@ error: return status; } -static int gain_cal_tbl_init(struct gain_cal_tbl *tbl, uint32_t num_entries) { +static int gain_cal_tbl_init(struct bladerf_gain_cal_tbl *tbl, uint32_t num_entries) { if (tbl == NULL) { log_error("calibration table is NULL\n"); return BLADERF_ERR_MEM; @@ -82,7 +82,7 @@ static int gain_cal_tbl_init(struct gain_cal_tbl *tbl, uint32_t num_entries) { tbl->start_freq = 0; tbl->stop_freq = 0; - tbl->entries = malloc(num_entries * sizeof(struct gain_cal_entry)); + tbl->entries = malloc(num_entries * sizeof(struct bladerf_gain_cal_entry)); if (tbl->entries == NULL) { log_error("failed to allocate memory for calibration table entries\n"); return BLADERF_ERR_MEM; @@ -94,7 +94,7 @@ static int gain_cal_tbl_init(struct gain_cal_tbl *tbl, uint32_t num_entries) { int load_gain_calibration(struct bladerf *dev, bladerf_channel ch, const char *binary_path) { int num_channels = 4; - struct gain_cal_tbl gain_tbls[num_channels]; + struct bladerf_gain_cal_tbl gain_tbls[num_channels]; uint64_t frequency; float power; int entry_counter; @@ -126,7 +126,6 @@ int load_gain_calibration(struct bladerf *dev, bladerf_channel ch, const char *b gain_tbls[ch].n_entries = entry_counter; gain_tbls[ch].ch = ch; gain_tbls[ch].state = BLADERF_GAIN_CAL_LOADED; - gain_tbls[ch].enabled = true; free(dev->gain_tbls[ch].entries); dev->gain_tbls[ch] = gain_tbls[ch]; diff --git a/host/libraries/libbladeRF_test/test_gain_calibration/CMakeLists.txt b/host/libraries/libbladeRF_test/test_gain_calibration/CMakeLists.txt index 48c68ff4..d0b069d2 100644 --- a/host/libraries/libbladeRF_test/test_gain_calibration/CMakeLists.txt +++ b/host/libraries/libbladeRF_test/test_gain_calibration/CMakeLists.txt @@ -2,6 +2,7 @@ cmake_minimum_required(VERSION 3.5) project(libbladeRF_test_gain_calibration C) set(INCLUDES + ./include ${libbladeRF_SOURCE_DIR}/include ${libbladeRF_SOURCE_DIR}/src ${BLADERF_HOST_COMMON_INCLUDE_DIRS} @@ -15,6 +16,7 @@ endif() set(SRC src/main.c + src/file_operations.c ${libbladeRF_SOURCE_DIR}/src/helpers/file.c ${BLADERF_HOST_COMMON_SOURCE_DIR}/log.c ) diff --git a/host/libraries/libbladeRF_test/test_gain_calibration/include/file_operations.h b/host/libraries/libbladeRF_test/test_gain_calibration/include/file_operations.h new file mode 100644 index 00000000..c342253f --- /dev/null +++ b/host/libraries/libbladeRF_test/test_gain_calibration/include/file_operations.h @@ -0,0 +1,35 @@ +/* + * This file is part of the bladeRF project: + * http://www.github.com/nuand/bladeRF + * + * Copyright (C) 2024 Nuand LLC + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ +#ifndef FILE_OPERATIONS_H_ +#define FILE_OPERATIONS_H_ + +/** + * @brief Read frequency-power data from a binary file and print it. + * + * Primarily useful for debugging. This function reads pairs of frequency (uint64_t) + * and power (float) values from a binary file and prints them to the standard output. + * + * @param[in] binary_path Path to the binary file containing the frequency-power data. + * @return Returns 0 on success, and 1 if there's an error opening the file. + */ +int read_and_print_binary(const char *binary_path); + +#endif diff --git a/host/libraries/libbladeRF_test/test_gain_calibration/src/file_operations.c b/host/libraries/libbladeRF_test/test_gain_calibration/src/file_operations.c new file mode 100644 index 00000000..2b449b10 --- /dev/null +++ b/host/libraries/libbladeRF_test/test_gain_calibration/src/file_operations.c @@ -0,0 +1,49 @@ +/* + * This file is part of the bladeRF project: + * http://www.github.com/nuand/bladeRF + * + * Copyright (C) 2024 Nuand LLC + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ +#include +#include +#include +#include +#include "libbladeRF.h" + +int read_and_print_binary(const char *binary_path) { + uint64_t frequency; + float power; + + if (access(binary_path, F_OK) == -1) { + fprintf(stderr, "Error: file %s does not exist\n", binary_path); + return 1; + } + + FILE *binaryFile = fopen(binary_path, "rb"); + if (!binaryFile) { + fprintf(stderr, "Error opening binary file.\n"); + return 1; + } + + printf("Frequency (Hz),Power (dBm)\n"); + while (fread(&frequency, sizeof(uint64_t), 1, binaryFile) && fread(&power, sizeof(float), 1, binaryFile)) { + printf("%" PRIu64 ",%f\n", frequency, power); + } + + fclose(binaryFile); + return 0; +} diff --git a/host/libraries/libbladeRF_test/test_gain_calibration/src/main.c b/host/libraries/libbladeRF_test/test_gain_calibration/src/main.c index b98ef494..cb3ea286 100644 --- a/host/libraries/libbladeRF_test/test_gain_calibration/src/main.c +++ b/host/libraries/libbladeRF_test/test_gain_calibration/src/main.c @@ -22,6 +22,8 @@ #include #include #include "libbladeRF.h" +#include "file_operations.h" + #include "log.h" #include "helpers/file.h" @@ -38,7 +40,8 @@ int main(int argc, char *argv[]) { int status; struct bladerf *dev; char *devstr = NULL; - const char *cal_rx_file_loc = "rx_pwr_cal.bin"; + const char *cal_rx_file_loc_csv = "rx_pwr_cal.csv"; + const char *cal_rx_file_loc_bin = "./output/rx_pwr_cal.tbl"; bladerf_channel ch; bladerf_log_set_verbosity(BLADERF_LOG_LEVEL_DEBUG); @@ -46,7 +49,8 @@ int main(int argc, char *argv[]) { CHECK(bladerf_open(&dev, devstr)); ch = BLADERF_CHANNEL_RX(0); - CHECK(bladerf_load_gain_calibration(dev, ch, cal_rx_file_loc)); + CHECK(bladerf_load_gain_calibration(dev, ch, cal_rx_file_loc_csv)); + CHECK(read_and_print_binary(cal_rx_file_loc_bin)); out: bladerf_close(dev); From 50dd427e49cb60f35cdf6f36494cad7a3296d901 Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Fri, 2 Feb 2024 18:41:23 -0600 Subject: [PATCH 049/238] libbladeRF: gain_calibration: enable function added --- .../libraries/libbladeRF/include/libbladeRF.h | 25 +++++++++++++++++++ host/libraries/libbladeRF/src/bladerf.c | 9 +++++++ .../libbladeRF/src/device_calibration.c | 1 + 3 files changed, 35 insertions(+) diff --git a/host/libraries/libbladeRF/include/libbladeRF.h b/host/libraries/libbladeRF/include/libbladeRF.h index 129ed0d9..9fc4acde 100644 --- a/host/libraries/libbladeRF/include/libbladeRF.h +++ b/host/libraries/libbladeRF/include/libbladeRF.h @@ -4159,6 +4159,7 @@ struct bladerf_gain_cal_entry { struct bladerf_gain_cal_tbl { struct bladerf_version version; /**< Table format version */ bladerf_channel ch; /**< Channel */ + bool enabled; /**< Whether gain calibration is enabled. */ uint32_t n_entries; /**< Number of entries */ bladerf_frequency start_freq; /**< Start frequency (Hz) */ bladerf_frequency stop_freq; /**< Stop frequency (Hz) */ @@ -4198,6 +4199,30 @@ int CALL_CONV bladerf_load_gain_calibration(struct bladerf *dev, bladerf_channel ch, const char* cal_file_loc); +/** + * @brief Toggles gain calibration for a specified channel. + * + * Enables or disables automatic gain adjustment based on a preloaded + * calibration table for the specified channel. This operation is thread-safe. + + * + * @note Gain calibration mode persists until device reset or power cycle. + * Ensure a calibration table is loaded before enabling. + + * + * @param[in] dev Non-NULL pointer to the bladeRF device. + * @param[in] ch Channel (`BLADERF_CHANNEL_RX(0)`, `BLADERF_CHANNEL_TX(0)`, + * etc.) to set gain calibration for. + * @param[in] en `true` to enable or `false` to disable gain calibration. + * + * @return 0 on success, or a `BLADERF_ERR_*` code on failure (e.g., if + * calibration table is not initialized). + */ +API_EXPORT +int CALL_CONV bladerf_enable_gain_calibration(struct bladerf *dev, + bladerf_channel ch, + bool en); + /** @} (End of FN_CAL) */ /** diff --git a/host/libraries/libbladeRF/src/bladerf.c b/host/libraries/libbladeRF/src/bladerf.c index b6536e8b..9d5f6379 100644 --- a/host/libraries/libbladeRF/src/bladerf.c +++ b/host/libraries/libbladeRF/src/bladerf.c @@ -2200,3 +2200,12 @@ error: MUTEX_UNLOCK(&dev->lock); return status; } + +int bladerf_enable_gain_calibration(struct bladerf *dev, bladerf_channel ch, bool en) +{ + + dev->gain_tbls[ch].enabled = en; + + return 0; +} + diff --git a/host/libraries/libbladeRF/src/device_calibration.c b/host/libraries/libbladeRF/src/device_calibration.c index 20baa3f1..85bb16f3 100644 --- a/host/libraries/libbladeRF/src/device_calibration.c +++ b/host/libraries/libbladeRF/src/device_calibration.c @@ -126,6 +126,7 @@ int load_gain_calibration(struct bladerf *dev, bladerf_channel ch, const char *b gain_tbls[ch].n_entries = entry_counter; gain_tbls[ch].ch = ch; gain_tbls[ch].state = BLADERF_GAIN_CAL_LOADED; + gain_tbls[ch].enabled = true; free(dev->gain_tbls[ch].entries); dev->gain_tbls[ch] = gain_tbls[ch]; From cdaaa3d9152c95fd170573142ca9a60cad85abbf Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Thu, 1 Aug 2024 13:05:02 -0500 Subject: [PATCH 050/238] libbladeRF: gain_calibration: set gain target on load, set_gain, and en --- host/libraries/libbladeRF/src/bladerf.c | 14 +++++++++++++- host/libraries/libbladeRF/src/device_calibration.c | 8 ++++++++ .../test_gain_calibration/src/main.c | 3 +++ 3 files changed, 24 insertions(+), 1 deletion(-) diff --git a/host/libraries/libbladeRF/src/bladerf.c b/host/libraries/libbladeRF/src/bladerf.c index 9d5f6379..77126844 100644 --- a/host/libraries/libbladeRF/src/bladerf.c +++ b/host/libraries/libbladeRF/src/bladerf.c @@ -561,7 +561,13 @@ int bladerf_set_gain(struct bladerf *dev, bladerf_channel ch, int gain) } } + dev->gain_tbls[ch].gain_target = gain; + status = dev->board->set_gain(dev, ch, gain); + if (status != 0) { + log_error("Failed to set gain\n"); + goto error; + } error: MUTEX_UNLOCK(&dev->lock); @@ -2203,9 +2209,15 @@ error: int bladerf_enable_gain_calibration(struct bladerf *dev, bladerf_channel ch, bool en) { + int status = 0; dev->gain_tbls[ch].enabled = en; + status = bladerf_set_gain(dev, ch, dev->gain_tbls[ch].gain_target); + if (status != 0) { + log_error("%s: Failed to reset gain.\n", __FUNCTION__); + return status; + } - return 0; + return status; } diff --git a/host/libraries/libbladeRF/src/device_calibration.c b/host/libraries/libbladeRF/src/device_calibration.c index 85bb16f3..406cc4f1 100644 --- a/host/libraries/libbladeRF/src/device_calibration.c +++ b/host/libraries/libbladeRF/src/device_calibration.c @@ -95,6 +95,7 @@ static int gain_cal_tbl_init(struct bladerf_gain_cal_tbl *tbl, uint32_t num_entr int load_gain_calibration(struct bladerf *dev, bladerf_channel ch, const char *binary_path) { int num_channels = 4; struct bladerf_gain_cal_tbl gain_tbls[num_channels]; + bladerf_gain current_gain; uint64_t frequency; float power; int entry_counter; @@ -107,6 +108,12 @@ int load_gain_calibration(struct bladerf *dev, bladerf_channel ch, const char *b goto error; } + status = dev->board->get_gain(dev, ch, ¤t_gain); + if (status != 0) { + log_error("Failed to get gain: %s\n", bladerf_strerror(status)); + goto error; + } + status = gain_cal_tbl_init(&gain_tbls[ch], (uint32_t) 10e3); if (status != 0) { log_error("Error initializing gain calibration table\n"); @@ -127,6 +134,7 @@ int load_gain_calibration(struct bladerf *dev, bladerf_channel ch, const char *b gain_tbls[ch].ch = ch; gain_tbls[ch].state = BLADERF_GAIN_CAL_LOADED; gain_tbls[ch].enabled = true; + gain_tbls[ch].gain_target = current_gain; free(dev->gain_tbls[ch].entries); dev->gain_tbls[ch] = gain_tbls[ch]; diff --git a/host/libraries/libbladeRF_test/test_gain_calibration/src/main.c b/host/libraries/libbladeRF_test/test_gain_calibration/src/main.c index cb3ea286..aac50336 100644 --- a/host/libraries/libbladeRF_test/test_gain_calibration/src/main.c +++ b/host/libraries/libbladeRF_test/test_gain_calibration/src/main.c @@ -52,6 +52,9 @@ int main(int argc, char *argv[]) { CHECK(bladerf_load_gain_calibration(dev, ch, cal_rx_file_loc_csv)); CHECK(read_and_print_binary(cal_rx_file_loc_bin)); + ch = BLADERF_CHANNEL_TX(0); + CHECK(bladerf_load_gain_calibration(dev, ch, cal_rx_file_loc_csv)); + out: bladerf_close(dev); return status; From 9cd7ab7d38a9a3bf62b5e70696dfb4f743cf11ab Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Fri, 10 Nov 2023 13:43:44 -0600 Subject: [PATCH 051/238] libbladeRF: gain_calibration: normalize correction values TX=0dBm and RX=-30dBm are measurement targets set by the calibration setup. These values are not to be changed unless the test measurement setup has changed. --- .../libbladeRF/src/device_calibration.c | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/host/libraries/libbladeRF/src/device_calibration.c b/host/libraries/libbladeRF/src/device_calibration.c index 406cc4f1..6e12eccc 100644 --- a/host/libraries/libbladeRF/src/device_calibration.c +++ b/host/libraries/libbladeRF/src/device_calibration.c @@ -92,6 +92,19 @@ static int gain_cal_tbl_init(struct bladerf_gain_cal_tbl *tbl, uint32_t num_entr return 0; } +static int normalize_gain_correction(struct bladerf_gain_cal_tbl *tbl, bladerf_gain ref_pwr) { + if (tbl->state != BLADERF_GAIN_CAL_LOADED) { + log_error("The gain calibration table is not loaded for channel %d\n", tbl->ch); + return BLADERF_ERR_MEM; + } + + for (size_t i = 0; i < tbl->n_entries; i++) { + tbl->entries[i].gain_corr -= (double)ref_pwr; + } + + return 0; +} + int load_gain_calibration(struct bladerf *dev, bladerf_channel ch, const char *binary_path) { int num_channels = 4; struct bladerf_gain_cal_tbl gain_tbls[num_channels]; @@ -136,6 +149,28 @@ int load_gain_calibration(struct bladerf *dev, bladerf_channel ch, const char *b gain_tbls[ch].enabled = true; gain_tbls[ch].gain_target = current_gain; + switch (ch) { + /** bladeRF calibration target is -30dBFS for RX */ + case BLADERF_CHANNEL_RX(0): + case BLADERF_CHANNEL_RX(1): + status = normalize_gain_correction(&gain_tbls[ch], -30); + break; + + /** bladeRF calibration target is 0dBm for TX */ + case BLADERF_CHANNEL_TX(0): + case BLADERF_CHANNEL_TX(1): + status = normalize_gain_correction(&gain_tbls[ch], 0); + break; + + default: + log_error("Channel unknown: ch = %i?\n", ch); + status = BLADERF_ERR_UNEXPECTED; + goto error; + } + if (status != 0) { + goto error; + } + free(dev->gain_tbls[ch].entries); dev->gain_tbls[ch] = gain_tbls[ch]; From 228de95650dcbae95c99f99188ffd05f001de21f Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Fri, 2 Feb 2024 17:28:01 -0600 Subject: [PATCH 052/238] libbladeRF: gain_calibration: print function added --- .../libraries/libbladeRF/include/libbladeRF.h | 22 +++++++++++ host/libraries/libbladeRF/src/bladerf.c | 37 +++++++++++++++++++ .../test_gain_calibration/src/main.c | 6 ++- 3 files changed, 63 insertions(+), 2 deletions(-) diff --git a/host/libraries/libbladeRF/include/libbladeRF.h b/host/libraries/libbladeRF/include/libbladeRF.h index 9fc4acde..0583e9f7 100644 --- a/host/libraries/libbladeRF/include/libbladeRF.h +++ b/host/libraries/libbladeRF/include/libbladeRF.h @@ -4199,6 +4199,28 @@ int CALL_CONV bladerf_load_gain_calibration(struct bladerf *dev, bladerf_channel ch, const char* cal_file_loc); +/** + * @brief Displays gain calibration details for a specified channel. + * + * Outputs the gain calibration information to the console. The level of detail + * is adjustable via `with_entries`. + * + * @note This operation is thread-safe. + * + * @param[in] dev Non-NULL pointer to a bladeRF device. + * @param[in] ch Channel to display gain calibration for. Use + * `bladerf_channel`. + * @param[in] with_entries Set to `true` to print all calibration entries, or + * `false` for a summary only. + * + * @return 0 on success, BLADERF_ERR_UNSUPPORTED if calibration is not supported + * on the device, or other BLADERF_ERR_* codes for different failures. + */ +API_EXPORT +int CALL_CONV bladerf_print_gain_calibration(struct bladerf *dev, + bladerf_channel ch, + bool with_entries); + /** * @brief Toggles gain calibration for a specified channel. * diff --git a/host/libraries/libbladeRF/src/bladerf.c b/host/libraries/libbladeRF/src/bladerf.c index 77126844..5553ac57 100644 --- a/host/libraries/libbladeRF/src/bladerf.c +++ b/host/libraries/libbladeRF/src/bladerf.c @@ -36,6 +36,7 @@ #include "backend/backend.h" #include "backend/usb/usb.h" #include "board/board.h" +#include "conversions.h" #include "driver/fx3_fw.h" #include "device_calibration.h" #include "streaming/async.h" @@ -2221,3 +2222,39 @@ int bladerf_enable_gain_calibration(struct bladerf *dev, bladerf_channel ch, boo return status; } +int bladerf_print_gain_calibration(struct bladerf *dev, bladerf_channel ch, bool with_entries) +{ + CHECK_NULL(dev); + int status = 0; + const char *board_name; + struct bladerf_gain_cal_tbl *gain_tbls = dev->gain_tbls; + + board_name = bladerf_get_board_name(dev); + if (strcmp(board_name, "bladerf2") != 0) { + log_error("Gain calibration unsupported on this device: %s\n", board_name); + status = BLADERF_ERR_UNSUPPORTED; + goto error; + } + + if (gain_tbls[ch].state == BLADERF_GAIN_CAL_UNINITIALIZED) { + printf("Gain Calibration [%s]: uninitialized\n", channel2str(ch)); + return 0; + } + + printf("Gain Calibration [%s]: loaded\n", channel2str(ch)); + printf(" Status: %s\n", (gain_tbls[ch].enabled) ? "enabled" : "disabled"); + printf(" Version: %i.%i.%i\n", + gain_tbls[ch].version.major, gain_tbls[ch].version.minor, gain_tbls[ch].version.patch); + printf(" Number of Entries: %u\n", gain_tbls[ch].n_entries); + printf(" Start Frequency: %" PRIu64 " Hz\n", gain_tbls[ch].start_freq); + printf(" Stop Frequency: %" PRIu64 " Hz\n", gain_tbls[ch].stop_freq); + + if (with_entries) { + for (size_t i = 0; i < gain_tbls[ch].n_entries; i++) { + printf("%" PRIu64 ",%f\n", gain_tbls[ch].entries[i].freq, gain_tbls[ch].entries[i].gain_corr); + } + } + +error: + return status; +} diff --git a/host/libraries/libbladeRF_test/test_gain_calibration/src/main.c b/host/libraries/libbladeRF_test/test_gain_calibration/src/main.c index aac50336..d6a053f7 100644 --- a/host/libraries/libbladeRF_test/test_gain_calibration/src/main.c +++ b/host/libraries/libbladeRF_test/test_gain_calibration/src/main.c @@ -41,7 +41,6 @@ int main(int argc, char *argv[]) { struct bladerf *dev; char *devstr = NULL; const char *cal_rx_file_loc_csv = "rx_pwr_cal.csv"; - const char *cal_rx_file_loc_bin = "./output/rx_pwr_cal.tbl"; bladerf_channel ch; bladerf_log_set_verbosity(BLADERF_LOG_LEVEL_DEBUG); @@ -50,11 +49,14 @@ int main(int argc, char *argv[]) { ch = BLADERF_CHANNEL_RX(0); CHECK(bladerf_load_gain_calibration(dev, ch, cal_rx_file_loc_csv)); - CHECK(read_and_print_binary(cal_rx_file_loc_bin)); ch = BLADERF_CHANNEL_TX(0); CHECK(bladerf_load_gain_calibration(dev, ch, cal_rx_file_loc_csv)); + for (int i = 0; i < 4; i++) { + CHECK(bladerf_print_gain_calibration(dev, i, false)); + } + out: bladerf_close(dev); return status; From d83fd7777d14a8b43d4b047eb4b69fc5625dc648 Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Mon, 13 Nov 2023 16:24:17 -0600 Subject: [PATCH 053/238] libbladeRF: gain_calibration: check and round macros for gain cal fns --- .../libbladeRF/src/device_calibration.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/host/libraries/libbladeRF/src/device_calibration.c b/host/libraries/libbladeRF/src/device_calibration.c index 6e12eccc..bf9b4d14 100644 --- a/host/libraries/libbladeRF/src/device_calibration.c +++ b/host/libraries/libbladeRF/src/device_calibration.c @@ -29,6 +29,24 @@ #include "log.h" #include "common.h" +#define __round_int(x) (x >= 0 ? (int)(x + 0.5) : (int)(x - 0.5)) + +#define RETURN_ERROR_STATUS(_what, _status) \ + do { \ + log_error("%s: %s failed: %s\n", __FUNCTION__, _what, \ + bladerf_strerror(_status)); \ + return _status; \ + } while (0) + +#define CHECK_STATUS(_fn) \ + do { \ + int _s = _fn; \ + if (_s < 0) { \ + RETURN_ERROR_STATUS(#_fn, _s); \ + } \ + } while (0) + + int gain_cal_csv_to_bin(const char *csv_path, const char *binary_path) { uint64_t frequency; From 9fb9b19f4217c312cd901b03b0fcad7dc15cff6f Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Fri, 2 Feb 2024 17:34:00 -0600 Subject: [PATCH 054/238] libbladeRF: gain_calibration: added bladerf_get_gain_calibration --- host/libraries/libbladeRF/include/libbladeRF.h | 17 +++++++++++++++++ host/libraries/libbladeRF/src/bladerf.c | 17 +++++++++++++++++ 2 files changed, 34 insertions(+) diff --git a/host/libraries/libbladeRF/include/libbladeRF.h b/host/libraries/libbladeRF/include/libbladeRF.h index 0583e9f7..ac1a9a98 100644 --- a/host/libraries/libbladeRF/include/libbladeRF.h +++ b/host/libraries/libbladeRF/include/libbladeRF.h @@ -4245,6 +4245,23 @@ int CALL_CONV bladerf_enable_gain_calibration(struct bladerf *dev, bladerf_channel ch, bool en); +/** + * @brief Provides read-only access to a channel's gain calibration table. + * + * Returns a read-only pointer to a specified channel's gain calibration table, + * preventing modification. Access is thread-safe, protected by device mutexes. + * + * @param[in] dev Non-NULL pointer to a BladeRF device structure. + * @param[in] ch Channel to retrieve the gain calibration table for. + * @param[out] tbl On success, updated to point to the read-only gain + * calibration table. + * + * @return 0 on success, BLADERF_ERR_UNEXPECTED if the table is not loaded, or + * BLADERF_ERR_INVAL for invalid inputs. + */ +API_EXPORT +int bladerf_get_gain_calibration(struct bladerf *dev, bladerf_channel ch, const struct bladerf_gain_cal_tbl **tbl); + /** @} (End of FN_CAL) */ /** diff --git a/host/libraries/libbladeRF/src/bladerf.c b/host/libraries/libbladeRF/src/bladerf.c index 5553ac57..c0b2aac6 100644 --- a/host/libraries/libbladeRF/src/bladerf.c +++ b/host/libraries/libbladeRF/src/bladerf.c @@ -2258,3 +2258,20 @@ int bladerf_print_gain_calibration(struct bladerf *dev, bladerf_channel ch, bool error: return status; } + +int bladerf_get_gain_calibration(struct bladerf *dev, bladerf_channel ch, const struct bladerf_gain_cal_tbl **tbl) +{ + CHECK_NULL(dev); + MUTEX_LOCK(&dev->lock); + + if (dev->gain_tbls == NULL) { + log_error("Gain calibration not loaded\n"); + MUTEX_UNLOCK(&dev->lock); + return BLADERF_ERR_UNEXPECTED; + } + + *tbl = &(dev->gain_tbls[ch]); + + MUTEX_UNLOCK(&dev->lock); + return 0; +} From e94f3c73788fd4f30585cb7b1c31911a8694cb43 Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Fri, 2 Aug 2024 11:01:18 -0500 Subject: [PATCH 055/238] libbladeRF: gain_calibration: gain correction implementation Initially administered through frequency assignment. --- .../libbladeRF/include/device_calibration.h | 59 ++++++++++ host/libraries/libbladeRF/src/bladerf.c | 7 ++ .../libbladeRF/src/device_calibration.c | 105 ++++++++++++++++++ .../test_gain_calibration/src/main.c | 59 +++++++++- 4 files changed, 226 insertions(+), 4 deletions(-) diff --git a/host/libraries/libbladeRF/include/device_calibration.h b/host/libraries/libbladeRF/include/device_calibration.h index c68856c8..278fb801 100644 --- a/host/libraries/libbladeRF/include/device_calibration.h +++ b/host/libraries/libbladeRF/include/device_calibration.h @@ -50,4 +50,63 @@ int gain_cal_csv_to_bin(const char *csv_path, const char *binary_path); */ int load_gain_calibration(struct bladerf *dev, bladerf_channel ch, const char *binary_path); +/** + * @brief Retrieve the gain correction gain delta between the current frequency and the target frequency. + * + * This function determines the gain correction difference between two frequencies, + * using the calibration table associated with the specified channel. + * The result is based on the gain correction values retrieved from the calibration table entries. + * + * @param dev Pointer to the bladeRF device structure. + * @param freq The target frequency for which the gain correction gain is to be determined. + * @param ch The bladeRF channel to use when fetching the gain calibration table. + * @param compensated_gain The gain correction result + * + * @return 0 on success, BLADERF_ERR_* code on failure. + */ +int get_gain_correction(struct bladerf *dev, + bladerf_frequency freq, + bladerf_channel ch, + bladerf_gain *compensated_gain); + + +/** + * Retrieves a gain calibration entry for a specified frequency by interpolating + * between the nearest lower and higher frequency calibration entries in the given + * calibration table. + * + * @param[in] tbl Pointer to the gain calibration table containing pre-calculated + * gain correction values across various frequencies. + * @param[in] freq The frequency for which the gain calibration entry is requested. + * @param[out] result Pointer to a `struct bladerf_gain_cal_entry` that will be filled + * with the interpolated gain calibration entry for the specified frequency. + * This structure must be allocated by the caller. + * + * The function first identifies the calibration entries immediately below and above the + * requested frequency. If the requested frequency matches a calibration point exactly, + * that entry is directly copied into `result`. If the requested frequency falls between + * two calibration points, a linear interpolation is performed to compute the gain + * correction value for the requested frequency, and the result is stored in `result`. + * + * @note This function assumes that the calibration table is sorted by frequency. + * + * @return 0 on success, indicating that `result` has been populated with the interpolated + * gain correction value. If the function fails, a negative error code is returned: + * - BLADERF_ERR_INVAL if the `result` pointer is NULL, + * - BLADERF_ERR_UNEXPECTED if suitable floor and ceiling entries cannot be found + * in the calibration table. + */ +int get_gain_cal_entry(const struct bladerf_gain_cal_tbl *tbl, + bladerf_frequency freq, + struct bladerf_gain_cal_entry *result); + +/** + * Applies compensated gain given the current gain target and center frequency + * + * @param dev The bladeRF device structure pointer. + * @param ch The bladeRF channel to use. + * @param frequency The target frequency. + */ +int apply_gain_correction(struct bladerf *dev, bladerf_channel ch, bladerf_frequency frequency); + #endif diff --git a/host/libraries/libbladeRF/src/bladerf.c b/host/libraries/libbladeRF/src/bladerf.c index c0b2aac6..ad7d66b2 100644 --- a/host/libraries/libbladeRF/src/bladerf.c +++ b/host/libraries/libbladeRF/src/bladerf.c @@ -816,6 +816,13 @@ int bladerf_set_frequency(struct bladerf *dev, status = dev->board->set_frequency(dev, ch, frequency); + if (dev->gain_tbls[ch].enabled && status == 0) { + status = apply_gain_correction(dev, ch, frequency); + if (status != 0) { + log_error("Failed to set gain correction\n"); + } + } + MUTEX_UNLOCK(&dev->lock); return status; } diff --git a/host/libraries/libbladeRF/src/device_calibration.c b/host/libraries/libbladeRF/src/device_calibration.c index bf9b4d14..3ed07173 100644 --- a/host/libraries/libbladeRF/src/device_calibration.c +++ b/host/libraries/libbladeRF/src/device_calibration.c @@ -197,3 +197,108 @@ error: fclose(binaryFile); return status; } + +static void find_floor_ceil_entries_by_frequency(const struct bladerf_gain_cal_tbl *tbl, bladerf_frequency freq, + struct bladerf_gain_cal_entry **floor, struct bladerf_gain_cal_entry **ceil) { + int mid = 0; + *floor = NULL; + *ceil = NULL; + + if (tbl == NULL || tbl->entries == NULL || tbl->n_entries == 0) { + return; + } + + int32_t low = 0; + int32_t high = tbl->n_entries - 1; + + /* Binary search for the entry with the closest frequency to 'freq' */ + while (low <= high && high >= 0) { + mid = (low + high) / 2; + if (tbl->entries[mid].freq == freq) { + *floor = &tbl->entries[mid]; + *ceil = &tbl->entries[mid]; + return; + } else if (tbl->entries[mid].freq < freq) { + low = mid + 1; + } else { + high = mid - 1; + } + } + + /* At this point, 'low' points to the first entry greater than 'freq', + and 'high' points to the last entry less than 'freq'. */ + if ((uint32_t)low < tbl->n_entries) { + *ceil = &tbl->entries[low]; + } + + /* If 'high' is negative, then there are no entries less than 'freq' */ + *floor = (high >= 0) ? &tbl->entries[high] : &tbl->entries[0]; +} + +int get_gain_cal_entry(const struct bladerf_gain_cal_tbl *tbl, bladerf_frequency freq, struct bladerf_gain_cal_entry *result) { + struct bladerf_gain_cal_entry *floor_entry, *ceil_entry; + + if (tbl == NULL || result == NULL) { + return BLADERF_ERR_INVAL; + } + + find_floor_ceil_entries_by_frequency(tbl, freq, &floor_entry, &ceil_entry); + if (!floor_entry || !ceil_entry) { + log_error("Could not find ceil or floor entries in the calibration table\n"); + return BLADERF_ERR_UNEXPECTED; + } + + if (floor_entry->freq == ceil_entry->freq) { + result->freq = freq; + result->gain_corr = floor_entry->gain_corr; + return 0; + } + + double interpolated_gain_corr = floor_entry->gain_corr + + (freq - floor_entry->freq) * + (ceil_entry->gain_corr - floor_entry->gain_corr) / + (ceil_entry->freq - floor_entry->freq); + + result->freq = freq; + result->gain_corr = interpolated_gain_corr; + return 0; +} + +int get_gain_correction(struct bladerf *dev, bladerf_frequency freq, bladerf_channel ch, bladerf_gain *compensated_gain) { + int status = 0; + struct bladerf_gain_cal_tbl *cal_table = &dev->gain_tbls[ch]; + struct bladerf_gain_cal_entry entry_next; + + CHECK_STATUS(get_gain_cal_entry(cal_table, freq, &entry_next)); + + *compensated_gain = __round_int(cal_table->gain_target - entry_next.gain_corr); + + log_verbose("Target gain: %i, Compen. gain: %i\n", dev->gain_tbls[ch].gain_target, *compensated_gain); + return status; +} + +int apply_gain_correction(struct bladerf *dev, bladerf_channel ch, bladerf_frequency frequency) { + struct bladerf_range const *gain_range = NULL; + bladerf_frequency current_frequency; + bladerf_gain gain_compensated; + + if (dev->gain_tbls[ch].enabled == false) { + log_error("Gain compensation disabled. Can't apply gain correction.\n"); + return BLADERF_ERR_UNEXPECTED; + } + + CHECK_STATUS(dev->board->get_gain_range(dev, ch, &gain_range)); + CHECK_STATUS(dev->board->get_frequency(dev, ch, ¤t_frequency)); + CHECK_STATUS(get_gain_correction(dev, frequency, ch, &gain_compensated)); + + if (gain_compensated > gain_range->max || gain_compensated < gain_range->min) { + log_warning("Power compensated gain out of range [%i:%i]: %i\n", + gain_range->min, gain_range->max, gain_compensated); + gain_compensated = (gain_compensated > gain_range->max) ? gain_range->max : gain_range->min; + log_warning("Gain clamped to: %i\n", gain_compensated); + } + + CHECK_STATUS(dev->board->set_gain(dev, ch, gain_compensated);); + + return 0; +} diff --git a/host/libraries/libbladeRF_test/test_gain_calibration/src/main.c b/host/libraries/libbladeRF_test/test_gain_calibration/src/main.c index d6a053f7..54bb20b0 100644 --- a/host/libraries/libbladeRF_test/test_gain_calibration/src/main.c +++ b/host/libraries/libbladeRF_test/test_gain_calibration/src/main.c @@ -36,27 +36,78 @@ } \ } while (0) +static int init_sync(struct bladerf *dev) +{ + int status; + const unsigned int num_buffers = 512; + const unsigned int buffer_size = 16*2048; /* Must be a multiple of 1024 */ + const unsigned int num_transfers = 64; + const unsigned int timeout_ms = 3500; + + CHECK(bladerf_sync_config(dev, BLADERF_TX_X1, BLADERF_FORMAT_SC16_Q11, + num_buffers, buffer_size, num_transfers, + timeout_ms)); + +out: + return status; +} + int main(int argc, char *argv[]) { int status; struct bladerf *dev; char *devstr = NULL; - const char *cal_rx_file_loc_csv = "rx_pwr_cal.csv"; + const char *rx_cal_file = "rx_sweep_0.csv"; + const char *tx_cal_file = "tx_sweep_60_fine.csv"; bladerf_channel ch; - bladerf_log_set_verbosity(BLADERF_LOG_LEVEL_DEBUG); + const struct bladerf_range *freq_range; + const bladerf_gain TARGET_GAIN = 30; + bladerf_gain gain; + bladerf_gain gain_expected; + const struct bladerf_gain_cal_tbl *cal[4]; + + bladerf_log_set_verbosity(BLADERF_LOG_LEVEL_INFO); CHECK(bladerf_open(&dev, devstr)); ch = BLADERF_CHANNEL_RX(0); - CHECK(bladerf_load_gain_calibration(dev, ch, cal_rx_file_loc_csv)); + CHECK(bladerf_load_gain_calibration(dev, ch, rx_cal_file)); + CHECK(bladerf_get_gain_calibration(dev, ch, &cal[ch])); ch = BLADERF_CHANNEL_TX(0); - CHECK(bladerf_load_gain_calibration(dev, ch, cal_rx_file_loc_csv)); + CHECK(bladerf_load_gain_calibration(dev, ch, tx_cal_file)); + CHECK(bladerf_get_gain_calibration(dev, ch, &cal[ch])); for (int i = 0; i < 4; i++) { CHECK(bladerf_print_gain_calibration(dev, i, false)); } + /** + * Monitor calibrated gain over frequency + */ + CHECK(init_sync(dev)); + CHECK(bladerf_set_gain(dev, ch, TARGET_GAIN)); + + CHECK(bladerf_enable_module(dev, ch, true)); + for (size_t entry_idx = 0; entry_idx < cal[ch]->n_entries; entry_idx++) { + CHECK(bladerf_set_frequency(dev, ch, cal[ch]->entries[entry_idx].freq)); + CHECK(bladerf_get_gain(dev, ch, &gain)); + gain_expected = (int)round(TARGET_GAIN - cal[ch]->entries[entry_idx].gain_corr); + + if (gain != gain_expected) { + fprintf(stderr, "[Error] Gain compensation failed TX frequency sweep\n"); + fprintf(stderr, " Frequency: %" PRIu64 "\n", cal[ch]->entries[entry_idx].freq); + fprintf(stderr, " Target gain: %i\n", TARGET_GAIN); + fprintf(stderr, " Gain correction: %f\n", cal[ch]->entries[entry_idx].gain_corr); + fprintf(stderr, " Expected gain: %i\n", gain_expected); + goto out; + } + + printf("\033[2K\rTX Frequency: %0.0f MHz, Gain: %i", cal[ch]->entries[entry_idx].freq/1e6, gain); + fflush(stdout); + } + printf("\n"); + out: bladerf_close(dev); return status; From cb9dc300b10ad2dedce4f0deb4ef97cca0b8f899 Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Mon, 13 Nov 2023 17:44:34 -0600 Subject: [PATCH 056/238] libbladeRF: gain_calibration: gain corr set by bladerf_set_gain() --- host/libraries/libbladeRF/src/bladerf.c | 9 ++++- .../test_gain_calibration/src/main.c | 35 +++++++++++++++++++ 2 files changed, 43 insertions(+), 1 deletion(-) diff --git a/host/libraries/libbladeRF/src/bladerf.c b/host/libraries/libbladeRF/src/bladerf.c index ad7d66b2..7cca2dc6 100644 --- a/host/libraries/libbladeRF/src/bladerf.c +++ b/host/libraries/libbladeRF/src/bladerf.c @@ -542,6 +542,8 @@ int bladerf_set_gain(struct bladerf *dev, bladerf_channel ch, int gain) { int status; bladerf_gain_mode gain_mode; + bladerf_frequency freq; + bladerf_gain assigned_gain = gain; MUTEX_LOCK(&dev->lock); /* Change gain mode to manual if ch = RX */ @@ -564,7 +566,12 @@ int bladerf_set_gain(struct bladerf *dev, bladerf_channel ch, int gain) dev->gain_tbls[ch].gain_target = gain; - status = dev->board->set_gain(dev, ch, gain); + if (dev->gain_tbls[ch].enabled == true) { + dev->board->get_frequency(dev, ch, &freq); + get_gain_correction(dev, freq, ch, &assigned_gain); + } + + status = dev->board->set_gain(dev, ch, assigned_gain); if (status != 0) { log_error("Failed to set gain\n"); goto error; diff --git a/host/libraries/libbladeRF_test/test_gain_calibration/src/main.c b/host/libraries/libbladeRF_test/test_gain_calibration/src/main.c index 54bb20b0..20c6f292 100644 --- a/host/libraries/libbladeRF_test/test_gain_calibration/src/main.c +++ b/host/libraries/libbladeRF_test/test_gain_calibration/src/main.c @@ -108,6 +108,41 @@ int main(int argc, char *argv[]) { } printf("\n"); + /** + * Monitor calibrated gain over gain assignments + */ + struct bladerf_range const *gain_range = NULL; + bladerf_gain min_gain, max_gain; + CHECK(bladerf_set_frequency(dev, ch, cal[ch]->entries[0].freq)); + CHECK(bladerf_get_gain_range(dev, ch, &gain_range)); + min_gain = gain_range->min * gain_range->scale; + max_gain = gain_range->max * gain_range->scale; + gain_expected = 0; + + /** Start right below gain range, end right past gain range */ + for (bladerf_gain g = min_gain-10; g <= max_gain+10; g++) { + CHECK(bladerf_set_gain(dev, ch, g)); + CHECK(bladerf_get_gain(dev, ch, &gain)); + gain_expected = (int)round(g - cal[ch]->entries[0].gain_corr); + + // Clamp expected gain device's gain range + if (gain_expected < min_gain || gain_expected > max_gain) { + gain_expected = (gain_expected < min_gain) ? min_gain : max_gain; + } + + if (gain != gain_expected) { + fprintf(stderr, "[Error] Gain compensation failed gain sweep\n"); + fprintf(stderr, " Target gain: %i\n", g); + fprintf(stderr, " Expected gain: %i\n", gain_expected); + fprintf(stderr, " Actual gain: %i\n", gain); + goto out; + } + + printf("\033[2K\rTarget gain: %i, Expected gain: %i, Actual gain: %i", g, gain_expected, gain); + fflush(stdout); + } + printf("\n"); + out: bladerf_close(dev); return status; From afae6bde2071626e92c38b7e99767aca58c59f8f Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Mon, 13 Nov 2023 16:58:11 -0600 Subject: [PATCH 057/238] libbladeRF: gain_calibration: free table entries on bladerf_close() --- host/libraries/libbladeRF/src/bladerf.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/host/libraries/libbladeRF/src/bladerf.c b/host/libraries/libbladeRF/src/bladerf.c index 7cca2dc6..6f2d8215 100644 --- a/host/libraries/libbladeRF/src/bladerf.c +++ b/host/libraries/libbladeRF/src/bladerf.c @@ -210,6 +210,14 @@ void bladerf_close(struct bladerf *dev) dev->backend->close(dev); } + /** Free gain table entries */ + for (int i = 0; i < NUM_GAIN_CAL_TBLS; i++) { + if (dev->gain_tbls[i].state != BLADERF_GAIN_CAL_UNINITIALIZED) { + log_debug("Freeing gain table entries for ch[%s]\n", channel2str(i)); + free(dev->gain_tbls[i].entries); + } + } + MUTEX_UNLOCK(&dev->lock); free(dev); From 00346bba68839f362c8164f20c21702643ef7491 Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Tue, 21 Nov 2023 13:41:38 -0600 Subject: [PATCH 058/238] libbladeRF: gain_calibration: new example gain calibration CSVs --- .../test_gain_calibration/CMakeLists.txt | 9 +- .../example_measurements/rx_sweep.csv | 4746 ++++++++++++++++ .../example_measurements/tx_sweep.csv | 4750 +++++++++++++++++ 3 files changed, 9503 insertions(+), 2 deletions(-) create mode 100644 host/libraries/libbladeRF_test/test_gain_calibration/example_measurements/rx_sweep.csv create mode 100644 host/libraries/libbladeRF_test/test_gain_calibration/example_measurements/tx_sweep.csv diff --git a/host/libraries/libbladeRF_test/test_gain_calibration/CMakeLists.txt b/host/libraries/libbladeRF_test/test_gain_calibration/CMakeLists.txt index d0b069d2..aa074f5a 100644 --- a/host/libraries/libbladeRF_test/test_gain_calibration/CMakeLists.txt +++ b/host/libraries/libbladeRF_test/test_gain_calibration/CMakeLists.txt @@ -40,7 +40,12 @@ configure_file(example_measurements/tx_sweep_60_fine.csv FILE_PERMISSIONS OWNER_READ COPYONLY) -configure_file(example_measurements/rx_pwr_cal.csv - ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/rx_pwr_cal.csv +configure_file(example_measurements/rx_sweep.csv + ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/rx_sweep.csv + FILE_PERMISSIONS OWNER_READ + COPYONLY) + +configure_file(example_measurements/tx_sweep.csv + ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/tx_sweep.csv FILE_PERMISSIONS OWNER_READ COPYONLY) diff --git a/host/libraries/libbladeRF_test/test_gain_calibration/example_measurements/rx_sweep.csv b/host/libraries/libbladeRF_test/test_gain_calibration/example_measurements/rx_sweep.csv new file mode 100644 index 00000000..2e61a6a6 --- /dev/null +++ b/host/libraries/libbladeRF_test/test_gain_calibration/example_measurements/rx_sweep.csv @@ -0,0 +1,4746 @@ +RX Chain,RX Gain,VSG Power into bladeRF RX (dBm),Frequency of signal (Hz),Frequency of bladeRF+PXI (Hz),AD9361 RSSI register value,Power of Signal from Full Scale (dBFS) +0,0,-30.000000,75000000,70000000,-48,-24.911830 +0,0,-30.000000,80000000,75000000,-48,-24.952046 +0,0,-30.000000,85000000,80000000,-48,-24.917278 +0,0,-30.000000,90000000,85000000,-48,-24.914935 +0,0,-30.000000,95000000,90000000,-48,-25.103565 +0,0,-30.000000,100000000,95000000,-49,-25.451630 +0,0,-30.000000,105000000,100000000,-48,-25.259531 +0,0,-30.000000,110000000,105000000,-48,-25.268522 +0,0,-30.000000,115000000,110000000,-49,-26.059311 +0,0,-30.000000,120000000,115000000,-49,-26.068684 +0,0,-30.000000,125000000,120000000,-49,-26.042067 +0,0,-30.000000,130000000,125000000,-49,-25.995099 +0,0,-30.000000,135000000,130000000,-49,-25.905534 +0,0,-30.000000,140000000,135000000,-49,-25.860041 +0,0,-30.000000,145000000,140000000,-49,-25.791198 +0,0,-30.000000,150000000,145000000,-49,-25.741327 +0,0,-30.000000,155000000,150000000,-49,-25.714040 +0,0,-30.000000,160000000,155000000,-49,-25.697982 +0,0,-30.000000,165000000,160000000,-49,-25.684992 +0,0,-30.000000,170000000,165000000,-49,-25.674131 +0,0,-30.000000,175000000,170000000,-49,-25.700741 +0,0,-30.000000,180000000,175000000,-49,-25.700391 +0,0,-30.000000,185000000,180000000,-49,-25.707282 +0,0,-30.000000,190000000,185000000,-49,-25.665154 +0,0,-30.000000,195000000,190000000,-49,-25.739358 +0,0,-30.000000,200000000,195000000,-49,-25.685807 +0,0,-30.000000,205000000,200000000,-49,-25.693657 +0,0,-30.000000,210000000,205000000,-49,-25.689434 +0,0,-30.000000,215000000,210000000,-49,-25.673403 +0,0,-30.000000,220000000,215000000,-49,-25.701915 +0,0,-30.000000,225000000,220000000,-49,-25.677577 +0,0,-30.000000,230000000,225000000,-49,-25.667044 +0,0,-30.000000,235000000,230000000,-49,-25.663628 +0,0,-30.000000,240000000,235000000,-49,-25.727613 +0,0,-30.000000,245000000,240000000,-49,-25.740817 +0,0,-30.000000,250000000,245000000,-49,-25.789371 +0,0,-30.000000,255000000,250000000,-49,-25.793094 +0,0,-30.000000,260000000,255000000,-49,-25.797284 +0,0,-30.000000,265000000,260000000,-49,-25.803993 +0,0,-30.000000,270000000,265000000,-49,-25.792286 +0,0,-30.000000,275000000,270000000,-49,-25.799520 +0,0,-30.000000,280000000,275000000,-49,-25.785825 +0,0,-30.000000,285000000,280000000,-49,-25.799137 +0,0,-30.000000,290000000,285000000,-49,-25.828767 +0,0,-30.000000,295000000,290000000,-49,-25.851724 +0,0,-30.000000,300000000,295000000,-49,-25.884505 +0,0,-30.000000,305000000,300000000,-49,-25.912415 +0,0,-30.000000,310000000,305000000,-49,-25.943461 +0,0,-30.000000,315000000,310000000,-49,-25.971170 +0,0,-30.000000,320000000,315000000,-49,-26.001457 +0,0,-30.000000,325000000,320000000,-49,-26.026396 +0,0,-30.000000,330000000,325000000,-49,-26.048351 +0,0,-30.000000,335000000,330000000,-49,-26.069402 +0,0,-30.000000,340000000,335000000,-49,-26.090498 +0,0,-30.000000,345000000,340000000,-49,-26.103996 +0,0,-30.000000,350000000,345000000,-49,-26.111081 +0,0,-30.000000,355000000,350000000,-49,-26.116926 +0,0,-30.000000,360000000,355000000,-49,-26.115612 +0,0,-30.000000,365000000,360000000,-49,-26.113926 +0,0,-30.000000,370000000,365000000,-49,-26.108151 +0,0,-30.000000,375000000,370000000,-49,-26.095493 +0,0,-30.000000,380000000,375000000,-49,-26.089091 +0,0,-30.000000,385000000,380000000,-49,-26.077573 +0,0,-30.000000,390000000,385000000,-49,-26.067856 +0,0,-30.000000,395000000,390000000,-49,-26.050005 +0,0,-30.000000,400000000,395000000,-49,-26.024773 +0,0,-30.000000,405000000,400000000,-49,-26.005253 +0,0,-30.000000,410000000,405000000,-49,-25.980925 +0,0,-30.000000,415000000,410000000,-49,-25.948560 +0,0,-30.000000,420000000,415000000,-49,-25.916842 +0,0,-30.000000,425000000,420000000,-49,-25.882989 +0,0,-30.000000,430000000,425000000,-49,-25.847994 +0,0,-30.000000,435000000,430000000,-49,-25.810229 +0,0,-30.000000,440000000,435000000,-49,-25.770860 +0,0,-30.000000,445000000,440000000,-49,-25.731611 +0,0,-30.000000,450000000,445000000,-49,-25.690894 +0,0,-30.000000,455000000,450000000,-49,-25.655057 +0,0,-30.000000,460000000,455000000,-49,-25.618509 +0,0,-30.000000,465000000,460000000,-49,-25.583395 +0,0,-30.000000,470000000,465000000,-49,-25.549632 +0,0,-30.000000,475000000,470000000,-49,-25.518485 +0,0,-30.000000,480000000,475000000,-49,-25.484013 +0,0,-30.000000,485000000,480000000,-49,-25.458312 +0,0,-30.000000,490000000,485000000,-49,-25.428374 +0,0,-30.000000,495000000,490000000,-49,-25.404039 +0,0,-30.000000,500000000,495000000,-49,-25.380697 +0,0,-30.000000,505000000,500000000,-49,-25.356392 +0,0,-30.000000,510000000,505000000,-48,-25.339550 +0,0,-30.000000,515000000,510000000,-48,-25.322129 +0,0,-30.000000,520000000,515000000,-48,-25.307158 +0,0,-30.000000,525000000,520000000,-48,-25.290812 +0,0,-30.000000,530000000,525000000,-48,-25.276887 +0,0,-30.000000,535000000,530000000,-48,-25.265106 +0,0,-30.000000,540000000,535000000,-48,-25.253992 +0,0,-30.000000,545000000,540000000,-48,-25.246733 +0,0,-30.000000,550000000,545000000,-48,-25.234228 +0,0,-30.000000,555000000,550000000,-48,-25.234292 +0,0,-30.000000,560000000,555000000,-48,-25.235139 +0,0,-30.000000,565000000,560000000,-48,-25.239921 +0,0,-30.000000,570000000,565000000,-48,-25.241870 +0,0,-30.000000,575000000,570000000,-48,-25.243009 +0,0,-30.000000,580000000,575000000,-48,-25.247857 +0,0,-30.000000,585000000,580000000,-48,-25.253179 +0,0,-30.000000,590000000,585000000,-48,-25.273775 +0,0,-30.000000,595000000,590000000,-48,-25.283851 +0,0,-30.000000,600000000,595000000,-48,-25.291126 +0,0,-30.000000,605000000,600000000,-49,-25.297334 +0,0,-30.000000,610000000,605000000,-48,-25.245670 +0,0,-30.000000,615000000,610000000,-48,-25.237755 +0,0,-30.000000,620000000,615000000,-48,-25.262004 +0,0,-30.000000,625000000,620000000,-48,-25.291451 +0,0,-30.000000,630000000,625000000,-48,-25.322038 +0,0,-30.000000,635000000,630000000,-48,-25.352783 +0,0,-30.000000,640000000,635000000,-49,-25.375721 +0,0,-30.000000,645000000,640000000,-49,-25.382966 +0,0,-30.000000,650000000,645000000,-49,-25.398884 +0,0,-30.000000,655000000,650000000,-49,-25.398553 +0,0,-30.000000,660000000,655000000,-49,-25.404729 +0,0,-30.000000,665000000,660000000,-49,-25.414913 +0,0,-30.000000,670000000,665000000,-49,-25.404868 +0,0,-30.000000,675000000,670000000,-48,-25.406440 +0,0,-30.000000,680000000,675000000,-49,-25.409537 +0,0,-30.000000,685000000,680000000,-49,-25.405626 +0,0,-30.000000,690000000,685000000,-48,-25.400806 +0,0,-30.000000,695000000,690000000,-49,-25.396972 +0,0,-30.000000,700000000,695000000,-49,-25.400166 +0,0,-30.000000,705000000,700000000,-48,-25.396730 +0,0,-30.000000,710000000,705000000,-49,-25.412184 +0,0,-30.000000,715000000,710000000,-49,-25.407777 +0,0,-30.000000,720000000,715000000,-49,-25.410656 +0,0,-30.000000,725000000,720000000,-49,-25.398794 +0,0,-30.000000,730000000,725000000,-49,-25.356492 +0,0,-30.000000,735000000,730000000,-48,-25.284358 +0,0,-30.000000,740000000,735000000,-48,-25.273533 +0,0,-30.000000,745000000,740000000,-48,-25.307042 +0,0,-30.000000,750000000,745000000,-49,-25.343473 +0,0,-30.000000,755000000,750000000,-49,-25.379210 +0,0,-30.000000,760000000,755000000,-49,-25.400885 +0,0,-30.000000,765000000,760000000,-49,-25.381128 +0,0,-30.000000,770000000,765000000,-48,-25.304245 +0,0,-30.000000,775000000,770000000,-48,-25.235908 +0,0,-30.000000,780000000,775000000,-48,-25.292025 +0,0,-30.000000,785000000,780000000,-48,-25.337625 +0,0,-30.000000,790000000,785000000,-48,-25.352084 +0,0,-30.000000,795000000,790000000,-48,-25.347856 +0,0,-30.000000,800000000,795000000,-48,-25.329161 +0,0,-30.000000,805000000,800000000,-48,-25.301734 +0,0,-30.000000,810000000,805000000,-48,-25.268601 +0,0,-30.000000,815000000,810000000,-48,-25.242944 +0,0,-30.000000,820000000,815000000,-48,-25.251727 +0,0,-30.000000,825000000,820000000,-48,-25.274535 +0,0,-30.000000,830000000,825000000,-48,-25.310526 +0,0,-30.000000,835000000,830000000,-49,-25.343078 +0,0,-30.000000,840000000,835000000,-49,-25.381097 +0,0,-30.000000,845000000,840000000,-49,-25.403964 +0,0,-30.000000,850000000,845000000,-49,-25.443475 +0,0,-30.000000,855000000,850000000,-49,-25.486770 +0,0,-30.000000,860000000,855000000,-49,-25.531770 +0,0,-30.000000,865000000,860000000,-49,-25.572735 +0,0,-30.000000,870000000,865000000,-49,-25.619761 +0,0,-30.000000,875000000,870000000,-49,-25.665110 +0,0,-30.000000,880000000,875000000,-49,-25.712303 +0,0,-30.000000,885000000,880000000,-49,-25.750959 +0,0,-30.000000,890000000,885000000,-49,-25.805909 +0,0,-30.000000,895000000,890000000,-49,-25.851893 +0,0,-30.000000,900000000,895000000,-49,-25.905421 +0,0,-30.000000,905000000,900000000,-49,-25.958305 +0,0,-30.000000,910000000,905000000,-49,-26.014620 +0,0,-30.000000,915000000,910000000,-49,-26.078620 +0,0,-30.000000,920000000,915000000,-49,-26.134932 +0,0,-30.000000,925000000,920000000,-49,-26.198343 +0,0,-30.000000,930000000,925000000,-49,-26.273949 +0,0,-30.000000,935000000,930000000,-49,-26.341500 +0,0,-30.000000,940000000,935000000,-49,-26.416031 +0,0,-30.000000,945000000,940000000,-49,-26.481521 +0,0,-30.000000,950000000,945000000,-49,-26.560791 +0,0,-30.000000,955000000,950000000,-50,-26.635488 +0,0,-30.000000,960000000,955000000,-50,-26.715638 +0,0,-30.000000,965000000,960000000,-50,-26.795101 +0,0,-30.000000,970000000,965000000,-50,-26.873576 +0,0,-30.000000,975000000,970000000,-50,-26.954751 +0,0,-30.000000,980000000,975000000,-50,-27.038496 +0,0,-30.000000,985000000,980000000,-50,-27.124070 +0,0,-30.000000,990000000,985000000,-50,-27.200008 +0,0,-30.000000,995000000,990000000,-50,-27.291378 +0,0,-30.000000,1000000000,995000000,-50,-27.381581 +0,0,-30.000000,1005000000,1000000000,-51,-27.638114 +0,0,-30.000000,1010000000,1005000000,-51,-27.691086 +0,0,-30.000000,1015000000,1010000000,-51,-27.743014 +0,0,-30.000000,1020000000,1015000000,-51,-27.807184 +0,0,-30.000000,1025000000,1020000000,-51,-27.872780 +0,0,-30.000000,1030000000,1025000000,-51,-27.936503 +0,0,-30.000000,1035000000,1030000000,-51,-28.002539 +0,0,-30.000000,1040000000,1035000000,-51,-28.064556 +0,0,-30.000000,1045000000,1040000000,-51,-28.127877 +0,0,-30.000000,1050000000,1045000000,-51,-28.303955 +0,0,-30.000000,1055000000,1050000000,-51,-28.279094 +0,0,-30.000000,1060000000,1055000000,-51,-28.292856 +0,0,-30.000000,1065000000,1060000000,-51,-28.336645 +0,0,-30.000000,1070000000,1065000000,-51,-28.377139 +0,0,-30.000000,1075000000,1070000000,-52,-28.420104 +0,0,-30.000000,1080000000,1075000000,-52,-28.455503 +0,0,-30.000000,1085000000,1080000000,-52,-28.488475 +0,0,-30.000000,1090000000,1085000000,-52,-28.518784 +0,0,-30.000000,1095000000,1090000000,-52,-28.547697 +0,0,-30.000000,1100000000,1095000000,-52,-28.572926 +0,0,-30.000000,1105000000,1100000000,-52,-28.593316 +0,0,-30.000000,1110000000,1105000000,-52,-28.606456 +0,0,-30.000000,1115000000,1110000000,-52,-28.614778 +0,0,-30.000000,1120000000,1115000000,-52,-28.622932 +0,0,-30.000000,1125000000,1120000000,-52,-28.628823 +0,0,-30.000000,1130000000,1125000000,-52,-28.632377 +0,0,-30.000000,1135000000,1130000000,-52,-28.633261 +0,0,-30.000000,1140000000,1135000000,-52,-28.637622 +0,0,-30.000000,1145000000,1140000000,-52,-28.642848 +0,0,-30.000000,1150000000,1145000000,-52,-28.646432 +0,0,-30.000000,1155000000,1150000000,-52,-28.661919 +0,0,-30.000000,1160000000,1155000000,-52,-28.685973 +0,0,-30.000000,1165000000,1160000000,-52,-28.726432 +0,0,-30.000000,1170000000,1165000000,-52,-28.785705 +0,0,-30.000000,1175000000,1170000000,-52,-28.866320 +0,0,-30.000000,1180000000,1175000000,-52,-28.952742 +0,0,-30.000000,1185000000,1180000000,-52,-29.031192 +0,0,-30.000000,1190000000,1185000000,-52,-29.080368 +0,0,-30.000000,1195000000,1190000000,-52,-29.089070 +0,0,-30.000000,1200000000,1195000000,-52,-29.066728 +0,0,-30.000000,1205000000,1200000000,-52,-29.025875 +0,0,-30.000000,1210000000,1205000000,-52,-28.979084 +0,0,-30.000000,1215000000,1210000000,-52,-28.911067 +0,0,-30.000000,1220000000,1215000000,-52,-28.866683 +0,0,-30.000000,1225000000,1220000000,-52,-28.827937 +0,0,-30.000000,1230000000,1225000000,-52,-28.799500 +0,0,-30.000000,1235000000,1230000000,-52,-28.777246 +0,0,-30.000000,1240000000,1235000000,-52,-28.757591 +0,0,-30.000000,1245000000,1240000000,-52,-28.741088 +0,0,-30.000000,1250000000,1245000000,-52,-28.732601 +0,0,-30.000000,1255000000,1250000000,-52,-28.729212 +0,0,-30.000000,1260000000,1255000000,-52,-28.724762 +0,0,-30.000000,1265000000,1260000000,-52,-28.727279 +0,0,-30.000000,1270000000,1265000000,-52,-28.736865 +0,0,-30.000000,1275000000,1270000000,-52,-28.746829 +0,0,-30.000000,1280000000,1275000000,-52,-28.757590 +0,0,-30.000000,1285000000,1280000000,-52,-28.768507 +0,0,-30.000000,1290000000,1285000000,-52,-28.785838 +0,0,-30.000000,1295000000,1290000000,-52,-28.805696 +0,0,-30.000000,1300000000,1295000000,-52,-28.822799 +0,0,-30.000000,1305000000,1300000000,-52,-28.838670 +0,0,-30.000000,1310000000,1305000000,-52,-28.857752 +0,0,-30.000000,1315000000,1310000000,-52,-28.878118 +0,0,-30.000000,1320000000,1315000000,-52,-28.897703 +0,0,-30.000000,1325000000,1320000000,-52,-28.912721 +0,0,-30.000000,1330000000,1325000000,-52,-28.930133 +0,0,-30.000000,1335000000,1330000000,-52,-28.943491 +0,0,-30.000000,1340000000,1335000000,-52,-28.952823 +0,0,-30.000000,1345000000,1340000000,-52,-28.961876 +0,0,-30.000000,1350000000,1345000000,-52,-28.970749 +0,0,-30.000000,1355000000,1350000000,-52,-28.977009 +0,0,-30.000000,1360000000,1355000000,-52,-28.979721 +0,0,-30.000000,1365000000,1360000000,-52,-28.983475 +0,0,-30.000000,1370000000,1365000000,-52,-28.980489 +0,0,-30.000000,1375000000,1370000000,-52,-28.978688 +0,0,-30.000000,1380000000,1375000000,-52,-28.972103 +0,0,-30.000000,1385000000,1380000000,-52,-28.965248 +0,0,-30.000000,1390000000,1385000000,-52,-28.953965 +0,0,-30.000000,1395000000,1390000000,-52,-28.942213 +0,0,-30.000000,1400000000,1395000000,-52,-28.926584 +0,0,-30.000000,1405000000,1400000000,-52,-28.908481 +0,0,-30.000000,1410000000,1405000000,-52,-28.885047 +0,0,-30.000000,1415000000,1410000000,-52,-28.861929 +0,0,-30.000000,1420000000,1415000000,-52,-28.833374 +0,0,-30.000000,1425000000,1420000000,-52,-28.804626 +0,0,-30.000000,1430000000,1425000000,-52,-28.772632 +0,0,-30.000000,1435000000,1430000000,-52,-28.741352 +0,0,-30.000000,1440000000,1435000000,-52,-28.708379 +0,0,-30.000000,1445000000,1440000000,-52,-28.672527 +0,0,-30.000000,1450000000,1445000000,-52,-28.638924 +0,0,-30.000000,1455000000,1450000000,-52,-28.605314 +0,0,-30.000000,1460000000,1455000000,-52,-28.573490 +0,0,-30.000000,1465000000,1460000000,-52,-28.538020 +0,0,-30.000000,1470000000,1465000000,-52,-28.507471 +0,0,-30.000000,1475000000,1470000000,-52,-28.478287 +0,0,-30.000000,1480000000,1475000000,-52,-28.447547 +0,0,-30.000000,1485000000,1480000000,-52,-28.421525 +0,0,-30.000000,1490000000,1485000000,-52,-28.395862 +0,0,-30.000000,1495000000,1490000000,-51,-28.374139 +0,0,-30.000000,1500000000,1495000000,-51,-28.355957 +0,0,-30.000000,1505000000,1500000000,-51,-28.339023 +0,0,-30.000000,1510000000,1505000000,-51,-28.338406 +0,0,-30.000000,1515000000,1510000000,-51,-28.324638 +0,0,-30.000000,1520000000,1515000000,-51,-28.313802 +0,0,-30.000000,1525000000,1520000000,-51,-28.303122 +0,0,-30.000000,1530000000,1525000000,-51,-28.300790 +0,0,-30.000000,1535000000,1530000000,-51,-28.299062 +0,0,-30.000000,1540000000,1535000000,-51,-28.301979 +0,0,-30.000000,1545000000,1540000000,-51,-28.308190 +0,0,-30.000000,1550000000,1545000000,-51,-28.316551 +0,0,-30.000000,1555000000,1550000000,-51,-28.326343 +0,0,-30.000000,1560000000,1555000000,-51,-28.341566 +0,0,-30.000000,1565000000,1560000000,-51,-28.361345 +0,0,-30.000000,1570000000,1565000000,-51,-28.383293 +0,0,-30.000000,1575000000,1570000000,-52,-28.406259 +0,0,-30.000000,1580000000,1575000000,-52,-28.437763 +0,0,-30.000000,1585000000,1580000000,-52,-28.468018 +0,0,-30.000000,1590000000,1585000000,-52,-28.506336 +0,0,-30.000000,1595000000,1590000000,-52,-28.547226 +0,0,-30.000000,1600000000,1595000000,-52,-28.590506 +0,0,-30.000000,1605000000,1600000000,-52,-28.637607 +0,0,-30.000000,1610000000,1605000000,-52,-28.864518 +0,0,-30.000000,1615000000,1610000000,-52,-28.876347 +0,0,-30.000000,1620000000,1615000000,-52,-28.899671 +0,0,-30.000000,1625000000,1620000000,-52,-28.928269 +0,0,-30.000000,1630000000,1625000000,-52,-28.975456 +0,0,-30.000000,1635000000,1630000000,-52,-29.028677 +0,0,-30.000000,1640000000,1635000000,-52,-29.087593 +0,0,-30.000000,1645000000,1640000000,-52,-29.151559 +0,0,-30.000000,1650000000,1645000000,-52,-29.217868 +0,0,-30.000000,1655000000,1650000000,-52,-29.293218 +0,0,-30.000000,1660000000,1655000000,-52,-29.362948 +0,0,-30.000000,1665000000,1660000000,-52,-29.435763 +0,0,-30.000000,1670000000,1665000000,-52,-29.507803 +0,0,-30.000000,1675000000,1670000000,-52,-29.583344 +0,0,-30.000000,1680000000,1675000000,-52,-29.657903 +0,0,-30.000000,1685000000,1680000000,-53,-29.730544 +0,0,-30.000000,1690000000,1685000000,-53,-29.806539 +0,0,-30.000000,1695000000,1690000000,-53,-29.886839 +0,0,-30.000000,1700000000,1695000000,-53,-29.968496 +0,0,-30.000000,1705000000,1700000000,-53,-30.052570 +0,0,-30.000000,1710000000,1705000000,-53,-30.144231 +0,0,-30.000000,1715000000,1710000000,-53,-30.238542 +0,0,-30.000000,1720000000,1715000000,-53,-30.332964 +0,0,-30.000000,1725000000,1720000000,-53,-30.429663 +0,0,-30.000000,1730000000,1725000000,-53,-30.525009 +0,0,-30.000000,1735000000,1730000000,-53,-30.626341 +0,0,-30.000000,1740000000,1735000000,-54,-30.725261 +0,0,-30.000000,1745000000,1740000000,-54,-30.825642 +0,0,-30.000000,1750000000,1745000000,-54,-30.925732 +0,0,-30.000000,1755000000,1750000000,-54,-31.025025 +0,0,-30.000000,1760000000,1755000000,-54,-31.122749 +0,0,-30.000000,1765000000,1760000000,-54,-31.309026 +0,0,-30.000000,1770000000,1765000000,-54,-31.344094 +0,0,-30.000000,1775000000,1770000000,-54,-31.418976 +0,0,-30.000000,1780000000,1775000000,-55,-31.510892 +0,0,-30.000000,1785000000,1780000000,-55,-31.599534 +0,0,-30.000000,1790000000,1785000000,-55,-31.686913 +0,0,-30.000000,1795000000,1790000000,-55,-31.780676 +0,0,-30.000000,1800000000,1795000000,-55,-31.863324 +0,0,-30.000000,1805000000,1800000000,-55,-31.948021 +0,0,-30.000000,1810000000,1805000000,-55,-32.026552 +0,0,-30.000000,1815000000,1810000000,-55,-32.105896 +0,0,-30.000000,1820000000,1815000000,-55,-32.181526 +0,0,-30.000000,1825000000,1820000000,-55,-32.252967 +0,0,-30.000000,1830000000,1825000000,-55,-32.316900 +0,0,-30.000000,1835000000,1830000000,-55,-32.381548 +0,0,-30.000000,1840000000,1835000000,-55,-32.446473 +0,0,-30.000000,1845000000,1840000000,-55,-32.501505 +0,0,-30.000000,1850000000,1845000000,-55,-32.554097 +0,0,-30.000000,1855000000,1850000000,-55,-32.598435 +0,0,-30.000000,1860000000,1855000000,-55,-32.647259 +0,0,-30.000000,1865000000,1860000000,-55,-32.685672 +0,0,-30.000000,1870000000,1865000000,-55,-32.727233 +0,0,-30.000000,1875000000,1870000000,-55,-32.763385 +0,0,-30.000000,1880000000,1875000000,-56,-32.794282 +0,0,-30.000000,1885000000,1880000000,-56,-32.821878 +0,0,-30.000000,1890000000,1885000000,-56,-32.851067 +0,0,-30.000000,1895000000,1890000000,-56,-32.875213 +0,0,-30.000000,1900000000,1895000000,-56,-32.898438 +0,0,-30.000000,1905000000,1900000000,-56,-32.917093 +0,0,-30.000000,1910000000,1905000000,-56,-32.935540 +0,0,-30.000000,1915000000,1910000000,-56,-32.945589 +0,0,-30.000000,1920000000,1915000000,-56,-32.964669 +0,0,-30.000000,1925000000,1920000000,-56,-32.974953 +0,0,-30.000000,1930000000,1925000000,-56,-32.993579 +0,0,-30.000000,1935000000,1930000000,-56,-33.002888 +0,0,-30.000000,1940000000,1935000000,-56,-33.019853 +0,0,-30.000000,1945000000,1940000000,-56,-33.029425 +0,0,-30.000000,1950000000,1945000000,-56,-33.046801 +0,0,-30.000000,1955000000,1950000000,-56,-33.063847 +0,0,-30.000000,1960000000,1955000000,-56,-33.087397 +0,0,-30.000000,1965000000,1960000000,-56,-33.113383 +0,0,-30.000000,1970000000,1965000000,-56,-33.142028 +0,0,-30.000000,1975000000,1970000000,-56,-33.169487 +0,0,-30.000000,1980000000,1975000000,-56,-33.198707 +0,0,-30.000000,1985000000,1980000000,-56,-33.233348 +0,0,-30.000000,1990000000,1985000000,-56,-33.271104 +0,0,-30.000000,1995000000,1990000000,-56,-33.308164 +0,0,-30.000000,2000000000,1995000000,-56,-33.349190 +0,0,-30.000000,2005000000,2000000000,-56,-33.397196 +0,0,-30.000000,2010000000,2005000000,-56,-33.444254 +0,0,-30.000000,2015000000,2010000000,-56,-33.499658 +0,0,-30.000000,2020000000,2015000000,-56,-33.558068 +0,0,-30.000000,2025000000,2020000000,-56,-33.614336 +0,0,-30.000000,2030000000,2025000000,-56,-33.677511 +0,0,-30.000000,2035000000,2030000000,-56,-33.740455 +0,0,-30.000000,2040000000,2035000000,-57,-33.805496 +0,0,-30.000000,2045000000,2040000000,-57,-33.875238 +0,0,-30.000000,2050000000,2045000000,-57,-33.945373 +0,0,-30.000000,2055000000,2050000000,-57,-34.016625 +0,0,-30.000000,2060000000,2055000000,-57,-34.090272 +0,0,-30.000000,2065000000,2060000000,-57,-34.161144 +0,0,-30.000000,2070000000,2065000000,-57,-34.151674 +0,0,-30.000000,2075000000,2070000000,-57,-34.070182 +0,0,-30.000000,2080000000,2075000000,-57,-34.019217 +0,0,-30.000000,2085000000,2080000000,-57,-34.012867 +0,0,-30.000000,2090000000,2085000000,-57,-34.027225 +0,0,-30.000000,2095000000,2090000000,-58,-34.699828 +0,0,-30.000000,2100000000,2095000000,-58,-34.723060 +0,0,-30.000000,2105000000,2100000000,-58,-34.783153 +0,0,-30.000000,2110000000,2105000000,-58,-34.851246 +0,0,-30.000000,2115000000,2110000000,-58,-34.913337 +0,0,-30.000000,2120000000,2115000000,-58,-34.972358 +0,0,-30.000000,2125000000,2120000000,-58,-35.014535 +0,0,-30.000000,2130000000,2125000000,-58,-35.051865 +0,0,-30.000000,2135000000,2130000000,-58,-35.064462 +0,0,-30.000000,2140000000,2135000000,-58,-35.084516 +0,0,-30.000000,2145000000,2140000000,-58,-35.097466 +0,0,-30.000000,2150000000,2145000000,-58,-35.105708 +0,0,-30.000000,2155000000,2150000000,-58,-35.104635 +0,0,-30.000000,2160000000,2155000000,-58,-35.093917 +0,0,-30.000000,2165000000,2160000000,-58,-35.076799 +0,0,-30.000000,2170000000,2165000000,-58,-35.056636 +0,0,-30.000000,2175000000,2170000000,-58,-35.032415 +0,0,-30.000000,2180000000,2175000000,-58,-34.999687 +0,0,-30.000000,2185000000,2180000000,-58,-34.962982 +0,0,-30.000000,2190000000,2185000000,-58,-34.925108 +0,0,-30.000000,2195000000,2190000000,-58,-34.878934 +0,0,-30.000000,2200000000,2195000000,-58,-34.831614 +0,0,-30.000000,2205000000,2200000000,-58,-34.779499 +0,0,-30.000000,2210000000,2205000000,-58,-34.723427 +0,0,-30.000000,2215000000,2210000000,-57,-34.665186 +0,0,-30.000000,2220000000,2215000000,-57,-34.602520 +0,0,-30.000000,2225000000,2220000000,-57,-34.538394 +0,0,-30.000000,2230000000,2225000000,-57,-34.471930 +0,0,-30.000000,2235000000,2230000000,-57,-34.402859 +0,0,-30.000000,2240000000,2235000000,-57,-34.336606 +0,0,-30.000000,2245000000,2240000000,-57,-34.324282 +0,0,-30.000000,2250000000,2245000000,-57,-34.371852 +0,0,-30.000000,2255000000,2250000000,-57,-34.412717 +0,0,-30.000000,2260000000,2255000000,-57,-34.438681 +0,0,-30.000000,2265000000,2260000000,-57,-34.427129 +0,0,-30.000000,2270000000,2265000000,-57,-34.415219 +0,0,-30.000000,2275000000,2270000000,-57,-33.509777 +0,0,-30.000000,2280000000,2275000000,-56,-33.625163 +0,0,-30.000000,2285000000,2280000000,-56,-33.649992 +0,0,-30.000000,2290000000,2285000000,-56,-33.615337 +0,0,-30.000000,2295000000,2290000000,-56,-33.564340 +0,0,-30.000000,2300000000,2295000000,-56,-33.515527 +0,0,-30.000000,2305000000,2300000000,-56,-33.461199 +0,0,-30.000000,2310000000,2305000000,-56,-33.410854 +0,0,-30.000000,2315000000,2310000000,-56,-33.357815 +0,0,-30.000000,2320000000,2315000000,-56,-33.318036 +0,0,-30.000000,2325000000,2320000000,-56,-33.280309 +0,0,-30.000000,2330000000,2325000000,-56,-33.247214 +0,0,-30.000000,2335000000,2330000000,-56,-33.220241 +0,0,-30.000000,2340000000,2335000000,-56,-33.193724 +0,0,-30.000000,2345000000,2340000000,-56,-33.174859 +0,0,-30.000000,2350000000,2345000000,-56,-33.160768 +0,0,-30.000000,2355000000,2350000000,-56,-33.151173 +0,0,-30.000000,2360000000,2355000000,-56,-33.145240 +0,0,-30.000000,2365000000,2360000000,-56,-33.142948 +0,0,-30.000000,2370000000,2365000000,-56,-33.144879 +0,0,-30.000000,2375000000,2370000000,-56,-33.150158 +0,0,-30.000000,2380000000,2375000000,-56,-33.157681 +0,0,-30.000000,2385000000,2380000000,-56,-33.164699 +0,0,-30.000000,2390000000,2385000000,-56,-33.176072 +0,0,-30.000000,2395000000,2390000000,-56,-33.190993 +0,0,-30.000000,2400000000,2395000000,-56,-33.200152 +0,0,-30.000000,2405000000,2400000000,-56,-33.216101 +0,0,-30.000000,2410000000,2405000000,-56,-33.226343 +0,0,-30.000000,2415000000,2410000000,-56,-33.238565 +0,0,-30.000000,2420000000,2415000000,-56,-33.248537 +0,0,-30.000000,2425000000,2420000000,-56,-33.263578 +0,0,-30.000000,2430000000,2425000000,-56,-33.274944 +0,0,-30.000000,2435000000,2430000000,-56,-33.283987 +0,0,-30.000000,2440000000,2435000000,-56,-33.294117 +0,0,-30.000000,2445000000,2440000000,-56,-33.306779 +0,0,-30.000000,2450000000,2445000000,-56,-33.317261 +0,0,-30.000000,2455000000,2450000000,-56,-33.324597 +0,0,-30.000000,2460000000,2455000000,-56,-33.330141 +0,0,-30.000000,2465000000,2460000000,-56,-33.334708 +0,0,-30.000000,2470000000,2465000000,-56,-33.338215 +0,0,-30.000000,2475000000,2470000000,-56,-33.348134 +0,0,-30.000000,2480000000,2475000000,-56,-33.354833 +0,0,-30.000000,2485000000,2480000000,-56,-33.361779 +0,0,-30.000000,2490000000,2485000000,-56,-33.368618 +0,0,-30.000000,2495000000,2490000000,-56,-33.379179 +0,0,-30.000000,2500000000,2495000000,-56,-33.393209 +0,0,-30.000000,2505000000,2500000000,-56,-33.411025 +0,0,-30.000000,2510000000,2505000000,-56,-33.430911 +0,0,-30.000000,2515000000,2510000000,-56,-33.451288 +0,0,-30.000000,2520000000,2515000000,-56,-33.474448 +0,0,-30.000000,2525000000,2520000000,-56,-33.499374 +0,0,-30.000000,2530000000,2525000000,-56,-33.527325 +0,0,-30.000000,2535000000,2530000000,-56,-33.563682 +0,0,-30.000000,2540000000,2535000000,-56,-33.597569 +0,0,-30.000000,2545000000,2540000000,-56,-33.637786 +0,0,-30.000000,2550000000,2545000000,-56,-33.678376 +0,0,-30.000000,2555000000,2550000000,-56,-33.727430 +0,0,-30.000000,2560000000,2555000000,-56,-33.771789 +0,0,-30.000000,2565000000,2560000000,-57,-33.815861 +0,0,-30.000000,2570000000,2565000000,-57,-33.869032 +0,0,-30.000000,2575000000,2570000000,-57,-33.918163 +0,0,-30.000000,2580000000,2575000000,-57,-33.972296 +0,0,-30.000000,2585000000,2580000000,-57,-34.028210 +0,0,-30.000000,2590000000,2585000000,-57,-34.082155 +0,0,-30.000000,2595000000,2590000000,-57,-34.139968 +0,0,-30.000000,2600000000,2595000000,-57,-34.153044 +0,0,-30.000000,2605000000,2600000000,-57,-34.102208 +0,0,-30.000000,2610000000,2605000000,-57,-34.060538 +0,0,-30.000000,2615000000,2610000000,-57,-34.029632 +0,0,-30.000000,2620000000,2615000000,-57,-34.007356 +0,0,-30.000000,2625000000,2620000000,-57,-34.012702 +0,0,-30.000000,2630000000,2625000000,-57,-34.018282 +0,0,-30.000000,2635000000,2630000000,-58,-34.691262 +0,0,-30.000000,2640000000,2635000000,-58,-34.683082 +0,0,-30.000000,2645000000,2640000000,-58,-34.732363 +0,0,-30.000000,2650000000,2645000000,-58,-34.786820 +0,0,-30.000000,2655000000,2650000000,-58,-34.852958 +0,0,-30.000000,2660000000,2655000000,-58,-34.912171 +0,0,-30.000000,2665000000,2660000000,-58,-34.973454 +0,0,-30.000000,2670000000,2665000000,-58,-35.032985 +0,0,-30.000000,2675000000,2670000000,-58,-35.096722 +0,0,-30.000000,2680000000,2675000000,-58,-35.159531 +0,0,-30.000000,2685000000,2680000000,-58,-35.223494 +0,0,-30.000000,2690000000,2685000000,-58,-35.290575 +0,0,-30.000000,2695000000,2690000000,-58,-35.361626 +0,0,-30.000000,2700000000,2695000000,-58,-35.426749 +0,0,-30.000000,2705000000,2700000000,-58,-35.593166 +0,0,-30.000000,2710000000,2705000000,-58,-35.637284 +0,0,-30.000000,2715000000,2710000000,-58,-35.694362 +0,0,-30.000000,2720000000,2715000000,-58,-35.751131 +0,0,-30.000000,2725000000,2720000000,-58,-35.829839 +0,0,-30.000000,2730000000,2725000000,-58,-35.902531 +0,0,-30.000000,2735000000,2730000000,-58,-35.985883 +0,0,-30.000000,2740000000,2735000000,-59,-36.069067 +0,0,-30.000000,2745000000,2740000000,-59,-36.158203 +0,0,-30.000000,2750000000,2745000000,-59,-36.247118 +0,0,-30.000000,2755000000,2750000000,-59,-36.347993 +0,0,-30.000000,2760000000,2755000000,-59,-36.442875 +0,0,-30.000000,2765000000,2760000000,-59,-36.554186 +0,0,-30.000000,2770000000,2765000000,-59,-36.668194 +0,0,-30.000000,2775000000,2770000000,-59,-36.783228 +0,0,-30.000000,2780000000,2775000000,-59,-36.899751 +0,0,-30.000000,2785000000,2780000000,-60,-37.021731 +0,0,-30.000000,2790000000,2785000000,-60,-37.138118 +0,0,-30.000000,2795000000,2790000000,-60,-37.162536 +0,0,-30.000000,2800000000,2795000000,-60,-37.103843 +0,0,-30.000000,2805000000,2800000000,-60,-37.048106 +0,0,-30.000000,2810000000,2805000000,-60,-37.888671 +0,0,-30.000000,2815000000,2810000000,-60,-37.861303 +0,0,-30.000000,2820000000,2815000000,-60,-37.919929 +0,0,-30.000000,2825000000,2820000000,-61,-38.034309 +0,0,-30.000000,2830000000,2825000000,-61,-38.156616 +0,0,-30.000000,2835000000,2830000000,-61,-38.281467 +0,0,-30.000000,2840000000,2835000000,-61,-38.405370 +0,0,-30.000000,2845000000,2840000000,-61,-38.522237 +0,0,-30.000000,2850000000,2845000000,-61,-38.640325 +0,0,-30.000000,2855000000,2850000000,-61,-38.761633 +0,0,-30.000000,2860000000,2855000000,-61,-38.862864 +0,0,-30.000000,2865000000,2860000000,-61,-38.949813 +0,0,-30.000000,2870000000,2865000000,-61,-39.069492 +0,0,-30.000000,2875000000,2870000000,-61,-39.167590 +0,0,-30.000000,2880000000,2875000000,-61,-39.264731 +0,0,-30.000000,2885000000,2880000000,-61,-39.360211 +0,0,-30.000000,2890000000,2885000000,-62,-39.448456 +0,0,-30.000000,2895000000,2890000000,-62,-39.537843 +0,0,-30.000000,2900000000,2895000000,-62,-39.619851 +0,0,-30.000000,2905000000,2900000000,-62,-39.693136 +0,0,-30.000000,2910000000,2905000000,-62,-39.776355 +0,0,-30.000000,2915000000,2910000000,-62,-39.843868 +0,0,-30.000000,2920000000,2915000000,-62,-39.911557 +0,0,-30.000000,2925000000,2920000000,-62,-39.965128 +0,0,-30.000000,2930000000,2925000000,-62,-40.013397 +0,0,-30.000000,2935000000,2930000000,-63,-40.067993 +0,0,-30.000000,2940000000,2935000000,-62,-40.110369 +0,0,-30.000000,2945000000,2940000000,-63,-40.138663 +0,0,-30.000000,2950000000,2945000000,-63,-40.144069 +0,0,-30.000000,2955000000,2950000000,-63,-40.124285 +0,0,-30.000000,2960000000,2955000000,-63,-40.111869 +0,0,-30.000000,2965000000,2960000000,-62,-40.104916 +0,0,-30.000000,2970000000,2965000000,-63,-40.099216 +0,0,-30.000000,2975000000,2970000000,-63,-40.094184 +0,0,-30.000000,2980000000,2975000000,-62,-40.079391 +0,0,-30.000000,2985000000,2980000000,-63,-40.071197 +0,0,-30.000000,2990000000,2985000000,-62,-40.077734 +0,0,-30.000000,2995000000,2990000000,-62,-40.082257 +0,0,-30.000000,3000000000,2995000000,-62,-40.069316 +0,0,-30.000000,3005000000,3000000000,-62,-40.066070 +0,0,-30.000000,3010000000,3005000000,-59,-36.707229 +0,0,-30.000000,3015000000,3010000000,-59,-36.839754 +0,0,-30.000000,3020000000,3015000000,-59,-36.876682 +0,0,-30.000000,3025000000,3020000000,-59,-36.884961 +0,0,-30.000000,3030000000,3025000000,-59,-36.881890 +0,0,-30.000000,3035000000,3030000000,-59,-36.883236 +0,0,-30.000000,3040000000,3035000000,-59,-36.876755 +0,0,-30.000000,3045000000,3040000000,-59,-36.874012 +0,0,-30.000000,3050000000,3045000000,-59,-36.870488 +0,0,-30.000000,3055000000,3050000000,-59,-36.874931 +0,0,-30.000000,3060000000,3055000000,-59,-36.876386 +0,0,-30.000000,3065000000,3060000000,-59,-36.880370 +0,0,-30.000000,3070000000,3065000000,-59,-36.888294 +0,0,-30.000000,3075000000,3070000000,-59,-36.900806 +0,0,-30.000000,3080000000,3075000000,-59,-36.909488 +0,0,-30.000000,3085000000,3080000000,-59,-36.928543 +0,0,-30.000000,3090000000,3085000000,-59,-36.953705 +0,0,-30.000000,3095000000,3090000000,-59,-36.975518 +0,0,-30.000000,3100000000,3095000000,-60,-36.999990 +0,0,-30.000000,3105000000,3100000000,-60,-37.032812 +0,0,-30.000000,3110000000,3105000000,-60,-37.068974 +0,0,-30.000000,3115000000,3110000000,-60,-37.110603 +0,0,-30.000000,3120000000,3115000000,-60,-37.159534 +0,0,-30.000000,3125000000,3120000000,-60,-37.295069 +0,0,-30.000000,3130000000,3125000000,-60,-37.421147 +0,0,-30.000000,3135000000,3130000000,-60,-37.424640 +0,0,-30.000000,3140000000,3135000000,-60,-37.432549 +0,0,-30.000000,3145000000,3140000000,-60,-37.448059 +0,0,-30.000000,3150000000,3145000000,-60,-37.499442 +0,0,-30.000000,3155000000,3150000000,-60,-37.545349 +0,0,-30.000000,3160000000,3155000000,-60,-37.604948 +0,0,-30.000000,3165000000,3160000000,-60,-37.667317 +0,0,-30.000000,3170000000,3165000000,-60,-37.717685 +0,0,-30.000000,3175000000,3170000000,-60,-37.765258 +0,0,-30.000000,3180000000,3175000000,-60,-37.816497 +0,0,-30.000000,3185000000,3180000000,-60,-37.871444 +0,0,-30.000000,3190000000,3185000000,-60,-37.906270 +0,0,-30.000000,3195000000,3190000000,-60,-37.949742 +0,0,-30.000000,3200000000,3195000000,-60,-37.983743 +0,0,-30.000000,3205000000,3200000000,-61,-38.020450 +0,0,-30.000000,3210000000,3205000000,-61,-38.045177 +0,0,-30.000000,3215000000,3210000000,-61,-38.066813 +0,0,-30.000000,3220000000,3215000000,-61,-38.090233 +0,0,-30.000000,3225000000,3220000000,-61,-38.107456 +0,0,-30.000000,3230000000,3225000000,-61,-38.118520 +0,0,-30.000000,3235000000,3230000000,-61,-38.124422 +0,0,-30.000000,3240000000,3235000000,-61,-38.124819 +0,0,-30.000000,3245000000,3240000000,-61,-38.123202 +0,0,-30.000000,3250000000,3245000000,-61,-38.123047 +0,0,-30.000000,3255000000,3250000000,-61,-38.121889 +0,0,-30.000000,3260000000,3255000000,-61,-38.103617 +0,0,-30.000000,3265000000,3260000000,-61,-38.089825 +0,0,-30.000000,3270000000,3265000000,-61,-38.070241 +0,0,-30.000000,3275000000,3270000000,-61,-38.048198 +0,0,-30.000000,3280000000,3275000000,-61,-38.021993 +0,0,-30.000000,3285000000,3280000000,-60,-37.992508 +0,0,-30.000000,3290000000,3285000000,-60,-37.951408 +0,0,-30.000000,3295000000,3290000000,-60,-37.912083 +0,0,-30.000000,3300000000,3295000000,-60,-37.875164 +0,0,-30.000000,3305000000,3300000000,-60,-37.816240 +0,0,-30.000000,3310000000,3305000000,-60,-37.768241 +0,0,-30.000000,3315000000,3310000000,-60,-37.710578 +0,0,-30.000000,3320000000,3315000000,-60,-37.651295 +0,0,-30.000000,3325000000,3320000000,-60,-37.590496 +0,0,-30.000000,3330000000,3325000000,-60,-37.530963 +0,0,-30.000000,3335000000,3330000000,-60,-37.460003 +0,0,-30.000000,3340000000,3335000000,-60,-37.408467 +0,0,-30.000000,3345000000,3340000000,-60,-37.399387 +0,0,-30.000000,3350000000,3345000000,-60,-37.430017 +0,0,-30.000000,3355000000,3350000000,-60,-37.444532 +0,0,-30.000000,3360000000,3355000000,-60,-37.455508 +0,0,-30.000000,3365000000,3360000000,-60,-37.467197 +0,0,-30.000000,3370000000,3365000000,-60,-37.457607 +0,0,-30.000000,3375000000,3370000000,-60,-37.415093 +0,0,-30.000000,3380000000,3375000000,-60,-37.373884 +0,0,-30.000000,3385000000,3380000000,-60,-36.533372 +0,0,-30.000000,3390000000,3385000000,-59,-36.617040 +0,0,-30.000000,3395000000,3390000000,-59,-36.624909 +0,0,-30.000000,3400000000,3395000000,-59,-36.592608 +0,0,-30.000000,3405000000,3400000000,-59,-36.547445 +0,0,-30.000000,3410000000,3405000000,-59,-36.504298 +0,0,-30.000000,3415000000,3410000000,-59,-36.460078 +0,0,-30.000000,3420000000,3415000000,-59,-36.415491 +0,0,-30.000000,3425000000,3420000000,-59,-36.387438 +0,0,-30.000000,3430000000,3425000000,-59,-36.347859 +0,0,-30.000000,3435000000,3430000000,-59,-36.315288 +0,0,-30.000000,3440000000,3435000000,-59,-36.290960 +0,0,-30.000000,3445000000,3440000000,-59,-36.235765 +0,0,-30.000000,3450000000,3445000000,-59,-36.212162 +0,0,-30.000000,3455000000,3450000000,-59,-36.186729 +0,0,-30.000000,3460000000,3455000000,-59,-36.169271 +0,0,-30.000000,3465000000,3460000000,-59,-36.152598 +0,0,-30.000000,3470000000,3465000000,-59,-36.143432 +0,0,-30.000000,3475000000,3470000000,-59,-36.135668 +0,0,-30.000000,3480000000,3475000000,-59,-36.121889 +0,0,-30.000000,3485000000,3480000000,-59,-36.118041 +0,0,-30.000000,3490000000,3485000000,-59,-36.111445 +0,0,-30.000000,3495000000,3490000000,-59,-36.112991 +0,0,-30.000000,3500000000,3495000000,-59,-36.114199 +0,0,-30.000000,3505000000,3500000000,-59,-36.111847 +0,0,-30.000000,3510000000,3505000000,-59,-36.109118 +0,0,-30.000000,3515000000,3510000000,-59,-36.095974 +0,0,-30.000000,3520000000,3515000000,-59,-36.090233 +0,0,-30.000000,3525000000,3520000000,-58,-36.085013 +0,0,-30.000000,3530000000,3525000000,-59,-36.083587 +0,0,-30.000000,3535000000,3530000000,-59,-36.081278 +0,0,-30.000000,3540000000,3535000000,-58,-36.078842 +0,0,-30.000000,3545000000,3540000000,-58,-36.070674 +0,0,-30.000000,3550000000,3545000000,-58,-36.065592 +0,0,-30.000000,3555000000,3550000000,-58,-36.055231 +0,0,-30.000000,3560000000,3555000000,-58,-36.044616 +0,0,-30.000000,3565000000,3560000000,-58,-36.026211 +0,0,-30.000000,3570000000,3565000000,-58,-36.005576 +0,0,-30.000000,3575000000,3570000000,-58,-35.984534 +0,0,-30.000000,3580000000,3575000000,-58,-35.956859 +0,0,-30.000000,3585000000,3580000000,-58,-35.930280 +0,0,-30.000000,3590000000,3585000000,-58,-35.903363 +0,0,-30.000000,3595000000,3590000000,-58,-35.883388 +0,0,-30.000000,3600000000,3595000000,-58,-35.852765 +0,0,-30.000000,3605000000,3600000000,-58,-36.066602 +0,0,-30.000000,3610000000,3605000000,-58,-36.010870 +0,0,-30.000000,3615000000,3610000000,-58,-35.956604 +0,0,-30.000000,3620000000,3615000000,-58,-35.898851 +0,0,-30.000000,3625000000,3620000000,-58,-35.837502 +0,0,-30.000000,3630000000,3625000000,-58,-35.778818 +0,0,-30.000000,3635000000,3630000000,-58,-35.725824 +0,0,-30.000000,3640000000,3635000000,-58,-35.665405 +0,0,-30.000000,3645000000,3640000000,-58,-35.600199 +0,0,-30.000000,3650000000,3645000000,-58,-35.547322 +0,0,-30.000000,3655000000,3650000000,-58,-35.490529 +0,0,-30.000000,3660000000,3655000000,-58,-35.429025 +0,0,-30.000000,3665000000,3660000000,-58,-35.373208 +0,0,-30.000000,3670000000,3665000000,-58,-35.319324 +0,0,-30.000000,3675000000,3670000000,-58,-35.260399 +0,0,-30.000000,3680000000,3675000000,-58,-35.204579 +0,0,-30.000000,3685000000,3680000000,-58,-35.142264 +0,0,-30.000000,3690000000,3685000000,-58,-35.086481 +0,0,-30.000000,3695000000,3690000000,-58,-35.030879 +0,0,-30.000000,3700000000,3695000000,-58,-34.968871 +0,0,-30.000000,3705000000,3700000000,-58,-34.927560 +0,0,-30.000000,3710000000,3705000000,-58,-34.868097 +0,0,-30.000000,3715000000,3710000000,-58,-34.818134 +0,0,-30.000000,3720000000,3715000000,-58,-34.772457 +0,0,-30.000000,3725000000,3720000000,-58,-34.714834 +0,0,-30.000000,3730000000,3725000000,-57,-34.671810 +0,0,-30.000000,3735000000,3730000000,-57,-34.646003 +0,0,-30.000000,3740000000,3735000000,-57,-34.599783 +0,0,-30.000000,3745000000,3740000000,-57,-34.570784 +0,0,-30.000000,3750000000,3745000000,-57,-34.529898 +0,0,-30.000000,3755000000,3750000000,-57,-34.495316 +0,0,-30.000000,3760000000,3755000000,-57,-34.462331 +0,0,-30.000000,3765000000,3760000000,-57,-34.433188 +0,0,-30.000000,3770000000,3765000000,-57,-34.412007 +0,0,-30.000000,3775000000,3770000000,-57,-34.388148 +0,0,-30.000000,3780000000,3775000000,-57,-34.373017 +0,0,-30.000000,3785000000,3780000000,-57,-34.360390 +0,0,-30.000000,3790000000,3785000000,-57,-34.352548 +0,0,-30.000000,3795000000,3790000000,-57,-34.343183 +0,0,-30.000000,3800000000,3795000000,-57,-34.346803 +0,0,-30.000000,3805000000,3800000000,-57,-34.349096 +0,0,-30.000000,3810000000,3805000000,-57,-34.351944 +0,0,-30.000000,3815000000,3810000000,-57,-34.352213 +0,0,-30.000000,3820000000,3815000000,-57,-34.357172 +0,0,-30.000000,3825000000,3820000000,-57,-34.354634 +0,0,-30.000000,3830000000,3825000000,-57,-34.355452 +0,0,-30.000000,3835000000,3830000000,-57,-34.356950 +0,0,-30.000000,3840000000,3835000000,-57,-34.359027 +0,0,-30.000000,3845000000,3840000000,-57,-34.358299 +0,0,-30.000000,3850000000,3845000000,-57,-34.361356 +0,0,-30.000000,3855000000,3850000000,-57,-34.366438 +0,0,-30.000000,3860000000,3855000000,-57,-34.373441 +0,0,-30.000000,3865000000,3860000000,-57,-34.383589 +0,0,-30.000000,3870000000,3865000000,-57,-34.393606 +0,0,-30.000000,3875000000,3870000000,-57,-34.405727 +0,0,-30.000000,3880000000,3875000000,-57,-34.420465 +0,0,-30.000000,3885000000,3880000000,-57,-34.431880 +0,0,-30.000000,3890000000,3885000000,-57,-34.452883 +0,0,-30.000000,3895000000,3890000000,-57,-34.465586 +0,0,-30.000000,3900000000,3895000000,-57,-34.481512 +0,0,-30.000000,3905000000,3900000000,-57,-34.493356 +0,0,-30.000000,3910000000,3905000000,-57,-34.507400 +0,0,-30.000000,3915000000,3910000000,-57,-34.514949 +0,0,-30.000000,3920000000,3915000000,-57,-34.521083 +0,0,-30.000000,3925000000,3920000000,-57,-34.534800 +0,0,-30.000000,3930000000,3925000000,-57,-34.551531 +0,0,-30.000000,3935000000,3930000000,-57,-34.559958 +0,0,-30.000000,3940000000,3935000000,-57,-34.561892 +0,0,-30.000000,3945000000,3940000000,-57,-34.568478 +0,0,-30.000000,3950000000,3945000000,-57,-34.572655 +0,0,-30.000000,3955000000,3950000000,-57,-34.578222 +0,0,-30.000000,3960000000,3955000000,-57,-34.591748 +0,0,-30.000000,3965000000,3960000000,-57,-34.598075 +0,0,-30.000000,3970000000,3965000000,-57,-34.604259 +0,0,-30.000000,3975000000,3970000000,-57,-34.609605 +0,0,-30.000000,3980000000,3975000000,-57,-34.617523 +0,0,-30.000000,3985000000,3980000000,-57,-34.622001 +0,0,-30.000000,3990000000,3985000000,-57,-34.620706 +0,0,-30.000000,3995000000,3990000000,-57,-34.622585 +0,0,-30.000000,4000000000,3995000000,-57,-34.618368 +0,0,-30.000000,4005000000,4000000000,-58,-34.856233 +0,0,-30.000000,4010000000,4005000000,-57,-36.697914 +0,0,-30.000000,4015000000,4010000000,-57,-36.690595 +0,0,-30.000000,4020000000,4015000000,-57,-36.672963 +0,0,-30.000000,4025000000,4020000000,-57,-36.662879 +0,0,-30.000000,4030000000,4025000000,-57,-36.654534 +0,0,-30.000000,4035000000,4030000000,-57,-36.644079 +0,0,-30.000000,4040000000,4035000000,-57,-36.635002 +0,0,-30.000000,4045000000,4040000000,-57,-36.624288 +0,0,-30.000000,4050000000,4045000000,-57,-36.625662 +0,0,-30.000000,4055000000,4050000000,-57,-36.622520 +0,0,-30.000000,4060000000,4055000000,-57,-36.618348 +0,0,-30.000000,4065000000,4060000000,-57,-36.611889 +0,0,-30.000000,4070000000,4065000000,-57,-36.606543 +0,0,-30.000000,4075000000,4070000000,-57,-36.615251 +0,0,-30.000000,4080000000,4075000000,-57,-36.607884 +0,0,-30.000000,4085000000,4080000000,-57,-36.594790 +0,0,-30.000000,4090000000,4085000000,-57,-36.580313 +0,0,-30.000000,4095000000,4090000000,-57,-36.565991 +0,0,-30.000000,4100000000,4095000000,-57,-36.559380 +0,0,-30.000000,4105000000,4100000000,-57,-36.546723 +0,0,-30.000000,4110000000,4105000000,-57,-36.529526 +0,0,-30.000000,4115000000,4110000000,-57,-36.526698 +0,0,-30.000000,4120000000,4115000000,-57,-36.513581 +0,0,-30.000000,4125000000,4120000000,-57,-36.507801 +0,0,-30.000000,4130000000,4125000000,-57,-36.495223 +0,0,-30.000000,4135000000,4130000000,-57,-36.494210 +0,0,-30.000000,4140000000,4135000000,-57,-36.490676 +0,0,-30.000000,4145000000,4140000000,-57,-36.483367 +0,0,-30.000000,4150000000,4145000000,-57,-36.477277 +0,0,-30.000000,4155000000,4150000000,-57,-36.481715 +0,0,-30.000000,4160000000,4155000000,-57,-36.482401 +0,0,-30.000000,4165000000,4160000000,-57,-36.482532 +0,0,-30.000000,4170000000,4165000000,-57,-36.488171 +0,0,-30.000000,4175000000,4170000000,-57,-36.488470 +0,0,-30.000000,4180000000,4175000000,-57,-36.493351 +0,0,-30.000000,4185000000,4180000000,-57,-36.495854 +0,0,-30.000000,4190000000,4185000000,-57,-36.494510 +0,0,-30.000000,4195000000,4190000000,-57,-36.500434 +0,0,-30.000000,4200000000,4195000000,-57,-36.499495 +0,0,-30.000000,4205000000,4200000000,-57,-36.509786 +0,0,-30.000000,4210000000,4205000000,-57,-36.517217 +0,0,-30.000000,4215000000,4210000000,-57,-36.527057 +0,0,-30.000000,4220000000,4215000000,-57,-36.532118 +0,0,-30.000000,4225000000,4220000000,-57,-36.543665 +0,0,-30.000000,4230000000,4225000000,-57,-36.559716 +0,0,-30.000000,4235000000,4230000000,-57,-36.581959 +0,0,-30.000000,4240000000,4235000000,-57,-36.592691 +0,0,-30.000000,4245000000,4240000000,-57,-36.608677 +0,0,-30.000000,4250000000,4245000000,-57,-36.630910 +0,0,-30.000000,4255000000,4250000000,-57,-36.654153 +0,0,-30.000000,4260000000,4255000000,-57,-36.676056 +0,0,-30.000000,4265000000,4260000000,-57,-36.696487 +0,0,-30.000000,4270000000,4265000000,-57,-36.720644 +0,0,-30.000000,4275000000,4270000000,-57,-36.749403 +0,0,-30.000000,4280000000,4275000000,-57,-36.770399 +0,0,-30.000000,4285000000,4280000000,-57,-36.801016 +0,0,-30.000000,4290000000,4285000000,-57,-36.829370 +0,0,-30.000000,4295000000,4290000000,-57,-36.860181 +0,0,-30.000000,4300000000,4295000000,-57,-36.897028 +0,0,-30.000000,4305000000,4300000000,-57,-36.930666 +0,0,-30.000000,4310000000,4305000000,-57,-36.968725 +0,0,-30.000000,4315000000,4310000000,-58,-36.996457 +0,0,-30.000000,4320000000,4315000000,-58,-37.027798 +0,0,-30.000000,4325000000,4320000000,-58,-37.058764 +0,0,-30.000000,4330000000,4325000000,-58,-37.096145 +0,0,-30.000000,4335000000,4330000000,-58,-37.126476 +0,0,-30.000000,4340000000,4335000000,-58,-37.145570 +0,0,-30.000000,4345000000,4340000000,-58,-37.146110 +0,0,-30.000000,4350000000,4345000000,-58,-37.129804 +0,0,-30.000000,4355000000,4350000000,-58,-37.115987 +0,0,-30.000000,4360000000,4355000000,-58,-37.099514 +0,0,-30.000000,4365000000,4360000000,-58,-37.085585 +0,0,-30.000000,4370000000,4365000000,-58,-37.067545 +0,0,-30.000000,4375000000,4370000000,-58,-37.059450 +0,0,-30.000000,4380000000,4375000000,-58,-37.061240 +0,0,-30.000000,4385000000,4380000000,-58,-37.055484 +0,0,-30.000000,4390000000,4385000000,-58,-37.042252 +0,0,-30.000000,4395000000,4390000000,-58,-37.038933 +0,0,-30.000000,4400000000,4395000000,-58,-37.044300 +0,0,-30.000000,4405000000,4400000000,-58,-37.029655 +0,0,-30.000000,4410000000,4405000000,-58,-37.031833 +0,0,-30.000000,4415000000,4410000000,-58,-37.941042 +0,0,-30.000000,4420000000,4415000000,-58,-37.691994 +0,0,-30.000000,4425000000,4420000000,-58,-37.626077 +0,0,-30.000000,4430000000,4425000000,-58,-37.630876 +0,0,-30.000000,4435000000,4430000000,-58,-37.655687 +0,0,-30.000000,4440000000,4435000000,-58,-37.677722 +0,0,-30.000000,4445000000,4440000000,-58,-37.701215 +0,0,-30.000000,4450000000,4445000000,-58,-37.712988 +0,0,-30.000000,4455000000,4450000000,-58,-37.726316 +0,0,-30.000000,4460000000,4455000000,-58,-37.750892 +0,0,-30.000000,4465000000,4460000000,-58,-37.767072 +0,0,-30.000000,4470000000,4465000000,-58,-37.783106 +0,0,-30.000000,4475000000,4470000000,-58,-37.802631 +0,0,-30.000000,4480000000,4475000000,-58,-37.828318 +0,0,-30.000000,4485000000,4480000000,-58,-37.845865 +0,0,-30.000000,4490000000,4485000000,-58,-37.859349 +0,0,-30.000000,4495000000,4490000000,-58,-37.876571 +0,0,-30.000000,4500000000,4495000000,-58,-37.894560 +0,0,-30.000000,4505000000,4500000000,-58,-37.914219 +0,0,-30.000000,4510000000,4505000000,-58,-37.932272 +0,0,-30.000000,4515000000,4510000000,-58,-37.946426 +0,0,-30.000000,4520000000,4515000000,-58,-37.967477 +0,0,-30.000000,4525000000,4520000000,-58,-37.984467 +0,0,-30.000000,4530000000,4525000000,-58,-38.001548 +0,0,-30.000000,4535000000,4530000000,-59,-38.018933 +0,0,-30.000000,4540000000,4535000000,-59,-38.046066 +0,0,-30.000000,4545000000,4540000000,-59,-38.079980 +0,0,-30.000000,4550000000,4545000000,-59,-38.098509 +0,0,-30.000000,4555000000,4550000000,-59,-38.115672 +0,0,-30.000000,4560000000,4555000000,-59,-38.143689 +0,0,-30.000000,4565000000,4560000000,-59,-38.167212 +0,0,-30.000000,4570000000,4565000000,-59,-38.191868 +0,0,-30.000000,4575000000,4570000000,-59,-38.205826 +0,0,-30.000000,4580000000,4575000000,-59,-38.229075 +0,0,-30.000000,4585000000,4580000000,-59,-38.251905 +0,0,-30.000000,4590000000,4585000000,-59,-38.278790 +0,0,-30.000000,4595000000,4590000000,-59,-38.304025 +0,0,-30.000000,4600000000,4595000000,-59,-38.303356 +0,0,-30.000000,4605000000,4600000000,-59,-38.334483 +0,0,-30.000000,4610000000,4605000000,-59,-38.352109 +0,0,-30.000000,4615000000,4610000000,-59,-38.373841 +0,0,-30.000000,4620000000,4615000000,-59,-38.391914 +0,0,-30.000000,4625000000,4620000000,-59,-38.413625 +0,0,-30.000000,4630000000,4625000000,-59,-38.431455 +0,0,-30.000000,4635000000,4630000000,-59,-38.458292 +0,0,-30.000000,4640000000,4635000000,-59,-38.477832 +0,0,-30.000000,4645000000,4640000000,-59,-38.486189 +0,0,-30.000000,4650000000,4645000000,-59,-38.497340 +0,0,-30.000000,4655000000,4650000000,-59,-38.511409 +0,0,-30.000000,4660000000,4655000000,-59,-38.535029 +0,0,-30.000000,4665000000,4660000000,-59,-38.534211 +0,0,-30.000000,4670000000,4665000000,-59,-38.540175 +0,0,-30.000000,4675000000,4670000000,-59,-38.553335 +0,0,-30.000000,4680000000,4675000000,-59,-38.561973 +0,0,-30.000000,4685000000,4680000000,-59,-38.580756 +0,0,-30.000000,4690000000,4685000000,-59,-38.596320 +0,0,-30.000000,4695000000,4690000000,-59,-38.593886 +0,0,-30.000000,4700000000,4695000000,-59,-38.609368 +0,0,-30.000000,4705000000,4700000000,-59,-38.619138 +0,0,-30.000000,4710000000,4705000000,-59,-38.641705 +0,0,-30.000000,4715000000,4710000000,-59,-38.647292 +0,0,-30.000000,4720000000,4715000000,-59,-38.660491 +0,0,-30.000000,4725000000,4720000000,-59,-38.679112 +0,0,-30.000000,4730000000,4725000000,-59,-38.680180 +0,0,-30.000000,4735000000,4730000000,-59,-38.697954 +0,0,-30.000000,4740000000,4735000000,-59,-38.712884 +0,0,-30.000000,4745000000,4740000000,-59,-38.726850 +0,0,-30.000000,4750000000,4745000000,-59,-38.738945 +0,0,-30.000000,4755000000,4750000000,-59,-38.742188 +0,0,-30.000000,4760000000,4755000000,-59,-38.752303 +0,0,-30.000000,4765000000,4760000000,-59,-38.750448 +0,0,-30.000000,4770000000,4765000000,-59,-38.743124 +0,0,-30.000000,4775000000,4770000000,-59,-38.744657 +0,0,-30.000000,4780000000,4775000000,-59,-38.754238 +0,0,-30.000000,4785000000,4780000000,-59,-38.760327 +0,0,-30.000000,4790000000,4785000000,-59,-38.766095 +0,0,-30.000000,4795000000,4790000000,-59,-38.771102 +0,0,-30.000000,4800000000,4795000000,-59,-38.772677 +0,0,-30.000000,4805000000,4800000000,-59,-38.787835 +0,0,-30.000000,4810000000,4805000000,-59,-38.805007 +0,0,-30.000000,4815000000,4810000000,-59,-38.816870 +0,0,-30.000000,4820000000,4815000000,-59,-38.816422 +0,0,-30.000000,4825000000,4820000000,-59,-38.833875 +0,0,-30.000000,4830000000,4825000000,-59,-38.822019 +0,0,-30.000000,4835000000,4830000000,-59,-38.833489 +0,0,-30.000000,4840000000,4835000000,-59,-38.846553 +0,0,-30.000000,4845000000,4840000000,-59,-38.852811 +0,0,-30.000000,4850000000,4845000000,-59,-38.853334 +0,0,-30.000000,4855000000,4850000000,-59,-38.848645 +0,0,-30.000000,4860000000,4855000000,-59,-38.859064 +0,0,-30.000000,4865000000,4860000000,-59,-38.847664 +0,0,-30.000000,4870000000,4865000000,-59,-38.849087 +0,0,-30.000000,4875000000,4870000000,-59,-38.839655 +0,0,-30.000000,4880000000,4875000000,-59,-38.861966 +0,0,-30.000000,4885000000,4880000000,-59,-38.855158 +0,0,-30.000000,4890000000,4885000000,-59,-38.851381 +0,0,-30.000000,4895000000,4890000000,-59,-38.853722 +0,0,-30.000000,4900000000,4895000000,-59,-38.849788 +0,0,-30.000000,4905000000,4900000000,-59,-38.853899 +0,0,-30.000000,4910000000,4905000000,-59,-38.854204 +0,0,-30.000000,4915000000,4910000000,-59,-38.874255 +0,0,-30.000000,4920000000,4915000000,-59,-38.873607 +0,0,-30.000000,4925000000,4920000000,-59,-38.868583 +0,0,-30.000000,4930000000,4925000000,-59,-38.872920 +0,0,-30.000000,4935000000,4930000000,-59,-38.891903 +0,0,-30.000000,4940000000,4935000000,-59,-38.890589 +0,0,-30.000000,4945000000,4940000000,-59,-38.891301 +0,0,-30.000000,4950000000,4945000000,-59,-38.902919 +0,0,-30.000000,4955000000,4950000000,-59,-38.916139 +0,0,-30.000000,4960000000,4955000000,-59,-38.922480 +0,0,-30.000000,4965000000,4960000000,-59,-38.921281 +0,0,-30.000000,4970000000,4965000000,-59,-38.915864 +0,0,-30.000000,4975000000,4970000000,-59,-38.917559 +0,0,-30.000000,4980000000,4975000000,-59,-38.937604 +0,0,-30.000000,4985000000,4980000000,-59,-38.933803 +0,0,-30.000000,4990000000,4985000000,-59,-38.954717 +0,0,-30.000000,4995000000,4990000000,-59,-38.987663 +0,0,-30.000000,5000000000,4995000000,-59,-39.026994 +0,0,-30.000000,5005000000,5000000000,-59,-39.082256 +0,0,-30.000000,5010000000,5005000000,-59,-39.061533 +0,0,-30.000000,5015000000,5010000000,-59,-39.038581 +0,0,-30.000000,5020000000,5015000000,-59,-39.033968 +0,0,-30.000000,5025000000,5020000000,-59,-39.016413 +0,0,-30.000000,5030000000,5025000000,-59,-39.016008 +0,0,-30.000000,5035000000,5030000000,-59,-39.016641 +0,0,-30.000000,5040000000,5035000000,-59,-39.004888 +0,0,-30.000000,5045000000,5040000000,-59,-39.006264 +0,0,-30.000000,5050000000,5045000000,-59,-39.009493 +0,0,-30.000000,5055000000,5050000000,-59,-39.011818 +0,0,-30.000000,5060000000,5055000000,-59,-39.023512 +0,0,-30.000000,5065000000,5060000000,-59,-39.042158 +0,0,-30.000000,5070000000,5065000000,-59,-39.037189 +0,0,-30.000000,5075000000,5070000000,-59,-39.059171 +0,0,-30.000000,5080000000,5075000000,-59,-39.063856 +0,0,-30.000000,5085000000,5080000000,-59,-39.073410 +0,0,-30.000000,5090000000,5085000000,-59,-39.084845 +0,0,-30.000000,5095000000,5090000000,-59,-39.107272 +0,0,-30.000000,5100000000,5095000000,-59,-39.110074 +0,0,-30.000000,5105000000,5100000000,-59,-39.130254 +0,0,-30.000000,5110000000,5105000000,-59,-39.146556 +0,0,-30.000000,5115000000,5110000000,-59,-39.153697 +0,0,-30.000000,5120000000,5115000000,-59,-39.171597 +0,0,-30.000000,5125000000,5120000000,-59,-39.190494 +0,0,-30.000000,5130000000,5125000000,-59,-39.214894 +0,0,-30.000000,5135000000,5130000000,-59,-39.219345 +0,0,-30.000000,5140000000,5135000000,-59,-39.237056 +0,0,-30.000000,5145000000,5140000000,-59,-39.257843 +0,0,-30.000000,5150000000,5145000000,-59,-39.278479 +0,0,-30.000000,5155000000,5150000000,-59,-39.296276 +0,0,-30.000000,5160000000,5155000000,-59,-39.304751 +0,0,-30.000000,5165000000,5160000000,-59,-39.321630 +0,0,-30.000000,5170000000,5165000000,-59,-39.352800 +0,0,-30.000000,5175000000,5170000000,-59,-39.368052 +0,0,-30.000000,5180000000,5175000000,-59,-39.389540 +0,0,-30.000000,5185000000,5180000000,-59,-39.408347 +0,0,-30.000000,5190000000,5185000000,-59,-39.440855 +0,0,-30.000000,5195000000,5190000000,-59,-39.467796 +0,0,-30.000000,5200000000,5195000000,-59,-39.492556 +0,0,-30.000000,5205000000,5200000000,-60,-39.517181 +0,0,-30.000000,5210000000,5205000000,-59,-39.542496 +0,0,-30.000000,5215000000,5210000000,-60,-39.588268 +0,0,-30.000000,5220000000,5215000000,-60,-39.629510 +0,0,-30.000000,5225000000,5220000000,-60,-39.665137 +0,0,-30.000000,5230000000,5225000000,-60,-39.728598 +0,0,-30.000000,5235000000,5230000000,-60,-39.762823 +0,0,-30.000000,5240000000,5235000000,-60,-39.801484 +0,0,-30.000000,5245000000,5240000000,-60,-39.835421 +0,0,-30.000000,5250000000,5245000000,-60,-39.887590 +0,0,-30.000000,5255000000,5250000000,-60,-39.923781 +0,0,-30.000000,5260000000,5255000000,-60,-39.960956 +0,0,-30.000000,5265000000,5260000000,-60,-40.004606 +0,0,-30.000000,5270000000,5265000000,-60,-40.029690 +0,0,-30.000000,5275000000,5270000000,-60,-40.076318 +0,0,-30.000000,5280000000,5275000000,-60,-40.105670 +0,0,-30.000000,5285000000,5280000000,-61,-40.140971 +0,0,-30.000000,5290000000,5285000000,-61,-40.149868 +0,0,-30.000000,5295000000,5290000000,-60,-40.143459 +0,0,-30.000000,5300000000,5295000000,-60,-40.125847 +0,0,-30.000000,5305000000,5300000000,-60,-40.113984 +0,0,-30.000000,5310000000,5305000000,-60,-40.088816 +0,0,-30.000000,5315000000,5310000000,-60,-40.091070 +0,0,-30.000000,5320000000,5315000000,-60,-40.091332 +0,0,-30.000000,5325000000,5320000000,-60,-40.070525 +0,0,-30.000000,5330000000,5325000000,-60,-40.079327 +0,0,-30.000000,5335000000,5330000000,-60,-40.071122 +0,0,-30.000000,5340000000,5335000000,-60,-40.077078 +0,0,-30.000000,5345000000,5340000000,-60,-40.051941 +0,0,-30.000000,5350000000,5345000000,-60,-40.845439 +0,0,-30.000000,5355000000,5350000000,-61,-40.713429 +0,0,-30.000000,5360000000,5355000000,-61,-40.681244 +0,0,-30.000000,5365000000,5360000000,-61,-40.720669 +0,0,-30.000000,5370000000,5365000000,-61,-40.767116 +0,0,-30.000000,5375000000,5370000000,-61,-40.832613 +0,0,-30.000000,5380000000,5375000000,-61,-40.894186 +0,0,-30.000000,5385000000,5380000000,-61,-40.969826 +0,0,-30.000000,5390000000,5385000000,-61,-41.035819 +0,0,-30.000000,5395000000,5390000000,-61,-41.120719 +0,0,-30.000000,5400000000,5395000000,-61,-41.193172 +0,0,-30.000000,5405000000,5400000000,-61,-41.257812 +0,0,-30.000000,5410000000,5405000000,-61,-41.340955 +0,0,-30.000000,5415000000,5410000000,-61,-41.433741 +0,0,-30.000000,5420000000,5415000000,-61,-41.466302 +0,0,-30.000000,5425000000,5420000000,-61,-41.547842 +0,0,-30.000000,5430000000,5425000000,-61,-41.656044 +0,0,-30.000000,5435000000,5430000000,-61,-41.734674 +0,0,-30.000000,5440000000,5435000000,-62,-41.806212 +0,0,-30.000000,5445000000,5440000000,-62,-41.896233 +0,0,-30.000000,5450000000,5445000000,-62,-41.977188 +0,0,-30.000000,5455000000,5450000000,-62,-42.082713 +0,0,-30.000000,5460000000,5455000000,-62,-42.155790 +0,0,-30.000000,5465000000,5460000000,-62,-42.254013 +0,0,-30.000000,5470000000,5465000000,-62,-42.330483 +0,0,-30.000000,5475000000,5470000000,-62,-42.435543 +0,0,-30.000000,5480000000,5475000000,-62,-42.500476 +0,0,-30.000000,5485000000,5480000000,-62,-42.606348 +0,0,-30.000000,5490000000,5485000000,-62,-42.690324 +0,0,-30.000000,5495000000,5490000000,-62,-42.747317 +0,0,-30.000000,5500000000,5495000000,-63,-42.846284 +0,0,-30.000000,5505000000,5500000000,-63,-42.900624 +0,0,-30.000000,5510000000,5505000000,-63,-42.967779 +0,0,-30.000000,5515000000,5510000000,-63,-42.999778 +0,0,-30.000000,5520000000,5515000000,-63,-43.058031 +0,0,-30.000000,5525000000,5520000000,-63,-43.106561 +0,0,-30.000000,5530000000,5525000000,-63,-43.128109 +0,0,-30.000000,5535000000,5530000000,-63,-43.172919 +0,0,-30.000000,5540000000,5535000000,-63,-43.203085 +0,0,-30.000000,5545000000,5540000000,-63,-43.247158 +0,0,-30.000000,5550000000,5545000000,-63,-43.248819 +0,0,-30.000000,5555000000,5550000000,-63,-43.273690 +0,0,-30.000000,5560000000,5555000000,-63,-43.281687 +0,0,-30.000000,5565000000,5560000000,-63,-43.283381 +0,0,-30.000000,5570000000,5565000000,-63,-43.270726 +0,0,-30.000000,5575000000,5570000000,-63,-43.276566 +0,0,-30.000000,5580000000,5575000000,-63,-43.289973 +0,0,-30.000000,5585000000,5580000000,-63,-43.278051 +0,0,-30.000000,5590000000,5585000000,-63,-43.274522 +0,0,-30.000000,5595000000,5590000000,-63,-43.244269 +0,0,-30.000000,5600000000,5595000000,-63,-43.258406 +0,0,-30.000000,5605000000,5600000000,-63,-43.220733 +0,0,-30.000000,5610000000,5605000000,-63,-43.229534 +0,0,-30.000000,5615000000,5610000000,-63,-43.224140 +0,0,-30.000000,5620000000,5615000000,-63,-43.218255 +0,0,-30.000000,5625000000,5620000000,-63,-43.221024 +0,0,-30.000000,5630000000,5625000000,-63,-43.230253 +0,0,-30.000000,5635000000,5630000000,-63,-43.222518 +0,0,-30.000000,5640000000,5635000000,-63,-43.240000 +0,0,-30.000000,5645000000,5640000000,-63,-43.256678 +0,0,-30.000000,5650000000,5645000000,-63,-43.264727 +0,0,-30.000000,5655000000,5650000000,-63,-43.306688 +0,0,-30.000000,5660000000,5655000000,-63,-43.324708 +0,0,-30.000000,5665000000,5660000000,-63,-43.366493 +0,0,-30.000000,5670000000,5665000000,-63,-43.381364 +0,0,-30.000000,5675000000,5670000000,-63,-43.417614 +0,0,-30.000000,5680000000,5675000000,-63,-43.464877 +0,0,-30.000000,5685000000,5680000000,-63,-43.529765 +0,0,-30.000000,5690000000,5685000000,-63,-43.587374 +0,0,-30.000000,5695000000,5690000000,-63,-43.647948 +0,0,-30.000000,5700000000,5695000000,-63,-43.746607 +0,0,-30.000000,5705000000,5700000000,-63,-43.801292 +0,0,-30.000000,5710000000,5705000000,-64,-43.908923 +0,0,-30.000000,5715000000,5710000000,-64,-44.003700 +0,0,-30.000000,5720000000,5715000000,-64,-44.113947 +0,0,-30.000000,5725000000,5720000000,-64,-44.221098 +0,0,-30.000000,5730000000,5725000000,-64,-44.299195 +0,0,-30.000000,5735000000,5730000000,-64,-44.398674 +0,0,-30.000000,5740000000,5735000000,-64,-44.506274 +0,0,-30.000000,5745000000,5740000000,-64,-44.611693 +0,0,-30.000000,5750000000,5745000000,-64,-44.719495 +0,0,-30.000000,5755000000,5750000000,-64,-44.802613 +0,0,-30.000000,5760000000,5755000000,-64,-44.880732 +0,0,-30.000000,5765000000,5760000000,-64,-44.975721 +0,0,-30.000000,5770000000,5765000000,-64,-45.059360 +0,0,-30.000000,5775000000,5770000000,-64,-45.110237 +0,0,-30.000000,5780000000,5775000000,-64,-45.179913 +0,0,-30.000000,5785000000,5780000000,-64,-45.244524 +0,0,-30.000000,5790000000,5785000000,-64,-45.314458 +0,0,-30.000000,5795000000,5790000000,-64,-45.377272 +0,0,-30.000000,5800000000,5795000000,-64,-45.421061 +0,0,-30.000000,5805000000,5800000000,-64,-45.493772 +0,0,-30.000000,5810000000,5805000000,-64,-45.539449 +0,0,-30.000000,5815000000,5810000000,-64,-45.563033 +0,0,-30.000000,5820000000,5815000000,-64,-45.621308 +0,0,-30.000000,5825000000,5820000000,-64,-45.676387 +0,0,-30.000000,5830000000,5825000000,-64,-45.724392 +0,0,-30.000000,5835000000,5830000000,-64,-45.742075 +0,0,-30.000000,5840000000,5835000000,-64,-45.775671 +0,0,-30.000000,5845000000,5840000000,-64,-45.806281 +0,0,-30.000000,5850000000,5845000000,-64,-45.853941 +0,0,-30.000000,5855000000,5850000000,-64,-45.874319 +0,0,-30.000000,5860000000,5855000000,-64,-45.854716 +0,0,-30.000000,5865000000,5860000000,-64,-45.890337 +0,0,-30.000000,5870000000,5865000000,-64,-45.857254 +0,0,-30.000000,5875000000,5870000000,-64,-45.889943 +0,0,-30.000000,5880000000,5875000000,-64,-45.843372 +0,0,-30.000000,5885000000,5880000000,-64,-45.860472 +0,0,-30.000000,5890000000,5885000000,-64,-45.838382 +0,0,-30.000000,5895000000,5890000000,-64,-45.828736 +0,0,-30.000000,5900000000,5895000000,-64,-45.788022 +0,0,-30.000000,5905000000,5900000000,-64,-45.744197 +0,0,-30.000000,5910000000,5905000000,-64,-45.712323 +0,0,-30.000000,5915000000,5910000000,-64,-45.649051 +0,0,-30.000000,5920000000,5915000000,-64,-45.603434 +0,0,-30.000000,5925000000,5920000000,-64,-45.541193 +0,0,-30.000000,5930000000,5925000000,-64,-45.484880 +0,0,-30.000000,5935000000,5930000000,-64,-45.392558 +0,0,-30.000000,5940000000,5935000000,-64,-45.360970 +0,0,-30.000000,5945000000,5940000000,-64,-45.293070 +0,0,-30.000000,5950000000,5945000000,-64,-45.210945 +0,0,-30.000000,5955000000,5950000000,-64,-45.125568 +0,0,-30.000000,5960000000,5955000000,-64,-45.057260 +0,0,-30.000000,5965000000,5960000000,-64,-44.990266 +0,0,-30.000000,5970000000,5965000000,-64,-44.924659 +0,0,-30.000000,5975000000,5970000000,-64,-44.821101 +0,0,-30.000000,5980000000,5975000000,-64,-44.742335 +0,0,-30.000000,5985000000,5980000000,-64,-44.668076 +0,0,-30.000000,5990000000,5985000000,-64,-44.600529 +0,0,-30.000000,5995000000,5990000000,-64,-44.500290 +0,0,-30.000000,6000000000,5995000000,-64,-44.483179 +0,0,-30.000000,6005000000,6000000000,-64,-44.442212 +0,15,-30.000000,80000000,75000000,-51,-11.029162 +0,15,-30.000000,85000000,80000000,-51,-11.015217 +0,15,-30.000000,90000000,85000000,-51,-11.010878 +0,15,-30.000000,95000000,90000000,-51,-11.062092 +0,15,-30.000000,100000000,95000000,-51,-10.946893 +0,15,-30.000000,105000000,100000000,-51,-10.768239 +0,15,-30.000000,110000000,105000000,-51,-10.803481 +0,15,-30.000000,115000000,110000000,-52,-11.671789 +0,15,-30.000000,120000000,115000000,-51,-11.688450 +0,15,-30.000000,125000000,120000000,-52,-11.555931 +0,15,-30.000000,130000000,125000000,-51,-11.496562 +0,15,-30.000000,135000000,130000000,-51,-11.378758 +0,15,-30.000000,140000000,135000000,-51,-11.355509 +0,15,-30.000000,145000000,140000000,-51,-11.264119 +0,15,-30.000000,150000000,145000000,-51,-11.270862 +0,15,-30.000000,155000000,150000000,-51,-11.194337 +0,15,-30.000000,160000000,155000000,-51,-11.182039 +0,15,-30.000000,165000000,160000000,-51,-11.143992 +0,15,-30.000000,170000000,165000000,-51,-11.168157 +0,15,-30.000000,175000000,170000000,-51,-11.146750 +0,15,-30.000000,180000000,175000000,-51,-11.150760 +0,15,-30.000000,185000000,180000000,-51,-11.180838 +0,15,-30.000000,190000000,185000000,-51,-11.167996 +0,15,-30.000000,195000000,190000000,-51,-11.136744 +0,15,-30.000000,200000000,195000000,-51,-11.089891 +0,15,-30.000000,205000000,200000000,-51,-11.126156 +0,15,-30.000000,210000000,205000000,-51,-11.095918 +0,15,-30.000000,215000000,210000000,-51,-11.082078 +0,15,-30.000000,220000000,215000000,-51,-11.084721 +0,15,-30.000000,225000000,220000000,-51,-11.060167 +0,15,-30.000000,230000000,225000000,-51,-11.084164 +0,15,-30.000000,235000000,230000000,-51,-11.102361 +0,15,-30.000000,240000000,235000000,-51,-11.134937 +0,15,-30.000000,245000000,240000000,-51,-11.153745 +0,15,-30.000000,250000000,245000000,-51,-11.146705 +0,15,-30.000000,255000000,250000000,-51,-11.182786 +0,15,-30.000000,260000000,255000000,-51,-11.198158 +0,15,-30.000000,265000000,260000000,-51,-11.188854 +0,15,-30.000000,270000000,265000000,-51,-11.157633 +0,15,-30.000000,275000000,270000000,-51,-11.168249 +0,15,-30.000000,280000000,275000000,-51,-11.149308 +0,15,-30.000000,285000000,280000000,-51,-11.166763 +0,15,-30.000000,290000000,285000000,-51,-11.187937 +0,15,-30.000000,295000000,290000000,-51,-11.213540 +0,15,-30.000000,300000000,295000000,-51,-11.245529 +0,15,-30.000000,305000000,300000000,-51,-11.272063 +0,15,-30.000000,310000000,305000000,-51,-11.303097 +0,15,-30.000000,315000000,310000000,-51,-11.328408 +0,15,-30.000000,320000000,315000000,-51,-11.354569 +0,15,-30.000000,325000000,320000000,-51,-11.379332 +0,15,-30.000000,330000000,325000000,-51,-11.400531 +0,15,-30.000000,335000000,330000000,-51,-11.422330 +0,15,-30.000000,340000000,335000000,-51,-11.439940 +0,15,-30.000000,345000000,340000000,-51,-11.451448 +0,15,-30.000000,350000000,345000000,-51,-11.459430 +0,15,-30.000000,355000000,350000000,-51,-11.464062 +0,15,-30.000000,360000000,355000000,-51,-11.463515 +0,15,-30.000000,365000000,360000000,-51,-11.458736 +0,15,-30.000000,370000000,365000000,-51,-11.451797 +0,15,-30.000000,375000000,370000000,-51,-11.441828 +0,15,-30.000000,380000000,375000000,-51,-11.434339 +0,15,-30.000000,385000000,380000000,-51,-11.421005 +0,15,-30.000000,390000000,385000000,-51,-11.410479 +0,15,-30.000000,395000000,390000000,-51,-11.391271 +0,15,-30.000000,400000000,395000000,-51,-11.368645 +0,15,-30.000000,405000000,400000000,-51,-11.346130 +0,15,-30.000000,410000000,405000000,-51,-11.322375 +0,15,-30.000000,415000000,410000000,-51,-11.290096 +0,15,-30.000000,420000000,415000000,-51,-11.257751 +0,15,-30.000000,425000000,420000000,-51,-11.226606 +0,15,-30.000000,430000000,425000000,-51,-11.189839 +0,15,-30.000000,435000000,430000000,-51,-11.151323 +0,15,-30.000000,440000000,435000000,-51,-11.112066 +0,15,-30.000000,445000000,440000000,-51,-11.073939 +0,15,-30.000000,450000000,445000000,-51,-11.036239 +0,15,-30.000000,455000000,450000000,-51,-10.998809 +0,15,-30.000000,460000000,455000000,-51,-10.961760 +0,15,-30.000000,465000000,460000000,-51,-10.925503 +0,15,-30.000000,470000000,465000000,-51,-10.891681 +0,15,-30.000000,475000000,470000000,-51,-10.859648 +0,15,-30.000000,480000000,475000000,-51,-10.827545 +0,15,-30.000000,485000000,480000000,-51,-10.800080 +0,15,-30.000000,490000000,485000000,-51,-10.771792 +0,15,-30.000000,495000000,490000000,-51,-10.747752 +0,15,-30.000000,500000000,495000000,-51,-10.723114 +0,15,-30.000000,505000000,500000000,-51,-10.701250 +0,15,-30.000000,510000000,505000000,-51,-10.681594 +0,15,-30.000000,515000000,510000000,-51,-10.662566 +0,15,-30.000000,520000000,515000000,-51,-10.650048 +0,15,-30.000000,525000000,520000000,-51,-10.634799 +0,15,-30.000000,530000000,525000000,-51,-10.621608 +0,15,-30.000000,535000000,530000000,-51,-10.608034 +0,15,-30.000000,540000000,535000000,-51,-10.597351 +0,15,-30.000000,545000000,540000000,-51,-10.590988 +0,15,-30.000000,550000000,545000000,-51,-10.577765 +0,15,-30.000000,555000000,550000000,-51,-10.574715 +0,15,-30.000000,560000000,555000000,-51,-10.566061 +0,15,-30.000000,565000000,560000000,-51,-10.559579 +0,15,-30.000000,570000000,565000000,-51,-10.556984 +0,15,-30.000000,575000000,570000000,-51,-10.553376 +0,15,-30.000000,580000000,575000000,-51,-10.550627 +0,15,-30.000000,585000000,580000000,-51,-10.541446 +0,15,-30.000000,590000000,585000000,-51,-10.524087 +0,15,-30.000000,595000000,590000000,-51,-10.518354 +0,15,-30.000000,600000000,595000000,-51,-10.511692 +0,15,-30.000000,605000000,600000000,-51,-10.619169 +0,15,-30.000000,610000000,605000000,-51,-10.586207 +0,15,-30.000000,615000000,610000000,-51,-10.554774 +0,15,-30.000000,620000000,615000000,-51,-10.530536 +0,15,-30.000000,625000000,620000000,-51,-10.508893 +0,15,-30.000000,630000000,625000000,-51,-10.483063 +0,15,-30.000000,635000000,630000000,-51,-10.459651 +0,15,-30.000000,640000000,635000000,-51,-10.439591 +0,15,-30.000000,645000000,640000000,-51,-10.425263 +0,15,-30.000000,650000000,645000000,-51,-10.403417 +0,15,-30.000000,655000000,650000000,-51,-10.380573 +0,15,-30.000000,660000000,655000000,-51,-10.358308 +0,15,-30.000000,665000000,660000000,-51,-10.334673 +0,15,-30.000000,670000000,665000000,-51,-10.314664 +0,15,-30.000000,675000000,670000000,-51,-10.301257 +0,15,-30.000000,680000000,675000000,-51,-10.289051 +0,15,-30.000000,685000000,680000000,-51,-10.283128 +0,15,-30.000000,690000000,685000000,-51,-10.277150 +0,15,-30.000000,695000000,690000000,-51,-10.276680 +0,15,-30.000000,700000000,695000000,-51,-10.281938 +0,15,-30.000000,705000000,700000000,-51,-10.294938 +0,15,-30.000000,710000000,705000000,-51,-10.312637 +0,15,-30.000000,715000000,710000000,-51,-10.337265 +0,15,-30.000000,720000000,715000000,-51,-10.375557 +0,15,-30.000000,725000000,720000000,-51,-10.425476 +0,15,-30.000000,730000000,725000000,-51,-10.477087 +0,15,-30.000000,735000000,730000000,-51,-10.535710 +0,15,-30.000000,740000000,735000000,-51,-10.598459 +0,15,-30.000000,745000000,740000000,-51,-10.653928 +0,15,-30.000000,750000000,745000000,-51,-10.695142 +0,15,-30.000000,755000000,750000000,-51,-10.731804 +0,15,-30.000000,760000000,755000000,-51,-10.751487 +0,15,-30.000000,765000000,760000000,-51,-10.735006 +0,15,-30.000000,770000000,765000000,-51,-10.658338 +0,15,-30.000000,775000000,770000000,-51,-10.576000 +0,15,-30.000000,780000000,775000000,-51,-10.516240 +0,15,-30.000000,785000000,780000000,-51,-10.486349 +0,15,-30.000000,790000000,785000000,-51,-10.476516 +0,15,-30.000000,795000000,790000000,-51,-10.481254 +0,15,-30.000000,800000000,795000000,-51,-10.495188 +0,15,-30.000000,805000000,800000000,-51,-10.516306 +0,15,-30.000000,810000000,805000000,-51,-10.541847 +0,15,-30.000000,815000000,810000000,-51,-10.570150 +0,15,-30.000000,820000000,815000000,-51,-10.600828 +0,15,-30.000000,825000000,820000000,-51,-10.631365 +0,15,-30.000000,830000000,825000000,-51,-10.667477 +0,15,-30.000000,835000000,830000000,-51,-10.704045 +0,15,-30.000000,840000000,835000000,-51,-10.741449 +0,15,-30.000000,845000000,840000000,-51,-10.763019 +0,15,-30.000000,850000000,845000000,-51,-10.805051 +0,15,-30.000000,855000000,850000000,-51,-10.846830 +0,15,-30.000000,860000000,855000000,-51,-10.892554 +0,15,-30.000000,865000000,860000000,-51,-10.931477 +0,15,-30.000000,870000000,865000000,-51,-10.981154 +0,15,-30.000000,875000000,870000000,-51,-11.023673 +0,15,-30.000000,880000000,875000000,-51,-11.071302 +0,15,-30.000000,885000000,880000000,-51,-11.112943 +0,15,-30.000000,890000000,885000000,-51,-11.167280 +0,15,-30.000000,895000000,890000000,-51,-11.214001 +0,15,-30.000000,900000000,895000000,-51,-11.267971 +0,15,-30.000000,905000000,900000000,-51,-11.321488 +0,15,-30.000000,910000000,905000000,-51,-11.377692 +0,15,-30.000000,915000000,910000000,-51,-11.442980 +0,15,-30.000000,920000000,915000000,-51,-11.497833 +0,15,-30.000000,925000000,920000000,-52,-11.562266 +0,15,-30.000000,930000000,925000000,-52,-11.637591 +0,15,-30.000000,935000000,930000000,-52,-11.704756 +0,15,-30.000000,940000000,935000000,-52,-11.779735 +0,15,-30.000000,945000000,940000000,-52,-11.847019 +0,15,-30.000000,950000000,945000000,-52,-11.926967 +0,15,-30.000000,955000000,950000000,-52,-12.000624 +0,15,-30.000000,960000000,955000000,-52,-12.081534 +0,15,-30.000000,965000000,960000000,-52,-12.161842 +0,15,-30.000000,970000000,965000000,-52,-12.239927 +0,15,-30.000000,975000000,970000000,-52,-12.321386 +0,15,-30.000000,980000000,975000000,-52,-12.406504 +0,15,-30.000000,985000000,980000000,-53,-12.494427 +0,15,-30.000000,990000000,985000000,-53,-12.569030 +0,15,-30.000000,995000000,990000000,-53,-12.656242 +0,15,-30.000000,1000000000,995000000,-53,-12.748180 +0,15,-30.000000,1005000000,1000000000,-53,-13.006090 +0,15,-30.000000,1010000000,1005000000,-53,-13.069078 +0,15,-30.000000,1015000000,1010000000,-53,-13.227623 +0,15,-30.000000,1020000000,1015000000,-53,-13.219072 +0,15,-30.000000,1025000000,1020000000,-53,-13.259978 +0,15,-30.000000,1030000000,1025000000,-54,-13.318854 +0,15,-30.000000,1035000000,1030000000,-54,-13.383074 +0,15,-30.000000,1040000000,1035000000,-54,-13.443177 +0,15,-30.000000,1045000000,1040000000,-54,-13.502837 +0,15,-30.000000,1050000000,1045000000,-54,-13.559270 +0,15,-30.000000,1055000000,1050000000,-54,-13.612369 +0,15,-30.000000,1060000000,1055000000,-54,-13.664236 +0,15,-30.000000,1065000000,1060000000,-54,-13.710208 +0,15,-30.000000,1070000000,1065000000,-54,-13.754495 +0,15,-30.000000,1075000000,1070000000,-54,-13.795454 +0,15,-30.000000,1080000000,1075000000,-54,-13.831119 +0,15,-30.000000,1085000000,1080000000,-54,-13.863604 +0,15,-30.000000,1090000000,1085000000,-54,-13.892381 +0,15,-30.000000,1095000000,1090000000,-54,-13.920310 +0,15,-30.000000,1100000000,1095000000,-54,-13.945904 +0,15,-30.000000,1105000000,1100000000,-54,-13.964352 +0,15,-30.000000,1110000000,1105000000,-54,-13.978049 +0,15,-30.000000,1115000000,1110000000,-54,-13.987993 +0,15,-30.000000,1120000000,1115000000,-54,-13.997830 +0,15,-30.000000,1125000000,1120000000,-54,-14.004697 +0,15,-30.000000,1130000000,1125000000,-54,-14.007530 +0,15,-30.000000,1135000000,1130000000,-54,-14.010244 +0,15,-30.000000,1140000000,1135000000,-54,-14.012841 +0,15,-30.000000,1145000000,1140000000,-54,-14.018404 +0,15,-30.000000,1150000000,1145000000,-54,-14.024388 +0,15,-30.000000,1155000000,1150000000,-54,-14.039351 +0,15,-30.000000,1160000000,1155000000,-54,-14.064706 +0,15,-30.000000,1165000000,1160000000,-54,-14.103816 +0,15,-30.000000,1170000000,1165000000,-54,-14.163392 +0,15,-30.000000,1175000000,1170000000,-54,-14.241684 +0,15,-30.000000,1180000000,1175000000,-54,-14.330320 +0,15,-30.000000,1185000000,1180000000,-54,-14.408625 +0,15,-30.000000,1190000000,1185000000,-54,-14.455134 +0,15,-30.000000,1195000000,1190000000,-54,-14.464583 +0,15,-30.000000,1200000000,1195000000,-54,-14.443279 +0,15,-30.000000,1205000000,1200000000,-54,-14.403463 +0,15,-30.000000,1210000000,1205000000,-54,-14.355652 +0,15,-30.000000,1215000000,1210000000,-54,-14.288615 +0,15,-30.000000,1220000000,1215000000,-54,-14.243216 +0,15,-30.000000,1225000000,1220000000,-54,-14.204992 +0,15,-30.000000,1230000000,1225000000,-54,-14.175209 +0,15,-30.000000,1235000000,1230000000,-54,-14.153751 +0,15,-30.000000,1240000000,1235000000,-54,-14.133830 +0,15,-30.000000,1245000000,1240000000,-54,-14.117792 +0,15,-30.000000,1250000000,1245000000,-54,-14.109435 +0,15,-30.000000,1255000000,1250000000,-54,-14.106099 +0,15,-30.000000,1260000000,1255000000,-54,-14.103557 +0,15,-30.000000,1265000000,1260000000,-54,-14.104270 +0,15,-30.000000,1270000000,1265000000,-54,-14.114872 +0,15,-30.000000,1275000000,1270000000,-54,-14.126493 +0,15,-30.000000,1280000000,1275000000,-54,-14.137627 +0,15,-30.000000,1285000000,1280000000,-54,-14.149459 +0,15,-30.000000,1290000000,1285000000,-54,-14.167538 +0,15,-30.000000,1295000000,1290000000,-54,-14.187352 +0,15,-30.000000,1300000000,1295000000,-54,-14.204508 +0,15,-30.000000,1305000000,1300000000,-54,-14.222048 +0,15,-30.000000,1310000000,1305000000,-54,-15.264337 +0,15,-30.000000,1315000000,1310000000,-54,-15.284364 +0,15,-30.000000,1320000000,1315000000,-54,-15.303239 +0,15,-30.000000,1325000000,1320000000,-54,-15.320554 +0,15,-30.000000,1330000000,1325000000,-54,-15.335915 +0,15,-30.000000,1335000000,1330000000,-54,-15.349134 +0,15,-30.000000,1340000000,1335000000,-54,-15.361855 +0,15,-30.000000,1345000000,1340000000,-54,-15.370849 +0,15,-30.000000,1350000000,1345000000,-54,-15.379633 +0,15,-30.000000,1355000000,1350000000,-54,-15.384739 +0,15,-30.000000,1360000000,1355000000,-54,-15.388682 +0,15,-30.000000,1365000000,1360000000,-54,-15.390095 +0,15,-30.000000,1370000000,1365000000,-54,-15.389984 +0,15,-30.000000,1375000000,1370000000,-54,-15.388162 +0,15,-30.000000,1380000000,1375000000,-54,-15.383569 +0,15,-30.000000,1385000000,1380000000,-54,-15.375292 +0,15,-30.000000,1390000000,1385000000,-54,-15.365038 +0,15,-30.000000,1395000000,1390000000,-54,-15.351141 +0,15,-30.000000,1400000000,1395000000,-54,-15.337070 +0,15,-30.000000,1405000000,1400000000,-54,-15.320260 +0,15,-30.000000,1410000000,1405000000,-54,-15.298409 +0,15,-30.000000,1415000000,1410000000,-54,-15.274464 +0,15,-30.000000,1420000000,1415000000,-54,-15.245313 +0,15,-30.000000,1425000000,1420000000,-54,-15.219345 +0,15,-30.000000,1430000000,1425000000,-54,-15.187775 +0,15,-30.000000,1435000000,1430000000,-54,-15.155267 +0,15,-30.000000,1440000000,1435000000,-54,-15.122467 +0,15,-30.000000,1445000000,1440000000,-54,-15.089988 +0,15,-30.000000,1450000000,1445000000,-54,-15.055999 +0,15,-30.000000,1455000000,1450000000,-54,-15.023171 +0,15,-30.000000,1460000000,1455000000,-54,-14.989848 +0,15,-30.000000,1465000000,1460000000,-54,-14.957814 +0,15,-30.000000,1470000000,1465000000,-54,-14.925420 +0,15,-30.000000,1475000000,1470000000,-54,-14.895960 +0,15,-30.000000,1480000000,1475000000,-54,-14.867162 +0,15,-30.000000,1485000000,1480000000,-54,-14.839656 +0,15,-30.000000,1490000000,1485000000,-54,-14.816749 +0,15,-30.000000,1495000000,1490000000,-54,-14.795757 +0,15,-30.000000,1500000000,1495000000,-54,-14.776992 +0,15,-30.000000,1505000000,1500000000,-54,-14.761602 +0,15,-30.000000,1510000000,1505000000,-54,-14.751784 +0,15,-30.000000,1515000000,1510000000,-54,-14.746224 +0,15,-30.000000,1520000000,1515000000,-54,-14.736751 +0,15,-30.000000,1525000000,1520000000,-54,-14.729662 +0,15,-30.000000,1530000000,1525000000,-54,-14.726170 +0,15,-30.000000,1535000000,1530000000,-54,-14.725403 +0,15,-30.000000,1540000000,1535000000,-54,-14.728683 +0,15,-30.000000,1545000000,1540000000,-54,-14.736000 +0,15,-30.000000,1550000000,1545000000,-54,-14.745566 +0,15,-30.000000,1555000000,1550000000,-54,-14.755867 +0,15,-30.000000,1560000000,1555000000,-54,-14.773148 +0,15,-30.000000,1565000000,1560000000,-54,-14.792212 +0,15,-30.000000,1570000000,1565000000,-54,-14.813807 +0,15,-30.000000,1575000000,1570000000,-54,-14.839428 +0,15,-30.000000,1580000000,1575000000,-54,-14.869353 +0,15,-30.000000,1585000000,1580000000,-54,-14.901427 +0,15,-30.000000,1590000000,1585000000,-54,-14.938245 +0,15,-30.000000,1595000000,1590000000,-54,-14.981147 +0,15,-30.000000,1600000000,1595000000,-54,-15.024956 +0,15,-30.000000,1605000000,1600000000,-54,-15.073274 +0,15,-30.000000,1610000000,1605000000,-54,-15.297074 +0,15,-30.000000,1615000000,1610000000,-54,-15.320311 +0,15,-30.000000,1620000000,1615000000,-54,-15.338014 +0,15,-30.000000,1625000000,1620000000,-54,-15.371147 +0,15,-30.000000,1630000000,1625000000,-54,-15.413304 +0,15,-30.000000,1635000000,1630000000,-55,-15.467204 +0,15,-30.000000,1640000000,1635000000,-55,-15.526418 +0,15,-30.000000,1645000000,1640000000,-55,-15.590852 +0,15,-30.000000,1650000000,1645000000,-55,-15.658721 +0,15,-30.000000,1655000000,1650000000,-55,-15.732260 +0,15,-30.000000,1660000000,1655000000,-55,-15.802417 +0,15,-30.000000,1665000000,1660000000,-55,-15.875551 +0,15,-30.000000,1670000000,1665000000,-55,-15.949557 +0,15,-30.000000,1675000000,1670000000,-55,-16.022149 +0,15,-30.000000,1680000000,1675000000,-55,-16.097357 +0,15,-30.000000,1685000000,1680000000,-55,-16.195334 +0,15,-30.000000,1690000000,1685000000,-55,-16.252788 +0,15,-30.000000,1695000000,1690000000,-56,-16.328278 +0,15,-30.000000,1700000000,1695000000,-56,-16.410134 +0,15,-30.000000,1705000000,1700000000,-56,-16.492532 +0,15,-30.000000,1710000000,1705000000,-56,-16.584053 +0,15,-30.000000,1715000000,1710000000,-56,-16.677183 +0,15,-30.000000,1720000000,1715000000,-56,-16.772483 +0,15,-30.000000,1725000000,1720000000,-56,-16.870223 +0,15,-30.000000,1730000000,1725000000,-56,-16.966164 +0,15,-30.000000,1735000000,1730000000,-56,-17.064959 +0,15,-30.000000,1740000000,1735000000,-56,-17.166584 +0,15,-30.000000,1745000000,1740000000,-56,-17.265648 +0,15,-30.000000,1750000000,1745000000,-56,-17.365673 +0,15,-30.000000,1755000000,1750000000,-56,-17.468260 +0,15,-30.000000,1760000000,1755000000,-57,-17.566465 +0,15,-30.000000,1765000000,1760000000,-57,-17.664651 +0,15,-30.000000,1770000000,1765000000,-57,-17.763763 +0,15,-30.000000,1775000000,1770000000,-57,-17.859960 +0,15,-30.000000,1780000000,1775000000,-57,-17.955617 +0,15,-30.000000,1785000000,1780000000,-57,-18.045520 +0,15,-30.000000,1790000000,1785000000,-57,-18.136815 +0,15,-30.000000,1795000000,1790000000,-57,-18.226579 +0,15,-30.000000,1800000000,1795000000,-57,-18.312834 +0,15,-30.000000,1805000000,1800000000,-57,-18.394434 +0,15,-30.000000,1810000000,1805000000,-58,-18.474554 +0,15,-30.000000,1815000000,1810000000,-58,-18.554820 +0,15,-30.000000,1820000000,1815000000,-58,-18.627975 +0,15,-30.000000,1825000000,1820000000,-58,-18.699375 +0,15,-30.000000,1830000000,1825000000,-58,-18.768367 +0,15,-30.000000,1835000000,1830000000,-58,-18.831927 +0,15,-30.000000,1840000000,1835000000,-58,-18.893283 +0,15,-30.000000,1845000000,1840000000,-58,-18.950606 +0,15,-30.000000,1850000000,1845000000,-58,-19.003538 +0,15,-30.000000,1855000000,1850000000,-58,-19.051572 +0,15,-30.000000,1860000000,1855000000,-58,-19.097052 +0,15,-30.000000,1865000000,1860000000,-58,-19.140145 +0,15,-30.000000,1870000000,1865000000,-58,-19.221159 +0,15,-30.000000,1875000000,1870000000,-58,-19.223831 +0,15,-30.000000,1880000000,1875000000,-58,-19.247249 +0,15,-30.000000,1885000000,1880000000,-58,-19.273870 +0,15,-30.000000,1890000000,1885000000,-59,-19.300992 +0,15,-30.000000,1895000000,1890000000,-59,-19.324461 +0,15,-30.000000,1900000000,1895000000,-59,-19.346947 +0,15,-30.000000,1905000000,1900000000,-59,-19.368537 +0,15,-30.000000,1910000000,1905000000,-59,-19.386816 +0,15,-30.000000,1915000000,1910000000,-59,-19.402377 +0,15,-30.000000,1920000000,1915000000,-59,-19.415539 +0,15,-30.000000,1925000000,1920000000,-59,-19.431213 +0,15,-30.000000,1930000000,1925000000,-59,-19.444777 +0,15,-30.000000,1935000000,1930000000,-59,-19.458438 +0,15,-30.000000,1940000000,1935000000,-59,-19.471598 +0,15,-30.000000,1945000000,1940000000,-59,-19.485482 +0,15,-30.000000,1950000000,1945000000,-59,-19.499797 +0,15,-30.000000,1955000000,1950000000,-59,-19.514943 +0,15,-30.000000,1960000000,1955000000,-59,-19.538459 +0,15,-30.000000,1965000000,1960000000,-59,-19.564774 +0,15,-30.000000,1970000000,1965000000,-59,-19.592806 +0,15,-30.000000,1975000000,1970000000,-59,-19.620522 +0,15,-30.000000,1980000000,1975000000,-59,-19.650615 +0,15,-30.000000,1985000000,1980000000,-59,-19.686166 +0,15,-30.000000,1990000000,1985000000,-59,-19.721738 +0,15,-30.000000,1995000000,1990000000,-59,-19.762247 +0,15,-30.000000,2000000000,1995000000,-59,-19.806290 +0,15,-30.000000,2005000000,2000000000,-59,-19.850464 +0,15,-30.000000,2010000000,2005000000,-59,-19.901436 +0,15,-30.000000,2015000000,2010000000,-59,-19.953942 +0,15,-30.000000,2020000000,2015000000,-59,-20.010040 +0,15,-30.000000,2025000000,2020000000,-59,-20.068813 +0,15,-30.000000,2030000000,2025000000,-59,-20.131580 +0,15,-30.000000,2035000000,2030000000,-59,-20.194025 +0,15,-30.000000,2040000000,2035000000,-59,-20.259256 +0,15,-30.000000,2045000000,2040000000,-59,-20.328590 +0,15,-30.000000,2050000000,2045000000,-59,-20.397703 +0,15,-30.000000,2055000000,2050000000,-59,-20.467840 +0,15,-30.000000,2060000000,2055000000,-59,-20.542272 +0,15,-30.000000,2065000000,2060000000,-60,-20.619910 +0,15,-30.000000,2070000000,2065000000,-60,-20.699482 +0,15,-30.000000,2075000000,2070000000,-60,-20.779292 +0,15,-30.000000,2080000000,2075000000,-60,-20.859461 +0,15,-30.000000,2085000000,2080000000,-60,-20.940357 +0,15,-30.000000,2090000000,2085000000,-60,-21.020041 +0,15,-30.000000,2095000000,2090000000,-60,-21.100160 +0,15,-30.000000,2100000000,2095000000,-60,-21.172170 +0,15,-30.000000,2105000000,2100000000,-60,-21.245304 +0,15,-30.000000,2110000000,2105000000,-60,-21.313933 +0,15,-30.000000,2115000000,2110000000,-60,-21.374051 +0,15,-30.000000,2120000000,2115000000,-60,-21.428237 +0,15,-30.000000,2125000000,2120000000,-60,-21.473251 +0,15,-30.000000,2130000000,2125000000,-61,-21.510574 +0,15,-30.000000,2135000000,2130000000,-61,-21.526640 +0,15,-30.000000,2140000000,2135000000,-61,-21.546961 +0,15,-30.000000,2145000000,2140000000,-61,-21.561717 +0,15,-30.000000,2150000000,2145000000,-61,-21.567418 +0,15,-30.000000,2155000000,2150000000,-61,-21.568863 +0,15,-30.000000,2160000000,2155000000,-61,-21.559678 +0,15,-30.000000,2165000000,2160000000,-61,-21.545175 +0,15,-30.000000,2170000000,2165000000,-61,-21.525060 +0,15,-30.000000,2175000000,2170000000,-61,-21.499749 +0,15,-30.000000,2180000000,2175000000,-60,-21.468490 +0,15,-30.000000,2185000000,2180000000,-60,-21.432227 +0,15,-30.000000,2190000000,2185000000,-60,-21.393178 +0,15,-30.000000,2195000000,2190000000,-60,-21.348947 +0,15,-30.000000,2200000000,2195000000,-60,-21.301642 +0,15,-30.000000,2205000000,2200000000,-60,-21.247759 +0,15,-30.000000,2210000000,2205000000,-60,-21.192744 +0,15,-30.000000,2215000000,2210000000,-60,-21.135543 +0,15,-30.000000,2220000000,2215000000,-60,-21.076375 +0,15,-30.000000,2225000000,2220000000,-60,-21.012455 +0,15,-30.000000,2230000000,2225000000,-60,-20.947006 +0,15,-30.000000,2235000000,2230000000,-60,-20.879630 +0,15,-30.000000,2240000000,2235000000,-60,-20.806929 +0,15,-30.000000,2245000000,2240000000,-60,-20.735893 +0,15,-30.000000,2250000000,2245000000,-60,-20.663908 +0,15,-30.000000,2255000000,2250000000,-60,-20.593662 +0,15,-30.000000,2260000000,2255000000,-59,-20.518908 +0,15,-30.000000,2265000000,2260000000,-59,-20.445307 +0,15,-30.000000,2270000000,2265000000,-59,-20.374447 +0,15,-30.000000,2275000000,2270000000,-59,-20.302630 +0,15,-30.000000,2280000000,2275000000,-59,-20.234362 +0,15,-30.000000,2285000000,2280000000,-59,-20.168371 +0,15,-30.000000,2290000000,2285000000,-59,-20.105293 +0,15,-30.000000,2295000000,2290000000,-59,-20.047100 +0,15,-30.000000,2300000000,2295000000,-59,-19.991002 +0,15,-30.000000,2305000000,2300000000,-59,-19.938548 +0,15,-30.000000,2310000000,2305000000,-59,-19.886785 +0,15,-30.000000,2315000000,2310000000,-59,-19.840409 +0,15,-30.000000,2320000000,2315000000,-59,-19.796678 +0,15,-30.000000,2325000000,2320000000,-59,-19.760162 +0,15,-30.000000,2330000000,2325000000,-59,-19.725551 +0,15,-30.000000,2335000000,2330000000,-59,-19.697159 +0,15,-30.000000,2340000000,2335000000,-59,-19.674767 +0,15,-30.000000,2345000000,2340000000,-59,-19.656241 +0,15,-30.000000,2350000000,2345000000,-59,-19.642905 +0,15,-30.000000,2355000000,2350000000,-59,-19.632978 +0,15,-30.000000,2360000000,2355000000,-59,-19.627943 +0,15,-30.000000,2365000000,2360000000,-59,-19.626398 +0,15,-30.000000,2370000000,2365000000,-59,-19.626587 +0,15,-30.000000,2375000000,2370000000,-59,-19.630884 +0,15,-30.000000,2380000000,2375000000,-59,-19.639634 +0,15,-30.000000,2385000000,2380000000,-59,-19.647860 +0,15,-30.000000,2390000000,2385000000,-59,-19.658961 +0,15,-30.000000,2395000000,2390000000,-59,-19.671953 +0,15,-30.000000,2400000000,2395000000,-59,-19.686000 +0,15,-30.000000,2405000000,2400000000,-59,-19.700247 +0,15,-30.000000,2410000000,2405000000,-59,-19.713565 +0,15,-30.000000,2415000000,2410000000,-59,-19.725617 +0,15,-30.000000,2420000000,2415000000,-59,-19.738306 +0,15,-30.000000,2425000000,2420000000,-59,-19.750470 +0,15,-30.000000,2430000000,2425000000,-59,-19.763168 +0,15,-30.000000,2435000000,2430000000,-59,-19.774538 +0,15,-30.000000,2440000000,2435000000,-59,-19.785551 +0,15,-30.000000,2445000000,2440000000,-59,-19.797571 +0,15,-30.000000,2450000000,2445000000,-59,-19.807497 +0,15,-30.000000,2455000000,2450000000,-59,-19.819566 +0,15,-30.000000,2460000000,2455000000,-59,-19.822580 +0,15,-30.000000,2465000000,2460000000,-59,-19.828864 +0,15,-30.000000,2470000000,2465000000,-59,-19.835270 +0,15,-30.000000,2475000000,2470000000,-59,-19.842942 +0,15,-30.000000,2480000000,2475000000,-59,-19.848785 +0,15,-30.000000,2485000000,2480000000,-59,-19.856846 +0,15,-30.000000,2490000000,2485000000,-59,-19.867004 +0,15,-30.000000,2495000000,2490000000,-59,-19.879343 +0,15,-30.000000,2500000000,2495000000,-59,-19.891621 +0,15,-30.000000,2505000000,2500000000,-59,-19.909127 +0,15,-30.000000,2510000000,2505000000,-59,-19.926931 +0,15,-30.000000,2515000000,2510000000,-59,-19.947899 +0,15,-30.000000,2520000000,2515000000,-59,-19.972521 +0,15,-30.000000,2525000000,2520000000,-59,-20.001005 +0,15,-30.000000,2530000000,2525000000,-59,-20.031708 +0,15,-30.000000,2535000000,2530000000,-59,-20.065987 +0,15,-30.000000,2540000000,2535000000,-59,-20.102131 +0,15,-30.000000,2545000000,2540000000,-59,-20.141087 +0,15,-30.000000,2550000000,2545000000,-59,-20.185340 +0,15,-30.000000,2555000000,2550000000,-59,-20.231601 +0,15,-30.000000,2560000000,2555000000,-59,-20.277586 +0,15,-30.000000,2565000000,2560000000,-59,-20.322414 +0,15,-30.000000,2570000000,2565000000,-59,-20.370497 +0,15,-30.000000,2575000000,2570000000,-59,-20.423268 +0,15,-30.000000,2580000000,2575000000,-59,-20.476203 +0,15,-30.000000,2585000000,2580000000,-59,-20.529863 +0,15,-30.000000,2590000000,2585000000,-60,-20.586851 +0,15,-30.000000,2595000000,2590000000,-60,-20.644095 +0,15,-30.000000,2600000000,2595000000,-60,-20.702186 +0,15,-30.000000,2605000000,2600000000,-60,-20.760098 +0,15,-30.000000,2610000000,2605000000,-60,-20.813767 +0,15,-30.000000,2615000000,2610000000,-60,-20.872848 +0,15,-30.000000,2620000000,2615000000,-60,-20.931874 +0,15,-30.000000,2625000000,2620000000,-60,-20.991162 +0,15,-30.000000,2630000000,2625000000,-60,-21.050053 +0,15,-30.000000,2635000000,2630000000,-60,-21.111769 +0,15,-30.000000,2640000000,2635000000,-60,-21.174388 +0,15,-30.000000,2645000000,2640000000,-60,-21.233536 +0,15,-30.000000,2650000000,2645000000,-60,-21.296482 +0,15,-30.000000,2655000000,2650000000,-60,-21.360362 +0,15,-30.000000,2660000000,2655000000,-60,-21.420472 +0,15,-30.000000,2665000000,2660000000,-60,-21.482723 +0,15,-30.000000,2670000000,2665000000,-61,-21.543968 +0,15,-30.000000,2675000000,2670000000,-61,-21.607058 +0,15,-30.000000,2680000000,2675000000,-61,-21.669603 +0,15,-30.000000,2685000000,2680000000,-61,-21.734036 +0,15,-30.000000,2690000000,2685000000,-61,-21.800047 +0,15,-30.000000,2695000000,2690000000,-61,-21.867857 +0,15,-30.000000,2700000000,2695000000,-61,-21.937314 +0,15,-30.000000,2705000000,2700000000,-61,-22.114208 +0,15,-30.000000,2710000000,2705000000,-61,-22.254888 +0,15,-30.000000,2715000000,2710000000,-61,-22.252317 +0,15,-30.000000,2720000000,2715000000,-61,-22.286826 +0,15,-30.000000,2725000000,2720000000,-62,-22.352851 +0,15,-30.000000,2730000000,2725000000,-62,-22.422075 +0,15,-30.000000,2735000000,2730000000,-62,-22.505496 +0,15,-30.000000,2740000000,2735000000,-62,-22.590870 +0,15,-30.000000,2745000000,2740000000,-62,-22.678313 +0,15,-30.000000,2750000000,2745000000,-62,-22.771606 +0,15,-30.000000,2755000000,2750000000,-62,-22.868837 +0,15,-30.000000,2760000000,2755000000,-62,-22.970879 +0,15,-30.000000,2765000000,2760000000,-62,-23.075745 +0,15,-30.000000,2770000000,2765000000,-62,-23.190523 +0,15,-30.000000,2775000000,2770000000,-62,-23.307488 +0,15,-30.000000,2780000000,2775000000,-62,-23.425912 +0,15,-30.000000,2785000000,2780000000,-62,-23.545655 +0,15,-30.000000,2790000000,2785000000,-63,-23.669684 +0,15,-30.000000,2795000000,2790000000,-63,-23.794860 +0,15,-30.000000,2800000000,2795000000,-63,-23.920049 +0,15,-30.000000,2805000000,2800000000,-63,-24.050184 +0,15,-30.000000,2810000000,2805000000,-63,-24.177309 +0,15,-30.000000,2815000000,2810000000,-63,-24.306203 +0,15,-30.000000,2820000000,2815000000,-63,-24.430527 +0,15,-30.000000,2825000000,2820000000,-64,-24.559212 +0,15,-30.000000,2830000000,2825000000,-64,-24.681494 +0,15,-30.000000,2835000000,2830000000,-64,-24.806647 +0,15,-30.000000,2840000000,2835000000,-64,-24.926959 +0,15,-30.000000,2845000000,2840000000,-64,-25.046706 +0,15,-30.000000,2850000000,2845000000,-64,-25.273142 +0,15,-30.000000,2855000000,2850000000,-65,-25.317328 +0,15,-30.000000,2860000000,2855000000,-65,-25.400324 +0,15,-30.000000,2865000000,2860000000,-65,-25.483659 +0,15,-30.000000,2870000000,2865000000,-65,-25.589801 +0,15,-30.000000,2875000000,2870000000,-65,-25.693981 +0,15,-30.000000,2880000000,2875000000,-65,-25.793433 +0,15,-30.000000,2885000000,2880000000,-65,-25.886788 +0,15,-30.000000,2890000000,2885000000,-65,-25.980899 +0,15,-30.000000,2895000000,2890000000,-65,-26.070285 +0,15,-30.000000,2900000000,2895000000,-65,-26.152836 +0,15,-30.000000,2905000000,2900000000,-65,-26.232964 +0,15,-30.000000,2910000000,2905000000,-65,-26.305918 +0,15,-30.000000,2915000000,2910000000,-65,-26.375444 +0,15,-30.000000,2920000000,2915000000,-65,-26.440792 +0,15,-30.000000,2925000000,2920000000,-65,-26.502022 +0,15,-30.000000,2930000000,2925000000,-65,-26.552932 +0,15,-30.000000,2935000000,2930000000,-66,-26.606115 +0,15,-30.000000,2940000000,2935000000,-66,-26.651632 +0,15,-30.000000,2945000000,2940000000,-66,-26.692832 +0,15,-30.000000,2950000000,2945000000,-66,-26.728115 +0,15,-30.000000,2955000000,2950000000,-66,-26.761216 +0,15,-30.000000,2960000000,2955000000,-66,-26.790020 +0,15,-30.000000,2965000000,2960000000,-66,-26.816510 +0,15,-30.000000,2970000000,2965000000,-66,-26.836362 +0,15,-30.000000,2975000000,2970000000,-66,-26.850361 +0,15,-30.000000,2980000000,2975000000,-66,-26.867200 +0,15,-30.000000,2985000000,2980000000,-66,-26.879439 +0,15,-30.000000,2990000000,2985000000,-66,-26.892582 +0,15,-30.000000,2995000000,2990000000,-66,-26.903149 +0,15,-30.000000,3000000000,2995000000,-66,-26.908974 +0,15,-30.000000,3005000000,3000000000,-66,-26.916365 +0,15,-30.000000,3010000000,3005000000,-62,-23.392055 +0,15,-30.000000,3015000000,3010000000,-62,-23.414430 +0,15,-30.000000,3020000000,3015000000,-62,-23.417328 +0,15,-30.000000,3025000000,3020000000,-62,-23.414444 +0,15,-30.000000,3030000000,3025000000,-62,-23.409637 +0,15,-30.000000,3035000000,3030000000,-62,-23.406374 +0,15,-30.000000,3040000000,3035000000,-62,-23.401958 +0,15,-30.000000,3045000000,3040000000,-62,-23.401059 +0,15,-30.000000,3050000000,3045000000,-62,-23.400017 +0,15,-30.000000,3055000000,3050000000,-62,-23.403425 +0,15,-30.000000,3060000000,3055000000,-62,-23.406675 +0,15,-30.000000,3065000000,3060000000,-62,-23.413816 +0,15,-30.000000,3070000000,3065000000,-62,-23.421608 +0,15,-30.000000,3075000000,3070000000,-62,-23.434244 +0,15,-30.000000,3080000000,3075000000,-62,-23.448749 +0,15,-30.000000,3085000000,3080000000,-62,-23.466384 +0,15,-30.000000,3090000000,3085000000,-62,-23.490412 +0,15,-30.000000,3095000000,3090000000,-62,-23.517415 +0,15,-30.000000,3100000000,3095000000,-62,-23.546856 +0,15,-30.000000,3105000000,3100000000,-63,-23.581816 +0,15,-30.000000,3110000000,3105000000,-63,-23.619018 +0,15,-30.000000,3115000000,3110000000,-63,-23.660987 +0,15,-30.000000,3120000000,3115000000,-63,-23.704727 +0,15,-30.000000,3125000000,3120000000,-63,-23.754777 +0,15,-30.000000,3130000000,3125000000,-63,-23.805838 +0,15,-30.000000,3135000000,3130000000,-63,-23.859675 +0,15,-30.000000,3140000000,3135000000,-63,-23.916958 +0,15,-30.000000,3145000000,3140000000,-63,-23.974225 +0,15,-30.000000,3150000000,3145000000,-63,-24.029263 +0,15,-30.000000,3155000000,3150000000,-63,-24.086164 +0,15,-30.000000,3160000000,3155000000,-63,-24.143023 +0,15,-30.000000,3165000000,3160000000,-63,-24.198934 +0,15,-30.000000,3170000000,3165000000,-63,-24.252127 +0,15,-30.000000,3175000000,3170000000,-63,-24.303798 +0,15,-30.000000,3180000000,3175000000,-63,-24.355370 +0,15,-30.000000,3185000000,3180000000,-63,-24.403490 +0,15,-30.000000,3190000000,3185000000,-63,-24.450336 +0,15,-30.000000,3195000000,3190000000,-63,-24.490692 +0,15,-30.000000,3200000000,3195000000,-64,-24.528139 +0,15,-30.000000,3205000000,3200000000,-64,-24.566359 +0,15,-30.000000,3210000000,3205000000,-64,-24.595093 +0,15,-30.000000,3215000000,3210000000,-64,-24.620556 +0,15,-30.000000,3220000000,3215000000,-64,-24.642680 +0,15,-30.000000,3225000000,3220000000,-64,-24.658725 +0,15,-30.000000,3230000000,3225000000,-64,-24.672448 +0,15,-30.000000,3235000000,3230000000,-64,-24.681234 +0,15,-30.000000,3240000000,3235000000,-64,-24.685464 +0,15,-30.000000,3245000000,3240000000,-64,-24.685472 +0,15,-30.000000,3250000000,3245000000,-64,-24.683797 +0,15,-30.000000,3255000000,3250000000,-64,-24.677183 +0,15,-30.000000,3260000000,3255000000,-64,-24.665928 +0,15,-30.000000,3265000000,3260000000,-64,-24.650934 +0,15,-30.000000,3270000000,3265000000,-64,-24.633218 +0,15,-30.000000,3275000000,3270000000,-64,-24.611081 +0,15,-30.000000,3280000000,3275000000,-64,-24.583167 +0,15,-30.000000,3285000000,3280000000,-64,-24.551349 +0,15,-30.000000,3290000000,3285000000,-64,-24.516560 +0,15,-30.000000,3295000000,3290000000,-63,-24.473481 +0,15,-30.000000,3300000000,3295000000,-63,-24.430022 +0,15,-30.000000,3305000000,3300000000,-63,-24.381806 +0,15,-30.000000,3310000000,3305000000,-63,-24.328533 +0,15,-30.000000,3315000000,3310000000,-63,-24.273169 +0,15,-30.000000,3320000000,3315000000,-63,-24.214478 +0,15,-30.000000,3325000000,3320000000,-63,-24.153641 +0,15,-30.000000,3330000000,3325000000,-63,-24.089931 +0,15,-30.000000,3335000000,3330000000,-63,-24.022591 +0,15,-30.000000,3340000000,3335000000,-63,-23.956101 +0,15,-30.000000,3345000000,3340000000,-63,-23.888053 +0,15,-30.000000,3350000000,3345000000,-63,-23.818233 +0,15,-30.000000,3355000000,3350000000,-63,-23.749934 +0,15,-30.000000,3360000000,3355000000,-63,-23.676960 +0,15,-30.000000,3365000000,3360000000,-63,-23.607687 +0,15,-30.000000,3370000000,3365000000,-62,-23.540518 +0,15,-30.000000,3375000000,3370000000,-62,-23.472887 +0,15,-30.000000,3380000000,3375000000,-62,-23.409090 +0,15,-30.000000,3385000000,3380000000,-62,-23.342839 +0,15,-30.000000,3390000000,3385000000,-62,-23.284303 +0,15,-30.000000,3395000000,3390000000,-62,-23.229810 +0,15,-30.000000,3400000000,3395000000,-62,-23.179046 +0,15,-30.000000,3405000000,3400000000,-62,-23.129561 +0,15,-30.000000,3410000000,3405000000,-62,-23.084869 +0,15,-30.000000,3415000000,3410000000,-62,-23.043556 +0,15,-30.000000,3420000000,3415000000,-62,-23.006814 +0,15,-30.000000,3425000000,3420000000,-62,-22.973095 +0,15,-30.000000,3430000000,3425000000,-62,-22.942039 +0,15,-30.000000,3435000000,3430000000,-62,-22.914766 +0,15,-30.000000,3440000000,3435000000,-62,-22.886861 +0,15,-30.000000,3445000000,3440000000,-62,-22.834138 +0,15,-30.000000,3450000000,3445000000,-62,-22.811612 +0,15,-30.000000,3455000000,3450000000,-62,-22.791609 +0,15,-30.000000,3460000000,3455000000,-62,-22.775529 +0,15,-30.000000,3465000000,3460000000,-62,-22.755726 +0,15,-30.000000,3470000000,3465000000,-62,-22.744744 +0,15,-30.000000,3475000000,3470000000,-62,-22.735217 +0,15,-30.000000,3480000000,3475000000,-62,-22.729002 +0,15,-30.000000,3485000000,3480000000,-62,-22.723687 +0,15,-30.000000,3490000000,3485000000,-62,-22.723951 +0,15,-30.000000,3495000000,3490000000,-62,-22.719902 +0,15,-30.000000,3500000000,3495000000,-62,-22.723931 +0,15,-30.000000,3505000000,3500000000,-62,-22.723379 +0,15,-30.000000,3510000000,3505000000,-62,-22.720723 +0,15,-30.000000,3515000000,3510000000,-62,-22.714456 +0,15,-30.000000,3520000000,3515000000,-62,-22.707734 +0,15,-30.000000,3525000000,3520000000,-62,-22.702445 +0,15,-30.000000,3530000000,3525000000,-62,-22.699049 +0,15,-30.000000,3535000000,3530000000,-62,-22.696555 +0,15,-30.000000,3540000000,3535000000,-62,-22.692385 +0,15,-30.000000,3545000000,3540000000,-62,-22.687543 +0,15,-30.000000,3550000000,3545000000,-62,-22.681153 +0,15,-30.000000,3555000000,3550000000,-62,-22.673225 +0,15,-30.000000,3560000000,3555000000,-62,-22.662567 +0,15,-30.000000,3565000000,3560000000,-62,-22.647494 +0,15,-30.000000,3570000000,3565000000,-62,-22.629343 +0,15,-30.000000,3575000000,3570000000,-62,-22.608090 +0,15,-30.000000,3580000000,3575000000,-62,-22.582531 +0,15,-30.000000,3585000000,3580000000,-62,-22.556786 +0,15,-30.000000,3590000000,3585000000,-62,-22.535233 +0,15,-30.000000,3595000000,3590000000,-62,-22.512263 +0,15,-30.000000,3600000000,3595000000,-62,-22.484745 +0,15,-30.000000,3605000000,3600000000,-62,-22.693343 +0,15,-30.000000,3610000000,3605000000,-62,-22.640448 +0,15,-30.000000,3615000000,3610000000,-62,-22.586463 +0,15,-30.000000,3620000000,3615000000,-62,-22.529802 +0,15,-30.000000,3625000000,3620000000,-62,-22.473951 +0,15,-30.000000,3630000000,3625000000,-62,-22.416436 +0,15,-30.000000,3635000000,3630000000,-62,-22.360107 +0,15,-30.000000,3640000000,3635000000,-61,-22.303149 +0,15,-30.000000,3645000000,3640000000,-61,-22.246255 +0,15,-30.000000,3650000000,3645000000,-61,-22.239897 +0,15,-30.000000,3655000000,3650000000,-61,-22.300598 +0,15,-30.000000,3660000000,3655000000,-61,-22.358083 +0,15,-30.000000,3665000000,3660000000,-62,-22.377221 +0,15,-30.000000,3670000000,3665000000,-62,-22.380642 +0,15,-30.000000,3675000000,3670000000,-61,-22.370524 +0,15,-30.000000,3680000000,3675000000,-61,-22.350715 +0,15,-30.000000,3685000000,3680000000,-61,-22.325536 +0,15,-30.000000,3690000000,3685000000,-61,-22.292548 +0,15,-30.000000,3695000000,3690000000,-60,-21.492775 +0,15,-30.000000,3700000000,3695000000,-61,-21.571027 +0,15,-30.000000,3705000000,3700000000,-61,-21.565017 +0,15,-30.000000,3710000000,3705000000,-61,-21.519906 +0,15,-30.000000,3715000000,3710000000,-60,-21.477008 +0,15,-30.000000,3720000000,3715000000,-60,-21.433618 +0,15,-30.000000,3725000000,3720000000,-60,-21.375952 +0,15,-30.000000,3730000000,3725000000,-60,-21.337515 +0,15,-30.000000,3735000000,3730000000,-60,-21.311468 +0,15,-30.000000,3740000000,3735000000,-60,-21.269403 +0,15,-30.000000,3745000000,3740000000,-60,-21.237797 +0,15,-30.000000,3750000000,3745000000,-60,-21.201999 +0,15,-30.000000,3755000000,3750000000,-60,-21.169586 +0,15,-30.000000,3760000000,3755000000,-60,-21.138873 +0,15,-30.000000,3765000000,3760000000,-60,-21.110333 +0,15,-30.000000,3770000000,3765000000,-60,-21.088037 +0,15,-30.000000,3775000000,3770000000,-60,-21.067760 +0,15,-30.000000,3780000000,3775000000,-60,-21.050043 +0,15,-30.000000,3785000000,3780000000,-60,-21.035166 +0,15,-30.000000,3790000000,3785000000,-60,-21.022148 +0,15,-30.000000,3795000000,3790000000,-60,-21.010933 +0,15,-30.000000,3800000000,3795000000,-60,-21.003906 +0,15,-30.000000,3805000000,3800000000,-60,-20.999462 +0,15,-30.000000,3810000000,3805000000,-60,-20.996638 +0,15,-30.000000,3815000000,3810000000,-60,-20.994096 +0,15,-30.000000,3820000000,3815000000,-60,-20.992391 +0,15,-30.000000,3825000000,3820000000,-60,-20.996746 +0,15,-30.000000,3830000000,3825000000,-60,-21.005201 +0,15,-30.000000,3835000000,3830000000,-60,-21.013507 +0,15,-30.000000,3840000000,3835000000,-60,-21.021268 +0,15,-30.000000,3845000000,3840000000,-60,-21.027559 +0,15,-30.000000,3850000000,3845000000,-60,-21.040081 +0,15,-30.000000,3855000000,3850000000,-60,-21.051908 +0,15,-30.000000,3860000000,3855000000,-60,-21.063596 +0,15,-30.000000,3865000000,3860000000,-60,-21.077639 +0,15,-30.000000,3870000000,3865000000,-60,-21.090005 +0,15,-30.000000,3875000000,3870000000,-60,-21.105751 +0,15,-30.000000,3880000000,3875000000,-60,-21.120356 +0,15,-30.000000,3885000000,3880000000,-60,-21.134690 +0,15,-30.000000,3890000000,3885000000,-60,-21.152960 +0,15,-30.000000,3895000000,3890000000,-60,-21.170638 +0,15,-30.000000,3900000000,3895000000,-60,-21.187925 +0,15,-30.000000,3905000000,3900000000,-60,-21.205050 +0,15,-30.000000,3910000000,3905000000,-60,-21.220302 +0,15,-30.000000,3915000000,3910000000,-60,-21.229172 +0,15,-30.000000,3920000000,3915000000,-60,-21.238492 +0,15,-30.000000,3925000000,3920000000,-60,-21.250785 +0,15,-30.000000,3930000000,3925000000,-60,-21.268294 +0,15,-30.000000,3935000000,3930000000,-60,-21.276012 +0,15,-30.000000,3940000000,3935000000,-60,-21.281145 +0,15,-30.000000,3945000000,3940000000,-60,-21.290032 +0,15,-30.000000,3950000000,3945000000,-60,-21.296538 +0,15,-30.000000,3955000000,3950000000,-60,-21.298208 +0,15,-30.000000,3960000000,3955000000,-60,-21.310954 +0,15,-30.000000,3965000000,3960000000,-60,-21.320946 +0,15,-30.000000,3970000000,3965000000,-60,-21.330450 +0,15,-30.000000,3975000000,3970000000,-60,-21.337075 +0,15,-30.000000,3980000000,3975000000,-60,-21.343832 +0,15,-30.000000,3985000000,3980000000,-60,-21.346309 +0,15,-30.000000,3990000000,3985000000,-60,-21.348612 +0,15,-30.000000,3995000000,3990000000,-60,-21.348991 +0,15,-30.000000,4000000000,3995000000,-60,-21.348133 +0,15,-30.000000,4005000000,4000000000,-61,-21.581023 +0,15,-30.000000,4010000000,4005000000,-60,-21.450429 +0,15,-30.000000,4015000000,4010000000,-60,-21.433393 +0,15,-30.000000,4020000000,4015000000,-60,-21.420631 +0,15,-30.000000,4025000000,4020000000,-60,-21.409016 +0,15,-30.000000,4030000000,4025000000,-60,-21.397080 +0,15,-30.000000,4035000000,4030000000,-60,-21.389680 +0,15,-30.000000,4040000000,4035000000,-60,-21.383820 +0,15,-30.000000,4045000000,4040000000,-60,-21.378171 +0,15,-30.000000,4050000000,4045000000,-60,-21.373654 +0,15,-30.000000,4055000000,4050000000,-60,-21.372797 +0,15,-30.000000,4060000000,4055000000,-60,-21.367514 +0,15,-30.000000,4065000000,4060000000,-60,-21.363581 +0,15,-30.000000,4070000000,4065000000,-60,-21.362441 +0,15,-30.000000,4075000000,4070000000,-60,-21.364230 +0,15,-30.000000,4080000000,4075000000,-60,-21.359149 +0,15,-30.000000,4085000000,4080000000,-60,-21.346012 +0,15,-30.000000,4090000000,4085000000,-60,-21.332452 +0,15,-30.000000,4095000000,4090000000,-60,-21.320648 +0,15,-30.000000,4100000000,4095000000,-60,-21.310988 +0,15,-30.000000,4105000000,4100000000,-60,-21.298908 +0,15,-30.000000,4110000000,4105000000,-60,-21.287463 +0,15,-30.000000,4115000000,4110000000,-60,-21.278870 +0,15,-30.000000,4120000000,4115000000,-60,-21.268731 +0,15,-30.000000,4125000000,4120000000,-60,-21.260669 +0,15,-30.000000,4130000000,4125000000,-60,-21.256017 +0,15,-30.000000,4135000000,4130000000,-60,-21.249745 +0,15,-30.000000,4140000000,4135000000,-60,-21.246429 +0,15,-30.000000,4145000000,4140000000,-60,-21.243121 +0,15,-30.000000,4150000000,4145000000,-60,-21.239302 +0,15,-30.000000,4155000000,4150000000,-60,-21.240608 +0,15,-30.000000,4160000000,4155000000,-60,-21.241583 +0,15,-30.000000,4165000000,4160000000,-60,-21.243896 +0,15,-30.000000,4170000000,4165000000,-60,-21.243536 +0,15,-30.000000,4175000000,4170000000,-60,-21.246358 +0,15,-30.000000,4180000000,4175000000,-60,-21.254011 +0,15,-30.000000,4185000000,4180000000,-60,-21.257509 +0,15,-30.000000,4190000000,4185000000,-60,-21.261875 +0,15,-30.000000,4195000000,4190000000,-60,-21.264832 +0,15,-30.000000,4200000000,4195000000,-60,-21.270282 +0,15,-30.000000,4205000000,4200000000,-60,-21.277279 +0,15,-30.000000,4210000000,4205000000,-60,-21.285003 +0,15,-30.000000,4215000000,4210000000,-60,-21.293222 +0,15,-30.000000,4220000000,4215000000,-60,-21.300064 +0,15,-30.000000,4225000000,4220000000,-60,-21.315548 +0,15,-30.000000,4230000000,4225000000,-60,-21.333533 +0,15,-30.000000,4235000000,4230000000,-60,-21.349000 +0,15,-30.000000,4240000000,4235000000,-60,-21.366348 +0,15,-30.000000,4245000000,4240000000,-60,-21.383979 +0,15,-30.000000,4250000000,4245000000,-60,-21.406673 +0,15,-30.000000,4255000000,4250000000,-60,-21.429709 +0,15,-30.000000,4260000000,4255000000,-60,-21.451974 +0,15,-30.000000,4265000000,4260000000,-60,-21.473701 +0,15,-30.000000,4270000000,4265000000,-61,-21.496879 +0,15,-30.000000,4275000000,4270000000,-61,-21.524341 +0,15,-30.000000,4280000000,4275000000,-61,-21.553881 +0,15,-30.000000,4285000000,4280000000,-61,-21.582886 +0,15,-30.000000,4290000000,4285000000,-61,-21.610544 +0,15,-30.000000,4295000000,4290000000,-61,-21.641046 +0,15,-30.000000,4300000000,4295000000,-61,-21.679768 +0,15,-30.000000,4305000000,4300000000,-61,-21.714960 +0,15,-30.000000,4310000000,4305000000,-61,-21.752001 +0,15,-30.000000,4315000000,4310000000,-61,-21.779866 +0,15,-30.000000,4320000000,4315000000,-61,-21.815800 +0,15,-30.000000,4325000000,4320000000,-61,-21.850867 +0,15,-30.000000,4330000000,4325000000,-61,-21.883658 +0,15,-30.000000,4335000000,4330000000,-61,-21.920299 +0,15,-30.000000,4340000000,4335000000,-61,-21.951153 +0,15,-30.000000,4345000000,4340000000,-61,-21.982680 +0,15,-30.000000,4350000000,4345000000,-61,-22.013028 +0,15,-30.000000,4355000000,4350000000,-61,-22.043894 +0,15,-30.000000,4360000000,4355000000,-61,-22.074420 +0,15,-30.000000,4365000000,4360000000,-61,-22.100798 +0,15,-30.000000,4370000000,4365000000,-61,-22.125580 +0,15,-30.000000,4375000000,4370000000,-61,-22.264867 +0,15,-30.000000,4380000000,4375000000,-61,-22.263819 +0,15,-30.000000,4385000000,4380000000,-61,-22.244857 +0,15,-30.000000,4390000000,4385000000,-61,-22.244031 +0,15,-30.000000,4395000000,4390000000,-61,-22.259511 +0,15,-30.000000,4400000000,4395000000,-61,-22.282603 +0,15,-30.000000,4405000000,4400000000,-61,-22.311864 +0,15,-30.000000,4410000000,4405000000,-62,-22.321931 +0,15,-30.000000,4415000000,4410000000,-62,-22.348059 +0,15,-30.000000,4420000000,4415000000,-62,-22.375230 +0,15,-30.000000,4425000000,4420000000,-62,-22.401695 +0,15,-30.000000,4430000000,4425000000,-62,-22.428021 +0,15,-30.000000,4435000000,4430000000,-62,-22.455573 +0,15,-30.000000,4440000000,4435000000,-62,-22.478440 +0,15,-30.000000,4445000000,4440000000,-62,-22.496111 +0,15,-30.000000,4450000000,4445000000,-62,-22.516805 +0,15,-30.000000,4455000000,4450000000,-62,-22.533979 +0,15,-30.000000,4460000000,4455000000,-62,-22.557705 +0,15,-30.000000,4465000000,4460000000,-62,-22.569823 +0,15,-30.000000,4470000000,4465000000,-62,-22.588092 +0,15,-30.000000,4475000000,4470000000,-62,-22.609261 +0,15,-30.000000,4480000000,4475000000,-62,-22.632133 +0,15,-30.000000,4485000000,4480000000,-62,-22.653849 +0,15,-30.000000,4490000000,4485000000,-62,-22.673677 +0,15,-30.000000,4495000000,4490000000,-62,-22.686124 +0,15,-30.000000,4500000000,4495000000,-62,-22.708570 +0,15,-30.000000,4505000000,4500000000,-62,-22.729513 +0,15,-30.000000,4510000000,4505000000,-62,-22.743465 +0,15,-30.000000,4515000000,4510000000,-62,-22.762568 +0,15,-30.000000,4520000000,4515000000,-62,-22.781934 +0,15,-30.000000,4525000000,4520000000,-62,-22.801682 +0,15,-30.000000,4530000000,4525000000,-62,-22.815989 +0,15,-30.000000,4535000000,4530000000,-62,-22.841750 +0,15,-30.000000,4540000000,4535000000,-62,-22.865295 +0,15,-30.000000,4545000000,4540000000,-62,-22.892241 +0,15,-30.000000,4550000000,4545000000,-62,-22.917756 +0,15,-30.000000,4555000000,4550000000,-62,-22.936822 +0,15,-30.000000,4560000000,4555000000,-62,-22.962854 +0,15,-30.000000,4565000000,4560000000,-62,-22.985878 +0,15,-30.000000,4570000000,4565000000,-62,-23.010526 +0,15,-30.000000,4575000000,4570000000,-62,-23.027951 +0,15,-30.000000,4580000000,4575000000,-62,-23.051413 +0,15,-30.000000,4585000000,4580000000,-62,-23.076225 +0,15,-30.000000,4590000000,4585000000,-62,-23.101309 +0,15,-30.000000,4595000000,4590000000,-62,-23.122217 +0,15,-30.000000,4600000000,4595000000,-62,-23.133355 +0,15,-30.000000,4605000000,4600000000,-62,-23.154628 +0,15,-30.000000,4610000000,4605000000,-62,-23.179532 +0,15,-30.000000,4615000000,4610000000,-62,-23.203886 +0,15,-30.000000,4620000000,4615000000,-62,-23.221128 +0,15,-30.000000,4625000000,4620000000,-62,-23.242759 +0,15,-30.000000,4630000000,4625000000,-62,-23.262706 +0,15,-30.000000,4635000000,4630000000,-62,-23.283396 +0,15,-30.000000,4640000000,4635000000,-62,-23.302927 +0,15,-30.000000,4645000000,4640000000,-62,-23.310868 +0,15,-30.000000,4650000000,4645000000,-62,-23.327261 +0,15,-30.000000,4655000000,4650000000,-62,-23.342029 +0,15,-30.000000,4660000000,4655000000,-62,-23.356672 +0,15,-30.000000,4665000000,4660000000,-62,-23.361813 +0,15,-30.000000,4670000000,4665000000,-62,-23.372912 +0,15,-30.000000,4675000000,4670000000,-62,-23.382915 +0,15,-30.000000,4680000000,4675000000,-62,-23.396337 +0,15,-30.000000,4685000000,4680000000,-62,-23.412609 +0,15,-30.000000,4690000000,4685000000,-62,-23.427697 +0,15,-30.000000,4695000000,4690000000,-62,-23.430372 +0,15,-30.000000,4700000000,4695000000,-62,-23.442573 +0,15,-30.000000,4705000000,4700000000,-62,-23.458610 +0,15,-30.000000,4710000000,4705000000,-62,-23.478086 +0,15,-30.000000,4715000000,4710000000,-62,-23.486645 +0,15,-30.000000,4720000000,4715000000,-62,-23.500698 +0,15,-30.000000,4725000000,4720000000,-62,-23.515470 +0,15,-30.000000,4730000000,4725000000,-62,-23.519619 +0,15,-30.000000,4735000000,4730000000,-62,-23.535887 +0,15,-30.000000,4740000000,4735000000,-62,-23.549863 +0,15,-30.000000,4745000000,4740000000,-62,-23.561648 +0,15,-30.000000,4750000000,4745000000,-63,-23.572730 +0,15,-30.000000,4755000000,4750000000,-63,-23.580518 +0,15,-30.000000,4760000000,4755000000,-63,-23.585450 +0,15,-30.000000,4765000000,4760000000,-63,-23.581033 +0,15,-30.000000,4770000000,4765000000,-63,-23.586813 +0,15,-30.000000,4775000000,4770000000,-63,-23.591116 +0,15,-30.000000,4780000000,4775000000,-63,-23.596318 +0,15,-30.000000,4785000000,4780000000,-63,-23.600161 +0,15,-30.000000,4790000000,4785000000,-63,-23.604199 +0,15,-30.000000,4795000000,4790000000,-63,-23.609666 +0,15,-30.000000,4800000000,4795000000,-63,-23.612532 +0,15,-30.000000,4805000000,4800000000,-63,-23.626040 +0,15,-30.000000,4810000000,4805000000,-63,-23.641080 +0,15,-30.000000,4815000000,4810000000,-63,-23.654613 +0,15,-30.000000,4820000000,4815000000,-63,-23.659549 +0,15,-30.000000,4825000000,4820000000,-63,-23.668082 +0,15,-30.000000,4830000000,4825000000,-63,-23.673666 +0,15,-30.000000,4835000000,4830000000,-63,-23.682393 +0,15,-30.000000,4840000000,4835000000,-63,-23.690640 +0,15,-30.000000,4845000000,4840000000,-63,-23.702128 +0,15,-30.000000,4850000000,4845000000,-63,-23.699632 +0,15,-30.000000,4855000000,4850000000,-63,-23.701364 +0,15,-30.000000,4860000000,4855000000,-63,-23.705480 +0,15,-30.000000,4865000000,4860000000,-63,-23.697119 +0,15,-30.000000,4870000000,4865000000,-63,-23.701207 +0,15,-30.000000,4875000000,4870000000,-63,-23.696579 +0,15,-30.000000,4880000000,4875000000,-63,-23.708593 +0,15,-30.000000,4885000000,4880000000,-63,-23.710366 +0,15,-30.000000,4890000000,4885000000,-63,-23.700573 +0,15,-30.000000,4895000000,4890000000,-63,-23.704031 +0,15,-30.000000,4900000000,4895000000,-63,-23.705019 +0,15,-30.000000,4905000000,4900000000,-63,-23.705205 +0,15,-30.000000,4910000000,4905000000,-63,-23.710334 +0,15,-30.000000,4915000000,4910000000,-63,-23.721144 +0,15,-30.000000,4920000000,4915000000,-63,-23.725231 +0,15,-30.000000,4925000000,4920000000,-63,-23.725675 +0,15,-30.000000,4930000000,4925000000,-63,-23.731165 +0,15,-30.000000,4935000000,4930000000,-63,-23.738143 +0,15,-30.000000,4940000000,4935000000,-63,-23.746505 +0,15,-30.000000,4945000000,4940000000,-63,-23.750888 +0,15,-30.000000,4950000000,4945000000,-63,-23.754714 +0,15,-30.000000,4955000000,4950000000,-63,-23.760518 +0,15,-30.000000,4960000000,4955000000,-63,-23.766272 +0,15,-30.000000,4965000000,4960000000,-63,-23.761938 +0,15,-30.000000,4970000000,4965000000,-63,-23.768292 +0,15,-30.000000,4975000000,4970000000,-63,-23.770660 +0,15,-30.000000,4980000000,4975000000,-63,-23.785551 +0,15,-30.000000,4985000000,4980000000,-63,-23.790303 +0,15,-30.000000,4990000000,4985000000,-63,-23.800839 +0,15,-30.000000,4995000000,4990000000,-63,-23.836408 +0,15,-30.000000,5000000000,4995000000,-63,-23.868380 +0,15,-30.000000,5005000000,5000000000,-63,-23.934484 +0,15,-30.000000,5010000000,5005000000,-63,-23.913556 +0,15,-30.000000,5015000000,5010000000,-63,-23.892707 +0,15,-30.000000,5020000000,5015000000,-63,-23.876106 +0,15,-30.000000,5025000000,5020000000,-63,-23.865903 +0,15,-30.000000,5030000000,5025000000,-63,-23.870831 +0,15,-30.000000,5035000000,5030000000,-63,-23.866992 +0,15,-30.000000,5040000000,5035000000,-63,-23.865978 +0,15,-30.000000,5045000000,5040000000,-63,-23.868831 +0,15,-30.000000,5050000000,5045000000,-63,-23.869782 +0,15,-30.000000,5055000000,5050000000,-63,-23.871177 +0,15,-30.000000,5060000000,5055000000,-63,-23.879834 +0,15,-30.000000,5065000000,5060000000,-63,-23.889762 +0,15,-30.000000,5070000000,5065000000,-63,-23.900124 +0,15,-30.000000,5075000000,5070000000,-63,-23.912017 +0,15,-30.000000,5080000000,5075000000,-63,-23.925979 +0,15,-30.000000,5085000000,5080000000,-63,-23.938151 +0,15,-30.000000,5090000000,5085000000,-63,-23.947751 +0,15,-30.000000,5095000000,5090000000,-63,-23.964841 +0,15,-30.000000,5100000000,5095000000,-63,-23.979748 +0,15,-30.000000,5105000000,5100000000,-63,-23.994776 +0,15,-30.000000,5110000000,5105000000,-63,-24.009980 +0,15,-30.000000,5115000000,5110000000,-63,-24.027155 +0,15,-30.000000,5120000000,5115000000,-63,-24.041392 +0,15,-30.000000,5125000000,5120000000,-63,-24.058034 +0,15,-30.000000,5130000000,5125000000,-63,-24.088581 +0,15,-30.000000,5135000000,5130000000,-63,-24.108378 +0,15,-30.000000,5140000000,5135000000,-63,-24.129855 +0,15,-30.000000,5145000000,5140000000,-63,-24.151307 +0,15,-30.000000,5150000000,5145000000,-63,-24.171886 +0,15,-30.000000,5155000000,5150000000,-63,-24.195770 +0,15,-30.000000,5160000000,5155000000,-63,-24.216198 +0,15,-30.000000,5165000000,5160000000,-63,-24.240082 +0,15,-30.000000,5170000000,5165000000,-63,-24.263349 +0,15,-30.000000,5175000000,5170000000,-63,-24.288086 +0,15,-30.000000,5180000000,5175000000,-63,-24.313490 +0,15,-30.000000,5185000000,5180000000,-63,-24.340030 +0,15,-30.000000,5190000000,5185000000,-63,-24.365086 +0,15,-30.000000,5195000000,5190000000,-63,-24.394602 +0,15,-30.000000,5200000000,5195000000,-63,-24.422119 +0,15,-30.000000,5205000000,5200000000,-63,-24.451755 +0,15,-30.000000,5210000000,5205000000,-63,-24.479012 +0,15,-30.000000,5215000000,5210000000,-64,-24.522537 +0,15,-30.000000,5220000000,5215000000,-64,-24.566109 +0,15,-30.000000,5225000000,5220000000,-64,-24.605405 +0,15,-30.000000,5230000000,5225000000,-64,-24.661844 +0,15,-30.000000,5235000000,5230000000,-64,-24.691884 +0,15,-30.000000,5240000000,5235000000,-64,-24.734127 +0,15,-30.000000,5245000000,5240000000,-64,-24.776223 +0,15,-30.000000,5250000000,5245000000,-64,-24.818073 +0,15,-30.000000,5255000000,5250000000,-64,-24.861917 +0,15,-30.000000,5260000000,5255000000,-64,-24.900993 +0,15,-30.000000,5265000000,5260000000,-64,-24.942072 +0,15,-30.000000,5270000000,5265000000,-64,-24.972729 +0,15,-30.000000,5275000000,5270000000,-64,-25.014369 +0,15,-30.000000,5280000000,5275000000,-64,-25.052497 +0,15,-30.000000,5285000000,5280000000,-64,-25.092997 +0,15,-30.000000,5290000000,5285000000,-64,-25.131948 +0,15,-30.000000,5295000000,5290000000,-64,-25.140018 +0,15,-30.000000,5300000000,5295000000,-64,-25.090717 +0,15,-30.000000,5305000000,5300000000,-64,-25.043026 +0,15,-30.000000,5310000000,5305000000,-64,-25.016455 +0,15,-30.000000,5315000000,5310000000,-64,-24.996736 +0,15,-30.000000,5320000000,5315000000,-64,-24.971993 +0,15,-30.000000,5325000000,5320000000,-64,-24.952969 +0,15,-30.000000,5330000000,5325000000,-64,-24.951467 +0,15,-30.000000,5335000000,5330000000,-64,-24.939491 +0,15,-30.000000,5340000000,5335000000,-64,-24.954129 +0,15,-30.000000,5345000000,5340000000,-65,-25.639866 +0,15,-30.000000,5350000000,5345000000,-65,-25.575863 +0,15,-30.000000,5355000000,5350000000,-65,-25.591321 +0,15,-30.000000,5360000000,5355000000,-65,-25.647918 +0,15,-30.000000,5365000000,5360000000,-65,-25.708457 +0,15,-30.000000,5370000000,5365000000,-65,-25.773118 +0,15,-30.000000,5375000000,5370000000,-65,-25.838238 +0,15,-30.000000,5380000000,5375000000,-65,-25.907647 +0,15,-30.000000,5385000000,5380000000,-65,-25.982682 +0,15,-30.000000,5390000000,5385000000,-65,-26.058451 +0,15,-30.000000,5395000000,5390000000,-65,-26.137700 +0,15,-30.000000,5400000000,5395000000,-65,-26.209877 +0,15,-30.000000,5405000000,5400000000,-65,-26.291054 +0,15,-30.000000,5410000000,5405000000,-65,-26.376596 +0,15,-30.000000,5415000000,5410000000,-65,-26.461850 +0,15,-30.000000,5420000000,5415000000,-65,-26.520276 +0,15,-30.000000,5425000000,5420000000,-66,-26.608096 +0,15,-30.000000,5430000000,5425000000,-66,-26.710245 +0,15,-30.000000,5435000000,5430000000,-66,-26.800258 +0,15,-30.000000,5440000000,5435000000,-66,-26.883150 +0,15,-30.000000,5445000000,5440000000,-66,-26.974626 +0,15,-30.000000,5450000000,5445000000,-66,-27.066325 +0,15,-30.000000,5455000000,5450000000,-66,-27.156603 +0,15,-30.000000,5460000000,5455000000,-66,-27.251588 +0,15,-30.000000,5465000000,5460000000,-66,-27.356013 +0,15,-30.000000,5470000000,5465000000,-66,-27.455504 +0,15,-30.000000,5475000000,5470000000,-66,-27.553513 +0,15,-30.000000,5480000000,5475000000,-67,-27.637375 +0,15,-30.000000,5485000000,5480000000,-67,-27.743991 +0,15,-30.000000,5490000000,5485000000,-67,-27.834142 +0,15,-30.000000,5495000000,5490000000,-67,-27.909103 +0,15,-30.000000,5500000000,5495000000,-67,-27.995454 +0,15,-30.000000,5505000000,5500000000,-67,-28.074945 +0,15,-30.000000,5510000000,5505000000,-67,-28.135778 +0,15,-30.000000,5515000000,5510000000,-67,-28.121905 +0,15,-30.000000,5520000000,5515000000,-67,-28.081095 +0,15,-30.000000,5525000000,5520000000,-67,-28.042250 +0,15,-30.000000,5530000000,5525000000,-67,-28.003429 +0,15,-30.000000,5535000000,5530000000,-67,-27.985483 +0,15,-30.000000,5540000000,5535000000,-67,-27.975354 +0,15,-30.000000,5545000000,5540000000,-67,-27.954908 +0,15,-30.000000,5550000000,5545000000,-67,-27.959761 +0,15,-30.000000,5555000000,5550000000,-67,-27.964716 +0,15,-30.000000,5560000000,5555000000,-67,-28.711331 +0,15,-30.000000,5565000000,5560000000,-68,-28.559311 +0,15,-30.000000,5570000000,5565000000,-68,-28.506647 +0,15,-30.000000,5575000000,5570000000,-68,-28.502586 +0,15,-30.000000,5580000000,5575000000,-68,-28.500607 +0,15,-30.000000,5585000000,5580000000,-68,-28.497666 +0,15,-30.000000,5590000000,5585000000,-68,-28.491790 +0,15,-30.000000,5595000000,5590000000,-68,-28.473858 +0,15,-30.000000,5600000000,5595000000,-68,-28.464832 +0,15,-30.000000,5605000000,5600000000,-68,-28.457682 +0,15,-30.000000,5610000000,5605000000,-68,-28.452573 +0,15,-30.000000,5615000000,5610000000,-68,-28.443953 +0,15,-30.000000,5620000000,5615000000,-68,-28.442251 +0,15,-30.000000,5625000000,5620000000,-68,-28.445976 +0,15,-30.000000,5630000000,5625000000,-68,-28.450062 +0,15,-30.000000,5635000000,5630000000,-68,-28.458064 +0,15,-30.000000,5640000000,5635000000,-68,-28.462882 +0,15,-30.000000,5645000000,5640000000,-68,-28.479217 +0,15,-30.000000,5650000000,5645000000,-68,-28.503855 +0,15,-30.000000,5655000000,5650000000,-68,-28.534604 +0,15,-30.000000,5660000000,5655000000,-68,-28.554559 +0,15,-30.000000,5665000000,5660000000,-68,-28.590360 +0,15,-30.000000,5670000000,5665000000,-68,-28.632287 +0,15,-30.000000,5675000000,5670000000,-68,-28.682556 +0,15,-30.000000,5680000000,5675000000,-68,-28.731758 +0,15,-30.000000,5685000000,5680000000,-68,-28.800636 +0,15,-30.000000,5690000000,5685000000,-68,-28.874446 +0,15,-30.000000,5695000000,5690000000,-68,-28.957908 +0,15,-30.000000,5700000000,5695000000,-68,-29.047952 +0,15,-30.000000,5705000000,5700000000,-68,-29.137896 +0,15,-30.000000,5710000000,5705000000,-68,-29.251471 +0,15,-30.000000,5715000000,5710000000,-68,-29.368283 +0,15,-30.000000,5720000000,5715000000,-68,-29.492163 +0,15,-30.000000,5725000000,5720000000,-68,-29.620102 +0,15,-30.000000,5730000000,5725000000,-69,-29.749557 +0,15,-30.000000,5735000000,5730000000,-69,-29.867694 +0,15,-30.000000,5740000000,5735000000,-69,-30.005185 +0,15,-30.000000,5745000000,5740000000,-69,-30.140094 +0,15,-30.000000,5750000000,5745000000,-69,-30.275903 +0,15,-30.000000,5755000000,5750000000,-69,-30.412748 +0,15,-30.000000,5760000000,5755000000,-69,-30.524154 +0,15,-30.000000,5765000000,5760000000,-70,-30.632746 +0,15,-30.000000,5770000000,5765000000,-70,-30.738883 +0,15,-30.000000,5775000000,5770000000,-70,-30.845320 +0,15,-30.000000,5780000000,5775000000,-70,-30.945475 +0,15,-30.000000,5785000000,5780000000,-70,-31.033938 +0,15,-30.000000,5790000000,5785000000,-70,-31.120099 +0,15,-30.000000,5795000000,5790000000,-70,-31.108342 +0,15,-30.000000,5800000000,5795000000,-70,-31.053945 +0,15,-30.000000,5805000000,5800000000,-70,-31.025629 +0,15,-30.000000,5810000000,5805000000,-70,-31.007516 +0,15,-30.000000,5815000000,5810000000,-70,-31.851901 +0,15,-30.000000,5820000000,5815000000,-71,-31.709106 +0,15,-30.000000,5825000000,5820000000,-71,-31.717556 +0,15,-30.000000,5830000000,5825000000,-71,-31.781560 +0,15,-30.000000,5835000000,5830000000,-71,-31.845258 +0,15,-30.000000,5840000000,5835000000,-71,-31.895972 +0,15,-30.000000,5845000000,5840000000,-71,-31.947271 +0,15,-30.000000,5850000000,5845000000,-71,-31.980072 +0,15,-30.000000,5855000000,5850000000,-71,-32.017534 +0,15,-30.000000,5860000000,5855000000,-71,-32.033724 +0,15,-30.000000,5865000000,5860000000,-71,-32.040561 +0,15,-30.000000,5870000000,5865000000,-71,-32.037294 +0,15,-30.000000,5875000000,5870000000,-71,-32.023869 +0,15,-30.000000,5880000000,5875000000,-71,-32.010866 +0,15,-30.000000,5885000000,5880000000,-71,-31.995724 +0,15,-30.000000,5890000000,5885000000,-71,-31.964754 +0,15,-30.000000,5895000000,5890000000,-71,-31.932463 +0,15,-30.000000,5900000000,5895000000,-71,-31.895824 +0,15,-30.000000,5905000000,5900000000,-71,-31.846215 +0,15,-30.000000,5910000000,5905000000,-71,-31.767889 +0,15,-30.000000,5915000000,5910000000,-71,-31.693529 +0,15,-30.000000,5920000000,5915000000,-71,-31.608440 +0,15,-30.000000,5925000000,5920000000,-71,-31.499616 +0,15,-30.000000,5930000000,5925000000,-70,-31.410335 +0,15,-30.000000,5935000000,5930000000,-70,-31.313153 +0,15,-30.000000,5940000000,5935000000,-70,-31.287972 +0,15,-30.000000,5945000000,5940000000,-70,-31.362824 +0,15,-30.000000,5950000000,5945000000,-70,-31.379187 +0,15,-30.000000,5955000000,5950000000,-70,-31.361142 +0,15,-30.000000,5960000000,5955000000,-70,-31.300900 +0,15,-30.000000,5965000000,5960000000,-70,-30.382770 +0,15,-30.000000,5970000000,5965000000,-69,-30.431215 +0,15,-30.000000,5975000000,5970000000,-69,-30.410404 +0,15,-30.000000,5980000000,5975000000,-69,-30.335547 +0,15,-30.000000,5985000000,5980000000,-69,-30.251283 +0,15,-30.000000,5990000000,5985000000,-69,-30.167643 +0,15,-30.000000,5995000000,5990000000,-69,-30.091595 +0,15,-30.000000,6000000000,5995000000,-69,-30.015980 +0,15,-30.000000,6005000000,6000000000,-69,-29.958181 +1,0,-30.000000,80000000,75000000,-49,-25.626591 +1,0,-30.000000,85000000,80000000,-49,-25.648414 +1,0,-30.000000,90000000,85000000,-49,-25.670995 +1,0,-30.000000,95000000,90000000,-49,-25.750241 +1,0,-30.000000,100000000,95000000,-49,-25.654826 +1,0,-30.000000,105000000,100000000,-49,-25.496175 +1,0,-30.000000,110000000,105000000,-49,-25.548486 +1,0,-30.000000,115000000,110000000,-49,-26.404500 +1,0,-30.000000,120000000,115000000,-49,-26.387956 +1,0,-30.000000,125000000,120000000,-49,-26.361962 +1,0,-30.000000,130000000,125000000,-49,-26.282244 +1,0,-30.000000,135000000,130000000,-49,-26.221555 +1,0,-30.000000,140000000,135000000,-49,-26.100830 +1,0,-30.000000,145000000,140000000,-49,-26.088782 +1,0,-30.000000,150000000,145000000,-49,-26.052463 +1,0,-30.000000,155000000,150000000,-49,-26.014697 +1,0,-30.000000,160000000,155000000,-49,-26.022830 +1,0,-30.000000,165000000,160000000,-49,-26.034750 +1,0,-30.000000,170000000,165000000,-49,-25.997670 +1,0,-30.000000,175000000,170000000,-49,-25.994485 +1,0,-30.000000,180000000,175000000,-49,-25.964522 +1,0,-30.000000,185000000,180000000,-49,-25.952455 +1,0,-30.000000,190000000,185000000,-49,-26.021048 +1,0,-30.000000,195000000,190000000,-49,-26.010700 +1,0,-30.000000,200000000,195000000,-49,-25.964518 +1,0,-30.000000,205000000,200000000,-49,-25.953485 +1,0,-30.000000,210000000,205000000,-49,-25.990925 +1,0,-30.000000,215000000,210000000,-49,-25.978864 +1,0,-30.000000,220000000,215000000,-49,-25.982280 +1,0,-30.000000,225000000,220000000,-49,-25.937740 +1,0,-30.000000,230000000,225000000,-49,-26.009904 +1,0,-30.000000,235000000,230000000,-49,-25.973853 +1,0,-30.000000,240000000,235000000,-49,-26.021163 +1,0,-30.000000,245000000,240000000,-49,-26.063151 +1,0,-30.000000,250000000,245000000,-49,-26.074565 +1,0,-30.000000,255000000,250000000,-49,-26.106260 +1,0,-30.000000,260000000,255000000,-49,-26.155536 +1,0,-30.000000,265000000,260000000,-49,-26.130927 +1,0,-30.000000,270000000,265000000,-49,-26.124078 +1,0,-30.000000,275000000,270000000,-49,-26.120560 +1,0,-30.000000,280000000,275000000,-49,-26.102852 +1,0,-30.000000,285000000,280000000,-49,-26.118863 +1,0,-30.000000,290000000,285000000,-49,-26.143431 +1,0,-30.000000,295000000,290000000,-49,-26.168356 +1,0,-30.000000,300000000,295000000,-49,-26.198606 +1,0,-30.000000,305000000,300000000,-49,-26.225019 +1,0,-30.000000,310000000,305000000,-49,-26.255553 +1,0,-30.000000,315000000,310000000,-49,-26.280690 +1,0,-30.000000,320000000,315000000,-49,-26.307515 +1,0,-30.000000,325000000,320000000,-49,-26.329383 +1,0,-30.000000,330000000,325000000,-49,-26.348470 +1,0,-30.000000,335000000,330000000,-49,-26.368375 +1,0,-30.000000,340000000,335000000,-49,-26.382579 +1,0,-30.000000,345000000,340000000,-49,-26.389938 +1,0,-30.000000,350000000,345000000,-49,-26.395638 +1,0,-30.000000,355000000,350000000,-49,-26.395166 +1,0,-30.000000,360000000,355000000,-49,-26.391005 +1,0,-30.000000,365000000,360000000,-49,-26.384274 +1,0,-30.000000,370000000,365000000,-49,-26.372588 +1,0,-30.000000,375000000,370000000,-49,-26.357002 +1,0,-30.000000,380000000,375000000,-49,-26.344945 +1,0,-30.000000,385000000,380000000,-49,-26.323871 +1,0,-30.000000,390000000,385000000,-49,-26.308823 +1,0,-30.000000,395000000,390000000,-49,-26.284833 +1,0,-30.000000,400000000,395000000,-49,-26.258748 +1,0,-30.000000,405000000,400000000,-49,-26.230383 +1,0,-30.000000,410000000,405000000,-49,-26.202232 +1,0,-30.000000,415000000,410000000,-49,-26.161774 +1,0,-30.000000,420000000,415000000,-49,-26.125397 +1,0,-30.000000,425000000,420000000,-49,-26.091213 +1,0,-30.000000,430000000,425000000,-49,-26.050730 +1,0,-30.000000,435000000,430000000,-49,-26.005717 +1,0,-30.000000,440000000,435000000,-49,-25.962756 +1,0,-30.000000,445000000,440000000,-49,-25.922271 +1,0,-30.000000,450000000,445000000,-49,-25.883705 +1,0,-30.000000,455000000,450000000,-49,-25.842674 +1,0,-30.000000,460000000,455000000,-49,-25.802837 +1,0,-30.000000,465000000,460000000,-49,-25.762480 +1,0,-30.000000,470000000,465000000,-49,-25.726332 +1,0,-30.000000,475000000,470000000,-49,-25.694065 +1,0,-30.000000,480000000,475000000,-49,-25.660817 +1,0,-30.000000,485000000,480000000,-49,-25.633655 +1,0,-30.000000,490000000,485000000,-49,-25.605936 +1,0,-30.000000,495000000,490000000,-49,-25.577650 +1,0,-30.000000,500000000,495000000,-49,-25.553977 +1,0,-30.000000,505000000,500000000,-49,-25.527501 +1,0,-30.000000,510000000,505000000,-49,-25.506451 +1,0,-30.000000,515000000,510000000,-49,-25.487593 +1,0,-30.000000,520000000,515000000,-49,-25.473717 +1,0,-30.000000,525000000,520000000,-49,-25.456129 +1,0,-30.000000,530000000,525000000,-49,-25.445006 +1,0,-30.000000,535000000,530000000,-49,-25.432510 +1,0,-30.000000,540000000,535000000,-49,-25.418170 +1,0,-30.000000,545000000,540000000,-49,-25.408260 +1,0,-30.000000,550000000,545000000,-49,-25.392652 +1,0,-30.000000,555000000,550000000,-49,-25.383948 +1,0,-30.000000,560000000,555000000,-49,-25.376640 +1,0,-30.000000,565000000,560000000,-49,-25.368836 +1,0,-30.000000,570000000,565000000,-49,-25.359922 +1,0,-30.000000,575000000,570000000,-49,-25.351775 +1,0,-30.000000,580000000,575000000,-48,-25.347392 +1,0,-30.000000,585000000,580000000,-48,-25.335123 +1,0,-30.000000,590000000,585000000,-48,-25.314178 +1,0,-30.000000,595000000,590000000,-48,-25.301510 +1,0,-30.000000,600000000,595000000,-48,-25.292814 +1,0,-30.000000,605000000,600000000,-49,-25.396041 +1,0,-30.000000,610000000,605000000,-49,-25.360886 +1,0,-30.000000,615000000,610000000,-48,-25.325148 +1,0,-30.000000,620000000,615000000,-48,-25.297809 +1,0,-30.000000,625000000,620000000,-48,-25.273969 +1,0,-30.000000,630000000,625000000,-48,-25.245042 +1,0,-30.000000,635000000,630000000,-48,-25.080027 +1,0,-30.000000,640000000,635000000,-48,-25.095968 +1,0,-30.000000,645000000,640000000,-48,-25.113895 +1,0,-30.000000,650000000,645000000,-48,-25.121076 +1,0,-30.000000,655000000,650000000,-48,-25.118478 +1,0,-30.000000,660000000,655000000,-48,-25.103769 +1,0,-30.000000,665000000,660000000,-48,-25.085528 +1,0,-30.000000,670000000,665000000,-48,-25.065181 +1,0,-30.000000,675000000,670000000,-48,-25.052884 +1,0,-30.000000,680000000,675000000,-48,-25.043271 +1,0,-30.000000,685000000,680000000,-48,-25.039211 +1,0,-30.000000,690000000,685000000,-48,-25.034683 +1,0,-30.000000,695000000,690000000,-48,-25.035795 +1,0,-30.000000,700000000,695000000,-48,-25.039631 +1,0,-30.000000,705000000,700000000,-48,-25.053939 +1,0,-30.000000,710000000,705000000,-48,-25.065331 +1,0,-30.000000,715000000,710000000,-48,-25.084870 +1,0,-30.000000,720000000,715000000,-48,-25.110222 +1,0,-30.000000,725000000,720000000,-48,-25.139520 +1,0,-30.000000,730000000,725000000,-48,-25.123594 +1,0,-30.000000,735000000,730000000,-48,-25.069580 +1,0,-30.000000,740000000,735000000,-48,-25.012607 +1,0,-30.000000,745000000,740000000,-48,-24.968325 +1,0,-30.000000,750000000,745000000,-48,-24.944175 +1,0,-30.000000,755000000,750000000,-48,-24.960012 +1,0,-30.000000,760000000,755000000,-48,-24.977627 +1,0,-30.000000,765000000,760000000,-48,-25.013968 +1,0,-30.000000,770000000,765000000,-48,-25.085043 +1,0,-30.000000,775000000,770000000,-48,-25.118996 +1,0,-30.000000,780000000,775000000,-48,-25.378993 +1,0,-30.000000,785000000,780000000,-49,-25.801608 +1,0,-30.000000,790000000,785000000,-49,-25.685836 +1,0,-30.000000,795000000,790000000,-49,-25.631120 +1,0,-30.000000,800000000,795000000,-49,-25.602314 +1,0,-30.000000,805000000,800000000,-49,-25.595724 +1,0,-30.000000,810000000,805000000,-49,-25.600994 +1,0,-30.000000,815000000,810000000,-49,-25.618583 +1,0,-30.000000,820000000,815000000,-49,-25.640751 +1,0,-30.000000,825000000,820000000,-49,-25.667725 +1,0,-30.000000,830000000,825000000,-49,-25.702613 +1,0,-30.000000,835000000,830000000,-49,-25.739787 +1,0,-30.000000,840000000,835000000,-49,-25.774339 +1,0,-30.000000,845000000,840000000,-49,-25.794455 +1,0,-30.000000,850000000,845000000,-49,-25.834373 +1,0,-30.000000,855000000,850000000,-49,-25.878953 +1,0,-30.000000,860000000,855000000,-49,-25.922255 +1,0,-30.000000,865000000,860000000,-49,-25.958361 +1,0,-30.000000,870000000,865000000,-49,-26.008373 +1,0,-30.000000,875000000,870000000,-49,-26.050943 +1,0,-30.000000,880000000,875000000,-49,-26.099062 +1,0,-30.000000,885000000,880000000,-49,-26.137593 +1,0,-30.000000,890000000,885000000,-49,-26.191485 +1,0,-30.000000,895000000,890000000,-49,-26.237477 +1,0,-30.000000,900000000,895000000,-49,-26.290091 +1,0,-30.000000,905000000,900000000,-49,-26.342595 +1,0,-30.000000,910000000,905000000,-49,-26.400192 +1,0,-30.000000,915000000,910000000,-49,-26.461660 +1,0,-30.000000,920000000,915000000,-49,-26.519276 +1,0,-30.000000,925000000,920000000,-49,-26.577953 +1,0,-30.000000,930000000,925000000,-50,-26.653870 +1,0,-30.000000,935000000,930000000,-50,-26.720835 +1,0,-30.000000,940000000,935000000,-50,-26.795018 +1,0,-30.000000,945000000,940000000,-50,-26.860280 +1,0,-30.000000,950000000,945000000,-50,-26.940363 +1,0,-30.000000,955000000,950000000,-50,-27.013238 +1,0,-30.000000,960000000,955000000,-50,-27.090947 +1,0,-30.000000,965000000,960000000,-50,-27.171395 +1,0,-30.000000,970000000,965000000,-50,-27.243306 +1,0,-30.000000,975000000,970000000,-50,-27.325417 +1,0,-30.000000,980000000,975000000,-50,-27.404185 +1,0,-30.000000,985000000,980000000,-50,-27.487424 +1,0,-30.000000,990000000,985000000,-50,-27.558172 +1,0,-30.000000,995000000,990000000,-51,-27.642833 +1,0,-30.000000,1000000000,995000000,-51,-27.729300 +1,0,-30.000000,1005000000,1000000000,-51,-27.980951 +1,0,-30.000000,1010000000,1005000000,-51,-28.038734 +1,0,-30.000000,1015000000,1010000000,-51,-28.088942 +1,0,-30.000000,1020000000,1015000000,-51,-28.139006 +1,0,-30.000000,1025000000,1020000000,-51,-28.112290 +1,0,-30.000000,1030000000,1025000000,-51,-28.055034 +1,0,-30.000000,1035000000,1030000000,-51,-28.010153 +1,0,-30.000000,1040000000,1035000000,-51,-27.978562 +1,0,-30.000000,1045000000,1040000000,-51,-27.973489 +1,0,-30.000000,1050000000,1045000000,-51,-27.959868 +1,0,-30.000000,1055000000,1050000000,-51,-27.971544 +1,0,-30.000000,1060000000,1055000000,-51,-27.971837 +1,0,-30.000000,1065000000,1060000000,-51,-27.995705 +1,0,-30.000000,1070000000,1065000000,-51,-28.018616 +1,0,-30.000000,1075000000,1070000000,-51,-28.063982 +1,0,-30.000000,1080000000,1075000000,-51,-28.067781 +1,0,-30.000000,1085000000,1080000000,-51,-28.080152 +1,0,-30.000000,1090000000,1085000000,-51,-28.089175 +1,0,-30.000000,1095000000,1090000000,-51,-28.093957 +1,0,-30.000000,1100000000,1095000000,-51,-28.107858 +1,0,-30.000000,1105000000,1100000000,-51,-28.118501 +1,0,-30.000000,1110000000,1105000000,-51,-28.109859 +1,0,-30.000000,1115000000,1110000000,-51,-28.113821 +1,0,-30.000000,1120000000,1115000000,-51,-28.101656 +1,0,-30.000000,1125000000,1120000000,-51,-28.112851 +1,0,-30.000000,1130000000,1125000000,-51,-28.078578 +1,0,-30.000000,1135000000,1130000000,-51,-28.064507 +1,0,-30.000000,1140000000,1135000000,-51,-28.052755 +1,0,-30.000000,1145000000,1140000000,-51,-28.081576 +1,0,-30.000000,1150000000,1145000000,-51,-28.067099 +1,0,-30.000000,1155000000,1150000000,-51,-28.072256 +1,0,-30.000000,1160000000,1155000000,-51,-28.096942 +1,0,-30.000000,1165000000,1160000000,-51,-28.097515 +1,0,-30.000000,1170000000,1165000000,-51,-28.125121 +1,0,-30.000000,1175000000,1170000000,-51,-28.187442 +1,0,-30.000000,1180000000,1175000000,-51,-28.293580 +1,0,-30.000000,1185000000,1180000000,-51,-28.366441 +1,0,-30.000000,1190000000,1185000000,-52,-28.476552 +1,0,-30.000000,1195000000,1190000000,-52,-28.745526 +1,0,-30.000000,1200000000,1195000000,-52,-28.763823 +1,0,-30.000000,1205000000,1200000000,-52,-28.715168 +1,0,-30.000000,1210000000,1205000000,-52,-28.659069 +1,0,-30.000000,1215000000,1210000000,-52,-28.589011 +1,0,-30.000000,1220000000,1215000000,-52,-28.542992 +1,0,-30.000000,1225000000,1220000000,-52,-28.502020 +1,0,-30.000000,1230000000,1225000000,-52,-28.471818 +1,0,-30.000000,1235000000,1230000000,-52,-28.446325 +1,0,-30.000000,1240000000,1235000000,-52,-28.424445 +1,0,-30.000000,1245000000,1240000000,-51,-28.403401 +1,0,-30.000000,1250000000,1245000000,-51,-28.388227 +1,0,-30.000000,1255000000,1250000000,-51,-28.379771 +1,0,-30.000000,1260000000,1255000000,-51,-28.371625 +1,0,-30.000000,1265000000,1260000000,-51,-28.364365 +1,0,-30.000000,1270000000,1265000000,-51,-28.369914 +1,0,-30.000000,1275000000,1270000000,-51,-28.368672 +1,0,-30.000000,1280000000,1275000000,-51,-28.371215 +1,0,-30.000000,1285000000,1280000000,-51,-28.375460 +1,0,-30.000000,1290000000,1285000000,-51,-28.384671 +1,0,-30.000000,1295000000,1290000000,-51,-28.394959 +1,0,-30.000000,1300000000,1295000000,-51,-28.400679 +1,0,-30.000000,1305000000,1300000000,-51,-28.408230 +1,0,-30.000000,1310000000,1305000000,-52,-28.417989 +1,0,-30.000000,1315000000,1310000000,-52,-28.425488 +1,0,-30.000000,1320000000,1315000000,-52,-28.430677 +1,0,-30.000000,1325000000,1320000000,-52,-28.438538 +1,0,-30.000000,1330000000,1325000000,-52,-28.442937 +1,0,-30.000000,1335000000,1330000000,-52,-28.445422 +1,0,-30.000000,1340000000,1335000000,-52,-28.449759 +1,0,-30.000000,1345000000,1340000000,-52,-28.448763 +1,0,-30.000000,1350000000,1345000000,-52,-28.448776 +1,0,-30.000000,1355000000,1350000000,-52,-28.444563 +1,0,-30.000000,1360000000,1355000000,-52,-28.442347 +1,0,-30.000000,1365000000,1360000000,-52,-28.438317 +1,0,-30.000000,1370000000,1365000000,-52,-28.431974 +1,0,-30.000000,1375000000,1370000000,-52,-28.427170 +1,0,-30.000000,1380000000,1375000000,-52,-28.419541 +1,0,-30.000000,1385000000,1380000000,-51,-28.411559 +1,0,-30.000000,1390000000,1385000000,-51,-28.403590 +1,0,-30.000000,1395000000,1390000000,-51,-28.390494 +1,0,-30.000000,1400000000,1395000000,-51,-28.379504 +1,0,-30.000000,1405000000,1400000000,-51,-28.367984 +1,0,-30.000000,1410000000,1405000000,-51,-28.356459 +1,0,-30.000000,1415000000,1410000000,-51,-28.342979 +1,0,-30.000000,1420000000,1415000000,-51,-28.327847 +1,0,-30.000000,1425000000,1420000000,-51,-28.315940 +1,0,-30.000000,1430000000,1425000000,-51,-28.303202 +1,0,-30.000000,1435000000,1430000000,-51,-28.289490 +1,0,-30.000000,1440000000,1435000000,-51,-28.279600 +1,0,-30.000000,1445000000,1440000000,-51,-28.269781 +1,0,-30.000000,1450000000,1445000000,-51,-28.090148 +1,0,-30.000000,1455000000,1450000000,-51,-28.043187 +1,0,-30.000000,1460000000,1455000000,-51,-28.043354 +1,0,-30.000000,1465000000,1460000000,-51,-28.044192 +1,0,-30.000000,1470000000,1465000000,-51,-28.037358 +1,0,-30.000000,1475000000,1470000000,-51,-28.033958 +1,0,-30.000000,1480000000,1475000000,-51,-28.021682 +1,0,-30.000000,1485000000,1480000000,-51,-28.006230 +1,0,-30.000000,1490000000,1485000000,-51,-27.997971 +1,0,-30.000000,1495000000,1490000000,-51,-27.973983 +1,0,-30.000000,1500000000,1495000000,-51,-27.964224 +1,0,-30.000000,1505000000,1500000000,-51,-27.962306 +1,0,-30.000000,1510000000,1505000000,-51,-27.950734 +1,0,-30.000000,1515000000,1510000000,-51,-27.956334 +1,0,-30.000000,1520000000,1515000000,-51,-27.958285 +1,0,-30.000000,1525000000,1520000000,-51,-27.954979 +1,0,-30.000000,1530000000,1525000000,-51,-27.980418 +1,0,-30.000000,1535000000,1530000000,-51,-28.006780 +1,0,-30.000000,1540000000,1535000000,-51,-28.039602 +1,0,-30.000000,1545000000,1540000000,-51,-28.041425 +1,0,-30.000000,1550000000,1545000000,-51,-28.053486 +1,0,-30.000000,1555000000,1550000000,-51,-28.122093 +1,0,-30.000000,1560000000,1555000000,-51,-28.151366 +1,0,-30.000000,1565000000,1560000000,-51,-28.227795 +1,0,-30.000000,1570000000,1565000000,-51,-28.292891 +1,0,-30.000000,1575000000,1570000000,-51,-28.413855 +1,0,-30.000000,1580000000,1575000000,-52,-28.751542 +1,0,-30.000000,1585000000,1580000000,-52,-28.935008 +1,0,-30.000000,1590000000,1585000000,-52,-29.009437 +1,0,-30.000000,1595000000,1590000000,-52,-29.068158 +1,0,-30.000000,1600000000,1595000000,-52,-29.127698 +1,0,-30.000000,1605000000,1600000000,-52,-29.183714 +1,0,-30.000000,1610000000,1605000000,-52,-29.419413 +1,0,-30.000000,1615000000,1610000000,-52,-29.442862 +1,0,-30.000000,1620000000,1615000000,-52,-29.477609 +1,0,-30.000000,1625000000,1620000000,-52,-29.520310 +1,0,-30.000000,1630000000,1625000000,-52,-29.566524 +1,0,-30.000000,1635000000,1630000000,-52,-29.620471 +1,0,-30.000000,1640000000,1635000000,-52,-29.682210 +1,0,-30.000000,1645000000,1640000000,-53,-29.748088 +1,0,-30.000000,1650000000,1645000000,-53,-29.817337 +1,0,-30.000000,1655000000,1650000000,-53,-29.890313 +1,0,-30.000000,1660000000,1655000000,-53,-29.966828 +1,0,-30.000000,1665000000,1660000000,-53,-30.043504 +1,0,-30.000000,1670000000,1665000000,-53,-30.124102 +1,0,-30.000000,1675000000,1670000000,-53,-30.209811 +1,0,-30.000000,1680000000,1675000000,-53,-30.299432 +1,0,-30.000000,1685000000,1680000000,-53,-30.390740 +1,0,-30.000000,1690000000,1685000000,-53,-30.485059 +1,0,-30.000000,1695000000,1690000000,-53,-30.582832 +1,0,-30.000000,1700000000,1695000000,-54,-30.678929 +1,0,-30.000000,1705000000,1700000000,-54,-30.779128 +1,0,-30.000000,1710000000,1705000000,-54,-30.880377 +1,0,-30.000000,1715000000,1710000000,-54,-30.984086 +1,0,-30.000000,1720000000,1715000000,-54,-31.087804 +1,0,-30.000000,1725000000,1720000000,-54,-31.132377 +1,0,-30.000000,1730000000,1725000000,-54,-31.049098 +1,0,-30.000000,1735000000,1730000000,-54,-30.986790 +1,0,-30.000000,1740000000,1735000000,-54,-31.015083 +1,0,-30.000000,1745000000,1740000000,-54,-31.030348 +1,0,-30.000000,1750000000,1745000000,-54,-31.110288 +1,0,-30.000000,1755000000,1750000000,-55,-31.921454 +1,0,-30.000000,1760000000,1755000000,-55,-31.906844 +1,0,-30.000000,1765000000,1760000000,-55,-31.978084 +1,0,-30.000000,1770000000,1765000000,-55,-32.063448 +1,0,-30.000000,1775000000,1770000000,-55,-32.146480 +1,0,-30.000000,1780000000,1775000000,-55,-32.229864 +1,0,-30.000000,1785000000,1780000000,-55,-32.306990 +1,0,-30.000000,1790000000,1785000000,-55,-32.383304 +1,0,-30.000000,1795000000,1790000000,-55,-32.453853 +1,0,-30.000000,1800000000,1795000000,-55,-32.520766 +1,0,-30.000000,1805000000,1800000000,-55,-32.583637 +1,0,-30.000000,1810000000,1805000000,-55,-32.648302 +1,0,-30.000000,1815000000,1810000000,-55,-32.702837 +1,0,-30.000000,1820000000,1815000000,-55,-32.756626 +1,0,-30.000000,1825000000,1820000000,-55,-32.805641 +1,0,-30.000000,1830000000,1825000000,-56,-32.849770 +1,0,-30.000000,1835000000,1830000000,-56,-32.885390 +1,0,-30.000000,1840000000,1835000000,-56,-32.922826 +1,0,-30.000000,1845000000,1840000000,-56,-32.952572 +1,0,-30.000000,1850000000,1845000000,-56,-32.983810 +1,0,-30.000000,1855000000,1850000000,-56,-33.005129 +1,0,-30.000000,1860000000,1855000000,-56,-33.022982 +1,0,-30.000000,1865000000,1860000000,-56,-33.037069 +1,0,-30.000000,1870000000,1865000000,-56,-33.045122 +1,0,-30.000000,1875000000,1870000000,-56,-33.052397 +1,0,-30.000000,1880000000,1875000000,-56,-33.055087 +1,0,-30.000000,1885000000,1880000000,-56,-33.055373 +1,0,-30.000000,1890000000,1885000000,-56,-33.054601 +1,0,-30.000000,1895000000,1890000000,-56,-33.048279 +1,0,-30.000000,1900000000,1895000000,-56,-33.041798 +1,0,-30.000000,1905000000,1900000000,-56,-33.034470 +1,0,-30.000000,1910000000,1905000000,-56,-33.023130 +1,0,-30.000000,1915000000,1910000000,-56,-33.010097 +1,0,-30.000000,1920000000,1915000000,-56,-32.989583 +1,0,-30.000000,1925000000,1920000000,-56,-32.976707 +1,0,-30.000000,1930000000,1925000000,-56,-32.963709 +1,0,-30.000000,1935000000,1930000000,-56,-32.946485 +1,0,-30.000000,1940000000,1935000000,-56,-32.933888 +1,0,-30.000000,1945000000,1940000000,-56,-32.916967 +1,0,-30.000000,1950000000,1945000000,-56,-32.902746 +1,0,-30.000000,1955000000,1950000000,-56,-32.889352 +1,0,-30.000000,1960000000,1955000000,-56,-32.889307 +1,0,-30.000000,1965000000,1960000000,-56,-32.881988 +1,0,-30.000000,1970000000,1965000000,-56,-32.881787 +1,0,-30.000000,1975000000,1970000000,-56,-32.879077 +1,0,-30.000000,1980000000,1975000000,-56,-32.883186 +1,0,-30.000000,1985000000,1980000000,-56,-32.889842 +1,0,-30.000000,1990000000,1985000000,-56,-32.893455 +1,0,-30.000000,1995000000,1990000000,-56,-32.908797 +1,0,-30.000000,2000000000,1995000000,-56,-32.919610 +1,0,-30.000000,2005000000,2000000000,-56,-32.937696 +1,0,-30.000000,2010000000,2005000000,-56,-32.956371 +1,0,-30.000000,2015000000,2010000000,-56,-32.976955 +1,0,-30.000000,2020000000,2015000000,-56,-33.006633 +1,0,-30.000000,2025000000,2020000000,-56,-33.036310 +1,0,-30.000000,2030000000,2025000000,-56,-33.066521 +1,0,-30.000000,2035000000,2030000000,-56,-33.099565 +1,0,-30.000000,2040000000,2035000000,-56,-33.131678 +1,0,-30.000000,2045000000,2040000000,-56,-33.169627 +1,0,-30.000000,2050000000,2045000000,-56,-33.205212 +1,0,-30.000000,2055000000,2050000000,-56,-33.237204 +1,0,-30.000000,2060000000,2055000000,-56,-33.277809 +1,0,-30.000000,2065000000,2060000000,-56,-33.325709 +1,0,-30.000000,2070000000,2065000000,-56,-33.367939 +1,0,-30.000000,2075000000,2070000000,-56,-33.416863 +1,0,-30.000000,2080000000,2075000000,-56,-33.463559 +1,0,-30.000000,2085000000,2080000000,-56,-33.509033 +1,0,-30.000000,2090000000,2085000000,-56,-33.549288 +1,0,-30.000000,2095000000,2090000000,-56,-33.587583 +1,0,-30.000000,2100000000,2095000000,-56,-33.622200 +1,0,-30.000000,2105000000,2100000000,-56,-33.649088 +1,0,-30.000000,2110000000,2105000000,-56,-33.670481 +1,0,-30.000000,2115000000,2110000000,-56,-33.677902 +1,0,-30.000000,2120000000,2115000000,-56,-33.684891 +1,0,-30.000000,2125000000,2120000000,-56,-33.681365 +1,0,-30.000000,2130000000,2125000000,-56,-33.669765 +1,0,-30.000000,2135000000,2130000000,-56,-33.637416 +1,0,-30.000000,2140000000,2135000000,-56,-33.608707 +1,0,-30.000000,2145000000,2140000000,-56,-33.575000 +1,0,-30.000000,2150000000,2145000000,-56,-33.541393 +1,0,-30.000000,2155000000,2150000000,-56,-33.497697 +1,0,-30.000000,2160000000,2155000000,-56,-33.450684 +1,0,-30.000000,2165000000,2160000000,-56,-33.397475 +1,0,-30.000000,2170000000,2165000000,-56,-33.343760 +1,0,-30.000000,2175000000,2170000000,-56,-33.289723 +1,0,-30.000000,2180000000,2175000000,-56,-33.228593 +1,0,-30.000000,2185000000,2180000000,-56,-33.166740 +1,0,-30.000000,2190000000,2185000000,-56,-33.101027 +1,0,-30.000000,2195000000,2190000000,-56,-33.037711 +1,0,-30.000000,2200000000,2195000000,-56,-32.964759 +1,0,-30.000000,2205000000,2200000000,-56,-32.900262 +1,0,-30.000000,2210000000,2205000000,-56,-32.834533 +1,0,-30.000000,2215000000,2210000000,-55,-32.770529 +1,0,-30.000000,2220000000,2215000000,-55,-32.705447 +1,0,-30.000000,2225000000,2220000000,-55,-32.638060 +1,0,-30.000000,2230000000,2225000000,-55,-32.572402 +1,0,-30.000000,2235000000,2230000000,-55,-32.515637 +1,0,-30.000000,2240000000,2235000000,-55,-32.456932 +1,0,-30.000000,2245000000,2240000000,-55,-32.398699 +1,0,-30.000000,2250000000,2245000000,-55,-32.346893 +1,0,-30.000000,2255000000,2250000000,-55,-32.300802 +1,0,-30.000000,2260000000,2255000000,-55,-32.255971 +1,0,-30.000000,2265000000,2260000000,-55,-32.214443 +1,0,-30.000000,2270000000,2265000000,-55,-32.180144 +1,0,-30.000000,2275000000,2270000000,-55,-32.144548 +1,0,-30.000000,2280000000,2275000000,-55,-32.120991 +1,0,-30.000000,2285000000,2280000000,-55,-32.098506 +1,0,-30.000000,2290000000,2285000000,-55,-32.083938 +1,0,-30.000000,2295000000,2290000000,-55,-32.077671 +1,0,-30.000000,2300000000,2295000000,-55,-32.072814 +1,0,-30.000000,2305000000,2300000000,-55,-32.074379 +1,0,-30.000000,2310000000,2305000000,-55,-32.077853 +1,0,-30.000000,2315000000,2310000000,-55,-32.087560 +1,0,-30.000000,2320000000,2315000000,-55,-32.103313 +1,0,-30.000000,2325000000,2320000000,-55,-32.121604 +1,0,-30.000000,2330000000,2325000000,-55,-32.145246 +1,0,-30.000000,2335000000,2330000000,-55,-32.176620 +1,0,-30.000000,2340000000,2335000000,-55,-32.209446 +1,0,-30.000000,2345000000,2340000000,-55,-32.249138 +1,0,-30.000000,2350000000,2345000000,-55,-32.293574 +1,0,-30.000000,2355000000,2350000000,-55,-32.345320 +1,0,-30.000000,2360000000,2355000000,-55,-32.399488 +1,0,-30.000000,2365000000,2360000000,-55,-32.458575 +1,0,-30.000000,2370000000,2365000000,-55,-32.524356 +1,0,-30.000000,2375000000,2370000000,-55,-32.590873 +1,0,-30.000000,2380000000,2375000000,-55,-32.662394 +1,0,-30.000000,2385000000,2380000000,-55,-32.739727 +1,0,-30.000000,2390000000,2385000000,-55,-32.824392 +1,0,-30.000000,2395000000,2390000000,-56,-32.914207 +1,0,-30.000000,2400000000,2395000000,-56,-33.001269 +1,0,-30.000000,2405000000,2400000000,-56,-33.098050 +1,0,-30.000000,2410000000,2405000000,-56,-33.194959 +1,0,-30.000000,2415000000,2410000000,-56,-33.300165 +1,0,-30.000000,2420000000,2415000000,-56,-33.412189 +1,0,-30.000000,2425000000,2420000000,-56,-33.522623 +1,0,-30.000000,2430000000,2425000000,-56,-33.640279 +1,0,-30.000000,2435000000,2430000000,-56,-33.762937 +1,0,-30.000000,2440000000,2435000000,-57,-33.887793 +1,0,-30.000000,2445000000,2440000000,-57,-34.021650 +1,0,-30.000000,2450000000,2445000000,-57,-34.121474 +1,0,-30.000000,2455000000,2450000000,-57,-34.087055 +1,0,-30.000000,2460000000,2455000000,-57,-34.039409 +1,0,-30.000000,2465000000,2460000000,-57,-34.034936 +1,0,-30.000000,2470000000,2465000000,-57,-34.304895 +1,0,-30.000000,2475000000,2470000000,-58,-34.966064 +1,0,-30.000000,2480000000,2475000000,-58,-35.020838 +1,0,-30.000000,2485000000,2480000000,-58,-35.146467 +1,0,-30.000000,2490000000,2485000000,-58,-35.294501 +1,0,-30.000000,2495000000,2490000000,-58,-35.438488 +1,0,-30.000000,2500000000,2495000000,-58,-35.586501 +1,0,-30.000000,2505000000,2500000000,-58,-35.731276 +1,0,-30.000000,2510000000,2505000000,-58,-35.877269 +1,0,-30.000000,2515000000,2510000000,-58,-36.016039 +1,0,-30.000000,2520000000,2515000000,-59,-36.162087 +1,0,-30.000000,2525000000,2520000000,-59,-36.302010 +1,0,-30.000000,2530000000,2525000000,-59,-36.438424 +1,0,-30.000000,2535000000,2530000000,-59,-36.565705 +1,0,-30.000000,2540000000,2535000000,-59,-36.703059 +1,0,-30.000000,2545000000,2540000000,-59,-36.833132 +1,0,-30.000000,2550000000,2545000000,-59,-36.955614 +1,0,-30.000000,2555000000,2550000000,-59,-37.078370 +1,0,-30.000000,2560000000,2555000000,-60,-37.130519 +1,0,-30.000000,2565000000,2560000000,-60,-37.104620 +1,0,-30.000000,2570000000,2565000000,-60,-37.077792 +1,0,-30.000000,2575000000,2570000000,-60,-37.041469 +1,0,-30.000000,2580000000,2575000000,-59,-37.086285 +1,0,-30.000000,2585000000,2580000000,-60,-38.016551 +1,0,-30.000000,2590000000,2585000000,-60,-37.916140 +1,0,-30.000000,2595000000,2590000000,-60,-37.913540 +1,0,-30.000000,2600000000,2595000000,-60,-37.964602 +1,0,-30.000000,2605000000,2600000000,-60,-38.028623 +1,0,-30.000000,2610000000,2605000000,-60,-38.106851 +1,0,-30.000000,2615000000,2610000000,-60,-38.167332 +1,0,-30.000000,2620000000,2615000000,-61,-38.229508 +1,0,-30.000000,2625000000,2620000000,-61,-38.295073 +1,0,-30.000000,2630000000,2625000000,-61,-38.344508 +1,0,-30.000000,2635000000,2630000000,-61,-38.401683 +1,0,-30.000000,2640000000,2635000000,-61,-38.450069 +1,0,-30.000000,2645000000,2640000000,-61,-38.501530 +1,0,-30.000000,2650000000,2645000000,-61,-38.558180 +1,0,-30.000000,2655000000,2650000000,-61,-38.586703 +1,0,-30.000000,2660000000,2655000000,-61,-38.636249 +1,0,-30.000000,2665000000,2660000000,-61,-38.665471 +1,0,-30.000000,2670000000,2665000000,-61,-38.708694 +1,0,-30.000000,2675000000,2670000000,-61,-38.771874 +1,0,-30.000000,2680000000,2675000000,-61,-38.810388 +1,0,-30.000000,2685000000,2680000000,-61,-38.849240 +1,0,-30.000000,2690000000,2685000000,-61,-38.896401 +1,0,-30.000000,2695000000,2690000000,-61,-38.946097 +1,0,-30.000000,2700000000,2695000000,-61,-38.994515 +1,0,-30.000000,2705000000,2700000000,-61,-39.150394 +1,0,-30.000000,2710000000,2705000000,-61,-39.196075 +1,0,-30.000000,2715000000,2710000000,-61,-39.233590 +1,0,-30.000000,2720000000,2715000000,-61,-39.283870 +1,0,-30.000000,2725000000,2720000000,-61,-39.326503 +1,0,-30.000000,2730000000,2725000000,-61,-39.396858 +1,0,-30.000000,2735000000,2730000000,-61,-39.479523 +1,0,-30.000000,2740000000,2735000000,-61,-39.554963 +1,0,-30.000000,2745000000,2740000000,-61,-39.633734 +1,0,-30.000000,2750000000,2745000000,-61,-39.700923 +1,0,-30.000000,2755000000,2750000000,-62,-39.794641 +1,0,-30.000000,2760000000,2755000000,-62,-39.896735 +1,0,-30.000000,2765000000,2760000000,-62,-39.982883 +1,0,-30.000000,2770000000,2765000000,-62,-40.077717 +1,0,-30.000000,2775000000,2770000000,-62,-40.127413 +1,0,-30.000000,2780000000,2775000000,-62,-40.100746 +1,0,-30.000000,2785000000,2780000000,-62,-40.062133 +1,0,-30.000000,2790000000,2785000000,-62,-40.043039 +1,0,-30.000000,2795000000,2790000000,-62,-40.073323 +1,0,-30.000000,2800000000,2795000000,-62,-41.052670 +1,0,-30.000000,2805000000,2800000000,-63,-40.947236 +1,0,-30.000000,2810000000,2805000000,-63,-40.970837 +1,0,-30.000000,2815000000,2810000000,-63,-41.035758 +1,0,-30.000000,2820000000,2815000000,-63,-41.143111 +1,0,-30.000000,2825000000,2820000000,-63,-41.236917 +1,0,-30.000000,2830000000,2825000000,-63,-41.320269 +1,0,-30.000000,2835000000,2830000000,-63,-41.399642 +1,0,-30.000000,2840000000,2835000000,-63,-41.479533 +1,0,-30.000000,2845000000,2840000000,-63,-41.561696 +1,0,-30.000000,2850000000,2845000000,-63,-41.647956 +1,0,-30.000000,2855000000,2850000000,-63,-41.699751 +1,0,-30.000000,2860000000,2855000000,-63,-41.776580 +1,0,-30.000000,2865000000,2860000000,-63,-41.811365 +1,0,-30.000000,2870000000,2865000000,-63,-41.877159 +1,0,-30.000000,2875000000,2870000000,-63,-41.924612 +1,0,-30.000000,2880000000,2875000000,-63,-41.984828 +1,0,-30.000000,2885000000,2880000000,-63,-42.044261 +1,0,-30.000000,2890000000,2885000000,-63,-42.071076 +1,0,-30.000000,2895000000,2890000000,-63,-42.132907 +1,0,-30.000000,2900000000,2895000000,-63,-42.146151 +1,0,-30.000000,2905000000,2900000000,-63,-42.175115 +1,0,-30.000000,2910000000,2905000000,-63,-42.212810 +1,0,-30.000000,2915000000,2910000000,-63,-42.212602 +1,0,-30.000000,2920000000,2915000000,-63,-42.234567 +1,0,-30.000000,2925000000,2920000000,-64,-42.273567 +1,0,-30.000000,2930000000,2925000000,-64,-42.270547 +1,0,-30.000000,2935000000,2930000000,-64,-42.270700 +1,0,-30.000000,2940000000,2935000000,-63,-42.263410 +1,0,-30.000000,2945000000,2940000000,-63,-42.267408 +1,0,-30.000000,2950000000,2945000000,-64,-42.240411 +1,0,-30.000000,2955000000,2950000000,-63,-42.230830 +1,0,-30.000000,2960000000,2955000000,-63,-42.212083 +1,0,-30.000000,2965000000,2960000000,-63,-42.206691 +1,0,-30.000000,2970000000,2965000000,-63,-42.197796 +1,0,-30.000000,2975000000,2970000000,-63,-42.164798 +1,0,-30.000000,2980000000,2975000000,-63,-42.131405 +1,0,-30.000000,2985000000,2980000000,-63,-42.128152 +1,0,-30.000000,2990000000,2985000000,-63,-42.087833 +1,0,-30.000000,2995000000,2990000000,-63,-42.065147 +1,0,-30.000000,3000000000,2995000000,-63,-42.033143 +1,0,-30.000000,3005000000,3000000000,-63,-42.011258 +1,0,-30.000000,3010000000,3005000000,-61,-38.662328 +1,0,-30.000000,3015000000,3010000000,-61,-38.631527 +1,0,-30.000000,3020000000,3015000000,-61,-38.593995 +1,0,-30.000000,3025000000,3020000000,-61,-38.558258 +1,0,-30.000000,3030000000,3025000000,-61,-38.536464 +1,0,-30.000000,3035000000,3030000000,-61,-38.499060 +1,0,-30.000000,3040000000,3035000000,-61,-38.462309 +1,0,-30.000000,3045000000,3040000000,-61,-38.444178 +1,0,-30.000000,3050000000,3045000000,-61,-38.422881 +1,0,-30.000000,3055000000,3050000000,-61,-38.395571 +1,0,-30.000000,3060000000,3055000000,-61,-38.377433 +1,0,-30.000000,3065000000,3060000000,-61,-38.356262 +1,0,-30.000000,3070000000,3065000000,-61,-38.347208 +1,0,-30.000000,3075000000,3070000000,-61,-38.333661 +1,0,-30.000000,3080000000,3075000000,-61,-38.320507 +1,0,-30.000000,3085000000,3080000000,-61,-38.315743 +1,0,-30.000000,3090000000,3085000000,-61,-38.321136 +1,0,-30.000000,3095000000,3090000000,-61,-38.325848 +1,0,-30.000000,3100000000,3095000000,-61,-38.338436 +1,0,-30.000000,3105000000,3100000000,-61,-38.348728 +1,0,-30.000000,3110000000,3105000000,-61,-38.367836 +1,0,-30.000000,3115000000,3110000000,-61,-38.397552 +1,0,-30.000000,3120000000,3115000000,-61,-38.408528 +1,0,-30.000000,3125000000,3120000000,-61,-38.435398 +1,0,-30.000000,3130000000,3125000000,-61,-38.469091 +1,0,-30.000000,3135000000,3130000000,-61,-38.498781 +1,0,-30.000000,3140000000,3135000000,-61,-38.530626 +1,0,-30.000000,3145000000,3140000000,-61,-38.560545 +1,0,-30.000000,3150000000,3145000000,-61,-38.595437 +1,0,-30.000000,3155000000,3150000000,-61,-38.615804 +1,0,-30.000000,3160000000,3155000000,-61,-38.651006 +1,0,-30.000000,3165000000,3160000000,-61,-38.679435 +1,0,-30.000000,3170000000,3165000000,-61,-38.706651 +1,0,-30.000000,3175000000,3170000000,-61,-38.737235 +1,0,-30.000000,3180000000,3175000000,-61,-38.762074 +1,0,-30.000000,3185000000,3180000000,-61,-38.772886 +1,0,-30.000000,3190000000,3185000000,-61,-38.789743 +1,0,-30.000000,3195000000,3190000000,-61,-38.789153 +1,0,-30.000000,3200000000,3195000000,-61,-38.796395 +1,0,-30.000000,3205000000,3200000000,-61,-38.809818 +1,0,-30.000000,3210000000,3205000000,-61,-38.791164 +1,0,-30.000000,3215000000,3210000000,-61,-38.798910 +1,0,-30.000000,3220000000,3215000000,-61,-38.778802 +1,0,-30.000000,3225000000,3220000000,-61,-38.760196 +1,0,-30.000000,3230000000,3225000000,-61,-38.739370 +1,0,-30.000000,3235000000,3230000000,-61,-38.706092 +1,0,-30.000000,3240000000,3235000000,-61,-38.684667 +1,0,-30.000000,3245000000,3240000000,-61,-38.651150 +1,0,-30.000000,3250000000,3245000000,-61,-38.615328 +1,0,-30.000000,3255000000,3250000000,-61,-38.568363 +1,0,-30.000000,3260000000,3255000000,-61,-38.508454 +1,0,-30.000000,3265000000,3260000000,-61,-38.452954 +1,0,-30.000000,3270000000,3265000000,-61,-38.399090 +1,0,-30.000000,3275000000,3270000000,-61,-38.336156 +1,0,-30.000000,3280000000,3275000000,-61,-38.271113 +1,0,-30.000000,3285000000,3280000000,-60,-38.205672 +1,0,-30.000000,3290000000,3285000000,-60,-38.122526 +1,0,-30.000000,3295000000,3290000000,-60,-38.048497 +1,0,-30.000000,3300000000,3295000000,-60,-37.963204 +1,0,-30.000000,3305000000,3300000000,-60,-37.870824 +1,0,-30.000000,3310000000,3305000000,-60,-37.788425 +1,0,-30.000000,3315000000,3310000000,-60,-37.687003 +1,0,-30.000000,3320000000,3315000000,-60,-37.589980 +1,0,-30.000000,3325000000,3320000000,-60,-37.484656 +1,0,-30.000000,3330000000,3325000000,-60,-37.380014 +1,0,-30.000000,3335000000,3330000000,-60,-37.167600 +1,0,-30.000000,3340000000,3335000000,-59,-37.058162 +1,0,-30.000000,3345000000,3340000000,-59,-37.024596 +1,0,-30.000000,3350000000,3345000000,-59,-36.955310 +1,0,-30.000000,3355000000,3350000000,-59,-36.864939 +1,0,-30.000000,3360000000,3355000000,-59,-36.767113 +1,0,-30.000000,3365000000,3360000000,-59,-36.664152 +1,0,-30.000000,3370000000,3365000000,-59,-36.574236 +1,0,-30.000000,3375000000,3370000000,-59,-36.474844 +1,0,-30.000000,3380000000,3375000000,-59,-36.378115 +1,0,-30.000000,3385000000,3380000000,-59,-36.282157 +1,0,-30.000000,3390000000,3385000000,-59,-36.197212 +1,0,-30.000000,3395000000,3390000000,-58,-36.118686 +1,0,-30.000000,3400000000,3395000000,-58,-36.042734 +1,0,-30.000000,3405000000,3400000000,-58,-35.965477 +1,0,-30.000000,3410000000,3405000000,-58,-35.895746 +1,0,-30.000000,3415000000,3410000000,-58,-35.829588 +1,0,-30.000000,3420000000,3415000000,-58,-35.766637 +1,0,-30.000000,3425000000,3420000000,-58,-35.709028 +1,0,-30.000000,3430000000,3425000000,-58,-35.652249 +1,0,-30.000000,3435000000,3430000000,-58,-35.601894 +1,0,-30.000000,3440000000,3435000000,-58,-35.557515 +1,0,-30.000000,3445000000,3440000000,-58,-35.480983 +1,0,-30.000000,3450000000,3445000000,-58,-35.436877 +1,0,-30.000000,3455000000,3450000000,-58,-35.403385 +1,0,-30.000000,3460000000,3455000000,-58,-35.361583 +1,0,-30.000000,3465000000,3460000000,-58,-35.326606 +1,0,-30.000000,3470000000,3465000000,-58,-35.300320 +1,0,-30.000000,3475000000,3470000000,-58,-35.269089 +1,0,-30.000000,3480000000,3475000000,-58,-35.243036 +1,0,-30.000000,3485000000,3480000000,-58,-35.213457 +1,0,-30.000000,3490000000,3485000000,-58,-35.201356 +1,0,-30.000000,3495000000,3490000000,-58,-35.182386 +1,0,-30.000000,3500000000,3495000000,-58,-35.160174 +1,0,-30.000000,3505000000,3500000000,-58,-35.148860 +1,0,-30.000000,3510000000,3505000000,-58,-35.125706 +1,0,-30.000000,3515000000,3510000000,-58,-35.099268 +1,0,-30.000000,3520000000,3515000000,-58,-35.074140 +1,0,-30.000000,3525000000,3520000000,-58,-35.054438 +1,0,-30.000000,3530000000,3525000000,-58,-35.032885 +1,0,-30.000000,3535000000,3530000000,-58,-35.019298 +1,0,-30.000000,3540000000,3535000000,-58,-35.000832 +1,0,-30.000000,3545000000,3540000000,-58,-34.971780 +1,0,-30.000000,3550000000,3545000000,-58,-34.962985 +1,0,-30.000000,3555000000,3550000000,-58,-34.941550 +1,0,-30.000000,3560000000,3555000000,-58,-34.918059 +1,0,-30.000000,3565000000,3560000000,-58,-34.896620 +1,0,-30.000000,3570000000,3565000000,-58,-34.862270 +1,0,-30.000000,3575000000,3570000000,-58,-34.832336 +1,0,-30.000000,3580000000,3575000000,-58,-34.803650 +1,0,-30.000000,3585000000,3580000000,-58,-34.768557 +1,0,-30.000000,3590000000,3585000000,-58,-34.745615 +1,0,-30.000000,3595000000,3590000000,-57,-34.716493 +1,0,-30.000000,3600000000,3595000000,-57,-34.690666 +1,0,-30.000000,3605000000,3600000000,-58,-34.889380 +1,0,-30.000000,3610000000,3605000000,-58,-34.834001 +1,0,-30.000000,3615000000,3610000000,-58,-34.782716 +1,0,-30.000000,3620000000,3615000000,-57,-34.727649 +1,0,-30.000000,3625000000,3620000000,-57,-34.674239 +1,0,-30.000000,3630000000,3625000000,-57,-34.629831 +1,0,-30.000000,3635000000,3630000000,-57,-34.577773 +1,0,-30.000000,3640000000,3635000000,-57,-34.525668 +1,0,-30.000000,3645000000,3640000000,-57,-34.478820 +1,0,-30.000000,3650000000,3645000000,-57,-34.436705 +1,0,-30.000000,3655000000,3650000000,-57,-34.393248 +1,0,-30.000000,3660000000,3655000000,-57,-34.346805 +1,0,-30.000000,3665000000,3660000000,-57,-34.191096 +1,0,-30.000000,3670000000,3665000000,-57,-34.055206 +1,0,-30.000000,3675000000,3670000000,-57,-34.054714 +1,0,-30.000000,3680000000,3675000000,-57,-34.063365 +1,0,-30.000000,3685000000,3680000000,-57,-34.070507 +1,0,-30.000000,3690000000,3685000000,-57,-34.072586 +1,0,-30.000000,3695000000,3690000000,-57,-34.059908 +1,0,-30.000000,3700000000,3695000000,-57,-34.027694 +1,0,-30.000000,3705000000,3700000000,-57,-34.013517 +1,0,-30.000000,3710000000,3705000000,-57,-33.977055 +1,0,-30.000000,3715000000,3710000000,-57,-33.951072 +1,0,-30.000000,3720000000,3715000000,-57,-33.932413 +1,0,-30.000000,3725000000,3720000000,-57,-33.899636 +1,0,-30.000000,3730000000,3725000000,-57,-33.883100 +1,0,-30.000000,3735000000,3730000000,-57,-33.874818 +1,0,-30.000000,3740000000,3735000000,-57,-33.851272 +1,0,-30.000000,3745000000,3740000000,-56,-33.850557 +1,0,-30.000000,3750000000,3745000000,-56,-33.839730 +1,0,-30.000000,3755000000,3750000000,-56,-33.826244 +1,0,-30.000000,3760000000,3755000000,-56,-33.816241 +1,0,-30.000000,3765000000,3760000000,-56,-33.813809 +1,0,-30.000000,3770000000,3765000000,-56,-33.812251 +1,0,-30.000000,3775000000,3770000000,-56,-33.811740 +1,0,-30.000000,3780000000,3775000000,-56,-33.810096 +1,0,-30.000000,3785000000,3780000000,-56,-33.815046 +1,0,-30.000000,3790000000,3785000000,-56,-33.820914 +1,0,-30.000000,3795000000,3790000000,-56,-33.827359 +1,0,-30.000000,3800000000,3795000000,-56,-33.838774 +1,0,-30.000000,3805000000,3800000000,-56,-33.848977 +1,0,-30.000000,3810000000,3805000000,-57,-33.861032 +1,0,-30.000000,3815000000,3810000000,-57,-33.873201 +1,0,-30.000000,3820000000,3815000000,-57,-33.893461 +1,0,-30.000000,3825000000,3820000000,-57,-33.914290 +1,0,-30.000000,3830000000,3825000000,-57,-33.938304 +1,0,-30.000000,3835000000,3830000000,-57,-33.960727 +1,0,-30.000000,3840000000,3835000000,-57,-33.982216 +1,0,-30.000000,3845000000,3840000000,-57,-34.006558 +1,0,-30.000000,3850000000,3845000000,-57,-34.032359 +1,0,-30.000000,3855000000,3850000000,-57,-34.056565 +1,0,-30.000000,3860000000,3855000000,-57,-34.081835 +1,0,-30.000000,3865000000,3860000000,-57,-34.098671 +1,0,-30.000000,3870000000,3865000000,-57,-34.111011 +1,0,-30.000000,3875000000,3870000000,-57,-34.102845 +1,0,-30.000000,3880000000,3875000000,-57,-34.082050 +1,0,-30.000000,3885000000,3880000000,-57,-34.080492 +1,0,-30.000000,3890000000,3885000000,-57,-34.056910 +1,0,-30.000000,3895000000,3890000000,-57,-34.048038 +1,0,-30.000000,3900000000,3895000000,-57,-34.015325 +1,0,-30.000000,3905000000,3900000000,-57,-34.018143 +1,0,-30.000000,3910000000,3905000000,-57,-34.003690 +1,0,-30.000000,3915000000,3910000000,-57,-33.986092 +1,0,-30.000000,3920000000,3915000000,-57,-33.994619 +1,0,-30.000000,3925000000,3920000000,-57,-33.982318 +1,0,-30.000000,3930000000,3925000000,-57,-34.002575 +1,0,-30.000000,3935000000,3930000000,-57,-34.001098 +1,0,-30.000000,3940000000,3935000000,-57,-34.011078 +1,0,-30.000000,3945000000,3940000000,-57,-34.009924 +1,0,-30.000000,3950000000,3945000000,-58,-34.717036 +1,0,-30.000000,3955000000,3950000000,-57,-34.625942 +1,0,-30.000000,3960000000,3955000000,-57,-34.620422 +1,0,-30.000000,3965000000,3960000000,-57,-34.634753 +1,0,-30.000000,3970000000,3965000000,-57,-34.654375 +1,0,-30.000000,3975000000,3970000000,-57,-34.668506 +1,0,-30.000000,3980000000,3975000000,-57,-34.688795 +1,0,-30.000000,3985000000,3980000000,-57,-34.709026 +1,0,-30.000000,3990000000,3985000000,-58,-34.718520 +1,0,-30.000000,3995000000,3990000000,-57,-34.733063 +1,0,-30.000000,4000000000,3995000000,-57,-34.742700 +1,0,-30.000000,4005000000,4000000000,-58,-34.979392 +1,0,-30.000000,4010000000,4005000000,-57,-36.873006 +1,0,-30.000000,4015000000,4010000000,-57,-36.858965 +1,0,-30.000000,4020000000,4015000000,-57,-36.849933 +1,0,-30.000000,4025000000,4020000000,-57,-36.843427 +1,0,-30.000000,4030000000,4025000000,-57,-36.832733 +1,0,-30.000000,4035000000,4030000000,-57,-36.834959 +1,0,-30.000000,4040000000,4035000000,-57,-36.838386 +1,0,-30.000000,4045000000,4040000000,-57,-36.837012 +1,0,-30.000000,4050000000,4045000000,-57,-36.838054 +1,0,-30.000000,4055000000,4050000000,-57,-36.846139 +1,0,-30.000000,4060000000,4055000000,-57,-36.839371 +1,0,-30.000000,4065000000,4060000000,-57,-36.842933 +1,0,-30.000000,4070000000,4065000000,-57,-36.844877 +1,0,-30.000000,4075000000,4070000000,-57,-36.848721 +1,0,-30.000000,4080000000,4075000000,-57,-36.845484 +1,0,-30.000000,4085000000,4080000000,-57,-36.827147 +1,0,-30.000000,4090000000,4085000000,-57,-36.816602 +1,0,-30.000000,4095000000,4090000000,-57,-36.807305 +1,0,-30.000000,4100000000,4095000000,-57,-36.795947 +1,0,-30.000000,4105000000,4100000000,-57,-36.780991 +1,0,-30.000000,4110000000,4105000000,-57,-36.768005 +1,0,-30.000000,4115000000,4110000000,-57,-36.755308 +1,0,-30.000000,4120000000,4115000000,-57,-36.736260 +1,0,-30.000000,4125000000,4120000000,-57,-36.722608 +1,0,-30.000000,4130000000,4125000000,-57,-36.718687 +1,0,-30.000000,4135000000,4130000000,-57,-36.711110 +1,0,-30.000000,4140000000,4135000000,-57,-36.700664 +1,0,-30.000000,4145000000,4140000000,-57,-36.693521 +1,0,-30.000000,4150000000,4145000000,-57,-36.683137 +1,0,-30.000000,4155000000,4150000000,-57,-36.671166 +1,0,-30.000000,4160000000,4155000000,-57,-36.674159 +1,0,-30.000000,4165000000,4160000000,-57,-36.670513 +1,0,-30.000000,4170000000,4165000000,-57,-36.657010 +1,0,-30.000000,4175000000,4170000000,-57,-36.650770 +1,0,-30.000000,4180000000,4175000000,-57,-36.651765 +1,0,-30.000000,4185000000,4180000000,-57,-36.651784 +1,0,-30.000000,4190000000,4185000000,-57,-36.647790 +1,0,-30.000000,4195000000,4190000000,-57,-36.649614 +1,0,-30.000000,4200000000,4195000000,-57,-36.642601 +1,0,-30.000000,4205000000,4200000000,-57,-36.644059 +1,0,-30.000000,4210000000,4205000000,-57,-36.640647 +1,0,-30.000000,4215000000,4210000000,-57,-36.649262 +1,0,-30.000000,4220000000,4215000000,-57,-36.649038 +1,0,-30.000000,4225000000,4220000000,-57,-36.658085 +1,0,-30.000000,4230000000,4225000000,-57,-36.668180 +1,0,-30.000000,4235000000,4230000000,-57,-36.682369 +1,0,-30.000000,4240000000,4235000000,-57,-36.698744 +1,0,-30.000000,4245000000,4240000000,-57,-36.706874 +1,0,-30.000000,4250000000,4245000000,-57,-36.725269 +1,0,-30.000000,4255000000,4250000000,-57,-36.740812 +1,0,-30.000000,4260000000,4255000000,-57,-36.758403 +1,0,-30.000000,4265000000,4260000000,-57,-36.771957 +1,0,-30.000000,4270000000,4265000000,-57,-36.798454 +1,0,-30.000000,4275000000,4270000000,-57,-36.818958 +1,0,-30.000000,4280000000,4275000000,-57,-36.842380 +1,0,-30.000000,4285000000,4280000000,-57,-36.871659 +1,0,-30.000000,4290000000,4285000000,-57,-36.901230 +1,0,-30.000000,4295000000,4290000000,-57,-36.926326 +1,0,-30.000000,4300000000,4295000000,-57,-36.961814 +1,0,-30.000000,4305000000,4300000000,-57,-36.995723 +1,0,-30.000000,4310000000,4305000000,-57,-37.030223 +1,0,-30.000000,4315000000,4310000000,-57,-37.049588 +1,0,-30.000000,4320000000,4315000000,-57,-37.090839 +1,0,-30.000000,4325000000,4320000000,-57,-37.098704 +1,0,-30.000000,4330000000,4325000000,-58,-37.097573 +1,0,-30.000000,4335000000,4330000000,-58,-37.099361 +1,0,-30.000000,4340000000,4335000000,-57,-37.085021 +1,0,-30.000000,4345000000,4340000000,-57,-37.069873 +1,0,-30.000000,4350000000,4345000000,-57,-37.063531 +1,0,-30.000000,4355000000,4350000000,-57,-37.054931 +1,0,-30.000000,4360000000,4355000000,-57,-37.038829 +1,0,-30.000000,4365000000,4360000000,-57,-37.018349 +1,0,-30.000000,4370000000,4365000000,-57,-37.021305 +1,0,-30.000000,4375000000,4370000000,-57,-37.025901 +1,0,-30.000000,4380000000,4375000000,-57,-37.024646 +1,0,-30.000000,4385000000,4380000000,-57,-37.008396 +1,0,-30.000000,4390000000,4385000000,-57,-37.003338 +1,0,-30.000000,4395000000,4390000000,-57,-37.036919 +1,0,-30.000000,4400000000,4395000000,-57,-37.021517 +1,0,-30.000000,4405000000,4400000000,-57,-37.061243 +1,0,-30.000000,4410000000,4405000000,-57,-37.072110 +1,0,-30.000000,4415000000,4410000000,-57,-37.541234 +1,0,-30.000000,4420000000,4415000000,-58,-37.697089 +1,0,-30.000000,4425000000,4420000000,-58,-37.663189 +1,0,-30.000000,4430000000,4425000000,-58,-37.669395 +1,0,-30.000000,4435000000,4430000000,-58,-37.697529 +1,0,-30.000000,4440000000,4435000000,-58,-37.716805 +1,0,-30.000000,4445000000,4440000000,-58,-37.731385 +1,0,-30.000000,4450000000,4445000000,-58,-37.746863 +1,0,-30.000000,4455000000,4450000000,-58,-37.754247 +1,0,-30.000000,4460000000,4455000000,-58,-37.770281 +1,0,-30.000000,4465000000,4460000000,-58,-37.768841 +1,0,-30.000000,4470000000,4465000000,-58,-37.794204 +1,0,-30.000000,4475000000,4470000000,-58,-37.815264 +1,0,-30.000000,4480000000,4475000000,-58,-37.821662 +1,0,-30.000000,4485000000,4480000000,-58,-37.840492 +1,0,-30.000000,4490000000,4485000000,-58,-37.850403 +1,0,-30.000000,4495000000,4490000000,-58,-37.849610 +1,0,-30.000000,4500000000,4495000000,-58,-37.866494 +1,0,-30.000000,4505000000,4500000000,-58,-37.872058 +1,0,-30.000000,4510000000,4505000000,-58,-37.875939 +1,0,-30.000000,4515000000,4510000000,-58,-37.887204 +1,0,-30.000000,4520000000,4515000000,-58,-37.886942 +1,0,-30.000000,4525000000,4520000000,-58,-37.898292 +1,0,-30.000000,4530000000,4525000000,-58,-37.902016 +1,0,-30.000000,4535000000,4530000000,-58,-37.904408 +1,0,-30.000000,4540000000,4535000000,-58,-37.919951 +1,0,-30.000000,4545000000,4540000000,-58,-37.932913 +1,0,-30.000000,4550000000,4545000000,-58,-37.940553 +1,0,-30.000000,4555000000,4550000000,-58,-37.949113 +1,0,-30.000000,4560000000,4555000000,-58,-37.961262 +1,0,-30.000000,4565000000,4560000000,-58,-37.960563 +1,0,-30.000000,4570000000,4565000000,-58,-37.969935 +1,0,-30.000000,4575000000,4570000000,-58,-37.974979 +1,0,-30.000000,4580000000,4575000000,-58,-37.982474 +1,0,-30.000000,4585000000,4580000000,-58,-37.989622 +1,0,-30.000000,4590000000,4585000000,-58,-37.999196 +1,0,-30.000000,4595000000,4590000000,-58,-38.005654 +1,0,-30.000000,4600000000,4595000000,-58,-37.996179 +1,0,-30.000000,4605000000,4600000000,-58,-38.008175 +1,0,-30.000000,4610000000,4605000000,-58,-38.022446 +1,0,-30.000000,4615000000,4610000000,-58,-38.024474 +1,0,-30.000000,4620000000,4615000000,-58,-38.029209 +1,0,-30.000000,4625000000,4620000000,-58,-38.025608 +1,0,-30.000000,4630000000,4625000000,-58,-38.042958 +1,0,-30.000000,4635000000,4630000000,-58,-38.042725 +1,0,-30.000000,4640000000,4635000000,-58,-38.049374 +1,0,-30.000000,4645000000,4640000000,-58,-38.055437 +1,0,-30.000000,4650000000,4645000000,-58,-38.061177 +1,0,-30.000000,4655000000,4650000000,-58,-38.055522 +1,0,-30.000000,4660000000,4655000000,-58,-38.067982 +1,0,-30.000000,4665000000,4660000000,-58,-38.062471 +1,0,-30.000000,4670000000,4665000000,-58,-38.067367 +1,0,-30.000000,4675000000,4670000000,-58,-38.066492 +1,0,-30.000000,4680000000,4675000000,-58,-38.084264 +1,0,-30.000000,4685000000,4680000000,-58,-38.084197 +1,0,-30.000000,4690000000,4685000000,-58,-38.101234 +1,0,-30.000000,4695000000,4690000000,-58,-38.105473 +1,0,-30.000000,4700000000,4695000000,-58,-38.101106 +1,0,-30.000000,4705000000,4700000000,-58,-38.116077 +1,0,-30.000000,4710000000,4705000000,-58,-38.140684 +1,0,-30.000000,4715000000,4710000000,-58,-38.144460 +1,0,-30.000000,4720000000,4715000000,-58,-38.147914 +1,0,-30.000000,4725000000,4720000000,-58,-38.165991 +1,0,-30.000000,4730000000,4725000000,-58,-38.171446 +1,0,-30.000000,4735000000,4730000000,-58,-38.192810 +1,0,-30.000000,4740000000,4735000000,-59,-38.209021 +1,0,-30.000000,4745000000,4740000000,-58,-38.214714 +1,0,-30.000000,4750000000,4745000000,-59,-38.237611 +1,0,-30.000000,4755000000,4750000000,-59,-38.240813 +1,0,-30.000000,4760000000,4755000000,-59,-38.249662 +1,0,-30.000000,4765000000,4760000000,-59,-38.253444 +1,0,-30.000000,4770000000,4765000000,-59,-38.264323 +1,0,-30.000000,4775000000,4770000000,-59,-38.274313 +1,0,-30.000000,4780000000,4775000000,-59,-38.282492 +1,0,-30.000000,4785000000,4780000000,-59,-38.298551 +1,0,-30.000000,4790000000,4785000000,-59,-38.308452 +1,0,-30.000000,4795000000,4790000000,-59,-38.328042 +1,0,-30.000000,4800000000,4795000000,-59,-38.327375 +1,0,-30.000000,4805000000,4800000000,-59,-38.354056 +1,0,-30.000000,4810000000,4805000000,-59,-38.379349 +1,0,-30.000000,4815000000,4810000000,-59,-38.395700 +1,0,-30.000000,4820000000,4815000000,-59,-38.415465 +1,0,-30.000000,4825000000,4820000000,-59,-38.431607 +1,0,-30.000000,4830000000,4825000000,-59,-38.441403 +1,0,-30.000000,4835000000,4830000000,-59,-38.465204 +1,0,-30.000000,4840000000,4835000000,-59,-38.486670 +1,0,-30.000000,4845000000,4840000000,-59,-38.506304 +1,0,-30.000000,4850000000,4845000000,-59,-38.526610 +1,0,-30.000000,4855000000,4850000000,-59,-38.539029 +1,0,-30.000000,4860000000,4855000000,-59,-38.551975 +1,0,-30.000000,4865000000,4860000000,-59,-38.552502 +1,0,-30.000000,4870000000,4865000000,-59,-38.587129 +1,0,-30.000000,4875000000,4870000000,-59,-38.583638 +1,0,-30.000000,4880000000,4875000000,-59,-38.619735 +1,0,-30.000000,4885000000,4880000000,-59,-38.633062 +1,0,-30.000000,4890000000,4885000000,-59,-38.638911 +1,0,-30.000000,4895000000,4890000000,-59,-38.660600 +1,0,-30.000000,4900000000,4895000000,-59,-38.680957 +1,0,-30.000000,4905000000,4900000000,-59,-38.693404 +1,0,-30.000000,4910000000,4905000000,-59,-38.712332 +1,0,-30.000000,4915000000,4910000000,-59,-38.744481 +1,0,-30.000000,4920000000,4915000000,-59,-38.768381 +1,0,-30.000000,4925000000,4920000000,-59,-38.783903 +1,0,-30.000000,4930000000,4925000000,-59,-38.807592 +1,0,-30.000000,4935000000,4930000000,-59,-38.828744 +1,0,-30.000000,4940000000,4935000000,-59,-38.851097 +1,0,-30.000000,4945000000,4940000000,-59,-38.870944 +1,0,-30.000000,4950000000,4945000000,-59,-38.886511 +1,0,-30.000000,4955000000,4950000000,-59,-38.910649 +1,0,-30.000000,4960000000,4955000000,-59,-38.919800 +1,0,-30.000000,4965000000,4960000000,-59,-38.931021 +1,0,-30.000000,4970000000,4965000000,-59,-38.960892 +1,0,-30.000000,4975000000,4970000000,-59,-38.974438 +1,0,-30.000000,4980000000,4975000000,-59,-39.007006 +1,0,-30.000000,4985000000,4980000000,-59,-39.025102 +1,0,-30.000000,4990000000,4985000000,-59,-39.052074 +1,0,-30.000000,4995000000,4990000000,-59,-39.109884 +1,0,-30.000000,5000000000,4995000000,-59,-39.146298 +1,0,-30.000000,5005000000,5000000000,-59,-39.237569 +1,0,-30.000000,5010000000,5005000000,-59,-39.233957 +1,0,-30.000000,5015000000,5010000000,-59,-39.232415 +1,0,-30.000000,5020000000,5015000000,-59,-39.233465 +1,0,-30.000000,5025000000,5020000000,-59,-39.255551 +1,0,-30.000000,5030000000,5025000000,-59,-39.284683 +1,0,-30.000000,5035000000,5030000000,-59,-39.308066 +1,0,-30.000000,5040000000,5035000000,-59,-39.319513 +1,0,-30.000000,5045000000,5040000000,-59,-39.353475 +1,0,-30.000000,5050000000,5045000000,-59,-39.378660 +1,0,-30.000000,5055000000,5050000000,-59,-39.412875 +1,0,-30.000000,5060000000,5055000000,-59,-39.440136 +1,0,-30.000000,5065000000,5060000000,-59,-39.490594 +1,0,-30.000000,5070000000,5065000000,-59,-39.534466 +1,0,-30.000000,5075000000,5070000000,-59,-39.579627 +1,0,-30.000000,5080000000,5075000000,-59,-39.630862 +1,0,-30.000000,5085000000,5080000000,-59,-39.674401 +1,0,-30.000000,5090000000,5085000000,-59,-39.734335 +1,0,-30.000000,5095000000,5090000000,-60,-39.794765 +1,0,-30.000000,5100000000,5095000000,-60,-39.859453 +1,0,-30.000000,5105000000,5100000000,-60,-39.907753 +1,0,-30.000000,5110000000,5105000000,-60,-39.981412 +1,0,-30.000000,5115000000,5110000000,-60,-40.039798 +1,0,-30.000000,5120000000,5115000000,-60,-40.083627 +1,0,-30.000000,5125000000,5120000000,-60,-40.093519 +1,0,-30.000000,5130000000,5125000000,-60,-40.075307 +1,0,-30.000000,5135000000,5130000000,-60,-40.039124 +1,0,-30.000000,5140000000,5135000000,-60,-40.037016 +1,0,-30.000000,5145000000,5140000000,-60,-40.003530 +1,0,-30.000000,5150000000,5145000000,-60,-40.032470 +1,0,-30.000000,5155000000,5150000000,-60,-40.841632 +1,0,-30.000000,5160000000,5155000000,-61,-40.764331 +1,0,-30.000000,5165000000,5160000000,-61,-40.741307 +1,0,-30.000000,5170000000,5165000000,-61,-40.776202 +1,0,-30.000000,5175000000,5170000000,-61,-40.840635 +1,0,-30.000000,5180000000,5175000000,-61,-40.907232 +1,0,-30.000000,5185000000,5180000000,-61,-40.958000 +1,0,-30.000000,5190000000,5185000000,-61,-41.018022 +1,0,-30.000000,5195000000,5190000000,-61,-41.073785 +1,0,-30.000000,5200000000,5195000000,-61,-41.127282 +1,0,-30.000000,5205000000,5200000000,-61,-41.188305 +1,0,-30.000000,5210000000,5205000000,-61,-41.249023 +1,0,-30.000000,5215000000,5210000000,-61,-41.294138 +1,0,-30.000000,5220000000,5215000000,-61,-41.345573 +1,0,-30.000000,5225000000,5220000000,-61,-41.410590 +1,0,-30.000000,5230000000,5225000000,-61,-41.481038 +1,0,-30.000000,5235000000,5230000000,-61,-41.498690 +1,0,-30.000000,5240000000,5235000000,-61,-41.573592 +1,0,-30.000000,5245000000,5240000000,-61,-41.604581 +1,0,-30.000000,5250000000,5245000000,-61,-41.658653 +1,0,-30.000000,5255000000,5250000000,-61,-41.700385 +1,0,-30.000000,5260000000,5255000000,-61,-41.717336 +1,0,-30.000000,5265000000,5260000000,-61,-41.752056 +1,0,-30.000000,5270000000,5265000000,-61,-41.778179 +1,0,-30.000000,5275000000,5270000000,-61,-41.814773 +1,0,-30.000000,5280000000,5275000000,-61,-41.843693 +1,0,-30.000000,5285000000,5280000000,-61,-41.867005 +1,0,-30.000000,5290000000,5285000000,-61,-41.888684 +1,0,-30.000000,5295000000,5290000000,-61,-41.931642 +1,0,-30.000000,5300000000,5295000000,-61,-41.960939 +1,0,-30.000000,5305000000,5300000000,-61,-41.995911 +1,0,-30.000000,5310000000,5305000000,-61,-41.987281 +1,0,-30.000000,5315000000,5310000000,-61,-42.000317 +1,0,-30.000000,5320000000,5315000000,-61,-42.015864 +1,0,-30.000000,5325000000,5320000000,-61,-42.032824 +1,0,-30.000000,5330000000,5325000000,-61,-42.065655 +1,0,-30.000000,5335000000,5330000000,-61,-42.070706 +1,0,-30.000000,5340000000,5335000000,-61,-42.104957 +1,0,-30.000000,5345000000,5340000000,-61,-42.127705 +1,0,-30.000000,5350000000,5345000000,-61,-42.170411 +1,0,-30.000000,5355000000,5350000000,-61,-42.192563 +1,0,-30.000000,5360000000,5355000000,-61,-42.225175 +1,0,-30.000000,5365000000,5360000000,-61,-42.265479 +1,0,-30.000000,5370000000,5365000000,-62,-42.323497 +1,0,-30.000000,5375000000,5370000000,-62,-42.376353 +1,0,-30.000000,5380000000,5375000000,-62,-42.419950 +1,0,-30.000000,5385000000,5380000000,-62,-42.472761 +1,0,-30.000000,5390000000,5385000000,-62,-42.521089 +1,0,-30.000000,5395000000,5390000000,-62,-42.594887 +1,0,-30.000000,5400000000,5395000000,-62,-42.622813 +1,0,-30.000000,5405000000,5400000000,-62,-42.718143 +1,0,-30.000000,5410000000,5405000000,-62,-42.772119 +1,0,-30.000000,5415000000,5410000000,-62,-42.811127 +1,0,-30.000000,5420000000,5415000000,-62,-42.845606 +1,0,-30.000000,5425000000,5420000000,-62,-42.876544 +1,0,-30.000000,5430000000,5425000000,-62,-42.969199 +1,0,-30.000000,5435000000,5430000000,-62,-43.041825 +1,0,-30.000000,5440000000,5435000000,-62,-43.095685 +1,0,-30.000000,5445000000,5440000000,-62,-43.154852 +1,0,-30.000000,5450000000,5445000000,-62,-43.216664 +1,0,-30.000000,5455000000,5450000000,-63,-43.268673 +1,0,-30.000000,5460000000,5455000000,-63,-43.334132 +1,0,-30.000000,5465000000,5460000000,-63,-43.368059 +1,0,-30.000000,5470000000,5465000000,-63,-43.439543 +1,0,-30.000000,5475000000,5470000000,-62,-43.504625 +1,0,-30.000000,5480000000,5475000000,-63,-43.545335 +1,0,-30.000000,5485000000,5480000000,-63,-43.585158 +1,0,-30.000000,5490000000,5485000000,-63,-43.649138 +1,0,-30.000000,5495000000,5490000000,-63,-43.685885 +1,0,-30.000000,5500000000,5495000000,-63,-43.718471 +1,0,-30.000000,5505000000,5500000000,-63,-43.726590 +1,0,-30.000000,5510000000,5505000000,-63,-43.774089 +1,0,-30.000000,5515000000,5510000000,-63,-43.774930 +1,0,-30.000000,5520000000,5515000000,-63,-43.789841 +1,0,-30.000000,5525000000,5520000000,-63,-43.780808 +1,0,-30.000000,5530000000,5525000000,-63,-43.801108 +1,0,-30.000000,5535000000,5530000000,-63,-43.769427 +1,0,-30.000000,5540000000,5535000000,-63,-43.798068 +1,0,-30.000000,5545000000,5540000000,-63,-43.792409 +1,0,-30.000000,5550000000,5545000000,-63,-43.765769 +1,0,-30.000000,5555000000,5550000000,-63,-43.756738 +1,0,-30.000000,5560000000,5555000000,-63,-43.736578 +1,0,-30.000000,5565000000,5560000000,-63,-43.706839 +1,0,-30.000000,5570000000,5565000000,-63,-43.683413 +1,0,-30.000000,5575000000,5570000000,-63,-43.641233 +1,0,-30.000000,5580000000,5575000000,-63,-43.644295 +1,0,-30.000000,5585000000,5580000000,-63,-43.581606 +1,0,-30.000000,5590000000,5585000000,-63,-43.570663 +1,0,-30.000000,5595000000,5590000000,-63,-43.532779 +1,0,-30.000000,5600000000,5595000000,-63,-43.467419 +1,0,-30.000000,5605000000,5600000000,-63,-43.434428 +1,0,-30.000000,5610000000,5605000000,-63,-43.402578 +1,0,-30.000000,5615000000,5610000000,-63,-43.353297 +1,0,-30.000000,5620000000,5615000000,-63,-43.306916 +1,0,-30.000000,5625000000,5620000000,-62,-43.255348 +1,0,-30.000000,5630000000,5625000000,-62,-43.244169 +1,0,-30.000000,5635000000,5630000000,-62,-43.211892 +1,0,-30.000000,5640000000,5635000000,-62,-43.207370 +1,0,-30.000000,5645000000,5640000000,-62,-43.149012 +1,0,-30.000000,5650000000,5645000000,-62,-43.135547 +1,0,-30.000000,5655000000,5650000000,-62,-43.089268 +1,0,-30.000000,5660000000,5655000000,-62,-43.071467 +1,0,-30.000000,5665000000,5660000000,-62,-43.081526 +1,0,-30.000000,5670000000,5665000000,-62,-43.088459 +1,0,-30.000000,5675000000,5670000000,-62,-43.035372 +1,0,-30.000000,5680000000,5675000000,-62,-43.063737 +1,0,-30.000000,5685000000,5680000000,-62,-43.048450 +1,0,-30.000000,5690000000,5685000000,-62,-43.069910 +1,0,-30.000000,5695000000,5690000000,-62,-43.069486 +1,0,-30.000000,5700000000,5695000000,-62,-43.080338 +1,0,-30.000000,5705000000,5700000000,-62,-43.136291 +1,0,-30.000000,5710000000,5705000000,-62,-43.152793 +1,0,-30.000000,5715000000,5710000000,-62,-43.187270 +1,0,-30.000000,5720000000,5715000000,-63,-43.221960 +1,0,-30.000000,5725000000,5720000000,-63,-43.296902 +1,0,-30.000000,5730000000,5725000000,-62,-43.315596 +1,0,-30.000000,5735000000,5730000000,-63,-43.361282 +1,0,-30.000000,5740000000,5735000000,-63,-43.422049 +1,0,-30.000000,5745000000,5740000000,-63,-43.471236 +1,0,-30.000000,5750000000,5745000000,-63,-43.527310 +1,0,-30.000000,5755000000,5750000000,-62,-43.545225 +1,0,-30.000000,5760000000,5755000000,-63,-43.601418 +1,0,-30.000000,5765000000,5760000000,-63,-43.613991 +1,0,-30.000000,5770000000,5765000000,-63,-43.661789 +1,0,-30.000000,5775000000,5770000000,-63,-43.706987 +1,0,-30.000000,5780000000,5775000000,-63,-43.710048 +1,0,-30.000000,5785000000,5780000000,-63,-43.721121 +1,0,-30.000000,5790000000,5785000000,-63,-43.734409 +1,0,-30.000000,5795000000,5790000000,-63,-43.764539 +1,0,-30.000000,5800000000,5795000000,-63,-43.796391 +1,0,-30.000000,5805000000,5800000000,-63,-43.810883 +1,0,-30.000000,5810000000,5805000000,-63,-43.828988 +1,0,-30.000000,5815000000,5810000000,-63,-43.843373 +1,0,-30.000000,5820000000,5815000000,-63,-43.877336 +1,0,-30.000000,5825000000,5820000000,-63,-43.896256 +1,0,-30.000000,5830000000,5825000000,-63,-43.909799 +1,0,-30.000000,5835000000,5830000000,-63,-43.929676 +1,0,-30.000000,5840000000,5835000000,-63,-43.959773 +1,0,-30.000000,5845000000,5840000000,-63,-43.951498 +1,0,-30.000000,5850000000,5845000000,-63,-43.884694 +1,0,-30.000000,5855000000,5850000000,-63,-43.892256 +1,0,-30.000000,5860000000,5855000000,-63,-43.911382 +1,0,-30.000000,5865000000,5860000000,-63,-43.859895 +1,0,-30.000000,5870000000,5865000000,-63,-43.864638 +1,0,-30.000000,5875000000,5870000000,-63,-43.831512 +1,0,-30.000000,5880000000,5875000000,-63,-43.781447 +1,0,-30.000000,5885000000,5880000000,-63,-43.763010 +1,0,-30.000000,5890000000,5885000000,-63,-43.720371 +1,0,-30.000000,5895000000,5890000000,-63,-43.691223 +1,0,-30.000000,5900000000,5895000000,-63,-43.645076 +1,0,-30.000000,5905000000,5900000000,-63,-43.606201 +1,0,-30.000000,5910000000,5905000000,-63,-43.521474 +1,0,-30.000000,5915000000,5910000000,-63,-43.476756 +1,0,-30.000000,5920000000,5915000000,-63,-43.428702 +1,0,-30.000000,5925000000,5920000000,-63,-43.333031 +1,0,-30.000000,5930000000,5925000000,-63,-43.255949 +1,0,-30.000000,5935000000,5930000000,-62,-43.214921 +1,0,-30.000000,5940000000,5935000000,-63,-43.153117 +1,0,-30.000000,5945000000,5940000000,-62,-43.102122 +1,0,-30.000000,5950000000,5945000000,-62,-43.050711 +1,0,-30.000000,5955000000,5950000000,-62,-43.010880 +1,0,-30.000000,5960000000,5955000000,-62,-42.946468 +1,0,-30.000000,5965000000,5960000000,-62,-42.879031 +1,0,-30.000000,5970000000,5965000000,-62,-42.808258 +1,0,-30.000000,5975000000,5970000000,-62,-42.770475 +1,0,-30.000000,5980000000,5975000000,-62,-42.743563 +1,0,-30.000000,5985000000,5980000000,-62,-42.708741 +1,0,-30.000000,5990000000,5985000000,-62,-42.660467 +1,0,-30.000000,5995000000,5990000000,-62,-42.635962 +1,0,-30.000000,6000000000,5995000000,-62,-42.609874 +1,0,-30.000000,6005000000,6000000000,-62,-42.573421 +1,15,-30.000000,80000000,75000000,-51,-11.041082 +1,15,-30.000000,85000000,80000000,-51,-11.030532 +1,15,-30.000000,90000000,85000000,-51,-11.032123 +1,15,-30.000000,95000000,90000000,-51,-11.086483 +1,15,-30.000000,100000000,95000000,-51,-10.971703 +1,15,-30.000000,105000000,100000000,-51,-10.796849 +1,15,-30.000000,110000000,105000000,-51,-10.834121 +1,15,-30.000000,115000000,110000000,-52,-11.690031 +1,15,-30.000000,120000000,115000000,-52,-11.631611 +1,15,-30.000000,125000000,120000000,-51,-11.620215 +1,15,-30.000000,130000000,125000000,-51,-11.512469 +1,15,-30.000000,135000000,130000000,-51,-11.485484 +1,15,-30.000000,140000000,135000000,-51,-11.411011 +1,15,-30.000000,145000000,140000000,-51,-11.314403 +1,15,-30.000000,150000000,145000000,-51,-11.268371 +1,15,-30.000000,155000000,150000000,-51,-11.244165 +1,15,-30.000000,160000000,155000000,-51,-11.249388 +1,15,-30.000000,165000000,160000000,-51,-11.222587 +1,15,-30.000000,170000000,165000000,-51,-11.191915 +1,15,-30.000000,175000000,170000000,-51,-11.198314 +1,15,-30.000000,180000000,175000000,-51,-11.172524 +1,15,-30.000000,185000000,180000000,-51,-11.187823 +1,15,-30.000000,190000000,185000000,-51,-11.188845 +1,15,-30.000000,195000000,190000000,-51,-11.166289 +1,15,-30.000000,200000000,195000000,-51,-11.139901 +1,15,-30.000000,205000000,200000000,-51,-11.115167 +1,15,-30.000000,210000000,205000000,-51,-11.157739 +1,15,-30.000000,215000000,210000000,-51,-11.178966 +1,15,-30.000000,220000000,215000000,-51,-11.158655 +1,15,-30.000000,225000000,220000000,-51,-11.165610 +1,15,-30.000000,230000000,225000000,-51,-11.145775 +1,15,-30.000000,235000000,230000000,-51,-11.128955 +1,15,-30.000000,240000000,235000000,-51,-11.177550 +1,15,-30.000000,245000000,240000000,-51,-11.178955 +1,15,-30.000000,250000000,245000000,-51,-11.236143 +1,15,-30.000000,255000000,250000000,-51,-11.260972 +1,15,-30.000000,260000000,255000000,-51,-11.215619 +1,15,-30.000000,265000000,260000000,-51,-11.232020 +1,15,-30.000000,270000000,265000000,-51,-11.247001 +1,15,-30.000000,275000000,270000000,-51,-11.216102 +1,15,-30.000000,280000000,275000000,-51,-11.217410 +1,15,-30.000000,285000000,280000000,-51,-11.235717 +1,15,-30.000000,290000000,285000000,-51,-11.255396 +1,15,-30.000000,295000000,290000000,-51,-11.282783 +1,15,-30.000000,300000000,295000000,-51,-11.310211 +1,15,-30.000000,305000000,300000000,-51,-11.335187 +1,15,-30.000000,310000000,305000000,-51,-11.362085 +1,15,-30.000000,315000000,310000000,-51,-11.387810 +1,15,-30.000000,320000000,315000000,-51,-11.412112 +1,15,-30.000000,325000000,320000000,-51,-11.431803 +1,15,-30.000000,330000000,325000000,-51,-11.450495 +1,15,-30.000000,335000000,330000000,-51,-11.468605 +1,15,-30.000000,340000000,335000000,-51,-11.481510 +1,15,-30.000000,345000000,340000000,-51,-11.491313 +1,15,-30.000000,350000000,345000000,-51,-11.495258 +1,15,-30.000000,355000000,350000000,-51,-11.494621 +1,15,-30.000000,360000000,355000000,-51,-11.489309 +1,15,-30.000000,365000000,360000000,-51,-11.479270 +1,15,-30.000000,370000000,365000000,-51,-11.468846 +1,15,-30.000000,375000000,370000000,-51,-11.453224 +1,15,-30.000000,380000000,375000000,-51,-11.439481 +1,15,-30.000000,385000000,380000000,-51,-11.420770 +1,15,-30.000000,390000000,385000000,-51,-11.405338 +1,15,-30.000000,395000000,390000000,-51,-11.380661 +1,15,-30.000000,400000000,395000000,-51,-11.351802 +1,15,-30.000000,405000000,400000000,-51,-11.325542 +1,15,-30.000000,410000000,405000000,-51,-11.293100 +1,15,-30.000000,415000000,410000000,-51,-11.256378 +1,15,-30.000000,420000000,415000000,-51,-11.221376 +1,15,-30.000000,425000000,420000000,-51,-11.184079 +1,15,-30.000000,430000000,425000000,-51,-11.144157 +1,15,-30.000000,435000000,430000000,-51,-11.100941 +1,15,-30.000000,440000000,435000000,-51,-11.058812 +1,15,-30.000000,445000000,440000000,-51,-11.016541 +1,15,-30.000000,450000000,445000000,-51,-10.974406 +1,15,-30.000000,455000000,450000000,-51,-10.935301 +1,15,-30.000000,460000000,455000000,-51,-10.895612 +1,15,-30.000000,465000000,460000000,-51,-10.857106 +1,15,-30.000000,470000000,465000000,-51,-10.821452 +1,15,-30.000000,475000000,470000000,-51,-10.787797 +1,15,-30.000000,480000000,475000000,-51,-10.752694 +1,15,-30.000000,485000000,480000000,-51,-10.725461 +1,15,-30.000000,490000000,485000000,-51,-10.694693 +1,15,-30.000000,495000000,490000000,-51,-10.670560 +1,15,-30.000000,500000000,495000000,-51,-10.645313 +1,15,-30.000000,505000000,500000000,-51,-10.621230 +1,15,-30.000000,510000000,505000000,-51,-10.600384 +1,15,-30.000000,515000000,510000000,-51,-10.581226 +1,15,-30.000000,520000000,515000000,-51,-10.566942 +1,15,-30.000000,525000000,520000000,-51,-10.549529 +1,15,-30.000000,530000000,525000000,-51,-10.537130 +1,15,-30.000000,535000000,530000000,-51,-10.525066 +1,15,-30.000000,540000000,535000000,-51,-10.510431 +1,15,-30.000000,545000000,540000000,-51,-10.500050 +1,15,-30.000000,550000000,545000000,-51,-10.486318 +1,15,-30.000000,555000000,550000000,-51,-10.480528 +1,15,-30.000000,560000000,555000000,-51,-10.469600 +1,15,-30.000000,565000000,560000000,-51,-10.462049 +1,15,-30.000000,570000000,565000000,-51,-10.454999 +1,15,-30.000000,575000000,570000000,-51,-10.447871 +1,15,-30.000000,580000000,575000000,-51,-10.440114 +1,15,-30.000000,585000000,580000000,-51,-10.428883 +1,15,-30.000000,590000000,585000000,-51,-10.408775 +1,15,-30.000000,595000000,590000000,-51,-10.399146 +1,15,-30.000000,600000000,595000000,-51,-10.387804 +1,15,-30.000000,605000000,600000000,-51,-10.492626 +1,15,-30.000000,610000000,605000000,-51,-10.461945 +1,15,-30.000000,615000000,610000000,-51,-10.428182 +1,15,-30.000000,620000000,615000000,-51,-10.399873 +1,15,-30.000000,625000000,620000000,-51,-10.375275 +1,15,-30.000000,630000000,625000000,-51,-10.347244 +1,15,-30.000000,635000000,630000000,-51,-10.320115 +1,15,-30.000000,640000000,635000000,-51,-10.299291 +1,15,-30.000000,645000000,640000000,-51,-10.282897 +1,15,-30.000000,650000000,645000000,-50,-10.258651 +1,15,-30.000000,655000000,650000000,-50,-10.236047 +1,15,-30.000000,660000000,655000000,-50,-10.214560 +1,15,-30.000000,665000000,660000000,-50,-10.191748 +1,15,-30.000000,670000000,665000000,-50,-10.171599 +1,15,-30.000000,675000000,670000000,-50,-10.162530 +1,15,-30.000000,680000000,675000000,-50,-10.168038 +1,15,-30.000000,685000000,680000000,-50,-10.176852 +1,15,-30.000000,690000000,685000000,-50,-10.183546 +1,15,-30.000000,695000000,690000000,-50,-10.185010 +1,15,-30.000000,700000000,695000000,-50,-10.178412 +1,15,-30.000000,705000000,700000000,-50,-10.171372 +1,15,-30.000000,710000000,705000000,-50,-10.174916 +1,15,-30.000000,715000000,710000000,-50,-10.191920 +1,15,-30.000000,720000000,715000000,-50,-10.217829 +1,15,-30.000000,725000000,720000000,-50,-10.251631 +1,15,-30.000000,730000000,725000000,-51,-10.283784 +1,15,-30.000000,735000000,730000000,-51,-10.323093 +1,15,-30.000000,740000000,735000000,-51,-10.371440 +1,15,-30.000000,745000000,740000000,-51,-10.428726 +1,15,-30.000000,750000000,745000000,-51,-10.489561 +1,15,-30.000000,755000000,750000000,-51,-10.558721 +1,15,-30.000000,760000000,755000000,-51,-10.635862 +1,15,-30.000000,765000000,760000000,-51,-10.718605 +1,15,-30.000000,770000000,765000000,-51,-10.787325 +1,15,-30.000000,775000000,770000000,-51,-10.833916 +1,15,-30.000000,780000000,775000000,-51,-10.842260 +1,15,-30.000000,785000000,780000000,-51,-10.816206 +1,15,-30.000000,790000000,785000000,-51,-10.774969 +1,15,-30.000000,795000000,790000000,-51,-10.736155 +1,15,-30.000000,800000000,795000000,-51,-10.711680 +1,15,-30.000000,805000000,800000000,-51,-10.705356 +1,15,-30.000000,810000000,805000000,-51,-10.712852 +1,15,-30.000000,815000000,810000000,-51,-10.729394 +1,15,-30.000000,820000000,815000000,-51,-10.753604 +1,15,-30.000000,825000000,820000000,-51,-10.779171 +1,15,-30.000000,830000000,825000000,-51,-10.815190 +1,15,-30.000000,835000000,830000000,-51,-10.848691 +1,15,-30.000000,840000000,835000000,-51,-10.887079 +1,15,-30.000000,845000000,840000000,-51,-10.907439 +1,15,-30.000000,850000000,845000000,-51,-10.948939 +1,15,-30.000000,855000000,850000000,-51,-10.992438 +1,15,-30.000000,860000000,855000000,-51,-11.036930 +1,15,-30.000000,865000000,860000000,-51,-11.077992 +1,15,-30.000000,870000000,865000000,-51,-11.125793 +1,15,-30.000000,875000000,870000000,-51,-11.168482 +1,15,-30.000000,880000000,875000000,-51,-11.213955 +1,15,-30.000000,885000000,880000000,-51,-11.254772 +1,15,-30.000000,890000000,885000000,-51,-11.308748 +1,15,-30.000000,895000000,890000000,-51,-11.354234 +1,15,-30.000000,900000000,895000000,-51,-11.408500 +1,15,-30.000000,905000000,900000000,-51,-11.460437 +1,15,-30.000000,910000000,905000000,-52,-11.517732 +1,15,-30.000000,915000000,910000000,-52,-11.581642 +1,15,-30.000000,920000000,915000000,-52,-11.637188 +1,15,-30.000000,925000000,920000000,-52,-11.700225 +1,15,-30.000000,930000000,925000000,-52,-11.776663 +1,15,-30.000000,935000000,930000000,-52,-11.842582 +1,15,-30.000000,940000000,935000000,-52,-11.916644 +1,15,-30.000000,945000000,940000000,-52,-11.982327 +1,15,-30.000000,950000000,945000000,-52,-12.062314 +1,15,-30.000000,955000000,950000000,-52,-12.134521 +1,15,-30.000000,960000000,955000000,-52,-12.212902 +1,15,-30.000000,965000000,960000000,-52,-12.291350 +1,15,-30.000000,970000000,965000000,-52,-12.367339 +1,15,-30.000000,975000000,970000000,-52,-12.446358 +1,15,-30.000000,980000000,975000000,-53,-12.527245 +1,15,-30.000000,985000000,980000000,-53,-12.609077 +1,15,-30.000000,990000000,985000000,-53,-12.679739 +1,15,-30.000000,995000000,990000000,-53,-12.762339 +1,15,-30.000000,1000000000,995000000,-53,-12.849523 +1,15,-30.000000,1005000000,1000000000,-53,-13.098788 +1,15,-30.000000,1010000000,1005000000,-53,-13.190193 +1,15,-30.000000,1015000000,1010000000,-53,-13.218772 +1,15,-30.000000,1020000000,1015000000,-54,-13.263308 +1,15,-30.000000,1025000000,1020000000,-54,-13.317033 +1,15,-30.000000,1030000000,1025000000,-54,-13.371417 +1,15,-30.000000,1035000000,1030000000,-54,-13.424030 +1,15,-30.000000,1040000000,1035000000,-54,-13.475881 +1,15,-30.000000,1045000000,1040000000,-54,-13.525852 +1,15,-30.000000,1050000000,1045000000,-54,-13.571403 +1,15,-30.000000,1055000000,1050000000,-54,-13.612755 +1,15,-30.000000,1060000000,1055000000,-54,-13.652981 +1,15,-30.000000,1065000000,1060000000,-54,-13.688387 +1,15,-30.000000,1070000000,1065000000,-54,-13.719676 +1,15,-30.000000,1075000000,1070000000,-54,-13.746969 +1,15,-30.000000,1080000000,1075000000,-54,-13.770679 +1,15,-30.000000,1085000000,1080000000,-54,-13.788501 +1,15,-30.000000,1090000000,1085000000,-54,-13.803992 +1,15,-30.000000,1095000000,1090000000,-54,-13.817755 +1,15,-30.000000,1100000000,1095000000,-54,-13.826449 +1,15,-30.000000,1105000000,1100000000,-54,-13.831755 +1,15,-30.000000,1110000000,1105000000,-54,-13.830438 +1,15,-30.000000,1115000000,1110000000,-54,-13.827512 +1,15,-30.000000,1120000000,1115000000,-54,-13.820550 +1,15,-30.000000,1125000000,1120000000,-54,-13.812996 +1,15,-30.000000,1130000000,1125000000,-54,-13.801383 +1,15,-30.000000,1135000000,1130000000,-54,-13.788037 +1,15,-30.000000,1140000000,1135000000,-54,-13.776945 +1,15,-30.000000,1145000000,1140000000,-54,-13.768420 +1,15,-30.000000,1150000000,1145000000,-54,-13.760986 +1,15,-30.000000,1155000000,1150000000,-54,-13.762354 +1,15,-30.000000,1160000000,1155000000,-54,-13.773811 +1,15,-30.000000,1165000000,1160000000,-54,-13.801523 +1,15,-30.000000,1170000000,1165000000,-54,-13.846425 +1,15,-30.000000,1175000000,1170000000,-54,-13.905008 +1,15,-30.000000,1180000000,1175000000,-54,-13.960004 +1,15,-30.000000,1185000000,1180000000,-54,-13.993670 +1,15,-30.000000,1190000000,1185000000,-54,-13.989155 +1,15,-30.000000,1195000000,1190000000,-54,-13.956349 +1,15,-30.000000,1200000000,1195000000,-54,-13.903876 +1,15,-30.000000,1205000000,1200000000,-54,-13.846910 +1,15,-30.000000,1210000000,1205000000,-54,-13.789571 +1,15,-30.000000,1215000000,1210000000,-54,-13.720902 +1,15,-30.000000,1220000000,1215000000,-54,-13.674983 +1,15,-30.000000,1225000000,1220000000,-54,-13.633166 +1,15,-30.000000,1230000000,1225000000,-54,-13.601564 +1,15,-30.000000,1235000000,1230000000,-54,-13.575791 +1,15,-30.000000,1240000000,1235000000,-54,-13.552570 +1,15,-30.000000,1245000000,1240000000,-54,-13.532389 +1,15,-30.000000,1250000000,1245000000,-54,-13.519259 +1,15,-30.000000,1255000000,1250000000,-54,-13.509407 +1,15,-30.000000,1260000000,1255000000,-54,-13.500609 +1,15,-30.000000,1265000000,1260000000,-54,-13.495085 +1,15,-30.000000,1270000000,1265000000,-54,-13.498227 +1,15,-30.000000,1275000000,1270000000,-54,-13.500356 +1,15,-30.000000,1280000000,1275000000,-54,-13.504130 +1,15,-30.000000,1285000000,1280000000,-54,-13.505174 +1,15,-30.000000,1290000000,1285000000,-54,-13.514322 +1,15,-30.000000,1295000000,1290000000,-54,-13.524754 +1,15,-30.000000,1300000000,1295000000,-54,-13.532220 +1,15,-30.000000,1305000000,1300000000,-54,-13.537895 +1,15,-30.000000,1310000000,1305000000,-54,-14.571025 +1,15,-30.000000,1315000000,1310000000,-54,-14.580601 +1,15,-30.000000,1320000000,1315000000,-54,-14.587978 +1,15,-30.000000,1325000000,1320000000,-54,-14.595465 +1,15,-30.000000,1330000000,1325000000,-54,-14.600016 +1,15,-30.000000,1335000000,1330000000,-54,-14.602260 +1,15,-30.000000,1340000000,1335000000,-54,-14.606307 +1,15,-30.000000,1345000000,1340000000,-54,-14.605206 +1,15,-30.000000,1350000000,1345000000,-54,-14.605908 +1,15,-30.000000,1355000000,1350000000,-54,-14.603757 +1,15,-30.000000,1360000000,1355000000,-54,-14.601591 +1,15,-30.000000,1365000000,1360000000,-54,-14.597256 +1,15,-30.000000,1370000000,1365000000,-54,-14.591703 +1,15,-30.000000,1375000000,1370000000,-54,-14.586599 +1,15,-30.000000,1380000000,1375000000,-54,-14.578981 +1,15,-30.000000,1385000000,1380000000,-54,-14.570829 +1,15,-30.000000,1390000000,1385000000,-54,-14.562268 +1,15,-30.000000,1395000000,1390000000,-54,-14.551792 +1,15,-30.000000,1400000000,1395000000,-54,-14.544233 +1,15,-30.000000,1405000000,1400000000,-54,-14.534136 +1,15,-30.000000,1410000000,1405000000,-53,-14.520448 +1,15,-30.000000,1415000000,1410000000,-53,-14.507596 +1,15,-30.000000,1420000000,1415000000,-53,-14.493640 +1,15,-30.000000,1425000000,1420000000,-53,-14.481266 +1,15,-30.000000,1430000000,1425000000,-53,-14.469603 +1,15,-30.000000,1435000000,1430000000,-53,-14.457550 +1,15,-30.000000,1440000000,1435000000,-53,-14.448011 +1,15,-30.000000,1445000000,1440000000,-53,-14.439305 +1,15,-30.000000,1450000000,1445000000,-53,-14.431899 +1,15,-30.000000,1455000000,1450000000,-53,-14.428592 +1,15,-30.000000,1460000000,1455000000,-53,-14.427103 +1,15,-30.000000,1465000000,1460000000,-53,-14.426978 +1,15,-30.000000,1470000000,1465000000,-53,-14.431171 +1,15,-30.000000,1475000000,1470000000,-53,-14.436309 +1,15,-30.000000,1480000000,1475000000,-53,-14.446370 +1,15,-30.000000,1485000000,1480000000,-53,-14.457923 +1,15,-30.000000,1490000000,1485000000,-53,-14.470679 +1,15,-30.000000,1495000000,1490000000,-53,-14.490333 +1,15,-30.000000,1500000000,1495000000,-53,-14.512268 +1,15,-30.000000,1505000000,1500000000,-54,-14.535957 +1,15,-30.000000,1510000000,1505000000,-54,-14.572642 +1,15,-30.000000,1515000000,1510000000,-54,-14.597743 +1,15,-30.000000,1520000000,1515000000,-54,-14.624745 +1,15,-30.000000,1525000000,1520000000,-54,-14.654535 +1,15,-30.000000,1530000000,1525000000,-54,-14.688246 +1,15,-30.000000,1535000000,1530000000,-54,-14.722531 +1,15,-30.000000,1540000000,1535000000,-54,-14.758990 +1,15,-30.000000,1545000000,1540000000,-54,-14.797782 +1,15,-30.000000,1550000000,1545000000,-54,-14.834433 +1,15,-30.000000,1555000000,1550000000,-54,-14.872690 +1,15,-30.000000,1560000000,1555000000,-54,-14.914667 +1,15,-30.000000,1565000000,1560000000,-54,-14.959391 +1,15,-30.000000,1570000000,1565000000,-54,-15.003691 +1,15,-30.000000,1575000000,1570000000,-54,-15.048624 +1,15,-30.000000,1580000000,1575000000,-54,-15.098766 +1,15,-30.000000,1585000000,1580000000,-54,-15.147560 +1,15,-30.000000,1590000000,1585000000,-54,-15.200006 +1,15,-30.000000,1595000000,1590000000,-54,-15.255495 +1,15,-30.000000,1600000000,1595000000,-54,-15.313277 +1,15,-30.000000,1605000000,1600000000,-54,-15.372650 +1,15,-30.000000,1610000000,1605000000,-55,-15.610408 +1,15,-30.000000,1615000000,1610000000,-55,-15.643755 +1,15,-30.000000,1620000000,1615000000,-55,-15.676177 +1,15,-30.000000,1625000000,1620000000,-55,-15.716612 +1,15,-30.000000,1630000000,1625000000,-55,-15.762159 +1,15,-30.000000,1635000000,1630000000,-55,-15.815449 +1,15,-30.000000,1640000000,1635000000,-55,-15.872930 +1,15,-30.000000,1645000000,1640000000,-55,-15.940067 +1,15,-30.000000,1650000000,1645000000,-55,-16.009081 +1,15,-30.000000,1655000000,1650000000,-55,-16.082607 +1,15,-30.000000,1660000000,1655000000,-55,-16.223010 +1,15,-30.000000,1665000000,1660000000,-55,-16.258310 +1,15,-30.000000,1670000000,1665000000,-56,-16.322271 +1,15,-30.000000,1675000000,1670000000,-56,-16.406738 +1,15,-30.000000,1680000000,1675000000,-56,-16.494179 +1,15,-30.000000,1685000000,1680000000,-56,-16.585397 +1,15,-30.000000,1690000000,1685000000,-56,-16.679862 +1,15,-30.000000,1695000000,1690000000,-56,-16.776361 +1,15,-30.000000,1700000000,1695000000,-56,-16.873140 +1,15,-30.000000,1705000000,1700000000,-56,-16.970901 +1,15,-30.000000,1710000000,1705000000,-56,-17.075052 +1,15,-30.000000,1715000000,1710000000,-56,-17.179049 +1,15,-30.000000,1720000000,1715000000,-56,-17.283968 +1,15,-30.000000,1725000000,1720000000,-56,-17.388468 +1,15,-30.000000,1730000000,1725000000,-56,-17.492254 +1,15,-30.000000,1735000000,1730000000,-57,-17.593648 +1,15,-30.000000,1740000000,1735000000,-57,-17.697243 +1,15,-30.000000,1745000000,1740000000,-57,-17.796445 +1,15,-30.000000,1750000000,1745000000,-57,-17.893539 +1,15,-30.000000,1755000000,1750000000,-57,-17.989398 +1,15,-30.000000,1760000000,1755000000,-57,-18.083548 +1,15,-30.000000,1765000000,1760000000,-57,-18.172688 +1,15,-30.000000,1770000000,1765000000,-57,-18.262510 +1,15,-30.000000,1775000000,1770000000,-57,-18.347525 +1,15,-30.000000,1780000000,1775000000,-57,-18.431761 +1,15,-30.000000,1785000000,1780000000,-58,-18.510211 +1,15,-30.000000,1790000000,1785000000,-58,-18.586393 +1,15,-30.000000,1795000000,1790000000,-58,-18.659895 +1,15,-30.000000,1800000000,1795000000,-58,-18.728081 +1,15,-30.000000,1805000000,1800000000,-58,-18.790793 +1,15,-30.000000,1810000000,1805000000,-58,-18.853398 +1,15,-30.000000,1815000000,1810000000,-58,-18.909827 +1,15,-30.000000,1820000000,1815000000,-58,-18.963474 +1,15,-30.000000,1825000000,1820000000,-58,-19.012848 +1,15,-30.000000,1830000000,1825000000,-58,-19.058910 +1,15,-30.000000,1835000000,1830000000,-58,-19.099704 +1,15,-30.000000,1840000000,1835000000,-58,-19.134032 +1,15,-30.000000,1845000000,1840000000,-58,-19.110027 +1,15,-30.000000,1850000000,1845000000,-58,-19.068212 +1,15,-30.000000,1855000000,1850000000,-58,-19.031587 +1,15,-30.000000,1860000000,1855000000,-58,-19.006728 +1,15,-30.000000,1865000000,1860000000,-58,-18.981905 +1,15,-30.000000,1870000000,1865000000,-58,-18.969367 +1,15,-30.000000,1875000000,1870000000,-58,-18.957317 +1,15,-30.000000,1880000000,1875000000,-58,-18.953783 +1,15,-30.000000,1885000000,1880000000,-58,-18.947990 +1,15,-30.000000,1890000000,1885000000,-58,-18.945033 +1,15,-30.000000,1895000000,1890000000,-58,-18.951540 +1,15,-30.000000,1900000000,1895000000,-58,-18.961505 +1,15,-30.000000,1905000000,1900000000,-58,-18.963217 +1,15,-30.000000,1910000000,1905000000,-58,-18.972058 +1,15,-30.000000,1915000000,1910000000,-58,-18.991450 +1,15,-30.000000,1920000000,1915000000,-58,-19.009465 +1,15,-30.000000,1925000000,1920000000,-58,-19.025634 +1,15,-30.000000,1930000000,1925000000,-58,-19.046572 +1,15,-30.000000,1935000000,1930000000,-58,-19.060395 +1,15,-30.000000,1940000000,1935000000,-58,-19.073721 +1,15,-30.000000,1945000000,1940000000,-58,-19.087080 +1,15,-30.000000,1950000000,1945000000,-58,-19.097138 +1,15,-30.000000,1955000000,1950000000,-58,-19.098191 +1,15,-30.000000,1960000000,1955000000,-58,-19.098233 +1,15,-30.000000,1965000000,1960000000,-58,-19.098727 +1,15,-30.000000,1970000000,1965000000,-58,-19.098113 +1,15,-30.000000,1975000000,1970000000,-58,-19.098549 +1,15,-30.000000,1980000000,1975000000,-58,-19.101912 +1,15,-30.000000,1985000000,1980000000,-58,-19.108183 +1,15,-30.000000,1990000000,1985000000,-58,-19.117046 +1,15,-30.000000,1995000000,1990000000,-58,-19.127175 +1,15,-30.000000,2000000000,1995000000,-58,-19.123742 +1,15,-30.000000,2005000000,2000000000,-58,-19.103715 +1,15,-30.000000,2010000000,2005000000,-58,-19.069468 +1,15,-30.000000,2015000000,2010000000,-58,-19.031205 +1,15,-30.000000,2020000000,2015000000,-58,-18.988215 +1,15,-30.000000,2025000000,2020000000,-58,-18.961053 +1,15,-30.000000,2030000000,2025000000,-58,-18.941201 +1,15,-30.000000,2035000000,2030000000,-58,-18.923475 +1,15,-30.000000,2040000000,2035000000,-58,-18.922794 +1,15,-30.000000,2045000000,2040000000,-58,-19.754656 +1,15,-30.000000,2050000000,2045000000,-59,-19.504067 +1,15,-30.000000,2055000000,2050000000,-59,-19.487635 +1,15,-30.000000,2060000000,2055000000,-59,-19.519341 +1,15,-30.000000,2065000000,2060000000,-59,-19.562108 +1,15,-30.000000,2070000000,2065000000,-59,-19.607376 +1,15,-30.000000,2075000000,2070000000,-59,-19.653804 +1,15,-30.000000,2080000000,2075000000,-59,-19.699480 +1,15,-30.000000,2085000000,2080000000,-59,-19.744541 +1,15,-30.000000,2090000000,2085000000,-59,-19.787778 +1,15,-30.000000,2095000000,2090000000,-59,-19.828429 +1,15,-30.000000,2100000000,2095000000,-59,-19.861287 +1,15,-30.000000,2105000000,2100000000,-59,-19.888618 +1,15,-30.000000,2110000000,2105000000,-59,-19.913091 +1,15,-30.000000,2115000000,2110000000,-59,-19.924123 +1,15,-30.000000,2120000000,2115000000,-59,-19.928290 +1,15,-30.000000,2125000000,2120000000,-59,-19.924018 +1,15,-30.000000,2130000000,2125000000,-59,-19.911831 +1,15,-30.000000,2135000000,2130000000,-59,-19.879675 +1,15,-30.000000,2140000000,2135000000,-59,-19.851934 +1,15,-30.000000,2145000000,2140000000,-59,-19.821717 +1,15,-30.000000,2150000000,2145000000,-59,-19.785767 +1,15,-30.000000,2155000000,2150000000,-59,-19.746680 +1,15,-30.000000,2160000000,2155000000,-59,-19.697785 +1,15,-30.000000,2165000000,2160000000,-59,-19.648213 +1,15,-30.000000,2170000000,2165000000,-59,-19.595717 +1,15,-30.000000,2175000000,2170000000,-59,-19.538012 +1,15,-30.000000,2180000000,2175000000,-59,-19.477253 +1,15,-30.000000,2185000000,2180000000,-59,-19.415320 +1,15,-30.000000,2190000000,2185000000,-59,-19.352564 +1,15,-30.000000,2195000000,2190000000,-58,-19.287980 +1,15,-30.000000,2200000000,2195000000,-58,-19.220712 +1,15,-30.000000,2205000000,2200000000,-58,-19.132880 +1,15,-30.000000,2210000000,2205000000,-58,-19.075317 +1,15,-30.000000,2215000000,2210000000,-58,-19.017314 +1,15,-30.000000,2220000000,2215000000,-58,-18.955308 +1,15,-30.000000,2225000000,2220000000,-58,-18.893081 +1,15,-30.000000,2230000000,2225000000,-58,-18.828741 +1,15,-30.000000,2235000000,2230000000,-58,-18.770108 +1,15,-30.000000,2240000000,2235000000,-58,-18.713133 +1,15,-30.000000,2245000000,2240000000,-58,-18.658118 +1,15,-30.000000,2250000000,2245000000,-58,-18.607537 +1,15,-30.000000,2255000000,2250000000,-58,-18.560053 +1,15,-30.000000,2260000000,2255000000,-58,-18.513959 +1,15,-30.000000,2265000000,2260000000,-57,-18.473467 +1,15,-30.000000,2270000000,2265000000,-57,-18.439307 +1,15,-30.000000,2275000000,2270000000,-57,-18.407990 +1,15,-30.000000,2280000000,2275000000,-57,-18.381925 +1,15,-30.000000,2285000000,2280000000,-57,-18.362421 +1,15,-30.000000,2290000000,2285000000,-57,-18.348524 +1,15,-30.000000,2295000000,2290000000,-57,-18.340393 +1,15,-30.000000,2300000000,2295000000,-57,-18.338380 +1,15,-30.000000,2305000000,2300000000,-57,-18.341321 +1,15,-30.000000,2310000000,2305000000,-57,-18.345005 +1,15,-30.000000,2315000000,2310000000,-57,-18.354154 +1,15,-30.000000,2320000000,2315000000,-57,-18.371812 +1,15,-30.000000,2325000000,2320000000,-57,-18.392021 +1,15,-30.000000,2330000000,2325000000,-57,-18.417512 +1,15,-30.000000,2335000000,2330000000,-57,-18.447165 +1,15,-30.000000,2340000000,2335000000,-58,-18.483675 +1,15,-30.000000,2345000000,2340000000,-58,-18.525163 +1,15,-30.000000,2350000000,2345000000,-58,-18.571069 +1,15,-30.000000,2355000000,2350000000,-58,-18.622107 +1,15,-30.000000,2360000000,2355000000,-58,-18.677613 +1,15,-30.000000,2365000000,2360000000,-58,-18.737452 +1,15,-30.000000,2370000000,2365000000,-58,-18.801534 +1,15,-30.000000,2375000000,2370000000,-58,-18.871150 +1,15,-30.000000,2380000000,2375000000,-58,-18.945685 +1,15,-30.000000,2385000000,2380000000,-58,-19.023380 +1,15,-30.000000,2390000000,2385000000,-58,-19.107616 +1,15,-30.000000,2395000000,2390000000,-58,-19.074351 +1,15,-30.000000,2400000000,2395000000,-58,-18.979592 +1,15,-30.000000,2405000000,2400000000,-58,-18.932389 +1,15,-30.000000,2410000000,2405000000,-58,-19.759121 +1,15,-30.000000,2415000000,2410000000,-59,-19.677318 +1,15,-30.000000,2420000000,2415000000,-59,-19.716767 +1,15,-30.000000,2425000000,2420000000,-59,-19.819206 +1,15,-30.000000,2430000000,2425000000,-59,-19.937399 +1,15,-30.000000,2435000000,2430000000,-59,-20.060911 +1,15,-30.000000,2440000000,2435000000,-59,-20.188299 +1,15,-30.000000,2445000000,2440000000,-59,-20.320976 +1,15,-30.000000,2450000000,2445000000,-59,-20.459059 +1,15,-30.000000,2455000000,2450000000,-60,-20.598966 +1,15,-30.000000,2460000000,2455000000,-60,-20.736669 +1,15,-30.000000,2465000000,2460000000,-60,-20.877604 +1,15,-30.000000,2470000000,2465000000,-60,-21.020762 +1,15,-30.000000,2475000000,2470000000,-60,-21.168005 +1,15,-30.000000,2480000000,2475000000,-60,-21.315136 +1,15,-30.000000,2485000000,2480000000,-60,-21.462880 +1,15,-30.000000,2490000000,2485000000,-61,-21.611771 +1,15,-30.000000,2495000000,2490000000,-61,-21.759330 +1,15,-30.000000,2500000000,2495000000,-61,-21.908904 +1,15,-30.000000,2505000000,2500000000,-61,-22.055706 +1,15,-30.000000,2510000000,2505000000,-61,-22.080915 +1,15,-30.000000,2515000000,2510000000,-61,-22.002296 +1,15,-30.000000,2520000000,2515000000,-61,-22.779094 +1,15,-30.000000,2525000000,2520000000,-62,-22.711180 +1,15,-30.000000,2530000000,2525000000,-62,-22.778632 +1,15,-30.000000,2535000000,2530000000,-62,-22.905786 +1,15,-30.000000,2540000000,2535000000,-62,-23.033874 +1,15,-30.000000,2545000000,2540000000,-62,-23.160557 +1,15,-30.000000,2550000000,2545000000,-62,-23.285341 +1,15,-30.000000,2555000000,2550000000,-62,-23.407527 +1,15,-30.000000,2560000000,2555000000,-62,-23.520090 +1,15,-30.000000,2565000000,2560000000,-63,-23.626644 +1,15,-30.000000,2570000000,2565000000,-63,-23.732982 +1,15,-30.000000,2575000000,2570000000,-63,-23.833369 +1,15,-30.000000,2580000000,2575000000,-63,-23.930247 +1,15,-30.000000,2585000000,2580000000,-63,-24.021725 +1,15,-30.000000,2590000000,2585000000,-63,-24.112010 +1,15,-30.000000,2595000000,2590000000,-63,-24.195322 +1,15,-30.000000,2600000000,2595000000,-63,-24.275128 +1,15,-30.000000,2605000000,2600000000,-63,-24.350651 +1,15,-30.000000,2610000000,2605000000,-63,-24.419140 +1,15,-30.000000,2615000000,2610000000,-63,-24.485136 +1,15,-30.000000,2620000000,2615000000,-64,-24.546671 +1,15,-30.000000,2625000000,2620000000,-64,-24.606620 +1,15,-30.000000,2630000000,2625000000,-64,-24.661787 +1,15,-30.000000,2635000000,2630000000,-64,-24.718138 +1,15,-30.000000,2640000000,2635000000,-64,-24.767392 +1,15,-30.000000,2645000000,2640000000,-64,-24.813772 +1,15,-30.000000,2650000000,2645000000,-64,-24.864182 +1,15,-30.000000,2655000000,2650000000,-64,-24.909273 +1,15,-30.000000,2660000000,2655000000,-64,-24.952602 +1,15,-30.000000,2665000000,2660000000,-64,-24.994235 +1,15,-30.000000,2670000000,2665000000,-64,-25.039181 +1,15,-30.000000,2675000000,2670000000,-64,-25.082807 +1,15,-30.000000,2680000000,2675000000,-64,-25.123595 +1,15,-30.000000,2685000000,2680000000,-64,-25.108834 +1,15,-30.000000,2690000000,2685000000,-64,-25.057555 +1,15,-30.000000,2695000000,2690000000,-64,-24.997226 +1,15,-30.000000,2700000000,2695000000,-64,-24.967325 +1,15,-30.000000,2705000000,2700000000,-64,-25.797899 +1,15,-30.000000,2710000000,2705000000,-65,-25.604688 +1,15,-30.000000,2715000000,2710000000,-65,-25.586066 +1,15,-30.000000,2720000000,2715000000,-65,-25.626226 +1,15,-30.000000,2725000000,2720000000,-65,-25.687560 +1,15,-30.000000,2730000000,2725000000,-65,-25.752986 +1,15,-30.000000,2735000000,2730000000,-65,-25.828354 +1,15,-30.000000,2740000000,2735000000,-65,-25.908701 +1,15,-30.000000,2745000000,2740000000,-65,-25.990041 +1,15,-30.000000,2750000000,2745000000,-65,-26.079479 +1,15,-30.000000,2755000000,2750000000,-65,-26.173007 +1,15,-30.000000,2760000000,2755000000,-65,-26.272111 +1,15,-30.000000,2765000000,2760000000,-65,-26.373921 +1,15,-30.000000,2770000000,2765000000,-65,-26.481962 +1,15,-30.000000,2775000000,2770000000,-65,-26.589481 +1,15,-30.000000,2780000000,2775000000,-66,-26.699458 +1,15,-30.000000,2785000000,2780000000,-66,-26.812347 +1,15,-30.000000,2790000000,2785000000,-66,-26.925161 +1,15,-30.000000,2795000000,2790000000,-66,-27.037926 +1,15,-30.000000,2800000000,2795000000,-66,-27.151554 +1,15,-30.000000,2805000000,2800000000,-66,-27.265035 +1,15,-30.000000,2810000000,2805000000,-66,-27.371825 +1,15,-30.000000,2815000000,2810000000,-66,-27.482459 +1,15,-30.000000,2820000000,2815000000,-67,-27.585988 +1,15,-30.000000,2825000000,2820000000,-67,-27.692082 +1,15,-30.000000,2830000000,2825000000,-67,-27.790209 +1,15,-30.000000,2835000000,2830000000,-67,-27.888307 +1,15,-30.000000,2840000000,2835000000,-67,-27.979622 +1,15,-30.000000,2845000000,2840000000,-67,-28.068403 +1,15,-30.000000,2850000000,2845000000,-67,-28.135383 +1,15,-30.000000,2855000000,2850000000,-67,-28.086509 +1,15,-30.000000,2860000000,2855000000,-67,-28.022251 +1,15,-30.000000,2865000000,2860000000,-67,-27.993527 +1,15,-30.000000,2870000000,2865000000,-67,-28.029720 +1,15,-30.000000,2875000000,2870000000,-68,-28.636973 +1,15,-30.000000,2880000000,2875000000,-68,-28.581991 +1,15,-30.000000,2885000000,2880000000,-68,-28.609555 +1,15,-30.000000,2890000000,2885000000,-68,-28.655476 +1,15,-30.000000,2895000000,2890000000,-68,-28.697532 +1,15,-30.000000,2900000000,2895000000,-68,-28.735687 +1,15,-30.000000,2905000000,2900000000,-68,-28.768201 +1,15,-30.000000,2910000000,2905000000,-68,-28.796031 +1,15,-30.000000,2915000000,2910000000,-68,-28.818878 +1,15,-30.000000,2920000000,2915000000,-68,-28.839170 +1,15,-30.000000,2925000000,2920000000,-68,-28.851948 +1,15,-30.000000,2930000000,2925000000,-68,-28.857926 +1,15,-30.000000,2935000000,2930000000,-68,-28.863929 +1,15,-30.000000,2940000000,2935000000,-68,-28.864878 +1,15,-30.000000,2945000000,2940000000,-68,-28.861164 +1,15,-30.000000,2950000000,2945000000,-68,-28.848729 +1,15,-30.000000,2955000000,2950000000,-68,-28.834176 +1,15,-30.000000,2960000000,2955000000,-68,-28.818208 +1,15,-30.000000,2965000000,2960000000,-68,-28.798164 +1,15,-30.000000,2970000000,2965000000,-68,-28.773538 +1,15,-30.000000,2975000000,2970000000,-68,-28.744433 +1,15,-30.000000,2980000000,2975000000,-68,-28.721816 +1,15,-30.000000,2985000000,2980000000,-68,-28.693134 +1,15,-30.000000,2990000000,2985000000,-68,-28.664041 +1,15,-30.000000,2995000000,2990000000,-68,-28.637950 +1,15,-30.000000,3000000000,2995000000,-68,-28.607233 +1,15,-30.000000,3005000000,3000000000,-68,-28.579615 +1,15,-30.000000,3010000000,3005000000,-64,-25.057918 +1,15,-30.000000,3015000000,3010000000,-64,-24.952340 +1,15,-30.000000,3020000000,3015000000,-64,-24.971511 +1,15,-30.000000,3025000000,3020000000,-64,-25.003601 +1,15,-30.000000,3030000000,3025000000,-64,-25.032292 +1,15,-30.000000,3035000000,3030000000,-64,-25.057753 +1,15,-30.000000,3040000000,3035000000,-64,-25.072258 +1,15,-30.000000,3045000000,3040000000,-64,-25.076246 +1,15,-30.000000,3050000000,3045000000,-64,-25.063954 +1,15,-30.000000,3055000000,3050000000,-64,-25.046123 +1,15,-30.000000,3060000000,3055000000,-64,-25.028695 +1,15,-30.000000,3065000000,3060000000,-64,-25.012685 +1,15,-30.000000,3070000000,3065000000,-64,-24.998796 +1,15,-30.000000,3075000000,3070000000,-64,-24.988490 +1,15,-30.000000,3080000000,3075000000,-64,-24.983129 +1,15,-30.000000,3085000000,3080000000,-64,-24.981288 +1,15,-30.000000,3090000000,3085000000,-64,-24.983238 +1,15,-30.000000,3095000000,3090000000,-64,-24.988586 +1,15,-30.000000,3100000000,3095000000,-64,-24.997931 +1,15,-30.000000,3105000000,3100000000,-64,-25.013762 +1,15,-30.000000,3110000000,3105000000,-64,-25.032176 +1,15,-30.000000,3115000000,3110000000,-64,-25.054934 +1,15,-30.000000,3120000000,3115000000,-64,-25.076128 +1,15,-30.000000,3125000000,3120000000,-64,-25.100950 +1,15,-30.000000,3130000000,3125000000,-64,-25.122959 +1,15,-30.000000,3135000000,3130000000,-64,-25.117363 +1,15,-30.000000,3140000000,3135000000,-64,-25.085723 +1,15,-30.000000,3145000000,3140000000,-64,-25.043683 +1,15,-30.000000,3150000000,3145000000,-64,-25.012092 +1,15,-30.000000,3155000000,3150000000,-64,-24.983470 +1,15,-30.000000,3160000000,3155000000,-64,-24.962403 +1,15,-30.000000,3165000000,3160000000,-64,-24.938690 +1,15,-30.000000,3170000000,3165000000,-64,-24.943046 +1,15,-30.000000,3175000000,3170000000,-64,-24.930772 +1,15,-30.000000,3180000000,3175000000,-64,-24.955573 +1,15,-30.000000,3185000000,3180000000,-64,-24.933525 +1,15,-30.000000,3190000000,3185000000,-64,-24.951490 +1,15,-30.000000,3195000000,3190000000,-64,-24.942480 +1,15,-30.000000,3200000000,3195000000,-64,-24.939818 +1,15,-30.000000,3205000000,3200000000,-64,-24.940925 +1,15,-30.000000,3210000000,3205000000,-64,-24.947198 +1,15,-30.000000,3215000000,3210000000,-64,-24.933458 +1,15,-30.000000,3220000000,3215000000,-64,-24.936400 +1,15,-30.000000,3225000000,3220000000,-64,-24.947909 +1,15,-30.000000,3230000000,3225000000,-64,-24.935887 +1,15,-30.000000,3235000000,3230000000,-64,-24.919032 +1,15,-30.000000,3240000000,3235000000,-64,-24.925593 +1,15,-30.000000,3245000000,3240000000,-64,-24.923998 +1,15,-30.000000,3250000000,3245000000,-64,-24.942030 +1,15,-30.000000,3255000000,3250000000,-64,-24.965252 +1,15,-30.000000,3260000000,3255000000,-64,-24.996084 +1,15,-30.000000,3265000000,3260000000,-64,-25.031414 +1,15,-30.000000,3270000000,3265000000,-64,-25.036580 +1,15,-30.000000,3275000000,3270000000,-64,-25.013194 +1,15,-30.000000,3280000000,3275000000,-64,-24.959452 +1,15,-30.000000,3285000000,3280000000,-64,-24.894253 +1,15,-30.000000,3290000000,3285000000,-64,-24.819976 +1,15,-30.000000,3295000000,3290000000,-64,-24.742302 +1,15,-30.000000,3300000000,3295000000,-64,-24.661880 +1,15,-30.000000,3305000000,3300000000,-64,-24.577515 +1,15,-30.000000,3310000000,3305000000,-63,-24.487000 +1,15,-30.000000,3315000000,3310000000,-63,-24.395440 +1,15,-30.000000,3320000000,3315000000,-63,-24.300420 +1,15,-30.000000,3325000000,3320000000,-63,-24.204722 +1,15,-30.000000,3330000000,3325000000,-63,-24.104360 +1,15,-30.000000,3335000000,3330000000,-63,-24.003937 +1,15,-30.000000,3340000000,3335000000,-63,-23.902421 +1,15,-30.000000,3345000000,3340000000,-63,-23.801221 +1,15,-30.000000,3350000000,3345000000,-63,-23.700096 +1,15,-30.000000,3355000000,3350000000,-63,-23.599607 +1,15,-30.000000,3360000000,3355000000,-62,-23.496559 +1,15,-30.000000,3365000000,3360000000,-62,-23.397186 +1,15,-30.000000,3370000000,3365000000,-62,-23.299116 +1,15,-30.000000,3375000000,3370000000,-62,-23.204177 +1,15,-30.000000,3380000000,3375000000,-62,-23.112140 +1,15,-30.000000,3385000000,3380000000,-62,-23.020775 +1,15,-30.000000,3390000000,3385000000,-62,-22.935549 +1,15,-30.000000,3395000000,3390000000,-62,-22.855762 +1,15,-30.000000,3400000000,3395000000,-62,-22.777860 +1,15,-30.000000,3405000000,3400000000,-62,-22.704585 +1,15,-30.000000,3410000000,3405000000,-62,-22.636551 +1,15,-30.000000,3415000000,3410000000,-62,-22.572163 +1,15,-30.000000,3420000000,3415000000,-62,-22.511270 +1,15,-30.000000,3425000000,3420000000,-62,-22.455730 +1,15,-30.000000,3430000000,3425000000,-62,-22.399721 +1,15,-30.000000,3435000000,3430000000,-62,-22.349304 +1,15,-30.000000,3440000000,3435000000,-61,-22.302336 +1,15,-30.000000,3445000000,3440000000,-61,-22.219575 +1,15,-30.000000,3450000000,3445000000,-61,-22.094266 +1,15,-30.000000,3455000000,3450000000,-61,-22.096770 +1,15,-30.000000,3460000000,3455000000,-61,-22.094567 +1,15,-30.000000,3465000000,3460000000,-61,-22.071201 +1,15,-30.000000,3470000000,3465000000,-61,-22.044509 +1,15,-30.000000,3475000000,3470000000,-61,-22.017173 +1,15,-30.000000,3480000000,3475000000,-61,-21.994700 +1,15,-30.000000,3485000000,3480000000,-61,-21.971968 +1,15,-30.000000,3490000000,3485000000,-61,-21.953979 +1,15,-30.000000,3495000000,3490000000,-61,-21.934393 +1,15,-30.000000,3500000000,3495000000,-61,-21.918812 +1,15,-30.000000,3505000000,3500000000,-61,-21.903592 +1,15,-30.000000,3510000000,3505000000,-61,-21.881944 +1,15,-30.000000,3515000000,3510000000,-61,-21.858154 +1,15,-30.000000,3520000000,3515000000,-61,-21.835179 +1,15,-30.000000,3525000000,3520000000,-61,-21.812900 +1,15,-30.000000,3530000000,3525000000,-61,-21.797911 +1,15,-30.000000,3535000000,3530000000,-61,-21.778334 +1,15,-30.000000,3540000000,3535000000,-61,-21.760017 +1,15,-30.000000,3545000000,3540000000,-61,-21.741893 +1,15,-30.000000,3550000000,3545000000,-61,-21.722389 +1,15,-30.000000,3555000000,3550000000,-61,-21.702318 +1,15,-30.000000,3560000000,3555000000,-61,-21.680693 +1,15,-30.000000,3565000000,3560000000,-61,-21.657762 +1,15,-30.000000,3570000000,3565000000,-61,-21.628758 +1,15,-30.000000,3575000000,3570000000,-61,-21.598986 +1,15,-30.000000,3580000000,3575000000,-61,-21.566508 +1,15,-30.000000,3585000000,3580000000,-61,-21.534926 +1,15,-30.000000,3590000000,3585000000,-61,-21.510479 +1,15,-30.000000,3595000000,3590000000,-60,-21.481370 +1,15,-30.000000,3600000000,3595000000,-60,-21.451023 +1,15,-30.000000,3605000000,3600000000,-61,-21.658115 +1,15,-30.000000,3610000000,3605000000,-61,-21.606254 +1,15,-30.000000,3615000000,3610000000,-61,-21.551150 +1,15,-30.000000,3620000000,3615000000,-61,-21.498292 +1,15,-30.000000,3625000000,3620000000,-60,-21.445710 +1,15,-30.000000,3630000000,3625000000,-60,-21.395882 +1,15,-30.000000,3635000000,3630000000,-60,-21.347368 +1,15,-30.000000,3640000000,3635000000,-60,-21.298757 +1,15,-30.000000,3645000000,3640000000,-60,-21.251830 +1,15,-30.000000,3650000000,3645000000,-60,-21.209016 +1,15,-30.000000,3655000000,3650000000,-60,-21.165104 +1,15,-30.000000,3660000000,3655000000,-60,-21.124298 +1,15,-30.000000,3665000000,3660000000,-60,-21.085823 +1,15,-30.000000,3670000000,3665000000,-60,-21.049716 +1,15,-30.000000,3675000000,3670000000,-60,-21.008183 +1,15,-30.000000,3680000000,3675000000,-60,-20.971319 +1,15,-30.000000,3685000000,3680000000,-60,-20.932237 +1,15,-30.000000,3690000000,3685000000,-60,-20.894156 +1,15,-30.000000,3695000000,3690000000,-60,-20.858280 +1,15,-30.000000,3700000000,3695000000,-60,-20.818624 +1,15,-30.000000,3705000000,3700000000,-60,-20.796324 +1,15,-30.000000,3710000000,3705000000,-60,-20.761732 +1,15,-30.000000,3715000000,3710000000,-60,-20.737681 +1,15,-30.000000,3720000000,3715000000,-60,-20.718119 +1,15,-30.000000,3725000000,3720000000,-60,-20.684953 +1,15,-30.000000,3730000000,3725000000,-60,-20.669855 +1,15,-30.000000,3735000000,3730000000,-60,-20.665144 +1,15,-30.000000,3740000000,3735000000,-60,-20.646790 +1,15,-30.000000,3745000000,3740000000,-60,-20.638454 +1,15,-30.000000,3750000000,3745000000,-60,-20.625929 +1,15,-30.000000,3755000000,3750000000,-60,-20.616829 +1,15,-30.000000,3760000000,3755000000,-60,-20.608361 +1,15,-30.000000,3765000000,3760000000,-60,-20.604816 +1,15,-30.000000,3770000000,3765000000,-60,-20.603265 +1,15,-30.000000,3775000000,3770000000,-60,-20.601302 +1,15,-30.000000,3780000000,3775000000,-60,-20.603828 +1,15,-30.000000,3785000000,3780000000,-60,-20.608303 +1,15,-30.000000,3790000000,3785000000,-60,-20.615245 +1,15,-30.000000,3795000000,3790000000,-60,-20.622987 +1,15,-30.000000,3800000000,3795000000,-60,-20.634883 +1,15,-30.000000,3805000000,3800000000,-60,-20.648175 +1,15,-30.000000,3810000000,3805000000,-60,-20.662910 +1,15,-30.000000,3815000000,3810000000,-60,-20.679447 +1,15,-30.000000,3820000000,3815000000,-60,-20.692187 +1,15,-30.000000,3825000000,3820000000,-60,-20.712659 +1,15,-30.000000,3830000000,3825000000,-60,-20.740302 +1,15,-30.000000,3835000000,3830000000,-60,-20.764675 +1,15,-30.000000,3840000000,3835000000,-60,-20.787716 +1,15,-30.000000,3845000000,3840000000,-60,-20.810242 +1,15,-30.000000,3850000000,3845000000,-60,-20.837056 +1,15,-30.000000,3855000000,3850000000,-60,-20.864552 +1,15,-30.000000,3860000000,3855000000,-60,-20.892431 +1,15,-30.000000,3865000000,3860000000,-60,-20.921143 +1,15,-30.000000,3870000000,3865000000,-60,-20.948505 +1,15,-30.000000,3875000000,3870000000,-60,-20.977970 +1,15,-30.000000,3880000000,3875000000,-60,-21.006039 +1,15,-30.000000,3885000000,3880000000,-60,-21.033743 +1,15,-30.000000,3890000000,3885000000,-60,-21.065520 +1,15,-30.000000,3895000000,3890000000,-60,-21.098753 +1,15,-30.000000,3900000000,3895000000,-60,-21.130550 +1,15,-30.000000,3905000000,3900000000,-60,-21.162426 +1,15,-30.000000,3910000000,3905000000,-60,-21.191041 +1,15,-30.000000,3915000000,3910000000,-60,-21.215892 +1,15,-30.000000,3920000000,3915000000,-60,-21.236055 +1,15,-30.000000,3925000000,3920000000,-60,-21.264581 +1,15,-30.000000,3930000000,3925000000,-60,-21.297189 +1,15,-30.000000,3935000000,3930000000,-60,-21.321827 +1,15,-30.000000,3940000000,3935000000,-60,-21.341422 +1,15,-30.000000,3945000000,3940000000,-60,-21.363312 +1,15,-30.000000,3950000000,3945000000,-60,-21.384334 +1,15,-30.000000,3955000000,3950000000,-60,-21.404623 +1,15,-30.000000,3960000000,3955000000,-60,-21.430816 +1,15,-30.000000,3965000000,3960000000,-60,-21.454936 +1,15,-30.000000,3970000000,3965000000,-60,-21.477602 +1,15,-30.000000,3975000000,3970000000,-61,-21.499639 +1,15,-30.000000,3980000000,3975000000,-61,-21.518326 +1,15,-30.000000,3985000000,3980000000,-61,-21.535003 +1,15,-30.000000,3990000000,3985000000,-61,-21.550521 +1,15,-30.000000,3995000000,3990000000,-61,-21.565224 +1,15,-30.000000,4000000000,3995000000,-61,-21.576152 +1,15,-30.000000,4005000000,4000000000,-61,-21.820437 +1,15,-30.000000,4010000000,4005000000,-61,-21.710447 +1,15,-30.000000,4015000000,4010000000,-61,-21.701933 +1,15,-30.000000,4020000000,4015000000,-61,-21.694144 +1,15,-30.000000,4025000000,4020000000,-61,-21.687431 +1,15,-30.000000,4030000000,4025000000,-61,-21.687968 +1,15,-30.000000,4035000000,4030000000,-61,-21.687664 +1,15,-30.000000,4040000000,4035000000,-61,-21.688891 +1,15,-30.000000,4045000000,4040000000,-61,-21.691840 +1,15,-30.000000,4050000000,4045000000,-61,-21.693348 +1,15,-30.000000,4055000000,4050000000,-61,-21.697983 +1,15,-30.000000,4060000000,4055000000,-61,-21.697340 +1,15,-30.000000,4065000000,4060000000,-61,-21.698267 +1,15,-30.000000,4070000000,4065000000,-61,-21.699606 +1,15,-30.000000,4075000000,4070000000,-61,-21.703056 +1,15,-30.000000,4080000000,4075000000,-61,-21.701619 +1,15,-30.000000,4085000000,4080000000,-61,-21.688911 +1,15,-30.000000,4090000000,4085000000,-61,-21.675912 +1,15,-30.000000,4095000000,4090000000,-61,-21.664134 +1,15,-30.000000,4100000000,4095000000,-61,-21.654502 +1,15,-30.000000,4105000000,4100000000,-61,-21.642400 +1,15,-30.000000,4110000000,4105000000,-61,-21.629351 +1,15,-30.000000,4115000000,4110000000,-61,-21.617978 +1,15,-30.000000,4120000000,4115000000,-61,-21.607297 +1,15,-30.000000,4125000000,4120000000,-61,-21.595364 +1,15,-30.000000,4130000000,4125000000,-61,-21.586701 +1,15,-30.000000,4135000000,4130000000,-61,-21.578996 +1,15,-30.000000,4140000000,4135000000,-61,-21.572578 +1,15,-30.000000,4145000000,4140000000,-61,-21.563451 +1,15,-30.000000,4150000000,4145000000,-61,-21.556421 +1,15,-30.000000,4155000000,4150000000,-61,-21.552568 +1,15,-30.000000,4160000000,4155000000,-61,-21.548392 +1,15,-30.000000,4165000000,4160000000,-61,-21.541688 +1,15,-30.000000,4170000000,4165000000,-61,-21.538966 +1,15,-30.000000,4175000000,4170000000,-61,-21.535585 +1,15,-30.000000,4180000000,4175000000,-61,-21.539053 +1,15,-30.000000,4185000000,4180000000,-61,-21.534739 +1,15,-30.000000,4190000000,4185000000,-61,-21.530889 +1,15,-30.000000,4195000000,4190000000,-61,-21.528414 +1,15,-30.000000,4200000000,4195000000,-61,-21.527321 +1,15,-30.000000,4205000000,4200000000,-61,-21.528758 +1,15,-30.000000,4210000000,4205000000,-61,-21.532195 +1,15,-30.000000,4215000000,4210000000,-61,-21.533586 +1,15,-30.000000,4220000000,4215000000,-61,-21.535138 +1,15,-30.000000,4225000000,4220000000,-61,-21.544447 +1,15,-30.000000,4230000000,4225000000,-61,-21.559241 +1,15,-30.000000,4235000000,4230000000,-61,-21.570769 +1,15,-30.000000,4240000000,4235000000,-61,-21.582513 +1,15,-30.000000,4245000000,4240000000,-61,-21.595726 +1,15,-30.000000,4250000000,4245000000,-61,-21.613693 +1,15,-30.000000,4255000000,4250000000,-61,-21.630581 +1,15,-30.000000,4260000000,4255000000,-61,-21.649167 +1,15,-30.000000,4265000000,4260000000,-61,-21.668468 +1,15,-30.000000,4270000000,4265000000,-61,-21.687942 +1,15,-30.000000,4275000000,4270000000,-61,-21.713784 +1,15,-30.000000,4280000000,4275000000,-61,-21.740057 +1,15,-30.000000,4285000000,4280000000,-61,-21.766736 +1,15,-30.000000,4290000000,4285000000,-61,-21.792486 +1,15,-30.000000,4295000000,4290000000,-61,-21.819994 +1,15,-30.000000,4300000000,4295000000,-61,-21.857501 +1,15,-30.000000,4305000000,4300000000,-61,-21.892558 +1,15,-30.000000,4310000000,4305000000,-61,-21.926641 +1,15,-30.000000,4315000000,4310000000,-61,-21.953377 +1,15,-30.000000,4320000000,4315000000,-61,-21.987557 +1,15,-30.000000,4325000000,4320000000,-61,-22.023401 +1,15,-30.000000,4330000000,4325000000,-61,-22.056091 +1,15,-30.000000,4335000000,4330000000,-61,-22.093055 +1,15,-30.000000,4340000000,4335000000,-61,-22.119078 +1,15,-30.000000,4345000000,4340000000,-61,-22.125175 +1,15,-30.000000,4350000000,4345000000,-61,-22.092817 +1,15,-30.000000,4355000000,4350000000,-61,-22.053768 +1,15,-30.000000,4360000000,4355000000,-61,-22.021360 +1,15,-30.000000,4365000000,4360000000,-61,-21.985181 +1,15,-30.000000,4370000000,4365000000,-61,-21.967032 +1,15,-30.000000,4375000000,4370000000,-61,-21.952931 +1,15,-30.000000,4380000000,4375000000,-61,-21.929823 +1,15,-30.000000,4385000000,4380000000,-61,-21.918529 +1,15,-30.000000,4390000000,4385000000,-61,-21.917369 +1,15,-30.000000,4395000000,4390000000,-61,-21.934721 +1,15,-30.000000,4400000000,4395000000,-61,-21.938622 +1,15,-30.000000,4405000000,4400000000,-61,-21.933613 +1,15,-30.000000,4410000000,4405000000,-61,-21.940233 +1,15,-30.000000,4415000000,4410000000,-61,-21.963250 +1,15,-30.000000,4420000000,4415000000,-61,-22.088728 +1,15,-30.000000,4425000000,4420000000,-62,-22.613695 +1,15,-30.000000,4430000000,4425000000,-62,-22.578180 +1,15,-30.000000,4435000000,4430000000,-62,-22.594880 +1,15,-30.000000,4440000000,4435000000,-62,-22.613012 +1,15,-30.000000,4445000000,4440000000,-62,-22.629123 +1,15,-30.000000,4450000000,4445000000,-62,-22.647166 +1,15,-30.000000,4455000000,4450000000,-62,-22.656758 +1,15,-30.000000,4460000000,4455000000,-62,-22.677039 +1,15,-30.000000,4465000000,4460000000,-62,-22.683415 +1,15,-30.000000,4470000000,4465000000,-62,-22.696525 +1,15,-30.000000,4475000000,4470000000,-62,-22.711792 +1,15,-30.000000,4480000000,4475000000,-62,-22.726603 +1,15,-30.000000,4485000000,4480000000,-62,-22.740653 +1,15,-30.000000,4490000000,4485000000,-62,-22.752318 +1,15,-30.000000,4495000000,4490000000,-62,-22.757554 +1,15,-30.000000,4500000000,4495000000,-62,-22.769429 +1,15,-30.000000,4505000000,4500000000,-62,-22.780706 +1,15,-30.000000,4510000000,4505000000,-62,-22.785532 +1,15,-30.000000,4515000000,4510000000,-62,-22.791636 +1,15,-30.000000,4520000000,4515000000,-62,-22.798101 +1,15,-30.000000,4525000000,4520000000,-62,-22.805988 +1,15,-30.000000,4530000000,4525000000,-62,-22.807731 +1,15,-30.000000,4535000000,4530000000,-62,-22.818803 +1,15,-30.000000,4540000000,4535000000,-62,-22.830386 +1,15,-30.000000,4545000000,4540000000,-62,-22.842595 +1,15,-30.000000,4550000000,4545000000,-62,-22.855033 +1,15,-30.000000,4555000000,4550000000,-62,-22.858097 +1,15,-30.000000,4560000000,4555000000,-62,-22.870665 +1,15,-30.000000,4565000000,4560000000,-62,-22.877326 +1,15,-30.000000,4570000000,4565000000,-62,-22.886921 +1,15,-30.000000,4575000000,4570000000,-62,-22.888771 +1,15,-30.000000,4580000000,4575000000,-62,-22.898735 +1,15,-30.000000,4585000000,4580000000,-62,-22.906489 +1,15,-30.000000,4590000000,4585000000,-62,-22.913969 +1,15,-30.000000,4595000000,4590000000,-62,-22.921488 +1,15,-30.000000,4600000000,4595000000,-62,-22.918186 +1,15,-30.000000,4605000000,4600000000,-62,-22.925094 +1,15,-30.000000,4610000000,4605000000,-62,-22.936141 +1,15,-30.000000,4615000000,4610000000,-62,-22.945979 +1,15,-30.000000,4620000000,4615000000,-62,-22.950723 +1,15,-30.000000,4625000000,4620000000,-62,-22.959934 +1,15,-30.000000,4630000000,4625000000,-62,-22.967793 +1,15,-30.000000,4635000000,4630000000,-62,-22.976633 +1,15,-30.000000,4640000000,4635000000,-62,-22.984785 +1,15,-30.000000,4645000000,4640000000,-62,-22.980625 +1,15,-30.000000,4650000000,4645000000,-62,-22.988078 +1,15,-30.000000,4655000000,4650000000,-62,-22.992822 +1,15,-30.000000,4660000000,4655000000,-62,-23.001931 +1,15,-30.000000,4665000000,4660000000,-62,-22.998954 +1,15,-30.000000,4670000000,4665000000,-62,-23.003212 +1,15,-30.000000,4675000000,4670000000,-62,-23.006390 +1,15,-30.000000,4680000000,4675000000,-62,-23.013846 +1,15,-30.000000,4685000000,4680000000,-62,-23.027014 +1,15,-30.000000,4690000000,4685000000,-62,-23.038904 +1,15,-30.000000,4695000000,4690000000,-62,-23.039799 +1,15,-30.000000,4700000000,4695000000,-62,-23.046387 +1,15,-30.000000,4705000000,4700000000,-62,-23.063977 +1,15,-30.000000,4710000000,4705000000,-62,-23.080988 +1,15,-30.000000,4715000000,4710000000,-62,-23.088817 +1,15,-30.000000,4720000000,4715000000,-62,-23.105339 +1,15,-30.000000,4725000000,4720000000,-62,-23.117231 +1,15,-30.000000,4730000000,4725000000,-62,-23.125737 +1,15,-30.000000,4735000000,4730000000,-62,-23.142641 +1,15,-30.000000,4740000000,4735000000,-62,-23.160920 +1,15,-30.000000,4745000000,4740000000,-62,-23.176371 +1,15,-30.000000,4750000000,4745000000,-62,-23.189546 +1,15,-30.000000,4755000000,4750000000,-62,-23.200627 +1,15,-30.000000,4760000000,4755000000,-62,-23.213801 +1,15,-30.000000,4765000000,4760000000,-62,-23.214069 +1,15,-30.000000,4770000000,4765000000,-62,-23.224218 +1,15,-30.000000,4775000000,4770000000,-62,-23.233928 +1,15,-30.000000,4780000000,4775000000,-62,-23.247252 +1,15,-30.000000,4785000000,4780000000,-62,-23.259912 +1,15,-30.000000,4790000000,4785000000,-62,-23.270610 +1,15,-30.000000,4795000000,4790000000,-62,-23.283568 +1,15,-30.000000,4800000000,4795000000,-62,-23.297644 +1,15,-30.000000,4805000000,4800000000,-62,-23.319064 +1,15,-30.000000,4810000000,4805000000,-62,-23.343391 +1,15,-30.000000,4815000000,4810000000,-62,-23.366601 +1,15,-30.000000,4820000000,4815000000,-62,-23.383165 +1,15,-30.000000,4825000000,4820000000,-62,-23.402598 +1,15,-30.000000,4830000000,4825000000,-62,-23.418225 +1,15,-30.000000,4835000000,4830000000,-62,-23.438720 +1,15,-30.000000,4840000000,4835000000,-62,-23.460085 +1,15,-30.000000,4845000000,4840000000,-62,-23.484492 +1,15,-30.000000,4850000000,4845000000,-62,-23.492085 +1,15,-30.000000,4855000000,4850000000,-62,-23.507940 +1,15,-30.000000,4860000000,4855000000,-62,-23.525624 +1,15,-30.000000,4865000000,4860000000,-62,-23.531610 +1,15,-30.000000,4870000000,4865000000,-62,-23.552014 +1,15,-30.000000,4875000000,4870000000,-62,-23.563330 +1,15,-30.000000,4880000000,4875000000,-63,-23.593218 +1,15,-30.000000,4885000000,4880000000,-63,-23.608712 +1,15,-30.000000,4890000000,4885000000,-63,-23.613521 +1,15,-30.000000,4895000000,4890000000,-63,-23.636306 +1,15,-30.000000,4900000000,4895000000,-63,-23.651498 +1,15,-30.000000,4905000000,4900000000,-63,-23.670238 +1,15,-30.000000,4910000000,4905000000,-63,-23.692163 +1,15,-30.000000,4915000000,4910000000,-63,-23.720011 +1,15,-30.000000,4920000000,4915000000,-63,-23.740498 +1,15,-30.000000,4925000000,4920000000,-63,-23.757099 +1,15,-30.000000,4930000000,4925000000,-63,-23.777678 +1,15,-30.000000,4935000000,4930000000,-63,-23.801264 +1,15,-30.000000,4940000000,4935000000,-63,-23.828147 +1,15,-30.000000,4945000000,4940000000,-63,-23.847997 +1,15,-30.000000,4950000000,4945000000,-63,-23.870066 +1,15,-30.000000,4955000000,4950000000,-63,-23.890888 +1,15,-30.000000,4960000000,4955000000,-63,-23.912589 +1,15,-30.000000,4965000000,4960000000,-63,-23.926167 +1,15,-30.000000,4970000000,4965000000,-63,-23.945964 +1,15,-30.000000,4975000000,4970000000,-63,-23.966266 +1,15,-30.000000,4980000000,4975000000,-63,-24.000404 +1,15,-30.000000,4985000000,4980000000,-63,-24.021696 +1,15,-30.000000,4990000000,4985000000,-63,-24.050275 +1,15,-30.000000,4995000000,4990000000,-63,-24.103147 +1,15,-30.000000,5000000000,4995000000,-63,-24.153988 +1,15,-30.000000,5005000000,5000000000,-63,-24.238550 +1,15,-30.000000,5010000000,5005000000,-63,-24.235274 +1,15,-30.000000,5015000000,5010000000,-63,-24.238420 +1,15,-30.000000,5020000000,5015000000,-63,-24.248800 +1,15,-30.000000,5025000000,5020000000,-63,-24.263168 +1,15,-30.000000,5030000000,5025000000,-63,-24.289712 +1,15,-30.000000,5035000000,5030000000,-63,-24.312019 +1,15,-30.000000,5040000000,5035000000,-63,-24.337762 +1,15,-30.000000,5045000000,5040000000,-63,-24.366512 +1,15,-30.000000,5050000000,5045000000,-63,-24.397465 +1,15,-30.000000,5055000000,5050000000,-63,-24.432016 +1,15,-30.000000,5060000000,5055000000,-63,-24.475484 +1,15,-30.000000,5065000000,5060000000,-64,-24.521121 +1,15,-30.000000,5070000000,5065000000,-64,-24.568504 +1,15,-30.000000,5075000000,5070000000,-64,-24.618400 +1,15,-30.000000,5080000000,5075000000,-64,-24.671768 +1,15,-30.000000,5085000000,5080000000,-64,-24.728749 +1,15,-30.000000,5090000000,5085000000,-64,-24.783689 +1,15,-30.000000,5095000000,5090000000,-64,-24.844259 +1,15,-30.000000,5100000000,5095000000,-64,-24.906146 +1,15,-30.000000,5105000000,5100000000,-64,-24.969969 +1,15,-30.000000,5110000000,5105000000,-64,-25.034961 +1,15,-30.000000,5115000000,5110000000,-64,-25.099374 +1,15,-30.000000,5120000000,5115000000,-64,-25.110788 +1,15,-30.000000,5125000000,5120000000,-64,-25.053066 +1,15,-30.000000,5130000000,5125000000,-64,-25.001393 +1,15,-30.000000,5135000000,5130000000,-64,-24.975479 +1,15,-30.000000,5140000000,5135000000,-64,-24.972677 +1,15,-30.000000,5145000000,5140000000,-64,-24.989301 +1,15,-30.000000,5150000000,5145000000,-65,-25.737512 +1,15,-30.000000,5155000000,5150000000,-65,-25.700697 +1,15,-30.000000,5160000000,5155000000,-65,-25.752079 +1,15,-30.000000,5165000000,5160000000,-65,-25.818100 +1,15,-30.000000,5170000000,5165000000,-65,-25.886014 +1,15,-30.000000,5175000000,5170000000,-65,-25.953007 +1,15,-30.000000,5180000000,5175000000,-65,-26.018778 +1,15,-30.000000,5185000000,5180000000,-65,-26.082981 +1,15,-30.000000,5190000000,5185000000,-65,-26.149417 +1,15,-30.000000,5195000000,5190000000,-65,-26.209838 +1,15,-30.000000,5200000000,5195000000,-65,-26.267668 +1,15,-30.000000,5205000000,5200000000,-65,-26.327436 +1,15,-30.000000,5210000000,5205000000,-65,-26.380178 +1,15,-30.000000,5215000000,5210000000,-65,-26.445868 +1,15,-30.000000,5220000000,5215000000,-65,-26.509385 +1,15,-30.000000,5225000000,5220000000,-65,-26.566079 +1,15,-30.000000,5230000000,5225000000,-66,-26.639112 +1,15,-30.000000,5235000000,5230000000,-66,-26.679185 +1,15,-30.000000,5240000000,5235000000,-66,-26.733291 +1,15,-30.000000,5245000000,5240000000,-66,-26.783706 +1,15,-30.000000,5250000000,5245000000,-66,-26.829272 +1,15,-30.000000,5255000000,5250000000,-66,-26.874859 +1,15,-30.000000,5260000000,5255000000,-66,-26.919735 +1,15,-30.000000,5265000000,5260000000,-66,-26.961765 +1,15,-30.000000,5270000000,5265000000,-66,-26.991075 +1,15,-30.000000,5275000000,5270000000,-66,-27.026552 +1,15,-30.000000,5280000000,5275000000,-66,-27.061746 +1,15,-30.000000,5285000000,5280000000,-66,-27.098741 +1,15,-30.000000,5290000000,5285000000,-66,-27.130634 +1,15,-30.000000,5295000000,5290000000,-66,-27.164199 +1,15,-30.000000,5300000000,5295000000,-66,-27.197074 +1,15,-30.000000,5305000000,5300000000,-66,-27.229476 +1,15,-30.000000,5310000000,5305000000,-66,-27.251601 +1,15,-30.000000,5315000000,5310000000,-66,-27.261319 +1,15,-30.000000,5320000000,5315000000,-66,-27.284707 +1,15,-30.000000,5325000000,5320000000,-66,-27.313179 +1,15,-30.000000,5330000000,5325000000,-66,-27.337633 +1,15,-30.000000,5335000000,5330000000,-66,-27.363891 +1,15,-30.000000,5340000000,5335000000,-66,-27.394636 +1,15,-30.000000,5345000000,5340000000,-66,-27.427618 +1,15,-30.000000,5350000000,5345000000,-66,-27.461683 +1,15,-30.000000,5355000000,5350000000,-66,-27.486806 +1,15,-30.000000,5360000000,5355000000,-66,-27.538308 +1,15,-30.000000,5365000000,5360000000,-67,-27.589578 +1,15,-30.000000,5370000000,5365000000,-67,-27.646573 +1,15,-30.000000,5375000000,5370000000,-67,-27.705945 +1,15,-30.000000,5380000000,5375000000,-67,-27.766359 +1,15,-30.000000,5385000000,5380000000,-67,-27.831652 +1,15,-30.000000,5390000000,5385000000,-67,-27.896583 +1,15,-30.000000,5395000000,5390000000,-67,-27.966124 +1,15,-30.000000,5400000000,5395000000,-67,-28.025399 +1,15,-30.000000,5405000000,5400000000,-67,-28.096944 +1,15,-30.000000,5410000000,5405000000,-67,-28.113026 +1,15,-30.000000,5415000000,5410000000,-67,-28.076030 +1,15,-30.000000,5420000000,5415000000,-67,-28.036072 +1,15,-30.000000,5425000000,5420000000,-67,-27.986731 +1,15,-30.000000,5430000000,5425000000,-67,-27.980085 +1,15,-30.000000,5435000000,5430000000,-67,-27.998972 +1,15,-30.000000,5440000000,5435000000,-67,-28.029794 +1,15,-30.000000,5445000000,5440000000,-67,-28.607065 +1,15,-30.000000,5450000000,5445000000,-68,-28.804509 +1,15,-30.000000,5455000000,5450000000,-68,-28.787089 +1,15,-30.000000,5460000000,5455000000,-68,-28.837244 +1,15,-30.000000,5465000000,5460000000,-68,-28.907808 +1,15,-30.000000,5470000000,5465000000,-68,-28.980372 +1,15,-30.000000,5475000000,5470000000,-68,-29.047568 +1,15,-30.000000,5480000000,5475000000,-68,-29.099703 +1,15,-30.000000,5485000000,5480000000,-68,-29.174306 +1,15,-30.000000,5490000000,5485000000,-68,-29.232609 +1,15,-30.000000,5495000000,5490000000,-68,-29.275874 +1,15,-30.000000,5500000000,5495000000,-68,-29.323579 +1,15,-30.000000,5505000000,5500000000,-68,-29.368139 +1,15,-30.000000,5510000000,5505000000,-68,-29.394209 +1,15,-30.000000,5515000000,5510000000,-68,-29.405487 +1,15,-30.000000,5520000000,5515000000,-68,-29.423242 +1,15,-30.000000,5525000000,5520000000,-68,-29.434399 +1,15,-30.000000,5530000000,5525000000,-68,-29.440224 +1,15,-30.000000,5535000000,5530000000,-68,-29.443966 +1,15,-30.000000,5540000000,5535000000,-68,-29.441675 +1,15,-30.000000,5545000000,5540000000,-68,-29.438446 +1,15,-30.000000,5550000000,5545000000,-68,-29.417121 +1,15,-30.000000,5555000000,5550000000,-68,-29.403867 +1,15,-30.000000,5560000000,5555000000,-68,-29.380027 +1,15,-30.000000,5565000000,5560000000,-68,-29.352755 +1,15,-30.000000,5570000000,5565000000,-68,-29.310519 +1,15,-30.000000,5575000000,5570000000,-68,-29.278369 +1,15,-30.000000,5580000000,5575000000,-68,-29.237986 +1,15,-30.000000,5585000000,5580000000,-68,-29.197052 +1,15,-30.000000,5590000000,5585000000,-68,-29.154610 +1,15,-30.000000,5595000000,5590000000,-68,-29.099816 +1,15,-30.000000,5600000000,5595000000,-68,-29.052427 +1,15,-30.000000,5605000000,5600000000,-68,-29.005241 +1,15,-30.000000,5610000000,5605000000,-68,-28.963899 +1,15,-30.000000,5615000000,5610000000,-68,-28.915385 +1,15,-30.000000,5620000000,5615000000,-68,-28.876066 +1,15,-30.000000,5625000000,5620000000,-68,-28.834734 +1,15,-30.000000,5630000000,5625000000,-68,-28.797070 +1,15,-30.000000,5635000000,5630000000,-68,-28.762533 +1,15,-30.000000,5640000000,5635000000,-68,-28.721934 +1,15,-30.000000,5645000000,5640000000,-68,-28.691799 +1,15,-30.000000,5650000000,5645000000,-68,-28.670955 +1,15,-30.000000,5655000000,5650000000,-68,-28.651258 +1,15,-30.000000,5660000000,5655000000,-68,-28.619380 +1,15,-30.000000,5665000000,5660000000,-68,-28.600118 +1,15,-30.000000,5670000000,5665000000,-68,-28.587231 +1,15,-30.000000,5675000000,5670000000,-68,-28.578674 +1,15,-30.000000,5680000000,5675000000,-68,-28.568899 +1,15,-30.000000,5685000000,5680000000,-68,-28.573262 +1,15,-30.000000,5690000000,5685000000,-68,-28.589041 +1,15,-30.000000,5695000000,5690000000,-68,-28.603530 +1,15,-30.000000,5700000000,5695000000,-68,-28.627792 +1,15,-30.000000,5705000000,5700000000,-68,-28.647372 +1,15,-30.000000,5710000000,5705000000,-68,-28.691647 +1,15,-30.000000,5715000000,5710000000,-68,-28.740465 +1,15,-30.000000,5720000000,5715000000,-68,-28.793347 +1,15,-30.000000,5725000000,5720000000,-68,-28.848032 +1,15,-30.000000,5730000000,5725000000,-68,-28.906323 +1,15,-30.000000,5735000000,5730000000,-68,-28.950233 +1,15,-30.000000,5740000000,5735000000,-68,-29.013117 +1,15,-30.000000,5745000000,5740000000,-68,-29.077295 +1,15,-30.000000,5750000000,5745000000,-68,-29.140343 +1,15,-30.000000,5755000000,5750000000,-68,-29.204853 +1,15,-30.000000,5760000000,5755000000,-68,-29.247761 +1,15,-30.000000,5765000000,5760000000,-68,-29.284077 +1,15,-30.000000,5770000000,5765000000,-68,-29.326529 +1,15,-30.000000,5775000000,5770000000,-68,-29.362827 +1,15,-30.000000,5780000000,5775000000,-68,-29.396941 +1,15,-30.000000,5785000000,5780000000,-68,-29.422791 +1,15,-30.000000,5790000000,5785000000,-68,-29.449845 +1,15,-30.000000,5795000000,5790000000,-68,-29.473785 +1,15,-30.000000,5800000000,5795000000,-68,-29.494352 +1,15,-30.000000,5805000000,5800000000,-68,-29.510043 +1,15,-30.000000,5810000000,5805000000,-68,-29.538887 +1,15,-30.000000,5815000000,5810000000,-68,-29.577381 +1,15,-30.000000,5820000000,5815000000,-68,-29.600165 +1,15,-30.000000,5825000000,5820000000,-68,-29.626486 +1,15,-30.000000,5830000000,5825000000,-68,-29.647167 +1,15,-30.000000,5835000000,5830000000,-68,-29.664285 +1,15,-30.000000,5840000000,5835000000,-68,-29.669695 +1,15,-30.000000,5845000000,5840000000,-68,-29.674017 +1,15,-30.000000,5850000000,5845000000,-68,-29.669046 +1,15,-30.000000,5855000000,5850000000,-68,-29.670205 +1,15,-30.000000,5860000000,5855000000,-68,-29.650669 +1,15,-30.000000,5865000000,5860000000,-68,-29.625199 +1,15,-30.000000,5870000000,5865000000,-68,-29.591322 +1,15,-30.000000,5875000000,5870000000,-68,-29.550845 +1,15,-30.000000,5880000000,5875000000,-68,-29.520992 +1,15,-30.000000,5885000000,5880000000,-68,-29.484316 +1,15,-30.000000,5890000000,5885000000,-68,-29.437877 +1,15,-30.000000,5895000000,5890000000,-68,-29.396130 +1,15,-30.000000,5900000000,5895000000,-68,-29.353721 +1,15,-30.000000,5905000000,5900000000,-68,-29.300210 +1,15,-30.000000,5910000000,5905000000,-68,-29.224593 +1,15,-30.000000,5915000000,5910000000,-68,-29.156660 +1,15,-30.000000,5920000000,5915000000,-68,-29.083403 +1,15,-30.000000,5925000000,5920000000,-68,-28.991188 +1,15,-30.000000,5930000000,5925000000,-68,-28.921525 +1,15,-30.000000,5935000000,5930000000,-68,-28.844824 +1,15,-30.000000,5940000000,5935000000,-68,-28.779085 +1,15,-30.000000,5945000000,5940000000,-68,-28.704002 +1,15,-30.000000,5950000000,5945000000,-68,-28.640918 +1,15,-30.000000,5955000000,5950000000,-68,-28.575780 +1,15,-30.000000,5960000000,5955000000,-68,-28.505040 +1,15,-30.000000,5965000000,5960000000,-68,-28.439508 +1,15,-30.000000,5970000000,5965000000,-67,-28.359362 +1,15,-30.000000,5975000000,5970000000,-67,-28.299457 +1,15,-30.000000,5980000000,5975000000,-67,-28.140287 +1,15,-30.000000,5985000000,5980000000,-67,-28.065858 +1,15,-30.000000,5990000000,5985000000,-67,-28.078890 +1,15,-30.000000,5995000000,5990000000,-67,-28.082584 +1,15,-30.000000,6000000000,5995000000,-67,-28.077990 +1,15,-30.000000,6005000000,6000000000,-67,-28.072972 diff --git a/host/libraries/libbladeRF_test/test_gain_calibration/example_measurements/tx_sweep.csv b/host/libraries/libbladeRF_test/test_gain_calibration/example_measurements/tx_sweep.csv new file mode 100644 index 00000000..596c81f2 --- /dev/null +++ b/host/libraries/libbladeRF_test/test_gain_calibration/example_measurements/tx_sweep.csv @@ -0,0 +1,4750 @@ +TX Chain,TX Gain,Frequency of Signal (Hz),Frequency of bladeRF+PXI (Hz),VSA Measured Power (dBm) +0,60,70000000,65000000,4.100207 +0,60,75000000,70000000,4.117410 +0,60,80000000,75000000,4.090445 +0,60,85000000,80000000,4.025778 +0,60,90000000,85000000,3.934039 +0,60,95000000,90000000,3.844343 +0,60,100000000,95000000,3.871344 +0,60,105000000,100000000,3.785587 +0,60,110000000,105000000,3.767367 +0,60,115000000,110000000,3.615436 +0,60,120000000,115000000,3.566799 +0,60,125000000,120000000,3.584680 +0,60,130000000,125000000,3.589748 +0,60,135000000,130000000,3.604699 +0,60,140000000,135000000,3.612587 +0,60,145000000,140000000,3.626826 +0,60,150000000,145000000,3.626935 +0,60,155000000,150000000,3.603232 +0,60,160000000,155000000,3.574549 +0,60,165000000,160000000,3.558617 +0,60,170000000,165000000,3.543334 +0,60,175000000,170000000,3.527882 +0,60,180000000,175000000,3.528922 +0,60,185000000,180000000,3.502194 +0,60,190000000,185000000,3.446954 +0,60,195000000,190000000,3.481058 +0,60,200000000,195000000,3.473717 +0,60,205000000,200000000,3.455364 +0,60,210000000,205000000,3.435344 +0,60,215000000,210000000,3.429107 +0,60,220000000,215000000,3.425639 +0,60,225000000,220000000,3.412198 +0,60,230000000,225000000,3.409889 +0,60,235000000,230000000,3.368693 +0,60,240000000,235000000,3.343763 +0,60,245000000,240000000,3.374059 +0,60,250000000,245000000,3.362444 +0,60,255000000,250000000,3.330861 +0,60,260000000,255000000,3.307332 +0,60,265000000,260000000,3.290796 +0,60,270000000,265000000,3.272395 +0,60,275000000,270000000,3.254999 +0,60,280000000,275000000,3.240390 +0,60,285000000,280000000,3.220819 +0,60,290000000,285000000,3.214519 +0,60,295000000,290000000,3.187660 +0,60,300000000,295000000,3.184402 +0,60,305000000,300000000,3.161516 +0,60,310000000,305000000,3.145835 +0,60,315000000,310000000,3.131355 +0,60,320000000,315000000,3.105888 +0,60,325000000,320000000,3.090490 +0,60,330000000,325000000,3.070736 +0,60,335000000,330000000,3.058477 +0,60,340000000,335000000,3.040255 +0,60,345000000,340000000,3.016973 +0,60,350000000,345000000,2.997852 +0,60,355000000,350000000,2.978938 +0,60,360000000,355000000,2.968213 +0,60,365000000,360000000,2.955035 +0,60,370000000,365000000,2.938246 +0,60,375000000,370000000,2.926618 +0,60,380000000,375000000,2.919523 +0,60,385000000,380000000,2.910882 +0,60,390000000,385000000,2.895546 +0,60,395000000,390000000,2.862972 +0,60,400000000,395000000,2.837660 +0,60,405000000,400000000,2.829471 +0,60,410000000,405000000,2.801215 +0,60,415000000,410000000,2.795871 +0,60,420000000,415000000,2.784296 +0,60,425000000,420000000,2.780258 +0,60,430000000,425000000,2.762303 +0,60,435000000,430000000,2.765986 +0,60,440000000,435000000,2.749333 +0,60,445000000,440000000,2.749321 +0,60,450000000,445000000,2.743017 +0,60,455000000,450000000,2.736214 +0,60,460000000,455000000,2.715966 +0,60,465000000,460000000,2.715687 +0,60,470000000,465000000,2.699097 +0,60,475000000,470000000,2.682015 +0,60,480000000,475000000,2.676703 +0,60,485000000,480000000,2.660604 +0,60,490000000,485000000,2.651461 +0,60,495000000,490000000,2.638682 +0,60,500000000,495000000,2.623897 +0,60,505000000,500000000,2.584755 +0,60,510000000,505000000,2.545155 +0,60,515000000,510000000,2.566971 +0,60,520000000,515000000,2.538168 +0,60,525000000,520000000,2.520592 +0,60,530000000,525000000,2.483552 +0,60,535000000,530000000,2.462786 +0,60,540000000,535000000,2.423191 +0,60,545000000,540000000,2.393252 +0,60,550000000,545000000,2.351417 +0,60,555000000,550000000,2.293041 +0,60,560000000,555000000,2.288487 +0,60,565000000,560000000,2.230287 +0,60,570000000,565000000,2.187160 +0,60,575000000,570000000,2.108589 +0,60,580000000,575000000,2.077314 +0,60,585000000,580000000,2.057639 +0,60,590000000,585000000,2.004828 +0,60,595000000,590000000,1.954864 +0,60,600000000,595000000,1.917828 +0,60,605000000,600000000,1.727982 +0,60,610000000,605000000,1.719493 +0,60,615000000,610000000,1.681028 +0,60,620000000,615000000,1.647068 +0,60,625000000,620000000,1.612090 +0,60,630000000,625000000,1.573383 +0,60,635000000,630000000,1.529281 +0,60,640000000,635000000,1.500827 +0,60,645000000,640000000,1.450382 +0,60,650000000,645000000,1.405465 +0,60,655000000,650000000,1.363183 +0,60,660000000,655000000,1.318748 +0,60,665000000,660000000,1.296402 +0,60,670000000,665000000,1.254725 +0,60,675000000,670000000,1.230021 +0,60,680000000,675000000,1.200782 +0,60,685000000,680000000,1.163460 +0,60,690000000,685000000,1.136600 +0,60,695000000,690000000,1.125448 +0,60,700000000,695000000,1.098023 +0,60,705000000,700000000,1.081932 +0,60,710000000,705000000,1.069146 +0,60,715000000,710000000,1.051098 +0,60,720000000,715000000,1.042533 +0,60,725000000,720000000,1.033827 +0,60,730000000,725000000,1.031149 +0,60,735000000,730000000,1.018054 +0,60,740000000,735000000,1.008513 +0,60,745000000,740000000,0.969678 +0,60,750000000,745000000,0.965921 +0,60,755000000,750000000,0.998602 +0,60,760000000,755000000,1.001951 +0,60,765000000,760000000,1.034698 +0,60,770000000,765000000,1.086311 +0,60,775000000,770000000,1.165109 +0,60,780000000,775000000,1.243008 +0,60,785000000,780000000,1.311599 +0,60,790000000,785000000,1.378720 +0,60,795000000,790000000,1.434776 +0,60,800000000,795000000,1.468162 +0,60,805000000,800000000,1.499904 +0,60,810000000,805000000,1.536328 +0,60,815000000,810000000,1.556228 +0,60,820000000,815000000,1.550649 +0,60,825000000,820000000,1.584968 +0,60,830000000,825000000,1.585622 +0,60,835000000,830000000,1.606185 +0,60,840000000,835000000,1.609065 +0,60,845000000,840000000,1.614859 +0,60,850000000,845000000,1.596565 +0,60,855000000,850000000,1.593633 +0,60,860000000,855000000,1.624001 +0,60,865000000,860000000,1.624742 +0,60,870000000,865000000,1.613882 +0,60,875000000,870000000,1.618675 +0,60,880000000,875000000,1.601451 +0,60,885000000,880000000,1.557326 +0,60,890000000,885000000,1.587776 +0,60,895000000,890000000,1.584444 +0,60,900000000,895000000,1.559692 +0,60,905000000,900000000,1.550224 +0,60,910000000,905000000,1.545286 +0,60,915000000,910000000,1.524808 +0,60,920000000,915000000,1.477037 +0,60,925000000,920000000,1.517860 +0,60,930000000,925000000,1.506921 +0,60,935000000,930000000,1.506194 +0,60,940000000,935000000,1.497744 +0,60,945000000,940000000,1.490135 +0,60,950000000,945000000,1.472929 +0,60,955000000,950000000,1.473499 +0,60,960000000,955000000,1.474783 +0,60,965000000,960000000,1.486550 +0,60,970000000,965000000,1.488926 +0,60,975000000,970000000,1.486826 +0,60,980000000,975000000,1.501254 +0,60,985000000,980000000,1.507246 +0,60,990000000,985000000,1.528698 +0,60,995000000,990000000,1.537860 +0,60,1000000000,995000000,1.557559 +0,60,1005000000,1000000000,1.369053 +0,60,1010000000,1005000000,1.419129 +0,60,1015000000,1010000000,1.454693 +0,60,1020000000,1015000000,1.455807 +0,60,1025000000,1020000000,1.520443 +0,60,1030000000,1025000000,1.568028 +0,60,1035000000,1030000000,1.593800 +0,60,1040000000,1035000000,1.624949 +0,60,1045000000,1040000000,1.652751 +0,60,1050000000,1045000000,1.681448 +0,60,1055000000,1050000000,1.682385 +0,60,1060000000,1055000000,1.734417 +0,60,1065000000,1060000000,1.757591 +0,60,1070000000,1065000000,1.743294 +0,60,1075000000,1070000000,1.793344 +0,60,1080000000,1075000000,1.809212 +0,60,1085000000,1080000000,1.820983 +0,60,1090000000,1085000000,1.830323 +0,60,1095000000,1090000000,1.832661 +0,60,1100000000,1095000000,1.841450 +0,60,1105000000,1100000000,1.843415 +0,60,1110000000,1105000000,1.839121 +0,60,1115000000,1110000000,1.828247 +0,60,1120000000,1115000000,1.817986 +0,60,1125000000,1120000000,1.797553 +0,60,1130000000,1125000000,1.768197 +0,60,1135000000,1130000000,1.733051 +0,60,1140000000,1135000000,1.691792 +0,60,1145000000,1140000000,1.635276 +0,60,1150000000,1145000000,1.570655 +0,60,1155000000,1150000000,1.505179 +0,60,1160000000,1155000000,1.423496 +0,60,1165000000,1160000000,1.347208 +0,60,1170000000,1165000000,1.309863 +0,60,1175000000,1170000000,1.290475 +0,60,1180000000,1175000000,1.295084 +0,60,1185000000,1180000000,1.321866 +0,60,1190000000,1185000000,1.347870 +0,60,1195000000,1190000000,1.363382 +0,60,1200000000,1195000000,1.363756 +0,60,1205000000,1200000000,1.361176 +0,60,1210000000,1205000000,1.349116 +0,60,1215000000,1210000000,1.333488 +0,60,1220000000,1215000000,1.318003 +0,60,1225000000,1220000000,1.293738 +0,60,1230000000,1225000000,1.258989 +0,60,1235000000,1230000000,1.216517 +0,60,1240000000,1235000000,1.177638 +0,60,1245000000,1240000000,1.130437 +0,60,1250000000,1245000000,1.074804 +0,60,1255000000,1250000000,1.026461 +0,60,1260000000,1255000000,0.984412 +0,60,1265000000,1260000000,0.914742 +0,60,1270000000,1265000000,0.857209 +0,60,1275000000,1270000000,0.791248 +0,60,1280000000,1275000000,0.716958 +0,60,1285000000,1280000000,0.639410 +0,60,1290000000,1285000000,0.573368 +0,60,1295000000,1290000000,0.491834 +0,60,1300000000,1295000000,0.404960 +0,60,1305000000,1300000000,0.315228 +0,60,1310000000,1305000000,0.228025 +0,60,1315000000,1310000000,0.142360 +0,60,1320000000,1315000000,0.046705 +0,60,1325000000,1320000000,-0.059263 +0,60,1330000000,1325000000,-0.169745 +0,60,1335000000,1330000000,-0.237401 +0,60,1340000000,1335000000,-0.333738 +0,60,1345000000,1340000000,-0.424306 +0,60,1350000000,1345000000,-0.518019 +0,60,1355000000,1350000000,-0.615228 +0,60,1360000000,1355000000,-0.706604 +0,60,1365000000,1360000000,-0.792911 +0,60,1370000000,1365000000,-0.886260 +0,60,1375000000,1370000000,-0.975704 +0,60,1380000000,1375000000,-1.058727 +0,60,1385000000,1380000000,-1.144527 +0,60,1390000000,1385000000,-1.230282 +0,60,1395000000,1390000000,-1.299013 +0,60,1400000000,1395000000,-1.374250 +0,60,1405000000,1400000000,-1.441091 +0,60,1410000000,1405000000,-1.512012 +0,60,1415000000,1410000000,-1.565381 +0,60,1420000000,1415000000,-1.627011 +0,60,1425000000,1420000000,-1.679122 +0,60,1430000000,1425000000,-1.743303 +0,60,1435000000,1430000000,-1.778476 +0,60,1440000000,1435000000,-1.821321 +0,60,1445000000,1440000000,-1.873230 +0,60,1450000000,1445000000,-1.898622 +0,60,1455000000,1450000000,-1.927078 +0,60,1460000000,1455000000,-1.955575 +0,60,1465000000,1460000000,-1.976220 +0,60,1470000000,1465000000,-1.990372 +0,60,1475000000,1470000000,-2.000150 +0,60,1480000000,1475000000,-2.008533 +0,60,1485000000,1480000000,-2.016300 +0,60,1490000000,1485000000,-2.021224 +0,60,1495000000,1490000000,-2.019427 +0,60,1500000000,1495000000,-2.024887 +0,60,1505000000,1500000000,-2.019891 +0,60,1510000000,1505000000,-2.026655 +0,60,1515000000,1510000000,-2.017969 +0,60,1520000000,1515000000,-2.014111 +0,60,1525000000,1520000000,-2.013908 +0,60,1530000000,1525000000,-2.014085 +0,60,1535000000,1530000000,-2.009600 +0,60,1540000000,1535000000,-2.016047 +0,60,1545000000,1540000000,-2.002599 +0,60,1550000000,1545000000,-2.028221 +0,60,1555000000,1550000000,-2.006256 +0,60,1560000000,1555000000,-2.006678 +0,60,1565000000,1560000000,-2.011443 +0,60,1570000000,1565000000,-2.016559 +0,60,1575000000,1570000000,-2.048770 +0,60,1580000000,1575000000,-2.032191 +0,60,1585000000,1580000000,-2.035294 +0,60,1590000000,1585000000,-2.078770 +0,60,1595000000,1590000000,-2.065820 +0,60,1600000000,1595000000,-2.072821 +0,60,1605000000,1600000000,-2.090824 +0,60,1610000000,1605000000,-2.298958 +0,60,1615000000,1610000000,-2.258708 +0,60,1620000000,1615000000,-2.262371 +0,60,1625000000,1620000000,-2.265906 +0,60,1630000000,1625000000,-2.278281 +0,60,1635000000,1630000000,-2.292056 +0,60,1640000000,1635000000,-2.309293 +0,60,1645000000,1640000000,-2.328241 +0,60,1650000000,1645000000,-2.341084 +0,60,1655000000,1650000000,-2.359303 +0,60,1660000000,1655000000,-2.355718 +0,60,1665000000,1660000000,-2.380922 +0,60,1670000000,1665000000,-2.401136 +0,60,1675000000,1670000000,-2.413238 +0,60,1680000000,1675000000,-2.414870 +0,60,1685000000,1680000000,-2.425358 +0,60,1690000000,1685000000,-2.423460 +0,60,1695000000,1690000000,-2.420452 +0,60,1700000000,1695000000,-2.419218 +0,60,1705000000,1700000000,-2.415057 +0,60,1710000000,1705000000,-2.405680 +0,60,1715000000,1710000000,-2.405948 +0,60,1720000000,1715000000,-2.383504 +0,60,1725000000,1720000000,-2.363845 +0,60,1730000000,1725000000,-2.330018 +0,60,1735000000,1730000000,-2.302685 +0,60,1740000000,1735000000,-2.270526 +0,60,1745000000,1740000000,-2.222964 +0,60,1750000000,1745000000,-2.180559 +0,60,1755000000,1750000000,-2.122526 +0,60,1760000000,1755000000,-2.117867 +0,60,1765000000,1760000000,-2.057514 +0,60,1770000000,1765000000,-1.999309 +0,60,1775000000,1770000000,-1.946847 +0,60,1780000000,1775000000,-1.893251 +0,60,1785000000,1780000000,-1.832241 +0,60,1790000000,1785000000,-1.764706 +0,60,1795000000,1790000000,-1.693954 +0,60,1800000000,1795000000,-1.623587 +0,60,1805000000,1800000000,-1.550614 +0,60,1810000000,1805000000,-1.471772 +0,60,1815000000,1810000000,-1.401735 +0,60,1820000000,1815000000,-1.329493 +0,60,1825000000,1820000000,-1.253242 +0,60,1830000000,1825000000,-1.213765 +0,60,1835000000,1830000000,-1.111490 +0,60,1840000000,1835000000,-1.041459 +0,60,1845000000,1840000000,-0.973157 +0,60,1850000000,1845000000,-0.906965 +0,60,1855000000,1850000000,-0.841204 +0,60,1860000000,1855000000,-0.791973 +0,60,1865000000,1860000000,-0.732206 +0,60,1870000000,1865000000,-0.672334 +0,60,1875000000,1870000000,-0.623311 +0,60,1880000000,1875000000,-0.567729 +0,60,1885000000,1880000000,-0.523409 +0,60,1890000000,1885000000,-0.480171 +0,60,1895000000,1890000000,-0.441250 +0,60,1900000000,1895000000,-0.420757 +0,60,1905000000,1900000000,-0.369926 +0,60,1910000000,1905000000,-0.342770 +0,60,1915000000,1910000000,-0.306218 +0,60,1920000000,1915000000,-0.283143 +0,60,1925000000,1920000000,-0.257990 +0,60,1930000000,1925000000,-0.247740 +0,60,1935000000,1930000000,-0.234898 +0,60,1940000000,1935000000,-0.224539 +0,60,1945000000,1940000000,-0.217548 +0,60,1950000000,1945000000,-0.217728 +0,60,1955000000,1950000000,-0.217120 +0,60,1960000000,1955000000,-0.221329 +0,60,1965000000,1960000000,-0.234882 +0,60,1970000000,1965000000,-0.236833 +0,60,1975000000,1970000000,-0.262423 +0,60,1980000000,1975000000,-0.288308 +0,60,1985000000,1980000000,-0.309290 +0,60,1990000000,1985000000,-0.334821 +0,60,1995000000,1990000000,-0.374757 +0,60,2000000000,1995000000,-0.414646 +0,60,2005000000,2000000000,-0.457271 +0,60,2010000000,2005000000,-0.504746 +0,60,2015000000,2010000000,-0.562334 +0,60,2020000000,2015000000,-0.617086 +0,60,2025000000,2020000000,-0.676797 +0,60,2030000000,2025000000,-0.744058 +0,60,2035000000,2030000000,-0.811081 +0,60,2040000000,2035000000,-0.893392 +0,60,2045000000,2040000000,-0.965036 +0,60,2050000000,2045000000,-1.047756 +0,60,2055000000,2050000000,-1.137617 +0,60,2060000000,2055000000,-1.223102 +0,60,2065000000,2060000000,-1.316850 +0,60,2070000000,2065000000,-1.391341 +0,60,2075000000,2070000000,-1.480926 +0,60,2080000000,2075000000,-1.557503 +0,60,2085000000,2080000000,-1.641807 +0,60,2090000000,2085000000,-1.713202 +0,60,2095000000,2090000000,-1.784394 +0,60,2100000000,2095000000,-1.869919 +0,60,2105000000,2100000000,-1.939570 +0,60,2110000000,2105000000,-2.004402 +0,60,2115000000,2110000000,-2.076487 +0,60,2120000000,2115000000,-2.159137 +0,60,2125000000,2120000000,-2.224719 +0,60,2130000000,2125000000,-2.305286 +0,60,2135000000,2130000000,-2.393829 +0,60,2140000000,2135000000,-2.463642 +0,60,2145000000,2140000000,-2.540523 +0,60,2150000000,2145000000,-2.631290 +0,60,2155000000,2150000000,-2.764551 +0,60,2160000000,2155000000,-2.778795 +0,60,2165000000,2160000000,-2.857774 +0,60,2170000000,2165000000,-2.933479 +0,60,2175000000,2170000000,-3.021025 +0,60,2180000000,2175000000,-3.094990 +0,60,2185000000,2180000000,-3.170047 +0,60,2190000000,2185000000,-3.238843 +0,60,2195000000,2190000000,-3.306433 +0,60,2200000000,2195000000,-3.377702 +0,60,2205000000,2200000000,-3.456514 +0,60,2210000000,2205000000,-3.518468 +0,60,2215000000,2210000000,-3.580184 +0,60,2220000000,2215000000,-3.638111 +0,60,2225000000,2220000000,-3.710879 +0,60,2230000000,2225000000,-3.769407 +0,60,2235000000,2230000000,-3.827661 +0,60,2240000000,2235000000,-3.887871 +0,60,2245000000,2240000000,-3.980895 +0,60,2250000000,2245000000,-3.999103 +0,60,2255000000,2250000000,-4.066500 +0,60,2260000000,2255000000,-4.124697 +0,60,2265000000,2260000000,-4.179531 +0,60,2270000000,2265000000,-4.234944 +0,60,2275000000,2270000000,-4.291104 +0,60,2280000000,2275000000,-4.349870 +0,60,2285000000,2280000000,-4.404576 +0,60,2290000000,2285000000,-4.459347 +0,60,2295000000,2290000000,-4.515449 +0,60,2300000000,2295000000,-4.553760 +0,60,2305000000,2300000000,-4.617341 +0,60,2310000000,2305000000,-4.671379 +0,60,2315000000,2310000000,-4.732879 +0,60,2320000000,2315000000,-4.776204 +0,60,2325000000,2320000000,-4.825138 +0,60,2330000000,2325000000,-4.872034 +0,60,2335000000,2330000000,-4.921991 +0,60,2340000000,2335000000,-4.982786 +0,60,2345000000,2340000000,-5.021575 +0,60,2350000000,2345000000,-5.075013 +0,60,2355000000,2350000000,-5.109157 +0,60,2360000000,2355000000,-5.156717 +0,60,2365000000,2360000000,-5.250880 +0,60,2370000000,2365000000,-5.236359 +0,60,2375000000,2370000000,-5.270088 +0,60,2380000000,2375000000,-5.316279 +0,60,2385000000,2380000000,-5.354084 +0,60,2390000000,2385000000,-5.377363 +0,60,2395000000,2390000000,-5.426134 +0,60,2400000000,2395000000,-5.468631 +0,60,2405000000,2400000000,-5.492619 +0,60,2410000000,2405000000,-5.517303 +0,60,2415000000,2410000000,-5.545830 +0,60,2420000000,2415000000,-5.578412 +0,60,2425000000,2420000000,-5.603325 +0,60,2430000000,2425000000,-5.626382 +0,60,2435000000,2430000000,-5.658421 +0,60,2440000000,2435000000,-5.680237 +0,60,2445000000,2440000000,-5.692741 +0,60,2450000000,2445000000,-5.711138 +0,60,2455000000,2450000000,-5.724227 +0,60,2460000000,2455000000,-5.736266 +0,60,2465000000,2460000000,-5.737120 +0,60,2470000000,2465000000,-5.760042 +0,60,2475000000,2470000000,-5.765885 +0,60,2480000000,2475000000,-5.775934 +0,60,2485000000,2480000000,-5.780187 +0,60,2490000000,2485000000,-5.782429 +0,60,2495000000,2490000000,-5.774033 +0,60,2500000000,2495000000,-5.783847 +0,60,2505000000,2500000000,-5.779497 +0,60,2510000000,2505000000,-5.772732 +0,60,2515000000,2510000000,-5.774420 +0,60,2520000000,2515000000,-5.766399 +0,60,2525000000,2520000000,-5.756028 +0,60,2530000000,2525000000,-5.747478 +0,60,2535000000,2530000000,-5.725401 +0,60,2540000000,2535000000,-5.712500 +0,60,2545000000,2540000000,-5.696743 +0,60,2550000000,2545000000,-5.675015 +0,60,2555000000,2550000000,-5.653439 +0,60,2560000000,2555000000,-5.637948 +0,60,2565000000,2560000000,-5.614139 +0,60,2570000000,2565000000,-5.595996 +0,60,2575000000,2570000000,-5.567319 +0,60,2580000000,2575000000,-5.543749 +0,60,2585000000,2580000000,-5.516024 +0,60,2590000000,2585000000,-5.486864 +0,60,2595000000,2590000000,-5.456404 +0,60,2600000000,2595000000,-5.434219 +0,60,2605000000,2600000000,-5.402671 +0,60,2610000000,2605000000,-5.362646 +0,60,2615000000,2610000000,-5.336541 +0,60,2620000000,2615000000,-5.311420 +0,60,2625000000,2620000000,-5.284595 +0,60,2630000000,2625000000,-5.251807 +0,60,2635000000,2630000000,-5.221240 +0,60,2640000000,2635000000,-5.179014 +0,60,2645000000,2640000000,-5.155150 +0,60,2650000000,2645000000,-5.117194 +0,60,2655000000,2650000000,-5.079500 +0,60,2660000000,2655000000,-5.054261 +0,60,2665000000,2660000000,-5.027613 +0,60,2670000000,2665000000,-4.992343 +0,60,2675000000,2670000000,-4.964551 +0,60,2680000000,2675000000,-4.944845 +0,60,2685000000,2680000000,-4.929153 +0,60,2690000000,2685000000,-4.876087 +0,60,2695000000,2690000000,-4.843391 +0,60,2700000000,2695000000,-4.811534 +0,60,2705000000,2700000000,-5.025114 +0,60,2710000000,2705000000,-4.950145 +0,60,2715000000,2710000000,-4.885831 +0,60,2720000000,2715000000,-4.823732 +0,60,2725000000,2720000000,-4.774621 +0,60,2730000000,2725000000,-4.728079 +0,60,2735000000,2730000000,-4.668292 +0,60,2740000000,2735000000,-4.623954 +0,60,2745000000,2740000000,-4.573103 +0,60,2750000000,2745000000,-4.544019 +0,60,2755000000,2750000000,-4.488909 +0,60,2760000000,2755000000,-4.444633 +0,60,2765000000,2760000000,-4.399436 +0,60,2770000000,2765000000,-4.358362 +0,60,2775000000,2770000000,-4.318676 +0,60,2780000000,2775000000,-4.278760 +0,60,2785000000,2780000000,-4.242032 +0,60,2790000000,2785000000,-4.199002 +0,60,2795000000,2790000000,-4.158809 +0,60,2800000000,2795000000,-4.126411 +0,60,2805000000,2800000000,-4.089270 +0,60,2810000000,2805000000,-4.047110 +0,60,2815000000,2810000000,-4.013889 +0,60,2820000000,2815000000,-3.977524 +0,60,2825000000,2820000000,-3.948347 +0,60,2830000000,2825000000,-3.912266 +0,60,2835000000,2830000000,-3.884309 +0,60,2840000000,2835000000,-3.843090 +0,60,2845000000,2840000000,-3.818071 +0,60,2850000000,2845000000,-3.789353 +0,60,2855000000,2850000000,-3.757364 +0,60,2860000000,2855000000,-3.725026 +0,60,2865000000,2860000000,-3.702429 +0,60,2870000000,2865000000,-3.673995 +0,60,2875000000,2870000000,-3.666736 +0,60,2880000000,2875000000,-3.625179 +0,60,2885000000,2880000000,-3.609150 +0,60,2890000000,2885000000,-3.582634 +0,60,2895000000,2890000000,-3.564697 +0,60,2900000000,2895000000,-3.551338 +0,60,2905000000,2900000000,-3.535998 +0,60,2910000000,2905000000,-3.522813 +0,60,2915000000,2910000000,-3.503939 +0,60,2920000000,2915000000,-3.493228 +0,60,2925000000,2920000000,-3.478435 +0,60,2930000000,2925000000,-3.470492 +0,60,2935000000,2930000000,-3.462603 +0,60,2940000000,2935000000,-3.455068 +0,60,2945000000,2940000000,-3.440138 +0,60,2950000000,2945000000,-3.434924 +0,60,2955000000,2950000000,-3.436803 +0,60,2960000000,2955000000,-3.426041 +0,60,2965000000,2960000000,-3.427392 +0,60,2970000000,2965000000,-3.419096 +0,60,2975000000,2970000000,-3.422529 +0,60,2980000000,2975000000,-3.418175 +0,60,2985000000,2980000000,-3.421567 +0,60,2990000000,2985000000,-3.416811 +0,60,2995000000,2990000000,-3.409298 +0,60,3000000000,2995000000,-3.404326 +0,60,3005000000,3000000000,-3.403179 +0,60,3010000000,3005000000,-3.824385 +0,60,3015000000,3010000000,-3.800734 +0,60,3020000000,3015000000,-3.769868 +0,60,3025000000,3020000000,-3.736739 +0,60,3030000000,3025000000,-3.709184 +0,60,3035000000,3030000000,-3.669342 +0,60,3040000000,3035000000,-3.638654 +0,60,3045000000,3040000000,-3.601744 +0,60,3050000000,3045000000,-3.565997 +0,60,3055000000,3050000000,-3.533682 +0,60,3060000000,3055000000,-3.500241 +0,60,3065000000,3060000000,-3.468463 +0,60,3070000000,3065000000,-3.432680 +0,60,3075000000,3070000000,-3.404072 +0,60,3080000000,3075000000,-3.372319 +0,60,3085000000,3080000000,-3.344113 +0,60,3090000000,3085000000,-3.313818 +0,60,3095000000,3090000000,-3.286908 +0,60,3100000000,3095000000,-3.260398 +0,60,3105000000,3100000000,-3.232855 +0,60,3110000000,3105000000,-3.214013 +0,60,3115000000,3110000000,-3.187845 +0,60,3120000000,3115000000,-3.165904 +0,60,3125000000,3120000000,-3.142335 +0,60,3130000000,3125000000,-3.120703 +0,60,3135000000,3130000000,-3.100712 +0,60,3140000000,3135000000,-3.080211 +0,60,3145000000,3140000000,-3.060304 +0,60,3150000000,3145000000,-3.041457 +0,60,3155000000,3150000000,-3.022161 +0,60,3160000000,3155000000,-3.001188 +0,60,3165000000,3160000000,-2.985767 +0,60,3170000000,3165000000,-2.972224 +0,60,3175000000,3170000000,-2.959737 +0,60,3180000000,3175000000,-2.950854 +0,60,3185000000,3180000000,-2.937213 +0,60,3190000000,3185000000,-2.927023 +0,60,3195000000,3190000000,-2.917768 +0,60,3200000000,3195000000,-2.901190 +0,60,3205000000,3200000000,-2.890418 +0,60,3210000000,3205000000,-2.877484 +0,60,3215000000,3210000000,-2.860894 +0,60,3220000000,3215000000,-2.857210 +0,60,3225000000,3220000000,-2.835971 +0,60,3230000000,3225000000,-2.829589 +0,60,3235000000,3230000000,-2.820374 +0,60,3240000000,3235000000,-2.811488 +0,60,3245000000,3240000000,-2.795645 +0,60,3250000000,3245000000,-2.791705 +0,60,3255000000,3250000000,-2.782581 +0,60,3260000000,3255000000,-2.781095 +0,60,3265000000,3260000000,-2.774640 +0,60,3270000000,3265000000,-2.774844 +0,60,3275000000,3270000000,-2.769602 +0,60,3280000000,3275000000,-2.762914 +0,60,3285000000,3280000000,-2.768570 +0,60,3290000000,3285000000,-2.763141 +0,60,3295000000,3290000000,-2.764805 +0,60,3300000000,3295000000,-2.759708 +0,60,3305000000,3300000000,-2.765325 +0,60,3310000000,3305000000,-2.765110 +0,60,3315000000,3310000000,-2.762342 +0,60,3320000000,3315000000,-2.774169 +0,60,3325000000,3320000000,-2.769385 +0,60,3330000000,3325000000,-2.777904 +0,60,3335000000,3330000000,-2.789881 +0,60,3340000000,3335000000,-2.795606 +0,60,3345000000,3340000000,-2.802409 +0,60,3350000000,3345000000,-2.816888 +0,60,3355000000,3350000000,-2.824486 +0,60,3360000000,3355000000,-2.836781 +0,60,3365000000,3360000000,-2.844294 +0,60,3370000000,3365000000,-2.859955 +0,60,3375000000,3370000000,-2.878740 +0,60,3380000000,3375000000,-2.894762 +0,60,3385000000,3380000000,-2.915720 +0,60,3390000000,3385000000,-2.932238 +0,60,3395000000,3390000000,-2.941762 +0,60,3400000000,3395000000,-2.967148 +0,60,3405000000,3400000000,-2.989167 +0,60,3410000000,3405000000,-3.012628 +0,60,3415000000,3410000000,-3.040184 +0,60,3420000000,3415000000,-3.079309 +0,60,3425000000,3420000000,-3.099129 +0,60,3430000000,3425000000,-3.132405 +0,60,3435000000,3430000000,-3.160140 +0,60,3440000000,3435000000,-3.196358 +0,60,3445000000,3440000000,-3.233840 +0,60,3450000000,3445000000,-3.267694 +0,60,3455000000,3450000000,-3.306146 +0,60,3460000000,3455000000,-3.346909 +0,60,3465000000,3460000000,-3.391509 +0,60,3470000000,3465000000,-3.438348 +0,60,3475000000,3470000000,-3.486505 +0,60,3480000000,3475000000,-3.529701 +0,60,3485000000,3480000000,-3.584706 +0,60,3490000000,3485000000,-3.626296 +0,60,3495000000,3490000000,-3.677486 +0,60,3500000000,3495000000,-3.721461 +0,60,3505000000,3500000000,-3.772438 +0,60,3510000000,3505000000,-3.828090 +0,60,3515000000,3510000000,-3.918792 +0,60,3520000000,3515000000,-3.940064 +0,60,3525000000,3520000000,-3.997686 +0,60,3530000000,3525000000,-4.056462 +0,60,3535000000,3530000000,-4.114891 +0,60,3540000000,3535000000,-4.177597 +0,60,3545000000,3540000000,-4.238581 +0,60,3550000000,3545000000,-4.306047 +0,60,3555000000,3550000000,-4.374472 +0,60,3560000000,3555000000,-4.446089 +0,60,3565000000,3560000000,-4.507576 +0,60,3570000000,3565000000,-4.583689 +0,60,3575000000,3570000000,-4.649519 +0,60,3580000000,3575000000,-4.732509 +0,60,3585000000,3580000000,-4.811317 +0,60,3590000000,3585000000,-4.898368 +0,60,3595000000,3590000000,-4.973350 +0,60,3600000000,3595000000,-5.051297 +0,60,3605000000,3600000000,-5.141290 +0,60,3610000000,3605000000,-5.229401 +0,60,3615000000,3610000000,-5.309399 +0,60,3620000000,3615000000,-5.433334 +0,60,3625000000,3620000000,-5.484215 +0,60,3630000000,3625000000,-5.576295 +0,60,3635000000,3630000000,-5.666569 +0,60,3640000000,3635000000,-5.757064 +0,60,3645000000,3640000000,-5.858344 +0,60,3650000000,3645000000,-5.940994 +0,60,3655000000,3650000000,-5.979823 +0,60,3660000000,3655000000,-6.055216 +0,60,3665000000,3660000000,-6.130875 +0,60,3670000000,3665000000,-6.208005 +0,60,3675000000,3670000000,-6.277557 +0,60,3680000000,3675000000,-6.357543 +0,60,3685000000,3680000000,-6.424721 +0,60,3690000000,3685000000,-6.501293 +0,60,3695000000,3690000000,-6.568027 +0,60,3700000000,3695000000,-6.648227 +0,60,3705000000,3700000000,-6.716894 +0,60,3710000000,3705000000,-6.788077 +0,60,3715000000,3710000000,-6.865499 +0,60,3720000000,3715000000,-6.932474 +0,60,3725000000,3720000000,-6.990206 +0,60,3730000000,3725000000,-7.057678 +0,60,3735000000,3730000000,-7.122836 +0,60,3740000000,3735000000,-7.176333 +0,60,3745000000,3740000000,-7.236074 +0,60,3750000000,3745000000,-7.293285 +0,60,3755000000,3750000000,-7.359080 +0,60,3760000000,3755000000,-7.400938 +0,60,3765000000,3760000000,-7.445758 +0,60,3770000000,3765000000,-7.501352 +0,60,3775000000,3770000000,-7.559843 +0,60,3780000000,3775000000,-7.633903 +0,60,3785000000,3780000000,-7.648331 +0,60,3790000000,3785000000,-7.684263 +0,60,3795000000,3790000000,-7.731691 +0,60,3800000000,3795000000,-7.773380 +0,60,3805000000,3800000000,-7.814356 +0,60,3810000000,3805000000,-7.859053 +0,60,3815000000,3810000000,-7.875758 +0,60,3820000000,3815000000,-7.902240 +0,60,3825000000,3820000000,-7.937301 +0,60,3830000000,3825000000,-7.954596 +0,60,3835000000,3830000000,-7.982815 +0,60,3840000000,3835000000,-8.006508 +0,60,3845000000,3840000000,-8.021569 +0,60,3850000000,3845000000,-8.052110 +0,60,3855000000,3850000000,-8.067669 +0,60,3860000000,3855000000,-8.112166 +0,60,3865000000,3860000000,-8.124214 +0,60,3870000000,3865000000,-8.137264 +0,60,3875000000,3870000000,-8.140124 +0,60,3880000000,3875000000,-8.162803 +0,60,3885000000,3880000000,-8.165056 +0,60,3890000000,3885000000,-8.179156 +0,60,3895000000,3890000000,-8.193631 +0,60,3900000000,3895000000,-8.200828 +0,60,3905000000,3900000000,-8.208419 +0,60,3910000000,3905000000,-8.215292 +0,60,3915000000,3910000000,-8.230251 +0,60,3920000000,3915000000,-8.235836 +0,60,3925000000,3920000000,-8.242012 +0,60,3930000000,3925000000,-8.265241 +0,60,3935000000,3930000000,-8.262722 +0,60,3940000000,3935000000,-8.271455 +0,60,3945000000,3940000000,-8.271166 +0,60,3950000000,3945000000,-8.290058 +0,60,3955000000,3950000000,-8.304231 +0,60,3960000000,3955000000,-8.300877 +0,60,3965000000,3960000000,-8.319982 +0,60,3970000000,3965000000,-8.380039 +0,60,3975000000,3970000000,-8.366048 +0,60,3980000000,3975000000,-8.367793 +0,60,3985000000,3980000000,-8.383790 +0,60,3990000000,3985000000,-8.400596 +0,60,3995000000,3990000000,-8.419360 +0,60,4000000000,3995000000,-8.429898 +0,60,4005000000,4000000000,-8.609578 +0,60,4010000000,4005000000,-8.587477 +0,60,4015000000,4010000000,-8.578950 +0,60,4020000000,4015000000,-8.593220 +0,60,4025000000,4020000000,-8.614049 +0,60,4030000000,4025000000,-8.630279 +0,60,4035000000,4030000000,-8.629020 +0,60,4040000000,4035000000,-8.658844 +0,60,4045000000,4040000000,-8.679251 +0,60,4050000000,4045000000,-8.685559 +0,60,4055000000,4050000000,-8.692000 +0,60,4060000000,4055000000,-8.713732 +0,60,4065000000,4060000000,-8.736860 +0,60,4070000000,4065000000,-8.759348 +0,60,4075000000,4070000000,-8.770121 +0,60,4080000000,4075000000,-8.788305 +0,60,4085000000,4080000000,-8.806110 +0,60,4090000000,4085000000,-8.832790 +0,60,4095000000,4090000000,-8.849303 +0,60,4100000000,4095000000,-8.853693 +0,60,4105000000,4100000000,-8.854278 +0,60,4110000000,4105000000,-8.870345 +0,60,4115000000,4110000000,-8.841269 +0,60,4120000000,4115000000,-8.837956 +0,60,4125000000,4120000000,-8.820925 +0,60,4130000000,4125000000,-8.796053 +0,60,4135000000,4130000000,-8.769552 +0,60,4140000000,4135000000,-8.749586 +0,60,4145000000,4140000000,-8.720048 +0,60,4150000000,4145000000,-8.683527 +0,60,4155000000,4150000000,-8.658355 +0,60,4160000000,4155000000,-8.616730 +0,60,4165000000,4160000000,-8.597307 +0,60,4170000000,4165000000,-8.531603 +0,60,4175000000,4170000000,-8.482436 +0,60,4180000000,4175000000,-8.427538 +0,60,4185000000,4180000000,-8.367986 +0,60,4190000000,4185000000,-8.334595 +0,60,4195000000,4190000000,-8.253263 +0,60,4200000000,4195000000,-8.200787 +0,60,4205000000,4200000000,-8.125754 +0,60,4210000000,4205000000,-8.059006 +0,60,4215000000,4210000000,-7.985138 +0,60,4220000000,4215000000,-7.922077 +0,60,4225000000,4220000000,-7.841183 +0,60,4230000000,4225000000,-7.773010 +0,60,4235000000,4230000000,-7.689833 +0,60,4240000000,4235000000,-7.628013 +0,60,4245000000,4240000000,-7.559941 +0,60,4250000000,4245000000,-7.477808 +0,60,4255000000,4250000000,-7.413978 +0,60,4260000000,4255000000,-7.335053 +0,60,4265000000,4260000000,-7.283474 +0,60,4270000000,4265000000,-7.224746 +0,60,4275000000,4270000000,-7.161213 +0,60,4280000000,4275000000,-7.103718 +0,60,4285000000,4280000000,-7.054061 +0,60,4290000000,4285000000,-7.004557 +0,60,4295000000,4290000000,-6.974011 +0,60,4300000000,4295000000,-6.926616 +0,60,4305000000,4300000000,-6.918257 +0,60,4310000000,4305000000,-6.880956 +0,60,4315000000,4310000000,-6.867355 +0,60,4320000000,4315000000,-6.860544 +0,60,4325000000,4320000000,-6.847555 +0,60,4330000000,4325000000,-6.843334 +0,60,4335000000,4330000000,-6.847190 +0,60,4340000000,4335000000,-6.893708 +0,60,4345000000,4340000000,-6.876297 +0,60,4350000000,4345000000,-6.886452 +0,60,4355000000,4350000000,-6.907143 +0,60,4360000000,4355000000,-6.953147 +0,60,4365000000,4360000000,-6.976667 +0,60,4370000000,4365000000,-6.991306 +0,60,4375000000,4370000000,-7.038461 +0,60,4380000000,4375000000,-7.058518 +0,60,4385000000,4380000000,-7.083701 +0,60,4390000000,4385000000,-7.136261 +0,60,4395000000,4390000000,-7.165984 +0,60,4400000000,4395000000,-7.160344 +0,60,4405000000,4400000000,-7.189295 +0,60,4410000000,4405000000,-7.222288 +0,60,4415000000,4410000000,-7.243143 +0,60,4420000000,4415000000,-7.253932 +0,60,4425000000,4420000000,-7.265991 +0,60,4430000000,4425000000,-7.286546 +0,60,4435000000,4430000000,-7.296165 +0,60,4440000000,4435000000,-7.302421 +0,60,4445000000,4440000000,-7.310629 +0,60,4450000000,4445000000,-7.323117 +0,60,4455000000,4450000000,-7.310962 +0,60,4460000000,4455000000,-7.300994 +0,60,4465000000,4460000000,-7.303780 +0,60,4470000000,4465000000,-7.281369 +0,60,4475000000,4470000000,-7.260896 +0,60,4480000000,4475000000,-7.264815 +0,60,4485000000,4480000000,-7.245087 +0,60,4490000000,4485000000,-7.216422 +0,60,4495000000,4490000000,-7.199420 +0,60,4500000000,4495000000,-7.182421 +0,60,4505000000,4500000000,-7.167343 +0,60,4510000000,4505000000,-7.145234 +0,60,4515000000,4510000000,-7.117377 +0,60,4520000000,4515000000,-7.086861 +0,60,4525000000,4520000000,-7.068922 +0,60,4530000000,4525000000,-7.050923 +0,60,4535000000,4530000000,-7.026651 +0,60,4540000000,4535000000,-7.002258 +0,60,4545000000,4540000000,-6.989660 +0,60,4550000000,4545000000,-6.983808 +0,60,4555000000,4550000000,-6.965266 +0,60,4560000000,4555000000,-6.952774 +0,60,4565000000,4560000000,-6.940562 +0,60,4570000000,4565000000,-6.937723 +0,60,4575000000,4570000000,-6.929541 +0,60,4580000000,4575000000,-6.938055 +0,60,4585000000,4580000000,-6.944826 +0,60,4590000000,4585000000,-6.942001 +0,60,4595000000,4590000000,-6.954680 +0,60,4600000000,4595000000,-6.977827 +0,60,4605000000,4600000000,-6.996227 +0,60,4610000000,4605000000,-7.025993 +0,60,4615000000,4610000000,-7.039772 +0,60,4620000000,4615000000,-7.042029 +0,60,4625000000,4620000000,-7.087940 +0,60,4630000000,4625000000,-7.114792 +0,60,4635000000,4630000000,-7.145631 +0,60,4640000000,4635000000,-7.147896 +0,60,4645000000,4640000000,-7.165443 +0,60,4650000000,4645000000,-7.186428 +0,60,4655000000,4650000000,-7.202465 +0,60,4660000000,4655000000,-7.223950 +0,60,4665000000,4660000000,-7.231187 +0,60,4670000000,4665000000,-7.257076 +0,60,4675000000,4670000000,-7.279138 +0,60,4680000000,4675000000,-7.282400 +0,60,4685000000,4680000000,-7.310025 +0,60,4690000000,4685000000,-7.314556 +0,60,4695000000,4690000000,-7.313955 +0,60,4700000000,4695000000,-7.314459 +0,60,4705000000,4700000000,-7.327530 +0,60,4710000000,4705000000,-7.334086 +0,60,4715000000,4710000000,-7.337801 +0,60,4720000000,4715000000,-7.345880 +0,60,4725000000,4720000000,-7.349970 +0,60,4730000000,4725000000,-7.340133 +0,60,4735000000,4730000000,-7.338610 +0,60,4740000000,4735000000,-7.354904 +0,60,4745000000,4740000000,-7.341439 +0,60,4750000000,4745000000,-7.325879 +0,60,4755000000,4750000000,-7.321974 +0,60,4760000000,4755000000,-7.324849 +0,60,4765000000,4760000000,-7.311704 +0,60,4770000000,4765000000,-7.317521 +0,60,4775000000,4770000000,-7.317958 +0,60,4780000000,4775000000,-7.322085 +0,60,4785000000,4780000000,-7.320578 +0,60,4790000000,4785000000,-7.310717 +0,60,4795000000,4790000000,-7.316541 +0,60,4800000000,4795000000,-7.320830 +0,60,4805000000,4800000000,-7.320842 +0,60,4810000000,4805000000,-7.331866 +0,60,4815000000,4810000000,-7.340919 +0,60,4820000000,4815000000,-7.348955 +0,60,4825000000,4820000000,-7.365210 +0,60,4830000000,4825000000,-7.379990 +0,60,4835000000,4830000000,-7.385069 +0,60,4840000000,4835000000,-7.400438 +0,60,4845000000,4840000000,-7.420884 +0,60,4850000000,4845000000,-7.443483 +0,60,4855000000,4850000000,-7.454774 +0,60,4860000000,4855000000,-7.485112 +0,60,4865000000,4860000000,-7.487624 +0,60,4870000000,4865000000,-7.506087 +0,60,4875000000,4870000000,-7.524904 +0,60,4880000000,4875000000,-7.531894 +0,60,4885000000,4880000000,-7.538809 +0,60,4890000000,4885000000,-7.558142 +0,60,4895000000,4890000000,-7.545909 +0,60,4900000000,4895000000,-7.560215 +0,60,4905000000,4900000000,-7.539324 +0,60,4910000000,4905000000,-7.540371 +0,60,4915000000,4910000000,-7.530087 +0,60,4920000000,4915000000,-7.503177 +0,60,4925000000,4920000000,-7.495246 +0,60,4930000000,4925000000,-7.488067 +0,60,4935000000,4930000000,-7.435379 +0,60,4940000000,4935000000,-7.410965 +0,60,4945000000,4940000000,-7.378324 +0,60,4950000000,4945000000,-7.343819 +0,60,4955000000,4950000000,-7.325415 +0,60,4960000000,4955000000,-7.256688 +0,60,4965000000,4960000000,-7.213460 +0,60,4970000000,4965000000,-7.182841 +0,60,4975000000,4970000000,-7.134824 +0,60,4980000000,4975000000,-7.067095 +0,60,4985000000,4980000000,-7.017913 +0,60,4990000000,4985000000,-6.944831 +0,60,4995000000,4990000000,-6.884394 +0,60,5000000000,4995000000,-6.822306 +0,60,5005000000,5000000000,-6.972946 +0,60,5010000000,5005000000,-6.857194 +0,60,5015000000,5010000000,-6.758218 +0,60,5020000000,5015000000,-6.675308 +0,60,5025000000,5020000000,-6.577577 +0,60,5030000000,5025000000,-6.507904 +0,60,5035000000,5030000000,-6.439568 +0,60,5040000000,5035000000,-6.367642 +0,60,5045000000,5040000000,-6.308996 +0,60,5050000000,5045000000,-6.258718 +0,60,5055000000,5050000000,-6.216998 +0,60,5060000000,5055000000,-6.174553 +0,60,5065000000,5060000000,-6.147677 +0,60,5070000000,5065000000,-6.127012 +0,60,5075000000,5070000000,-6.124837 +0,60,5080000000,5075000000,-6.115795 +0,60,5085000000,5080000000,-6.135956 +0,60,5090000000,5085000000,-6.149950 +0,60,5095000000,5090000000,-6.165764 +0,60,5100000000,5095000000,-6.200954 +0,60,5105000000,5100000000,-6.226211 +0,60,5110000000,5105000000,-6.263647 +0,60,5115000000,5110000000,-6.305251 +0,60,5120000000,5115000000,-6.349313 +0,60,5125000000,5120000000,-6.401340 +0,60,5130000000,5125000000,-6.454283 +0,60,5135000000,5130000000,-6.500097 +0,60,5140000000,5135000000,-6.560917 +0,60,5145000000,5140000000,-6.626575 +0,60,5150000000,5145000000,-6.683043 +0,60,5155000000,5150000000,-6.751943 +0,60,5160000000,5155000000,-6.803675 +0,60,5165000000,5160000000,-6.850558 +0,60,5170000000,5165000000,-6.907009 +0,60,5175000000,5170000000,-6.947057 +0,60,5180000000,5175000000,-6.998483 +0,60,5185000000,5180000000,-7.047351 +0,60,5190000000,5185000000,-7.085669 +0,60,5195000000,5190000000,-7.118881 +0,60,5200000000,5195000000,-7.160673 +0,60,5205000000,5200000000,-7.203281 +0,60,5210000000,5205000000,-7.206638 +0,60,5215000000,5210000000,-7.218982 +0,60,5220000000,5215000000,-7.244737 +0,60,5225000000,5220000000,-7.259970 +0,60,5230000000,5225000000,-7.288818 +0,60,5235000000,5230000000,-7.289712 +0,60,5240000000,5235000000,-7.310192 +0,60,5245000000,5240000000,-7.324887 +0,60,5250000000,5245000000,-7.332648 +0,60,5255000000,5250000000,-7.347914 +0,60,5260000000,5255000000,-7.361651 +0,60,5265000000,5260000000,-7.373217 +0,60,5270000000,5265000000,-7.385489 +0,60,5275000000,5270000000,-7.394106 +0,60,5280000000,5275000000,-7.427303 +0,60,5285000000,5280000000,-7.450679 +0,60,5290000000,5285000000,-7.491709 +0,60,5295000000,5290000000,-7.514281 +0,60,5300000000,5295000000,-7.562453 +0,60,5305000000,5300000000,-7.611082 +0,60,5310000000,5305000000,-7.660957 +0,60,5315000000,5310000000,-7.729766 +0,60,5320000000,5315000000,-7.795167 +0,60,5325000000,5320000000,-7.860566 +0,60,5330000000,5325000000,-7.932443 +0,60,5335000000,5330000000,-8.012860 +0,60,5340000000,5335000000,-8.110101 +0,60,5345000000,5340000000,-8.203068 +0,60,5350000000,5345000000,-8.292630 +0,60,5355000000,5350000000,-8.385339 +0,60,5360000000,5355000000,-8.492435 +0,60,5365000000,5360000000,-8.595150 +0,60,5370000000,5365000000,-8.691325 +0,60,5375000000,5370000000,-8.795303 +0,60,5380000000,5375000000,-8.900039 +0,60,5385000000,5380000000,-8.995368 +0,60,5390000000,5385000000,-9.098090 +0,60,5395000000,5390000000,-9.196319 +0,60,5400000000,5395000000,-9.302691 +0,60,5405000000,5400000000,-9.393891 +0,60,5410000000,5405000000,-9.504268 +0,60,5415000000,5410000000,-9.593701 +0,60,5420000000,5415000000,-9.678919 +0,60,5425000000,5420000000,-9.761849 +0,60,5430000000,5425000000,-9.835101 +0,60,5435000000,5430000000,-9.900818 +0,60,5440000000,5435000000,-9.971939 +0,60,5445000000,5440000000,-10.034998 +0,60,5450000000,5445000000,-10.093761 +0,60,5455000000,5450000000,-10.158603 +0,60,5460000000,5455000000,-10.195882 +0,60,5465000000,5460000000,-10.237130 +0,60,5470000000,5465000000,-10.275259 +0,60,5475000000,5470000000,-10.314974 +0,60,5480000000,5475000000,-10.343064 +0,60,5485000000,5480000000,-10.369034 +0,60,5490000000,5485000000,-10.401454 +0,60,5495000000,5490000000,-10.418228 +0,60,5500000000,5495000000,-10.435623 +0,60,5505000000,5500000000,-10.442916 +0,60,5510000000,5505000000,-10.458424 +0,60,5515000000,5510000000,-10.468549 +0,60,5520000000,5515000000,-10.468607 +0,60,5525000000,5520000000,-10.474097 +0,60,5530000000,5525000000,-10.502153 +0,60,5535000000,5530000000,-10.471620 +0,60,5540000000,5535000000,-10.478559 +0,60,5545000000,5540000000,-10.478191 +0,60,5550000000,5545000000,-10.484808 +0,60,5555000000,5550000000,-10.466659 +0,60,5560000000,5555000000,-10.468788 +0,60,5565000000,5560000000,-10.479252 +0,60,5570000000,5565000000,-10.472892 +0,60,5575000000,5570000000,-10.478068 +0,60,5580000000,5575000000,-10.474681 +0,60,5585000000,5580000000,-10.485932 +0,60,5590000000,5585000000,-10.488700 +0,60,5595000000,5590000000,-10.491248 +0,60,5600000000,5595000000,-10.498080 +0,60,5605000000,5600000000,-10.513143 +0,60,5610000000,5605000000,-10.526825 +0,60,5615000000,5610000000,-10.532611 +0,60,5620000000,5615000000,-10.562664 +0,60,5625000000,5620000000,-10.565964 +0,60,5630000000,5625000000,-10.580325 +0,60,5635000000,5630000000,-10.598327 +0,60,5640000000,5635000000,-10.618874 +0,60,5645000000,5640000000,-10.636725 +0,60,5650000000,5645000000,-10.646153 +0,60,5655000000,5650000000,-10.669869 +0,60,5660000000,5655000000,-10.704931 +0,60,5665000000,5660000000,-10.740229 +0,60,5670000000,5665000000,-10.749227 +0,60,5675000000,5670000000,-10.781502 +0,60,5680000000,5675000000,-10.810183 +0,60,5685000000,5680000000,-10.835794 +0,60,5690000000,5685000000,-10.886562 +0,60,5695000000,5690000000,-10.885891 +0,60,5700000000,5695000000,-10.898622 +0,60,5705000000,5700000000,-10.915739 +0,60,5710000000,5705000000,-10.937505 +0,60,5715000000,5710000000,-10.935958 +0,60,5720000000,5715000000,-10.936475 +0,60,5725000000,5720000000,-10.952407 +0,60,5730000000,5725000000,-10.942931 +0,60,5735000000,5730000000,-10.938548 +0,60,5740000000,5735000000,-10.940923 +0,60,5745000000,5740000000,-10.938502 +0,60,5750000000,5745000000,-10.932387 +0,60,5755000000,5750000000,-10.924124 +0,60,5760000000,5755000000,-10.895969 +0,60,5765000000,5760000000,-10.895031 +0,60,5770000000,5765000000,-10.834877 +0,60,5775000000,5770000000,-10.804454 +0,60,5780000000,5775000000,-10.777452 +0,60,5785000000,5780000000,-10.740498 +0,60,5790000000,5785000000,-10.717329 +0,60,5795000000,5790000000,-10.684086 +0,60,5800000000,5795000000,-10.645187 +0,60,5805000000,5800000000,-10.599226 +0,60,5810000000,5805000000,-10.553833 +0,60,5815000000,5810000000,-10.497962 +0,60,5820000000,5815000000,-10.445632 +0,60,5825000000,5820000000,-10.381685 +0,60,5830000000,5825000000,-10.319367 +0,60,5835000000,5830000000,-10.282403 +0,60,5840000000,5835000000,-10.225120 +0,60,5845000000,5840000000,-10.167893 +0,60,5850000000,5845000000,-10.116751 +0,60,5855000000,5850000000,-10.060240 +0,60,5860000000,5855000000,-9.996715 +0,60,5865000000,5860000000,-9.932005 +0,60,5870000000,5865000000,-9.859419 +0,60,5875000000,5870000000,-9.798214 +0,60,5880000000,5875000000,-9.724786 +0,60,5885000000,5880000000,-9.675111 +0,60,5890000000,5885000000,-9.614786 +0,60,5895000000,5890000000,-9.555308 +0,60,5900000000,5895000000,-9.497622 +0,60,5905000000,5900000000,-9.446270 +0,60,5910000000,5905000000,-9.375905 +0,60,5915000000,5910000000,-9.313253 +0,60,5920000000,5915000000,-9.300947 +0,60,5925000000,5920000000,-9.240562 +0,60,5930000000,5925000000,-9.191239 +0,60,5935000000,5930000000,-9.129501 +0,60,5940000000,5935000000,-9.084176 +0,60,5945000000,5940000000,-9.018927 +0,60,5950000000,5945000000,-8.979181 +0,60,5955000000,5950000000,-8.941906 +0,60,5960000000,5955000000,-8.863937 +0,60,5965000000,5960000000,-8.823041 +0,60,5970000000,5965000000,-8.765117 +0,60,5975000000,5970000000,-8.725905 +0,60,5980000000,5975000000,-8.667963 +0,60,5985000000,5980000000,-8.631003 +0,60,5990000000,5985000000,-8.573725 +0,60,5995000000,5990000000,-8.513669 +0,60,6000000000,5995000000,-8.470626 +0,60,6005000000,6000000000,-8.428394 +0,30,75000000,70000000,-25.967458 +0,30,80000000,75000000,-26.003823 +0,30,85000000,80000000,-26.059882 +0,30,90000000,85000000,-26.149731 +0,30,95000000,90000000,-26.253284 +0,30,100000000,95000000,-26.264459 +0,30,105000000,100000000,-26.328679 +0,30,110000000,105000000,-26.344746 +0,30,115000000,110000000,-26.593659 +0,30,120000000,115000000,-26.540603 +0,30,125000000,120000000,-26.508347 +0,30,130000000,125000000,-26.431046 +0,30,135000000,130000000,-26.456293 +0,30,140000000,135000000,-26.430514 +0,30,145000000,140000000,-26.369945 +0,30,150000000,145000000,-26.426049 +0,30,155000000,150000000,-26.421441 +0,30,160000000,155000000,-26.394494 +0,30,165000000,160000000,-26.403471 +0,30,170000000,165000000,-26.362862 +0,30,175000000,170000000,-26.378642 +0,30,180000000,175000000,-26.364085 +0,30,185000000,180000000,-26.414329 +0,30,190000000,185000000,-26.406986 +0,30,195000000,190000000,-26.440021 +0,30,200000000,195000000,-26.447198 +0,30,205000000,200000000,-26.479958 +0,30,210000000,205000000,-26.455103 +0,30,215000000,210000000,-26.492316 +0,30,220000000,215000000,-26.504149 +0,30,225000000,220000000,-26.518820 +0,30,230000000,225000000,-26.541680 +0,30,235000000,230000000,-26.573506 +0,30,240000000,235000000,-26.588738 +0,30,245000000,240000000,-26.614573 +0,30,250000000,245000000,-26.651497 +0,30,255000000,250000000,-26.686544 +0,30,260000000,255000000,-26.733879 +0,30,265000000,260000000,-26.771054 +0,30,270000000,265000000,-26.793288 +0,30,275000000,270000000,-26.826088 +0,30,280000000,275000000,-26.844184 +0,30,285000000,280000000,-26.873139 +0,30,290000000,285000000,-26.880744 +0,30,295000000,290000000,-26.893240 +0,30,300000000,295000000,-26.907869 +0,30,305000000,300000000,-26.921845 +0,30,310000000,305000000,-26.928711 +0,30,315000000,310000000,-26.933333 +0,30,320000000,315000000,-26.966488 +0,30,325000000,320000000,-26.970000 +0,30,330000000,325000000,-26.961799 +0,30,335000000,330000000,-26.972957 +0,30,340000000,335000000,-26.977856 +0,30,345000000,340000000,-26.985456 +0,30,350000000,345000000,-26.984872 +0,30,355000000,350000000,-27.001224 +0,30,360000000,355000000,-27.011417 +0,30,365000000,360000000,-27.002262 +0,30,370000000,365000000,-27.006617 +0,30,375000000,370000000,-27.007085 +0,30,380000000,375000000,-27.017090 +0,30,385000000,380000000,-27.027307 +0,30,390000000,385000000,-27.022848 +0,30,395000000,390000000,-27.042031 +0,30,400000000,395000000,-27.062746 +0,30,405000000,400000000,-27.073038 +0,30,410000000,405000000,-27.079123 +0,30,415000000,410000000,-27.073161 +0,30,420000000,415000000,-27.076124 +0,30,425000000,420000000,-27.074813 +0,30,430000000,425000000,-27.065886 +0,30,435000000,430000000,-27.069926 +0,30,440000000,435000000,-27.061195 +0,30,445000000,440000000,-27.050422 +0,30,450000000,445000000,-27.035443 +0,30,455000000,450000000,-27.028431 +0,30,460000000,455000000,-27.029822 +0,30,465000000,460000000,-27.017686 +0,30,470000000,465000000,-27.009917 +0,30,475000000,470000000,-27.004710 +0,30,480000000,475000000,-27.018905 +0,30,485000000,480000000,-27.001486 +0,30,490000000,485000000,-27.006471 +0,30,495000000,490000000,-27.004537 +0,30,500000000,495000000,-27.018348 +0,30,505000000,500000000,-27.040890 +0,30,510000000,505000000,-27.072928 +0,30,515000000,510000000,-27.089846 +0,30,520000000,515000000,-27.127704 +0,30,525000000,520000000,-27.166901 +0,30,530000000,525000000,-27.208642 +0,30,535000000,530000000,-27.271623 +0,30,540000000,535000000,-27.322362 +0,30,545000000,540000000,-27.382275 +0,30,550000000,545000000,-27.504674 +0,30,555000000,550000000,-27.511998 +0,30,560000000,555000000,-27.569766 +0,30,565000000,560000000,-27.627115 +0,30,570000000,565000000,-27.675361 +0,30,575000000,570000000,-27.739517 +0,30,580000000,575000000,-27.785066 +0,30,585000000,580000000,-27.813980 +0,30,590000000,585000000,-27.854932 +0,30,595000000,590000000,-27.874919 +0,30,600000000,595000000,-27.912333 +0,30,605000000,600000000,-27.989051 +0,30,610000000,605000000,-28.007884 +0,30,615000000,610000000,-28.037639 +0,30,620000000,615000000,-28.067034 +0,30,625000000,620000000,-28.111059 +0,30,630000000,625000000,-28.141205 +0,30,635000000,630000000,-28.164172 +0,30,640000000,635000000,-28.193196 +0,30,645000000,640000000,-28.252649 +0,30,650000000,645000000,-28.290005 +0,30,655000000,650000000,-28.267961 +0,30,660000000,655000000,-28.280212 +0,30,665000000,660000000,-28.280002 +0,30,670000000,665000000,-28.276424 +0,30,675000000,670000000,-28.269297 +0,30,680000000,675000000,-28.249214 +0,30,685000000,680000000,-28.238466 +0,30,690000000,685000000,-28.215318 +0,30,695000000,690000000,-28.182919 +0,30,700000000,695000000,-28.203393 +0,30,705000000,700000000,-28.146784 +0,30,710000000,705000000,-28.111762 +0,30,715000000,710000000,-28.105223 +0,30,720000000,715000000,-28.066776 +0,30,725000000,720000000,-28.050994 +0,30,730000000,725000000,-28.040439 +0,30,735000000,730000000,-28.046868 +0,30,740000000,735000000,-28.061557 +0,30,745000000,740000000,-28.077446 +0,30,750000000,745000000,-28.101589 +0,30,755000000,750000000,-28.138281 +0,30,760000000,755000000,-28.175947 +0,30,765000000,760000000,-28.203236 +0,30,770000000,765000000,-28.200406 +0,30,775000000,770000000,-28.190721 +0,30,780000000,775000000,-28.171873 +0,30,785000000,780000000,-28.144615 +0,30,790000000,785000000,-28.140152 +0,30,795000000,790000000,-28.154397 +0,30,800000000,795000000,-28.174130 +0,30,805000000,800000000,-28.246680 +0,30,810000000,805000000,-28.227909 +0,30,815000000,810000000,-28.285782 +0,30,820000000,815000000,-28.291280 +0,30,825000000,820000000,-28.308887 +0,30,830000000,825000000,-28.333630 +0,30,835000000,830000000,-28.343212 +0,30,840000000,835000000,-28.352933 +0,30,845000000,840000000,-28.377367 +0,30,850000000,845000000,-28.366380 +0,30,855000000,850000000,-28.309654 +0,30,860000000,855000000,-28.305770 +0,30,865000000,860000000,-28.272629 +0,30,870000000,865000000,-28.239973 +0,30,875000000,870000000,-28.227981 +0,30,880000000,875000000,-28.193248 +0,30,885000000,880000000,-28.159477 +0,30,890000000,885000000,-28.138124 +0,30,895000000,890000000,-28.123103 +0,30,900000000,895000000,-28.081534 +0,30,905000000,900000000,-28.061457 +0,30,910000000,905000000,-28.069142 +0,30,915000000,910000000,-28.046302 +0,30,920000000,915000000,-28.048945 +0,30,925000000,920000000,-28.043050 +0,30,930000000,925000000,-28.044078 +0,30,935000000,930000000,-28.055941 +0,30,940000000,935000000,-28.065658 +0,30,945000000,940000000,-28.073607 +0,30,950000000,945000000,-28.095757 +0,30,955000000,950000000,-28.105950 +0,30,960000000,955000000,-28.127967 +0,30,965000000,960000000,-28.113407 +0,30,970000000,965000000,-28.124599 +0,30,975000000,970000000,-28.118901 +0,30,980000000,975000000,-28.106875 +0,30,985000000,980000000,-28.073405 +0,30,990000000,985000000,-28.064113 +0,30,995000000,990000000,-28.047367 +0,30,1000000000,995000000,-28.019269 +0,30,1005000000,1000000000,-27.895639 +0,30,1010000000,1005000000,-27.841914 +0,30,1015000000,1010000000,-27.802501 +0,30,1020000000,1015000000,-27.769539 +0,30,1025000000,1020000000,-27.736989 +0,30,1030000000,1025000000,-27.722987 +0,30,1035000000,1030000000,-27.711856 +0,30,1040000000,1035000000,-27.701172 +0,30,1045000000,1040000000,-27.695712 +0,30,1050000000,1045000000,-27.699020 +0,30,1055000000,1050000000,-27.698354 +0,30,1060000000,1055000000,-27.709055 +0,30,1065000000,1060000000,-27.726281 +0,30,1070000000,1065000000,-27.744802 +0,30,1075000000,1070000000,-27.769505 +0,30,1080000000,1075000000,-27.535782 +0,30,1085000000,1080000000,-27.747215 +0,30,1090000000,1085000000,-27.786478 +0,30,1095000000,1090000000,-27.680085 +0,30,1100000000,1095000000,-27.775390 +0,30,1105000000,1100000000,-27.834500 +0,30,1110000000,1105000000,-27.637504 +0,30,1115000000,1110000000,-27.916991 +0,30,1120000000,1115000000,-27.940026 +0,30,1125000000,1120000000,-27.929767 +0,30,1130000000,1125000000,-27.878995 +0,30,1135000000,1130000000,-27.781244 +0,30,1140000000,1135000000,-27.870129 +0,30,1145000000,1140000000,-28.146009 +0,30,1150000000,1145000000,-28.201991 +0,30,1155000000,1150000000,-28.291333 +0,30,1160000000,1155000000,-28.349679 +0,30,1165000000,1160000000,-28.452459 +0,30,1170000000,1165000000,-28.456274 +0,30,1175000000,1170000000,-28.493048 +0,30,1180000000,1175000000,-28.474437 +0,30,1185000000,1180000000,-28.439500 +0,30,1190000000,1185000000,-28.404019 +0,30,1195000000,1190000000,-28.362584 +0,30,1200000000,1195000000,-28.333051 +0,30,1205000000,1200000000,-28.322180 +0,30,1210000000,1205000000,-28.301933 +0,30,1215000000,1210000000,-28.316522 +0,30,1220000000,1215000000,-28.286332 +0,30,1225000000,1220000000,-28.278666 +0,30,1230000000,1225000000,-28.283870 +0,30,1235000000,1230000000,-28.292664 +0,30,1240000000,1235000000,-28.302613 +0,30,1245000000,1240000000,-28.346262 +0,30,1250000000,1245000000,-28.318819 +0,30,1255000000,1250000000,-28.353191 +0,30,1260000000,1255000000,-28.385126 +0,30,1265000000,1260000000,-28.421842 +0,30,1270000000,1265000000,-28.428127 +0,30,1275000000,1270000000,-28.497199 +0,30,1280000000,1275000000,-28.503633 +0,30,1285000000,1280000000,-28.554375 +0,30,1290000000,1285000000,-28.592888 +0,30,1295000000,1290000000,-28.649621 +0,30,1300000000,1295000000,-28.714451 +0,30,1305000000,1300000000,-28.771840 +0,30,1310000000,1305000000,-28.812950 +0,30,1315000000,1310000000,-28.882891 +0,30,1320000000,1315000000,-28.932388 +0,30,1325000000,1320000000,-29.011145 +0,30,1330000000,1325000000,-29.088099 +0,30,1335000000,1330000000,-29.170688 +0,30,1340000000,1335000000,-29.240065 +0,30,1345000000,1340000000,-29.296998 +0,30,1350000000,1345000000,-29.378903 +0,30,1355000000,1350000000,-29.449698 +0,30,1360000000,1355000000,-29.557996 +0,30,1365000000,1360000000,-29.615642 +0,30,1370000000,1365000000,-29.686475 +0,30,1375000000,1370000000,-29.765223 +0,30,1380000000,1375000000,-29.843850 +0,30,1385000000,1380000000,-29.923889 +0,30,1390000000,1385000000,-30.009593 +0,30,1395000000,1390000000,-30.084632 +0,30,1400000000,1395000000,-30.192567 +0,30,1405000000,1400000000,-30.260648 +0,30,1410000000,1405000000,-30.370112 +0,30,1415000000,1410000000,-30.428107 +0,30,1420000000,1415000000,-30.514088 +0,30,1425000000,1420000000,-30.600828 +0,30,1430000000,1425000000,-30.688216 +0,30,1435000000,1430000000,-30.775689 +0,30,1440000000,1435000000,-30.881330 +0,30,1445000000,1440000000,-30.995177 +0,30,1450000000,1445000000,-31.041390 +0,30,1455000000,1450000000,-31.182118 +0,30,1460000000,1455000000,-31.237367 +0,30,1465000000,1460000000,-31.351137 +0,30,1470000000,1465000000,-31.286232 +0,30,1475000000,1470000000,-31.373822 +0,30,1480000000,1475000000,-31.516308 +0,30,1485000000,1480000000,-31.533837 +0,30,1490000000,1485000000,-31.519998 +0,30,1495000000,1490000000,-31.488289 +0,30,1500000000,1495000000,-31.772411 +0,30,1505000000,1500000000,-31.814895 +0,30,1510000000,1505000000,-31.859151 +0,30,1515000000,1510000000,-31.885338 +0,30,1520000000,1515000000,-31.915368 +0,30,1525000000,1520000000,-31.921139 +0,30,1530000000,1525000000,-31.927575 +0,30,1535000000,1530000000,-31.925415 +0,30,1540000000,1535000000,-31.921320 +0,30,1545000000,1540000000,-31.904082 +0,30,1550000000,1545000000,-31.878281 +0,30,1555000000,1550000000,-31.833003 +0,30,1560000000,1555000000,-31.790399 +0,30,1565000000,1560000000,-31.741514 +0,30,1570000000,1565000000,-31.697741 +0,30,1575000000,1570000000,-31.613772 +0,30,1580000000,1575000000,-31.558480 +0,30,1585000000,1580000000,-31.498949 +0,30,1590000000,1585000000,-31.423496 +0,30,1595000000,1590000000,-31.389443 +0,30,1600000000,1595000000,-31.309792 +0,30,1605000000,1600000000,-31.254691 +0,30,1610000000,1605000000,-31.526521 +0,30,1615000000,1610000000,-31.505432 +0,30,1620000000,1615000000,-31.507569 +0,30,1625000000,1620000000,-31.534235 +0,30,1630000000,1625000000,-31.571942 +0,30,1635000000,1630000000,-31.573944 +0,30,1640000000,1635000000,-31.604732 +0,30,1645000000,1640000000,-31.635702 +0,30,1650000000,1645000000,-31.662113 +0,30,1655000000,1650000000,-31.694206 +0,30,1660000000,1655000000,-31.718985 +0,30,1665000000,1660000000,-31.784692 +0,30,1670000000,1665000000,-31.793388 +0,30,1675000000,1670000000,-31.800946 +0,30,1680000000,1675000000,-31.809494 +0,30,1685000000,1680000000,-31.819533 +0,30,1690000000,1685000000,-31.827743 +0,30,1695000000,1690000000,-31.837925 +0,30,1700000000,1695000000,-31.850967 +0,30,1705000000,1700000000,-31.844802 +0,30,1710000000,1705000000,-31.848982 +0,30,1715000000,1710000000,-31.849731 +0,30,1720000000,1715000000,-31.834682 +0,30,1725000000,1720000000,-31.864213 +0,30,1730000000,1725000000,-31.817866 +0,30,1735000000,1730000000,-31.797118 +0,30,1740000000,1735000000,-31.779444 +0,30,1745000000,1740000000,-31.741409 +0,30,1750000000,1745000000,-31.723723 +0,30,1755000000,1750000000,-31.696004 +0,30,1760000000,1755000000,-31.674483 +0,30,1765000000,1760000000,-31.664895 +0,30,1770000000,1765000000,-31.636287 +0,30,1775000000,1770000000,-31.618862 +0,30,1780000000,1775000000,-31.596194 +0,30,1785000000,1780000000,-31.570396 +0,30,1790000000,1785000000,-31.548634 +0,30,1795000000,1790000000,-31.520589 +0,30,1800000000,1795000000,-31.484018 +0,30,1805000000,1800000000,-31.453192 +0,30,1810000000,1805000000,-31.417306 +0,30,1815000000,1810000000,-31.385078 +0,30,1820000000,1815000000,-31.383538 +0,30,1825000000,1820000000,-31.315208 +0,30,1830000000,1825000000,-31.276287 +0,30,1835000000,1830000000,-31.236045 +0,30,1840000000,1835000000,-31.190982 +0,30,1845000000,1840000000,-31.143393 +0,30,1850000000,1845000000,-31.096235 +0,30,1855000000,1850000000,-31.035770 +0,30,1860000000,1855000000,-30.986164 +0,30,1865000000,1860000000,-30.919215 +0,30,1870000000,1865000000,-30.858244 +0,30,1875000000,1870000000,-30.789525 +0,30,1880000000,1875000000,-30.715868 +0,30,1885000000,1880000000,-30.642717 +0,30,1890000000,1885000000,-30.564514 +0,30,1895000000,1890000000,-30.480054 +0,30,1900000000,1895000000,-30.403494 +0,30,1905000000,1900000000,-30.316256 +0,30,1910000000,1905000000,-30.236843 +0,30,1915000000,1910000000,-30.150430 +0,30,1920000000,1915000000,-30.068390 +0,30,1925000000,1920000000,-29.994746 +0,30,1930000000,1925000000,-29.919932 +0,30,1935000000,1930000000,-29.840721 +0,30,1940000000,1935000000,-29.776670 +0,30,1945000000,1940000000,-29.723178 +0,30,1950000000,1945000000,-29.668816 +0,30,1955000000,1950000000,-29.624783 +0,30,1960000000,1955000000,-29.584769 +0,30,1965000000,1960000000,-29.550958 +0,30,1970000000,1965000000,-29.526635 +0,30,1975000000,1970000000,-29.499742 +0,30,1980000000,1975000000,-29.483205 +0,30,1985000000,1980000000,-29.477464 +0,30,1990000000,1985000000,-29.486420 +0,30,1995000000,1990000000,-29.500182 +0,30,2000000000,1995000000,-29.505297 +0,30,2005000000,2000000000,-29.534760 +0,30,2010000000,2005000000,-29.555440 +0,30,2015000000,2010000000,-29.600296 +0,30,2020000000,2015000000,-29.641595 +0,30,2025000000,2020000000,-29.687728 +0,30,2030000000,2025000000,-29.743774 +0,30,2035000000,2030000000,-29.801530 +0,30,2040000000,2035000000,-29.865399 +0,30,2045000000,2040000000,-29.938266 +0,30,2050000000,2045000000,-30.013805 +0,30,2055000000,2050000000,-30.102355 +0,30,2060000000,2055000000,-30.199126 +0,30,2065000000,2060000000,-30.261751 +0,30,2070000000,2065000000,-30.367355 +0,30,2075000000,2070000000,-30.439709 +0,30,2080000000,2075000000,-30.540798 +0,30,2085000000,2080000000,-30.625413 +0,30,2090000000,2085000000,-30.703309 +0,30,2095000000,2090000000,-30.828770 +0,30,2100000000,2095000000,-30.891251 +0,30,2105000000,2100000000,-30.962373 +0,30,2110000000,2105000000,-31.051287 +0,30,2115000000,2110000000,-31.138788 +0,30,2120000000,2115000000,-31.228036 +0,30,2125000000,2120000000,-31.327613 +0,30,2130000000,2125000000,-31.412298 +0,30,2135000000,2130000000,-31.501992 +0,30,2140000000,2135000000,-31.601997 +0,30,2145000000,2140000000,-31.704042 +0,30,2150000000,2145000000,-31.782442 +0,30,2155000000,2150000000,-31.876998 +0,30,2160000000,2155000000,-31.981947 +0,30,2165000000,2160000000,-32.068528 +0,30,2170000000,2165000000,-32.157195 +0,30,2175000000,2170000000,-32.240860 +0,30,2180000000,2175000000,-32.330524 +0,30,2185000000,2180000000,-32.421457 +0,30,2190000000,2185000000,-32.507186 +0,30,2195000000,2190000000,-32.594517 +0,30,2200000000,2195000000,-32.693690 +0,30,2205000000,2200000000,-32.753010 +0,30,2210000000,2205000000,-32.829715 +0,30,2215000000,2210000000,-33.086172 +0,30,2220000000,2215000000,-33.190415 +0,30,2225000000,2220000000,-33.280985 +0,30,2230000000,2225000000,-33.388876 +0,30,2235000000,2230000000,-33.474579 +0,30,2240000000,2235000000,-33.548515 +0,30,2245000000,2240000000,-33.622284 +0,30,2250000000,2245000000,-33.694799 +0,30,2255000000,2250000000,-33.759988 +0,30,2260000000,2255000000,-33.825839 +0,30,2265000000,2260000000,-33.888426 +0,30,2270000000,2265000000,-33.933245 +0,30,2275000000,2270000000,-33.995856 +0,30,2280000000,2275000000,-34.026842 +0,30,2285000000,2280000000,-34.069852 +0,30,2290000000,2285000000,-34.098272 +0,30,2295000000,2290000000,-34.130305 +0,30,2300000000,2295000000,-34.146437 +0,30,2305000000,2300000000,-34.190171 +0,30,2310000000,2305000000,-34.182859 +0,30,2315000000,2310000000,-34.193425 +0,30,2320000000,2315000000,-34.201792 +0,30,2325000000,2320000000,-34.211295 +0,30,2330000000,2325000000,-34.214850 +0,30,2335000000,2330000000,-34.253183 +0,30,2340000000,2335000000,-34.262427 +0,30,2345000000,2340000000,-34.271742 +0,30,2350000000,2345000000,-34.268583 +0,30,2355000000,2350000000,-34.276832 +0,30,2360000000,2355000000,-34.278630 +0,30,2365000000,2360000000,-34.263789 +0,30,2370000000,2365000000,-34.263665 +0,30,2375000000,2370000000,-34.259219 +0,30,2380000000,2375000000,-34.258342 +0,30,2385000000,2380000000,-34.263331 +0,30,2390000000,2385000000,-34.275211 +0,30,2395000000,2390000000,-34.373542 +0,30,2400000000,2395000000,-34.444941 +0,30,2405000000,2400000000,-34.460820 +0,30,2410000000,2405000000,-34.514228 +0,30,2415000000,2410000000,-34.576787 +0,30,2420000000,2415000000,-34.643072 +0,30,2425000000,2420000000,-34.714208 +0,30,2430000000,2425000000,-34.792073 +0,30,2435000000,2430000000,-34.889087 +0,30,2440000000,2435000000,-34.949084 +0,30,2445000000,2440000000,-35.022680 +0,30,2450000000,2445000000,-35.106230 +0,30,2455000000,2450000000,-35.191122 +0,30,2460000000,2455000000,-35.274780 +0,30,2465000000,2460000000,-35.396247 +0,30,2470000000,2465000000,-35.442919 +0,30,2475000000,2470000000,-35.570327 +0,30,2480000000,2475000000,-35.646162 +0,30,2485000000,2480000000,-35.695143 +0,30,2490000000,2485000000,-35.740324 +0,30,2495000000,2490000000,-35.806372 +0,30,2500000000,2495000000,-35.879965 +0,30,2505000000,2500000000,-35.937878 +0,30,2510000000,2505000000,-35.977117 +0,30,2515000000,2510000000,-36.029739 +0,30,2520000000,2515000000,-36.082354 +0,30,2525000000,2520000000,-36.105206 +0,30,2530000000,2525000000,-36.132022 +0,30,2535000000,2530000000,-36.146488 +0,30,2540000000,2535000000,-36.173866 +0,30,2545000000,2540000000,-36.176317 +0,30,2550000000,2545000000,-36.188464 +0,30,2555000000,2550000000,-36.112278 +0,30,2560000000,2555000000,-36.096525 +0,30,2565000000,2560000000,-36.074677 +0,30,2570000000,2565000000,-36.063553 +0,30,2575000000,2570000000,-36.011968 +0,30,2580000000,2575000000,-35.987360 +0,30,2585000000,2580000000,-35.932430 +0,30,2590000000,2585000000,-35.877481 +0,30,2595000000,2590000000,-35.820054 +0,30,2600000000,2595000000,-35.756186 +0,30,2605000000,2600000000,-35.699460 +0,30,2610000000,2605000000,-35.624531 +0,30,2615000000,2610000000,-35.530120 +0,30,2620000000,2615000000,-35.439925 +0,30,2625000000,2620000000,-35.344054 +0,30,2630000000,2625000000,-35.247068 +0,30,2635000000,2630000000,-35.155670 +0,30,2640000000,2635000000,-35.054928 +0,30,2645000000,2640000000,-34.953036 +0,30,2650000000,2645000000,-34.846785 +0,30,2655000000,2650000000,-34.753882 +0,30,2660000000,2655000000,-34.644239 +0,30,2665000000,2660000000,-34.544189 +0,30,2670000000,2665000000,-34.451252 +0,30,2675000000,2670000000,-34.352763 +0,30,2680000000,2675000000,-34.262344 +0,30,2685000000,2680000000,-34.174645 +0,30,2690000000,2685000000,-34.102217 +0,30,2695000000,2690000000,-34.025576 +0,30,2700000000,2695000000,-33.957488 +0,30,2705000000,2700000000,-34.096267 +0,30,2710000000,2705000000,-34.009855 +0,30,2715000000,2710000000,-33.935446 +0,30,2720000000,2715000000,-33.882123 +0,30,2725000000,2720000000,-33.840053 +0,30,2730000000,2725000000,-33.807882 +0,30,2735000000,2730000000,-33.792595 +0,30,2740000000,2735000000,-33.772668 +0,30,2745000000,2740000000,-33.773835 +0,30,2750000000,2745000000,-33.772775 +0,30,2755000000,2750000000,-33.777633 +0,30,2760000000,2755000000,-33.792408 +0,30,2765000000,2760000000,-33.805999 +0,30,2770000000,2765000000,-33.825957 +0,30,2775000000,2770000000,-33.880485 +0,30,2780000000,2775000000,-33.882299 +0,30,2785000000,2780000000,-33.914671 +0,30,2790000000,2785000000,-33.930378 +0,30,2795000000,2790000000,-33.973880 +0,30,2800000000,2795000000,-33.972598 +0,30,2805000000,2800000000,-34.033135 +0,30,2810000000,2805000000,-34.016434 +0,30,2815000000,2810000000,-34.022401 +0,30,2820000000,2815000000,-34.078919 +0,30,2825000000,2820000000,-34.081917 +0,30,2830000000,2825000000,-34.045148 +0,30,2835000000,2830000000,-34.041376 +0,30,2840000000,2835000000,-34.026222 +0,30,2845000000,2840000000,-34.018265 +0,30,2850000000,2845000000,-33.994535 +0,30,2855000000,2850000000,-33.974646 +0,30,2860000000,2855000000,-33.940409 +0,30,2865000000,2860000000,-33.916682 +0,30,2870000000,2865000000,-33.876005 +0,30,2875000000,2870000000,-33.826284 +0,30,2880000000,2875000000,-33.777515 +0,30,2885000000,2880000000,-33.751438 +0,30,2890000000,2885000000,-33.678680 +0,30,2895000000,2890000000,-33.613454 +0,30,2900000000,2895000000,-33.557783 +0,30,2905000000,2900000000,-33.493525 +0,30,2910000000,2905000000,-33.425362 +0,30,2915000000,2910000000,-33.355070 +0,30,2920000000,2915000000,-33.282019 +0,30,2925000000,2920000000,-33.213790 +0,30,2930000000,2925000000,-33.138853 +0,30,2935000000,2930000000,-33.058925 +0,30,2940000000,2935000000,-32.990041 +0,30,2945000000,2940000000,-32.927559 +0,30,2950000000,2945000000,-32.853061 +0,30,2955000000,2950000000,-32.778849 +0,30,2960000000,2955000000,-32.707054 +0,30,2965000000,2960000000,-32.639638 +0,30,2970000000,2965000000,-32.578240 +0,30,2975000000,2970000000,-32.536057 +0,30,2980000000,2975000000,-32.456098 +0,30,2985000000,2980000000,-32.398563 +0,30,2990000000,2985000000,-32.342322 +0,30,2995000000,2990000000,-32.260373 +0,30,3000000000,2995000000,-32.252165 +0,30,3005000000,3000000000,-32.206529 +0,30,3010000000,3005000000,-32.347447 +0,30,3015000000,3010000000,-32.324600 +0,30,3020000000,3015000000,-32.275595 +0,30,3025000000,3020000000,-32.232171 +0,30,3030000000,3025000000,-32.195517 +0,30,3035000000,3030000000,-32.166745 +0,30,3040000000,3035000000,-32.143190 +0,30,3045000000,3040000000,-32.125843 +0,30,3050000000,3045000000,-32.114434 +0,30,3055000000,3050000000,-32.108262 +0,30,3060000000,3055000000,-32.081022 +0,30,3065000000,3060000000,-32.112175 +0,30,3070000000,3065000000,-32.119775 +0,30,3075000000,3070000000,-32.131248 +0,30,3080000000,3075000000,-32.141962 +0,30,3085000000,3080000000,-32.164113 +0,30,3090000000,3085000000,-32.183637 +0,30,3095000000,3090000000,-32.203344 +0,30,3100000000,3095000000,-32.193179 +0,30,3105000000,3100000000,-32.240419 +0,30,3110000000,3105000000,-32.241338 +0,30,3115000000,3110000000,-32.261123 +0,30,3120000000,3115000000,-32.285823 +0,30,3125000000,3120000000,-32.298476 +0,30,3130000000,3125000000,-32.324770 +0,30,3135000000,3130000000,-32.343473 +0,30,3140000000,3135000000,-32.389861 +0,30,3145000000,3140000000,-32.403151 +0,30,3150000000,3145000000,-32.384460 +0,30,3155000000,3150000000,-32.391795 +0,30,3160000000,3155000000,-32.408354 +0,30,3165000000,3160000000,-32.435439 +0,30,3170000000,3165000000,-32.438730 +0,30,3175000000,3170000000,-32.419274 +0,30,3180000000,3175000000,-32.442679 +0,30,3185000000,3180000000,-32.436374 +0,30,3190000000,3185000000,-32.433205 +0,30,3195000000,3190000000,-32.405928 +0,30,3200000000,3195000000,-32.412953 +0,30,3205000000,3200000000,-32.398936 +0,30,3210000000,3205000000,-32.361155 +0,30,3215000000,3210000000,-32.369431 +0,30,3220000000,3215000000,-32.348352 +0,30,3225000000,3220000000,-32.329688 +0,30,3230000000,3225000000,-32.306590 +0,30,3235000000,3230000000,-32.263486 +0,30,3240000000,3235000000,-32.231055 +0,30,3245000000,3240000000,-32.210957 +0,30,3250000000,3245000000,-32.183926 +0,30,3255000000,3250000000,-32.160020 +0,30,3260000000,3255000000,-32.138841 +0,30,3265000000,3260000000,-32.107271 +0,30,3270000000,3265000000,-32.080100 +0,30,3275000000,3270000000,-32.060286 +0,30,3280000000,3275000000,-32.038516 +0,30,3285000000,3280000000,-32.013382 +0,30,3290000000,3285000000,-32.010857 +0,30,3295000000,3290000000,-31.993777 +0,30,3300000000,3295000000,-31.967588 +0,30,3305000000,3300000000,-31.943508 +0,30,3310000000,3305000000,-31.936506 +0,30,3315000000,3310000000,-31.918922 +0,30,3320000000,3315000000,-31.912471 +0,30,3325000000,3320000000,-31.908757 +0,30,3330000000,3325000000,-31.929114 +0,30,3335000000,3330000000,-31.914782 +0,30,3340000000,3335000000,-31.909318 +0,30,3345000000,3340000000,-31.920956 +0,30,3350000000,3345000000,-31.925162 +0,30,3355000000,3350000000,-31.937831 +0,30,3360000000,3355000000,-31.991985 +0,30,3365000000,3360000000,-31.998721 +0,30,3370000000,3365000000,-31.998609 +0,30,3375000000,3370000000,-32.017992 +0,30,3380000000,3375000000,-32.043544 +0,30,3385000000,3380000000,-32.067430 +0,30,3390000000,3385000000,-32.101308 +0,30,3395000000,3390000000,-32.132674 +0,30,3400000000,3395000000,-32.163248 +0,30,3405000000,3400000000,-32.230867 +0,30,3410000000,3405000000,-32.234471 +0,30,3415000000,3410000000,-32.275939 +0,30,3420000000,3415000000,-32.355185 +0,30,3425000000,3420000000,-32.361338 +0,30,3430000000,3425000000,-32.409155 +0,30,3435000000,3430000000,-32.492010 +0,30,3440000000,3435000000,-32.500635 +0,30,3445000000,3440000000,-32.547619 +0,30,3450000000,3445000000,-32.601545 +0,30,3455000000,3450000000,-32.655748 +0,30,3460000000,3455000000,-32.700693 +0,30,3465000000,3460000000,-32.761832 +0,30,3470000000,3465000000,-32.808384 +0,30,3475000000,3470000000,-32.862892 +0,30,3480000000,3475000000,-32.910352 +0,30,3485000000,3480000000,-32.970633 +0,30,3490000000,3485000000,-33.022984 +0,30,3495000000,3490000000,-33.070061 +0,30,3500000000,3495000000,-33.153046 +0,30,3505000000,3500000000,-33.180054 +0,30,3510000000,3505000000,-33.237310 +0,30,3515000000,3510000000,-33.286969 +0,30,3520000000,3515000000,-33.337380 +0,30,3525000000,3520000000,-33.389421 +0,30,3530000000,3525000000,-33.448691 +0,30,3535000000,3530000000,-33.536424 +0,30,3540000000,3535000000,-33.544199 +0,30,3545000000,3540000000,-33.594322 +0,30,3550000000,3545000000,-33.648038 +0,30,3555000000,3550000000,-33.704558 +0,30,3560000000,3555000000,-33.751649 +0,30,3565000000,3560000000,-33.795574 +0,30,3570000000,3565000000,-33.851653 +0,30,3575000000,3570000000,-33.892415 +0,30,3580000000,3575000000,-33.959017 +0,30,3585000000,3580000000,-34.011335 +0,30,3590000000,3585000000,-34.067196 +0,30,3595000000,3590000000,-34.112895 +0,30,3600000000,3595000000,-34.162851 +0,30,3605000000,3600000000,-34.208597 +0,30,3610000000,3605000000,-34.263128 +0,30,3615000000,3610000000,-34.307530 +0,30,3620000000,3615000000,-34.366667 +0,30,3625000000,3620000000,-34.445376 +0,30,3630000000,3625000000,-34.472662 +0,30,3635000000,3630000000,-34.514249 +0,30,3640000000,3635000000,-34.569208 +0,30,3645000000,3640000000,-34.623280 +0,30,3650000000,3645000000,-34.660453 +0,30,3655000000,3650000000,-34.700316 +0,30,3660000000,3655000000,-34.742859 +0,30,3665000000,3660000000,-34.788420 +0,30,3670000000,3665000000,-34.835476 +0,30,3675000000,3670000000,-34.886083 +0,30,3680000000,3675000000,-34.937226 +0,30,3685000000,3680000000,-34.991777 +0,30,3690000000,3685000000,-35.051892 +0,30,3695000000,3690000000,-35.121010 +0,30,3700000000,3695000000,-35.211962 +0,30,3705000000,3700000000,-35.248504 +0,30,3710000000,3705000000,-35.321178 +0,30,3715000000,3710000000,-35.387302 +0,30,3720000000,3715000000,-35.250966 +0,30,3725000000,3720000000,-35.342011 +0,30,3730000000,3725000000,-35.432958 +0,30,3735000000,3730000000,-35.497600 +0,30,3740000000,3735000000,-35.589871 +0,30,3745000000,3740000000,-35.718305 +0,30,3750000000,3745000000,-35.779487 +0,30,3755000000,3750000000,-35.901691 +0,30,3760000000,3755000000,-36.001408 +0,30,3765000000,3760000000,-36.088441 +0,30,3770000000,3765000000,-36.167601 +0,30,3775000000,3770000000,-36.275781 +0,30,3780000000,3775000000,-36.334682 +0,30,3785000000,3780000000,-36.426952 +0,30,3790000000,3785000000,-36.542487 +0,30,3795000000,3790000000,-36.625457 +0,30,3800000000,3795000000,-36.699704 +0,30,3805000000,3800000000,-36.738775 +0,30,3810000000,3805000000,-36.803973 +0,30,3815000000,3810000000,-36.876196 +0,30,3820000000,3815000000,-36.935673 +0,30,3825000000,3820000000,-36.994073 +0,30,3830000000,3825000000,-37.058785 +0,30,3835000000,3830000000,-37.104132 +0,30,3840000000,3835000000,-37.143952 +0,30,3845000000,3840000000,-37.185112 +0,30,3850000000,3845000000,-37.225627 +0,30,3855000000,3850000000,-37.258240 +0,30,3860000000,3855000000,-37.281739 +0,30,3865000000,3860000000,-37.306456 +0,30,3870000000,3865000000,-37.323162 +0,30,3875000000,3870000000,-37.341740 +0,30,3880000000,3875000000,-37.342289 +0,30,3885000000,3880000000,-37.349224 +0,30,3890000000,3885000000,-37.355502 +0,30,3895000000,3890000000,-37.333470 +0,30,3900000000,3895000000,-37.336551 +0,30,3905000000,3900000000,-37.326169 +0,30,3910000000,3905000000,-37.311098 +0,30,3915000000,3910000000,-37.298200 +0,30,3920000000,3915000000,-37.273848 +0,30,3925000000,3920000000,-37.252469 +0,30,3930000000,3925000000,-37.230388 +0,30,3935000000,3930000000,-37.201702 +0,30,3940000000,3935000000,-37.185311 +0,30,3945000000,3940000000,-37.165221 +0,30,3950000000,3945000000,-37.153839 +0,30,3955000000,3950000000,-37.136505 +0,30,3960000000,3955000000,-37.114794 +0,30,3965000000,3960000000,-37.105919 +0,30,3970000000,3965000000,-37.085924 +0,30,3975000000,3970000000,-37.085960 +0,30,3980000000,3975000000,-37.087987 +0,30,3985000000,3980000000,-37.091142 +0,30,3990000000,3985000000,-37.098877 +0,30,3995000000,3990000000,-37.111034 +0,30,4000000000,3995000000,-37.130940 +0,30,4005000000,4000000000,-37.275988 +0,30,4010000000,4005000000,-37.256692 +0,30,4015000000,4010000000,-37.259124 +0,30,4020000000,4015000000,-37.296263 +0,30,4025000000,4020000000,-37.352148 +0,30,4030000000,4025000000,-37.397964 +0,30,4035000000,4030000000,-37.417982 +0,30,4040000000,4035000000,-37.463136 +0,30,4045000000,4040000000,-37.513513 +0,30,4050000000,4045000000,-37.571301 +0,30,4055000000,4050000000,-37.626913 +0,30,4060000000,4055000000,-37.695241 +0,30,4065000000,4060000000,-37.746591 +0,30,4070000000,4065000000,-37.804306 +0,30,4075000000,4070000000,-37.866004 +0,30,4080000000,4075000000,-37.921785 +0,30,4085000000,4080000000,-37.974347 +0,30,4090000000,4085000000,-38.022658 +0,30,4095000000,4090000000,-38.073012 +0,30,4100000000,4095000000,-38.149716 +0,30,4105000000,4100000000,-38.154052 +0,30,4110000000,4105000000,-38.203907 +0,30,4115000000,4110000000,-38.226296 +0,30,4120000000,4115000000,-38.238992 +0,30,4125000000,4120000000,-38.261168 +0,30,4130000000,4125000000,-38.261116 +0,30,4135000000,4130000000,-38.253712 +0,30,4140000000,4135000000,-38.244361 +0,30,4145000000,4140000000,-38.236536 +0,30,4150000000,4145000000,-38.216005 +0,30,4155000000,4150000000,-38.203362 +0,30,4160000000,4155000000,-38.171338 +0,30,4165000000,4160000000,-38.153420 +0,30,4170000000,4165000000,-38.091377 +0,30,4175000000,4170000000,-38.044319 +0,30,4180000000,4175000000,-37.987391 +0,30,4185000000,4180000000,-37.934807 +0,30,4190000000,4185000000,-37.861318 +0,30,4195000000,4190000000,-37.796483 +0,30,4200000000,4195000000,-37.711978 +0,30,4205000000,4200000000,-37.635226 +0,30,4210000000,4205000000,-37.572283 +0,30,4215000000,4210000000,-37.472569 +0,30,4220000000,4215000000,-37.383602 +0,30,4225000000,4220000000,-37.295199 +0,30,4230000000,4225000000,-37.204058 +0,30,4235000000,4230000000,-37.108341 +0,30,4240000000,4235000000,-37.020416 +0,30,4245000000,4240000000,-36.935088 +0,30,4250000000,4245000000,-36.829173 +0,30,4255000000,4250000000,-36.742182 +0,30,4260000000,4255000000,-36.653322 +0,30,4265000000,4260000000,-36.577582 +0,30,4270000000,4265000000,-36.499734 +0,30,4275000000,4270000000,-36.428050 +0,30,4280000000,4275000000,-36.360823 +0,30,4285000000,4280000000,-36.302390 +0,30,4290000000,4285000000,-36.261081 +0,30,4295000000,4290000000,-36.209791 +0,30,4300000000,4295000000,-36.179976 +0,30,4305000000,4300000000,-36.148018 +0,30,4310000000,4305000000,-36.131809 +0,30,4315000000,4310000000,-36.111764 +0,30,4320000000,4315000000,-36.107968 +0,30,4325000000,4320000000,-36.117255 +0,30,4330000000,4325000000,-36.136815 +0,30,4335000000,4330000000,-36.156399 +0,30,4340000000,4335000000,-36.179655 +0,30,4345000000,4340000000,-36.213475 +0,30,4350000000,4345000000,-36.259049 +0,30,4355000000,4350000000,-36.291918 +0,30,4360000000,4355000000,-36.326768 +0,30,4365000000,4360000000,-36.376293 +0,30,4370000000,4365000000,-36.416618 +0,30,4375000000,4370000000,-36.452553 +0,30,4380000000,4375000000,-36.505706 +0,30,4385000000,4380000000,-36.545463 +0,30,4390000000,4385000000,-36.591355 +0,30,4395000000,4390000000,-36.634697 +0,30,4400000000,4395000000,-36.659635 +0,30,4405000000,4400000000,-36.691995 +0,30,4410000000,4405000000,-36.732177 +0,30,4415000000,4410000000,-36.751283 +0,30,4420000000,4415000000,-36.776219 +0,30,4425000000,4420000000,-36.804531 +0,30,4430000000,4425000000,-36.808557 +0,30,4435000000,4430000000,-36.835896 +0,30,4440000000,4435000000,-36.854073 +0,30,4445000000,4440000000,-36.844106 +0,30,4450000000,4445000000,-36.831034 +0,30,4455000000,4450000000,-36.827002 +0,30,4460000000,4455000000,-36.822752 +0,30,4465000000,4460000000,-36.828975 +0,30,4470000000,4465000000,-36.799318 +0,30,4475000000,4470000000,-36.779262 +0,30,4480000000,4475000000,-36.763445 +0,30,4485000000,4480000000,-36.734743 +0,30,4490000000,4485000000,-36.717327 +0,30,4495000000,4490000000,-36.677343 +0,30,4500000000,4495000000,-36.661523 +0,30,4505000000,4500000000,-36.622484 +0,30,4510000000,4505000000,-36.601823 +0,30,4515000000,4510000000,-36.565325 +0,30,4520000000,4515000000,-36.538573 +0,30,4525000000,4520000000,-36.503399 +0,30,4530000000,4525000000,-36.477100 +0,30,4535000000,4530000000,-36.454012 +0,30,4540000000,4535000000,-36.440668 +0,30,4545000000,4540000000,-36.421080 +0,30,4550000000,4545000000,-36.404037 +0,30,4555000000,4550000000,-36.438562 +0,30,4560000000,4555000000,-36.439141 +0,30,4565000000,4560000000,-36.428079 +0,30,4570000000,4565000000,-36.410180 +0,30,4575000000,4570000000,-36.419804 +0,30,4580000000,4575000000,-36.413851 +0,30,4585000000,4580000000,-36.422381 +0,30,4590000000,4585000000,-36.437572 +0,30,4595000000,4590000000,-36.451207 +0,30,4600000000,4595000000,-36.474312 +0,30,4605000000,4600000000,-36.500900 +0,30,4610000000,4605000000,-36.452594 +0,30,4615000000,4610000000,-36.480728 +0,30,4620000000,4615000000,-36.507014 +0,30,4625000000,4620000000,-36.531190 +0,30,4630000000,4625000000,-36.560667 +0,30,4635000000,4630000000,-36.596861 +0,30,4640000000,4635000000,-36.625274 +0,30,4645000000,4640000000,-36.648038 +0,30,4650000000,4645000000,-36.675068 +0,30,4655000000,4650000000,-36.676597 +0,30,4660000000,4655000000,-36.737997 +0,30,4665000000,4660000000,-36.749521 +0,30,4670000000,4665000000,-36.786947 +0,30,4675000000,4670000000,-36.837307 +0,30,4680000000,4675000000,-36.833744 +0,30,4685000000,4680000000,-36.838701 +0,30,4690000000,4685000000,-36.864372 +0,30,4695000000,4690000000,-36.891093 +0,30,4700000000,4695000000,-36.878887 +0,30,4705000000,4700000000,-36.913673 +0,30,4710000000,4705000000,-36.923630 +0,30,4715000000,4710000000,-36.924560 +0,30,4720000000,4715000000,-36.932985 +0,30,4725000000,4720000000,-36.932159 +0,30,4730000000,4725000000,-36.967358 +0,30,4735000000,4730000000,-36.975268 +0,30,4740000000,4735000000,-36.981240 +0,30,4745000000,4740000000,-36.979722 +0,30,4750000000,4745000000,-36.991361 +0,30,4755000000,4750000000,-36.963528 +0,30,4760000000,4755000000,-36.971333 +0,30,4765000000,4760000000,-36.973684 +0,30,4770000000,4765000000,-36.979392 +0,30,4775000000,4770000000,-36.977195 +0,30,4780000000,4775000000,-36.976784 +0,30,4785000000,4780000000,-36.973556 +0,30,4790000000,4785000000,-36.991919 +0,30,4795000000,4790000000,-36.986815 +0,30,4800000000,4795000000,-36.991472 +0,30,4805000000,4800000000,-37.001060 +0,30,4810000000,4805000000,-37.011054 +0,30,4815000000,4810000000,-37.020134 +0,30,4820000000,4815000000,-37.031426 +0,30,4825000000,4820000000,-37.023256 +0,30,4830000000,4825000000,-37.043795 +0,30,4835000000,4830000000,-37.061035 +0,30,4840000000,4835000000,-37.073846 +0,30,4845000000,4840000000,-37.105710 +0,30,4850000000,4845000000,-37.123388 +0,30,4855000000,4850000000,-37.144258 +0,30,4860000000,4855000000,-37.173135 +0,30,4865000000,4860000000,-37.184137 +0,30,4870000000,4865000000,-37.236799 +0,30,4875000000,4870000000,-37.227935 +0,30,4880000000,4875000000,-37.228386 +0,30,4885000000,4880000000,-37.174680 +0,30,4890000000,4885000000,-37.176321 +0,30,4895000000,4890000000,-37.165460 +0,30,4900000000,4895000000,-37.208247 +0,30,4905000000,4900000000,-37.189400 +0,30,4910000000,4905000000,-37.197569 +0,30,4915000000,4910000000,-37.187907 +0,30,4920000000,4915000000,-37.179262 +0,30,4925000000,4920000000,-37.168809 +0,30,4930000000,4925000000,-37.127531 +0,30,4935000000,4930000000,-37.126789 +0,30,4940000000,4935000000,-37.093883 +0,30,4945000000,4940000000,-37.075420 +0,30,4950000000,4945000000,-37.046898 +0,30,4955000000,4950000000,-37.018733 +0,30,4960000000,4955000000,-36.979154 +0,30,4965000000,4960000000,-36.927560 +0,30,4970000000,4965000000,-36.883890 +0,30,4975000000,4970000000,-36.854584 +0,30,4980000000,4975000000,-36.805028 +0,30,4985000000,4980000000,-36.752423 +0,30,4990000000,4985000000,-36.702937 +0,30,4995000000,4990000000,-36.643177 +0,30,5000000000,4995000000,-36.589714 +0,30,5005000000,5000000000,-36.809583 +0,30,5010000000,5005000000,-36.694958 +0,30,5015000000,5010000000,-36.604551 +0,30,5020000000,5015000000,-36.521959 +0,30,5025000000,5020000000,-36.446284 +0,30,5030000000,5025000000,-36.365069 +0,30,5035000000,5030000000,-36.288798 +0,30,5040000000,5035000000,-36.226599 +0,30,5045000000,5040000000,-36.166830 +0,30,5050000000,5045000000,-36.111060 +0,30,5055000000,5050000000,-36.069538 +0,30,5060000000,5055000000,-36.025576 +0,30,5065000000,5060000000,-35.994165 +0,30,5070000000,5065000000,-35.967241 +0,30,5075000000,5070000000,-35.951228 +0,30,5080000000,5075000000,-35.941251 +0,30,5085000000,5080000000,-35.943849 +0,30,5090000000,5085000000,-35.944338 +0,30,5095000000,5090000000,-35.968721 +0,30,5100000000,5095000000,-35.979542 +0,30,5105000000,5100000000,-36.018471 +0,30,5110000000,5105000000,-36.032450 +0,30,5115000000,5110000000,-36.064877 +0,30,5120000000,5115000000,-36.106334 +0,30,5125000000,5120000000,-36.290761 +0,30,5130000000,5125000000,-36.341324 +0,30,5135000000,5130000000,-36.385161 +0,30,5140000000,5135000000,-36.431829 +0,30,5145000000,5140000000,-36.491449 +0,30,5150000000,5145000000,-36.533189 +0,30,5155000000,5150000000,-36.598759 +0,30,5160000000,5155000000,-36.632479 +0,30,5165000000,5160000000,-36.684197 +0,30,5170000000,5165000000,-36.736812 +0,30,5175000000,5170000000,-36.761984 +0,30,5180000000,5175000000,-36.824592 +0,30,5185000000,5180000000,-36.784432 +0,30,5190000000,5185000000,-36.823496 +0,30,5195000000,5190000000,-36.869823 +0,30,5200000000,5195000000,-36.918272 +0,30,5205000000,5200000000,-36.948921 +0,30,5210000000,5205000000,-36.975022 +0,30,5215000000,5210000000,-37.009415 +0,30,5220000000,5215000000,-37.022772 +0,30,5225000000,5220000000,-37.038189 +0,30,5230000000,5225000000,-37.047401 +0,30,5235000000,5230000000,-37.047765 +0,30,5240000000,5235000000,-37.064182 +0,30,5245000000,5240000000,-37.056857 +0,30,5250000000,5245000000,-37.070317 +0,30,5255000000,5250000000,-37.070078 +0,30,5260000000,5255000000,-37.079763 +0,30,5265000000,5260000000,-37.093936 +0,30,5270000000,5265000000,-37.099599 +0,30,5275000000,5270000000,-37.121466 +0,30,5280000000,5275000000,-37.131975 +0,30,5285000000,5280000000,-37.160163 +0,30,5290000000,5285000000,-37.188338 +0,30,5295000000,5290000000,-37.231232 +0,30,5300000000,5295000000,-37.265676 +0,30,5305000000,5300000000,-37.276926 +0,30,5310000000,5305000000,-37.503461 +0,30,5315000000,5310000000,-37.549352 +0,30,5320000000,5315000000,-37.622295 +0,30,5325000000,5320000000,-37.685803 +0,30,5330000000,5325000000,-37.811992 +0,30,5335000000,5330000000,-37.855192 +0,30,5340000000,5335000000,-37.942690 +0,30,5345000000,5340000000,-38.030235 +0,30,5350000000,5345000000,-38.120942 +0,30,5355000000,5350000000,-38.214279 +0,30,5360000000,5355000000,-38.332392 +0,30,5365000000,5360000000,-38.430425 +0,30,5370000000,5365000000,-38.535860 +0,30,5375000000,5370000000,-38.633590 +0,30,5380000000,5375000000,-38.741056 +0,30,5385000000,5380000000,-38.846844 +0,30,5390000000,5385000000,-38.936944 +0,30,5395000000,5390000000,-39.043027 +0,30,5400000000,5395000000,-39.143313 +0,30,5405000000,5400000000,-39.223820 +0,30,5410000000,5405000000,-39.314225 +0,30,5415000000,5410000000,-39.417381 +0,30,5420000000,5415000000,-39.493188 +0,30,5425000000,5420000000,-39.569759 +0,30,5430000000,5425000000,-39.654633 +0,30,5435000000,5430000000,-39.726076 +0,30,5440000000,5435000000,-39.793784 +0,30,5445000000,5440000000,-39.847791 +0,30,5450000000,5445000000,-39.917141 +0,30,5455000000,5450000000,-39.963076 +0,30,5460000000,5455000000,-40.018779 +0,30,5465000000,5460000000,-40.063616 +0,30,5470000000,5465000000,-40.115447 +0,30,5475000000,5470000000,-40.164328 +0,30,5480000000,5475000000,-40.196036 +0,30,5485000000,5480000000,-40.232151 +0,30,5490000000,5485000000,-40.261364 +0,30,5495000000,5490000000,-40.296474 +0,30,5500000000,5495000000,-40.318139 +0,30,5505000000,5500000000,-40.339590 +0,30,5510000000,5505000000,-40.359718 +0,30,5515000000,5510000000,-40.390747 +0,30,5520000000,5515000000,-40.406883 +0,30,5525000000,5520000000,-40.432211 +0,30,5530000000,5525000000,-40.458810 +0,30,5535000000,5530000000,-40.463561 +0,30,5540000000,5535000000,-40.369960 +0,30,5545000000,5540000000,-40.389094 +0,30,5550000000,5545000000,-40.401463 +0,30,5555000000,5550000000,-40.430340 +0,30,5560000000,5555000000,-40.442154 +0,30,5565000000,5560000000,-40.453888 +0,30,5570000000,5565000000,-40.465457 +0,30,5575000000,5570000000,-40.489030 +0,30,5580000000,5575000000,-40.506219 +0,30,5585000000,5580000000,-40.524192 +0,30,5590000000,5585000000,-40.535142 +0,30,5595000000,5590000000,-40.560155 +0,30,5600000000,5595000000,-40.589618 +0,30,5605000000,5600000000,-40.573407 +0,30,5610000000,5605000000,-40.590370 +0,30,5615000000,5610000000,-40.611676 +0,30,5620000000,5615000000,-40.612120 +0,30,5625000000,5620000000,-40.634402 +0,30,5630000000,5625000000,-40.656574 +0,30,5635000000,5630000000,-40.668585 +0,30,5640000000,5635000000,-40.661483 +0,30,5645000000,5640000000,-40.666801 +0,30,5650000000,5645000000,-40.688791 +0,30,5655000000,5650000000,-40.688456 +0,30,5660000000,5655000000,-40.702480 +0,30,5665000000,5660000000,-40.709054 +0,30,5670000000,5665000000,-40.716602 +0,30,5675000000,5670000000,-40.738714 +0,30,5680000000,5675000000,-40.753401 +0,30,5685000000,5680000000,-40.764174 +0,30,5690000000,5685000000,-40.766840 +0,30,5695000000,5690000000,-40.770814 +0,30,5700000000,5695000000,-40.742632 +0,30,5705000000,5700000000,-40.783391 +0,30,5710000000,5705000000,-40.788399 +0,30,5715000000,5710000000,-40.781294 +0,30,5720000000,5715000000,-40.784334 +0,30,5725000000,5720000000,-40.782913 +0,30,5730000000,5725000000,-40.799375 +0,30,5735000000,5730000000,-40.795536 +0,30,5740000000,5735000000,-40.809814 +0,30,5745000000,5740000000,-40.800712 +0,30,5750000000,5745000000,-40.810192 +0,30,5755000000,5750000000,-40.812974 +0,30,5760000000,5755000000,-40.817176 +0,30,5765000000,5760000000,-40.812059 +0,30,5770000000,5765000000,-40.840522 +0,30,5775000000,5770000000,-40.823772 +0,30,5780000000,5775000000,-40.824694 +0,30,5785000000,5780000000,-40.826688 +0,30,5790000000,5785000000,-40.808936 +0,30,5795000000,5790000000,-40.824296 +0,30,5800000000,5795000000,-40.815080 +0,30,5805000000,5800000000,-40.808869 +0,30,5810000000,5805000000,-40.790197 +0,30,5815000000,5810000000,-40.775784 +0,30,5820000000,5815000000,-40.762523 +0,30,5825000000,5820000000,-40.740107 +0,30,5830000000,5825000000,-40.730239 +0,30,5835000000,5830000000,-40.710520 +0,30,5840000000,5835000000,-40.666645 +0,30,5845000000,5840000000,-40.638698 +0,30,5850000000,5845000000,-40.613786 +0,30,5855000000,5850000000,-40.578117 +0,30,5860000000,5855000000,-40.532292 +0,30,5865000000,5860000000,-40.464987 +0,30,5870000000,5865000000,-40.414865 +0,30,5875000000,5870000000,-40.366700 +0,30,5880000000,5875000000,-40.300637 +0,30,5885000000,5880000000,-40.237486 +0,30,5890000000,5885000000,-40.162925 +0,30,5895000000,5890000000,-40.088193 +0,30,5900000000,5895000000,-40.016565 +0,30,5905000000,5900000000,-39.947180 +0,30,5910000000,5905000000,-39.864011 +0,30,5915000000,5910000000,-39.762713 +0,30,5920000000,5915000000,-39.674886 +0,30,5925000000,5920000000,-39.598081 +0,30,5930000000,5925000000,-39.503462 +0,30,5935000000,5930000000,-39.420238 +0,30,5940000000,5935000000,-39.327480 +0,30,5945000000,5940000000,-39.252698 +0,30,5950000000,5945000000,-39.169805 +0,30,5955000000,5950000000,-39.080002 +0,30,5960000000,5955000000,-38.976653 +0,30,5965000000,5960000000,-38.876284 +0,30,5970000000,5965000000,-38.789874 +0,30,5975000000,5970000000,-38.693318 +0,30,5980000000,5975000000,-38.603341 +0,30,5985000000,5980000000,-38.530356 +0,30,5990000000,5985000000,-38.467843 +0,30,5995000000,5990000000,-38.407018 +0,30,6000000000,5995000000,-38.339691 +0,30,6005000000,6000000000,-38.292864 +1,60,75000000,70000000,4.118145 +1,60,80000000,75000000,4.120237 +1,60,85000000,80000000,4.071447 +1,60,90000000,85000000,3.986350 +1,60,95000000,90000000,3.910265 +1,60,100000000,95000000,3.938866 +1,60,105000000,100000000,3.850418 +1,60,110000000,105000000,3.833037 +1,60,115000000,110000000,3.568585 +1,60,120000000,115000000,3.743790 +1,60,125000000,120000000,3.606806 +1,60,130000000,125000000,3.666961 +1,60,135000000,130000000,3.682439 +1,60,140000000,135000000,3.699359 +1,60,145000000,140000000,3.654489 +1,60,150000000,145000000,3.693749 +1,60,155000000,150000000,3.666711 +1,60,160000000,155000000,3.663805 +1,60,165000000,160000000,3.583302 +1,60,170000000,165000000,3.630264 +1,60,175000000,170000000,3.628801 +1,60,180000000,175000000,3.584064 +1,60,185000000,180000000,3.557610 +1,60,190000000,185000000,3.572951 +1,60,195000000,190000000,3.569510 +1,60,200000000,195000000,3.489633 +1,60,205000000,200000000,3.533012 +1,60,210000000,205000000,3.516401 +1,60,215000000,210000000,3.505666 +1,60,220000000,215000000,3.503843 +1,60,225000000,220000000,3.496242 +1,60,230000000,225000000,3.473359 +1,60,235000000,230000000,3.458085 +1,60,240000000,235000000,3.453986 +1,60,245000000,240000000,3.443485 +1,60,250000000,245000000,3.419987 +1,60,255000000,250000000,3.404960 +1,60,260000000,255000000,3.371288 +1,60,265000000,260000000,3.346029 +1,60,270000000,265000000,3.293956 +1,60,275000000,270000000,3.313075 +1,60,280000000,275000000,3.297086 +1,60,285000000,280000000,3.273188 +1,60,290000000,285000000,3.267797 +1,60,295000000,290000000,3.254795 +1,60,300000000,295000000,3.208274 +1,60,305000000,300000000,3.223704 +1,60,310000000,305000000,3.205746 +1,60,315000000,310000000,3.186363 +1,60,320000000,315000000,3.170674 +1,60,325000000,320000000,3.147251 +1,60,330000000,325000000,3.124012 +1,60,335000000,330000000,3.107713 +1,60,340000000,335000000,3.088388 +1,60,345000000,340000000,3.055834 +1,60,350000000,345000000,3.049620 +1,60,355000000,350000000,3.021976 +1,60,360000000,355000000,3.018718 +1,60,365000000,360000000,3.011717 +1,60,370000000,365000000,2.993448 +1,60,375000000,370000000,2.988895 +1,60,380000000,375000000,2.973242 +1,60,385000000,380000000,2.974617 +1,60,390000000,385000000,2.945178 +1,60,395000000,390000000,2.908957 +1,60,400000000,395000000,2.891268 +1,60,405000000,400000000,2.876464 +1,60,410000000,405000000,2.864924 +1,60,415000000,410000000,2.862376 +1,60,420000000,415000000,2.839072 +1,60,425000000,420000000,2.829368 +1,60,430000000,425000000,2.822262 +1,60,435000000,430000000,2.814377 +1,60,440000000,435000000,2.812431 +1,60,445000000,440000000,2.802500 +1,60,450000000,445000000,2.792276 +1,60,455000000,450000000,2.788625 +1,60,460000000,455000000,2.772357 +1,60,465000000,460000000,2.765824 +1,60,470000000,465000000,2.753717 +1,60,475000000,470000000,2.750244 +1,60,480000000,475000000,2.697735 +1,60,485000000,480000000,2.720670 +1,60,490000000,485000000,2.700643 +1,60,495000000,490000000,2.688687 +1,60,500000000,495000000,2.672744 +1,60,505000000,500000000,2.660659 +1,60,510000000,505000000,2.630428 +1,60,515000000,510000000,2.561761 +1,60,520000000,515000000,2.594014 +1,60,525000000,520000000,2.571158 +1,60,530000000,525000000,2.536024 +1,60,535000000,530000000,2.510705 +1,60,540000000,535000000,2.472667 +1,60,545000000,540000000,2.432559 +1,60,550000000,545000000,2.397903 +1,60,555000000,550000000,2.362770 +1,60,560000000,555000000,2.329981 +1,60,565000000,560000000,2.280665 +1,60,570000000,565000000,2.235960 +1,60,575000000,570000000,2.185155 +1,60,580000000,575000000,2.140835 +1,60,585000000,580000000,2.095532 +1,60,590000000,585000000,2.044864 +1,60,595000000,590000000,1.990514 +1,60,600000000,595000000,1.941898 +1,60,605000000,600000000,1.769563 +1,60,610000000,605000000,1.741997 +1,60,615000000,610000000,1.721686 +1,60,620000000,615000000,1.631075 +1,60,625000000,620000000,1.633213 +1,60,630000000,625000000,1.612130 +1,60,635000000,630000000,1.574653 +1,60,640000000,635000000,1.531739 +1,60,645000000,640000000,1.494930 +1,60,650000000,645000000,1.394626 +1,60,655000000,650000000,1.357393 +1,60,660000000,655000000,1.364514 +1,60,665000000,660000000,1.337918 +1,60,670000000,665000000,1.309195 +1,60,675000000,670000000,1.281534 +1,60,680000000,675000000,1.253736 +1,60,685000000,680000000,1.229779 +1,60,690000000,685000000,1.182147 +1,60,695000000,690000000,1.176514 +1,60,700000000,695000000,1.151710 +1,60,705000000,700000000,1.141681 +1,60,710000000,705000000,1.126820 +1,60,715000000,710000000,1.114262 +1,60,720000000,715000000,1.096620 +1,60,725000000,720000000,1.080872 +1,60,730000000,725000000,1.062299 +1,60,735000000,730000000,1.024545 +1,60,740000000,735000000,0.993904 +1,60,745000000,740000000,0.943747 +1,60,750000000,745000000,0.887219 +1,60,755000000,750000000,0.854159 +1,60,760000000,755000000,0.873143 +1,60,765000000,760000000,0.978667 +1,60,770000000,765000000,1.102578 +1,60,775000000,770000000,1.209833 +1,60,780000000,775000000,1.288356 +1,60,785000000,780000000,1.357198 +1,60,790000000,785000000,1.406880 +1,60,795000000,790000000,1.449441 +1,60,800000000,795000000,1.487980 +1,60,805000000,800000000,1.526878 +1,60,810000000,805000000,1.552604 +1,60,815000000,810000000,1.574903 +1,60,820000000,815000000,1.573026 +1,60,825000000,820000000,1.615953 +1,60,830000000,825000000,1.638080 +1,60,835000000,830000000,1.643346 +1,60,840000000,835000000,1.656077 +1,60,845000000,840000000,1.663562 +1,60,850000000,845000000,1.672622 +1,60,855000000,850000000,1.688258 +1,60,860000000,855000000,1.681837 +1,60,865000000,860000000,1.682444 +1,60,870000000,865000000,1.686337 +1,60,875000000,870000000,1.682432 +1,60,880000000,875000000,1.648815 +1,60,885000000,880000000,1.673984 +1,60,890000000,885000000,1.655370 +1,60,895000000,890000000,1.650795 +1,60,900000000,895000000,1.641859 +1,60,905000000,900000000,1.637044 +1,60,910000000,905000000,1.618134 +1,60,915000000,910000000,1.611259 +1,60,920000000,915000000,1.606146 +1,60,925000000,920000000,1.604929 +1,60,930000000,925000000,1.593440 +1,60,935000000,930000000,1.592905 +1,60,940000000,935000000,1.587890 +1,60,945000000,940000000,1.588107 +1,60,950000000,945000000,1.583245 +1,60,955000000,950000000,1.574816 +1,60,960000000,955000000,1.579399 +1,60,965000000,960000000,1.552805 +1,60,970000000,965000000,1.588564 +1,60,975000000,970000000,1.611121 +1,60,980000000,975000000,1.616799 +1,60,985000000,980000000,1.629245 +1,60,990000000,985000000,1.644466 +1,60,995000000,990000000,1.668695 +1,60,1000000000,995000000,1.681293 +1,60,1005000000,1000000000,1.497485 +1,60,1010000000,1005000000,1.544548 +1,60,1015000000,1010000000,1.592962 +1,60,1020000000,1015000000,1.634446 +1,60,1025000000,1020000000,1.661700 +1,60,1030000000,1025000000,1.671608 +1,60,1035000000,1030000000,1.721033 +1,60,1040000000,1035000000,1.751380 +1,60,1045000000,1040000000,1.806325 +1,60,1050000000,1045000000,1.809396 +1,60,1055000000,1050000000,1.838399 +1,60,1060000000,1055000000,1.854544 +1,60,1065000000,1060000000,1.863676 +1,60,1070000000,1065000000,1.883242 +1,60,1075000000,1070000000,1.901148 +1,60,1080000000,1075000000,1.906221 +1,60,1085000000,1080000000,1.907985 +1,60,1090000000,1085000000,1.908919 +1,60,1095000000,1090000000,1.914382 +1,60,1100000000,1095000000,1.913725 +1,60,1105000000,1100000000,1.897530 +1,60,1110000000,1105000000,1.882040 +1,60,1115000000,1110000000,1.868542 +1,60,1120000000,1115000000,1.837513 +1,60,1125000000,1120000000,1.815551 +1,60,1130000000,1125000000,1.774552 +1,60,1135000000,1130000000,1.721005 +1,60,1140000000,1135000000,1.676211 +1,60,1145000000,1140000000,1.619384 +1,60,1150000000,1145000000,1.555226 +1,60,1155000000,1150000000,1.470043 +1,60,1160000000,1155000000,1.378512 +1,60,1165000000,1160000000,1.265398 +1,60,1170000000,1165000000,1.164420 +1,60,1175000000,1170000000,1.099146 +1,60,1180000000,1175000000,1.054390 +1,60,1185000000,1180000000,1.058869 +1,60,1190000000,1185000000,1.092423 +1,60,1195000000,1190000000,1.123636 +1,60,1200000000,1195000000,1.154818 +1,60,1205000000,1200000000,1.163866 +1,60,1210000000,1205000000,1.175609 +1,60,1215000000,1210000000,1.173326 +1,60,1220000000,1215000000,1.152320 +1,60,1225000000,1220000000,1.088623 +1,60,1230000000,1225000000,1.095384 +1,60,1235000000,1230000000,1.057589 +1,60,1240000000,1235000000,1.014731 +1,60,1245000000,1240000000,0.972102 +1,60,1250000000,1245000000,0.921016 +1,60,1255000000,1250000000,0.862489 +1,60,1260000000,1255000000,0.798173 +1,60,1265000000,1260000000,0.739720 +1,60,1270000000,1265000000,0.682384 +1,60,1275000000,1270000000,0.602886 +1,60,1280000000,1275000000,0.529878 +1,60,1285000000,1280000000,0.453382 +1,60,1290000000,1285000000,0.365452 +1,60,1295000000,1290000000,0.284655 +1,60,1300000000,1295000000,0.192623 +1,60,1305000000,1300000000,0.100682 +1,60,1310000000,1305000000,0.008291 +1,60,1315000000,1310000000,-0.093312 +1,60,1320000000,1315000000,-0.191643 +1,60,1325000000,1320000000,-0.293947 +1,60,1330000000,1325000000,-0.395058 +1,60,1335000000,1330000000,-0.497527 +1,60,1340000000,1335000000,-0.620668 +1,60,1345000000,1340000000,-0.706136 +1,60,1350000000,1345000000,-0.802318 +1,60,1355000000,1350000000,-0.891505 +1,60,1360000000,1355000000,-0.995777 +1,60,1365000000,1360000000,-1.094896 +1,60,1370000000,1365000000,-1.193049 +1,60,1375000000,1370000000,-1.277575 +1,60,1380000000,1375000000,-1.362545 +1,60,1385000000,1380000000,-1.450016 +1,60,1390000000,1385000000,-1.535660 +1,60,1395000000,1390000000,-1.614586 +1,60,1400000000,1395000000,-1.686302 +1,60,1405000000,1400000000,-1.765329 +1,60,1410000000,1405000000,-1.829364 +1,60,1415000000,1410000000,-1.897838 +1,60,1420000000,1415000000,-1.957177 +1,60,1425000000,1420000000,-2.013192 +1,60,1430000000,1425000000,-2.057809 +1,60,1435000000,1430000000,-2.112925 +1,60,1440000000,1435000000,-2.148218 +1,60,1445000000,1440000000,-2.191049 +1,60,1450000000,1445000000,-2.219753 +1,60,1455000000,1450000000,-2.257659 +1,60,1460000000,1455000000,-2.284245 +1,60,1465000000,1460000000,-2.301141 +1,60,1470000000,1465000000,-2.317422 +1,60,1475000000,1470000000,-2.333758 +1,60,1480000000,1475000000,-2.345669 +1,60,1485000000,1480000000,-2.352526 +1,60,1490000000,1485000000,-2.346378 +1,60,1495000000,1490000000,-2.351467 +1,60,1500000000,1495000000,-2.358510 +1,60,1505000000,1500000000,-2.350649 +1,60,1510000000,1505000000,-2.350747 +1,60,1515000000,1510000000,-2.395116 +1,60,1520000000,1515000000,-2.347593 +1,60,1525000000,1520000000,-2.345304 +1,60,1530000000,1525000000,-2.340524 +1,60,1535000000,1530000000,-2.337811 +1,60,1540000000,1535000000,-2.337649 +1,60,1545000000,1540000000,-2.334606 +1,60,1550000000,1545000000,-2.333589 +1,60,1555000000,1550000000,-2.326234 +1,60,1560000000,1555000000,-2.336900 +1,60,1565000000,1560000000,-2.333623 +1,60,1570000000,1565000000,-2.333136 +1,60,1575000000,1570000000,-2.338494 +1,60,1580000000,1575000000,-2.345484 +1,60,1585000000,1580000000,-2.350964 +1,60,1590000000,1585000000,-2.374476 +1,60,1595000000,1590000000,-2.376505 +1,60,1600000000,1595000000,-2.402293 +1,60,1605000000,1600000000,-2.418143 +1,60,1610000000,1605000000,-2.624673 +1,60,1615000000,1610000000,-2.600839 +1,60,1620000000,1615000000,-2.605408 +1,60,1625000000,1620000000,-2.621252 +1,60,1630000000,1625000000,-2.647231 +1,60,1635000000,1630000000,-2.670129 +1,60,1640000000,1635000000,-2.704115 +1,60,1645000000,1640000000,-2.748629 +1,60,1650000000,1645000000,-2.782535 +1,60,1655000000,1650000000,-2.819943 +1,60,1660000000,1655000000,-2.850077 +1,60,1665000000,1660000000,-2.877749 +1,60,1670000000,1665000000,-2.902351 +1,60,1675000000,1670000000,-2.919140 +1,60,1680000000,1675000000,-2.928025 +1,60,1685000000,1680000000,-2.939196 +1,60,1690000000,1685000000,-2.955370 +1,60,1695000000,1690000000,-2.935889 +1,60,1700000000,1695000000,-2.932153 +1,60,1705000000,1700000000,-2.921128 +1,60,1710000000,1705000000,-2.912754 +1,60,1715000000,1710000000,-2.904624 +1,60,1720000000,1715000000,-2.883791 +1,60,1725000000,1720000000,-2.860888 +1,60,1730000000,1725000000,-2.838514 +1,60,1735000000,1730000000,-2.807096 +1,60,1740000000,1735000000,-2.770551 +1,60,1745000000,1740000000,-2.730116 +1,60,1750000000,1745000000,-2.688203 +1,60,1755000000,1750000000,-2.632206 +1,60,1760000000,1755000000,-2.608497 +1,60,1765000000,1760000000,-2.563081 +1,60,1770000000,1765000000,-2.525433 +1,60,1775000000,1770000000,-2.469722 +1,60,1780000000,1775000000,-2.421689 +1,60,1785000000,1780000000,-2.357965 +1,60,1790000000,1785000000,-2.294774 +1,60,1795000000,1790000000,-2.218968 +1,60,1800000000,1795000000,-2.150347 +1,60,1805000000,1800000000,-2.077362 +1,60,1810000000,1805000000,-1.999310 +1,60,1815000000,1810000000,-1.932392 +1,60,1820000000,1815000000,-1.863308 +1,60,1825000000,1820000000,-1.786404 +1,60,1830000000,1825000000,-1.711915 +1,60,1835000000,1830000000,-1.640712 +1,60,1840000000,1835000000,-1.573120 +1,60,1845000000,1840000000,-1.503759 +1,60,1850000000,1845000000,-1.433752 +1,60,1855000000,1850000000,-1.365300 +1,60,1860000000,1855000000,-1.312398 +1,60,1865000000,1860000000,-1.248213 +1,60,1870000000,1865000000,-1.193300 +1,60,1875000000,1870000000,-1.134489 +1,60,1880000000,1875000000,-1.085797 +1,60,1885000000,1880000000,-1.026955 +1,60,1890000000,1885000000,-0.978194 +1,60,1895000000,1890000000,-0.937158 +1,60,1900000000,1895000000,-0.893986 +1,60,1905000000,1900000000,-0.852826 +1,60,1910000000,1905000000,-0.817834 +1,60,1915000000,1910000000,-0.782148 +1,60,1920000000,1915000000,-0.754107 +1,60,1925000000,1920000000,-0.758918 +1,60,1930000000,1925000000,-0.735777 +1,60,1935000000,1930000000,-0.684379 +1,60,1940000000,1935000000,-0.668625 +1,60,1945000000,1940000000,-0.656097 +1,60,1950000000,1945000000,-0.640514 +1,60,1955000000,1950000000,-0.638805 +1,60,1960000000,1955000000,-0.637204 +1,60,1965000000,1960000000,-0.637451 +1,60,1970000000,1965000000,-0.645441 +1,60,1975000000,1970000000,-0.655584 +1,60,1980000000,1975000000,-0.664913 +1,60,1985000000,1980000000,-0.681713 +1,60,1990000000,1985000000,-0.697125 +1,60,1995000000,1990000000,-0.721959 +1,60,2000000000,1995000000,-0.752418 +1,60,2005000000,2000000000,-0.765147 +1,60,2010000000,2005000000,-0.811465 +1,60,2015000000,2010000000,-0.857978 +1,60,2020000000,2015000000,-0.898293 +1,60,2025000000,2020000000,-0.951971 +1,60,2030000000,2025000000,-1.019815 +1,60,2035000000,2030000000,-1.048286 +1,60,2040000000,2035000000,-1.112208 +1,60,2045000000,2040000000,-1.192791 +1,60,2050000000,2045000000,-1.262755 +1,60,2055000000,2050000000,-1.334486 +1,60,2060000000,2055000000,-1.405875 +1,60,2065000000,2060000000,-1.498711 +1,60,2070000000,2065000000,-1.605304 +1,60,2075000000,2070000000,-1.657282 +1,60,2080000000,2075000000,-1.729665 +1,60,2085000000,2080000000,-1.823783 +1,60,2090000000,2085000000,-1.896531 +1,60,2095000000,2090000000,-1.965923 +1,60,2100000000,2095000000,-2.097176 +1,60,2105000000,2100000000,-2.108738 +1,60,2110000000,2105000000,-2.170078 +1,60,2115000000,2110000000,-2.285526 +1,60,2120000000,2115000000,-2.295600 +1,60,2125000000,2120000000,-2.352699 +1,60,2130000000,2125000000,-2.409321 +1,60,2135000000,2130000000,-2.460122 +1,60,2140000000,2135000000,-2.526298 +1,60,2145000000,2140000000,-2.597092 +1,60,2150000000,2145000000,-2.646436 +1,60,2155000000,2150000000,-2.718323 +1,60,2160000000,2155000000,-2.774477 +1,60,2165000000,2160000000,-2.845237 +1,60,2170000000,2165000000,-2.903200 +1,60,2175000000,2170000000,-2.974097 +1,60,2180000000,2175000000,-3.030992 +1,60,2185000000,2180000000,-3.096853 +1,60,2190000000,2185000000,-3.151537 +1,60,2195000000,2190000000,-3.219614 +1,60,2200000000,2195000000,-3.272640 +1,60,2205000000,2200000000,-3.342100 +1,60,2210000000,2205000000,-3.393823 +1,60,2215000000,2210000000,-3.450354 +1,60,2220000000,2215000000,-3.503159 +1,60,2225000000,2220000000,-3.561271 +1,60,2230000000,2225000000,-3.618677 +1,60,2235000000,2230000000,-3.666191 +1,60,2240000000,2235000000,-3.721554 +1,60,2245000000,2240000000,-3.824685 +1,60,2250000000,2245000000,-3.824495 +1,60,2255000000,2250000000,-3.873230 +1,60,2260000000,2255000000,-3.930820 +1,60,2265000000,2260000000,-3.971395 +1,60,2270000000,2265000000,-4.025307 +1,60,2275000000,2270000000,-4.077089 +1,60,2280000000,2275000000,-4.148141 +1,60,2285000000,2280000000,-4.181436 +1,60,2290000000,2285000000,-4.223043 +1,60,2295000000,2290000000,-4.280504 +1,60,2300000000,2295000000,-4.322649 +1,60,2305000000,2300000000,-4.364026 +1,60,2310000000,2305000000,-4.423734 +1,60,2315000000,2310000000,-4.469185 +1,60,2320000000,2315000000,-4.515335 +1,60,2325000000,2320000000,-4.554117 +1,60,2330000000,2325000000,-4.618782 +1,60,2335000000,2330000000,-4.651248 +1,60,2340000000,2335000000,-4.689222 +1,60,2345000000,2340000000,-4.742752 +1,60,2350000000,2345000000,-4.788888 +1,60,2355000000,2350000000,-4.827130 +1,60,2360000000,2355000000,-4.865924 +1,60,2365000000,2360000000,-4.899997 +1,60,2370000000,2365000000,-4.927117 +1,60,2375000000,2370000000,-4.969407 +1,60,2380000000,2375000000,-5.014315 +1,60,2385000000,2380000000,-5.064940 +1,60,2390000000,2385000000,-5.087006 +1,60,2395000000,2390000000,-5.117528 +1,60,2400000000,2395000000,-5.161241 +1,60,2405000000,2400000000,-5.176559 +1,60,2410000000,2405000000,-5.204745 +1,60,2415000000,2410000000,-5.231719 +1,60,2420000000,2415000000,-5.261655 +1,60,2425000000,2420000000,-5.282523 +1,60,2430000000,2425000000,-5.308071 +1,60,2435000000,2430000000,-5.325580 +1,60,2440000000,2435000000,-5.340970 +1,60,2445000000,2440000000,-5.367605 +1,60,2450000000,2445000000,-5.384683 +1,60,2455000000,2450000000,-5.420400 +1,60,2460000000,2455000000,-5.412254 +1,60,2465000000,2460000000,-5.422759 +1,60,2470000000,2465000000,-5.434071 +1,60,2475000000,2470000000,-5.442353 +1,60,2480000000,2475000000,-5.446340 +1,60,2485000000,2480000000,-5.460677 +1,60,2490000000,2485000000,-5.457051 +1,60,2495000000,2490000000,-5.453950 +1,60,2500000000,2495000000,-5.459113 +1,60,2505000000,2500000000,-5.470373 +1,60,2510000000,2505000000,-5.464488 +1,60,2515000000,2510000000,-5.453379 +1,60,2520000000,2515000000,-5.445415 +1,60,2525000000,2520000000,-5.450336 +1,60,2530000000,2525000000,-5.440009 +1,60,2535000000,2530000000,-5.427622 +1,60,2540000000,2535000000,-5.419395 +1,60,2545000000,2540000000,-5.412739 +1,60,2550000000,2545000000,-5.399522 +1,60,2555000000,2550000000,-5.377942 +1,60,2560000000,2555000000,-5.372406 +1,60,2565000000,2560000000,-5.395819 +1,60,2570000000,2565000000,-5.342127 +1,60,2575000000,2570000000,-5.322565 +1,60,2580000000,2575000000,-5.301400 +1,60,2585000000,2580000000,-5.290111 +1,60,2590000000,2585000000,-5.265044 +1,60,2595000000,2590000000,-5.234740 +1,60,2600000000,2595000000,-5.204398 +1,60,2605000000,2600000000,-5.174796 +1,60,2610000000,2605000000,-5.157202 +1,60,2615000000,2610000000,-5.125252 +1,60,2620000000,2615000000,-5.095517 +1,60,2625000000,2620000000,-5.070555 +1,60,2630000000,2625000000,-5.037148 +1,60,2635000000,2630000000,-5.043047 +1,60,2640000000,2635000000,-5.014822 +1,60,2645000000,2640000000,-4.947484 +1,60,2650000000,2645000000,-4.901635 +1,60,2655000000,2650000000,-4.874090 +1,60,2660000000,2655000000,-4.845999 +1,60,2665000000,2660000000,-4.822021 +1,60,2670000000,2665000000,-4.789715 +1,60,2675000000,2670000000,-4.759662 +1,60,2680000000,2675000000,-4.732462 +1,60,2685000000,2680000000,-4.705230 +1,60,2690000000,2685000000,-4.682415 +1,60,2695000000,2690000000,-4.652691 +1,60,2700000000,2695000000,-4.619206 +1,60,2705000000,2700000000,-4.835572 +1,60,2710000000,2705000000,-4.757806 +1,60,2715000000,2710000000,-4.689726 +1,60,2720000000,2715000000,-4.635815 +1,60,2725000000,2720000000,-4.589155 +1,60,2730000000,2725000000,-4.544188 +1,60,2735000000,2730000000,-4.500940 +1,60,2740000000,2735000000,-4.472305 +1,60,2745000000,2740000000,-4.413688 +1,60,2750000000,2745000000,-4.363318 +1,60,2755000000,2750000000,-4.325474 +1,60,2760000000,2755000000,-4.284837 +1,60,2765000000,2760000000,-4.244932 +1,60,2770000000,2765000000,-4.209699 +1,60,2775000000,2770000000,-4.171773 +1,60,2780000000,2775000000,-4.158885 +1,60,2785000000,2780000000,-4.097327 +1,60,2790000000,2785000000,-4.061324 +1,60,2795000000,2790000000,-4.030161 +1,60,2800000000,2795000000,-3.993585 +1,60,2805000000,2800000000,-3.955312 +1,60,2810000000,2805000000,-3.923753 +1,60,2815000000,2810000000,-3.892937 +1,60,2820000000,2815000000,-3.869222 +1,60,2825000000,2820000000,-3.832351 +1,60,2830000000,2825000000,-3.804696 +1,60,2835000000,2830000000,-3.773727 +1,60,2840000000,2835000000,-3.750619 +1,60,2845000000,2840000000,-3.728592 +1,60,2850000000,2845000000,-3.693921 +1,60,2855000000,2850000000,-3.671828 +1,60,2860000000,2855000000,-3.643732 +1,60,2865000000,2860000000,-3.628211 +1,60,2870000000,2865000000,-3.595915 +1,60,2875000000,2870000000,-3.572506 +1,60,2880000000,2875000000,-3.562572 +1,60,2885000000,2880000000,-3.546407 +1,60,2890000000,2885000000,-3.525311 +1,60,2895000000,2890000000,-3.502901 +1,60,2900000000,2895000000,-3.487773 +1,60,2905000000,2900000000,-3.481744 +1,60,2910000000,2905000000,-3.470720 +1,60,2915000000,2910000000,-3.458051 +1,60,2920000000,2915000000,-3.451046 +1,60,2925000000,2920000000,-3.442993 +1,60,2930000000,2925000000,-3.429741 +1,60,2935000000,2930000000,-3.430443 +1,60,2940000000,2935000000,-3.420025 +1,60,2945000000,2940000000,-3.416309 +1,60,2950000000,2945000000,-3.421270 +1,60,2955000000,2950000000,-3.445862 +1,60,2960000000,2955000000,-3.424799 +1,60,2965000000,2960000000,-3.431960 +1,60,2970000000,2965000000,-3.426049 +1,60,2975000000,2970000000,-3.453098 +1,60,2980000000,2975000000,-3.430252 +1,60,2985000000,2980000000,-3.441133 +1,60,2990000000,2985000000,-3.483523 +1,60,2995000000,2990000000,-3.447748 +1,60,3000000000,2995000000,-3.448759 +1,60,3005000000,3000000000,-3.449786 +1,60,3010000000,3005000000,-3.473109 +1,60,3015000000,3010000000,-3.468245 +1,60,3020000000,3015000000,-3.440688 +1,60,3025000000,3020000000,-3.414684 +1,60,3030000000,3025000000,-3.388586 +1,60,3035000000,3030000000,-3.355971 +1,60,3040000000,3035000000,-3.326755 +1,60,3045000000,3040000000,-3.293520 +1,60,3050000000,3045000000,-3.262389 +1,60,3055000000,3050000000,-3.227309 +1,60,3060000000,3055000000,-3.194967 +1,60,3065000000,3060000000,-3.158758 +1,60,3070000000,3065000000,-3.127071 +1,60,3075000000,3070000000,-3.094343 +1,60,3080000000,3075000000,-3.070812 +1,60,3085000000,3080000000,-3.031786 +1,60,3090000000,3085000000,-3.003080 +1,60,3095000000,3090000000,-2.976314 +1,60,3100000000,3095000000,-2.950349 +1,60,3105000000,3100000000,-2.924167 +1,60,3110000000,3105000000,-2.892528 +1,60,3115000000,3110000000,-2.874457 +1,60,3120000000,3115000000,-2.848388 +1,60,3125000000,3120000000,-2.825133 +1,60,3130000000,3125000000,-2.817690 +1,60,3135000000,3130000000,-2.782274 +1,60,3140000000,3135000000,-2.765488 +1,60,3145000000,3140000000,-2.746613 +1,60,3150000000,3145000000,-2.731686 +1,60,3155000000,3150000000,-2.738141 +1,60,3160000000,3155000000,-2.691339 +1,60,3165000000,3160000000,-2.680380 +1,60,3170000000,3165000000,-2.669532 +1,60,3175000000,3170000000,-2.656766 +1,60,3180000000,3175000000,-2.672855 +1,60,3185000000,3180000000,-2.645603 +1,60,3190000000,3185000000,-2.634885 +1,60,3195000000,3190000000,-2.627117 +1,60,3200000000,3195000000,-2.622429 +1,60,3205000000,3200000000,-2.620159 +1,60,3210000000,3205000000,-2.614377 +1,60,3215000000,3210000000,-2.608098 +1,60,3220000000,3215000000,-2.610961 +1,60,3225000000,3220000000,-2.603611 +1,60,3230000000,3225000000,-2.604462 +1,60,3235000000,3230000000,-2.597854 +1,60,3240000000,3235000000,-2.598866 +1,60,3245000000,3240000000,-2.598425 +1,60,3250000000,3245000000,-2.603586 +1,60,3255000000,3250000000,-2.608466 +1,60,3260000000,3255000000,-2.612945 +1,60,3265000000,3260000000,-2.628906 +1,60,3270000000,3265000000,-2.635958 +1,60,3275000000,3270000000,-2.642866 +1,60,3280000000,3275000000,-2.653884 +1,60,3285000000,3280000000,-2.663475 +1,60,3290000000,3285000000,-2.678064 +1,60,3295000000,3290000000,-2.687107 +1,60,3300000000,3295000000,-2.707448 +1,60,3305000000,3300000000,-2.719576 +1,60,3310000000,3305000000,-2.751190 +1,60,3315000000,3310000000,-2.749089 +1,60,3320000000,3315000000,-2.766542 +1,60,3325000000,3320000000,-2.791599 +1,60,3330000000,3325000000,-2.809161 +1,60,3335000000,3330000000,-2.859896 +1,60,3340000000,3335000000,-2.852252 +1,60,3345000000,3340000000,-2.874962 +1,60,3350000000,3345000000,-2.894441 +1,60,3355000000,3350000000,-2.927577 +1,60,3360000000,3355000000,-2.977072 +1,60,3365000000,3360000000,-2.987163 +1,60,3370000000,3365000000,-3.008129 +1,60,3375000000,3370000000,-3.042734 +1,60,3380000000,3375000000,-3.080683 +1,60,3385000000,3380000000,-3.108094 +1,60,3390000000,3385000000,-3.150740 +1,60,3395000000,3390000000,-3.173553 +1,60,3400000000,3395000000,-3.209881 +1,60,3405000000,3400000000,-3.243643 +1,60,3410000000,3405000000,-3.284751 +1,60,3415000000,3410000000,-3.323492 +1,60,3420000000,3415000000,-3.377195 +1,60,3425000000,3420000000,-3.408159 +1,60,3430000000,3425000000,-3.452078 +1,60,3435000000,3430000000,-3.484631 +1,60,3440000000,3435000000,-3.536013 +1,60,3445000000,3440000000,-3.576968 +1,60,3450000000,3445000000,-3.623302 +1,60,3455000000,3450000000,-3.676914 +1,60,3460000000,3455000000,-3.709468 +1,60,3465000000,3460000000,-3.755087 +1,60,3470000000,3465000000,-3.788943 +1,60,3475000000,3470000000,-3.836886 +1,60,3480000000,3475000000,-3.884920 +1,60,3485000000,3480000000,-3.931026 +1,60,3490000000,3485000000,-3.974546 +1,60,3495000000,3490000000,-4.017079 +1,60,3500000000,3495000000,-4.063626 +1,60,3505000000,3500000000,-4.101076 +1,60,3510000000,3505000000,-4.150226 +1,60,3515000000,3510000000,-4.188129 +1,60,3520000000,3515000000,-4.236617 +1,60,3525000000,3520000000,-4.308433 +1,60,3530000000,3525000000,-4.323787 +1,60,3535000000,3530000000,-4.377332 +1,60,3540000000,3535000000,-4.425913 +1,60,3545000000,3540000000,-4.465621 +1,60,3550000000,3545000000,-4.530327 +1,60,3555000000,3550000000,-4.571860 +1,60,3560000000,3555000000,-4.620892 +1,60,3565000000,3560000000,-4.667184 +1,60,3570000000,3565000000,-4.724808 +1,60,3575000000,3570000000,-4.784597 +1,60,3580000000,3575000000,-4.851935 +1,60,3585000000,3580000000,-4.902598 +1,60,3590000000,3585000000,-4.972429 +1,60,3595000000,3590000000,-5.032413 +1,60,3600000000,3595000000,-5.078805 +1,60,3605000000,3600000000,-5.155603 +1,60,3610000000,3605000000,-5.211944 +1,60,3615000000,3610000000,-5.273011 +1,60,3620000000,3615000000,-5.338023 +1,60,3625000000,3620000000,-5.405553 +1,60,3630000000,3625000000,-5.505530 +1,60,3635000000,3630000000,-5.538166 +1,60,3640000000,3635000000,-5.601780 +1,60,3645000000,3640000000,-5.672291 +1,60,3650000000,3645000000,-5.711225 +1,60,3655000000,3650000000,-5.759223 +1,60,3660000000,3655000000,-5.815022 +1,60,3665000000,3660000000,-5.859890 +1,60,3670000000,3665000000,-5.916487 +1,60,3675000000,3670000000,-5.959046 +1,60,3680000000,3675000000,-6.011310 +1,60,3685000000,3680000000,-6.064292 +1,60,3690000000,3685000000,-6.102654 +1,60,3695000000,3690000000,-6.153990 +1,60,3700000000,3695000000,-6.196280 +1,60,3705000000,3700000000,-6.249709 +1,60,3710000000,3705000000,-6.297484 +1,60,3715000000,3710000000,-6.347387 +1,60,3720000000,3715000000,-6.385104 +1,60,3725000000,3720000000,-6.438034 +1,60,3730000000,3725000000,-6.467562 +1,60,3735000000,3730000000,-6.505866 +1,60,3740000000,3735000000,-6.540211 +1,60,3745000000,3740000000,-6.580622 +1,60,3750000000,3745000000,-6.622374 +1,60,3755000000,3750000000,-6.641902 +1,60,3760000000,3755000000,-6.669671 +1,60,3765000000,3760000000,-6.699917 +1,60,3770000000,3765000000,-6.717117 +1,60,3775000000,3770000000,-6.749214 +1,60,3780000000,3775000000,-6.772967 +1,60,3785000000,3780000000,-6.797911 +1,60,3790000000,3785000000,-6.827137 +1,60,3795000000,3790000000,-6.842959 +1,60,3800000000,3795000000,-6.862940 +1,60,3805000000,3800000000,-6.872733 +1,60,3810000000,3805000000,-6.888171 +1,60,3815000000,3810000000,-6.899048 +1,60,3820000000,3815000000,-6.911934 +1,60,3825000000,3820000000,-6.920586 +1,60,3830000000,3825000000,-6.929474 +1,60,3835000000,3830000000,-6.923864 +1,60,3840000000,3835000000,-6.965767 +1,60,3845000000,3840000000,-6.935242 +1,60,3850000000,3845000000,-6.940404 +1,60,3855000000,3850000000,-6.943067 +1,60,3860000000,3855000000,-6.959041 +1,60,3865000000,3860000000,-6.970198 +1,60,3870000000,3865000000,-6.970748 +1,60,3875000000,3870000000,-6.998624 +1,60,3880000000,3875000000,-6.958053 +1,60,3885000000,3880000000,-6.953457 +1,60,3890000000,3885000000,-6.944812 +1,60,3895000000,3890000000,-6.948755 +1,60,3900000000,3895000000,-6.942735 +1,60,3905000000,3900000000,-6.937548 +1,60,3910000000,3905000000,-6.942312 +1,60,3915000000,3910000000,-6.944647 +1,60,3920000000,3915000000,-6.944742 +1,60,3925000000,3920000000,-6.933331 +1,60,3930000000,3925000000,-6.936697 +1,60,3935000000,3930000000,-6.943710 +1,60,3940000000,3935000000,-6.937036 +1,60,3945000000,3940000000,-6.940207 +1,60,3950000000,3945000000,-6.947356 +1,60,3955000000,3950000000,-6.944707 +1,60,3960000000,3955000000,-6.954567 +1,60,3965000000,3960000000,-6.966515 +1,60,3970000000,3965000000,-6.982527 +1,60,3975000000,3970000000,-7.000178 +1,60,3980000000,3975000000,-6.999096 +1,60,3985000000,3980000000,-7.024147 +1,60,3990000000,3985000000,-7.032854 +1,60,3995000000,3990000000,-7.048888 +1,60,4000000000,3995000000,-7.066155 +1,60,4005000000,4000000000,-7.241517 +1,60,4010000000,4005000000,-7.229185 +1,60,4015000000,4010000000,-7.216071 +1,60,4020000000,4015000000,-7.222900 +1,60,4025000000,4020000000,-7.242293 +1,60,4030000000,4025000000,-7.254869 +1,60,4035000000,4030000000,-7.264845 +1,60,4040000000,4035000000,-7.325308 +1,60,4045000000,4040000000,-7.308949 +1,60,4050000000,4045000000,-7.325529 +1,60,4055000000,4050000000,-7.341393 +1,60,4060000000,4055000000,-7.353400 +1,60,4065000000,4060000000,-7.424951 +1,60,4070000000,4065000000,-7.408765 +1,60,4075000000,4070000000,-7.423714 +1,60,4080000000,4075000000,-7.477619 +1,60,4085000000,4080000000,-7.463205 +1,60,4090000000,4085000000,-7.478346 +1,60,4095000000,4090000000,-7.494519 +1,60,4100000000,4095000000,-7.529017 +1,60,4105000000,4100000000,-7.523770 +1,60,4110000000,4105000000,-7.521803 +1,60,4115000000,4110000000,-7.526965 +1,60,4120000000,4115000000,-7.518500 +1,60,4125000000,4120000000,-7.521653 +1,60,4130000000,4125000000,-7.503991 +1,60,4135000000,4130000000,-7.498529 +1,60,4140000000,4135000000,-7.489318 +1,60,4145000000,4140000000,-7.479001 +1,60,4150000000,4145000000,-7.450880 +1,60,4155000000,4150000000,-7.435665 +1,60,4160000000,4155000000,-7.415251 +1,60,4165000000,4160000000,-7.393825 +1,60,4170000000,4165000000,-7.371019 +1,60,4175000000,4170000000,-7.341887 +1,60,4180000000,4175000000,-7.319551 +1,60,4185000000,4180000000,-7.293247 +1,60,4190000000,4185000000,-7.266195 +1,60,4195000000,4190000000,-7.277455 +1,60,4200000000,4195000000,-7.220111 +1,60,4205000000,4200000000,-7.205753 +1,60,4210000000,4205000000,-7.175998 +1,60,4215000000,4210000000,-7.145024 +1,60,4220000000,4215000000,-7.130095 +1,60,4225000000,4220000000,-7.110106 +1,60,4230000000,4225000000,-7.106476 +1,60,4235000000,4230000000,-7.071777 +1,60,4240000000,4235000000,-7.064552 +1,60,4245000000,4240000000,-7.072941 +1,60,4250000000,4245000000,-7.039848 +1,60,4255000000,4250000000,-7.031257 +1,60,4260000000,4255000000,-7.039432 +1,60,4265000000,4260000000,-7.039675 +1,60,4270000000,4265000000,-7.055810 +1,60,4275000000,4270000000,-7.069460 +1,60,4280000000,4275000000,-7.087055 +1,60,4285000000,4280000000,-7.107939 +1,60,4290000000,4285000000,-7.133496 +1,60,4295000000,4290000000,-7.153033 +1,60,4300000000,4295000000,-7.190141 +1,60,4305000000,4300000000,-7.236899 +1,60,4310000000,4305000000,-7.271399 +1,60,4315000000,4310000000,-7.324082 +1,60,4320000000,4315000000,-7.364405 +1,60,4325000000,4320000000,-7.401570 +1,60,4330000000,4325000000,-7.446400 +1,60,4335000000,4330000000,-7.508299 +1,60,4340000000,4335000000,-7.556389 +1,60,4345000000,4340000000,-7.591256 +1,60,4350000000,4345000000,-7.635543 +1,60,4355000000,4350000000,-7.691527 +1,60,4360000000,4355000000,-7.748265 +1,60,4365000000,4360000000,-7.802025 +1,60,4370000000,4365000000,-7.846745 +1,60,4375000000,4370000000,-7.871616 +1,60,4380000000,4375000000,-7.935070 +1,60,4385000000,4380000000,-7.966014 +1,60,4390000000,4385000000,-8.012404 +1,60,4395000000,4390000000,-8.046711 +1,60,4400000000,4395000000,-8.108738 +1,60,4405000000,4400000000,-8.125029 +1,60,4410000000,4405000000,-8.144383 +1,60,4415000000,4410000000,-8.214379 +1,60,4420000000,4415000000,-8.194512 +1,60,4425000000,4420000000,-8.231533 +1,60,4430000000,4425000000,-8.246958 +1,60,4435000000,4430000000,-8.263072 +1,60,4440000000,4435000000,-8.292320 +1,60,4445000000,4440000000,-8.295609 +1,60,4450000000,4445000000,-8.317913 +1,60,4455000000,4450000000,-8.321384 +1,60,4460000000,4455000000,-8.345608 +1,60,4465000000,4460000000,-8.348838 +1,60,4470000000,4465000000,-8.334854 +1,60,4475000000,4470000000,-8.351930 +1,60,4480000000,4475000000,-8.371010 +1,60,4485000000,4480000000,-8.378618 +1,60,4490000000,4485000000,-8.380265 +1,60,4495000000,4490000000,-8.382331 +1,60,4500000000,4495000000,-8.387092 +1,60,4505000000,4500000000,-8.400533 +1,60,4510000000,4505000000,-8.421915 +1,60,4515000000,4510000000,-8.418121 +1,60,4520000000,4515000000,-8.425844 +1,60,4525000000,4520000000,-8.467848 +1,60,4530000000,4525000000,-8.460785 +1,60,4535000000,4530000000,-8.444994 +1,60,4540000000,4535000000,-8.458933 +1,60,4545000000,4540000000,-8.477046 +1,60,4550000000,4545000000,-8.496149 +1,60,4555000000,4550000000,-8.505087 +1,60,4560000000,4555000000,-8.511848 +1,60,4565000000,4560000000,-8.565283 +1,60,4570000000,4565000000,-8.537747 +1,60,4575000000,4570000000,-8.569388 +1,60,4580000000,4575000000,-8.571584 +1,60,4585000000,4580000000,-8.598531 +1,60,4590000000,4585000000,-8.597104 +1,60,4595000000,4590000000,-8.609766 +1,60,4600000000,4595000000,-8.664858 +1,60,4605000000,4600000000,-8.650208 +1,60,4610000000,4605000000,-8.663500 +1,60,4615000000,4610000000,-8.665164 +1,60,4620000000,4615000000,-8.677350 +1,60,4625000000,4620000000,-8.688746 +1,60,4630000000,4625000000,-8.684959 +1,60,4635000000,4630000000,-8.690438 +1,60,4640000000,4635000000,-8.699793 +1,60,4645000000,4640000000,-8.692428 +1,60,4650000000,4645000000,-8.685881 +1,60,4655000000,4650000000,-8.667251 +1,60,4660000000,4655000000,-8.645468 +1,60,4665000000,4660000000,-8.646932 +1,60,4670000000,4665000000,-8.615191 +1,60,4675000000,4670000000,-8.603970 +1,60,4680000000,4675000000,-8.567212 +1,60,4685000000,4680000000,-8.557302 +1,60,4690000000,4685000000,-8.534557 +1,60,4695000000,4690000000,-8.488795 +1,60,4700000000,4695000000,-8.468802 +1,60,4705000000,4700000000,-8.450276 +1,60,4710000000,4705000000,-8.399794 +1,60,4715000000,4710000000,-8.367764 +1,60,4720000000,4715000000,-8.331222 +1,60,4725000000,4720000000,-8.293803 +1,60,4730000000,4725000000,-8.253734 +1,60,4735000000,4730000000,-8.246383 +1,60,4740000000,4735000000,-8.217543 +1,60,4745000000,4740000000,-8.144501 +1,60,4750000000,4745000000,-8.090745 +1,60,4755000000,4750000000,-8.079836 +1,60,4760000000,4755000000,-8.033102 +1,60,4765000000,4760000000,-8.004851 +1,60,4770000000,4765000000,-7.955002 +1,60,4775000000,4770000000,-7.920824 +1,60,4780000000,4775000000,-7.887583 +1,60,4785000000,4780000000,-7.872572 +1,60,4790000000,4785000000,-7.839764 +1,60,4795000000,4790000000,-7.801342 +1,60,4800000000,4795000000,-7.787729 +1,60,4805000000,4800000000,-7.764655 +1,60,4810000000,4805000000,-7.741645 +1,60,4815000000,4810000000,-7.713681 +1,60,4820000000,4815000000,-7.696391 +1,60,4825000000,4820000000,-7.699494 +1,60,4830000000,4825000000,-7.666577 +1,60,4835000000,4830000000,-7.675724 +1,60,4840000000,4835000000,-7.654178 +1,60,4845000000,4840000000,-7.643005 +1,60,4850000000,4845000000,-7.640111 +1,60,4855000000,4850000000,-7.638511 +1,60,4860000000,4855000000,-7.632116 +1,60,4865000000,4860000000,-7.624301 +1,60,4870000000,4865000000,-7.599293 +1,60,4875000000,4870000000,-7.624662 +1,60,4880000000,4875000000,-7.569795 +1,60,4885000000,4880000000,-7.557781 +1,60,4890000000,4885000000,-7.537238 +1,60,4895000000,4890000000,-7.528346 +1,60,4900000000,4895000000,-7.495739 +1,60,4905000000,4900000000,-7.466030 +1,60,4910000000,4905000000,-7.432044 +1,60,4915000000,4910000000,-7.400023 +1,60,4920000000,4915000000,-7.364172 +1,60,4925000000,4920000000,-7.321986 +1,60,4930000000,4925000000,-7.274484 +1,60,4935000000,4930000000,-7.231793 +1,60,4940000000,4935000000,-7.189039 +1,60,4945000000,4940000000,-7.152296 +1,60,4950000000,4945000000,-7.105776 +1,60,4955000000,4950000000,-7.059783 +1,60,4960000000,4955000000,-7.007230 +1,60,4965000000,4960000000,-6.948944 +1,60,4970000000,4965000000,-6.918347 +1,60,4975000000,4970000000,-6.871302 +1,60,4980000000,4975000000,-6.805217 +1,60,4985000000,4980000000,-6.766028 +1,60,4990000000,4985000000,-6.705500 +1,60,4995000000,4990000000,-6.667088 +1,60,5000000000,4995000000,-6.612153 +1,60,5005000000,5000000000,-6.793798 +1,60,5010000000,5005000000,-6.696797 +1,60,5015000000,5010000000,-6.625016 +1,60,5020000000,5015000000,-6.579629 +1,60,5025000000,5020000000,-6.526524 +1,60,5030000000,5025000000,-6.495151 +1,60,5035000000,5030000000,-6.477155 +1,60,5040000000,5035000000,-6.458687 +1,60,5045000000,5040000000,-6.453649 +1,60,5050000000,5045000000,-6.460856 +1,60,5055000000,5050000000,-6.455972 +1,60,5060000000,5055000000,-6.479197 +1,60,5065000000,5060000000,-6.515464 +1,60,5070000000,5065000000,-6.545358 +1,60,5075000000,5070000000,-6.589313 +1,60,5080000000,5075000000,-6.657197 +1,60,5085000000,5080000000,-6.695273 +1,60,5090000000,5085000000,-6.744477 +1,60,5095000000,5090000000,-6.814381 +1,60,5100000000,5095000000,-6.895271 +1,60,5105000000,5100000000,-6.963504 +1,60,5110000000,5105000000,-7.039949 +1,60,5115000000,5110000000,-7.101862 +1,60,5120000000,5115000000,-7.170563 +1,60,5125000000,5120000000,-7.255881 +1,60,5130000000,5125000000,-7.331065 +1,60,5135000000,5130000000,-7.377129 +1,60,5140000000,5135000000,-7.461825 +1,60,5145000000,5140000000,-7.535764 +1,60,5150000000,5145000000,-7.609344 +1,60,5155000000,5150000000,-7.667434 +1,60,5160000000,5155000000,-7.740651 +1,60,5165000000,5160000000,-7.845484 +1,60,5170000000,5165000000,-7.853351 +1,60,5175000000,5170000000,-7.932991 +1,60,5180000000,5175000000,-7.993505 +1,60,5185000000,5180000000,-8.032435 +1,60,5190000000,5185000000,-8.089830 +1,60,5195000000,5190000000,-8.150882 +1,60,5200000000,5195000000,-8.205554 +1,60,5205000000,5200000000,-8.278123 +1,60,5210000000,5205000000,-8.317705 +1,60,5215000000,5210000000,-8.360838 +1,60,5220000000,5215000000,-8.421636 +1,60,5225000000,5220000000,-8.474375 +1,60,5230000000,5225000000,-8.546437 +1,60,5235000000,5230000000,-8.582243 +1,60,5240000000,5235000000,-8.663543 +1,60,5245000000,5240000000,-8.718764 +1,60,5250000000,5245000000,-8.789340 +1,60,5255000000,5250000000,-8.864965 +1,60,5260000000,5255000000,-8.957241 +1,60,5265000000,5260000000,-9.053295 +1,60,5270000000,5265000000,-9.087237 +1,60,5275000000,5270000000,-9.195247 +1,60,5280000000,5275000000,-9.276172 +1,60,5285000000,5280000000,-9.364023 +1,60,5290000000,5285000000,-9.485444 +1,60,5295000000,5290000000,-9.575201 +1,60,5300000000,5295000000,-9.659956 +1,60,5305000000,5300000000,-9.770584 +1,60,5310000000,5305000000,-9.885459 +1,60,5315000000,5310000000,-9.981723 +1,60,5320000000,5315000000,-10.096599 +1,60,5325000000,5320000000,-10.205832 +1,60,5330000000,5325000000,-10.301215 +1,60,5335000000,5330000000,-10.424843 +1,60,5340000000,5335000000,-10.533926 +1,60,5345000000,5340000000,-10.703923 +1,60,5350000000,5345000000,-10.744525 +1,60,5355000000,5350000000,-10.852868 +1,60,5360000000,5355000000,-10.966047 +1,60,5365000000,5360000000,-11.061428 +1,60,5370000000,5365000000,-11.151439 +1,60,5375000000,5370000000,-11.237664 +1,60,5380000000,5375000000,-11.332283 +1,60,5385000000,5380000000,-11.434913 +1,60,5390000000,5385000000,-11.505144 +1,60,5395000000,5390000000,-11.573334 +1,60,5400000000,5395000000,-11.658313 +1,60,5405000000,5400000000,-11.721193 +1,60,5410000000,5405000000,-11.807498 +1,60,5415000000,5410000000,-11.869071 +1,60,5420000000,5415000000,-11.915596 +1,60,5425000000,5420000000,-11.965888 +1,60,5430000000,5425000000,-12.005152 +1,60,5435000000,5430000000,-12.042048 +1,60,5440000000,5435000000,-12.119941 +1,60,5445000000,5440000000,-12.123923 +1,60,5450000000,5445000000,-12.160504 +1,60,5455000000,5450000000,-12.191938 +1,60,5460000000,5455000000,-12.217711 +1,60,5465000000,5460000000,-12.218565 +1,60,5470000000,5465000000,-12.237894 +1,60,5475000000,5470000000,-12.240333 +1,60,5480000000,5475000000,-12.238171 +1,60,5485000000,5480000000,-12.250717 +1,60,5490000000,5485000000,-12.265309 +1,60,5495000000,5490000000,-12.236815 +1,60,5500000000,5495000000,-12.241531 +1,60,5505000000,5500000000,-12.231124 +1,60,5510000000,5505000000,-12.222047 +1,60,5515000000,5510000000,-12.226513 +1,60,5520000000,5515000000,-12.190030 +1,60,5525000000,5520000000,-12.193792 +1,60,5530000000,5525000000,-12.184528 +1,60,5535000000,5530000000,-12.180245 +1,60,5540000000,5535000000,-12.151718 +1,60,5545000000,5540000000,-12.142386 +1,60,5550000000,5545000000,-12.139206 +1,60,5555000000,5550000000,-12.107829 +1,60,5560000000,5555000000,-12.118078 +1,60,5565000000,5560000000,-12.109759 +1,60,5570000000,5565000000,-12.101928 +1,60,5575000000,5570000000,-12.093212 +1,60,5580000000,5575000000,-12.082592 +1,60,5585000000,5580000000,-12.107408 +1,60,5590000000,5585000000,-12.092851 +1,60,5595000000,5590000000,-12.092232 +1,60,5600000000,5595000000,-12.100924 +1,60,5605000000,5600000000,-12.094703 +1,60,5610000000,5605000000,-12.097125 +1,60,5615000000,5610000000,-12.107262 +1,60,5620000000,5615000000,-12.141195 +1,60,5625000000,5620000000,-12.118361 +1,60,5630000000,5625000000,-12.124527 +1,60,5635000000,5630000000,-12.133749 +1,60,5640000000,5635000000,-12.133747 +1,60,5645000000,5640000000,-12.131343 +1,60,5650000000,5645000000,-12.133154 +1,60,5655000000,5650000000,-12.141426 +1,60,5660000000,5655000000,-12.164580 +1,60,5665000000,5660000000,-12.173954 +1,60,5670000000,5665000000,-12.184802 +1,60,5675000000,5670000000,-12.177881 +1,60,5680000000,5675000000,-12.192617 +1,60,5685000000,5680000000,-12.207278 +1,60,5690000000,5685000000,-12.196863 +1,60,5695000000,5690000000,-12.204257 +1,60,5700000000,5695000000,-12.208249 +1,60,5705000000,5700000000,-12.230839 +1,60,5710000000,5705000000,-12.190015 +1,60,5715000000,5710000000,-12.154213 +1,60,5720000000,5715000000,-12.143030 +1,60,5725000000,5720000000,-12.135164 +1,60,5730000000,5725000000,-12.103790 +1,60,5735000000,5730000000,-12.090321 +1,60,5740000000,5735000000,-12.059015 +1,60,5745000000,5740000000,-12.034795 +1,60,5750000000,5745000000,-11.991338 +1,60,5755000000,5750000000,-11.967096 +1,60,5760000000,5755000000,-11.907400 +1,60,5765000000,5760000000,-11.862685 +1,60,5770000000,5765000000,-11.814330 +1,60,5775000000,5770000000,-11.753323 +1,60,5780000000,5775000000,-11.696776 +1,60,5785000000,5780000000,-11.650978 +1,60,5790000000,5785000000,-11.594127 +1,60,5795000000,5790000000,-11.530226 +1,60,5800000000,5795000000,-11.477749 +1,60,5805000000,5800000000,-11.425540 +1,60,5810000000,5805000000,-11.352558 +1,60,5815000000,5810000000,-11.266300 +1,60,5820000000,5815000000,-11.191540 +1,60,5825000000,5820000000,-11.115531 +1,60,5830000000,5825000000,-11.055842 +1,60,5835000000,5830000000,-10.961416 +1,60,5840000000,5835000000,-10.905594 +1,60,5845000000,5840000000,-10.833924 +1,60,5850000000,5845000000,-10.753580 +1,60,5855000000,5850000000,-10.690676 +1,60,5860000000,5855000000,-10.594750 +1,60,5865000000,5860000000,-10.516119 +1,60,5870000000,5865000000,-10.432016 +1,60,5875000000,5870000000,-10.354612 +1,60,5880000000,5875000000,-10.271360 +1,60,5885000000,5880000000,-10.199091 +1,60,5890000000,5885000000,-10.129661 +1,60,5895000000,5890000000,-10.066510 +1,60,5900000000,5895000000,-9.992965 +1,60,5905000000,5900000000,-9.943989 +1,60,5910000000,5905000000,-9.864875 +1,60,5915000000,5910000000,-9.803111 +1,60,5920000000,5915000000,-9.778192 +1,60,5925000000,5920000000,-9.712161 +1,60,5930000000,5925000000,-9.648768 +1,60,5935000000,5930000000,-9.598291 +1,60,5940000000,5935000000,-9.532263 +1,60,5945000000,5940000000,-9.483748 +1,60,5950000000,5945000000,-9.433754 +1,60,5955000000,5950000000,-9.388387 +1,60,5960000000,5955000000,-9.331922 +1,60,5965000000,5960000000,-9.286330 +1,60,5970000000,5965000000,-9.246541 +1,60,5975000000,5970000000,-9.211621 +1,60,5980000000,5975000000,-9.162929 +1,60,5985000000,5980000000,-9.128476 +1,60,5990000000,5985000000,-9.093445 +1,60,5995000000,5990000000,-9.099536 +1,60,6000000000,5995000000,-9.036272 +1,60,6005000000,6000000000,-9.013504 +1,30,75000000,70000000,-25.856226 +1,30,80000000,75000000,-25.881775 +1,30,85000000,80000000,-25.940659 +1,30,90000000,85000000,-26.041000 +1,30,95000000,90000000,-26.143460 +1,30,100000000,95000000,-26.161686 +1,30,105000000,100000000,-26.226567 +1,30,110000000,105000000,-26.246741 +1,30,115000000,110000000,-26.394439 +1,30,120000000,115000000,-26.416790 +1,30,125000000,120000000,-26.378177 +1,30,130000000,125000000,-26.374674 +1,30,135000000,130000000,-26.321928 +1,30,140000000,135000000,-26.325704 +1,30,145000000,140000000,-26.262993 +1,30,150000000,145000000,-26.340081 +1,30,155000000,150000000,-26.293145 +1,30,160000000,155000000,-26.249227 +1,30,165000000,160000000,-26.257917 +1,30,170000000,165000000,-26.272937 +1,30,175000000,170000000,-26.276457 +1,30,180000000,175000000,-26.264025 +1,30,185000000,180000000,-26.326074 +1,30,190000000,185000000,-26.286205 +1,30,195000000,190000000,-26.334652 +1,30,200000000,195000000,-26.344521 +1,30,205000000,200000000,-26.363052 +1,30,210000000,205000000,-26.369782 +1,30,215000000,210000000,-26.376426 +1,30,220000000,215000000,-26.391619 +1,30,225000000,220000000,-26.425075 +1,30,230000000,225000000,-26.442552 +1,30,235000000,230000000,-26.479831 +1,30,240000000,235000000,-26.506614 +1,30,245000000,240000000,-26.527257 +1,30,250000000,245000000,-26.573415 +1,30,255000000,250000000,-26.606204 +1,30,260000000,255000000,-26.656945 +1,30,265000000,260000000,-26.688139 +1,30,270000000,265000000,-26.724045 +1,30,275000000,270000000,-26.749058 +1,30,280000000,275000000,-26.769596 +1,30,285000000,280000000,-26.796396 +1,30,290000000,285000000,-26.806470 +1,30,295000000,290000000,-26.816982 +1,30,300000000,295000000,-26.843405 +1,30,305000000,300000000,-26.895958 +1,30,310000000,305000000,-26.861560 +1,30,315000000,310000000,-26.862021 +1,30,320000000,315000000,-26.883593 +1,30,325000000,320000000,-26.884673 +1,30,330000000,325000000,-26.893718 +1,30,335000000,330000000,-26.900628 +1,30,340000000,335000000,-26.903665 +1,30,345000000,340000000,-26.905422 +1,30,350000000,345000000,-26.911055 +1,30,355000000,350000000,-26.922193 +1,30,360000000,355000000,-26.927281 +1,30,365000000,360000000,-26.924745 +1,30,370000000,365000000,-26.937536 +1,30,375000000,370000000,-26.935562 +1,30,380000000,375000000,-26.937893 +1,30,385000000,380000000,-26.924799 +1,30,390000000,385000000,-26.947337 +1,30,395000000,390000000,-26.978958 +1,30,400000000,395000000,-26.983643 +1,30,405000000,400000000,-26.998094 +1,30,410000000,405000000,-27.005371 +1,30,415000000,410000000,-27.035497 +1,30,420000000,415000000,-26.995687 +1,30,425000000,420000000,-26.995564 +1,30,430000000,425000000,-26.988820 +1,30,435000000,430000000,-26.984345 +1,30,440000000,435000000,-26.967811 +1,30,445000000,440000000,-26.962579 +1,30,450000000,445000000,-26.948092 +1,30,455000000,450000000,-26.946717 +1,30,460000000,455000000,-26.944660 +1,30,465000000,460000000,-26.932394 +1,30,470000000,465000000,-26.921088 +1,30,475000000,470000000,-26.919381 +1,30,480000000,475000000,-26.907780 +1,30,485000000,480000000,-26.910887 +1,30,490000000,485000000,-26.920295 +1,30,495000000,490000000,-26.926708 +1,30,500000000,495000000,-26.934277 +1,30,505000000,500000000,-26.955357 +1,30,510000000,505000000,-26.990622 +1,30,515000000,510000000,-27.015730 +1,30,520000000,515000000,-27.060740 +1,30,525000000,520000000,-27.097562 +1,30,530000000,525000000,-27.145999 +1,30,535000000,530000000,-27.234112 +1,30,540000000,535000000,-27.254778 +1,30,545000000,540000000,-27.323032 +1,30,550000000,545000000,-27.397181 +1,30,555000000,550000000,-27.444646 +1,30,560000000,555000000,-27.511116 +1,30,565000000,560000000,-27.561334 +1,30,570000000,565000000,-27.617000 +1,30,575000000,570000000,-27.660560 +1,30,580000000,575000000,-27.705876 +1,30,585000000,580000000,-27.746796 +1,30,590000000,585000000,-27.768715 +1,30,595000000,590000000,-27.800900 +1,30,600000000,595000000,-27.837187 +1,30,605000000,600000000,-27.922441 +1,30,610000000,605000000,-27.946372 +1,30,615000000,610000000,-27.953112 +1,30,620000000,615000000,-27.993423 +1,30,625000000,620000000,-28.033443 +1,30,630000000,625000000,-28.061949 +1,30,635000000,630000000,-28.085931 +1,30,640000000,635000000,-28.100197 +1,30,645000000,640000000,-28.126696 +1,30,650000000,645000000,-28.150711 +1,30,655000000,650000000,-28.172547 +1,30,660000000,655000000,-28.170471 +1,30,665000000,660000000,-28.186981 +1,30,670000000,665000000,-28.174801 +1,30,675000000,670000000,-28.193237 +1,30,680000000,675000000,-28.146933 +1,30,685000000,680000000,-28.126204 +1,30,690000000,685000000,-28.105773 +1,30,695000000,690000000,-28.083856 +1,30,700000000,695000000,-28.053754 +1,30,705000000,700000000,-28.036789 +1,30,710000000,705000000,-28.011102 +1,30,715000000,710000000,-28.002428 +1,30,720000000,715000000,-27.990146 +1,30,725000000,720000000,-27.994335 +1,30,730000000,725000000,-28.003535 +1,30,735000000,730000000,-28.033778 +1,30,740000000,735000000,-28.078644 +1,30,745000000,740000000,-28.155751 +1,30,750000000,745000000,-28.241768 +1,30,755000000,750000000,-28.285117 +1,30,760000000,755000000,-28.270314 +1,30,765000000,760000000,-28.195078 +1,30,770000000,765000000,-28.107447 +1,30,775000000,770000000,-28.065691 +1,30,780000000,775000000,-28.041556 +1,30,785000000,780000000,-28.047299 +1,30,790000000,785000000,-28.082713 +1,30,795000000,790000000,-28.082116 +1,30,800000000,795000000,-28.107407 +1,30,805000000,800000000,-28.144114 +1,30,810000000,805000000,-28.168165 +1,30,815000000,810000000,-28.201385 +1,30,820000000,815000000,-28.218346 +1,30,825000000,820000000,-28.244768 +1,30,830000000,825000000,-28.255681 +1,30,835000000,830000000,-28.255710 +1,30,840000000,835000000,-28.255632 +1,30,845000000,840000000,-28.238040 +1,30,850000000,845000000,-28.233225 +1,30,855000000,850000000,-28.209968 +1,30,860000000,855000000,-28.181612 +1,30,865000000,860000000,-28.156341 +1,30,870000000,865000000,-28.127545 +1,30,875000000,870000000,-28.087909 +1,30,880000000,875000000,-28.052394 +1,30,885000000,880000000,-28.024930 +1,30,890000000,885000000,-28.006305 +1,30,895000000,890000000,-27.972397 +1,30,900000000,895000000,-27.951092 +1,30,905000000,900000000,-27.933606 +1,30,910000000,905000000,-27.921126 +1,30,915000000,910000000,-27.912638 +1,30,920000000,915000000,-27.907034 +1,30,925000000,920000000,-27.899970 +1,30,930000000,925000000,-27.902485 +1,30,935000000,930000000,-27.927248 +1,30,940000000,935000000,-27.937679 +1,30,945000000,940000000,-27.941777 +1,30,950000000,945000000,-27.952426 +1,30,955000000,950000000,-27.969150 +1,30,960000000,955000000,-27.966448 +1,30,965000000,960000000,-27.969847 +1,30,970000000,965000000,-27.970728 +1,30,975000000,970000000,-27.988310 +1,30,980000000,975000000,-27.944865 +1,30,985000000,980000000,-27.917367 +1,30,990000000,985000000,-27.906069 +1,30,995000000,990000000,-27.881833 +1,30,1000000000,995000000,-27.855749 +1,30,1005000000,1000000000,-27.741338 +1,30,1010000000,1005000000,-27.697510 +1,30,1015000000,1010000000,-27.652911 +1,30,1020000000,1015000000,-27.624604 +1,30,1025000000,1020000000,-27.598339 +1,30,1030000000,1025000000,-27.576460 +1,30,1035000000,1030000000,-27.566295 +1,30,1040000000,1035000000,-27.574351 +1,30,1045000000,1040000000,-27.564089 +1,30,1050000000,1045000000,-27.572782 +1,30,1055000000,1050000000,-27.575684 +1,30,1060000000,1055000000,-27.583022 +1,30,1065000000,1060000000,-27.604882 +1,30,1070000000,1065000000,-27.641879 +1,30,1075000000,1070000000,-27.628308 +1,30,1080000000,1075000000,-27.640522 +1,30,1085000000,1080000000,-27.667372 +1,30,1090000000,1085000000,-27.692217 +1,30,1095000000,1090000000,-27.703344 +1,30,1100000000,1095000000,-27.727015 +1,30,1105000000,1100000000,-27.782094 +1,30,1110000000,1105000000,-27.770525 +1,30,1115000000,1110000000,-27.788238 +1,30,1120000000,1115000000,-27.813740 +1,30,1125000000,1120000000,-27.840898 +1,30,1130000000,1125000000,-27.869695 +1,30,1135000000,1130000000,-27.962650 +1,30,1140000000,1135000000,-27.989108 +1,30,1145000000,1140000000,-28.020953 +1,30,1150000000,1145000000,-28.082400 +1,30,1155000000,1150000000,-28.219700 +1,30,1160000000,1155000000,-28.268503 +1,30,1165000000,1160000000,-28.374860 +1,30,1170000000,1165000000,-28.496183 +1,30,1175000000,1170000000,-28.588926 +1,30,1180000000,1175000000,-28.640270 +1,30,1185000000,1180000000,-28.633040 +1,30,1190000000,1185000000,-28.597647 +1,30,1195000000,1190000000,-28.542390 +1,30,1200000000,1195000000,-28.486014 +1,30,1205000000,1200000000,-28.454187 +1,30,1210000000,1205000000,-28.455288 +1,30,1215000000,1210000000,-28.407626 +1,30,1220000000,1215000000,-28.370315 +1,30,1225000000,1220000000,-28.370204 +1,30,1230000000,1225000000,-28.368727 +1,30,1235000000,1230000000,-28.384080 +1,30,1240000000,1235000000,-28.389167 +1,30,1245000000,1240000000,-28.394162 +1,30,1250000000,1245000000,-28.407304 +1,30,1255000000,1250000000,-28.436820 +1,30,1260000000,1255000000,-28.452529 +1,30,1265000000,1260000000,-28.483149 +1,30,1270000000,1265000000,-28.526631 +1,30,1275000000,1270000000,-28.554895 +1,30,1280000000,1275000000,-28.600701 +1,30,1285000000,1280000000,-28.658583 +1,30,1290000000,1285000000,-28.705844 +1,30,1295000000,1290000000,-28.753996 +1,30,1300000000,1295000000,-28.813670 +1,30,1305000000,1300000000,-28.880891 +1,30,1310000000,1305000000,-28.953851 +1,30,1315000000,1310000000,-29.024474 +1,30,1320000000,1315000000,-29.095531 +1,30,1325000000,1320000000,-29.170238 +1,30,1330000000,1325000000,-29.247478 +1,30,1335000000,1330000000,-29.325571 +1,30,1340000000,1335000000,-29.406593 +1,30,1345000000,1340000000,-29.484379 +1,30,1350000000,1345000000,-29.574126 +1,30,1355000000,1350000000,-29.654784 +1,30,1360000000,1355000000,-29.739740 +1,30,1365000000,1360000000,-29.816491 +1,30,1370000000,1365000000,-29.903197 +1,30,1375000000,1370000000,-29.982864 +1,30,1380000000,1375000000,-30.065767 +1,30,1385000000,1380000000,-30.214852 +1,30,1390000000,1385000000,-30.247111 +1,30,1395000000,1390000000,-30.341052 +1,30,1400000000,1395000000,-30.422116 +1,30,1405000000,1400000000,-30.510404 +1,30,1410000000,1405000000,-30.598231 +1,30,1415000000,1410000000,-30.682669 +1,30,1420000000,1415000000,-30.780246 +1,30,1425000000,1420000000,-30.866085 +1,30,1430000000,1425000000,-30.953761 +1,30,1435000000,1430000000,-31.050194 +1,30,1440000000,1435000000,-31.139837 +1,30,1445000000,1440000000,-31.232087 +1,30,1450000000,1445000000,-31.330322 +1,30,1455000000,1450000000,-31.413944 +1,30,1460000000,1455000000,-31.509712 +1,30,1465000000,1460000000,-31.593853 +1,30,1470000000,1465000000,-31.680480 +1,30,1475000000,1470000000,-31.752348 +1,30,1480000000,1475000000,-31.831896 +1,30,1485000000,1480000000,-31.951962 +1,30,1490000000,1485000000,-31.971522 +1,30,1495000000,1490000000,-32.018648 +1,30,1500000000,1495000000,-32.081842 +1,30,1505000000,1500000000,-32.125405 +1,30,1510000000,1505000000,-32.166137 +1,30,1515000000,1510000000,-32.202758 +1,30,1520000000,1515000000,-32.220528 +1,30,1525000000,1520000000,-32.239704 +1,30,1530000000,1525000000,-32.239583 +1,30,1535000000,1530000000,-32.232791 +1,30,1540000000,1535000000,-32.220022 +1,30,1545000000,1540000000,-32.209272 +1,30,1550000000,1545000000,-32.170961 +1,30,1555000000,1550000000,-32.166513 +1,30,1560000000,1555000000,-32.094232 +1,30,1565000000,1560000000,-32.044945 +1,30,1570000000,1565000000,-31.979376 +1,30,1575000000,1570000000,-31.907061 +1,30,1580000000,1575000000,-31.852034 +1,30,1585000000,1580000000,-31.788434 +1,30,1590000000,1585000000,-31.718713 +1,30,1595000000,1590000000,-31.653725 +1,30,1600000000,1595000000,-31.596627 +1,30,1605000000,1600000000,-31.542360 +1,30,1610000000,1605000000,-31.822220 +1,30,1615000000,1610000000,-31.817576 +1,30,1620000000,1615000000,-31.833388 +1,30,1625000000,1620000000,-31.858513 +1,30,1630000000,1625000000,-31.882638 +1,30,1635000000,1630000000,-31.925204 +1,30,1640000000,1635000000,-31.970760 +1,30,1645000000,1640000000,-32.059836 +1,30,1650000000,1645000000,-32.072693 +1,30,1655000000,1650000000,-32.115323 +1,30,1660000000,1655000000,-32.166075 +1,30,1665000000,1660000000,-32.205378 +1,30,1670000000,1665000000,-32.239735 +1,30,1675000000,1670000000,-32.281744 +1,30,1680000000,1675000000,-32.290795 +1,30,1685000000,1680000000,-32.303278 +1,30,1690000000,1685000000,-32.314124 +1,30,1695000000,1690000000,-32.324282 +1,30,1700000000,1695000000,-32.322326 +1,30,1705000000,1700000000,-32.320796 +1,30,1710000000,1705000000,-32.321116 +1,30,1715000000,1710000000,-32.312802 +1,30,1720000000,1715000000,-32.310318 +1,30,1725000000,1720000000,-32.295376 +1,30,1730000000,1725000000,-32.275004 +1,30,1735000000,1730000000,-32.271249 +1,30,1740000000,1735000000,-32.236782 +1,30,1745000000,1740000000,-32.216983 +1,30,1750000000,1745000000,-32.192414 +1,30,1755000000,1750000000,-32.159340 +1,30,1760000000,1755000000,-32.160172 +1,30,1765000000,1760000000,-32.133472 +1,30,1770000000,1765000000,-32.116974 +1,30,1775000000,1770000000,-32.097625 +1,30,1780000000,1775000000,-32.073052 +1,30,1785000000,1780000000,-32.048891 +1,30,1790000000,1785000000,-32.028623 +1,30,1795000000,1790000000,-31.995239 +1,30,1800000000,1795000000,-31.969788 +1,30,1805000000,1800000000,-31.942456 +1,30,1810000000,1805000000,-31.914238 +1,30,1815000000,1810000000,-31.882030 +1,30,1820000000,1815000000,-31.864082 +1,30,1825000000,1820000000,-31.832642 +1,30,1830000000,1825000000,-31.783828 +1,30,1835000000,1830000000,-31.744760 +1,30,1840000000,1835000000,-31.709129 +1,30,1845000000,1840000000,-31.667151 +1,30,1850000000,1845000000,-31.622903 +1,30,1855000000,1850000000,-31.570512 +1,30,1860000000,1855000000,-31.515120 +1,30,1865000000,1860000000,-31.457766 +1,30,1870000000,1865000000,-31.393445 +1,30,1875000000,1870000000,-31.327210 +1,30,1880000000,1875000000,-31.256614 +1,30,1885000000,1880000000,-31.182443 +1,30,1890000000,1885000000,-31.100648 +1,30,1895000000,1890000000,-31.015459 +1,30,1900000000,1895000000,-30.961013 +1,30,1905000000,1900000000,-30.841424 +1,30,1910000000,1905000000,-30.755506 +1,30,1915000000,1910000000,-30.655861 +1,30,1920000000,1915000000,-30.568976 +1,30,1925000000,1920000000,-30.473760 +1,30,1930000000,1925000000,-30.411212 +1,30,1935000000,1930000000,-30.334831 +1,30,1940000000,1935000000,-30.232260 +1,30,1945000000,1940000000,-30.160314 +1,30,1950000000,1945000000,-30.088117 +1,30,1955000000,1950000000,-30.026900 +1,30,1960000000,1955000000,-29.967676 +1,30,1965000000,1960000000,-29.945000 +1,30,1970000000,1965000000,-29.883653 +1,30,1975000000,1970000000,-29.834240 +1,30,1980000000,1975000000,-29.806641 +1,30,1985000000,1980000000,-29.795082 +1,30,1990000000,1985000000,-29.777308 +1,30,1995000000,1990000000,-29.776962 +1,30,2000000000,1995000000,-29.777272 +1,30,2005000000,2000000000,-29.782228 +1,30,2010000000,2005000000,-29.810690 +1,30,2015000000,2010000000,-29.845256 +1,30,2020000000,2015000000,-29.872099 +1,30,2025000000,2020000000,-29.908436 +1,30,2030000000,2025000000,-29.959025 +1,30,2035000000,2030000000,-30.017298 +1,30,2040000000,2035000000,-30.075421 +1,30,2045000000,2040000000,-30.149006 +1,30,2050000000,2045000000,-30.227410 +1,30,2055000000,2050000000,-30.298078 +1,30,2060000000,2055000000,-30.381271 +1,30,2065000000,2060000000,-30.461302 +1,30,2070000000,2065000000,-30.557631 +1,30,2075000000,2070000000,-30.639731 +1,30,2080000000,2075000000,-30.728171 +1,30,2085000000,2080000000,-30.829608 +1,30,2090000000,2085000000,-30.925586 +1,30,2095000000,2090000000,-31.017291 +1,30,2100000000,2095000000,-31.080477 +1,30,2105000000,2100000000,-31.161148 +1,30,2110000000,2105000000,-31.232523 +1,30,2115000000,2110000000,-31.306544 +1,30,2120000000,2115000000,-31.381075 +1,30,2125000000,2120000000,-31.452472 +1,30,2130000000,2125000000,-31.520780 +1,30,2135000000,2130000000,-31.591387 +1,30,2140000000,2135000000,-31.654024 +1,30,2145000000,2140000000,-31.728731 +1,30,2150000000,2145000000,-31.790156 +1,30,2155000000,2150000000,-31.866258 +1,30,2160000000,2155000000,-31.947918 +1,30,2165000000,2160000000,-32.007552 +1,30,2170000000,2165000000,-32.076216 +1,30,2175000000,2170000000,-32.144834 +1,30,2180000000,2175000000,-32.214130 +1,30,2185000000,2180000000,-32.282537 +1,30,2190000000,2185000000,-32.400318 +1,30,2195000000,2190000000,-32.430190 +1,30,2200000000,2195000000,-32.489746 +1,30,2205000000,2200000000,-32.558916 +1,30,2210000000,2205000000,-32.622370 +1,30,2215000000,2210000000,-32.876718 +1,30,2220000000,2215000000,-32.963658 +1,30,2225000000,2220000000,-33.051613 +1,30,2230000000,2225000000,-33.125291 +1,30,2235000000,2230000000,-33.211527 +1,30,2240000000,2235000000,-33.272305 +1,30,2245000000,2240000000,-33.343951 +1,30,2250000000,2245000000,-33.401232 +1,30,2255000000,2250000000,-33.462705 +1,30,2260000000,2255000000,-33.518659 +1,30,2265000000,2260000000,-33.565870 +1,30,2270000000,2265000000,-33.607587 +1,30,2275000000,2270000000,-33.651932 +1,30,2280000000,2275000000,-33.688164 +1,30,2285000000,2280000000,-33.755365 +1,30,2290000000,2285000000,-33.736423 +1,30,2295000000,2290000000,-33.750410 +1,30,2300000000,2295000000,-33.772187 +1,30,2305000000,2300000000,-33.780963 +1,30,2310000000,2305000000,-33.797862 +1,30,2315000000,2310000000,-33.843122 +1,30,2320000000,2315000000,-33.833986 +1,30,2325000000,2320000000,-33.810507 +1,30,2330000000,2325000000,-33.812039 +1,30,2335000000,2330000000,-33.837293 +1,30,2340000000,2335000000,-33.850642 +1,30,2345000000,2340000000,-33.853364 +1,30,2350000000,2345000000,-33.857835 +1,30,2355000000,2350000000,-33.846763 +1,30,2360000000,2355000000,-33.840968 +1,30,2365000000,2360000000,-33.871898 +1,30,2370000000,2365000000,-33.833901 +1,30,2375000000,2370000000,-33.831135 +1,30,2380000000,2375000000,-33.835260 +1,30,2385000000,2380000000,-33.837645 +1,30,2390000000,2385000000,-33.842719 +1,30,2395000000,2390000000,-33.952709 +1,30,2400000000,2395000000,-33.992909 +1,30,2405000000,2400000000,-34.037953 +1,30,2410000000,2405000000,-34.091966 +1,30,2415000000,2410000000,-34.164670 +1,30,2420000000,2415000000,-34.224171 +1,30,2425000000,2420000000,-34.295456 +1,30,2430000000,2425000000,-34.386317 +1,30,2435000000,2430000000,-34.468126 +1,30,2440000000,2435000000,-34.540469 +1,30,2445000000,2440000000,-34.620363 +1,30,2450000000,2445000000,-34.709990 +1,30,2455000000,2450000000,-34.835242 +1,30,2460000000,2455000000,-34.886713 +1,30,2465000000,2460000000,-34.965330 +1,30,2470000000,2465000000,-35.049754 +1,30,2475000000,2470000000,-35.126845 +1,30,2480000000,2475000000,-35.212037 +1,30,2485000000,2480000000,-35.278206 +1,30,2490000000,2485000000,-35.353274 +1,30,2495000000,2490000000,-35.427794 +1,30,2500000000,2495000000,-35.490766 +1,30,2505000000,2500000000,-35.551754 +1,30,2510000000,2505000000,-35.601139 +1,30,2515000000,2510000000,-35.650212 +1,30,2520000000,2515000000,-35.691716 +1,30,2525000000,2520000000,-35.723353 +1,30,2530000000,2525000000,-35.763223 +1,30,2535000000,2530000000,-35.784739 +1,30,2540000000,2535000000,-35.809240 +1,30,2545000000,2540000000,-35.820173 +1,30,2550000000,2545000000,-35.827970 +1,30,2555000000,2550000000,-35.762319 +1,30,2560000000,2555000000,-35.746567 +1,30,2565000000,2560000000,-35.735887 +1,30,2570000000,2565000000,-35.707623 +1,30,2575000000,2570000000,-35.680984 +1,30,2580000000,2575000000,-35.653822 +1,30,2585000000,2580000000,-35.607636 +1,30,2590000000,2585000000,-35.559628 +1,30,2595000000,2590000000,-35.505938 +1,30,2600000000,2595000000,-35.457948 +1,30,2605000000,2600000000,-35.377364 +1,30,2610000000,2605000000,-35.302970 +1,30,2615000000,2610000000,-35.248834 +1,30,2620000000,2615000000,-35.124219 +1,30,2625000000,2620000000,-35.020546 +1,30,2630000000,2625000000,-34.965389 +1,30,2635000000,2630000000,-34.857610 +1,30,2640000000,2635000000,-34.736974 +1,30,2645000000,2640000000,-34.639418 +1,30,2650000000,2645000000,-34.539983 +1,30,2655000000,2650000000,-34.433442 +1,30,2660000000,2655000000,-34.333808 +1,30,2665000000,2660000000,-34.241503 +1,30,2670000000,2665000000,-34.136609 +1,30,2675000000,2670000000,-34.044150 +1,30,2680000000,2675000000,-33.962396 +1,30,2685000000,2680000000,-33.878437 +1,30,2690000000,2685000000,-33.797997 +1,30,2695000000,2690000000,-33.728624 +1,30,2700000000,2695000000,-33.675815 +1,30,2705000000,2700000000,-33.816840 +1,30,2710000000,2705000000,-33.731634 +1,30,2715000000,2710000000,-33.671010 +1,30,2720000000,2715000000,-33.624829 +1,30,2725000000,2720000000,-33.587399 +1,30,2730000000,2725000000,-33.566647 +1,30,2735000000,2730000000,-33.555466 +1,30,2740000000,2735000000,-33.560824 +1,30,2745000000,2740000000,-33.555053 +1,30,2750000000,2745000000,-33.561645 +1,30,2755000000,2750000000,-33.578560 +1,30,2760000000,2755000000,-33.587189 +1,30,2765000000,2760000000,-33.625593 +1,30,2770000000,2765000000,-33.669310 +1,30,2775000000,2770000000,-33.687957 +1,30,2780000000,2775000000,-33.718340 +1,30,2785000000,2780000000,-33.752564 +1,30,2790000000,2785000000,-33.786977 +1,30,2795000000,2790000000,-33.813323 +1,30,2800000000,2795000000,-33.869665 +1,30,2805000000,2800000000,-33.856290 +1,30,2810000000,2805000000,-33.886348 +1,30,2815000000,2810000000,-33.899671 +1,30,2820000000,2815000000,-33.913169 +1,30,2825000000,2820000000,-33.927770 +1,30,2830000000,2825000000,-33.929752 +1,30,2835000000,2830000000,-33.936079 +1,30,2840000000,2835000000,-33.922466 +1,30,2845000000,2840000000,-33.911537 +1,30,2850000000,2845000000,-33.898320 +1,30,2855000000,2850000000,-33.866516 +1,30,2860000000,2855000000,-33.835630 +1,30,2865000000,2860000000,-33.806172 +1,30,2870000000,2865000000,-33.767393 +1,30,2875000000,2870000000,-33.719867 +1,30,2880000000,2875000000,-33.674449 +1,30,2885000000,2880000000,-33.625211 +1,30,2890000000,2885000000,-33.557243 +1,30,2895000000,2890000000,-33.496256 +1,30,2900000000,2895000000,-33.441262 +1,30,2905000000,2900000000,-33.374508 +1,30,2910000000,2905000000,-33.303355 +1,30,2915000000,2910000000,-33.236983 +1,30,2920000000,2915000000,-33.155018 +1,30,2925000000,2920000000,-33.088004 +1,30,2930000000,2925000000,-33.005220 +1,30,2935000000,2930000000,-32.935756 +1,30,2940000000,2935000000,-32.858912 +1,30,2945000000,2940000000,-32.778917 +1,30,2950000000,2945000000,-32.707921 +1,30,2955000000,2950000000,-32.639237 +1,30,2960000000,2955000000,-32.603803 +1,30,2965000000,2960000000,-32.507580 +1,30,2970000000,2965000000,-32.453059 +1,30,2975000000,2970000000,-32.397107 +1,30,2980000000,2975000000,-32.330301 +1,30,2985000000,2980000000,-32.282743 +1,30,2990000000,2985000000,-32.234853 +1,30,2995000000,2990000000,-32.191756 +1,30,3000000000,2995000000,-32.151252 +1,30,3005000000,3000000000,-32.111524 +1,30,3010000000,3005000000,-32.022297 +1,30,3015000000,3010000000,-31.992877 +1,30,3020000000,3015000000,-31.965361 +1,30,3025000000,3020000000,-31.966840 +1,30,3030000000,3025000000,-31.919356 +1,30,3035000000,3030000000,-31.905021 +1,30,3040000000,3035000000,-31.890583 +1,30,3045000000,3040000000,-31.887624 +1,30,3050000000,3045000000,-31.912383 +1,30,3055000000,3050000000,-31.873949 +1,30,3060000000,3055000000,-31.881122 +1,30,3065000000,3060000000,-31.882339 +1,30,3070000000,3065000000,-31.893927 +1,30,3075000000,3070000000,-31.904003 +1,30,3080000000,3075000000,-31.906399 +1,30,3085000000,3080000000,-31.926951 +1,30,3090000000,3085000000,-31.943055 +1,30,3095000000,3090000000,-31.954724 +1,30,3100000000,3095000000,-31.970397 +1,30,3105000000,3100000000,-31.981843 +1,30,3110000000,3105000000,-32.000580 +1,30,3115000000,3110000000,-32.010219 +1,30,3120000000,3115000000,-32.022420 +1,30,3125000000,3120000000,-32.032672 +1,30,3130000000,3125000000,-32.041416 +1,30,3135000000,3130000000,-32.052605 +1,30,3140000000,3135000000,-32.051215 +1,30,3145000000,3140000000,-32.059060 +1,30,3150000000,3145000000,-32.058029 +1,30,3155000000,3150000000,-32.059115 +1,30,3160000000,3155000000,-32.061933 +1,30,3165000000,3160000000,-32.073600 +1,30,3170000000,3165000000,-32.057387 +1,30,3175000000,3170000000,-32.046343 +1,30,3180000000,3175000000,-32.039269 +1,30,3185000000,3180000000,-32.026526 +1,30,3190000000,3185000000,-32.014860 +1,30,3195000000,3190000000,-32.002742 +1,30,3200000000,3195000000,-31.993899 +1,30,3205000000,3200000000,-31.983554 +1,30,3210000000,3205000000,-31.965688 +1,30,3215000000,3210000000,-31.944984 +1,30,3220000000,3215000000,-31.927726 +1,30,3225000000,3220000000,-31.909564 +1,30,3230000000,3225000000,-31.920159 +1,30,3235000000,3230000000,-31.877692 +1,30,3240000000,3235000000,-31.855049 +1,30,3245000000,3240000000,-31.838638 +1,30,3250000000,3245000000,-31.817655 +1,30,3255000000,3250000000,-31.803147 +1,30,3260000000,3255000000,-31.787435 +1,30,3265000000,3260000000,-31.766343 +1,30,3270000000,3265000000,-31.756672 +1,30,3275000000,3270000000,-31.742297 +1,30,3280000000,3275000000,-31.732945 +1,30,3285000000,3280000000,-31.721950 +1,30,3290000000,3285000000,-31.712252 +1,30,3295000000,3290000000,-31.712494 +1,30,3300000000,3295000000,-31.704136 +1,30,3305000000,3300000000,-31.708759 +1,30,3310000000,3305000000,-31.699334 +1,30,3315000000,3310000000,-31.712760 +1,30,3320000000,3315000000,-31.712119 +1,30,3325000000,3320000000,-31.719042 +1,30,3330000000,3325000000,-31.727358 +1,30,3335000000,3330000000,-31.745714 +1,30,3340000000,3335000000,-31.767968 +1,30,3345000000,3340000000,-31.770310 +1,30,3350000000,3345000000,-31.790205 +1,30,3355000000,3350000000,-31.817427 +1,30,3360000000,3355000000,-31.838524 +1,30,3365000000,3360000000,-31.874462 +1,30,3370000000,3365000000,-31.908067 +1,30,3375000000,3370000000,-31.953108 +1,30,3380000000,3375000000,-31.964177 +1,30,3385000000,3380000000,-32.001242 +1,30,3390000000,3385000000,-32.032569 +1,30,3395000000,3390000000,-32.069079 +1,30,3400000000,3395000000,-32.122392 +1,30,3405000000,3400000000,-32.163710 +1,30,3410000000,3405000000,-32.212463 +1,30,3415000000,3410000000,-32.254985 +1,30,3420000000,3415000000,-32.298968 +1,30,3425000000,3420000000,-32.353100 +1,30,3430000000,3425000000,-32.400904 +1,30,3435000000,3430000000,-32.452296 +1,30,3440000000,3435000000,-32.502538 +1,30,3445000000,3440000000,-32.548724 +1,30,3450000000,3445000000,-32.602864 +1,30,3455000000,3450000000,-32.664822 +1,30,3460000000,3455000000,-32.708955 +1,30,3465000000,3460000000,-32.769117 +1,30,3470000000,3465000000,-32.806351 +1,30,3475000000,3470000000,-32.860003 +1,30,3480000000,3475000000,-32.914963 +1,30,3485000000,3480000000,-32.967275 +1,30,3490000000,3485000000,-33.019834 +1,30,3495000000,3490000000,-33.069980 +1,30,3500000000,3495000000,-33.119001 +1,30,3505000000,3500000000,-33.166887 +1,30,3510000000,3505000000,-33.218080 +1,30,3515000000,3510000000,-33.301183 +1,30,3520000000,3515000000,-33.317984 +1,30,3525000000,3520000000,-33.368044 +1,30,3530000000,3525000000,-33.412522 +1,30,3535000000,3530000000,-33.456203 +1,30,3540000000,3535000000,-33.501395 +1,30,3545000000,3540000000,-33.548709 +1,30,3550000000,3545000000,-33.594678 +1,30,3555000000,3550000000,-33.635968 +1,30,3560000000,3555000000,-33.675753 +1,30,3565000000,3560000000,-33.723483 +1,30,3570000000,3565000000,-33.757132 +1,30,3575000000,3570000000,-33.809375 +1,30,3580000000,3575000000,-33.854785 +1,30,3585000000,3580000000,-33.888890 +1,30,3590000000,3585000000,-33.929246 +1,30,3595000000,3590000000,-33.972496 +1,30,3600000000,3595000000,-34.022499 +1,30,3605000000,3600000000,-34.061185 +1,30,3610000000,3605000000,-34.100025 +1,30,3615000000,3610000000,-34.121069 +1,30,3620000000,3615000000,-34.167656 +1,30,3625000000,3620000000,-34.203296 +1,30,3630000000,3625000000,-34.245262 +1,30,3635000000,3630000000,-34.274701 +1,30,3640000000,3635000000,-34.298723 +1,30,3645000000,3640000000,-34.340596 +1,30,3650000000,3645000000,-34.374279 +1,30,3655000000,3650000000,-34.388441 +1,30,3660000000,3655000000,-34.414498 +1,30,3665000000,3660000000,-34.459544 +1,30,3670000000,3665000000,-34.470209 +1,30,3675000000,3670000000,-34.499111 +1,30,3680000000,3675000000,-34.534162 +1,30,3685000000,3680000000,-34.575373 +1,30,3690000000,3685000000,-34.603424 +1,30,3695000000,3690000000,-34.685779 +1,30,3700000000,3695000000,-34.700441 +1,30,3705000000,3700000000,-34.741066 +1,30,3710000000,3705000000,-34.791187 +1,30,3715000000,3710000000,-34.841565 +1,30,3720000000,3715000000,-34.686143 +1,30,3725000000,3720000000,-34.743519 +1,30,3730000000,3725000000,-34.813899 +1,30,3735000000,3730000000,-34.875187 +1,30,3740000000,3735000000,-34.938481 +1,30,3745000000,3740000000,-34.999111 +1,30,3750000000,3745000000,-35.071933 +1,30,3755000000,3750000000,-35.146010 +1,30,3760000000,3755000000,-35.209988 +1,30,3765000000,3760000000,-35.304803 +1,30,3770000000,3765000000,-35.359482 +1,30,3775000000,3770000000,-35.428709 +1,30,3780000000,3775000000,-35.503487 +1,30,3785000000,3780000000,-35.569905 +1,30,3790000000,3785000000,-35.628251 +1,30,3795000000,3790000000,-35.698080 +1,30,3800000000,3795000000,-35.755310 +1,30,3805000000,3800000000,-35.821047 +1,30,3810000000,3805000000,-35.873715 +1,30,3815000000,3810000000,-35.915591 +1,30,3820000000,3815000000,-35.962933 +1,30,3825000000,3820000000,-35.995619 +1,30,3830000000,3825000000,-36.033619 +1,30,3835000000,3830000000,-36.069009 +1,30,3840000000,3835000000,-36.099748 +1,30,3845000000,3840000000,-36.121845 +1,30,3850000000,3845000000,-36.142567 +1,30,3855000000,3850000000,-36.150697 +1,30,3860000000,3855000000,-36.153996 +1,30,3865000000,3860000000,-36.165469 +1,30,3870000000,3865000000,-36.165372 +1,30,3875000000,3870000000,-36.188004 +1,30,3880000000,3875000000,-36.140271 +1,30,3885000000,3880000000,-36.134021 +1,30,3890000000,3885000000,-36.101613 +1,30,3895000000,3890000000,-36.083936 +1,30,3900000000,3895000000,-36.080074 +1,30,3905000000,3900000000,-36.038939 +1,30,3910000000,3905000000,-36.018755 +1,30,3915000000,3910000000,-36.017413 +1,30,3920000000,3915000000,-35.954554 +1,30,3925000000,3920000000,-35.923408 +1,30,3930000000,3925000000,-35.885322 +1,30,3935000000,3930000000,-35.845524 +1,30,3940000000,3935000000,-35.823054 +1,30,3945000000,3940000000,-35.800136 +1,30,3950000000,3945000000,-35.778693 +1,30,3955000000,3950000000,-35.755063 +1,30,3960000000,3955000000,-35.762335 +1,30,3965000000,3960000000,-35.721879 +1,30,3970000000,3965000000,-35.715563 +1,30,3975000000,3970000000,-35.694109 +1,30,3980000000,3975000000,-35.690795 +1,30,3985000000,3980000000,-35.710944 +1,30,3990000000,3985000000,-35.717526 +1,30,3995000000,3990000000,-35.740121 +1,30,4000000000,3995000000,-35.753558 +1,30,4005000000,4000000000,-35.912981 +1,30,4010000000,4005000000,-35.899416 +1,30,4015000000,4010000000,-35.909170 +1,30,4020000000,4015000000,-35.946556 +1,30,4025000000,4020000000,-35.987934 +1,30,4030000000,4025000000,-36.027021 +1,30,4035000000,4030000000,-36.092250 +1,30,4040000000,4035000000,-36.136502 +1,30,4045000000,4040000000,-36.192564 +1,30,4050000000,4045000000,-36.273986 +1,30,4055000000,4050000000,-36.309795 +1,30,4060000000,4055000000,-36.358257 +1,30,4065000000,4060000000,-36.434276 +1,30,4070000000,4065000000,-36.487393 +1,30,4075000000,4070000000,-36.543363 +1,30,4080000000,4075000000,-36.601693 +1,30,4085000000,4080000000,-36.673037 +1,30,4090000000,4085000000,-36.714097 +1,30,4095000000,4090000000,-36.762061 +1,30,4100000000,4095000000,-36.798433 +1,30,4105000000,4100000000,-36.829454 +1,30,4110000000,4105000000,-36.867047 +1,30,4115000000,4110000000,-36.903456 +1,30,4120000000,4115000000,-36.921785 +1,30,4125000000,4120000000,-36.945920 +1,30,4130000000,4125000000,-36.936951 +1,30,4135000000,4130000000,-36.934055 +1,30,4140000000,4135000000,-36.914627 +1,30,4145000000,4140000000,-36.911933 +1,30,4150000000,4145000000,-36.908758 +1,30,4155000000,4150000000,-36.881956 +1,30,4160000000,4155000000,-36.859616 +1,30,4165000000,4160000000,-36.850067 +1,30,4170000000,4165000000,-36.812605 +1,30,4175000000,4170000000,-36.779319 +1,30,4180000000,4175000000,-36.744357 +1,30,4185000000,4180000000,-36.706913 +1,30,4190000000,4185000000,-36.658667 +1,30,4195000000,4190000000,-36.607443 +1,30,4200000000,4195000000,-36.571173 +1,30,4205000000,4200000000,-36.525320 +1,30,4210000000,4205000000,-36.480264 +1,30,4215000000,4210000000,-36.441963 +1,30,4220000000,4215000000,-36.398151 +1,30,4225000000,4220000000,-36.364870 +1,30,4230000000,4225000000,-36.328598 +1,30,4235000000,4230000000,-36.306601 +1,30,4240000000,4235000000,-36.282886 +1,30,4245000000,4240000000,-36.266024 +1,30,4250000000,4245000000,-36.240806 +1,30,4255000000,4250000000,-36.227840 +1,30,4260000000,4255000000,-36.212871 +1,30,4265000000,4260000000,-36.215904 +1,30,4270000000,4265000000,-36.215283 +1,30,4275000000,4270000000,-36.227207 +1,30,4280000000,4275000000,-36.234476 +1,30,4285000000,4280000000,-36.268942 +1,30,4290000000,4285000000,-36.297450 +1,30,4295000000,4290000000,-36.328507 +1,30,4300000000,4295000000,-36.410890 +1,30,4305000000,4300000000,-36.406759 +1,30,4310000000,4305000000,-36.454345 +1,30,4315000000,4310000000,-36.546529 +1,30,4320000000,4315000000,-36.550693 +1,30,4325000000,4320000000,-36.612672 +1,30,4330000000,4325000000,-36.673051 +1,30,4335000000,4330000000,-36.732741 +1,30,4340000000,4335000000,-36.786485 +1,30,4345000000,4340000000,-36.872936 +1,30,4350000000,4345000000,-36.912193 +1,30,4355000000,4350000000,-36.986196 +1,30,4360000000,4355000000,-37.075110 +1,30,4365000000,4360000000,-37.143720 +1,30,4370000000,4365000000,-37.147929 +1,30,4375000000,4370000000,-37.232021 +1,30,4380000000,4375000000,-37.270780 +1,30,4385000000,4380000000,-37.303379 +1,30,4390000000,4385000000,-37.353391 +1,30,4395000000,4390000000,-37.410225 +1,30,4400000000,4395000000,-37.438263 +1,30,4405000000,4400000000,-37.476969 +1,30,4410000000,4405000000,-37.505685 +1,30,4415000000,4410000000,-37.542189 +1,30,4420000000,4415000000,-37.579295 +1,30,4425000000,4420000000,-37.605563 +1,30,4430000000,4425000000,-37.624251 +1,30,4435000000,4430000000,-37.635541 +1,30,4440000000,4435000000,-37.665391 +1,30,4445000000,4440000000,-37.673136 +1,30,4450000000,4445000000,-37.674195 +1,30,4455000000,4450000000,-37.690566 +1,30,4460000000,4455000000,-37.689676 +1,30,4465000000,4460000000,-37.701028 +1,30,4470000000,4465000000,-37.724179 +1,30,4475000000,4470000000,-37.755516 +1,30,4480000000,4475000000,-37.734194 +1,30,4485000000,4480000000,-37.731483 +1,30,4490000000,4485000000,-37.746505 +1,30,4495000000,4490000000,-37.747642 +1,30,4500000000,4495000000,-37.741654 +1,30,4505000000,4500000000,-37.752346 +1,30,4510000000,4505000000,-37.774563 +1,30,4515000000,4510000000,-37.770286 +1,30,4520000000,4515000000,-37.779333 +1,30,4525000000,4520000000,-37.790139 +1,30,4530000000,4525000000,-37.800751 +1,30,4535000000,4530000000,-37.804037 +1,30,4540000000,4535000000,-37.854861 +1,30,4545000000,4540000000,-37.837078 +1,30,4550000000,4545000000,-37.840138 +1,30,4555000000,4550000000,-37.931015 +1,30,4560000000,4555000000,-37.938597 +1,30,4565000000,4560000000,-37.947917 +1,30,4570000000,4565000000,-37.975305 +1,30,4575000000,4570000000,-37.988615 +1,30,4580000000,4575000000,-38.001552 +1,30,4585000000,4580000000,-38.053039 +1,30,4590000000,4585000000,-38.034480 +1,30,4595000000,4590000000,-38.067378 +1,30,4600000000,4595000000,-38.098872 +1,30,4605000000,4600000000,-38.115531 +1,30,4610000000,4605000000,-38.063265 +1,30,4615000000,4610000000,-38.105159 +1,30,4620000000,4615000000,-38.107533 +1,30,4625000000,4620000000,-38.113486 +1,30,4630000000,4625000000,-38.125800 +1,30,4635000000,4630000000,-38.132616 +1,30,4640000000,4635000000,-38.139072 +1,30,4645000000,4640000000,-38.142557 +1,30,4650000000,4645000000,-38.130523 +1,30,4655000000,4650000000,-38.147094 +1,30,4660000000,4655000000,-38.129656 +1,30,4665000000,4660000000,-38.160065 +1,30,4670000000,4665000000,-38.116556 +1,30,4675000000,4670000000,-38.122638 +1,30,4680000000,4675000000,-38.091575 +1,30,4685000000,4680000000,-38.075781 +1,30,4690000000,4685000000,-38.052434 +1,30,4695000000,4690000000,-38.060732 +1,30,4700000000,4695000000,-38.021375 +1,30,4705000000,4700000000,-37.990861 +1,30,4710000000,4705000000,-37.976400 +1,30,4715000000,4710000000,-37.938629 +1,30,4720000000,4715000000,-37.926536 +1,30,4725000000,4720000000,-37.899985 +1,30,4730000000,4725000000,-37.865548 +1,30,4735000000,4730000000,-37.848490 +1,30,4740000000,4735000000,-37.806844 +1,30,4745000000,4740000000,-37.770265 +1,30,4750000000,4745000000,-37.751846 +1,30,4755000000,4750000000,-37.698682 +1,30,4760000000,4755000000,-37.664862 +1,30,4765000000,4760000000,-37.665188 +1,30,4770000000,4765000000,-37.597859 +1,30,4775000000,4770000000,-37.579254 +1,30,4780000000,4775000000,-37.548034 +1,30,4785000000,4780000000,-37.526314 +1,30,4790000000,4785000000,-37.501119 +1,30,4795000000,4790000000,-37.487212 +1,30,4800000000,4795000000,-37.472353 +1,30,4805000000,4800000000,-37.426791 +1,30,4810000000,4805000000,-37.414080 +1,30,4815000000,4810000000,-37.411546 +1,30,4820000000,4815000000,-37.396805 +1,30,4825000000,4820000000,-37.375593 +1,30,4830000000,4825000000,-37.358717 +1,30,4835000000,4830000000,-37.349573 +1,30,4840000000,4835000000,-37.329335 +1,30,4845000000,4840000000,-37.326537 +1,30,4850000000,4845000000,-37.320010 +1,30,4855000000,4850000000,-37.326168 +1,30,4860000000,4855000000,-37.325057 +1,30,4865000000,4860000000,-37.323713 +1,30,4870000000,4865000000,-37.302885 +1,30,4875000000,4870000000,-37.297454 +1,30,4880000000,4875000000,-37.289915 +1,30,4885000000,4880000000,-37.216202 +1,30,4890000000,4885000000,-37.193584 +1,30,4895000000,4890000000,-37.172555 +1,30,4900000000,4895000000,-37.145418 +1,30,4905000000,4900000000,-37.115803 +1,30,4910000000,4905000000,-37.105970 +1,30,4915000000,4910000000,-37.076541 +1,30,4920000000,4915000000,-37.035912 +1,30,4925000000,4920000000,-36.993696 +1,30,4930000000,4925000000,-36.967387 +1,30,4935000000,4930000000,-36.945486 +1,30,4940000000,4935000000,-36.890266 +1,30,4945000000,4940000000,-36.849464 +1,30,4950000000,4945000000,-36.784365 +1,30,4955000000,4950000000,-36.740157 +1,30,4960000000,4955000000,-36.703101 +1,30,4965000000,4960000000,-36.643748 +1,30,4970000000,4965000000,-36.593381 +1,30,4975000000,4970000000,-36.554842 +1,30,4980000000,4975000000,-36.509031 +1,30,4985000000,4980000000,-36.481457 +1,30,4990000000,4985000000,-36.411618 +1,30,4995000000,4990000000,-36.393961 +1,30,5000000000,4995000000,-36.329155 +1,30,5005000000,5000000000,-36.562844 +1,30,5010000000,5005000000,-36.474577 +1,30,5015000000,5010000000,-36.427205 +1,30,5020000000,5015000000,-36.341189 +1,30,5025000000,5020000000,-36.282156 +1,30,5030000000,5025000000,-36.252112 +1,30,5035000000,5030000000,-36.219707 +1,30,5040000000,5035000000,-36.214535 +1,30,5045000000,5040000000,-36.182946 +1,30,5050000000,5045000000,-36.176242 +1,30,5055000000,5050000000,-36.174135 +1,30,5060000000,5055000000,-36.206020 +1,30,5065000000,5060000000,-36.222740 +1,30,5070000000,5065000000,-36.239016 +1,30,5075000000,5070000000,-36.312715 +1,30,5080000000,5075000000,-36.323659 +1,30,5085000000,5080000000,-36.352419 +1,30,5090000000,5085000000,-36.403520 +1,30,5095000000,5090000000,-36.473190 +1,30,5100000000,5095000000,-36.545266 +1,30,5105000000,5100000000,-36.605706 +1,30,5110000000,5105000000,-36.670989 +1,30,5115000000,5110000000,-36.734275 +1,30,5120000000,5115000000,-36.785709 +1,30,5125000000,5120000000,-37.011902 +1,30,5130000000,5125000000,-37.071789 +1,30,5135000000,5130000000,-37.154548 +1,30,5140000000,5135000000,-37.227852 +1,30,5145000000,5140000000,-37.293391 +1,30,5150000000,5145000000,-37.378368 +1,30,5155000000,5150000000,-37.422484 +1,30,5160000000,5155000000,-37.472994 +1,30,5165000000,5160000000,-37.525291 +1,30,5170000000,5165000000,-37.600487 +1,30,5175000000,5170000000,-37.638011 +1,30,5180000000,5175000000,-37.681148 +1,30,5185000000,5180000000,-37.681260 +1,30,5190000000,5185000000,-37.743702 +1,30,5195000000,5190000000,-37.812846 +1,30,5200000000,5195000000,-37.860188 +1,30,5205000000,5200000000,-37.954120 +1,30,5210000000,5205000000,-38.001207 +1,30,5215000000,5210000000,-38.051349 +1,30,5220000000,5215000000,-38.092692 +1,30,5225000000,5220000000,-38.136588 +1,30,5230000000,5225000000,-38.189006 +1,30,5235000000,5230000000,-38.248800 +1,30,5240000000,5235000000,-38.299137 +1,30,5245000000,5240000000,-38.366263 +1,30,5250000000,5245000000,-38.408978 +1,30,5255000000,5250000000,-38.532540 +1,30,5260000000,5255000000,-38.560544 +1,30,5265000000,5260000000,-38.636384 +1,30,5270000000,5265000000,-38.708623 +1,30,5275000000,5270000000,-38.791091 +1,30,5280000000,5275000000,-38.884455 +1,30,5285000000,5280000000,-38.990272 +1,30,5290000000,5285000000,-39.032381 +1,30,5295000000,5290000000,-39.122471 +1,30,5300000000,5295000000,-39.229106 +1,30,5305000000,5300000000,-39.325509 +1,30,5310000000,5305000000,-39.580877 +1,30,5315000000,5310000000,-39.699107 +1,30,5320000000,5315000000,-39.822527 +1,30,5325000000,5320000000,-39.944243 +1,30,5330000000,5325000000,-40.040747 +1,30,5335000000,5330000000,-40.183542 +1,30,5340000000,5335000000,-40.289868 +1,30,5345000000,5340000000,-40.385318 +1,30,5350000000,5345000000,-40.523741 +1,30,5355000000,5350000000,-40.601177 +1,30,5360000000,5355000000,-40.704532 +1,30,5365000000,5360000000,-40.799905 +1,30,5370000000,5365000000,-40.902633 +1,30,5375000000,5370000000,-41.018822 +1,30,5380000000,5375000000,-41.144079 +1,30,5385000000,5380000000,-41.184176 +1,30,5390000000,5385000000,-41.280690 +1,30,5395000000,5390000000,-41.364456 +1,30,5400000000,5395000000,-41.438798 +1,30,5405000000,5400000000,-41.494864 +1,30,5410000000,5405000000,-41.577565 +1,30,5415000000,5410000000,-41.633554 +1,30,5420000000,5415000000,-41.686150 +1,30,5425000000,5420000000,-41.715148 +1,30,5430000000,5425000000,-41.775942 +1,30,5435000000,5430000000,-41.823271 +1,30,5440000000,5435000000,-41.877708 +1,30,5445000000,5440000000,-41.904533 +1,30,5450000000,5445000000,-41.933251 +1,30,5455000000,5450000000,-41.981513 +1,30,5460000000,5455000000,-42.007406 +1,30,5465000000,5460000000,-42.040357 +1,30,5470000000,5465000000,-42.049159 +1,30,5475000000,5470000000,-42.054748 +1,30,5480000000,5475000000,-42.066086 +1,30,5485000000,5480000000,-42.099871 +1,30,5490000000,5485000000,-42.096205 +1,30,5495000000,5490000000,-42.109391 +1,30,5500000000,5495000000,-42.133984 +1,30,5505000000,5500000000,-42.133867 +1,30,5510000000,5505000000,-42.148723 +1,30,5515000000,5510000000,-42.137916 +1,30,5520000000,5515000000,-42.143737 +1,30,5525000000,5520000000,-42.148088 +1,30,5530000000,5525000000,-42.153764 +1,30,5535000000,5530000000,-42.163284 +1,30,5540000000,5535000000,-42.066539 +1,30,5545000000,5540000000,-42.076744 +1,30,5550000000,5545000000,-42.075819 +1,30,5555000000,5550000000,-42.080134 +1,30,5560000000,5555000000,-42.089434 +1,30,5565000000,5560000000,-42.083261 +1,30,5570000000,5565000000,-42.077956 +1,30,5575000000,5570000000,-42.083729 +1,30,5580000000,5575000000,-42.127886 +1,30,5585000000,5580000000,-42.121664 +1,30,5590000000,5585000000,-42.110746 +1,30,5595000000,5590000000,-42.105433 +1,30,5600000000,5595000000,-42.109389 +1,30,5605000000,5600000000,-42.100210 +1,30,5610000000,5605000000,-42.109497 +1,30,5615000000,5610000000,-42.119392 +1,30,5620000000,5615000000,-42.114197 +1,30,5625000000,5620000000,-42.092814 +1,30,5630000000,5625000000,-42.105032 +1,30,5635000000,5630000000,-42.091341 +1,30,5640000000,5635000000,-42.087183 +1,30,5645000000,5640000000,-42.079567 +1,30,5650000000,5645000000,-42.083321 +1,30,5655000000,5650000000,-42.095175 +1,30,5660000000,5655000000,-42.069055 +1,30,5665000000,5660000000,-42.061788 +1,30,5670000000,5665000000,-42.041017 +1,30,5675000000,5670000000,-42.067697 +1,30,5680000000,5675000000,-42.048876 +1,30,5685000000,5680000000,-42.037675 +1,30,5690000000,5685000000,-42.024102 +1,30,5695000000,5690000000,-42.012922 +1,30,5700000000,5695000000,-42.002453 +1,30,5705000000,5700000000,-41.988127 +1,30,5710000000,5705000000,-41.975979 +1,30,5715000000,5710000000,-41.981072 +1,30,5720000000,5715000000,-41.948604 +1,30,5725000000,5720000000,-41.935749 +1,30,5730000000,5725000000,-41.926041 +1,30,5735000000,5730000000,-41.925119 +1,30,5740000000,5735000000,-41.893233 +1,30,5745000000,5740000000,-41.906727 +1,30,5750000000,5745000000,-41.886011 +1,30,5755000000,5750000000,-41.856344 +1,30,5760000000,5755000000,-41.858150 +1,30,5765000000,5760000000,-41.826268 +1,30,5770000000,5765000000,-41.823475 +1,30,5775000000,5770000000,-41.805168 +1,30,5780000000,5775000000,-41.770529 +1,30,5785000000,5780000000,-41.752211 +1,30,5790000000,5785000000,-41.715274 +1,30,5795000000,5790000000,-41.703886 +1,30,5800000000,5795000000,-41.687302 +1,30,5805000000,5800000000,-41.666203 +1,30,5810000000,5805000000,-41.630945 +1,30,5815000000,5810000000,-41.580435 +1,30,5820000000,5815000000,-41.537416 +1,30,5825000000,5820000000,-41.509208 +1,30,5830000000,5825000000,-41.467542 +1,30,5835000000,5830000000,-41.422159 +1,30,5840000000,5835000000,-41.376076 +1,30,5845000000,5840000000,-41.306831 +1,30,5850000000,5845000000,-41.250601 +1,30,5855000000,5850000000,-41.196689 +1,30,5860000000,5855000000,-41.122994 +1,30,5865000000,5860000000,-41.053414 +1,30,5870000000,5865000000,-40.966387 +1,30,5875000000,5870000000,-40.886211 +1,30,5880000000,5875000000,-40.815861 +1,30,5885000000,5880000000,-40.725793 +1,30,5890000000,5885000000,-40.626272 +1,30,5895000000,5890000000,-40.542055 +1,30,5900000000,5895000000,-40.468083 +1,30,5905000000,5900000000,-40.380518 +1,30,5910000000,5905000000,-40.278994 +1,30,5915000000,5910000000,-40.160402 +1,30,5920000000,5915000000,-40.076621 +1,30,5925000000,5920000000,-39.970703 +1,30,5930000000,5925000000,-39.862015 +1,30,5935000000,5930000000,-39.767894 +1,30,5940000000,5935000000,-39.693068 +1,30,5945000000,5940000000,-39.592378 +1,30,5950000000,5945000000,-39.509260 +1,30,5955000000,5950000000,-39.449049 +1,30,5960000000,5955000000,-39.349304 +1,30,5965000000,5960000000,-39.254704 +1,30,5970000000,5965000000,-39.180231 +1,30,5975000000,5970000000,-39.095144 +1,30,5980000000,5975000000,-39.024892 +1,30,5985000000,5980000000,-38.962590 +1,30,5990000000,5985000000,-38.925621 +1,30,5995000000,5990000000,-38.880980 +1,30,6000000000,5995000000,-38.850149 +1,30,6005000000,6000000000,-38.807547 From ce634ef649aba89f9fea6b67aea93882eb9f6a77 Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Tue, 21 Nov 2023 15:21:41 -0600 Subject: [PATCH 059/238] libbladeRF: gain_calibration: CSV additional parameters supported The CSV import supports the added parameters and cross test for gain and channel combinations. --- .../libbladeRF/include/device_calibration.h | 3 +- host/libraries/libbladeRF/src/bladerf.c | 2 +- .../libbladeRF/src/device_calibration.c | 30 ++++++++++++++++--- .../test_gain_calibration/src/main.c | 4 +-- 4 files changed, 31 insertions(+), 8 deletions(-) diff --git a/host/libraries/libbladeRF/include/device_calibration.h b/host/libraries/libbladeRF/include/device_calibration.h index 278fb801..a324b807 100644 --- a/host/libraries/libbladeRF/include/device_calibration.h +++ b/host/libraries/libbladeRF/include/device_calibration.h @@ -33,9 +33,10 @@ * * @param csv_path Path to the input CSV file. * @param binary_path Path to the output binary file. + * @param ch bladeRF channel * @return 0 on success, BLADERF_ERR_* code on failure. */ -int gain_cal_csv_to_bin(const char *csv_path, const char *binary_path); +int gain_cal_csv_to_bin(const char *csv_path, const char *binary_path, bladerf_channel ch); /** * @brief Loads gain calibration data from a binary file into a bladeRF device. diff --git a/host/libraries/libbladeRF/src/bladerf.c b/host/libraries/libbladeRF/src/bladerf.c index 6f2d8215..46ce34ed 100644 --- a/host/libraries/libbladeRF/src/bladerf.c +++ b/host/libraries/libbladeRF/src/bladerf.c @@ -2204,7 +2204,7 @@ int bladerf_load_gain_calibration(struct bladerf *dev, bladerf_channel ch, const if (ext) { log_debug("Converting gain calibration to binary format\n"); strcpy(ext, ".tbl"); - status = gain_cal_csv_to_bin(full_path, full_path_bin); + status = gain_cal_csv_to_bin(full_path, full_path_bin, ch); if (status != 0) { log_error("Failed to convert csv to binary: %s -> %s\n", full_path, full_path_bin); diff --git a/host/libraries/libbladeRF/src/device_calibration.c b/host/libraries/libbladeRF/src/device_calibration.c index 3ed07173..82883342 100644 --- a/host/libraries/libbladeRF/src/device_calibration.c +++ b/host/libraries/libbladeRF/src/device_calibration.c @@ -47,10 +47,18 @@ } while (0) -int gain_cal_csv_to_bin(const char *csv_path, const char *binary_path) +int gain_cal_csv_to_bin(const char *csv_path, const char *binary_path, bladerf_channel ch) { uint64_t frequency; float power; + uint64_t cw_freq; + uint8_t chain; + bladerf_gain gain; + int32_t rssi; + float vsg_power; + uint64_t signal_freq, bladeRF_PXI_freq; + + char line[256]; char current_dir[1000]; int status = 0; @@ -76,9 +84,23 @@ int gain_cal_csv_to_bin(const char *csv_path, const char *binary_path) /** Transfer CSV data to binary */ while (fgets(line, sizeof(line), csvFile)) { - sscanf(line, "%lu,%f", &frequency, &power); - fwrite(&frequency, sizeof(uint64_t), 1, binaryFile); - fwrite(&power, sizeof(float), 1, binaryFile); + if (BLADERF_CHANNEL_IS_TX(ch)) { + sscanf(line, "%" SCNu8 ",%" SCNi32 ",%" SCNu64 ",%" SCNu64 ",%f", + &chain, &gain, &cw_freq, &frequency, &power); + + if (chain == 0 && gain == 60) { + fwrite(&frequency, sizeof(uint64_t), 1, binaryFile); + fwrite(&power, sizeof(float), 1, binaryFile); + } + } else { + sscanf(line, "%" SCNu8 ",%" SCNi32 ",%f,%" SCNu64 ",%" SCNu64 ",%" SCNi32 ",%f", + &chain, &gain, &vsg_power, &signal_freq, &bladeRF_PXI_freq, &rssi, &power); + + if (chain == 0 && gain == 0) { + fwrite(&bladeRF_PXI_freq, sizeof(uint64_t), 1, binaryFile); + fwrite(&power, sizeof(float), 1, binaryFile); + } + } } error: diff --git a/host/libraries/libbladeRF_test/test_gain_calibration/src/main.c b/host/libraries/libbladeRF_test/test_gain_calibration/src/main.c index 20c6f292..f2ecec86 100644 --- a/host/libraries/libbladeRF_test/test_gain_calibration/src/main.c +++ b/host/libraries/libbladeRF_test/test_gain_calibration/src/main.c @@ -56,8 +56,8 @@ int main(int argc, char *argv[]) { int status; struct bladerf *dev; char *devstr = NULL; - const char *rx_cal_file = "rx_sweep_0.csv"; - const char *tx_cal_file = "tx_sweep_60_fine.csv"; + const char *rx_cal_file = "rx_sweep.csv"; + const char *tx_cal_file = "tx_sweep.csv"; bladerf_channel ch; const struct bladerf_range *freq_range; From 986c3a3353e13cdc79519447e97c6b8b822e4010 Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Thu, 1 Aug 2024 13:20:11 -0500 Subject: [PATCH 060/238] libbladeRF: gain_calibration: added gain calibration image type --- host/libraries/libbladeRF/include/libbladeRF.h | 1 + host/libraries/libbladeRF/src/board/bladerf1/image.c | 1 + 2 files changed, 2 insertions(+) diff --git a/host/libraries/libbladeRF/include/libbladeRF.h b/host/libraries/libbladeRF/include/libbladeRF.h index ac1a9a98..0d8a30a2 100644 --- a/host/libraries/libbladeRF/include/libbladeRF.h +++ b/host/libraries/libbladeRF/include/libbladeRF.h @@ -3289,6 +3289,7 @@ typedef enum { BLADERF_IMAGE_TYPE_RX_IQ_CAL, /**< RX IQ balance calibration table */ BLADERF_IMAGE_TYPE_TX_IQ_CAL, /**< TX IQ balance calibration table */ BLADERF_IMAGE_TYPE_FPGA_A5, /**< FPGA bitstream for A5 device */ + BLADERF_IMAGE_TYPE_GAIN_CAL, /**< Gain calibration */ } bladerf_image_type; /** Size of the magic signature at the beginning of bladeRF image files */ diff --git a/host/libraries/libbladeRF/src/board/bladerf1/image.c b/host/libraries/libbladeRF/src/board/bladerf1/image.c index b1742145..dacfcc92 100644 --- a/host/libraries/libbladeRF/src/board/bladerf1/image.c +++ b/host/libraries/libbladeRF/src/board/bladerf1/image.c @@ -140,6 +140,7 @@ static bool image_type_is_valid(bladerf_image_type type) { case BLADERF_IMAGE_TYPE_TX_DC_CAL: case BLADERF_IMAGE_TYPE_RX_IQ_CAL: case BLADERF_IMAGE_TYPE_TX_IQ_CAL: + case BLADERF_IMAGE_TYPE_GAIN_CAL: return true; default: From eb3d128a8d9876d82ab31220cae16632335e2626 Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Wed, 22 Nov 2023 13:01:56 -0600 Subject: [PATCH 061/238] libbladeRF: image: bladerf_image_print_metadata added Ex: Magic: bladeRF Version: 0.1.0 Timestamp: 655e530f Serial: Address: 0 Length: 0 --- .../libraries/libbladeRF/include/libbladeRF.h | 21 +++++++++++++++++++ .../libbladeRF/src/board/bladerf1/image.c | 17 +++++++++++++++ 2 files changed, 38 insertions(+) diff --git a/host/libraries/libbladeRF/include/libbladeRF.h b/host/libraries/libbladeRF/include/libbladeRF.h index 0d8a30a2..92805d56 100644 --- a/host/libraries/libbladeRF/include/libbladeRF.h +++ b/host/libraries/libbladeRF/include/libbladeRF.h @@ -3432,6 +3432,27 @@ struct bladerf_image *CALL_CONV bladerf_alloc_cal_image( API_EXPORT void CALL_CONV bladerf_free_image(struct bladerf_image *image); +/** + * @brief Prints the metadata of a bladeRF image structure. + * + * This function displays the metadata of a provided `bladerf_image` structure. + * It includes information such as the magic number, version, timestamp, serial number, + * address, and length of the image. The function will return an error code if the + * provided image pointer is `NULL`. + * + * @pre The image should have been allocated using bladerf_alloc_image(). + * + * @note This function only prints the metadata of the image and does not + * perform any operations on the image data itself. + * + * @param[in] image Pointer to the `bladerf_image` structure whose metadata is to be printed. + * It should not be `NULL`. + * + * @return 0 on success, BLADERF_ERR_MEM if the image pointer is `NULL`. + */ +API_EXPORT +int CALL_CONV bladerf_image_print_metadata(const struct bladerf_image *image); + /** * Write a flash image to a file. * diff --git a/host/libraries/libbladeRF/src/board/bladerf1/image.c b/host/libraries/libbladeRF/src/board/bladerf1/image.c index dacfcc92..c3380573 100644 --- a/host/libraries/libbladeRF/src/board/bladerf1/image.c +++ b/host/libraries/libbladeRF/src/board/bladerf1/image.c @@ -281,6 +281,23 @@ static int unpack_image(struct bladerf_image *img, uint8_t *buf, size_t len) return 0; } +int bladerf_image_print_metadata(const struct bladerf_image *image) { + if (!image) { + return BLADERF_ERR_MEM; + } + + printf("Magic: %s\n", image->magic); + printf("Version: %d.%d.%d\n", + image->version.major, image->version.minor, image->version.patch); + printf("Timestamp: %" PRIx64 "\n", image->timestamp); + printf("Serial: %s\n", image->serial); + printf("Address: %x\n", image->address); + printf("Length: %u\n", image->length); + fflush(stdout); + + return 0; +} + int bladerf_image_write(struct bladerf *dev, struct bladerf_image *img, const char *file) { From aab04e0a2bc7d968a00017c69fd7d6e8aca74cc1 Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Wed, 22 Nov 2023 13:13:41 -0600 Subject: [PATCH 062/238] libbladeRF: image: print type with metadata Ex: Magic: bladeRF Type: Raw Data Version: 0.1.0 Timestamp: 655e530f Serial: Address: 0 Length: 0 --- .../libraries/libbladeRF/include/libbladeRF.h | 14 ++++++++ .../libbladeRF/src/board/bladerf1/image.c | 36 +++++++++++++++++++ 2 files changed, 50 insertions(+) diff --git a/host/libraries/libbladeRF/include/libbladeRF.h b/host/libraries/libbladeRF/include/libbladeRF.h index 92805d56..8c33c075 100644 --- a/host/libraries/libbladeRF/include/libbladeRF.h +++ b/host/libraries/libbladeRF/include/libbladeRF.h @@ -3453,6 +3453,20 @@ void CALL_CONV bladerf_free_image(struct bladerf_image *image); API_EXPORT int CALL_CONV bladerf_image_print_metadata(const struct bladerf_image *image); +/** + * @brief Converts a bladeRF image type to its corresponding string representation. + * + * This function maps a `bladerf_image_type` enumeration value to a human-readable + * string. It is useful for logging, debugging, or displaying the image type + * to an end user. + * + * @param[in] type The `bladerf_image_type` enumeration value to be converted. + * + * @return A pointer to a string representing the image type. Returns "Unknown Type" + * for any unrecognized or out-of-range values. + */ +const char* bladerf_image_type_to_string(bladerf_image_type type); + /** * Write a flash image to a file. * diff --git a/host/libraries/libbladeRF/src/board/bladerf1/image.c b/host/libraries/libbladeRF/src/board/bladerf1/image.c index c3380573..ddea18b9 100644 --- a/host/libraries/libbladeRF/src/board/bladerf1/image.c +++ b/host/libraries/libbladeRF/src/board/bladerf1/image.c @@ -287,6 +287,7 @@ int bladerf_image_print_metadata(const struct bladerf_image *image) { } printf("Magic: %s\n", image->magic); + printf("Type: %s\n", bladerf_image_type_to_string(image->type)); printf("Version: %d.%d.%d\n", image->version.major, image->version.minor, image->version.patch); printf("Timestamp: %" PRIx64 "\n", image->timestamp); @@ -298,6 +299,41 @@ int bladerf_image_print_metadata(const struct bladerf_image *image) { return 0; } +const char* bladerf_image_type_to_string(bladerf_image_type type) { + switch (type) { + case BLADERF_IMAGE_TYPE_INVALID: + return "Invalid"; + case BLADERF_IMAGE_TYPE_RAW: + return "Raw Data"; + case BLADERF_IMAGE_TYPE_FIRMWARE: + return "Firmware"; + case BLADERF_IMAGE_TYPE_FPGA_40KLE: + return "FPGA 40 KLE Bitstream"; + case BLADERF_IMAGE_TYPE_FPGA_115KLE: + return "FPGA 115 KLE Bitstream"; + case BLADERF_IMAGE_TYPE_FPGA_A4: + return "FPGA A4 Bitstream"; + case BLADERF_IMAGE_TYPE_FPGA_A9: + return "FPGA A9 Bitstream"; + case BLADERF_IMAGE_TYPE_CALIBRATION: + return "Board Calibration"; + case BLADERF_IMAGE_TYPE_RX_DC_CAL: + return "RX DC Offset Calibration Table"; + case BLADERF_IMAGE_TYPE_TX_DC_CAL: + return "TX DC Offset Calibration Table"; + case BLADERF_IMAGE_TYPE_RX_IQ_CAL: + return "RX IQ Balance Calibration Table"; + case BLADERF_IMAGE_TYPE_TX_IQ_CAL: + return "TX IQ Balance Calibration Table"; + case BLADERF_IMAGE_TYPE_FPGA_A5: + return "FPGA A5 Bitstream"; + case BLADERF_IMAGE_TYPE_GAIN_CAL: + return "Gain Calibration"; + default: + return "Unknown Type"; + } +} + int bladerf_image_write(struct bladerf *dev, struct bladerf_image *img, const char *file) { From b35052dfd7097095ffb9b8857e31f1cdc7895495 Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Mon, 27 Nov 2023 15:36:29 -0600 Subject: [PATCH 063/238] libbladeRF: gain_calibration: CSV to bladeRF image binary This changes the method of storing the binary data. Rather than a naive CSV save, we package the binary in a bladeRF image format containing metadata along with the power vs. frequency data. --- .../libbladeRF/include/device_calibration.h | 2 +- host/libraries/libbladeRF/src/bladerf.c | 2 +- .../libbladeRF/src/device_calibration.c | 211 +++++++++++++----- 3 files changed, 154 insertions(+), 61 deletions(-) diff --git a/host/libraries/libbladeRF/include/device_calibration.h b/host/libraries/libbladeRF/include/device_calibration.h index a324b807..251abade 100644 --- a/host/libraries/libbladeRF/include/device_calibration.h +++ b/host/libraries/libbladeRF/include/device_calibration.h @@ -36,7 +36,7 @@ * @param ch bladeRF channel * @return 0 on success, BLADERF_ERR_* code on failure. */ -int gain_cal_csv_to_bin(const char *csv_path, const char *binary_path, bladerf_channel ch); +int gain_cal_csv_to_bin(struct bladerf *dev, const char *csv_path, const char *binary_path, bladerf_channel ch); /** * @brief Loads gain calibration data from a binary file into a bladeRF device. diff --git a/host/libraries/libbladeRF/src/bladerf.c b/host/libraries/libbladeRF/src/bladerf.c index 46ce34ed..decc79f7 100644 --- a/host/libraries/libbladeRF/src/bladerf.c +++ b/host/libraries/libbladeRF/src/bladerf.c @@ -2204,7 +2204,7 @@ int bladerf_load_gain_calibration(struct bladerf *dev, bladerf_channel ch, const if (ext) { log_debug("Converting gain calibration to binary format\n"); strcpy(ext, ".tbl"); - status = gain_cal_csv_to_bin(full_path, full_path_bin, ch); + status = gain_cal_csv_to_bin(dev, full_path, full_path_bin, ch); if (status != 0) { log_error("Failed to convert csv to binary: %s -> %s\n", full_path, full_path_bin); diff --git a/host/libraries/libbladeRF/src/device_calibration.c b/host/libraries/libbladeRF/src/device_calibration.c index 82883342..a120cf6d 100644 --- a/host/libraries/libbladeRF/src/device_calibration.c +++ b/host/libraries/libbladeRF/src/device_calibration.c @@ -46,9 +46,36 @@ } \ } while (0) +static size_t count_csv_entries(const char *filename) { + char line[1024]; // Adjust buffer size as needed + int count = 0; -int gain_cal_csv_to_bin(const char *csv_path, const char *binary_path, bladerf_channel ch) + FILE *file = fopen(filename, "r"); + if (file == NULL) { + perror("Error opening file"); + return -1; + } + + while (fgets(line, sizeof(line), file)) { + count++; + } + + fclose(file); + + return count - 1; +} + +int gain_cal_csv_to_bin(struct bladerf *dev, const char *csv_path, const char *binary_path, bladerf_channel ch) { + int status = 0; + struct bladerf_image *image; + size_t data_size; + size_t entry_size; + size_t offset = 0; + + char line[256]; + char current_dir[1000]; + uint64_t frequency; float power; uint64_t cw_freq; @@ -56,12 +83,7 @@ int gain_cal_csv_to_bin(const char *csv_path, const char *binary_path, bladerf_c bladerf_gain gain; int32_t rssi; float vsg_power; - uint64_t signal_freq, bladeRF_PXI_freq; - - - char line[256]; - char current_dir[1000]; - int status = 0; + uint64_t signal_freq; FILE *csvFile = fopen(csv_path, "r"); FILE *binaryFile = fopen(binary_path, "wb"); @@ -75,34 +97,76 @@ int gain_cal_csv_to_bin(const char *csv_path, const char *binary_path, bladerf_c goto error; } - /** Check for empty CSV */ + size_t num_entries = count_csv_entries(csv_path); + if (num_entries == 0) { + status = BLADERF_ERR_INVAL; + log_error("Error reading header from CSV file or file is empty.\n"); + goto error; + } + + entry_size = (BLADERF_CHANNEL_IS_TX(ch)) + ? sizeof(chain) + sizeof(gain) + sizeof(cw_freq) + sizeof(frequency) + sizeof(power) + : sizeof(chain) + sizeof(gain) + sizeof(vsg_power) + sizeof(signal_freq) + sizeof(frequency) + sizeof(rssi) + sizeof(power); + + data_size = num_entries * entry_size; + + image = bladerf_alloc_image(dev, BLADERF_IMAGE_TYPE_GAIN_CAL, 0xffffffff, data_size); + if (image == NULL) { + log_error("Failed to allocate image\n"); + status = BLADERF_ERR_MEM; + goto error; + } + if (!fgets(line, sizeof(line), csvFile)) { status = BLADERF_ERR_INVAL; log_error("Error reading header from CSV file or file is empty.\n"); goto error; } - /** Transfer CSV data to binary */ - while (fgets(line, sizeof(line), csvFile)) { + for (size_t i = 0; i < num_entries; i++) { + if (!fgets(line, sizeof(line), csvFile)) { + break; + } + if (BLADERF_CHANNEL_IS_TX(ch)) { sscanf(line, "%" SCNu8 ",%" SCNi32 ",%" SCNu64 ",%" SCNu64 ",%f", &chain, &gain, &cw_freq, &frequency, &power); - if (chain == 0 && gain == 60) { - fwrite(&frequency, sizeof(uint64_t), 1, binaryFile); - fwrite(&power, sizeof(float), 1, binaryFile); - } + memcpy(&image->data[offset], &chain, sizeof(chain)); + offset += sizeof(chain); + memcpy(&image->data[offset], &gain, sizeof(gain)); + offset += sizeof(gain); + memcpy(&image->data[offset], &cw_freq, sizeof(cw_freq)); + offset += sizeof(cw_freq); + memcpy(&image->data[offset], &frequency, sizeof(frequency)); + offset += sizeof(frequency); + memcpy(&image->data[offset], &power, sizeof(power)); + offset += sizeof(power); } else { sscanf(line, "%" SCNu8 ",%" SCNi32 ",%f,%" SCNu64 ",%" SCNu64 ",%" SCNi32 ",%f", - &chain, &gain, &vsg_power, &signal_freq, &bladeRF_PXI_freq, &rssi, &power); + &chain, &gain, &vsg_power, &signal_freq, &frequency, &rssi, &power); - if (chain == 0 && gain == 0) { - fwrite(&bladeRF_PXI_freq, sizeof(uint64_t), 1, binaryFile); - fwrite(&power, sizeof(float), 1, binaryFile); - } + memcpy(&image->data[offset], &chain, sizeof(chain)); + offset += sizeof(chain); + memcpy(&image->data[offset], &gain, sizeof(gain)); + offset += sizeof(gain); + memcpy(&image->data[offset], &vsg_power, sizeof(vsg_power)); + offset += sizeof(vsg_power); + memcpy(&image->data[offset], &signal_freq, sizeof(signal_freq)); + offset += sizeof(signal_freq); + memcpy(&image->data[offset], &frequency, sizeof(frequency)); + offset += sizeof(frequency); + memcpy(&image->data[offset], &rssi, sizeof(rssi)); + offset += sizeof(rssi); + memcpy(&image->data[offset], &power, sizeof(power)); + offset += sizeof(power); } } + log_debug("Writing image to file: %s\n", binary_path); + bladerf_image_write(dev, image, binary_path); + bladerf_free_image(image); + error: if (csvFile) fclose(csvFile); @@ -132,28 +196,27 @@ static int gain_cal_tbl_init(struct bladerf_gain_cal_tbl *tbl, uint32_t num_entr return 0; } -static int normalize_gain_correction(struct bladerf_gain_cal_tbl *tbl, bladerf_gain ref_pwr) { - if (tbl->state != BLADERF_GAIN_CAL_LOADED) { - log_error("The gain calibration table is not loaded for channel %d\n", tbl->ch); - return BLADERF_ERR_MEM; - } - - for (size_t i = 0; i < tbl->n_entries; i++) { - tbl->entries[i].gain_corr -= (double)ref_pwr; - } - - return 0; -} - int load_gain_calibration(struct bladerf *dev, bladerf_channel ch, const char *binary_path) { int num_channels = 4; struct bladerf_gain_cal_tbl gain_tbls[num_channels]; bladerf_gain current_gain; uint64_t frequency; float power; - int entry_counter; + size_t entry_counter; + size_t offset; int status = 0; + uint64_t cw_freq; + uint8_t chain; + bladerf_gain gain; + int32_t rssi; + float vsg_power; + bladerf_frequency signal_freq; + + struct bladerf_image *image = NULL; + size_t entry_size; + size_t num_entries; + FILE *binaryFile = fopen(binary_path, "rb"); if (!binaryFile) { log_error("Error opening binary file.\n"); @@ -174,11 +237,61 @@ int load_gain_calibration(struct bladerf *dev, bladerf_channel ch, const char *b goto error; } + entry_size = (BLADERF_CHANNEL_IS_TX(ch)) + ? sizeof(chain) + sizeof(gain) + sizeof(cw_freq) + sizeof(frequency) + sizeof(power) + : sizeof(chain) + sizeof(gain) + sizeof(vsg_power) + sizeof(signal_freq) + sizeof(frequency) + sizeof(rssi) + sizeof(power); + + image = bladerf_alloc_image(dev, BLADERF_IMAGE_TYPE_GAIN_CAL, 0, 0); + status = bladerf_image_read(image, binary_path); + if (status != 0) { + log_error("Failed to read image: %s\n", bladerf_strerror(status)); + goto error; + } + + num_entries = image->length / entry_size; + + offset = 0; entry_counter = 0; - while (fread(&frequency, sizeof(uint64_t), 1, binaryFile) && fread(&power, sizeof(float), 1, binaryFile)) { - gain_tbls[ch].entries[entry_counter].freq = frequency; - gain_tbls[ch].entries[entry_counter].gain_corr = power; - entry_counter++; + for (uint64_t i = 0; i < num_entries; i++) { + if (BLADERF_CHANNEL_IS_TX(ch)) { + memcpy(&chain, &image->data[offset], sizeof(chain)); + offset += sizeof(chain); + memcpy(&gain, &image->data[offset], sizeof(gain)); + offset += sizeof(gain); + memcpy(&cw_freq, &image->data[offset], sizeof(cw_freq)); + offset += sizeof(cw_freq); + memcpy(&frequency, &image->data[offset], sizeof(frequency)); + offset += sizeof(frequency); + memcpy(&power, &image->data[offset], sizeof(power)); + offset += sizeof(power); + } else { + memcpy(&chain, &image->data[offset], sizeof(chain)); + offset += sizeof(chain); + memcpy(&gain, &image->data[offset], sizeof(gain)); + offset += sizeof(gain); + memcpy(&vsg_power, &image->data[offset], sizeof(vsg_power)); + offset += sizeof(vsg_power); + memcpy(&signal_freq, &image->data[offset], sizeof(signal_freq)); + offset += sizeof(signal_freq); + memcpy(&frequency, &image->data[offset], sizeof(frequency)); + offset += sizeof(frequency); + memcpy(&rssi, &image->data[offset], sizeof(rssi)); + offset += sizeof(rssi); + memcpy(&power, &image->data[offset], sizeof(power)); + offset += sizeof(power); + } + + if (BLADERF_CHANNEL_IS_TX(ch) && chain == 0 && gain == 60) { + gain_tbls[ch].entries[entry_counter].freq = frequency; + gain_tbls[ch].entries[entry_counter].gain_corr = power; + entry_counter++; + } + + if (!BLADERF_CHANNEL_IS_TX(ch) && chain == 0 && gain == 0) { + gain_tbls[ch].entries[entry_counter].freq = frequency; + gain_tbls[ch].entries[entry_counter].gain_corr = power - vsg_power; + entry_counter++; + } } gain_tbls[ch].start_freq = gain_tbls[ch].entries[0].freq; @@ -189,34 +302,14 @@ int load_gain_calibration(struct bladerf *dev, bladerf_channel ch, const char *b gain_tbls[ch].enabled = true; gain_tbls[ch].gain_target = current_gain; - switch (ch) { - /** bladeRF calibration target is -30dBFS for RX */ - case BLADERF_CHANNEL_RX(0): - case BLADERF_CHANNEL_RX(1): - status = normalize_gain_correction(&gain_tbls[ch], -30); - break; - - /** bladeRF calibration target is 0dBm for TX */ - case BLADERF_CHANNEL_TX(0): - case BLADERF_CHANNEL_TX(1): - status = normalize_gain_correction(&gain_tbls[ch], 0); - break; - - default: - log_error("Channel unknown: ch = %i?\n", ch); - status = BLADERF_ERR_UNEXPECTED; - goto error; - } - if (status != 0) { - goto error; - } - free(dev->gain_tbls[ch].entries); dev->gain_tbls[ch] = gain_tbls[ch]; error: if (binaryFile) fclose(binaryFile); + if (image) + bladerf_free_image(image); return status; } From dbf50d88d08d7527ce8750c64bac7cc7a31dec59 Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Fri, 1 Dec 2023 15:31:19 -0600 Subject: [PATCH 064/238] libbladeRF: gain_calibration: added RX test sweep --- .../test_gain_calibration/src/main.c | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/host/libraries/libbladeRF_test/test_gain_calibration/src/main.c b/host/libraries/libbladeRF_test/test_gain_calibration/src/main.c index f2ecec86..346fecc2 100644 --- a/host/libraries/libbladeRF_test/test_gain_calibration/src/main.c +++ b/host/libraries/libbladeRF_test/test_gain_calibration/src/main.c @@ -44,6 +44,10 @@ static int init_sync(struct bladerf *dev) const unsigned int num_transfers = 64; const unsigned int timeout_ms = 3500; + CHECK(bladerf_sync_config(dev, BLADERF_RX_X1, BLADERF_FORMAT_SC16_Q11, + num_buffers, buffer_size, num_transfers, + timeout_ms)); + CHECK(bladerf_sync_config(dev, BLADERF_TX_X1, BLADERF_FORMAT_SC16_Q11, num_buffers, buffer_size, num_transfers, timeout_ms)); @@ -108,6 +112,29 @@ int main(int argc, char *argv[]) { } printf("\n"); + ch = BLADERF_CHANNEL_RX(0); + bladerf_get_frequency_range(dev, ch, &freq_range); + CHECK(bladerf_set_gain(dev, ch, TARGET_GAIN)); + CHECK(bladerf_enable_module(dev, ch, true)); + for (size_t entry_idx = 0; entry_idx < cal[ch]->n_entries; entry_idx++) { + CHECK(bladerf_set_frequency(dev, ch, cal[ch]->entries[entry_idx].freq)); + CHECK(bladerf_get_gain(dev, ch, &gain)); + gain_expected = (int)round(TARGET_GAIN - cal[ch]->entries[entry_idx].gain_corr); + + if (gain != gain_expected) { + fprintf(stderr, "[Error] Gain compensation failed RX frequency sweep\n"); + fprintf(stderr, " Frequency: %" PRIu64 "\n", cal[ch]->entries[entry_idx].freq); + fprintf(stderr, " Target gain: %i\n", TARGET_GAIN); + fprintf(stderr, " Gain correction: %f\n", cal[ch]->entries[entry_idx].gain_corr); + fprintf(stderr, " Expected gain: %i\n", gain_expected); + goto out; + } + + printf("\033[2K\rRX Frequency: %0.0f MHz, Gain: %i", cal[ch]->entries[entry_idx].freq/1e6, gain); + fflush(stdout); + } + printf("\n"); + /** * Monitor calibrated gain over gain assignments */ From 361646af4133b650430808326ad5fd8dcca72cf4 Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Mon, 4 Dec 2023 15:33:17 -0600 Subject: [PATCH 065/238] libbladeRF: test: added gain calibration test to regression test --- host/libraries/libbladeRF_test/test_regression/src/main.cxx | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/host/libraries/libbladeRF_test/test_regression/src/main.cxx b/host/libraries/libbladeRF_test/test_regression/src/main.cxx index a1ef0fe0..6b3bad0c 100644 --- a/host/libraries/libbladeRF_test/test_regression/src/main.cxx +++ b/host/libraries/libbladeRF_test/test_regression/src/main.cxx @@ -270,6 +270,10 @@ TEST(TEST_LIBBLADERF, scheduled_retune) { } } +TEST(TEST_LIBBLADERF, gain_calibration) { + status = std::system("./output/libbladeRF_test_gain_calibration"); + ASSERT_EQ(0, status); +} // =============================== // HDL From d2579486cef033c1ccfaf6b069e9cde22c56caed Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Thu, 21 Dec 2023 15:32:43 -0600 Subject: [PATCH 066/238] libbladeRF: gain_calibration: added table version check Gain calibration tables will be denoted with the GAIN_CAL_VERSION macro defined at the top of device_calibration.c. --- .../libbladeRF/src/device_calibration.c | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/host/libraries/libbladeRF/src/device_calibration.c b/host/libraries/libbladeRF/src/device_calibration.c index a120cf6d..a430d9fd 100644 --- a/host/libraries/libbladeRF/src/device_calibration.c +++ b/host/libraries/libbladeRF/src/device_calibration.c @@ -25,10 +25,18 @@ #include #include "libbladeRF.h" #include "board/board.h" +#include "helpers/version.h" #include "device_calibration.h" #include "log.h" #include "common.h" +#define GAIN_CAL_VERSION (struct bladerf_version) { \ + .describe = "gain calibration table", \ + .major = 1, \ + .minor = 0, \ + .patch = 0, \ +} + #define __round_int(x) (x >= 0 ? (int)(x + 0.5) : (int)(x - 0.5)) #define RETURN_ERROR_STATUS(_what, _status) \ @@ -123,6 +131,8 @@ int gain_cal_csv_to_bin(struct bladerf *dev, const char *csv_path, const char *b goto error; } + image->version = GAIN_CAL_VERSION; + for (size_t i = 0; i < num_entries; i++) { if (!fgets(line, sizeof(line), csvFile)) { break; @@ -248,6 +258,15 @@ int load_gain_calibration(struct bladerf *dev, bladerf_channel ch, const char *b goto error; } + if (version_equal(&image->version, &GAIN_CAL_VERSION) == false) { + log_error("Expected gain calibration table: v%i.%i.%i\n", + GAIN_CAL_VERSION.major, GAIN_CAL_VERSION.minor, GAIN_CAL_VERSION.patch); + log_error("Imported gain calibration table: v%i.%i.%i\n", + image->version.major, image->version.minor, image->version.patch); + status = BLADERF_ERR_INVAL; + goto error; + } + num_entries = image->length / entry_size; offset = 0; @@ -294,6 +313,7 @@ int load_gain_calibration(struct bladerf *dev, bladerf_channel ch, const char *b } } + gain_tbls[ch].version = image->version; gain_tbls[ch].start_freq = gain_tbls[ch].entries[0].freq; gain_tbls[ch].stop_freq = gain_tbls[ch].entries[entry_counter-1].freq; gain_tbls[ch].n_entries = entry_counter; From a83272d452c81751598caf82eb9864811490dc03 Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Wed, 3 Jan 2024 12:50:36 -0600 Subject: [PATCH 067/238] libbladeRF: gain_calibration: added gain cal auto loading support If the the file location is not specified, using a NULL file location, then try loading the expected default file name from one of the find_file locations. The test renames the files to the default serial based file names and stores them alongside the binary (one of the find_file locations). --- host/libraries/libbladeRF/src/bladerf.c | 22 +++++++++- .../include/file_operations.h | 21 +++++++++ .../src/file_operations.c | 43 +++++++++++++++++++ .../test_gain_calibration/src/main.c | 2 + 4 files changed, 87 insertions(+), 1 deletion(-) diff --git a/host/libraries/libbladeRF/src/bladerf.c b/host/libraries/libbladeRF/src/bladerf.c index decc79f7..cff85734 100644 --- a/host/libraries/libbladeRF/src/bladerf.c +++ b/host/libraries/libbladeRF/src/bladerf.c @@ -2181,6 +2181,10 @@ int bladerf_load_gain_calibration(struct bladerf *dev, bladerf_channel ch, const char *full_path_bin = NULL; char *ext; + size_t filename_len = PATH_MAX; + char *filename = (char *)calloc(1, filename_len + 1); + CHECK_NULL(filename); + log_debug("Loading gain calibration\n"); MUTEX_LOCK(&dev->lock); @@ -2191,8 +2195,22 @@ int bladerf_load_gain_calibration(struct bladerf *dev, bladerf_channel ch, const goto error; } - full_path = file_find(cal_file_loc); + if (cal_file_loc != NULL) { + strcpy(filename, cal_file_loc); + } else { + log_debug("No calibration file specified, using serial number\n"); + strcpy(filename, dev->ident.serial); + filename_len -= strlen(filename); + + if (BLADERF_CHANNEL_IS_TX(ch)) + strncat(filename, "_tx_gain_cal.tbl", filename_len); + else + strncat(filename, "_rx_gain_cal.tbl", filename_len); + } + + full_path = file_find(filename); if (full_path == NULL) { + log_error("Failed to find gain calibration file: %s\n", filename); status = BLADERF_ERR_NO_FILE; goto error; } @@ -2225,6 +2243,8 @@ error: free(full_path); if (full_path_bin) free(full_path_bin); + if (filename) + free(filename); MUTEX_UNLOCK(&dev->lock); return status; diff --git a/host/libraries/libbladeRF_test/test_gain_calibration/include/file_operations.h b/host/libraries/libbladeRF_test/test_gain_calibration/include/file_operations.h index c342253f..75f1c133 100644 --- a/host/libraries/libbladeRF_test/test_gain_calibration/include/file_operations.h +++ b/host/libraries/libbladeRF_test/test_gain_calibration/include/file_operations.h @@ -21,6 +21,8 @@ #ifndef FILE_OPERATIONS_H_ #define FILE_OPERATIONS_H_ +#include "libbladeRF.h" + /** * @brief Read frequency-power data from a binary file and print it. * @@ -32,4 +34,23 @@ */ int read_and_print_binary(const char *binary_path); +/** + * @brief Renames a calibration file based on the serial number of a BladeRF device and loads gain calibration. + * + * This function first retrieves the serial number of the specified BladeRF device. It then constructs a new filename + * for the calibration file by appending the serial number to the original filename. After renaming the file, it + * proceeds to load the gain calibration for the specified channel. If any step fails, the function returns an error. + * + * @param dev Pointer to a bladerf structure representing an open BladeRF device. + * @param ch Specifies the BladeRF channel for which the gain calibration is to be loaded. + * + * @return Returns 0 on successful execution and renaming of the file and loading of gain calibration. + * If an error occurs at any step (memory allocation failure, failure to get the serial number, + * failure in renaming the file, or failure in loading the gain calibration), the function returns -1. + * + * @note The function assumes the presence of "./output/" directory and "rx_sweep.bin" file in it. + * The memory allocated for the serial number is freed before the function returns. + */ +int test_serial_based_autoload(struct bladerf *dev, bladerf_channel ch); + #endif diff --git a/host/libraries/libbladeRF_test/test_gain_calibration/src/file_operations.c b/host/libraries/libbladeRF_test/test_gain_calibration/src/file_operations.c index 2b449b10..53d5cf9a 100644 --- a/host/libraries/libbladeRF_test/test_gain_calibration/src/file_operations.c +++ b/host/libraries/libbladeRF_test/test_gain_calibration/src/file_operations.c @@ -47,3 +47,46 @@ int read_and_print_binary(const char *binary_path) { fclose(binaryFile); return 0; } + +int test_serial_based_autoload(struct bladerf *dev, bladerf_channel ch) { + int status = 0; + char new_filename[255]; + char old_filename[255]; + const char *output_dir = "./output/"; + char *cal_bin = (char *)malloc(255); + char *serial = (char *)malloc(255); + if (serial == NULL || cal_bin == NULL) { + status = BLADERF_ERR_MEM; + goto out; + } + + status = bladerf_get_serial(dev, serial); + if (status != 0) { + goto out; + } + + if (BLADERF_CHANNEL_IS_TX(ch)) { + strncpy(cal_bin, "tx_sweep.tbl", 255); + snprintf(new_filename, sizeof(new_filename), "%s%s_tx_gain_cal.tbl", output_dir, serial); + } else { + strncpy(cal_bin, "rx_sweep.tbl", 255); + snprintf(new_filename, sizeof(new_filename), "%s%s_rx_gain_cal.tbl", output_dir, serial); + } + + snprintf(old_filename, sizeof(old_filename), "%s%s", output_dir, cal_bin); + + if (rename(old_filename, new_filename) != 0) { + status = BLADERF_ERR_IO; + goto out; + } + + status = bladerf_load_gain_calibration(dev, ch, NULL); + if (status != 0) { + goto out; + } + +out: + free(serial); + free(cal_bin); + return status; +} diff --git a/host/libraries/libbladeRF_test/test_gain_calibration/src/main.c b/host/libraries/libbladeRF_test/test_gain_calibration/src/main.c index 346fecc2..0a51bcbd 100644 --- a/host/libraries/libbladeRF_test/test_gain_calibration/src/main.c +++ b/host/libraries/libbladeRF_test/test_gain_calibration/src/main.c @@ -77,10 +77,12 @@ int main(int argc, char *argv[]) { ch = BLADERF_CHANNEL_RX(0); CHECK(bladerf_load_gain_calibration(dev, ch, rx_cal_file)); CHECK(bladerf_get_gain_calibration(dev, ch, &cal[ch])); + CHECK(test_serial_based_autoload(dev, ch)); ch = BLADERF_CHANNEL_TX(0); CHECK(bladerf_load_gain_calibration(dev, ch, tx_cal_file)); CHECK(bladerf_get_gain_calibration(dev, ch, &cal[ch])); + CHECK(test_serial_based_autoload(dev, ch)); for (int i = 0; i < 4; i++) { CHECK(bladerf_print_gain_calibration(dev, i, false)); From 8031b84e5942c5d91bc5d35df36608e472bfb52f Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Wed, 3 Jan 2024 18:40:14 -0600 Subject: [PATCH 068/238] libbladeRF: gain_calibration: store gain cal file within table --- host/libraries/libbladeRF/include/libbladeRF.h | 2 ++ host/libraries/libbladeRF/src/bladerf.c | 1 + host/libraries/libbladeRF/src/device_calibration.c | 14 ++++++++++++++ 3 files changed, 17 insertions(+) diff --git a/host/libraries/libbladeRF/include/libbladeRF.h b/host/libraries/libbladeRF/include/libbladeRF.h index 8c33c075..a4e8049d 100644 --- a/host/libraries/libbladeRF/include/libbladeRF.h +++ b/host/libraries/libbladeRF/include/libbladeRF.h @@ -4201,6 +4201,8 @@ struct bladerf_gain_cal_tbl { bladerf_frequency stop_freq; /**< Stop frequency (Hz) */ struct bladerf_gain_cal_entry *entries; /**< Sorted calibration entries */ bladerf_gain gain_target; /**< Compensated gain */ + size_t file_path_len; /**< Length of the file path string. */ + char *file_path; /**< Path to the file from which the table was loaded. */ enum gain_cal_state { BLADERF_GAIN_CAL_UNINITIALIZED, BLADERF_GAIN_CAL_LOADED, diff --git a/host/libraries/libbladeRF/src/bladerf.c b/host/libraries/libbladeRF/src/bladerf.c index cff85734..54834b3b 100644 --- a/host/libraries/libbladeRF/src/bladerf.c +++ b/host/libraries/libbladeRF/src/bladerf.c @@ -2290,6 +2290,7 @@ int bladerf_print_gain_calibration(struct bladerf *dev, bladerf_channel ch, bool printf(" Number of Entries: %u\n", gain_tbls[ch].n_entries); printf(" Start Frequency: %" PRIu64 " Hz\n", gain_tbls[ch].start_freq); printf(" Stop Frequency: %" PRIu64 " Hz\n", gain_tbls[ch].stop_freq); + printf(" File Path: %s\n", gain_tbls[ch].file_path); if (with_entries) { for (size_t i = 0; i < gain_tbls[ch].n_entries; i++) { diff --git a/host/libraries/libbladeRF/src/device_calibration.c b/host/libraries/libbladeRF/src/device_calibration.c index a430d9fd..f23cd774 100644 --- a/host/libraries/libbladeRF/src/device_calibration.c +++ b/host/libraries/libbladeRF/src/device_calibration.c @@ -23,6 +23,7 @@ #include #include #include +#include #include "libbladeRF.h" #include "board/board.h" #include "helpers/version.h" @@ -195,6 +196,7 @@ static int gain_cal_tbl_init(struct bladerf_gain_cal_tbl *tbl, uint32_t num_entr tbl->n_entries = num_entries; tbl->start_freq = 0; tbl->stop_freq = 0; + tbl->file_path_len = PATH_MAX; tbl->entries = malloc(num_entries * sizeof(struct bladerf_gain_cal_entry)); if (tbl->entries == NULL) { @@ -202,6 +204,12 @@ static int gain_cal_tbl_init(struct bladerf_gain_cal_tbl *tbl, uint32_t num_entr return BLADERF_ERR_MEM; } + tbl->file_path = malloc(tbl->file_path_len + 1); + if (tbl->file_path == NULL) { + log_error("failed to allocate memory for calibration table file path\n"); + return BLADERF_ERR_MEM; + } + tbl->state = BLADERF_GAIN_CAL_LOADED; return 0; } @@ -321,11 +329,17 @@ int load_gain_calibration(struct bladerf *dev, bladerf_channel ch, const char *b gain_tbls[ch].state = BLADERF_GAIN_CAL_LOADED; gain_tbls[ch].enabled = true; gain_tbls[ch].gain_target = current_gain; + strncpy(gain_tbls[ch].file_path, binary_path, gain_tbls[ch].file_path_len); free(dev->gain_tbls[ch].entries); + free(dev->gain_tbls[ch].file_path); dev->gain_tbls[ch] = gain_tbls[ch]; error: + if (status != 0) { + log_error("binary_path: %s\n", binary_path); + } + if (binaryFile) fclose(binaryFile); if (image) From eb78b981bd7acb7d0bde63c733e642c422b9c97c Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Thu, 4 Jan 2024 12:01:12 -0600 Subject: [PATCH 069/238] libbladeRF: gain_calibration: added free gain table function --- .../libbladeRF/include/device_calibration.h | 15 +++++++++++ host/libraries/libbladeRF/src/bladerf.c | 5 +--- .../libbladeRF/src/device_calibration.c | 27 +++++++++++++++++-- 3 files changed, 41 insertions(+), 6 deletions(-) diff --git a/host/libraries/libbladeRF/include/device_calibration.h b/host/libraries/libbladeRF/include/device_calibration.h index 251abade..61cdd8a6 100644 --- a/host/libraries/libbladeRF/include/device_calibration.h +++ b/host/libraries/libbladeRF/include/device_calibration.h @@ -110,4 +110,19 @@ int get_gain_cal_entry(const struct bladerf_gain_cal_tbl *tbl, */ int apply_gain_correction(struct bladerf *dev, bladerf_channel ch, bladerf_frequency frequency); +/** + * @brief Frees the resources of a gain calibration table and resets its fields. + * + * This function frees the dynamically allocated memory for the 'entries' and 'file_path' + * fields of the bladerf_gain_cal_tbl structure. After freeing these resources, it resets all fields + * of the structure to their default values, ensuring the structure is clean and can be + * reused or safely deallocated. The function logs a verbose message upon starting the + * freeing process. + * + * @param tbl Pointer to the bladerf_gain_cal_tbl structure. If this pointer is NULL, + * the function returns immediately without performing any operations. + * It is assumed that the caller ensures the validity of this pointer. + */ +void gain_cal_tbl_free(struct bladerf_gain_cal_tbl *tbl); + #endif diff --git a/host/libraries/libbladeRF/src/bladerf.c b/host/libraries/libbladeRF/src/bladerf.c index 54834b3b..7d665098 100644 --- a/host/libraries/libbladeRF/src/bladerf.c +++ b/host/libraries/libbladeRF/src/bladerf.c @@ -212,10 +212,7 @@ void bladerf_close(struct bladerf *dev) /** Free gain table entries */ for (int i = 0; i < NUM_GAIN_CAL_TBLS; i++) { - if (dev->gain_tbls[i].state != BLADERF_GAIN_CAL_UNINITIALIZED) { - log_debug("Freeing gain table entries for ch[%s]\n", channel2str(i)); - free(dev->gain_tbls[i].entries); - } + gain_cal_tbl_free(&dev->gain_tbls[i]); } MUTEX_UNLOCK(&dev->lock); diff --git a/host/libraries/libbladeRF/src/device_calibration.c b/host/libraries/libbladeRF/src/device_calibration.c index f23cd774..d6c0ea4e 100644 --- a/host/libraries/libbladeRF/src/device_calibration.c +++ b/host/libraries/libbladeRF/src/device_calibration.c @@ -214,6 +214,30 @@ static int gain_cal_tbl_init(struct bladerf_gain_cal_tbl *tbl, uint32_t num_entr return 0; } +void gain_cal_tbl_free(struct bladerf_gain_cal_tbl *tbl) { + log_verbose("Freeing gain calibration table\n"); + + if (tbl->entries != NULL) { + free(tbl->entries); + tbl->entries = NULL; + } + + if (tbl->file_path != NULL) { + free(tbl->file_path); + tbl->file_path = NULL; + } + + tbl->version = (struct bladerf_version){0, 0, 0, NULL}; + tbl->enabled = false; + tbl->ch = 0; + tbl->n_entries = 0; + tbl->start_freq = 0; + tbl->stop_freq = 0; + tbl->gain_target = 0; + tbl->file_path_len = 0; + tbl->state = BLADERF_GAIN_CAL_UNLOADED; +} + int load_gain_calibration(struct bladerf *dev, bladerf_channel ch, const char *binary_path) { int num_channels = 4; struct bladerf_gain_cal_tbl gain_tbls[num_channels]; @@ -331,8 +355,7 @@ int load_gain_calibration(struct bladerf *dev, bladerf_channel ch, const char *b gain_tbls[ch].gain_target = current_gain; strncpy(gain_tbls[ch].file_path, binary_path, gain_tbls[ch].file_path_len); - free(dev->gain_tbls[ch].entries); - free(dev->gain_tbls[ch].file_path); + gain_cal_tbl_free(&dev->gain_tbls[ch]); dev->gain_tbls[ch] = gain_tbls[ch]; error: From b5cfb5b0365493ae435cf5d26dc1101a520c8858 Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Tue, 9 Jan 2024 16:56:01 -0600 Subject: [PATCH 070/238] libbladeRF: gain_calibration: added null check and gain cal loaded check --- host/libraries/libbladeRF/src/bladerf.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/host/libraries/libbladeRF/src/bladerf.c b/host/libraries/libbladeRF/src/bladerf.c index 7d665098..5c6de886 100644 --- a/host/libraries/libbladeRF/src/bladerf.c +++ b/host/libraries/libbladeRF/src/bladerf.c @@ -2249,8 +2249,14 @@ error: int bladerf_enable_gain_calibration(struct bladerf *dev, bladerf_channel ch, bool en) { + CHECK_NULL(dev); int status = 0; + if (dev->gain_tbls[ch].state == BLADERF_GAIN_CAL_UNINITIALIZED) { + log_warning("%s: Gain calibration not loaded\n", __FUNCTION__); + return 0; + } + dev->gain_tbls[ch].enabled = en; status = bladerf_set_gain(dev, ch, dev->gain_tbls[ch].gain_target); if (status != 0) { From 3cef03a0ce2cd48fe0a8e57f8dc68b31322393a0 Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Wed, 7 Aug 2024 15:31:52 -0500 Subject: [PATCH 071/238] libbladeRF: gain_calibration: reassign gain after loading calibration This ensures the calibration is enabled once the calibration is loaded. Since gain calibration relies on top level call to set the gain, bladerf_set_gain(), we have to unlock the mutex and call said function. --- host/libraries/libbladeRF/src/bladerf.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/host/libraries/libbladeRF/src/bladerf.c b/host/libraries/libbladeRF/src/bladerf.c index 5c6de886..e42f9e76 100644 --- a/host/libraries/libbladeRF/src/bladerf.c +++ b/host/libraries/libbladeRF/src/bladerf.c @@ -2235,6 +2235,15 @@ int bladerf_load_gain_calibration(struct bladerf *dev, bladerf_channel ch, const goto error; } + MUTEX_UNLOCK(&dev->lock); + + /* Reset gain to ensure calibration adjustment is applied after loading */ + status = bladerf_set_gain(dev, ch, dev->gain_tbls[ch].gain_target); + if (status != 0) { + log_error("%s: Failed to reset gain.\n", __FUNCTION__); + goto error; + } + error: if (full_path) free(full_path); From 3c25f57893ca82f41f71297a598fdb82041e3124 Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Fri, 2 Feb 2024 17:34:47 -0600 Subject: [PATCH 072/238] libbladeRF: gain_calibration: added bladerf_get_gain_target The gain target is either set or calculated based on the gain mode. If using manual gain control, the gain target from the gain table is returned. If the AGC is enabled, the gain target is calculated based on the current gain. --- .../libraries/libbladeRF/include/libbladeRF.h | 25 +++++++++++- host/libraries/libbladeRF/src/bladerf.c | 40 +++++++++++++++++++ 2 files changed, 64 insertions(+), 1 deletion(-) diff --git a/host/libraries/libbladeRF/include/libbladeRF.h b/host/libraries/libbladeRF/include/libbladeRF.h index a4e8049d..332941c5 100644 --- a/host/libraries/libbladeRF/include/libbladeRF.h +++ b/host/libraries/libbladeRF/include/libbladeRF.h @@ -4298,7 +4298,30 @@ int CALL_CONV bladerf_enable_gain_calibration(struct bladerf *dev, * BLADERF_ERR_INVAL for invalid inputs. */ API_EXPORT -int bladerf_get_gain_calibration(struct bladerf *dev, bladerf_channel ch, const struct bladerf_gain_cal_tbl **tbl); +int CALL_CONV bladerf_get_gain_calibration(struct bladerf *dev, bladerf_channel ch, const struct bladerf_gain_cal_tbl **tbl); + +/** + * @brief Computes the gain target for a specified channel, incorporating + * calibration corrections. + * + * For a channel, this calculates the target gain considering the current gain + * setting and calibration corrections, if available. In MGC mode, it returns + * the target gain from the calibration table. In AGC mode, it adjusts the + * target based on the calibration correction for the current frequency. + * + * @note Access to device and calibration data is thread-safe. + * + * @param[in] dev Non-NULL pointer to a BladeRF device. + * @param[in] ch Channel (RX/TX) for querying the gain target. + * @param[out] gain_target Where to store the computed gain target. Reflects + * current gain and calibration corrections. + * + * @return 0 if successful, with `gain_target` updated. On failure, returns + * BLADERF_ERR_UNEXPECTED if calibration is uninitialized, or other error codes + * for different failures. + */ +API_EXPORT +int CALL_CONV bladerf_get_gain_target(struct bladerf *dev, bladerf_channel ch, int *gain_target); /** @} (End of FN_CAL) */ diff --git a/host/libraries/libbladeRF/src/bladerf.c b/host/libraries/libbladeRF/src/bladerf.c index e42f9e76..f8f92681 100644 --- a/host/libraries/libbladeRF/src/bladerf.c +++ b/host/libraries/libbladeRF/src/bladerf.c @@ -2330,3 +2330,43 @@ int bladerf_get_gain_calibration(struct bladerf *dev, bladerf_channel ch, const MUTEX_UNLOCK(&dev->lock); return 0; } + +int bladerf_get_gain_target(struct bladerf *dev, bladerf_channel ch, int *gain_target) +{ + int status = 0; + CHECK_NULL(dev); + MUTEX_LOCK(&dev->lock); + bladerf_frequency current_frequency; + struct bladerf_gain_cal_tbl *cal_table = &dev->gain_tbls[ch]; + struct bladerf_gain_cal_entry current_entry; + bladerf_gain current_gain; + bladerf_gain_mode gain_mode; + + + if (dev->gain_tbls[ch].state == BLADERF_GAIN_CAL_UNINITIALIZED) { + log_error("Gain calibration not loaded\n"); + status = BLADERF_ERR_UNEXPECTED; + goto error; + } + + if (BLADERF_CHANNEL_IS_TX(ch) == true) { + *gain_target = cal_table->gain_target; + goto error; + } + + dev->board->get_gain_mode(dev, ch, &gain_mode); + + if (gain_mode == BLADERF_GAIN_MGC) { + *gain_target = cal_table->gain_target; + goto error; + } + + CHECK_STATUS(dev->board->get_gain(dev, ch, ¤t_gain)); + CHECK_STATUS(dev->board->get_frequency(dev, ch, ¤t_frequency)); + CHECK_STATUS(get_gain_cal_entry(cal_table, current_frequency, ¤t_entry)); + *gain_target = current_gain + current_entry.gain_corr; + +error: + MUTEX_UNLOCK(&dev->lock); + return status; +} From 2ab7adc676e959b619098ed9515c26e8a466fd4b Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Wed, 17 Jan 2024 09:52:18 -0600 Subject: [PATCH 073/238] libbladeRF: gain_calibration: added header check for CSV conversions This blocks RX gain calibrations from being applied to TX and vice versa. --- host/libraries/libbladeRF/src/device_calibration.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/host/libraries/libbladeRF/src/device_calibration.c b/host/libraries/libbladeRF/src/device_calibration.c index d6c0ea4e..f9799997 100644 --- a/host/libraries/libbladeRF/src/device_calibration.c +++ b/host/libraries/libbladeRF/src/device_calibration.c @@ -31,6 +31,9 @@ #include "log.h" #include "common.h" +#define GAIN_CAL_HEADER_RX "RX Chain,RX Gain,VSG Power into bladeRF RX (dBm),Frequency of signal (Hz),Frequency of bladeRF+PXI (Hz),AD9361 RSSI register value,Power of Signal from Full Scale (dBFS)\0" +#define GAIN_CAL_HEADER_TX "TX Chain,TX Gain,Frequency of Signal (Hz),Frequency of bladeRF+PXI (Hz),VSA Measured Power (dBm)\0" + #define GAIN_CAL_VERSION (struct bladerf_version) { \ .describe = "gain calibration table", \ .major = 1, \ @@ -84,6 +87,7 @@ int gain_cal_csv_to_bin(struct bladerf *dev, const char *csv_path, const char *b char line[256]; char current_dir[1000]; + char expected_header[1024]; uint64_t frequency; float power; @@ -132,6 +136,13 @@ int gain_cal_csv_to_bin(struct bladerf *dev, const char *csv_path, const char *b goto error; } + strncpy(expected_header, (BLADERF_CHANNEL_IS_TX(ch)) ? GAIN_CAL_HEADER_TX : GAIN_CAL_HEADER_RX, sizeof(expected_header)); + if (strncmp(line, expected_header, strlen(expected_header)) != 0) { + status = BLADERF_ERR_INVAL; + log_error("CSV format does not match expected %s headers\n", (BLADERF_CHANNEL_IS_TX(ch)) ? "TX" : "RX"); + goto error; + } + image->version = GAIN_CAL_VERSION; for (size_t i = 0; i < num_entries; i++) { From 125d96f4b175ca2fd9789b32a23b715f3a467d74 Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Wed, 7 Aug 2024 13:35:13 -0500 Subject: [PATCH 074/238] libbladeRF: gain_calibration: restore gain mode after cal load --- host/libraries/libbladeRF/src/bladerf.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/host/libraries/libbladeRF/src/bladerf.c b/host/libraries/libbladeRF/src/bladerf.c index f8f92681..9d448c9b 100644 --- a/host/libraries/libbladeRF/src/bladerf.c +++ b/host/libraries/libbladeRF/src/bladerf.c @@ -2182,6 +2182,8 @@ int bladerf_load_gain_calibration(struct bladerf *dev, bladerf_channel ch, const char *filename = (char *)calloc(1, filename_len + 1); CHECK_NULL(filename); + bladerf_gain_mode gain_mode_before_gain_reset; + log_debug("Loading gain calibration\n"); MUTEX_LOCK(&dev->lock); @@ -2237,6 +2239,10 @@ int bladerf_load_gain_calibration(struct bladerf *dev, bladerf_channel ch, const MUTEX_UNLOCK(&dev->lock); + /* Save current gain mode before gain reset */ + if (BLADERF_CHANNEL_IS_TX(ch) == false) + dev->board->get_gain_mode(dev, ch, &gain_mode_before_gain_reset); + /* Reset gain to ensure calibration adjustment is applied after loading */ status = bladerf_set_gain(dev, ch, dev->gain_tbls[ch].gain_target); if (status != 0) { @@ -2244,6 +2250,15 @@ int bladerf_load_gain_calibration(struct bladerf *dev, bladerf_channel ch, const goto error; } + /** Restore previous gain mode */ + if (BLADERF_CHANNEL_IS_TX(ch) == false) { + status = bladerf_set_gain_mode(dev, ch, gain_mode_before_gain_reset); + if (status != 0) { + log_error("%s: Failed to reset gain mode.\n", __FUNCTION__); + goto error; + } + } + error: if (full_path) free(full_path); From b185d4c60a5376f91b7515111335c924ba6316be Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Mon, 8 Jul 2024 11:53:37 -0600 Subject: [PATCH 075/238] libbladeRF: gain_calibration: added cal table valid entry check --- host/libraries/libbladeRF/src/device_calibration.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/host/libraries/libbladeRF/src/device_calibration.c b/host/libraries/libbladeRF/src/device_calibration.c index f9799997..bc2435f7 100644 --- a/host/libraries/libbladeRF/src/device_calibration.c +++ b/host/libraries/libbladeRF/src/device_calibration.c @@ -356,6 +356,12 @@ int load_gain_calibration(struct bladerf *dev, bladerf_channel ch, const char *b } } + if (entry_counter == 0) { + log_error("No valid entries found: %s\n", binary_path); + status = BLADERF_ERR_UNEXPECTED; + goto error; + } + gain_tbls[ch].version = image->version; gain_tbls[ch].start_freq = gain_tbls[ch].entries[0].freq; gain_tbls[ch].stop_freq = gain_tbls[ch].entries[entry_counter-1].freq; From 5e041d0adac1a260df6fe16b7d0ba1deb0bc974a Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Mon, 8 Jul 2024 17:54:42 -0600 Subject: [PATCH 076/238] libbladeRF: gain_calibration: added serial number to gain cal table The gain calibration table will compare the serial number in the CSV with the serial number of the opened device. A warning will be issued if the serial numbers do not match. --- .../libbladeRF/src/device_calibration.c | 37 +++++++++++++++++-- .../example_measurements/rx_sweep.csv | 1 + .../example_measurements/tx_sweep.csv | 1 + 3 files changed, 35 insertions(+), 4 deletions(-) diff --git a/host/libraries/libbladeRF/src/device_calibration.c b/host/libraries/libbladeRF/src/device_calibration.c index bc2435f7..44956712 100644 --- a/host/libraries/libbladeRF/src/device_calibration.c +++ b/host/libraries/libbladeRF/src/device_calibration.c @@ -74,7 +74,7 @@ static size_t count_csv_entries(const char *filename) { fclose(file); - return count - 1; + return count - 2; // Subtract 2 to account for the serial number and header lines } int gain_cal_csv_to_bin(struct bladerf *dev, const char *csv_path, const char *binary_path, bladerf_channel ch) @@ -88,6 +88,8 @@ int gain_cal_csv_to_bin(struct bladerf *dev, const char *csv_path, const char *b char line[256]; char current_dir[1000]; char expected_header[1024]; + char device_serial[BLADERF_SERIAL_LENGTH]; + char csv_serial[BLADERF_SERIAL_LENGTH]; uint64_t frequency; float power; @@ -110,6 +112,20 @@ int gain_cal_csv_to_bin(struct bladerf *dev, const char *csv_path, const char *b goto error; } + strncpy(device_serial, dev->ident.serial, BLADERF_SERIAL_LENGTH); + device_serial[BLADERF_SERIAL_LENGTH - 1] = '\0'; + + if (!fgets(line, sizeof(line), csvFile)) { + status = BLADERF_ERR_INVAL; + log_error("Error reading serial number from CSV file or file is empty.\n"); + goto error; + } + + sscanf(line, "Serial: %s", csv_serial); + if (strcmp(device_serial, csv_serial) != 0) { + log_warning("Gain calibration file serial (%s) does not match device serial (%s)\n", csv_serial, device_serial); + } + size_t num_entries = count_csv_entries(csv_path); if (num_entries == 0) { status = BLADERF_ERR_INVAL; @@ -121,7 +137,7 @@ int gain_cal_csv_to_bin(struct bladerf *dev, const char *csv_path, const char *b ? sizeof(chain) + sizeof(gain) + sizeof(cw_freq) + sizeof(frequency) + sizeof(power) : sizeof(chain) + sizeof(gain) + sizeof(vsg_power) + sizeof(signal_freq) + sizeof(frequency) + sizeof(rssi) + sizeof(power); - data_size = num_entries * entry_size; + data_size = num_entries * entry_size + BLADERF_SERIAL_LENGTH; image = bladerf_alloc_image(dev, BLADERF_IMAGE_TYPE_GAIN_CAL, 0xffffffff, data_size); if (image == NULL) { @@ -145,6 +161,9 @@ int gain_cal_csv_to_bin(struct bladerf *dev, const char *csv_path, const char *b image->version = GAIN_CAL_VERSION; + memcpy(&image->data[offset], device_serial, BLADERF_SERIAL_LENGTH); + offset += BLADERF_SERIAL_LENGTH; + for (size_t i = 0; i < num_entries; i++) { if (!fgets(line, sizeof(line), csvFile)) { break; @@ -269,6 +288,8 @@ int load_gain_calibration(struct bladerf *dev, bladerf_channel ch, const char *b struct bladerf_image *image = NULL; size_t entry_size; size_t num_entries; + char device_serial[BLADERF_SERIAL_LENGTH]; + char file_serial[BLADERF_SERIAL_LENGTH]; FILE *binaryFile = fopen(binary_path, "rb"); if (!binaryFile) { @@ -310,10 +331,18 @@ int load_gain_calibration(struct bladerf *dev, bladerf_channel ch, const char *b goto error; } - num_entries = image->length / entry_size; + strncpy(device_serial, dev->ident.serial, BLADERF_SERIAL_LENGTH); + device_serial[BLADERF_SERIAL_LENGTH - 1] = '\0'; + memcpy(file_serial, image->data, BLADERF_SERIAL_LENGTH); + file_serial[BLADERF_SERIAL_LENGTH - 1] = '\0'; - offset = 0; + if (strcmp(device_serial, file_serial) != 0) { + log_warning("Calibration file serial (%s) does not match device serial (%s)\n", file_serial, device_serial); + } + + offset = BLADERF_SERIAL_LENGTH; entry_counter = 0; + num_entries = (image->length - BLADERF_SERIAL_LENGTH) / entry_size; for (uint64_t i = 0; i < num_entries; i++) { if (BLADERF_CHANNEL_IS_TX(ch)) { memcpy(&chain, &image->data[offset], sizeof(chain)); diff --git a/host/libraries/libbladeRF_test/test_gain_calibration/example_measurements/rx_sweep.csv b/host/libraries/libbladeRF_test/test_gain_calibration/example_measurements/rx_sweep.csv index 2e61a6a6..2f310071 100644 --- a/host/libraries/libbladeRF_test/test_gain_calibration/example_measurements/rx_sweep.csv +++ b/host/libraries/libbladeRF_test/test_gain_calibration/example_measurements/rx_sweep.csv @@ -1,3 +1,4 @@ +Serial: 52f4b4c4e1164ce3a7b89d3e47c8c0e8 RX Chain,RX Gain,VSG Power into bladeRF RX (dBm),Frequency of signal (Hz),Frequency of bladeRF+PXI (Hz),AD9361 RSSI register value,Power of Signal from Full Scale (dBFS) 0,0,-30.000000,75000000,70000000,-48,-24.911830 0,0,-30.000000,80000000,75000000,-48,-24.952046 diff --git a/host/libraries/libbladeRF_test/test_gain_calibration/example_measurements/tx_sweep.csv b/host/libraries/libbladeRF_test/test_gain_calibration/example_measurements/tx_sweep.csv index 596c81f2..3129e457 100644 --- a/host/libraries/libbladeRF_test/test_gain_calibration/example_measurements/tx_sweep.csv +++ b/host/libraries/libbladeRF_test/test_gain_calibration/example_measurements/tx_sweep.csv @@ -1,3 +1,4 @@ +Serial: 52f4b4c4e1164ce3a7b89d3e47c8c0e8 TX Chain,TX Gain,Frequency of Signal (Hz),Frequency of bladeRF+PXI (Hz),VSA Measured Power (dBm) 0,60,70000000,65000000,4.100207 0,60,75000000,70000000,4.117410 From 64e709e885a6517ac4eddccb1119d877e074e6b0 Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Sun, 4 Aug 2024 19:23:52 -0500 Subject: [PATCH 077/238] bladeRF-power: init --- host/utilities/CMakeLists.txt | 1 + host/utilities/bladeRF-power/CMakeLists.txt | 23 +++ .../utilities/bladeRF-power/include/helpers.h | 45 +++++ host/utilities/bladeRF-power/include/init.h | 69 +++++++ host/utilities/bladeRF-power/include/window.h | 57 ++++++ host/utilities/bladeRF-power/src/helpers.c | 191 ++++++++++++++++++ host/utilities/bladeRF-power/src/init.c | 100 +++++++++ host/utilities/bladeRF-power/src/main.c | 139 +++++++++++++ host/utilities/bladeRF-power/src/window.c | 115 +++++++++++ 9 files changed, 740 insertions(+) create mode 100644 host/utilities/bladeRF-power/CMakeLists.txt create mode 100644 host/utilities/bladeRF-power/include/helpers.h create mode 100644 host/utilities/bladeRF-power/include/init.h create mode 100644 host/utilities/bladeRF-power/include/window.h create mode 100644 host/utilities/bladeRF-power/src/helpers.c create mode 100644 host/utilities/bladeRF-power/src/init.c create mode 100644 host/utilities/bladeRF-power/src/main.c create mode 100644 host/utilities/bladeRF-power/src/window.c diff --git a/host/utilities/CMakeLists.txt b/host/utilities/CMakeLists.txt index 4900c231..3603551b 100644 --- a/host/utilities/CMakeLists.txt +++ b/host/utilities/CMakeLists.txt @@ -2,3 +2,4 @@ cmake_minimum_required(VERSION 3.5) add_subdirectory(bladeRF-cli) add_subdirectory(bladeRF-fsk/c) +add_subdirectory(bladeRF-power) diff --git a/host/utilities/bladeRF-power/CMakeLists.txt b/host/utilities/bladeRF-power/CMakeLists.txt new file mode 100644 index 00000000..cf06df6f --- /dev/null +++ b/host/utilities/bladeRF-power/CMakeLists.txt @@ -0,0 +1,23 @@ +cmake_minimum_required(VERSION 3.5) +project(bladeRF-power LANGUAGES C) + +find_package(Curses REQUIRED) + +include_directories( + ${BLADERF_HOST_COMMON_INCLUDE_DIRS} + ${libbladeRF_SOURCE_DIR}/include + ./include) + +add_executable(${PROJECT_NAME} + ${BLADERF_HOST_COMMON_SOURCE_DIR}/conversions.c + src/init.c + src/helpers.c + src/window.c + src/main.c) + +target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wextra -Werror) +target_link_libraries(${PROJECT_NAME} + libbladerf_shared + m + ${BLADERF_HOST_COMMON_LIBRARIES} + ${CURSES_LIBRARIES}) diff --git a/host/utilities/bladeRF-power/include/helpers.h b/host/utilities/bladeRF-power/include/helpers.h new file mode 100644 index 00000000..6112fd49 --- /dev/null +++ b/host/utilities/bladeRF-power/include/helpers.h @@ -0,0 +1,45 @@ +/* + * This file is part of the bladeRF project: + * http://www.github.com/nuand/bladeRF + * + * Copyright (C) 2024 Nuand LLC + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + * + * This program is intended to verify that C programs build against + * libbladeRF without any unintended dependencies. + */ +#ifndef HELPERS_H_ +#define HELPERS_H_ + +#include "libbladeRF.h" +#include "init.h" + +#define DIRECTION_UNSET 3 + +/** + * @brief Ask the user for TX or RX operation. + * + * @return bladerf_direction + */ +bladerf_direction ask_direction(); + +int start_streaming(struct bladerf *dev, struct test_params *test); + +#endif // HELPERS_H_ diff --git a/host/utilities/bladeRF-power/include/init.h b/host/utilities/bladeRF-power/include/init.h new file mode 100644 index 00000000..8639b010 --- /dev/null +++ b/host/utilities/bladeRF-power/include/init.h @@ -0,0 +1,69 @@ +/* + * This file is part of the bladeRF project: + * http://www.github.com/nuand/bladeRF + * + * Copyright (C) 2024 Nuand LLC + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + * + * This program is intended to verify that C programs build against + * libbladeRF without any unintended dependencies. + */ +#ifndef INIT_H +#define INIT_H + +#include "libbladeRF.h" + +struct test_params { + bladerf_frequency frequency; + bladerf_frequency frequency_actual; + bladerf_frequency freq_min; + bladerf_frequency freq_max; + bladerf_gain gain; + bladerf_gain gain_min; + bladerf_gain gain_max; + bladerf_gain gain_actual; + bladerf_gain_mode gain_mode; + bladerf_sample_rate samp_rate; + bladerf_sample_rate bandwidth; + bladerf_direction direction; + double rx_power; + bool gain_cal_enabled; + char *gain_cal_file; +}; + +/** + * @brief Initialize the test parameters + * + * @param test The test parameters to initialize + */ +void init_params(struct test_params *test); + +/** + * @brief Initialize the device + * + * @param dev The device to initialize + * @param dir The direction to initialize + * @param test The test parameters to use + * + * @return 0 on success, BLADERF_ERR_* on failure + */ +int dev_init(struct bladerf *dev, bladerf_direction dir, struct test_params *test); + +#endif diff --git a/host/utilities/bladeRF-power/include/window.h b/host/utilities/bladeRF-power/include/window.h new file mode 100644 index 00000000..bc8e93d6 --- /dev/null +++ b/host/utilities/bladeRF-power/include/window.h @@ -0,0 +1,57 @@ +/* + * This file is part of the bladeRF project: + * http://www.github.com/nuand/bladeRF + * + * Copyright (C) 2024 Nuand LLC + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + * + * This program is intended to verify that C programs build against + * libbladeRF without any unintended dependencies. + */ +#ifndef _HELPERS_H_ +#define _HELPERS_H_ + +#include +#include "helpers.h" + + +/** + * @brief Initializes ncurses mode and creates two windows: main and log. + * + * This function starts the ncurses mode, sets various ncurses properties, + * and creates two separate windows for main content and log/status display. + * + * @param main_win Pointer to a pointer to the main window, which will be initialized by this function. + */ +void init_curses(WINDOW **win); + +/** + * @brief Updates the main window with current test parameters. + * + * Clears the main window, draws a box around it, and then prints the current + * status of the test parameters including gain calibration status, frequency, + * and gain values. + * + * @param win Pointer to the main ncurses window to be updated. + * @param test Struct containing test parameters to display. + */ +void update_window(WINDOW *win, struct test_params *test); + +#endif // HELPERS_H_ diff --git a/host/utilities/bladeRF-power/src/helpers.c b/host/utilities/bladeRF-power/src/helpers.c new file mode 100644 index 00000000..8abf726c --- /dev/null +++ b/host/utilities/bladeRF-power/src/helpers.c @@ -0,0 +1,191 @@ +/* + * This file is part of the bladeRF project: + * http://www.github.com/nuand/bladeRF + * + * Copyright (C) 2024 Nuand LLC + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + * + * This program is intended to verify that C programs build against + * libbladeRF without any unintended dependencies. + */ +#include +#include +#include +#include "window.h" +#include "helpers.h" +#include "libbladeRF.h" +#include "log.h" + +#define INT12_MAX 2047 + +#define CHECK(fn) do { \ + status = fn; \ + if (status != 0) { \ + fprintf(stderr, "[Error] %s:%d: %s - %s\n", __FILE__, __LINE__, #fn, bladerf_strerror(status)); \ + fprintf(stderr, "Exiting.\n"); \ + goto error; \ + } \ +} while (0) + +#define CHECK_NULL(...) do { \ + const void* _args[] = { __VA_ARGS__, NULL }; \ + for (size_t _i = 0; _args[_i] != NULL; ++_i) { \ + if (_args[_i] == NULL) { \ + log_error("%s:%d: Argument %zu is a NULL pointer\n", __FILE__, __LINE__, _i + 1); \ + return BLADERF_ERR_INVAL; \ + } \ + } \ +} while (0) + +bladerf_direction ask_direction() { + char direction; + printf("Enter direction (tx/rx/q[uit]): "); + + int ret = scanf("%c", &direction); + if (ret == EOF || ret == 0) { + printf("Error reading direction. Exiting...\n"); + exit(1); + } + while (getchar() != '\n'); + + if (direction == 't' || direction == 'r') { + return (direction == 't') ? BLADERF_TX : BLADERF_RX; + } else if (direction == 'q') { + printf("Exiting...\n"); + exit(0); + } else { + bladerf_direction dir = ask_direction(); + return dir; + } +} + +static int calculate_power(const int16_t *samples, size_t num_samples, double *power) { + CHECK_NULL(samples, power); + + double sum = 0; + for (size_t i = 0; i < num_samples; i++) { + sum += (samples[2*i] * samples[2*i]) + (samples[2*i+1] * samples[2*i+1]); + } + const double avg_power = sum / num_samples; + const double max_power = INT12_MAX * INT12_MAX; + const double avg_power_dbfs = 10 * log10(avg_power / max_power); + *power = avg_power_dbfs; + return 0; +} + +int start_streaming(struct bladerf *dev, struct test_params *test) { + int status = 0; + WINDOW *main_win = NULL; + bladerf_channel ch = (test->direction == BLADERF_TX) ? BLADERF_CHANNEL_TX(0) : BLADERF_CHANNEL_RX(0); + const size_t num_samples = test->samp_rate / 30; // 30Hz + const struct bladerf_gain_cal_tbl *gain_tbl = NULL; + + int16_t *samples = malloc(2 * num_samples * sizeof(int16_t)); + if (samples == NULL) { + fprintf(stderr, "Error allocating memory for samples. Exiting...\n"); + return BLADERF_ERR_INVAL; + } + + if (test->direction == BLADERF_TX) { + for (size_t i = 0; i < num_samples; i++) { + samples[2*i] = INT12_MAX; + samples[2*i+1] = INT12_MAX; + } + } + + CHECK(bladerf_get_gain_calibration(dev, ch, &gain_tbl)); + test->gain_cal_enabled = gain_tbl->enabled; + + CHECK(bladerf_enable_module(dev, ch, true)); + CHECK(bladerf_get_gain(dev, ch, &test->gain_actual)); + CHECK(bladerf_get_frequency(dev, ch, &test->frequency_actual)); + + int cmd = 0; + init_curses(&main_win); + while (status == 0 && cmd != 'q') { + cmd = getch(); + + if (cmd == 'l' || cmd == KEY_RIGHT) { + bladerf_frequency next_freq = test->frequency + 5e6; + test->frequency = (next_freq > test->freq_max) ? test->freq_max : next_freq; + CHECK(bladerf_set_frequency(dev, ch, test->frequency)); + CHECK(bladerf_get_frequency(dev, ch, &test->frequency_actual)); + } + + if (cmd == 'h' || cmd == KEY_LEFT) { + bladerf_frequency next_freq = test->frequency - 5e6; + test->frequency = (next_freq < test->freq_min) ? test->freq_min : next_freq; + CHECK(bladerf_set_frequency(dev, ch, test->frequency)); + CHECK(bladerf_get_frequency(dev, ch, &test->frequency_actual)); + } + + if ((cmd == 'k' || cmd == KEY_UP) && test->gain + 1 <= test->gain_max) { + CHECK(bladerf_set_gain(dev, ch, test->gain + 1)); + CHECK(bladerf_get_gain(dev, ch, &test->gain_actual)); + } + + if ((cmd == 'j' || cmd == KEY_DOWN) && test->gain - 1 >= test->gain_min) { + CHECK(bladerf_set_gain(dev, ch, test->gain - 1)); + CHECK(bladerf_get_gain(dev, ch, &test->gain_actual)); + } + + if (cmd == 'c') { + CHECK(bladerf_get_gain_calibration(dev, ch, &gain_tbl)); + CHECK(bladerf_enable_gain_calibration(dev, ch, !gain_tbl->enabled)); + CHECK(bladerf_get_gain_calibration(dev, ch, &gain_tbl)); + test->gain_cal_enabled = gain_tbl->enabled; + } + + if (cmd == 'a' && BLADERF_CHANNEL_IS_TX(ch) == false) { + bladerf_gain_mode next_mode; + + next_mode = (test->gain_mode == BLADERF_GAIN_MGC) + ? BLADERF_GAIN_DEFAULT + : BLADERF_GAIN_MGC; + + CHECK(bladerf_set_gain_mode(dev, ch, next_mode)); + CHECK(bladerf_get_gain_mode(dev, ch, &test->gain_mode)); + } + + if (BLADERF_CHANNEL_IS_TX(ch) == false) { + CHECK(bladerf_get_gain_mode(dev, ch, &test->gain_mode)); + } + + CHECK(bladerf_get_gain(dev, ch, &test->gain_actual)); + CHECK(bladerf_get_gain_target(dev, ch, &test->gain)); + + update_window(main_win, test); + + if (test->direction == BLADERF_RX) { + CHECK(bladerf_sync_rx(dev, samples, num_samples, NULL, 1000)); + CHECK(calculate_power(samples, num_samples, &test->rx_power)); + } else { + CHECK(bladerf_sync_tx(dev, samples, num_samples, NULL, 1000)); + } + } + +error: + bladerf_enable_module(dev, ch, false); + free(samples); + + delwin(main_win); + endwin(); + return status; +} diff --git a/host/utilities/bladeRF-power/src/init.c b/host/utilities/bladeRF-power/src/init.c new file mode 100644 index 00000000..db9587fc --- /dev/null +++ b/host/utilities/bladeRF-power/src/init.c @@ -0,0 +1,100 @@ +/* + * This file is part of the bladeRF project: + * http://www.github.com/nuand/bladeRF + * + * Copyright (C) 2024 Nuand LLC + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + * + * This program is intended to verify that C programs build against + * libbladeRF without any unintended dependencies. + */ +#include +#include "init.h" +#include "helpers.h" +#include "libbladeRF.h" + +#define CHECK(fn) do { \ + status = fn; \ + if (status != 0) { \ + fprintf(stderr, "[Error] %s:%d: %s - %s\n", __FILE__, __LINE__, #fn, bladerf_strerror(status)); \ + fprintf(stderr, "Exiting.\n"); \ + goto error; \ + } \ +} while (0) + +void init_params(struct test_params *test) { + test->frequency = 1e9; + test->frequency_actual = test->frequency; + test->freq_min = 65e6; + test->freq_max = 6e9; + + test->gain = 0; + test->gain_actual = 0; + test->gain_min = -10; + test->gain_max = 60; + test->gain_mode = BLADERF_GAIN_DEFAULT; + + test->samp_rate = 20e6; + test->bandwidth = test->samp_rate; + test->direction = DIRECTION_UNSET; + + test->rx_power = 0.0; + test->gain_cal_enabled = false; + test->gain_cal_file = NULL; +} + +int dev_init(struct bladerf *dev, bladerf_direction dir, struct test_params *test) { + int status = 0; + const struct bladerf_range *freq_range; + const struct bladerf_range *gain_range; + bladerf_channel ch = (dir == BLADERF_TX) ? BLADERF_CHANNEL_TX(0) : BLADERF_CHANNEL_RX(0); + + bladerf_channel_layout layout = (dir == BLADERF_TX) ? BLADERF_TX_X1 : BLADERF_RX_X1; + bladerf_format format = BLADERF_FORMAT_SC16_Q11; + size_t num_buffers = 512; + size_t buffer_size = 16*1024; + size_t num_transfers = 32; + size_t stream_timeout = 1000; //ms + + CHECK(bladerf_set_gain(dev, ch, test->gain)); + CHECK(bladerf_set_sample_rate(dev, ch, test->samp_rate, NULL)); + CHECK(bladerf_set_bandwidth(dev, ch, test->bandwidth, &test->bandwidth)); + CHECK(bladerf_set_frequency(dev, ch, test->frequency)); + CHECK(bladerf_sync_config(dev, layout, format, num_buffers, buffer_size, + num_transfers, stream_timeout)); + + if (dir == BLADERF_RX) { + CHECK(bladerf_set_gain_mode(dev, ch, test->gain_mode)); + CHECK(bladerf_get_gain_mode(dev, ch, &test->gain_mode)); + } + + CHECK(bladerf_get_frequency_range(dev, ch, &freq_range)); + test->freq_min = freq_range->min * freq_range->scale; + test->freq_max = freq_range->max * freq_range->scale; + + CHECK(bladerf_get_gain_range(dev, ch, &gain_range)); + test->gain_min = gain_range->min * gain_range->scale; + test->gain_max = gain_range->max * gain_range->scale; + + CHECK(bladerf_load_gain_calibration(dev, ch, test->gain_cal_file)); + +error: + return status; +} diff --git a/host/utilities/bladeRF-power/src/main.c b/host/utilities/bladeRF-power/src/main.c new file mode 100644 index 00000000..7edca81f --- /dev/null +++ b/host/utilities/bladeRF-power/src/main.c @@ -0,0 +1,139 @@ +/* + * This file is part of the bladeRF project: + * http://www.github.com/nuand/bladeRF + * + * Copyright (C) 2024 Nuand LLC + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + * + * This program is intended to verify that C programs build against + * libbladeRF without any unintended dependencies. + */ +#include +#include +#include "libbladeRF.h" +#include "init.h" +#include "helpers.h" +#include "conversions.h" + +#define CHECK(fn) do { \ + status = fn; \ + if (status != 0) { \ + fprintf(stderr, "[Error] %s:%d: %s - %s\n", __FILE__, __LINE__, #fn, bladerf_strerror(status)); \ + fprintf(stderr, "Exiting.\n"); \ + goto error; \ + } \ +} while (0) + +#define OPTSTR "d:l:trf:v:h" +struct option long_options[] = { + { "device", required_argument, NULL, 'd' }, + { "load", required_argument, NULL, 'l' }, + { "tx", no_argument, NULL, 't' }, + { "rx", no_argument, NULL, 'r' }, + { "frequency", required_argument, NULL, 'f' }, + { "verbosity", optional_argument, NULL, 'v' }, + { "help", no_argument, NULL, 'h' }, + { NULL, 0, NULL, 0 }, +}; + +int main(int argc, char *argv[]) +{ + int status = 0; + struct bladerf *dev = NULL; + struct bladerf_devinfo devinfo; + char *devstr = NULL; + + int opt = 0; + int opt_ind = 0; + bool ok; + bladerf_log_level log_level = BLADERF_LOG_LEVEL_INFO; + + struct test_params test; + init_params(&test); + + while (opt != -1) { + opt = getopt_long(argc, argv, OPTSTR, long_options, &opt_ind); + + switch (opt) { + case 'd': + devstr = optarg; + break; + + case 'f': + test.frequency = str2uint64(optarg, 1, UINT64_MAX, &ok); + printf("Frequency: %" PRIu64 "\n", test.frequency); + break; + + case 't': + case 'r': + if (test.direction != DIRECTION_UNSET) { + fprintf(stderr, "Only one direction may be specified.\n"); + test.direction = ask_direction(); + break; + } + test.direction = (opt == 't') ? BLADERF_TX : BLADERF_RX; + break; + + case 'l': + test.gain_cal_file = optarg; + break; + + case 'v': + log_level = str2loglevel(optarg, &ok); + if (!ok) { + fprintf(stderr, "Invalid log level: %s\n", optarg); + return -1; + } + break; + + case 'h': + printf("Usage: %s [options]\n", argv[0]); + printf(" -d, --device Specify the device to open.\n"); + printf(" -l, --load Load a specified gain cal file (.csv or .tbl).\n"); + printf(" -t, --tx Transmit mode. Can't be combined with --rx.\n"); + printf(" -r, --rx Receive mode. Can't be combined with --tx.\n"); + printf(" -f, --frequency Set the initial frequency (in Hz).\n"); + printf(" -v, --verbosity Set the libbladeRF verbosity level (e.g., verbose, debug).\n"); + printf(" -h, --help Display this help text and exit.\n"); + printf("\n"); + return 0; + + default: + break; + } + } + + bladerf_log_set_verbosity(log_level); + + CHECK(bladerf_open(&dev, devstr)); + CHECK(bladerf_get_devinfo(dev, &devinfo)); + printf("Device: %s\n", devinfo.serial); + + if (test.direction == DIRECTION_UNSET) { + test.direction = ask_direction(); + } + + CHECK(dev_init(dev, test.direction, &test)); + CHECK(start_streaming(dev, &test)); + +error: + if (dev) bladerf_close(dev); + return status; +} diff --git a/host/utilities/bladeRF-power/src/window.c b/host/utilities/bladeRF-power/src/window.c new file mode 100644 index 00000000..206166d1 --- /dev/null +++ b/host/utilities/bladeRF-power/src/window.c @@ -0,0 +1,115 @@ +/* + * This file is part of the bladeRF project: + * http://www.github.com/nuand/bladeRF + * + * Copyright (C) 2024 Nuand LLC + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + * + * This program is intended to verify that C programs build against + * libbladeRF without any unintended dependencies. + */ +#include +#include +#include +#include "helpers.h" +#include "libbladeRF.h" + +typedef struct { + double value; + const char* unit; +} eng_double_t; + +static eng_double_t uint64_to_eng_double(uint64_t value) { + static const char* units[] = {"", "K", "M", "G", "T", "P"}; + eng_double_t value_eng = { .value = (double)value, .unit = "" }; + int unit_index = 0; + + while (value_eng.value >= 1000.0 && unit_index < 5) { + value_eng.value /= 1000.0; + unit_index++; + } + + value_eng.unit = units[unit_index]; + return value_eng; +} + +/** + * @brief Converts an RX power calculation from dBFS to dBm. + * + * The calibration procedure references to 0dB. Once gain calibration is + * enabled, we can directly convert the dBFS value to dBm if the gain is + * set to 0dB. If the gain is not set to 0dB, the current gain can simply + * be subtracted from the dBFS value to get the dBm value. + * + * @param power_dbfs The power in dBFS. + * @param target_gain The current gain setting. + * @return The power in dBm. + */ +static double rx_power_dbfs_to_dbm(double power_dbfs, bladerf_gain target_gain) { + const double CALIBRATION_REFERENCE_GAIN = 0.0; + return power_dbfs + (CALIBRATION_REFERENCE_GAIN - target_gain); +} + +void init_curses(WINDOW **win) { + initscr(); // Start curses mode + noecho(); // Don't echo input characters + timeout(0); // Non-blocking getch() returns ERR if no input is waiting + curs_set(0); // Hide the cursor + keypad(stdscr, TRUE); // Enable keyboard mapping, such as arrow keys + nodelay(stdscr, TRUE); // Make getch() non-blocking + + int max_y, max_x; + getmaxyx(stdscr, max_y, max_x); + + *win = newwin(max_y, max_x, 0, 0); +} + +void update_window(WINDOW *win, struct test_params *test) { + size_t maxy = getmaxy(win); + size_t start_y = 1; + + werase(win); + + mvwprintw(win, start_y++, 1, "Gain Calibration: %s\n", test->gain_cal_enabled ? "enabled" : "disabled"); + mvwprintw(win, start_y++, 1, "Automatic Gain Control: %s\n", test->gain_mode == BLADERF_GAIN_MGC ? "disabled" : "enabled"); + mvwprintw(win, start_y++, 1, "Bandwidth: %7.3f %sHz\n", + uint64_to_eng_double(test->bandwidth).value, + uint64_to_eng_double(test->bandwidth).unit); + mvwprintw(win, start_y++, 1, "Frequency: %7.3f %sHz\n", + uint64_to_eng_double(test->frequency).value, + uint64_to_eng_double(test->frequency).unit); + mvwprintw(win, start_y++, 1, "Gain: %" PRIi32 "dB actual, %" PRIi32 "dB target, range: [%" PRIi32 ", %" PRIi32 "]\n", + test->gain_actual, test->gain, test->gain_min, test->gain_max); + + if (test->gain_cal_enabled && test->direction == BLADERF_TX) { + mvwprintw(win, start_y++, 1, "Output Pwr: %" PRIi32 "dBm, range: [%" PRIi32 ", %" PRIi32 "]\n", + test->gain-60, test->gain_min-60, test->gain_max-60); + } else if (test->gain_cal_enabled && test->direction == BLADERF_RX) { + mvwprintw(win, start_y++, 1, "Avg Power: %0.2fdBFS, %0.2fdBm", + test->rx_power, rx_power_dbfs_to_dbm(test->rx_power, test->gain)); + } else if (test->direction == BLADERF_RX) { + mvwprintw(win, start_y++, 1, "Avg Power: %0.2fdBFS", test->rx_power); + } + + wprintw(win, "\n"); + mvwprintw(win, maxy-2, 1, "Keys: [h/l] Frequency, [j/k] Gain, [c] Toggle Calibration, [a] Toggle AGC, [q] Quit\n"); + box(win, 0, 0); + wrefresh(win); +} From 3d350853b9aeb13fd7e30fdf5cf9ad1477d23981 Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Tue, 16 Jan 2024 12:22:41 -0600 Subject: [PATCH 078/238] bladeRF-power: added install target --- host/utilities/bladeRF-power/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/host/utilities/bladeRF-power/CMakeLists.txt b/host/utilities/bladeRF-power/CMakeLists.txt index cf06df6f..db6fe9f0 100644 --- a/host/utilities/bladeRF-power/CMakeLists.txt +++ b/host/utilities/bladeRF-power/CMakeLists.txt @@ -21,3 +21,5 @@ target_link_libraries(${PROJECT_NAME} m ${BLADERF_HOST_COMMON_LIBRARIES} ${CURSES_LIBRARIES}) + +install(TARGETS ${PROJECT_NAME} DESTINATION ${BIN_INSTALL_DIR}) From b4e50ac1e4cd62cda6cded6c1f3d7f265fddb2bf Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Wed, 17 Jan 2024 10:01:02 -0600 Subject: [PATCH 079/238] bladeRF-power: added README.md and appended to utilities README.md --- host/utilities/README.md | 2 ++ host/utilities/bladeRF-power/README.md | 48 ++++++++++++++++++++++++++ 2 files changed, 50 insertions(+) create mode 100644 host/utilities/bladeRF-power/README.md diff --git a/host/utilities/README.md b/host/utilities/README.md index eafe8fb6..f9a8fa92 100644 --- a/host/utilities/README.md +++ b/host/utilities/README.md @@ -5,6 +5,8 @@ This directory contains applications that utilize libbladeRF. | ------------------------- |:-------------------------------------------------------------------------- | | [bladeRF-cli] | Command line tool for development and debugging | | [bladeRF-fsk] | BladeRF-to-bladeRF text/file transfer program based on a custom FSK modem | +| [bladeRF-power] | Command line tool for measuring and outputting power levels | [bladeRF-cli]: ./bladeRF-cli (bladeRF-cli) [bladeRF-fsk]: ./bladeRF-fsk (bladeRF-fsk) +[bladeRF-power]: ./bladeRF-power (bladeRF-power) diff --git a/host/utilities/bladeRF-power/README.md b/host/utilities/bladeRF-power/README.md new file mode 100644 index 00000000..598b9945 --- /dev/null +++ b/host/utilities/bladeRF-power/README.md @@ -0,0 +1,48 @@ +# bladeRF-power + +## Summary + +`bladeRF-power` performs power level measurements using bladeRF devices. This tool provides an interface for users to exercise the gain calibration feature of bladeRF, enabling precise control and adjustment of gain settings. The utility integrates an ncurses GUI for ease of use, allowing users to visually monitor and adjust power levels. + +## Install + +`bladeRF-power` will be installed as part of the bladeRF host package. To install the host package, follow the instructions in the [host package README](../../../host/README.md). + +```bash +cd bladeRF/host/ +mkdir ./build && cd ./build +cmake .. && make -j`nproc` +sudo make install +bladeRF-power --help +``` + +## Loading the Gain Calibration + +### Auto Loading (Recommended) + +Place the bladeRF's gain calibration file in one of the [auto loading locations](https://github.com/Nuand/bladeRF/wiki/FPGA-Autoloading). + +### Manual Loading + +If you do not wish to use the auto loading feature, you can manually load the gain calibration file using the `--load` option. + +```bash +bladeRF-power --load /path/to/gain_calibration_file.tbl +``` + +## Troubleshooting + +Run bladeRF-power with the example gain calibration within the host build. + +> **Note**: The example gain calibration file is not for your device, and will not provide accurate measurements. + +```bash +cd bladeRF/host/ +mkdir ./build && cd ./build +cmake .. && make -j`nproc` + +# Generate example .tbl files for auto loading +./output/libbladeRF_test_gain_calibration + +./output/bladeRF-power +``` From 8ec93c517c6b1215e042a3e7ddeeb0595f3b10f1 Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Wed, 31 Jan 2024 17:46:39 -0600 Subject: [PATCH 080/238] bladeRF-power: add FIR filter for power equalization across bandwidth The FIR filter will equalize the noise figure across the bandwidth of the bladeRF 2.0. After equalization, measurements of off-center CWs and modulated waveforms are brought within +-1dB of error. --- host/utilities/bladeRF-power/CMakeLists.txt | 1 + host/utilities/bladeRF-power/include/filter.h | 72 ++++++++++ host/utilities/bladeRF-power/src/filter.c | 135 ++++++++++++++++++ host/utilities/bladeRF-power/src/helpers.c | 26 +++- 4 files changed, 228 insertions(+), 6 deletions(-) create mode 100644 host/utilities/bladeRF-power/include/filter.h create mode 100644 host/utilities/bladeRF-power/src/filter.c diff --git a/host/utilities/bladeRF-power/CMakeLists.txt b/host/utilities/bladeRF-power/CMakeLists.txt index db6fe9f0..4d5d5f2a 100644 --- a/host/utilities/bladeRF-power/CMakeLists.txt +++ b/host/utilities/bladeRF-power/CMakeLists.txt @@ -13,6 +13,7 @@ add_executable(${PROJECT_NAME} src/init.c src/helpers.c src/window.c + src/filter.c src/main.c) target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wextra -Werror) diff --git a/host/utilities/bladeRF-power/include/filter.h b/host/utilities/bladeRF-power/include/filter.h new file mode 100644 index 00000000..4848ceaa --- /dev/null +++ b/host/utilities/bladeRF-power/include/filter.h @@ -0,0 +1,72 @@ +/* + * This file is part of the bladeRF project: + * http://www.github.com/nuand/bladeRF + * + * Copyright (C) 2024 Nuand LLC + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + * + * This program is intended to verify that C programs build against + * libbladeRF without any unintended dependencies. + */ +#ifndef FILTER_H_ +#define FILTER_H_ +#include + +/** + * @brief Apply a predefined FIR filter to input samples to flatten the noise + * figure across the specified frequency range, specifically designed for + * bladeRF 2.0 devices. + * + * This function convolves input samples with a low-pass FIR filter designed to + * equalize the device's frequency response for power measurement. The filter + * aims to achieve a uniform gain across the desired frequency spectrum with + * minimal ripple. + * + * @param dev Pointer to the `bladerf` device structure + * @param samples Pointer to the input sample array, where each element + * represents a complex sample (interleaved I and Q components). The input array + * should have a length of `2 * num_samples`, accounting for both I and Q + * components. + * @param num_samples The number of complex samples in the `samples` array. This + * is not the length of the array but the number of complex samples (each + * consisting of an I and a Q component). + * @param convolved_samples Pointer to the output sample array where the + * filtered samples will be stored. This array must be preallocated and have the + * same length as the `samples` array to hold the convolved (filtered) output. + * + * @return BLADERF_ERR_INVAL if any of the input pointers are NULL, indicating + * an invalid parameter. Returns 0 on successful execution of the function. + * + * @note The function performs in-place filtering if the input and output arrays + * are the same. Care must be taken to ensure adequate memory allocation for the + * output to avoid memory corruption. + * @note This function checks the device type and only performs filtering for + * bladeRF 2.0 devices. For other devices, it copies the input samples to the + * output buffer directly without filtering. + * @note The filter coefficients and the filtering process are optimized for + * specific frequency ranges and may not be suitable for all signal processing + * needs. + */ +int flatten_noise_figure(struct bladerf *dev, + const int16_t *samples, + size_t num_samples, + int16_t *convolved_samples); + +#endif // FILTER_H_ \ No newline at end of file diff --git a/host/utilities/bladeRF-power/src/filter.c b/host/utilities/bladeRF-power/src/filter.c new file mode 100644 index 00000000..2160247b --- /dev/null +++ b/host/utilities/bladeRF-power/src/filter.c @@ -0,0 +1,135 @@ +/* + * This file is part of the bladeRF project: + * http://www.github.com/nuand/bladeRF + * + * Copyright (C) 2024 Nuand LLC + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + * + * This program is intended to verify that C programs build against + * libbladeRF without any unintended dependencies. + */ +#include +#include +#include +#include +#include +#include +#include "log.h" +#include "libbladeRF.h" + +#define CHECK_NULL(...) do { \ + const void* _args[] = { __VA_ARGS__, NULL }; \ + for (size_t _i = 0; _args[_i] != NULL; ++_i) { \ + if (_args[_i] == NULL) { \ + log_error("%s:%d: Argument %zu is a NULL pointer\n", __FILE__, __LINE__, _i + 1); \ + return BLADERF_ERR_INVAL; \ + } \ + } \ +} while (0) + +typedef struct { + const char *device_name; + double *filter_taps; + size_t tap_num; +} device_fir_filter_t; + +#define PASS_THROUGH_TAPS_NUM 1 +#define PASS_THROUGH_TAPS {1.00000000000000000} +static double pass_through_taps[PASS_THROUGH_TAPS_NUM] = PASS_THROUGH_TAPS; + +#define BLADERF1_TAPS_NUM PASS_THROUGH_TAPS_NUM +static double bladerf1_filter_taps[BLADERF1_TAPS_NUM] = PASS_THROUGH_TAPS; + +/* +FIR filter designed with +http://t-filter.appspot.com + +sampling frequency: 2000 Hz + +* 0 Hz - 50 Hz + gain = 0.96 + desired ripple = 0.1 dB + actual ripple = 0.02235661175114112 dB + +* 590 Hz - 600 Hz + gain = 0.7 + desired ripple = 0.5 dB + actual ripple = 0.07461272495123161 dB + +* 990 Hz - 1000 Hz + gain = 0.56 + desired ripple = 0.1 dB + actual ripple = 0.00253374647750082 dB +*/ +#define BLADERF2_TAPS_NUM 3 +static double bladerf2_filter_taps[BLADERF2_TAPS_NUM] = { + 0.10034970104726319, + 0.7605360692461476, + 0.10034970104726319 +}; + +static device_fir_filter_t filters[] = { + {"passthrough", pass_through_taps, PASS_THROUGH_TAPS_NUM}, // Default filter + {"bladerf1", bladerf1_filter_taps, BLADERF1_TAPS_NUM}, + {"bladerf2", bladerf2_filter_taps, BLADERF2_TAPS_NUM}, +}; + +static device_fir_filter_t* get_device_filter(struct bladerf *dev) { + const char* board_name = bladerf_get_board_name(dev); + for (size_t i = 0; i < sizeof(filters) / sizeof(filters[0]); i++) { + if (strncmp(board_name, filters[i].device_name, strlen(filters[i].device_name)) == 0) { + return &filters[i]; + } + } + + log_debug("No FIR filter found for bladeRF device. Using passthrough."); + return &filters[0]; // Default filter +} + +int flatten_noise_figure(struct bladerf *dev, + const int16_t *samples, + size_t num_samples, + int16_t *convolved_samples) +{ + int status = 0; + double acc_i, acc_q; + CHECK_NULL(dev, samples, convolved_samples); + + device_fir_filter_t* filter = get_device_filter(dev); + + for (size_t i = 0; i < num_samples; i++) { + acc_i = 0.0; + acc_q = 0.0; + + // Convolve filter with input samples + for (size_t j = 0; j < filter->tap_num; j++) { + if (i >= j) { + acc_i += filter->filter_taps[j] * (double)samples[2*(i-j)]; + acc_q += filter->filter_taps[j] * (double)samples[2*(i-j) + 1]; + } + } + + // Clamping to the to int16_t + convolved_samples[2*i] = (int16_t)(fmax(fmin(acc_i, INT16_MAX), INT16_MIN)); + convolved_samples[2*i + 1] = (int16_t)(fmax(fmin(acc_q, INT16_MAX), INT16_MIN)); + } + + return status; +} diff --git a/host/utilities/bladeRF-power/src/helpers.c b/host/utilities/bladeRF-power/src/helpers.c index 8abf726c..15aedeca 100644 --- a/host/utilities/bladeRF-power/src/helpers.c +++ b/host/utilities/bladeRF-power/src/helpers.c @@ -32,6 +32,7 @@ #include "helpers.h" #include "libbladeRF.h" #include "log.h" +#include "filter.h" #define INT12_MAX 2047 @@ -76,18 +77,31 @@ bladerf_direction ask_direction() { } } -static int calculate_power(const int16_t *samples, size_t num_samples, double *power) { - CHECK_NULL(samples, power); - +static int calculate_power(struct bladerf *dev, const int16_t *samples, size_t num_samples, double *power) { + CHECK_NULL(dev, samples, power); + int status = 0; double sum = 0; + int16_t *samples_filtered = NULL; + + samples_filtered = malloc(2 * num_samples * sizeof(int16_t)); + CHECK_NULL(samples_filtered); + + CHECK(flatten_noise_figure(dev, samples, num_samples, samples_filtered)); + for (size_t i = 0; i < num_samples; i++) { - sum += (samples[2*i] * samples[2*i]) + (samples[2*i+1] * samples[2*i+1]); + sum += (samples_filtered[2*i] * samples_filtered[2*i]) + (samples_filtered[2*i+1] * samples_filtered[2*i+1]); } + const double avg_power = sum / num_samples; const double max_power = INT12_MAX * INT12_MAX; const double avg_power_dbfs = 10 * log10(avg_power / max_power); *power = avg_power_dbfs; - return 0; + +error: + if (samples_filtered != NULL) + free(samples_filtered); + + return status; } int start_streaming(struct bladerf *dev, struct test_params *test) { @@ -175,7 +189,7 @@ int start_streaming(struct bladerf *dev, struct test_params *test) { if (test->direction == BLADERF_RX) { CHECK(bladerf_sync_rx(dev, samples, num_samples, NULL, 1000)); - CHECK(calculate_power(samples, num_samples, &test->rx_power)); + CHECK(calculate_power(dev, samples, num_samples, &test->rx_power)); } else { CHECK(bladerf_sync_tx(dev, samples, num_samples, NULL, 1000)); } From 935ef43fb937e35b2238a329383d0b932e6b520d Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Tue, 9 Jul 2024 10:47:20 -0500 Subject: [PATCH 081/238] bladeRF-power: cli: added engineering notation suffix ingestion This allows arguments to be specified with engineering notation. E.g. bladeRF-power -f 4G --- host/utilities/bladeRF-power/include/helpers.h | 4 ++++ host/utilities/bladeRF-power/src/helpers.c | 9 +++++++++ host/utilities/bladeRF-power/src/main.c | 3 ++- 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/host/utilities/bladeRF-power/include/helpers.h b/host/utilities/bladeRF-power/include/helpers.h index 6112fd49..af5bfb97 100644 --- a/host/utilities/bladeRF-power/include/helpers.h +++ b/host/utilities/bladeRF-power/include/helpers.h @@ -30,8 +30,12 @@ #include "libbladeRF.h" #include "init.h" +#include "conversions.h" #define DIRECTION_UNSET 3 +#define NUM_FREQ_SUFFIXES 6 + +extern const struct numeric_suffix freq_suffixes[NUM_FREQ_SUFFIXES]; /** * @brief Ask the user for TX or RX operation. diff --git a/host/utilities/bladeRF-power/src/helpers.c b/host/utilities/bladeRF-power/src/helpers.c index 15aedeca..cb9e2582 100644 --- a/host/utilities/bladeRF-power/src/helpers.c +++ b/host/utilities/bladeRF-power/src/helpers.c @@ -203,3 +203,12 @@ error: endwin(); return status; } + +struct numeric_suffix const freq_suffixes[NUM_FREQ_SUFFIXES] = { + { "G", 1000 * 1000 * 1000 }, + { "GHz", 1000 * 1000 * 1000 }, + { "M", 1000 * 1000 }, + { "MHz", 1000 * 1000 }, + { "k", 1000 }, + { "kHz", 1000 } +}; diff --git a/host/utilities/bladeRF-power/src/main.c b/host/utilities/bladeRF-power/src/main.c index 7edca81f..7f013be2 100644 --- a/host/utilities/bladeRF-power/src/main.c +++ b/host/utilities/bladeRF-power/src/main.c @@ -77,7 +77,8 @@ int main(int argc, char *argv[]) break; case 'f': - test.frequency = str2uint64(optarg, 1, UINT64_MAX, &ok); + test.frequency = str2uint64_suffix(optarg, 0, UINT64_MAX, freq_suffixes, + NUM_FREQ_SUFFIXES, &ok); printf("Frequency: %" PRIu64 "\n", test.frequency); break; From f370c2aef32898ec788e0f88e59095b80621cb20 Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Fri, 2 Aug 2024 14:01:21 -0500 Subject: [PATCH 082/238] bladeRF-power: cli: rm module disable after stream Closing the bladeRF after the module disable causes some usb interfaces to fatally crash specifically for the TX interface. discovery notes: - Enable module and bladerf_close both call sync_deinit - Mutex is destroyed in sync_deinit --- host/utilities/bladeRF-power/src/helpers.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/host/utilities/bladeRF-power/src/helpers.c b/host/utilities/bladeRF-power/src/helpers.c index cb9e2582..d6dd4f0b 100644 --- a/host/utilities/bladeRF-power/src/helpers.c +++ b/host/utilities/bladeRF-power/src/helpers.c @@ -196,9 +196,7 @@ int start_streaming(struct bladerf *dev, struct test_params *test) { } error: - bladerf_enable_module(dev, ch, false); free(samples); - delwin(main_win); endwin(); return status; From d9be3348c336a0a0c2838e5f3d93d99800f7b6d7 Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Wed, 10 Jul 2024 10:05:10 -0500 Subject: [PATCH 083/238] bladeRF-power: cli: display calibration info when 'i' is pressed --- host/utilities/bladeRF-power/include/window.h | 2 + host/utilities/bladeRF-power/src/helpers.c | 11 ++++ host/utilities/bladeRF-power/src/window.c | 63 ++++++++++++++++++- 3 files changed, 74 insertions(+), 2 deletions(-) diff --git a/host/utilities/bladeRF-power/include/window.h b/host/utilities/bladeRF-power/include/window.h index bc8e93d6..aa74e90b 100644 --- a/host/utilities/bladeRF-power/include/window.h +++ b/host/utilities/bladeRF-power/include/window.h @@ -54,4 +54,6 @@ void init_curses(WINDOW **win); */ void update_window(WINDOW *win, struct test_params *test); +void display_overlay(WINDOW *main_win, const struct bladerf_gain_cal_tbl *cal_tbl); + #endif // HELPERS_H_ diff --git a/host/utilities/bladeRF-power/src/helpers.c b/host/utilities/bladeRF-power/src/helpers.c index d6dd4f0b..33d64395 100644 --- a/host/utilities/bladeRF-power/src/helpers.c +++ b/host/utilities/bladeRF-power/src/helpers.c @@ -133,6 +133,7 @@ int start_streaming(struct bladerf *dev, struct test_params *test) { int cmd = 0; init_curses(&main_win); + bool show_calibration_info = false; while (status == 0 && cmd != 'q') { cmd = getch(); @@ -178,6 +179,10 @@ int start_streaming(struct bladerf *dev, struct test_params *test) { CHECK(bladerf_get_gain_mode(dev, ch, &test->gain_mode)); } + if (cmd == 'i') { + show_calibration_info = !show_calibration_info; + } + if (BLADERF_CHANNEL_IS_TX(ch) == false) { CHECK(bladerf_get_gain_mode(dev, ch, &test->gain_mode)); } @@ -187,6 +192,12 @@ int start_streaming(struct bladerf *dev, struct test_params *test) { update_window(main_win, test); + if (show_calibration_info) { + const struct bladerf_gain_cal_tbl *cal_tbl = NULL; + CHECK(bladerf_get_gain_calibration(dev, ch, &cal_tbl)); + display_overlay(main_win, cal_tbl); + } + if (test->direction == BLADERF_RX) { CHECK(bladerf_sync_rx(dev, samples, num_samples, NULL, 1000)); CHECK(calculate_power(dev, samples, num_samples, &test->rx_power)); diff --git a/host/utilities/bladeRF-power/src/window.c b/host/utilities/bladeRF-power/src/window.c index 206166d1..3a087936 100644 --- a/host/utilities/bladeRF-power/src/window.c +++ b/host/utilities/bladeRF-power/src/window.c @@ -108,8 +108,67 @@ void update_window(WINDOW *win, struct test_params *test) { mvwprintw(win, start_y++, 1, "Avg Power: %0.2fdBFS", test->rx_power); } - wprintw(win, "\n"); - mvwprintw(win, maxy-2, 1, "Keys: [h/l] Frequency, [j/k] Gain, [c] Toggle Calibration, [a] Toggle AGC, [q] Quit\n"); + mvwprintw(win, maxy-2, 1, "Keys: [h/l] Frequency, [j/k] Gain, [c] Toggle Calibration, [a] Toggle AGC, [i] Cal info [q], Quit\n"); box(win, 0, 0); wrefresh(win); } + +static char* truncate_path(const char* path, size_t max_width) { + static char truncated[256]; // Adjust size as needed + if (strlen(path) <= max_width) { + return (char*)path; + } + + int prefix_len = (max_width - 3) / 2; + int suffix_len = max_width - 3 - prefix_len; + + snprintf(truncated, sizeof(truncated), "%.*s...%s", + prefix_len, path, path + strlen(path) - suffix_len); + return truncated; +} + +void display_overlay(WINDOW *main_win, const struct bladerf_gain_cal_tbl *cal_tbl) { + int main_height, main_width; + getmaxyx(main_win, main_height, main_width); + size_t overlay_width = main_width / 2; + size_t overlay_height = main_height - 3; + + WINDOW *overlay_win = newwin(overlay_height, overlay_width, 1, main_width / 4); + + size_t start_y = 3; + mvwprintw(overlay_win, 1, 2, "Gain Calibration Table Info"); + mvwprintw(overlay_win, start_y++, 2, "File: %s", + truncate_path(cal_tbl->file_path, overlay_width - 10)); + mvwprintw(overlay_win, start_y++, 2, "Version: %u.%u.%u", + cal_tbl->version.major, cal_tbl->version.minor, cal_tbl->version.patch); + mvwprintw(overlay_win, start_y++, 2, "Channel: %s", + cal_tbl->ch == BLADERF_CHANNEL_RX(0) ? "RX1" : + cal_tbl->ch == BLADERF_CHANNEL_TX(0) ? "TX1" : + cal_tbl->ch == BLADERF_CHANNEL_RX(1) ? "RX2" : + cal_tbl->ch == BLADERF_CHANNEL_TX(1) ? "TX2" : "Unknown"); + mvwprintw(overlay_win, start_y++, 2, "Num. Entries: %u", cal_tbl->n_entries); + mvwprintw(overlay_win, start_y++, 2, "First Freq: %.3f MHz", + (double)cal_tbl->start_freq / 1e6); + mvwprintw(overlay_win, start_y++, 2, "Last Freq: %.3f MHz", + (double)cal_tbl->stop_freq / 1e6); + mvwprintw(overlay_win, start_y++, 2, "Enabled: %s", cal_tbl->enabled ? "Yes" : "No"); + mvwprintw(overlay_win, start_y++, 2, "Gain Target: %d dB", cal_tbl->gain_target); + mvwprintw(overlay_win, start_y++, 2, "State: %s", + cal_tbl->state == BLADERF_GAIN_CAL_UNINITIALIZED ? "Uninitialized" : + cal_tbl->state == BLADERF_GAIN_CAL_LOADED ? "Loaded" : + cal_tbl->state == BLADERF_GAIN_CAL_UNLOADED ? "Unloaded" : "Unknown"); + + + box(overlay_win, 0, 0); + + if (overlay_height < start_y + 2) { + const char* WIN_HEIGHT_WARNING = "[Warning] Increase terminal window height to see more info\0"; + int warning_length = strlen(WIN_HEIGHT_WARNING); + int start_x = (getmaxx(overlay_win) - warning_length) / 2; + mvwprintw(overlay_win, 0, start_x, "%s", WIN_HEIGHT_WARNING); + } + + mvwprintw(overlay_win, main_height - 5, 2, "Press any key to close"); + wnoutrefresh(overlay_win); + doupdate(); +} From eff35dd79961709aa0908489883bc649203927a1 Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Fri, 2 Aug 2024 11:51:21 -0500 Subject: [PATCH 084/238] bladeRF-power: cli: display warning if bladeRF-power window is too small This actively checks if the window is too small and will provide a warning when data is being hidden. --- host/utilities/bladeRF-power/src/window.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/host/utilities/bladeRF-power/src/window.c b/host/utilities/bladeRF-power/src/window.c index 3a087936..c679dc4a 100644 --- a/host/utilities/bladeRF-power/src/window.c +++ b/host/utilities/bladeRF-power/src/window.c @@ -82,7 +82,9 @@ void init_curses(WINDOW **win) { } void update_window(WINDOW *win, struct test_params *test) { + const size_t MIN_LINES = 9; size_t maxy = getmaxy(win); + size_t maxx = getmaxx(win); size_t start_y = 1; werase(win); @@ -110,6 +112,14 @@ void update_window(WINDOW *win, struct test_params *test) { mvwprintw(win, maxy-2, 1, "Keys: [h/l] Frequency, [j/k] Gain, [c] Toggle Calibration, [a] Toggle AGC, [i] Cal info [q], Quit\n"); box(win, 0, 0); + + if (maxy < MIN_LINES) { + const char* WIN_HEIGHT_WARNING = "[Warning] Increase terminal window height to see more info\0"; + int warning_length = strlen(WIN_HEIGHT_WARNING); + int start_x = (maxx - warning_length) / 2; + mvwprintw(win, 0, start_x, "%s", WIN_HEIGHT_WARNING); + } + wrefresh(win); } From 818082947a4ee91262172c8e34c778b1bd9ec02e Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Thu, 11 Jul 2024 15:25:21 -0500 Subject: [PATCH 085/238] bladeRF-power: cli: added stderr message viewer --- host/utilities/bladeRF-power/include/init.h | 2 ++ host/utilities/bladeRF-power/src/helpers.c | 38 +++++++++++++++++++++ host/utilities/bladeRF-power/src/window.c | 24 +++++++++++-- 3 files changed, 62 insertions(+), 2 deletions(-) diff --git a/host/utilities/bladeRF-power/include/init.h b/host/utilities/bladeRF-power/include/init.h index 8639b010..80b0746b 100644 --- a/host/utilities/bladeRF-power/include/init.h +++ b/host/utilities/bladeRF-power/include/init.h @@ -46,6 +46,8 @@ struct test_params { double rx_power; bool gain_cal_enabled; char *gain_cal_file; + bool show_messages; + char message_buffer[4096]; // Adjust size as needed }; /** diff --git a/host/utilities/bladeRF-power/src/helpers.c b/host/utilities/bladeRF-power/src/helpers.c index 33d64395..7e5372e3 100644 --- a/host/utilities/bladeRF-power/src/helpers.c +++ b/host/utilities/bladeRF-power/src/helpers.c @@ -28,6 +28,7 @@ #include #include #include +#include #include "window.h" #include "helpers.h" #include "libbladeRF.h" @@ -111,6 +112,17 @@ int start_streaming(struct bladerf *dev, struct test_params *test) { const size_t num_samples = test->samp_rate / 30; // 30Hz const struct bladerf_gain_cal_tbl *gain_tbl = NULL; + // Set up stderr redirection + int pipefd[2]; + int stderr_copy = dup(STDERR_FILENO); + if (pipe(pipefd) == -1) { + perror("pipe"); + return -1; + } + dup2(pipefd[1], STDERR_FILENO); + close(pipefd[1]); + fcntl(pipefd[0], F_SETFL, O_NONBLOCK); + int16_t *samples = malloc(2 * num_samples * sizeof(int16_t)); if (samples == NULL) { fprintf(stderr, "Error allocating memory for samples. Exiting...\n"); @@ -134,6 +146,8 @@ int start_streaming(struct bladerf *dev, struct test_params *test) { int cmd = 0; init_curses(&main_win); bool show_calibration_info = false; + test->show_messages = false; + memset(test->message_buffer, 0, sizeof(test->message_buffer)); while (status == 0 && cmd != 'q') { cmd = getch(); @@ -144,6 +158,24 @@ int start_streaming(struct bladerf *dev, struct test_params *test) { CHECK(bladerf_get_frequency(dev, ch, &test->frequency_actual)); } + if (cmd == 'm') { + test->show_messages = !test->show_messages; + } + + // Read from stderr pipe + char temp_buffer[1024]; + ssize_t bytes_read; + while ((bytes_read = read(pipefd[0], temp_buffer, sizeof(temp_buffer) - 1)) > 0) { + temp_buffer[bytes_read] = '\0'; + strncat(test->message_buffer, temp_buffer, sizeof(test->message_buffer) - strlen(test->message_buffer) - 1); + } + + // Truncate message buffer if it gets too long + if (strlen(test->message_buffer) > sizeof(test->message_buffer) / 2) { + memmove(test->message_buffer, test->message_buffer + strlen(test->message_buffer) / 2, strlen(test->message_buffer) / 2); + test->message_buffer[strlen(test->message_buffer) / 2] = '\0'; + } + if (cmd == 'h' || cmd == KEY_LEFT) { bladerf_frequency next_freq = test->frequency - 5e6; test->frequency = (next_freq < test->freq_min) ? test->freq_min : next_freq; @@ -210,6 +242,12 @@ error: free(samples); delwin(main_win); endwin(); + + // Restore original stderr + dup2(stderr_copy, STDERR_FILENO); + close(stderr_copy); + close(pipefd[0]); + return status; } diff --git a/host/utilities/bladeRF-power/src/window.c b/host/utilities/bladeRF-power/src/window.c index c679dc4a..be08fd98 100644 --- a/host/utilities/bladeRF-power/src/window.c +++ b/host/utilities/bladeRF-power/src/window.c @@ -110,7 +110,26 @@ void update_window(WINDOW *win, struct test_params *test) { mvwprintw(win, start_y++, 1, "Avg Power: %0.2fdBFS", test->rx_power); } - mvwprintw(win, maxy-2, 1, "Keys: [h/l] Frequency, [j/k] Gain, [c] Toggle Calibration, [a] Toggle AGC, [i] Cal info [q], Quit\n"); + if (test->show_messages) { + int message_start_y = 10; + mvwprintw(win, message_start_y, 1, "Messages:"); + + // Leave space for the box and key instructions + int available_lines = maxy - message_start_y - 3; + + char *line_start = test->message_buffer; + char *line_end; + int line_count = 0; + while ((line_end = strchr(line_start, '\n')) && line_count < available_lines) { + *line_end = '\0'; // Temporarily replace newline with null terminator + mvwprintw(win, message_start_y + 1 + line_count, 1, "%.*s", (int)(maxx - 2), line_start); + *line_end = '\n'; // Restore newline + line_start = line_end + 1; + line_count++; + } + } + + mvwprintw(win, maxy-2, 1, "Keys: [q] Quit, [h/l] Frequency, [j/k] Gain, [c] Toggle Calibration, [a] Toggle AGC, [i] Cal info, [m] Toggle messages\n"); box(win, 0, 0); if (maxy < MIN_LINES) { @@ -120,7 +139,8 @@ void update_window(WINDOW *win, struct test_params *test) { mvwprintw(win, 0, start_x, "%s", WIN_HEIGHT_WARNING); } - wrefresh(win); + wnoutrefresh(win); + doupdate(); } static char* truncate_path(const char* path, size_t max_width) { From 68f396a10242af08f2c9ea8809179d7cb46c9af9 Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Sun, 4 Aug 2024 19:06:10 -0500 Subject: [PATCH 086/238] bladeRF-power: added ascii text art for power measurements MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit █████╗ ███████╗ ██████╗ ██╗ ██████╗ ██████╗ ███╗ ███╗ ██╔══██╗ ╚════██║ ╚════██╗ ███║ ██╔══██╗██╔══██╗████╗ ████║ ███████╗ ╚██████║ ██╔╝ █████╔╝ ╚██║ ██║ ██║██████╔╝██╔████╔██║ ╚═══██║ ██╔╝ ██╔═══╝ ██║ ██║ ██║██╔══██╗██║╚██╔╝██║ █████╔╝ ██╔╝ ██╗███████╗ ██║ ██████╔╝██████╔╝██║ ╚═╝ ██║ ╚════╝ ╚═╝ ╚═╝╚══════╝ ╚═╝ ╚═════╝ ╚═════╝ ╚═╝ ╚═╝ --- host/utilities/bladeRF-power/CMakeLists.txt | 5 +- host/utilities/bladeRF-power/include/text.h | 64 +++++++ host/utilities/bladeRF-power/src/text.c | 182 ++++++++++++++++++++ host/utilities/bladeRF-power/src/window.c | 7 + 4 files changed, 257 insertions(+), 1 deletion(-) create mode 100644 host/utilities/bladeRF-power/include/text.h create mode 100644 host/utilities/bladeRF-power/src/text.c diff --git a/host/utilities/bladeRF-power/CMakeLists.txt b/host/utilities/bladeRF-power/CMakeLists.txt index 4d5d5f2a..458afe90 100644 --- a/host/utilities/bladeRF-power/CMakeLists.txt +++ b/host/utilities/bladeRF-power/CMakeLists.txt @@ -1,6 +1,8 @@ -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10) project(bladeRF-power LANGUAGES C) +set (CURSES_NEED_NCURSES TRUE) +set (CURSES_NEED_WIDE TRUE) find_package(Curses REQUIRED) include_directories( @@ -14,6 +16,7 @@ add_executable(${PROJECT_NAME} src/helpers.c src/window.c src/filter.c + src/text.c src/main.c) target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wextra -Werror) diff --git a/host/utilities/bladeRF-power/include/text.h b/host/utilities/bladeRF-power/include/text.h new file mode 100644 index 00000000..26c60d95 --- /dev/null +++ b/host/utilities/bladeRF-power/include/text.h @@ -0,0 +1,64 @@ +/* + * This file is part of the bladeRF project: + * http://www.github.com/nuand/bladeRF + * + * Copyright (C) 2024 Nuand LLC + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + * + * This program is intended to verify that C programs build against + * libbladeRF without any unintended dependencies. + */ +#include + +#define DIGIT_HEIGHT 6 +#define DIGIT_WIDTH 11 +#define MAX_DIGITS 20 +#define POWER_SUFFIX_DBM 0 +#define POWER_SUFFIX_DBFS 1 +#define DEFCON_ART_HEIGHT 5 +#define DEFCON_ART_WIDTH 56 +#define DEFCON_ART_VARIATIONS 6 + +/** + * @brief Display a double in the form of ASCII art + * + * @param win Window to display the ASCII art in + * @param number Number to display + * @param start_y Starting y coordinate + * @param start_x Starting x coordinate + * @param suffix_type Type of suffix to display + * + * @note This function will display a double in the form of ASCII art + */ +void display_double(WINDOW *win, double number, int start_y, int start_x, int suffix_type); + + +/** + * @brief Display DEFCON ASCII art + * + * @param win Window to display the art in + * @param start_y Starting y coordinate + * @param start_x Starting x coordinate + * @param variation Variation of the art to display + * + * @note The variation parameter is used to select a specific DEFCON ASCII art + */ +void display_defcon_art(WINDOW *win, int start_y, int start_x, int variation); + diff --git a/host/utilities/bladeRF-power/src/text.c b/host/utilities/bladeRF-power/src/text.c new file mode 100644 index 00000000..eb52c20d --- /dev/null +++ b/host/utilities/bladeRF-power/src/text.c @@ -0,0 +1,182 @@ +/* + * This file is part of the bladeRF project: + * http://www.github.com/nuand/bladeRF + * + * Copyright (C) 2024 Nuand LLC + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + * + * This program is intended to verify that C programs build against + * libbladeRF without any unintended dependencies. + */ +#include +#include +#include +#include +#include +#include +#include "text.h" + +const char* power_suffix[2][DIGIT_HEIGHT] = { + { + "██████╗ ██████╗ ███╗ ███╗", + "██╔══██╗██╔══██╗████╗ ████║", + "██║ ██║██████╔╝██╔████╔██║", + "██║ ██║██╔══██╗██║╚██╔╝██║", + "██████╔╝██████╔╝██║ ╚═╝ ██║", + "╚═════╝ ╚═════╝ ╚═╝ ╚═╝", + }, + { + "██████╗ ██████╗ ███████╗███████╗", + "██╔══██╗██╔══██╗██╔════╝██╔════╝", + "██║ ██║██████╔╝█████╗ ███████╗", + "██║ ██║██╔══██╗██╔══╝ ╚════██║", + "██████╔╝██████╔╝██║ ███████║", + "╚═════╝ ╚═════╝ ╚═╝ ╚══════╝", + } +}; + +const char* ascii_art_digits[12][DIGIT_HEIGHT] = { + { + " ██████╗ ", + "██╔═══██╗", + "██║ ██║", + "██║ ██║", + "╚██████╔╝", + " ╚═════╝ " + }, + { + " ██╗", + "███║", + "╚██║", + " ██║", + " ██║", + " ╚═╝" + }, + { + "██████╗ ", + "╚════██╗", + " █████╔╝", + "██╔═══╝ ", + "███████╗", + "╚══════╝" + }, + { + "██████╗ ", + "╚════██╗", + " █████╔╝", + " ╚═══██╗", + "██████╔╝", + "╚═════╝ " + }, + { + "██╗ ██╗", + "██║ ██║", + "███████║", + "╚════██║", + " ██║", + " ╚═╝" + }, + { + "███████╗", + "██╔════╝", + "███████╗", + "╚════██║", + "███████║", + "╚══════╝" + }, + { + " ██████╗", + "██╔════╝", + "███████╗", + "██╔═══██╗", + "╚██████╔╝", + " ╚═════╝ " + }, + { + "███████╗", + "╚════██║", + " ██╔╝", + " ██╔╝ ", + " ██╔╝ ", + " ╚═╝ " + }, + { + " █████╗ ", + "██╔══██╗", + "╚█████╔╝", + "██╔══██╗", + "╚█████╔╝", + " ╚════╝ " + }, + { + " █████╗ ", + "██╔══██╗", + "╚██████║", + " ╚═══██║", + " █████╔╝", + " ╚════╝ " + }, + { // Negative symbol (index 10) + " ", + " ", + "███████╗", + " ", + " ", + " " + }, + { // Decimal point (index 11) + " ", + " ", + " ", + " ", + " ██╗", + " ╚═╝" + } +}; + +void display_digit(WINDOW *win, int digit, int start_y, int start_x) { + for (int i = 0; i < DIGIT_HEIGHT; i++) { + mvwaddstr(win, start_y + i, start_x, ascii_art_digits[digit][i]); + } +} + +void display_double(WINDOW *win, double number, int start_y, int start_x, int suffix_type) { + int x_offset = 0; + char number_str[MAX_DIGITS]; + snprintf(number_str, MAX_DIGITS, "%.2f", number); + for (int i = 0; number_str[i] != '\0'; i++) { + if (number_str[i] >= '0' && number_str[i] <= '9') { + display_digit(win, number_str[i] - '0', start_y, start_x + x_offset); + x_offset += DIGIT_WIDTH; + } else if (number_str[i] == '.') { + display_digit(win, 11, start_y, start_x + x_offset); + x_offset += 4; // Width of decimal point + } else if (number_str[i] == '-') { + display_digit(win, 10, start_y, start_x + x_offset); + x_offset += DIGIT_WIDTH; + } + } + + x_offset += 2; // Width of decimal point + + for (size_t i = 0; i < DIGIT_HEIGHT; i++) { + mvwaddstr(win, start_y + i, start_x + x_offset, power_suffix[suffix_type][i]); + } +} diff --git a/host/utilities/bladeRF-power/src/window.c b/host/utilities/bladeRF-power/src/window.c index be08fd98..294bc543 100644 --- a/host/utilities/bladeRF-power/src/window.c +++ b/host/utilities/bladeRF-power/src/window.c @@ -28,6 +28,8 @@ #include #include #include +#include +#include "text.h" #include "helpers.h" #include "libbladeRF.h" @@ -68,6 +70,7 @@ static double rx_power_dbfs_to_dbm(double power_dbfs, bladerf_gain target_gain) } void init_curses(WINDOW **win) { + setlocale(LC_ALL, ""); // Set locale for wide character support initscr(); // Start curses mode noecho(); // Don't echo input characters timeout(0); // Non-blocking getch() returns ERR if no input is waiting @@ -103,11 +106,15 @@ void update_window(WINDOW *win, struct test_params *test) { if (test->gain_cal_enabled && test->direction == BLADERF_TX) { mvwprintw(win, start_y++, 1, "Output Pwr: %" PRIi32 "dBm, range: [%" PRIi32 ", %" PRIi32 "]\n", test->gain-60, test->gain_min-60, test->gain_max-60); + display_double(win, test->gain-60, start_y+=2, 1, POWER_SUFFIX_DBM); } else if (test->gain_cal_enabled && test->direction == BLADERF_RX) { mvwprintw(win, start_y++, 1, "Avg Power: %0.2fdBFS, %0.2fdBm", test->rx_power, rx_power_dbfs_to_dbm(test->rx_power, test->gain)); + display_double(win, rx_power_dbfs_to_dbm(test->rx_power, test->gain), + start_y+=2, 1, POWER_SUFFIX_DBM); } else if (test->direction == BLADERF_RX) { mvwprintw(win, start_y++, 1, "Avg Power: %0.2fdBFS", test->rx_power); + display_double(win, test->rx_power, start_y+=2, 1, POWER_SUFFIX_DBFS); } if (test->show_messages) { From 94c08ebc9f1b13fd9660397b4017bf1d78535035 Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Wed, 7 Aug 2024 12:08:45 -0500 Subject: [PATCH 087/238] bladeRF-power: added channel select --- host/utilities/bladeRF-power/include/init.h | 1 + host/utilities/bladeRF-power/src/helpers.c | 5 ++++- host/utilities/bladeRF-power/src/init.c | 7 +++++-- host/utilities/bladeRF-power/src/main.c | 12 +++++++++++- host/utilities/bladeRF-power/src/window.c | 4 +++- 5 files changed, 24 insertions(+), 5 deletions(-) diff --git a/host/utilities/bladeRF-power/include/init.h b/host/utilities/bladeRF-power/include/init.h index 80b0746b..dade7d08 100644 --- a/host/utilities/bladeRF-power/include/init.h +++ b/host/utilities/bladeRF-power/include/init.h @@ -31,6 +31,7 @@ #include "libbladeRF.h" struct test_params { + bladerf_channel channel; bladerf_frequency frequency; bladerf_frequency frequency_actual; bladerf_frequency freq_min; diff --git a/host/utilities/bladeRF-power/src/helpers.c b/host/utilities/bladeRF-power/src/helpers.c index 7e5372e3..bfa713b4 100644 --- a/host/utilities/bladeRF-power/src/helpers.c +++ b/host/utilities/bladeRF-power/src/helpers.c @@ -108,10 +108,13 @@ error: int start_streaming(struct bladerf *dev, struct test_params *test) { int status = 0; WINDOW *main_win = NULL; - bladerf_channel ch = (test->direction == BLADERF_TX) ? BLADERF_CHANNEL_TX(0) : BLADERF_CHANNEL_RX(0); const size_t num_samples = test->samp_rate / 30; // 30Hz const struct bladerf_gain_cal_tbl *gain_tbl = NULL; + bladerf_channel ch = (test->direction == BLADERF_TX) + ? BLADERF_CHANNEL_TX(test->channel) + : BLADERF_CHANNEL_RX(test->channel); + // Set up stderr redirection int pipefd[2]; int stderr_copy = dup(STDERR_FILENO); diff --git a/host/utilities/bladeRF-power/src/init.c b/host/utilities/bladeRF-power/src/init.c index db9587fc..dbac8437 100644 --- a/host/utilities/bladeRF-power/src/init.c +++ b/host/utilities/bladeRF-power/src/init.c @@ -40,6 +40,7 @@ } while (0) void init_params(struct test_params *test) { + test->channel = 0; test->frequency = 1e9; test->frequency_actual = test->frequency; test->freq_min = 65e6; @@ -64,8 +65,6 @@ int dev_init(struct bladerf *dev, bladerf_direction dir, struct test_params *tes int status = 0; const struct bladerf_range *freq_range; const struct bladerf_range *gain_range; - bladerf_channel ch = (dir == BLADERF_TX) ? BLADERF_CHANNEL_TX(0) : BLADERF_CHANNEL_RX(0); - bladerf_channel_layout layout = (dir == BLADERF_TX) ? BLADERF_TX_X1 : BLADERF_RX_X1; bladerf_format format = BLADERF_FORMAT_SC16_Q11; size_t num_buffers = 512; @@ -73,6 +72,10 @@ int dev_init(struct bladerf *dev, bladerf_direction dir, struct test_params *tes size_t num_transfers = 32; size_t stream_timeout = 1000; //ms + bladerf_channel ch = (dir == BLADERF_TX) + ? BLADERF_CHANNEL_TX(test->channel) + : BLADERF_CHANNEL_RX(test->channel); + CHECK(bladerf_set_gain(dev, ch, test->gain)); CHECK(bladerf_set_sample_rate(dev, ch, test->samp_rate, NULL)); CHECK(bladerf_set_bandwidth(dev, ch, test->bandwidth, &test->bandwidth)); diff --git a/host/utilities/bladeRF-power/src/main.c b/host/utilities/bladeRF-power/src/main.c index 7f013be2..971cfcb9 100644 --- a/host/utilities/bladeRF-power/src/main.c +++ b/host/utilities/bladeRF-power/src/main.c @@ -41,9 +41,10 @@ } \ } while (0) -#define OPTSTR "d:l:trf:v:h" +#define OPTSTR "d:c:l:trf:v:h" struct option long_options[] = { { "device", required_argument, NULL, 'd' }, + { "channel", required_argument, NULL, 'c' }, { "load", required_argument, NULL, 'l' }, { "tx", no_argument, NULL, 't' }, { "rx", no_argument, NULL, 'r' }, @@ -76,6 +77,14 @@ int main(int argc, char *argv[]) devstr = optarg; break; + case 'c': + test.channel = str2int(optarg, 0, INT32_MAX, &ok); + if (!ok) { + fprintf(stderr, "Invalid channel: %s\n", optarg); + return -1; + } + break; + case 'f': test.frequency = str2uint64_suffix(optarg, 0, UINT64_MAX, freq_suffixes, NUM_FREQ_SUFFIXES, &ok); @@ -107,6 +116,7 @@ int main(int argc, char *argv[]) case 'h': printf("Usage: %s [options]\n", argv[0]); printf(" -d, --device Specify the device to open.\n"); + printf(" -c, --channel Specify the channel to use.\n"); printf(" -l, --load Load a specified gain cal file (.csv or .tbl).\n"); printf(" -t, --tx Transmit mode. Can't be combined with --rx.\n"); printf(" -r, --rx Receive mode. Can't be combined with --tx.\n"); diff --git a/host/utilities/bladeRF-power/src/window.c b/host/utilities/bladeRF-power/src/window.c index 294bc543..f54fd56a 100644 --- a/host/utilities/bladeRF-power/src/window.c +++ b/host/utilities/bladeRF-power/src/window.c @@ -85,13 +85,15 @@ void init_curses(WINDOW **win) { } void update_window(WINDOW *win, struct test_params *test) { - const size_t MIN_LINES = 9; + const size_t MIN_LINES = 10; size_t maxy = getmaxy(win); size_t maxx = getmaxx(win); size_t start_y = 1; werase(win); + mvwprintw(win, start_y++, 1, "Channel: %s(%i)\n", + test->direction == BLADERF_TX ? "TX" : "RX", test->channel); mvwprintw(win, start_y++, 1, "Gain Calibration: %s\n", test->gain_cal_enabled ? "enabled" : "disabled"); mvwprintw(win, start_y++, 1, "Automatic Gain Control: %s\n", test->gain_mode == BLADERF_GAIN_MGC ? "disabled" : "enabled"); mvwprintw(win, start_y++, 1, "Bandwidth: %7.3f %sHz\n", From 5f64e3f1c46a6cc17cf8f0b0ad49e33ff91cac8a Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Wed, 7 Aug 2024 14:52:28 -0500 Subject: [PATCH 088/238] bladeRF-power: set test gain control to manual when TX --- host/utilities/bladeRF-power/src/helpers.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/host/utilities/bladeRF-power/src/helpers.c b/host/utilities/bladeRF-power/src/helpers.c index bfa713b4..77d4d2fd 100644 --- a/host/utilities/bladeRF-power/src/helpers.c +++ b/host/utilities/bladeRF-power/src/helpers.c @@ -115,6 +115,9 @@ int start_streaming(struct bladerf *dev, struct test_params *test) { ? BLADERF_CHANNEL_TX(test->channel) : BLADERF_CHANNEL_RX(test->channel); + if (test->direction == BLADERF_TX) + test->gain_mode = BLADERF_GAIN_MGC; + // Set up stderr redirection int pipefd[2]; int stderr_copy = dup(STDERR_FILENO); From b98f385fb4e48b57eeab8a702712ed93a1a74766 Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Wed, 7 Aug 2024 19:18:10 -0500 Subject: [PATCH 089/238] bladeRF-power: added sample rate assignment --- host/utilities/bladeRF-power/src/main.c | 10 +++++++++- host/utilities/bladeRF-power/src/window.c | 6 +++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/host/utilities/bladeRF-power/src/main.c b/host/utilities/bladeRF-power/src/main.c index 971cfcb9..58baba3f 100644 --- a/host/utilities/bladeRF-power/src/main.c +++ b/host/utilities/bladeRF-power/src/main.c @@ -41,7 +41,7 @@ } \ } while (0) -#define OPTSTR "d:c:l:trf:v:h" +#define OPTSTR "d:c:l:trf:s:v:h" struct option long_options[] = { { "device", required_argument, NULL, 'd' }, { "channel", required_argument, NULL, 'c' }, @@ -49,6 +49,7 @@ struct option long_options[] = { { "tx", no_argument, NULL, 't' }, { "rx", no_argument, NULL, 'r' }, { "frequency", required_argument, NULL, 'f' }, + { "sample-rate",required_argument, NULL, 's' }, { "verbosity", optional_argument, NULL, 'v' }, { "help", no_argument, NULL, 'h' }, { NULL, 0, NULL, 0 }, @@ -105,6 +106,12 @@ int main(int argc, char *argv[]) test.gain_cal_file = optarg; break; + case 's': + test.samp_rate = str2uint_suffix(optarg, 0, UINT32_MAX, freq_suffixes, + NUM_FREQ_SUFFIXES, &ok); + printf("Sample rate: %i\nHz", test.samp_rate); + break; + case 'v': log_level = str2loglevel(optarg, &ok); if (!ok) { @@ -121,6 +128,7 @@ int main(int argc, char *argv[]) printf(" -t, --tx Transmit mode. Can't be combined with --rx.\n"); printf(" -r, --rx Receive mode. Can't be combined with --tx.\n"); printf(" -f, --frequency Set the initial frequency (in Hz).\n"); + printf(" -s, --sample-rate Set the initial sample rate (in Hz).\n"); printf(" -v, --verbosity Set the libbladeRF verbosity level (e.g., verbose, debug).\n"); printf(" -h, --help Display this help text and exit.\n"); printf("\n"); diff --git a/host/utilities/bladeRF-power/src/window.c b/host/utilities/bladeRF-power/src/window.c index f54fd56a..b887dae1 100644 --- a/host/utilities/bladeRF-power/src/window.c +++ b/host/utilities/bladeRF-power/src/window.c @@ -96,9 +96,9 @@ void update_window(WINDOW *win, struct test_params *test) { test->direction == BLADERF_TX ? "TX" : "RX", test->channel); mvwprintw(win, start_y++, 1, "Gain Calibration: %s\n", test->gain_cal_enabled ? "enabled" : "disabled"); mvwprintw(win, start_y++, 1, "Automatic Gain Control: %s\n", test->gain_mode == BLADERF_GAIN_MGC ? "disabled" : "enabled"); - mvwprintw(win, start_y++, 1, "Bandwidth: %7.3f %sHz\n", - uint64_to_eng_double(test->bandwidth).value, - uint64_to_eng_double(test->bandwidth).unit); + mvwprintw(win, start_y++, 1, "Sample Rate: %7.3f %sHz\n", + uint64_to_eng_double(test->samp_rate).value, + uint64_to_eng_double(test->samp_rate).unit); mvwprintw(win, start_y++, 1, "Frequency: %7.3f %sHz\n", uint64_to_eng_double(test->frequency).value, uint64_to_eng_double(test->frequency).unit); From f81b82aa8e75ee8866d1aede2a09191d92399829 Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Tue, 6 Aug 2024 18:24:30 -0500 Subject: [PATCH 090/238] libbladeRF: bump to version 2.5.1 Introduces bladeRF-power cli tool and gain calibration functionality. --- host/libraries/libbladeRF/CMakeLists.txt | 2 +- host/libraries/libbladeRF/include/libbladeRF.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/host/libraries/libbladeRF/CMakeLists.txt b/host/libraries/libbladeRF/CMakeLists.txt index 35b5f8d6..5f0ebd90 100644 --- a/host/libraries/libbladeRF/CMakeLists.txt +++ b/host/libraries/libbladeRF/CMakeLists.txt @@ -8,7 +8,7 @@ project(libbladeRF C) set(VERSION_INFO_MAJOR 2) set(VERSION_INFO_MINOR 5) -set(VERSION_INFO_PATCH 0) +set(VERSION_INFO_PATCH 1) set(LIBBLADERF_VERSION ${VERSION_INFO_MAJOR}.${VERSION_INFO_MINOR}.${VERSION_INFO_PATCH}) diff --git a/host/libraries/libbladeRF/include/libbladeRF.h b/host/libraries/libbladeRF/include/libbladeRF.h index 332941c5..5deca906 100644 --- a/host/libraries/libbladeRF/include/libbladeRF.h +++ b/host/libraries/libbladeRF/include/libbladeRF.h @@ -51,7 +51,7 @@ * * https://github.com/Nuand/bladeRF/blob/master/doc/development/versioning.md */ -#define LIBBLADERF_API_VERSION (0x02050000) +#define LIBBLADERF_API_VERSION (0x02050100) #ifdef __cplusplus extern "C" { From d746811bd981b78e8b439f62744f66e57d74d927 Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Sat, 10 Aug 2024 16:37:29 -0700 Subject: [PATCH 091/238] cmake: added Clang alternatives to compiler configurations --- host/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/host/CMakeLists.txt b/host/CMakeLists.txt index 5666a149..4986b9b1 100644 --- a/host/CMakeLists.txt +++ b/host/CMakeLists.txt @@ -97,7 +97,7 @@ add_subdirectory(common/thirdparty/ad936x) option(ENABLE_GDB_EXTENSIONS "Build with -ggdb3 instead of -g" OFF) if(${CMAKE_C_COMPILER_ID} STREQUAL "GNU" OR - ${CMAKE_C_COMPILER_ID} STREQUAL "Clang") + ${CMAKE_C_COMPILER_ID} MATCHES ".*Clang") # Personal preference - as much debug info as possible with GDB if(${ENABLE_GDB_EXTENSIONS}) @@ -119,7 +119,7 @@ if(${CMAKE_C_COMPILER_ID} STREQUAL "GNU" OR endif(${CMAKE_BUILD_TYPE} STREQUAL "Debug") endif(${CMAKE_C_COMPILER_ID} STREQUAL "GNU" OR - ${CMAKE_C_COMPILER_ID} STREQUAL "Clang") + ${CMAKE_C_COMPILER_ID} MATCHES ".*Clang") ############################### # MS Visual Studio From e1a5c9260d849f34ab8b226ea0cb7cf2fadf81bb Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Sat, 10 Aug 2024 18:14:11 -0700 Subject: [PATCH 092/238] libbladeRF: fix calibration load check for get_gain_calibration Fixes #981 --- host/libraries/libbladeRF/src/bladerf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/host/libraries/libbladeRF/src/bladerf.c b/host/libraries/libbladeRF/src/bladerf.c index 9d448c9b..f19c3a68 100644 --- a/host/libraries/libbladeRF/src/bladerf.c +++ b/host/libraries/libbladeRF/src/bladerf.c @@ -2334,8 +2334,8 @@ int bladerf_get_gain_calibration(struct bladerf *dev, bladerf_channel ch, const CHECK_NULL(dev); MUTEX_LOCK(&dev->lock); - if (dev->gain_tbls == NULL) { - log_error("Gain calibration not loaded\n"); + if (dev->gain_tbls[ch].state != BLADERF_GAIN_CAL_LOADED) { + log_error("%s: Gain calibration not loaded\n", __FUNCTION__); MUTEX_UNLOCK(&dev->lock); return BLADERF_ERR_UNEXPECTED; } From 26e91a550e76195d3759af89122c45a89ce76f8b Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Sat, 10 Aug 2024 18:18:57 -0700 Subject: [PATCH 093/238] libbladeRF: test: fix gain compare dev init --- host/libraries/libbladeRF_test/test_gain_compare/src/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/host/libraries/libbladeRF_test/test_gain_compare/src/main.c b/host/libraries/libbladeRF_test/test_gain_compare/src/main.c index 631507c6..d6e1310b 100644 --- a/host/libraries/libbladeRF_test/test_gain_compare/src/main.c +++ b/host/libraries/libbladeRF_test/test_gain_compare/src/main.c @@ -39,7 +39,7 @@ out: int main(int argc, char *argv[]) { int status; - struct bladerf *dev; + struct bladerf *dev = NULL; char *devstr = NULL; bladerf_sample_rate samp_rate = 2e6; From cbc3d30a2785aa5ee98427ff14ca7e1e774986bd Mon Sep 17 00:00:00 2001 From: Asa Zernik Date: Tue, 13 Aug 2024 11:32:42 +0300 Subject: [PATCH 094/238] libbladeRF: Return error code instead of asserting in version_check Specifically, when there's a missing compat table entry. All callers specify that they want to be forgiving of version mismatches, so this seems in the spirit of the call tree. Ran into this error when playing with a custom-loaded FPGA; if I had flashed the FPGA instead of simply loading it, this could have bricked the blade (or at least forced me into a very involved recovery process). --- host/libraries/libbladeRF/src/helpers/version.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/host/libraries/libbladeRF/src/helpers/version.c b/host/libraries/libbladeRF/src/helpers/version.c index f75cc5a3..a378d235 100644 --- a/host/libraries/libbladeRF/src/helpers/version.c +++ b/host/libraries/libbladeRF/src/helpers/version.c @@ -146,11 +146,11 @@ int version_check(const struct version_compat_table *fw_compat_table, if (fw_compat == NULL) { log_debug("%s is missing FW version compat table entry?\n", __FUNCTION__); - assert(!"BUG!"); + return BLADERF_ERR_UPDATE_FW; } else if (fpga_compat == NULL) { log_debug("%s is missing FPGA version compat table entry?\n", __FUNCTION__); - assert(!"BUG!"); + return BLADERF_ERR_UPDATE_FPGA; } if (required_fw_version) { From fe3304d75967c88ab4f17ff37cb5daf8ff53d3e1 Mon Sep 17 00:00:00 2001 From: Semnodime Date: Wed, 29 May 2024 05:30:05 +0200 Subject: [PATCH 095/238] hdl: fix readme typo close #970 --- hdl/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hdl/README.md b/hdl/README.md index 8da30296..5462a08c 100644 --- a/hdl/README.md +++ b/hdl/README.md @@ -27,7 +27,7 @@ We use an [Intel (Altera)][intel] [Cyclone IV E FPGA][cive]. The size of the FP [cive]: https://www.altera.com/products/fpga/cyclone-series/cyclone-iv/overview.html ## HDL Structure ## -Since the FPGA is connected and soldered down to the board, it makes sense to have a single top level which defines where the pins go, their IO levels and their genera directionality. We use a single `bladerf.vhd` top level to define a VHDL entity called `bladerf` that defines these pins. +Since the FPGA is connected and soldered down to the board, it makes sense to have a single top level which defines where the pins go, their IO levels and their general directionality. We use a single `bladerf.vhd` top level to define a VHDL entity called `bladerf` that defines these pins. We realize people will want to change the internal guts of the FPGA for their own programmable logic reasons. Because of this, we decided to differentiate the implementations using a feature of the Quartus Prime project file called Revisions. Revisions can take a base design (top level entity, a part and pins) and duplicate that project, recording any source level changes you wish to make to the project. This way, a user must only create their own architecture that is the new implementation of the `bladerf` top level. From 179fe7c6005052ba8c48d392d71663cec4abf18c Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Fri, 3 Jan 2025 12:36:06 -0600 Subject: [PATCH 096/238] hdl: corrected bladeRF 1.0 FPGA version number --- .../bladerf/software/bladeRF_nios/src/fpga_version.h | 4 ++-- host/libraries/libbladeRF/src/board/bladerf1/compatibility.c | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/hdl/fpga/platforms/bladerf/software/bladeRF_nios/src/fpga_version.h b/hdl/fpga/platforms/bladerf/software/bladeRF_nios/src/fpga_version.h index 3b2bc086..d66033f5 100644 --- a/hdl/fpga/platforms/bladerf/software/bladeRF_nios/src/fpga_version.h +++ b/hdl/fpga/platforms/bladerf/software/bladeRF_nios/src/fpga_version.h @@ -7,8 +7,8 @@ #define FPGA_VERSION_ID 0x7777 #define FPGA_VERSION_MAJOR 0 -#define FPGA_VERSION_MINOR 14 -#define FPGA_VERSION_PATCH 0 +#define FPGA_VERSION_MINOR 15 +#define FPGA_VERSION_PATCH 3 #define FPGA_VERSION ((uint32_t)( FPGA_VERSION_MAJOR | \ (FPGA_VERSION_MINOR << 8) | \ (FPGA_VERSION_PATCH << 16) ) ) diff --git a/host/libraries/libbladeRF/src/board/bladerf1/compatibility.c b/host/libraries/libbladeRF/src/board/bladerf1/compatibility.c index 6d76d3f0..b1e6df96 100644 --- a/host/libraries/libbladeRF/src/board/bladerf1/compatibility.c +++ b/host/libraries/libbladeRF/src/board/bladerf1/compatibility.c @@ -35,6 +35,7 @@ const struct version_compat_table bladerf1_fw_compat_table = {fw_compat, ARRAY_S static const struct compat fpga_compat[] = { /* FPGA requires >= Firmware */ + { VERSION(0, 15, 3), VERSION(2, 4, 0) }, { VERSION(0, 15, 1), VERSION(2, 4, 0) }, { VERSION(0, 15, 0), VERSION(2, 4, 0) }, { VERSION(0, 14, 0), VERSION(2, 4, 0) }, From 65cdf8899481f35272c8fdd37eef2d36dc2bcfc0 Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Mon, 7 Apr 2025 14:15:59 -0500 Subject: [PATCH 097/238] bladeRF-power: fixed ncurses dep On macOS, sometimes the ${CURSES_LIBRARIES} variable provided by find_package(Curses) doesn't correctly include all the necessary linkage information, especially when using wide character support. By explicitly adding ncurses to the link libraries for Apple platforms, we ensure that the linker can find all the required symbols. --- host/utilities/bladeRF-power/CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/host/utilities/bladeRF-power/CMakeLists.txt b/host/utilities/bladeRF-power/CMakeLists.txt index 458afe90..b0131a1f 100644 --- a/host/utilities/bladeRF-power/CMakeLists.txt +++ b/host/utilities/bladeRF-power/CMakeLists.txt @@ -24,6 +24,7 @@ target_link_libraries(${PROJECT_NAME} libbladerf_shared m ${BLADERF_HOST_COMMON_LIBRARIES} - ${CURSES_LIBRARIES}) + ${CURSES_LIBRARIES} + ncurses) install(TARGETS ${PROJECT_NAME} DESTINATION ${BIN_INSTALL_DIR}) From 3cc8e3c54e27d972ce22d68742319b492cc6b65d Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Mon, 6 Jan 2025 13:29:16 -0600 Subject: [PATCH 098/238] hdl: fixed late exit from meta down count state The expected two cycle passing between meta write and idle states is independent of the number of streams. Specifically addresses an off-by-one timestamp error with the bladeRF 1.0. --- hdl/fpga/ip/nuand/synthesis/fifo_writer.vhd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hdl/fpga/ip/nuand/synthesis/fifo_writer.vhd b/hdl/fpga/ip/nuand/synthesis/fifo_writer.vhd index 9ae1d24e..86bf18d3 100644 --- a/hdl/fpga/ip/nuand/synthesis/fifo_writer.vhd +++ b/hdl/fpga/ip/nuand/synthesis/fifo_writer.vhd @@ -293,7 +293,7 @@ begin meta_future.dma_downcount <= meta_current.dma_downcount - NUM_STREAMS; end if; - if( meta_current.dma_downcount <= NUM_STREAMS ) then + if( meta_current.dma_downcount <= 2 ) then -- Look for 2 because of the 2 cycles passing -- through IDLE and META_WRITE after this. -- 8bit format requires an additional 2 cycle delay. From 73e78639aadff525552872d9a257d3b9b13be59b Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Thu, 16 Jan 2025 13:26:01 -0600 Subject: [PATCH 099/238] doc: fix API sections menu item with Doxygen 1.9.8 The API sections aren't stored as modules anymore. They're topics. Error likely introduced at doxygen commit: 6d80fc7e5 --- host/libraries/libbladeRF/doc/doxygen/layout.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/host/libraries/libbladeRF/doc/doxygen/layout.xml b/host/libraries/libbladeRF/doc/doxygen/layout.xml index e468b13a..faee2c71 100644 --- a/host/libraries/libbladeRF/doc/doxygen/layout.xml +++ b/host/libraries/libbladeRF/doc/doxygen/layout.xml @@ -5,6 +5,7 @@ + From a8481c2af7984302e21b5ce7ab5c98c2c8da594c Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Thu, 16 Jan 2025 14:04:01 -0600 Subject: [PATCH 100/238] doc: added packet length warning for BLADERF_FORMAT_PACKET_META A packet length of (n*256-4) DWORDs will cause the synchronous buffer it's filled into to indefinitely persist. --- host/libraries/libbladeRF/include/libbladeRF.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/host/libraries/libbladeRF/include/libbladeRF.h b/host/libraries/libbladeRF/include/libbladeRF.h index 5deca906..0e0a922d 100644 --- a/host/libraries/libbladeRF/include/libbladeRF.h +++ b/host/libraries/libbladeRF/include/libbladeRF.h @@ -2217,6 +2217,13 @@ typedef enum { * USB 2.0 Hi-Speed or USB 3.0 SuperSpeed for packets for this streaming * format. * + * @warning A packet length of (n*256-4) DWORDs will cause the synchronous + * buffer it's filled into to indefinitely persist. For instance, if a + * packet containing 252 DWORDs is filled into buffer N, buffer N will + * always return that first 252 dword packet. It is recommended to avoid + * these specific packet lengths (252, 508, 764, 1020, etc. DWORDs) + * until this limitation is resolved. + * * @see STREAMING_FORMAT_METADATA * @see The `src/streaming/metadata.h` header in the libbladeRF codebase. */ From ffd7f52a4010924779b14ab494bbdcaa1b844a8a Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Mon, 19 Aug 2024 16:23:44 -0500 Subject: [PATCH 101/238] hdl: added git information to build output --- hdl/quartus/build_bladerf.sh | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/hdl/quartus/build_bladerf.sh b/hdl/quartus/build_bladerf.sh index 583900a4..a1e9e742 100755 --- a/hdl/quartus/build_bladerf.sh +++ b/hdl/quartus/build_bladerf.sh @@ -462,6 +462,18 @@ if [[ ${flow} == "full" ]]; then sha256sum $RBF > $RBF.sha256sum MD5SUM=$(cat $RBF.md5sum | awk '{ print $1 }') SHA256SUM=$(cat $RBF.sha256sum | awk '{ print $1 }') + + GIT_HASH=$(git rev-parse --short HEAD) + GIT_BRANCH=$(git rev-parse --abbrev-ref HEAD) + GIT_DIRTY=$(git diff --quiet && echo "clean" || echo "dirty") + + cat << EOF > git_info.txt +Git Information: +Commit Hash: $GIT_HASH +Branch: $GIT_BRANCH +Working Directory: $GIT_DIRTY +EOF + popd echo "" @@ -473,6 +485,10 @@ if [[ ${flow} == "full" ]]; then echo " MD5: $MD5SUM" echo " SHA256: $SHA256SUM" echo "" + echo " Git Information:" + echo " Commit: $GIT_HASH ($GIT_DIRTY)" + echo " Branch: $GIT_BRANCH" + echo "" cat "$BUILD_OUTPUT_DIR/$BUILD_NAME.fit.summary" | sed -e 's/^\(.\)/ \1/g' echo "##########################################################################" fi From 465ea0a49e05d2d66451d5d303a001eb36e16617 Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Fri, 12 Jul 2024 15:32:21 -0500 Subject: [PATCH 102/238] libbladeRF: test: added streaming test The streaming test allows for cross testing between MIMO, SISO, TX, RX, meta, and non-meta configurations. Example: TX a CW at 50MSPS and at a frequency of (915MHz+50MHz/16) with meta enabled ./output/libbladeRF_test_streaming -te -s 50M Example: TX and RX at 25MSPS and at a frequency of (915MHz+25MHz/16) without meta enabled ./output/libbladeRF_test_streaming -tr -s 25M --- host/libraries/libbladeRF_test/CMakeLists.txt | 1 + .../test_streaming/CMakeLists.txt | 17 + .../libbladeRF_test/test_streaming/src/main.c | 330 ++++++++++++++++++ 3 files changed, 348 insertions(+) create mode 100644 host/libraries/libbladeRF_test/test_streaming/CMakeLists.txt create mode 100644 host/libraries/libbladeRF_test/test_streaming/src/main.c diff --git a/host/libraries/libbladeRF_test/CMakeLists.txt b/host/libraries/libbladeRF_test/CMakeLists.txt index 17ecdc09..00fc3efe 100644 --- a/host/libraries/libbladeRF_test/CMakeLists.txt +++ b/host/libraries/libbladeRF_test/CMakeLists.txt @@ -19,6 +19,7 @@ add_subdirectory(test_quick_retune) add_subdirectory(test_repeated_stream) add_subdirectory(test_rx_discont) add_subdirectory(test_scheduled_retune) +add_subdirectory(test_streaming) add_subdirectory(test_sync) add_subdirectory(test_timestamps) add_subdirectory(test_tune_timing) diff --git a/host/libraries/libbladeRF_test/test_streaming/CMakeLists.txt b/host/libraries/libbladeRF_test/test_streaming/CMakeLists.txt new file mode 100644 index 00000000..ffc48c12 --- /dev/null +++ b/host/libraries/libbladeRF_test/test_streaming/CMakeLists.txt @@ -0,0 +1,17 @@ +cmake_minimum_required(VERSION 3.5) +project(libbladeRF_test_streaming C) + +set(INCLUDES + ${libbladeRF_SOURCE_DIR}/include) +if(MSVC) + set(INCLUDES ${INCLUDES} ${MSVC_C99_INCLUDES}) +endif() + +set(SRC + ${BLADERF_HOST_COMMON_SOURCE_DIR}/conversions.c + src/main.c) + +include_directories(${INCLUDES} ${CURL_INCLUDE_DIR} include) +add_executable(${PROJECT_NAME} ${SRC}) + +target_link_libraries(${PROJECT_NAME} libbladerf_shared m) diff --git a/host/libraries/libbladeRF_test/test_streaming/src/main.c b/host/libraries/libbladeRF_test/test_streaming/src/main.c new file mode 100644 index 00000000..2b8cde96 --- /dev/null +++ b/host/libraries/libbladeRF_test/test_streaming/src/main.c @@ -0,0 +1,330 @@ +#include +#include +#include +#include +#include +#include +#include "conversions.h" + +#define INT12_MAX 2047 +#define BUFFER_SIZE_ALIGNMENT 1024 + +#define CHECK_STATUS(fn) \ + do { \ + status = (fn); \ + if (status != 0) { \ + fprintf(stderr, "Error at %s:%d (%s): %s\n", \ + __FILE__, __LINE__, __func__, bladerf_strerror(status)); \ + goto error; \ + } \ + } while (0) + +typedef struct { + bool tx; + bool rx; + bool mimo; + size_t num_samples; + uint64_t sample_rate; + int16_t *tx_samples; + int16_t *rx_samples; + bladerf_format format; + struct bladerf_metadata tx_meta; + struct bladerf_metadata rx_meta; + size_t num_buffers; + size_t buffer_size; + size_t num_transfers; + size_t timeout_ms; +} test_config; + +void print_config(const test_config *config, const char *device_string, const char *fpga_file) { + printf("\nConfiguration Summary:\n"); + printf("---------------------\n"); + printf("Device: %s\n", device_string ? device_string : "any"); + printf("FPGA file: %s\n", fpga_file ? fpga_file : "Not specified"); + printf("TX enabled: %s\n", config->tx ? "Yes" : "No"); + printf("RX enabled: %s\n", config->rx ? "Yes" : "No"); + printf("MIMO enabled: %s\n", config->mimo ? "Yes" : "No"); + printf("Format: %s\n", config->format == BLADERF_FORMAT_SC16_Q11_META ? "SC16 Q11 META" : "SC16 Q11"); + printf("Sample rate: %.3f MHz\n", config->sample_rate / 1e6); + printf("# of samples: %zu\n", config->num_samples); + printf("Buffer size: %zu\n", config->buffer_size); + printf("# of buffers: %zu\n", config->num_buffers); + printf("# of transfers: %zu\n", config->num_transfers); + printf("---------------------\n\n"); +} + + +// Define suffix table for engineering notation +static const struct numeric_suffix freq_suffixes[] = { + { "K", 1000 }, + { "k", 1000 }, + { "M", 1000000 }, + { "m", 1000000 }, + { "G", 1000000000 }, + { "g", 1000000000 }, +}; + +void print_bladerf_flag_statuses(uint32_t flags) { + printf("BladeRF Flag Statuses:\n"); + printf("%-40s %d\n", "BLADERF_META_STATUS_OVERRUN:", !!(flags & BLADERF_META_STATUS_OVERRUN)); + printf("%-40s %d\n", "BLADERF_META_STATUS_UNDERRUN:", !!(flags & BLADERF_META_STATUS_UNDERRUN)); + printf("%-40s %d\n", "BLADERF_META_FLAG_TX_BURST_START:", !!(flags & BLADERF_META_FLAG_TX_BURST_START)); + printf("%-40s %d\n", "BLADERF_META_FLAG_TX_BURST_END:", !!(flags & BLADERF_META_FLAG_TX_BURST_END)); + printf("%-40s %d\n", "BLADERF_META_FLAG_TX_NOW:", !!(flags & BLADERF_META_FLAG_TX_NOW)); + printf("%-40s %d\n", "BLADERF_META_FLAG_TX_UPDATE_TIMESTAMP:", !!(flags & BLADERF_META_FLAG_TX_UPDATE_TIMESTAMP)); + printf("%-40s %d\n", "BLADERF_META_FLAG_RX_NOW:", !!(flags & BLADERF_META_FLAG_RX_NOW)); + printf("%-40s %d\n", "BLADERF_META_FLAG_RX_HW_UNDERFLOW:", !!(flags & BLADERF_META_FLAG_RX_HW_UNDERFLOW)); + printf("%-40s %d\n", "BLADERF_META_FLAG_RX_HW_MINIEXP1:", !!(flags & BLADERF_META_FLAG_RX_HW_MINIEXP1)); + printf("%-40s %d\n", "BLADERF_META_FLAG_RX_HW_MINIEXP2:", !!(flags & BLADERF_META_FLAG_RX_HW_MINIEXP2)); +} + +void print_help() { + printf("Usage: test_streaming [options]\n"); + printf("Options:\n"); + printf(" -d, --device Specify the device string\n"); + printf(" -f, --fpga Specify the FPGA file\n"); + printf(" -v, --verbosity Enable verbose logging\n"); + printf(" -t, --tx Enable TX test\n"); + printf(" -r, --rx Enable RX test\n"); + printf(" -m, --mimo Enable MIMO test\n"); + printf(" -e, --meta Enable META test\n"); + printf(" -s, --samplerate Specify the sample rate\n"); + printf(" -n, --num-samples Specify the number of samples\n"); + printf(" -b, --buffer-size Specify the buffer size (multiple of 1024)\n"); + printf(" -h, --help Display this help message\n"); + printf("\n"); + + printf("Description:\n"); + printf("The streaming test allows for cross testing between MIMO, SISO, TX, RX, meta,\n"); + printf("and non-meta configurations.\n"); + printf("\n"); + + printf("Example: TX a CW at 50MSPS and at a frequency of (915MHz+50MHz/16) with meta enabled\n"); + printf("./output/libbladeRF_test_streaming -te -s 50M\n"); + printf("\n"); + printf("Example: TX and RX at 25MSPS and at a frequency of (915MHz+25MHz/16) without meta enabled\n"); + printf("./output/libbladeRF_test_streaming -tr -s 25M\n"); +} + +int main(int argc, char *argv[]) +{ + int status = 0; + struct bladerf *dev = NULL; + const char *fpga_file = NULL; + const char *device_string = NULL; + int c; + bool ok; + + test_config config = { + .tx = false, + .rx = false, + .mimo = false, + .sample_rate = 61.44e6, + .num_samples = 5 * 61.44e6, + .tx_samples = NULL, + .format = BLADERF_FORMAT_SC16_Q11, + .num_buffers = 512, + .buffer_size = 4096, + .num_transfers = 64, + .timeout_ms = 1000, + .tx_meta.flags = BLADERF_META_FLAG_TX_BURST_START | + BLADERF_META_FLAG_TX_NOW | + BLADERF_META_FLAG_TX_BURST_END, + .rx_meta.flags = BLADERF_META_FLAG_RX_NOW, + }; + + bladerf_log_set_verbosity(BLADERF_LOG_LEVEL_INFO); + + while (1) { + int option_index = 0; + static struct option long_options[] = { + {"device", required_argument, 0, 'd'}, + {"fpga", required_argument, 0, 'f'}, + {"verbosity", no_argument, 0, 'v'}, + {"tx", no_argument, 0, 't'}, + {"rx", no_argument, 0, 'r'}, + {"mimo", no_argument, 0, 'm'}, + {"meta", no_argument, 0, 'e'}, + {"samplerate", required_argument, 0, 's'}, + {"num-samples", required_argument, 0, 'n'}, + {"buffer-size", required_argument, 0, 'b'}, + {"help", no_argument, 0, 'h'}, + {0, 0, 0, 0} + }; + + c = getopt_long(argc, argv, "d:f:vtrmes:n:b:h", long_options, &option_index); + if (c == -1) + break; + + switch (c) { + case 'd': + device_string = optarg; + break; + case 'f': + fpga_file = optarg; + break; + case 'v': + bladerf_log_set_verbosity(BLADERF_LOG_LEVEL_VERBOSE); + break; + case 't': + config.tx = true; + break; + case 'r': + config.rx = true; + break; + case 'm': + config.mimo = true; + break; + case 'n': + config.num_samples = str2uint64_suffix( + optarg, 1, UINT64_MAX, freq_suffixes, + sizeof(freq_suffixes) / sizeof(freq_suffixes[0]), &ok); + if (!ok) { + fprintf(stderr, "Invalid number of samples: %s\n", optarg); + exit(EXIT_FAILURE); + } + break; + case 'b': { + size_t requested_size = strtoull(optarg, NULL, 0); + config.buffer_size = ((requested_size + BUFFER_SIZE_ALIGNMENT - 1) / BUFFER_SIZE_ALIGNMENT) * BUFFER_SIZE_ALIGNMENT; + if (requested_size % BUFFER_SIZE_ALIGNMENT != 0) { + fprintf(stderr, "Requested buffer size rounded up to %zu\n", config.buffer_size); + } + break; + } + case 'e': + config.format = BLADERF_FORMAT_SC16_Q11_META; + break; + case 's': + config.sample_rate = str2uint64_suffix( + optarg, 0, UINT64_MAX, freq_suffixes, + sizeof(freq_suffixes) / sizeof(freq_suffixes[0]), &ok); + if (!ok) { + fprintf(stderr, "Invalid sample rate: %s\n", optarg); + exit(EXIT_FAILURE); + } + break; + case 'h': + case '?': + print_help(); + exit(EXIT_FAILURE); + default: + printf("?? getopt returned character code 0%o ??\n", c); + } + } + + if (!config.tx && !config.rx) { + fprintf(stderr, "[Error] TX or RX must be specified.\n"); + print_help(); + exit(EXIT_FAILURE); + } + + print_config(&config, device_string, fpga_file); + + // Allocate memory for samples (2* for IQ components and 2* for MIMO) + config.tx_samples = malloc(4 * config.num_samples * sizeof(int16_t)); + config.rx_samples = malloc(4 * config.num_samples * sizeof(int16_t)); + if (config.tx_samples == NULL || config.rx_samples == NULL) { + fprintf(stderr, "Failed to allocate memory for samples\n"); + exit(EXIT_FAILURE); + } + + printf("Opening device: %s\n", (device_string == NULL) ? "any" : device_string); + CHECK_STATUS(bladerf_open(&dev, device_string)); + + if (fpga_file != NULL) { + printf("Loading the FPGA image...\n"); + CHECK_STATUS(bladerf_load_fpga(dev, fpga_file)); + } + + printf("Setting sample rate to %0.3f MHz...\n", config.sample_rate / 1e6); + CHECK_STATUS(bladerf_set_sample_rate(dev, BLADERF_CHANNEL_RX(0), config.sample_rate, NULL)); + CHECK_STATUS(bladerf_set_sample_rate(dev, BLADERF_CHANNEL_TX(0), config.sample_rate, NULL)); + + printf("Setting frequency to 915 MHz...\n"); + CHECK_STATUS(bladerf_set_frequency(dev, BLADERF_CHANNEL_RX(0), 915e6)); + CHECK_STATUS(bladerf_set_frequency(dev, BLADERF_CHANNEL_TX(0), 915e6)); + + CHECK_STATUS(bladerf_set_gain(dev, BLADERF_CHANNEL_TX(0), 30)); + CHECK_STATUS(bladerf_set_gain(dev, BLADERF_CHANNEL_RX(0), 0)); + + for (size_t i = 0; i < config.num_samples; i++) { + double angle = (2.0 * M_PI * (i % 16)) / 16.0; + config.tx_samples[2 * i] = (int16_t)round(INT12_MAX * cos(angle)); // I component + config.tx_samples[2 * i + 1] = (int16_t)round(INT12_MAX * sin(angle)); // Q component + } + + if (config.mimo) { + for (size_t i = 0; i < config.num_samples; i++) { + double angle = (2.0 * M_PI * (i % 16)) / 16.0; + config.tx_samples[4 * i + 0] = (int16_t)round(INT12_MAX * cos(angle)); // Ch0 I + config.tx_samples[4 * i + 1] = (int16_t)round(INT12_MAX * sin(angle)); // Ch0 Q + config.tx_samples[4 * i + 2] = (int16_t)round(INT12_MAX * cos(angle)); // Ch1 I + config.tx_samples[4 * i + 3] = (int16_t)round(INT12_MAX * sin(angle)); // Ch1 Q + } + } + + if (config.tx) { + printf("Streaming TX...\n"); + CHECK_STATUS(bladerf_sync_config( + dev, (config.mimo == true) ? BLADERF_TX_X2 : BLADERF_TX_X1, + config.format, config.num_buffers, config.buffer_size, + config.num_transfers, config.timeout_ms)); + CHECK_STATUS(bladerf_enable_module(dev, BLADERF_CHANNEL_TX(0), true)); + if (config.mimo) + CHECK_STATUS(bladerf_enable_module(dev, BLADERF_CHANNEL_TX(1), true)); + CHECK_STATUS(bladerf_sync_tx(dev, config.tx_samples, config.num_samples, + &config.tx_meta, 5000)); + CHECK_STATUS(bladerf_enable_module(dev, BLADERF_CHANNEL_TX(0), false)); + } + + if (config.rx) { + printf("Streaming RX...\n"); + CHECK_STATUS(bladerf_sync_config( + dev, (config.mimo == true) ? BLADERF_RX_X2 : BLADERF_RX_X1, + config.format, config.num_buffers, config.buffer_size, + config.num_transfers, config.timeout_ms)); + + CHECK_STATUS(bladerf_enable_module(dev, BLADERF_CHANNEL_RX(0), true)); + if (config.mimo) + CHECK_STATUS(bladerf_enable_module(dev, BLADERF_CHANNEL_RX(1), true)); + + /* Retrieve the current timestamp */ + config.rx_meta.flags = 0; + status = bladerf_get_timestamp(dev, BLADERF_RX, &config.rx_meta.timestamp); + if (status != 0) { + fprintf(stderr, "Failed to get current RX timestamp: %s\n", + bladerf_strerror(status)); + } else { + printf("Current RX timestamp: 0x%016" PRIx64 "\n", config.rx_meta.timestamp); + } + + /* Schedule first RX to be 0.1s in the future */ + config.rx_meta.timestamp += config.sample_rate / 10; + printf("Scheduling RX for 0x%016" PRIx64 "\n", config.rx_meta.timestamp); + + status = bladerf_sync_rx(dev, config.rx_samples, config.num_samples, + &config.rx_meta, config.timeout_ms); + if (status != 0) { + fprintf(stderr, "RX failed: %s\n", bladerf_strerror(status)); + } else if (config.rx_meta.status & BLADERF_META_STATUS_OVERRUN) { + fprintf(stderr, "Overrun detected. %u valid samples were read.\n", + config.rx_meta.actual_count); + print_bladerf_flag_statuses(config.rx_meta.status); + } else { + printf("RX'd %u samples at t=0x%016" PRIx64 "\n", config.rx_meta.actual_count, + config.rx_meta.timestamp); + } + CHECK_STATUS(bladerf_enable_module(dev, BLADERF_CHANNEL_RX(0), false)); + } + +error: + if (config.tx_samples) + free(config.tx_samples); + if (config.rx_samples) + free(config.rx_samples); + if (dev) + bladerf_close(dev); + + return status; +} From f230c9dc8df6f125a75e4923eb92318130641e52 Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Wed, 24 Jul 2024 11:22:53 -0500 Subject: [PATCH 103/238] hdl: test: added gpif fifo stress test testbench This copies the gpif 8b testbench, but with 7 blocks per TX iteration and 2 subsequent iteration repeats. Run for 4ms to find channel shift reset failure. --- .../fx3_gpif_iq_8bit_fifo_stress_tb.do | 12 + .../tb/fx3_gpif_iq_8bit_fifo_stress_tb.vhd | 840 ++++++++++++++++++ .../vhdl/tb/fx3_model_fifo_stress.vhd | 279 ++++++ 3 files changed, 1131 insertions(+) create mode 100644 hdl/fpga/platforms/bladerf-micro/modelsim/fx3_gpif_iq_8bit_fifo_stress_tb.do create mode 100644 hdl/fpga/platforms/bladerf-micro/vhdl/tb/fx3_gpif_iq_8bit_fifo_stress_tb.vhd create mode 100644 hdl/fpga/platforms/bladerf-micro/vhdl/tb/fx3_model_fifo_stress.vhd diff --git a/hdl/fpga/platforms/bladerf-micro/modelsim/fx3_gpif_iq_8bit_fifo_stress_tb.do b/hdl/fpga/platforms/bladerf-micro/modelsim/fx3_gpif_iq_8bit_fifo_stress_tb.do new file mode 100644 index 00000000..c96b41fe --- /dev/null +++ b/hdl/fpga/platforms/bladerf-micro/modelsim/fx3_gpif_iq_8bit_fifo_stress_tb.do @@ -0,0 +1,12 @@ +source ../../../ip/nuand/nuand.do + +vcom -work nuand -2008 ../vhdl/rx.vhd +vcom -work nuand -2008 ../vhdl/tx.vhd + +vlib rtl_work +vcom -work rtl_work -2008 ../../../ip/altera/fx3_pll/fx3_pll.vhd + +compile_nuand ../../../ip/nuand bladerf-micro + +vcom -work nuand -2008 ../vhdl/tb/fx3_model_fifo_stress.vhd +vcom -work nuand -2008 ../vhdl/tb/fx3_gpif_iq_8bit_fifo_stress_tb.vhd diff --git a/hdl/fpga/platforms/bladerf-micro/vhdl/tb/fx3_gpif_iq_8bit_fifo_stress_tb.vhd b/hdl/fpga/platforms/bladerf-micro/vhdl/tb/fx3_gpif_iq_8bit_fifo_stress_tb.vhd new file mode 100644 index 00000000..ce575ef3 --- /dev/null +++ b/hdl/fpga/platforms/bladerf-micro/vhdl/tb/fx3_gpif_iq_8bit_fifo_stress_tb.vhd @@ -0,0 +1,840 @@ +-- Copyright (c) 2024 Nuand LLC +-- +-- Permission is hereby granted, free of charge, to any person obtaining a copy +-- of this software and associated documentation files (the "Software"), to deal +-- in the Software without restriction, including without limitation the rights +-- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +-- copies of the Software, and to permit persons to whom the Software is +-- furnished to do so, subject to the following conditions: +-- +-- The above copyright notice and this permission notice shall be included in +-- all copies or substantial portions of the Software. +-- +-- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +-- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +-- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +-- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +-- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +-- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +-- THE SOFTWARE. + +library ieee; + use ieee.std_logic_1164.all; + use ieee.numeric_std.all; + +library rtl_work; + +library altera_lnsim; + use altera_lnsim.altera_pll; + +library nuand; + use nuand.util.all ; + use nuand.fifo_readwrite_p.all; + use nuand.common_dcfifo_p.all; + use nuand.bladerf_p.all; + +entity fx3_gpif_iq_8bit_fifo_stress is + generic ( + -- For bladeRF2 (2x2 MIMO): + NUM_MIMO_STREAMS : natural := 2; + FIFO_READER_READ_THROTTLE : natural := 0; + + ENABLE_CHANNEL_0 : std_logic := '1'; + ENABLE_CHANNEL_1 : std_logic := '0'; + EIGHT_BIT_MODE_EN : std_logic := '1' + ); +end entity; + +architecture arch of fx3_gpif_iq_8bit_fifo_stress is + + -- bladerf-hosted uses ad9361.clock (125 MHz) for rx_clock and tx_clock + constant SYSCLK_HALF_PERIOD : time := 1 sec * (1.0/125.0e6/2.0); + + -- For reasons unknown, simulation of this system in ModelSim requires that + -- wrreq and data be asserted shortly before the rising clock edge. Sigh... + constant FIFO_WORKAROUND : time := 1 ps; + + type fx3_control_t is record + usb_speed : std_logic; + tx_enable : std_logic; + rx_enable : std_logic; + meta_enable : std_logic; + packet : std_logic; + end record; + + type fx3_gpif_t is record + gpif_in : std_logic_vector(31 downto 0); + gpif_out : std_logic_vector(31 downto 0); + gpif_oe : std_logic; + ctl_in : std_logic_vector(12 downto 0); + ctl_out : std_logic_vector(12 downto 0); + ctl_oe : std_logic_vector(12 downto 0); + end record; + + signal sys_rst : std_logic := '1'; + signal done : boolean := false; + + signal fx3_pclk : std_logic := '1'; + signal fx3_pclk_pll : std_logic := '1'; + signal sys_clk : std_logic := '1'; + + signal pll_reset : std_logic := '0'; + signal pll_locked : std_logic := '0'; + signal fx3_control : fx3_control_t; + signal fx3_gpif : fx3_gpif_t; + signal fx3_gpif_i : std_logic_vector(31 downto 0); + signal fx3_ctl_i : std_logic_vector(12 downto 0); + + -- Control mapping + alias dma0_rx_ack is fx3_ctl_i( 0); + alias dma1_rx_ack is fx3_ctl_i( 1); + alias dma2_tx_ack is fx3_ctl_i( 2); + alias dma3_tx_ack is fx3_ctl_i( 3); + alias dma_rx_enable is fx3_ctl_i( 4); + alias dma_tx_enable is fx3_ctl_i( 5); + alias dma_idle is fx3_ctl_i( 6); + alias system_reset is fx3_ctl_i( 7); + alias dma0_rx_reqx is fx3_ctl_i( 8); + alias dma1_rx_reqx is fx3_ctl_i(12); -- due to 9 being connected to dclk + alias dma2_tx_reqx is fx3_ctl_i(10); + alias dma3_tx_reqx is fx3_ctl_i(11); + + signal loopback_i : signed(15 downto 0) := (others =>'0'); + signal loopback_q : signed(15 downto 0) := (others =>'0'); + signal loopback_valid : std_logic := '0'; + signal loopback_enabled : std_logic := '0'; + + signal tx_clock : std_logic := '1' ; + signal rx_clock : std_logic := '1' ; + + signal rx_sample_fifo : rx_fifo_t := RX_FIFO_T_DEFAULT; + signal tx_sample_fifo : tx_fifo_t := TX_FIFO_T_DEFAULT; + signal loopback_fifo : loopback_fifo_t := LOOPBACK_FIFO_T_DEFAULT; + signal rx_meta_fifo : meta_fifo_rx_t := META_FIFO_RX_T_DEFAULT; + signal tx_meta_fifo : meta_fifo_tx_t := META_FIFO_TX_T_DEFAULT; + + signal rx_mux_i : signed(15 downto 0); + signal rx_mux_q : signed(15 downto 0); + signal rx_mux_valid : std_logic; + + signal tx_timestamp : unsigned(63 downto 0) := ( others => '0' ); + signal rx_timestamp : unsigned(63 downto 0) := ( others => '0' ); + + constant FX3_HALF_PERIOD : time := 1.0/(100.0e6)/2.0*1 sec ; + constant TX_HALF_PERIOD : time := 1.0/(9.0e6)/2.0*1 sec ; + constant RX_HALF_PERIOD : time := 1.0/(9.0e6)/2.0*1 sec ; + + signal dac_controls : sample_controls_t(0 to NUM_MIMO_STREAMS-1) := (others => SAMPLE_CONTROL_DISABLE); + signal dac_streams : sample_streams_t(dac_controls'range) := (others => ZERO_SAMPLE); + signal adc_controls : sample_controls_t(0 to NUM_MIMO_STREAMS-1) := (others => SAMPLE_CONTROL_DISABLE); + signal adc_streams : sample_streams_t(adc_controls'range) := (others => ZERO_SAMPLE); + + signal tx_reset : std_logic := '0'; + signal tx_ts_reset : std_logic := '0'; + signal rx_reset : std_logic := '0'; + signal rx_ts_reset : std_logic := '0'; + + signal meta_en_tx : std_logic := '0'; + signal meta_en_rx : std_logic := '0'; + + signal rx_packet_control : packet_control_t := PACKET_CONTROL_DEFAULT; + signal tx_packet_control : packet_control_t; + + signal trigger_signal_sync_tb : std_logic; + signal adc_stream_val_at_rx_enable : signed(15 downto 0) := ( others => '0' ); + + function data_gen (count : natural) return std_logic_vector is + variable msw, lsw : std_logic_vector(15 downto 0); + begin + msw := std_logic_vector(to_signed(count, 16)); + lsw := std_logic_vector(to_signed(-count, 16)); + + return (msw & lsw); + end function data_gen; + + signal rx_packet_ready : std_logic; + +begin + + -- ======================================================================== + -- Brief summary of data flow + -- ======================================================================== + -- + -- Simulated samples flow from fx3_model's TX side to its RX side. The + -- validity of the data is checked there. + -- + -- entity U_fx3_model FX3 model, TX process + -- signal fx3_gpif_i fx3_gpif.gpif_oe is '0' + -- process register_gpif + -- signal fx3_gpif.gpif_in Demuxed GPIF interface (FX3 -> FPGA) + -- entity U_fx3_gpif GPIF implementation, write side + -- signal tx_sample_fifo.w* TX fifo, write side + -- entity U_tx_sample_fifo + -- signal tx_sample_fifo.r* TX fifo, read side + -- process tx_mux + -- signal loopback_fifo.w* Loopback fifo, write side + -- entity U_rx_loopback_fifo + -- signal loopback_fifo.r* Loopback fifo, read side + -- process loopback_fifo_control + -- signal loopback_{i,q,valid} + -- process rx_mux + -- signal rx_mux_{i,q,valid} + -- entity U_fifo_writer + -- signal rx_sample_fifo.w* RX fifo, write side + -- entity U_rx_sample_fifo + -- signal rx_sample_fifo.r* RX fifo, read side + -- entity U_fx3_gpif GPIF implementation, read side + -- signal fx3_gpif.gpif_out Demuxed GPIF interface (FPGA -> FX3) + -- process register_gpif + -- signal fx3_gpif_i fx3_gpif.gpif_oe is '1' + -- entity U_fx3_model FX3 model, RX process + + + -- ======================================================================== + -- Instantiations + -- ======================================================================== + + -- Unit under test + -- Clock domain: fx3_pclk_pll + U_fx3_gpif : entity nuand.fx3_gpif + port map ( + pclk => fx3_pclk_pll, + reset => sys_rst, + usb_speed => fx3_control.usb_speed, + gpif_in => fx3_gpif.gpif_in, + gpif_out => fx3_gpif.gpif_out, + gpif_oe => fx3_gpif.gpif_oe, + ctl_in => fx3_gpif.ctl_in, + ctl_out => fx3_gpif.ctl_out, + ctl_oe => fx3_gpif.ctl_oe, + tx_enable => fx3_control.tx_enable, + rx_enable => fx3_control.rx_enable, + meta_enable => fx3_control.meta_enable, + packet_enable => fx3_control.packet, + tx_fifo_write => tx_sample_fifo.wreq, + tx_fifo_full => tx_sample_fifo.wfull, + tx_fifo_empty => tx_sample_fifo.wempty, + tx_fifo_usedw => tx_sample_fifo.wused, + tx_fifo_data => tx_sample_fifo.wdata, + tx_timestamp => tx_timestamp, + tx_meta_fifo_write => tx_meta_fifo.wreq, + tx_meta_fifo_full => tx_meta_fifo.wfull, + tx_meta_fifo_empty => tx_meta_fifo.wempty, + tx_meta_fifo_usedw => tx_meta_fifo.wused, + tx_meta_fifo_data => tx_meta_fifo.wdata, + rx_fifo_read => rx_sample_fifo.rreq, + rx_fifo_full => rx_sample_fifo.rfull, + rx_fifo_empty => rx_sample_fifo.rempty, + rx_fifo_usedw => rx_sample_fifo.rused, + rx_fifo_data => rx_sample_fifo.rdata, + rx_meta_fifo_read => rx_meta_fifo.rreq, + rx_meta_fifo_full => rx_meta_fifo.rfull, + rx_meta_fifo_empty => rx_meta_fifo.rempty, + rx_meta_fifo_usedr => rx_meta_fifo.rused, + rx_meta_fifo_data => rx_meta_fifo.rdata + ); + + -- Discrete control signals for fx3_gpif + fx3_control.usb_speed <= '0'; + fx3_control.meta_enable <= '0'; + fx3_control.packet <= '0'; + + U_pkt_gen : entity nuand.rx_packet_generator + port map( + rx_clock => rx_clock, + rx_reset => rx_reset, + + rx_enable => fx3_control.rx_enable, + rx_packet_enable => fx3_control.packet, + + rx_packet_ready => rx_packet_ready, + + rx_packet_control => rx_packet_control + + ); + + + meta_en_tx <= fx3_control.meta_enable; + meta_en_rx <= fx3_control.meta_enable; + + increment_tx_ts : process(tx_clock) + variable ping : boolean := true ; + begin + if( rising_edge(tx_clock) ) then + ping := not ping ; + if( ping = true ) then + tx_timestamp <= tx_timestamp + 1 ; + end if ; + end if ; + end process ; + + increment_rx_ts : process(rx_clock) + variable ping : boolean := true ; + begin + if( rising_edge(rx_clock) ) then + ping := not ping ; + if( ping = true ) then + rx_timestamp <= rx_timestamp + 1 ; + end if ; + end if ; + end process ; + + -- Model of FX3's GPIF interface + -- Clock domain: fx3_pclk (source) + U_fx3_model : entity nuand.fx3_model(micro_dma_fifo_stress) + port map ( + fx3_pclk => fx3_pclk, + fx3_gpif => fx3_gpif_i, + fx3_ctl => fx3_ctl_i, + fx3_uart_rxd => '0', + fx3_uart_txd => open, + fx3_uart_cts => open, + fx3_rx_en => '1', + fx3_rx_meta_en => meta_en_rx, + fx3_tx_en => '1', + fx3_tx_meta_en => meta_en_tx, + eight_bit_mode_en => EIGHT_BIT_MODE_EN, + done => done + ); + + -- Generate phase-shifted PLL clock + U_fx3_pll : entity rtl_work.fx3_pll + port map ( + inclk0 => fx3_pclk, + areset => pll_reset, + c0 => fx3_pclk_pll, + locked => pll_locked + ); + + tx_clock <= not tx_clock after TX_HALF_PERIOD ; + rx_clock <= not rx_clock after RX_HALF_PERIOD ; + + + -- Reset handler + sys_rst <= '0' after 100 ns; + + -- Generate system clock + sys_clk <= not sys_clk after SYSCLK_HALF_PERIOD when not done else '0'; + + + tx_reset <= sys_rst; + tx_ts_reset <= sys_rst; + rx_reset <= sys_rst; + rx_ts_reset <= sys_rst; + + meta_en_tx <= fx3_control.meta_enable; + meta_en_rx <= fx3_control.meta_enable; + + -- TX Submodule + U_tx : entity work.tx + generic map ( + NUM_STREAMS => dac_controls'length + ) + port map ( + tx_reset => tx_reset, + tx_clock => tx_clock, + tx_enable => fx3_control.tx_enable, + + meta_en => meta_en_tx, + timestamp_reset => tx_ts_reset, + usb_speed => fx3_control.usb_speed, + tx_underflow_led => open, + tx_timestamp => tx_timestamp, + + -- Triggering + trigger_arm => '0', + trigger_fire => '0', + trigger_master => '0', + trigger_line => open, + + -- Packet FIFO + packet_en => fx3_control.packet, + packet_empty => open, + packet_control => tx_packet_control, + packet_ready => '1', + + -- 8-bit mode + eight_bit_mode_en => EIGHT_BIT_MODE_EN, + + -- Samples from host via FX3 + sample_fifo_wclock => fx3_pclk_pll, + sample_fifo_wreq => tx_sample_fifo.wreq, + sample_fifo_wdata => tx_sample_fifo.wdata, + sample_fifo_wempty => tx_sample_fifo.wempty, + sample_fifo_wfull => tx_sample_fifo.wfull, + sample_fifo_wused => tx_sample_fifo.wused, + + -- Metadata from host via FX3 + meta_fifo_wclock => fx3_pclk_pll, + meta_fifo_wreq => tx_meta_fifo.wreq, + meta_fifo_wdata => tx_meta_fifo.wdata, + meta_fifo_wempty => tx_meta_fifo.wempty, + meta_fifo_wfull => tx_meta_fifo.wfull, + meta_fifo_wused => tx_meta_fifo.wused, + + -- Digital Loopback Interface + loopback_enabled => '0', + loopback_fifo_wdata => loopback_fifo.wdata, + loopback_fifo_wreq => loopback_fifo.wreq, + loopback_fifo_wfull => loopback_fifo.wfull, + loopback_fifo_wused => loopback_fifo.wused, + + -- RFFE Interface + dac_controls => dac_controls, + dac_streams => dac_streams + ); + + -- RX Submodule + U_rx : entity work.rx + generic map ( + NUM_STREAMS => adc_controls'length + ) + port map ( + rx_reset => rx_reset, + rx_clock => rx_clock, + rx_enable => fx3_control.rx_enable, + + meta_en => meta_en_rx, + timestamp_reset => rx_ts_reset, + usb_speed => fx3_control.usb_speed, + rx_mux_sel => to_unsigned(0, 3), + rx_overflow_led => open, + rx_timestamp => rx_timestamp, + + -- Triggering + trigger_arm => '0', + trigger_fire => '0', + trigger_master => '0', + trigger_line => open, + trigger_signal_sync_tb => trigger_signal_sync_tb, + + -- Packet FIFO + packet_en => fx3_control.packet, + packet_control => rx_packet_control, + packet_ready => rx_packet_ready, + + -- 8-bit mode + eight_bit_mode_en => EIGHT_BIT_MODE_EN, + + -- Samples to host via FX3 + sample_fifo_rclock => fx3_pclk_pll, + sample_fifo_raclr => not fx3_control.rx_enable, + sample_fifo_rreq => rx_sample_fifo.rreq, + sample_fifo_rdata => rx_sample_fifo.rdata, + sample_fifo_rempty => rx_sample_fifo.rempty, + sample_fifo_rfull => rx_sample_fifo.rfull, + sample_fifo_rused => rx_sample_fifo.rused, + + -- Mini expansion signals + mini_exp => "00", + + -- Metadata to host via FX3 + meta_fifo_rclock => fx3_pclk_pll, + meta_fifo_raclr => not fx3_control.rx_enable, + meta_fifo_rreq => rx_meta_fifo.rreq, + meta_fifo_rdata => rx_meta_fifo.rdata, + meta_fifo_rempty => rx_meta_fifo.rempty, + meta_fifo_rfull => rx_meta_fifo.rfull, + meta_fifo_rused => rx_meta_fifo.rused, + + -- Digital Loopback Interface + loopback_fifo_wenabled => open, + loopback_fifo_wreset => tx_reset, + loopback_fifo_wclock => tx_clock, + loopback_fifo_wdata => loopback_fifo.wdata, + loopback_fifo_wreq => loopback_fifo.wreq, + loopback_fifo_wfull => loopback_fifo.wfull, + loopback_fifo_wused => loopback_fifo.wused, + + -- RFFE Interface + adc_controls => adc_controls, + adc_streams => adc_streams + ); + + -- ======================================================================== + -- Data converters + -- ======================================================================== + + gen_dac_controls : if( NUM_MIMO_STREAMS > 1 ) generate + -- The TX side of the AD9361 HDL is a FIFO pull interface + -- that expects a readahead FIFO. It toggles the data request + -- signal every other cycle. This behavior is mimicked here. + process( tx_clock, sys_rst ) + begin + if( sys_rst = '1' ) then + dac_controls <= ( + 0 => (enable => ENABLE_CHANNEL_0, data_req => '1'), + 1 => (enable => ENABLE_CHANNEL_1, data_req => '1') + ); + elsif( rising_edge(tx_clock) ) then + for i in dac_controls'range loop + dac_controls(i) <= ( + enable => dac_controls(i).enable, + data_req => not dac_controls(i).data_req ); + end loop; + end if; + end process; + else generate + dac_controls <= (others => SAMPLE_CONTROL_ENABLE); + end generate; + + gen_adc_controls : if( NUM_MIMO_STREAMS > 1 ) generate + process( rx_clock, sys_rst ) + constant SIGMA_DELTA_BITS : signed (3 downto 0) := "0000"; + constant COUNT_RESET : integer := 0; + variable count : integer range -2047 to 2047 := COUNT_RESET; + begin + if( sys_rst = '1' ) then + count := COUNT_RESET; + adc_controls <= ( + 0 => (enable => ENABLE_CHANNEL_0, data_req => '1'), + 1 => (enable => ENABLE_CHANNEL_1, data_req => '1') + ); + elsif( rising_edge(rx_clock) ) then + for i in adc_controls'range loop + adc_controls(i) <= ( + enable => adc_controls(i).enable, + data_req => not adc_controls(i).data_req ); + if( adc_controls(i).enable = '1') then + if( adc_streams(i).data_v = '1' ) then + if( EIGHT_BIT_MODE_EN = '1' ) then + adc_streams(i).data_i <= "0000" & to_signed(count, 8) & SIGMA_DELTA_BITS; + adc_streams(i).data_q <= "0000" & to_signed(-count, 8) & SIGMA_DELTA_BITS; + count := (count + 1) mod 128; + else + adc_streams(i).data_i <= to_signed(count, 16); + adc_streams(i).data_q <= to_signed(-count, 16); + count := (count + 1) mod 2048; + end if; + end if; + adc_streams(i).data_v <= not adc_streams(i).data_v; + end if; + end loop; + end if; + end process; + else generate + adc_controls <= (others => SAMPLE_CONTROL_ENABLE); + end generate; + + -- ======================================================================== + -- Processes + -- ======================================================================== + + -- FX3 GPIF bidirectional signal control + -- Adapted from same process in bladerf-hosted.vhd + register_gpif : process(sys_rst, fx3_pclk_pll) + begin + if( sys_rst = '1' ) then + fx3_gpif_i <= (others => 'Z'); + fx3_gpif.gpif_in <= (others => 'Z'); + elsif( rising_edge(fx3_pclk_pll) ) then + fx3_gpif.gpif_in <= fx3_gpif_i; + + if( fx3_gpif.gpif_oe = '1' ) then + fx3_gpif_i <= fx3_gpif.gpif_out; + else + fx3_gpif_i <= (others =>'Z'); + end if; + end if; + end process; + + -- FX3 CTL bidirectional signals + -- Adapted from same generator in bladerf-hosted.vhd + generate_ctl : for i in fx3_ctl_i'range generate + fx3_ctl_i(i) <= fx3_gpif.ctl_out(i) when fx3_gpif.ctl_oe(i) = '1' else 'Z'; + end generate; + + fx3_gpif.ctl_in <= fx3_ctl_i; + + -- Controller for loopback FIFO + -- Stripped-down version of same process from rx.vhd + loopback_fifo_control : process( sys_rst, loopback_fifo.rclock ) + begin + if( sys_rst = '1' ) then + loopback_enabled <= '0'; + loopback_fifo.rreq <= '0'; + loopback_i <= (others => '0'); + loopback_q <= (others => '0'); + loopback_valid <= '0'; + elsif( rising_edge(loopback_fifo.rclock) ) then + loopback_enabled <= '0'; + loopback_fifo.rreq <= '0'; + loopback_i <= loopback_i; + loopback_q <= loopback_q; + loopback_valid <= '0'; + + -- Is loopback enabled? + loopback_enabled <= fx3_control.rx_enable; + + -- Do the loopback + loopback_i <= resize(signed(loopback_fifo.rdata(15 downto 0)), loopback_i'length); + loopback_q <= resize(signed(loopback_fifo.rdata(31 downto 16)), loopback_q'length); + loopback_valid <= loopback_fifo.rreq and not loopback_fifo.rempty; + + -- Read from the FIFO if req'd + loopback_fifo.rreq <= loopback_enabled and (not loopback_fifo.rempty); + end if; + end process; + + -- RX multiplexer + -- Stripped-down version of same process from rx.vhd + rx_mux : process(sys_rst, sys_clk) + begin + if( sys_rst = '1' ) then + rx_mux_i <= (others =>'0'); + rx_mux_q <= (others =>'0'); + rx_mux_valid <= '0'; + elsif( rising_edge(sys_clk) ) then + rx_mux_i <= loopback_i; + rx_mux_q <= loopback_q; + rx_mux_valid <= loopback_valid; + end if; + end process; + + -- TX multiplexer + -- Stripped-down version of mimo_channel_sel_mux from tx.vhd + --tx_mux : process( sys_clk ) + --begin + -- if( rising_edge(sys_clk) ) then + -- tx_sample_fifo.rreq <= not tx_sample_fifo.rempty; + + -- loopback_fifo.wdata <= tx_sample_fifo.rdata; + -- loopback_fifo.wreq <= tx_sample_fifo.rreq and not tx_sample_fifo.rempty; + -- end if; + --end process; + + + -- ======================================================================== + -- Verification + -- ======================================================================== + print_config: process + begin + wait until rising_edge(fx3_control.tx_enable); + report lf& + "[CONFIG] EIGHT_BIT_MODE_EN: " & std_logic'image(EIGHT_BIT_MODE_EN) &lf& + "[CONFIG] ENABLE_CHANNEL_0: " & std_logic'image(ENABLE_CHANNEL_0) &lf& + "[CONFIG] ENABLE_CHANNEL_1: " & std_logic'image(ENABLE_CHANNEL_1); + end process print_config; + + + -- + -- Check for metavalues + -- We should never see metavalues written to the FIFOs + -- + check_fifo_write : process(fx3_pclk_pll) is + begin + if( rising_edge(fx3_pclk_pll) ) then + if( tx_sample_fifo.wreq = '1' and fx3_control.meta_enable = '0' ) then + for i in tx_sample_fifo.wdata'range loop + assert tx_sample_fifo.wdata(i) = '0' or tx_sample_fifo.wdata(i) = '1' + severity failure; + end loop; + end if; + end if; + end process; + + check_fifo_read : process(fx3_pclk_pll) is + begin + if( rising_edge(fx3_pclk_pll) ) then + if( rx_sample_fifo.rreq = '1' ) then + for i in rx_sample_fifo.rdata'range loop + assert rx_sample_fifo.rdata(i) = '0' or rx_sample_fifo.rdata(i) = '1' + severity failure; + end loop; + end if; + end if; + end process check_fifo_read; + + -- + -- Check for fullness on FIFOs + -- + assert(rx_sample_fifo.wfull = '0') report "rx_sample_fifo full (write)" severity warning; + assert(tx_sample_fifo.wfull = '0') report "tx_sample_fifo full (write)" severity warning; + assert(loopback_fifo.wfull = '0') report "loopback_fifo full (write)" severity warning; + + -- + -- Tx Sample Check + -- + look_for_dropped_tx_samples : process(tx_clock) is + constant MESSAGES_PER_ITERATION : natural := 7; --Provided in fx3_model + constant SIGMA_DELTA_BITS : signed (3 downto 0) := "0000"; + variable current_message_count : natural := 1; + variable iq_value : signed (15 downto 0) := x"0000"; + variable expected_sample_i : signed (15 downto 0); + variable expected_sample_q : signed (15 downto 0); + variable failure_count : natural := 0; + begin + for i in dac_controls'range loop + if( rising_edge(tx_clock) + and dac_controls(i).enable = '1' + and dac_streams(i).data_v = '1' + and fx3_control.tx_enable = '1' ) + then + if( EIGHT_BIT_MODE_EN = '1' ) then + expected_sample_i := iq_value (11 downto 0) & SIGMA_DELTA_BITS; + expected_sample_q := iq_value (11 downto 0) + 1 & SIGMA_DELTA_BITS; + + assert ( dac_streams(i).data_i = expected_sample_i ) + report "dac_streams("&to_string(i)&").data_i: " & to_hstring(dac_streams(i).data_i) & " | " & + "expected_sample_i: " & to_hstring(expected_sample_i) + severity warning; + assert ( dac_streams(i).data_q = expected_sample_q ) + report "dac_streams("&to_string(i)&").data_q: " & to_hstring(dac_streams(i).data_q) & " | " & + "expected_sample_q: " & to_hstring(expected_sample_q) + severity warning; + + if ( dac_streams(i).data_i /= expected_sample_i or dac_streams(i).data_q /= expected_sample_q ) then + failure_count := failure_count + 1; + if ( failure_count >= 6 ) then + report "tx fail count tolerance exceeded" severity failure; + end if; + end if; + + iq_value := (iq_value + 2) mod 128; + else + expected_sample_i := iq_value; + expected_sample_q := to_signed(current_message_count, 8) & (iq_value(7 downto 0) + 1); + + assert(dac_streams(i).data_i = expected_sample_i) + report "dac_streams("&to_string(i)&").data_i: " & to_hstring(dac_streams(i).data_i) & " | " & + "expected_sample_i: " & to_hstring(expected_sample_i) + severity failure; + assert(dac_streams(i).data_q = expected_sample_q) + report "dac_streams("&to_string(i)&").data_q: " & to_hstring(dac_streams(i).data_q) & " | " & + "expected_sample_q: " & to_hstring(expected_sample_q) + severity failure; + + -- Set iq values based on blocks received + -- See tx_sample_stream's encoding scheme in fx3_model.vhd + if( iq_value = x"03FE" ) then + iq_value := x"0000"; + if( current_message_count < MESSAGES_PER_ITERATION ) then + current_message_count := current_message_count + 1; + else + current_message_count := 1; + end if; + else + iq_value := (iq_value + 2) mod 2048; + end if; + end if; + end if; + end loop; + + end process look_for_dropped_tx_samples; + + -- + -- Rx Sample Check + -- + first_rx_val_at_mux: process + -- Catches and saves the first sample of + -- each rx enabled burst seen by the mux + begin + for i in adc_controls'range loop + if( adc_controls(i).enable = '1') then + if( ENABLE_CHANNEL_0 = '1' and ENABLE_CHANNEL_1 = '1' ) then + adc_stream_val_at_rx_enable <= adc_streams(i).data_i - 1; + else + adc_stream_val_at_rx_enable <= adc_streams(i).data_i; + end if; + end if; + end loop; + wait until rising_edge(trigger_signal_sync_tb); + end process first_rx_val_at_mux; + + look_for_dropped_rx_samples: process(fx3_pclk_pll) + variable rx_val : integer := 0; + + variable q_expected : std_logic_vector (15 downto 0); + variable i_expected : std_logic_vector (15 downto 0); + variable q_out : std_logic_vector (15 downto 0); + variable i_out : std_logic_vector (15 downto 0); + + variable q0_expected_eight_bit_mode : std_logic_vector (7 downto 0); + variable i0_expected_eight_bit_mode : std_logic_vector (7 downto 0); + variable q1_expected_eight_bit_mode : std_logic_vector (7 downto 0); + variable i1_expected_eight_bit_mode : std_logic_vector (7 downto 0); + variable q0_out_eight_bit_mode : std_logic_vector (7 downto 0); + variable i0_out_eight_bit_mode : std_logic_vector (7 downto 0); + variable q1_out_eight_bit_mode : std_logic_vector (7 downto 0); + variable i1_out_eight_bit_mode : std_logic_vector (7 downto 0); + + variable previous_adc_stream_val_at_rx_enable : signed (15 downto 0) := ( others => '0'); + variable fail_count: natural := 0; + variable both_channels_en : std_logic; + begin + if( previous_adc_stream_val_at_rx_enable /= adc_stream_val_at_rx_enable ) then + rx_val := to_integer(adc_stream_val_at_rx_enable (15 downto 4)) when EIGHT_BIT_MODE_EN else + to_integer(adc_stream_val_at_rx_enable); + previous_adc_stream_val_at_rx_enable := adc_stream_val_at_rx_enable; + end if; + + if( rising_edge(fx3_pclk_pll) + and fx3_gpif.gpif_oe = '1' + and fx3_control.rx_enable = '1' ) then + if( EIGHT_BIT_MODE_EN = '1') then + -- The +-1 ch1 offset in SISO mode will not reach 128 + both_channels_en := ENABLE_CHANNEL_0 and ENABLE_CHANNEL_1; + q1_expected_eight_bit_mode := std_logic_vector(to_signed(-rx_val - 1, 8)) when both_channels_en else + std_logic_vector(to_signed(-((rx_val + 1) mod 128), 8)); + i1_expected_eight_bit_mode := std_logic_vector(to_signed(rx_val + 1, 8)) when both_channels_en else + std_logic_vector(to_signed((rx_val + 1) mod 128, 8)); + q0_expected_eight_bit_mode := std_logic_vector(to_signed(-rx_val, 8)); + i0_expected_eight_bit_mode := std_logic_vector(to_signed(rx_val, 8)); + + q1_out_eight_bit_mode := fx3_gpif.gpif_out(31 downto 24); + i1_out_eight_bit_mode := fx3_gpif.gpif_out(23 downto 16); + q0_out_eight_bit_mode := fx3_gpif.gpif_out(15 downto 8); + i0_out_eight_bit_mode := fx3_gpif.gpif_out(7 downto 0); + + if( q1_out_eight_bit_mode /= q1_expected_eight_bit_mode or + i1_out_eight_bit_mode /= i1_expected_eight_bit_mode or + q0_out_eight_bit_mode /= q0_expected_eight_bit_mode or + i0_out_eight_bit_mode /= i0_expected_eight_bit_mode) then + fail_count := fail_count + 1; + report "-----------------------------"; + if( fail_count > 3 ) then + report "rx fail count tolerance exceeded" severity failure; + end if; + end if; + + assert ( q1_out_eight_bit_mode = q1_expected_eight_bit_mode ) + report "data_q1: " & to_hstring(q1_out_eight_bit_mode) & " | " & + "expected: " & to_hstring(q1_expected_eight_bit_mode) + severity warning; + assert ( i1_out_eight_bit_mode = i1_expected_eight_bit_mode ) + report "data_i1: " & to_hstring(i1_out_eight_bit_mode) & " | " & + "expected: " & to_hstring(i1_expected_eight_bit_mode) + severity warning; + assert ( q0_out_eight_bit_mode = q0_expected_eight_bit_mode ) + report "data_q0: " & to_hstring(q0_out_eight_bit_mode) & " | " & + "expected: " & to_hstring(q0_expected_eight_bit_mode) + severity warning; + assert ( i0_out_eight_bit_mode = i0_expected_eight_bit_mode ) + report "data_i0: " & to_hstring(i0_out_eight_bit_mode) & " | " & + "expected: " & to_hstring(i0_expected_eight_bit_mode) + severity warning; + + -- 128 limit set by gen_adc_controls above + rx_val := (rx_val + 2) mod 128; + else + q_expected := std_logic_vector(to_signed(-rx_val, 16)); + i_expected := std_logic_vector(to_signed(rx_val, 16)); + q_out := fx3_gpif.gpif_out(31 downto 16); + i_out := fx3_gpif.gpif_out(15 downto 0); + + assert(q_out = q_expected) + report "data_q: " & to_hstring(q_out) & " | " & + "expected: " & to_hstring(q_expected) + severity failure; + assert(i_out = i_expected) + report "data_i: " & to_hstring(i_out) & " | " & + "expected: " & to_hstring(i_expected) + severity failure; + + -- 2047 limit set by gen_adc_controls above + rx_val := (rx_val + 1) mod 2048; + end if; + end if; + end process look_for_dropped_rx_samples; + +end architecture; diff --git a/hdl/fpga/platforms/bladerf-micro/vhdl/tb/fx3_model_fifo_stress.vhd b/hdl/fpga/platforms/bladerf-micro/vhdl/tb/fx3_model_fifo_stress.vhd new file mode 100644 index 00000000..21e3618b --- /dev/null +++ b/hdl/fpga/platforms/bladerf-micro/vhdl/tb/fx3_model_fifo_stress.vhd @@ -0,0 +1,279 @@ +-- Copyright (c) 2024 Nuand LLC +-- +-- Permission is hereby granted, free of charge, to any person obtaining a copy +-- of this software and associated documentation files (the "Software"), to deal +-- in the Software without restriction, including without limitation the rights +-- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +-- copies of the Software, and to permit persons to whom the Software is +-- furnished to do so, subject to the following conditions: +-- +-- The above copyright notice and this permission notice shall be included in +-- all copies or substantial portions of the Software. +-- +-- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +-- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +-- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +-- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +-- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +-- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +-- THE SOFTWARE. + +library ieee; + use ieee.std_logic_1164.all; + use ieee.numeric_std.all; + use ieee.math_real.all; + use ieee.math_complex.all; + +library work; + use work.util.all; + +architecture micro_dma_fifo_stress of fx3_model is + + constant PCLK_HALF_PERIOD : time := 1 sec * (1.0/100.0e6/2.0); + constant START_COUNT : natural := 32; + constant BLOCKS_PER_ITERATION : natural := 7; + constant ITERATIONS : natural := 4; + + -- Control mapping + alias dma0_rx_ack is fx3_ctl( 0); + alias dma1_rx_ack is fx3_ctl( 1); + alias dma2_tx_ack is fx3_ctl( 2); + alias dma3_tx_ack is fx3_ctl( 3); + alias dma_rx_enable is fx3_ctl( 4); + alias dma_tx_enable is fx3_ctl( 5); + alias dma_idle is fx3_ctl( 6); + alias system_reset is fx3_ctl( 7); + alias dma0_rx_reqx is fx3_ctl( 8); + alias dma1_rx_reqx is fx3_ctl(12); -- due to 9 being connected to dclk + alias dma2_tx_reqx is fx3_ctl(10); + alias dma3_tx_reqx is fx3_ctl(11); + + type gpif_state_t is (IDLE, TX_META, TX_SAMPLES, RX_SAMPLES); + signal gpif_state_rx, gpif_state_tx : gpif_state_t; + + signal rx_done : boolean := false; + signal tx_done : boolean := false; + + signal rx_data : std_logic_vector(31 downto 0); + signal tx_data : std_logic_vector(31 downto 0); + + impure function data_gen (count : natural) return std_logic_vector is + variable eight_bit_msw_i : std_logic_vector(7 downto 0); + variable eight_bit_msw_q : std_logic_vector(7 downto 0); + variable eight_bit_lsw_i : std_logic_vector(7 downto 0); + variable eight_bit_lsw_q : std_logic_vector(7 downto 0); + variable msw, lsw : std_logic_vector(15 downto 0); + begin + if( eight_bit_mode_en = '1' ) then + eight_bit_lsw_i := std_logic_vector(to_unsigned(count, 8)); + eight_bit_lsw_q := std_logic_vector(to_unsigned(count+1, 8)); + eight_bit_msw_i := std_logic_vector(to_unsigned(count+2, 8)); + eight_bit_msw_q := std_logic_vector(to_unsigned(count+3, 8)); + lsw := eight_bit_lsw_q & eight_bit_lsw_i; + msw := eight_bit_msw_q & eight_bit_msw_i; + else + msw := std_logic_vector(to_signed(count+1, 16)); + lsw := std_logic_vector(to_signed(count, 16)); + end if; + + return (msw & lsw); + end function data_gen; + + impure function data_check (count : natural ; rxdata : std_logic_vector(31 downto 0)) return boolean is + begin + return (rxdata = data_gen(count)); + end function data_check; + +begin + + -- DCLK which isn't used + fx3_ctl(9) <= '0'; + + fx3_ctl(3 downto 0) <= (others => 'Z'); + + -- Create a 100MHz clock output + fx3_pclk <= not fx3_pclk after PCLK_HALF_PERIOD when (not rx_done or not tx_done) else '0'; + + -- Doneness + done <= rx_done and tx_done; + + rx_sample_stream : process + constant BLOCK_SIZE : natural := 512; + variable count : natural := START_COUNT; + variable req_time : time; + begin + gpif_state_rx <= IDLE; + dma0_rx_reqx <= '1'; + dma1_rx_reqx <= '1'; + dma_rx_enable <= '0'; + rx_data <= (others => 'U'); + + wait until rising_edge(fx3_pclk) and system_reset = '0'; + + nop(fx3_pclk, 1000); + + wait until rising_edge(fx3_pclk) and fx3_rx_en = '1'; + + wait for 30 us; + + for j in 1 to ITERATIONS loop + dma_rx_enable <= '1'; + + for i in 1 to BLOCKS_PER_ITERATION loop + dma0_rx_reqx <= '0'; + req_time := now; + wait until rising_edge( fx3_pclk ) and dma0_rx_ack = '1'; + wait until rising_edge( fx3_pclk ); + dma0_rx_reqx <= '1'; + + report "RX iteration " & to_string(j) & " block " & to_string(i) & " delay " & to_string(now - req_time); + + for i in 1 to BLOCK_SIZE loop + gpif_state_rx <= RX_SAMPLES; + rx_data <= fx3_gpif; + wait until rising_edge( fx3_pclk ); + + --assert data_check(count, rx_data) severity failure; + + count := (count + 1) mod 2048; + gpif_state_rx <= IDLE; + rx_data <= (others => 'X'); + end loop; + end loop; + + dma_rx_enable <= '0'; + wait for 10 us; + end loop; + + report "Done with RX sample stream"; + rx_done <= true; + wait; + end process; + + tx_sample_stream : process + constant TIME_BETWEEN_ITERATIONS : natural := 4593; + constant BLOCK_SIZE : natural := 512; + variable count : natural := START_COUNT; + variable timestamp_cntr : natural := 400; + variable header_len : natural := 0; + variable data_out : std_logic_vector(31 downto 0); + variable req_time : time; + begin + gpif_state_tx <= IDLE; + dma2_tx_reqx <= '1'; + dma3_tx_reqx <= '1'; + dma_tx_enable <= '0'; + fx3_gpif <= (others =>'Z'); + + wait until rising_edge(fx3_pclk) and system_reset = '0'; + + nop(fx3_pclk, 1000); + + wait until rising_edge(fx3_pclk) and fx3_tx_en = '1'; + + wait for 30 us; + + for k in 1 to ITERATIONS loop + dma_tx_enable <= '1'; + + for fifo_stress_idx in 1 to 3 loop + for j in 1 to BLOCKS_PER_ITERATION loop + header_len := 0; + dma3_tx_reqx <= '0'; + req_time := now; + wait until rising_edge( fx3_pclk ) and dma3_tx_ack = '1'; + wait until rising_edge( fx3_pclk ); + wait until rising_edge( fx3_pclk ); + wait until rising_edge( fx3_pclk ); + dma3_tx_reqx <= '1'; + + report "TX iteration " & to_string(k) & " block " & to_string(j) & " delay " & to_string(now - req_time); + + + if( fx3_tx_meta_en = '1') then + header_len := 4; + + for i in 1 to 4 loop + case (i) is + when 1 => + data_out := x"00000000"; + when 2 => + data_out(31 downto 0) := std_logic_vector(to_signed(timestamp_cntr, 32)); + if (j = BLOCKS_PER_ITERATION) then + timestamp_cntr := timestamp_cntr + TIME_BETWEEN_ITERATIONS; + else + timestamp_cntr := timestamp_cntr + 254; + end if; + when 3 => + data_out := (others => '0'); + when 4 => + data_out := (others => '1'); + end case; + + gpif_state_tx <= TX_META; + fx3_gpif <= data_out; + tx_data <= data_out; + wait until rising_edge( fx3_pclk ); + + gpif_state_tx <= IDLE; + tx_data <= (others => 'X'); + end loop; + end if; + count := 0; + + for i in 1 to (BLOCK_SIZE - header_len) loop + gpif_state_tx <= TX_SAMPLES; + data_out := data_gen(count); + if( eight_bit_mode_en = '1' ) then + fx3_gpif <= data_out; + tx_data <= data_out; + else + fx3_gpif <= std_logic_vector(to_unsigned(j, 8)) & data_out(23 downto 0); + tx_data <= std_logic_vector(to_unsigned(j, 8)) & data_out(23 downto 0); + end if; + wait until rising_edge( fx3_pclk ); + + count := (count + 4) mod 128 when eight_bit_mode_en = '1' else + (count + 2) mod 2048; + gpif_state_tx <= IDLE; + tx_data <= (others => 'X'); + end loop; + + fx3_gpif <= (others =>'Z'); + nop(fx3_pclk, 10); + end loop; + wait for 10 us; + end loop; + + wait for 2 ms; + dma_tx_enable <= '0'; + wait for 10 us; + end loop; + + report "Done with TX sample stream"; + tx_done <= true; + wait; + end process; + + reset_system : process + begin + system_reset <= '1'; + dma_idle <= '0'; + nop( fx3_pclk, 100 ); + system_reset <= '0'; + nop( fx3_pclk, 10 ); + dma_idle <= '1'; + wait; + end process; + + -- TODO: UART Interface + fx3_uart_txd <= '1'; + fx3_uart_cts <= '1'; + + assert (gpif_state_tx = IDLE and gpif_state_rx /= IDLE) + or (gpif_state_rx = IDLE and gpif_state_tx /= IDLE) + or (gpif_state_rx = IDLE and gpif_state_tx = IDLE) + report "gpif_state_rx and gpif_state_tx cannot both be non-idle" + severity failure; + +end architecture micro_dma_fifo_stress; From 367df45e7503efbda6135e27225dc6af04b194cd Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Wed, 24 Jul 2024 13:08:40 -0500 Subject: [PATCH 104/238] hdl: fixed fifo ingestion arithmetic on tx enable toggle The channel shift would be left at 1 after the state moved to COMPUTE_ENABLED_CHANNELS. Samples left would be reassigned to 1 in COMPUTE_OFFSETS. Then channel offset would be assigned 2, an invalid value. This change only assigns samples left and channel shift if at the 0th sample index, which allows for sample continuity. --- hdl/fpga/ip/nuand/synthesis/fifo_reader.vhd | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/hdl/fpga/ip/nuand/synthesis/fifo_reader.vhd b/hdl/fpga/ip/nuand/synthesis/fifo_reader.vhd index d4cfb406..a8c5ddb7 100644 --- a/hdl/fpga/ip/nuand/synthesis/fifo_reader.vhd +++ b/hdl/fpga/ip/nuand/synthesis/fifo_reader.vhd @@ -493,7 +493,11 @@ begin -- still need to be processed (not including the first). This becomes the number of clock -- cycles to wait before asserting the FIFO read request to get a new batch of samples. fifo_future.samples_left_init <= NUM_STREAMS - fifo_current.enabled_channels; - fifo_future.samples_left <= NUM_STREAMS - fifo_current.enabled_channels; + + if (fifo_current.samples_left = FIFO_FSM_RESET_VALUE.samples_left) then + fifo_future.samples_left <= NUM_STREAMS - fifo_current.enabled_channels; + fifo_future.ch_shift <= 0; + end if; if( packet_en = '1' ) then fifo_future.state <= READ_PACKET; From 77d234c3bb6280cbd391b9a2c53d8bca27761691 Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Tue, 23 Jul 2024 19:24:26 -0500 Subject: [PATCH 105/238] hdl: leverage full sample depth of sample fifos We were limiting ourselves to half of the fifo depth and subtracting 4 gpif buffers from that, which is 1/4 of the current fifo depth. No sign of a full fifo during siso, mimo, meta, and non-meta streaming tests at low sample rates. The fifo writes are appropriately held off. --- hdl/fpga/ip/nuand/synthesis/fifo_writer.vhd | 2 +- hdl/fpga/platforms/bladerf-micro/vhdl/bladerf_p.vhd | 8 ++++---- hdl/fpga/platforms/common/bladerf/vhdl/fx3_gpif.vhd | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/hdl/fpga/ip/nuand/synthesis/fifo_writer.vhd b/hdl/fpga/ip/nuand/synthesis/fifo_writer.vhd index 86bf18d3..f4667b34 100644 --- a/hdl/fpga/ip/nuand/synthesis/fifo_writer.vhd +++ b/hdl/fpga/ip/nuand/synthesis/fifo_writer.vhd @@ -187,7 +187,7 @@ begin meta_fifo_used_v := unsigned(meta_fifo_full & meta_fifo_usedw); meta_fifo_used_v_r <= meta_fifo_used_v; - if( fifo_full = '0' and ((FIFO_MAX - fifo_used_v_r) > ( dma_buf_size * 4 )) and + if( fifo_full = '0' and ((FIFO_MAX - fifo_used_v_r) > ( dma_buf_size )) and ( ( meta_en = '1' and meta_fifo_full = '0' and ( META_MAX - 4 ) > meta_fifo_used_v_r ) or (meta_en = '0') ) ) then fifo_enough <= true; diff --git a/hdl/fpga/platforms/bladerf-micro/vhdl/bladerf_p.vhd b/hdl/fpga/platforms/bladerf-micro/vhdl/bladerf_p.vhd index 519d57db..4aa6ee3c 100644 --- a/hdl/fpga/platforms/bladerf-micro/vhdl/bladerf_p.vhd +++ b/hdl/fpga/platforms/bladerf-micro/vhdl/bladerf_p.vhd @@ -168,11 +168,11 @@ package bladerf_p is constant TX_FIFO_WWIDTH : natural := 32; -- write side data width constant TX_FIFO_RWIDTH : natural := 64; -- read side data width - constant TX_FIFO_LENGTH : natural := 16384; -- samples + constant TX_FIFO_LENGTH : natural := 8192; -- samples constant RX_FIFO_WWIDTH : natural := 64; -- write side data width constant RX_FIFO_RWIDTH : natural := 32; -- read side data width - constant RX_FIFO_LENGTH : natural := 4096; -- samples + constant RX_FIFO_LENGTH : natural := 8192; -- samples constant ADSB_FIFO_WWIDTH : natural := 128; -- write side data width constant ADSB_FIFO_RWIDTH : natural := 32; -- read side data width @@ -184,11 +184,11 @@ package bladerf_p is constant META_FIFO_TX_WWIDTH : natural := 32; -- write side data width constant META_FIFO_TX_RWIDTH : natural := 128; -- read side data width - constant META_FIFO_TX_LENGTH : natural := 512; -- 32-bit words + constant META_FIFO_TX_LENGTH : natural := 2048; -- 32-bit words constant META_FIFO_RX_WWIDTH : natural := 128; -- write side data width constant META_FIFO_RX_RWIDTH : natural := 32; -- read side data width - constant META_FIFO_RX_LENGTH : natural := 512; -- 32-bit words + constant META_FIFO_RX_LENGTH : natural := 2048; -- 32-bit words type tx_fifo_t is record aclr : std_logic; diff --git a/hdl/fpga/platforms/common/bladerf/vhdl/fx3_gpif.vhd b/hdl/fpga/platforms/common/bladerf/vhdl/fx3_gpif.vhd index dfdf0417..67380194 100644 --- a/hdl/fpga/platforms/common/bladerf/vhdl/fx3_gpif.vhd +++ b/hdl/fpga/platforms/common/bladerf/vhdl/fx3_gpif.vhd @@ -280,7 +280,7 @@ begin -- Can we not fit one more block of data in RX buffer? rx_fifo_critical <= (unsigned(rx_fifo_usedw) >= ((2**(rx_fifo_usedw'length-1) - gpif_buf_size))); -- Do we have room for one more block of data in the TX buffer? - tx_fifo_enough <= (unsigned(tx_fifo_usedw) < ((2**(tx_fifo_usedw'length-1) - gpif_buf_size * 4))) and + tx_fifo_enough <= (unsigned(tx_fifo_usedw) < ((2**(tx_fifo_usedw'length) - gpif_buf_size))) and (unsigned(tx_meta_fifo_usedw) < ((2**(tx_meta_fifo_usedw'length-1) - 4))); end if; end process calculate_fifo_waterlines; From 27fe2f48eadf3c666179c85998120068c6cd468d Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Mon, 29 Jul 2024 14:44:31 -0500 Subject: [PATCH 106/238] hdl: moved gpif buf size constants to fx3 gpif package As we add changes to the FX3, it will be much easier to have a single source of truth for the GPIF DMA sizes. This commit should not introduce any changes to simulation or synthesis results. --- hdl/fpga/ip/nuand/fx3_gpif_tb.do | 1 + hdl/fpga/ip/nuand/nuand.do | 1 + hdl/fpga/ip/nuand/synthesis/fifo_reader.vhd | 5 ++-- hdl/fpga/ip/nuand/synthesis/fifo_writer.vhd | 5 ++-- .../platforms/bladerf-micro/bladerf-adsb.qip | 1 + .../bladerf-micro/bladerf-foxhunt.qip | 1 + .../bladerf-micro/bladerf-hosted.qip | 1 + .../platforms/bladerf-micro/bladerf-wlan.qip | 1 + .../bladerf-micro/modelsim/compile.do | 1 + hdl/fpga/platforms/bladerf/bladerf-adsb.qip | 1 + .../platforms/bladerf/bladerf-atsc_tx.qip | 1 + hdl/fpga/platforms/bladerf/bladerf-hosted.qip | 1 + .../common/bladerf/vhdl/fx3_gpif.vhd | 7 +++-- .../common/bladerf/vhdl/fx3_gpif_p.vhd | 27 +++++++++++++++++++ 14 files changed, 46 insertions(+), 8 deletions(-) create mode 100644 hdl/fpga/platforms/common/bladerf/vhdl/fx3_gpif_p.vhd diff --git a/hdl/fpga/ip/nuand/fx3_gpif_tb.do b/hdl/fpga/ip/nuand/fx3_gpif_tb.do index 1b3cc47b..5b70254d 100644 --- a/hdl/fpga/ip/nuand/fx3_gpif_tb.do +++ b/hdl/fpga/ip/nuand/fx3_gpif_tb.do @@ -4,6 +4,7 @@ proc compile_fx3_gpif { root } { vlib work vcom -2008 -work work [file join $root ./synthesis/set_clear_ff.vhd] + vcom -2008 -work work [file join $root ../../platforms/common/bladerf/vhdl/fx3_gpif_p.vhd] vcom -2008 -work work [file join $root ../../platforms/common/bladerf/vhdl/fx3_gpif.vhd] vcom -2008 -work work [file join $root ./simulation/util.vhd] vcom -2008 -work work [file join $root ./simulation/fx3_model.vhd] diff --git a/hdl/fpga/ip/nuand/nuand.do b/hdl/fpga/ip/nuand/nuand.do index c1475459..1d530437 100644 --- a/hdl/fpga/ip/nuand/nuand.do +++ b/hdl/fpga/ip/nuand/nuand.do @@ -42,6 +42,7 @@ proc compile_nuand { root platform } { vcom -work nuand -2008 [file join $root ./synthesis/tb/atsc_tx_tb.vhd] + vcom -work nuand -2008 [file join $root ../../platforms/common/bladerf/vhdl/fx3_gpif_p.vhd] vcom -work nuand -2008 [file join $root ./simulation/fx3_model.vhd] vcom -work nuand -2008 [file join $root ./simulation/lms6002d_model.vhd] diff --git a/hdl/fpga/ip/nuand/synthesis/fifo_reader.vhd b/hdl/fpga/ip/nuand/synthesis/fifo_reader.vhd index a8c5ddb7..848155ea 100644 --- a/hdl/fpga/ip/nuand/synthesis/fifo_reader.vhd +++ b/hdl/fpga/ip/nuand/synthesis/fifo_reader.vhd @@ -24,6 +24,7 @@ library ieee; library work; use work.fifo_readwrite_p.all; + use work.fx3_gpif_p.all; entity fifo_reader is generic ( @@ -71,8 +72,8 @@ end entity; architecture simple of fifo_reader is - constant DMA_BUF_SIZE_SS : natural := 512; - constant DMA_BUF_SIZE_HS : natural := 256; + constant DMA_BUF_SIZE_SS : natural := GPIF_BUF_SIZE_SS; + constant DMA_BUF_SIZE_HS : natural := GPIF_BUF_SIZE_HS; signal dma_buf_size : natural range DMA_BUF_SIZE_HS to DMA_BUF_SIZE_SS := DMA_BUF_SIZE_SS; signal underflow_detected : std_logic := '0'; diff --git a/hdl/fpga/ip/nuand/synthesis/fifo_writer.vhd b/hdl/fpga/ip/nuand/synthesis/fifo_writer.vhd index f4667b34..36fa0098 100644 --- a/hdl/fpga/ip/nuand/synthesis/fifo_writer.vhd +++ b/hdl/fpga/ip/nuand/synthesis/fifo_writer.vhd @@ -24,6 +24,7 @@ library ieee; library work; use work.fifo_readwrite_p.all; + use work.fx3_gpif_p.all; entity fifo_writer is generic ( @@ -70,8 +71,8 @@ end entity; architecture simple of fifo_writer is - constant DMA_BUF_SIZE_SS : natural := 512; - constant DMA_BUF_SIZE_HS : natural := 256; + constant DMA_BUF_SIZE_SS : natural := GPIF_BUF_SIZE_SS; + constant DMA_BUF_SIZE_HS : natural := GPIF_BUF_SIZE_HS; signal dma_buf_size : natural range DMA_BUF_SIZE_HS to DMA_BUF_SIZE_SS := DMA_BUF_SIZE_SS; diff --git a/hdl/fpga/platforms/bladerf-micro/bladerf-adsb.qip b/hdl/fpga/platforms/bladerf-micro/bladerf-adsb.qip index 51720fcf..f6ac9da8 100644 --- a/hdl/fpga/platforms/bladerf-micro/bladerf-adsb.qip +++ b/hdl/fpga/platforms/bladerf-micro/bladerf-adsb.qip @@ -36,6 +36,7 @@ set_global_assignment -name QIP_FILE [file normalize [file join $nuand_ip pll_r set_global_assignment -name VHDL_FILE [file normalize [file join $nuand_ip ps_sync/vhdl/ps_sync.vhd]] # Implementation Details +set_global_assignment -name VHDL_FILE [file normalize [file join $common_dir vhdl/fx3_gpif_p.vhd]] set_global_assignment -name VHDL_FILE [file normalize [file join $common_dir vhdl/fx3_gpif.vhd]] set_global_assignment -name VHDL_FILE [file normalize [file join $here vhdl/tx.vhd]] set_global_assignment -name VHDL_FILE [file normalize [file join $here vhdl/rx-adsb.vhd]] diff --git a/hdl/fpga/platforms/bladerf-micro/bladerf-foxhunt.qip b/hdl/fpga/platforms/bladerf-micro/bladerf-foxhunt.qip index 80b16c4a..380c3eea 100644 --- a/hdl/fpga/platforms/bladerf-micro/bladerf-foxhunt.qip +++ b/hdl/fpga/platforms/bladerf-micro/bladerf-foxhunt.qip @@ -33,6 +33,7 @@ set_global_assignment -name VHDL_FILE [file normalize [file join $nuand_ip ps_sy set_global_assignment -name QIP_FILE [file normalize [file join $nuand_ip tone_generator/tone_generator.qip]] # Implementation Details +set_global_assignment -name VHDL_FILE [file normalize [file join $common_dir vhdl/fx3_gpif_p.vhd]] set_global_assignment -name VHDL_FILE [file normalize [file join $common_dir vhdl/fx3_gpif.vhd]] set_global_assignment -name VHDL_FILE [file normalize [file join $here vhdl/tx.vhd]] set_global_assignment -name VHDL_FILE [file normalize [file join $here vhdl/rx.vhd]] diff --git a/hdl/fpga/platforms/bladerf-micro/bladerf-hosted.qip b/hdl/fpga/platforms/bladerf-micro/bladerf-hosted.qip index 42f5e944..2a97c1c9 100644 --- a/hdl/fpga/platforms/bladerf-micro/bladerf-hosted.qip +++ b/hdl/fpga/platforms/bladerf-micro/bladerf-hosted.qip @@ -34,6 +34,7 @@ set_global_assignment -name QIP_FILE [file normalize [file join $nuand_ip pll_r set_global_assignment -name VHDL_FILE [file normalize [file join $nuand_ip ps_sync/vhdl/ps_sync.vhd]] # Implementation Details +set_global_assignment -name VHDL_FILE [file normalize [file join $common_dir vhdl/fx3_gpif_p.vhd]] set_global_assignment -name VHDL_FILE [file normalize [file join $common_dir vhdl/fx3_gpif.vhd]] set_global_assignment -name VHDL_FILE [file normalize [file join $here vhdl/tx.vhd]] set_global_assignment -name VHDL_FILE [file normalize [file join $here vhdl/rx.vhd]] diff --git a/hdl/fpga/platforms/bladerf-micro/bladerf-wlan.qip b/hdl/fpga/platforms/bladerf-micro/bladerf-wlan.qip index 4504b78a..d30315e2 100644 --- a/hdl/fpga/platforms/bladerf-micro/bladerf-wlan.qip +++ b/hdl/fpga/platforms/bladerf-micro/bladerf-wlan.qip @@ -36,6 +36,7 @@ set_global_assignment -name VHDL_FILE [file normalize [file join $nuand_ip synth set_global_assignment -name VHDL_FILE [file normalize [file join $nuand_ip rfic_spi_controller/vhdl/rfic_spi_controller.vhd]] # Implementation Details +set_global_assignment -name VHDL_FILE [file normalize [file join $common_dir vhdl/fx3_gpif_p.vhd]] set_global_assignment -name VHDL_FILE [file normalize [file join $common_dir vhdl/fx3_gpif.vhd]] set_global_assignment -name VHDL_FILE [file normalize [file join $here vhdl/tx.vhd]] set_global_assignment -name VHDL_FILE [file normalize [file join $here vhdl/rx.vhd]] diff --git a/hdl/fpga/platforms/bladerf-micro/modelsim/compile.do b/hdl/fpga/platforms/bladerf-micro/modelsim/compile.do index 61ada131..1c44b08b 100644 --- a/hdl/fpga/platforms/bladerf-micro/modelsim/compile.do +++ b/hdl/fpga/platforms/bladerf-micro/modelsim/compile.do @@ -3,6 +3,7 @@ compile_nuand ../../../ip/nuand bladerf-micro vcom -work nuand -2008 ../vhdl/tb/nios_system.vhd +vcom -work nuand -2008 ../../../platforms/common/bladerf/vhdl/fx3_gpif_p.vhd vcom -work nuand -2008 ../../../platforms/common/bladerf/vhdl/fx3_gpif.vhd vcom -work nuand -2008 ../vhdl/bladerf_p.vhd diff --git a/hdl/fpga/platforms/bladerf/bladerf-adsb.qip b/hdl/fpga/platforms/bladerf/bladerf-adsb.qip index 1fa86c44..02d157c0 100644 --- a/hdl/fpga/platforms/bladerf/bladerf-adsb.qip +++ b/hdl/fpga/platforms/bladerf/bladerf-adsb.qip @@ -33,6 +33,7 @@ set_global_assignment -name VHDL_FILE [file normalize [file join $nuand_ip syn set_global_assignment -name VHDL_FILE [file normalize [file join $nuand_ip synthesis/fifo_writer.vhd]] set_global_assignment -name VHDL_FILE [file normalize [file join $nuand_ip synthesis/lms6002d/vhdl/lms6002d.vhd]] set_global_assignment -name VHDL_FILE [file normalize [file join $nuand_ip synthesis/set_clear_ff.vhd]] +set_global_assignment -name VHDL_FILE [file normalize [file join $common_dir vhdl/fx3_gpif_p.vhd]] set_global_assignment -name VHDL_FILE [file normalize [file join $common_dir vhdl/fx3_gpif.vhd]] set_global_assignment -name VHDL_FILE [file normalize [file join $here vhdl/bladerf-adsb.vhd]] diff --git a/hdl/fpga/platforms/bladerf/bladerf-atsc_tx.qip b/hdl/fpga/platforms/bladerf/bladerf-atsc_tx.qip index a53653fb..15865fe0 100644 --- a/hdl/fpga/platforms/bladerf/bladerf-atsc_tx.qip +++ b/hdl/fpga/platforms/bladerf/bladerf-atsc_tx.qip @@ -33,6 +33,7 @@ set_global_assignment -name VHDL_FILE [file normalize [file join $nuand_ip syn set_global_assignment -name VHDL_FILE [file normalize [file join $nuand_ip synthesis/fifo_writer.vhd]] set_global_assignment -name VHDL_FILE [file normalize [file join $nuand_ip synthesis/lms6002d/vhdl/lms6002d.vhd]] set_global_assignment -name VHDL_FILE [file normalize [file join $nuand_ip synthesis/set_clear_ff.vhd]] +set_global_assignment -name VHDL_FILE [file normalize [file join $common_dir vhdl/fx3_gpif_p.vhd]] set_global_assignment -name VHDL_FILE [file normalize [file join $common_dir vhdl/fx3_gpif.vhd]] set_global_assignment -name VHDL_FILE [file normalize [file join $here vhdl/bladerf-atsc_tx.vhd]] set_global_assignment -name QIP_FILE [file normalize nios_system/synthesis/nios_system.qip] diff --git a/hdl/fpga/platforms/bladerf/bladerf-hosted.qip b/hdl/fpga/platforms/bladerf/bladerf-hosted.qip index 93cb2b28..0604d825 100644 --- a/hdl/fpga/platforms/bladerf/bladerf-hosted.qip +++ b/hdl/fpga/platforms/bladerf/bladerf-hosted.qip @@ -35,6 +35,7 @@ set_global_assignment -name VHDL_FILE [file normalize [file join $nuand_ip syn set_global_assignment -name VHDL_FILE [file normalize [file join $nuand_ip synthesis/lms6002d/vhdl/bladerf_agc.vhd]] set_global_assignment -name VHDL_FILE [file normalize [file join $nuand_ip trigger/trigger.vhd]] set_global_assignment -name VHDL_FILE [file normalize [file join $nuand_ip synthesis/set_clear_ff.vhd]] +set_global_assignment -name VHDL_FILE [file normalize [file join $common_dir vhdl/fx3_gpif_p.vhd]] set_global_assignment -name VHDL_FILE [file normalize [file join $common_dir vhdl/fx3_gpif.vhd]] set_global_assignment -name VHDL_FILE [file normalize [file join $nuand_ip synthesis/rx_packet_generator.vhd]] set_global_assignment -name VHDL_FILE [file normalize [file join $here vhdl/bladerf-hosted.vhd]] diff --git a/hdl/fpga/platforms/common/bladerf/vhdl/fx3_gpif.vhd b/hdl/fpga/platforms/common/bladerf/vhdl/fx3_gpif.vhd index 67380194..bfdad067 100644 --- a/hdl/fpga/platforms/common/bladerf/vhdl/fx3_gpif.vhd +++ b/hdl/fpga/platforms/common/bladerf/vhdl/fx3_gpif.vhd @@ -22,6 +22,9 @@ library ieee; use ieee.std_logic_1164.all; use ieee.numeric_std.all; +library nuand; + use nuand.fx3_gpif_p.all; + entity fx3_gpif is port ( -- FX3 control signals @@ -117,10 +120,6 @@ architecture sample_shuffler of fx3_gpif is constant META_DOWNCOUNT_RESET : natural := 4; constant FINI_DOWNCOUNT_RESET : natural := 10; - -- GPIF buf sizes for USB high-speed and super-speed - constant GPIF_BUF_SIZE_HS : natural := 256; - constant GPIF_BUF_SIZE_SS : natural := 512; - type dma_handshake_t is record rx0 : std_logic; rx1 : std_logic; diff --git a/hdl/fpga/platforms/common/bladerf/vhdl/fx3_gpif_p.vhd b/hdl/fpga/platforms/common/bladerf/vhdl/fx3_gpif_p.vhd new file mode 100644 index 00000000..43d7673c --- /dev/null +++ b/hdl/fpga/platforms/common/bladerf/vhdl/fx3_gpif_p.vhd @@ -0,0 +1,27 @@ +-- Copyright (c) 2024 Nuand LLC +-- +-- Permission is hereby granted, free of charge, to any person obtaining a copy +-- of this software and associated documentation files (the "Software"), to deal +-- in the Software without restriction, including without limitation the rights +-- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +-- copies of the Software, and to permit persons to whom the Software is +-- furnished to do so, subject to the following conditions: +-- +-- The above copyright notice and this permission notice shall be included in +-- all copies or substantial portions of the Software. +-- +-- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +-- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +-- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +-- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +-- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +-- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +-- THE SOFTWARE. +library ieee; +use ieee.std_logic_1164.all; + +package fx3_gpif_p is + -- GPIF buf sizes for USB high-speed and super-speed + constant GPIF_BUF_SIZE_HS : natural := 256; + constant GPIF_BUF_SIZE_SS : natural := 512; +end package fx3_gpif_p; From 89caa01c127d59b7b3ee2bdf57bee75f3d2effcd Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Tue, 30 Jul 2024 12:04:17 -0500 Subject: [PATCH 107/238] hdl: test: added variable length gpif support to fx3_model --- hdl/fpga/ip/nuand/simulation/fx3_model.vhd | 8 +++++--- .../platforms/bladerf-micro/vhdl/tb/fx3_model.vhd | 13 +++++++------ hdl/fpga/platforms/bladerf/modelsim/compile.do | 1 + 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/hdl/fpga/ip/nuand/simulation/fx3_model.vhd b/hdl/fpga/ip/nuand/simulation/fx3_model.vhd index fc2da9e1..b13b55c1 100644 --- a/hdl/fpga/ip/nuand/simulation/fx3_model.vhd +++ b/hdl/fpga/ip/nuand/simulation/fx3_model.vhd @@ -26,6 +26,8 @@ library ieee; library work; use work.util.all; + use work.fx3_gpif_p.all; + entity fx3_model is port ( @@ -102,7 +104,7 @@ begin done <= rx_done and tx_done; rx_sample_stream : process - constant BLOCK_SIZE : natural := 512; + constant BLOCK_SIZE : natural := GPIF_BUF_SIZE_SS; variable count : natural := START_COUNT; variable req_time : time; begin @@ -155,7 +157,7 @@ begin end process; tx_sample_stream : process - constant BLOCK_SIZE : natural := 512; + constant BLOCK_SIZE : natural := GPIF_BUF_SIZE_SS; variable count : natural := START_COUNT; variable timestamp_cntr : natural := 80; variable header_len : natural := 0; @@ -201,7 +203,7 @@ begin data_out := x"12341234"; when 2 => data_out(31 downto 0) := std_logic_vector(to_signed(timestamp_cntr, 32)); - timestamp_cntr := timestamp_cntr + 508 * 2; + timestamp_cntr := timestamp_cntr + (GPIF_BUF_SIZE_SS-4) * 2; when 3 => data_out := (others => '0'); when 4 => diff --git a/hdl/fpga/platforms/bladerf-micro/vhdl/tb/fx3_model.vhd b/hdl/fpga/platforms/bladerf-micro/vhdl/tb/fx3_model.vhd index 29a39001..be1682a9 100644 --- a/hdl/fpga/platforms/bladerf-micro/vhdl/tb/fx3_model.vhd +++ b/hdl/fpga/platforms/bladerf-micro/vhdl/tb/fx3_model.vhd @@ -26,6 +26,7 @@ library ieee; library work; use work.util.all; + use work.fx3_gpif_p.all; architecture micro_dma of fx3_model is @@ -98,7 +99,7 @@ begin done <= rx_done and tx_done; rx_sample_stream : process - constant BLOCK_SIZE : natural := 512; + constant BLOCK_SIZE : natural := GPIF_BUF_SIZE_SS; variable count : natural := START_COUNT; variable req_time : time; begin @@ -151,8 +152,8 @@ begin end process; tx_sample_stream : process - constant TIME_BETWEEN_ITERATIONS : natural := 4593; - constant BLOCK_SIZE : natural := 512; + constant TIME_BETWEEN_ITERATIONS : natural := 7000; + constant BLOCK_SIZE : natural := GPIF_BUF_SIZE_SS; variable count : natural := START_COUNT; variable timestamp_cntr : natural := 400; variable header_len : natural := 0; @@ -242,7 +243,7 @@ begin nop(fx3_pclk, 10); end loop; - wait for 1 ms; + wait for 1.5 ms; dma_tx_enable <= '0'; wait for 10 us; end loop; @@ -333,7 +334,7 @@ begin done <= rx_done and tx_done; rx_sample_stream : process - constant BLOCK_SIZE : natural := 512; + constant BLOCK_SIZE : natural := GPIF_BUF_SIZE_SS; variable count : natural := START_COUNT; variable req_time : time; begin @@ -387,7 +388,7 @@ begin tx_sample_stream : process constant TIME_BETWEEN_ITERATIONS : natural := 4556; - constant BLOCK_SIZE : natural := 512; + constant BLOCK_SIZE : natural := GPIF_BUF_SIZE_SS; variable count : natural := START_COUNT; variable timestamp_cntr : natural := 250; variable header_len : natural := 0; diff --git a/hdl/fpga/platforms/bladerf/modelsim/compile.do b/hdl/fpga/platforms/bladerf/modelsim/compile.do index 289bc60f..06e95382 100644 --- a/hdl/fpga/platforms/bladerf/modelsim/compile.do +++ b/hdl/fpga/platforms/bladerf/modelsim/compile.do @@ -10,6 +10,7 @@ vcom -work nuand -2008 ../../../ip/altera/rx_meta_fifo/rx_meta_fifo.vhd vcom -work nuand -2008 ../vhdl/tb/nios_system.vhd +vcom -work nuand -2008 ../vhdl/fx3_gpif_p.vhd vcom -work nuand -2008 ../vhdl/fx3_gpif.vhd vcom -work nuand -2008 ../vhdl/bladerf.vhd From 6a0de336426b1da5cbc0b6e0e31e360ba9acfe70 Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Tue, 30 Jul 2024 12:06:06 -0500 Subject: [PATCH 108/238] hdl: test: variable gpif buf length support added to testbenches --- hdl/fpga/ip/nuand/simulation/sample_stream_tb.vhd | 5 +++-- .../bladerf-micro/vhdl/tb/fx3_gpif_meta_8bit_tb.vhd | 9 +++++---- .../bladerf-micro/vhdl/tb/fx3_model_fifo_stress.vhd | 5 +++-- .../platforms/bladerf-micro/vhdl/tb/rx_timestamp_tb.vhd | 4 +++- .../platforms/bladerf-micro/vhdl/tb/wlan_fx3_model.vhd | 5 +++-- 5 files changed, 17 insertions(+), 11 deletions(-) diff --git a/hdl/fpga/ip/nuand/simulation/sample_stream_tb.vhd b/hdl/fpga/ip/nuand/simulation/sample_stream_tb.vhd index 6952d26f..8d9876c9 100644 --- a/hdl/fpga/ip/nuand/simulation/sample_stream_tb.vhd +++ b/hdl/fpga/ip/nuand/simulation/sample_stream_tb.vhd @@ -28,6 +28,7 @@ library nuand ; use nuand.fifo_readwrite_p.all; use nuand.common_dcfifo_p.all; use nuand.bladerf_p.all; + use nuand.fx3_gpif_p.all; library std ; use std.env.all ; @@ -435,8 +436,8 @@ begin wait until reset = '0' ; end if ; while true loop - wait until rising_edge(fx3_clock) and unsigned(rx_sample_fifo.rused) > 512 ; - for i in 1 to 512 loop + wait until rising_edge(fx3_clock) and unsigned(rx_sample_fifo.rused) > GPIF_BUF_SIZE_SS; + for i in 1 to GPIF_BUF_SIZE_SS loop rx_sample_fifo.rreq <= '1' ; nop( fx3_clock, 1 ) ; if( CHECK_OVERFLOW ) then diff --git a/hdl/fpga/platforms/bladerf-micro/vhdl/tb/fx3_gpif_meta_8bit_tb.vhd b/hdl/fpga/platforms/bladerf-micro/vhdl/tb/fx3_gpif_meta_8bit_tb.vhd index e58db4f3..8b2d9447 100644 --- a/hdl/fpga/platforms/bladerf-micro/vhdl/tb/fx3_gpif_meta_8bit_tb.vhd +++ b/hdl/fpga/platforms/bladerf-micro/vhdl/tb/fx3_gpif_meta_8bit_tb.vhd @@ -32,6 +32,7 @@ library nuand; use nuand.fifo_readwrite_p.all; use nuand.common_dcfifo_p.all; use nuand.bladerf_p.all; + use nuand.fx3_gpif_p.all; entity fx3_gpif_meta_8bit_tb is generic ( @@ -910,11 +911,11 @@ begin -- Allows a 0 increment for the first ts assertion if( ENABLE_CHANNEL_0 = '1' and ENABLE_CHANNEL_1 = '1') then - ts_increment := 254 when EIGHT_BIT_MODE_EN = '0' - else 508; + ts_increment := (GPIF_BUF_SIZE_SS-4)/2 when EIGHT_BIT_MODE_EN = '0' + else (GPIF_BUF_SIZE_SS-4); else - ts_increment := 508 when EIGHT_BIT_MODE_EN = '0' - else 1016; + ts_increment := (GPIF_BUF_SIZE_SS -4) when EIGHT_BIT_MODE_EN = '0' + else 2*(GPIF_BUF_SIZE_SS -4); end if; iteration := iteration + 1; diff --git a/hdl/fpga/platforms/bladerf-micro/vhdl/tb/fx3_model_fifo_stress.vhd b/hdl/fpga/platforms/bladerf-micro/vhdl/tb/fx3_model_fifo_stress.vhd index 21e3618b..35bfec18 100644 --- a/hdl/fpga/platforms/bladerf-micro/vhdl/tb/fx3_model_fifo_stress.vhd +++ b/hdl/fpga/platforms/bladerf-micro/vhdl/tb/fx3_model_fifo_stress.vhd @@ -26,6 +26,7 @@ library ieee; library work; use work.util.all; + use work.fx3_gpif_p.all; architecture micro_dma_fifo_stress of fx3_model is @@ -98,7 +99,7 @@ begin done <= rx_done and tx_done; rx_sample_stream : process - constant BLOCK_SIZE : natural := 512; + constant BLOCK_SIZE : natural := GPIF_BUF_SIZE_SS; variable count : natural := START_COUNT; variable req_time : time; begin @@ -152,7 +153,7 @@ begin tx_sample_stream : process constant TIME_BETWEEN_ITERATIONS : natural := 4593; - constant BLOCK_SIZE : natural := 512; + constant BLOCK_SIZE : natural := GPIF_BUF_SIZE_SS; variable count : natural := START_COUNT; variable timestamp_cntr : natural := 400; variable header_len : natural := 0; diff --git a/hdl/fpga/platforms/bladerf-micro/vhdl/tb/rx_timestamp_tb.vhd b/hdl/fpga/platforms/bladerf-micro/vhdl/tb/rx_timestamp_tb.vhd index 232d427a..704754dd 100644 --- a/hdl/fpga/platforms/bladerf-micro/vhdl/tb/rx_timestamp_tb.vhd +++ b/hdl/fpga/platforms/bladerf-micro/vhdl/tb/rx_timestamp_tb.vhd @@ -32,6 +32,7 @@ library nuand; use nuand.fifo_readwrite_p.all; use nuand.common_dcfifo_p.all; use nuand.bladerf_p.all; + use nuand.fx3_gpif_p.all; entity rx_timestamp_tb is generic ( @@ -618,7 +619,8 @@ begin -- variable timestamp : unsigned(63 downto 0) := (others => '0'); begin wait for 1 ns; - delta_expected := to_unsigned(508, 64) when not EIGHT_BIT_MODE_EN else to_unsigned(1016, 64); + delta_expected := to_unsigned(GPIF_BUF_SIZE_SS-HEADER_LEN, 64) when not EIGHT_BIT_MODE_EN + else to_unsigned(2*(GPIF_BUF_SIZE_SS-HEADER_LEN), 64); if (ENABLE_CHANNEL_0 and ENABLE_CHANNEL_1) then delta_expected := delta_expected/2; diff --git a/hdl/fpga/platforms/bladerf-micro/vhdl/tb/wlan_fx3_model.vhd b/hdl/fpga/platforms/bladerf-micro/vhdl/tb/wlan_fx3_model.vhd index 2b80c591..eb9e69b7 100644 --- a/hdl/fpga/platforms/bladerf-micro/vhdl/tb/wlan_fx3_model.vhd +++ b/hdl/fpga/platforms/bladerf-micro/vhdl/tb/wlan_fx3_model.vhd @@ -26,6 +26,7 @@ library ieee; library work; use work.util.all; + use work.fx3_gpif_p.all; architecture wlan_micro_packet_dma of fx3_model is @@ -108,7 +109,7 @@ begin done <= rx_done and tx_done; rx_sample_stream : process - constant BLOCK_SIZE : natural := 512; + constant BLOCK_SIZE : natural := GPIF_BUF_SIZE_SS; variable count : natural := START_COUNT; variable req_time : time; begin @@ -161,7 +162,7 @@ begin end process; tx_sample_stream : process - constant BLOCK_SIZE : natural := 512; + constant BLOCK_SIZE : natural := GPIF_BUF_SIZE_SS; variable count : natural := START_COUNT; variable timestamp_cntr : natural := 100; variable header_len : natural := 0; From 37d3e0b2e52618aa3ca8aec923d116c54437a44b Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Tue, 30 Jul 2024 13:31:52 -0500 Subject: [PATCH 109/238] hdl: test: added variable gpif buffer length support for fx3_gpif_iq_tb --- hdl/fpga/platforms/bladerf-micro/vhdl/tb/fx3_gpif_iq_tb.vhd | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hdl/fpga/platforms/bladerf-micro/vhdl/tb/fx3_gpif_iq_tb.vhd b/hdl/fpga/platforms/bladerf-micro/vhdl/tb/fx3_gpif_iq_tb.vhd index 77dc714f..d0d24255 100644 --- a/hdl/fpga/platforms/bladerf-micro/vhdl/tb/fx3_gpif_iq_tb.vhd +++ b/hdl/fpga/platforms/bladerf-micro/vhdl/tb/fx3_gpif_iq_tb.vhd @@ -32,6 +32,7 @@ library nuand; use nuand.fifo_readwrite_p.all; use nuand.common_dcfifo_p.all; use nuand.bladerf_p.all; + use nuand.fx3_gpif_p.all; entity fx3_gpif_iq_tb is generic ( @@ -638,6 +639,7 @@ begin look_for_dropped_tx_samples : process(tx_clock) is constant MESSAGES_PER_ITERATION : natural := 3; --Provided in fx3_model variable current_message_count : natural := 1; + variable valid_sample_count : natural := 0; variable iq_value : signed (15 downto 0) := x"0000"; variable expected_sample_q : signed (15 downto 0); variable expected_sample_i : signed (15 downto 0); @@ -648,6 +650,7 @@ begin and dac_streams(i).data_v = '1' and fx3_control.tx_enable = '1' ) then + valid_sample_count := valid_sample_count + 1; expected_sample_i := iq_value; expected_sample_q := to_signed(current_message_count, 8) & (iq_value(7 downto 0) + 1); @@ -662,7 +665,7 @@ begin -- Set iq values based on blocks received -- See tx_sample_stream's encoding scheme in fx3_model.vhd - if( iq_value = x"03FE" ) then + if( valid_sample_count mod GPIF_BUF_SIZE_SS = 0 ) then iq_value := x"0000"; if( current_message_count < MESSAGES_PER_ITERATION ) then current_message_count := current_message_count + 1; From 5d7ff6a0ea15c7a94c61ef764a73eb182be95482 Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Tue, 30 Jul 2024 17:23:25 -0500 Subject: [PATCH 110/238] hdl: test: added variable gpif buffer length support for gpif meta tb --- .../platforms/bladerf-micro/vhdl/tb/fx3_gpif_meta_tb.vhd | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/hdl/fpga/platforms/bladerf-micro/vhdl/tb/fx3_gpif_meta_tb.vhd b/hdl/fpga/platforms/bladerf-micro/vhdl/tb/fx3_gpif_meta_tb.vhd index c94cef1c..979c7e01 100644 --- a/hdl/fpga/platforms/bladerf-micro/vhdl/tb/fx3_gpif_meta_tb.vhd +++ b/hdl/fpga/platforms/bladerf-micro/vhdl/tb/fx3_gpif_meta_tb.vhd @@ -32,6 +32,7 @@ library nuand; use nuand.fifo_readwrite_p.all; use nuand.common_dcfifo_p.all; use nuand.bladerf_p.all; + use nuand.fx3_gpif_p.all; entity fx3_gpif_meta_tb is generic ( @@ -683,8 +684,10 @@ begin end process tx_sample_start_check; look_for_dropped_tx_samples : process(tx_clock) is + constant HEADER_LEN : integer := 4; -- In clk cycles constant MESSAGES_PER_ITERATION : natural := 3; --Provided in fx3_model variable current_message_count : natural := 1; + variable valid_sample_count : natural := 0; variable iq_value : signed (15 downto 0) := x"0000"; variable expected_sample_q : signed (15 downto 0); variable expected_sample_i : signed (15 downto 0); @@ -695,6 +698,7 @@ begin and dac_streams(i).data_v = '1' and fx3_control.tx_enable = '1' ) then + valid_sample_count := valid_sample_count + 1; expected_sample_i := iq_value; expected_sample_q := to_signed(current_message_count, 8) & (iq_value(7 downto 0) + 1); @@ -709,7 +713,7 @@ begin -- Set iq values based on blocks received -- See tx_sample_stream's encoding scheme in fx3_model.vhd - if( iq_value = x"03F6" ) then + if( valid_sample_count mod (GPIF_BUF_SIZE_SS-HEADER_LEN) = 0 ) then iq_value := x"0000"; if( current_message_count < MESSAGES_PER_ITERATION ) then current_message_count := current_message_count + 1; From 2aaa5e2961e4871524b6f65eec8dcd3b5ad1fe04 Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Tue, 30 Jul 2024 17:18:56 -0500 Subject: [PATCH 111/238] hdl: test: added variable gpif buffer length support for 8b testbenches --- .../vhdl/tb/fx3_gpif_iq_8bit_tb.vhd | 5 ++++- .../vhdl/tb/fx3_gpif_meta_8bit_tb.vhd | 19 ++++++++++++++----- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/hdl/fpga/platforms/bladerf-micro/vhdl/tb/fx3_gpif_iq_8bit_tb.vhd b/hdl/fpga/platforms/bladerf-micro/vhdl/tb/fx3_gpif_iq_8bit_tb.vhd index a39550ac..dd22b9d2 100644 --- a/hdl/fpga/platforms/bladerf-micro/vhdl/tb/fx3_gpif_iq_8bit_tb.vhd +++ b/hdl/fpga/platforms/bladerf-micro/vhdl/tb/fx3_gpif_iq_8bit_tb.vhd @@ -32,6 +32,7 @@ library nuand; use nuand.fifo_readwrite_p.all; use nuand.common_dcfifo_p.all; use nuand.bladerf_p.all; + use nuand.fx3_gpif_p.all; entity fx3_gpif_iq_8bit_tb is generic ( @@ -659,6 +660,7 @@ begin constant MESSAGES_PER_ITERATION : natural := 3; --Provided in fx3_model constant SIGMA_DELTA_BITS : signed (3 downto 0) := "0000"; variable current_message_count : natural := 1; + variable valid_sample_count : natural := 0; variable iq_value : signed (15 downto 0) := x"0000"; variable expected_sample_i : signed (15 downto 0); variable expected_sample_q : signed (15 downto 0); @@ -670,6 +672,7 @@ begin and dac_streams(i).data_v = '1' and fx3_control.tx_enable = '1' ) then + valid_sample_count := valid_sample_count + 1; if( EIGHT_BIT_MODE_EN = '1' ) then expected_sample_i := iq_value (11 downto 0) & SIGMA_DELTA_BITS; expected_sample_q := iq_value (11 downto 0) + 1 & SIGMA_DELTA_BITS; @@ -706,7 +709,7 @@ begin -- Set iq values based on blocks received -- See tx_sample_stream's encoding scheme in fx3_model.vhd - if( iq_value = x"03FE" ) then + if( valid_sample_count mod GPIF_BUF_SIZE_SS = 0 ) then iq_value := x"0000"; if( current_message_count < MESSAGES_PER_ITERATION ) then current_message_count := current_message_count + 1; diff --git a/hdl/fpga/platforms/bladerf-micro/vhdl/tb/fx3_gpif_meta_8bit_tb.vhd b/hdl/fpga/platforms/bladerf-micro/vhdl/tb/fx3_gpif_meta_8bit_tb.vhd index 8b2d9447..2fca50a3 100644 --- a/hdl/fpga/platforms/bladerf-micro/vhdl/tb/fx3_gpif_meta_8bit_tb.vhd +++ b/hdl/fpga/platforms/bladerf-micro/vhdl/tb/fx3_gpif_meta_8bit_tb.vhd @@ -697,7 +697,8 @@ begin look_for_dropped_tx_samples : process(tx_clock) is constant MESSAGES_PER_ITERATION : natural := 3; --Provided in fx3_model constant SIGMA_DELTA_BITS : signed (3 downto 0) := "0000"; - variable dac_stream_back_to_0 : natural := 0; + constant HEADER_LEN : natural := 4; -- In clk cycles + variable valid_sample_count : natural := 0; variable current_message_count : natural := 1; variable iq_value : signed (15 downto 0) := x"0000"; variable expected_sample_i : signed (15 downto 0); @@ -710,6 +711,7 @@ begin and dac_streams(i).data_v = '1' and fx3_control.tx_enable = '1' ) then + valid_sample_count := valid_sample_count + 1; if( EIGHT_BIT_MODE_EN = '1' ) then expected_sample_i := iq_value (11 downto 0) & SIGMA_DELTA_BITS; expected_sample_q := iq_value (11 downto 0) + 1 & SIGMA_DELTA_BITS; @@ -730,9 +732,16 @@ begin end if; end if; - dac_stream_back_to_0 := dac_stream_back_to_0 + 1 when iq_value = 0; - iq_value := (iq_value + 2) mod 128 when dac_stream_back_to_0 mod 16 /= 0 else - (iq_value + 2) mod 112; + if( valid_sample_count mod (2*GPIF_BUF_SIZE_SS - 8) = 0 ) then + iq_value := x"0000"; + if( current_message_count < MESSAGES_PER_ITERATION ) then + current_message_count := current_message_count + 1; + else + current_message_count := 1; + end if; + else + iq_value := (iq_value + 2) mod 128; + end if; else expected_sample_i := iq_value; expected_sample_q := to_signed(current_message_count, 8) & (iq_value(7 downto 0) + 1); @@ -748,7 +757,7 @@ begin -- Set iq values based on blocks received -- See tx_sample_stream's encoding scheme in fx3_model.vhd - if( iq_value = x"03F6" ) then + if( valid_sample_count mod (GPIF_BUF_SIZE_SS - HEADER_LEN) = 0 ) then iq_value := x"0000"; if( current_message_count < MESSAGES_PER_ITERATION ) then current_message_count := current_message_count + 1; From 05ede8f541d7e83c61cd5d26c205d5aacc2da080 Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Mon, 29 Jul 2024 14:23:05 -0500 Subject: [PATCH 112/238] fx3_firmware: increase DMA buffer sizes for USB throughput bottleneck $ make test_hdl [----------] Global test environment tear-down [==========] 63 tests from 2 test suites ran. (381209 ms total) [ PASSED ] 63 tests. [100%] Built target test_hdl --- fx3_firmware/src/rf.c | 4 ++-- hdl/fpga/platforms/common/bladerf/vhdl/fx3_gpif_p.vhd | 4 ++-- host/libraries/libbladeRF/src/backend/usb/usb.h | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/fx3_firmware/src/rf.c b/fx3_firmware/src/rf.c index ba992402..a50a9f56 100644 --- a/fx3_firmware/src/rf.c +++ b/fx3_firmware/src/rf.c @@ -290,8 +290,8 @@ static void NuandRFLinkStart(void) } CyU3PMemSet((uint8_t *)&dmaCfg, 0, sizeof(dmaCfg)); - dmaCfg.size = size * 2; - dmaCfg.count = 22; + dmaCfg.size = size * 8; + dmaCfg.count = 11; dmaCfg.prodSckId = BLADE_RF_SAMPLE_EP_PRODUCER_USB_SOCKET; dmaCfg.consSckId = CY_U3P_PIB_SOCKET_3; dmaCfg.dmaMode = CY_U3P_DMA_MODE_BYTE; diff --git a/hdl/fpga/platforms/common/bladerf/vhdl/fx3_gpif_p.vhd b/hdl/fpga/platforms/common/bladerf/vhdl/fx3_gpif_p.vhd index 43d7673c..f9c64182 100644 --- a/hdl/fpga/platforms/common/bladerf/vhdl/fx3_gpif_p.vhd +++ b/hdl/fpga/platforms/common/bladerf/vhdl/fx3_gpif_p.vhd @@ -22,6 +22,6 @@ use ieee.std_logic_1164.all; package fx3_gpif_p is -- GPIF buf sizes for USB high-speed and super-speed - constant GPIF_BUF_SIZE_HS : natural := 256; - constant GPIF_BUF_SIZE_SS : natural := 512; + constant GPIF_BUF_SIZE_HS : natural := 1024; + constant GPIF_BUF_SIZE_SS : natural := 2048; end package fx3_gpif_p; diff --git a/host/libraries/libbladeRF/src/backend/usb/usb.h b/host/libraries/libbladeRF/src/backend/usb/usb.h index 644ed7a3..80e9b7a3 100644 --- a/host/libraries/libbladeRF/src/backend/usb/usb.h +++ b/host/libraries/libbladeRF/src/backend/usb/usb.h @@ -61,8 +61,8 @@ extern bool bladerf_usb_reset_device_on_open; #endif /* Size of a host<->FPGA message in BYTES */ -#define USB_MSG_SIZE_SS 2048 -#define USB_MSG_SIZE_HS 1024 +#define USB_MSG_SIZE_SS 8192 +#define USB_MSG_SIZE_HS 4096 typedef enum { USB_TARGET_DEVICE, From a62c1d49030d1d07da2c05c17b62070ae9a4c6ad Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Thu, 27 Feb 2025 17:36:03 -0600 Subject: [PATCH 113/238] libbladeRF: support and clamp byte alignment to larger GPIF buffer size This change also includes a refactor of the redundant format to sample size conversions found within the synchronous and asynchronous interfaces. --- .../libraries/libbladeRF/include/libbladeRF.h | 2 +- .../libbladeRF/src/streaming/async.c | 26 +++------------ .../libbladeRF/src/streaming/metadata.h | 2 +- .../libraries/libbladeRF/src/streaming/sync.c | 33 +++++++++---------- 4 files changed, 21 insertions(+), 42 deletions(-) diff --git a/host/libraries/libbladeRF/include/libbladeRF.h b/host/libraries/libbladeRF/include/libbladeRF.h index 0e0a922d..7c331dcc 100644 --- a/host/libraries/libbladeRF/include/libbladeRF.h +++ b/host/libraries/libbladeRF/include/libbladeRF.h @@ -2731,7 +2731,7 @@ int CALL_CONV bladerf_get_timestamp(struct bladerf *dev, * data stream. This must be greater than the * `num_xfers` parameter. * @param[in] buffer_size The size of the underlying stream buffers, in - * samples. This value must be a multiple of 1024. + * samples. This value must be a multiple of 2048. * Note that samples are only transferred when a * buffer of this size is filled. * @param[in] num_transfers The number of active USB transfers that may be diff --git a/host/libraries/libbladeRF/src/streaming/async.c b/host/libraries/libbladeRF/src/streaming/async.c index cffa9d21..1eee58d4 100644 --- a/host/libraries/libbladeRF/src/streaming/async.c +++ b/host/libraries/libbladeRF/src/streaming/async.c @@ -52,8 +52,10 @@ int async_init_stream(struct bladerf_stream **stream, return BLADERF_ERR_INVAL; } - if (samples_per_buffer < 1024 || samples_per_buffer % 1024 != 0) { - log_error("samples_per_buffer must be multiples of 1024\n"); + buffer_size_bytes = samples_to_bytes(format, samples_per_buffer); + if (buffer_size_bytes < USB_MSG_SIZE_SS || buffer_size_bytes % USB_MSG_SIZE_SS != 0) { + log_error("Samples_per_buffer must be multiples of %u\n", + bytes_to_samples(format, USB_MSG_SIZE_SS)); return BLADERF_ERR_INVAL; } @@ -109,26 +111,6 @@ int async_init_stream(struct bladerf_stream **stream, } } - switch(format) { - case BLADERF_FORMAT_SC8_Q7: - case BLADERF_FORMAT_SC8_Q7_META: - buffer_size_bytes = sc8q7_to_bytes(samples_per_buffer); - break; - - case BLADERF_FORMAT_SC16_Q11: - case BLADERF_FORMAT_SC16_Q11_META: - buffer_size_bytes = sc16q11_to_bytes(samples_per_buffer); - break; - - case BLADERF_FORMAT_PACKET_META: - buffer_size_bytes = samples_per_buffer; - break; - - default: - status = BLADERF_ERR_INVAL; - break; - } - if (!status) { lstream->buffers = calloc(num_buffers, sizeof(lstream->buffers[0])); if (lstream->buffers) { diff --git a/host/libraries/libbladeRF/src/streaming/metadata.h b/host/libraries/libbladeRF/src/streaming/metadata.h index e2685596..55f6a594 100644 --- a/host/libraries/libbladeRF/src/streaming/metadata.h +++ b/host/libraries/libbladeRF/src/streaming/metadata.h @@ -24,7 +24,7 @@ * ~~~~~~~~~~~~~~~~~~~~~~~ * * The FPGA handles data in units of "messages." These messages are - * 1024 or 2048 bytes for USB 2.0 (Hi-Speed) or USB 3.0 (SuperSpeed), + * 2048 or 8192 bytes for USB 2.0 (Hi-Speed) or USB 3.0 (SuperSpeed), * respectively. * * The first 16 bytes of the message form a header, which includes metadata diff --git a/host/libraries/libbladeRF/src/streaming/sync.c b/host/libraries/libbladeRF/src/streaming/sync.c index feef101b..600dde8f 100644 --- a/host/libraries/libbladeRF/src/streaming/sync.c +++ b/host/libraries/libbladeRF/src/streaming/sync.c @@ -141,6 +141,8 @@ int sync_init(struct bladerf_sync *sync, { int status = 0; size_t i, bytes_per_sample; + size_t bytes_per_buffer; + const size_t GPIF_BUF_SIZE = 8192; if (num_transfers >= num_buffers) { return BLADERF_ERR_INVAL; @@ -168,27 +170,22 @@ int sync_init(struct bladerf_sync *sync, } } - switch (format) { - case BLADERF_FORMAT_SC8_Q7: - case BLADERF_FORMAT_SC8_Q7_META: - bytes_per_sample = 2; - break; + bytes_per_sample = samples_to_bytes(format, 1); + bytes_per_buffer = samples_to_bytes(format, buffer_size); + if (bytes_per_buffer < GPIF_BUF_SIZE || bytes_per_buffer % GPIF_BUF_SIZE != 0) { + size_t original_size = buffer_size; - case BLADERF_FORMAT_SC16_Q11: - case BLADERF_FORMAT_SC16_Q11_META: - case BLADERF_FORMAT_PACKET_META: - bytes_per_sample = 4; - break; + /* Round up to the next multiple of GPIF_BUF_SIZE, ensuring at least one GPIF buffer */ + buffer_size = bytes_per_buffer == 0 ? GPIF_BUF_SIZE / bytes_per_sample : + ((bytes_per_buffer + GPIF_BUF_SIZE - 1) / GPIF_BUF_SIZE) + * (GPIF_BUF_SIZE / bytes_per_sample); - default: - log_debug("Invalid format value: %d\n", format); - return BLADERF_ERR_INVAL; - } + log_warning("Requested buffer size %zu samples (%zu bytes) is invalid. " + "Adjusting to %zu samples (%zu bytes).\n", + original_size, samples_to_bytes(format, original_size), + buffer_size, samples_to_bytes(format, buffer_size)); - /* bladeRF GPIF DMA requirement */ - if ((bytes_per_sample * buffer_size) % 4096 != 0) { - assert(!"Invalid buffer size"); - return BLADERF_ERR_INVAL; + bytes_per_buffer = samples_to_bytes(format, buffer_size); } /* Deinitialize sync handle if it's initialized */ From a0937cc50c8022b63cc29027bb296b682b0a98ee Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Tue, 30 Jul 2024 17:39:42 -0500 Subject: [PATCH 114/238] doc: updated buf size limit in examples and tests --- host/libraries/libbladeRF/doc/examples/sync_rx_meta.c | 2 +- host/libraries/libbladeRF/doc/examples/sync_rxtx.c | 2 +- host/libraries/libbladeRF/doc/examples/sync_tx_meta.c | 2 +- host/libraries/libbladeRF_test/test_rx_meta/src/main.c | 2 +- host/libraries/libbladeRF_test/test_streaming/src/main.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/host/libraries/libbladeRF/doc/examples/sync_rx_meta.c b/host/libraries/libbladeRF/doc/examples/sync_rx_meta.c index 40081124..1799a257 100644 --- a/host/libraries/libbladeRF/doc/examples/sync_rx_meta.c +++ b/host/libraries/libbladeRF/doc/examples/sync_rx_meta.c @@ -57,7 +57,7 @@ int16_t *init(struct bladerf *dev, int16_t num_samples, bladerf_format format, * restricted to multiples of any particular size. * * The value for `num_samples` has no major restrictions here, while the - * `buffer_size` below must be a multiple of 1024. + * `buffer_size` below must be a multiple of 2048. */ int16_t *samples; diff --git a/host/libraries/libbladeRF/doc/examples/sync_rxtx.c b/host/libraries/libbladeRF/doc/examples/sync_rxtx.c index 69b65f81..c92a6ff1 100644 --- a/host/libraries/libbladeRF/doc/examples/sync_rxtx.c +++ b/host/libraries/libbladeRF/doc/examples/sync_rxtx.c @@ -67,7 +67,7 @@ static int init_sync(struct bladerf *dev) * received. */ const unsigned int num_buffers = 16; - const unsigned int buffer_size = 8192; /* Must be a multiple of 1024 */ + const unsigned int buffer_size = 8192; /* Must be a multiple of 2048 */ const unsigned int num_transfers = 8; const unsigned int timeout_ms = 3500; diff --git a/host/libraries/libbladeRF/doc/examples/sync_tx_meta.c b/host/libraries/libbladeRF/doc/examples/sync_tx_meta.c index 6a15db56..19b59252 100644 --- a/host/libraries/libbladeRF/doc/examples/sync_tx_meta.c +++ b/host/libraries/libbladeRF/doc/examples/sync_tx_meta.c @@ -94,7 +94,7 @@ int16_t *init(struct bladerf *dev, int16_t num_samples) * restricted to multiples of any particular size. * * The value for `num_samples` has no major restrictions here, while the - * `buffer_size` below must be a multiple of 1024. + * `buffer_size` below must be a multiple of 2048. */ int16_t *samples; diff --git a/host/libraries/libbladeRF_test/test_rx_meta/src/main.c b/host/libraries/libbladeRF_test/test_rx_meta/src/main.c index 629c1921..f7238773 100644 --- a/host/libraries/libbladeRF_test/test_rx_meta/src/main.c +++ b/host/libraries/libbladeRF_test/test_rx_meta/src/main.c @@ -57,7 +57,7 @@ int16_t *init(struct bladerf *dev, int16_t num_samples, bladerf_format format, * restricted to multiples of any particular size. * * The value for `num_samples` has no major restrictions here, while the - * `buffer_size` below must be a multiple of 1024. + * `buffer_size` below must be a multiple of 2048. */ int16_t *samples; diff --git a/host/libraries/libbladeRF_test/test_streaming/src/main.c b/host/libraries/libbladeRF_test/test_streaming/src/main.c index 2b8cde96..0db7c886 100644 --- a/host/libraries/libbladeRF_test/test_streaming/src/main.c +++ b/host/libraries/libbladeRF_test/test_streaming/src/main.c @@ -90,7 +90,7 @@ void print_help() { printf(" -e, --meta Enable META test\n"); printf(" -s, --samplerate Specify the sample rate\n"); printf(" -n, --num-samples Specify the number of samples\n"); - printf(" -b, --buffer-size Specify the buffer size (multiple of 1024)\n"); + printf(" -b, --buffer-size Specify the buffer size (multiple of 2048)\n"); printf(" -h, --help Display this help message\n"); printf("\n"); From d0d6d97eb40496cadf7d4325fca1f33bd7740f9a Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Tue, 30 Jul 2024 17:53:13 -0500 Subject: [PATCH 115/238] doc: bladeRF-cli: updated sample limit to match buffer limit --- .../utilities/bladeRF-cli/src/cmd/doc/interactive-help.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/host/utilities/bladeRF-cli/src/cmd/doc/interactive-help.md b/host/utilities/bladeRF-cli/src/cmd/doc/interactive-help.md index d1ce8758..abeb1319 100644 --- a/host/utilities/bladeRF-cli/src/cmd/doc/interactive-help.md +++ b/host/utilities/bladeRF-cli/src/cmd/doc/interactive-help.md @@ -746,8 +746,8 @@ available parameters. `bitmode` state `samples` Number of samples per buffer to use in the - asynchronous stream. Must be divisible by 1024 and - >= 1024. + asynchronous stream. Must be divisible by 2048 and + >= 2048. `buffers` Number of sample buffers to use in the asynchronous stream. The min value is 4. @@ -935,8 +935,8 @@ available parameters. retransmitting file contents. 0 implies no delay. `samples` Number of samples per buffer to use in the - asynchronous stream. Must be divisible by 1024 and - >= 1024. + asynchronous stream. Must be divisible by 2048 and + >= 2048. `buffers` Number of sample buffers to use in the asynchronous stream. The min value is 4. From 87e06388d44f12f3f9153b007c26e7744e0ead78 Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Wed, 31 Jul 2024 15:44:28 -0500 Subject: [PATCH 116/238] hdl: revert jtag timing fixes SignalTap may throw a "jtag instance not found" error which is sourced from not meeting timing requirements for the jtag interface. Reverting previous fixes may resurface some timing issues, but the "instance not found" error at least goes away and I can use signal tap again. Sources: SignalTap-II -> "instance not found" error https://community.intel.com/t5/Programmable-Devices/SignalTap-II-gt-quot-instance-not-found-quot-error/m-p/238886 How to set timing constraint for JTAG https://community.intel.com/t5/Programmable-Devices/How-to-set-timing-constraint-for-JTAG/m-p/1379278 --- hdl/fpga/platforms/bladerf-micro/constraints/bladerf.sdc | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/hdl/fpga/platforms/bladerf-micro/constraints/bladerf.sdc b/hdl/fpga/platforms/bladerf-micro/constraints/bladerf.sdc index 41b5ca59..85b16c3e 100644 --- a/hdl/fpga/platforms/bladerf-micro/constraints/bladerf.sdc +++ b/hdl/fpga/platforms/bladerf-micro/constraints/bladerf.sdc @@ -71,11 +71,10 @@ set_false_path -from exp_present -to * set_false_path -from pwr_status -to * # JTAG settings -create_clock -name {altera_reserved_tck} -period 100 [get_ports {altera_reserved_tck}] -set_clock_groups -asynchronous -group {altera_reserved_tck} -set_false_path -from [get_ports {altera_reserved_tms}] -set_false_path -from [get_ports {altera_reserved_tdi}] -set_false_path -to [get_ports {altera_reserved_tdo}] +set_clock_groups -exclusive -group [get_clocks altera_reserved_tck] +set_input_delay -clock [get_clocks altera_reserved_tck] 2.0 [get_ports altera_reserved_tdi] +set_input_delay -clock [get_clocks altera_reserved_tck] 2.0 [get_ports altera_reserved_tms] +set_output_delay -clock [get_clocks altera_reserved_tck] 2.0 [get_ports altera_reserved_tdo] # Exceptions From bdd4f39a3dfdf9f4f6ca414e531a6cbffc36b1a2 Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Fri, 26 Jul 2024 17:29:48 -0500 Subject: [PATCH 117/238] fx3_firmware: rev libbladeRF, hdl, and fx3 for 2048 sample gpif buffers FX3 GPIF buffers set to 2048 samples and number of buffers reduced to 11 per dma channel. This substantially increases the theoretical USB SuperSpeed throughput from roughly 228MB/s to 356MB/s. $ make test_libbladeRF [ OK ] libbladeRF.scheduled_retune (19755 ms) [----------] 29 tests from libbladeRF (308802 ms total) [----------] Global test environment tear-down [==========] 29 tests from 1 test suite ran. (308802 ms total) [ PASSED ] 29 tests. --- fx3_firmware/CHANGELOG | 5 +++++ fx3_firmware/CMakeLists.txt | 2 +- .../bladerf-micro/software/bladeRF_nios/src/fpga_version.h | 4 ++-- .../bladerf/software/bladeRF_nios/src/fpga_version.h | 4 ++-- host/libraries/libbladeRF/CMakeLists.txt | 4 ++-- host/libraries/libbladeRF/include/libbladeRF.h | 2 +- host/libraries/libbladeRF/src/board/bladerf1/compatibility.c | 2 ++ host/libraries/libbladeRF/src/board/bladerf2/compatibility.c | 2 ++ 8 files changed, 17 insertions(+), 8 deletions(-) diff --git a/fx3_firmware/CHANGELOG b/fx3_firmware/CHANGELOG index 6b3580dc..63480bd3 100644 --- a/fx3_firmware/CHANGELOG +++ b/fx3_firmware/CHANGELOG @@ -6,6 +6,11 @@ hosted on GitHub: https://github.com/nuand/bladeRF ================================================================================ +v2.5.0 (2024-07-30) +-------------------------------- + * Bumped GPIF DMA buffer size to 8192 bytes + * Reduced the number of GPIF DMA buffers to 11 per channel + v2.4.0 (2020-08-01) -------------------------------- * Add ability to send short packets to FX3 from FPGA diff --git a/fx3_firmware/CMakeLists.txt b/fx3_firmware/CMakeLists.txt index e2985177..fcd98074 100644 --- a/fx3_firmware/CMakeLists.txt +++ b/fx3_firmware/CMakeLists.txt @@ -33,7 +33,7 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/../host/cmake/modules) # Update these definitions when updating the firmware version set(VERSION_INFO_MAJOR 2) -set(VERSION_INFO_MINOR 4) +set(VERSION_INFO_MINOR 5) set(VERSION_INFO_PATCH 0) if(NOT DEFINED VERSION_INFO_EXTRA) diff --git a/hdl/fpga/platforms/bladerf-micro/software/bladeRF_nios/src/fpga_version.h b/hdl/fpga/platforms/bladerf-micro/software/bladeRF_nios/src/fpga_version.h index d66033f5..8b1a4cd8 100644 --- a/hdl/fpga/platforms/bladerf-micro/software/bladeRF_nios/src/fpga_version.h +++ b/hdl/fpga/platforms/bladerf-micro/software/bladeRF_nios/src/fpga_version.h @@ -7,8 +7,8 @@ #define FPGA_VERSION_ID 0x7777 #define FPGA_VERSION_MAJOR 0 -#define FPGA_VERSION_MINOR 15 -#define FPGA_VERSION_PATCH 3 +#define FPGA_VERSION_MINOR 16 +#define FPGA_VERSION_PATCH 0 #define FPGA_VERSION ((uint32_t)( FPGA_VERSION_MAJOR | \ (FPGA_VERSION_MINOR << 8) | \ (FPGA_VERSION_PATCH << 16) ) ) diff --git a/hdl/fpga/platforms/bladerf/software/bladeRF_nios/src/fpga_version.h b/hdl/fpga/platforms/bladerf/software/bladeRF_nios/src/fpga_version.h index d66033f5..8b1a4cd8 100644 --- a/hdl/fpga/platforms/bladerf/software/bladeRF_nios/src/fpga_version.h +++ b/hdl/fpga/platforms/bladerf/software/bladeRF_nios/src/fpga_version.h @@ -7,8 +7,8 @@ #define FPGA_VERSION_ID 0x7777 #define FPGA_VERSION_MAJOR 0 -#define FPGA_VERSION_MINOR 15 -#define FPGA_VERSION_PATCH 3 +#define FPGA_VERSION_MINOR 16 +#define FPGA_VERSION_PATCH 0 #define FPGA_VERSION ((uint32_t)( FPGA_VERSION_MAJOR | \ (FPGA_VERSION_MINOR << 8) | \ (FPGA_VERSION_PATCH << 16) ) ) diff --git a/host/libraries/libbladeRF/CMakeLists.txt b/host/libraries/libbladeRF/CMakeLists.txt index 5f0ebd90..f1074908 100644 --- a/host/libraries/libbladeRF/CMakeLists.txt +++ b/host/libraries/libbladeRF/CMakeLists.txt @@ -7,8 +7,8 @@ project(libbladeRF C) ################################################################################ set(VERSION_INFO_MAJOR 2) -set(VERSION_INFO_MINOR 5) -set(VERSION_INFO_PATCH 1) +set(VERSION_INFO_MINOR 6) +set(VERSION_INFO_PATCH 0) set(LIBBLADERF_VERSION ${VERSION_INFO_MAJOR}.${VERSION_INFO_MINOR}.${VERSION_INFO_PATCH}) diff --git a/host/libraries/libbladeRF/include/libbladeRF.h b/host/libraries/libbladeRF/include/libbladeRF.h index 7c331dcc..4b5f1ece 100644 --- a/host/libraries/libbladeRF/include/libbladeRF.h +++ b/host/libraries/libbladeRF/include/libbladeRF.h @@ -51,7 +51,7 @@ * * https://github.com/Nuand/bladeRF/blob/master/doc/development/versioning.md */ -#define LIBBLADERF_API_VERSION (0x02050100) +#define LIBBLADERF_API_VERSION (0x02060000) #ifdef __cplusplus extern "C" { diff --git a/host/libraries/libbladeRF/src/board/bladerf1/compatibility.c b/host/libraries/libbladeRF/src/board/bladerf1/compatibility.c index b1e6df96..a5276fb8 100644 --- a/host/libraries/libbladeRF/src/board/bladerf1/compatibility.c +++ b/host/libraries/libbladeRF/src/board/bladerf1/compatibility.c @@ -13,6 +13,7 @@ static const struct compat fw_compat[] = { /* Firmware requires >= FPGA */ + { VERSION(2, 5, 0), VERSION(0, 16, 0) }, { VERSION(2, 4, 0), VERSION(0, 6, 0) }, { VERSION(2, 3, 2), VERSION(0, 0, 2) }, { VERSION(2, 3, 1), VERSION(0, 0, 2) }, @@ -35,6 +36,7 @@ const struct version_compat_table bladerf1_fw_compat_table = {fw_compat, ARRAY_S static const struct compat fpga_compat[] = { /* FPGA requires >= Firmware */ + { VERSION(0, 16, 0), VERSION(2, 5, 0) }, { VERSION(0, 15, 3), VERSION(2, 4, 0) }, { VERSION(0, 15, 1), VERSION(2, 4, 0) }, { VERSION(0, 15, 0), VERSION(2, 4, 0) }, diff --git a/host/libraries/libbladeRF/src/board/bladerf2/compatibility.c b/host/libraries/libbladeRF/src/board/bladerf2/compatibility.c index 7ee0b8e0..8801d174 100644 --- a/host/libraries/libbladeRF/src/board/bladerf2/compatibility.c +++ b/host/libraries/libbladeRF/src/board/bladerf2/compatibility.c @@ -13,6 +13,7 @@ static const struct compat fw_compat[] = { /* Firmware requires >= FPGA */ + { VERSION(2, 5, 0), VERSION(0, 16, 0) }, { VERSION(2, 4, 0), VERSION(0, 6, 0) }, { VERSION(2, 3, 2), VERSION(0, 6, 0) }, { VERSION(2, 3, 1), VERSION(0, 6, 0) }, @@ -27,6 +28,7 @@ const struct version_compat_table bladerf2_fw_compat_table = {fw_compat, ARRAY_S static const struct compat fpga_compat[] = { /* FPGA requires >= Firmware */ + { VERSION(0, 16, 0), VERSION(2, 5, 0) }, { VERSION(0, 15, 3), VERSION(2, 4, 0) }, { VERSION(0, 15, 2), VERSION(2, 4, 0) }, { VERSION(0, 15, 1), VERSION(2, 4, 0) }, From bc6ac13970552a9a337fe1d825ba4f0774fb1ebb Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Fri, 27 Sep 2024 15:43:02 -0500 Subject: [PATCH 118/238] doc: updated fx3 firmware folder name --- fx3_firmware/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fx3_firmware/README.md b/fx3_firmware/README.md index bf7e43fa..195dad6f 100644 --- a/fx3_firmware/README.md +++ b/fx3_firmware/README.md @@ -38,7 +38,7 @@ Adjust the paths as necessary on your system, depending where you installed the ``` $ mkdir build $ cd build -$ cmake -DFX3_INSTALL_PATH=/opt/cypress/fx3_sdk -DCMAKE_TOOLCHAIN_FILE=../cmake/fx3-toolchain.cmake ../ +$ cmake -DFX3_INSTALL_PATH=/opt/cypress/fx3_firmware_linux -DCMAKE_TOOLCHAIN_FILE=../cmake/fx3-toolchain.cmake ../ $ make ``` From 04c1215e02214e7781d0c94eba64f939b3482423 Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Thu, 29 Feb 2024 17:13:00 -0600 Subject: [PATCH 119/238] libbladeRF: test: added packet test --- host/libraries/libbladeRF_test/CMakeLists.txt | 1 + .../test_packet/CMakeLists.txt | 31 +++ .../libbladeRF_test/test_packet/src/main.c | 207 ++++++++++++++++++ 3 files changed, 239 insertions(+) create mode 100644 host/libraries/libbladeRF_test/test_packet/CMakeLists.txt create mode 100644 host/libraries/libbladeRF_test/test_packet/src/main.c diff --git a/host/libraries/libbladeRF_test/CMakeLists.txt b/host/libraries/libbladeRF_test/CMakeLists.txt index 00fc3efe..e637ca8a 100644 --- a/host/libraries/libbladeRF_test/CMakeLists.txt +++ b/host/libraries/libbladeRF_test/CMakeLists.txt @@ -10,6 +10,7 @@ add_subdirectory(test_ctrl) add_subdirectory(test_freq_hop) add_subdirectory(test_fw_check) add_subdirectory(test_open) +add_subdirectory(test_packet) add_subdirectory(test_parse) add_subdirectory(test_peripheral_timing) add_subdirectory(test_gain_compare) diff --git a/host/libraries/libbladeRF_test/test_packet/CMakeLists.txt b/host/libraries/libbladeRF_test/test_packet/CMakeLists.txt new file mode 100644 index 00000000..69f3c46a --- /dev/null +++ b/host/libraries/libbladeRF_test/test_packet/CMakeLists.txt @@ -0,0 +1,31 @@ +cmake_minimum_required(VERSION 3.5) +project(libbladeRF_test_packet C) + +set(INCLUDES + ${CMAKE_CURRENT_SOURCE_DIR}/../common/include + ${libbladeRF_SOURCE_DIR}/include + ${BLADERF_HOST_COMMON_INCLUDE_DIRS} +) + +# Checks if the include directories exist +foreach(dir ${INCLUDES}) + if(NOT EXISTS ${dir}) + message(FATAL_ERROR "The include directory '${dir}' does not exist.") + endif() +endforeach() + +set(SRC + src/main.c + ${BLADERF_HOST_COMMON_SOURCE_DIR}/log.c + ${BLADERF_HOST_COMMON_SOURCE_DIR}/conversions.c) + +if(MSVC) + set(SRC ${SRC} + ${BLADERF_HOST_COMMON_SOURCE_DIR}/windows/getopt_long.c + ) +endif() + +include_directories(${INCLUDES}) +add_executable(${PROJECT_NAME} ${SRC}) +target_link_libraries(${PROJECT_NAME} libbladerf_shared) + diff --git a/host/libraries/libbladeRF_test/test_packet/src/main.c b/host/libraries/libbladeRF_test/test_packet/src/main.c new file mode 100644 index 00000000..5e0dd975 --- /dev/null +++ b/host/libraries/libbladeRF_test/test_packet/src/main.c @@ -0,0 +1,207 @@ +#include +#include +#include "test_common.h" +#include "libbladeRF.h" +#include "log.h" +#include "conversions.h" + +#define dword_t int32_t +#define DYNAMIC_PACKET_LEN 0 + +typedef struct test { + bladerf_frequency frequency; + bladerf_sample_rate samplerate; + bladerf_bandwidth bandwidth; + + // Sync interface + bladerf_channel channel; + uint32_t num_buffers; + uint32_t buffer_len; + + // Packets + size_t num_dwords; + size_t num_packets; +} test_t; + +void test_config_init(test_t *t) { + t->frequency = 915e6; + t->samplerate = 10e6; + t->bandwidth = 10e6; + + t->channel = BLADERF_CHANNEL_TX(0); + t->num_buffers = 512; + t->buffer_len = 4096; + + t->num_dwords = DYNAMIC_PACKET_LEN; + t->num_packets = 10; +} + +int bladerf_config(struct bladerf *dev, const test_t *test) { + int status = 0; + CHECK_NULL(dev, test); + + CHECK_STATUS(bladerf_set_frequency(dev, test->channel, test->frequency)); + CHECK_STATUS(bladerf_set_sample_rate(dev, test->channel, test->samplerate, NULL)); + CHECK_STATUS(bladerf_set_bandwidth(dev, test->channel, test->bandwidth, NULL)); + CHECK_STATUS(bladerf_sync_config(dev, test->channel, BLADERF_FORMAT_PACKET_META, + test->num_buffers, test->buffer_len, 16, 3e6)); + +error: + return status; +} + +int send_packets_variable_len(struct bladerf *dev, const test_t *test) { + CHECK_NULL(dev, test); + int status = 0; + struct bladerf_metadata meta; + + size_t dynamic_packet_len = 0; + size_t packet_sizes[4] = {40, 17, 43, dynamic_packet_len}; + + memset(&meta, 0, sizeof(meta)); + meta.flags = BLADERF_META_FLAG_TX_BURST_START | BLADERF_META_FLAG_TX_NOW | BLADERF_META_FLAG_TX_BURST_END; + + CHECK_STATUS(bladerf_enable_module(dev, test->channel, true)); + + size_t packet_idx = 0; + for (size_t i = 0; i < test->num_packets; i++) { + dynamic_packet_len = 20 + (i % 300); + packet_sizes[3] = dynamic_packet_len; + + size_t current_packet_len = packet_sizes[packet_idx % 4]; // Select packet size in round-robin fashion + size_t packet_size = current_packet_len * sizeof(dword_t); + dword_t *packet = malloc(packet_size); + CHECK_NULL(packet); + + for (size_t j = 0; j < current_packet_len; j++) { + packet[j] = j; + } + + CHECK_STATUS(bladerf_sync_tx(dev, packet, bytes_to_dwords(packet_size), &meta, 3e3)); + + free(packet); + packet_idx++; // Move to the next packet size for the next iteration + } + + CHECK_STATUS(bladerf_enable_module(dev, test->channel, false)); + +error: + return status; +} + +int send_packets_static_len(struct bladerf *dev, const test_t *test) { + int status = 0; + struct bladerf_metadata meta; + CHECK_NULL(dev); + + size_t packets_size = test->num_dwords * sizeof(dword_t); + dword_t *packet = malloc(packets_size); + CHECK_NULL(packet); + + for (size_t i = 0; i < test->num_dwords; i++) { + packet[i] = i; + } + + memset(&meta, 0, sizeof(meta)); + meta.flags = BLADERF_META_FLAG_TX_BURST_START | BLADERF_META_FLAG_TX_NOW | + BLADERF_META_FLAG_TX_BURST_END; + + CHECK_STATUS(bladerf_enable_module(dev, test->channel, true)); + + for (size_t i = 0; i < test->num_packets; i++) { + CHECK_STATUS(bladerf_sync_tx(dev, packet, bytes_to_dwords(packets_size), &meta, 3e3)); + } + + CHECK_STATUS(bladerf_enable_module(dev, test->channel, false)); + +error: + free(packet); + return status; +} + +static const struct option long_options[] = { + { "packets", required_argument, NULL, 'n' }, + { "size", required_argument, NULL, 's' }, + { "device", required_argument, NULL, 'd' }, + { "verbosity", required_argument, NULL, 'v' }, + { "help", no_argument, NULL, 'h' }, + { NULL, 0, NULL, 0 }, +}; + +int main(int argc, char *argv[]) +{ + int status = 0; + int opt = 0; + int opt_ind = 0; + bool ok; + struct bladerf *dev; + char *devstr = NULL; + test_t test; + bladerf_log_level log_level; + + test_config_init(&test); + + while ((opt = getopt_long(argc, argv, "n:s:d:v:h", long_options, &opt_ind)) != -1) { + switch (opt) { + case 'n': + test.num_packets = strtoul(optarg, NULL, 0); + break; + + case 's': + test.num_dwords = strtoul(optarg, NULL, 0); + break; + + case 'd': + devstr = optarg; + break; + + case 'v': + log_level = str2loglevel(optarg, &ok); + if (!ok) { + fprintf(stderr, "Invalid log level: %s\n", optarg); + return -1; + } + bladerf_log_set_verbosity(log_level); + break; + + case 'h': + printf("Usage: %s [options]\n", argv[0]); + printf("Options:\n"); + printf(" -n, --packets Number of packets to send.\n"); + printf(" -s, --size Number of dwords per packet.\n"); + printf(" -d, --device Specify the device to open. Allows selection of a specific\n"); + printf(" bladeRF device if multiple are available.\n"); + printf(" -v, --verbosity Set libbladeRF verbosity level.\n"); + printf(" -h, --help Show this help message and exit.\n"); + printf("\n"); + printf("The program transmits packets using the bladeRF library. If '--size 0' is used, packets\n"); + printf("will be sent with variable lengths in a round-robin fashion: 40, 17, 43 dwords, and\n"); + printf("a dynamic packet length of '20 + (packet_count %% 300)'. Otherwise, all packets\n"); + printf("will have a static length as specified by '--size'.\n"); + return 0; + + default: + return EXIT_FAILURE; + } + } + + printf("Opening device: %s\n", (devstr == NULL) ? "any" : devstr); + CHECK_STATUS(bladerf_open(&dev, devstr)); + CHECK_STATUS(bladerf_config(dev, &test)); + + if (test.num_dwords == DYNAMIC_PACKET_LEN) { + printf("Sending %zu packets with the following packet length and order:\n", test.num_packets); + printf("Packet Lengths: [%i, %i, %i, 20 + (packets_sent %% 300)] dwords\n", 40, 17, 43); + + CHECK_STATUS(send_packets_variable_len(dev, &test)); + } else { + printf("Sending %zu packets: %zu dwords/packet (%zu bytes/packet)\n", + test.num_packets, test.num_dwords, test.num_dwords * sizeof(dword_t)); + + CHECK_STATUS(send_packets_static_len(dev, &test)); + } + +error: + bladerf_close(dev); + return (status == 0) ? EXIT_SUCCESS : EXIT_FAILURE; +} From 966900a8c195037523e2822d31bdb9594a93c53f Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Thu, 27 Feb 2025 18:14:18 -0600 Subject: [PATCH 120/238] hdl: added enable signal for highly packed mode --- hdl/fpga/ip/nuand/synthesis/fifo_writer.vhd | 1 + hdl/fpga/platforms/bladerf-micro/vhdl/rx.vhd | 2 ++ hdl/fpga/platforms/bladerf/vhdl/bladerf-hosted.vhd | 1 + 3 files changed, 4 insertions(+) diff --git a/hdl/fpga/ip/nuand/synthesis/fifo_writer.vhd b/hdl/fpga/ip/nuand/synthesis/fifo_writer.vhd index 36fa0098..d0ed1419 100644 --- a/hdl/fpga/ip/nuand/synthesis/fifo_writer.vhd +++ b/hdl/fpga/ip/nuand/synthesis/fifo_writer.vhd @@ -43,6 +43,7 @@ entity fifo_writer is meta_en : in std_logic; packet_en : in std_logic; eight_bit_mode_en : in std_logic := '0'; + highly_packed_mode_en : in std_logic; timestamp : in unsigned(63 downto 0); mini_exp : in std_logic_vector(1 downto 0); diff --git a/hdl/fpga/platforms/bladerf-micro/vhdl/rx.vhd b/hdl/fpga/platforms/bladerf-micro/vhdl/rx.vhd index a2e22c12..5ff34e3f 100644 --- a/hdl/fpga/platforms/bladerf-micro/vhdl/rx.vhd +++ b/hdl/fpga/platforms/bladerf-micro/vhdl/rx.vhd @@ -51,6 +51,7 @@ entity rx is -- 8-bit mode eight_bit_mode_en : in std_logic := '0'; + highly_packed_mode_en : in std_logic := '0'; -- Packet to host via FX3 packet_en : in std_logic; @@ -251,6 +252,7 @@ begin packet_ready => packet_ready, eight_bit_mode_en => eight_bit_mode_en, + highly_packed_mode_en => highly_packed_mode_en, meta_fifo_full => meta_fifo.wfull, meta_fifo_usedw => meta_fifo.wused, diff --git a/hdl/fpga/platforms/bladerf/vhdl/bladerf-hosted.vhd b/hdl/fpga/platforms/bladerf/vhdl/bladerf-hosted.vhd index a0f7db0d..504750e8 100644 --- a/hdl/fpga/platforms/bladerf/vhdl/bladerf-hosted.vhd +++ b/hdl/fpga/platforms/bladerf/vhdl/bladerf-hosted.vhd @@ -769,6 +769,7 @@ begin meta_en => meta_en_rx, packet_en => packet_en_rx, eight_bit_mode_en => '0', + highly_packed_mode_en => '0', timestamp => rx_timestamp, mini_exp => mini_exp2 & mini_exp1, From b52f50c1fe01708a0089c9e71ee4f2e795e42327 Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Thu, 27 Feb 2025 12:51:23 -0600 Subject: [PATCH 121/238] hdl: added highly packed mode to fifo writer Iteratively packs 12b'samples across 3 fifo writes. The meta downcount operation still needs to be confirmed. --- hdl/fpga/ip/nuand/synthesis/fifo_writer.vhd | 93 +++++++++++++++++++-- 1 file changed, 87 insertions(+), 6 deletions(-) diff --git a/hdl/fpga/ip/nuand/synthesis/fifo_writer.vhd b/hdl/fpga/ip/nuand/synthesis/fifo_writer.vhd index d0ed1419..43c52790 100644 --- a/hdl/fpga/ip/nuand/synthesis/fifo_writer.vhd +++ b/hdl/fpga/ip/nuand/synthesis/fifo_writer.vhd @@ -120,6 +120,8 @@ architecture simple of fifo_writer is fifo_clear : std_logic; fifo_write : std_logic; fifo_data : unsigned(fifo_data'range); + fifo_12b_buf : unsigned(95 downto 0); + write_cycle : natural range 0 to 3; samples_left : natural range 0 to in_sample_controls'length; in_sample_controls_r: sample_controls_t(0 to NUM_STREAMS-1); in_samples_r : sample_streams_t(0 to NUM_STREAMS-1); @@ -131,6 +133,8 @@ architecture simple of fifo_writer is fifo_clear => '1', fifo_write => '0', fifo_data => (others => '-'), + fifo_12b_buf => (others => '-'), + write_cycle => 0, samples_left => 0, in_sample_controls_r=> (others => SAMPLE_CONTROL_DISABLE), in_samples_r => (others => ZERO_SAMPLE), @@ -432,6 +436,57 @@ begin return rv; end function; + + -- -------------------------------------------------------------------- + -- MIMO PACKER: STEP 1 of 3 (SC12Q11 Highly Packed Mode) + -- -------------------------------------------------------------------- + -- This block receives samples as an array of sample streams, one + -- element per channel. These streams need to be packed into a single, + -- wide bus that is written to a FIFO and delivered to the host. + -- For SC12Q11 (SC16_Q11_PACKED) format, each I and Q sample is 12 bits wide. + -- + -- This packing scheme efficiently utilizes the available bandwidth + -- for the SC12Q11 format, allowing for 8 complete IQ pairs every 3 cycles. + -- + -- The packing process fills 3 cycles of a 64-bit buffer with 8 24b IQ pairs: + -- Cycle 1: | 63:60 | 59:48 | 47:36 | 35:24 | 23:12 | 11:0 | Bit indices + -- | Q0' | I0 | Q1 | I1 | Q0 | I0 | Samples + -- [-----][--------full 12-bit samples-----------] + -- 4-bit + -- overlap + -- + -- Cycle 2: | 63:56 | 55:44 | 43:32 | 31:20 | 19:8 | 7:0 | Bit indices + -- | I1' | Q0 | I0 | Q1 | I1 | Q0' | Samples + -- [-----][--------full 12-bit samples--------][---] + -- 8-bit 8-bit + -- overlap overlap + -- + -- Cycle 3: | 63:52 | 51:40 | 39:28 | 27:16 | 15:4 | 3:0 | Bit indices + -- | Q1 | I1 | Q0 | I0 | Q1 | I1' | Samples + -- [--------full 12-bit samples-----------][-----] + -- 4-bit + -- overlap + -- + -- Note: Samples with apostrophes (') indicate partial samples that span + -- across cycle boundaries. The complete samples are reconstructed by + -- combining these partial segments from different cycles. + function pack_sc12q11( sc : sample_controls_t; + ss : sample_streams_t; + d : unsigned ) return unsigned is + constant IQ_PAIR_LEN : positive := 24; + variable rv : unsigned(d'range) := (others => '0'); + begin + rv := d; + for i in sc'range loop + if( (sc(i).enable = '1') and (ss(i).data_v = '1') ) then + rv := unsigned(ss(i).data_q(11 downto 0)) & + unsigned(ss(i).data_i(11 downto 0)) & + rv(rv'high downto rv'low+IQ_PAIR_LEN); + end if; + end loop; + return rv; + end function; + procedure handle_fifo_write( signal fifo_current : in fifo_fsm_t; signal meta_current : in meta_fsm_t; @@ -459,11 +514,18 @@ begin if( write_req = '1' ) then if( fifo_current.samples_left = 0 ) then fifo_future.samples_left <= NUM_STREAMS - count_enabled_channels(in_sample_controls); + fifo_future.fifo_write <= write_req; + if( eight_bit_mode_en = '1' ) then fifo_future.fifo_write <= write_req and fifo_current.eight_bit_delay; fifo_future.eight_bit_delay <= not fifo_current.eight_bit_delay; - else - fifo_future.fifo_write <= write_req; + end if; + + if( highly_packed_mode_en = '1' ) then + fifo_future.write_cycle <= (fifo_current.write_cycle + 1) mod 4; + if fifo_current.write_cycle = 0 then + fifo_future.fifo_write <= '0'; + end if; end if; else -- MIMO PACKER: STEP 3 of 3 @@ -489,14 +551,33 @@ begin -- MIMO PACKER: STEP 1 of 3 if( packet_en = '0' ) then + fifo_future.fifo_data <= pack(fifo_current.in_sample_controls_r, + fifo_current.in_samples_r, + fifo_current.fifo_data); + + if( highly_packed_mode_en = '1' ) then + fifo_future.fifo_12b_buf <= pack_sc12q11( + sc => in_sample_controls, + ss => in_samples, + d => fifo_current.fifo_12b_buf + ); + + if fifo_current.write_cycle = 1 then + fifo_future.fifo_data <= fifo_current.fifo_12b_buf( + fifo_data'length-1 downto fifo_current.fifo_12b_buf'low); + elsif fifo_current.write_cycle = 2 then + fifo_future.fifo_data <= fifo_current.fifo_12b_buf( + fifo_data'length-1+16 downto fifo_current.fifo_12b_buf'low+16); + elsif fifo_current.write_cycle = 3 then + fifo_future.fifo_data <= fifo_current.fifo_12b_buf( + fifo_data'length-1+32 downto fifo_current.fifo_12b_buf'low+32); + end if; + end if; + if( eight_bit_mode_en = '1' ) then fifo_future.fifo_data <= pack_eight_bit_mode(fifo_current.in_sample_controls_r, fifo_current.in_samples_r, fifo_current.fifo_data); - else - fifo_future.fifo_data <= pack(fifo_current.in_sample_controls_r, - fifo_current.in_samples_r, - fifo_current.fifo_data); end if; end if; From 6196c719112c30ff54511622ca77a92364ad2266 Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Fri, 4 Oct 2024 14:14:00 -0500 Subject: [PATCH 122/238] hdl: added sc16q11 packed tb --- .../modelsim/fx3_gpif_iq_packed_tb.do | 13 + .../vhdl/tb/fx3_gpif_iq_packed_tb.vhd | 646 ++++++++++++++++++ 2 files changed, 659 insertions(+) create mode 100644 hdl/fpga/platforms/bladerf-micro/modelsim/fx3_gpif_iq_packed_tb.do create mode 100644 hdl/fpga/platforms/bladerf-micro/vhdl/tb/fx3_gpif_iq_packed_tb.vhd diff --git a/hdl/fpga/platforms/bladerf-micro/modelsim/fx3_gpif_iq_packed_tb.do b/hdl/fpga/platforms/bladerf-micro/modelsim/fx3_gpif_iq_packed_tb.do new file mode 100644 index 00000000..649623d3 --- /dev/null +++ b/hdl/fpga/platforms/bladerf-micro/modelsim/fx3_gpif_iq_packed_tb.do @@ -0,0 +1,13 @@ +source ../../../ip/nuand/nuand.do + +# vcom -work nuand -2008 ../vhdl/rx.vhd +# vcom -work nuand -2008 ../vhdl/tx.vhd + +# vlib rtl_work +# vcom -work rtl_work -2008 ../../../ip/altera/fx3_pll/fx3_pll.vhd + +# compile_nuand ../../../ip/nuand bladerf-micro + +vcom -work nuand -2008 ../../../ip/nuand/simulation/fx3_model.vhd +vcom -work nuand -2008 ../vhdl/tb/fx3_model.vhd +vcom -work nuand -2008 ../vhdl/tb/fx3_gpif_iq_packed_tb.vhd diff --git a/hdl/fpga/platforms/bladerf-micro/vhdl/tb/fx3_gpif_iq_packed_tb.vhd b/hdl/fpga/platforms/bladerf-micro/vhdl/tb/fx3_gpif_iq_packed_tb.vhd new file mode 100644 index 00000000..ad5a5f37 --- /dev/null +++ b/hdl/fpga/platforms/bladerf-micro/vhdl/tb/fx3_gpif_iq_packed_tb.vhd @@ -0,0 +1,646 @@ +-- Copyright (c) 2024 Nuand LLC +-- +-- Permission is hereby granted, free of charge, to any person obtaining a copy +-- of this software and associated documentation files (the "Software"), to deal +-- in the Software without restriction, including without limitation the rights +-- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +-- copies of the Software, and to permit persons to whom the Software is +-- furnished to do so, subject to the following conditions: +-- +-- The above copyright notice and this permission notice shall be included in +-- all copies or substantial portions of the Software. +-- +-- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +-- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +-- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +-- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +-- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +-- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +-- THE SOFTWARE. + +library ieee; + use ieee.std_logic_1164.all; + use ieee.numeric_std.all; + +library rtl_work; + +library altera_lnsim; + use altera_lnsim.altera_pll; + +library nuand; + use nuand.util.all ; + use nuand.fifo_readwrite_p.all; + use nuand.common_dcfifo_p.all; + use nuand.bladerf_p.all; + use nuand.fx3_gpif_p.all; + +entity fx3_gpif_iq_packed_tb is + generic ( + -- For bladeRF2 (2x2 MIMO): + NUM_MIMO_STREAMS : natural := 2; + FIFO_READER_READ_THROTTLE : natural := 0; + + ENABLE_CHANNEL_0 : std_logic := '1'; + ENABLE_CHANNEL_1 : std_logic := '1' + ); +end entity; + +architecture arch of fx3_gpif_iq_packed_tb is + + -- bladerf-hosted uses ad9361.clock (125 MHz) for rx_clock and tx_clock + constant SYSCLK_HALF_PERIOD : time := 1 sec * (1.0/125.0e6/2.0); + + -- For reasons unknown, simulation of this system in ModelSim requires that + -- wrreq and data be asserted shortly before the rising clock edge. Sigh... + constant FIFO_WORKAROUND : time := 1 ps; + + type fx3_control_t is record + usb_speed : std_logic; + tx_enable : std_logic; + rx_enable : std_logic; + meta_enable : std_logic; + packet : std_logic; + highly_packed_mode : std_logic; + end record; + + type fx3_gpif_t is record + gpif_in : std_logic_vector(31 downto 0); + gpif_out : std_logic_vector(31 downto 0); + gpif_oe : std_logic; + ctl_in : std_logic_vector(12 downto 0); + ctl_out : std_logic_vector(12 downto 0); + ctl_oe : std_logic_vector(12 downto 0); + end record; + + signal sys_rst : std_logic := '1'; + signal done : boolean := false; + + signal fx3_pclk : std_logic := '1'; + signal fx3_pclk_pll : std_logic := '1'; + signal sys_clk : std_logic := '1'; + + signal pll_reset : std_logic := '0'; + signal pll_locked : std_logic := '0'; + signal fx3_control : fx3_control_t; + signal fx3_gpif : fx3_gpif_t; + signal fx3_gpif_i : std_logic_vector(31 downto 0); + signal fx3_ctl_i : std_logic_vector(12 downto 0); + + -- Control mapping + alias dma0_rx_ack is fx3_ctl_i( 0); + alias dma1_rx_ack is fx3_ctl_i( 1); + alias dma2_tx_ack is fx3_ctl_i( 2); + alias dma3_tx_ack is fx3_ctl_i( 3); + alias dma_rx_enable is fx3_ctl_i( 4); + alias dma_tx_enable is fx3_ctl_i( 5); + alias dma_idle is fx3_ctl_i( 6); + alias system_reset is fx3_ctl_i( 7); + alias dma0_rx_reqx is fx3_ctl_i( 8); + alias dma1_rx_reqx is fx3_ctl_i(12); -- due to 9 being connected to dclk + alias dma2_tx_reqx is fx3_ctl_i(10); + alias dma3_tx_reqx is fx3_ctl_i(11); + + signal loopback_i : signed(15 downto 0) := (others =>'0'); + signal loopback_q : signed(15 downto 0) := (others =>'0'); + signal loopback_valid : std_logic := '0'; + signal loopback_enabled : std_logic := '0'; + + signal tx_clock : std_logic := '1' ; + signal rx_clock : std_logic := '1' ; + + signal rx_sample_fifo : rx_fifo_t := RX_FIFO_T_DEFAULT; + signal tx_sample_fifo : tx_fifo_t := TX_FIFO_T_DEFAULT; + signal loopback_fifo : loopback_fifo_t := LOOPBACK_FIFO_T_DEFAULT; + signal rx_meta_fifo : meta_fifo_rx_t := META_FIFO_RX_T_DEFAULT; + signal tx_meta_fifo : meta_fifo_tx_t := META_FIFO_TX_T_DEFAULT; + + signal rx_mux_i : signed(15 downto 0); + signal rx_mux_q : signed(15 downto 0); + signal rx_mux_valid : std_logic; + + signal tx_timestamp : unsigned(63 downto 0) := ( others => '0' ); + signal rx_timestamp : unsigned(63 downto 0) := ( others => '0' ); + + constant FX3_HALF_PERIOD : time := 1.0/(100.0e6)/2.0*1 sec ; + constant TX_HALF_PERIOD : time := 1.0/(9.0e6)/2.0*1 sec ; + constant RX_HALF_PERIOD : time := 1.0/(9.0e6)/2.0*1 sec ; + + signal dac_controls : sample_controls_t(0 to NUM_MIMO_STREAMS-1) := (others => SAMPLE_CONTROL_DISABLE); + signal dac_streams : sample_streams_t(dac_controls'range) := (others => ZERO_SAMPLE); + signal adc_controls : sample_controls_t(0 to NUM_MIMO_STREAMS-1) := (others => SAMPLE_CONTROL_DISABLE); + signal adc_streams : sample_streams_t(adc_controls'range) := (others => ZERO_SAMPLE); + + signal tx_reset : std_logic := '0'; + signal tx_ts_reset : std_logic := '0'; + signal rx_reset : std_logic := '0'; + signal rx_ts_reset : std_logic := '0'; + + signal meta_en_tx : std_logic := '0'; + signal meta_en_rx : std_logic := '0'; + + signal rx_packet_control : packet_control_t := PACKET_CONTROL_DEFAULT; + signal tx_packet_control : packet_control_t; + + signal trigger_signal_sync_tb : std_logic; + signal dac_stream_val_at_rx_enable : signed(15 downto 0) := ( others => '0' ); + + function data_gen (count : natural) return std_logic_vector is + variable msw, lsw : std_logic_vector(15 downto 0); + begin + msw := std_logic_vector(to_signed(count, 16)); + lsw := std_logic_vector(to_signed(-count, 16)); + + return (msw & lsw); + end function data_gen; + + signal rx_packet_ready : std_logic; + +begin + + -- ======================================================================== + -- Brief summary of data flow + -- ======================================================================== + -- + -- Simulated samples flow from fx3_model's TX side to its RX side. The + -- validity of the data is checked there. + -- + -- entity U_fx3_model FX3 model, TX process + -- signal fx3_gpif_i fx3_gpif.gpif_oe is '0' + -- process register_gpif + -- signal fx3_gpif.gpif_in Demuxed GPIF interface (FX3 -> FPGA) + -- entity U_fx3_gpif GPIF implementation, write side + -- signal tx_sample_fifo.w* TX fifo, write side + -- entity U_tx_sample_fifo + -- signal tx_sample_fifo.r* TX fifo, read side + -- process tx_mux + -- signal loopback_fifo.w* Loopback fifo, write side + -- entity U_rx_loopback_fifo + -- signal loopback_fifo.r* Loopback fifo, read side + -- process loopback_fifo_control + -- signal loopback_{i,q,valid} + -- process rx_mux + -- signal rx_mux_{i,q,valid} + -- entity U_fifo_writer + -- signal rx_sample_fifo.w* RX fifo, write side + -- entity U_rx_sample_fifo + -- signal rx_sample_fifo.r* RX fifo, read side + -- entity U_fx3_gpif GPIF implementation, read side + -- signal fx3_gpif.gpif_out Demuxed GPIF interface (FPGA -> FX3) + -- process register_gpif + -- signal fx3_gpif_i fx3_gpif.gpif_oe is '1' + -- entity U_fx3_model FX3 model, RX process + + + -- ======================================================================== + -- Instantiations + -- ======================================================================== + + -- Unit under test + -- Clock domain: fx3_pclk_pll + U_fx3_gpif : entity nuand.fx3_gpif + port map ( + pclk => fx3_pclk_pll, + reset => sys_rst, + usb_speed => fx3_control.usb_speed, + gpif_in => fx3_gpif.gpif_in, + gpif_out => fx3_gpif.gpif_out, + gpif_oe => fx3_gpif.gpif_oe, + ctl_in => fx3_gpif.ctl_in, + ctl_out => fx3_gpif.ctl_out, + ctl_oe => fx3_gpif.ctl_oe, + tx_enable => fx3_control.tx_enable, + rx_enable => fx3_control.rx_enable, + meta_enable => fx3_control.meta_enable, + packet_enable => fx3_control.packet, + tx_fifo_write => tx_sample_fifo.wreq, + tx_fifo_full => tx_sample_fifo.wfull, + tx_fifo_empty => tx_sample_fifo.wempty, + tx_fifo_usedw => tx_sample_fifo.wused, + tx_fifo_data => tx_sample_fifo.wdata, + tx_timestamp => tx_timestamp, + tx_meta_fifo_write => tx_meta_fifo.wreq, + tx_meta_fifo_full => tx_meta_fifo.wfull, + tx_meta_fifo_empty => tx_meta_fifo.wempty, + tx_meta_fifo_usedw => tx_meta_fifo.wused, + tx_meta_fifo_data => tx_meta_fifo.wdata, + rx_fifo_read => rx_sample_fifo.rreq, + rx_fifo_full => rx_sample_fifo.rfull, + rx_fifo_empty => rx_sample_fifo.rempty, + rx_fifo_usedw => rx_sample_fifo.rused, + rx_fifo_data => rx_sample_fifo.rdata, + rx_meta_fifo_read => rx_meta_fifo.rreq, + rx_meta_fifo_full => rx_meta_fifo.rfull, + rx_meta_fifo_empty => rx_meta_fifo.rempty, + rx_meta_fifo_usedr => rx_meta_fifo.rused, + rx_meta_fifo_data => rx_meta_fifo.rdata + ); + + -- Discrete control signals for fx3_gpif + fx3_control.usb_speed <= '0'; + fx3_control.meta_enable <= '0'; + fx3_control.packet <= '0'; + fx3_control.highly_packed_mode <= '1'; + + U_pkt_gen : entity nuand.rx_packet_generator + port map( + rx_clock => rx_clock, + rx_reset => rx_reset, + rx_enable => fx3_control.rx_enable, + rx_packet_enable => fx3_control.packet, + rx_packet_ready => rx_packet_ready, + rx_packet_control => rx_packet_control + ); + + + meta_en_tx <= fx3_control.meta_enable; + meta_en_rx <= fx3_control.meta_enable; + + increment_tx_ts : process(tx_clock) + variable ping : boolean := true ; + begin + if( rising_edge(tx_clock) ) then + ping := not ping ; + if( ping = true ) then + tx_timestamp <= tx_timestamp + 1 ; + end if ; + end if ; + end process ; + + increment_rx_ts : process(rx_clock) + variable ping : boolean := true ; + begin + if( rising_edge(rx_clock) ) then + ping := not ping ; + if( ping = true ) then + rx_timestamp <= rx_timestamp + 1 ; + end if ; + end if ; + end process ; + + -- Model of FX3's GPIF interface + -- Clock domain: fx3_pclk (source) + U_fx3_model : entity nuand.fx3_model(micro_dma) + port map ( + fx3_pclk => fx3_pclk, + fx3_gpif => fx3_gpif_i, + fx3_ctl => fx3_ctl_i, + fx3_uart_rxd => '0', + fx3_uart_txd => open, + fx3_uart_cts => open, + fx3_rx_en => '1', + fx3_rx_meta_en => meta_en_rx, + fx3_tx_en => '1', + fx3_tx_meta_en => meta_en_tx, + done => done + ); + + -- Generate phase-shifted PLL clock + U_fx3_pll : entity rtl_work.fx3_pll + port map ( + inclk0 => fx3_pclk, + areset => pll_reset, + c0 => fx3_pclk_pll, + locked => pll_locked + ); + + tx_clock <= not tx_clock after TX_HALF_PERIOD ; + rx_clock <= not rx_clock after RX_HALF_PERIOD ; + + + -- Reset handler + sys_rst <= '0' after 100 ns; + + -- Generate system clock + sys_clk <= not sys_clk after SYSCLK_HALF_PERIOD when not done else '0'; + + + tx_reset <= sys_rst; + tx_ts_reset <= sys_rst; + rx_reset <= sys_rst; + rx_ts_reset <= sys_rst; + + meta_en_tx <= fx3_control.meta_enable; + meta_en_rx <= fx3_control.meta_enable; + + -- TX Submodule + U_tx : entity work.tx + generic map ( + NUM_STREAMS => dac_controls'length + ) + port map ( + tx_reset => tx_reset, + tx_clock => tx_clock, + tx_enable => fx3_control.tx_enable, + + meta_en => meta_en_tx, + timestamp_reset => tx_ts_reset, + usb_speed => fx3_control.usb_speed, + tx_underflow_led => open, + tx_timestamp => tx_timestamp, + + -- Triggering + trigger_arm => '0', + trigger_fire => '0', + trigger_master => '0', + trigger_line => open, + + -- Packet FIFO + packet_en => fx3_control.packet, + packet_empty => open, + packet_control => tx_packet_control, + packet_ready => '1', + + -- Samples from host via FX3 + sample_fifo_wclock => fx3_pclk_pll, + sample_fifo_wreq => tx_sample_fifo.wreq, + sample_fifo_wdata => tx_sample_fifo.wdata, + sample_fifo_wempty => tx_sample_fifo.wempty, + sample_fifo_wfull => tx_sample_fifo.wfull, + sample_fifo_wused => tx_sample_fifo.wused, + + -- Metadata from host via FX3 + meta_fifo_wclock => fx3_pclk_pll, + meta_fifo_wreq => tx_meta_fifo.wreq, + meta_fifo_wdata => tx_meta_fifo.wdata, + meta_fifo_wempty => tx_meta_fifo.wempty, + meta_fifo_wfull => tx_meta_fifo.wfull, + meta_fifo_wused => tx_meta_fifo.wused, + + -- Digital Loopback Interface + loopback_enabled => '0', + loopback_fifo_wdata => loopback_fifo.wdata, + loopback_fifo_wreq => loopback_fifo.wreq, + loopback_fifo_wfull => loopback_fifo.wfull, + loopback_fifo_wused => loopback_fifo.wused, + + -- RFFE Interface + dac_controls => dac_controls, + dac_streams => dac_streams + ); + + -- RX Submodule + U_rx : entity work.rx + generic map ( + NUM_STREAMS => adc_controls'length + ) + port map ( + highly_packed_mode_en => fx3_control.highly_packed_mode, + rx_reset => rx_reset, + rx_clock => rx_clock, + rx_enable => fx3_control.rx_enable, + + meta_en => meta_en_rx, + timestamp_reset => rx_ts_reset, + usb_speed => fx3_control.usb_speed, + rx_mux_sel => to_unsigned(0, 3), + rx_overflow_led => open, + rx_timestamp => rx_timestamp, + + -- Triggering + trigger_arm => '0', + trigger_fire => '0', + trigger_master => '0', + trigger_line => open, + trigger_signal_sync_tb => trigger_signal_sync_tb, + + -- Packet FIFO + packet_en => fx3_control.packet, + packet_control => rx_packet_control, + packet_ready => rx_packet_ready, + + -- Samples to host via FX3 + sample_fifo_rclock => fx3_pclk_pll, + sample_fifo_raclr => not fx3_control.rx_enable, + sample_fifo_rreq => rx_sample_fifo.rreq, + sample_fifo_rdata => rx_sample_fifo.rdata, + sample_fifo_rempty => rx_sample_fifo.rempty, + sample_fifo_rfull => rx_sample_fifo.rfull, + sample_fifo_rused => rx_sample_fifo.rused, + + -- Mini expansion signals + mini_exp => "00", + + -- Metadata to host via FX3 + meta_fifo_rclock => fx3_pclk_pll, + meta_fifo_raclr => not fx3_control.rx_enable, + meta_fifo_rreq => rx_meta_fifo.rreq, + meta_fifo_rdata => rx_meta_fifo.rdata, + meta_fifo_rempty => rx_meta_fifo.rempty, + meta_fifo_rfull => rx_meta_fifo.rfull, + meta_fifo_rused => rx_meta_fifo.rused, + + -- Digital Loopback Interface + loopback_fifo_wenabled => open, + loopback_fifo_wreset => tx_reset, + loopback_fifo_wclock => tx_clock, + loopback_fifo_wdata => loopback_fifo.wdata, + loopback_fifo_wreq => loopback_fifo.wreq, + loopback_fifo_wfull => loopback_fifo.wfull, + loopback_fifo_wused => loopback_fifo.wused, + + -- RFFE Interface + adc_controls => adc_controls, + adc_streams => adc_streams + ); + + -- ======================================================================== + -- Data converters + -- ======================================================================== + + gen_dac_controls : if( NUM_MIMO_STREAMS > 1 ) generate + -- The TX side of the AD9361 HDL is a FIFO pull interface + -- that expects a readahead FIFO. It toggles the data request + -- signal every other cycle. This behavior is mimicked here. + process( tx_clock, sys_rst ) + begin + if( sys_rst = '1' ) then + dac_controls <= ( + 0 => (enable => ENABLE_CHANNEL_0, data_req => '1'), + 1 => (enable => ENABLE_CHANNEL_1, data_req => '1') + ); + elsif( rising_edge(tx_clock) ) then + for i in dac_controls'range loop + dac_controls(i) <= ( + enable => dac_controls(i).enable, + data_req => not dac_controls(i).data_req ); + end loop; + end if; + end process; + else generate + dac_controls <= (others => SAMPLE_CONTROL_ENABLE); + end generate; + + gen_adc_controls : if( NUM_MIMO_STREAMS > 1 ) generate + process( rx_clock, sys_rst ) + constant COUNT_RESET : integer := 0; + variable count : integer range -2047 to 2047 := COUNT_RESET; + begin + if( sys_rst = '1' ) then + count := COUNT_RESET; + adc_controls <= ( + 0 => (enable => ENABLE_CHANNEL_0, data_req => '1'), + 1 => (enable => ENABLE_CHANNEL_1, data_req => '1') + ); + elsif( rising_edge(rx_clock) ) then + for i in adc_controls'range loop + adc_controls(i) <= ( + enable => adc_controls(i).enable, + data_req => not adc_controls(i).data_req ); + if( adc_controls(i).enable = '1') then + if( adc_streams(i).data_v = '1' ) then + adc_streams(i).data_i <= to_signed(count, 16); + adc_streams(i).data_q <= to_signed(-count, 16); + if( count < 2047 ) then + count := count + 1; + else + count := COUNT_RESET; + end if; + end if; + adc_streams(i).data_v <= not adc_streams(i).data_v; + end if; + end loop; + end if; + end process; + else generate + adc_controls <= (others => SAMPLE_CONTROL_ENABLE); + end generate; + + -- ======================================================================== + -- Processes + -- ======================================================================== + + -- FX3 GPIF bidirectional signal control + -- Adapted from same process in bladerf-hosted.vhd + register_gpif : process(sys_rst, fx3_pclk_pll) + begin + if( sys_rst = '1' ) then + fx3_gpif_i <= (others => 'Z'); + fx3_gpif.gpif_in <= (others => 'Z'); + elsif( rising_edge(fx3_pclk_pll) ) then + fx3_gpif.gpif_in <= fx3_gpif_i; + + if( fx3_gpif.gpif_oe = '1' ) then + fx3_gpif_i <= fx3_gpif.gpif_out; + else + fx3_gpif_i <= (others =>'Z'); + end if; + end if; + end process; + + -- FX3 CTL bidirectional signals + -- Adapted from same generator in bladerf-hosted.vhd + generate_ctl : for i in fx3_ctl_i'range generate + fx3_ctl_i(i) <= fx3_gpif.ctl_out(i) when fx3_gpif.ctl_oe(i) = '1' else 'Z'; + end generate; + + fx3_gpif.ctl_in <= fx3_ctl_i; + + -- Controller for loopback FIFO + -- Stripped-down version of same process from rx.vhd + loopback_fifo_control : process( sys_rst, loopback_fifo.rclock ) + begin + if( sys_rst = '1' ) then + loopback_enabled <= '0'; + loopback_fifo.rreq <= '0'; + loopback_i <= (others => '0'); + loopback_q <= (others => '0'); + loopback_valid <= '0'; + elsif( rising_edge(loopback_fifo.rclock) ) then + loopback_enabled <= '0'; + loopback_fifo.rreq <= '0'; + loopback_i <= loopback_i; + loopback_q <= loopback_q; + loopback_valid <= '0'; + + -- Is loopback enabled? + loopback_enabled <= fx3_control.rx_enable; + + -- Do the loopback + loopback_i <= resize(signed(loopback_fifo.rdata(15 downto 0)), loopback_i'length); + loopback_q <= resize(signed(loopback_fifo.rdata(31 downto 16)), loopback_q'length); + loopback_valid <= loopback_fifo.rreq and not loopback_fifo.rempty; + + -- Read from the FIFO if req'd + loopback_fifo.rreq <= loopback_enabled and (not loopback_fifo.rempty); + end if; + end process; + + -- RX multiplexer + -- Stripped-down version of same process from rx.vhd + rx_mux : process(sys_rst, sys_clk) + begin + if( sys_rst = '1' ) then + rx_mux_i <= (others =>'0'); + rx_mux_q <= (others =>'0'); + rx_mux_valid <= '0'; + elsif( rising_edge(sys_clk) ) then + rx_mux_i <= loopback_i; + rx_mux_q <= loopback_q; + rx_mux_valid <= loopback_valid; + end if; + end process; + + -- TX multiplexer + -- Stripped-down version of mimo_channel_sel_mux from tx.vhd + --tx_mux : process( sys_clk ) + --begin + -- if( rising_edge(sys_clk) ) then + -- tx_sample_fifo.rreq <= not tx_sample_fifo.rempty; + + -- loopback_fifo.wdata <= tx_sample_fifo.rdata; + -- loopback_fifo.wreq <= tx_sample_fifo.rreq and not tx_sample_fifo.rempty; + -- end if; + --end process; + + + -- ======================================================================== + -- Verification + -- ======================================================================== + + -- + -- Check for fullness on FIFOs + -- + assert (rx_sample_fifo.wfull = '0') report "rx_sample_fifo full (write)" severity warning; + assert (tx_sample_fifo.wfull = '0') report "tx_sample_fifo full (write)" severity warning; + assert (loopback_fifo.wfull = '0') report "loopback_fifo full (write)" severity warning; + + -- Every three gpif transfers will contain 4 samples. + -- Let's fill and check a 4 sample buffer every 3 pclk cycles. + -- + -- Note: Failure expected after each fx3_model iteration since we lose + -- sample continuity when fifo writer is disabled. + look_for_dropped_rx_samples: process(fx3_pclk_pll) + variable rx_val : integer; + variable gpif_buffer_idx : integer range 0 to 2 := 0; + variable buf_sc12q11 : std_logic_vector(3*fx3_gpif.gpif_out'length-1 downto 0) := (others => '0'); + begin + -- Init rx_val + if sys_rst = '1' then + rx_val := 16#172# when ENABLE_CHANNEL_0 and ENABLE_CHANNEL_1 else 16#B9#; + end if; + + if (rising_edge(fx3_pclk_pll) + and fx3_gpif.gpif_oe = '1' + and fx3_control.rx_enable = '1') then + + -- Shift in the new samples + buf_sc12q11 := fx3_gpif.gpif_out & buf_sc12q11(buf_sc12q11'length-1 downto fx3_gpif.gpif_out'length); + + -- Checks the 4 sample buffer every 3 pclk cycles + if gpif_buffer_idx = 2 then + for i in 0 to 3 loop + assert(signed(buf_sc12q11(11+24*i downto 24*i))) = to_signed(rx_val, 12) + report "I expected: " & integer'image(rx_val) & ", Actual: " & integer'image(to_integer(signed(buf_sc12q11(11+24*i downto 24*i)))) + severity failure; + assert(signed(buf_sc12q11(23+24*i downto 12+24*i))) = to_signed(-1*rx_val, 12) + report "Q expected: " & integer'image(-1*rx_val) & ", Actual: " & integer'image(to_integer(signed(buf_sc12q11(23+24*i downto 12+24*i)))) + severity failure; + rx_val := (rx_val + 1) mod 2048; + end loop; + end if; + + gpif_buffer_idx := (gpif_buffer_idx + 1) mod 3; + end if; + end process look_for_dropped_rx_samples; + +end architecture; From 9a22cd26d5ae269090965d4eec63949d43858c66 Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Tue, 26 Mar 2024 15:52:01 -0500 Subject: [PATCH 123/238] hdl: added sc16q11 packed enable signal from Nios GPIO --- .../bladerf-micro/vhdl/bladerf-hosted.vhd | 16 +++++++++++++++- .../platforms/bladerf-micro/vhdl/bladerf_p.vhd | 3 +++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/hdl/fpga/platforms/bladerf-micro/vhdl/bladerf-hosted.vhd b/hdl/fpga/platforms/bladerf-micro/vhdl/bladerf-hosted.vhd index 5d634e5d..f51b836a 100644 --- a/hdl/fpga/platforms/bladerf-micro/vhdl/bladerf-hosted.vhd +++ b/hdl/fpga/platforms/bladerf-micro/vhdl/bladerf-hosted.vhd @@ -93,6 +93,8 @@ architecture hosted_bladerf of bladerf is signal eightbit_en_tx : std_logic; signal eightbit_en_rx : std_logic; + signal highly_packed_en_txrx : std_logic; + signal packet_en_pclk : std_logic; signal packet_en_tx : std_logic; signal packet_en_rx : std_logic; @@ -641,8 +643,9 @@ begin trigger_master => rx_trigger_ctl.master, trigger_line => rx_trigger_line, - -- Eightbit mode + -- Packed modes eight_bit_mode_en => eightbit_en_rx, + highly_packed_mode_en => highly_packed_en_txrx, -- Packet FIFO packet_en => packet_en_rx, @@ -859,6 +862,17 @@ begin sync => eightbit_en_tx ); + U_sync_highly_packed_en_txrx : entity work.synchronizer + generic map ( + RESET_LEVEL => '0' + ) + port map ( + reset => '0', + clock => ad9361.clock, + async => nios_gpio.o.highly_packed_en, + sync => highly_packed_en_txrx + ); + U_sync_packet_en_pclk : entity work.synchronizer generic map ( RESET_LEVEL => '0' diff --git a/hdl/fpga/platforms/bladerf-micro/vhdl/bladerf_p.vhd b/hdl/fpga/platforms/bladerf-micro/vhdl/bladerf_p.vhd index 4aa6ee3c..e4147bef 100644 --- a/hdl/fpga/platforms/bladerf-micro/vhdl/bladerf_p.vhd +++ b/hdl/fpga/platforms/bladerf-micro/vhdl/bladerf_p.vhd @@ -307,6 +307,7 @@ package bladerf_p is type nios_gpo_t is record xb_mode : std_logic_vector(1 downto 0); eightbit_en : std_logic; + highly_packed_en: std_logic; packet_en : std_logic; si_clock_sel : std_logic; ufl_clock_oe : std_logic; @@ -518,6 +519,7 @@ package body bladerf_p is variable rv : std_logic_vector(31 downto 0) := (others => 'U'); begin rv(31 downto 30) := x.xb_mode; + rv(21) := x.highly_packed_en; rv(20) := x.eightbit_en; rv(19) := x.packet_en; rv(18) := x.si_clock_sel; @@ -597,6 +599,7 @@ package body bladerf_p is variable rv : nios_gpo_t; begin rv.xb_mode := x(31 downto 30); + rv.highly_packed_en:= x(21); rv.eightbit_en := x(20); rv.packet_en := x(19); rv.si_clock_sel := x(18); From 79cae1e87f425246bb4b5b8db010317440606d55 Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Mon, 23 Sep 2024 11:06:53 -0500 Subject: [PATCH 124/238] libbladeRF: added sc16q11 packed sample format libbladeRF ingests SC12 Q11 samples and expands them to SC16 Q11 before filling the end buffer. The trade-off is CPU cycles for the 12b to 16b conversion. --- host/libraries/libbladeRF/include/bladeRF1.h | 5 +++++ .../libraries/libbladeRF/include/libbladeRF.h | 16 ++++++++++++++ .../libbladeRF/src/board/bladerf2/common.c | 7 ++++++ .../libbladeRF/src/helpers/interleave.c | 2 ++ .../libbladeRF/src/streaming/format.h | 16 ++++++++++++++ .../libraries/libbladeRF/src/streaming/sync.c | 22 ++++++++++++++++--- 6 files changed, 65 insertions(+), 3 deletions(-) diff --git a/host/libraries/libbladeRF/include/bladeRF1.h b/host/libraries/libbladeRF/include/bladeRF1.h index 5c09f655..8c939e95 100644 --- a/host/libraries/libbladeRF/include/bladeRF1.h +++ b/host/libraries/libbladeRF/include/bladeRF1.h @@ -1376,6 +1376,11 @@ int CALL_CONV bladerf_calibrate_dc(struct bladerf *dev, */ #define BLADERF_GPIO_8BIT_MODE (1 << 20) +/** + * Enable highly packed mode + */ +#define BLADERF_GPIO_HIGHLY_PACKED_MODE (1 << 21) + /** * AGC enable control bit * diff --git a/host/libraries/libbladeRF/include/libbladeRF.h b/host/libraries/libbladeRF/include/libbladeRF.h index 4b5f1ece..ce3f563c 100644 --- a/host/libraries/libbladeRF/include/libbladeRF.h +++ b/host/libraries/libbladeRF/include/libbladeRF.h @@ -2140,6 +2140,22 @@ typedef enum { */ BLADERF_FORMAT_SC16_Q11, + /** + * @brief Signed, Complex 16-bit Q11 using a 12-bit Q11 intermediate format. + * + * This format is a ::BLADERF_FORMAT_SC16_Q11 equivalent to the end user. + * The difference lies in the intermediate SC12 Q11 packing format used by + * the FPGA and libbladeRF. This intermediate format allows for a 33.3% + * higher sample rate when bandwidth limited by the host interface. Synchronous + * buffer length must be a multiple of 4096 samples. + * + * @note While this format allows for higher sample rates over bandwidth-limited + * interfaces, it requires additional CPU processing for packing/unpacking. Users + * should benchmark to determine if the increased sample rate outweighs the + * added processing overhead for their specific use case. + */ + BLADERF_FORMAT_SC16_Q11_PACKED, + /** * This format is the same as the ::BLADERF_FORMAT_SC16_Q11 format, except * the first 4 samples in every block* of samples are replaced with diff --git a/host/libraries/libbladeRF/src/board/bladerf2/common.c b/host/libraries/libbladeRF/src/board/bladerf2/common.c index 15202f89..60a02699 100644 --- a/host/libraries/libbladeRF/src/board/bladerf2/common.c +++ b/host/libraries/libbladeRF/src/board/bladerf2/common.c @@ -54,6 +54,7 @@ static inline int requires_timestamps(bladerf_format format, bool *required) case BLADERF_FORMAT_SC8_Q7: case BLADERF_FORMAT_SC16_Q11: + case BLADERF_FORMAT_SC16_Q11_PACKED: *required = false; break; @@ -123,6 +124,12 @@ int perform_format_config(struct bladerf *dev, gpio_val &= ~BLADERF_GPIO_8BIT_MODE; } + if (format == BLADERF_FORMAT_SC16_Q11_PACKED) { + gpio_val |= BLADERF_GPIO_HIGHLY_PACKED_MODE; + } else { + gpio_val &= ~BLADERF_GPIO_HIGHLY_PACKED_MODE; + } + CHECK_STATUS(dev->backend->config_gpio_write(dev, gpio_val)); board_data->module_format[dir] = format; diff --git a/host/libraries/libbladeRF/src/helpers/interleave.c b/host/libraries/libbladeRF/src/helpers/interleave.c index 0989c4c9..a62d551b 100644 --- a/host/libraries/libbladeRF/src/helpers/interleave.c +++ b/host/libraries/libbladeRF/src/helpers/interleave.c @@ -46,6 +46,7 @@ size_t _interleave_calc_bytes_per_sample(bladerf_format format) case BLADERF_FORMAT_SC8_Q7_META: return 2; + case BLADERF_FORMAT_SC16_Q11_PACKED: case BLADERF_FORMAT_SC16_Q11: case BLADERF_FORMAT_SC16_Q11_META: case BLADERF_FORMAT_PACKET_META: @@ -63,6 +64,7 @@ size_t _interleave_calc_metadata_bytes(bladerf_format format) case BLADERF_FORMAT_PACKET_META: return 0x10; case BLADERF_FORMAT_SC8_Q7: + case BLADERF_FORMAT_SC16_Q11_PACKED: case BLADERF_FORMAT_SC16_Q11: return 0; } diff --git a/host/libraries/libbladeRF/src/streaming/format.h b/host/libraries/libbladeRF/src/streaming/format.h index 95cf5dae..2d665cac 100644 --- a/host/libraries/libbladeRF/src/streaming/format.h +++ b/host/libraries/libbladeRF/src/streaming/format.h @@ -54,6 +54,18 @@ static inline size_t sc16q11_to_bytes(size_t n_samples) return n_samples * sample_size; } +/* + * Convert SC16Q11 packed (SC12Q11) samples to bytes + * I and Q are packed into 3 bytes. I and Q are 12 bits each. + * That makes a sample 24 bits = 3 bytes. + */ +static inline size_t sc16q11_packed_to_bytes(size_t n_samples) +{ + const size_t sample_size = 3*sizeof(int8_t); + assert(n_samples <= (SIZE_MAX / sample_size)); + return n_samples * sample_size; +} + /* * Convert bytes to SC16Q11 samples */ @@ -72,6 +84,9 @@ static inline size_t samples_to_bytes(bladerf_format format, size_t n) case BLADERF_FORMAT_SC8_Q7_META: return sc8q7_to_bytes(n); + case BLADERF_FORMAT_SC16_Q11_PACKED: + return sc16q11_packed_to_bytes(n); + case BLADERF_FORMAT_SC16_Q11: case BLADERF_FORMAT_SC16_Q11_META: return sc16q11_to_bytes(n); @@ -93,6 +108,7 @@ static inline size_t bytes_to_samples(bladerf_format format, size_t n) case BLADERF_FORMAT_SC8_Q7_META: return bytes_to_sc8q7(n); + case BLADERF_FORMAT_SC16_Q11_PACKED: case BLADERF_FORMAT_SC16_Q11: case BLADERF_FORMAT_SC16_Q11_META: return bytes_to_sc16q11(n); diff --git a/host/libraries/libbladeRF/src/streaming/sync.c b/host/libraries/libbladeRF/src/streaming/sync.c index 600dde8f..706e1787 100644 --- a/host/libraries/libbladeRF/src/streaming/sync.c +++ b/host/libraries/libbladeRF/src/streaming/sync.c @@ -536,6 +536,7 @@ int sync_rx(struct bladerf_sync *s, void *samples, unsigned num_samples, switch (s->stream_config.format) { case BLADERF_FORMAT_SC16_Q11: + case BLADERF_FORMAT_SC16_Q11_PACKED: case BLADERF_FORMAT_SC8_Q7: s->state = SYNC_STATE_USING_BUFFER; break; @@ -567,9 +568,24 @@ int sync_rx(struct bladerf_sync *s, void *samples, unsigned num_samples, samples_to_copy = uint_min(num_samples - samples_returned, samples_per_buffer - b->partial_off); - memcpy(samples_dest + samples2bytes(s, samples_returned), - buf_src + samples2bytes(s, b->partial_off), - samples2bytes(s, samples_to_copy)); + if (s->stream_config.format == BLADERF_FORMAT_SC16_Q11_PACKED) { + // Unpack SC12Q11 samples to SC16Q11 directly into destination buffer + size_t zz, jj; + uint8_t *meta_sample_ptr = buf_src + samples2bytes(s, b->partial_off); + int16_t *dest_ptr = (int16_t*)(samples_dest + (4*samples_returned)); + for (zz = 0, jj = 0; zz < 2*samples_to_copy; zz+=4, jj+=3) { + dest_ptr[zz+0] = (int16_t)((((uint16_t*)(meta_sample_ptr))[jj+0] & 0x0FFF) << 4) >> 4; + dest_ptr[zz+1] = (int16_t)((((uint16_t*)(meta_sample_ptr))[jj+1] & 0x00FF) << 8) >> 4 + | ((((uint16_t*)(meta_sample_ptr))[jj+0] & 0xF000) >> 12); + dest_ptr[zz+2] = (int16_t)((((uint16_t*)(meta_sample_ptr))[jj+2] & 0x000F) << 12) >> 4 + | ((((uint16_t*)(meta_sample_ptr))[jj+1] & 0xFF00)) >> 8; + dest_ptr[zz+3] = (int16_t)((((uint16_t*)(meta_sample_ptr))[jj+2] & 0xFFF0)) >> 4; + } + } else { + memcpy(samples_dest + samples2bytes(s, samples_returned), + buf_src + samples2bytes(s, b->partial_off), + samples2bytes(s, samples_to_copy)); + } b->partial_off += samples_to_copy; samples_returned += samples_to_copy; From 999f632f8c175c0da25e0f0726eb0d9193fe574d Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Thu, 3 Oct 2024 16:23:34 -0500 Subject: [PATCH 125/238] hdl: fixed sc16q11 packed discontinuity on RX overflow The 12b write cycle and buffer are held constant when in the HOLDOFF state. --- hdl/fpga/ip/nuand/synthesis/fifo_writer.vhd | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hdl/fpga/ip/nuand/synthesis/fifo_writer.vhd b/hdl/fpga/ip/nuand/synthesis/fifo_writer.vhd index 43c52790..3407890b 100644 --- a/hdl/fpga/ip/nuand/synthesis/fifo_writer.vhd +++ b/hdl/fpga/ip/nuand/synthesis/fifo_writer.vhd @@ -659,10 +659,13 @@ begin if( fifo_full = '1' or ( meta_current.meta_written = '0' and meta_en = '1') ) then fifo_future.fifo_write <= '0'; fifo_future.state <= HOLDOFF; + fifo_future.write_cycle <= fifo_current.write_cycle; + fifo_future.fifo_12b_buf <= fifo_current.fifo_12b_buf; end if; when HOLDOFF => - + fifo_future.write_cycle <= fifo_current.write_cycle; + fifo_future.fifo_12b_buf <= fifo_current.fifo_12b_buf; if( fifo_enough ) then fifo_future.state <= WRITE_SAMPLES; From 057964225f7904aceefa6520e7ac19cb66f2321b Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Tue, 8 Oct 2024 17:08:08 -0500 Subject: [PATCH 126/238] hdl: added sc16q11 packed tx sample drop check --- .../vhdl/tb/fx3_gpif_iq_packed_tb.vhd | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/hdl/fpga/platforms/bladerf-micro/vhdl/tb/fx3_gpif_iq_packed_tb.vhd b/hdl/fpga/platforms/bladerf-micro/vhdl/tb/fx3_gpif_iq_packed_tb.vhd index ad5a5f37..89fce653 100644 --- a/hdl/fpga/platforms/bladerf-micro/vhdl/tb/fx3_gpif_iq_packed_tb.vhd +++ b/hdl/fpga/platforms/bladerf-micro/vhdl/tb/fx3_gpif_iq_packed_tb.vhd @@ -643,4 +643,34 @@ begin end if; end process look_for_dropped_rx_samples; + look_for_dropped_tx_samples: process(tx_clock) + variable tx_val : integer := 0; + variable message_count : integer := 1; + variable q_expected : integer := 0; + variable valid_tx_count : integer := 0; + begin + if rising_edge(tx_clock) then + for i in dac_controls'range loop + if dac_streams(i).data_v = '1' then + q_expected := to_integer(to_signed(message_count,8) & to_signed(tx_val+1, 8)); + + assert(dac_streams(i).data_i = to_signed(tx_val, 16)) + report "TX("&integer'image(i)&") I expected: " & integer'image(tx_val) & ", Actual: " & integer'image(to_integer(signed(dac_streams(i).data_i))) + severity failure; + assert(dac_streams(i).data_q = q_expected) + report "TX("&integer'image(i)&") Q expected: " & integer'image(q_expected) & ", Actual: " & integer'image(to_integer(signed(dac_streams(i).data_q))) + severity failure; + + -- A new message is received every 2048 samples + valid_tx_count := valid_tx_count + 1; + if valid_tx_count mod 2048 = 0 then + message_count := message_count + 1; + end if; + + tx_val := (tx_val + 2) mod 2048; + end if; + end loop; + end if; + end process look_for_dropped_tx_samples; + end architecture; From 36dddacd2782c1e675abbcf3e1df654e5876c634 Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Wed, 9 Oct 2024 17:24:37 -0500 Subject: [PATCH 127/238] hdl: added sc16q11 packed format to fx3 model Every 3 gpif cycles will contain 4 sc12q11 samples when the packed format is enabled. --- hdl/fpga/ip/nuand/simulation/fx3_model.vhd | 1 + .../vhdl/tb/fx3_gpif_iq_packed_tb.vhd | 1 + .../bladerf-micro/vhdl/tb/fx3_model.vhd | 34 ++++++++++++++++++- 3 files changed, 35 insertions(+), 1 deletion(-) diff --git a/hdl/fpga/ip/nuand/simulation/fx3_model.vhd b/hdl/fpga/ip/nuand/simulation/fx3_model.vhd index b13b55c1..1dce5e00 100644 --- a/hdl/fpga/ip/nuand/simulation/fx3_model.vhd +++ b/hdl/fpga/ip/nuand/simulation/fx3_model.vhd @@ -42,6 +42,7 @@ entity fx3_model is fx3_tx_en : in std_logic; fx3_tx_meta_en : in std_logic; eight_bit_mode_en : in std_logic := '0'; + packed_mode_en : in std_logic := '0'; done : out boolean ); end entity ; -- fx3_model diff --git a/hdl/fpga/platforms/bladerf-micro/vhdl/tb/fx3_gpif_iq_packed_tb.vhd b/hdl/fpga/platforms/bladerf-micro/vhdl/tb/fx3_gpif_iq_packed_tb.vhd index 89fce653..c63a0459 100644 --- a/hdl/fpga/platforms/bladerf-micro/vhdl/tb/fx3_gpif_iq_packed_tb.vhd +++ b/hdl/fpga/platforms/bladerf-micro/vhdl/tb/fx3_gpif_iq_packed_tb.vhd @@ -291,6 +291,7 @@ begin fx3_rx_meta_en => meta_en_rx, fx3_tx_en => '1', fx3_tx_meta_en => meta_en_tx, + packed_mode_en => fx3_control.highly_packed_mode, done => done ); diff --git a/hdl/fpga/platforms/bladerf-micro/vhdl/tb/fx3_model.vhd b/hdl/fpga/platforms/bladerf-micro/vhdl/tb/fx3_model.vhd index be1682a9..27bdf9a0 100644 --- a/hdl/fpga/platforms/bladerf-micro/vhdl/tb/fx3_model.vhd +++ b/hdl/fpga/platforms/bladerf-micro/vhdl/tb/fx3_model.vhd @@ -58,6 +58,32 @@ architecture micro_dma of fx3_model is signal rx_data : std_logic_vector(31 downto 0); signal tx_data : std_logic_vector(31 downto 0); + -- Generates packed samples + -- The host will pack SC16Q11 samples into an SC12Q11 format. Every 3 gpif_in + -- cycles contain 4 SC12Q11 IQ pairs. + -- + -- Packing order: + -- Buffer 1: [--Sample1(8)--|----------Sample0(24)----------] + -- Buffer 2: [------Sample2(16)------|------Sample1(16)-----] + -- Buffer 3: [----------Sample3(24)----------|--Sample2(8)--] + function data_gen_packed(cycle : natural) return std_logic_vector is + variable four_sample_buffer : std_logic_vector(95 downto 0) := (others => '0'); + variable buffer_offset : integer := 0; + variable sample_value_ref : integer := 0; + variable I : std_logic_vector(11 downto 0) := (others => '0'); + variable Q : std_logic_vector(11 downto 0) := (others => '0'); + begin + sample_value_ref := cycle / 3; + for j in 0 to 3 loop + Q := std_logic_vector(to_signed(8*sample_value_ref+2*j+1, 12)); + I := std_logic_vector(to_signed(8*sample_value_ref+2*j, 12)); + four_sample_buffer := Q & I & four_sample_buffer(95 downto 24); + end loop; + + buffer_offset := (cycle mod 3) * 32; + return four_sample_buffer(31+buffer_offset downto buffer_offset); + end function data_gen_packed; + impure function data_gen (count : natural) return std_logic_vector is variable eight_bit_msw_i : std_logic_vector(7 downto 0); variable eight_bit_msw_q : std_logic_vector(7 downto 0); @@ -155,6 +181,7 @@ begin constant TIME_BETWEEN_ITERATIONS : natural := 7000; constant BLOCK_SIZE : natural := GPIF_BUF_SIZE_SS; variable count : natural := START_COUNT; + variable cycle : natural := 0; variable timestamp_cntr : natural := 400; variable header_len : natural := 0; variable data_out : std_logic_vector(31 downto 0); @@ -224,7 +251,11 @@ begin for i in 1 to (BLOCK_SIZE - header_len) loop gpif_state_tx <= TX_SAMPLES; data_out := data_gen(count); - if( eight_bit_mode_en = '1' ) then + if packed_mode_en = '1' then + data_out := data_gen_packed(cycle); + end if; + + if( eight_bit_mode_en = '1' or packed_mode_en = '1' ) then fx3_gpif <= data_out; tx_data <= data_out; else @@ -233,6 +264,7 @@ begin end if; wait until rising_edge( fx3_pclk ); + cycle := cycle + 1; count := (count + 4) mod 128 when eight_bit_mode_en = '1' else (count + 2) mod 2048; gpif_state_tx <= IDLE; From d48f0d568faeae2b271cd48409c13784395badb3 Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Thu, 27 Feb 2025 18:03:36 -0600 Subject: [PATCH 128/238] hdl: added sc16q11 packed tx support --- hdl/fpga/ip/nuand/synthesis/fifo_reader.vhd | 88 ++++++++++++++++++- .../bladerf-micro/vhdl/bladerf-hosted.vhd | 1 + .../vhdl/tb/fx3_gpif_iq_packed_tb.vhd | 8 +- hdl/fpga/platforms/bladerf-micro/vhdl/tx.vhd | 6 +- .../platforms/bladerf/vhdl/bladerf-hosted.vhd | 1 + 5 files changed, 96 insertions(+), 8 deletions(-) diff --git a/hdl/fpga/ip/nuand/synthesis/fifo_reader.vhd b/hdl/fpga/ip/nuand/synthesis/fifo_reader.vhd index 848155ea..b5077288 100644 --- a/hdl/fpga/ip/nuand/synthesis/fifo_reader.vhd +++ b/hdl/fpga/ip/nuand/synthesis/fifo_reader.vhd @@ -44,6 +44,7 @@ entity fifo_reader is meta_en : in std_logic; packet_en : in std_logic; eight_bit_mode_en : in std_logic; + highly_packed_mode_en : in std_logic; timestamp : in unsigned(63 downto 0); fifo_usedw : in std_logic_vector(FIFO_USEDW_WIDTH-1 downto 0); @@ -142,6 +143,10 @@ architecture simple of fifo_reader is fifo_read : std_logic; out_samples : sample_streams_t(out_samples'range); eight_bit_sample_sel: std_logic; + + -- Highly packed mode signals + packed_buffer : std_logic_vector(47 downto 0); + packed_cycle : integer range 0 to 3; end record; constant FIFO_FSM_RESET_VALUE : fifo_fsm_t := ( @@ -157,7 +162,9 @@ architecture simple of fifo_reader is packet_data_cache => (others => '0'), fifo_read => '0', out_samples => (others => ZERO_SAMPLE), - eight_bit_sample_sel => '0' + eight_bit_sample_sel => '0', + packed_buffer => (others => '0'), + packed_cycle => 0 ); signal fifo_current : fifo_fsm_t := FIFO_FSM_RESET_VALUE; @@ -419,6 +426,67 @@ begin return rv; end function; + -- -------------------------------------------------------------------- + -- MIMO UNPACKER: STEP 1 of 5 (SC12Q11 Highly Packed Mode) + -- -------------------------------------------------------------------- + -- The sample FIFO output is a wide data bus that contains multiple + -- 12-bit I/Q samples packed across multiple cycles. This procedure unpacks + -- data from a 64-bit wide bus across three cycles to extract eight 12-bit I/Q pairs. + -- + -- The packing scheme for 12-bit samples across three 64-bit cycles: + -- Cycle 1: | 63:60 | 59:48 | 47:36 | 35:24 | 23:12 | 11:0 | Bit indices + -- | Q0' | I0 | Q1 | I1 | Q0 | I0 | Samples + -- [-----][--------full 12-bit samples-----------] + -- 4-bit + -- overlap + -- + -- Cycle 2: | 63:56 | 55:44 | 43:32 | 31:20 | 19:8 | 7:0 | Bit indices + -- | I1' | Q0 | I0 | Q1 | I1 | Q0' | Samples + -- [-----][--------full 12-bit samples--------][---] + -- 8-bit 8-bit + -- overlap overlap + -- + -- Cycle 3: | 63:52 | 51:40 | 39:28 | 27:16 | 15:4 | 3:0 | Bit indices + -- | Q1 | I1 | Q0 | I0 | Q1 | I1' | Samples + -- [--------full 12-bit samples-----------][-----] + -- 4-bit + -- overlap + -- + -- Note: Samples with apostrophes (') indicate partial samples that span + -- across cycle boundaries. The complete samples are reconstructed by + -- combining these partial segments from different cycles. + procedure unpack_sc12q11( + signal data : in std_logic_vector(63 downto 0); + signal previous_data : in std_logic_vector(47 downto 0); + signal cycle : in integer; + variable rv : out sample_streams_t + ) is + constant OFFSET_UNIT : natural := 24; + begin + for i in rv'range loop + rv(i).data_i := resize(signed(shift_right(unsigned(data),i*OFFSET_UNIT)(11 downto 0)),rv(i).data_i'length); + rv(i).data_q := resize(signed(shift_right(unsigned(data),i*OFFSET_UNIT)(23 downto 12)),rv(i).data_q'length); + rv(i).data_v := '0'; + end loop; + + if (cycle = 1) then + rv(0).data_i := resize(signed(previous_data(43 downto 32)),rv(0).data_i'length); + rv(0).data_q := resize(signed(data(7 downto 0) & previous_data(47 downto 44)),rv(0).data_q'length); + rv(1).data_i := resize(signed(shift_right(unsigned(data),8)(11 downto 0)),rv(1).data_i'length); + rv(1).data_q := resize(signed(shift_right(unsigned(data),8)(23 downto 12)),rv(1).data_q'length); + elsif (cycle = 2) then + rv(0).data_i := resize(signed(previous_data(27 downto 16)),rv(0).data_i'length); + rv(0).data_q := resize(signed(previous_data(39 downto 28)),rv(0).data_q'length); + rv(1).data_i := resize(signed(fifo_data(3 downto 0) & previous_data(47 downto 40)), rv(1).data_i'length); + rv(1).data_q := resize(signed(fifo_data(15 downto 4)), rv(1).data_q'length); + elsif (cycle = 3) then + rv(0).data_i := resize(signed(previous_data(11 downto 0)),rv(0).data_i'length); + rv(0).data_q := resize(signed(previous_data(23 downto 12)),rv(0).data_q'length); + rv(1).data_i := resize(signed(previous_data(35 downto 24)),rv(0).data_i'length); + rv(1).data_q := resize(signed(previous_data(47 downto 36)),rv(0).data_q'length); + end if; + end procedure; + -- -------------------------------------------------------------------- -- MIMO UNPACKER: STEP 3 of 5 -- -------------------------------------------------------------------- @@ -459,7 +527,14 @@ begin fifo_future.packet_control.data_valid <= '0'; -- MIMO UNPACKER: STEP 1 of 5 - if( eight_bit_mode_en = '1') then + if (highly_packed_mode_en = '1' and NUM_STREAMS = 2) then + unpack_sc12q11( + data => fifo_data, + previous_data => fifo_current.packed_buffer, + cycle => fifo_current.packed_cycle, + rv => unpacked + ); + elsif (eight_bit_mode_en = '1') then unpacked := unpack_eight_bit_mode(fifo_current.sample_controls_reg, fifo_data, fifo_current.eight_bit_sample_sel); else unpacked := unpack(fifo_current.sample_controls_reg, fifo_data); @@ -566,11 +641,16 @@ begin if( fifo_current.samples_left = 0 ) then fifo_future.samples_left <= fifo_current.samples_left_init; fifo_future.ch_shift <= 0; + fifo_future.fifo_read <= read_req; if( eight_bit_mode_en = '1' ) then fifo_future.fifo_read <= read_req and fifo_current.eight_bit_sample_sel; fifo_future.eight_bit_sample_sel <= not fifo_current.eight_bit_sample_sel; - else - fifo_future.fifo_read <= read_req; + elsif (highly_packed_mode_en = '1' and NUM_STREAMS = 2) then + fifo_future.packed_cycle <= (fifo_current.packed_cycle + 1) mod 4; + fifo_future.packed_buffer <= fifo_data(fifo_data'high downto fifo_data'high-47); + if read_req = '1' and fifo_current.packed_cycle = 3 then + fifo_future.fifo_read <= '0'; + end if; end if; else -- MIMO UNPACKER: STEP 5 of 5 diff --git a/hdl/fpga/platforms/bladerf-micro/vhdl/bladerf-hosted.vhd b/hdl/fpga/platforms/bladerf-micro/vhdl/bladerf-hosted.vhd index f51b836a..4818f26e 100644 --- a/hdl/fpga/platforms/bladerf-micro/vhdl/bladerf-hosted.vhd +++ b/hdl/fpga/platforms/bladerf-micro/vhdl/bladerf-hosted.vhd @@ -569,6 +569,7 @@ begin -- Eightbit mode eight_bit_mode_en => eightbit_en_tx, + highly_packed_mode_en => highly_packed_en_txrx, -- Packet FIFO packet_en => packet_en_tx, diff --git a/hdl/fpga/platforms/bladerf-micro/vhdl/tb/fx3_gpif_iq_packed_tb.vhd b/hdl/fpga/platforms/bladerf-micro/vhdl/tb/fx3_gpif_iq_packed_tb.vhd index c63a0459..b3591f9a 100644 --- a/hdl/fpga/platforms/bladerf-micro/vhdl/tb/fx3_gpif_iq_packed_tb.vhd +++ b/hdl/fpga/platforms/bladerf-micro/vhdl/tb/fx3_gpif_iq_packed_tb.vhd @@ -339,6 +339,9 @@ begin tx_underflow_led => open, tx_timestamp => tx_timestamp, + -- Packing modes + highly_packed_mode_en => fx3_control.highly_packed_mode, + -- Triggering trigger_arm => '0', trigger_fire => '0', @@ -653,7 +656,8 @@ begin if rising_edge(tx_clock) then for i in dac_controls'range loop if dac_streams(i).data_v = '1' then - q_expected := to_integer(to_signed(message_count,8) & to_signed(tx_val+1, 8)); + q_expected := tx_val+1 when fx3_control.highly_packed_mode = '1' + else to_integer(to_signed(message_count,8) & to_signed(tx_val+1, 8)); assert(dac_streams(i).data_i = to_signed(tx_val, 16)) report "TX("&integer'image(i)&") I expected: " & integer'image(tx_val) & ", Actual: " & integer'image(to_integer(signed(dac_streams(i).data_i))) @@ -668,7 +672,7 @@ begin message_count := message_count + 1; end if; - tx_val := (tx_val + 2) mod 2048; + tx_val := (tx_val + 2) when tx_val < 2046 else -2048; end if; end loop; end if; diff --git a/hdl/fpga/platforms/bladerf-micro/vhdl/tx.vhd b/hdl/fpga/platforms/bladerf-micro/vhdl/tx.vhd index 7dd307df..cf004e69 100644 --- a/hdl/fpga/platforms/bladerf-micro/vhdl/tx.vhd +++ b/hdl/fpga/platforms/bladerf-micro/vhdl/tx.vhd @@ -47,8 +47,9 @@ entity tx is trigger_master : in std_logic; trigger_line : inout std_logic; -- this is not good, should be in/out/oe - -- 8-bit mode - eight_bit_mode_en : in std_logic := '0'; + -- Packing modes + eight_bit_mode_en : in std_logic := '0'; + highly_packed_mode_en : in std_logic := '0'; -- Packet from host via FX3 packet_en : in std_logic; @@ -218,6 +219,7 @@ begin timestamp => tx_timestamp, eight_bit_mode_en => eight_bit_mode_en, + highly_packed_mode_en => highly_packed_mode_en, fifo_empty => sample_fifo.rempty, fifo_usedw => sample_fifo.rused, diff --git a/hdl/fpga/platforms/bladerf/vhdl/bladerf-hosted.vhd b/hdl/fpga/platforms/bladerf/vhdl/bladerf-hosted.vhd index 504750e8..2dc8edd5 100644 --- a/hdl/fpga/platforms/bladerf/vhdl/bladerf-hosted.vhd +++ b/hdl/fpga/platforms/bladerf/vhdl/bladerf-hosted.vhd @@ -920,6 +920,7 @@ begin meta_en => meta_en_tx, packet_en => packet_en_tx, eight_bit_mode_en => '0', + highly_packed_mode_en => '0', timestamp => tx_timestamp, fifo_empty => tx_sample_fifo.rempty, From ff1b3d4e97e9119bb57084e092d5d7badbcf5c75 Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Wed, 16 Oct 2024 12:25:01 -0500 Subject: [PATCH 129/238] libbladeRF: added sc16q11 packed tx support --- .../libraries/libbladeRF/src/streaming/sync.c | 22 ++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/host/libraries/libbladeRF/src/streaming/sync.c b/host/libraries/libbladeRF/src/streaming/sync.c index 706e1787..94d29a45 100644 --- a/host/libraries/libbladeRF/src/streaming/sync.c +++ b/host/libraries/libbladeRF/src/streaming/sync.c @@ -1067,6 +1067,7 @@ int sync_tx(struct bladerf_sync *s, switch (s->stream_config.format) { case BLADERF_FORMAT_SC16_Q11: + case BLADERF_FORMAT_SC16_Q11_PACKED: case BLADERF_FORMAT_SC8_Q7: s->state = SYNC_STATE_USING_BUFFER; break; @@ -1100,9 +1101,24 @@ int sync_tx(struct bladerf_sync *s, samples_to_copy = uint_min(num_samples - samples_written, samples_per_buffer - b->partial_off); - memcpy(buf_dest + samples2bytes(s, b->partial_off), - samples_src + samples2bytes(s, samples_written), - samples2bytes(s, samples_to_copy)); + if (s->stream_config.format == BLADERF_FORMAT_SC16_Q11_PACKED) { + // Pack SC16Q11 samples to SC12Q11 directly into destination buffer + size_t zz, jj; + uint8_t *packed_dest = buf_dest + samples2bytes(s, b->partial_off); + int16_t const *src_ptr = (int16_t const *)(samples_src + 2*sizeof(int16_t)*samples_written); + for (zz = 0, jj = 0; zz < samples_to_copy * 2; zz += 4, jj += 3) { + ((uint16_t*)packed_dest)[jj+0] = src_ptr[zz+0] & 0x0FFF; + ((uint16_t*)packed_dest)[jj+0] |= (src_ptr[zz+1] << 12) & 0xF000; + ((uint16_t*)packed_dest)[jj+1] = (src_ptr[zz+1] >> 4) & 0x00FF; + ((uint16_t*)packed_dest)[jj+1] |= (src_ptr[zz+2] << 8) & 0xFF00; + ((uint16_t*)packed_dest)[jj+2] = (src_ptr[zz+2] >> 8) & 0x000F; + ((uint16_t*)packed_dest)[jj+2] |= (src_ptr[zz+3] << 4) & 0xFFF0; + } + } else { + memcpy(buf_dest + samples2bytes(s, b->partial_off), + samples_src + samples2bytes(s, samples_written), + samples2bytes(s, samples_to_copy)); + } b->partial_off += samples_to_copy; samples_written += samples_to_copy; From 5ff41748aaa838186cd3597ec01a286a9e55d3e4 Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Mon, 21 Oct 2024 12:14:57 -0500 Subject: [PATCH 130/238] libbladeRF: added sc16q11 packed error when initializing async stream BLADERF_FORMAT_SC16_Q11_PACKED is only supported with the synchronous interface. --- host/libraries/libbladeRF/src/bladerf.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/host/libraries/libbladeRF/src/bladerf.c b/host/libraries/libbladeRF/src/bladerf.c index f19c3a68..cd74b181 100644 --- a/host/libraries/libbladeRF/src/bladerf.c +++ b/host/libraries/libbladeRF/src/bladerf.c @@ -1115,6 +1115,12 @@ int bladerf_init_stream(struct bladerf_stream **stream, } } + if (format == BLADERF_FORMAT_SC16_Q11_PACKED) { + log_error("%s: Async interface does not support SC16_Q11_PACKED format\n", __FUNCTION__); + MUTEX_UNLOCK(&dev->lock); + return BLADERF_ERR_UNSUPPORTED; + } + status = dev->board->init_stream(stream, dev, callback, buffers, num_buffers, format, samples_per_buffer, num_transfers, data); From 59b68f7bf2ed734c315b8d9f4553aacb5db7cd9f Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Tue, 1 Oct 2024 15:12:28 -0500 Subject: [PATCH 131/238] bladeRF-cli: sample format tracked by cli state This will allow us to track the sample format across the cli and can replace the bit_mode cli state member. --- .../bladeRF-cli/src/cmd/printset_impl.c | 24 +++++++++++++++---- host/utilities/bladeRF-cli/src/cmd/rx.c | 6 +---- host/utilities/bladeRF-cli/src/cmd/tx.c | 6 +---- host/utilities/bladeRF-cli/src/common.c | 1 + host/utilities/bladeRF-cli/src/common.h | 1 + 5 files changed, 23 insertions(+), 15 deletions(-) diff --git a/host/utilities/bladeRF-cli/src/cmd/printset_impl.c b/host/utilities/bladeRF-cli/src/cmd/printset_impl.c index ae1d4013..b445d926 100644 --- a/host/utilities/bladeRF-cli/src/cmd/printset_impl.c +++ b/host/utilities/bladeRF-cli/src/cmd/printset_impl.c @@ -1303,7 +1303,20 @@ out: int print_bitmode(struct cli_state *state, int argc, char **argv) { int rv = CLI_RET_OK; - printf(" Bit Mode: %s bit samples\n", state->bit_mode_8bit ? "8" : "16"); + const char *mode_str; + + switch (state->sample_format) { + case BLADERF_FORMAT_SC16_Q11: + mode_str = "16 bit"; + break; + case BLADERF_FORMAT_SC8_Q7: + mode_str = "8 bit"; + break; + default: + mode_str = "Unknown"; + } + + printf(" Bit Mode: %s samples\n", mode_str); return rv; } @@ -1336,18 +1349,19 @@ int set_bitmode(struct cli_state *state, int argc, char **argv) printf(" Error: 16bit mode not permitted when\n" " over sampling is enabled.\n"); goto out; - } else if(state->bit_mode_8bit) { - state->bit_mode_8bit = false; } + + state->bit_mode_8bit = false; + state->sample_format = BLADERF_FORMAT_SC16_Q11; } else if (!strcasecmp("8", argv[2]) || !strcasecmp("8bit", argv[2])) { if (!state->bit_mode_8bit) { if (strcmp(bladerf_get_board_name(state->dev), "bladerf2") != 0) { printf(" Error: BladeRF2 required for 8bit format\n"); rv = CLI_RET_UNSUPPORTED; goto out; - } else { - state->bit_mode_8bit = true; } + state->bit_mode_8bit = true; + state->sample_format = BLADERF_FORMAT_SC8_Q7; } } else { printf(" Usage: %s %s <8|16>\n", argv[0], argv[1]); diff --git a/host/utilities/bladeRF-cli/src/cmd/rx.c b/host/utilities/bladeRF-cli/src/cmd/rx.c index 64a083cd..0835a566 100644 --- a/host/utilities/bladeRF-cli/src/cmd/rx.c +++ b/host/utilities/bladeRF-cli/src/cmd/rx.c @@ -311,7 +311,6 @@ void *rx_task(void *cli_state_arg) struct cli_state *cli_state = (struct cli_state *)cli_state_arg; struct rxtx_data *rx = cli_state->rx; struct rx_params *rx_params = rx->params; - bladerf_format sync_fmt; task_state = rxtx_get_state(rx); assert(task_state == RXTX_STATE_INIT); @@ -370,12 +369,9 @@ void *rx_task(void *cli_state_arg) if (status == 0) { MUTEX_LOCK(&rx->data_mgmt.lock); - sync_fmt = cli_state->bit_mode_8bit ? - BLADERF_FORMAT_SC8_Q7 : BLADERF_FORMAT_SC16_Q11; - status = bladerf_sync_config( cli_state->dev, rx->data_mgmt.layout, - sync_fmt, rx->data_mgmt.num_buffers, + cli_state->sample_format, rx->data_mgmt.num_buffers, rx->data_mgmt.samples_per_buffer, rx->data_mgmt.num_transfers, rx->data_mgmt.timeout_ms); diff --git a/host/utilities/bladeRF-cli/src/cmd/tx.c b/host/utilities/bladeRF-cli/src/cmd/tx.c index 03ab5904..d4ddeb08 100644 --- a/host/utilities/bladeRF-cli/src/cmd/tx.c +++ b/host/utilities/bladeRF-cli/src/cmd/tx.c @@ -375,7 +375,6 @@ void *tx_task(void *cli_state_arg) enum rxtx_state task_state; struct cli_state *cli_state = (struct cli_state *)cli_state_arg; struct rxtx_data *tx = cli_state->tx; - bladerf_format sync_fmt; /* We expect to be in the IDLE state when this is kicked off. We could * also get into the shutdown state if the program exits before we @@ -408,13 +407,10 @@ void *tx_task(void *cli_state_arg) assert(tx->file_mgmt.file != NULL); MUTEX_UNLOCK(&tx->file_mgmt.file_meta_lock); - sync_fmt = cli_state->bit_mode_8bit ? - BLADERF_FORMAT_SC8_Q7 : BLADERF_FORMAT_SC16_Q11; - /* Initialize the TX synchronous data configuration */ status = bladerf_sync_config( cli_state->dev, tx->data_mgmt.layout, - sync_fmt, tx->data_mgmt.num_buffers, + cli_state->sample_format, tx->data_mgmt.num_buffers, tx->data_mgmt.samples_per_buffer, tx->data_mgmt.num_transfers, tx->data_mgmt.timeout_ms); diff --git a/host/utilities/bladeRF-cli/src/common.c b/host/utilities/bladeRF-cli/src/common.c index 5c6d4a6a..5c1bd207 100644 --- a/host/utilities/bladeRF-cli/src/common.c +++ b/host/utilities/bladeRF-cli/src/common.c @@ -100,6 +100,7 @@ struct cli_state *cli_state_create() cli_state->last_lib_error = 0; cli_state->scripts = NULL; cli_state->bit_mode_8bit = false; + cli_state->sample_format = BLADERF_FORMAT_SC16_Q11; cli_state->dev_info.fpga_size = BLADERF_FPGA_UNKNOWN; cli_state->dev_info.is_bladerf_x40_x115 = false; diff --git a/host/utilities/bladeRF-cli/src/common.h b/host/utilities/bladeRF-cli/src/common.h index 0980940a..137e34b8 100644 --- a/host/utilities/bladeRF-cli/src/common.h +++ b/host/utilities/bladeRF-cli/src/common.h @@ -119,6 +119,7 @@ struct cli_state { struct rxtx_data *tx; /**< Data for sample transmission */ bool bit_mode_8bit; /**< Bit mode is set to 16 bits */ + bladerf_format sample_format; /**< Sample format */ }; /** From b655422a718c8656a8e83691da9dce214b53352b Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Fri, 18 Oct 2024 15:52:04 -0500 Subject: [PATCH 132/238] bladeRF-cli: replace cli state member bit_mode_8bit with sample_format Instead of relying on a bit_mode boolean assignment, we can directly rely on a bladerf_format state member. --- host/utilities/bladeRF-cli/src/cmd/generate.c | 2 +- .../utilities/bladeRF-cli/src/cmd/printset_impl.c | 15 ++++++--------- host/utilities/bladeRF-cli/src/cmd/rx.c | 2 +- host/utilities/bladeRF-cli/src/cmd/rxtx.c | 2 +- host/utilities/bladeRF-cli/src/cmd/tx.c | 8 ++++---- host/utilities/bladeRF-cli/src/common.c | 1 - host/utilities/bladeRF-cli/src/common.h | 1 - 7 files changed, 13 insertions(+), 18 deletions(-) diff --git a/host/utilities/bladeRF-cli/src/cmd/generate.c b/host/utilities/bladeRF-cli/src/cmd/generate.c index 3ffedf29..e070032c 100644 --- a/host/utilities/bladeRF-cli/src/cmd/generate.c +++ b/host/utilities/bladeRF-cli/src/cmd/generate.c @@ -66,7 +66,7 @@ int cmd_generate(struct cli_state *s, int argc, char **argv) int mag = 2047; int i; - if (s->bit_mode_8bit) { + if (s->sample_format == BLADERF_FORMAT_SC8_Q7) { mag /= 16; } int remaining_argc; diff --git a/host/utilities/bladeRF-cli/src/cmd/printset_impl.c b/host/utilities/bladeRF-cli/src/cmd/printset_impl.c index b445d926..539d5fb2 100644 --- a/host/utilities/bladeRF-cli/src/cmd/printset_impl.c +++ b/host/utilities/bladeRF-cli/src/cmd/printset_impl.c @@ -1351,18 +1351,15 @@ int set_bitmode(struct cli_state *state, int argc, char **argv) goto out; } - state->bit_mode_8bit = false; state->sample_format = BLADERF_FORMAT_SC16_Q11; } else if (!strcasecmp("8", argv[2]) || !strcasecmp("8bit", argv[2])) { - if (!state->bit_mode_8bit) { - if (strcmp(bladerf_get_board_name(state->dev), "bladerf2") != 0) { - printf(" Error: BladeRF2 required for 8bit format\n"); - rv = CLI_RET_UNSUPPORTED; - goto out; - } - state->bit_mode_8bit = true; - state->sample_format = BLADERF_FORMAT_SC8_Q7; + if (strcmp(bladerf_get_board_name(state->dev), "bladerf2") != 0) { + printf(" Error: BladeRF2 required for 8bit format\n"); + rv = CLI_RET_UNSUPPORTED; + goto out; } + + state->sample_format = BLADERF_FORMAT_SC8_Q7; } else { printf(" Usage: %s %s <8|16>\n", argv[0], argv[1]); rv = CLI_RET_UNSUPPORTED; diff --git a/host/utilities/bladeRF-cli/src/cmd/rx.c b/host/utilities/bladeRF-cli/src/cmd/rx.c index 0835a566..42defef9 100644 --- a/host/utilities/bladeRF-cli/src/cmd/rx.c +++ b/host/utilities/bladeRF-cli/src/cmd/rx.c @@ -172,7 +172,7 @@ static int rx_write_csv(struct cli_state *s, MUTEX_LOCK(&rx->file_mgmt.file_lock); - if (s->bit_mode_8bit) { + if (s->sample_format == BLADERF_FORMAT_SC8_Q7) { samples_sc8q7 = (int8_t*)samples; // Output 2 columns for each enabled channel // (2 cols for BLADERF_RX_X1, 4 cols for BLADERF_RX_X2, etc) diff --git a/host/utilities/bladeRF-cli/src/cmd/rxtx.c b/host/utilities/bladeRF-cli/src/cmd/rxtx.c index a5d1867e..af3ba377 100644 --- a/host/utilities/bladeRF-cli/src/cmd/rxtx.c +++ b/host/utilities/bladeRF-cli/src/cmd/rxtx.c @@ -340,7 +340,7 @@ enum rxtx_fmt rxtx_str2fmt(const char *str, struct cli_state *s) if (!strcasecmp("csv", str)) { ret = RXTX_FMT_CSV; } else if (!strcasecmp("bin", str)) { - ret = (s->bit_mode_8bit) ? RXTX_FMT_BIN_SC8Q7 : RXTX_FMT_BIN_SC16Q11; + ret = (s->sample_format == BLADERF_FORMAT_SC8_Q7) ? RXTX_FMT_BIN_SC8Q7 : RXTX_FMT_BIN_SC16Q11; } return ret; diff --git a/host/utilities/bladeRF-cli/src/cmd/tx.c b/host/utilities/bladeRF-cli/src/cmd/tx.c index d4ddeb08..badd5bc8 100644 --- a/host/utilities/bladeRF-cli/src/cmd/tx.c +++ b/host/utilities/bladeRF-cli/src/cmd/tx.c @@ -246,7 +246,7 @@ static int tx_csv_to_bladerf_format(struct cli_state *s) int max_val = SC16Q11_IQ_MAX; // 16 bit samples are 2*int8_t samples wide - int sample_size = s->bit_mode_8bit ? 1 : 2; + int sample_size = (s->sample_format == BLADERF_FORMAT_SC8_Q7) ? 1 : 2; int status; assert(tx->file_mgmt.path != NULL); @@ -268,7 +268,7 @@ static int tx_csv_to_bladerf_format(struct cli_state *s) } - if (s->bit_mode_8bit) { + if (s->sample_format == BLADERF_FORMAT_SC8_Q7) { min_val = SC8Q7_IQ_MIN; max_val = SC8Q7_IQ_MAX; } @@ -332,7 +332,7 @@ static int tx_csv_to_bladerf_format(struct cli_state *s) tx->file_mgmt.format = RXTX_FMT_BIN_SC16Q11; if (n_clamped != 0) { - if (s->bit_mode_8bit) { + if (s->sample_format == BLADERF_FORMAT_SC8_Q7) { printf(" Warning: %zu value%s clamped within DAC SC8 Q7 " "range of [%d, %d].\n", n_clamped, 1 == n_clamped ? "" : "s", SC8Q7_IQ_MIN, @@ -483,7 +483,7 @@ static int tx_cmd_start(struct cli_state *s) status = tx_csv_to_bladerf_format(s); if (status == 0) { - if (s->bit_mode_8bit) { + if (s->sample_format == BLADERF_FORMAT_SC8_Q7) { printf(" Converted CSV to SC8 Q7 file and " "switched to converted file.\n\n"); diff --git a/host/utilities/bladeRF-cli/src/common.c b/host/utilities/bladeRF-cli/src/common.c index 5c1bd207..420a4de1 100644 --- a/host/utilities/bladeRF-cli/src/common.c +++ b/host/utilities/bladeRF-cli/src/common.c @@ -99,7 +99,6 @@ struct cli_state *cli_state_create() cli_state->dev = NULL; cli_state->last_lib_error = 0; cli_state->scripts = NULL; - cli_state->bit_mode_8bit = false; cli_state->sample_format = BLADERF_FORMAT_SC16_Q11; cli_state->dev_info.fpga_size = BLADERF_FPGA_UNKNOWN; diff --git a/host/utilities/bladeRF-cli/src/common.h b/host/utilities/bladeRF-cli/src/common.h index 137e34b8..bc6d410a 100644 --- a/host/utilities/bladeRF-cli/src/common.h +++ b/host/utilities/bladeRF-cli/src/common.h @@ -118,7 +118,6 @@ struct cli_state { struct rxtx_data *rx; /**< Data for sample reception */ struct rxtx_data *tx; /**< Data for sample transmission */ - bool bit_mode_8bit; /**< Bit mode is set to 16 bits */ bladerf_format sample_format; /**< Sample format */ }; From 6eab5f6a5e1d3dea4624ce61dc5374d6af03f7df Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Tue, 4 Mar 2025 13:04:56 -0600 Subject: [PATCH 133/238] bladeRF-cli: added sc16q11 packed format support --- host/utilities/bladeRF-cli/src/cmd/printset_impl.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/host/utilities/bladeRF-cli/src/cmd/printset_impl.c b/host/utilities/bladeRF-cli/src/cmd/printset_impl.c index 539d5fb2..38782a18 100644 --- a/host/utilities/bladeRF-cli/src/cmd/printset_impl.c +++ b/host/utilities/bladeRF-cli/src/cmd/printset_impl.c @@ -1309,6 +1309,9 @@ int print_bitmode(struct cli_state *state, int argc, char **argv) case BLADERF_FORMAT_SC16_Q11: mode_str = "16 bit"; break; + case BLADERF_FORMAT_SC16_Q11_PACKED: + mode_str = "Packed 16 bit"; + break; case BLADERF_FORMAT_SC8_Q7: mode_str = "8 bit"; break; @@ -1334,7 +1337,7 @@ int set_bitmode(struct cli_state *state, int argc, char **argv) if (argc != 3) { if (argc == 2) { - printf(" Usage: %s %s <8|16>\n", argv[0], argv[1]); + printf(" Usage: %s %s <8|16|packed>\n", argv[0], argv[1]); rv = CLI_RET_OK; goto out; } else { @@ -1360,8 +1363,10 @@ int set_bitmode(struct cli_state *state, int argc, char **argv) } state->sample_format = BLADERF_FORMAT_SC8_Q7; + } else if (!strcasecmp("packed", argv[2])) { + state->sample_format = BLADERF_FORMAT_SC16_Q11_PACKED; } else { - printf(" Usage: %s %s <8|16>\n", argv[0], argv[1]); + printf(" Usage: %s %s <8|16|packed>\n", argv[0], argv[1]); rv = CLI_RET_UNSUPPORTED; goto out; } From 3ae66b49a1de3d1e1869784194178043434ad7ac Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Wed, 2 Oct 2024 11:23:00 -0500 Subject: [PATCH 134/238] bladeRF-cli: added sc16q11 packed siso rx example --- .../bladeRF-cli/sc16q11-packed-siso/README.md | 26 ++++++++++ .../sc16q11-packed-siso/requirements.txt | 14 ++++++ .../bladeRF-cli/sc16q11-packed-siso/run.sh | 3 ++ .../bladeRF-cli/sc16q11-packed-siso/rx.txt | 7 +++ .../sc16q11-packed-siso/validate.py | 47 +++++++++++++++++++ 5 files changed, 97 insertions(+) create mode 100644 host/examples/bladeRF-cli/sc16q11-packed-siso/README.md create mode 100644 host/examples/bladeRF-cli/sc16q11-packed-siso/requirements.txt create mode 100755 host/examples/bladeRF-cli/sc16q11-packed-siso/run.sh create mode 100644 host/examples/bladeRF-cli/sc16q11-packed-siso/rx.txt create mode 100644 host/examples/bladeRF-cli/sc16q11-packed-siso/validate.py diff --git a/host/examples/bladeRF-cli/sc16q11-packed-siso/README.md b/host/examples/bladeRF-cli/sc16q11-packed-siso/README.md new file mode 100644 index 00000000..4246506a --- /dev/null +++ b/host/examples/bladeRF-cli/sc16q11-packed-siso/README.md @@ -0,0 +1,26 @@ +# BladeRF CLI RX SISO Packed + +This example demonstrates how to configure and use the BladeRF CLI to aquire an RX stream of packed 16-bit samples. + +## Prerequisites + +Before running this example, ensure the Python environment is initialized and install the dependencies: + +```bash +python3 -m venv env +source env/bin/activate +pip install -r requirements.txt +``` + +## Running the Example + +To run the example, execute the following command: + +```bash +./run.sh +``` + +This will execute the bladeRF-cli script that ingests samples from an internal 12b counter and writes them to a CSV file. + +The Python script `validate.py` will then read the CSV file and plot the samples for visual inspection. + diff --git a/host/examples/bladeRF-cli/sc16q11-packed-siso/requirements.txt b/host/examples/bladeRF-cli/sc16q11-packed-siso/requirements.txt new file mode 100644 index 00000000..a5f0390e --- /dev/null +++ b/host/examples/bladeRF-cli/sc16q11-packed-siso/requirements.txt @@ -0,0 +1,14 @@ +contourpy==1.3.0 +cycler==0.12.1 +fonttools==4.54.1 +kiwisolver==1.4.7 +matplotlib==3.9.2 +numpy==2.1.1 +packaging==24.1 +pandas==2.2.3 +pillow==10.4.0 +pyparsing==3.1.4 +python-dateutil==2.9.0.post0 +pytz==2024.2 +six==1.16.0 +tzdata==2024.2 diff --git a/host/examples/bladeRF-cli/sc16q11-packed-siso/run.sh b/host/examples/bladeRF-cli/sc16q11-packed-siso/run.sh new file mode 100755 index 00000000..a29f4495 --- /dev/null +++ b/host/examples/bladeRF-cli/sc16q11-packed-siso/run.sh @@ -0,0 +1,3 @@ +set -e +bladeRF-cli -s rx.txt +python3 validate.py /tmp/data.csv diff --git a/host/examples/bladeRF-cli/sc16q11-packed-siso/rx.txt b/host/examples/bladeRF-cli/sc16q11-packed-siso/rx.txt new file mode 100644 index 00000000..22036223 --- /dev/null +++ b/host/examples/bladeRF-cli/sc16q11-packed-siso/rx.txt @@ -0,0 +1,7 @@ +set frequency 915M +set samplerate 20M +set rx_mux 12BIT_COUNTER +set bitmode packed +rx config file=/tmp/data.csv format=csv n=200k +rx start +rx wait diff --git a/host/examples/bladeRF-cli/sc16q11-packed-siso/validate.py b/host/examples/bladeRF-cli/sc16q11-packed-siso/validate.py new file mode 100644 index 00000000..72564195 --- /dev/null +++ b/host/examples/bladeRF-cli/sc16q11-packed-siso/validate.py @@ -0,0 +1,47 @@ +import matplotlib.pyplot as plt +import pandas as pd +import numpy as np +import sys + +def import_data(file_path): + try: + df = pd.read_csv(file_path, header=None, names=['I', 'Q']) + + if df.shape[1] < 2: + raise ValueError("CSV file must contain at least two columns for I and Q values") + + # Check if the data is numeric + if not (df['I'].dtype.kind in 'biufc' and df['Q'].dtype.kind in 'biufc'): + raise ValueError("I and Q samples must be numeric") + + return df + + except FileNotFoundError: + print(f"Error: File '{file_path}' not found") + sys.exit(1) + except pd.errors.EmptyDataError: + print(f"Error: File '{file_path}' is empty") + sys.exit(1) + except Exception as e: + print(f"Error: {str(e)}") + sys.exit(1) + +if len(sys.argv) != 2: + print("Usage: python validate.py ") + sys.exit(1) + +file_path = sys.argv[1] +df = import_data(file_path) + +# Plot I and Q components on the same graph +plt.figure(figsize=(10, 6)) +plt.plot(df.index, df['I'], label='I', alpha=0.7) +plt.plot(df.index, df['Q'], label='Q', alpha=0.7) +plt.xlabel('Sample Index') +plt.ylabel('Amplitude') +plt.title('I/Q Components Over Time') +plt.legend() +plt.grid(True, alpha=0.3) + +plt.tight_layout() +plt.show() From c407de2c9f47de203ffb3832e30bcbdadd7487e2 Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Wed, 2 Oct 2024 14:05:23 -0500 Subject: [PATCH 135/238] bladeRF-cli: added sc16q11 packed mimo rx example --- .../bladeRF-cli/sc16q11-packed-mimo/README.md | 25 +++++ .../sc16q11-packed-mimo/requirements.txt | 14 +++ .../bladeRF-cli/sc16q11-packed-mimo/run.sh | 3 + .../bladeRF-cli/sc16q11-packed-mimo/rx.txt | 8 ++ .../sc16q11-packed-mimo/validate.py | 100 ++++++++++++++++++ 5 files changed, 150 insertions(+) create mode 100644 host/examples/bladeRF-cli/sc16q11-packed-mimo/README.md create mode 100644 host/examples/bladeRF-cli/sc16q11-packed-mimo/requirements.txt create mode 100755 host/examples/bladeRF-cli/sc16q11-packed-mimo/run.sh create mode 100644 host/examples/bladeRF-cli/sc16q11-packed-mimo/rx.txt create mode 100644 host/examples/bladeRF-cli/sc16q11-packed-mimo/validate.py diff --git a/host/examples/bladeRF-cli/sc16q11-packed-mimo/README.md b/host/examples/bladeRF-cli/sc16q11-packed-mimo/README.md new file mode 100644 index 00000000..dd2ba2ea --- /dev/null +++ b/host/examples/bladeRF-cli/sc16q11-packed-mimo/README.md @@ -0,0 +1,25 @@ +# BladeRF CLI RX MIMO Packed + +This example demonstrates how to configure and use the BladeRF CLI to aquire an RX stream of packed 16-bit samples. + +## Prerequisites + +Before running this example, ensure the Python environment is initialized and install the dependencies: + +```bash +python3 -m venv env +source env/bin/activate +pip install -r requirements.txt +``` + +## Running the Example + +To run the example, execute the following command: + +```bash +./run.sh +``` + +This will execute the bladeRF-cli script that ingests samples from an internal 12b counter and writes them to a CSV file. + +The Python script `validate.py` will then read the CSV file and plot the samples for visual inspection. diff --git a/host/examples/bladeRF-cli/sc16q11-packed-mimo/requirements.txt b/host/examples/bladeRF-cli/sc16q11-packed-mimo/requirements.txt new file mode 100644 index 00000000..a5f0390e --- /dev/null +++ b/host/examples/bladeRF-cli/sc16q11-packed-mimo/requirements.txt @@ -0,0 +1,14 @@ +contourpy==1.3.0 +cycler==0.12.1 +fonttools==4.54.1 +kiwisolver==1.4.7 +matplotlib==3.9.2 +numpy==2.1.1 +packaging==24.1 +pandas==2.2.3 +pillow==10.4.0 +pyparsing==3.1.4 +python-dateutil==2.9.0.post0 +pytz==2024.2 +six==1.16.0 +tzdata==2024.2 diff --git a/host/examples/bladeRF-cli/sc16q11-packed-mimo/run.sh b/host/examples/bladeRF-cli/sc16q11-packed-mimo/run.sh new file mode 100755 index 00000000..a29f4495 --- /dev/null +++ b/host/examples/bladeRF-cli/sc16q11-packed-mimo/run.sh @@ -0,0 +1,3 @@ +set -e +bladeRF-cli -s rx.txt +python3 validate.py /tmp/data.csv diff --git a/host/examples/bladeRF-cli/sc16q11-packed-mimo/rx.txt b/host/examples/bladeRF-cli/sc16q11-packed-mimo/rx.txt new file mode 100644 index 00000000..18b5c1b6 --- /dev/null +++ b/host/examples/bladeRF-cli/sc16q11-packed-mimo/rx.txt @@ -0,0 +1,8 @@ +set bitmode packed +set rx_mux 12BIT_COUNTER +# set frequency 915M +set samplerate 61.44M +rx config file=/tmp/data.csv format=csv n=40k channel=1,2 +# rx config file=/tmp/data.csv format=csv n=200k +rx start +rx wait diff --git a/host/examples/bladeRF-cli/sc16q11-packed-mimo/validate.py b/host/examples/bladeRF-cli/sc16q11-packed-mimo/validate.py new file mode 100644 index 00000000..536e4355 --- /dev/null +++ b/host/examples/bladeRF-cli/sc16q11-packed-mimo/validate.py @@ -0,0 +1,100 @@ +import matplotlib.pyplot as plt +import pandas as pd +import numpy as np +import sys +import ast + +def import_data(file_path): + try: + # Read the CSV file without header + df = pd.read_csv(file_path, header=None) + + # Function to safely convert string representations of tuples to actual tuples + def safe_eval(x): + try: + return ast.literal_eval(x) + except: + return x + + # Apply safe_eval to all elements + df = df.apply(lambda col: col.map(safe_eval)) + + # Rename columns based on the number of columns + if df.shape[1] == 2: + df.columns = ['I', 'Q'] + elif df.shape[1] == 4: + df.columns = ['I1', 'Q1', 'I2', 'Q2'] + else: + raise ValueError("CSV file must contain either two columns (single channel) or four columns (dual channel)") + + # Extract numeric values from tuples if necessary + for col in df.columns: + if df[col].dtype == 'object': + df[col] = df[col].apply(lambda x: x[0] if isinstance(x, (tuple, list)) else x) + + # Convert to numeric, coercing errors to NaN + df = df.apply(pd.to_numeric, errors='coerce') + + # Drop any rows with NaN values + df = df.dropna() + + # Check if all columns are numeric + for col in df.columns: + if not pd.api.types.is_numeric_dtype(df[col]): + raise ValueError(f"{col} samples must be numeric") + + return df + + except FileNotFoundError: + print(f"Error: File '{file_path}' not found") + sys.exit(1) + except pd.errors.EmptyDataError: + print(f"Error: File '{file_path}' is empty") + sys.exit(1) + except Exception as e: + print(f"Error: {str(e)}") + sys.exit(1) + +if len(sys.argv) != 2: + print("Usage: python validate.py ") + sys.exit(1) + +file_path = sys.argv[1] +df = import_data(file_path) + +# Determine if it's single or dual channel +is_dual_channel = 'I2' in df.columns + +plt.figure(figsize=(12, 8)) + +if is_dual_channel: + # Plot Channel 1 + plt.subplot(2, 1, 1) + plt.plot(df.index, df['I1'], label='I (Ch1)', alpha=0.7) + plt.plot(df.index, df['Q1'], label='Q (Ch1)', alpha=0.7) + plt.ylabel('Amplitude (Ch1)') + plt.title('I/Q Components Over Time - Channel 1') + plt.legend(loc='upper right') + plt.grid(True, alpha=0.3) + + # Plot Channel 2 + plt.subplot(2, 1, 2) + plt.plot(df.index, df['I2'], label='I (Ch2)', alpha=0.7) + plt.plot(df.index, df['Q2'], label='Q (Ch2)', alpha=0.7) + plt.xlabel('Sample Index') + plt.ylabel('Amplitude (Ch2)') + plt.title('I/Q Components Over Time - Channel 2') + plt.legend(loc='upper right') + plt.grid(True, alpha=0.3) +else: + # Plot Single Channel + plt.plot(df.index, df['I'], label='I', alpha=0.7) + plt.plot(df.index, df['Q'], label='Q', alpha=0.7) + plt.xlabel('Sample Index') + plt.ylabel('Amplitude') + plt.title('I/Q Components Over Time - Single Channel') + plt.legend(loc='upper right') + plt.grid(True, alpha=0.3) + +plt.tight_layout() +plt.show() From 709d45d853066edeac07c31377969b0fade76c44 Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Wed, 16 Oct 2024 16:59:07 -0500 Subject: [PATCH 136/238] bladeRF-cli: added sc16q11 packed siso tx example --- .../sc16q11-packed-siso/.gitignore | 1 + .../generate_tx_samples.py | 51 +++++++++++++++++++ .../bladeRF-cli/sc16q11-packed-siso/tx.txt | 6 +++ 3 files changed, 58 insertions(+) create mode 100644 host/examples/bladeRF-cli/sc16q11-packed-siso/.gitignore create mode 100644 host/examples/bladeRF-cli/sc16q11-packed-siso/generate_tx_samples.py create mode 100644 host/examples/bladeRF-cli/sc16q11-packed-siso/tx.txt diff --git a/host/examples/bladeRF-cli/sc16q11-packed-siso/.gitignore b/host/examples/bladeRF-cli/sc16q11-packed-siso/.gitignore new file mode 100644 index 00000000..1e569eb6 --- /dev/null +++ b/host/examples/bladeRF-cli/sc16q11-packed-siso/.gitignore @@ -0,0 +1 @@ +tx_samples.csv diff --git a/host/examples/bladeRF-cli/sc16q11-packed-siso/generate_tx_samples.py b/host/examples/bladeRF-cli/sc16q11-packed-siso/generate_tx_samples.py new file mode 100644 index 00000000..7612ce9d --- /dev/null +++ b/host/examples/bladeRF-cli/sc16q11-packed-siso/generate_tx_samples.py @@ -0,0 +1,51 @@ +import csv +import sys + +def generate_csv_normal(filename): + with open(filename, 'w', newline='') as csvfile: + writer = csv.writer(csvfile) + + # Generate numbers from 0 to 2047 + for i in range(0, 2048, 2): + writer.writerow([i, i+1]) + + # Generate numbers from -2048 to -1 + for i in range(-2048, 0, 2): + writer.writerow([i, i+1]) + +def generate_csv_cw(filename): + cw_pattern = [ + [0, 2047], + [2047, 0], + [0, -2047], + [-2047, 0] + ] + + with open(filename, 'w', newline='') as csvfile: + writer = csv.writer(csvfile) + for _ in range(2*4096): + for sample in cw_pattern: + # Duplicate the pattern for both channels + writer.writerow(sample) + +if __name__ == "__main__": + filename = 'tx_samples.csv' + + if len(sys.argv) > 1: + if sys.argv[1] == "-h" or sys.argv[1] == "--help": + print("Usage: python generate_tx_samples.py [option]") + print("Options:") + print(" -h, --help Show this help message and exit") + print(" cw Generate CSV file with CW pattern") + print(" (no option) Generate CSV file with count pattern") + sys.exit(0) + elif sys.argv[1] == "cw": + generate_csv_cw(filename) + print(f"CSV file '{filename}' has been generated with CW pattern.") + else: + print(f"Unknown option: {sys.argv[1]}") + print("Use -h or --help for usage information.") + sys.exit(1) + else: + generate_csv_normal(filename) + print(f"CSV file '{filename}' has been generated with count pattern.") diff --git a/host/examples/bladeRF-cli/sc16q11-packed-siso/tx.txt b/host/examples/bladeRF-cli/sc16q11-packed-siso/tx.txt new file mode 100644 index 00000000..f32a2a3e --- /dev/null +++ b/host/examples/bladeRF-cli/sc16q11-packed-siso/tx.txt @@ -0,0 +1,6 @@ +set frequency 915M +set samplerate 20M +set bitmode packed +tx config file=tx_samples.csv format=csv +tx start +tx wait From b2d9f969a5b412c1039d53707867c899ae67b870 Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Wed, 16 Oct 2024 17:04:08 -0500 Subject: [PATCH 137/238] bladeRF-cli: added sc16q11 packed mimo tx example --- .../sc16q11-packed-mimo/.gitignore | 1 + .../generate_tx_samples.py | 51 +++++++++++++++++++ .../bladeRF-cli/sc16q11-packed-mimo/tx.txt | 6 +++ 3 files changed, 58 insertions(+) create mode 100644 host/examples/bladeRF-cli/sc16q11-packed-mimo/.gitignore create mode 100644 host/examples/bladeRF-cli/sc16q11-packed-mimo/generate_tx_samples.py create mode 100644 host/examples/bladeRF-cli/sc16q11-packed-mimo/tx.txt diff --git a/host/examples/bladeRF-cli/sc16q11-packed-mimo/.gitignore b/host/examples/bladeRF-cli/sc16q11-packed-mimo/.gitignore new file mode 100644 index 00000000..1e569eb6 --- /dev/null +++ b/host/examples/bladeRF-cli/sc16q11-packed-mimo/.gitignore @@ -0,0 +1 @@ +tx_samples.csv diff --git a/host/examples/bladeRF-cli/sc16q11-packed-mimo/generate_tx_samples.py b/host/examples/bladeRF-cli/sc16q11-packed-mimo/generate_tx_samples.py new file mode 100644 index 00000000..b6322555 --- /dev/null +++ b/host/examples/bladeRF-cli/sc16q11-packed-mimo/generate_tx_samples.py @@ -0,0 +1,51 @@ +import csv +import sys + +def generate_csv_normal(filename): + with open(filename, 'w', newline='') as csvfile: + writer = csv.writer(csvfile) + + # Generate numbers from 0 to 2047 + for i in range(0, 2048, 4): + writer.writerow([i, i+1, i+2, i+3]) + + # Generate numbers from -2048 to -1 + for i in range(-2048, 0, 4): + writer.writerow([i, i+1, i+2, i+3]) + +def generate_csv_cw(filename): + cw_pattern = [ + [0, 2047], + [2047, 0], + [0, -2047], + [-2047, 0] + ] + + with open(filename, 'w', newline='') as csvfile: + writer = csv.writer(csvfile) + for _ in range(2*4096): + for sample in cw_pattern: + # Duplicate the pattern for both channels + writer.writerow(sample + sample) + +if __name__ == "__main__": + filename = 'tx_samples.csv' + + if len(sys.argv) > 1: + if sys.argv[1] == "-h" or sys.argv[1] == "--help": + print("Usage: python generate_tx_samples.py [option]") + print("Options:") + print(" -h, --help Show this help message and exit") + print(" cw Generate CSV file with CW pattern") + print(" (no option) Generate CSV file with count pattern") + sys.exit(0) + elif sys.argv[1] == "cw": + generate_csv_cw(filename) + print(f"CSV file '{filename}' has been generated with CW pattern.") + else: + print(f"Unknown option: {sys.argv[1]}") + print("Use -h or --help for usage information.") + sys.exit(1) + else: + generate_csv_normal(filename) + print(f"CSV file '{filename}' has been generated with count pattern.") diff --git a/host/examples/bladeRF-cli/sc16q11-packed-mimo/tx.txt b/host/examples/bladeRF-cli/sc16q11-packed-mimo/tx.txt new file mode 100644 index 00000000..0ec94c7c --- /dev/null +++ b/host/examples/bladeRF-cli/sc16q11-packed-mimo/tx.txt @@ -0,0 +1,6 @@ +set frequency 915M +set samplerate 20M +set bitmode packed +tx config file=tx_samples.csv format=csv channel=1,2 +tx start +tx wait From 16c184b6dcb48265adf1709b93615907e57e616b Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Tue, 8 Oct 2024 15:39:54 -0500 Subject: [PATCH 138/238] test: added fx3_gpif_iq_packed_tb to regression test --- host/libraries/libbladeRF_test/test_regression/src/main.cxx | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/host/libraries/libbladeRF_test/test_regression/src/main.cxx b/host/libraries/libbladeRF_test/test_regression/src/main.cxx index 6b3bad0c..3d95ba07 100644 --- a/host/libraries/libbladeRF_test/test_regression/src/main.cxx +++ b/host/libraries/libbladeRF_test/test_regression/src/main.cxx @@ -337,6 +337,7 @@ INSTANTIATE_TEST_SUITE_P(hdl, verify, TEST_HDL_COMPILE(compile) TEST_HDL_COMPILE(fx3_gpif_iq_tb) +TEST_HDL_COMPILE(fx3_gpif_iq_packed_tb) TEST_HDL_COMPILE(fx3_gpif_iq_8bit_tb) TEST_HDL_COMPILE(fx3_gpif_meta_8bit_tb) TEST_HDL_COMPILE(fx3_gpif_meta_tb) @@ -351,6 +352,10 @@ TEST_HDL_VERIFY(fx3_gpif_iq_tb, 16b01, -gENABLE_CHANNEL_0='0' -gENABLE_CHANNEL_1 TEST_HDL_VERIFY(fx3_gpif_iq_tb, 16b10, -gENABLE_CHANNEL_0='1' -gENABLE_CHANNEL_1='0', 1000); TEST_HDL_VERIFY(fx3_gpif_iq_tb, 16b11, -gENABLE_CHANNEL_0='1' -gENABLE_CHANNEL_1='1', 1000); +TEST_HDL_VERIFY(fx3_gpif_iq_packed_tb, 16b01, -gENABLE_CHANNEL_0='0' -gENABLE_CHANNEL_1='1', 1000); +TEST_HDL_VERIFY(fx3_gpif_iq_packed_tb, 16b10, -gENABLE_CHANNEL_0='1' -gENABLE_CHANNEL_1='0', 1000); +TEST_HDL_VERIFY(fx3_gpif_iq_packed_tb, 16b11, -gENABLE_CHANNEL_0='1' -gENABLE_CHANNEL_1='1', 1000); + TEST_HDL_VERIFY(fx3_gpif_packet_tb, 16b00, -gENABLE_CHANNEL_0='0' -gENABLE_CHANNEL_1='0', 1000); TEST_HDL_VERIFY(fx3_gpif_packet_tb, 16b01, -gENABLE_CHANNEL_0='0' -gENABLE_CHANNEL_1='1', 1000); TEST_HDL_VERIFY(fx3_gpif_packet_tb, 16b10, -gENABLE_CHANNEL_0='1' -gENABLE_CHANNEL_1='0', 1000); From 950189d29d424d3e7b98b96bf6a5186da81368cc Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Wed, 6 Mar 2024 14:04:45 -0600 Subject: [PATCH 139/238] hdl: fix fifo_reader packet mode dma_downcount off-by-one error --- hdl/fpga/ip/nuand/synthesis/fifo_reader.vhd | 6 ++++-- .../platforms/bladerf-micro/vhdl/tb/fx3_gpif_packet_tb.vhd | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/hdl/fpga/ip/nuand/synthesis/fifo_reader.vhd b/hdl/fpga/ip/nuand/synthesis/fifo_reader.vhd index b5077288..9c1dbf1c 100644 --- a/hdl/fpga/ip/nuand/synthesis/fifo_reader.vhd +++ b/hdl/fpga/ip/nuand/synthesis/fifo_reader.vhd @@ -211,7 +211,8 @@ begin -- Meta FIFO combinatorial process meta_fsm_comb : process( all ) - variable meta_time : unsigned(63 downto 0); + variable meta_time : unsigned(63 downto 0); + variable packet_len : integer; begin meta_future <= meta_current; @@ -254,7 +255,8 @@ begin when META_WAIT => if( packet_en = '1' ) then - meta_future.dma_downcount <= to_integer(unsigned(meta_current.meta_cache(15 downto 0))); + packet_len := to_integer(unsigned(meta_current.meta_cache(15 downto 0))); + meta_future.dma_downcount <= packet_len - 1; else meta_future.dma_downcount <= dma_buf_size - 4; end if; diff --git a/hdl/fpga/platforms/bladerf-micro/vhdl/tb/fx3_gpif_packet_tb.vhd b/hdl/fpga/platforms/bladerf-micro/vhdl/tb/fx3_gpif_packet_tb.vhd index 472ce02b..000ea508 100644 --- a/hdl/fpga/platforms/bladerf-micro/vhdl/tb/fx3_gpif_packet_tb.vhd +++ b/hdl/fpga/platforms/bladerf-micro/vhdl/tb/fx3_gpif_packet_tb.vhd @@ -700,7 +700,7 @@ begin -- Change the iq values based on blocks received -- See tx_sample_stream's encoding scheme in fx3_model.vhd - if( iq_value(7 downto 0) = tx_packet_len ) then + if( iq_value(7 downto 0) = tx_packet_len - 1 ) then iq_value := x"0000"; if( current_block_count <= BLOCKS_PER_ITERATION ) then current_block_count := current_block_count + 1; From 0b54c576e32ac5edf73d29b0a9cac8204ec0efc2 Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Fri, 8 Nov 2024 16:59:45 -0600 Subject: [PATCH 140/238] host: NULL_CHECK made variadic --- .../libbladeRF/src/board/bladerf2/common.h | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/host/libraries/libbladeRF/src/board/bladerf2/common.h b/host/libraries/libbladeRF/src/board/bladerf2/common.h index 5a88cb41..dea783d2 100644 --- a/host/libraries/libbladeRF/src/board/bladerf2/common.h +++ b/host/libraries/libbladeRF/src/board/bladerf2/common.h @@ -253,17 +253,21 @@ extern char const *bladerf2_state_to_string[4]; } while (0) /** - * @brief Null test + * @brief Null test for multiple variables * - * @param _var The variable to check + * @param ... The variables to check * - * @return RETURN_INVAL if _var is null, continues otherwise + * @return RETURN_INVAL if any var is null, continues otherwise */ -#define NULL_CHECK(_var) \ - do { \ - if (NULL == _var) { \ - RETURN_INVAL(#_var, "is null"); \ - } \ +#define NULL_CHECK(...) \ + do { \ + void *_ptrs[] = { (void*)__VA_ARGS__ }; \ + const char *_names[] = { #__VA_ARGS__ }; \ + for (size_t _i = 0; _i < sizeof(_ptrs)/sizeof(_ptrs[0]); _i++) { \ + if (NULL == _ptrs[_i]) { \ + RETURN_INVAL(_names[_i], "is null"); \ + } \ + } \ } while (0) /** From 899cd2274f96d9bb6a8c2cb41626426deada5593 Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Fri, 1 Nov 2024 20:25:52 -0500 Subject: [PATCH 141/238] libbladeRF: refactored bladerf_enable_feature These changes make it much easier to add features to libbladeRF. The nested ifs have been restructured for a switch and errors leverage the goto error. The device handle now is also null checked. The mutex lock has also been removed. Regression test passed. --- host/libraries/libbladeRF/src/bladerf.c | 53 ++++++++++++++----------- 1 file changed, 29 insertions(+), 24 deletions(-) diff --git a/host/libraries/libbladeRF/src/bladerf.c b/host/libraries/libbladeRF/src/bladerf.c index cd74b181..70570b20 100644 --- a/host/libraries/libbladeRF/src/bladerf.c +++ b/host/libraries/libbladeRF/src/bladerf.c @@ -2079,36 +2079,41 @@ int bladerf_xb300_get_output_power(struct bladerf *dev, float *val) /* Features */ /******************************************************************************/ +static const char *feature2str(bladerf_feature feature) +{ + switch (feature) { + case BLADERF_FEATURE_DEFAULT: return "DEFAULT"; + case BLADERF_FEATURE_OVERSAMPLE: return "OVERSAMPLE"; + default: return "UNKNOWN FEATURE"; + } +} + +static int validate_board_compatibility(const char *board_name, bladerf_feature feature) +{ + if (strcmp(board_name, "bladerf2") != 0 && feature == BLADERF_FEATURE_OVERSAMPLE) { + log_error("BladeRF2 required for %s feature\n", feature2str(feature)); + return BLADERF_ERR_UNSUPPORTED; + } + return 0; +} + int bladerf_enable_feature(struct bladerf *dev, bladerf_feature feature, bool enable) { - int status; - MUTEX_LOCK(&dev->lock); + log_verbose("%s feature %s\n", enable ? "Enabling" : "Disabling", feature2str(feature)); + int status = 0; + CHECK_NULL(dev); - status = 0; + const char *board_name = bladerf_get_board_name(dev); - if(feature == BLADERF_FEATURE_DEFAULT) { - dev->feature = 0; - } else { - if(feature == BLADERF_FEATURE_OVERSAMPLE) { - if (strcmp(bladerf_get_board_name(dev), "bladerf2") != 0) { - log_error("BladeRF2 required for OVERSAMPLE feature\n"); - status = BLADERF_ERR_UNSUPPORTED; - } - } else { - /* Unknown / Unsupported feature */ - status = BLADERF_ERR_UNSUPPORTED; - } - - if (status == 0) { - if (enable) { - dev->feature |= feature; - } else { - dev->feature &= ~feature; - } - } + if (enable == false) { + dev->feature = BLADERF_FEATURE_DEFAULT; + return 0; } - MUTEX_UNLOCK(&dev->lock); + CHECK_STATUS(validate_board_compatibility(board_name, feature)); + dev->feature = feature; + +error: return status; } From bfadb91e065cbd62b2deda7248da32653150e792 Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Wed, 6 Nov 2024 14:03:49 -0600 Subject: [PATCH 142/238] libbladeRF: fixed rx meta packet timestamp and flags assignment --- host/libraries/libbladeRF/src/streaming/sync.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/host/libraries/libbladeRF/src/streaming/sync.c b/host/libraries/libbladeRF/src/streaming/sync.c index 94d29a45..32d58813 100644 --- a/host/libraries/libbladeRF/src/streaming/sync.c +++ b/host/libraries/libbladeRF/src/streaming/sync.c @@ -779,8 +779,10 @@ int sync_rx(struct bladerf_sync *s, void *samples, unsigned num_samples, buf_src = (uint8_t*)b->buffers[b->cons_i]; - pkt_len_dwords = metadata_get_packet_len(buf_src); + user_meta->flags = metadata_get_packet_flags(buf_src); + user_meta->timestamp = metadata_get_timestamp(buf_src); + pkt_len_dwords = metadata_get_packet_len(buf_src); if (pkt_len_dwords > 0) { samples_returned += num_samples; user_meta->actual_count = pkt_len_dwords; From b086beee7e940464ef174b1c9d4c04977ad60222 Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Wed, 18 Dec 2024 13:31:19 -0600 Subject: [PATCH 143/238] libbladeRF: added error print for set frequencies out of range --- host/libraries/libbladeRF/src/board/bladerf2/rfic_host.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/host/libraries/libbladeRF/src/board/bladerf2/rfic_host.c b/host/libraries/libbladeRF/src/board/bladerf2/rfic_host.c index 7cccbe67..202f3a33 100644 --- a/host/libraries/libbladeRF/src/board/bladerf2/rfic_host.c +++ b/host/libraries/libbladeRF/src/board/bladerf2/rfic_host.c @@ -443,6 +443,8 @@ static int _rfic_host_set_frequency(struct bladerf *dev, CHECK_STATUS(dev->board->get_frequency_range(dev, ch, &range)); if (!is_within_range(range, frequency)) { + log_error("Frequency out of range [%0.2f MHz, %0.2f MHz]: %f MHz\n", + range->min/1e6, range->max/1e6, frequency/1e6); return BLADERF_ERR_RANGE; } From 9db41c9faf69eee7a5f53c29603041619fec7d1e Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Thu, 30 Jan 2025 16:34:26 -0600 Subject: [PATCH 144/238] hdl: optimized sc16q11 packed cycle calculation Alleviates timing violations from resources allocated by the calibration signal IP. --- hdl/fpga/ip/nuand/synthesis/fifo_reader.vhd | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/hdl/fpga/ip/nuand/synthesis/fifo_reader.vhd b/hdl/fpga/ip/nuand/synthesis/fifo_reader.vhd index 9c1dbf1c..e62d8d39 100644 --- a/hdl/fpga/ip/nuand/synthesis/fifo_reader.vhd +++ b/hdl/fpga/ip/nuand/synthesis/fifo_reader.vhd @@ -146,7 +146,7 @@ architecture simple of fifo_reader is -- Highly packed mode signals packed_buffer : std_logic_vector(47 downto 0); - packed_cycle : integer range 0 to 3; + packed_cycle : integer range 0 to 4; end record; constant FIFO_FSM_RESET_VALUE : fifo_fsm_t := ( @@ -648,9 +648,10 @@ begin fifo_future.fifo_read <= read_req and fifo_current.eight_bit_sample_sel; fifo_future.eight_bit_sample_sel <= not fifo_current.eight_bit_sample_sel; elsif (highly_packed_mode_en = '1' and NUM_STREAMS = 2) then - fifo_future.packed_cycle <= (fifo_current.packed_cycle + 1) mod 4; + fifo_future.packed_cycle <= (fifo_current.packed_cycle + 1); fifo_future.packed_buffer <= fifo_data(fifo_data'high downto fifo_data'high-47); - if read_req = '1' and fifo_current.packed_cycle = 3 then + if fifo_current.packed_cycle = 3 then + fifo_future.packed_cycle <= 0; fifo_future.fifo_read <= '0'; end if; end if; From 3a11ac3b39bbad0d0688a6251bde2494ef4b634b Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Thu, 24 Oct 2024 14:26:35 -0500 Subject: [PATCH 145/238] hdl: fix fifo reader meta_p_time conditional violation The conditional that moves the meta state to META_DOWNCOUNT contains a max value check using the `val+1=0` idiom. We can remove the carry propagation delay by comparing against a max value constant assigned (others => '1'). The fixes a setup time violation. --- hdl/fpga/ip/nuand/synthesis/fifo_reader.vhd | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hdl/fpga/ip/nuand/synthesis/fifo_reader.vhd b/hdl/fpga/ip/nuand/synthesis/fifo_reader.vhd index e62d8d39..b2d78523 100644 --- a/hdl/fpga/ip/nuand/synthesis/fifo_reader.vhd +++ b/hdl/fpga/ip/nuand/synthesis/fifo_reader.vhd @@ -75,6 +75,7 @@ architecture simple of fifo_reader is constant DMA_BUF_SIZE_SS : natural := GPIF_BUF_SIZE_SS; constant DMA_BUF_SIZE_HS : natural := GPIF_BUF_SIZE_HS; + constant MAX_TIMESTAMP : unsigned(timestamp'high downto timestamp'low) := (others => '1'); signal dma_buf_size : natural range DMA_BUF_SIZE_HS to DMA_BUF_SIZE_SS := DMA_BUF_SIZE_SS; signal underflow_detected : std_logic := '0'; @@ -261,7 +262,7 @@ begin meta_future.dma_downcount <= dma_buf_size - 4; end if; - if( (timestamp >= meta_current.meta_p_time or meta_current.meta_p_time + 1 = 0) + if( (timestamp >= meta_current.meta_p_time or meta_current.meta_p_time = MAX_TIMESTAMP) and ( packet_en = '0' or ( packet_en = '1' and packet_ready = '1' ) ) ) then meta_future.meta_time_go <= '1'; meta_future.state <= META_DOWNCOUNT; From e8ec849ee7b191fcf847cf15615e69417feec0b3 Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Thu, 6 Feb 2025 14:19:32 -0600 Subject: [PATCH 146/238] nios: fix missing break for BLADE_USB_CMD_QUERY_FPGA_SOURCE --- fx3_firmware/src/bladeRF.c | 1 + 1 file changed, 1 insertion(+) diff --git a/fx3_firmware/src/bladeRF.c b/fx3_firmware/src/bladeRF.c index 0a29e2f6..757fb8f3 100644 --- a/fx3_firmware/src/bladeRF.c +++ b/fx3_firmware/src/bladeRF.c @@ -468,6 +468,7 @@ CyBool_t NuandHandleVendorRequest( case BLADE_USB_CMD_QUERY_FPGA_SOURCE: ret = (unsigned int)NuandGetFpgaConfigSource(); CyU3PUsbSendRetCode(ret); + break; case BLADE_USB_CMD_SET_LOOPBACK: NuandRFLinkLoopBack(wValue); From 3614c2ccc5b59a202626b185cbdcda6fbf7d0c36 Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Fri, 7 Feb 2025 17:36:39 -0600 Subject: [PATCH 147/238] hdl: fixed late exit from TX meta down count state The expected two cycle passing between meta write and idle states is independent of the number of streams. Specifically addresses an off-by-one timestamp error with the bladeRF 1.0. --- hdl/fpga/ip/nuand/synthesis/fifo_reader.vhd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hdl/fpga/ip/nuand/synthesis/fifo_reader.vhd b/hdl/fpga/ip/nuand/synthesis/fifo_reader.vhd index b2d78523..c7666501 100644 --- a/hdl/fpga/ip/nuand/synthesis/fifo_reader.vhd +++ b/hdl/fpga/ip/nuand/synthesis/fifo_reader.vhd @@ -278,7 +278,7 @@ begin if( fifo_current.fifo_read = '1') then meta_future.dma_downcount <= meta_current.dma_downcount - NUM_STREAMS; end if; - if( meta_current.dma_downcount <= NUM_STREAMS ) then + if( meta_current.dma_downcount <= 2 ) then -- Look for 2 because of the 2 cycles passing -- through META_LOAD and META_WAIT after this. meta_future.state <= META_LOAD; From 730094891d4ca022cdd3203b92f5b6666968f4fb Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Fri, 7 Feb 2025 17:42:26 -0600 Subject: [PATCH 148/238] hdl: fixed TX meta sample gap every gpif len when timestamp is META NOW --- hdl/fpga/ip/nuand/synthesis/fifo_reader.vhd | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hdl/fpga/ip/nuand/synthesis/fifo_reader.vhd b/hdl/fpga/ip/nuand/synthesis/fifo_reader.vhd index c7666501..1ce256c0 100644 --- a/hdl/fpga/ip/nuand/synthesis/fifo_reader.vhd +++ b/hdl/fpga/ip/nuand/synthesis/fifo_reader.vhd @@ -212,6 +212,7 @@ begin -- Meta FIFO combinatorial process meta_fsm_comb : process( all ) + constant META_NOW : unsigned(63 downto 0) := (others => '1'); variable meta_time : unsigned(63 downto 0); variable packet_len : integer; begin @@ -243,7 +244,7 @@ begin (packet_en = '1' and packet_ready = '1') ) ) then meta_future.meta_read <= '1'; meta_future.state <= META_WAIT; - if( packet_en = '1' or meta_current.meta_p_time_r /= timestamp ) then + if( packet_en = '1' or (meta_current.meta_p_time_r > timestamp and meta_current.meta_p_time_r /= META_NOW) ) then meta_future.meta_time_go <= '0'; else meta_future.meta_time_go <= '1'; From f788085819b5cc238e5a3afeb5b8bcd50129f5b4 Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Mon, 10 Feb 2025 15:34:31 -0600 Subject: [PATCH 149/238] hdl: fixed tx sample fifo reset false path assigns for x40 & x115 builds --- hdl/fpga/platforms/bladerf/constraints/bladerf.sdc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hdl/fpga/platforms/bladerf/constraints/bladerf.sdc b/hdl/fpga/platforms/bladerf/constraints/bladerf.sdc index bcdd65af..1354cd04 100644 --- a/hdl/fpga/platforms/bladerf/constraints/bladerf.sdc +++ b/hdl/fpga/platforms/bladerf/constraints/bladerf.sdc @@ -105,8 +105,8 @@ set_output_delay -clock [get_clocks altera_reserved_tck] 20 [get_ports altera_re # Exceptions # The dcfifo which goes from the C4 TX domain to the PCLK domain seems to have an issue with the clear signal. It isn't generally a issue so ignore it? -set_false_path -from {reset_synchronizer:U_tx_reset|sync} -to {tx_*fifo:U_tx_*_fifo|common_dcfifo:U_common_dcfifo|dcfifo*:auto_generated|dffpipe_3dc:wraclr|dffe12a[0]} -set_false_path -from {reset_synchronizer:U_tx_reset|sync} -to {tx_*fifo:U_tx_*_fifo|common_dcfifo:U_common_dcfifo|dcfifo*:auto_generated|dffpipe_3dc:wraclr|dffe13a[0]} +set_false_path -from {reset_synchronizer:U_tx_reset|sync} -to {tx_*fifo:U_tx_*_fifo|common_dcfifo:U_common_dcfifo|dcfifo*:auto_generated|dffpipe_3dc:wraclr|dffe*a[0]} +set_false_path -from {reset_synchronizer:U_tx_reset|sync} -to {tx_*fifo:U_tx_*_fifo|common_dcfifo:U_common_dcfifo|dcfifo*:auto_generated|dffpipe_3dc:wraclr|dffe*a[0]} # False path between hold_time and compare_time due to the way the FSM is setup set_false_path -from {*x_tamer|hold_time[*]} -to {*x_tamer|compare_time[*]} From cc6f329bb892d9571bf5fa47ed2d508c2e441f24 Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Fri, 21 Feb 2025 11:55:53 -0600 Subject: [PATCH 150/238] hdl: refactor RX/TX DMA request prioritization * fixed TX deadlock when RX requests are not executed * simplified RX and TX request prioritization --- .../common/bladerf/vhdl/fx3_gpif.vhd | 53 ++++++++++--------- 1 file changed, 29 insertions(+), 24 deletions(-) diff --git a/hdl/fpga/platforms/common/bladerf/vhdl/fx3_gpif.vhd b/hdl/fpga/platforms/common/bladerf/vhdl/fx3_gpif.vhd index bfdad067..e5a38860 100644 --- a/hdl/fpga/platforms/common/bladerf/vhdl/fx3_gpif.vhd +++ b/hdl/fpga/platforms/common/bladerf/vhdl/fx3_gpif.vhd @@ -179,8 +179,8 @@ architecture sample_shuffler of fx3_gpif is signal current, future : fsm_t := FSM_RESET_VALUE; - signal can_rx, should_rx : boolean; - signal can_tx, should_tx : boolean; + signal can_rx : boolean; + signal can_tx : boolean; signal rx_fifo_enough : boolean; signal tx_fifo_enough : boolean; signal rx_fifo_critical : boolean; @@ -192,14 +192,10 @@ architecture sample_shuffler of fx3_gpif is attribute preserve : boolean; attribute preserve of can_rx : signal is true; attribute preserve of can_tx : signal is true; - attribute preserve of should_rx : signal is true; - attribute preserve of should_tx : signal is true; attribute keep : boolean; attribute keep of can_rx : signal is true; attribute keep of can_tx : signal is true; - attribute keep of should_rx : signal is true; - attribute keep of should_tx : signal is true; -- acknowledge(dma_channel) returns a dma_handshake_t with all bits 0 -- except the bit corresponding to dma_channel @@ -337,22 +333,28 @@ begin end if; end process gpif_mux; - -- Arbitrate RX and TX requests - -- In the event the FX3 simultaneously requests RX and TX, we generally - -- prioritize the TX first; this helps avoid discontinuities on the TX - -- signal. However, if RX is about to overflow, we'll choose that. can_and_should : process(pclk, reset) + variable rx_dma_req : boolean; + variable tx_dma_req : boolean; + variable rx_meta_ok : boolean; begin if (reset = '1') then can_rx <= false; can_tx <= false; - should_rx <= false; - should_tx <= false; elsif (rising_edge(pclk)) then - can_rx <= dma_rx_enable = '1' and rx_fifo_enough and (dma_req.rx0 = '1' or dma_req.rx1 = '1'); - can_tx <= dma_tx_enable = '1' and tx_fifo_enough and (dma_req.tx2 = '1' or dma_req.tx3 = '1'); - should_rx <= can_rx and (not can_tx or rx_fifo_critical); - should_tx <= can_tx and not rx_fifo_critical; + rx_dma_req := dma_req.rx0 = '1' or dma_req.rx1 = '1'; + rx_meta_ok := meta_enable = '1' nand rx_meta_fifo_empty = '1'; + + can_rx <= dma_rx_enable = '1' and + rx_fifo_enough and + rx_dma_req and + rx_meta_ok; + + tx_dma_req := dma_req.tx2 = '1' or dma_req.tx3 = '1'; + + can_tx <= dma_tx_enable = '1' and + tx_fifo_enough and + tx_dma_req; end if; end process; @@ -408,21 +410,24 @@ begin future.fini_downcount <= FINI_DOWNCOUNT_RESET; future.finishing_rx <= '0'; + -- Arbitrate RX and TX requests + -- In the event the FX3 simultaneously requests RX and TX, we generally + -- prioritize the TX first; this helps avoid discontinuities on the TX + -- signal. However, if RX is about to overflow, we'll choose that. if (current.dma_idle = '1') then - if (should_rx and ( (rx_meta_fifo_empty = '0' and current.rx_meta_en = '1') - or (current.rx_meta_en = '0') ) ) then - -- There is an RX to perform (sending data to FX3). + future.dma_downcount <= gpif_buf_size-1; + if (can_rx and rx_fifo_critical) then future.ack_downcount <= ACK_DOWNCOUNT_READ; - future.dma_downcount <= gpif_buf_size-1; future.rx_current_dma <= RX0; future.state <= SETUP_RD; - - elsif (should_tx) then - -- There is a TX to perform (getting data from FX3). + elsif (can_tx) then future.ack_downcount <= ACK_DOWNCOUNT_WRITE; - future.dma_downcount <= gpif_buf_size-1; future.tx_current_dma <= TX3; future.state <= SETUP_WR; + elsif (can_rx) then + future.ack_downcount <= ACK_DOWNCOUNT_READ; + future.rx_current_dma <= RX0; + future.state <= SETUP_RD; end if; end if; From d586de33c1f757be69543498d72df6d197c9b63f Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Mon, 3 Mar 2025 14:20:37 -0600 Subject: [PATCH 151/238] libbladeRF: added legacy GPIF buffer size support for FW < v2.5.0 --- host/libraries/libbladeRF/src/backend/usb/usb.h | 17 +++++++++++++++++ .../libbladeRF/src/board/bladerf1/bladerf1.c | 14 ++++++++++++++ .../libbladeRF/src/board/bladerf2/bladerf2.c | 15 +++++++++++++++ 3 files changed, 46 insertions(+) diff --git a/host/libraries/libbladeRF/src/backend/usb/usb.h b/host/libraries/libbladeRF/src/backend/usb/usb.h index 80e9b7a3..df4bf873 100644 --- a/host/libraries/libbladeRF/src/backend/usb/usb.h +++ b/host/libraries/libbladeRF/src/backend/usb/usb.h @@ -63,6 +63,23 @@ extern bool bladerf_usb_reset_device_on_open; /* Size of a host<->FPGA message in BYTES */ #define USB_MSG_SIZE_SS 8192 #define USB_MSG_SIZE_HS 4096 +#define USB_MSG_SIZE_SS_LEGACY 2048 +#define USB_MSG_SIZE_HS_LEGACY 1024 + + +static const struct bladerf_version FW_LARGER_BUFFER_VERSION = { + .major = 2, + .minor = 5, + .patch = 0, + .describe = NULL +}; + +static const struct bladerf_version FPGA_LARGER_BUFFER_VERSION = { + .major = 0, + .minor = 16, + .patch = 0, + .describe = NULL +}; typedef enum { USB_TARGET_DEVICE, diff --git a/host/libraries/libbladeRF/src/board/bladerf1/bladerf1.c b/host/libraries/libbladeRF/src/board/bladerf1/bladerf1.c index 01a525aa..4d1f63b7 100644 --- a/host/libraries/libbladeRF/src/board/bladerf1/bladerf1.c +++ b/host/libraries/libbladeRF/src/board/bladerf1/bladerf1.c @@ -814,6 +814,7 @@ static int bladerf1_open(struct bladerf *dev, struct bladerf_devinfo *devinfo) struct bladerf1_board_data *board_data; struct bladerf_version required_fw_version; bladerf_dev_speed usb_speed; + bool use_legacy_msg_size = false; char filename[FILENAME_MAX]; char *full_path; int status; @@ -899,13 +900,19 @@ static int bladerf1_open(struct bladerf *dev, struct bladerf_devinfo *devinfo) log_debug("Failed to get device speed: %s\n", bladerf_strerror(status)); return status; } + + use_legacy_msg_size = version_less_than(&board_data->fw_version, &FW_LARGER_BUFFER_VERSION); switch (usb_speed) { case BLADERF_DEVICE_SPEED_SUPER: board_data->msg_size = USB_MSG_SIZE_SS; + if (use_legacy_msg_size) + board_data->msg_size = USB_MSG_SIZE_SS_LEGACY; break; case BLADERF_DEVICE_SPEED_HIGH: board_data->msg_size = USB_MSG_SIZE_HS; + if (use_legacy_msg_size) + board_data->msg_size = USB_MSG_SIZE_HS_LEGACY; break; default: @@ -913,6 +920,13 @@ static int bladerf1_open(struct bladerf *dev, struct bladerf_devinfo *devinfo) return BLADERF_ERR_UNEXPECTED; } + log_debug("Size of a host<->FPGA message: %zu bytes\n", board_data->msg_size); + if (use_legacy_msg_size) { + log_warning("Using legacy message size. Consider upgrading firmware >= v%u.%u.%u and fpga >= v%u.%u.%u\n", + FW_LARGER_BUFFER_VERSION.major, FW_LARGER_BUFFER_VERSION.minor, FW_LARGER_BUFFER_VERSION.patch, + FPGA_LARGER_BUFFER_VERSION.major, FPGA_LARGER_BUFFER_VERSION.minor, FPGA_LARGER_BUFFER_VERSION.patch); + } + /* Verify that we have a sufficent firmware version before continuing. */ status = version_check_fw(&bladerf1_fw_compat_table, &board_data->fw_version, &required_fw_version); diff --git a/host/libraries/libbladeRF/src/board/bladerf2/bladerf2.c b/host/libraries/libbladeRF/src/board/bladerf2/bladerf2.c index c6961ec5..75eae769 100644 --- a/host/libraries/libbladeRF/src/board/bladerf2/bladerf2.c +++ b/host/libraries/libbladeRF/src/board/bladerf2/bladerf2.c @@ -254,6 +254,7 @@ static int bladerf2_open(struct bladerf *dev, struct bladerf_devinfo *devinfo) struct bladerf_version required_fw_version; char *full_path; bladerf_dev_speed usb_speed; + bool use_legacy_msg_size = false; size_t i; int ready, status; @@ -324,19 +325,33 @@ static int bladerf2_open(struct bladerf *dev, struct bladerf_devinfo *devinfo) /* Determine data message size */ CHECK_STATUS(dev->backend->get_device_speed(dev, &usb_speed)); + use_legacy_msg_size = version_less_than(&board_data->fw_version, &FW_LARGER_BUFFER_VERSION); switch (usb_speed) { case BLADERF_DEVICE_SPEED_SUPER: board_data->msg_size = USB_MSG_SIZE_SS; + if (use_legacy_msg_size) + board_data->msg_size = USB_MSG_SIZE_SS_LEGACY; break; + case BLADERF_DEVICE_SPEED_HIGH: board_data->msg_size = USB_MSG_SIZE_HS; + if (use_legacy_msg_size) + board_data->msg_size = USB_MSG_SIZE_HS_LEGACY; break; + default: log_error("%s: unsupported device speed (%d)\n", __FUNCTION__, usb_speed); return BLADERF_ERR_UNSUPPORTED; } + log_debug("Size of a host<->FPGA message: %zu bytes\n", board_data->msg_size); + if (use_legacy_msg_size) { + log_warning("Using legacy message size. Consider upgrading firmware >= v%u.%u.%u and fpga >= v%u.%u.%u\n", + FW_LARGER_BUFFER_VERSION.major, FW_LARGER_BUFFER_VERSION.minor, FW_LARGER_BUFFER_VERSION.patch, + FPGA_LARGER_BUFFER_VERSION.major, FPGA_LARGER_BUFFER_VERSION.minor, FPGA_LARGER_BUFFER_VERSION.patch); + } + /* Verify that we have a sufficent firmware version before continuing. */ status = version_check_fw(&bladerf2_fw_compat_table, &board_data->fw_version, &required_fw_version); From 0b00acac09b1c8982140120d6df934dd5449798d Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Mon, 3 Mar 2025 16:12:31 -0600 Subject: [PATCH 152/238] libbladeRF: error on GPIF buffer size mismatch between FX3 and HDL While retaining the original non-fail condition for mismatches, we throw an error for FPGA and FX3 images that have incompatible buffer sizes. This prevents operational issues when mixing firmware versions that support larger USB transfer buffers with FPGA versions that don't, and vice versa. --- .../libbladeRF/src/board/bladerf1/bladerf1.c | 14 ++++++++++++-- .../libbladeRF/src/board/bladerf2/bladerf2.c | 14 ++++++++++++-- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/host/libraries/libbladeRF/src/board/bladerf1/bladerf1.c b/host/libraries/libbladeRF/src/board/bladerf1/bladerf1.c index 4d1f63b7..8a30f767 100644 --- a/host/libraries/libbladeRF/src/board/bladerf1/bladerf1.c +++ b/host/libraries/libbladeRF/src/board/bladerf1/bladerf1.c @@ -576,7 +576,7 @@ static int bladerf1_initialize(struct bladerf *dev) if (status < 0) { #if LOGGING_ENABLED if (status == BLADERF_ERR_UPDATE_FPGA) { - log_warning("FPGA v%u.%u.%u was detected. Firmware v%u.%u.%u " + log_error("FPGA v%u.%u.%u was detected. Firmware v%u.%u.%u " "requires FPGA v%u.%u.%u or later. Please load a " "different FPGA version before continuing.\n\n", board_data->fpga_version.major, @@ -589,7 +589,7 @@ static int bladerf1_initialize(struct bladerf *dev) required_fpga_version.minor, required_fpga_version.patch); } else if (status == BLADERF_ERR_UPDATE_FW) { - log_warning("FPGA v%u.%u.%u was detected, which requires firmware " + log_error("FPGA v%u.%u.%u was detected, which requires firmware " "v%u.%u.%u or later. The device firmware is currently " "v%u.%u.%u. Please upgrade the device firmware before " "continuing.\n\n", @@ -604,6 +604,16 @@ static int bladerf1_initialize(struct bladerf *dev) board_data->fw_version.patch); } #endif + + if (version_greater_or_equal(&board_data->fw_version, &FW_LARGER_BUFFER_VERSION) && + version_less_than(&board_data->fpga_version, &FPGA_LARGER_BUFFER_VERSION)) { + return BLADERF_ERR_UPDATE_FPGA; + } + + if (version_greater_or_equal(&board_data->fpga_version, &FPGA_LARGER_BUFFER_VERSION) && + version_less_than(&board_data->fw_version, &FW_LARGER_BUFFER_VERSION)) { + return BLADERF_ERR_UPDATE_FW; + } } /* Detect AGC FPGA bug and report warning */ diff --git a/host/libraries/libbladeRF/src/board/bladerf2/bladerf2.c b/host/libraries/libbladeRF/src/board/bladerf2/bladerf2.c index 75eae769..3ba901fb 100644 --- a/host/libraries/libbladeRF/src/board/bladerf2/bladerf2.c +++ b/host/libraries/libbladeRF/src/board/bladerf2/bladerf2.c @@ -143,7 +143,7 @@ static int _bladerf2_initialize(struct bladerf *dev) if (status < 0) { #if LOGGING_ENABLED if (BLADERF_ERR_UPDATE_FPGA == status) { - log_warning( + log_error( "FPGA v%u.%u.%u was detected. Firmware v%u.%u.%u " "requires FPGA v%u.%u.%u or later. Please load a " "different FPGA version before continuing.\n\n", @@ -153,7 +153,7 @@ static int _bladerf2_initialize(struct bladerf *dev) required_fpga_version.major, required_fpga_version.minor, required_fpga_version.patch); } else if (BLADERF_ERR_UPDATE_FW == status) { - log_warning( + log_error( "FPGA v%u.%u.%u was detected, which requires firmware " "v%u.%u.%u or later. The device firmware is currently " "v%u.%u.%u. Please upgrade the device firmware before " @@ -165,6 +165,16 @@ static int _bladerf2_initialize(struct bladerf *dev) board_data->fw_version.patch); } #endif + + if (version_greater_or_equal(&board_data->fw_version, &FW_LARGER_BUFFER_VERSION) && + version_less_than(&board_data->fpga_version, &FPGA_LARGER_BUFFER_VERSION)) { + return BLADERF_ERR_UPDATE_FPGA; + } + + if (version_greater_or_equal(&board_data->fpga_version, &FPGA_LARGER_BUFFER_VERSION) && + version_less_than(&board_data->fw_version, &FW_LARGER_BUFFER_VERSION)) { + return BLADERF_ERR_UPDATE_FW; + } } /* Set FPGA packet protocol */ From 0917d0780b8dc58fce0a51799404f6f48461d4e4 Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Tue, 4 Mar 2025 15:58:22 -0600 Subject: [PATCH 153/238] libbladeRF: support for smaller GPIF buffer FPGA and FX3 versions --- .../libbladeRF/src/streaming/async.c | 22 ++++++++++-- .../libraries/libbladeRF/src/streaming/sync.c | 35 +++++++++++++++---- 2 files changed, 49 insertions(+), 8 deletions(-) diff --git a/host/libraries/libbladeRF/src/streaming/async.c b/host/libraries/libbladeRF/src/streaming/async.c index 1eee58d4..50769a76 100644 --- a/host/libraries/libbladeRF/src/streaming/async.c +++ b/host/libraries/libbladeRF/src/streaming/async.c @@ -44,6 +44,8 @@ int async_init_stream(struct bladerf_stream **stream, { struct bladerf_stream *lstream; size_t buffer_size_bytes; + size_t gpif_buffer_size = USB_MSG_SIZE_SS; + struct bladerf_version fx3_version = FW_LARGER_BUFFER_VERSION; size_t i; int status = 0; @@ -52,10 +54,26 @@ int async_init_stream(struct bladerf_stream **stream, return BLADERF_ERR_INVAL; } + status = dev->board->get_fw_version(dev, &fx3_version); + if (status != 0) { + log_error("Failed to get FX3 firmware version: %s\n", + bladerf_strerror(status)); + return status; + } + + if (fx3_version.major <= FW_LARGER_BUFFER_VERSION.major && + fx3_version.minor < FW_LARGER_BUFFER_VERSION.minor) { + gpif_buffer_size = USB_MSG_SIZE_SS_LEGACY; + } + + log_debug("FX3 firmware %u.%u.%u GPIF buffer size: %zu%s\n", + fx3_version.major, fx3_version.minor, fx3_version.patch, + gpif_buffer_size, gpif_buffer_size == USB_MSG_SIZE_SS_LEGACY ? " (legacy)" : ""); + buffer_size_bytes = samples_to_bytes(format, samples_per_buffer); - if (buffer_size_bytes < USB_MSG_SIZE_SS || buffer_size_bytes % USB_MSG_SIZE_SS != 0) { + if (buffer_size_bytes < gpif_buffer_size || buffer_size_bytes % gpif_buffer_size != 0) { log_error("Samples_per_buffer must be multiples of %u\n", - bytes_to_samples(format, USB_MSG_SIZE_SS)); + bytes_to_samples(format, gpif_buffer_size)); return BLADERF_ERR_INVAL; } diff --git a/host/libraries/libbladeRF/src/streaming/sync.c b/host/libraries/libbladeRF/src/streaming/sync.c index 32d58813..7f5e4155 100644 --- a/host/libraries/libbladeRF/src/streaming/sync.c +++ b/host/libraries/libbladeRF/src/streaming/sync.c @@ -39,6 +39,7 @@ #include "board/board.h" #include "helpers/timeout.h" #include "helpers/have_cap.h" +#include "backend/usb/usb.h" #ifdef ENABLE_LIBBLADERF_SYNC_LOG_VERBOSE static inline void dump_buf_states(struct bladerf_sync *s) @@ -142,7 +143,9 @@ int sync_init(struct bladerf_sync *sync, int status = 0; size_t i, bytes_per_sample; size_t bytes_per_buffer; - const size_t GPIF_BUF_SIZE = 8192; + size_t gpif_buffer_size = USB_MSG_SIZE_SS; + size_t valid_buffer_size = gpif_buffer_size; + struct bladerf_version fx3_version = FW_LARGER_BUFFER_VERSION; if (num_transfers >= num_buffers) { return BLADERF_ERR_INVAL; @@ -170,15 +173,35 @@ int sync_init(struct bladerf_sync *sync, } } + status = dev->board->get_fw_version(dev, &fx3_version); + if (status != 0) { + log_error("Failed to get FX3 firmware version: %s\n", + bladerf_strerror(status)); + return status; + } + + if (fx3_version.major <= FW_LARGER_BUFFER_VERSION.major && + fx3_version.minor < FW_LARGER_BUFFER_VERSION.minor) { + gpif_buffer_size = USB_MSG_SIZE_SS_LEGACY; + } + + log_debug("FX3 firmware %u.%u.%u GPIF buffer size: %zu%s\n", + fx3_version.major, fx3_version.minor, fx3_version.patch, + gpif_buffer_size, gpif_buffer_size == USB_MSG_SIZE_SS_LEGACY ? " (legacy)" : ""); + + if (format == BLADERF_FORMAT_SC16_Q11_PACKED) { + valid_buffer_size = 3*gpif_buffer_size; + } + bytes_per_sample = samples_to_bytes(format, 1); bytes_per_buffer = samples_to_bytes(format, buffer_size); - if (bytes_per_buffer < GPIF_BUF_SIZE || bytes_per_buffer % GPIF_BUF_SIZE != 0) { + if (bytes_per_buffer < valid_buffer_size || bytes_per_buffer % valid_buffer_size != 0) { size_t original_size = buffer_size; - /* Round up to the next multiple of GPIF_BUF_SIZE, ensuring at least one GPIF buffer */ - buffer_size = bytes_per_buffer == 0 ? GPIF_BUF_SIZE / bytes_per_sample : - ((bytes_per_buffer + GPIF_BUF_SIZE - 1) / GPIF_BUF_SIZE) - * (GPIF_BUF_SIZE / bytes_per_sample); + /* Round up to the next multiple of valid_buffer_size, ensuring at least one GPIF buffer */ + buffer_size = bytes_per_buffer == 0 ? valid_buffer_size / bytes_per_sample : + ((bytes_per_buffer + valid_buffer_size - 1) / valid_buffer_size) + * (valid_buffer_size / bytes_per_sample); log_warning("Requested buffer size %zu samples (%zu bytes) is invalid. " "Adjusting to %zu samples (%zu bytes).\n", From 2d2904e8809ba404d784a93e0f5bed0cebc910d8 Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Fri, 7 Mar 2025 11:42:30 -0600 Subject: [PATCH 154/238] libbladeRF: added bladerf_format_to_string function --- .../libraries/libbladeRF/include/libbladeRF.h | 10 +++++++++ host/libraries/libbladeRF/src/bladerf.c | 22 +++++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/host/libraries/libbladeRF/include/libbladeRF.h b/host/libraries/libbladeRF/include/libbladeRF.h index ce3f563c..3524f50b 100644 --- a/host/libraries/libbladeRF/include/libbladeRF.h +++ b/host/libraries/libbladeRF/include/libbladeRF.h @@ -2343,6 +2343,16 @@ typedef enum { BLADERF_FORMAT_SC8_Q7_META, } bladerf_format; +/** + * Convert a sample format to a string suitable for printing + * + * @param format Format to convert to string + * + * @return The string representation of the format + */ +API_EXPORT +const char * CALL_CONV bladerf_format_to_string(bladerf_format format); + /** * @defgroup STREAMING_FORMAT_METADATA Metadata structure and flags * diff --git a/host/libraries/libbladeRF/src/bladerf.c b/host/libraries/libbladeRF/src/bladerf.c index 70570b20..8294caea 100644 --- a/host/libraries/libbladeRF/src/bladerf.c +++ b/host/libraries/libbladeRF/src/bladerf.c @@ -1787,6 +1787,28 @@ int bladerf_lock_otp(struct bladerf *dev) /* Helpers & Miscellaneous */ /******************************************************************************/ +const char * bladerf_format_to_string(bladerf_format format) +{ + switch (format) { + case BLADERF_FORMAT_SC8_Q7: + return "BLADERF_FORMAT_SC8_Q7"; + case BLADERF_FORMAT_SC8_Q7_META: + return "BLADERF_FORMAT_SC8_Q7_META"; + case BLADERF_FORMAT_SC16_Q11_PACKED: + return "BLADERF_FORMAT_SC16_Q11_PACKED"; + case BLADERF_FORMAT_SC16_Q11: + return "BLADERF_FORMAT_SC16_Q11"; + case BLADERF_FORMAT_SC16_Q11_META: + return "BLADERF_FORMAT_SC16_Q11_META"; + case BLADERF_FORMAT_PACKET_META: + return "BLADERF_FORMAT_PACKET_META"; + + default: + assert(!"Invalid format"); + return "UNKNOWN"; + } +} + const char *bladerf_strerror(int error) { switch (error) { From 72db17fa2cea6b4ce7bb2865c7709d00dcca55e8 Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Tue, 18 Mar 2025 15:48:15 -0500 Subject: [PATCH 155/238] libbladeRF: fix packet format async stream to bytes This fixes the sync interface packet format misalignment when sync config assumes the sync config buffer is in bytes. --- host/libraries/libbladeRF/src/backend/usb/cyapi.c | 4 ++-- host/libraries/libbladeRF/src/backend/usb/libusb.c | 4 ++-- host/libraries/libbladeRF/src/streaming/async.h | 2 -- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/host/libraries/libbladeRF/src/backend/usb/cyapi.c b/host/libraries/libbladeRF/src/backend/usb/cyapi.c index 48bef435..85d63ff8 100644 --- a/host/libraries/libbladeRF/src/backend/usb/cyapi.c +++ b/host/libraries/libbladeRF/src/backend/usb/cyapi.c @@ -655,7 +655,7 @@ static int cyapi_stream(void *driver, struct bladerf_stream *stream, if ((stream->layout & BLADERF_DIRECTION_MASK) == BLADERF_TX && stream->format == BLADERF_FORMAT_PACKET_META) { - status = submit_transfer(stream, next_buffer, meta.actual_count); + status = submit_transfer(stream, next_buffer, meta.actual_count * sizeof(uint32_t)); } else { status = submit_transfer(stream, next_buffer, async_stream_buf_bytes(stream)); } @@ -714,7 +714,7 @@ static int cyapi_stream(void *driver, struct bladerf_stream *stream, } else if (next_buffer != BLADERF_STREAM_NO_DATA) { if ((layout & BLADERF_DIRECTION_MASK) == BLADERF_TX && stream->format == BLADERF_FORMAT_PACKET_META) { - status = submit_transfer(stream, next_buffer, meta.actual_count); + status = submit_transfer(stream, next_buffer, meta.actual_count * sizeof(uint32_t)); } else { status = submit_transfer(stream, next_buffer, async_stream_buf_bytes(stream)); } diff --git a/host/libraries/libbladeRF/src/backend/usb/libusb.c b/host/libraries/libbladeRF/src/backend/usb/libusb.c index 6100f8ad..e23ce61c 100644 --- a/host/libraries/libbladeRF/src/backend/usb/libusb.c +++ b/host/libraries/libbladeRF/src/backend/usb/libusb.c @@ -1125,7 +1125,7 @@ static void LIBUSB_CALL lusb_stream_cb(struct libusb_transfer *transfer) int status; if((stream->layout & BLADERF_DIRECTION_MASK) == BLADERF_TX && stream->format == BLADERF_FORMAT_PACKET_META) { - status = submit_transfer(stream, next_buffer, metadata.actual_count); + status = submit_transfer(stream, next_buffer, metadata.actual_count * sizeof(uint32_t)); } else { status = submit_transfer(stream, next_buffer, async_stream_buf_bytes(stream)); } @@ -1372,7 +1372,7 @@ static int lusb_stream(void *driver, struct bladerf_stream *stream, if (buffer != BLADERF_STREAM_NO_DATA) { if((layout & BLADERF_DIRECTION_MASK) == BLADERF_TX && stream->format == BLADERF_FORMAT_PACKET_META) { - status = submit_transfer(stream, buffer, metadata.actual_count); + status = submit_transfer(stream, buffer, metadata.actual_count * sizeof(uint32_t)); } else { status = submit_transfer(stream, buffer, async_stream_buf_bytes(stream)); } diff --git a/host/libraries/libbladeRF/src/streaming/async.h b/host/libraries/libbladeRF/src/streaming/async.h index b0fd3b8c..4bc2aa3e 100644 --- a/host/libraries/libbladeRF/src/streaming/async.h +++ b/host/libraries/libbladeRF/src/streaming/async.h @@ -66,8 +66,6 @@ struct bladerf_stream { /* Get the number of bytes per stream buffer */ static inline size_t async_stream_buf_bytes(struct bladerf_stream *s) { - if (s->format == BLADERF_FORMAT_PACKET_META) - return s->samples_per_buffer; return samples_to_bytes(s->format, s->samples_per_buffer); } From b774f45d38f0bb3b5afa439008248ee45e8548aa Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Tue, 4 Mar 2025 13:04:56 -0600 Subject: [PATCH 156/238] bladeRF-cli: added sc16q11 packed format support --- host/utilities/bladeRF-cli/src/cmd/printset_impl.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/host/utilities/bladeRF-cli/src/cmd/printset_impl.c b/host/utilities/bladeRF-cli/src/cmd/printset_impl.c index 38782a18..4b644646 100644 --- a/host/utilities/bladeRF-cli/src/cmd/printset_impl.c +++ b/host/utilities/bladeRF-cli/src/cmd/printset_impl.c @@ -1346,7 +1346,7 @@ int set_bitmode(struct cli_state *state, int argc, char **argv) } } - if (!strcasecmp("16", argv[2]) || !strcasecmp("16bit", argv[2])) { + if (!strcasecmp("16", argv[2]) || !strcasecmp("16bit", argv[2]) || !strcasecmp("packed", argv[2])) { bladerf_get_feature(state->dev, &feature); if(feature == BLADERF_FEATURE_OVERSAMPLE) { printf(" Error: 16bit mode not permitted when\n" @@ -1354,7 +1354,9 @@ int set_bitmode(struct cli_state *state, int argc, char **argv) goto out; } - state->sample_format = BLADERF_FORMAT_SC16_Q11; + state->sample_format = !strcasecmp("packed", argv[2]) ? + BLADERF_FORMAT_SC16_Q11_PACKED : + BLADERF_FORMAT_SC16_Q11; } else if (!strcasecmp("8", argv[2]) || !strcasecmp("8bit", argv[2])) { if (strcmp(bladerf_get_board_name(state->dev), "bladerf2") != 0) { printf(" Error: BladeRF2 required for 8bit format\n"); From 79785afcf1fc64d75b0bc5677f53b5264c38d86c Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Tue, 1 Oct 2024 15:13:37 -0500 Subject: [PATCH 157/238] bladeRF-cli: added sc16q11 packed format support --- host/utilities/bladeRF-cli/src/cmd/printset_impl.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/host/utilities/bladeRF-cli/src/cmd/printset_impl.c b/host/utilities/bladeRF-cli/src/cmd/printset_impl.c index 4b644646..c37937c8 100644 --- a/host/utilities/bladeRF-cli/src/cmd/printset_impl.c +++ b/host/utilities/bladeRF-cli/src/cmd/printset_impl.c @@ -1348,9 +1348,9 @@ int set_bitmode(struct cli_state *state, int argc, char **argv) if (!strcasecmp("16", argv[2]) || !strcasecmp("16bit", argv[2]) || !strcasecmp("packed", argv[2])) { bladerf_get_feature(state->dev, &feature); - if(feature == BLADERF_FEATURE_OVERSAMPLE) { - printf(" Error: 16bit mode not permitted when\n" - " over sampling is enabled.\n"); + if (feature == BLADERF_FEATURE_OVERSAMPLE) { + printf(" Error: %s mode not permitted when over sampling is enabled.\n", + !strcasecmp("packed", argv[2]) ? "Packed" : "16bit"); goto out; } From 45e2d8f128057314cc1d91b5f844df7c176280c5 Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Fri, 14 Feb 2025 16:49:29 -0600 Subject: [PATCH 158/238] test: bump python requirements.txt versions --- .../libbladeRF_test/requirements.txt | 29 +++++++++---------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/host/libraries/libbladeRF_test/requirements.txt b/host/libraries/libbladeRF_test/requirements.txt index e777159e..875171b7 100644 --- a/host/libraries/libbladeRF_test/requirements.txt +++ b/host/libraries/libbladeRF_test/requirements.txt @@ -1,15 +1,14 @@ -contourpy==1.1.0 -cycler==0.11.0 -fonttools==4.43.0 -kiwisolver==1.4.5 -matplotlib==3.7.2 -numpy==1.25.2 -packaging==23.1 -pandas==2.0.3 -Pillow==10.3.0 -pyparsing==3.0.9 -python-dateutil==2.8.2 -pytz==2023.3 -scipy==1.11.2 -six==1.16.0 -tzdata==2023.3 +contourpy==1.3.1 +cycler==0.12.1 +fonttools==4.56.0 +kiwisolver==1.4.8 +matplotlib==3.10.0 +numpy==2.2.3 +packaging==24.2 +pandas==2.2.3 +pillow==11.1.0 +pyparsing==3.2.1 +python-dateutil==2.9.0.post0 +pytz==2025.1 +six==1.17.0 +tzdata==2025.1 From 0e2a9785543202339303c9fe5d20df65cb6c753c Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Wed, 5 Mar 2025 16:30:50 -0600 Subject: [PATCH 159/238] doc: Doxygen config update v1.8.8 > v1.9.8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit └> doxygen -u Doxyfile.in warning: Tag 'TCL_SUBST' at line 247 of file 'Doxyfile.in' has become obsolete. This tag has been removed. warning: Tag 'COLS_IN_ALPHA_INDEX' at line 1059 of file 'Doxyfile.in' has become obsolete. This tag has been removed. warning: Tag 'HTML_TIMESTAMP' at line 1194 of file 'Doxyfile.in' has become obsolete. This tag has been removed. warning: Tag 'FORMULA_TRANSPARENT' at line 1475 of file 'Doxyfile.in' has become obsolete. This tag has been removed. warning: Tag 'LATEX_SOURCE_CODE' at line 1749 of file 'Doxyfile.in' has become obsolete. This tag has been removed. warning: Tag 'DOCBOOK_PROGRAMLISTING' at line 1911 of file 'Doxyfile.in' has become obsolete. This tag has been removed. warning: Tag 'PERL_PATH' at line 2090 of file 'Doxyfile.in' has become obsolete. This tag has been removed. warning: Tag 'CLASS_DIAGRAMS' at line 2103 of file 'Doxyfile.in' has become obsolete. This tag has been removed. warning: Tag 'MSCGEN_PATH' at line 2112 of file 'Doxyfile.in' has become obsolete. This tag has been removed. warning: Tag 'DOT_FONTNAME' at line 2154 of file 'Doxyfile.in' has become obsolete. This tag has been removed. warning: Tag 'DOT_FONTSIZE' at line 2161 of file 'Doxyfile.in' has become obsolete. This tag has been removed. warning: Tag 'DOT_TRANSPARENT' at line 2372 of file 'Doxyfile.in' has become obsolete. This tag has been removed. warning: Changing CLASS_GRAPH option to TEXT because obsolete option CLASS_DIAGRAM was found and set to NO. --- .../libbladeRF/doc/doxygen/Doxyfile.in | 1192 ++++++++++++----- 1 file changed, 822 insertions(+), 370 deletions(-) diff --git a/host/libraries/libbladeRF/doc/doxygen/Doxyfile.in b/host/libraries/libbladeRF/doc/doxygen/Doxyfile.in index c8016c99..9729a38b 100644 --- a/host/libraries/libbladeRF/doc/doxygen/Doxyfile.in +++ b/host/libraries/libbladeRF/doc/doxygen/Doxyfile.in @@ -1,4 +1,4 @@ -# Doxyfile 1.8.8 +# Doxyfile 1.9.8 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project. @@ -12,16 +12,26 @@ # For lists, items can also be appended using: # TAG += value [value, ...] # Values that contain spaces should be placed between quotes (\" \"). +# +# Note: +# +# Use doxygen to compare the used configuration file with the template +# configuration file: +# doxygen -x [configFile] +# Use doxygen to compare the used configuration file with the template +# configuration file without replacing the environment variables or CMake type +# replacement variables: +# doxygen -x_noenv [configFile] #--------------------------------------------------------------------------- # Project related configuration options #--------------------------------------------------------------------------- -# This tag specifies the encoding used for all characters in the config file -# that follow. The default is UTF-8 which is also the encoding used for all text -# before the first occurrence of this tag. Doxygen uses libiconv (or the iconv -# built into libc) for the transcoding. See http://www.gnu.org/software/libiconv -# for the list of possible encodings. +# This tag specifies the encoding used for all characters in the configuration +# file that follow. The default is UTF-8 which is also the encoding used for all +# text before the first occurrence of this tag. Doxygen uses libiconv (or the +# iconv built into libc) for the transcoding. See +# https://www.gnu.org/software/libiconv/ for the list of possible encodings. # The default value is: UTF-8. DOXYFILE_ENCODING = UTF-8 @@ -46,10 +56,10 @@ PROJECT_NUMBER = @VERSION@ PROJECT_BRIEF = "Nuand bladeRF library" -# With the PROJECT_LOGO tag one can specify an logo or icon that is included in -# the documentation. The maximum height of the logo should not exceed 55 pixels -# and the maximum width should not exceed 200 pixels. Doxygen will copy the logo -# to the output directory. +# With the PROJECT_LOGO tag one can specify a logo or an icon that is included +# in the documentation. The maximum height of the logo should not exceed 55 +# pixels and the maximum width should not exceed 200 pixels. Doxygen will copy +# the logo to the output directory. PROJECT_LOGO = @LOGO_IMAGE@ @@ -60,16 +70,28 @@ PROJECT_LOGO = @LOGO_IMAGE@ OUTPUT_DIRECTORY = . -# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 4096 sub- -# directories (in 2 levels) under the output directory of each output format and -# will distribute the generated files over these directories. Enabling this +# If the CREATE_SUBDIRS tag is set to YES then doxygen will create up to 4096 +# sub-directories (in 2 levels) under the output directory of each output format +# and will distribute the generated files over these directories. Enabling this # option can be useful when feeding doxygen a huge amount of source files, where # putting all generated files in the same directory would otherwise causes -# performance problems for the file system. +# performance problems for the file system. Adapt CREATE_SUBDIRS_LEVEL to +# control the number of sub-directories. # The default value is: NO. CREATE_SUBDIRS = NO +# Controls the number of sub-directories that will be created when +# CREATE_SUBDIRS tag is set to YES. Level 0 represents 16 directories, and every +# level increment doubles the number of directories, resulting in 4096 +# directories at level 8 which is the default and also the maximum value. The +# sub-directories are organized in 2 levels, the first level always has a fixed +# number of 16 directories. +# Minimum value: 0, maximum value: 8, default value: 8. +# This tag requires that the tag CREATE_SUBDIRS is set to YES. + +CREATE_SUBDIRS_LEVEL = 8 + # If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII # characters to appear in the names of generated files. If set to NO, non-ASCII # characters will be escaped, for example _xE3_x81_x84 will be used for Unicode @@ -81,26 +103,26 @@ ALLOW_UNICODE_NAMES = NO # The OUTPUT_LANGUAGE tag is used to specify the language in which all # documentation generated by doxygen is written. Doxygen will use this # information to generate all constant output in the proper language. -# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Catalan, Chinese, -# Chinese-Traditional, Croatian, Czech, Danish, Dutch, English (United States), -# Esperanto, Farsi (Persian), Finnish, French, German, Greek, Hungarian, -# Indonesian, Italian, Japanese, Japanese-en (Japanese with English messages), -# Korean, Korean-en (Korean with English messages), Latvian, Lithuanian, -# Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, Romanian, Russian, -# Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, Swedish, Turkish, -# Ukrainian and Vietnamese. +# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Bulgarian, +# Catalan, Chinese, Chinese-Traditional, Croatian, Czech, Danish, Dutch, English +# (United States), Esperanto, Farsi (Persian), Finnish, French, German, Greek, +# Hindi, Hungarian, Indonesian, Italian, Japanese, Japanese-en (Japanese with +# English messages), Korean, Korean-en (Korean with English messages), Latvian, +# Lithuanian, Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, +# Romanian, Russian, Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, +# Swedish, Turkish, Ukrainian and Vietnamese. # The default value is: English. OUTPUT_LANGUAGE = English -# If the BRIEF_MEMBER_DESC tag is set to YES doxygen will include brief member +# If the BRIEF_MEMBER_DESC tag is set to YES, doxygen will include brief member # descriptions after the members that are listed in the file and class # documentation (similar to Javadoc). Set to NO to disable this. # The default value is: YES. BRIEF_MEMBER_DESC = YES -# If the REPEAT_BRIEF tag is set to YES doxygen will prepend the brief +# If the REPEAT_BRIEF tag is set to YES, doxygen will prepend the brief # description of a member or function before the detailed description # # Note: If both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the @@ -145,7 +167,7 @@ ALWAYS_DETAILED_SEC = NO INLINE_INHERITED_MEMB = NO -# If the FULL_PATH_NAMES tag is set to YES doxygen will prepend the full path +# If the FULL_PATH_NAMES tag is set to YES, doxygen will prepend the full path # before files name in the file list and in the header files. If set to NO the # shortest path that makes the file name unique will be used # The default value is: YES. @@ -189,6 +211,16 @@ SHORT_NAMES = NO JAVADOC_AUTOBRIEF = NO +# If the JAVADOC_BANNER tag is set to YES then doxygen will interpret a line +# such as +# /*************** +# as being the beginning of a Javadoc-style comment "banner". If set to NO, the +# Javadoc-style will behave just like regular comments and it will not be +# interpreted by doxygen. +# The default value is: NO. + +JAVADOC_BANNER = NO + # If the QT_AUTOBRIEF tag is set to YES then doxygen will interpret the first # line (until the first dot) of a Qt-style comment as the brief description. If # set to NO, the Qt-style will behave just like regular Qt-style comments (thus @@ -209,15 +241,23 @@ QT_AUTOBRIEF = NO MULTILINE_CPP_IS_BRIEF = NO +# By default Python docstrings are displayed as preformatted text and doxygen's +# special commands cannot be used. By setting PYTHON_DOCSTRING to NO the +# doxygen's special commands can be used and the contents of the docstring +# documentation blocks is shown as doxygen documentation. +# The default value is: YES. + +PYTHON_DOCSTRING = YES + # If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the # documentation from any documented member that it re-implements. # The default value is: YES. INHERIT_DOCS = YES -# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce a -# new page for each member. If set to NO, the documentation of a member will be -# part of the file/class/namespace that contains it. +# If the SEPARATE_MEMBER_PAGES tag is set to YES then doxygen will produce a new +# page for each member. If set to NO, the documentation of a member will be part +# of the file/class/namespace that contains it. # The default value is: NO. SEPARATE_MEMBER_PAGES = NO @@ -232,20 +272,19 @@ TAB_SIZE = 8 # the documentation. An alias has the form: # name=value # For example adding -# "sideeffect=@par Side Effects:\n" +# "sideeffect=@par Side Effects:^^" # will allow you to put the command \sideeffect (or @sideeffect) in the # documentation, which will result in a user-defined paragraph with heading -# "Side Effects:". You can put \n's in the value part of an alias to insert -# newlines. +# "Side Effects:". Note that you cannot put \n's in the value part of an alias +# to insert newlines (in the resulting output). You can put ^^ in the value part +# of an alias to insert a newline as if a physical newline was in the original +# file. When you need a literal { or } or , in the value part of an alias you +# have to escape them by means of a backslash (\), this can lead to conflicts +# with the commands \{ and \} for these it is advised to use the version @{ and +# @} or use a double escape (\\{ and \\}) ALIASES = -# This tag can be used to specify a number of word-keyword mappings (TCL only). -# A mapping has the form "name=value". For example adding "class=itcl::class" -# will allow you to use the command class in the itcl::class meaning. - -TCL_SUBST = - # Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources # only. Doxygen will then generate output that is more tailored for C. For # instance, some of the names that are used will be different. The list of all @@ -274,28 +313,40 @@ OPTIMIZE_FOR_FORTRAN = NO OPTIMIZE_OUTPUT_VHDL = NO +# Set the OPTIMIZE_OUTPUT_SLICE tag to YES if your project consists of Slice +# sources only. Doxygen will then generate output that is more tailored for that +# language. For instance, namespaces will be presented as modules, types will be +# separated into more groups, etc. +# The default value is: NO. + +OPTIMIZE_OUTPUT_SLICE = NO + # Doxygen selects the parser to use depending on the extension of the files it # parses. With this tag you can assign which parser to use for a given # extension. Doxygen has a built-in mapping, but you can override or extend it # using this tag. The format is ext=language, where ext is a file extension, and -# language is one of the parsers supported by doxygen: IDL, Java, Javascript, -# C#, C, C++, D, PHP, Objective-C, Python, Fortran (fixed format Fortran: -# FortranFixed, free formatted Fortran: FortranFree, unknown formatted Fortran: -# Fortran. In the later case the parser tries to guess whether the code is fixed -# or free formatted code, this is the default for Fortran type files), VHDL. For -# instance to make doxygen treat .inc files as Fortran files (default is PHP), -# and .f files as C (default is Fortran), use: inc=Fortran f=C. +# language is one of the parsers supported by doxygen: IDL, Java, JavaScript, +# Csharp (C#), C, C++, Lex, D, PHP, md (Markdown), Objective-C, Python, Slice, +# VHDL, Fortran (fixed format Fortran: FortranFixed, free formatted Fortran: +# FortranFree, unknown formatted Fortran: Fortran. In the later case the parser +# tries to guess whether the code is fixed or free formatted code, this is the +# default for Fortran type files). For instance to make doxygen treat .inc files +# as Fortran files (default is PHP), and .f files as C (default is Fortran), +# use: inc=Fortran f=C. # -# Note For files without extension you can use no_extension as a placeholder. +# Note: For files without extension you can use no_extension as a placeholder. # # Note that for custom extensions you also need to set FILE_PATTERNS otherwise -# the files are not read by doxygen. +# the files are not read by doxygen. When specifying no_extension you should add +# * to the FILE_PATTERNS. +# +# Note see also the list of default file extension mappings. EXTENSION_MAPPING = # If the MARKDOWN_SUPPORT tag is enabled then doxygen pre-processes all comments # according to the Markdown format, which allows for more readable -# documentation. See http://daringfireball.net/projects/markdown/ for details. +# documentation. See https://daringfireball.net/projects/markdown/ for details. # The output of markdown processing is further processed by doxygen, so you can # mix doxygen, HTML, and XML commands with Markdown formatting. Disable only in # case of backward compatibilities issues. @@ -303,10 +354,30 @@ EXTENSION_MAPPING = MARKDOWN_SUPPORT = YES +# When the TOC_INCLUDE_HEADINGS tag is set to a non-zero value, all headings up +# to that level are automatically included in the table of contents, even if +# they do not have an id attribute. +# Note: This feature currently applies only to Markdown headings. +# Minimum value: 0, maximum value: 99, default value: 5. +# This tag requires that the tag MARKDOWN_SUPPORT is set to YES. + +TOC_INCLUDE_HEADINGS = 5 + +# The MARKDOWN_ID_STYLE tag can be used to specify the algorithm used to +# generate identifiers for the Markdown headings. Note: Every identifier is +# unique. +# Possible values are: DOXYGEN use a fixed 'autotoc_md' string followed by a +# sequence number starting at 0 and GITHUB use the lower case version of title +# with any whitespace replaced by '-' and punctuation characters removed. +# The default value is: DOXYGEN. +# This tag requires that the tag MARKDOWN_SUPPORT is set to YES. + +MARKDOWN_ID_STYLE = DOXYGEN + # When enabled doxygen tries to link words that correspond to documented # classes, or namespaces to their corresponding documentation. Such a link can -# be prevented in individual cases by by putting a % sign in front of the word -# or globally by setting AUTOLINK_SUPPORT to NO. +# be prevented in individual cases by putting a % sign in front of the word or +# globally by setting AUTOLINK_SUPPORT to NO. # The default value is: YES. AUTOLINK_SUPPORT = YES @@ -328,7 +399,7 @@ BUILTIN_STL_SUPPORT = NO CPP_CLI_SUPPORT = NO # Set the SIP_SUPPORT tag to YES if your project consists of sip (see: -# http://www.riverbankcomputing.co.uk/software/sip/intro) sources only. Doxygen +# https://www.riverbankcomputing.com/software/sip/intro) sources only. Doxygen # will parse them like normal C++ but will assume all classes use public instead # of private inheritance when no explicit protection keyword is present. # The default value is: NO. @@ -346,13 +417,20 @@ SIP_SUPPORT = NO IDL_PROPERTY_SUPPORT = YES # If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC -# tag is set to YES, then doxygen will reuse the documentation of the first +# tag is set to YES then doxygen will reuse the documentation of the first # member in the group (if any) for the other members of the group. By default # all members of a group must be documented explicitly. # The default value is: NO. DISTRIBUTE_GROUP_DOC = NO +# If one adds a struct or class to a group and this option is enabled, then also +# any nested class or struct is added to the same group. By default this option +# is disabled and one has to add nested compounds explicitly via \ingroup. +# The default value is: NO. + +GROUP_NESTED_COMPOUNDS = NO + # Set the SUBGROUPING tag to YES to allow class member groups of the same type # (for instance a group of public functions) to be put as a subgroup of that # type (e.g. under the Public Functions section). Set it to NO to prevent @@ -407,11 +485,32 @@ TYPEDEF_HIDES_STRUCT = NO LOOKUP_CACHE_SIZE = 0 +# The NUM_PROC_THREADS specifies the number of threads doxygen is allowed to use +# during processing. When set to 0 doxygen will based this on the number of +# cores available in the system. You can set it explicitly to a value larger +# than 0 to get more control over the balance between CPU load and processing +# speed. At this moment only the input processing can be done using multiple +# threads. Since this is still an experimental feature the default is set to 1, +# which effectively disables parallel processing. Please report any issues you +# encounter. Generating dot graphs in parallel is controlled by the +# DOT_NUM_THREADS setting. +# Minimum value: 0, maximum value: 32, default value: 1. + +NUM_PROC_THREADS = 1 + +# If the TIMESTAMP tag is set different from NO then each generated page will +# contain the date or date and time when the page was generated. Setting this to +# NO can help when comparing the output of multiple runs. +# Possible values are: YES, NO, DATETIME and DATE. +# The default value is: NO. + +TIMESTAMP = YES + #--------------------------------------------------------------------------- # Build related configuration options #--------------------------------------------------------------------------- -# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in +# If the EXTRACT_ALL tag is set to YES, doxygen will assume all entities in # documentation are documented, even if no documentation was available. Private # class members and static file members will be hidden unless the # EXTRACT_PRIVATE respectively EXTRACT_STATIC tags are set to YES. @@ -421,35 +520,41 @@ LOOKUP_CACHE_SIZE = 0 EXTRACT_ALL = NO -# If the EXTRACT_PRIVATE tag is set to YES all private members of a class will +# If the EXTRACT_PRIVATE tag is set to YES, all private members of a class will # be included in the documentation. # The default value is: NO. EXTRACT_PRIVATE = NO -# If the EXTRACT_PACKAGE tag is set to YES all members with package or internal +# If the EXTRACT_PRIV_VIRTUAL tag is set to YES, documented private virtual +# methods of a class will be included in the documentation. +# The default value is: NO. + +EXTRACT_PRIV_VIRTUAL = NO + +# If the EXTRACT_PACKAGE tag is set to YES, all members with package or internal # scope will be included in the documentation. # The default value is: NO. EXTRACT_PACKAGE = NO -# If the EXTRACT_STATIC tag is set to YES all static members of a file will be +# If the EXTRACT_STATIC tag is set to YES, all static members of a file will be # included in the documentation. # The default value is: NO. EXTRACT_STATIC = NO -# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) defined -# locally in source files will be included in the documentation. If set to NO +# If the EXTRACT_LOCAL_CLASSES tag is set to YES, classes (and structs) defined +# locally in source files will be included in the documentation. If set to NO, # only classes defined in header files are included. Does not have any effect # for Java sources. # The default value is: YES. EXTRACT_LOCAL_CLASSES = YES -# This flag is only useful for Objective-C code. When set to YES local methods, +# This flag is only useful for Objective-C code. If set to YES, local methods, # which are defined in the implementation section but not in the interface are -# included in the documentation. If set to NO only methods in the interface are +# included in the documentation. If set to NO, only methods in the interface are # included. # The default value is: NO. @@ -464,6 +569,13 @@ EXTRACT_LOCAL_METHODS = NO EXTRACT_ANON_NSPACES = NO +# If this flag is set to YES, the name of an unnamed parameter in a declaration +# will be determined by the corresponding definition. By default unnamed +# parameters remain unnamed in the output. +# The default value is: YES. + +RESOLVE_UNNAMED_PARAMS = YES + # If the HIDE_UNDOC_MEMBERS tag is set to YES, doxygen will hide all # undocumented members inside documented classes or files. If set to NO these # members will be included in the various overviews, but no documentation @@ -474,21 +586,22 @@ HIDE_UNDOC_MEMBERS = NO # If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all # undocumented classes that are normally visible in the class hierarchy. If set -# to NO these classes will be included in the various overviews. This option has -# no effect if EXTRACT_ALL is enabled. +# to NO, these classes will be included in the various overviews. This option +# will also hide undocumented C++ concepts if enabled. This option has no effect +# if EXTRACT_ALL is enabled. # The default value is: NO. HIDE_UNDOC_CLASSES = NO # If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend -# (class|struct|union) declarations. If set to NO these declarations will be -# included in the documentation. +# declarations. If set to NO, these declarations will be included in the +# documentation. # The default value is: NO. HIDE_FRIEND_COMPOUNDS = NO # If the HIDE_IN_BODY_DOCS tag is set to YES, doxygen will hide any -# documentation blocks found inside the body of a function. If set to NO these +# documentation blocks found inside the body of a function. If set to NO, these # blocks will be appended to the function's detailed documentation block. # The default value is: NO. @@ -501,22 +614,43 @@ HIDE_IN_BODY_DOCS = NO INTERNAL_DOCS = NO -# If the CASE_SENSE_NAMES tag is set to NO then doxygen will only generate file -# names in lower-case letters. If set to YES upper-case letters are also -# allowed. This is useful if you have classes or files whose names only differ -# in case and if your file system supports case sensitive file names. Windows -# and Mac users are advised to set this option to NO. -# The default value is: system dependent. +# With the correct setting of option CASE_SENSE_NAMES doxygen will better be +# able to match the capabilities of the underlying filesystem. In case the +# filesystem is case sensitive (i.e. it supports files in the same directory +# whose names only differ in casing), the option must be set to YES to properly +# deal with such files in case they appear in the input. For filesystems that +# are not case sensitive the option should be set to NO to properly deal with +# output files written for symbols that only differ in casing, such as for two +# classes, one named CLASS and the other named Class, and to also support +# references to files without having to specify the exact matching casing. On +# Windows (including Cygwin) and MacOS, users should typically set this option +# to NO, whereas on Linux or other Unix flavors it should typically be set to +# YES. +# Possible values are: SYSTEM, NO and YES. +# The default value is: SYSTEM. CASE_SENSE_NAMES = NO # If the HIDE_SCOPE_NAMES tag is set to NO then doxygen will show members with -# their full class and namespace scopes in the documentation. If set to YES the +# their full class and namespace scopes in the documentation. If set to YES, the # scope will be hidden. # The default value is: NO. HIDE_SCOPE_NAMES = YES +# If the HIDE_COMPOUND_REFERENCE tag is set to NO (default) then doxygen will +# append additional text to a page's title, such as Class Reference. If set to +# YES the compound reference will be hidden. +# The default value is: NO. + +HIDE_COMPOUND_REFERENCE= NO + +# If the SHOW_HEADERFILE tag is set to YES then the documentation for a class +# will show which file needs to be included to use the class. +# The default value is: YES. + +SHOW_HEADERFILE = YES + # If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of # the files that are included by a file in the documentation of that file. # The default value is: YES. @@ -544,14 +678,14 @@ INLINE_INFO = YES # If the SORT_MEMBER_DOCS tag is set to YES then doxygen will sort the # (detailed) documentation of file and class members alphabetically by member -# name. If set to NO the members will appear in declaration order. +# name. If set to NO, the members will appear in declaration order. # The default value is: YES. SORT_MEMBER_DOCS = YES # If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the brief # descriptions of file, namespace and class members alphabetically by member -# name. If set to NO the members will appear in declaration order. Note that +# name. If set to NO, the members will appear in declaration order. Note that # this will also influence the order of the classes in the class list. # The default value is: NO. @@ -596,27 +730,25 @@ SORT_BY_SCOPE_NAME = NO STRICT_PROTO_MATCHING = NO -# The GENERATE_TODOLIST tag can be used to enable ( YES) or disable ( NO) the -# todo list. This list is created by putting \todo commands in the -# documentation. +# The GENERATE_TODOLIST tag can be used to enable (YES) or disable (NO) the todo +# list. This list is created by putting \todo commands in the documentation. # The default value is: YES. GENERATE_TODOLIST = YES -# The GENERATE_TESTLIST tag can be used to enable ( YES) or disable ( NO) the -# test list. This list is created by putting \test commands in the -# documentation. +# The GENERATE_TESTLIST tag can be used to enable (YES) or disable (NO) the test +# list. This list is created by putting \test commands in the documentation. # The default value is: YES. GENERATE_TESTLIST = YES -# The GENERATE_BUGLIST tag can be used to enable ( YES) or disable ( NO) the bug +# The GENERATE_BUGLIST tag can be used to enable (YES) or disable (NO) the bug # list. This list is created by putting \bug commands in the documentation. # The default value is: YES. GENERATE_BUGLIST = YES -# The GENERATE_DEPRECATEDLIST tag can be used to enable ( YES) or disable ( NO) +# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or disable (NO) # the deprecated list. This list is created by putting \deprecated commands in # the documentation. # The default value is: YES. @@ -641,8 +773,8 @@ ENABLED_SECTIONS = MAX_INITIALIZER_LINES = 30 # Set the SHOW_USED_FILES tag to NO to disable the list of files generated at -# the bottom of the documentation of classes and structs. If set to YES the list -# will mention the files that were used to generate the documentation. +# the bottom of the documentation of classes and structs. If set to YES, the +# list will mention the files that were used to generate the documentation. # The default value is: YES. SHOW_USED_FILES = YES @@ -676,7 +808,8 @@ FILE_VERSION_FILTER = # output files in an output format independent way. To create the layout file # that represents doxygen's defaults, run doxygen with the -l option. You can # optionally specify a file name after the option, if omitted DoxygenLayout.xml -# will be used as the name of the layout file. +# will be used as the name of the layout file. See also section "Changing the +# layout of pages" for information. # # Note that if you run doxygen from a directory containing a file called # DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE @@ -687,7 +820,7 @@ LAYOUT_FILE = @CMAKE_CURRENT_SOURCE_DIR@/doc/doxygen/layout.xml # The CITE_BIB_FILES tag can be used to specify one or more bib files containing # the reference definitions. This must be a list of .bib files. The .bib # extension is automatically appended if omitted. This requires the bibtex tool -# to be installed. See also http://en.wikipedia.org/wiki/BibTeX for more info. +# to be installed. See also https://en.wikipedia.org/wiki/BibTeX for more info. # For LaTeX the style of the bibliography can be controlled using # LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the # search path. See also \cite for info how to create references. @@ -706,7 +839,7 @@ CITE_BIB_FILES = QUIET = NO # The WARNINGS tag can be used to turn on/off the warning messages that are -# generated to standard error ( stderr) by doxygen. If WARNINGS is set to YES +# generated to standard error (stderr) by doxygen. If WARNINGS is set to YES # this implies that the warnings are on. # # Tip: Turn warnings on while writing the documentation. @@ -714,7 +847,7 @@ QUIET = NO WARNINGS = YES -# If the WARN_IF_UNDOCUMENTED tag is set to YES, then doxygen will generate +# If the WARN_IF_UNDOCUMENTED tag is set to YES then doxygen will generate # warnings for undocumented members. If EXTRACT_ALL is set to YES then this flag # will automatically be disabled. # The default value is: YES. @@ -722,34 +855,81 @@ WARNINGS = YES WARN_IF_UNDOCUMENTED = YES # If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for -# potential errors in the documentation, such as not documenting some parameters -# in a documented function, or documenting parameters that don't exist or using -# markup commands wrongly. +# potential errors in the documentation, such as documenting some parameters in +# a documented function twice, or documenting parameters that don't exist or +# using markup commands wrongly. # The default value is: YES. WARN_IF_DOC_ERROR = YES +# If WARN_IF_INCOMPLETE_DOC is set to YES, doxygen will warn about incomplete +# function parameter documentation. If set to NO, doxygen will accept that some +# parameters have no documentation without warning. +# The default value is: YES. + +WARN_IF_INCOMPLETE_DOC = YES + # This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that # are documented, but have no documentation for their parameters or return -# value. If set to NO doxygen will only warn about wrong or incomplete parameter -# documentation, but not about the absence of documentation. +# value. If set to NO, doxygen will only warn about wrong parameter +# documentation, but not about the absence of documentation. If EXTRACT_ALL is +# set to YES then this flag will automatically be disabled. See also +# WARN_IF_INCOMPLETE_DOC # The default value is: NO. WARN_NO_PARAMDOC = NO +# If WARN_IF_UNDOC_ENUM_VAL option is set to YES, doxygen will warn about +# undocumented enumeration values. If set to NO, doxygen will accept +# undocumented enumeration values. If EXTRACT_ALL is set to YES then this flag +# will automatically be disabled. +# The default value is: NO. + +WARN_IF_UNDOC_ENUM_VAL = NO + +# If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when +# a warning is encountered. If the WARN_AS_ERROR tag is set to FAIL_ON_WARNINGS +# then doxygen will continue running as if WARN_AS_ERROR tag is set to NO, but +# at the end of the doxygen process doxygen will return with a non-zero status. +# If the WARN_AS_ERROR tag is set to FAIL_ON_WARNINGS_PRINT then doxygen behaves +# like FAIL_ON_WARNINGS but in case no WARN_LOGFILE is defined doxygen will not +# write the warning messages in between other messages but write them at the end +# of a run, in case a WARN_LOGFILE is defined the warning messages will be +# besides being in the defined file also be shown at the end of a run, unless +# the WARN_LOGFILE is defined as - i.e. standard output (stdout) in that case +# the behavior will remain as with the setting FAIL_ON_WARNINGS. +# Possible values are: NO, YES, FAIL_ON_WARNINGS and FAIL_ON_WARNINGS_PRINT. +# The default value is: NO. + +WARN_AS_ERROR = NO + # The WARN_FORMAT tag determines the format of the warning messages that doxygen # can produce. The string should contain the $file, $line, and $text tags, which # will be replaced by the file and line number from which the warning originated # and the warning text. Optionally the format may contain $version, which will # be replaced by the version of the file (if it could be obtained via # FILE_VERSION_FILTER) +# See also: WARN_LINE_FORMAT # The default value is: $file:$line: $text. WARN_FORMAT = "$file:$line: $text" +# In the $text part of the WARN_FORMAT command it is possible that a reference +# to a more specific place is given. To make it easier to jump to this place +# (outside of doxygen) the user can define a custom "cut" / "paste" string. +# Example: +# WARN_LINE_FORMAT = "'vi $file +$line'" +# See also: WARN_FORMAT +# The default value is: at line $line of file $file. + +WARN_LINE_FORMAT = "at line $line of file $file" + # The WARN_LOGFILE tag can be used to specify a file to which warning and error # messages should be written. If left blank the output is written to standard -# error (stderr). +# error (stderr). In case the file specified cannot be opened for writing the +# warning and error messages are written to standard error. When as file - is +# specified the warning and error messages are written to standard output +# (stdout). WARN_LOGFILE = @@ -760,7 +940,7 @@ WARN_LOGFILE = # The INPUT tag is used to specify the files and/or directories that contain # documented source files. You may enter file names like myfile.cpp or # directories like /usr/src/myproject. Separate the files or directories with -# spaces. +# spaces. See also FILE_PATTERNS and EXTENSION_MAPPING # Note: If this tag is empty the current directory is searched. INPUT = @CMAKE_CURRENT_SOURCE_DIR@/include/libbladeRF.h \ @@ -771,20 +951,40 @@ INPUT = @CMAKE_CURRENT_SOURCE_DIR@/include/libbladeRF.h \ # This tag can be used to specify the character encoding of the source files # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses # libiconv (or the iconv built into libc) for the transcoding. See the libiconv -# documentation (see: http://www.gnu.org/software/libiconv) for the list of -# possible encodings. +# documentation (see: +# https://www.gnu.org/software/libiconv/) for the list of possible encodings. +# See also: INPUT_FILE_ENCODING # The default value is: UTF-8. INPUT_ENCODING = UTF-8 +# This tag can be used to specify the character encoding of the source files +# that doxygen parses The INPUT_FILE_ENCODING tag can be used to specify +# character encoding on a per file pattern basis. Doxygen will compare the file +# name with each pattern and apply the encoding instead of the default +# INPUT_ENCODING) if there is a match. The character encodings are a list of the +# form: pattern=encoding (like *.php=ISO-8859-1). See cfg_input_encoding +# "INPUT_ENCODING" for further information on supported encodings. + +INPUT_FILE_ENCODING = + # If the value of the INPUT tag contains directories, you can use the # FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and -# *.h) to filter out the source-files in the directories. If left blank the -# following patterns are tested:*.c, *.cc, *.cxx, *.cpp, *.c++, *.java, *.ii, -# *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h, *.hh, *.hxx, *.hpp, -# *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc, *.m, *.markdown, -# *.md, *.mm, *.dox, *.py, *.f90, *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf, -# *.qsf, *.as and *.js. +# *.h) to filter out the source-files in the directories. +# +# Note that for custom extensions or not directly supported extensions you also +# need to set EXTENSION_MAPPING for the extension otherwise the files are not +# read by doxygen. +# +# Note the list of default checked file patterns might differ from the list of +# default file extension mappings. +# +# If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cxxm, +# *.cpp, *.cppm, *.c++, *.c++m, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, +# *.ddl, *.odl, *.h, *.hh, *.hxx, *.hpp, *.h++, *.ixx, *.l, *.cs, *.d, *.php, +# *.php4, *.php5, *.phtml, *.inc, *.m, *.markdown, *.md, *.mm, *.dox (to be +# provided as doxygen C comment), *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, +# *.f18, *.f, *.for, *.vhd, *.vhdl, *.ucf, *.qsf and *.ice. FILE_PATTERNS = *.c \ *.cc \ @@ -854,10 +1054,7 @@ EXCLUDE_PATTERNS = # (namespaces, classes, functions, etc.) that should be excluded from the # output. The symbol name can be a fully qualified name, a word, or if the # wildcard * is used, a substring. Examples: ANamespace, AClass, -# AClass::ANamespace, ANamespace::*Test -# -# Note that the wildcards are matched against the file with absolute path, so to -# exclude all test directories use the pattern */test/* +# ANamespace::AClass, ANamespace::*Test EXCLUDE_SYMBOLS = @@ -901,6 +1098,15 @@ IMAGE_PATH = # Note that the filter must not add or remove lines; it is applied before the # code is scanned, but not when the output code is generated. If lines are added # or removed, the anchors will not be placed correctly. +# +# Note that doxygen will use the data processed and written to standard output +# for further processing, therefore nothing else, like debug statements or used +# commands (so in case of a Windows batch file always use @echo OFF), should be +# written to standard output. +# +# Note that for custom extensions or not directly supported extensions you also +# need to set EXTENSION_MAPPING for the extension otherwise the files are not +# properly processed by doxygen. INPUT_FILTER = @@ -910,11 +1116,15 @@ INPUT_FILTER = # (like *.cpp=my_cpp_filter). See INPUT_FILTER for further information on how # filters are used. If the FILTER_PATTERNS tag is empty or if none of the # patterns match the file name, INPUT_FILTER is applied. +# +# Note that for custom extensions or not directly supported extensions you also +# need to set EXTENSION_MAPPING for the extension otherwise the files are not +# properly processed by doxygen. FILTER_PATTERNS = # If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using -# INPUT_FILTER ) will also be used to filter the input files that are used for +# INPUT_FILTER) will also be used to filter the input files that are used for # producing the source files to browse (i.e. when SOURCE_BROWSER is set to YES). # The default value is: NO. @@ -935,6 +1145,15 @@ FILTER_SOURCE_PATTERNS = USE_MDFILE_AS_MAINPAGE = +# The Fortran standard specifies that for fixed formatted Fortran code all +# characters from position 72 are to be considered as comment. A common +# extension is to allow longer lines before the automatic comment starts. The +# setting FORTRAN_COMMENT_AFTER will also make it possible that longer lines can +# be processed before the automatic comment starts. +# Minimum value: 7, maximum value: 10000, default value: 72. + +FORTRAN_COMMENT_AFTER = 72 + #--------------------------------------------------------------------------- # Configuration options related to source browsing #--------------------------------------------------------------------------- @@ -962,7 +1181,7 @@ INLINE_SOURCES = NO STRIP_CODE_COMMENTS = YES # If the REFERENCED_BY_RELATION tag is set to YES then for each documented -# function all documented functions referencing it will be listed. +# entity all documented functions referencing it will be listed. # The default value is: NO. REFERENCED_BY_RELATION = NO @@ -974,7 +1193,7 @@ REFERENCED_BY_RELATION = NO REFERENCES_RELATION = NO # If the REFERENCES_LINK_SOURCE tag is set to YES and SOURCE_BROWSER tag is set -# to YES, then the hyperlinks from functions in REFERENCES_RELATION and +# to YES then the hyperlinks from functions in REFERENCES_RELATION and # REFERENCED_BY_RELATION lists will link to the source code. Otherwise they will # link to the documentation. # The default value is: YES. @@ -994,12 +1213,12 @@ SOURCE_TOOLTIPS = YES # If the USE_HTAGS tag is set to YES then the references to source code will # point to the HTML generated by the htags(1) tool instead of doxygen built-in # source browser. The htags tool is part of GNU's global source tagging system -# (see http://www.gnu.org/software/global/global.html). You will need version +# (see https://www.gnu.org/software/global/global.html). You will need version # 4.8.6 or higher. # # To use it do the following: # - Install the latest version of global -# - Enable SOURCE_BROWSER and USE_HTAGS in the config file +# - Enable SOURCE_BROWSER and USE_HTAGS in the configuration file # - Make sure the INPUT points to the root of the source tree # - Run doxygen as normal # @@ -1021,16 +1240,24 @@ USE_HTAGS = NO VERBATIM_HEADERS = YES -# If the CLANG_ASSISTED_PARSING tag is set to YES, then doxygen will use the -# clang parser (see: http://clang.llvm.org/) for more accurate parsing at the -# cost of reduced performance. This can be particularly helpful with template -# rich C++ code for which doxygen's built-in parser lacks the necessary type -# information. +# If the CLANG_ASSISTED_PARSING tag is set to YES then doxygen will use the +# clang parser (see: +# http://clang.llvm.org/) for more accurate parsing at the cost of reduced +# performance. This can be particularly helpful with template rich C++ code for +# which doxygen's built-in parser lacks the necessary type information. # Note: The availability of this option depends on whether or not doxygen was -# compiled with the --with-libclang option. +# generated with the -Duse_libclang=ON option for CMake. # The default value is: NO. -#CLANG_ASSISTED_PARSING = NO +CLANG_ASSISTED_PARSING = NO + +# If the CLANG_ASSISTED_PARSING tag is set to YES and the CLANG_ADD_INC_PATHS +# tag is set to YES then doxygen will add the directory of each input to the +# include path. +# The default value is: YES. +# This tag requires that the tag CLANG_ASSISTED_PARSING is set to YES. + +CLANG_ADD_INC_PATHS = YES # If clang assisted parsing is enabled you can provide the compiler with command # line options that you would normally use when invoking the compiler. Note that @@ -1038,7 +1265,20 @@ VERBATIM_HEADERS = YES # specified with INPUT and INCLUDE_PATH. # This tag requires that the tag CLANG_ASSISTED_PARSING is set to YES. -#CLANG_OPTIONS = +CLANG_OPTIONS = + +# If clang assisted parsing is enabled you can provide the clang parser with the +# path to the directory containing a file called compile_commands.json. This +# file is the compilation database (see: +# http://clang.llvm.org/docs/HowToSetupToolingForLLVM.html) containing the +# options used when the source files were built. This is equivalent to +# specifying the -p option to a clang tool, such as clang-check. These options +# will then be passed to the parser. Any options specified with CLANG_OPTIONS +# will be added as well. +# Note: The availability of this option depends on whether or not doxygen was +# generated with the -Duse_libclang=ON option for CMake. + +CLANG_DATABASE_PATH = #--------------------------------------------------------------------------- # Configuration options related to the alphabetical class index @@ -1051,17 +1291,11 @@ VERBATIM_HEADERS = YES ALPHABETICAL_INDEX = YES -# The COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns in -# which the alphabetical index list will be split. -# Minimum value: 1, maximum value: 20, default value: 5. -# This tag requires that the tag ALPHABETICAL_INDEX is set to YES. - -COLS_IN_ALPHA_INDEX = 5 - -# In case all classes in a project start with a common prefix, all classes will -# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag -# can be used to specify a prefix (or a list of prefixes) that should be ignored -# while generating the index headers. +# The IGNORE_PREFIX tag can be used to specify a prefix (or a list of prefixes) +# that should be ignored while generating the index headers. The IGNORE_PREFIX +# tag works for classes, function and member names. The entity will be placed in +# the alphabetical list under the first letter of the entity name that remains +# after removing the prefix. # This tag requires that the tag ALPHABETICAL_INDEX is set to YES. IGNORE_PREFIX = @@ -1070,7 +1304,7 @@ IGNORE_PREFIX = # Configuration options related to the HTML output #--------------------------------------------------------------------------- -# If the GENERATE_HTML tag is set to YES doxygen will generate HTML output +# If the GENERATE_HTML tag is set to YES, doxygen will generate HTML output # The default value is: YES. GENERATE_HTML = YES @@ -1136,11 +1370,16 @@ HTML_STYLESHEET = # cascading style sheets that are included after the standard style sheets # created by doxygen. Using this option one can overrule certain style aspects. # This is preferred over using HTML_STYLESHEET since it does not replace the -# standard style sheet and is therefor more robust against future updates. +# standard style sheet and is therefore more robust against future updates. # Doxygen will copy the style sheet files to the output directory. -# Note: The order of the extra stylesheet files is of importance (e.g. the last -# stylesheet in the list overrules the setting of the previous ones in the -# list). For an example see the documentation. +# Note: The order of the extra style sheet files is of importance (e.g. the last +# style sheet in the list overrules the setting of the previous ones in the +# list). +# Note: Since the styling of scrollbars can currently not be overruled in +# Webkit/Chromium, the styling will be left out of the default doxygen.css if +# one or more extra stylesheets have been specified. So if scrollbar +# customization is desired it has to be added explicitly. For an example see the +# documentation. # This tag requires that the tag GENERATE_HTML is set to YES. HTML_EXTRA_STYLESHEET = @@ -1155,10 +1394,23 @@ HTML_EXTRA_STYLESHEET = HTML_EXTRA_FILES = +# The HTML_COLORSTYLE tag can be used to specify if the generated HTML output +# should be rendered with a dark or light theme. +# Possible values are: LIGHT always generate light mode output, DARK always +# generate dark mode output, AUTO_LIGHT automatically set the mode according to +# the user preference, use light mode if no preference is set (the default), +# AUTO_DARK automatically set the mode according to the user preference, use +# dark mode if no preference is set and TOGGLE allow to user to switch between +# light and dark mode via a button. +# The default value is: AUTO_LIGHT. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_COLORSTYLE = AUTO_LIGHT + # The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen -# will adjust the colors in the stylesheet and background images according to -# this color. Hue is specified as an angle on a colorwheel, see -# http://en.wikipedia.org/wiki/Hue for more information. For instance the value +# will adjust the colors in the style sheet and background images according to +# this color. Hue is specified as an angle on a color-wheel, see +# https://en.wikipedia.org/wiki/Hue for more information. For instance the value # 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300 # purple, and 360 is red again. # Minimum value: 0, maximum value: 359, default value: 220. @@ -1167,7 +1419,7 @@ HTML_EXTRA_FILES = HTML_COLORSTYLE_HUE = 208 # The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors -# in the HTML output. For a value of 0 the output will use grayscales only. A +# in the HTML output. For a value of 0 the output will use gray-scales only. A # value of 255 will produce the most vivid colors. # Minimum value: 0, maximum value: 255, default value: 100. # This tag requires that the tag GENERATE_HTML is set to YES. @@ -1185,13 +1437,16 @@ HTML_COLORSTYLE_SAT = 32 HTML_COLORSTYLE_GAMMA = 189 -# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML -# page will contain the date and time when the page was generated. Setting this -# to NO can help when comparing the output of multiple runs. +# If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML +# documentation will contain a main index with vertical navigation menus that +# are dynamically created via JavaScript. If disabled, the navigation index will +# consists of multiple levels of tabs that are statically embedded in every HTML +# page. Disable this option to support browsers that do not have JavaScript, +# like the Qt help browser. # The default value is: YES. # This tag requires that the tag GENERATE_HTML is set to YES. -HTML_TIMESTAMP = YES +HTML_DYNAMIC_MENUS = YES # If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML # documentation will contain sections that can be hidden and shown after the @@ -1201,6 +1456,13 @@ HTML_TIMESTAMP = YES HTML_DYNAMIC_SECTIONS = NO +# If the HTML_CODE_FOLDING tag is set to YES then classes and functions can be +# dynamically folded and expanded in the generated HTML source code. +# The default value is: YES. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_CODE_FOLDING = YES + # With HTML_INDEX_NUM_ENTRIES one can control the preferred number of entries # shown in the various tree structured indices initially; the user can expand # and collapse entries dynamically later on. Doxygen will expand the tree to @@ -1216,13 +1478,14 @@ HTML_INDEX_NUM_ENTRIES = 100 # If the GENERATE_DOCSET tag is set to YES, additional index files will be # generated that can be used as input for Apple's Xcode 3 integrated development -# environment (see: http://developer.apple.com/tools/xcode/), introduced with -# OSX 10.5 (Leopard). To create a documentation set, doxygen will generate a -# Makefile in the HTML output directory. Running make will produce the docset in -# that directory and running make install will install the docset in +# environment (see: +# https://developer.apple.com/xcode/), introduced with OSX 10.5 (Leopard). To +# create a documentation set, doxygen will generate a Makefile in the HTML +# output directory. Running make will produce the docset in that directory and +# running make install will install the docset in # ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at -# startup. See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html -# for more information. +# startup. See https://developer.apple.com/library/archive/featuredarticles/Doxy +# genXcode/_index.html for more information. # The default value is: NO. # This tag requires that the tag GENERATE_HTML is set to YES. @@ -1236,6 +1499,13 @@ GENERATE_DOCSET = NO DOCSET_FEEDNAME = "Doxygen generated docs" +# This tag determines the URL of the docset feed. A documentation feed provides +# an umbrella under which multiple documentation sets from a single provider +# (such as a company or product suite) can be grouped. +# This tag requires that the tag GENERATE_DOCSET is set to YES. + +DOCSET_FEEDURL = + # This tag specifies a string that should uniquely identify the documentation # set bundle. This should be a reverse domain-name style string, e.g. # com.mycompany.MyDocSet. Doxygen will append .docset to the name. @@ -1261,8 +1531,12 @@ DOCSET_PUBLISHER_NAME = Publisher # If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three # additional HTML index files: index.hhp, index.hhc, and index.hhk. The # index.hhp is a project file that can be read by Microsoft's HTML Help Workshop -# (see: http://www.microsoft.com/en-us/download/details.aspx?id=21138) on -# Windows. +# on Windows. In the beginning of 2021 Microsoft took the original page, with +# a.o. the download links, offline the HTML help workshop was already many years +# in maintenance mode). You can download the HTML help workshop from the web +# archives at Installation executable (see: +# http://web.archive.org/web/20160201063255/http://download.microsoft.com/downlo +# ad/0/A/9/0A939EF6-E31C-430F-A3DF-DFAE7960D564/htmlhelp.exe). # # The HTML Help Workshop contains a compiler that can convert all HTML output # generated by doxygen into a single compiled HTML file (.chm). Compiled HTML @@ -1284,28 +1558,28 @@ GENERATE_HTMLHELP = NO CHM_FILE = # The HHC_LOCATION tag can be used to specify the location (absolute path -# including file name) of the HTML help compiler ( hhc.exe). If non-empty +# including file name) of the HTML help compiler (hhc.exe). If non-empty, # doxygen will try to run the HTML help compiler on the generated index.hhp. # The file has to be specified with full path. # This tag requires that the tag GENERATE_HTMLHELP is set to YES. HHC_LOCATION = -# The GENERATE_CHI flag controls if a separate .chi index file is generated ( -# YES) or that it should be included in the master .chm file ( NO). +# The GENERATE_CHI flag controls if a separate .chi index file is generated +# (YES) or that it should be included in the main .chm file (NO). # The default value is: NO. # This tag requires that the tag GENERATE_HTMLHELP is set to YES. GENERATE_CHI = NO -# The CHM_INDEX_ENCODING is used to encode HtmlHelp index ( hhk), content ( hhc) +# The CHM_INDEX_ENCODING is used to encode HtmlHelp index (hhk), content (hhc) # and project file content. # This tag requires that the tag GENERATE_HTMLHELP is set to YES. CHM_INDEX_ENCODING = -# The BINARY_TOC flag controls whether a binary table of contents is generated ( -# YES) or a normal table of contents ( NO) in the .chm file. Furthermore it +# The BINARY_TOC flag controls whether a binary table of contents is generated +# (YES) or a normal table of contents (NO) in the .chm file. Furthermore it # enables the Previous and Next buttons. # The default value is: NO. # This tag requires that the tag GENERATE_HTMLHELP is set to YES. @@ -1319,6 +1593,16 @@ BINARY_TOC = NO TOC_EXPAND = NO +# The SITEMAP_URL tag is used to specify the full URL of the place where the +# generated documentation will be placed on the server by the user during the +# deployment of the documentation. The generated sitemap is called sitemap.xml +# and placed on the directory specified by HTML_OUTPUT. In case no SITEMAP_URL +# is specified no sitemap is generated. For information about the sitemap +# protocol see https://www.sitemaps.org +# This tag requires that the tag GENERATE_HTML is set to YES. + +SITEMAP_URL = + # If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and # QHP_VIRTUAL_FOLDER are set, an additional index file will be generated that # can be used as input for Qt's qhelpgenerator to generate a Qt Compressed Help @@ -1337,7 +1621,8 @@ QCH_FILE = # The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help # Project output. For more information please see Qt Help Project / Namespace -# (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#namespace). +# (see: +# https://doc.qt.io/archives/qt-4.8/qthelpproject.html#namespace). # The default value is: org.doxygen.Project. # This tag requires that the tag GENERATE_QHP is set to YES. @@ -1345,8 +1630,8 @@ QHP_NAMESPACE = org.doxygen.Project # The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt # Help Project output. For more information please see Qt Help Project / Virtual -# Folders (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#virtual- -# folders). +# Folders (see: +# https://doc.qt.io/archives/qt-4.8/qthelpproject.html#virtual-folders). # The default value is: doc. # This tag requires that the tag GENERATE_QHP is set to YES. @@ -1354,30 +1639,30 @@ QHP_VIRTUAL_FOLDER = doc # If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom # filter to add. For more information please see Qt Help Project / Custom -# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom- -# filters). +# Filters (see: +# https://doc.qt.io/archives/qt-4.8/qthelpproject.html#custom-filters). # This tag requires that the tag GENERATE_QHP is set to YES. QHP_CUST_FILTER_NAME = # The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the # custom filter to add. For more information please see Qt Help Project / Custom -# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom- -# filters). +# Filters (see: +# https://doc.qt.io/archives/qt-4.8/qthelpproject.html#custom-filters). # This tag requires that the tag GENERATE_QHP is set to YES. QHP_CUST_FILTER_ATTRS = # The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this # project's filter section matches. Qt Help Project / Filter Attributes (see: -# http://qt-project.org/doc/qt-4.8/qthelpproject.html#filter-attributes). +# https://doc.qt.io/archives/qt-4.8/qthelpproject.html#filter-attributes). # This tag requires that the tag GENERATE_QHP is set to YES. QHP_SECT_FILTER_ATTRS = -# The QHG_LOCATION tag can be used to specify the location of Qt's -# qhelpgenerator. If non-empty doxygen will try to run qhelpgenerator on the -# generated .qhp file. +# The QHG_LOCATION tag can be used to specify the location (absolute path +# including file name) of Qt's qhelpgenerator. If non-empty doxygen will try to +# run qhelpgenerator on the generated .qhp file. # This tag requires that the tag GENERATE_QHP is set to YES. QHG_LOCATION = @@ -1419,17 +1704,29 @@ DISABLE_INDEX = NO # index structure (just like the one that is generated for HTML Help). For this # to work a browser that supports JavaScript, DHTML, CSS and frames is required # (i.e. any modern browser). Windows users are probably better off using the -# HTML help feature. Via custom stylesheets (see HTML_EXTRA_STYLESHEET) one can -# further fine-tune the look of the index. As an example, the default style -# sheet generated by doxygen has an example that shows how to put an image at -# the root of the tree instead of the PROJECT_NAME. Since the tree basically has -# the same information as the tab index, you could consider setting -# DISABLE_INDEX to YES when enabling this option. +# HTML help feature. Via custom style sheets (see HTML_EXTRA_STYLESHEET) one can +# further fine tune the look of the index (see "Fine-tuning the output"). As an +# example, the default style sheet generated by doxygen has an example that +# shows how to put an image at the root of the tree instead of the PROJECT_NAME. +# Since the tree basically has the same information as the tab index, you could +# consider setting DISABLE_INDEX to YES when enabling this option. # The default value is: NO. # This tag requires that the tag GENERATE_HTML is set to YES. GENERATE_TREEVIEW = NO +# When both GENERATE_TREEVIEW and DISABLE_INDEX are set to YES, then the +# FULL_SIDEBAR option determines if the side bar is limited to only the treeview +# area (value NO) or if it should extend to the full height of the window (value +# YES). Setting this to YES gives a layout similar to +# https://docs.readthedocs.io with more room for contents, but less room for the +# project logo, title, and description. If either GENERATE_TREEVIEW or +# DISABLE_INDEX is set to NO, this option has no effect. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. + +FULL_SIDEBAR = NO + # The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that # doxygen will group on one line in the generated HTML documentation. # @@ -1447,13 +1744,31 @@ ENUM_VALUES_PER_LINE = 4 TREEVIEW_WIDTH = 250 -# When the EXT_LINKS_IN_WINDOW option is set to YES doxygen will open links to +# If the EXT_LINKS_IN_WINDOW option is set to YES, doxygen will open links to # external symbols imported via tag files in a separate window. # The default value is: NO. # This tag requires that the tag GENERATE_HTML is set to YES. EXT_LINKS_IN_WINDOW = NO +# If the OBFUSCATE_EMAILS tag is set to YES, doxygen will obfuscate email +# addresses. +# The default value is: YES. +# This tag requires that the tag GENERATE_HTML is set to YES. + +OBFUSCATE_EMAILS = YES + +# If the HTML_FORMULA_FORMAT option is set to svg, doxygen will use the pdf2svg +# tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see +# https://inkscape.org) to generate formulas as SVG images instead of PNGs for +# the HTML output. These images will generally look nicer at scaled resolutions. +# Possible values are: png (the default) and svg (looks nicer but requires the +# pdf2svg or inkscape tool). +# The default value is: png. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_FORMULA_FORMAT = png + # Use this tag to change the font size of LaTeX formulas included as images in # the HTML documentation. When you change the font size after a successful # doxygen run you need to manually remove any form_*.png images from the HTML @@ -1463,20 +1778,15 @@ EXT_LINKS_IN_WINDOW = NO FORMULA_FONTSIZE = 10 -# Use the FORMULA_TRANPARENT tag to determine whether or not the images -# generated for formulas are transparent PNGs. Transparent PNGs are not -# supported properly for IE 6.0, but are supported on all modern browsers. -# -# Note that when changing this option you need to delete any form_*.png files in -# the HTML output directory before the changes have effect. -# The default value is: YES. -# This tag requires that the tag GENERATE_HTML is set to YES. +# The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands +# to create new LaTeX commands to be used in formulas as building blocks. See +# the section "Including formulas" for details. -FORMULA_TRANSPARENT = YES +FORMULA_MACROFILE = # Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see -# http://www.mathjax.org) which uses client side Javascript for the rendering -# instead of using prerendered bitmaps. Use this if you do not have LaTeX +# https://www.mathjax.org) which uses client side JavaScript for the rendering +# instead of using pre-rendered bitmaps. Use this if you do not have LaTeX # installed or if you want to formulas look prettier in the HTML output. When # enabled you may also need to install MathJax separately and configure the path # to it using the MATHJAX_RELPATH option. @@ -1485,11 +1795,29 @@ FORMULA_TRANSPARENT = YES USE_MATHJAX = YES +# With MATHJAX_VERSION it is possible to specify the MathJax version to be used. +# Note that the different versions of MathJax have different requirements with +# regards to the different settings, so it is possible that also other MathJax +# settings have to be changed when switching between the different MathJax +# versions. +# Possible values are: MathJax_2 and MathJax_3. +# The default value is: MathJax_2. +# This tag requires that the tag USE_MATHJAX is set to YES. + +MATHJAX_VERSION = MathJax_2 + # When MathJax is enabled you can set the default output format to be used for -# the MathJax output. See the MathJax site (see: -# http://docs.mathjax.org/en/latest/output.html) for more details. +# the MathJax output. For more details about the output format see MathJax +# version 2 (see: +# http://docs.mathjax.org/en/v2.7-latest/output.html) and MathJax version 3 +# (see: +# http://docs.mathjax.org/en/latest/web/components/output.html). # Possible values are: HTML-CSS (which is slower, but has the best -# compatibility), NativeMML (i.e. MathML) and SVG. +# compatibility. This is the name for Mathjax version 2, for MathJax version 3 +# this will be translated into chtml), NativeMML (i.e. MathML. Only supported +# for NathJax 2. For MathJax version 3 chtml will be used instead.), chtml (This +# is the name for Mathjax version 3, for MathJax version 2 this will be +# translated into HTML-CSS) and SVG. # The default value is: HTML-CSS. # This tag requires that the tag USE_MATHJAX is set to YES. @@ -1502,22 +1830,29 @@ MATHJAX_FORMAT = HTML-CSS # MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax # Content Delivery Network so you can quickly see the result without installing # MathJax. However, it is strongly recommended to install a local copy of -# MathJax from http://www.mathjax.org before deployment. -# The default value is: http://cdn.mathjax.org/mathjax/latest. +# MathJax from https://www.mathjax.org before deployment. The default value is: +# - in case of MathJax version 2: https://cdn.jsdelivr.net/npm/mathjax@2 +# - in case of MathJax version 3: https://cdn.jsdelivr.net/npm/mathjax@3 # This tag requires that the tag USE_MATHJAX is set to YES. MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest # The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax # extension names that should be enabled during MathJax rendering. For example +# for MathJax version 2 (see +# https://docs.mathjax.org/en/v2.7-latest/tex.html#tex-and-latex-extensions): # MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols +# For example for MathJax version 3 (see +# http://docs.mathjax.org/en/latest/input/tex/extensions/index.html): +# MATHJAX_EXTENSIONS = ams # This tag requires that the tag USE_MATHJAX is set to YES. MATHJAX_EXTENSIONS = # The MATHJAX_CODEFILE tag can be used to specify a file with javascript pieces # of code that will be used on startup of the MathJax code. See the MathJax site -# (see: http://docs.mathjax.org/en/latest/output.html) for more details. For an +# (see: +# http://docs.mathjax.org/en/v2.7-latest/output.html) for more details. For an # example see the documentation. # This tag requires that the tag USE_MATHJAX is set to YES. @@ -1545,7 +1880,7 @@ MATHJAX_CODEFILE = SEARCHENGINE = YES # When the SERVER_BASED_SEARCH tag is enabled the search engine will be -# implemented using a web server instead of a web client using Javascript. There +# implemented using a web server instead of a web client using JavaScript. There # are two flavors of web server based searching depending on the EXTERNAL_SEARCH # setting. When disabled, doxygen will generate a PHP script for searching and # an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing @@ -1562,9 +1897,10 @@ SERVER_BASED_SEARCH = NO # external search engine pointed to by the SEARCHENGINE_URL option to obtain the # search results. # -# Doxygen ships with an example indexer ( doxyindexer) and search engine +# Doxygen ships with an example indexer (doxyindexer) and search engine # (doxysearch.cgi) which are based on the open source search engine library -# Xapian (see: http://xapian.org/). +# Xapian (see: +# https://xapian.org/). # # See the section "External Indexing and Searching" for details. # The default value is: NO. @@ -1575,10 +1911,11 @@ EXTERNAL_SEARCH = NO # The SEARCHENGINE_URL should point to a search engine hosted by a web server # which will return the search results when EXTERNAL_SEARCH is enabled. # -# Doxygen ships with an example indexer ( doxyindexer) and search engine +# Doxygen ships with an example indexer (doxyindexer) and search engine # (doxysearch.cgi) which are based on the open source search engine library -# Xapian (see: http://xapian.org/). See the section "External Indexing and -# Searching" for details. +# Xapian (see: +# https://xapian.org/). See the section "External Indexing and Searching" for +# details. # This tag requires that the tag SEARCHENGINE is set to YES. SEARCHENGINE_URL = @@ -1613,7 +1950,7 @@ EXTRA_SEARCH_MAPPINGS = # Configuration options related to the LaTeX output #--------------------------------------------------------------------------- -# If the GENERATE_LATEX tag is set to YES doxygen will generate LaTeX output. +# If the GENERATE_LATEX tag is set to YES, doxygen will generate LaTeX output. # The default value is: YES. GENERATE_LATEX = NO @@ -1629,22 +1966,36 @@ LATEX_OUTPUT = latex # The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be # invoked. # -# Note that when enabling USE_PDFLATEX this option is only used for generating -# bitmaps for formulas in the HTML output, but not in the Makefile that is -# written to the output directory. -# The default file is: latex. +# Note that when not enabling USE_PDFLATEX the default is latex when enabling +# USE_PDFLATEX the default is pdflatex and when in the later case latex is +# chosen this is overwritten by pdflatex. For specific output languages the +# default can have been set differently, this depends on the implementation of +# the output language. # This tag requires that the tag GENERATE_LATEX is set to YES. LATEX_CMD_NAME = latex # The MAKEINDEX_CMD_NAME tag can be used to specify the command name to generate # index for LaTeX. +# Note: This tag is used in the Makefile / make.bat. +# See also: LATEX_MAKEINDEX_CMD for the part in the generated output file +# (.tex). # The default file is: makeindex. # This tag requires that the tag GENERATE_LATEX is set to YES. MAKEINDEX_CMD_NAME = makeindex -# If the COMPACT_LATEX tag is set to YES doxygen generates more compact LaTeX +# The LATEX_MAKEINDEX_CMD tag can be used to specify the command name to +# generate index for LaTeX. In case there is no backslash (\) as first character +# it will be automatically added in the LaTeX code. +# Note: This tag is used in the generated output file (.tex). +# See also: MAKEINDEX_CMD_NAME for the part in the Makefile / make.bat. +# The default value is: makeindex. +# This tag requires that the tag GENERATE_LATEX is set to YES. + +LATEX_MAKEINDEX_CMD = makeindex + +# If the COMPACT_LATEX tag is set to YES, doxygen generates more compact LaTeX # documents. This may be useful for small projects and may help to save some # trees in general. # The default value is: NO. @@ -1662,41 +2013,57 @@ COMPACT_LATEX = NO PAPER_TYPE = a4 # The EXTRA_PACKAGES tag can be used to specify one or more LaTeX package names -# that should be included in the LaTeX output. To get the times font for -# instance you can specify -# EXTRA_PACKAGES=times +# that should be included in the LaTeX output. The package can be specified just +# by its name or with the correct syntax as to be used with the LaTeX +# \usepackage command. To get the times font for instance you can specify : +# EXTRA_PACKAGES=times or EXTRA_PACKAGES={times} +# To use the option intlimits with the amsmath package you can specify: +# EXTRA_PACKAGES=[intlimits]{amsmath} # If left blank no extra packages will be included. # This tag requires that the tag GENERATE_LATEX is set to YES. EXTRA_PACKAGES = -# The LATEX_HEADER tag can be used to specify a personal LaTeX header for the -# generated LaTeX document. The header should contain everything until the first -# chapter. If it is left blank doxygen will generate a standard header. See -# section "Doxygen usage" for information on how to let doxygen write the -# default header to a separate file. +# The LATEX_HEADER tag can be used to specify a user-defined LaTeX header for +# the generated LaTeX document. The header should contain everything until the +# first chapter. If it is left blank doxygen will generate a standard header. It +# is highly recommended to start with a default header using +# doxygen -w latex new_header.tex new_footer.tex new_stylesheet.sty +# and then modify the file new_header.tex. See also section "Doxygen usage" for +# information on how to generate the default header that doxygen normally uses. # -# Note: Only use a user-defined header if you know what you are doing! The -# following commands have a special meaning inside the header: $title, -# $datetime, $date, $doxygenversion, $projectname, $projectnumber, -# $projectbrief, $projectlogo. Doxygen will replace $title with the empy string, -# for the replacement values of the other commands the user is refered to -# HTML_HEADER. +# Note: Only use a user-defined header if you know what you are doing! +# Note: The header is subject to change so you typically have to regenerate the +# default header when upgrading to a newer version of doxygen. The following +# commands have a special meaning inside the header (and footer): For a +# description of the possible markers and block names see the documentation. # This tag requires that the tag GENERATE_LATEX is set to YES. LATEX_HEADER = -# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for the -# generated LaTeX document. The footer should contain everything after the last -# chapter. If it is left blank doxygen will generate a standard footer. See +# The LATEX_FOOTER tag can be used to specify a user-defined LaTeX footer for +# the generated LaTeX document. The footer should contain everything after the +# last chapter. If it is left blank doxygen will generate a standard footer. See # LATEX_HEADER for more information on how to generate a default footer and what -# special commands can be used inside the footer. -# -# Note: Only use a user-defined footer if you know what you are doing! +# special commands can be used inside the footer. See also section "Doxygen +# usage" for information on how to generate the default footer that doxygen +# normally uses. Note: Only use a user-defined footer if you know what you are +# doing! # This tag requires that the tag GENERATE_LATEX is set to YES. LATEX_FOOTER = +# The LATEX_EXTRA_STYLESHEET tag can be used to specify additional user-defined +# LaTeX style sheets that are included after the standard style sheets created +# by doxygen. Using this option one can overrule certain style aspects. Doxygen +# will copy the style sheet files to the output directory. +# Note: The order of the extra style sheet files is of importance (e.g. the last +# style sheet in the list overrules the setting of the previous ones in the +# list). +# This tag requires that the tag GENERATE_LATEX is set to YES. + +LATEX_EXTRA_STYLESHEET = + # The LATEX_EXTRA_FILES tag can be used to specify one or more extra images or # other source files which should be copied to the LATEX_OUTPUT output # directory. Note that the files will be copied as-is; there are no commands or @@ -1714,18 +2081,26 @@ LATEX_EXTRA_FILES = PDF_HYPERLINKS = YES -# If the USE_PDFLATEX tag is set to YES, doxygen will use pdflatex to generate -# the PDF file directly from the LaTeX files. Set this option to YES to get a -# higher quality PDF documentation. +# If the USE_PDFLATEX tag is set to YES, doxygen will use the engine as +# specified with LATEX_CMD_NAME to generate the PDF file directly from the LaTeX +# files. Set this option to YES, to get a higher quality PDF documentation. +# +# See also section LATEX_CMD_NAME for selecting the engine. # The default value is: YES. # This tag requires that the tag GENERATE_LATEX is set to YES. USE_PDFLATEX = YES -# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \batchmode -# command to the generated LaTeX files. This will instruct LaTeX to keep running -# if errors occur, instead of asking the user for help. This option is also used -# when generating formulas in HTML. +# The LATEX_BATCHMODE tag signals the behavior of LaTeX in case of an error. +# Possible values are: NO same as ERROR_STOP, YES same as BATCH, BATCH In batch +# mode nothing is printed on the terminal, errors are scrolled as if is +# hit at every error; missing files that TeX tries to input or request from +# keyboard input (\read on a not open input stream) cause the job to abort, +# NON_STOP In nonstop mode the diagnostic message will appear on the terminal, +# but there is no possibility of user interaction just like in batch mode, +# SCROLL In scroll mode, TeX will stop only for missing files to input or if +# keyboard input is necessary and ERROR_STOP In errorstop mode, TeX will stop at +# each error, asking for user intervention. # The default value is: NO. # This tag requires that the tag GENERATE_LATEX is set to YES. @@ -1738,29 +2113,27 @@ LATEX_BATCHMODE = NO LATEX_HIDE_INDICES = NO -# If the LATEX_SOURCE_CODE tag is set to YES then doxygen will include source -# code with syntax highlighting in the LaTeX output. -# -# Note that which sources are shown also depends on other settings such as -# SOURCE_BROWSER. -# The default value is: NO. -# This tag requires that the tag GENERATE_LATEX is set to YES. - -LATEX_SOURCE_CODE = NO - # The LATEX_BIB_STYLE tag can be used to specify the style to use for the # bibliography, e.g. plainnat, or ieeetr. See -# http://en.wikipedia.org/wiki/BibTeX and \cite for more info. +# https://en.wikipedia.org/wiki/BibTeX and \cite for more info. # The default value is: plain. # This tag requires that the tag GENERATE_LATEX is set to YES. LATEX_BIB_STYLE = plain +# The LATEX_EMOJI_DIRECTORY tag is used to specify the (relative or absolute) +# path from which the emoji images will be read. If a relative path is entered, +# it will be relative to the LATEX_OUTPUT directory. If left blank the +# LATEX_OUTPUT directory will be used. +# This tag requires that the tag GENERATE_LATEX is set to YES. + +LATEX_EMOJI_DIRECTORY = + #--------------------------------------------------------------------------- # Configuration options related to the RTF output #--------------------------------------------------------------------------- -# If the GENERATE_RTF tag is set to YES doxygen will generate RTF output. The +# If the GENERATE_RTF tag is set to YES, doxygen will generate RTF output. The # RTF output is optimized for Word 97 and may not look too pretty with other RTF # readers/editors. # The default value is: NO. @@ -1775,7 +2148,7 @@ GENERATE_RTF = NO RTF_OUTPUT = rtf -# If the COMPACT_RTF tag is set to YES doxygen generates more compact RTF +# If the COMPACT_RTF tag is set to YES, doxygen generates more compact RTF # documents. This may be useful for small projects and may help to save some # trees in general. # The default value is: NO. @@ -1795,9 +2168,9 @@ COMPACT_RTF = NO RTF_HYPERLINKS = NO -# Load stylesheet definitions from file. Syntax is similar to doxygen's config -# file, i.e. a series of assignments. You only have to provide replacements, -# missing definitions are set to their default value. +# Load stylesheet definitions from file. Syntax is similar to doxygen's +# configuration file, i.e. a series of assignments. You only have to provide +# replacements, missing definitions are set to their default value. # # See also section "Doxygen usage" for information on how to generate the # default style sheet that doxygen normally uses. @@ -1806,8 +2179,8 @@ RTF_HYPERLINKS = NO RTF_STYLESHEET_FILE = # Set optional variables used in the generation of an RTF document. Syntax is -# similar to doxygen's config file. A template extensions file can be generated -# using doxygen -e rtf extensionFile. +# similar to doxygen's configuration file. A template extensions file can be +# generated using doxygen -e rtf extensionFile. # This tag requires that the tag GENERATE_RTF is set to YES. RTF_EXTENSIONS_FILE = @@ -1816,7 +2189,7 @@ RTF_EXTENSIONS_FILE = # Configuration options related to the man page output #--------------------------------------------------------------------------- -# If the GENERATE_MAN tag is set to YES doxygen will generate man pages for +# If the GENERATE_MAN tag is set to YES, doxygen will generate man pages for # classes and files. # The default value is: NO. @@ -1860,7 +2233,7 @@ MAN_LINKS = NO # Configuration options related to the XML output #--------------------------------------------------------------------------- -# If the GENERATE_XML tag is set to YES doxygen will generate an XML file that +# If the GENERATE_XML tag is set to YES, doxygen will generate an XML file that # captures the structure of the code including all documentation. # The default value is: NO. @@ -1874,7 +2247,7 @@ GENERATE_XML = NO XML_OUTPUT = xml -# If the XML_PROGRAMLISTING tag is set to YES doxygen will dump the program +# If the XML_PROGRAMLISTING tag is set to YES, doxygen will dump the program # listings (including syntax highlighting and cross-referencing information) to # the XML output. Note that enabling this will significantly increase the size # of the XML output. @@ -1883,11 +2256,18 @@ XML_OUTPUT = xml XML_PROGRAMLISTING = YES +# If the XML_NS_MEMB_FILE_SCOPE tag is set to YES, doxygen will include +# namespace members in file scope as well, matching the HTML output. +# The default value is: NO. +# This tag requires that the tag GENERATE_XML is set to YES. + +XML_NS_MEMB_FILE_SCOPE = NO + #--------------------------------------------------------------------------- # Configuration options related to the DOCBOOK output #--------------------------------------------------------------------------- -# If the GENERATE_DOCBOOK tag is set to YES doxygen will generate Docbook files +# If the GENERATE_DOCBOOK tag is set to YES, doxygen will generate Docbook files # that can be used to generate PDF. # The default value is: NO. @@ -1901,32 +2281,49 @@ GENERATE_DOCBOOK = NO DOCBOOK_OUTPUT = docbook -# If the DOCBOOK_PROGRAMLISTING tag is set to YES doxygen will include the -# program listings (including syntax highlighting and cross-referencing -# information) to the DOCBOOK output. Note that enabling this will significantly -# increase the size of the DOCBOOK output. -# The default value is: NO. -# This tag requires that the tag GENERATE_DOCBOOK is set to YES. - -DOCBOOK_PROGRAMLISTING = NO - #--------------------------------------------------------------------------- # Configuration options for the AutoGen Definitions output #--------------------------------------------------------------------------- -# If the GENERATE_AUTOGEN_DEF tag is set to YES doxygen will generate an AutoGen -# Definitions (see http://autogen.sf.net) file that captures the structure of -# the code including all documentation. Note that this feature is still -# experimental and incomplete at the moment. +# If the GENERATE_AUTOGEN_DEF tag is set to YES, doxygen will generate an +# AutoGen Definitions (see https://autogen.sourceforge.net/) file that captures +# the structure of the code including all documentation. Note that this feature +# is still experimental and incomplete at the moment. # The default value is: NO. GENERATE_AUTOGEN_DEF = NO +#--------------------------------------------------------------------------- +# Configuration options related to Sqlite3 output +#--------------------------------------------------------------------------- + +# If the GENERATE_SQLITE3 tag is set to YES doxygen will generate a Sqlite3 +# database with symbols found by doxygen stored in tables. +# The default value is: NO. + +GENERATE_SQLITE3 = NO + +# The SQLITE3_OUTPUT tag is used to specify where the Sqlite3 database will be +# put. If a relative path is entered the value of OUTPUT_DIRECTORY will be put +# in front of it. +# The default directory is: sqlite3. +# This tag requires that the tag GENERATE_SQLITE3 is set to YES. + +SQLITE3_OUTPUT = sqlite3 + +# The SQLITE3_OVERWRITE_DB tag is set to YES, the existing doxygen_sqlite3.db +# database file will be recreated with each doxygen run. If set to NO, doxygen +# will warn if an a database file is already found and not modify it. +# The default value is: YES. +# This tag requires that the tag GENERATE_SQLITE3 is set to YES. + +SQLITE3_RECREATE_DB = YES + #--------------------------------------------------------------------------- # Configuration options related to the Perl module output #--------------------------------------------------------------------------- -# If the GENERATE_PERLMOD tag is set to YES doxygen will generate a Perl module +# If the GENERATE_PERLMOD tag is set to YES, doxygen will generate a Perl module # file that captures the structure of the code including all documentation. # # Note that this feature is still experimental and incomplete at the moment. @@ -1934,7 +2331,7 @@ GENERATE_AUTOGEN_DEF = NO GENERATE_PERLMOD = NO -# If the PERLMOD_LATEX tag is set to YES doxygen will generate the necessary +# If the PERLMOD_LATEX tag is set to YES, doxygen will generate the necessary # Makefile rules, Perl scripts and LaTeX code to be able to generate PDF and DVI # output from the Perl module output. # The default value is: NO. @@ -1942,9 +2339,9 @@ GENERATE_PERLMOD = NO PERLMOD_LATEX = NO -# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be nicely +# If the PERLMOD_PRETTY tag is set to YES, the Perl module output will be nicely # formatted so it can be parsed by a human reader. This is useful if you want to -# understand what is going on. On the other hand, if this tag is set to NO the +# understand what is going on. On the other hand, if this tag is set to NO, the # size of the Perl module output will be much smaller and Perl will parse it # just the same. # The default value is: YES. @@ -1964,14 +2361,14 @@ PERLMOD_MAKEVAR_PREFIX = # Configuration options related to the preprocessor #--------------------------------------------------------------------------- -# If the ENABLE_PREPROCESSING tag is set to YES doxygen will evaluate all +# If the ENABLE_PREPROCESSING tag is set to YES, doxygen will evaluate all # C-preprocessor directives found in the sources and include files. # The default value is: YES. ENABLE_PREPROCESSING = YES -# If the MACRO_EXPANSION tag is set to YES doxygen will expand all macro names -# in the source code. If set to NO only conditional compilation will be +# If the MACRO_EXPANSION tag is set to YES, doxygen will expand all macro names +# in the source code. If set to NO, only conditional compilation will be # performed. Macro expansion can be done in a controlled way by setting # EXPAND_ONLY_PREDEF to YES. # The default value is: NO. @@ -1987,7 +2384,7 @@ MACRO_EXPANSION = NO EXPAND_ONLY_PREDEF = NO -# If the SEARCH_INCLUDES tag is set to YES the includes files in the +# If the SEARCH_INCLUDES tag is set to YES, the include files in the # INCLUDE_PATH will be searched if a #include is found. # The default value is: YES. # This tag requires that the tag ENABLE_PREPROCESSING is set to YES. @@ -1996,7 +2393,8 @@ SEARCH_INCLUDES = YES # The INCLUDE_PATH tag can be used to specify one or more directories that # contain include files that are not input files but should be processed by the -# preprocessor. +# preprocessor. Note that the INCLUDE_PATH is not recursive, so the setting of +# RECURSIVE has no effect here. # This tag requires that the tag SEARCH_INCLUDES is set to YES. INCLUDE_PATH = @@ -2063,62 +2461,32 @@ TAGFILES = GENERATE_TAGFILE = -# If the ALLEXTERNALS tag is set to YES all external class will be listed in the -# class index. If set to NO only the inherited external classes will be listed. +# If the ALLEXTERNALS tag is set to YES, all external classes and namespaces +# will be listed in the class and namespace index. If set to NO, only the +# inherited external classes will be listed. # The default value is: NO. ALLEXTERNALS = NO -# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed in -# the modules index. If set to NO, only the current project's groups will be +# If the EXTERNAL_GROUPS tag is set to YES, all external groups will be listed +# in the topic index. If set to NO, only the current project's groups will be # listed. # The default value is: YES. EXTERNAL_GROUPS = YES -# If the EXTERNAL_PAGES tag is set to YES all external pages will be listed in +# If the EXTERNAL_PAGES tag is set to YES, all external pages will be listed in # the related pages index. If set to NO, only the current project's pages will # be listed. # The default value is: YES. EXTERNAL_PAGES = YES -# The PERL_PATH should be the absolute path and name of the perl script -# interpreter (i.e. the result of 'which perl'). -# The default file (with absolute path) is: /usr/bin/perl. - -PERL_PATH = /usr/bin/perl - #--------------------------------------------------------------------------- -# Configuration options related to the dot tool +# Configuration options related to diagram generator tools #--------------------------------------------------------------------------- -# If the CLASS_DIAGRAMS tag is set to YES doxygen will generate a class diagram -# (in HTML and LaTeX) for classes with base or super classes. Setting the tag to -# NO turns the diagrams off. Note that this option also works with HAVE_DOT -# disabled, but it is recommended to install and use dot, since it yields more -# powerful graphs. -# The default value is: YES. - -CLASS_DIAGRAMS = NO - -# You can define message sequence charts within doxygen comments using the \msc -# command. Doxygen will then run the mscgen tool (see: -# http://www.mcternan.me.uk/mscgen/)) to produce the chart and insert it in the -# documentation. The MSCGEN_PATH tag allows you to specify the directory where -# the mscgen tool resides. If left empty the tool is assumed to be found in the -# default search path. - -MSCGEN_PATH = - -# You can include diagrams made with dia in doxygen documentation. Doxygen will -# then run dia to produce the diagram and insert it in the documentation. The -# DIA_PATH tag allows you to specify the directory where the dia binary resides. -# If left empty dia is assumed to be found in the default search path. - -DIA_PATH = - -# If set to YES, the inheritance and collaboration graphs will hide inheritance +# If set to YES the inheritance and collaboration graphs will hide inheritance # and usage relations if the target is undocumented or is not a class. # The default value is: YES. @@ -2126,7 +2494,7 @@ HIDE_UNDOC_RELATIONS = YES # If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is # available from the path. This tool is part of Graphviz (see: -# http://www.graphviz.org/), a graph visualization toolkit from AT&T and Lucent +# https://www.graphviz.org/), a graph visualization toolkit from AT&T and Lucent # Bell Labs. The other options in this section have no effect if this option is # set to NO # The default value is: YES. @@ -2143,55 +2511,79 @@ HAVE_DOT = NO DOT_NUM_THREADS = 0 -# When you want a differently looking font in the dot files that doxygen -# generates you can specify the font name using DOT_FONTNAME. You need to make -# sure dot is able to find the font, which can be done by putting it in a -# standard location or by setting the DOTFONTPATH environment variable or by -# setting DOT_FONTPATH to the directory containing the font. -# The default value is: Helvetica. +# DOT_COMMON_ATTR is common attributes for nodes, edges and labels of +# subgraphs. When you want a differently looking font in the dot files that +# doxygen generates you can specify fontname, fontcolor and fontsize attributes. +# For details please see Node, +# Edge and Graph Attributes specification You need to make sure dot is able +# to find the font, which can be done by putting it in a standard location or by +# setting the DOTFONTPATH environment variable or by setting DOT_FONTPATH to the +# directory containing the font. Default graphviz fontsize is 14. +# The default value is: fontname=Helvetica,fontsize=10. # This tag requires that the tag HAVE_DOT is set to YES. -DOT_FONTNAME = Helvetica +DOT_COMMON_ATTR = "fontname=Helvetica,fontsize=10" -# The DOT_FONTSIZE tag can be used to set the size (in points) of the font of -# dot graphs. -# Minimum value: 4, maximum value: 24, default value: 10. +# DOT_EDGE_ATTR is concatenated with DOT_COMMON_ATTR. For elegant style you can +# add 'arrowhead=open, arrowtail=open, arrowsize=0.5'. Complete documentation about +# arrows shapes. +# The default value is: labelfontname=Helvetica,labelfontsize=10. # This tag requires that the tag HAVE_DOT is set to YES. -DOT_FONTSIZE = 10 +DOT_EDGE_ATTR = "labelfontname=Helvetica,labelfontsize=10" -# By default doxygen will tell dot to use the default font as specified with -# DOT_FONTNAME. If you specify a different font using DOT_FONTNAME you can set -# the path where dot can find it using this tag. +# DOT_NODE_ATTR is concatenated with DOT_COMMON_ATTR. For view without boxes +# around nodes set 'shape=plain' or 'shape=plaintext' Shapes specification +# The default value is: shape=box,height=0.2,width=0.4. +# This tag requires that the tag HAVE_DOT is set to YES. + +DOT_NODE_ATTR = "shape=box,height=0.2,width=0.4" + +# You can set the path where dot can find font specified with fontname in +# DOT_COMMON_ATTR and others dot attributes. # This tag requires that the tag HAVE_DOT is set to YES. DOT_FONTPATH = -# If the CLASS_GRAPH tag is set to YES then doxygen will generate a graph for -# each documented class showing the direct and indirect inheritance relations. -# Setting this tag to YES will force the CLASS_DIAGRAMS tag to NO. +# If the CLASS_GRAPH tag is set to YES or GRAPH or BUILTIN then doxygen will +# generate a graph for each documented class showing the direct and indirect +# inheritance relations. In case the CLASS_GRAPH tag is set to YES or GRAPH and +# HAVE_DOT is enabled as well, then dot will be used to draw the graph. In case +# the CLASS_GRAPH tag is set to YES and HAVE_DOT is disabled or if the +# CLASS_GRAPH tag is set to BUILTIN, then the built-in generator will be used. +# If the CLASS_GRAPH tag is set to TEXT the direct and indirect inheritance +# relations will be shown as texts / links. +# Possible values are: NO, YES, TEXT, GRAPH and BUILTIN. # The default value is: YES. -# This tag requires that the tag HAVE_DOT is set to YES. -CLASS_GRAPH = YES +CLASS_GRAPH = TEXT # If the COLLABORATION_GRAPH tag is set to YES then doxygen will generate a # graph for each documented class showing the direct and indirect implementation # dependencies (inheritance, containment, and class references variables) of the -# class with other documented classes. +# class with other documented classes. Explicit enabling a collaboration graph, +# when COLLABORATION_GRAPH is set to NO, can be accomplished by means of the +# command \collaborationgraph. Disabling a collaboration graph can be +# accomplished by means of the command \hidecollaborationgraph. # The default value is: YES. # This tag requires that the tag HAVE_DOT is set to YES. COLLABORATION_GRAPH = YES # If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for -# groups, showing the direct groups dependencies. +# groups, showing the direct groups dependencies. Explicit enabling a group +# dependency graph, when GROUP_GRAPHS is set to NO, can be accomplished by means +# of the command \groupgraph. Disabling a directory graph can be accomplished by +# means of the command \hidegroupgraph. See also the chapter Grouping in the +# manual. # The default value is: YES. # This tag requires that the tag HAVE_DOT is set to YES. GROUP_GRAPHS = YES -# If the UML_LOOK tag is set to YES doxygen will generate inheritance and +# If the UML_LOOK tag is set to YES, doxygen will generate inheritance and # collaboration diagrams in a style similar to the OMG's Unified Modeling # Language. # The default value is: NO. @@ -2208,10 +2600,32 @@ UML_LOOK = NO # but if the number exceeds 15, the total amount of fields shown is limited to # 10. # Minimum value: 0, maximum value: 100, default value: 10. -# This tag requires that the tag HAVE_DOT is set to YES. +# This tag requires that the tag UML_LOOK is set to YES. UML_LIMIT_NUM_FIELDS = 10 +# If the DOT_UML_DETAILS tag is set to NO, doxygen will show attributes and +# methods without types and arguments in the UML graphs. If the DOT_UML_DETAILS +# tag is set to YES, doxygen will add type and arguments for attributes and +# methods in the UML graphs. If the DOT_UML_DETAILS tag is set to NONE, doxygen +# will not generate fields with class member information in the UML graphs. The +# class diagrams will look similar to the default class diagrams but using UML +# notation for the relationships. +# Possible values are: NO, YES and NONE. +# The default value is: NO. +# This tag requires that the tag UML_LOOK is set to YES. + +DOT_UML_DETAILS = NO + +# The DOT_WRAP_THRESHOLD tag can be used to set the maximum number of characters +# to display on a single line. If the actual line length exceeds this threshold +# significantly it will wrapped across multiple lines. Some heuristics are apply +# to avoid ugly line breaks. +# Minimum value: 0, maximum value: 1000, default value: 17. +# This tag requires that the tag HAVE_DOT is set to YES. + +DOT_WRAP_THRESHOLD = 17 + # If the TEMPLATE_RELATIONS tag is set to YES then the inheritance and # collaboration graphs will show the relations between templates and their # instances. @@ -2223,7 +2637,9 @@ TEMPLATE_RELATIONS = NO # If the INCLUDE_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are set to # YES then doxygen will generate a graph for each documented file showing the # direct and indirect include dependencies of the file with other documented -# files. +# files. Explicit enabling an include graph, when INCLUDE_GRAPH is is set to NO, +# can be accomplished by means of the command \includegraph. Disabling an +# include graph can be accomplished by means of the command \hideincludegraph. # The default value is: YES. # This tag requires that the tag HAVE_DOT is set to YES. @@ -2232,7 +2648,10 @@ INCLUDE_GRAPH = YES # If the INCLUDED_BY_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are # set to YES then doxygen will generate a graph for each documented file showing # the direct and indirect include dependencies of the file with other documented -# files. +# files. Explicit enabling an included by graph, when INCLUDED_BY_GRAPH is set +# to NO, can be accomplished by means of the command \includedbygraph. Disabling +# an included by graph can be accomplished by means of the command +# \hideincludedbygraph. # The default value is: YES. # This tag requires that the tag HAVE_DOT is set to YES. @@ -2243,7 +2662,8 @@ INCLUDED_BY_GRAPH = YES # # Note that enabling this option will significantly increase the time of a run. # So in most cases it will be better to enable call graphs for selected -# functions only using the \callgraph command. +# functions only using the \callgraph command. Disabling a call graph can be +# accomplished by means of the command \hidecallgraph. # The default value is: NO. # This tag requires that the tag HAVE_DOT is set to YES. @@ -2254,7 +2674,8 @@ CALL_GRAPH = NO # # Note that enabling this option will significantly increase the time of a run. # So in most cases it will be better to enable caller graphs for selected -# functions only using the \callergraph command. +# functions only using the \callergraph command. Disabling a caller graph can be +# accomplished by means of the command \hidecallergraph. # The default value is: NO. # This tag requires that the tag HAVE_DOT is set to YES. @@ -2270,20 +2691,33 @@ GRAPHICAL_HIERARCHY = YES # If the DIRECTORY_GRAPH tag is set to YES then doxygen will show the # dependencies a directory has on other directories in a graphical way. The # dependency relations are determined by the #include relations between the -# files in the directories. +# files in the directories. Explicit enabling a directory graph, when +# DIRECTORY_GRAPH is set to NO, can be accomplished by means of the command +# \directorygraph. Disabling a directory graph can be accomplished by means of +# the command \hidedirectorygraph. # The default value is: YES. # This tag requires that the tag HAVE_DOT is set to YES. DIRECTORY_GRAPH = YES +# The DIR_GRAPH_MAX_DEPTH tag can be used to limit the maximum number of levels +# of child directories generated in directory dependency graphs by dot. +# Minimum value: 1, maximum value: 25, default value: 1. +# This tag requires that the tag DIRECTORY_GRAPH is set to YES. + +DIR_GRAPH_MAX_DEPTH = 1 + # The DOT_IMAGE_FORMAT tag can be used to set the image format of the images -# generated by dot. +# generated by dot. For an explanation of the image formats see the section +# output formats in the documentation of the dot tool (Graphviz (see: +# https://www.graphviz.org/)). # Note: If you choose svg you need to set HTML_FILE_EXTENSION to xhtml in order # to make the SVG files visible in IE 9+ (other browsers do not have this # requirement). -# Possible values are: png, png:cairo, png:cairo:cairo, png:cairo:gd, png:gd, -# png:gd:gd, jpg, jpg:cairo, jpg:cairo:gd, jpg:gd, jpg:gd:gd, gif, gif:cairo, -# gif:cairo:gd, gif:gd, gif:gd:gd and svg. +# Possible values are: png, jpg, jpg:cairo, jpg:cairo:gd, jpg:gd, jpg:gd:gd, +# gif, gif:cairo, gif:cairo:gd, gif:gd, gif:gd:gd, svg, png:gd, png:gd:gd, +# png:cairo, png:cairo:gd, png:cairo:cairo, png:cairo:gdiplus, png:gdiplus and +# png:gdiplus:gdiplus. # The default value is: png. # This tag requires that the tag HAVE_DOT is set to YES. @@ -2314,11 +2748,12 @@ DOT_PATH = DOTFILE_DIRS = -# The MSCFILE_DIRS tag can be used to specify one or more directories that -# contain msc files that are included in the documentation (see the \mscfile -# command). +# You can include diagrams made with dia in doxygen documentation. Doxygen will +# then run dia to produce the diagram and insert it in the documentation. The +# DIA_PATH tag allows you to specify the directory where the dia binary resides. +# If left empty dia is assumed to be found in the default search path. -MSCFILE_DIRS = +DIA_PATH = # The DIAFILE_DIRS tag can be used to specify one or more directories that # contain dia files that are included in the documentation (see the \diafile @@ -2327,14 +2762,23 @@ MSCFILE_DIRS = DIAFILE_DIRS = # When using plantuml, the PLANTUML_JAR_PATH tag should be used to specify the -# path where java can find the plantuml.jar file. If left blank, it is assumed -# PlantUML is not used or called during a preprocessing step. Doxygen will -# generate a warning when it encounters a \startuml command in this case and -# will not generate output for the diagram. -# This tag requires that the tag HAVE_DOT is set to YES. +# path where java can find the plantuml.jar file or to the filename of jar file +# to be used. If left blank, it is assumed PlantUML is not used or called during +# a preprocessing step. Doxygen will generate a warning when it encounters a +# \startuml command in this case and will not generate output for the diagram. PLANTUML_JAR_PATH = +# When using plantuml, the PLANTUML_CFG_FILE tag can be used to specify a +# configuration file for plantuml. + +PLANTUML_CFG_FILE = + +# When using plantuml, the specified paths are searched for files specified by +# the !include statement in a plantuml block. + +PLANTUML_INCLUDE_PATH = + # The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of nodes # that will be shown in the graph. If the number of nodes in a graph becomes # larger than this value, doxygen will truncate the graph, which is visualized @@ -2359,19 +2803,7 @@ DOT_GRAPH_MAX_NODES = 50 MAX_DOT_GRAPH_DEPTH = 0 -# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent -# background. This is disabled by default, because dot on Windows does not seem -# to support this out of the box. -# -# Warning: Depending on the platform used, enabling this option may lead to -# badly anti-aliased labels on the edges of a graph (i.e. they become hard to -# read). -# The default value is: NO. -# This tag requires that the tag HAVE_DOT is set to YES. - -DOT_TRANSPARENT = NO - -# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output +# Set the DOT_MULTI_TARGETS tag to YES to allow dot to generate multiple output # files in one run (i.e. multiple -o and -T options on the command line). This # makes dot run faster, but since only newer versions of dot (>1.8.10) support # this, this feature is disabled by default. @@ -2383,14 +2815,34 @@ DOT_MULTI_TARGETS = NO # If the GENERATE_LEGEND tag is set to YES doxygen will generate a legend page # explaining the meaning of the various boxes and arrows in the dot generated # graphs. +# Note: This tag requires that UML_LOOK isn't set, i.e. the doxygen internal +# graphical representation for inheritance and collaboration diagrams is used. # The default value is: YES. # This tag requires that the tag HAVE_DOT is set to YES. GENERATE_LEGEND = YES -# If the DOT_CLEANUP tag is set to YES doxygen will remove the intermediate dot +# If the DOT_CLEANUP tag is set to YES, doxygen will remove the intermediate # files that are used to generate the various graphs. +# +# Note: This setting is not only used for dot files but also for msc temporary +# files. # The default value is: YES. -# This tag requires that the tag HAVE_DOT is set to YES. DOT_CLEANUP = YES + +# You can define message sequence charts within doxygen comments using the \msc +# command. If the MSCGEN_TOOL tag is left empty (the default), then doxygen will +# use a built-in version of mscgen tool to produce the charts. Alternatively, +# the MSCGEN_TOOL tag can also specify the name an external tool. For instance, +# specifying prog as the value, doxygen will call the tool as prog -T +# -o . The external tool should support +# output file formats "png", "eps", "svg", and "ismap". + +MSCGEN_TOOL = + +# The MSCFILE_DIRS tag can be used to specify one or more directories that +# contain msc files that are included in the documentation (see the \mscfile +# command). + +MSCFILE_DIRS = From 234fcfeebf312436e0e154a596148b8ea6a540db Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Wed, 5 Mar 2025 16:40:23 -0600 Subject: [PATCH 160/238] doc: added Doxygen support for light and dark modes --- host/libraries/libbladeRF/doc/doxygen/Doxyfile.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/host/libraries/libbladeRF/doc/doxygen/Doxyfile.in b/host/libraries/libbladeRF/doc/doxygen/Doxyfile.in index 9729a38b..f2d060b0 100644 --- a/host/libraries/libbladeRF/doc/doxygen/Doxyfile.in +++ b/host/libraries/libbladeRF/doc/doxygen/Doxyfile.in @@ -1405,7 +1405,7 @@ HTML_EXTRA_FILES = # The default value is: AUTO_LIGHT. # This tag requires that the tag GENERATE_HTML is set to YES. -HTML_COLORSTYLE = AUTO_LIGHT +HTML_COLORSTYLE = TOGGLE # The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen # will adjust the colors in the style sheet and background images according to @@ -1435,7 +1435,7 @@ HTML_COLORSTYLE_SAT = 32 # Minimum value: 40, maximum value: 240, default value: 80. # This tag requires that the tag GENERATE_HTML is set to YES. -HTML_COLORSTYLE_GAMMA = 189 +HTML_COLORSTYLE_GAMMA = 80 # If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML # documentation will contain a main index with vertical navigation menus that From 90bd8bb9cc93f7ba1a8ec769bfe099329fb6a510 Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Mon, 10 Mar 2025 19:09:13 -0500 Subject: [PATCH 161/238] doc: update sync config buffer size description --- host/libraries/libbladeRF/include/libbladeRF.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/host/libraries/libbladeRF/include/libbladeRF.h b/host/libraries/libbladeRF/include/libbladeRF.h index 3524f50b..8ef9f166 100644 --- a/host/libraries/libbladeRF/include/libbladeRF.h +++ b/host/libraries/libbladeRF/include/libbladeRF.h @@ -2757,9 +2757,10 @@ int CALL_CONV bladerf_get_timestamp(struct bladerf *dev, * data stream. This must be greater than the * `num_xfers` parameter. * @param[in] buffer_size The size of the underlying stream buffers, in - * samples. This value must be a multiple of 2048. - * Note that samples are only transferred when a - * buffer of this size is filled. + * samples. Must be a multiple of: + * - 8192 bytes (2048 for FW < v2.5.0) + * - For SC16_Q11_PACKED format, multiply by 3 + * Invalid sizes are automatically rounded up. * @param[in] num_transfers The number of active USB transfers that may be * in-flight at any given time. If unsure of what * to use here, try values of 4, 8, or 16. From bd5d06879b0b0f16348b15f3ca6fbfe2ca5ad803 Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Fri, 21 Feb 2025 11:42:01 -0600 Subject: [PATCH 162/238] build_bladerf: added parallel build for hosted 40, 115, A4, A9 FPGAs usage: ./build_bladerf.sh -H --- hdl/quartus/build_bladerf.sh | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/hdl/quartus/build_bladerf.sh b/hdl/quartus/build_bladerf.sh index a1e9e742..b87e39e7 100755 --- a/hdl/quartus/build_bladerf.sh +++ b/hdl/quartus/build_bladerf.sh @@ -33,6 +33,7 @@ function usage() echo " -r Quartus project revision" echo " -s FPGA size" echo " -a SignalTap STP file" + echo " -H Build all hosted configurations" echo " -f Force SignalTap STP insertion by temporarily enabling" echo " the TalkBack feature of Quartus (required for Web Edition)." echo " The previous setting will be restored afterward." @@ -126,7 +127,7 @@ nios_rev="Tiny" flow="full" seed="1" -while getopts ":cb:r:s:a:fn:l:S:h" opt; do +while getopts ":cb:r:s:a:Hfn:l:S:h" opt; do case $opt in c) clear_work_dir=1 @@ -149,6 +150,10 @@ while getopts ":cb:r:s:a:fn:l:S:h" opt; do stp=$(readlink -f $OPTARG) ;; + H) + build_hosted=1 + ;; + f) echo "Forcing STP insertion" force="-force" @@ -183,6 +188,30 @@ while getopts ":cb:r:s:a:fn:l:S:h" opt; do esac done +if [ "$build_hosted" == "1" ]; then + mkdir -p build_logs + build_pids=() + + for config in "bladeRF 40" "bladeRF 115" "bladeRF-micro A4" "bladeRF-micro A9"; do + read -r board size <<< "$config" + echo "Starting build for $board hosted $size..." + $0 -b "$board" -r hosted -s "$size" > "build_logs/$board-hosted-$size.log" 2>&1 & + build_pids+=($!) + done + + echo "Waiting for ${#build_pids[@]} hosted builds to complete..." + + for pid in "${build_pids[@]}"; do + if ! wait "$pid"; then + echo "Build failed. Check build_logs directory for details." + exit 1 + fi + done + + echo "All hosted builds completed successfully!" + exit 0 +fi + if [ "$board" == "" ]; then echo -e "\nError: board (-b) is required\n" >&2 print_boards From 50eaaa6e0ccd90c970bd409799ca235195ea6f5d Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Thu, 20 Feb 2025 10:46:53 -0600 Subject: [PATCH 163/238] libbladeRF: added direction to transfer timeout errors --- host/libraries/libbladeRF/src/backend/usb/libusb.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/host/libraries/libbladeRF/src/backend/usb/libusb.c b/host/libraries/libbladeRF/src/backend/usb/libusb.c index e23ce61c..ef3d3aaa 100644 --- a/host/libraries/libbladeRF/src/backend/usb/libusb.c +++ b/host/libraries/libbladeRF/src/backend/usb/libusb.c @@ -1086,7 +1086,8 @@ static void LIBUSB_CALL lusb_stream_cb(struct libusb_transfer *transfer) break; case LIBUSB_TRANSFER_TIMED_OUT: - log_error("Transfer timed out for buffer %p\n\r", + log_error("Transfer timed out for %s buffer %p\n\r", + (stream->layout & BLADERF_DIRECTION_MASK) == BLADERF_TX ? "TX" : "RX", transfer->buffer); stream->error_code = BLADERF_ERR_TIMEOUT; break; From ecbfb99b8a3f30cccbe883edf0ae0500a172ccb1 Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Thu, 20 Mar 2025 15:48:48 -0500 Subject: [PATCH 164/238] libbladeRF: log sample rate ranges on failed sample rate assignment --- .../libbladeRF/src/board/bladerf2/bladerf2.c | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/host/libraries/libbladeRF/src/board/bladerf2/bladerf2.c b/host/libraries/libbladeRF/src/board/bladerf2/bladerf2.c index 3ba901fb..9fd7ee55 100644 --- a/host/libraries/libbladeRF/src/board/bladerf2/bladerf2.c +++ b/host/libraries/libbladeRF/src/board/bladerf2/bladerf2.c @@ -1072,17 +1072,17 @@ static int bladerf2_set_sample_rate(struct bladerf *dev, CHECK_STATUS(dev->board->get_sample_rate_range(dev, ch, &range)); if (!is_within_range(range, rate)) { - return BLADERF_ERR_RANGE; - } - - /* Feature range check */ - if (dev->feature == BLADERF_FEATURE_OVERSAMPLE && - !is_within_range(&bladerf2_sample_rate_range_oversample, rate)) { - log_error("Sample rate outside of OVERSAMPLE feature range\n"); - return BLADERF_ERR_RANGE; - } else if (dev->feature == BLADERF_FEATURE_DEFAULT && - !is_within_range(&bladerf2_sample_rate_range_base, rate)) { - log_error("Sample rate outside of DEFAULT feature range\n"); + log_error("Sample rate %.3f MHz is out of range\n" + "Available ranges:\n" + " Normal operating range: %.3f MHz to %.3f MHz%s\n" + " Oversample feature range: %.3f MHz to %.3f MHz%s\n", + rate/1e6, + bladerf2_sample_rate_range_base.min/1e6, + bladerf2_sample_rate_range_base.max/1e6, + (dev->feature == BLADERF_FEATURE_DEFAULT) ? " (current)" : "", + bladerf2_sample_rate_range_oversample.min/1e6, + bladerf2_sample_rate_range_oversample.max/1e6, + (dev->feature == BLADERF_FEATURE_OVERSAMPLE) ? " (current)" : ""); return BLADERF_ERR_RANGE; } From 4ef9a72242168155649bedac65c6b8c193fb91d7 Mon Sep 17 00:00:00 2001 From: Robert Ghilduta Date: Sun, 23 Mar 2025 03:54:22 -0700 Subject: [PATCH 165/238] bladeRF-update: upgrade utility for firmware and FPGA updates This commit introduces a new utility, bladeRF-update, which checks for and optionally installs updates for the bladeRF firmware and FPGA images. The utility provides functionality to download, verify, and update firmware and FPGA files based on version information retrieved from the official Nuand server. --- host/utilities/CMakeLists.txt | 1 + host/utilities/bladeRF-update/CMakeLists.txt | 37 + .../utilities/bladeRF-update/bladeRF-update.c | 1420 +++++++++++++++++ host/utilities/bladeRF-update/bladeRF_json.c | 220 +++ host/utilities/bladeRF-update/bladeRF_json.h | 73 + 5 files changed, 1751 insertions(+) create mode 100644 host/utilities/bladeRF-update/CMakeLists.txt create mode 100644 host/utilities/bladeRF-update/bladeRF-update.c create mode 100644 host/utilities/bladeRF-update/bladeRF_json.c create mode 100644 host/utilities/bladeRF-update/bladeRF_json.h diff --git a/host/utilities/CMakeLists.txt b/host/utilities/CMakeLists.txt index 3603551b..121a29a5 100644 --- a/host/utilities/CMakeLists.txt +++ b/host/utilities/CMakeLists.txt @@ -3,3 +3,4 @@ cmake_minimum_required(VERSION 3.5) add_subdirectory(bladeRF-cli) add_subdirectory(bladeRF-fsk/c) add_subdirectory(bladeRF-power) +add_subdirectory(bladeRF-update) diff --git a/host/utilities/bladeRF-update/CMakeLists.txt b/host/utilities/bladeRF-update/CMakeLists.txt new file mode 100644 index 00000000..dd9d35fb --- /dev/null +++ b/host/utilities/bladeRF-update/CMakeLists.txt @@ -0,0 +1,37 @@ +cmake_minimum_required(VERSION 3.11) # Increased for FetchContent +project(bladeRF-update C) + +include(FetchContent) + +set(INCLUDES + ${libbladeRF_SOURCE_DIR}/include + ${CMAKE_CURRENT_SOURCE_DIR}/../../common/include + ${CMAKE_CURRENT_SOURCE_DIR} +) + +# Platform-specific configurations +if(WIN32) + list(APPEND LIBS wininet) + add_definitions(-D_CRT_SECURE_NO_WARNINGS) +elseif(UNIX) + find_package(CURL REQUIRED) + list(APPEND INCLUDES ${CURL_INCLUDE_DIRS}) + list(APPEND LIBS ${CURL_LIBRARIES}) +endif() + +set(JSON_C_SOURCES "") + +add_executable(bladeRF-update + bladeRF-update.c + bladeRF_json.c + ${BLADERF_HOST_COMMON_SOURCE_DIR}/sha256.c + ${JSON_C_SOURCES} +) + +# Add libbladeRF to the list of libraries +list(APPEND LIBS libbladerf_shared) + +target_link_libraries(bladeRF-update ${LIBS}) +target_include_directories(bladeRF-update PUBLIC ${INCLUDES}) + +install(TARGETS bladeRF-update DESTINATION ${CMAKE_INSTALL_BINDIR}) diff --git a/host/utilities/bladeRF-update/bladeRF-update.c b/host/utilities/bladeRF-update/bladeRF-update.c new file mode 100644 index 00000000..efe77288 --- /dev/null +++ b/host/utilities/bladeRF-update/bladeRF-update.c @@ -0,0 +1,1420 @@ +#include +#include +#include +#include +#include + +#include +#include +#include +#include + +#ifdef _WIN32 +#include +#include +#else +#include +#include +#endif +#ifdef _WIN32 +#include +#include +#else +#include +#endif + +// Cross-platform file_exists function +bool file_exists(const char *filename) { + struct stat buffer; + return (stat(filename, &buffer) == 0); +} + +#include "sha256.h" + +#include "bladeRF_json.h" + +#define JSON_URL "https://nuand.com/versions.json" +#define BUFFER_SIZE 16384 +#define MAX_VERSION_LENGTH 32 +#define MAX_FILENAME_LENGTH 256 +#define MAX_HASH_LENGTH 64 +#define MAX_PATH_LENGTH 4096 // This should be sufficient for most Unix-like systems + +#define MAX_SEARCH_PATHS 10 + +// Add a global variable for verbose output +bool verbose_output = false; + +typedef struct { + char **paths; + int count; +} FPGASearchPaths; + +// Function to check if a directory exists +static bool directory_exists(const char *path) { +#ifdef _WIN32 + DWORD attrib = GetFileAttributesA(path); + return (attrib != INVALID_FILE_ATTRIBUTES && (attrib & FILE_ATTRIBUTE_DIRECTORY)); +#else + struct stat st; + return (stat(path, &st) == 0 && S_ISDIR(st.st_mode)); +#endif +} + +// Modified helper function to add a path if it exists +void add_path_if_exists(const char *path, FPGASearchPaths *search_paths) +{ + // check to make sure path is unique + for (int i = 0; i < search_paths->count; i++) { + if (strcmp(search_paths->paths[i], path) == 0) { + return; + } + } + if (directory_exists(path) && search_paths->count < MAX_SEARCH_PATHS) { + search_paths->paths[search_paths->count] = strdup(path); + search_paths->count++; + } +} + +// Helper function to create directory if it doesn't exist +bool create_directory_if_not_exists(const char *path) { +#ifdef _WIN32 + if (CreateDirectoryA(path, NULL) || GetLastError() == ERROR_ALREADY_EXISTS) { + return true; + } + return false; +#else + if (mkdir(path, 0755) == 0 || errno == EEXIST) { + return true; + } + return false; +#endif +} + +// Function to get the preferred download directory +char* get_preferred_download_path() { + static char download_path[MAX_PATH_LENGTH] = {0}; + +#ifdef _WIN32 + // Get the Roaming AppData folder + char appdata_path[MAX_PATH]; + if (SHGetFolderPathA(NULL, CSIDL_APPDATA, NULL, 0, appdata_path) != S_OK) { + return NULL; + } + + // Construct the Nuand directory path + snprintf(download_path, sizeof(download_path), "%s\\Nuand", appdata_path); + if (!create_directory_if_not_exists(download_path)) { + return NULL; + } + + // Construct the bladeRF directory path + snprintf(download_path, sizeof(download_path), "%s\\Nuand\\bladeRF", appdata_path); + if (!create_directory_if_not_exists(download_path)) { + return NULL; + } +#else + // Unix-like systems (Linux, macOS) + const char *home = getenv("HOME"); + if (!home) { + struct passwd *pw = getpwuid(getuid()); + if (pw) { + home = pw->pw_dir; + } else { + return NULL; + } + } + + // Construct ~/.config directory if it doesn't exist + snprintf(download_path, sizeof(download_path), "%s/.config", home); + if (!create_directory_if_not_exists(download_path)) { + return NULL; + } + + // Construct ~/.config/Nuand directory if it doesn't exist + snprintf(download_path, sizeof(download_path), "%s/.config/Nuand", home); + if (!create_directory_if_not_exists(download_path)) { + return NULL; + } + + // Construct ~/.config/Nuand/bladeRF directory if it doesn't exist + snprintf(download_path, sizeof(download_path), "%s/.config/Nuand/bladeRF", home); + if (!create_directory_if_not_exists(download_path)) { + return NULL; + } +#endif + + return download_path; +} + +// Implementation of bladerf_get_fpga_paths +FPGASearchPaths* bladerf_get_fpga_paths(void) { + FPGASearchPaths *search_paths = malloc(sizeof(FPGASearchPaths)); + if (!search_paths) { + return NULL; + } + search_paths->paths = malloc(MAX_SEARCH_PATHS * sizeof(char*)); + if (!search_paths->paths) { + free(search_paths); + return NULL; + } + search_paths->count = 0; + + // First check preferred download paths + char *preferred_path = get_preferred_download_path(); + if (preferred_path) { + add_path_if_exists(preferred_path, search_paths); + } + + // Check BLADERF_SEARCH_DIR environment variable + char *env_path = getenv("BLADERF_SEARCH_DIR"); + if (env_path) { + add_path_if_exists(env_path, search_paths); + } + + // Check current directory + char cwd[MAX_PATH_LENGTH]; + if (getcwd(cwd, sizeof(cwd))) { + add_path_if_exists(cwd, search_paths); + } + +#ifdef _WIN32 + // Windows-specific paths + char appdata_path[MAX_PATH]; + if (SHGetFolderPathA(NULL, CSIDL_APPDATA, NULL, 0, appdata_path) == S_OK) { + char nuand_path[MAX_PATH_LENGTH]; + snprintf(nuand_path, sizeof(nuand_path), "%s\\Nuand\\bladeRF", appdata_path); + add_path_if_exists(nuand_path, search_paths); + } + + // Check Windows installation directory from registry + HKEY hKey; + if (RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\Nuand LLC", 0, KEY_READ, &hKey) == ERROR_SUCCESS) { + char reg_path[MAX_PATH_LENGTH]; + DWORD dataSize = sizeof(reg_path); + if (RegQueryValueExA(hKey, "Path", NULL, NULL, (LPBYTE)reg_path, &dataSize) == ERROR_SUCCESS) { + add_path_if_exists(reg_path, search_paths); + } + RegCloseKey(hKey); + } +#else + // Unix-like systems (Linux, macOS, FreeBSD) + const char *home = getenv("HOME"); + if (!home) { + struct passwd *pw = getpwuid(getuid()); + if (pw) { + home = pw->pw_dir; + } + } + + if (home) { + char config_path[MAX_PATH_LENGTH]; + snprintf(config_path, sizeof(config_path), "%s/.config/Nuand/bladeRF", home); + add_path_if_exists(config_path, search_paths); + + char nuand_path[MAX_PATH_LENGTH]; + snprintf(nuand_path, sizeof(nuand_path), "%s/.Nuand/bladeRF", home); + add_path_if_exists(nuand_path, search_paths); + } + + // Check system-wide directories + add_path_if_exists("/etc/Nuand/bladeRF", search_paths); + add_path_if_exists("/usr/share/Nuand/bladeRF", search_paths); +#endif + + return search_paths; +} + +// Function to free the FPGASearchPaths structure +void free_fpga_search_paths(FPGASearchPaths *search_paths) { + if (search_paths) { + for (int i = 0; i < search_paths->count; i++) { + free(search_paths->paths[i]); + } + free(search_paths->paths); + free(search_paths); + } +} + +typedef struct { + char version[MAX_VERSION_LENGTH]; + char filename[MAX_FILENAME_LENGTH]; + char md5[MAX_HASH_LENGTH+1]; + char sha256[MAX_HASH_LENGTH+1]; +} VersionInfo; + +// New structure to hold FPGA version information +typedef struct { + char version[MAX_VERSION_LENGTH]; + VersionInfo *files; + int num_files; +} FPGAVersionInfo; + +// Modified UpdateInfo structure +typedef struct { + VersionInfo firmware; + FPGAVersionInfo *fpga_versions; + int num_fpga_versions; + char latest_fpga_version[MAX_VERSION_LENGTH]; // Add this line + int latest_fpga_version_index; + char latest_libbladerf_version[MAX_VERSION_LENGTH]; // Add this field for libbladeRF version +} UpdateInfo; + +struct MemoryStruct { + char *memory; + size_t size; +}; + +// Function prototypes +bool download_json(const char* url, char* buffer, size_t buffer_size); +bool parse_json(const char* json_string, UpdateInfo* update_info); +bool check_fx3_version(const UpdateInfo* update_info, struct bladerf* dev); +bool check_fpga_version(const UpdateInfo* update_info, struct bladerf* dev); +bool download_file(const char* url, const char* filename); +bool verify_file(const char* filename, const char* expected_md5, const char* expected_sha256, const UpdateInfo* update_info); +bool update_fx3_device(struct bladerf* dev, const UpdateInfo* update_info); +bool check_rbf_files(const UpdateInfo* update_info); +void update_rbf_files(const UpdateInfo* update_info); +void update_fw_files(const UpdateInfo* update_info); +bool check_fw_files(const UpdateInfo* update_info); +bool check_libbladerf_version(const UpdateInfo* update_info); +bool check_and_load_bootloader(const UpdateInfo* update_info, struct bladerf** dev, bool auto_update); + +bool remove_non_conforming = false; + +void print_usage() { + printf("Usage: bladeRF-update [OPTIONS]\n"); + printf("\n"); + printf("Options:\n"); + printf(" -h, --help Display this help message\n"); + printf(" -y Automatically update firmware and FPGA images\n"); + printf(" --rm Remove non-conforming FPGA images during update\n"); + printf(" -v, --verbose Display detailed output during operations\n"); + printf("\n"); + printf("Description:\n"); + printf(" bladeRF-update checks for and optionally installs updates for the bladeRF\n"); + printf(" firmware and FPGA images. Without options, it will only check for updates\n"); + printf(" and report the status, but won't make any changes.\n"); + printf("\n"); + printf(" Either -y or --rm is necessary to have bladeRF-update change anything.\n"); + printf("\n"); + printf("Examples:\n"); + printf(" bladeRF-update Check for updates without making changes\n"); + printf(" bladeRF-update -y Automatically update all components\n"); + printf(" bladeRF-update --rm Check and remove non-conforming FPGA images\n"); + printf(" bladeRF-update -y --rm Update all components and remove non-conforming images\n"); + printf(" bladeRF-update -v Display detailed output during operations\n"); +} + +int main(int argc, char *argv[]) { + printf("bladeRF-update utility will check for updates and optionally update firmware and FPGA images.\n"); + + bool auto_update = false; + bool fx3_up_to_date = false; + bool fpga_up_to_date = false; + bool need_to_update_bootloader = false; + bool need_to_reset_device = false; + bool outstanding_updates = false; + + for (int i = 1; i < argc; i++) { + if (strcmp(argv[i], "-y") == 0) { + auto_update = true; + } else if (strcmp(argv[i], "--rm") == 0) { + remove_non_conforming = true; + } else if (strcmp(argv[i], "-h") == 0 || strcmp(argv[i], "--help") == 0) { + print_usage(); + return 0; + } else if (strcmp(argv[i], "-v") == 0 || strcmp(argv[i], "--verbose") == 0) { + verbose_output = true; + } else { + fprintf(stderr, "Unknown option: %s\n", argv[i]); + print_usage(); + return 1; + } + } + + if (!auto_update && !remove_non_conforming) { + printf("Warning: No action will be taken. Use -y to update or --rm to remove non-conforming files.\n"); + } + + printf("\n"); + + char json_buffer[BUFFER_SIZE]; + if (!download_json(JSON_URL, json_buffer, BUFFER_SIZE)) { + fprintf(stderr, "Failed to download version information\n"); + return 1; + } + + UpdateInfo update_info; + if (!parse_json(json_buffer, &update_info)) { + fprintf(stderr, "Failed to parse version information\n"); + return 1; + } + + // Check libbladeRF version + bool libbladerf_up_to_date = check_libbladerf_version(&update_info); + + // Check RBF files regardless of device presence + bool rbf_up_to_date; + // Check FW files + bool fw_up_to_date; + + if (auto_update) { + printf("\n"); + update_rbf_files(&update_info); + update_fw_files(&update_info); + } + + printf("\n"); + rbf_up_to_date = check_rbf_files(&update_info); + printf("\n"); + fw_up_to_date = check_fw_files(&update_info); + printf("\n"); + + if (!auto_update && (!rbf_up_to_date || !fw_up_to_date)) { + printf("No updates performed. Run bladeRF-update -y to update files without a device connected.\n"); + } + + bool bladeRF_device_attached = false; + struct bladerf *dev = NULL; + int status = bladerf_open(&dev, NULL); + if (status != 0) { + printf("[?] No bladeRF device found initially. Checking for bootloaders...\n"); + + if (check_and_load_bootloader(&update_info, &dev, auto_update)) { + if (auto_update) { + printf("[+] Successfully opened bladeRF device after firmware load!\n"); + printf("[ ] Attempting to update FX3 to latest firmware version.\n"); + if (update_fx3_device(dev, &update_info)) { + need_to_reset_device = true; + } else { + printf("[-] Failed to flash FX3 firmware: %s\n", bladerf_strerror(status)); + goto cleanup; + } + } else { + printf("[!] Found bladeRF device in bootloader mode. Need to update bootloader, rerun bladeRF-update -y.\n"); + need_to_update_bootloader = true; + goto cleanup; + } + } else { + printf("[?] No bladeRF device or bootloader found. Cannot check FX3 firmware version.\n"); + printf("[!] Optionally connect a bladeRF device to check for updates.\n"); + goto cleanup; + } + } + bladeRF_device_attached = true; + + // Device is attached, get versions + + printf("[+] Connected bladeRF device:\n"); + + fx3_up_to_date = check_fx3_version(&update_info, dev); + fpga_up_to_date = check_fpga_version(&update_info, dev); + + if (!fx3_up_to_date && auto_update) { + printf("[ ] Attempting to update FX3 to latest firmware version.\n"); + fx3_up_to_date = update_fx3_device(dev, &update_info); + } + + if (rbf_up_to_date && fx3_up_to_date && fpga_up_to_date && fw_up_to_date) { + printf("[+] All components are up to date.\n"); + } else { + printf("[!] Updates are available. Run bladeRF-update -y to automatically update.\n"); + } + + bladerf_close(dev); +cleanup: + + outstanding_updates = false; +#define SUMMARY_SPACING "> " + printf("\n\nSUMMARY:\n"); + if (rbf_up_to_date) { + printf(SUMMARY_SPACING "[+] Downloaded FPGA RBF files are up to date!\n"); + } else { + printf(SUMMARY_SPACING "[-] Downloaded FPGA RBF files are outdated or non-conforming. See above for details.\n"); + printf(SUMMARY_SPACING "[!] Run bladeRF-update -y --rm to cleanly update RBF files.\n"); + outstanding_updates = true; + } + + if (fw_up_to_date) { + printf(SUMMARY_SPACING "[+] Downloaded FX3 firmware files are up to date!\n"); + } else { + printf(SUMMARY_SPACING "[-] Downloaded FX3 firmware files are outdated or missing. See above for details.\n"); + printf(SUMMARY_SPACING "[!] Run bladeRF-update -y --rm to cleanly update FX3 firmware files.\n"); + outstanding_updates = true; + } + + if (libbladerf_up_to_date) { + printf(SUMMARY_SPACING "[+] Installed libbladeRF library is up to date!\n"); + } else { + printf(SUMMARY_SPACING "[!] See instructions above to update libbladeRF library.\n"); + } + + if (need_to_update_bootloader) { + printf(SUMMARY_SPACING "[-] bladeRF bootloader found. Need to update bootloader.\n"); + printf(SUMMARY_SPACING "[!] Run bladeRF-update -y to update bootloader.\n"); + } + + if (bladeRF_device_attached) { + if (fx3_up_to_date) { + printf(SUMMARY_SPACING "[+] FX3 firmware is up to date.\n"); + } else { + printf(SUMMARY_SPACING "[-] FX3 firmware is outdated or missing. See above for details.\n"); + printf(SUMMARY_SPACING "[!] Run bladeRF-update -y --rm to cleanly update FX3 firmware files.\n"); + outstanding_updates = true; + } + if (fpga_up_to_date) { + printf(SUMMARY_SPACING "[+] FPGA is up to date.\n"); + } else { + printf(SUMMARY_SPACING "[-] FPGA is outdated or missing. See above for details.\n"); + printf(SUMMARY_SPACING "[!] Run bladeRF-update -y --rm to cleanly update FPGA files.\n"); + outstanding_updates = true; + } + } else { + printf(SUMMARY_SPACING "[!] Connect a bladeRF to check device's FX3 firmware.\n"); + } + + if (need_to_reset_device) { + printf(SUMMARY_SPACING "[!] Power cycle bladeRF by disconnecting and reconnecting the USB cable.\n"); + } + + // Display help message if no arguments were provided + if (argc == 1 || outstanding_updates) { + printf("\n"); + printf("For more information rerun bladeRF-update with -h%s.\n\n", outstanding_updates ? " or -y to update" : ""); + } + + return 0; +} + +// Add this callback function +size_t write_callback(void *contents, size_t size, size_t nmemb, void *userp) { + size_t realsize = size * nmemb; + struct MemoryStruct *mem = (struct MemoryStruct *)userp; + + char *ptr = realloc(mem->memory, mem->size + realsize + 1); + if (!ptr) { + fprintf(stderr, "Not enough memory (realloc returned NULL)\n"); + return 0; + } + + mem->memory = ptr; + memcpy(&(mem->memory[mem->size]), contents, realsize); + mem->size += realsize; + mem->memory[mem->size] = 0; + + return realsize; +} + +// Modify the download_json function +bool download_json(const char* url, char* buffer, size_t buffer_size) { +#ifdef _WIN32 + HINTERNET hInternet = InternetOpen("bladeRF-update", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); + if (hInternet == NULL) { + fprintf(stderr, "Failed to initialize WinINet\n"); + return false; + } + + HINTERNET hConnect = InternetOpenUrl(hInternet, url, NULL, 0, INTERNET_FLAG_RELOAD, 0); + if (hConnect == NULL) { + fprintf(stderr, "Failed to open URL\n"); + InternetCloseHandle(hInternet); + return false; + } + + DWORD bytesRead = 0; + DWORD totalBytesRead = 0; + + while (totalBytesRead < buffer_size - 1) { + if (!InternetReadFile(hConnect, buffer + totalBytesRead, buffer_size - totalBytesRead - 1, &bytesRead)) { + fprintf(stderr, "Failed to read from URL\n"); + InternetCloseHandle(hConnect); + InternetCloseHandle(hInternet); + return false; + } + + if (bytesRead == 0) { + break; + } + + totalBytesRead += bytesRead; + } + + buffer[totalBytesRead] = '\0'; + + InternetCloseHandle(hConnect); + InternetCloseHandle(hInternet); +#else + CURL *curl; + CURLcode res; + struct MemoryStruct chunk; + + chunk.memory = malloc(1); // will be grown as needed by realloc + chunk.size = 0; // no data at this point + + curl = curl_easy_init(); + if (!curl) { + fprintf(stderr, "Failed to initialize curl\n"); + free(chunk.memory); + return false; + } + + curl_easy_setopt(curl, CURLOPT_URL, url); + curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_callback); + curl_easy_setopt(curl, CURLOPT_WRITEDATA, (void *)&chunk); + curl_easy_setopt(curl, CURLOPT_USERAGENT, "bladeRF-update"); + + res = curl_easy_perform(curl); + if (res != CURLE_OK) { + fprintf(stderr, "Failed to download JSON: %s\n", curl_easy_strerror(res)); + curl_easy_cleanup(curl); + free(chunk.memory); + return false; + } + + if (chunk.size >= buffer_size) { + fprintf(stderr, "Downloaded data exceeds buffer size\n"); + curl_easy_cleanup(curl); + free(chunk.memory); + return false; + } + + memcpy(buffer, chunk.memory, chunk.size); + buffer[chunk.size] = '\0'; // Ensure null-termination + + curl_easy_cleanup(curl); + free(chunk.memory); +#endif + + return true; +} + +// Modified parse_json function +bool parse_json(const char* json_string, UpdateInfo* update_info) { + struct json_object *root, *firmware, *fpga, *latest, *versions, *version_obj, *filename, *md5, *sha256; + struct json_object *libbladerf, *libbladerf_latest; + + root = json_tokener_parse(json_string); + if (!root) { + fprintf(stderr, "Failed to parse JSON\n"); + return false; + } + + // Parse libbladeRF info + if (json_object_object_get_ex(root, "libbladeRF", &libbladerf)) { + if (json_object_object_get_ex(libbladerf, "latest", &libbladerf_latest)) { + const char* latest_lib_version = json_object_get_string(libbladerf_latest); + if (latest_lib_version) { + strncpy(update_info->latest_libbladerf_version, latest_lib_version, MAX_VERSION_LENGTH - 1); + update_info->latest_libbladerf_version[MAX_VERSION_LENGTH - 1] = '\0'; + } else { + // Default to empty string if not found + update_info->latest_libbladerf_version[0] = '\0'; + } + } else { + update_info->latest_libbladerf_version[0] = '\0'; + } + } else { + update_info->latest_libbladerf_version[0] = '\0'; + } + + // Parse firmware info + if (!json_object_object_get_ex(root, "firmware", &firmware)) { + fprintf(stderr, "Failed to get 'firmware' object from JSON\n"); + json_object_put(root); + return false; + } + if (!json_object_object_get_ex(firmware, "latest", &latest)) { + fprintf(stderr, "Failed to get 'latest' from firmware object\n"); + json_object_put(root); + return false; + } + if (!json_object_object_get_ex(firmware, "versions", &versions)) { + fprintf(stderr, "Failed to get 'versions' from firmware object\n"); + json_object_put(root); + return false; + } + const char* latest_version = json_object_get_string(latest); + if (!latest_version) { + fprintf(stderr, "Failed to get latest version string\n"); + json_object_put(root); + return false; + } + if (!json_object_object_get_ex(versions, latest_version, &version_obj)) { + fprintf(stderr, "Failed to get version object for latest version\n"); + json_object_put(root); + return false; + } + if (!json_object_object_get_ex(version_obj, "filename", &filename) || + !json_object_object_get_ex(version_obj, "md5", &md5) || + !json_object_object_get_ex(version_obj, "sha256", &sha256)) { + fprintf(stderr, "Failed to get filename, md5, or sha256 from version object\n"); + json_object_put(root); + return false; + } + + const char* filename_str = json_object_get_string(filename); + const char* md5_str = json_object_get_string(md5); + const char* sha256_str = json_object_get_string(sha256); + + if (!filename_str || !md5_str || !sha256_str) { + fprintf(stderr, "Failed to get string values for filename, md5, or sha256\n"); + json_object_put(root); + return false; + } + + strncpy(update_info->firmware.version, latest_version, MAX_VERSION_LENGTH - 1); + strncpy(update_info->firmware.filename, filename_str, MAX_FILENAME_LENGTH - 1); + strncpy(update_info->firmware.md5, md5_str, MAX_HASH_LENGTH); + strncpy(update_info->firmware.sha256, sha256_str, MAX_HASH_LENGTH); + + update_info->firmware.version[MAX_VERSION_LENGTH - 1] = '\0'; + update_info->firmware.filename[MAX_FILENAME_LENGTH - 1] = '\0'; + update_info->firmware.md5[MAX_HASH_LENGTH] = '\0'; + update_info->firmware.sha256[MAX_HASH_LENGTH] = '\0'; + + if (verbose_output) { + printf("\nParsed Update Information:\n"); + printf("Firmware:\n"); + printf(" Version: %s\n", update_info->firmware.version); + printf(" Filename: %s\n", update_info->firmware.filename); + printf(" MD5: %s\n", update_info->firmware.md5); + printf(" SHA256: %s\n", update_info->firmware.sha256); + + if (strlen(update_info->latest_libbladerf_version) > 0) { + printf("Latest libbladeRF version: %s\n", update_info->latest_libbladerf_version); + } + } + + // Parse FPGA info + if (!json_object_object_get_ex(root, "fpga", &fpga)) { + fprintf(stderr, "Failed to get 'fpga' object from JSON\n"); + json_object_put(root); + return false; + } + + // Get the latest FPGA version + struct json_object *latest_fpga; + if (!json_object_object_get_ex(fpga, "latest", &latest_fpga)) { + fprintf(stderr, "Failed to get 'latest' from FPGA object\n"); + json_object_put(root); + return false; + } + const char* latest_fpga_version = json_object_get_string(latest_fpga); + if (!latest_fpga_version) { + fprintf(stderr, "Failed to get latest FPGA version string\n"); + json_object_put(root); + return false; + } + + strncpy(update_info->latest_fpga_version, latest_fpga_version, MAX_VERSION_LENGTH - 1); + update_info->latest_fpga_version[MAX_VERSION_LENGTH - 1] = '\0'; + + if (!json_object_object_get_ex(fpga, "versions", &versions)) { + fprintf(stderr, "Failed to get 'versions' from FPGA object\n"); + json_object_put(root); + return false; + } + + update_info->num_fpga_versions = json_object_object_length(versions); + update_info->fpga_versions = malloc(update_info->num_fpga_versions * sizeof(FPGAVersionInfo)); + if (!update_info->fpga_versions) { + fprintf(stderr, "Failed to allocate memory for FPGA versions\n"); + json_object_put(root); + return false; + } + + int version_index = 0; + json_object_object_foreach(versions, fpga_version, fpga_version_obj) { + strncpy(update_info->fpga_versions[version_index].version, fpga_version, MAX_VERSION_LENGTH - 1); + update_info->fpga_versions[version_index].version[MAX_VERSION_LENGTH - 1] = '\0'; + + struct json_object *files; + if (!json_object_object_get_ex(fpga_version_obj, "files", &files)) { + fprintf(stderr, "Failed to get 'files' from FPGA version object\n"); + json_object_put(root); + return false; + } + + update_info->fpga_versions[version_index].num_files = json_object_object_length(files); + update_info->fpga_versions[version_index].files = malloc(update_info->fpga_versions[version_index].num_files * sizeof(VersionInfo)); + if (!update_info->fpga_versions[version_index].files) { + fprintf(stderr, "Failed to allocate memory for FPGA files\n"); + json_object_put(root); + return false; + } + + int file_index = 0; + json_object_object_foreach(files, fpga_type, fpga_file) { + struct json_object *md5_obj, *sha256_obj; + if (!json_object_object_get_ex(fpga_file, "md5", &md5_obj) || + !json_object_object_get_ex(fpga_file, "sha256", &sha256_obj)) { + fprintf(stderr, "Failed to get md5 or sha256 for FPGA type %s\n", fpga_type); + json_object_put(root); + return false; + } + + const char* md5_str = json_object_get_string(md5_obj); + const char* sha256_str = json_object_get_string(sha256_obj); + + if (!md5_str || !sha256_str) { + fprintf(stderr, "Failed to get string values for md5 or sha256 for FPGA type %s\n", fpga_type); + json_object_put(root); + return false; + } + + snprintf(update_info->fpga_versions[version_index].files[file_index].filename, MAX_FILENAME_LENGTH, "%s.rbf", fpga_type); + strncpy(update_info->fpga_versions[version_index].files[file_index].md5, md5_str, MAX_HASH_LENGTH); + strncpy(update_info->fpga_versions[version_index].files[file_index].sha256, sha256_str, MAX_HASH_LENGTH); + + update_info->fpga_versions[version_index].files[file_index].filename[MAX_FILENAME_LENGTH - 1] = '\0'; + update_info->fpga_versions[version_index].files[file_index].md5[MAX_HASH_LENGTH] = '\0'; + update_info->fpga_versions[version_index].files[file_index].sha256[MAX_HASH_LENGTH] = '\0'; + + file_index++; + } + + version_index++; + } + + update_info->latest_fpga_version_index = -1; + // Print statistics only for the latest FPGA version + for (int i = 0; i < update_info->num_fpga_versions; i++) { + if (strcmp(update_info->fpga_versions[i].version, latest_fpga_version) == 0) { + update_info->latest_fpga_version_index = i; + + if (verbose_output) { + printf("\nLatest FPGA Version: %s\n", latest_fpga_version); + for (int j = 0; j < update_info->fpga_versions[i].num_files; j++) { + printf(" Type: %s\n", update_info->fpga_versions[i].files[j].filename); + printf(" Filename: %s\n", update_info->fpga_versions[i].files[j].filename); + printf(" MD5: %s\n", update_info->fpga_versions[i].files[j].md5); + printf(" SHA256: %s\n", update_info->fpga_versions[i].files[j].sha256); + printf("\n"); + } + } + break; + } + } + + json_object_put(root); + return true; +} + +// Implementation of check_fpga_version +bool check_fpga_version(const UpdateInfo* update_info, struct bladerf* dev) { + struct bladerf_version version; + if (bladerf_fpga_version(dev, &version) != 0) { + fprintf(stderr, "Failed to get FPGA version\n"); + return false; + } + + printf("[ ] FPGA version: v%d.%d.%d\n", version.major, version.minor, version.patch); + char current_version[MAX_VERSION_LENGTH]; + snprintf(current_version, sizeof(current_version), "v%d.%d.%d", version.major, version.minor, version.patch); + + if (strcmp(current_version, update_info->latest_fpga_version) != 0) { + printf("[-] FPGA is outdated. Current: %s, Latest: %s\n", current_version, update_info->latest_fpga_version); + return false; + } + + printf("[+] FPGA is up to date.\n"); + + return true; +} + +// Implementation of check_fx3_version +bool check_fx3_version(const UpdateInfo* update_info, struct bladerf* dev) { + struct bladerf_version version; + if (bladerf_fw_version(dev, &version) != 0) { + fprintf(stderr, "[-] Failed to get firmware version\n"); + return false; + } + + printf("[ ] FX3 Firmware version: v%d.%d.%d\n", version.major, version.minor, version.patch); + char current_version[MAX_VERSION_LENGTH]; + snprintf(current_version, sizeof(current_version), "v%d.%d.%d", version.major, version.minor, version.patch); + + if (strcmp(current_version, update_info->firmware.version) != 0) { + printf("[-] FX3 firmware is outdated. Current: %s, Latest: %s\n", current_version, update_info->firmware.version); + return false; + } + + printf("[+] FX3 firmware is up to date.\n"); + + return true; +} + +// Implementation of download_file +bool download_file(const char* url, const char* filename) { +#ifdef _WIN32 + HINTERNET hInternet = InternetOpen("bladeRF-update", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); + if (hInternet == NULL) { + fprintf(stderr, "Failed to initialize WinINet\n"); + return false; + } + + HINTERNET hConnect = InternetOpenUrl(hInternet, url, NULL, 0, INTERNET_FLAG_RELOAD, 0); + if (hConnect == NULL) { + fprintf(stderr, "Failed to open URL\n"); + InternetCloseHandle(hInternet); + return false; + } + + FILE* file = fopen(filename, "wb"); + if (!file) { + fprintf(stderr, "Failed to open file for writing\n"); + InternetCloseHandle(hConnect); + InternetCloseHandle(hInternet); + return false; + } + + char buffer[4096]; + DWORD bytesRead; + while (InternetReadFile(hConnect, buffer, sizeof(buffer), &bytesRead) && bytesRead > 0) { + fwrite(buffer, 1, bytesRead, file); + } + + fclose(file); + InternetCloseHandle(hConnect); + InternetCloseHandle(hInternet); +#else + CURL *curl = curl_easy_init(); + if (!curl) { + fprintf(stderr, "Failed to initialize curl\n"); + return false; + } + + FILE* file = fopen(filename, "wb"); + if (!file) { + fprintf(stderr, "Failed to open file for writing\n"); + curl_easy_cleanup(curl); + return false; + } + + curl_easy_setopt(curl, CURLOPT_URL, url); + curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, NULL); + curl_easy_setopt(curl, CURLOPT_WRITEDATA, file); + curl_easy_setopt(curl, CURLOPT_USERAGENT, "bladeRF-update"); + + CURLcode res = curl_easy_perform(curl); + if (res != CURLE_OK) { + fprintf(stderr, "Failed to download file: %s\n", curl_easy_strerror(res)); + fclose(file); + curl_easy_cleanup(curl); + return false; + } + + fclose(file); + curl_easy_cleanup(curl); +#endif + + return true; +} + +// Modified implementation of verify_file +bool verify_file(const char* filename, const char* expected_md5, const char* expected_sha256, const UpdateInfo* update_info) { + FILE* file = fopen(filename, "rb"); + if (!file) { + fprintf(stderr, "Failed to open file for verification: %s\n", filename); + return false; + } + + SHA256_CTX sha256_ctx; + SHA256_Init(&sha256_ctx); + + unsigned char buffer[4096]; + size_t bytes_read; + while ((bytes_read = fread(buffer, 1, sizeof(buffer), file)) > 0) { + SHA256_Update(&sha256_ctx, buffer, bytes_read); + } + + fclose(file); + + unsigned char sha256_result[32]; + SHA256_Final(sha256_result, &sha256_ctx); + + char sha256_hex[65]; + + for (int i = 0; i < 32; i++) + sprintf(&sha256_hex[i*2], "%02x", sha256_result[i]); + + if (verbose_output) { + printf("File: %s\n", filename); + printf("SHA256:\n Expected: %s\n Calculated: %s\n", expected_sha256, sha256_hex); + } + + bool sha256_match = (strcmp(sha256_hex, expected_sha256) == 0); + + if (sha256_match) { + if (verbose_output) { + printf("Verification result: PASS\n"); + } + return true; + } else { + printf("Verification result: FAIL\n"); + + // Check for older versions + const char* base_filename = strrchr(filename, '/'); + if (base_filename == NULL) { + base_filename = filename; + } else { + base_filename++; // Skip the '/' + } + + for (int i = 0; i < update_info->num_fpga_versions; i++) { + for (int j = 0; j < update_info->fpga_versions[i].num_files; j++) { + if (strcmp(base_filename, update_info->fpga_versions[i].files[j].filename) == 0) { + if (strcmp(sha256_hex, update_info->fpga_versions[i].files[j].sha256) == 0) { + printf("Verification result: OUT OF DATE. File matches an older version %s\n", update_info->fpga_versions[i].version); + return false; + } + } + } + } + + printf("[-] File %s does not match any known version\n", filename); + + if (remove_non_conforming) { + remove(filename); + printf("[+] Removed file %s\n", filename); + return true; + } + + return false; + } +} + +// Implementation of update_fx3_device +bool update_fx3_device(struct bladerf* dev, const UpdateInfo* update_info) { + int status = 0; + printf("[ ] Updating FX3 firmware to latest version: %s\n", update_info->firmware.version); + + // Use a known path for the firmware file + char firmware_path[MAX_PATH_LENGTH] = {0}; + + // Use the preferred download path + const char* download_path = get_preferred_download_path(); + if (download_path) { +#ifdef _WIN32 + snprintf(firmware_path, sizeof(firmware_path), "%s\\%s", download_path, update_info->firmware.filename); +#else + snprintf(firmware_path, sizeof(firmware_path), "%s/%s", download_path, update_info->firmware.filename); +#endif + + printf("[ ] Using firmware at %s\n", firmware_path); + printf("[ ] Flashing FX3 firmware to device...\n"); + status = bladerf_flash_firmware(dev, firmware_path); + + if (status == 0) { + printf("[+] Successfully flashed FX3 firmware. Please disconnect and reconnect your bladeRF.\n"); + printf("[+] Firmware update requires a device reset. Closing device.\n"); + return true; + } else { + fprintf(stderr, "[-] Failed to flash FX3 firmware: %s\n", bladerf_strerror(status)); + } + } else { + fprintf(stderr, "[-] Could not determine firmware path\n"); + } + + return false; +} + +// Modified helper function to check RBF files +bool check_rbf_files(const UpdateInfo* update_info) { + FPGASearchPaths *search_paths = bladerf_get_fpga_paths(); + if (!search_paths) { + fprintf(stderr, "Failed to get FPGA search paths\n"); + return false; + } + + // Find the latest FPGA version + const FPGAVersionInfo* latest_version = NULL; + if (update_info->latest_fpga_version_index != -1) { + latest_version = &update_info->fpga_versions[update_info->latest_fpga_version_index]; + } + + if (!latest_version) { + fprintf(stderr, "No FPGA versions found in update info\n"); + free_fpga_search_paths(search_paths); + return false; + } + + if (verbose_output) { + printf("\nChecking all RBF load paths for latest FPGA version: %s\n\n", latest_version->version); + } + printf("[ ] Checking for latest FPGA version: %s\n", latest_version->version); + + + bool all_up_to_date = true; + for (int j = 0; j < latest_version->num_files; j++) { + bool file_found = false; + for (int k = 0; k < search_paths->count; k++) { + char filepath[MAX_PATH_LENGTH]; + snprintf(filepath, sizeof(filepath), "%s/%s", search_paths->paths[k], latest_version->files[j].filename); + + if (file_exists(filepath)) { + file_found = true; + if (!verify_file(filepath, latest_version->files[j].md5, latest_version->files[j].sha256, update_info)) { + printf("[-] FPGA %s is outdated or corrupted\n", filepath); + all_up_to_date = false; + } else { + if (verbose_output) { + printf("[+] FPGA %s is up to date\n\n", filepath); + } + } + //break; + } + } + if (!file_found) { + printf("[-] FPGA %s is missing\n", latest_version->files[j].filename); + all_up_to_date = false; + } + } + + if (all_up_to_date) { + printf("[+] All FPGA images are up to date.\n"); + } else { + printf("[-] Some FPGA images are outdated or non-conforming. See above for details.\n"); + } + + free_fpga_search_paths(search_paths); + return all_up_to_date; +} + +// Modified update_rbf_files function +void update_rbf_files(const UpdateInfo* update_info) { + FPGASearchPaths *search_paths = bladerf_get_fpga_paths(); + if (!search_paths) { + fprintf(stderr, "[CRITICAL] Failed to get FPGA search paths\n"); + return; + } + + // Use the preferred download path + const char* download_path = get_preferred_download_path(); + if (!download_path) { + // Fall back to the first search path if preferred path is not available + if (search_paths->count > 0) { + download_path = search_paths->paths[0]; + } else { + fprintf(stderr, "[CRITICAL] No valid download path available\n"); + free_fpga_search_paths(search_paths); + return; + } + } + + // Find the latest FPGA version + const FPGAVersionInfo* latest_version = NULL; + if (update_info->latest_fpga_version_index != -1) { + latest_version = &update_info->fpga_versions[update_info->latest_fpga_version_index]; + } + + if (!latest_version) { + fprintf(stderr, "[CRITICAL] No FPGA versions found in update info\n"); + free_fpga_search_paths(search_paths); + return; + } + + printf("[ ] Files will be downloaded to: %s\n", download_path); + printf("[ ] Updating RBF files to latest FPGA version: %s\n", latest_version->version); + + for (int j = 0; j < latest_version->num_files; j++) { + // First check if an up-to-date version of this file already exists + bool rbf_up_to_date = false; + char existing_rbf_path[MAX_PATH_LENGTH] = {0}; + + for (int k = 0; k < search_paths->count; k++) { + char filepath[MAX_PATH_LENGTH]; + snprintf(filepath, sizeof(filepath), "%s/%s", search_paths->paths[k], latest_version->files[j].filename); + + if (file_exists(filepath)) { + if (verify_file(filepath, latest_version->files[j].md5, latest_version->files[j].sha256, update_info)) { + rbf_up_to_date = true; + strncpy(existing_rbf_path, filepath, MAX_PATH_LENGTH - 1); + printf("[+] Found up-to-date RBF at %s, skipping download\n", filepath); + break; + } + } + } + + if (rbf_up_to_date) { + continue; + } + + char url[1024]; + snprintf(url, sizeof(url), "https://www.nuand.com/fpga/%s/%s", latest_version->version, latest_version->files[j].filename); + + char filepath[MAX_PATH_LENGTH]; +#ifdef _WIN32 + snprintf(filepath, sizeof(filepath), "%s\\%s", download_path, latest_version->files[j].filename); +#else + snprintf(filepath, sizeof(filepath), "%s/%s", download_path, latest_version->files[j].filename); +#endif + + printf("[ ] Downloading %s...\n", latest_version->files[j].filename); + if (download_file(url, filepath) && verify_file(filepath, latest_version->files[j].md5, latest_version->files[j].sha256, update_info)) { + printf("[+] Successfully updated %s\n", latest_version->files[j].filename); + } else { + fprintf(stderr, "Failed to update %s\n", latest_version->files[j].filename); + } + } + + free_fpga_search_paths(search_paths); +} + +// Modified update_fw_files function +void update_fw_files(const UpdateInfo* update_info) { + FPGASearchPaths *search_paths = bladerf_get_fpga_paths(); + if (!search_paths) { + fprintf(stderr, "Failed to get firmware search paths\n"); + return; + } + + // First check if an up-to-date firmware file already exists + bool fw_up_to_date = false; + char existing_fw_path[MAX_PATH_LENGTH] = {0}; + + printf("[ ] Updating firmware files to latest version: %s\n", update_info->firmware.version); + + for (int k = 0; k < search_paths->count; k++) { + char filepath[MAX_PATH_LENGTH]; + + // Check only version-specific file, not the generic bladeRF_fw.img + snprintf(filepath, sizeof(filepath), "%s/%s", search_paths->paths[k], update_info->firmware.filename); + if (file_exists(filepath)) { + if (verify_file(filepath, update_info->firmware.md5, update_info->firmware.sha256, update_info)) { + fw_up_to_date = true; + strncpy(existing_fw_path, filepath, MAX_PATH_LENGTH - 1); + printf("[+] Found up-to-date firmware at %s, skipping download\n", filepath); + break; + } + } + } + + if (fw_up_to_date) { + free_fpga_search_paths(search_paths); + return; + } + + // Use the preferred download path + const char* download_path = get_preferred_download_path(); + if (!download_path) { + // Fall back to the first search path if preferred path is not available + if (search_paths->count > 0) { + download_path = search_paths->paths[0]; + } else { + fprintf(stderr, "No valid download path available\n"); + free_fpga_search_paths(search_paths); + return; + } + } + + printf("[ ] Updating firmware to latest version: %s\n", update_info->firmware.version); + printf("[ ] Files will be downloaded to: %s\n", download_path); + + // Download the firmware image + char url[1024]; + snprintf(url, sizeof(url), "https://www.nuand.com/fx3/%s", update_info->firmware.filename); + + char filepath[MAX_PATH_LENGTH]; +#ifdef _WIN32 + snprintf(filepath, sizeof(filepath), "%s\\%s", download_path, update_info->firmware.filename); +#else + snprintf(filepath, sizeof(filepath), "%s/%s", download_path, update_info->firmware.filename); +#endif + + printf("[ ] Downloading %s...\n", update_info->firmware.filename); + if (download_file(url, filepath) && verify_file(filepath, update_info->firmware.md5, update_info->firmware.sha256, update_info)) { + printf("[+] Successfully downloaded %s\n", update_info->firmware.filename); + } else { + fprintf(stderr, "[-] Failed to download %s\n", update_info->firmware.filename); + } + + free_fpga_search_paths(search_paths); +} + +// Helper function to check for firmware files +bool check_fw_files(const UpdateInfo* update_info) { + FPGASearchPaths *search_paths = bladerf_get_fpga_paths(); + if (!search_paths) { + fprintf(stderr, "Failed to get firmware search paths\n"); + return false; + } + + if (verbose_output) { + printf("\nChecking all paths for latest firmware version: %s\n\n", update_info->firmware.version); + } + printf("[ ] Checking for latest firmware version: %s\n", update_info->firmware.version); + + bool fw_up_to_date = false; + bool found_outdated = false; + + for (int k = 0; k < search_paths->count; k++) { + char filepath[MAX_PATH_LENGTH]; + + // Check only version-specific file, not the generic bladeRF_fw.img + snprintf(filepath, sizeof(filepath), "%s/%s", search_paths->paths[k], update_info->firmware.filename); + if (file_exists(filepath)) { + if (verify_file(filepath, update_info->firmware.md5, update_info->firmware.sha256, update_info)) { + if (verbose_output) { + printf("[+] Firmware %s is up to date\n\n", filepath); + } + fw_up_to_date = true; + } else { + printf("[-] Firmware %s is outdated or corrupted.\n", filepath); + printf("[!] Rerun bladeRF-update -y --rm to do a clean update.\n"); + found_outdated = true; + } + } + } + + if (!fw_up_to_date) { + printf("[-] Firmware files not found or outdated. See above for details.\n"); + } else if (found_outdated) { + // If we found both up-to-date and outdated firmware, still mark as not up-to-date + // so we don't report all firmware files are up to date when some are outdated + fw_up_to_date = false; + } + + free_fpga_search_paths(search_paths); + if (fw_up_to_date) { + printf("[+] Firmware files are up to date.\n"); + } else { + printf("[-] Firmware files are outdated or non-conforming. See above for details.\n"); + } + return fw_up_to_date; +} + +// Function to check if current libbladeRF version is up to date +bool check_libbladerf_version(const UpdateInfo* update_info) { + // Don't proceed if we didn't get a valid libbladeRF version from the JSON + if (strlen(update_info->latest_libbladerf_version) == 0) { + return true; // Assume up to date if no version info was available + } + + struct bladerf_version version; + bladerf_version(&version); + + char current_version[MAX_VERSION_LENGTH]; + snprintf(current_version, sizeof(current_version), "v%d.%d.%d", version.major, version.minor, version.patch); + + printf("[ ] Checking for latest libbladeRF version: %s\n", update_info->latest_libbladerf_version); + if (strcmp(current_version, update_info->latest_libbladerf_version) != 0) { + printf("[-] Installed libbladeRF library version %s is outdated.\n", current_version); + printf("[-] Latest libbladeRF version: %s\n", update_info->latest_libbladerf_version); + + +#ifdef _WIN32 + printf("[!] Please download the latest Windows installer from:\n"); + printf("[!] https://www.nuand.com/win_installers/\n"); +#else + // For Linux/macOS + printf("[!] Please update using your package manager (e.g., apt-get install libbladerf)\n"); + printf("[!] or build from source: https://github.com/Nuand/bladeRF\n"); +#endif + + return false; + } else { + printf("[+] Installed libbladeRF version is up to date.\n"); + + } + + return true; +} + +// Added function to check for bootloaders and load firmware if found +bool check_and_load_bootloader(const UpdateInfo* update_info, struct bladerf** dev, bool auto_update) { + struct bladerf_devinfo *list = NULL; + int count = bladerf_get_bootloader_list(&list); + + if (count <= 0) { + if (count < 0) { + fprintf(stderr, "[-] Error checking for bootloaders: %s\n", bladerf_strerror(count)); + } else { + printf("[ ] No bladeRF bootloaders found.\n"); + } + return false; + } + + printf("[+] Found %d bladeRF device(s) in bootloader mode.\n", count); + if (!auto_update) { + return true; + } + + // Get the FX3 firmware file path + FPGASearchPaths *search_paths = bladerf_get_fpga_paths(); + if (!search_paths) { + fprintf(stderr, "[-] Failed to get firmware search paths\n"); + bladerf_free_device_list(list); + return false; + } + + // Find firmware file + char firmware_path[MAX_PATH_LENGTH] = {0}; + bool found_firmware = false; + + for (int k = 0; k < search_paths->count && !found_firmware; k++) { + snprintf(firmware_path, sizeof(firmware_path), "%s/%s", + search_paths->paths[k], update_info->firmware.filename); + if (file_exists(firmware_path)) { + found_firmware = true; + } + } + + if (!found_firmware) { + // If not found, check the preferred download path + const char* download_path = get_preferred_download_path(); + if (download_path) { + snprintf(firmware_path, sizeof(firmware_path), "%s/%s", + download_path, update_info->firmware.filename); + if (file_exists(firmware_path)) { + found_firmware = true; + } + } + } + + if (!found_firmware) { + fprintf(stderr, "[-] Could not find firmware file %s in any search path\n", + update_info->firmware.filename); + free_fpga_search_paths(search_paths); + bladerf_free_device_list(list); + return false; + } + + // Use the first bootloader device found + printf("[+] Using bootloader device at bus:%d addr:%d\n", list[0].usb_bus, list[0].usb_addr); + printf("[+] Loading firmware %s\n", firmware_path); + + int status = bladerf_load_fw_from_bootloader(NULL, list[0].backend, + list[0].usb_bus, list[0].usb_addr, + firmware_path); + + free_fpga_search_paths(search_paths); + bladerf_free_device_list(list); + + if (status != 0) { + fprintf(stderr, "[-] Failed to load firmware: %s\n", bladerf_strerror(status)); + return false; + } + + printf("[+] Successfully loaded firmware. Device should enumerate shortly.\n"); + + // Sleep for 3 seconds +#ifdef _WIN32 + Sleep(3000); +#else + sleep(3); +#endif + + // Try opening the device again after loading firmware + printf("[+] Trying to open device again after firmware load...\n"); + status = bladerf_open(dev, NULL); + + if (status != 0) { + fprintf(stderr, "[-] Still no bladeRF device found after loading firmware.\n"); + fprintf(stderr, "[!] Try unplugging and reconnecting the device.\n"); + return false; + } + + return true; +} diff --git a/host/utilities/bladeRF-update/bladeRF_json.c b/host/utilities/bladeRF-update/bladeRF_json.c new file mode 100644 index 00000000..b1f4ddb1 --- /dev/null +++ b/host/utilities/bladeRF-update/bladeRF_json.c @@ -0,0 +1,220 @@ +#include "bladeRF_json.h" +#include +#include +#include +#include + +/* --- Helper functions --- */ +static void skip_ws(const char **p) +{ + while (**p && isspace((unsigned char)**p)) { + (*p)++; + } +} + +static char *parse_string(const char **p) +{ + if (**p != '"') { + return NULL; + } + (*p)++; // skip opening quote + const char *start = *p; + char *out = malloc(strlen(start) + 1); // worst case + if (!out) return NULL; + char *dst = out; + while (**p && **p != '"') { + if (**p == '\\') { // escape + (*p)++; + char c = **p; + if (c == '"' || c == '\\' || c == '/') { + *dst++ = c; + } else if (c == 'b') { + *dst++ = '\b'; + } else if (c == 'f') { + *dst++ = '\f'; + } else if (c == 'n') { + *dst++ = '\n'; + } else if (c == 'r') { + *dst++ = '\r'; + } else if (c == 't') { + *dst++ = '\t'; + } else if (c == 'u') { + // skip unicode sequence (unhandled) - just copy as ? + // expect 4 hex digits + for (int i=0;i<4 && *(*p+1+i);i++); + *dst++ = '?'; + } else { + // invalid escape, copy as-is + *dst++ = c; + } + } else { + *dst++ = **p; + } + (*p)++; + } + if (**p != '"') { + free(out); + return NULL; // unterminated + } + (*p)++; // skip closing quote + *dst = '\0'; + return out; +} + +static json_object *new_string_value(char *str) +{ + json_object *v = malloc(sizeof(*v)); + if (!v) return NULL; + v->type = BLADERF_JSON_STRING; + v->u.string = str; + return v; +} + +static json_object *new_object_value(struct json_kv *kv) +{ + json_object *v = malloc(sizeof(*v)); + if (!v) return NULL; + v->type = BLADERF_JSON_OBJECT; + v->u.object = kv; + return v; +} + +static struct json_kv *parse_object(const char **p); + +static json_object *parse_value(const char **p) +{ + skip_ws(p); + if (**p == '"') { + char *s = parse_string(p); + if (!s) return NULL; + return new_string_value(s); + } else if (**p == '{') { + (*p)++; // consume '{' + struct json_kv *kv = parse_object(p); + if (!kv) return NULL; + return new_object_value(kv); + } + + return NULL; // unsupported type +} + +static struct json_kv *parse_object(const char **p) +{ + skip_ws(p); + if (**p == '}') { // empty object + (*p)++; + return NULL; + } + + struct json_kv *head = NULL; + struct json_kv *tail = NULL; + + while (1) { + skip_ws(p); + char *key = parse_string(p); + if (!key) goto error; + skip_ws(p); + if (**p != ':') goto error; + (*p)++; // consume ':' + json_object *val = parse_value(p); + if (!val) goto error; + + struct json_kv *node = malloc(sizeof(*node)); + if (!node) goto error; + node->key = key; + node->value = val; + node->next = NULL; + if (!head) head = node; else tail->next = node; + tail = node; + + skip_ws(p); + if (**p == ',') { + (*p)++; // another pair + continue; + } else if (**p == '}') { + (*p)++; // end object + break; + } else { + goto error; + } + } + + return head; + +error: + // free partially built object + while (head) { + struct json_kv *n = head->next; + free(head->key); + bladerf_json_free(head->value); + free(head); + head = n; + } + return NULL; +} + +/* --- Public API implementations --- */ +json_object *bladerf_json_parse(const char *input) +{ + const char *p = input; + skip_ws(&p); + if (*p != '{') { + return NULL; + } + p++; // consume '{' + struct json_kv *kv = parse_object(&p); + if (!kv) return NULL; + json_object *root = new_object_value(kv); + return root; +} + +static void free_kv(struct json_kv *kv) +{ + while (kv) { + struct json_kv *next = kv->next; + free(kv->key); + bladerf_json_free(kv->value); + free(kv); + kv = next; + } +} + +void bladerf_json_free(json_object *obj) +{ + if (!obj) return; + if (obj->type == BLADERF_JSON_STRING) { + free(obj->u.string); + } else if (obj->type == BLADERF_JSON_OBJECT) { + free_kv(obj->u.object); + } + free(obj); +} + +int bladerf_json_object_get_ex(const json_object *obj, const char *key, json_object **value_out) +{ + if (!obj || obj->type != BLADERF_JSON_OBJECT) return 0; + struct json_kv *kv = obj->u.object; + while (kv) { + if (strcmp(kv->key, key) == 0) { + if (value_out) *value_out = kv->value; + return 1; + } + kv = kv->next; + } + return 0; +} + +int bladerf_json_object_length(const json_object *obj) +{ + if (!obj || obj->type != BLADERF_JSON_OBJECT) return 0; + int count = 0; + struct json_kv *kv = obj->u.object; + while (kv) { count++; kv = kv->next; } + return count; +} + +const char *bladerf_json_get_string(const json_object *obj) +{ + if (!obj || obj->type != BLADERF_JSON_STRING) return NULL; + return obj->u.string; +} diff --git a/host/utilities/bladeRF-update/bladeRF_json.h b/host/utilities/bladeRF-update/bladeRF_json.h new file mode 100644 index 00000000..ca6a413d --- /dev/null +++ b/host/utilities/bladeRF-update/bladeRF_json.h @@ -0,0 +1,73 @@ +#ifndef BLADERF_JSON_H +#define BLADERF_JSON_H + +#include +#ifdef __cplusplus +extern "C" { +#endif + +/* Minimal JSON implementation for bladeRF-update utility. + * Supports: objects {"key":"value", ...}, nested objects, and + * string scalar values. No arrays, numbers, booleans, or null. + */ + +typedef enum { + BLADERF_JSON_STRING, + BLADERF_JSON_OBJECT +} bladerf_json_type; + +struct json_object; /* forward declaration */ +struct json_kv; /* forward */ + +typedef struct json_object { + bladerf_json_type type; + union { + char *string; /* BLADERF_JSON_STRING */ + struct json_kv *object; /* BLADERF_JSON_OBJECT (linked list) */ + } u; +} json_object; + +/* Key/value linked list for objects */ +struct json_kv { + char *key; + struct json_object *value; + struct json_kv *next; +}; + +/* Function prototypes (prefixed to avoid collision) */ +json_object *bladerf_json_parse(const char *input); +void bladerf_json_free(json_object *obj); +int bladerf_json_object_get_ex(const json_object *obj, const char *key, json_object **value_out); +int bladerf_json_object_length(const json_object *obj); +const char *bladerf_json_get_string(const json_object *obj); + +/* Iterator helper */ +static inline struct json_kv *bladerf_json_object_iter(const json_object *obj) +{ + if (!obj || obj->type != BLADERF_JSON_OBJECT) { + return NULL; + } + return obj->u.object; +} + +/* Macros to provide json-c compatible API subset */ +#define json_tokener_parse(str) bladerf_json_parse(str) +#define json_object_put(obj) bladerf_json_free(obj) +#define json_object_object_get_ex(obj,k,v) bladerf_json_object_get_ex(obj,k,v) +#define json_object_object_length(obj) bladerf_json_object_length(obj) +#define json_object_get_string(obj) bladerf_json_get_string(obj) + +/* Foreach macro mimicking json-c behaviour */ +#define json_object_object_foreach(obj, jkey, jval) \ + char *jkey; \ + json_object *jval; \ + for (struct json_kv *__kv = bladerf_json_object_iter(obj); \ + __kv != NULL && (((jkey) = __kv->key), ((jval) = __kv->value), 1); \ + __kv = __kv->next) + + +#ifdef __cplusplus +} +#endif + +#endif /* BLADERF_JSON_H */ \ No newline at end of file From fc0be5f7fb489ffee38b1037cb808dee10cf9e4a Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Tue, 25 Mar 2025 12:46:57 -0500 Subject: [PATCH 166/238] nios: rm --go from nios elf load --go does not let the Nios core continue as one would assume. Now a gdb client can connect and continue without issues. --- .../platforms/common/bladerf/software/bladeRF_nios/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hdl/fpga/platforms/common/bladerf/software/bladeRF_nios/Makefile b/hdl/fpga/platforms/common/bladerf/software/bladeRF_nios/Makefile index bf658767..b6ae6cdd 100644 --- a/hdl/fpga/platforms/common/bladerf/software/bladeRF_nios/Makefile +++ b/hdl/fpga/platforms/common/bladerf/software/bladeRF_nios/Makefile @@ -1004,7 +1004,7 @@ download-elf : $(ELF) $(ECHO) Downloading $(ELF) not supported; \ else \ $(ECHO) Info: Downloading $(ELF); \ - $(DOWNLOAD) --go --cpu_name=$(CPU_NAME) $(DOWNLOAD_CABLE_FLAG) $(SOPC_SYSID_FLAG) $(DOWNLOAD_JDI_FLAG) $(WRITE_GMON_OPTION) $(ELF); \ + $(DOWNLOAD) --cpu_name=$(CPU_NAME) $(DOWNLOAD_CABLE_FLAG) $(SOPC_SYSID_FLAG) $(DOWNLOAD_JDI_FLAG) $(WRITE_GMON_OPTION) $(ELF); \ fi # Delete the target of a rule if it has changed and its commands exit From 92b14af78720def1b36996295a1b19e0d3ece700 Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Tue, 25 Mar 2025 13:07:25 -0500 Subject: [PATCH 167/238] nios: added elf-gdb and gdb-server to the make args wrapping nios cmds --- hdl/fpga/platforms/common/bladerf/software/README.md | 2 +- .../common/bladerf/software/bladeRF_nios/Makefile | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/hdl/fpga/platforms/common/bladerf/software/README.md b/hdl/fpga/platforms/common/bladerf/software/README.md index da8ca1b0..4b2ee500 100644 --- a/hdl/fpga/platforms/common/bladerf/software/README.md +++ b/hdl/fpga/platforms/common/bladerf/software/README.md @@ -146,7 +146,7 @@ Command-Line Debugging with GDB - `$QUARTUS_INSTALL_DIR/nios2eds/nios2_command_shell.sh` - cd into `$BLADERF_DIR/hdl/quartus/work/--/bladeRF_nios` - Start the Nios gdb client: - - `nios2-elf-gdb -ex "target remote localhost:8888" bladeRF_nios.elf` + - `make WORKDIR=work/-- elf-gdb` - The Nios processor will now be in a paused state. This lets us setup breakpoints and whatnot as needed for debug. When ready to begin the debug process, issue the `continue` command. This will unpause the Nios. - If a breakpoint is hit, gdb will pause the Nios again until you issue another `continue` command. This may cause a timeout and break the user application. Breakpoints can have [commands associated with them](https://ftp.gnu.org/old-gnu/Manuals/gdb/html_node/gdb_34.html), so when one is hit, gdb can immediately print a value and continue. The print operation is slow enough that if more than a few characters are printed, it will trigger a timeout in libbladeRF. Refer to the *Debugging Tips* section for how to increase the timeout. diff --git a/hdl/fpga/platforms/common/bladerf/software/bladeRF_nios/Makefile b/hdl/fpga/platforms/common/bladerf/software/bladeRF_nios/Makefile index b6ae6cdd..064506df 100644 --- a/hdl/fpga/platforms/common/bladerf/software/bladeRF_nios/Makefile +++ b/hdl/fpga/platforms/common/bladerf/software/bladeRF_nios/Makefile @@ -897,6 +897,8 @@ endif # QSYS == 1 @$(ECHO) " Run targets:" @$(ECHO) " download-elf - Download and run your elf executable" @$(ECHO) " program-flash - Program flash contents to the board" + @$(ECHO) " gdb-server - Start GDB server on port 8888" + @$(ECHO) " elf-gdb - Connect GDB to running server and load symbols" # Handy rule to skip making libraries and just make application. .PHONY : app @@ -1111,3 +1113,13 @@ $(OBJDUMP_NAME) : $(ELF) .PHONY: print-elf-name print-elf-name: @$(ECHO) $(ELF) + +.PHONY : elf-gdb +elf-gdb : $(ELF) + @$(ECHO) Info: Starting GDB for $(ELF) + nios2-elf-gdb -ex "target remote localhost:8888" $(ELF) + +.PHONY : gdb-server +gdb-server: + @$(ECHO) Info: Starting GDB server on port 8888 + nios2-gdb-server --tcpport 8888 --tcppersist From ea07dad7dc7f64fc313ceac746dec3800812b550 Mon Sep 17 00:00:00 2001 From: ifrasch17 Date: Fri, 28 Mar 2025 19:02:27 -0600 Subject: [PATCH 168/238] hdl: fix bladeRF1 simulation added missing files to compile.do, and added missing ports to nios_system.vhd, so that compile.do would compile and run without errors --- .../platforms/bladerf/modelsim/compile.do | 14 +++++------ .../platforms/bladerf/vhdl/tb/nios_system.vhd | 23 ++++++++++++++++++- 2 files changed, 29 insertions(+), 8 deletions(-) diff --git a/hdl/fpga/platforms/bladerf/modelsim/compile.do b/hdl/fpga/platforms/bladerf/modelsim/compile.do index 06e95382..74940ac0 100644 --- a/hdl/fpga/platforms/bladerf/modelsim/compile.do +++ b/hdl/fpga/platforms/bladerf/modelsim/compile.do @@ -1,17 +1,17 @@ source ../../../ip/nuand/nuand.do -compile_nuand ../../../ip/nuand +compile_nuand ../../../ip/nuand bladerf vcom -work nuand -2008 ../../../ip/altera/pll/pll.vhd vcom -work nuand -2008 ../../../ip/altera/fx3_pll/fx3_pll.vhd -vcom -work nuand -2008 ../../../ip/altera/rx_fifo/rx_fifo.vhd -vcom -work nuand -2008 ../../../ip/altera/tx_fifo/tx_fifo.vhd -vcom -work nuand -2008 ../../../ip/altera/tx_meta_fifo/tx_meta_fifo.vhd -vcom -work nuand -2008 ../../../ip/altera/rx_meta_fifo/rx_meta_fifo.vhd vcom -work nuand -2008 ../vhdl/tb/nios_system.vhd -vcom -work nuand -2008 ../vhdl/fx3_gpif_p.vhd -vcom -work nuand -2008 ../vhdl/fx3_gpif.vhd +vcom -work nuand -2008 ../../common/bladerf/vhdl/fx3_gpif_p.vhd +vcom -work nuand -2008 ../../common/bladerf/vhdl/fx3_gpif.vhd + +vcom -work nuand -2008 ../../../ip/nuand/lms6_spi_controller/vhdl/lms6_spi_controller.vhd +vcom -work nuand -2008 ../../../ip/nuand/synthesis/lms6002d/vhdl/bladerf_agc_lms_drv.vhd +vcom -work nuand -2008 ../../../ip/nuand/synthesis/lms6002d/vhdl/bladerf_agc.vhd vcom -work nuand -2008 ../vhdl/bladerf.vhd vcom -work nuand -2008 ../vhdl/bladerf_p.vhd diff --git a/hdl/fpga/platforms/bladerf/vhdl/tb/nios_system.vhd b/hdl/fpga/platforms/bladerf/vhdl/tb/nios_system.vhd index 1d9c48a1..eb0c21b2 100644 --- a/hdl/fpga/platforms/bladerf/vhdl/tb/nios_system.vhd +++ b/hdl/fpga/platforms/bladerf/vhdl/tb/nios_system.vhd @@ -46,7 +46,16 @@ entity nios_system is tx_trigger_ctl_in_port : in std_logic_vector(7 downto 0); tx_trigger_ctl_out_port : out std_logic_vector(7 downto 0); rx_trigger_ctl_in_port : in std_logic_vector(7 downto 0); - rx_trigger_ctl_out_port : out std_logic_vector(7 downto 0) + rx_trigger_ctl_out_port : out std_logic_vector(7 downto 0); + arbiter_request : in std_logic_vector(1 downto 0); + arbiter_granted : out std_logic_vector(1 downto 0); + arbiter_ack : in std_logic_vector(1 downto 0); + agc_dc_i_max_export : out std_logic_vector(15 downto 0); + agc_dc_q_max_export : out std_logic_vector(15 downto 0); + agc_dc_i_mid_export : out std_logic_vector(15 downto 0); + agc_dc_q_mid_export : out std_logic_vector(15 downto 0); + agc_dc_i_min_export : out std_logic_vector(15 downto 0); + agc_dc_q_min_export : out std_logic_vector(15 downto 0) ); end entity ; @@ -83,5 +92,17 @@ begin xb_gpio_out_port <= (others =>'0') ; xb_gpio_dir_export <= (others =>'0') ; + tx_trigger_ctl_out_port <= (others => '0'); + rx_trigger_ctl_out_port <= (others => '0'); + + arbiter_granted <= (others => '0'); + + agc_dc_i_max_export <= (others => '0'); + agc_dc_q_max_export <= (others => '0'); + agc_dc_i_mid_export <= (others => '0'); + agc_dc_q_mid_export <= (others => '0'); + agc_dc_i_min_export <= (others => '0'); + agc_dc_q_min_export <= (others => '0'); + end architecture ; From 4bad3ab2efe1dde04e9d34d19c64c9ec777de4f5 Mon Sep 17 00:00:00 2001 From: ifrasch17 Date: Mon, 31 Mar 2025 14:42:48 -0600 Subject: [PATCH 169/238] hdl: fix delayed samples bug in bladeRF1 -adjusted transition from META_DOWNCOUNT to META_LOAD in attempt to fix delayed samples bug in bladeRF1 -Sample FIFO was missing the last read of each block -Saw that meta_current.meta_time.go needed to be held for 1 extra clock cycle -adjusted things so the transition only happens when dma_downcount==2 AND fifo_read=1 --- hdl/fpga/ip/nuand/synthesis/fifo_reader.vhd | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/hdl/fpga/ip/nuand/synthesis/fifo_reader.vhd b/hdl/fpga/ip/nuand/synthesis/fifo_reader.vhd index 1ce256c0..5a24b225 100644 --- a/hdl/fpga/ip/nuand/synthesis/fifo_reader.vhd +++ b/hdl/fpga/ip/nuand/synthesis/fifo_reader.vhd @@ -278,11 +278,11 @@ begin if( packet_en = '0' ) then if( fifo_current.fifo_read = '1') then meta_future.dma_downcount <= meta_current.dma_downcount - NUM_STREAMS; - end if; - if( meta_current.dma_downcount <= 2 ) then - -- Look for 2 because of the 2 cycles passing - -- through META_LOAD and META_WAIT after this. - meta_future.state <= META_LOAD; + if( meta_current.dma_downcount <= 2 ) then + -- Look for 2 because of the 2 cycles passing + -- through META_LOAD and META_WAIT after this. + meta_future.state <= META_LOAD; + end if; end if; else if( fifo_current.packet_control.data_valid = '1') then From 23de23e55fe12bedec1f000ac276e53ab3522053 Mon Sep 17 00:00:00 2001 From: ifrasch17 Date: Mon, 31 Mar 2025 16:05:58 -0600 Subject: [PATCH 170/238] hdl: Added missing signals to bladeRF2 nios_system model --- .../bladerf-micro/vhdl/tb/nios_system.vhd | 24 ++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/hdl/fpga/platforms/bladerf-micro/vhdl/tb/nios_system.vhd b/hdl/fpga/platforms/bladerf-micro/vhdl/tb/nios_system.vhd index aec9aee9..c6c0a582 100644 --- a/hdl/fpga/platforms/bladerf-micro/vhdl/tb/nios_system.vhd +++ b/hdl/fpga/platforms/bladerf-micro/vhdl/tb/nios_system.vhd @@ -108,7 +108,20 @@ entity nios_system is tx_trigger_ctl_out_port : out std_logic_vector(7 downto 0); -- out_port xb_gpio_in_port : in std_logic_vector(31 downto 0) := (others => 'X'); -- in_port xb_gpio_out_port : out std_logic_vector(31 downto 0); -- out_port - xb_gpio_dir_export : out std_logic_vector(31 downto 0) -- export + xb_gpio_dir_export : out std_logic_vector(31 downto 0); -- export + arbiter_request : in std_logic_vector(1 downto 0) := (others => 'X'); -- request + arbiter_granted : out std_logic_vector(1 downto 0); -- granted + arbiter_ack : in std_logic_vector(1 downto 0) := (others => 'X'); -- ack + wbm_wb_clk_i : in std_logic := 'X'; -- clk_i + wbm_wb_rst_i : in std_logic := 'X'; -- rst_i + wbm_wb_adr_o : out std_logic_vector(31 downto 0); -- adr_o + wbm_wb_dat_o : out std_logic_vector(31 downto 0); -- dat_o + wbm_wb_dat_i : in std_logic_vector(31 downto 0) := (others => 'X'); -- dat_i + wbm_wb_we_o : out std_logic; -- we_o + wbm_wb_sel_o : out std_logic; -- sel_o + wbm_wb_stb_o : out std_logic; -- stb_o + wbm_wb_ack_i : in std_logic := 'X'; -- ack_i + wbm_wb_cyc_o : out std_logic -- cyc_o ); end entity ; @@ -142,5 +155,14 @@ begin xb_gpio_out_port <= (others =>'0') ; xb_gpio_dir_export <= (others =>'0') ; + arbiter_granted <= (others => '0'); + + wbm_wb_adr_o <= (others => '0'); + wbm_wb_dat_o <= (others => '0'); + wbm_wb_we_o <= '0'; + wbm_wb_sel_o <= '0'; + wbm_wb_stb_o <= '0'; + wbm_wb_cyc_o <= '0'; + end architecture ; From 309e5e02667d5484535d5a7c6b23a7c169c09ec5 Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Wed, 2 Apr 2025 12:35:03 -0500 Subject: [PATCH 171/238] hdl: fixed corrupted uart buffer with two writes before a read When in the WAIT_FOR_READ state, the first character in reg_request continuously is overwritten. --- hdl/fpga/ip/nuand/command_uart/vhdl/command_uart.vhd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hdl/fpga/ip/nuand/command_uart/vhdl/command_uart.vhd b/hdl/fpga/ip/nuand/command_uart/vhdl/command_uart.vhd index 22bb4998..867c43fb 100644 --- a/hdl/fpga/ip/nuand/command_uart/vhdl/command_uart.vhd +++ b/hdl/fpga/ip/nuand/command_uart/vhdl/command_uart.vhd @@ -184,7 +184,7 @@ begin count := 0 ; irq <= '0' ; elsif( rising_edge(clock) ) then - if( sin_we = '1' ) then + if( sin_we = '1' and state /= WAIT_FOR_READ ) then reg_request(count*8+7 downto count*8) <= sin_data ; end if ; case state is From 2afc6535573b6bf7ac950df0272b8bae179f730f Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Thu, 3 Apr 2025 16:03:57 -0500 Subject: [PATCH 172/238] hdl: dynamically set Nios data and instruction base address by ram size --- hdl/fpga/platforms/bladerf-micro/build/nios_system.tcl | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/hdl/fpga/platforms/bladerf-micro/build/nios_system.tcl b/hdl/fpga/platforms/bladerf-micro/build/nios_system.tcl index 6530f959..e1a3f57d 100644 --- a/hdl/fpga/platforms/bladerf-micro/build/nios_system.tcl +++ b/hdl/fpga/platforms/bladerf-micro/build/nios_system.tcl @@ -33,6 +33,10 @@ if { [info exists platform_revision] == 0 } { puts "platform revision: ${platform_revision}" } +# RAM base address is equal to the RAM size +set ram_base_addr "0x[format %08x $ram_size]" +puts "RAM size: ${ram_size}, base address: ${ram_base_addr}" + # Instances and instance parameters # (disabled instances are intentionally culled) add_instance axi_ad9361_0 axi_ad9361 1.0 @@ -496,7 +500,7 @@ set_connection_parameter_value nios2.data_master/peripheral_spi.spi_control_port add_connection nios2.data_master ram.s1 set_connection_parameter_value nios2.data_master/ram.s1 arbitrationPriority {1} -set_connection_parameter_value nios2.data_master/ram.s1 baseAddress {0x00020000} +set_connection_parameter_value nios2.data_master/ram.s1 baseAddress ${ram_base_addr} set_connection_parameter_value nios2.data_master/ram.s1 defaultConnection {0} add_connection nios2.data_master rffe_spi.spi_control_port @@ -556,7 +560,7 @@ set_connection_parameter_value nios2.instruction_master/nios2.debug_mem_slave de add_connection nios2.instruction_master ram.s1 set_connection_parameter_value nios2.instruction_master/ram.s1 arbitrationPriority {1} -set_connection_parameter_value nios2.instruction_master/ram.s1 baseAddress {0x00020000} +set_connection_parameter_value nios2.instruction_master/ram.s1 baseAddress ${ram_base_addr} set_connection_parameter_value nios2.instruction_master/ram.s1 defaultConnection {0} add_connection nios2.irq command_uart.interrupt From 7b6a08e943749acf6fa916b04aae32c64defd8e4 Mon Sep 17 00:00:00 2001 From: Ben Morse Date: Tue, 8 Apr 2025 10:45:16 +0000 Subject: [PATCH 173/238] fx3: more explicit instructions for fx3 SDK --- fx3_firmware/README.md | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/fx3_firmware/README.md b/fx3_firmware/README.md index 195dad6f..d9bffde9 100644 --- a/fx3_firmware/README.md +++ b/fx3_firmware/README.md @@ -18,7 +18,7 @@ Building the FX3 firmware first requires the download of the [Cypress FX3 SDK][c **This firmware build requires FX3 SDK version 1.3.3 or later** -[cypress_sdk]: http://www.cypress.com/?rID=57990 (Cypress FX3 SDK) +[cypress_sdk]: http://www.cypress.com/?rID=57990 (Cypress FX3 SDK) (downloaded file is `ezusbfx3sdk_1.3.5_Linux_x32-x64.tar.gz`) [CMake](https://cmake.org) is used to configure the build. There are two locations that we must provide to CMake when configuring the build: @@ -27,6 +27,24 @@ Building the FX3 firmware first requires the download of the [Cypress FX3 SDK][c ### Command Line-Based Build (Recommended for Linux Users) ### +#### Setting up the FX3 SDK on Linux #### + +1. Extract the contents of `ezusbfx3sdk_1.3.5_Linux_x32-x64.tar.gz` (the contents are 5 .tar.gz files) +2. Extract and arrange two of them such that these folders exist: + - `/opt/cypress/ARM_GCC/arm-2013.11/` + - `/opt/cypress/fx3_firmware_linux/cyfx3sdk/` + +##### Ubuntu 20.04 Dependencies ##### +On Ubuntu 20.04, you'll need to install 32-bit libraries: + +``` +sudo dpkg --add-architecture i386 +sudo apt update +sudo apt install libc6:i386 libstdc++6:i386 libncurses5:i386 +``` + +#### Building the Firmware #### + Below are instructions for building the FX3 firmware from the command-line. This assumes that `cmake` and `make` are in your `PATH`, and is best suited for Linux developers. From b0aa8dd99c937c416daaafc5a7023a5caa224380 Mon Sep 17 00:00:00 2001 From: ifrasch17 Date: Tue, 8 Apr 2025 16:42:38 -0600 Subject: [PATCH 174/238] libbladeRF: Update API documentation for new GPIF buffer sizes -fixed the buffer sizes listed in the descriptions of the bladerf META formats --- host/libraries/libbladeRF/include/libbladeRF.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/host/libraries/libbladeRF/include/libbladeRF.h b/host/libraries/libbladeRF/include/libbladeRF.h index 8ef9f166..ab199253 100644 --- a/host/libraries/libbladeRF/include/libbladeRF.h +++ b/host/libraries/libbladeRF/include/libbladeRF.h @@ -2179,8 +2179,8 @@ typedef enum { * * *The number of samples in a block is dependent upon * the USB speed being used: - * - USB 2.0 Hi-Speed: 256 samples - * - USB 3.0 SuperSpeed: 512 samples + * - USB 2.0 Hi-Speed: 1024 samples + * - USB 3.0 SuperSpeed: 2048 samples * * When using the bladerf_sync_rx() and bladerf_sync_tx() functions, the * above details are entirely transparent; the caller need not be concerned @@ -2324,8 +2324,8 @@ typedef enum { * * *The number of samples in a block is dependent upon * the USB speed being used: - * - USB 2.0 Hi-Speed: 256 samples - * - USB 3.0 SuperSpeed: 512 samples + * - USB 2.0 Hi-Speed: 1024 samples + * - USB 3.0 SuperSpeed: 2048 samples * * When using the bladerf_sync_rx() and bladerf_sync_tx() functions, the * above details are entirely transparent; the caller need not be concerned From b137fbdf9179f81a5ca39999343b938ae7926ff1 Mon Sep 17 00:00:00 2001 From: ifrasch17 Date: Tue, 8 Apr 2025 17:55:28 -0600 Subject: [PATCH 175/238] hdl: updated readme with latest information -removed stale information -current quartus version to use is 20.1.1 -updated to include info about bladeRF 2 micro in addition to bladeRF 1 --- hdl/README.md | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/hdl/README.md b/hdl/README.md index 5462a08c..8dfd483d 100644 --- a/hdl/README.md +++ b/hdl/README.md @@ -1,5 +1,5 @@ # bladeRF HDL Source # -The Cyclone IV FPGA is at the heart of the bladeRF. It interfaces to the Cypress FX3, Lime Micro LMS6002D RF transceiver, Si5338 clock generator chip, and VCTCXO trim DAC. It has an input to read NMEA from a GPS as well as a 1pps input for time synchronization of signals and has a reference input for a reference clock to tame the VCTCXO. Lastly, it connects directly to the expansion header for controlling GPIO or any other interfaces that may reside on the expansion board. +The Cyclone FPGA is at the heart of the bladeRF. It interfaces to the Cypress FX3, Analog Devices AD9361 (bladeRF 2.0 micro) or Lime Micro LMS6002D (bladeRF 1) RF transceiver, Silicon Labs clock generator chip, and VCTCXO trim DAC. It has an input to read NMEA from a GPS as well as a 1pps input for time synchronization of signals and has a reference input for a reference clock to tame the VCTCXO. Lastly, it connects directly to the expansion header for controlling GPIO or any other interfaces that may reside on the expansion board. The HDL is separated out into two different sections: @@ -18,13 +18,14 @@ Some FPGA binaries are available for [download][download]. Please note the md5 [download]: https://www.nuand.com/fpga/ (nuand/FPGA Images) ## Required Software ## -We use an [Intel (Altera)][intel] [Cyclone IV E FPGA][cive]. The size of the FPGA is the only difference between the x40 and x115 models. Intel provides their [Quartus Prime][quartus] software for synthesizing designs for their FPGAs. The Lite Edition is free of charge, but not open source, and may require registering on their site to download the software. +We use an [Intel (Altera)][intel] [Cyclone V E FPGA][cve] for bladeRF 2.0 micro and a [Cyclone IV E FPGA][cive] for bladeRF 1 (classic). The size of the FPGA is the only difference between different bladeRF models of the same generation (x40 vs x115, xA4 vs xA9). Intel provides their [Quartus Prime][quartus] software for synthesizing designs for their FPGAs. The Lite Edition is free of charge, but not open source, and may require registering on their site to download the software. -**Important Note:** Be sure to download and install [Quartus Prime version 17.1][quartus], which the bladeRF project files are based upon. Updates to Quartus Prime are not guaranteed to be reverse-compatible with earlier Quartus versions, nor will future versions necessarily be reverse-compatible. +**Important Note:** Be sure to download and install [Quartus Prime version 20.1.1][quartus], which the bladeRF project files are based upon. Updates to Quartus Prime are not guaranteed to be reverse-compatible with earlier Quartus versions, nor will future versions necessarily be reverse-compatible. Particularly, newer versions of Quartus may not support older generation bladeRF 1 devices or the Nios II processor used on all bladeRF devices. [intel]: https://www.altera.com/ (Altera, part of the Intel Programmable Solutions Group) -[quartus]: https://dl.altera.com/17.1/?edition=lite (Quartus Prime Lite Edition v17.1) -[cive]: https://www.altera.com/products/fpga/cyclone-series/cyclone-iv/overview.html +[quartus]: https://www.intel.com/content/www/us/en/software-kit/660904/intel-quartus-prime-lite-edition-design-software-version-20-1-1-for-linux.html (Quartus Prime Lite Edition v20.1.1) +[cve]: https://www.intel.com/content/www/us/en/products/details/fpga/cyclone/v.html +[cive]: https://www.intel.com/content/www/us/en/products/details/fpga/cyclone/iv.html ## HDL Structure ## Since the FPGA is connected and soldered down to the board, it makes sense to have a single top level which defines where the pins go, their IO levels and their general directionality. We use a single `bladerf.vhd` top level to define a VHDL entity called `bladerf` that defines these pins. @@ -41,21 +42,25 @@ This technique can be seen with the currently supported architectures: ## Building the Project ## The Quartus Prime build tools supports TCL as a scripting language which we utilize to not only create the project file, but build the system without requiring the need of the GUI. Currently, the `build_bladerf.sh` performs some environment checks, builds the NIOS BSP and software, and then kicks off TCL scripts to build the FPGA image. -To support multiple versions of Quartus Prime on the same machine and to ensure the environment is appropriately setup, please use the `nios2_command_shell.sh` script to get into an appropriate Quartus Prime environment. Note that this shell script is usually located in the `nios2eds` directory of your Quartus Prime install directory. Also note that this is the preferred method regardless of using Windows or Linux to build. If you're using pybombs, make sure you haven't run `setup_env.sh`, as it prevents `nios2_command_shell.sh` from working properly. +To support multiple versions of Quartus Prime on the same machine and to ensure the environment is appropriately setup, please run the `nios2_command_shell.sh` script to get into an appropriate Quartus Prime environment. Note that this shell script is usually located in the `nios2eds` directory of your Quartus Prime install directory (e.g. `~/intelFPGA_lite/20.1/nios2eds/nios2_command_shell.sh`). Also note that this is the preferred method regardless of using Windows or Linux to build. If you're using pybombs, make sure you haven't run `setup_env.sh`, as it prevents `nios2_command_shell.sh` from working properly. -1. Take note of which Cyclone device you have. (The EP4CE40 is 40 kLE, and the EP4CE115 is 115 kLE.) You'll need this size below. +1. Take note of your bladeRF model (bladeRF micro, bladeRF classic) and its corresponding FPGA size (x40, xA9, etc). You'll need this info below. 2. Enter the `quartus` directory -3. Execute, from inside an appropriate NIOS II command shell, `./build_bladerf.sh -h` to view the usage for the build script. Note the size and revision options. Also note any items you'll need to add to your PATH before continuing. -4. Execute, from inside an appropriate NIOS II command shell, `./build_bladerf.sh -s -r `, with the relevant size for your bladeRF, and the desired revision. This will create the NIOS system and software associated with the FPGA build needed by the internal RAM for execution. +3. Execute, from inside an appropriate NIOS II command shell, `./build_bladerf.sh -h` to view the usage for the build script. Note the board, size, and revision options. Also note any items you'll need to add to your PATH before continuing. +4. Execute, from inside an appropriate NIOS II command shell, `./build_bladerf.sh -b -s -r `, with your bladeRF board model, the relevant size for your bladeRF, and the desired revision. This will create the NIOS system and software associated with the FPGA build needed by the internal RAM for execution. 5. The output of the build will be stored in a directory named in the form, `x-`. This directory will contain the bitstream, summaries, and reports. Note that there will be a _lot_ of information displayed from notes to critical warnings. Some of these are benign and others are, in fact, critical. -## Adding Signal Tap ## -For advanced users who want to use Signal Tap internal logic analyzer in their design, the `build.tcl` file can be passed a `-stp` flag which will add the Signal Tap file to the project before building it: - +Ex: Build the bladeRF 2.0 micro xA4 with the default `hosted` architecture ``` -quartus_sh -t ../build.tcl -rev hosted -size 115 -stp ../signaltap/debug_rx.stp +./build_bladerf.sh -b bladeRF-micro -s A4 -r hosted +``` + +## Adding Signal Tap ## +For advanced users who want to use Signal Tap internal logic analyzer in their design, use the `-a` flag to add the Signal Tap file to the project before building it: +``` +./build_bladerf.sh -b bladeRF-micro -s A4 -r hosted -a ../signaltap/debug_rx.stp ``` Note that to use Signal Tap with the Quartus Prime Lite Edition software, the TalkBack feature must be enabled. The build script tries to 'fake' this out by setting the TalkBack feature to be on, compiling the project, then turning it off immediately afterward. If this behavior is not desired, don't try to add a Signal Tap file to the project. From 4fd2a40ae16f8710f1447ad1e07a63682be82596 Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Wed, 9 Apr 2025 16:46:31 -0500 Subject: [PATCH 176/238] host: googletest and abseil version bump --- .../libbladeRF_test/test_regression/CMakeLists.txt | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/host/libraries/libbladeRF_test/test_regression/CMakeLists.txt b/host/libraries/libbladeRF_test/test_regression/CMakeLists.txt index e5bf0f7c..266fabc8 100644 --- a/host/libraries/libbladeRF_test/test_regression/CMakeLists.txt +++ b/host/libraries/libbladeRF_test/test_regression/CMakeLists.txt @@ -12,14 +12,9 @@ enable_testing() FetchContent_Declare( googletest GIT_REPOSITORY https://github.com/google/googletest.git - GIT_TAG v1.13.x + GIT_TAG v1.16.x ) -FetchContent_GetProperties(googletest) -if(NOT googletest_POPULATED) - FetchContent_Populate(googletest) - add_subdirectory(${googletest_SOURCE_DIR} ${googletest_BINARY_DIR}) -endif() # For Windows: Prevent overriding the parent project's compiler/linker settings set(gtest_force_shared_crt ON CACHE BOOL "" FORCE) FetchContent_MakeAvailable(googletest) @@ -28,12 +23,9 @@ set(ABSL_PROPAGATE_CXX_STD ON) FetchContent_Declare( abseil GIT_REPOSITORY https://github.com/abseil/abseil-cpp.git - GIT_TAG lts_2023_01_25 + GIT_TAG lts_2025_01_27 ) -if(NOT abseil_POPULATED) - FetchContent_Populate(abseil) - add_subdirectory(${abseil_SOURCE_DIR} ${abseil_BINARY_DIR}) -endif() +FetchContent_MakeAvailable(abseil) set(INCLUDES ./include From af0045347fa618ab84ac9a1e5b9fad4a7606e320 Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Wed, 9 Apr 2025 15:00:23 -0500 Subject: [PATCH 177/238] host: update CMake minimum required version format Update cmake_minimum_required calls to use the 'min...max' version range syntax to fix CMake deprecation warnings. Also modernized CMP0115 policy to use the NEW behavior instead of OLD. --- CMakeLists.txt | 2 +- host/CMakeLists.txt | 2 +- host/common/test/dc_calibration/CMakeLists.txt | 2 +- host/libraries/CMakeLists.txt | 2 +- host/libraries/libbladeRF/CMakeLists.txt | 4 ++-- host/libraries/libbladeRF/doc/examples/CMakeLists.txt | 2 +- host/libraries/libbladeRF/include/CMakeLists.txt | 2 +- host/libraries/libbladeRF_test/CMakeLists.txt | 2 +- host/libraries/libbladeRF_test/test_async/CMakeLists.txt | 2 +- .../libbladeRF_test/test_bootloader_recovery/CMakeLists.txt | 2 +- host/libraries/libbladeRF_test/test_c/CMakeLists.txt | 2 +- .../libbladeRF_test/test_clock_select/CMakeLists.txt | 2 +- .../libraries/libbladeRF_test/test_config_file/CMakeLists.txt | 2 +- host/libraries/libbladeRF_test/test_cpp/CMakeLists.txt | 2 +- host/libraries/libbladeRF_test/test_ctrl/CMakeLists.txt | 2 +- .../libbladeRF_test/test_digital_loopback/CMakeLists.txt | 2 +- host/libraries/libbladeRF_test/test_fpga_load/CMakeLists.txt | 2 +- host/libraries/libbladeRF_test/test_freq_hop/CMakeLists.txt | 2 +- host/libraries/libbladeRF_test/test_fw_check/CMakeLists.txt | 2 +- .../libbladeRF_test/test_gain_calibration/CMakeLists.txt | 2 +- .../libbladeRF_test/test_gain_compare/CMakeLists.txt | 2 +- .../libraries/libbladeRF_test/test_interleaver/CMakeLists.txt | 2 +- host/libraries/libbladeRF_test/test_open/CMakeLists.txt | 2 +- host/libraries/libbladeRF_test/test_packet/CMakeLists.txt | 2 +- host/libraries/libbladeRF_test/test_parse/CMakeLists.txt | 2 +- .../libbladeRF_test/test_peripheral_timing/CMakeLists.txt | 2 +- .../libbladeRF_test/test_quick_retune/CMakeLists.txt | 2 +- host/libraries/libbladeRF_test/test_regression/CMakeLists.txt | 2 +- .../libbladeRF_test/test_repeated_stream/CMakeLists.txt | 2 +- host/libraries/libbladeRF_test/test_repeater/CMakeLists.txt | 2 +- host/libraries/libbladeRF_test/test_rx_discont/CMakeLists.txt | 2 +- .../libbladeRF_test/test_scheduled_retune/CMakeLists.txt | 2 +- host/libraries/libbladeRF_test/test_streaming/CMakeLists.txt | 2 +- host/libraries/libbladeRF_test/test_sync/CMakeLists.txt | 2 +- host/libraries/libbladeRF_test/test_timestamps/CMakeLists.txt | 2 +- .../libraries/libbladeRF_test/test_tune_timing/CMakeLists.txt | 2 +- .../libraries/libbladeRF_test/test_unused_sync/CMakeLists.txt | 2 +- host/libraries/libbladeRF_test/test_version/CMakeLists.txt | 2 +- host/misc/CMakeLists.txt | 2 +- host/misc/udev/CMakeLists.txt | 2 +- host/utilities/CMakeLists.txt | 2 +- host/utilities/bladeRF-cli/CMakeLists.txt | 2 +- host/utilities/bladeRF-fsk/c/CMakeLists.txt | 2 +- host/utilities/bladeRF-power/CMakeLists.txt | 2 +- host/utilities/bladeRF-update/CMakeLists.txt | 2 +- 45 files changed, 46 insertions(+), 46 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 62860e41..e885cb49 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10...3.27) project(bladeRF CXX C) # Indicate that this is a top-level build set(BLADERF_TOP_LEVEL_BUILD ON) diff --git a/host/CMakeLists.txt b/host/CMakeLists.txt index 4986b9b1..1cd1a96d 100644 --- a/host/CMakeLists.txt +++ b/host/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10...3.27) project(bladeRF C) ################################################################################ diff --git a/host/common/test/dc_calibration/CMakeLists.txt b/host/common/test/dc_calibration/CMakeLists.txt index 40ecea94..0540497c 100644 --- a/host/common/test/dc_calibration/CMakeLists.txt +++ b/host/common/test/dc_calibration/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10...3.27) project(test_dc_calibration C) set(INCLUDES diff --git a/host/libraries/CMakeLists.txt b/host/libraries/CMakeLists.txt index e821c040..b70d1f44 100644 --- a/host/libraries/CMakeLists.txt +++ b/host/libraries/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10...3.27) add_subdirectory(libbladeRF) # Conditionally add the test directory diff --git a/host/libraries/libbladeRF/CMakeLists.txt b/host/libraries/libbladeRF/CMakeLists.txt index f1074908..1a3f8165 100644 --- a/host/libraries/libbladeRF/CMakeLists.txt +++ b/host/libraries/libbladeRF/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10...3.27) project(libbladeRF C) @@ -432,7 +432,7 @@ if(MSVC) endif() if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.20) - cmake_policy(SET CMP0115 OLD) + cmake_policy(SET CMP0115 NEW) endif(CMAKE_VERSION VERSION_GREATER_EQUAL 3.20) add_library(libbladerf_shared SHARED ${LIBBLADERF_SOURCE}) diff --git a/host/libraries/libbladeRF/doc/examples/CMakeLists.txt b/host/libraries/libbladeRF/doc/examples/CMakeLists.txt index b5670f2f..58b4ce4a 100644 --- a/host/libraries/libbladeRF/doc/examples/CMakeLists.txt +++ b/host/libraries/libbladeRF/doc/examples/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10...3.27) project(libbladeRF_doc_examples C) set(INCLUDES diff --git a/host/libraries/libbladeRF/include/CMakeLists.txt b/host/libraries/libbladeRF/include/CMakeLists.txt index 2c5db08a..4ce9bd67 100644 --- a/host/libraries/libbladeRF/include/CMakeLists.txt +++ b/host/libraries/libbladeRF/include/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10...3.27) ################################################################################ # Install libbladeRF header files diff --git a/host/libraries/libbladeRF_test/CMakeLists.txt b/host/libraries/libbladeRF_test/CMakeLists.txt index e637ca8a..fc3d90e1 100644 --- a/host/libraries/libbladeRF_test/CMakeLists.txt +++ b/host/libraries/libbladeRF_test/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.9) +cmake_minimum_required(VERSION 3.10...3.27) add_subdirectory(test_async) add_subdirectory(test_bootloader_recovery) diff --git a/host/libraries/libbladeRF_test/test_async/CMakeLists.txt b/host/libraries/libbladeRF_test/test_async/CMakeLists.txt index fd4cdeb3..c6693cb0 100644 --- a/host/libraries/libbladeRF_test/test_async/CMakeLists.txt +++ b/host/libraries/libbladeRF_test/test_async/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10...3.27) project(libbladeRF_test_async C) set(INCLUDES diff --git a/host/libraries/libbladeRF_test/test_bootloader_recovery/CMakeLists.txt b/host/libraries/libbladeRF_test/test_bootloader_recovery/CMakeLists.txt index d9077c5a..cd68644e 100644 --- a/host/libraries/libbladeRF_test/test_bootloader_recovery/CMakeLists.txt +++ b/host/libraries/libbladeRF_test/test_bootloader_recovery/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10...3.27) project(libbladeRF_test_bootloader_recovery C) set(INCLUDES diff --git a/host/libraries/libbladeRF_test/test_c/CMakeLists.txt b/host/libraries/libbladeRF_test/test_c/CMakeLists.txt index 20432e0e..fe2bc230 100644 --- a/host/libraries/libbladeRF_test/test_c/CMakeLists.txt +++ b/host/libraries/libbladeRF_test/test_c/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10...3.27) project(libbladeRF_test_c C) set(INCLUDES ${libbladeRF_SOURCE_DIR}/include) diff --git a/host/libraries/libbladeRF_test/test_clock_select/CMakeLists.txt b/host/libraries/libbladeRF_test/test_clock_select/CMakeLists.txt index 1087fba6..a2a21ee5 100644 --- a/host/libraries/libbladeRF_test/test_clock_select/CMakeLists.txt +++ b/host/libraries/libbladeRF_test/test_clock_select/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10...3.27) project(libbladeRF_test_clock_select C) set(INCLUDES ${libbladeRF_SOURCE_DIR}/include) diff --git a/host/libraries/libbladeRF_test/test_config_file/CMakeLists.txt b/host/libraries/libbladeRF_test/test_config_file/CMakeLists.txt index 0b24ddb1..79398e76 100644 --- a/host/libraries/libbladeRF_test/test_config_file/CMakeLists.txt +++ b/host/libraries/libbladeRF_test/test_config_file/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10...3.27) project(libbladeRF_test_config_file C) set(TEST_CONFIG_FILE_INCLUDES diff --git a/host/libraries/libbladeRF_test/test_cpp/CMakeLists.txt b/host/libraries/libbladeRF_test/test_cpp/CMakeLists.txt index cc022968..5d716a70 100644 --- a/host/libraries/libbladeRF_test/test_cpp/CMakeLists.txt +++ b/host/libraries/libbladeRF_test/test_cpp/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10...3.27) project(libbladeRF_test_cpp CXX) include_directories(${libbladeRF_SOURCE_DIR}/include) diff --git a/host/libraries/libbladeRF_test/test_ctrl/CMakeLists.txt b/host/libraries/libbladeRF_test/test_ctrl/CMakeLists.txt index d8379f5a..c52f2150 100644 --- a/host/libraries/libbladeRF_test/test_ctrl/CMakeLists.txt +++ b/host/libraries/libbladeRF_test/test_ctrl/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10...3.27) project(libbladeRF_test_ctrl C) set(INCLUDES diff --git a/host/libraries/libbladeRF_test/test_digital_loopback/CMakeLists.txt b/host/libraries/libbladeRF_test/test_digital_loopback/CMakeLists.txt index a057e46f..c9f783a6 100644 --- a/host/libraries/libbladeRF_test/test_digital_loopback/CMakeLists.txt +++ b/host/libraries/libbladeRF_test/test_digital_loopback/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10...3.27) project(libbladeRF_test_digital_loopback C) set(INCLUDES diff --git a/host/libraries/libbladeRF_test/test_fpga_load/CMakeLists.txt b/host/libraries/libbladeRF_test/test_fpga_load/CMakeLists.txt index bcb26fda..5f195f05 100644 --- a/host/libraries/libbladeRF_test/test_fpga_load/CMakeLists.txt +++ b/host/libraries/libbladeRF_test/test_fpga_load/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10...3.27) project(libbladeRF_test_fpga_load C) set(INCLUDES ${libbladeRF_SOURCE_DIR}/include) diff --git a/host/libraries/libbladeRF_test/test_freq_hop/CMakeLists.txt b/host/libraries/libbladeRF_test/test_freq_hop/CMakeLists.txt index 666174fc..92452e93 100644 --- a/host/libraries/libbladeRF_test/test_freq_hop/CMakeLists.txt +++ b/host/libraries/libbladeRF_test/test_freq_hop/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10...3.27) project(libbladeRF_test_freq_hop C) set(INCLUDES diff --git a/host/libraries/libbladeRF_test/test_fw_check/CMakeLists.txt b/host/libraries/libbladeRF_test/test_fw_check/CMakeLists.txt index caee11b4..108aa322 100644 --- a/host/libraries/libbladeRF_test/test_fw_check/CMakeLists.txt +++ b/host/libraries/libbladeRF_test/test_fw_check/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10...3.27) project(libbladeRF_test_fw_check C) set(INCLUDES diff --git a/host/libraries/libbladeRF_test/test_gain_calibration/CMakeLists.txt b/host/libraries/libbladeRF_test/test_gain_calibration/CMakeLists.txt index aa074f5a..9157738c 100644 --- a/host/libraries/libbladeRF_test/test_gain_calibration/CMakeLists.txt +++ b/host/libraries/libbladeRF_test/test_gain_calibration/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10...3.27) project(libbladeRF_test_gain_calibration C) set(INCLUDES diff --git a/host/libraries/libbladeRF_test/test_gain_compare/CMakeLists.txt b/host/libraries/libbladeRF_test/test_gain_compare/CMakeLists.txt index 7ebe543e..af89c370 100644 --- a/host/libraries/libbladeRF_test/test_gain_compare/CMakeLists.txt +++ b/host/libraries/libbladeRF_test/test_gain_compare/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10...3.27) project(libbladeRF_test_gain_compare C) set(INCLUDES diff --git a/host/libraries/libbladeRF_test/test_interleaver/CMakeLists.txt b/host/libraries/libbladeRF_test/test_interleaver/CMakeLists.txt index 6ccf938b..d71caa14 100644 --- a/host/libraries/libbladeRF_test/test_interleaver/CMakeLists.txt +++ b/host/libraries/libbladeRF_test/test_interleaver/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10...3.27) project(libbladeRF_test_interleaver C) set(INCLUDES diff --git a/host/libraries/libbladeRF_test/test_open/CMakeLists.txt b/host/libraries/libbladeRF_test/test_open/CMakeLists.txt index e55fada2..82f47504 100644 --- a/host/libraries/libbladeRF_test/test_open/CMakeLists.txt +++ b/host/libraries/libbladeRF_test/test_open/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10...3.27) project(libbladeRF_test_open C) set(INCLUDES diff --git a/host/libraries/libbladeRF_test/test_packet/CMakeLists.txt b/host/libraries/libbladeRF_test/test_packet/CMakeLists.txt index 69f3c46a..3bfb9bc7 100644 --- a/host/libraries/libbladeRF_test/test_packet/CMakeLists.txt +++ b/host/libraries/libbladeRF_test/test_packet/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10...3.27) project(libbladeRF_test_packet C) set(INCLUDES diff --git a/host/libraries/libbladeRF_test/test_parse/CMakeLists.txt b/host/libraries/libbladeRF_test/test_parse/CMakeLists.txt index 133310cb..ac662368 100644 --- a/host/libraries/libbladeRF_test/test_parse/CMakeLists.txt +++ b/host/libraries/libbladeRF_test/test_parse/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10...3.27) project(libbladeRF_test_parse C) set(INCLUDES diff --git a/host/libraries/libbladeRF_test/test_peripheral_timing/CMakeLists.txt b/host/libraries/libbladeRF_test/test_peripheral_timing/CMakeLists.txt index d5f8311c..480bf6ad 100644 --- a/host/libraries/libbladeRF_test/test_peripheral_timing/CMakeLists.txt +++ b/host/libraries/libbladeRF_test/test_peripheral_timing/CMakeLists.txt @@ -5,7 +5,7 @@ # the NIOS II code, it probably won't get much general use, so we'll just # leave this as-is for now. if(${CMAKE_SYSTEM_NAME} MATCHES "Linux") - cmake_minimum_required(VERSION 3.5) + cmake_minimum_required(VERSION 3.10...3.27) project(libbladeRF_test_peripheral_timing C) set(INCLUDES diff --git a/host/libraries/libbladeRF_test/test_quick_retune/CMakeLists.txt b/host/libraries/libbladeRF_test/test_quick_retune/CMakeLists.txt index 4a239b44..250eac1d 100644 --- a/host/libraries/libbladeRF_test/test_quick_retune/CMakeLists.txt +++ b/host/libraries/libbladeRF_test/test_quick_retune/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10...3.27) project(libbladeRF_test_quick_retune C) set(INCLUDES diff --git a/host/libraries/libbladeRF_test/test_regression/CMakeLists.txt b/host/libraries/libbladeRF_test/test_regression/CMakeLists.txt index 266fabc8..78f09b88 100644 --- a/host/libraries/libbladeRF_test/test_regression/CMakeLists.txt +++ b/host/libraries/libbladeRF_test/test_regression/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.11) # FetchContent is available in 3.11 +cmake_minimum_required(VERSION 3.11...3.27) # FetchContent is available in 3.11 project(libbladeRF_test_regression VERSION 3.11 LANGUAGES CXX) diff --git a/host/libraries/libbladeRF_test/test_repeated_stream/CMakeLists.txt b/host/libraries/libbladeRF_test/test_repeated_stream/CMakeLists.txt index 0537f163..53450df7 100644 --- a/host/libraries/libbladeRF_test/test_repeated_stream/CMakeLists.txt +++ b/host/libraries/libbladeRF_test/test_repeated_stream/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10...3.27) project(libbladeRF_test_repeated_stream C) set(INCLUDES diff --git a/host/libraries/libbladeRF_test/test_repeater/CMakeLists.txt b/host/libraries/libbladeRF_test/test_repeater/CMakeLists.txt index 68c5ce24..06a115c6 100644 --- a/host/libraries/libbladeRF_test/test_repeater/CMakeLists.txt +++ b/host/libraries/libbladeRF_test/test_repeater/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10...3.27) project(libbladeRF_test_repeater C) if(MSVC) diff --git a/host/libraries/libbladeRF_test/test_rx_discont/CMakeLists.txt b/host/libraries/libbladeRF_test/test_rx_discont/CMakeLists.txt index ac28ca0a..bd812bd9 100644 --- a/host/libraries/libbladeRF_test/test_rx_discont/CMakeLists.txt +++ b/host/libraries/libbladeRF_test/test_rx_discont/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10...3.27) project(libbladeRF_test_rx_discont C) set(INCLUDES diff --git a/host/libraries/libbladeRF_test/test_scheduled_retune/CMakeLists.txt b/host/libraries/libbladeRF_test/test_scheduled_retune/CMakeLists.txt index 9788a971..b1c6cf95 100644 --- a/host/libraries/libbladeRF_test/test_scheduled_retune/CMakeLists.txt +++ b/host/libraries/libbladeRF_test/test_scheduled_retune/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10...3.27) project(libbladeRF_test_scheduled_retune C) include_directories(${libbladeRF_SOURCE_DIR}/include) diff --git a/host/libraries/libbladeRF_test/test_streaming/CMakeLists.txt b/host/libraries/libbladeRF_test/test_streaming/CMakeLists.txt index ffc48c12..be7095f7 100644 --- a/host/libraries/libbladeRF_test/test_streaming/CMakeLists.txt +++ b/host/libraries/libbladeRF_test/test_streaming/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10...3.27) project(libbladeRF_test_streaming C) set(INCLUDES diff --git a/host/libraries/libbladeRF_test/test_sync/CMakeLists.txt b/host/libraries/libbladeRF_test/test_sync/CMakeLists.txt index fd3e31f9..625eeb32 100644 --- a/host/libraries/libbladeRF_test/test_sync/CMakeLists.txt +++ b/host/libraries/libbladeRF_test/test_sync/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10...3.27) project(libbladeRF_test_sync C) set(TEST_SYNC_INCLUDES diff --git a/host/libraries/libbladeRF_test/test_timestamps/CMakeLists.txt b/host/libraries/libbladeRF_test/test_timestamps/CMakeLists.txt index 4c5b752b..4dbc4580 100644 --- a/host/libraries/libbladeRF_test/test_timestamps/CMakeLists.txt +++ b/host/libraries/libbladeRF_test/test_timestamps/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10...3.27) project(libbladeRF_test_timestamps C) include_directories(${libbladeRF_SOURCE_DIR}/include) diff --git a/host/libraries/libbladeRF_test/test_tune_timing/CMakeLists.txt b/host/libraries/libbladeRF_test/test_tune_timing/CMakeLists.txt index 13579196..a64b62e0 100644 --- a/host/libraries/libbladeRF_test/test_tune_timing/CMakeLists.txt +++ b/host/libraries/libbladeRF_test/test_tune_timing/CMakeLists.txt @@ -5,7 +5,7 @@ # the NIOS II code, it probably won't get much general use, so we'll just # leave this as-is for now. if(${CMAKE_SYSTEM_NAME} MATCHES "Linux") - cmake_minimum_required(VERSION 3.5) + cmake_minimum_required(VERSION 3.10...3.27) project(libbladeRF_test_tune_timing C) set(INCLUDES diff --git a/host/libraries/libbladeRF_test/test_unused_sync/CMakeLists.txt b/host/libraries/libbladeRF_test/test_unused_sync/CMakeLists.txt index 1acd6916..0990ccb3 100644 --- a/host/libraries/libbladeRF_test/test_unused_sync/CMakeLists.txt +++ b/host/libraries/libbladeRF_test/test_unused_sync/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10...3.27) project(libbladeRF_test_unused_sync C) set(INCLUDES ${libbladeRF_SOURCE_DIR}/include) diff --git a/host/libraries/libbladeRF_test/test_version/CMakeLists.txt b/host/libraries/libbladeRF_test/test_version/CMakeLists.txt index 49603970..49d3c159 100644 --- a/host/libraries/libbladeRF_test/test_version/CMakeLists.txt +++ b/host/libraries/libbladeRF_test/test_version/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10...3.27) project(libbladeRF_test_version C) set(INCLUDES ${libbladeRF_SOURCE_DIR}/include) diff --git a/host/misc/CMakeLists.txt b/host/misc/CMakeLists.txt index 3d76bb7a..1556f1e4 100644 --- a/host/misc/CMakeLists.txt +++ b/host/misc/CMakeLists.txt @@ -1,2 +1,2 @@ -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10...3.27) add_subdirectory(udev) diff --git a/host/misc/udev/CMakeLists.txt b/host/misc/udev/CMakeLists.txt index 02e12b64..49a763d8 100644 --- a/host/misc/udev/CMakeLists.txt +++ b/host/misc/udev/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10...3.27) if(${CMAKE_SYSTEM_NAME} MATCHES "Linux") SET(SYSTEM_IS_LINUX TRUE) diff --git a/host/utilities/CMakeLists.txt b/host/utilities/CMakeLists.txt index 121a29a5..f06c4a99 100644 --- a/host/utilities/CMakeLists.txt +++ b/host/utilities/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10...3.27) add_subdirectory(bladeRF-cli) add_subdirectory(bladeRF-fsk/c) diff --git a/host/utilities/bladeRF-cli/CMakeLists.txt b/host/utilities/bladeRF-cli/CMakeLists.txt index a08d058a..185038a8 100644 --- a/host/utilities/bladeRF-cli/CMakeLists.txt +++ b/host/utilities/bladeRF-cli/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10...3.27) project(bladeRF-cli C) ################################################################################ diff --git a/host/utilities/bladeRF-fsk/c/CMakeLists.txt b/host/utilities/bladeRF-fsk/c/CMakeLists.txt index c523f3c6..73f699bb 100644 --- a/host/utilities/bladeRF-fsk/c/CMakeLists.txt +++ b/host/utilities/bladeRF-fsk/c/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10...3.27) project(bladeRF-fsk C) ################################################################################ diff --git a/host/utilities/bladeRF-power/CMakeLists.txt b/host/utilities/bladeRF-power/CMakeLists.txt index b0131a1f..f2b25c58 100644 --- a/host/utilities/bladeRF-power/CMakeLists.txt +++ b/host/utilities/bladeRF-power/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.10) +cmake_minimum_required(VERSION 3.10...3.27) project(bladeRF-power LANGUAGES C) set (CURSES_NEED_NCURSES TRUE) diff --git a/host/utilities/bladeRF-update/CMakeLists.txt b/host/utilities/bladeRF-update/CMakeLists.txt index dd9d35fb..1e403133 100644 --- a/host/utilities/bladeRF-update/CMakeLists.txt +++ b/host/utilities/bladeRF-update/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.11) # Increased for FetchContent +cmake_minimum_required(VERSION 3.11...3.27) # Increased for FetchContent project(bladeRF-update C) include(FetchContent) From dc7accaa38d59ae17b1c89a9419f64985a91d572 Mon Sep 17 00:00:00 2001 From: Robert Ghilduta Date: Mon, 22 Aug 2022 00:05:52 -0700 Subject: [PATCH 178/238] bladeRF-fsk: add additional gain controls --- .../utilities/bladeRF-fsk/c/src/bladeRF-fsk.c | 5 +- host/utilities/bladeRF-fsk/c/src/common.h | 8 ++ host/utilities/bladeRF-fsk/c/src/config.c | 100 ++++++++++++++++- .../bladeRF-fsk/c/src/radio_config.c | 104 +++++++++++++----- 4 files changed, 179 insertions(+), 38 deletions(-) diff --git a/host/utilities/bladeRF-fsk/c/src/bladeRF-fsk.c b/host/utilities/bladeRF-fsk/c/src/bladeRF-fsk.c index 38bd32cf..6ab457f5 100644 --- a/host/utilities/bladeRF-fsk/c/src/bladeRF-fsk.c +++ b/host/utilities/bladeRF-fsk/c/src/bladeRF-fsk.c @@ -272,10 +272,11 @@ int main(int argc, char *argv[]) "Notes:\n" " The -d option takes a device specifier string. See the bladerf_open()\n" " documentation for more information about the format of this string.\n" + " Double dashed arguments such as --rx-gain need to proceed single dash arguments.\n" "\n" "Example: Text chat between two devices at 904MHz/924MHz with TX gain adjusted.\n" - " Device 1> bladeRF-fsk -d *:serial=4a -r 904M -t 924M --tx-vga2 5\n" - " Device 2> bladeRF-fsk -d *:serial=f0 -r 924M -t 904M --tx-vga2 5\n" + " Device 1> bladeRF-fsk --rx-biast -d *:serial=4a -r 904M -t 924M --tx-vga2 5\n" + " Device 2> bladeRF-fsk --rx-biast -d *:serial=f0 -r 924M -t 904M --tx-vga2 5\n" "Example: File transfer between two devices at 904MHz/924MHz.\n" " Receiver > bladeRF-fsk -d *:serial=4a -r 904M -t 924M -o rx.jpg\n" " Transmitter> bladeRF-fsk -d *:serial=f0 -r 924M -t 904M -i puppy.jpg\n\n" diff --git a/host/utilities/bladeRF-fsk/c/src/common.h b/host/utilities/bladeRF-fsk/c/src/common.h index 3ded8488..714688d9 100644 --- a/host/utilities/bladeRF-fsk/c/src/common.h +++ b/host/utilities/bladeRF-fsk/c/src/common.h @@ -37,11 +37,19 @@ struct radio_params { unsigned int tx_freq; int tx_vga1_gain; //Range: -35 to -4 dB int tx_vga2_gain; //Range: 0 to 25 dB + int tx_use_unified; //Boolean + int tx_unified_gain; //Range: 0 to 90 dB [dynamic] + int tx_biastee; //Boolean + //RX unsigned int rx_freq; bladerf_lna_gain rx_lna_gain; //Range: 0 to 6 dB int rx_vga1_gain; //Range: 5 to 30 dB int rx_vga2_gain; //Range: 0 to 30 dB + int rx_use_unified; //Boolean + int rx_unified_gain; //Range: 0 to 90 dB [dynamic] + int rx_biastee; //Boolean + int rx_agc; //Boolean }; #endif diff --git a/host/utilities/bladeRF-fsk/c/src/config.c b/host/utilities/bladeRF-fsk/c/src/config.c index 764778f3..7d7cccbb 100644 --- a/host/utilities/bladeRF-fsk/c/src/config.c +++ b/host/utilities/bladeRF-fsk/c/src/config.c @@ -47,11 +47,19 @@ #define OPTION_RXLNA 0x80 #define OPTION_RXVGA1 0x81 #define OPTION_RXVGA2 0x82 +#define OPTION_RXGAIN 0x83 +#define OPTION_RXBIAST 0x84 +#define OPTION_RXAGC 0x85 #define OPTION_TXFREQ 't' #define OPTION_OUTPUT 'o' #define OPTION_TXVGA1 0x90 #define OPTION_TXVGA2 0x91 +#define OPTION_TXGAIN 0x92 +#define OPTION_TXBIAST 0x93 + +#define UNIFIED_GAIN_MIN 0 +#define UNIFIED_GAIN_MAX 60 #define RX_FREQ_DEFAULT 904000000 #define RX_LNA_DEFAULT BLADERF_LNA_GAIN_MAX @@ -72,11 +80,16 @@ static struct option long_options[] = { { "rx-vga1", required_argument, NULL, OPTION_RXVGA1 }, { "rx-vga2", required_argument, NULL, OPTION_RXVGA2 }, { "rx-freq", required_argument, NULL, OPTION_RXFREQ }, + { "rx-gain", required_argument, NULL, OPTION_RXGAIN }, + { "rx-biast", no_argument, NULL, OPTION_RXBIAST }, + { "rx-agc", no_argument, NULL, OPTION_RXAGC }, { "input", required_argument, NULL, OPTION_INPUT }, { "tx-vga1", required_argument, NULL, OPTION_TXVGA1 }, { "tx-vga2", required_argument, NULL, OPTION_TXVGA2 }, { "tx-freq", required_argument, NULL, OPTION_TXFREQ }, + { "tx-gain", required_argument, NULL, OPTION_TXGAIN }, + { "tx-biast", no_argument, NULL, OPTION_RXBIAST }, { NULL, 0, NULL, 0 }, }; @@ -113,6 +126,10 @@ static struct config *alloc_config_with_defaults() config->params.rx_lna_gain = RX_LNA_DEFAULT; config->params.rx_vga1_gain = RX_VGA1_DEFAULT; config->params.rx_vga2_gain = RX_VGA2_DEFAULT; + config->params.rx_agc = 1; + config->params.rx_use_unified = 1; + config->params.rx_unified_gain = 60; + config->params.rx_biastee = 0; /* TX defaults */ @@ -122,6 +139,9 @@ static struct config *alloc_config_with_defaults() config->params.tx_vga1_gain = TX_VGA1_DEFAULT; config->params.tx_vga2_gain = TX_VGA2_DEFAULT; + config->params.tx_use_unified = 1; + config->params.tx_unified_gain = 60; + config->params.tx_biastee = 0; return config; } @@ -209,6 +229,8 @@ int config_init_from_cmdline(int argc, char * const argv[], break; case OPTION_RXVGA1: + config->params.rx_agc = 0; + config->params.rx_use_unified = 0; config->params.rx_vga1_gain = str2int(optarg, BLADERF_RXVGA1_GAIN_MIN, @@ -223,6 +245,8 @@ int config_init_from_cmdline(int argc, char * const argv[], break; case OPTION_RXVGA2: + config->params.rx_agc = 0; + config->params.rx_use_unified = 0; config->params.rx_vga2_gain = str2int(optarg, BLADERF_RXVGA2_GAIN_MIN, @@ -251,6 +275,28 @@ int config_init_from_cmdline(int argc, char * const argv[], } break; + case OPTION_RXGAIN: + config->params.rx_agc = 0; + config->params.rx_use_unified = 1; + config->params.rx_unified_gain = str2int(optarg, + UNIFIED_GAIN_MIN, + UNIFIED_GAIN_MAX, + &valid); + + if (!valid) { + status = -1; + fprintf(stderr, "Invalid unified RX gain: %s\n", optarg); + goto out; + } + break; + + case OPTION_RXAGC: + config->params.rx_agc = 1; + break; + + case OPTION_RXBIAST: + config->params.rx_biastee = 1; + break; case OPTION_INPUT: if (config->tx_input == NULL) { @@ -277,6 +323,7 @@ int config_init_from_cmdline(int argc, char * const argv[], break; case OPTION_TXVGA1: + config->params.tx_use_unified = 0; config->params.tx_vga1_gain = str2int(optarg, BLADERF_TXVGA1_GAIN_MIN, @@ -291,6 +338,7 @@ int config_init_from_cmdline(int argc, char * const argv[], break; case OPTION_TXVGA2: + config->params.tx_use_unified = 0; config->params.tx_vga2_gain = str2int(optarg, BLADERF_TXVGA2_GAIN_MIN, @@ -304,6 +352,24 @@ int config_init_from_cmdline(int argc, char * const argv[], } break; + case OPTION_TXGAIN: + config->params.tx_use_unified = 1; + config->params.tx_unified_gain = str2int(optarg, + UNIFIED_GAIN_MIN, + UNIFIED_GAIN_MAX, + &valid); + + if (!valid) { + status = -1; + fprintf(stderr, "Invalid unified TX gain: %s\n", optarg); + goto out; + } + break; + + case OPTION_TXBIAST: + config->params.tx_biastee = 1; + break; + case OPTION_TXFREQ: config->params.tx_freq = str2uint_suffix(optarg, @@ -373,23 +439,38 @@ void config_print_options() " -d, --device Open the specified bladeRF device.\n" " Any available device is used if not specified.\n" " -q, --quiet Suppress printing of banner/exit messages.\n" -"\n" +"\n\n" " -r, --rx-freq RX frequency in Hz. Default: %d\n" " -o, --output RX data output. stdout is used if not specified.\n" -" --rx-lna RX LNA gain. Values: bypass, mid, max (default)\n" -" --rx-vga1 RX VGA1 gain. Range: %d to %d. Default = %d.\n" -" --rx-vga2 RX VGA2 gain. Range: %d to %d. Default = %d.\n" "\n" +" RX gains:\n" +" The default RX gain mode is to enable the AGC. To use manual unified gains, use --rx-gain. Alternatively,\n" +" to set specific gain stages on the bladeRF 1 specify --rx-lna, --rx-vga1, --rx-vga2.\n" +"\n" +" --rx-agc Enables slow moving RX AGC (enabled by default)\n" +" --rx-gain RX unified gain. Values: %d to %d. Default %d\n" +" --rx-lna RX LNA gain. Values: bypass, mid, max (default). [bladeRF 1 only]\n" +" --rx-vga1 RX VGA1 gain. Range: %d to %d. Default = %d. [bladeRF 1 only]\n" +" --rx-vga2 RX VGA2 gain. Range: %d to %d. Default = %d. [bladeRF 1 only]\n" +"\n\n" " -t, --tx-freq TX frequency. Default: %d\n" " -i, --input TX data input. stdin is used if not specified.\n" -" --tx-vga1 TX VGA1 gain. Range: %d to %d. Default = %d.\n" -" --tx-vga2 TX VGA2 gain. Range: %d to %d. Default = %d.\n", +"\n" +" TX gains:\n" +" The default TX gain is to use unified gains, which can be set with --tx-gain. Alternatively,\n" +" to set specific gain stages on the bladeRF 1 specify --tx-vag1, --tx-vga2.\n" +"\n" +" --tx-gain TX unified gain. Values: %d to %d. Default: %d\n" +" --tx-vga1 TX VGA1 gain. Range: %d to %d. Default = %d. [bladeRF 1 only]\n" +" --tx-vga2 TX VGA2 gain. Range: %d to %d. Default = %d. [bladeRF 1 only]\n", RX_FREQ_DEFAULT, + UNIFIED_GAIN_MIN, UNIFIED_GAIN_MAX, UNIFIED_GAIN_MAX, BLADERF_RXVGA1_GAIN_MIN, BLADERF_RXVGA1_GAIN_MAX, RX_VGA1_DEFAULT, BLADERF_RXVGA2_GAIN_MIN, BLADERF_RXVGA2_GAIN_MAX, RX_VGA2_DEFAULT, TX_FREQ_DEFAULT, + UNIFIED_GAIN_MIN, UNIFIED_GAIN_MAX, UNIFIED_GAIN_MAX, BLADERF_TXVGA1_GAIN_MIN, BLADERF_TXVGA1_GAIN_MAX, TX_VGA1_DEFAULT, BLADERF_TXVGA2_GAIN_MIN, BLADERF_TXVGA2_GAIN_MAX, TX_VGA2_DEFAULT @@ -416,12 +497,19 @@ void print_config(const struct config *config) printf(" LNA gain: %d\n", config->params.rx_lna_gain); printf(" VGA1 gain: %d\n", config->params.rx_vga1_gain); printf(" VGA2 gain: %d\n", config->params.rx_vga2_gain); + printf(" Use unified: %d\n", config->params.rx_use_unified); + printf(" Unified gain: %d\n", config->params.rx_unified_gain); + printf(" Biastee: %d\n", config->params.rx_use_unified); + printf(" AGC enabled: %d\n", config->params.rx_agc); printf("\n"); printf("TX Parameters:\n"); printf(" Input handle: %p\n", config->tx_input); printf(" Frequency (Hz): %u\n", config->params.tx_freq); printf(" VGA1 gain: %d\n", config->params.tx_vga1_gain); printf(" VGA2 gain: %d\n", config->params.tx_vga2_gain); + printf(" Use unified: %d\n", config->params.tx_use_unified); + printf(" Unified gain: %d\n", config->params.tx_unified_gain); + printf(" Biastee: %d\n", config->params.tx_use_unified); printf("\n"); } diff --git a/host/utilities/bladeRF-fsk/c/src/radio_config.c b/host/utilities/bladeRF-fsk/c/src/radio_config.c index 4b360057..a8d9aed3 100644 --- a/host/utilities/bladeRF-fsk/c/src/radio_config.c +++ b/host/utilities/bladeRF-fsk/c/src/radio_config.c @@ -35,9 +35,14 @@ struct module_config{ unsigned int bandwidth; unsigned int samplerate; /* Gains */ + int use_unified; + int use_agc; + int unified_gain; bladerf_lna_gain rx_lna; int vga1; int vga2; + /* Biastee control */ + int biastee; }; //internal functinos static int radio_configure_module(struct bladerf *dev, struct module_config *c); @@ -69,39 +74,72 @@ static int radio_configure_module(struct bladerf *dev, struct module_config *c) } switch (c->module) { case BLADERF_MODULE_RX: - /* Configure the gains of the RX LNA, RX VGA1, and RX VGA2 */ - status = bladerf_set_lna_gain(dev, c->rx_lna); - if (status != 0) { - fprintf(stderr, "Failed to set RX LNA gain: %s\n", - bladerf_strerror(status)); - return status; - } - status = bladerf_set_rxvga1(dev, c->vga1); - if (status != 0) { - fprintf(stderr, "Failed to set RX VGA1 gain: %s\n", - bladerf_strerror(status)); - return status; - } - status = bladerf_set_rxvga2(dev, c->vga2); - if (status != 0) { - fprintf(stderr, "Failed to set RX VGA2 gain: %s\n", - bladerf_strerror(status)); - return status; + if (c->use_agc) { + status = bladerf_set_gain_mode(dev, c->module, BLADERF_GAIN_AUTOMATIC); + if (status != 0) { + fprintf(stderr, "Failed enable RX AGC: %s\n", + bladerf_strerror(status)); + return status; + } + } else { + status = bladerf_set_gain_mode(dev, c->module, BLADERF_GAIN_MANUAL); + if (status != 0) { + fprintf(stderr, "Failed to disable RX AGC: %s\n", + bladerf_strerror(status)); + return status; + } + if (c->use_unified) { + status = bladerf_set_gain(dev, c->module, c->unified_gain); + if (status != 0) { + fprintf(stderr, "Failed to set unified RX gain: %s\n", + bladerf_strerror(status)); + return status; + } + } else { + /* Configure the gains of the RX LNA, RX VGA1, and RX VGA2 */ + status = bladerf_set_lna_gain(dev, c->rx_lna); + if (status != 0) { + fprintf(stderr, "Failed to set RX LNA gain: %s\n", + bladerf_strerror(status)); + return status; + } + status = bladerf_set_rxvga1(dev, c->vga1); + if (status != 0) { + fprintf(stderr, "Failed to set RX VGA1 gain: %s\n", + bladerf_strerror(status)); + return status; + } + status = bladerf_set_rxvga2(dev, c->vga2); + if (status != 0) { + fprintf(stderr, "Failed to set RX VGA2 gain: %s\n", + bladerf_strerror(status)); + return status; + } + } } break; case BLADERF_MODULE_TX: - /* Configure the TX VGA1 and TX VGA2 gains */ - status = bladerf_set_txvga1(dev, c->vga1); - if (status != 0) { - fprintf(stderr, "Failed to set TX VGA1 gain: %s\n", - bladerf_strerror(status)); - return status; - } - status = bladerf_set_txvga2(dev, c->vga2); - if (status != 0) { - fprintf(stderr, "Failed to set TX VGA2 gain: %s\n", - bladerf_strerror(status)); - return status; + if (c->use_unified) { + status = bladerf_set_gain(dev, c->module, c->unified_gain); + if (status != 0) { + fprintf(stderr, "Failed to set unified TX gain: %s\n", + bladerf_strerror(status)); + return status; + } + } else { + /* Configure the TX VGA1 and TX VGA2 gains */ + status = bladerf_set_txvga1(dev, c->vga1); + if (status != 0) { + fprintf(stderr, "Failed to set TX VGA1 gain: %s\n", + bladerf_strerror(status)); + return status; + } + status = bladerf_set_txvga2(dev, c->vga2); + if (status != 0) { + fprintf(stderr, "Failed to set TX VGA2 gain: %s\n", + bladerf_strerror(status)); + return status; + } } break; default: @@ -166,6 +204,9 @@ int radio_init_and_configure(struct bladerf *dev, struct radio_params *params) config.samplerate = BLADERF_SAMPLE_RATE; config.vga1 = params->tx_vga1_gain; config.vga2 = params->tx_vga2_gain; + config.use_unified = params->tx_use_unified; + config.unified_gain = params->tx_unified_gain; + config.biastee = params->tx_biastee; status = radio_configure_module(dev, &config); if (status != 0){ fprintf(stderr, "Couldn't configure TX module: %s\n", bladerf_strerror(status)); @@ -180,6 +221,9 @@ int radio_init_and_configure(struct bladerf *dev, struct radio_params *params) config.rx_lna = params->rx_lna_gain; config.vga1 = params->rx_vga1_gain; config.vga2 = params->rx_vga2_gain; + config.use_unified = params->rx_use_unified; + config.unified_gain = params->rx_unified_gain; + config.biastee = params->rx_biastee; status = radio_configure_module(dev, &config); if (status != 0){ fprintf(stderr, "Couldn't configure RX module: %s\n", bladerf_strerror(status)); From 1e498900e841c8c4ea2ae92e339438baacea21a4 Mon Sep 17 00:00:00 2001 From: Robert Ghilduta Date: Sat, 2 Dec 2023 05:17:37 -0800 Subject: [PATCH 179/238] libbladeRF: use libbladeRF thread macros --- host/common/include/thread.h | 80 ++++++++++++++++++- .../libbladeRF/src/backend/usb/cyapi.c | 12 +-- .../libbladeRF/src/backend/usb/libusb.c | 12 +-- .../libbladeRF/src/streaming/async.c | 12 +-- .../libbladeRF/src/streaming/async.h | 6 +- .../libraries/libbladeRF/src/streaming/sync.c | 6 +- .../libraries/libbladeRF/src/streaming/sync.h | 3 +- .../libbladeRF/src/streaming/sync_worker.c | 46 +++++------ .../libbladeRF/src/streaming/sync_worker.h | 12 +-- 9 files changed, 129 insertions(+), 60 deletions(-) diff --git a/host/common/include/thread.h b/host/common/include/thread.h index 855a24bf..83a7fc1d 100644 --- a/host/common/include/thread.h +++ b/host/common/include/thread.h @@ -32,11 +32,18 @@ /* Currently, only pthreads is supported. In the future, native windows threads * may be used; one of the objectives of this file is to ease that transistion. */ -#include #include "rel_assert.h" -#define MUTEX pthread_mutex_t +#define USE_PTHREADS +#ifdef USE_PTHREADS +/* Use pthreads */ + +#include + +#define THREAD pthread_t +#define MUTEX pthread_mutex_t +#define COND pthread_cond_t #ifdef ENABLE_LOCK_CHECKS # define MUTEX_INIT(m) do { \ int status; \ @@ -64,11 +71,76 @@ int status = pthread_mutex_destroy(m); \ assert(status == 0 && "Mutex destroy failure");\ } while (0) -#else +#else /* ENABLE_LOCK_CHECKS */ +# define THREAD_CREATE(x,y,z) pthread_create(x, NULL, y, z) +# define THREAD_SUCCESS 0 +# define THREAD_TIMEOUT ETIMEDOUT +# define THREAD_CANCEL(m) pthread_cancel(m) +# define THREAD_JOIN(t, s) pthread_join(t, s) + +# define COND_INIT(m) pthread_cond_init(m, NULL) +# define COND_SIGNAL(m) pthread_cond_signal(m) +# define COND_TIMED_WAIT(c, m, t) pthread_cond_timedwait(c, m, t) +# define COND_WAIT(c, m) pthread_cond_wait(c, m) + # define MUTEX_INIT(m) pthread_mutex_init(m, NULL) # define MUTEX_LOCK(m) pthread_mutex_lock(m) # define MUTEX_UNLOCK(m) pthread_mutex_unlock(m) # define MUTEX_DESTROY(m) pthread_mutex_destroy(m) -#endif +#endif /* ENABLE_LOCK_CHECKS */ + +#else /* USE_PTHREADS */ + +/* Use C11 threads */ +#include + +#define THREAD thrd_t +#define MUTEX mtx_t +#define COND cnd_t + +#ifdef ENABLE_LOCK_CHECKS +# define MUTEX_INIT(m) do { \ + int status; \ + status = mtx_init(m, mtx_plain | mtx_recursive); \ + assert(status == thrd_success && "Mutex init failure"); \ + } while (0) + +# define MUTEX_LOCK(m) do { \ + int status = mtx_lock(m); \ + assert(status == thrd_success && "Mutex lock failure");\ + } while (0) + +# define MUTEX_UNLOCK(m) do { \ + int status = mtx_unlock(m); \ + assert(status == thrd_success && "Mutex unlock failure");\ + } while (0) + +# define MUTEX_DESTROY(m) do { \ + mtx_destroy(m); \ + } while (0) +#else /* ENABLE_LOCK_CHECKS */ + +# define THREAD_CREATE(x,y,z) thrd_create(x,y,z) +# define THREAD_SUCCESS thrd_success +# define THREAD_TIMEOUT thrd_timeout +# define THREAD_CANCEL(m) /* No-op */ +# define THREAD_JOIN(t, s) thrd_join(t, s) + + +# define COND_INIT(m) ({ \ + *m = (cnd_t)CONDITION_VARIABLE_INIT; \ + 0; /* Return 0 */ \ + }) +# define COND_SIGNAL(m) cnd_signal(m) +# define COND_TIMED_WAIT(c, m, t) cnd_timedwait(c, m, t) +# define COND_WAIT(c, m) cnd_wait(c, m) + +# define MUTEX_INIT(m) (void)mtx_init(m, mtx_plain) +# define MUTEX_LOCK(m) (void)mtx_lock(m) +# define MUTEX_UNLOCK(m) (void)mtx_unlock(m) +# define MUTEX_DESTROY(m) mtx_destroy(m) +#endif /* ENABLE_LOCK_CHECKS */ + +#endif /* USE_PTHREADS */ #endif diff --git a/host/libraries/libbladeRF/src/backend/usb/cyapi.c b/host/libraries/libbladeRF/src/backend/usb/cyapi.c index 85d63ff8..8d8eb24b 100644 --- a/host/libraries/libbladeRF/src/backend/usb/cyapi.c +++ b/host/libraries/libbladeRF/src/backend/usb/cyapi.c @@ -26,7 +26,7 @@ extern "C" { #include -#include +#include "thread.h" #include #include "bladeRF.h" /* Firmware interface */ @@ -707,7 +707,7 @@ static int cyapi_stream(void *driver, struct bladerf_stream *stream, data->transfers[i].buffer = NULL; data->transfers[i].handle = NULL; data->num_avail++; - pthread_cond_signal(&stream->can_submit_buffer); + COND_SIGNAL(&stream->can_submit_buffer); if (next_buffer == BLADERF_STREAM_SHUTDOWN) { done = true; @@ -792,14 +792,14 @@ int cyapi_submit_stream_buffer(void *driver, struct bladerf_stream *stream, return BLADERF_ERR_UNEXPECTED; } - while (data->num_avail == 0 && status == 0) { - status = pthread_cond_timedwait(&stream->can_submit_buffer, + while (data->num_avail == 0 && status == THREAD_SUCCESS) { + status = COND_TIMED_WAIT(&stream->can_submit_buffer, &stream->lock, &timeout_abs); } } else { - while (data->num_avail == 0 && status == 0) { - status = pthread_cond_wait(&stream->can_submit_buffer, + while (data->num_avail == 0 && status == THREAD_SUCCESS) { + status = COND_WAIT(&stream->can_submit_buffer, &stream->lock); } } diff --git a/host/libraries/libbladeRF/src/backend/usb/libusb.c b/host/libraries/libbladeRF/src/backend/usb/libusb.c index ef3d3aaa..b665af72 100644 --- a/host/libraries/libbladeRF/src/backend/usb/libusb.c +++ b/host/libraries/libbladeRF/src/backend/usb/libusb.c @@ -22,7 +22,7 @@ #include "host_config.h" #include #include -#include +#include "thread.h" #include #include #if 1 == BLADERF_OS_FREEBSD @@ -1054,7 +1054,7 @@ static void LIBUSB_CALL lusb_stream_cb(struct libusb_transfer *transfer) } else { stream_data->transfer_status[transfer_i] = TRANSFER_AVAIL; stream_data->num_avail++; - pthread_cond_signal(&stream->can_submit_buffer); + COND_SIGNAL(&stream->can_submit_buffer); } /* Check to see if the transfer has been cancelled or errored */ @@ -1436,14 +1436,14 @@ int lusb_submit_stream_buffer(void *driver, struct bladerf_stream *stream, return BLADERF_ERR_UNEXPECTED; } - while (stream_data->num_avail == 0 && status == 0) { - status = pthread_cond_timedwait(&stream->can_submit_buffer, + while (stream_data->num_avail == 0 && status == THREAD_SUCCESS) { + status = COND_TIMED_WAIT(&stream->can_submit_buffer, &stream->lock, &timeout_abs); } } else { - while (stream_data->num_avail == 0 && status == 0) { - status = pthread_cond_wait(&stream->can_submit_buffer, + while (stream_data->num_avail == 0 && status == THREAD_SUCCESS) { + status = COND_WAIT(&stream->can_submit_buffer, &stream->lock); } } diff --git a/host/libraries/libbladeRF/src/streaming/async.c b/host/libraries/libbladeRF/src/streaming/async.c index 50769a76..aec727b5 100644 --- a/host/libraries/libbladeRF/src/streaming/async.c +++ b/host/libraries/libbladeRF/src/streaming/async.c @@ -86,12 +86,12 @@ int async_init_stream(struct bladerf_stream **stream, MUTEX_INIT(&lstream->lock); - if (pthread_cond_init(&lstream->can_submit_buffer, NULL) != 0) { + if (COND_INIT(&lstream->can_submit_buffer) != THREAD_SUCCESS) { free(lstream); return BLADERF_ERR_UNEXPECTED; } - if (pthread_cond_init(&lstream->stream_started, NULL) != 0) { + if (COND_INIT(&lstream->stream_started) != THREAD_SUCCESS) { free(lstream); return BLADERF_ERR_UNEXPECTED; } @@ -203,7 +203,7 @@ int async_run_stream(struct bladerf_stream *stream, bladerf_channel_layout layou MUTEX_LOCK(&stream->lock); stream->layout = layout; stream->state = STREAM_RUNNING; - pthread_cond_signal(&stream->stream_started); + COND_SIGNAL(&stream->stream_started); MUTEX_UNLOCK(&stream->lock); status = dev->backend->stream(stream, layout); @@ -236,14 +236,14 @@ int async_submit_stream_buffer(struct bladerf_stream *stream, "Waiting for stream to start.\n"); if (timeout_ms == 0) { - status = pthread_cond_wait(&stream->stream_started, + status = COND_WAIT(&stream->stream_started, &stream->lock); } else { - status = pthread_cond_timedwait(&stream->stream_started, + status = COND_TIMED_WAIT(&stream->stream_started, &stream->lock, &timeout_abs); } - if (status == ETIMEDOUT) { + if (status == THREAD_TIMEOUT) { status = BLADERF_ERR_TIMEOUT; log_debug("%s: %u ms timeout expired", __FUNCTION__, timeout_ms); diff --git a/host/libraries/libbladeRF/src/streaming/async.h b/host/libraries/libbladeRF/src/streaming/async.h index 4bc2aa3e..439ece2c 100644 --- a/host/libraries/libbladeRF/src/streaming/async.h +++ b/host/libraries/libbladeRF/src/streaming/async.h @@ -22,8 +22,6 @@ #ifndef STREAMING_ASYNC_H_ #define STREAMING_ASYNC_H_ -#include - #include #include "thread.h" @@ -58,8 +56,8 @@ struct bladerf_stream { /* The following items must be accessed atomically */ int error_code; bladerf_stream_state state; - pthread_cond_t can_submit_buffer; - pthread_cond_t stream_started; + COND can_submit_buffer; + COND stream_started; void *backend_data; }; diff --git a/host/libraries/libbladeRF/src/streaming/sync.c b/host/libraries/libbladeRF/src/streaming/sync.c index 7f5e4155..cf9c5b05 100644 --- a/host/libraries/libbladeRF/src/streaming/sync.c +++ b/host/libraries/libbladeRF/src/streaming/sync.c @@ -257,7 +257,7 @@ int sync_init(struct bladerf_sync *sync, __FUNCTION__, sync->meta.samples_per_msg); MUTEX_INIT(&sync->buf_mgmt.lock); - pthread_cond_init(&sync->buf_mgmt.buf_ready, NULL); + COND_INIT(&sync->buf_mgmt.buf_ready); sync->buf_mgmt.status = (sync_buffer_status*) malloc(num_buffers * sizeof(sync_buffer_status)); if (sync->buf_mgmt.status == NULL) { @@ -358,13 +358,13 @@ static int wait_for_buffer(struct buffer_mgmt *b, if (timeout_ms == 0) { log_verbose("%s: Infinite wait for buffer[%d] (status: %d).\n", dbg_name, dbg_idx, b->status[dbg_idx]); - status = pthread_cond_wait(&b->buf_ready, &b->lock); + status = COND_WAIT(&b->buf_ready, &b->lock); } else { log_verbose("%s: Timed wait for buffer[%d] (status: %d).\n", dbg_name, dbg_idx, b->status[dbg_idx]); status = populate_abs_timeout(&timeout, timeout_ms); if (status == 0) { - status = pthread_cond_timedwait(&b->buf_ready, &b->lock, &timeout); + status = COND_TIMED_WAIT(&b->buf_ready, &b->lock, &timeout); } } diff --git a/host/libraries/libbladeRF/src/streaming/sync.h b/host/libraries/libbladeRF/src/streaming/sync.h index 89777919..e28d0938 100644 --- a/host/libraries/libbladeRF/src/streaming/sync.h +++ b/host/libraries/libbladeRF/src/streaming/sync.h @@ -23,7 +23,6 @@ #define STREAMING_SYNC_H_ #include -#include #include @@ -88,7 +87,7 @@ struct buffer_mgmt { MUTEX lock; - pthread_cond_t buf_ready; /**< Buffer produced by RX callback, or + COND buf_ready; /**< Buffer produced by RX callback, or * buffer emptied by TX callback */ }; diff --git a/host/libraries/libbladeRF/src/streaming/sync_worker.c b/host/libraries/libbladeRF/src/streaming/sync_worker.c index b2ec8065..51f446a6 100644 --- a/host/libraries/libbladeRF/src/streaming/sync_worker.c +++ b/host/libraries/libbladeRF/src/streaming/sync_worker.c @@ -83,7 +83,7 @@ static void *rx_callback(struct bladerf *dev, /* This buffer is now ready for the consumer */ b->status[samples_idx] = SYNC_BUFFER_FULL; b->actual_lengths[samples_idx] = num_samples; - pthread_cond_signal(&b->buf_ready); + COND_SIGNAL(&b->buf_ready); /* Update the state of the buffer being submitted next */ next_idx = b->prod_i; @@ -155,7 +155,7 @@ static void *tx_callback(struct bladerf *dev, completed_idx = sync_buf2idx(b, samples); assert(b->status[completed_idx] == SYNC_BUFFER_IN_FLIGHT); b->status[completed_idx] = SYNC_BUFFER_EMPTY; - pthread_cond_signal(&b->buf_ready); + COND_SIGNAL(&b->buf_ready); /* If the callback is assigned to be the submitter, there are * buffers pending submission */ @@ -230,25 +230,25 @@ int sync_worker_init(struct bladerf_sync *s) MUTEX_INIT(&s->worker->state_lock); MUTEX_INIT(&s->worker->request_lock); - status = pthread_cond_init(&s->worker->state_changed, NULL); - if (status != 0) { - log_debug("%s worker: pthread_cond_init(state_changed) failed: %d\n", + status = COND_INIT(&s->worker->state_changed); + if (status != THREAD_SUCCESS) { + log_debug("%s worker: cond_init(state_changed) failed: %d\n", worker2str(s), status); status = BLADERF_ERR_UNEXPECTED; goto worker_init_out; } - status = pthread_cond_init(&s->worker->requests_pending, NULL); - if (status != 0) { - log_debug("%s worker: pthread_cond_init(requests_pending) failed: %d\n", + status = COND_INIT(&s->worker->requests_pending); + if (status != THREAD_SUCCESS) { + log_debug("%s worker: cond_init(requests_pending) failed: %d\n", worker2str(s), status); status = BLADERF_ERR_UNEXPECTED; goto worker_init_out; } - status = pthread_create(&s->worker->thread, NULL, sync_worker_task, s); - if (status != 0) { - log_debug("%s worker: pthread_create failed: %d\n", worker2str(s), + status = THREAD_CREATE(&s->worker->thread, sync_worker_task, s); + if (status != THREAD_SUCCESS) { + log_debug("%s worker: create failed: %d\n", worker2str(s), status); status = BLADERF_ERR_UNEXPECTED; goto worker_init_out; @@ -274,7 +274,7 @@ worker_init_out: } void sync_worker_deinit(struct sync_worker *w, - pthread_mutex_t *lock, pthread_cond_t *cond) + MUTEX *lock, COND *cond) { int status; @@ -289,7 +289,7 @@ void sync_worker_deinit(struct sync_worker *w, if (lock != NULL && cond != NULL) { MUTEX_LOCK(lock); - pthread_cond_signal(cond); + COND_SIGNAL(cond); MUTEX_UNLOCK(lock); } @@ -297,10 +297,10 @@ void sync_worker_deinit(struct sync_worker *w, if (status != 0) { log_warning("Timed out while stopping worker. Canceling thread.\n"); - pthread_cancel(w->thread); + THREAD_CANCEL(w->thread); } - pthread_join(w->thread, NULL); + THREAD_JOIN(w->thread, NULL); log_verbose("%s: Worker joined.\n", __FUNCTION__); async_deinit_stream(w->stream); @@ -312,7 +312,7 @@ void sync_worker_submit_request(struct sync_worker *w, unsigned int request) { MUTEX_LOCK(&w->request_lock); w->requests |= request; - pthread_cond_signal(&w->requests_pending); + COND_SIGNAL(&w->requests_pending); MUTEX_UNLOCK(&w->request_lock); } @@ -341,8 +341,8 @@ int sync_worker_wait_for_state(struct sync_worker *w, sync_worker_state state, MUTEX_LOCK(&w->state_lock); status = 0; - while (w->state != state && status == 0) { - status = pthread_cond_timedwait(&w->state_changed, + while (w->state != state && status == THREAD_SUCCESS) { + status = COND_TIMED_WAIT(&w->state_changed, &w->state_lock, &timeout_abs); } @@ -352,7 +352,7 @@ int sync_worker_wait_for_state(struct sync_worker *w, sync_worker_state state, MUTEX_LOCK(&w->state_lock); while (w->state != state) { log_verbose(": Waiting for state change, current = %d\n", w->state); - status = pthread_cond_wait(&w->state_changed, + status = COND_WAIT(&w->state_changed, &w->state_lock); } MUTEX_UNLOCK(&w->state_lock); @@ -392,7 +392,7 @@ static void set_state(struct sync_worker *w, sync_worker_state state) { MUTEX_LOCK(&w->state_lock); w->state = state; - pthread_cond_signal(&w->state_changed); + COND_SIGNAL(&w->state_changed); MUTEX_UNLOCK(&w->state_lock); } @@ -408,7 +408,7 @@ static sync_worker_state exec_idle_state(struct bladerf_sync *s) while (s->worker->requests == 0) { log_verbose("%s worker: Waiting for pending requests\n", worker2str(s)); - pthread_cond_wait(&s->worker->requests_pending, + COND_WAIT(&s->worker->requests_pending, &s->worker->request_lock); } @@ -434,7 +434,7 @@ static sync_worker_state exec_idle_state(struct bladerf_sync *s) } } - pthread_cond_signal(&s->buf_mgmt.buf_ready); + COND_SIGNAL(&s->buf_mgmt.buf_ready); } else { s->buf_mgmt.prod_i = s->stream_config.num_xfers; @@ -477,7 +477,7 @@ static void exec_running_state(struct bladerf_sync *s) * the stream error code back to the API caller */ if (status != 0) { MUTEX_LOCK(&s->buf_mgmt.lock); - pthread_cond_signal(&s->buf_mgmt.buf_ready); + COND_SIGNAL(&s->buf_mgmt.buf_ready); MUTEX_UNLOCK(&s->buf_mgmt.lock); } } diff --git a/host/libraries/libbladeRF/src/streaming/sync_worker.h b/host/libraries/libbladeRF/src/streaming/sync_worker.h index 35d5075b..75bf96e2 100644 --- a/host/libraries/libbladeRF/src/streaming/sync_worker.h +++ b/host/libraries/libbladeRF/src/streaming/sync_worker.h @@ -22,7 +22,7 @@ #include "host_config.h" #include "sync.h" #include -#include +#include "thread.h" #if BLADERF_OS_WINDOWS || BLADERF_OS_OSX #include "clock_gettime.h" @@ -49,7 +49,7 @@ typedef enum { } sync_worker_state; struct sync_worker { - pthread_t thread; + THREAD thread; struct bladerf_stream *stream; bladerf_stream_cb cb; @@ -58,7 +58,7 @@ struct sync_worker { sync_worker_state state; int err_code; MUTEX state_lock; - pthread_cond_t state_changed; /* Worker thread uses this to inform a + COND state_changed; /* Worker thread uses this to inform a * waiting main thread about a state * change */ @@ -66,7 +66,7 @@ struct sync_worker { * the sync->buf_mgmt.lock */ unsigned int requests; - pthread_cond_t requests_pending; + COND requests_pending; MUTEX request_lock; }; @@ -90,8 +90,8 @@ int sync_worker_init(struct bladerf_sync *s); * workers. */ void sync_worker_deinit(struct sync_worker *w, - pthread_mutex_t *lock, - pthread_cond_t *cond); + MUTEX *lock, + COND *cond); /** * Wait for state change with optional timeout From 5cdcd28e16033aea1f5ba53f7ecdaf8c046f7d9d Mon Sep 17 00:00:00 2001 From: Robert Ghilduta Date: Sat, 2 Dec 2023 14:01:48 -0800 Subject: [PATCH 180/238] host: convert async/sync to libbladeRF thread macros --- host/common/include/thread.h | 67 ++++++++++++------- .../libbladeRF/src/backend/usb/cyapi.c | 2 +- .../libbladeRF/src/backend/usb/libusb.c | 10 +-- .../libbladeRF/src/streaming/async.c | 11 +-- .../libraries/libbladeRF/src/streaming/sync.c | 8 +-- .../libbladeRF/src/streaming/sync_worker.c | 20 +----- 6 files changed, 52 insertions(+), 66 deletions(-) diff --git a/host/common/include/thread.h b/host/common/include/thread.h index 83a7fc1d..1d35bb81 100644 --- a/host/common/include/thread.h +++ b/host/common/include/thread.h @@ -34,12 +34,15 @@ */ #include "rel_assert.h" -#define USE_PTHREADS + +//#define USE_PTHREADS #ifdef USE_PTHREADS /* Use pthreads */ #include +#include +#define CLOCK_REALTIME 0 #define THREAD pthread_t #define MUTEX pthread_mutex_t @@ -80,8 +83,24 @@ # define COND_INIT(m) pthread_cond_init(m, NULL) # define COND_SIGNAL(m) pthread_cond_signal(m) -# define COND_TIMED_WAIT(c, m, t) pthread_cond_timedwait(c, m, t) -# define COND_WAIT(c, m) pthread_cond_wait(c, m) +// POSIX implementation as a function +static inline int posix_cond_timedwait(pthread_cond_t *c, + pthread_mutex_t *m, + unsigned int t) +{ + struct timespec ts; + clock_gettime(CLOCK_REALTIME, &ts); + ts.tv_sec += t / 1000; + ts.tv_nsec += (t % 1000) * 1000000; + if (ts.tv_nsec >= 1000000000) { + ts.tv_sec++; + ts.tv_nsec -= 1000000000; + } + return pthread_cond_timedwait(c, m, &ts) == ETIMEDOUT ? -1 : 0; +} +#define COND_TIMED_WAIT(c, m, t) posix_cond_timedwait(c, m, t) + +#define COND_WAIT(c, m) pthread_cond_wait(c, m) # define MUTEX_INIT(m) pthread_mutex_init(m, NULL) # define MUTEX_LOCK(m) pthread_mutex_lock(m) @@ -92,11 +111,12 @@ #else /* USE_PTHREADS */ /* Use C11 threads */ -#include +//#include + +#define THREAD HANDLE // For thread handles +#define MUTEX CRITICAL_SECTION // For mutexes +#define COND CONDITION_VARIABLE // For condition variables -#define THREAD thrd_t -#define MUTEX mtx_t -#define COND cnd_t #ifdef ENABLE_LOCK_CHECKS # define MUTEX_INIT(m) do { \ @@ -120,25 +140,26 @@ } while (0) #else /* ENABLE_LOCK_CHECKS */ -# define THREAD_CREATE(x,y,z) thrd_create(x,y,z) -# define THREAD_SUCCESS thrd_success -# define THREAD_TIMEOUT thrd_timeout -# define THREAD_CANCEL(m) /* No-op */ -# define THREAD_JOIN(t, s) thrd_join(t, s) +#include +# define THREAD_CREATE(x, y, z) \ + CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE)y, z, 0, x) +# define THREAD_SUCCESS 0 +# define THREAD_TIMEOUT WAIT_TIMEOUT +# define THREAD_CANCEL(m) TerminateThread(m, 0) +# define THREAD_JOIN(t, s) WaitForSingleObject(t, INFINITE) -# define COND_INIT(m) ({ \ - *m = (cnd_t)CONDITION_VARIABLE_INIT; \ - 0; /* Return 0 */ \ - }) -# define COND_SIGNAL(m) cnd_signal(m) -# define COND_TIMED_WAIT(c, m, t) cnd_timedwait(c, m, t) -# define COND_WAIT(c, m) cnd_wait(c, m) +# define COND_INIT(m) (InitializeConditionVariable(m), 0) +# define COND_SIGNAL(m) WakeConditionVariable(m) +# define COND_TIMED_WAIT(c, m, t) \ + (SleepConditionVariableCS(c, m, t) ? 0 : GetLastError()) +# define COND_WAIT(c, m) SleepConditionVariableCS(c, m, INFINITE) + +# define MUTEX_INIT(m) InitializeCriticalSection(m) +# define MUTEX_LOCK(m) EnterCriticalSection(m) +# define MUTEX_UNLOCK(m) LeaveCriticalSection(m) +# define MUTEX_DESTROY(m) DeleteCriticalSection(m) -# define MUTEX_INIT(m) (void)mtx_init(m, mtx_plain) -# define MUTEX_LOCK(m) (void)mtx_lock(m) -# define MUTEX_UNLOCK(m) (void)mtx_unlock(m) -# define MUTEX_DESTROY(m) mtx_destroy(m) #endif /* ENABLE_LOCK_CHECKS */ #endif /* USE_PTHREADS */ diff --git a/host/libraries/libbladeRF/src/backend/usb/cyapi.c b/host/libraries/libbladeRF/src/backend/usb/cyapi.c index 8d8eb24b..da0aef1d 100644 --- a/host/libraries/libbladeRF/src/backend/usb/cyapi.c +++ b/host/libraries/libbladeRF/src/backend/usb/cyapi.c @@ -805,7 +805,7 @@ int cyapi_submit_stream_buffer(void *driver, struct bladerf_stream *stream, } } - if (status == ETIMEDOUT) { + if (status == THREAD_TIMEOUT) { return BLADERF_ERR_TIMEOUT; } else if (status != 0) { return BLADERF_ERR_UNEXPECTED; diff --git a/host/libraries/libbladeRF/src/backend/usb/libusb.c b/host/libraries/libbladeRF/src/backend/usb/libusb.c index b665af72..09daf381 100644 --- a/host/libraries/libbladeRF/src/backend/usb/libusb.c +++ b/host/libraries/libbladeRF/src/backend/usb/libusb.c @@ -1410,7 +1410,6 @@ int lusb_submit_stream_buffer(void *driver, struct bladerf_stream *stream, { int status = 0; struct lusb_stream_data *stream_data = stream->backend_data; - struct timespec timeout_abs; if (buffer == BLADERF_STREAM_SHUTDOWN) { if (stream_data->num_avail == stream_data->num_transfers) { @@ -1431,15 +1430,10 @@ int lusb_submit_stream_buffer(void *driver, struct bladerf_stream *stream, } if (timeout_ms != 0) { - status = populate_abs_timeout(&timeout_abs, timeout_ms); - if (status != 0) { - return BLADERF_ERR_UNEXPECTED; - } - while (stream_data->num_avail == 0 && status == THREAD_SUCCESS) { status = COND_TIMED_WAIT(&stream->can_submit_buffer, &stream->lock, - &timeout_abs); + timeout_ms); } } else { while (stream_data->num_avail == 0 && status == THREAD_SUCCESS) { @@ -1449,7 +1443,7 @@ int lusb_submit_stream_buffer(void *driver, struct bladerf_stream *stream, } } - if (status == ETIMEDOUT) { + if (status == THREAD_TIMEOUT) { log_debug("%s: Timed out waiting for a transfer to become available.\n", __FUNCTION__); return BLADERF_ERR_TIMEOUT; diff --git a/host/libraries/libbladeRF/src/streaming/async.c b/host/libraries/libbladeRF/src/streaming/async.c index aec727b5..cfa4740a 100644 --- a/host/libraries/libbladeRF/src/streaming/async.c +++ b/host/libraries/libbladeRF/src/streaming/async.c @@ -218,19 +218,10 @@ int async_submit_stream_buffer(struct bladerf_stream *stream, bool nonblock) { int status = 0; - struct timespec timeout_abs; MUTEX_LOCK(&stream->lock); if (buffer != BLADERF_STREAM_SHUTDOWN) { - if (stream->state != STREAM_RUNNING && timeout_ms != 0) { - status = populate_abs_timeout(&timeout_abs, timeout_ms); - if (status != 0) { - log_debug("Failed to populate timeout value\n"); - goto error; - } - } - while (stream->state != STREAM_RUNNING) { log_debug("Buffer submitted while stream's not running. " "Waiting for stream to start.\n"); @@ -240,7 +231,7 @@ int async_submit_stream_buffer(struct bladerf_stream *stream, &stream->lock); } else { status = COND_TIMED_WAIT(&stream->stream_started, - &stream->lock, &timeout_abs); + &stream->lock, timeout_ms); } if (status == THREAD_TIMEOUT) { diff --git a/host/libraries/libbladeRF/src/streaming/sync.c b/host/libraries/libbladeRF/src/streaming/sync.c index cf9c5b05..2162b227 100644 --- a/host/libraries/libbladeRF/src/streaming/sync.c +++ b/host/libraries/libbladeRF/src/streaming/sync.c @@ -353,7 +353,6 @@ static int wait_for_buffer(struct buffer_mgmt *b, unsigned int dbg_idx) { int status; - struct timespec timeout; if (timeout_ms == 0) { log_verbose("%s: Infinite wait for buffer[%d] (status: %d).\n", @@ -362,13 +361,10 @@ static int wait_for_buffer(struct buffer_mgmt *b, } else { log_verbose("%s: Timed wait for buffer[%d] (status: %d).\n", dbg_name, dbg_idx, b->status[dbg_idx]); - status = populate_abs_timeout(&timeout, timeout_ms); - if (status == 0) { - status = COND_TIMED_WAIT(&b->buf_ready, &b->lock, &timeout); - } + status = COND_TIMED_WAIT(&b->buf_ready, &b->lock, timeout_ms); } - if (status == ETIMEDOUT) { + if (status == THREAD_TIMEOUT) { log_error("%s: Timed out waiting for buf_ready after %d ms\n", __FUNCTION__, timeout_ms); status = BLADERF_ERR_TIMEOUT; diff --git a/host/libraries/libbladeRF/src/streaming/sync_worker.c b/host/libraries/libbladeRF/src/streaming/sync_worker.c index 51f446a6..e74e8e44 100644 --- a/host/libraries/libbladeRF/src/streaming/sync_worker.c +++ b/host/libraries/libbladeRF/src/streaming/sync_worker.c @@ -320,31 +320,15 @@ int sync_worker_wait_for_state(struct sync_worker *w, sync_worker_state state, unsigned int timeout_ms) { int status = 0; - struct timespec timeout_abs; const int nsec_per_sec = 1000 * 1000 * 1000; if (timeout_ms != 0) { - const unsigned int timeout_sec = timeout_ms / 1000; - - status = clock_gettime(CLOCK_REALTIME, &timeout_abs); - if (status != 0) { - return BLADERF_ERR_UNEXPECTED; - } - - timeout_abs.tv_sec += timeout_sec; - timeout_abs.tv_nsec += (timeout_ms % 1000) * 1000 * 1000; - - if (timeout_abs.tv_nsec >= nsec_per_sec) { - timeout_abs.tv_sec += timeout_abs.tv_nsec / nsec_per_sec; - timeout_abs.tv_nsec %= nsec_per_sec; - } - MUTEX_LOCK(&w->state_lock); status = 0; while (w->state != state && status == THREAD_SUCCESS) { status = COND_TIMED_WAIT(&w->state_changed, &w->state_lock, - &timeout_abs); + timeout_ms); } MUTEX_UNLOCK(&w->state_lock); @@ -362,7 +346,7 @@ int sync_worker_wait_for_state(struct sync_worker *w, sync_worker_state state, log_debug("%s: Wait on state change failed: %s\n", __FUNCTION__, strerror(status)); - if (status == ETIMEDOUT) { + if (status == THREAD_TIMEOUT) { status = BLADERF_ERR_TIMEOUT; } else { status = BLADERF_ERR_UNEXPECTED; From 03b2481db9470eab4731cb144761987bd482fd42 Mon Sep 17 00:00:00 2001 From: Robert Ghilduta Date: Sat, 2 Dec 2023 17:20:02 -0800 Subject: [PATCH 181/238] bladeRF-cli: move to libbladeRF thread macros --- host/utilities/bladeRF-cli/src/cmd/cmd.c | 1 - host/utilities/bladeRF-cli/src/cmd/generate.c | 2 +- host/utilities/bladeRF-cli/src/cmd/rx.c | 1 - host/utilities/bladeRF-cli/src/cmd/rxtx.c | 74 ++++++------------- .../utilities/bladeRF-cli/src/cmd/rxtx_impl.h | 8 +- host/utilities/bladeRF-cli/src/cmd/tx.c | 2 +- host/utilities/bladeRF-cli/src/common.c | 14 ++-- host/utilities/bladeRF-cli/src/common.h | 6 +- host/utilities/bladeRF-cli/src/main.c | 2 +- 9 files changed, 38 insertions(+), 72 deletions(-) diff --git a/host/utilities/bladeRF-cli/src/cmd/cmd.c b/host/utilities/bladeRF-cli/src/cmd/cmd.c index 09f1c6b8..b1ec23ed 100644 --- a/host/utilities/bladeRF-cli/src/cmd/cmd.c +++ b/host/utilities/bladeRF-cli/src/cmd/cmd.c @@ -17,7 +17,6 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #include -#include #include #include #include diff --git a/host/utilities/bladeRF-cli/src/cmd/generate.c b/host/utilities/bladeRF-cli/src/cmd/generate.c index e070032c..540fc8b3 100644 --- a/host/utilities/bladeRF-cli/src/cmd/generate.c +++ b/host/utilities/bladeRF-cli/src/cmd/generate.c @@ -19,7 +19,6 @@ */ #include #include -#include #include #include #include @@ -36,6 +35,7 @@ #include "parse.h" #include "rel_assert.h" #include "rxtx_impl.h" +#include "thread.h" #include "doc/cmd_help.h" int gen_write_fmt_sample(FILE *fp, enum rxtx_fmt fmt, int16_t s_i, int16_t s_q) { diff --git a/host/utilities/bladeRF-cli/src/cmd/rx.c b/host/utilities/bladeRF-cli/src/cmd/rx.c index 42defef9..7fb120fb 100644 --- a/host/utilities/bladeRF-cli/src/cmd/rx.c +++ b/host/utilities/bladeRF-cli/src/cmd/rx.c @@ -20,7 +20,6 @@ #include #include #include -#include #include #include #include diff --git a/host/utilities/bladeRF-cli/src/cmd/rxtx.c b/host/utilities/bladeRF-cli/src/cmd/rxtx.c index af3ba377..55e03f64 100644 --- a/host/utilities/bladeRF-cli/src/cmd/rxtx.c +++ b/host/utilities/bladeRF-cli/src/cmd/rxtx.c @@ -20,7 +20,6 @@ #include #include #include -#include #include #include "host_config.h" @@ -112,7 +111,7 @@ void rxtx_set_state(struct rxtx_data *rxtx, enum rxtx_state state) { MUTEX_LOCK(&rxtx->task_mgmt.lock); rxtx->task_mgmt.state = state; - pthread_cond_signal(&rxtx->task_mgmt.signal_state_change); + COND_SIGNAL(&rxtx->task_mgmt.signal_state_change); MUTEX_UNLOCK(&rxtx->task_mgmt.lock); } @@ -158,7 +157,7 @@ void rxtx_submit_request(struct rxtx_data *rxtx, unsigned char req) { MUTEX_LOCK(&rxtx->task_mgmt.lock); rxtx->task_mgmt.req |= req; - pthread_cond_signal(&rxtx->task_mgmt.signal_req); + COND_SIGNAL(&rxtx->task_mgmt.signal_req); MUTEX_UNLOCK(&rxtx->task_mgmt.lock); } @@ -415,9 +414,9 @@ struct rxtx_data *rxtx_data_alloc(bladerf_direction dir) ret->task_mgmt.state = RXTX_STATE_IDLE; ret->task_mgmt.req = 0; MUTEX_INIT(&ret->task_mgmt.lock); - pthread_cond_init(&ret->task_mgmt.signal_req, NULL); - pthread_cond_init(&ret->task_mgmt.signal_done, NULL); - pthread_cond_init(&ret->task_mgmt.signal_state_change, NULL); + COND_INIT(&ret->task_mgmt.signal_req); + COND_INIT(&ret->task_mgmt.signal_done); + COND_INIT(&ret->task_mgmt.signal_state_change); ret->task_mgmt.main_task_waiting = false; /* Initialize error management */ @@ -434,9 +433,9 @@ int rxtx_startup(struct cli_state *s, bladerf_direction dir) if (rxtx_is_tx(dir)) { rxtx_set_state(s->tx, RXTX_STATE_INIT); - status = pthread_create(&s->tx->task_mgmt.thread, NULL, tx_task, s); + status = THREAD_CREATE(&s->tx->task_mgmt.thread, tx_task, s); - if (status < 0) { + if (status != THREAD_SUCCESS) { rxtx_set_state(s->tx, RXTX_STATE_FAIL); } else { status = rxtx_wait_for_state(s->tx, RXTX_STATE_IDLE, 0); @@ -446,9 +445,8 @@ int rxtx_startup(struct cli_state *s, bladerf_direction dir) } } else { rxtx_set_state(s->rx, RXTX_STATE_INIT); - status = pthread_create(&s->rx->task_mgmt.thread, NULL, rx_task, s); - - if (status < 0) { + status = THREAD_CREATE(&s->rx->task_mgmt.thread, rx_task, s); + if (status != THREAD_SUCCESS) { rxtx_set_state(s->rx, RXTX_STATE_FAIL); } else { status = rxtx_wait_for_state(s->rx, RXTX_STATE_IDLE, 0); @@ -478,7 +476,7 @@ void rxtx_shutdown(struct cli_state *s, struct rxtx_data *rxtx) if (rxtx->task_mgmt.started && rxtx_get_state(rxtx) != RXTX_STATE_FAIL) { rxtx_submit_request(rxtx, RXTX_TASK_REQ_SHUTDOWN); - pthread_join(rxtx->task_mgmt.thread, NULL); + THREAD_JOIN(rxtx->task_mgmt.thread, NULL); } free(rxtx->file_mgmt.path); @@ -741,7 +739,7 @@ void rxtx_task_exec_idle(struct rxtx_data *rxtx, unsigned char *requests) /* Wait until we're asked to start or shutdown */ while (!(*requests & (RXTX_TASK_REQ_START | RXTX_TASK_REQ_SHUTDOWN))) { MUTEX_LOCK(&rxtx->task_mgmt.lock); - pthread_cond_wait(&rxtx->task_mgmt.signal_req, &rxtx->task_mgmt.lock); + COND_WAIT(&rxtx->task_mgmt.signal_req, &rxtx->task_mgmt.lock); *requests = rxtx->task_mgmt.req; MUTEX_UNLOCK(&rxtx->task_mgmt.lock); } @@ -791,7 +789,6 @@ int rxtx_handle_wait(struct cli_state *s, int status = CLI_RET_UNKNOWN; bool ok; unsigned int timeout_ms = 0; - struct timespec timeout_abs; enum rxtx_state state; static const struct numeric_suffix times[] = { @@ -827,27 +824,13 @@ int rxtx_handle_wait(struct cli_state *s, if (timeout_ms != 0) { const unsigned int timeout_sec = timeout_ms / 1000; - status = clock_gettime(CLOCK_REALTIME, &timeout_abs); - if (status != 0) { - goto out; - } - - timeout_abs.tv_sec += timeout_sec; - timeout_abs.tv_nsec += (timeout_ms % 1000) * 1000 * 1000; - - if (timeout_abs.tv_nsec >= NSEC_PER_SEC) { - timeout_abs.tv_sec += timeout_abs.tv_nsec / NSEC_PER_SEC; - timeout_abs.tv_nsec %= NSEC_PER_SEC; - } - MUTEX_LOCK(&rxtx->task_mgmt.lock); rxtx->task_mgmt.main_task_waiting = true; while (rxtx->task_mgmt.main_task_waiting) { - status = - pthread_cond_timedwait(&rxtx->task_mgmt.signal_done, - &rxtx->task_mgmt.lock, &timeout_abs); + status = COND_TIMED_WAIT(&rxtx->task_mgmt.signal_done, + &rxtx->task_mgmt.lock, timeout_ms); - if (status == ETIMEDOUT) { + if (status == THREAD_TIMEOUT) { rxtx->task_mgmt.main_task_waiting = false; } } @@ -857,7 +840,7 @@ int rxtx_handle_wait(struct cli_state *s, MUTEX_LOCK(&rxtx->task_mgmt.lock); rxtx->task_mgmt.main_task_waiting = true; while (rxtx->task_mgmt.main_task_waiting) { - status = pthread_cond_wait(&rxtx->task_mgmt.signal_done, + status = COND_WAIT(&rxtx->task_mgmt.signal_done, &rxtx->task_mgmt.lock); } MUTEX_UNLOCK(&rxtx->task_mgmt.lock); @@ -869,7 +852,7 @@ out: MUTEX_LOCK(&s->dev_lock); /* Expected and OK condition */ - if (status == ETIMEDOUT) { + if (status == THREAD_TIMEOUT) { status = 0; } @@ -887,7 +870,7 @@ bool rxtx_release_wait(struct rxtx_data *rxtx) MUTEX_LOCK(&rxtx->task_mgmt.lock); was_waiting = rxtx->task_mgmt.main_task_waiting; rxtx->task_mgmt.main_task_waiting = false; - pthread_cond_signal(&rxtx->task_mgmt.signal_done); + COND_SIGNAL(&rxtx->task_mgmt.signal_done); MUTEX_UNLOCK(&rxtx->task_mgmt.lock); return was_waiting; @@ -898,36 +881,21 @@ int rxtx_wait_for_state(struct rxtx_data *rxtx, unsigned int timeout_ms) { int status = 0; - struct timespec timeout_abs; if (timeout_ms != 0) { const unsigned int timeout_sec = timeout_ms / 1000; - status = clock_gettime(CLOCK_REALTIME, &timeout_abs); - if (status != 0) { - return -1; - } - - timeout_abs.tv_sec += timeout_sec; - timeout_abs.tv_nsec += (timeout_ms % 1000) * 1000 * 1000; - - if (timeout_abs.tv_nsec >= NSEC_PER_SEC) { - timeout_abs.tv_sec += timeout_abs.tv_nsec / NSEC_PER_SEC; - timeout_abs.tv_nsec %= NSEC_PER_SEC; - } - MUTEX_LOCK(&rxtx->task_mgmt.lock); - while (rxtx->task_mgmt.state != req_state && status == 0) { - status = - pthread_cond_timedwait(&rxtx->task_mgmt.signal_state_change, - &rxtx->task_mgmt.lock, &timeout_abs); + while (rxtx->task_mgmt.state != req_state && status == THREAD_SUCCESS) { + status = COND_TIMED_WAIT(&rxtx->task_mgmt.signal_state_change, + &rxtx->task_mgmt.lock, timeout_ms); } MUTEX_UNLOCK(&rxtx->task_mgmt.lock); } else { MUTEX_LOCK(&rxtx->task_mgmt.lock); while (rxtx->task_mgmt.state != req_state) { - status = pthread_cond_wait(&rxtx->task_mgmt.signal_state_change, + status = COND_WAIT(&rxtx->task_mgmt.signal_state_change, &rxtx->task_mgmt.lock); } MUTEX_UNLOCK(&rxtx->task_mgmt.lock); diff --git a/host/utilities/bladeRF-cli/src/cmd/rxtx_impl.h b/host/utilities/bladeRF-cli/src/cmd/rxtx_impl.h index 7f2c0d8c..7149fb09 100644 --- a/host/utilities/bladeRF-cli/src/cmd/rxtx_impl.h +++ b/host/utilities/bladeRF-cli/src/cmd/rxtx_impl.h @@ -102,16 +102,16 @@ struct file_mgmt { /* Task and thread management */ struct task_mgmt { - pthread_t thread; /* Handle to thread in which the task runs */ + THREAD thread; /* Handle to thread in which the task runs */ bool started; /* Has the thread been started? */ enum rxtx_state state; /* Task state */ uint8_t req; /* Requests for state change. See * RXTX_TASK_REQ_* bitmasks */ MUTEX lock; /* Must be held to access 'req' or 'state' */ - pthread_cond_t signal_req; /* Signal when a request has been made */ - pthread_cond_t signal_done; /* Signal when task finishes work */ - pthread_cond_t signal_state_change; /* Signal after state change */ + COND signal_req; /* Signal when a request has been made */ + COND signal_done; /* Signal when task finishes work */ + COND signal_state_change; /* Signal after state change */ bool main_task_waiting; /* Main task is blocked waiting */ }; diff --git a/host/utilities/bladeRF-cli/src/cmd/tx.c b/host/utilities/bladeRF-cli/src/cmd/tx.c index badd5bc8..f572b471 100644 --- a/host/utilities/bladeRF-cli/src/cmd/tx.c +++ b/host/utilities/bladeRF-cli/src/cmd/tx.c @@ -19,7 +19,6 @@ */ #include #include -#include #include #include #include @@ -31,6 +30,7 @@ #include "minmax.h" #include "parse.h" #include "rel_assert.h" +#include "thread.h" #include "rxtx_impl.h" /* The DAC range is [-2048, 2047] */ diff --git a/host/utilities/bladeRF-cli/src/common.c b/host/utilities/bladeRF-cli/src/common.c index 420a4de1..e1f038fc 100644 --- a/host/utilities/bladeRF-cli/src/common.c +++ b/host/utilities/bladeRF-cli/src/common.c @@ -19,7 +19,6 @@ */ #include #include -#include #include #include #include @@ -31,6 +30,7 @@ #include "cmd/rxtx.h" #include "input.h" #include "script.h" +#include "thread.h" /* There's currently only ever 1 active cli_state */ static struct cli_state *cli_state; @@ -105,7 +105,7 @@ struct cli_state *cli_state_create() cli_state->dev_info.is_bladerf_x40_x115 = false; cli_state->dev_info.is_bladerf_micro = false; - pthread_mutex_init(&cli_state->dev_lock, NULL); + MUTEX_INIT(&cli_state->dev_lock); cli_state->rx = rxtx_data_alloc(BLADERF_RX); if (!cli_state->rx) { @@ -305,25 +305,25 @@ const char *cli_strerror(int error, int lib_error) void cli_error_init(struct cli_error *e) { - pthread_mutex_init(&e->lock, NULL); + MUTEX_INIT(&e->lock); e->type = ETYPE_CLI; e->value = 0; } void set_last_error(struct cli_error *e, enum error_type type, int error) { - pthread_mutex_lock(&e->lock); + MUTEX_LOCK(&e->lock); e->type = type; e->value = error; - pthread_mutex_unlock(&e->lock); + MUTEX_UNLOCK(&e->lock); } void get_last_error(struct cli_error *e, enum error_type *type, int *error) { - pthread_mutex_lock(&e->lock); + MUTEX_LOCK(&e->lock); *type = e->type; *error = e->value; - pthread_mutex_unlock(&e->lock); + MUTEX_UNLOCK(&e->lock); } int expand_and_open(const char *filename, const char *mode, FILE **file) diff --git a/host/utilities/bladeRF-cli/src/common.h b/host/utilities/bladeRF-cli/src/common.h index bc6d410a..622eadbe 100644 --- a/host/utilities/bladeRF-cli/src/common.h +++ b/host/utilities/bladeRF-cli/src/common.h @@ -26,7 +26,7 @@ #include "host_config.h" #include "str_queue.h" #include -#include +#include "thread.h" #include #include @@ -88,7 +88,7 @@ enum error_type { struct cli_error { int value; /**< Last command error */ enum error_type type; /**< Type/source of last error */ - pthread_mutex_t lock; + MUTEX lock; }; /** @@ -106,7 +106,7 @@ struct cli_dev_info { struct cli_state { struct bladerf *dev; /**< Device currently in use */ struct cli_dev_info dev_info; /**< Cached device information */ - pthread_mutex_t dev_lock; /**< Should be held when performing + MUTEX dev_lock; /**< Should be held when performing * any "device conrol" calls */ int last_lib_error; /**< Last libbladeRF error */ diff --git a/host/utilities/bladeRF-cli/src/main.c b/host/utilities/bladeRF-cli/src/main.c index 2b3fb861..78856b40 100644 --- a/host/utilities/bladeRF-cli/src/main.c +++ b/host/utilities/bladeRF-cli/src/main.c @@ -23,7 +23,6 @@ #include #include #include -#include #include #include #include "input/input.h" @@ -32,6 +31,7 @@ #include "common.h" #include "cmd.h" #include "version.h" +#include "thread.h" #if BLADERF_OS_WINDOWS #include "setenv.h" From ee0e0040b69dd85041eb572da54289bf7af9468e Mon Sep 17 00:00:00 2001 From: Robert Ghilduta Date: Sat, 2 Dec 2023 18:19:21 -0800 Subject: [PATCH 182/238] libbladeRF_test: change over to libbladeRF thread macros --- host/common/include/thread.h | 2 + .../test_ctrl/src/test_threads.c | 34 +++++----- .../test_digital_loopback/src/main.c | 21 +++--- .../test_repeated_stream/src/main.c | 16 ++--- .../test_repeater/src/repeater.c | 66 +++++++++---------- .../libbladeRF_test/test_sync/src/test.c | 12 ++-- .../test_timestamps/src/loopback.c | 32 ++++----- .../test_timestamps/src/loopback.h | 4 +- .../src/test_format_mismatch.c | 40 +++++------ .../test_timestamps/src/test_loopback_onoff.c | 35 +++++----- .../src/test_loopback_onoff_rf.c | 36 +++++----- .../src/test_loopback_onoff_zp.c | 32 ++++----- .../test_timestamps/src/test_txrx_hwloop.c | 14 ++-- .../test_timestamps/src/test_txrx_hwloop.h | 3 +- 14 files changed, 174 insertions(+), 173 deletions(-) diff --git a/host/common/include/thread.h b/host/common/include/thread.h index 1d35bb81..26b700d0 100644 --- a/host/common/include/thread.h +++ b/host/common/include/thread.h @@ -80,6 +80,7 @@ # define THREAD_TIMEOUT ETIMEDOUT # define THREAD_CANCEL(m) pthread_cancel(m) # define THREAD_JOIN(t, s) pthread_join(t, s) +# define THREAD_EXIT(s) pthread_exit(s) # define COND_INIT(m) pthread_cond_init(m, NULL) # define COND_SIGNAL(m) pthread_cond_signal(m) @@ -148,6 +149,7 @@ static inline int posix_cond_timedwait(pthread_cond_t *c, # define THREAD_TIMEOUT WAIT_TIMEOUT # define THREAD_CANCEL(m) TerminateThread(m, 0) # define THREAD_JOIN(t, s) WaitForSingleObject(t, INFINITE) +# define THREAD_EXIT(s) ExitThread(s) # define COND_INIT(m) (InitializeConditionVariable(m), 0) # define COND_SIGNAL(m) WakeConditionVariable(m) diff --git a/host/libraries/libbladeRF_test/test_ctrl/src/test_threads.c b/host/libraries/libbladeRF_test/test_ctrl/src/test_threads.c index 9eb5d413..be3b50cb 100644 --- a/host/libraries/libbladeRF_test/test_ctrl/src/test_threads.c +++ b/host/libraries/libbladeRF_test/test_ctrl/src/test_threads.c @@ -27,15 +27,15 @@ * while concurrently runing full duplex streams via the sync interface */ #include "test_ctrl.h" -#include +#include "thread.h" DECLARE_TEST_CASE(threads); struct sync_task { struct bladerf *dev; bladerf_direction direction; - pthread_t thread; - pthread_mutex_t lock; + THREAD thread; + MUTEX lock; bool launched; bool run; int status; @@ -53,7 +53,7 @@ struct thread_state { struct app_params *p; failure_count failures; struct thread_test_case const *tc; - pthread_t thread; + THREAD thread; }; static const struct thread_test_case tc[] = { @@ -69,9 +69,9 @@ static const struct thread_test_case tc[] = { static inline void get_sync_task_state(struct sync_task *t, bool *run) { - pthread_mutex_lock(&t->lock); + MUTEX_LOCK(&t->lock); *run = t->run; - pthread_mutex_unlock(&t->lock); + MUTEX_UNLOCK(&t->lock); } static void *stream_task(void *arg) @@ -129,9 +129,9 @@ out: } free(samples); - pthread_mutex_lock(&t->lock); + MUTEX_LOCK(&t->lock); t->status = status; - pthread_mutex_unlock(&t->lock); + MUTEX_UNLOCK(&t->lock); return NULL; } @@ -144,15 +144,15 @@ static void init_task(struct sync_task *t, t->run = true; t->status = 0; t->direction = dir; - pthread_mutex_init(&t->lock, NULL); + MUTEX_INIT(&t->lock); } static int launch_task(struct sync_task *t) { int status; - status = pthread_create(&t->thread, NULL, stream_task, t); - if (0 == status) { + status = THREAD_CREATE(&t->thread, stream_task, t); + if (THREAD_SUCCESS == status) { t->launched = true; } @@ -162,10 +162,10 @@ static int launch_task(struct sync_task *t) static inline int deinit_task(struct sync_task *t) { if (t->launched) { - pthread_mutex_lock(&t->lock); + MUTEX_LOCK(&t->lock); t->run = false; - pthread_mutex_unlock(&t->lock); - pthread_join(t->thread, NULL); + MUTEX_UNLOCK(&t->lock); + THREAD_JOIN(t->thread, NULL); return t->status; } else { return 0; @@ -257,9 +257,9 @@ failure_count test_threads(struct bladerf *dev, struct app_params *p, bool quiet } status = - pthread_create(&threads[i].thread, NULL, run_test_fn, &threads[i]); + THREAD_CREATE(&threads[i].thread, run_test_fn, &threads[i]); - if (0 == status) { + if (THREAD_SUCCESS == status) { PRINT(" Started test_%s thread...\n", threads[i].tc->test->name); threads[i].launched = true; } else { @@ -271,7 +271,7 @@ failure_count test_threads(struct bladerf *dev, struct app_params *p, bool quiet for (i = 0; i < num_threads; i++) { if (threads[i].launched) { - pthread_join(threads[i].thread, NULL); + THREAD_JOIN(threads[i].thread, NULL); PRINT("\n Joined test_%s thread.\n", threads[i].tc->test->name); failures += threads[i].failures; } diff --git a/host/libraries/libbladeRF_test/test_digital_loopback/src/main.c b/host/libraries/libbladeRF_test/test_digital_loopback/src/main.c index 8bbf9749..0c1f1e75 100644 --- a/host/libraries/libbladeRF_test/test_digital_loopback/src/main.c +++ b/host/libraries/libbladeRF_test/test_digital_loopback/src/main.c @@ -29,13 +29,12 @@ #include #include -#include - #include "conversions.h" #include "log.h" #include "test_common.h" #include #include "async.h" +#include "thread.h" /****************************************************************************** * Type definitions @@ -453,7 +452,7 @@ int main(int argc, char *argv[]) struct rx_buffer_state rx_state; struct tx_buffer_state tx_state; struct bladerf_stream *rx_stream, *tx_stream; - pthread_t rx_thread, tx_thread; + THREAD rx_thread, tx_thread; bladerf_log_level level; int status; bool ok; @@ -716,9 +715,9 @@ int main(int argc, char *argv[]) goto error; } - status = pthread_create(&tx_thread, NULL, tx_streamer, tx_stream); - if (status < 0) { - log_error("pthread_create(TX): %s\n", strerror(status)); + status = THREAD_CREATE(&tx_thread, tx_streamer, tx_stream); + if (status != THREAD_SUCCESS) { + log_error("THREAD_CREATE(TX): %s\n", strerror(status)); goto error; } @@ -728,16 +727,16 @@ int main(int argc, char *argv[]) goto error; } - status = pthread_create(&rx_thread, NULL, rx_streamer, rx_stream); - if (status < 0) { - log_error("pthread_create(RX): %s\n", strerror(status)); + status = THREAD_CREATE(&rx_thread, rx_streamer, rx_stream); + if (status != THREAD_SUCCESS) { + log_error("THREAD_CREATE(RX): %s\n", strerror(status)); goto error; } log_info("Loopback test running. Press Ctrl-C to exit...\n"); - pthread_join(tx_thread, NULL); - pthread_join(rx_thread, NULL); + THREAD_JOIN(tx_thread, NULL); + THREAD_JOIN(rx_thread, NULL); log_info("IQ Matches: %zu / %zu (%.1f%%)\n", good_count, good_count + bad_count, diff --git a/host/libraries/libbladeRF_test/test_repeated_stream/src/main.c b/host/libraries/libbladeRF_test/test_repeated_stream/src/main.c index 35e9797e..fa9c1779 100644 --- a/host/libraries/libbladeRF_test/test_repeated_stream/src/main.c +++ b/host/libraries/libbladeRF_test/test_repeated_stream/src/main.c @@ -32,12 +32,12 @@ #include #include #include -#include #include #include "devcfg.h" #include "conversions.h" #include "minmax.h" +#include "thread.h" #define OPTIONS DEVCFG_OPTIONS_BASE "r:S:" @@ -221,7 +221,7 @@ int main(int argc, char *argv[]) int status = EXIT_FAILURE; struct option *options = NULL; struct app_params params; - pthread_t rx_thread, tx_thread; + THREAD rx_thread, tx_thread; bool rx_launched = false; bool tx_launched = false; @@ -266,8 +266,8 @@ int main(int argc, char *argv[]) } if (params.rx) { - status = pthread_create(&rx_thread, NULL, rx_task, ¶ms); - if (status != 0) { + status = THREAD_CREATE(&rx_thread, rx_task, ¶ms); + if (status != THREAD_SUCCESS) { fprintf(stderr, "Failed to launch RX thread: %s\n", strerror(status)); params.rx = false; } else { @@ -276,8 +276,8 @@ int main(int argc, char *argv[]) } if (params.tx) { - status = pthread_create(&tx_thread, NULL, tx_task, ¶ms); - if (status != 0) { + status = THREAD_CREATE(&tx_thread, tx_task, ¶ms); + if (status != THREAD_SUCCESS) { fprintf(stderr, "Failed to launch TX thread: %s\n", strerror(status)); params.tx = false; } else { @@ -286,11 +286,11 @@ int main(int argc, char *argv[]) } if (rx_launched) { - pthread_join(rx_thread, NULL); + THREAD_JOIN(rx_thread, NULL); } if (tx_launched) { - pthread_join(tx_thread, NULL); + THREAD_JOIN(tx_thread, NULL); } out: diff --git a/host/libraries/libbladeRF_test/test_repeater/src/repeater.c b/host/libraries/libbladeRF_test/test_repeater/src/repeater.c index fcbfdcd0..011a0ead 100644 --- a/host/libraries/libbladeRF_test/test_repeater/src/repeater.c +++ b/host/libraries/libbladeRF_test/test_repeater/src/repeater.c @@ -64,10 +64,10 @@ #include #include #include -#include #include #include "rel_assert.h" +#include "thread.h" #include "repeater.h" #include "minmax.h" @@ -152,9 +152,9 @@ static char get_key() /* Thread-safe wrapper around fprintf(stderr, ...) */ #define print_error(repeater_, ...) do { \ - pthread_mutex_lock(&repeater_->stderr_lock); \ + MUTEX_LOCK(&repeater_->stderr_lock); \ fprintf(stderr, __VA_ARGS__); \ - pthread_mutex_unlock(&repeater_->stderr_lock); \ + MUTEX_UNLOCK(&repeater_->stderr_lock); \ } while (0) #define GAIN_TXVGA1_MIN -35 @@ -189,22 +189,22 @@ struct buf_mgmt size_t num_buffers; /* # of sample buffers */ /* Used to signal the TX thread when a few samplse have been buffered up */ - pthread_cond_t samples_available; + COND samples_available; - pthread_mutex_t lock; + MUTEX lock; }; struct repeater { struct bladerf *device; - pthread_t rx_task; + THREAD rx_task; struct bladerf_stream *rx_stream; - pthread_t tx_task; + THREAD tx_task; struct bladerf_stream *tx_stream; - pthread_mutex_t stderr_lock; + MUTEX stderr_lock; struct buf_mgmt buf_mgmt; @@ -247,7 +247,7 @@ static void *tx_stream_callback(struct bladerf *dev, void *ret; struct repeater *repeater = (struct repeater *)user_data; - pthread_mutex_lock(&repeater->buf_mgmt.lock); + MUTEX_LOCK(&repeater->buf_mgmt.lock); if (repeater->buf_mgmt.tx_idx < 0) { ret = NULL; @@ -271,7 +271,7 @@ static void *tx_stream_callback(struct bladerf *dev, } } - pthread_mutex_unlock(&repeater->buf_mgmt.lock); + MUTEX_UNLOCK(&repeater->buf_mgmt.lock); return ret; } @@ -284,21 +284,21 @@ void * tx_task_run(void *repeater_) /* Wait for RX task to buffer up some samples before we begin * consuming them */ - pthread_mutex_lock(&repeater->buf_mgmt.lock); + MUTEX_LOCK(&repeater->buf_mgmt.lock); while(repeater->buf_mgmt.num_filled < repeater->buf_mgmt.prefill_count && repeater->buf_mgmt.tx_idx >= 0) { - status = pthread_cond_wait(&repeater->buf_mgmt.samples_available, + status = COND_WAIT(&repeater->buf_mgmt.samples_available, &repeater->buf_mgmt.lock); - if (status != 0) { + if (status != THREAD_SUCCESS) { print_error(repeater, "TX startup wait failed (%d)\n", status); exit_early = true; } } exit_early |= repeater->buf_mgmt.tx_idx < 0; - pthread_mutex_unlock(&repeater->buf_mgmt.lock); + MUTEX_UNLOCK(&repeater->buf_mgmt.lock); if (!exit_early) { /* Call stream */ @@ -325,7 +325,7 @@ static void *rx_stream_callback(struct bladerf *dev, struct repeater *repeater = (struct repeater *)user_data; void *ret; - pthread_mutex_lock(&repeater->buf_mgmt.lock); + MUTEX_LOCK(&repeater->buf_mgmt.lock); if (repeater->buf_mgmt.rx_idx < 0) { ret = NULL; @@ -346,10 +346,10 @@ static void *rx_stream_callback(struct bladerf *dev, } else { repeater->buf_mgmt.num_filled++; } - pthread_cond_signal(&repeater->buf_mgmt.samples_available); + COND_SIGNAL(&repeater->buf_mgmt.samples_available); } - pthread_mutex_unlock(&repeater->buf_mgmt.lock); + MUTEX_UNLOCK(&repeater->buf_mgmt.lock); return ret; } @@ -372,9 +372,9 @@ static inline void repeater_init(struct repeater *repeater, { memset(repeater, 0, sizeof(*repeater)); - pthread_mutex_init(&repeater->stderr_lock, NULL); - pthread_mutex_init(&repeater->buf_mgmt.lock, NULL); - pthread_cond_init(&repeater->buf_mgmt.samples_available, NULL); + MUTEX_INIT(&repeater->stderr_lock); + MUTEX_INIT(&repeater->buf_mgmt.lock); + COND_INIT(&repeater->buf_mgmt.samples_available); repeater->buf_mgmt.num_filled = 0; repeater->buf_mgmt.num_buffers = config->num_buffers; @@ -607,15 +607,15 @@ static int start_tasks(struct repeater *repeater) { int status; - status = pthread_create(&repeater->rx_task, NULL, rx_task_run, repeater); - if (status < 0) { + status = THREAD_CREATE(&repeater->rx_task, rx_task_run, repeater); + if (status != THREAD_SUCCESS) { return -1; } - status = pthread_create(&repeater->tx_task, NULL, tx_task_run, repeater); - if (status < 0) { - pthread_cancel(repeater->rx_task); - pthread_join(repeater->rx_task, NULL); + status = THREAD_CREATE(&repeater->tx_task, tx_task_run, repeater); + if (status != THREAD_SUCCESS) { + THREAD_CANCEL(repeater->rx_task); + THREAD_JOIN(repeater->rx_task, NULL); return -1; } @@ -625,18 +625,18 @@ static int start_tasks(struct repeater *repeater) static void stop_tasks(struct repeater *repeater) { print_error(repeater, "Stoppping RX and tasks...\r\n"); - pthread_mutex_lock(&repeater->buf_mgmt.lock); + MUTEX_LOCK(&repeater->buf_mgmt.lock); repeater->buf_mgmt.tx_idx = -1; repeater->buf_mgmt.rx_idx = -1; - pthread_mutex_unlock(&repeater->buf_mgmt.lock); - pthread_join(repeater->rx_task, NULL); + MUTEX_UNLOCK(&repeater->buf_mgmt.lock); + THREAD_JOIN(repeater->rx_task, NULL); /* Fire off the "samples available" signal to the TX thread, in case * it is still awaiting for the prefill completion */ - pthread_mutex_lock(&repeater->buf_mgmt.lock); - pthread_cond_signal(&repeater->buf_mgmt.samples_available); - pthread_mutex_unlock(&repeater->buf_mgmt.lock); - pthread_join(repeater->tx_task, NULL); + MUTEX_LOCK(&repeater->buf_mgmt.lock); + COND_SIGNAL(&repeater->buf_mgmt.samples_available); + MUTEX_UNLOCK(&repeater->buf_mgmt.lock); + THREAD_JOIN(repeater->tx_task, NULL); } diff --git a/host/libraries/libbladeRF_test/test_sync/src/test.c b/host/libraries/libbladeRF_test/test_sync/src/test.c index b9231ca2..340dab5e 100644 --- a/host/libraries/libbladeRF_test/test_sync/src/test.c +++ b/host/libraries/libbladeRF_test/test_sync/src/test.c @@ -27,7 +27,7 @@ #include #include #include -#include +#include "thread.h" #include #include @@ -40,7 +40,7 @@ static struct task_args { struct bladerf *dev; struct test_params *p; - pthread_t thread; + THREAD thread; int status; bool quit; } rx_args, tx_args; @@ -365,7 +365,7 @@ int test_run(struct test_params *p) tx_args.quit = false; log_debug("Starting TX task\n"); - if (pthread_create(&tx_args.thread, NULL, tx_task, &tx_args) != 0) { + if (THREAD_CREATE(&tx_args.thread, tx_task, &tx_args) != THREAD_SUCCESS) { fclose(p->in_file); p->in_file = NULL; } @@ -378,7 +378,7 @@ int test_run(struct test_params *p) rx_args.quit = false; log_debug("Starting RX task\n"); - if (pthread_create(&rx_args.thread, NULL, rx_task, &rx_args) != 0) { + if (THREAD_CREATE(&rx_args.thread, rx_task, &rx_args) != THREAD_SUCCESS) { fclose(p->out_file); p->out_file = NULL; } @@ -387,12 +387,12 @@ int test_run(struct test_params *p) log_debug("Running...\n"); if (p->in_file != NULL) { - pthread_join(tx_args.thread, NULL); + THREAD_JOIN(tx_args.thread, NULL); log_debug("Joined TX task\n"); } if (p->out_file != NULL) { - pthread_join(rx_args.thread, NULL); + THREAD_JOIN(rx_args.thread, NULL); log_debug("Joined RX task\n"); } diff --git a/host/libraries/libbladeRF_test/test_timestamps/src/loopback.c b/host/libraries/libbladeRF_test/test_timestamps/src/loopback.c index dd439bd3..9e4ec78a 100644 --- a/host/libraries/libbladeRF_test/test_timestamps/src/loopback.c +++ b/host/libraries/libbladeRF_test/test_timestamps/src/loopback.c @@ -284,10 +284,10 @@ void *loopback_burst_rx_task (void *args) burst_num, bladerf_strerror(status)); } else if (meta.status & BLADERF_META_STATUS_OVERRUN) { fprintf(stderr, "Error: RX overrun detected.\n"); - pthread_mutex_lock(&t->lock); + MUTEX_LOCK(&t->lock); t->stop = true; t->rx_ready = true; - pthread_mutex_unlock(&t->lock); + MUTEX_UNLOCK(&t->lock); } else { /* printf("Read %-8u samples @ 0x%08"PRIx64" (%-8"PRIu64")\n", @@ -336,9 +336,9 @@ void *loopback_burst_rx_task (void *args) * rid ourselves of any junk in the RX FIFOs and are * ready to start the test */ next_state = WAIT_FOR_BURST_START; - pthread_mutex_lock(&t->lock); + MUTEX_LOCK(&t->lock); t->rx_ready = true; - pthread_mutex_unlock(&t->lock); + MUTEX_UNLOCK(&t->lock); } } break; @@ -443,9 +443,9 @@ void *loopback_burst_rx_task (void *args) break; } - pthread_mutex_lock(&t->lock); + MUTEX_LOCK(&t->lock); stop = t->stop; - pthread_mutex_unlock(&t->lock); + MUTEX_UNLOCK(&t->lock); } if (status < 0) { @@ -459,9 +459,9 @@ void *loopback_burst_rx_task (void *args) #endif /* Ensure the TX side is signalled to stop, if it isn't already */ - pthread_mutex_lock(&t->lock); + MUTEX_LOCK(&t->lock); t->stop = true; - pthread_mutex_unlock(&t->lock); + MUTEX_UNLOCK(&t->lock); return NULL; } @@ -514,10 +514,10 @@ void *loopback_burst_rx_task_rf (void *args) burst_num, bladerf_strerror(status)); } else if (meta.status & BLADERF_META_STATUS_OVERRUN) { fprintf(stderr, "Error: RX overrun detected.\n"); - pthread_mutex_lock(&t->lock); + MUTEX_LOCK(&t->lock); t->stop = true; t->rx_ready = true; - pthread_mutex_unlock(&t->lock); + MUTEX_UNLOCK(&t->lock); } else { /* printf("Read %-8u samples @ 0x%08"PRIx64" (%-8"PRIu64")\n", @@ -565,9 +565,9 @@ void *loopback_burst_rx_task_rf (void *args) * rid ourselves of any junk in the RX FIFOs and are * ready to start the test */ next_state = WAIT_FOR_BURST_START; - pthread_mutex_lock(&t->lock); + MUTEX_LOCK(&t->lock); t->rx_ready = true; - pthread_mutex_unlock(&t->lock); + MUTEX_UNLOCK(&t->lock); } } break; @@ -672,9 +672,9 @@ void *loopback_burst_rx_task_rf (void *args) break; } - pthread_mutex_lock(&t->lock); + MUTEX_LOCK(&t->lock); stop = t->stop; - pthread_mutex_unlock(&t->lock); + MUTEX_UNLOCK(&t->lock); } if (status < 0) { @@ -688,9 +688,9 @@ void *loopback_burst_rx_task_rf (void *args) #endif /* Ensure the TX side is signalled to stop, if it isn't already */ - pthread_mutex_lock(&t->lock); + MUTEX_LOCK(&t->lock); t->stop = true; - pthread_mutex_unlock(&t->lock); + MUTEX_UNLOCK(&t->lock); return NULL; } diff --git a/host/libraries/libbladeRF_test/test_timestamps/src/loopback.h b/host/libraries/libbladeRF_test/test_timestamps/src/loopback.h index e37d488a..2d850bcc 100644 --- a/host/libraries/libbladeRF_test/test_timestamps/src/loopback.h +++ b/host/libraries/libbladeRF_test/test_timestamps/src/loopback.h @@ -28,8 +28,8 @@ #include #include #include -#include #include +#include "thread.h" #define LOOPBACK_TX_MAGNITUDE 2000 #define LOOPBACK_RX_POWER_THRESH (256 * 256) @@ -40,7 +40,7 @@ struct loopback_burst_test { struct loopback_burst *bursts; unsigned int num_bursts; - pthread_mutex_t lock; + MUTEX lock; bool stop; bool rx_ready; bladerf_frequency frequency; diff --git a/host/libraries/libbladeRF_test/test_timestamps/src/test_format_mismatch.c b/host/libraries/libbladeRF_test/test_timestamps/src/test_format_mismatch.c index f51fb1c0..08c501fd 100644 --- a/host/libraries/libbladeRF_test/test_timestamps/src/test_format_mismatch.c +++ b/host/libraries/libbladeRF_test/test_timestamps/src/test_format_mismatch.c @@ -32,7 +32,7 @@ #include #include #include -#include +#include "thread.h" #include #include "test_timestamps.h" @@ -77,8 +77,8 @@ static struct async_task size_t curr_buf_idx; size_t n_buffers; - pthread_t thread; - pthread_mutex_t lock; + THREAD thread; + MUTEX lock; } rx_task, tx_task; void *callback(struct bladerf *dev, struct bladerf_stream *stream, @@ -90,7 +90,7 @@ void *callback(struct bladerf *dev, struct bladerf_stream *stream, void *ret; - pthread_mutex_lock(&t->lock); + MUTEX_LOCK(&t->lock); t->curr_buf_idx = (t->curr_buf_idx + 1) % t->n_buffers; ret = t->buffers[t->curr_buf_idx]; @@ -112,7 +112,7 @@ void *callback(struct bladerf *dev, struct bladerf_stream *stream, ret = BLADERF_STREAM_SHUTDOWN; } - pthread_mutex_unlock(&t->lock); + MUTEX_UNLOCK(&t->lock); return ret; } @@ -146,10 +146,10 @@ static void *stream_task(void *arg) bladerf_deinit_stream(stream); out: - pthread_mutex_lock(&t->lock); + MUTEX_LOCK(&t->lock); t->state = TASK_STOPPED; t->exit_status = status; - pthread_mutex_unlock(&t->lock); + MUTEX_UNLOCK(&t->lock); return NULL; } @@ -217,8 +217,8 @@ static int init_if(struct bladerf *dev, struct app_params *p, bladerf_module m, t->fmt = fmt; t->state = state = TASK_UNINITIALIZED; - status = pthread_create(&t->thread, NULL, stream_task, t); - if (status != 0) { + status = THREAD_CREATE(&t->thread, stream_task, t); + if (status != THREAD_SUCCESS) { fprintf(stderr, "Failed to launch %s task\n", m == BLADERF_MODULE_RX ? "RX" : "TX"); return status; @@ -226,15 +226,15 @@ static int init_if(struct bladerf *dev, struct app_params *p, bladerf_module m, do { usleep(25000); - pthread_mutex_lock(&t->lock); + MUTEX_LOCK(&t->lock); state = t->state; - pthread_mutex_unlock(&t->lock); + MUTEX_UNLOCK(&t->lock); } while (state == TASK_UNINITIALIZED); /* This may have already stopped if an invalid configuration was * detected. */ if (state == TASK_STOPPED) { - pthread_join(t->thread, NULL); + THREAD_JOIN(t->thread, NULL); if (t->exit_status != exp_status) { fprintf(stderr, "Uexpected status when configuring async %s: %s\n", @@ -274,23 +274,23 @@ static int deinit_if(struct bladerf *dev, bladerf_module m, bool sync, return -1; } - pthread_mutex_lock(&t->lock); + MUTEX_LOCK(&t->lock); state = t->state; - pthread_mutex_unlock(&t->lock); + MUTEX_UNLOCK(&t->lock); while (state != TASK_STOPPED) { - pthread_mutex_lock(&t->lock); + MUTEX_LOCK(&t->lock); t->state = TASK_SHUTDOWN_REQUESTED; - pthread_mutex_unlock(&t->lock); + MUTEX_UNLOCK(&t->lock); usleep(25000); - pthread_mutex_lock(&t->lock); + MUTEX_LOCK(&t->lock); state = t->state; - pthread_mutex_unlock(&t->lock); + MUTEX_UNLOCK(&t->lock); } - pthread_join(t->thread, NULL); + THREAD_JOIN(t->thread, NULL); if (t->exit_status != exp_status) { fprintf(stderr, @@ -331,7 +331,7 @@ static void init_task_info(struct bladerf *dev, struct app_params *p, t->n_buffers = 16; t->curr_buf_idx = 0; - pthread_mutex_init(&t->lock, NULL); + MUTEX_INIT(&t->lock); } int test_fn_format_mismatch(struct bladerf *dev, struct app_params *p) diff --git a/host/libraries/libbladeRF_test/test_timestamps/src/test_loopback_onoff.c b/host/libraries/libbladeRF_test/test_timestamps/src/test_loopback_onoff.c index 7a36879a..410c2849 100644 --- a/host/libraries/libbladeRF_test/test_timestamps/src/test_loopback_onoff.c +++ b/host/libraries/libbladeRF_test/test_timestamps/src/test_loopback_onoff.c @@ -33,7 +33,6 @@ #include #include #include -#include #include #include "test_timestamps.h" #include "loopback.h" @@ -88,9 +87,9 @@ static void * tx_task(void *args) i + 1, samples_left, bladerf_strerror(status)); /* Stop the RX worker */ - pthread_mutex_lock(&t->lock); + MUTEX_LOCK(&t->lock); t->stop = true; - pthread_mutex_unlock(&t->lock); + MUTEX_UNLOCK(&t->lock); } meta.flags &= ~BLADERF_META_FLAG_TX_BURST_START; @@ -109,15 +108,15 @@ static void * tx_task(void *args) bladerf_strerror(status)); /* Stop the RX worker */ - pthread_mutex_lock(&t->lock); + MUTEX_LOCK(&t->lock); t->stop = true; - pthread_mutex_unlock(&t->lock); + MUTEX_UNLOCK(&t->lock); } } - pthread_mutex_lock(&t->lock); + MUTEX_LOCK(&t->lock); stop = t->stop; - pthread_mutex_unlock(&t->lock); + MUTEX_UNLOCK(&t->lock); } /* Wait for samples to finish */ @@ -195,10 +194,10 @@ int test_fn_loopback_onoff(struct bladerf *dev, struct app_params *p) { int status = 0; struct loopback_burst_test test; - pthread_t tx_thread; + THREAD tx_thread; bool tx_started = false; - pthread_t rx_thread; + THREAD rx_thread; bool rx_started = false; bool rx_ready = false; @@ -208,7 +207,7 @@ int test_fn_loopback_onoff(struct bladerf *dev, struct app_params *p) test.stop = false; test.rx_ready = false; - pthread_mutex_init(&test.lock, NULL); + MUTEX_INIT(&test.lock); test.bursts = (struct loopback_burst *) malloc(test.num_bursts * sizeof(test.bursts[0])); if (test.bursts == NULL) { @@ -225,8 +224,8 @@ int test_fn_loopback_onoff(struct bladerf *dev, struct app_params *p) printf("Starting bursts...\n"); - status = pthread_create(&rx_thread, NULL, loopback_burst_rx_task, &test); - if (status != 0) { + status = THREAD_CREATE(&rx_thread, loopback_burst_rx_task, &test); + if (status != THREAD_SUCCESS) { fprintf(stderr, "Failed to start RX thread: %s\n", strerror(status)); goto out; } else { @@ -235,13 +234,13 @@ int test_fn_loopback_onoff(struct bladerf *dev, struct app_params *p) while (!rx_ready) { usleep(10000); - pthread_mutex_lock(&test.lock); + MUTEX_LOCK(&test.lock); rx_ready = test.rx_ready; - pthread_mutex_unlock(&test.lock); + MUTEX_UNLOCK(&test.lock); } - status = pthread_create(&tx_thread, NULL, tx_task, &test); - if (status != 0) { + status = THREAD_CREATE(&tx_thread, tx_task, &test); + if (status != THREAD_SUCCESS) { fprintf(stderr, "Failed to start TX thread: %s\n", strerror(status)); goto out; } else { @@ -250,11 +249,11 @@ int test_fn_loopback_onoff(struct bladerf *dev, struct app_params *p) out: if (tx_started) { - pthread_join(tx_thread, NULL); + THREAD_JOIN(tx_thread, NULL); } if (rx_started) { - pthread_join(rx_thread, NULL); + THREAD_JOIN(rx_thread, NULL); } free(test.bursts); diff --git a/host/libraries/libbladeRF_test/test_timestamps/src/test_loopback_onoff_rf.c b/host/libraries/libbladeRF_test/test_timestamps/src/test_loopback_onoff_rf.c index e0ef5fbb..1b98cce5 100644 --- a/host/libraries/libbladeRF_test/test_timestamps/src/test_loopback_onoff_rf.c +++ b/host/libraries/libbladeRF_test/test_timestamps/src/test_loopback_onoff_rf.c @@ -33,7 +33,7 @@ #include #include #include -#include +#include "thread.h" #include #include "test_timestamps.h" #include "loopback.h" @@ -88,9 +88,9 @@ static void * tx_task(void *args) i + 1, samples_left, bladerf_strerror(status)); /* Stop the RX worker */ - pthread_mutex_lock(&t->lock); + MUTEX_LOCK(&t->lock); t->stop = true; - pthread_mutex_unlock(&t->lock); + MUTEX_UNLOCK(&t->lock); } meta.flags &= ~BLADERF_META_FLAG_TX_BURST_START; @@ -109,15 +109,15 @@ static void * tx_task(void *args) bladerf_strerror(status)); /* Stop the RX worker */ - pthread_mutex_lock(&t->lock); + MUTEX_LOCK(&t->lock); t->stop = true; - pthread_mutex_unlock(&t->lock); + MUTEX_UNLOCK(&t->lock); } } - pthread_mutex_lock(&t->lock); + MUTEX_LOCK(&t->lock); stop = t->stop; - pthread_mutex_unlock(&t->lock); + MUTEX_UNLOCK(&t->lock); } /* Wait for samples to finish */ @@ -199,10 +199,10 @@ int test_fn_loopback_onoff_rf(struct bladerf *dev, struct app_params *p) return 0; int status = 0; struct loopback_burst_test test; - pthread_t tx_thread; + THREAD tx_thread; bool tx_started = false; - pthread_t rx_thread; + THREAD rx_thread; bool rx_started = false; bool rx_ready = false; @@ -213,7 +213,7 @@ int test_fn_loopback_onoff_rf(struct bladerf *dev, struct app_params *p) test.rx_ready = false; test.frequency = 100e6; - pthread_mutex_init(&test.lock, NULL); + MUTEX_INIT(&test.lock); fprintf(stderr, "[WARNING] loopback_onoff_rf under construction\n"); fprintf(stderr, "[WARNING] Failure expected\n"); @@ -234,8 +234,8 @@ int test_fn_loopback_onoff_rf(struct bladerf *dev, struct app_params *p) printf("Starting bursts...\n"); - status = pthread_create(&rx_thread, NULL, loopback_burst_rx_task_rf, &test); - if (status != 0) { + status = THREAD_CREATE(&rx_thread, loopback_burst_rx_task_rf, &test); + if (status != THREAD_SUCCESS) { fprintf(stderr, "Failed to start RX thread: %s\n", strerror(status)); goto out; } else { @@ -244,13 +244,13 @@ int test_fn_loopback_onoff_rf(struct bladerf *dev, struct app_params *p) while (!rx_ready) { usleep(10000); - pthread_mutex_lock(&test.lock); + MUTEX_LOCK(&test.lock); rx_ready = test.rx_ready; - pthread_mutex_unlock(&test.lock); + MUTEX_UNLOCK(&test.lock); } - status = pthread_create(&tx_thread, NULL, tx_task, &test); - if (status != 0) { + status = THREAD_CREATE(&tx_thread, tx_task, &test); + if (status != THREAD_SUCCESS) { fprintf(stderr, "Failed to start TX thread: %s\n", strerror(status)); goto out; } else { @@ -259,11 +259,11 @@ int test_fn_loopback_onoff_rf(struct bladerf *dev, struct app_params *p) out: if (tx_started) { - pthread_join(tx_thread, NULL); + THREAD_JOIN(tx_thread, NULL); } if (rx_started) { - pthread_join(rx_thread, NULL); + THREAD_JOIN(rx_thread, NULL); } free(test.bursts); diff --git a/host/libraries/libbladeRF_test/test_timestamps/src/test_loopback_onoff_zp.c b/host/libraries/libbladeRF_test/test_timestamps/src/test_loopback_onoff_zp.c index 33e84f68..29059767 100644 --- a/host/libraries/libbladeRF_test/test_timestamps/src/test_loopback_onoff_zp.c +++ b/host/libraries/libbladeRF_test/test_timestamps/src/test_loopback_onoff_zp.c @@ -35,7 +35,7 @@ #include #include #include -#include +#include "thread.h" #include #include #include "test_timestamps.h" @@ -284,9 +284,9 @@ static void * tx_task(void *args) status = tx_samples(t, samples, &meta, t->bursts[i].duration, i); if (status != 0) { - pthread_mutex_lock(&t->lock); + MUTEX_LOCK(&t->lock); stop = t->stop = true; - pthread_mutex_unlock(&t->lock); + MUTEX_UNLOCK(&t->lock); } else { meta.flags = BLADERF_META_FLAG_TX_UPDATE_TIMESTAMP; @@ -296,9 +296,9 @@ static void * tx_task(void *args) } - pthread_mutex_lock(&t->lock); + MUTEX_LOCK(&t->lock); stop = t->stop; - pthread_mutex_unlock(&t->lock); + MUTEX_UNLOCK(&t->lock); } } @@ -341,10 +341,10 @@ int test_fn_loopback_onoff_zp(struct bladerf *dev, struct app_params *p) { int status = 0; struct loopback_burst_test test; - pthread_t tx_thread; + THREAD tx_thread; bool tx_started = false; - pthread_t rx_thread; + THREAD rx_thread; bool rx_started = false; bool rx_ready = false; @@ -354,7 +354,7 @@ int test_fn_loopback_onoff_zp(struct bladerf *dev, struct app_params *p) test.stop = false; test.rx_ready = false; - pthread_mutex_init(&test.lock, NULL); + MUTEX_INIT(&test.lock); test.bursts = (struct loopback_burst *) malloc(test.num_bursts * sizeof(test.bursts[0])); if (test.bursts == NULL) { @@ -371,8 +371,8 @@ int test_fn_loopback_onoff_zp(struct bladerf *dev, struct app_params *p) printf("Starting bursts...\n"); - status = pthread_create(&rx_thread, NULL, loopback_burst_rx_task, &test); - if (status != 0) { + status = THREAD_CREATE(&rx_thread, loopback_burst_rx_task, &test); + if (status != THREAD_SUCCESS) { fprintf(stderr, "Failed to start RX thread: %s\n", strerror(status)); goto out; } else { @@ -381,13 +381,13 @@ int test_fn_loopback_onoff_zp(struct bladerf *dev, struct app_params *p) while (!rx_ready) { usleep(10000); - pthread_mutex_lock(&test.lock); + MUTEX_LOCK(&test.lock); rx_ready = test.rx_ready; - pthread_mutex_unlock(&test.lock); + MUTEX_UNLOCK(&test.lock); } - status = pthread_create(&tx_thread, NULL, tx_task, &test); - if (status != 0) { + status = THREAD_CREATE(&tx_thread, tx_task, &test); + if (status != THREAD_SUCCESS) { fprintf(stderr, "Failed to start TX thread: %s\n", strerror(status)); goto out; } else { @@ -396,11 +396,11 @@ int test_fn_loopback_onoff_zp(struct bladerf *dev, struct app_params *p) out: if (tx_started) { - pthread_join(tx_thread, NULL); + THREAD_JOIN(tx_thread, NULL); } if (rx_started) { - pthread_join(rx_thread, NULL); + THREAD_JOIN(rx_thread, NULL); } free(test.bursts); diff --git a/host/libraries/libbladeRF_test/test_timestamps/src/test_txrx_hwloop.c b/host/libraries/libbladeRF_test/test_timestamps/src/test_txrx_hwloop.c index 560681d4..f37b9116 100644 --- a/host/libraries/libbladeRF_test/test_timestamps/src/test_txrx_hwloop.c +++ b/host/libraries/libbladeRF_test/test_timestamps/src/test_txrx_hwloop.c @@ -31,11 +31,11 @@ #include #include #include -#include #include "conversions.h" #include "test_timestamps.h" #include "test_txrx_hwloop.h" #include "minmax.h" +#include "thread.h" #ifdef _WIN32 #include "gettimeofday.h" @@ -97,8 +97,8 @@ int main(int argc, char *argv[]) { bladerf_log_level log_level; /** Threading */ - pthread_t thread_rx; - pthread_t thread_loopcompare; + THREAD thread_rx; + THREAD thread_loopcompare; thread_args args_loopbackcompare; thread_args args_rx; @@ -231,14 +231,14 @@ int main(int argc, char *argv[]) { args_rx.is_rx_device = true; args_rx.dev = dev_rx; args_rx.tc = &test; - pthread_create(&thread_rx, NULL, rx_task, &args_rx); + THREAD_CREATE(&thread_rx, rx_task, &args_rx); } if (test.compare == true) { args_loopbackcompare.is_rx_device = false; args_loopbackcompare.dev = dev_tx; args_loopbackcompare.tc = &test; - pthread_create(&thread_loopcompare, NULL, rx_task, &args_loopbackcompare); + THREAD_CREATE(&thread_loopcompare, rx_task, &args_loopbackcompare); } for (i = 0; i < test.iterations && status == 0; i++) { @@ -287,12 +287,12 @@ int main(int argc, char *argv[]) { printf("TX finished in %.4f seconds\n", time_passed); out: if (!test.just_tx) { - pthread_join(thread_rx, NULL); + THREAD_JOIN(thread_rx, NULL); bladerf_close(dev_rx); } if (test.compare) - pthread_join(thread_loopcompare, NULL); + THREAD_JOIN(thread_loopcompare, NULL); status_out = bladerf_enable_module(dev_tx, BLADERF_MODULE_TX, false); if (status_out != 0) { diff --git a/host/libraries/libbladeRF_test/test_timestamps/src/test_txrx_hwloop.h b/host/libraries/libbladeRF_test/test_timestamps/src/test_txrx_hwloop.h index c58039eb..f30de91f 100644 --- a/host/libraries/libbladeRF_test/test_timestamps/src/test_txrx_hwloop.h +++ b/host/libraries/libbladeRF_test/test_timestamps/src/test_txrx_hwloop.h @@ -24,6 +24,7 @@ */ #include #include +#include "thread.h" #include "log.h" struct test_case { @@ -326,6 +327,6 @@ void *rx_task(void *args) { cleanup: free(samples); free(file_name); - pthread_exit(NULL); + THREAD_EXIT(NULL); fclose(file); } From bb93c07af8e68afcb6ad82e4023a567cf579dcd8 Mon Sep 17 00:00:00 2001 From: Robert Ghilduta Date: Sun, 3 Dec 2023 02:45:16 -0800 Subject: [PATCH 183/238] host: libbladeRF's thread.h now compiles and runs. Lowest level functions should now work. Async/sync functions probably still do not work. --- host/common/include/thread.h | 48 +++++++++++++++++++++++------------- 1 file changed, 31 insertions(+), 17 deletions(-) diff --git a/host/common/include/thread.h b/host/common/include/thread.h index 26b700d0..06b4ae57 100644 --- a/host/common/include/thread.h +++ b/host/common/include/thread.h @@ -34,9 +34,17 @@ */ #include "rel_assert.h" +#if (defined(_WIN32) || defined(USE_NATIVE_THREADS)) && \ + !defined(DO_NOT_USE_PTHREADS) +// Do not use pthreads on Windows +#undef USE_PTHREADS +#else +// Use pthreads on non-Windows platforms +#define USE_PTHREADS +#endif -//#define USE_PTHREADS #ifdef USE_PTHREADS +#error "Pthreads are not supported at this time" /* Use pthreads */ @@ -75,6 +83,14 @@ assert(status == 0 && "Mutex destroy failure");\ } while (0) #else /* ENABLE_LOCK_CHECKS */ + +#define MUTEX_INIT(m) pthread_mutex_init(m, NULL) +#define MUTEX_LOCK(m) pthread_mutex_lock(m) +#define MUTEX_UNLOCK(m) pthread_mutex_unlock(m) +#define MUTEX_DESTROY(m) pthread_mutex_destroy(m) + +#endif /* ENABLE_LOCK_CHECKS */ + # define THREAD_CREATE(x,y,z) pthread_create(x, NULL, y, z) # define THREAD_SUCCESS 0 # define THREAD_TIMEOUT ETIMEDOUT @@ -103,13 +119,9 @@ static inline int posix_cond_timedwait(pthread_cond_t *c, #define COND_WAIT(c, m) pthread_cond_wait(c, m) -# define MUTEX_INIT(m) pthread_mutex_init(m, NULL) -# define MUTEX_LOCK(m) pthread_mutex_lock(m) -# define MUTEX_UNLOCK(m) pthread_mutex_unlock(m) -# define MUTEX_DESTROY(m) pthread_mutex_destroy(m) -#endif /* ENABLE_LOCK_CHECKS */ #else /* USE_PTHREADS */ +#include /* Use C11 threads */ //#include @@ -118,7 +130,6 @@ static inline int posix_cond_timedwait(pthread_cond_t *c, #define MUTEX CRITICAL_SECTION // For mutexes #define COND CONDITION_VARIABLE // For condition variables - #ifdef ENABLE_LOCK_CHECKS # define MUTEX_INIT(m) do { \ int status; \ @@ -141,10 +152,19 @@ static inline int posix_cond_timedwait(pthread_cond_t *c, } while (0) #else /* ENABLE_LOCK_CHECKS */ -#include +#define MUTEX_INIT(m) InitializeCriticalSection(m) +#define MUTEX_LOCK(m) EnterCriticalSection(m) +#define MUTEX_UNLOCK(m) LeaveCriticalSection(m) +#define MUTEX_DESTROY(m) DeleteCriticalSection(m) + +#endif /* ENABLE_LOCK_CHECKS */ + + +# define THREAD_CREATE(handle, func, arg) \ + ((*(handle) = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE)(func), \ + (LPVOID)(arg), 0, NULL)) == NULL ? GetLastError() : 0) + -# define THREAD_CREATE(x, y, z) \ - CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE)y, z, 0, x) # define THREAD_SUCCESS 0 # define THREAD_TIMEOUT WAIT_TIMEOUT # define THREAD_CANCEL(m) TerminateThread(m, 0) @@ -155,14 +175,8 @@ static inline int posix_cond_timedwait(pthread_cond_t *c, # define COND_SIGNAL(m) WakeConditionVariable(m) # define COND_TIMED_WAIT(c, m, t) \ (SleepConditionVariableCS(c, m, t) ? 0 : GetLastError()) -# define COND_WAIT(c, m) SleepConditionVariableCS(c, m, INFINITE) +# define COND_WAIT(c, m) (!SleepConditionVariableCS(c, m, INFINITE)) -# define MUTEX_INIT(m) InitializeCriticalSection(m) -# define MUTEX_LOCK(m) EnterCriticalSection(m) -# define MUTEX_UNLOCK(m) LeaveCriticalSection(m) -# define MUTEX_DESTROY(m) DeleteCriticalSection(m) - -#endif /* ENABLE_LOCK_CHECKS */ #endif /* USE_PTHREADS */ From 1062b40d464c09216f5d15f561c7a867d101f8f4 Mon Sep 17 00:00:00 2001 From: Robert Ghilduta Date: Sun, 3 Dec 2023 15:26:01 -0800 Subject: [PATCH 184/238] host: begin removing libpthreadswin32 from cmakes --- host/CMakeLists.txt | 23 ------------------- host/common/thirdparty/ad936x/CMakeLists.txt | 11 +-------- host/libraries/libbladeRF/CMakeLists.txt | 15 ++---------- .../libbladeRF_test/test_ctrl/CMakeLists.txt | 6 +---- .../test_digital_loopback/CMakeLists.txt | 6 +---- .../test_freq_hop/CMakeLists.txt | 3 --- .../test_fw_check/CMakeLists.txt | 6 +---- .../test_repeated_stream/CMakeLists.txt | 5 +--- .../test_repeater/CMakeLists.txt | 4 +--- .../test_rx_discont/CMakeLists.txt | 6 +---- .../test_scheduled_retune/CMakeLists.txt | 6 +---- .../libbladeRF_test/test_sync/CMakeLists.txt | 6 +---- .../test_timestamps/CMakeLists.txt | 6 +---- host/utilities/bladeRF-cli/CMakeLists.txt | 5 ---- 14 files changed, 12 insertions(+), 96 deletions(-) diff --git a/host/CMakeLists.txt b/host/CMakeLists.txt index 1cd1a96d..f76cb32d 100644 --- a/host/CMakeLists.txt +++ b/host/CMakeLists.txt @@ -230,29 +230,6 @@ add_custom_target(uninstall # Windows-only, Post build: Copy libraries to our build output directory ################################################################################ if(WIN32 AND NOT CMAKE_CROSSCOMPILING) - find_package(LibPThreadsWin32) - if(LIBPTHREADSWIN32_FOUND) - set(WIN_RUNTIME_ITEMS ${WIN_RUNTIME_ITEMS} - "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/licenses/pthreads-win32/COPYING.LIB.txt" - "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/pthreadVC2.dll") - - add_custom_command( - OUTPUT "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/licenses/pthreads-win32/COPYING.LIB.txt" - COMMAND ${CMAKE_COMMAND} -E copy_if_different - "${LIBPTHREADSWIN32_LIB_COPYING}" - "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/licenses/pthreads-win32/COPYING.LIB.txt" - COMMENT "Copying pthreads-win32 license to output directory..." - ) - - add_custom_command( - OUTPUT "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/pthreadVC2.dll" - COMMAND ${CMAKE_COMMAND} -E copy_if_different - "${LIBPTHREADSWIN32_DLL}" - "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/" - COMMENT "Copying pthreadVC2.dll to output directory..." - ) - endif(LIBPTHREADSWIN32_FOUND) - if(LIBUSB_FOUND) set(WIN_RUNTIME_ITEMS ${WIN_RUNTIME_ITEMS} "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/licenses/libusb/COPYING" diff --git a/host/common/thirdparty/ad936x/CMakeLists.txt b/host/common/thirdparty/ad936x/CMakeLists.txt index c134f747..158c49bd 100644 --- a/host/common/thirdparty/ad936x/CMakeLists.txt +++ b/host/common/thirdparty/ad936x/CMakeLists.txt @@ -94,16 +94,7 @@ target_include_directories(ad936x PUBLIC if(MSVC) add_definitions(-DHAVE_STRUCT_TIMESPEC) target_include_directories(ad936x PUBLIC ${MSVC_C99_INCLUDES}) - - find_package(LibPThreadsWin32 REQUIRED) - if(LIBPTHREADSWIN32_FOUND) - set(HAVE_THREADS true) - target_include_directories(ad936x PUBLIC ${LIBPTHREADSWIN32_INCLUDE_DIRS}) - set(LIBAD936X_LIBS - ${LIBAD936X_LIBS} ${LIBPTHREADSWIN32_LIBRARIES}) - else() - set(HAVE_THREADS false) - endif() + set(HAVE_THREADS true) else(MSVC) find_package(Threads REQUIRED) if(Threads_FOUND) diff --git a/host/libraries/libbladeRF/CMakeLists.txt b/host/libraries/libbladeRF/CMakeLists.txt index 1a3f8165..4be814e4 100644 --- a/host/libraries/libbladeRF/CMakeLists.txt +++ b/host/libraries/libbladeRF/CMakeLists.txt @@ -199,16 +199,7 @@ set(LIBBLADERF_INCLUDES if(MSVC) set(LIBBLADERF_INCLUDES ${LIBBLADERF_INCLUDES} ${MSVC_C99_INCLUDES}) - find_package(LibPThreadsWin32 REQUIRED) - if(LIBPTHREADSWIN32_FOUND) - set(HAVE_THREADS true) - set(LIBBLADERF_INCLUDES - ${LIBBLADERF_INCLUDES} ${LIBPTHREADSWIN32_INCLUDE_DIRS}) - set(LIBBLADERF_LIBS - ${LIBBLADERF_LIBS} ${LIBPTHREADSWIN32_LIBRARIES}) - else() - set(HAVE_THREADS false) - endif() + set(HAVE_THREADS true) else(MSVC) find_package(Threads REQUIRED) if(Threads_FOUND) @@ -441,9 +432,7 @@ add_library(libbladerf_shared SHARED ${LIBBLADERF_SOURCE}) # Build configuration ################################################################################ -if(MSVC) - set(LIBBLADERF_LIBS ${LIBBLADERF_LIBS} ${LIBPTHREADSWIN32_LIBRARIES}) -else() +if(NOT MSVC) set(LIBBLADERF_LIBS ${LIBBLADERF_LIBS} ${CMAKE_THREAD_LIBS_INIT}) endif(MSVC) diff --git a/host/libraries/libbladeRF_test/test_ctrl/CMakeLists.txt b/host/libraries/libbladeRF_test/test_ctrl/CMakeLists.txt index c52f2150..b5cfe43e 100644 --- a/host/libraries/libbladeRF_test/test_ctrl/CMakeLists.txt +++ b/host/libraries/libbladeRF_test/test_ctrl/CMakeLists.txt @@ -13,11 +13,7 @@ endif() set(LIBS libbladerf_shared) -if(MSVC) - find_package(LibPThreadsWin32 REQUIRED) - set(INCLUDES ${INCLUDES} ${LIBPTHREADSWIN32_INCLUDE_DIRS}) - set(LIBS ${LIBS} ${LIBPTHREADSWIN32_LIBRARIES}) -else(MSVC) +if(NOT MSVC) find_package(Threads REQUIRED) set(LIBS ${LIBS} ${CMAKE_THREAD_LIBS_INIT}) endif(MSVC) diff --git a/host/libraries/libbladeRF_test/test_digital_loopback/CMakeLists.txt b/host/libraries/libbladeRF_test/test_digital_loopback/CMakeLists.txt index c9f783a6..ee2e6ac9 100644 --- a/host/libraries/libbladeRF_test/test_digital_loopback/CMakeLists.txt +++ b/host/libraries/libbladeRF_test/test_digital_loopback/CMakeLists.txt @@ -14,11 +14,7 @@ endif() set(LIBS libbladerf_shared) -if(MSVC) - find_package(LibPThreadsWin32 REQUIRED) - set(INCLUDES ${INCLUDES} ${LIBPTHREADSWIN32_INCLUDE_DIRS}) - set(LIBS ${LIBS} ${LIBPTHREADSWIN32_LIBRARIES}) -else(MSVC) +if(NOT MSVC) find_package(Threads REQUIRED) set(LIBS ${LIBS} ${CMAKE_THREAD_LIBS_INIT}) endif(MSVC) diff --git a/host/libraries/libbladeRF_test/test_freq_hop/CMakeLists.txt b/host/libraries/libbladeRF_test/test_freq_hop/CMakeLists.txt index 92452e93..37e03f5e 100644 --- a/host/libraries/libbladeRF_test/test_freq_hop/CMakeLists.txt +++ b/host/libraries/libbladeRF_test/test_freq_hop/CMakeLists.txt @@ -11,9 +11,6 @@ set(LIBS libbladerf_shared) if(MSVC) set(INCLUDES ${INCLUDES} ${MSVC_C99_INCLUDES}) - find_package(LibPThreadsWin32 REQUIRED) - set(INCLUDES ${INCLUDES} ${LIBPTHREADSWIN32_INCLUDE_DIRS}) - set(LIBS ${LIBS} ${LIBPTHREADSWIN32_LIBRARIES}) endif() set(SRC diff --git a/host/libraries/libbladeRF_test/test_fw_check/CMakeLists.txt b/host/libraries/libbladeRF_test/test_fw_check/CMakeLists.txt index 108aa322..bc0b8e77 100644 --- a/host/libraries/libbladeRF_test/test_fw_check/CMakeLists.txt +++ b/host/libraries/libbladeRF_test/test_fw_check/CMakeLists.txt @@ -19,11 +19,7 @@ else() add_definitions(-DLIBBLADERF_SEARCH_PREFIX="${CMAKE_INSTALL_PREFIX}") endif() -if(MSVC) - find_package(LibPThreadsWin32 REQUIRED) - set(INCLUDES ${INCLUDES} ${LIBPTHREADSWIN32_INCLUDE_DIRS}) - set(LIBS ${LIBS} ${LIBPTHREADSWIN32_LIBRARIES}) -else(MSVC) +if(NOT MSVC) find_package(Threads REQUIRED) set(LIBS ${LIBS} ${CMAKE_THREAD_LIBS_INIT}) endif(MSVC) diff --git a/host/libraries/libbladeRF_test/test_repeated_stream/CMakeLists.txt b/host/libraries/libbladeRF_test/test_repeated_stream/CMakeLists.txt index 53450df7..6d818034 100644 --- a/host/libraries/libbladeRF_test/test_repeated_stream/CMakeLists.txt +++ b/host/libraries/libbladeRF_test/test_repeated_stream/CMakeLists.txt @@ -15,10 +15,7 @@ set(SRC set(LIBS libbladerf_shared) if(MSVC) - find_package(LibPThreadsWin32 REQUIRED) - set(INCLUDES ${INCLUDES} ${LIBPTHREADSWIN32_INCLUDE_DIRS} ${MSVC_C99_INCLUDES}) - set(LIBS ${LIBS} ${LIBPTHREADSWIN32_LIBRARIES}) - set(SRC ${SRC} ${BLADERF_HOST_COMMON_SOURCE_DIR}/windows/getopt_long.c) + set(INCLUDES ${INCLUDES} ${MSVC_C99_INCLUDES}) else(MSVC) find_package(Threads REQUIRED) set(LIBS ${LIBS} ${CMAKE_THREAD_LIBS_INIT}) diff --git a/host/libraries/libbladeRF_test/test_repeater/CMakeLists.txt b/host/libraries/libbladeRF_test/test_repeater/CMakeLists.txt index 06a115c6..59863c5d 100644 --- a/host/libraries/libbladeRF_test/test_repeater/CMakeLists.txt +++ b/host/libraries/libbladeRF_test/test_repeater/CMakeLists.txt @@ -1,9 +1,7 @@ cmake_minimum_required(VERSION 3.10...3.27) project(libbladeRF_test_repeater C) -if(MSVC) - find_package(LibPThreadsWin32 REQUIRED) -else(MSVC) +if(NOT MSVC) find_package(Threads REQUIRED) endif(MSVC) diff --git a/host/libraries/libbladeRF_test/test_rx_discont/CMakeLists.txt b/host/libraries/libbladeRF_test/test_rx_discont/CMakeLists.txt index bd812bd9..9107f250 100644 --- a/host/libraries/libbladeRF_test/test_rx_discont/CMakeLists.txt +++ b/host/libraries/libbladeRF_test/test_rx_discont/CMakeLists.txt @@ -12,11 +12,7 @@ endif() set(LIBS libbladerf_shared) -if(MSVC) - find_package(LibPThreadsWin32 REQUIRED) - set(INCLUDES ${INCLUDES} ${LIBPTHREADSWIN32_INCLUDE_DIRS}) - set(LIBS ${LIBS} ${LIBPTHREADSWIN32_LIBRARIES}) -else(MSVC) +if(NOT MSVC) find_package(Threads REQUIRED) set(LIBS ${LIBS} ${CMAKE_THREAD_LIBS_INIT}) endif(MSVC) diff --git a/host/libraries/libbladeRF_test/test_scheduled_retune/CMakeLists.txt b/host/libraries/libbladeRF_test/test_scheduled_retune/CMakeLists.txt index b1c6cf95..980c9b74 100644 --- a/host/libraries/libbladeRF_test/test_scheduled_retune/CMakeLists.txt +++ b/host/libraries/libbladeRF_test/test_scheduled_retune/CMakeLists.txt @@ -14,11 +14,7 @@ endif() set(LIBS libbladerf_shared) -if(MSVC) - find_package(LibPThreadsWin32 REQUIRED) - set(INCLUDES ${INCLUDES} ${LIBPTHREADSWIN32_INCLUDE_DIRS}) - set(LIBS ${LIBS} ${LIBPTHREADSWIN32_LIBRARIES}) -else(MSVC) +if(NOT MSVC) find_package(Threads REQUIRED) set(LIBS ${LIBS} ${CMAKE_THREAD_LIBS_INIT}) endif(MSVC) diff --git a/host/libraries/libbladeRF_test/test_sync/CMakeLists.txt b/host/libraries/libbladeRF_test/test_sync/CMakeLists.txt index 625eeb32..e8e76513 100644 --- a/host/libraries/libbladeRF_test/test_sync/CMakeLists.txt +++ b/host/libraries/libbladeRF_test/test_sync/CMakeLists.txt @@ -12,11 +12,7 @@ endif() set(TEST_SYNC_LIBS libbladerf_shared) -if(MSVC) - find_package(LibPThreadsWin32 REQUIRED) - set(TEST_SYNC_INCLUDES ${TEST_SYNC_INCLUDES} ${LIBPTHREADSWIN32_INCLUDE_DIRS}) - set(TEST_SYNC_LIBS ${TEST_SYNC_LIBS} ${LIBPTHREADSWIN32_LIBRARIES}) -else(MSVC) +if(NOT MSVC) find_package(Threads REQUIRED) set(TEST_SYNC_LIBS ${TEST_SYNC_LIBS} ${CMAKE_THREAD_LIBS_INIT}) endif(MSVC) diff --git a/host/libraries/libbladeRF_test/test_timestamps/CMakeLists.txt b/host/libraries/libbladeRF_test/test_timestamps/CMakeLists.txt index 4dbc4580..a8816a3a 100644 --- a/host/libraries/libbladeRF_test/test_timestamps/CMakeLists.txt +++ b/host/libraries/libbladeRF_test/test_timestamps/CMakeLists.txt @@ -14,11 +14,7 @@ endif() set(LIBS libbladerf_shared) -if(MSVC) - find_package(LibPThreadsWin32 REQUIRED) - set(INCLUDES ${INCLUDES} ${LIBPTHREADSWIN32_INCLUDE_DIRS}) - set(LIBS ${LIBS} ${LIBPTHREADSWIN32_LIBRARIES}) -else() +if(NOT MSVC) find_package(Threads REQUIRED) set(LIBS ${LIBS} ${CMAKE_THREAD_LIBS_INIT}) endif(MSVC) diff --git a/host/utilities/bladeRF-cli/CMakeLists.txt b/host/utilities/bladeRF-cli/CMakeLists.txt index 185038a8..f8d15399 100644 --- a/host/utilities/bladeRF-cli/CMakeLists.txt +++ b/host/utilities/bladeRF-cli/CMakeLists.txt @@ -169,7 +169,6 @@ endif() if(MSVC) set(CLI_INCLUDE_DIRS ${CLI_INCLUDE_DIRS} ${BLADERF_HOST_COMMON_INCLUDE_DIRS}/windows - ${LIBPTHREADSWIN32_INCLUDE_DIRS} ) endif() @@ -280,10 +279,6 @@ elseif(ENABLE_LIBEDIT) set(CLI_LINK_LIBRARIES ${CLI_LINK_LIBRARIES} ${LIBEDIT_LIBRARIES}) endif(ENABLE_LIBTECLA) -if(LIBPTHREADSWIN32_FOUND) - set(CLI_LINK_LIBRARIES ${CLI_LINK_LIBRARIES} ${LIBPTHREADSWIN32_LIBRARIES}) -endif() - if(LIBC_VERSION) # clock_gettime() was moved from librt -> libc in 2.17 if(${LIBC_VERSION} VERSION_LESS "2.17") From 5863f983a2039e56c71c87fa07cf0c43bfe649a8 Mon Sep 17 00:00:00 2001 From: Robert Ghilduta Date: Sun, 3 Dec 2023 17:24:33 -0800 Subject: [PATCH 185/238] host: remove remaining libpthreadswin32 and add fixups to cmake --- host/libraries/libbladeRF/CMakeLists.txt | 7 +------ .../libbladeRF_test/test_config_file/CMakeLists.txt | 6 ------ .../libraries/libbladeRF_test/test_ctrl/CMakeLists.txt | 2 +- .../test_digital_loopback/CMakeLists.txt | 2 +- .../libbladeRF_test/test_fw_check/CMakeLists.txt | 2 +- .../test_repeated_stream/CMakeLists.txt | 1 + .../libbladeRF_test/test_repeater/CMakeLists.txt | 10 ++-------- .../libbladeRF_test/test_rx_discont/CMakeLists.txt | 2 +- .../test_scheduled_retune/CMakeLists.txt | 2 +- .../libraries/libbladeRF_test/test_sync/CMakeLists.txt | 2 +- .../libbladeRF_test/test_timestamps/CMakeLists.txt | 2 +- host/utilities/bladeRF-cli/CMakeLists.txt | 8 +++----- 12 files changed, 14 insertions(+), 32 deletions(-) diff --git a/host/libraries/libbladeRF/CMakeLists.txt b/host/libraries/libbladeRF/CMakeLists.txt index 4be814e4..009ab65f 100644 --- a/host/libraries/libbladeRF/CMakeLists.txt +++ b/host/libraries/libbladeRF/CMakeLists.txt @@ -274,11 +274,6 @@ if(ENABLE_BACKEND_CYAPI) set(LIBBLADERF_INCLUDES ${LIBBLADERF_INCLUDES} ${CYAPI_INCLUDE_DIRS}) endif(ENABLE_BACKEND_CYAPI) -if(MSVC) - set(LIBBLADERF_INCLUDES ${LIBBLADERF_INCLUDES} - ${LIBPTHREADSWIN32_INCLUDE_DIRS}) -endif() - if(ENABLE_LIBBLADERF_SYNC_LOG_VERBOSE AND ENABLE_LIBBLADERF_LOGGING) add_definitions(-DENABLE_LIBBLADERF_SYNC_LOG_VERBOSE) endif() @@ -434,7 +429,7 @@ add_library(libbladerf_shared SHARED ${LIBBLADERF_SOURCE}) if(NOT MSVC) set(LIBBLADERF_LIBS ${LIBBLADERF_LIBS} ${CMAKE_THREAD_LIBS_INIT}) -endif(MSVC) +endif(NOT MSVC) if(ENABLE_BACKEND_LIBUSB) set(LIBBLADERF_LIBS ${LIBBLADERF_LIBS} ${LIBUSB_LIBRARIES}) diff --git a/host/libraries/libbladeRF_test/test_config_file/CMakeLists.txt b/host/libraries/libbladeRF_test/test_config_file/CMakeLists.txt index 79398e76..c04ee551 100644 --- a/host/libraries/libbladeRF_test/test_config_file/CMakeLists.txt +++ b/host/libraries/libbladeRF_test/test_config_file/CMakeLists.txt @@ -34,21 +34,15 @@ set(SRC set(TEST_CONFIG_FILE_LIBS libbladerf_shared) if(MSVC) - find_package(LibPThreadsWin32 REQUIRED) set(TEST_CONFIG_FILE_INCLUDES ${TEST_CONFIG_FILE_INCLUDES} ${MSVC_C99_INCLUDES} - ${LIBPTHREADSWIN32_INCLUDE_DIRS} ) set(SRC ${SRC} ${BLADERF_HOST_COMMON_SOURCE_DIR}/windows/clock_gettime.c ${BLADERF_HOST_COMMON_SOURCE_DIR}/windows/mkdtemp.c ) - set(TEST_CONFIG_FILE_LIBS - ${TEST_CONFIG_FILE_LIBS} - ${LIBPTHREADSWIN32_LIBRARIES} - ) endif() add_definitions(-DLIBBLADERF_SEARCH_PREFIX="${CMAKE_INSTALL_PREFIX}") diff --git a/host/libraries/libbladeRF_test/test_ctrl/CMakeLists.txt b/host/libraries/libbladeRF_test/test_ctrl/CMakeLists.txt index b5cfe43e..08c15b5c 100644 --- a/host/libraries/libbladeRF_test/test_ctrl/CMakeLists.txt +++ b/host/libraries/libbladeRF_test/test_ctrl/CMakeLists.txt @@ -16,7 +16,7 @@ set(LIBS libbladerf_shared) if(NOT MSVC) find_package(Threads REQUIRED) set(LIBS ${LIBS} ${CMAKE_THREAD_LIBS_INIT}) -endif(MSVC) +endif(NOT MSVC) set(SRC src/main.c diff --git a/host/libraries/libbladeRF_test/test_digital_loopback/CMakeLists.txt b/host/libraries/libbladeRF_test/test_digital_loopback/CMakeLists.txt index ee2e6ac9..61e898b0 100644 --- a/host/libraries/libbladeRF_test/test_digital_loopback/CMakeLists.txt +++ b/host/libraries/libbladeRF_test/test_digital_loopback/CMakeLists.txt @@ -17,7 +17,7 @@ set(LIBS libbladerf_shared) if(NOT MSVC) find_package(Threads REQUIRED) set(LIBS ${LIBS} ${CMAKE_THREAD_LIBS_INIT}) -endif(MSVC) +endif(NOT MSVC) add_definitions(-DLOGGING_ENABLED=1) diff --git a/host/libraries/libbladeRF_test/test_fw_check/CMakeLists.txt b/host/libraries/libbladeRF_test/test_fw_check/CMakeLists.txt index bc0b8e77..a2dbc9b5 100644 --- a/host/libraries/libbladeRF_test/test_fw_check/CMakeLists.txt +++ b/host/libraries/libbladeRF_test/test_fw_check/CMakeLists.txt @@ -22,7 +22,7 @@ endif() if(NOT MSVC) find_package(Threads REQUIRED) set(LIBS ${LIBS} ${CMAKE_THREAD_LIBS_INIT}) -endif(MSVC) +endif(NOT MSVC) set(SRC src/main.c diff --git a/host/libraries/libbladeRF_test/test_repeated_stream/CMakeLists.txt b/host/libraries/libbladeRF_test/test_repeated_stream/CMakeLists.txt index 6d818034..b98c811b 100644 --- a/host/libraries/libbladeRF_test/test_repeated_stream/CMakeLists.txt +++ b/host/libraries/libbladeRF_test/test_repeated_stream/CMakeLists.txt @@ -16,6 +16,7 @@ set(LIBS libbladerf_shared) if(MSVC) set(INCLUDES ${INCLUDES} ${MSVC_C99_INCLUDES}) + set(SRC ${SRC} ${BLADERF_HOST_COMMON_SOURCE_DIR}/windows/getopt_long.c) else(MSVC) find_package(Threads REQUIRED) set(LIBS ${LIBS} ${CMAKE_THREAD_LIBS_INIT}) diff --git a/host/libraries/libbladeRF_test/test_repeater/CMakeLists.txt b/host/libraries/libbladeRF_test/test_repeater/CMakeLists.txt index 59863c5d..76a2299f 100644 --- a/host/libraries/libbladeRF_test/test_repeater/CMakeLists.txt +++ b/host/libraries/libbladeRF_test/test_repeater/CMakeLists.txt @@ -3,7 +3,7 @@ project(libbladeRF_test_repeater C) if(NOT MSVC) find_package(Threads REQUIRED) -endif(MSVC) +endif(NOT MSVC) set(TEST_REPEATER_SRC src/main.c @@ -26,7 +26,6 @@ set(TEST_REPEATER_INCLUDE if(MSVC) set(TEST_REPEATER_INCLUDE ${TEST_REPEATER_INCLUDE} ${BLADERF_HOST_COMMON_INCLUDE_DIRS}/windows - ${LIBPTHREADSWIN32_INCLUDE_DIRS} ${MSVC_C99_INCLUDES} ) endif() @@ -39,10 +38,5 @@ set(TEST_REPEATER_LIBS libbladerf_shared ${CMAKE_THREAD_LIBS_INIT}) - -if(LIBPTHREADSWIN32_FOUND) - set(TEST_REPEATER_LIBS ${TEST_REPEATER_LIBS} ${LIBPTHREADSWIN32_LIBRARIES}) -endif() - target_link_libraries(libbladeRF_test_repeater - ${TEST_REPEATER_LIBS}) + ${TEST_REPEATER_LIBS}) \ No newline at end of file diff --git a/host/libraries/libbladeRF_test/test_rx_discont/CMakeLists.txt b/host/libraries/libbladeRF_test/test_rx_discont/CMakeLists.txt index 9107f250..d7ab507e 100644 --- a/host/libraries/libbladeRF_test/test_rx_discont/CMakeLists.txt +++ b/host/libraries/libbladeRF_test/test_rx_discont/CMakeLists.txt @@ -15,7 +15,7 @@ set(LIBS libbladerf_shared) if(NOT MSVC) find_package(Threads REQUIRED) set(LIBS ${LIBS} ${CMAKE_THREAD_LIBS_INIT}) -endif(MSVC) +endif(NOT MSVC) set(SRC src/main.c diff --git a/host/libraries/libbladeRF_test/test_scheduled_retune/CMakeLists.txt b/host/libraries/libbladeRF_test/test_scheduled_retune/CMakeLists.txt index 980c9b74..0d542fe7 100644 --- a/host/libraries/libbladeRF_test/test_scheduled_retune/CMakeLists.txt +++ b/host/libraries/libbladeRF_test/test_scheduled_retune/CMakeLists.txt @@ -17,7 +17,7 @@ set(LIBS libbladerf_shared) if(NOT MSVC) find_package(Threads REQUIRED) set(LIBS ${LIBS} ${CMAKE_THREAD_LIBS_INIT}) -endif(MSVC) +endif(NOT MSVC) set(SRC src/main.c diff --git a/host/libraries/libbladeRF_test/test_sync/CMakeLists.txt b/host/libraries/libbladeRF_test/test_sync/CMakeLists.txt index e8e76513..0921e4d1 100644 --- a/host/libraries/libbladeRF_test/test_sync/CMakeLists.txt +++ b/host/libraries/libbladeRF_test/test_sync/CMakeLists.txt @@ -15,7 +15,7 @@ set(TEST_SYNC_LIBS libbladerf_shared) if(NOT MSVC) find_package(Threads REQUIRED) set(TEST_SYNC_LIBS ${TEST_SYNC_LIBS} ${CMAKE_THREAD_LIBS_INIT}) -endif(MSVC) +endif(NOT MSVC) add_definitions(-DLOGGING_ENABLED=1) diff --git a/host/libraries/libbladeRF_test/test_timestamps/CMakeLists.txt b/host/libraries/libbladeRF_test/test_timestamps/CMakeLists.txt index a8816a3a..34b40751 100644 --- a/host/libraries/libbladeRF_test/test_timestamps/CMakeLists.txt +++ b/host/libraries/libbladeRF_test/test_timestamps/CMakeLists.txt @@ -17,7 +17,7 @@ set(LIBS libbladerf_shared) if(NOT MSVC) find_package(Threads REQUIRED) set(LIBS ${LIBS} ${CMAKE_THREAD_LIBS_INIT}) -endif(MSVC) +endif(NOT MSVC) set(SRC diff --git a/host/utilities/bladeRF-cli/CMakeLists.txt b/host/utilities/bladeRF-cli/CMakeLists.txt index f8d15399..378d2faa 100644 --- a/host/utilities/bladeRF-cli/CMakeLists.txt +++ b/host/utilities/bladeRF-cli/CMakeLists.txt @@ -28,11 +28,9 @@ configure_file( find_package(LibTecla) find_package(LibEdit) -if(MSVC) - find_package(LibPThreadsWin32 REQUIRED) -else(MSVC) +if(NOT MSVC) find_package(Threads REQUIRED) -endif(MSVC) +endif(NOT MSVC) find_program(PANDOC_EXECUTABLE pandoc) find_program(BASH_EXECUTABLE bash) @@ -265,7 +263,7 @@ set(CLI_LINK_LIBRARIES if(NOT MSVC) set(CLI_LINK_LIBRARIES ${CLI_LINK_LIBRARIES} m) -endif() +endif(NOT MSVC) if(ENABLE_LIBTECLA) set(CLI_LINK_LIBRARIES ${CLI_LINK_LIBRARIES} ${LIBTECLA_LIBRARIES}) From 7985676d0de93b3bcae70e820108d7012e2f4e1d Mon Sep 17 00:00:00 2001 From: Robert Ghilduta Date: Sun, 3 Dec 2023 15:26:50 -0800 Subject: [PATCH 186/238] host: switch over from using pthread.h to libbladeRF's thread.h --- host/common/include/thread.h | 2 +- host/common/include/windows/clock_gettime.h | 2 +- host/common/include/windows/gettimeofday.h | 2 +- host/common/include/windows/nanosleep.h | 2 +- host/utilities/bladeRF-fsk/c/src/bladeRF-fsk.c | 2 +- host/utilities/bladeRF-fsk/c/src/link.h | 2 +- host/utilities/bladeRF-fsk/c/src/phy.h | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/host/common/include/thread.h b/host/common/include/thread.h index 06b4ae57..a8c96f32 100644 --- a/host/common/include/thread.h +++ b/host/common/include/thread.h @@ -48,7 +48,7 @@ /* Use pthreads */ -#include +#include "thread.h" #include #define CLOCK_REALTIME 0 diff --git a/host/common/include/windows/clock_gettime.h b/host/common/include/windows/clock_gettime.h index 05652ae1..f720a4db 100644 --- a/host/common/include/windows/clock_gettime.h +++ b/host/common/include/windows/clock_gettime.h @@ -25,7 +25,7 @@ #ifndef WIN_CLOCK_GETTIME_H_ #define WIN_CLOCK_GETTIME_H_ -#include +#include "thread.h" #ifdef __cplusplus extern "C" { diff --git a/host/common/include/windows/gettimeofday.h b/host/common/include/windows/gettimeofday.h index a1a4bddf..acfa22d1 100644 --- a/host/common/include/windows/gettimeofday.h +++ b/host/common/include/windows/gettimeofday.h @@ -25,7 +25,7 @@ #ifndef WIN_GETTIMEOFDAY_H_ #define WIN_GETTIMEOFDAY_H_ -#include +#include "thread.h" #ifdef __cplusplus extern "C" { diff --git a/host/common/include/windows/nanosleep.h b/host/common/include/windows/nanosleep.h index 99af6feb..011eff5c 100644 --- a/host/common/include/windows/nanosleep.h +++ b/host/common/include/windows/nanosleep.h @@ -25,7 +25,7 @@ #ifndef WIN_NANOSLEEP_H_ #define WIN_NANOSLEEP_H_ -#include +#include "thread.h" #ifdef __cplusplus extern "C" { diff --git a/host/utilities/bladeRF-fsk/c/src/bladeRF-fsk.c b/host/utilities/bladeRF-fsk/c/src/bladeRF-fsk.c index 6ab457f5..ab884ec6 100644 --- a/host/utilities/bladeRF-fsk/c/src/bladeRF-fsk.c +++ b/host/utilities/bladeRF-fsk/c/src/bladeRF-fsk.c @@ -25,7 +25,7 @@ #include #include #include -#include +#include "thread.h" #include #include #include "host_config.h" diff --git a/host/utilities/bladeRF-fsk/c/src/link.h b/host/utilities/bladeRF-fsk/c/src/link.h index ddb651f5..a4948ea7 100644 --- a/host/utilities/bladeRF-fsk/c/src/link.h +++ b/host/utilities/bladeRF-fsk/c/src/link.h @@ -33,7 +33,7 @@ #include #include -#include +#include "thread.h" #include #include #include diff --git a/host/utilities/bladeRF-fsk/c/src/phy.h b/host/utilities/bladeRF-fsk/c/src/phy.h index d85ea89d..b59cd40d 100644 --- a/host/utilities/bladeRF-fsk/c/src/phy.h +++ b/host/utilities/bladeRF-fsk/c/src/phy.h @@ -41,7 +41,7 @@ #include #include #include -#include +#include "thread.h" #include #include From 34fce67f4fd472eb480074ce758813568eb96586 Mon Sep 17 00:00:00 2001 From: Robert Ghilduta Date: Sun, 3 Dec 2023 16:56:32 -0800 Subject: [PATCH 187/238] host: remove pthreadswin32 cmake --- host/cmake/modules/FindLibPThreadsWin32.cmake | 113 ------------------ 1 file changed, 113 deletions(-) delete mode 100644 host/cmake/modules/FindLibPThreadsWin32.cmake diff --git a/host/cmake/modules/FindLibPThreadsWin32.cmake b/host/cmake/modules/FindLibPThreadsWin32.cmake deleted file mode 100644 index 6cdfacae..00000000 --- a/host/cmake/modules/FindLibPThreadsWin32.cmake +++ /dev/null @@ -1,113 +0,0 @@ -# This is file is based off of the FindLibUSB.cmake file written by Hendrik Sattler, -# from the OpenOBEX project (licensed GPLv2/LGPL). (If this is not correct, -# please contact us so we can attribute the author appropriately.) -# -# https://github.com/zuckschwerdt/openobex/blob/master/CMakeModules/FindLibUSB.cmake -# http://dev.zuckschwerdt.org/openobex/ -# -# Find pthreads-win32 -# -# This requires the LIBPTHREADSWIN32_PATH variable to be set to the path to the -# a pthreads-win32 release, such as the Pre-built.2 directory from the 2.9.1 release: -# ftp://sourceware.org/pub/pthreads-win32/pthreads-w32-2-9-1-release.zip -# -# The following standard variables get defined: -# LIBPTHREADSWIN32_FOUND: true if LibUSB was found -# LIBPTHREADSWIN32_HEADER_FILE: the location of the C header file -# LIBPTHREADSWIN32_INCLUDE_DIRS: the directories that contain headers -# LIBPTHREADSWIN32_LIBRARIES: the library files -# LIBPTHREADSWIN32_LIB_COPYING: the license associated with the library -# LIBPTHREADSWIN32_DLL: the pthreadVC2.dll file - -if(DEFINED __INCLUDED_BLADERF_FINDLIBPTHREADSWIN32_CMAKE) - return() -endif() -set(__INCLUDED_BLADERF_FINDLIBPTHREADSWIN32_CMAKE TRUE) - -include ( CheckLibraryExists ) -include ( CheckIncludeFile ) - -set(LIBPTHREADSWIN32_PATH - "C:/Program Files (x86)/pthreads-win32" - CACHE - PATH - "Path to win-pthreads files. (This is generally only needed for Windows users who downloaded binary distributions.)" - ) - -find_file ( LIBPTHREADSWIN32_HEADER_FILE - NAMES - pthread.h - PATHS - ${LIBPTHREADSWIN32_PATH} - PATH_SUFFIXES - include include -) -mark_as_advanced ( LIBPTHREADSWIN32_HEADER_FILE ) -get_filename_component ( LIBPTHREADSWIN32_INCLUDE_DIRS "${LIBPTHREADSWIN32_HEADER_FILE}" PATH ) - -if ( WIN32 ) - if ( MSVC ) - if ( CMAKE_CL_64 ) - set ( LIBPTHREADSWIN32_LIBRARY_PATH_SUFFIX x64 ) - else ( CMAKE_CL_64 ) - set ( LIBPTHREADSWIN32_LIBRARY_PATH_SUFFIX x86 ) - endif ( CMAKE_CL_64 ) - elseif ( CMAKE_COMPILER_IS_GNUCC ) - if ( CMAKE_SIZEOF_VOID_P EQUAL 8 ) - set ( LIBPTHREADSWIN32_LIBRARY_PATH_SUFFIX x64 ) - else ( CMAKE_SIZEOF_VOID_P EQUAL 8 ) - set ( LIBPTHREADSWIN32_LIBRARY_PATH_SUFFIX x86 ) - endif ( CMAKE_SIZEOF_VOID_P EQUAL 8 ) - endif ( MSVC ) - - find_library ( PTHREAD_LIBRARY - NAMES - pthreadVC2 - PATHS - ${LIBPTHREADSWIN32_PATH} - PATH_SUFFIXES - lib/${LIBPTHREADSWIN32_LIBRARY_PATH_SUFFIX} - ) - - mark_as_advanced ( PTHREAD_LIBRARY ) - if ( PTHREAD_LIBRARY ) - set ( LIBPTHREADSWIN32_LIBRARIES ${PTHREAD_LIBRARY} ) - endif ( PTHREAD_LIBRARY ) - - find_file ( PTHREAD_DLL - NAMES - pthreadVC2.dll - PATHS - ${LIBPTHREADSWIN32_PATH} - PATH_SUFFIXES - dll/${LIBPTHREADSWIN32_LIBRARY_PATH_SUFFIX} - . - ) - - mark_as_advanced ( PTHREAD_DLL ) - if ( PTHREAD_DLL ) - set ( LIBPTHREADSWIN32_DLL ${PTHREAD_DLL} ) - endif ( PTHREAD_DLL ) - -else ( WIN32 ) - message(FATAL_ERROR "This file only supports Windows") -endif ( WIN32 ) - -set ( LIBPTHREADSWIN32_LIB_COPYING - "${LIBPTHREADSWIN32_PATH}/COPYING.LIB" ) -if ( NOT EXISTS ${LIBPTHREADSWIN32_LIB_COPYING} ) - message(FATAL_ERROR "Unable to find pthread-win32 COPYING.LIB file") -endif () - -if ( LIBPTHREADSWIN32_INCLUDE_DIRS AND LIBPTHREADSWIN32_LIBRARIES AND LIBPTHREADSWIN32_DLL ) - set ( LIBPTHREADSWIN32_FOUND true ) -endif ( LIBPTHREADSWIN32_INCLUDE_DIRS AND LIBPTHREADSWIN32_LIBRARIES AND LIBPTHREADSWIN32_DLL ) - -if ( LIBPTHREADSWIN32_FOUND ) - set ( CMAKE_REQUIRED_INCLUDES "${LIBPTHREADSWIN32_INCLUDE_DIRS}" ) - check_include_file ( "{LIBPTHREADSWIN32_HEADER_FILE}" LIBPTHREADSWIN32_FOUND ) -endif ( LIBPTHREADSWIN32_FOUND ) - -if ( NOT LIBPTHREADSWIN32_FOUND ) - message ( FATAL_ERROR "pthreads-win32 not found. If you're using a binary distribution, try setting -DLIBPTHREADSWIN32_PATH=." ) -endif ( NOT LIBPTHREADSWIN32_FOUND ) From 11506a47625351dccbe01047f5517e91d01e8241 Mon Sep 17 00:00:00 2001 From: Robert Ghilduta Date: Sun, 3 Dec 2023 17:24:56 -0800 Subject: [PATCH 188/238] host: fixup windows related files --- host/common/include/thread.h | 1 + host/common/include/windows/ptw32_timespec.h | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/host/common/include/thread.h b/host/common/include/thread.h index a8c96f32..9203c5ad 100644 --- a/host/common/include/thread.h +++ b/host/common/include/thread.h @@ -122,6 +122,7 @@ static inline int posix_cond_timedwait(pthread_cond_t *c, #else /* USE_PTHREADS */ #include +#include /* Use C11 threads */ //#include diff --git a/host/common/include/windows/ptw32_timespec.h b/host/common/include/windows/ptw32_timespec.h index 20aa8a68..41412031 100644 --- a/host/common/include/windows/ptw32_timespec.h +++ b/host/common/include/windows/ptw32_timespec.h @@ -48,9 +48,10 @@ #endif #include +#include #include #include "host_config.h" -#include "pthread.h" +#include "thread.h" #ifdef __cplusplus extern "C" { From 401d7df2c0b3db609f833850ad0c8a8f7f91da88 Mon Sep 17 00:00:00 2001 From: Robert Ghilduta Date: Sun, 3 Dec 2023 17:25:16 -0800 Subject: [PATCH 189/238] host: clean up README, and misc files to indicate remove libpthreadswin32 --- debian/copyright | 11 ----------- host/README.md | 20 -------------------- 2 files changed, 31 deletions(-) diff --git a/debian/copyright b/debian/copyright index 391dc196..3e546eb2 100644 --- a/debian/copyright +++ b/debian/copyright @@ -60,17 +60,6 @@ License: OpenCores-I2C OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -Files: host/cmake/modules/FindLibPThreadsWin32.cmake -Copyright: 2008-2009 Hendrik Sattler - 2013-2018 Nuand LLC -License: GPL-2+ -Comment: This is file is based off of the FindLibUSB.cmake file written by - Hendrik Sattler, from the OpenOBEX project (licensed GPLv2/LGPL). (If - this is not correct, please contact us so we can attribute the author - appropriately.) - https://github.com/zuckschwerdt/openobex/blob/master/CMakeModules/FindLibUSB.cmake - http://dev.zuckschwerdt.org/openobex/ - Files: host/cmake/modules/FindLibUSB.cmake Copyright: 2008-2009 Hendrik Sattler 2013-2018 Nuand LLC diff --git a/host/README.md b/host/README.md index 120cb579..e03a3c45 100644 --- a/host/README.md +++ b/host/README.md @@ -23,9 +23,6 @@ Windows users that wish to use a Cypress driver/library based libbladeRF backend ### CMake ### [CMake][CMake.org] is used to build the items in this directory. \>= v2.8.5 is required, but the latest available version is recommended. -### pthreads-win32 - Windows-only ### -Windows users will need to get [pthreads-win32], and may (with newer Windows versions) need to build it from scratch. - ## Build ## ### Linux and OSX ### @@ -63,7 +60,6 @@ This process was most recently validated on Windows 10 Enterprise with CMake 3.9 - If you run into any failures, check these items, then re-run Configure: - LIBUSB_PATH (and ENABLE_BACKEND_LIBUSB) - for using libusb - FX3_SDK_PATH (and ENABLE_BACKEND_CYAPI) - for using the Cypress driver - - LIBPTHREADSWIN32_PATH - Adjust options as desired and re-run the "Configure" command as needed. Values in red are new, and should be reviewed before running "Configure" again to get the red out. - Click the CMake GUI's "Generate" button. - In the ```build``` directory, a Visual Studio solution will now exist. You can click "Open Project" to get there. @@ -71,21 +67,6 @@ This process was most recently validated on Windows 10 Enterprise with CMake 3.9 - Upon building the solution, build artifacts will be present in: ```build\output\``` - `````` may refer to Debug or Release, for example -#### pthreads-win32 #### -If you are using a newer version of Windows / Visual Studio and are getting ```error C0211: 'timespec': 'struct' type redefinition``` when trying to build bladeRF, you will need to rebuild pthreads-win32. The below process seems to work with pthreads-w32 2.9.1. - -- Get full source tree from [pthreads-win32] website, and unpack someplace convenient -- In Visual Studio, open `pthreads-w32-2-9-1-release\pthreads.2\pthread.dsw` (one-way upgrade is OK) -- Right-click the solution, select "Retarget solution", hit OK. -- Change "Solution Configurations" dropdown to "Release" ("Debug" doesn't work, but that's OK) -- Edit pthread.h to add `#define HAVE_STRUCT_TIMESPEC` and `#define PTW32_ARCHx64` near the top, just below the include guard -- Build the solution - -- Back over in the bladeRF CMake: - - File -> Delete Cache - - Redo the "Configure" dance as before - - Point `LIBPTHREADSWIN32_PATH` to the `pthreads-w32-2-9-1-release\pthreads.2` directory you were just working in - ## CMake Options and Flags ## Below is a list of useful and project-specific CMake options. Please see the [CMake documentation] for @@ -120,4 +101,3 @@ more information. [CMake documentation]: http://www.cmake.org/cmake/help/documentation.html (Cmake documentation) [Cypress FX3 SDK]: http://www.cypress.com/?rID=57990 (Cypress FX3 SDK) [redhat144967]: https://bugzilla.redhat.com/show_bug.cgi?id=144967 (Red Hat Bugzilla - Bug 144967) -[pthreads-win32]: https://sourceware.org/pthreads-win32/ (POSIX Threads for Win32) From a83f21d52533476da68e43fc400e3d80990a0cdf Mon Sep 17 00:00:00 2001 From: Robert Ghilduta Date: Sun, 3 Dec 2023 17:25:29 -0800 Subject: [PATCH 190/238] host: clean up windows build script, remove pthreads --- host/misc/windows/scripts/bladeRF-env.sample.txt | 3 --- host/misc/windows/scripts/build-bladeRF.bat | 7 ++----- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/host/misc/windows/scripts/bladeRF-env.sample.txt b/host/misc/windows/scripts/bladeRF-env.sample.txt index b78169fc..b4c64886 100644 --- a/host/misc/windows/scripts/bladeRF-env.sample.txt +++ b/host/misc/windows/scripts/bladeRF-env.sample.txt @@ -20,9 +20,6 @@ rem set GIT_REV=HEAD rem Path to libusb binaries and headers rem set LIBUSB="C:\Program Files (x86)\libusb-1.0.19" -rem Path to Win32 Pthreads -rem set PTHREADS="C:\Program Files (x86)\pthreads-win32" - rem Build type (Release vs Debug) rem set BUILD_TYPE=Release diff --git a/host/misc/windows/scripts/build-bladeRF.bat b/host/misc/windows/scripts/build-bladeRF.bat index 31a6769f..1e6ec9ce 100644 --- a/host/misc/windows/scripts/build-bladeRF.bat +++ b/host/misc/windows/scripts/build-bladeRF.bat @@ -36,9 +36,6 @@ set GIT_REV=HEAD rem Path to libusb binaries and headers set LIBUSB="C:\Program Files (x86)\libusb-1.0.19" -rem Path to Win32 Pthreads -set PTHREADS="C:\Program Files (x86)\pthreads-win32" - rem Build type (Release vs Debug) set BUILD_TYPE=Release @@ -117,7 +114,7 @@ mkdir %BUILDDIR64% pushd %BUILDDIR64% echo ====================== Configuring 64-bit build ====================== cmake -G %CMAKE_GENERATOR_64% -DCMAKE_BUILD_TYPE=%BUILD_TYPE% ^ - -DLIBUSB_PATH=%LIBUSB% -DLIBPTHREADSWIN32_PATH=%PTHREADS% ^ + -DLIBUSB_PATH=%LIBUSB% ^ ..\bladeRF\host ^ || goto EXIT_FAILURE @@ -138,7 +135,7 @@ echo[ echo[ echo ====================== Configuring 32-bit build ====================== cmake -G %CMAKE_GENERATOR_32% -DCMAKE_BUILD_TYPE=%BUILD_TYPE% ^ - -DLIBUSB_PATH=%LIBUSB% -DLIBPTHREADSWIN32_PATH=%PTHREADS% ^ + -DLIBUSB_PATH=%LIBUSB% ^ ..\bladeRF\host ^ || goto EXIT_FAILURE From d673366f4c7f900e8c145d4bddad3bc93269840f Mon Sep 17 00:00:00 2001 From: Robert Ghilduta Date: Mon, 4 Dec 2023 00:48:01 -0800 Subject: [PATCH 191/238] host: final pthread migration to make linux compile --- host/common/include/thread.h | 5 +++-- host/libraries/libbladeRF/src/streaming/sync_worker.c | 1 - host/utilities/bladeRF-cli/src/cmd/rxtx.c | 5 ----- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/host/common/include/thread.h b/host/common/include/thread.h index 9203c5ad..bc6f7d26 100644 --- a/host/common/include/thread.h +++ b/host/common/include/thread.h @@ -40,15 +40,16 @@ #undef USE_PTHREADS #else // Use pthreads on non-Windows platforms +#undef USE_PTHREADS #define USE_PTHREADS #endif #ifdef USE_PTHREADS -#error "Pthreads are not supported at this time" /* Use pthreads */ -#include "thread.h" +#include +#include #include #define CLOCK_REALTIME 0 diff --git a/host/libraries/libbladeRF/src/streaming/sync_worker.c b/host/libraries/libbladeRF/src/streaming/sync_worker.c index e74e8e44..cb7911a7 100644 --- a/host/libraries/libbladeRF/src/streaming/sync_worker.c +++ b/host/libraries/libbladeRF/src/streaming/sync_worker.c @@ -320,7 +320,6 @@ int sync_worker_wait_for_state(struct sync_worker *w, sync_worker_state state, unsigned int timeout_ms) { int status = 0; - const int nsec_per_sec = 1000 * 1000 * 1000; if (timeout_ms != 0) { MUTEX_LOCK(&w->state_lock); diff --git a/host/utilities/bladeRF-cli/src/cmd/rxtx.c b/host/utilities/bladeRF-cli/src/cmd/rxtx.c index 55e03f64..7f002417 100644 --- a/host/utilities/bladeRF-cli/src/cmd/rxtx.c +++ b/host/utilities/bladeRF-cli/src/cmd/rxtx.c @@ -822,8 +822,6 @@ int rxtx_handle_wait(struct cli_state *s, MUTEX_UNLOCK(&s->dev_lock); if (timeout_ms != 0) { - const unsigned int timeout_sec = timeout_ms / 1000; - MUTEX_LOCK(&rxtx->task_mgmt.lock); rxtx->task_mgmt.main_task_waiting = true; while (rxtx->task_mgmt.main_task_waiting) { @@ -846,7 +844,6 @@ int rxtx_handle_wait(struct cli_state *s, MUTEX_UNLOCK(&rxtx->task_mgmt.lock); } -out: /* Re-acquire the device control lock, as the top-level command handler * will be unlocking this when it's done */ MUTEX_LOCK(&s->dev_lock); @@ -883,8 +880,6 @@ int rxtx_wait_for_state(struct rxtx_data *rxtx, int status = 0; if (timeout_ms != 0) { - const unsigned int timeout_sec = timeout_ms / 1000; - MUTEX_LOCK(&rxtx->task_mgmt.lock); while (rxtx->task_mgmt.state != req_state && status == THREAD_SUCCESS) { status = COND_TIMED_WAIT(&rxtx->task_mgmt.signal_state_change, From 352b206044ba18e9b72bcd172c36ee8603acacb2 Mon Sep 17 00:00:00 2001 From: Robert Ghilduta Date: Sun, 3 Dec 2023 17:25:51 -0800 Subject: [PATCH 192/238] WIP: momentarily disable bladeRF-fsk on Windows --- host/utilities/CMakeLists.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/host/utilities/CMakeLists.txt b/host/utilities/CMakeLists.txt index f06c4a99..baad7c43 100644 --- a/host/utilities/CMakeLists.txt +++ b/host/utilities/CMakeLists.txt @@ -1,6 +1,8 @@ cmake_minimum_required(VERSION 3.10...3.27) add_subdirectory(bladeRF-cli) -add_subdirectory(bladeRF-fsk/c) add_subdirectory(bladeRF-power) add_subdirectory(bladeRF-update) +if(NOT MSVC) + add_subdirectory(bladeRF-fsk/c) +endif() From 6905c37642c41720606ae7fd2e84e1284812b2c1 Mon Sep 17 00:00:00 2001 From: Robert Ghilduta Date: Sat, 19 Apr 2025 20:39:07 -0700 Subject: [PATCH 193/238] host: finish off cross-platform support for Windows libbladeRF now compiles under MinGW as well as MSVC under Windows --- host/cmake/modules/FindLibUSB.cmake | 5 ++++ host/libraries/libbladeRF/src/bladerf.c | 6 ++++ .../libbladeRF/src/device_calibration.c | 30 +++++++++++++++---- .../test_clock_select/CMakeLists.txt | 10 +++++-- .../test_clock_select/src/main.c | 11 +++++-- .../test_fpga_load/CMakeLists.txt | 8 +++-- .../test_gain_calibration/CMakeLists.txt | 7 ++++- .../src/file_operations.c | 6 ++-- .../test_gain_calibration/src/main.c | 5 +++- .../test_gain_compare/CMakeLists.txt | 21 ++++++------- .../test_gain_compare/src/main.c | 2 +- .../test_streaming/CMakeLists.txt | 17 +++++++---- .../libbladeRF_test/test_streaming/src/main.c | 3 ++ host/utilities/CMakeLists.txt | 2 +- 14 files changed, 98 insertions(+), 35 deletions(-) diff --git a/host/cmake/modules/FindLibUSB.cmake b/host/cmake/modules/FindLibUSB.cmake index 8d65f3c2..ccf36097 100644 --- a/host/cmake/modules/FindLibUSB.cmake +++ b/host/cmake/modules/FindLibUSB.cmake @@ -80,6 +80,11 @@ if(PKGCONFIG_LIBUSB_FOUND AND NOT LIBUSB_FOUND) mark_as_advanced(${ibase}_LIBRARY) endforeach(i) + # assume we're using vcpkg + if(${CMAKE_SYSTEM_NAME} STREQUAL "Windows") + set(LIBUSB_LIBRARY_PATH_SUFFIX bin) + endif() + else(PKGCONFIG_LIBUSB_FOUND) if(${CMAKE_SYSTEM_NAME} STREQUAL "Windows") # The libusbx binary distribution contains several libs. diff --git a/host/libraries/libbladeRF/src/bladerf.c b/host/libraries/libbladeRF/src/bladerf.c index 8294caea..02df2b58 100644 --- a/host/libraries/libbladeRF/src/bladerf.c +++ b/host/libraries/libbladeRF/src/bladerf.c @@ -24,6 +24,12 @@ #include #include #include +#ifdef _WIN32 +#include +#ifndef PATH_MAX +#define PATH_MAX MAX_PATH +#endif +#endif #include diff --git a/host/libraries/libbladeRF/src/device_calibration.c b/host/libraries/libbladeRF/src/device_calibration.c index 44956712..7e8e81bb 100644 --- a/host/libraries/libbladeRF/src/device_calibration.c +++ b/host/libraries/libbladeRF/src/device_calibration.c @@ -22,14 +22,24 @@ #include #include -#include -#include +#include "common.h" #include "libbladeRF.h" #include "board/board.h" #include "helpers/version.h" #include "device_calibration.h" #include "log.h" -#include "common.h" + +#ifdef _WIN32 +#include +#include +// Define PATH_MAX for Windows if not already defined +#ifndef PATH_MAX +#define PATH_MAX MAX_PATH +#endif +#else +#include +#include +#endif #define GAIN_CAL_HEADER_RX "RX Chain,RX Gain,VSG Power into bladeRF RX (dBm),Frequency of signal (Hz),Frequency of bladeRF+PXI (Hz),AD9361 RSSI register value,Power of Signal from Full Scale (dBFS)\0" #define GAIN_CAL_HEADER_TX "TX Chain,TX Gain,Frequency of Signal (Hz),Frequency of bladeRF+PXI (Hz),VSA Measured Power (dBm)\0" @@ -226,7 +236,7 @@ static int gain_cal_tbl_init(struct bladerf_gain_cal_tbl *tbl, uint32_t num_entr tbl->n_entries = num_entries; tbl->start_freq = 0; tbl->stop_freq = 0; - tbl->file_path_len = PATH_MAX; + tbl->file_path_len = 4; tbl->entries = malloc(num_entries * sizeof(struct bladerf_gain_cal_entry)); if (tbl->entries == NULL) { @@ -269,8 +279,13 @@ void gain_cal_tbl_free(struct bladerf_gain_cal_tbl *tbl) { } int load_gain_calibration(struct bladerf *dev, bladerf_channel ch, const char *binary_path) { - int num_channels = 4; - struct bladerf_gain_cal_tbl gain_tbls[num_channels]; + const int num_channels = 4; // Make this const to fix the array allocation issue + struct bladerf_gain_cal_tbl *gain_tbls = malloc(num_channels * sizeof(struct bladerf_gain_cal_tbl)); + if (!gain_tbls) { + log_error("Failed to allocate memory for gain tables\n"); + return BLADERF_ERR_MEM; + } + bladerf_gain current_gain; uint64_t frequency; float power; @@ -413,6 +428,9 @@ error: fclose(binaryFile); if (image) bladerf_free_image(image); + if (gain_tbls) + free(gain_tbls); + return status; } diff --git a/host/libraries/libbladeRF_test/test_clock_select/CMakeLists.txt b/host/libraries/libbladeRF_test/test_clock_select/CMakeLists.txt index a2a21ee5..608c8db0 100644 --- a/host/libraries/libbladeRF_test/test_clock_select/CMakeLists.txt +++ b/host/libraries/libbladeRF_test/test_clock_select/CMakeLists.txt @@ -1,12 +1,16 @@ cmake_minimum_required(VERSION 3.10...3.27) project(libbladeRF_test_clock_select C) -set(INCLUDES ${libbladeRF_SOURCE_DIR}/include) +set(INCLUDES ${libbladeRF_SOURCE_DIR}/include ${BLADERF_HOST_COMMON_INCLUDE_DIRS}) +set(SRC src/main.c) if(MSVC) + set(SRC ${SRC} + ${BLADERF_HOST_COMMON_SOURCE_DIR}/windows/getopt_long.c + ) set(INCLUDES ${INCLUDES} ${MSVC_C99_INCLUDES}) endif() -include_directories(${INCLUDES} ${CURL_INCLUDE_DIR} include) -add_executable(${PROJECT_NAME} src/main.c) +include_directories(${INCLUDES} include) +add_executable(${PROJECT_NAME} ${SRC}) target_link_libraries(${PROJECT_NAME} libbladerf_shared) diff --git a/host/libraries/libbladeRF_test/test_clock_select/src/main.c b/host/libraries/libbladeRF_test/test_clock_select/src/main.c index 856aeff4..118f7ee6 100644 --- a/host/libraries/libbladeRF_test/test_clock_select/src/main.c +++ b/host/libraries/libbladeRF_test/test_clock_select/src/main.c @@ -27,8 +27,10 @@ */ #include #include -#include +#include "getopt.h" +#if !defined(_WIN32) && !defined(_WIN64) #include +#endif #include #include #include "libbladeRF.h" @@ -173,7 +175,12 @@ int main(int argc, char *argv[]) fprintf(stderr, "Attempting to reopen device...\n"); bladerf_close(dev); dev = NULL; - sleep(3); + /* Wait for device to be ready */ +#ifdef _WIN32 + Sleep(3000); // Windows uses milliseconds +#else + sleep(3); // Unix uses seconds +#endif CHECK_STATUS(bladerf_open(&dev, device_string)); } diff --git a/host/libraries/libbladeRF_test/test_fpga_load/CMakeLists.txt b/host/libraries/libbladeRF_test/test_fpga_load/CMakeLists.txt index 5f195f05..c7683587 100644 --- a/host/libraries/libbladeRF_test/test_fpga_load/CMakeLists.txt +++ b/host/libraries/libbladeRF_test/test_fpga_load/CMakeLists.txt @@ -1,12 +1,14 @@ cmake_minimum_required(VERSION 3.10...3.27) project(libbladeRF_test_fpga_load C) -set(INCLUDES ${libbladeRF_SOURCE_DIR}/include) +set(INCLUDES ${libbladeRF_SOURCE_DIR}/include ${BLADERF_HOST_COMMON_INCLUDE_DIRS}) +set(SRC src/main.c) if(MSVC) set(INCLUDES ${INCLUDES} ${MSVC_C99_INCLUDES}) + set(SRC ${SRC} ${BLADERF_HOST_COMMON_SOURCE_DIR}/windows/getopt_long.c) endif() -include_directories(${INCLUDES} ${CURL_INCLUDE_DIR} include) -add_executable(${PROJECT_NAME} src/main.c) +include_directories(${INCLUDES} include) +add_executable(${PROJECT_NAME} ${SRC}) target_link_libraries(${PROJECT_NAME} libbladerf_shared) diff --git a/host/libraries/libbladeRF_test/test_gain_calibration/CMakeLists.txt b/host/libraries/libbladeRF_test/test_gain_calibration/CMakeLists.txt index 9157738c..01903b4f 100644 --- a/host/libraries/libbladeRF_test/test_gain_calibration/CMakeLists.txt +++ b/host/libraries/libbladeRF_test/test_gain_calibration/CMakeLists.txt @@ -8,6 +8,11 @@ set(INCLUDES ${BLADERF_HOST_COMMON_INCLUDE_DIRS} ) +set(LIBS libbladerf_shared) +if(NOT MSVC) + set(LIBS ${LIBS} m) +endif() + if(LIBBLADERF_SEARCH_PREFIX_OVERRIDE) add_definitions(-DLIBBLADERF_SEARCH_PREFIX="${LIBBLADERF_SEARCH_PREFIX_OVERRIDE}") else() @@ -23,7 +28,7 @@ set(SRC include_directories(${INCLUDES}) add_executable(libbladeRF_test_gain_calibration ${SRC}) -target_link_libraries(libbladeRF_test_gain_calibration libbladerf_shared m) +target_link_libraries(libbladeRF_test_gain_calibration ${LIBS}) configure_file(example_measurements/rx_sweep_0.csv ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/rx_sweep_0.csv diff --git a/host/libraries/libbladeRF_test/test_gain_calibration/src/file_operations.c b/host/libraries/libbladeRF_test/test_gain_calibration/src/file_operations.c index 53d5cf9a..232ebe09 100644 --- a/host/libraries/libbladeRF_test/test_gain_calibration/src/file_operations.c +++ b/host/libraries/libbladeRF_test/test_gain_calibration/src/file_operations.c @@ -20,10 +20,12 @@ */ #include #include -#include +#include "host_config.h" #include #include "libbladeRF.h" - +#ifndef F_OK +#define F_OK 0 +#endif int read_and_print_binary(const char *binary_path) { uint64_t frequency; float power; diff --git a/host/libraries/libbladeRF_test/test_gain_calibration/src/main.c b/host/libraries/libbladeRF_test/test_gain_calibration/src/main.c index 0a51bcbd..31a12968 100644 --- a/host/libraries/libbladeRF_test/test_gain_calibration/src/main.c +++ b/host/libraries/libbladeRF_test/test_gain_calibration/src/main.c @@ -20,7 +20,10 @@ */ #include #include -#include +#ifdef __WIN32 +#include +#endif +#include "host_config.h" #include "libbladeRF.h" #include "file_operations.h" diff --git a/host/libraries/libbladeRF_test/test_gain_compare/CMakeLists.txt b/host/libraries/libbladeRF_test/test_gain_compare/CMakeLists.txt index af89c370..0baea360 100644 --- a/host/libraries/libbladeRF_test/test_gain_compare/CMakeLists.txt +++ b/host/libraries/libbladeRF_test/test_gain_compare/CMakeLists.txt @@ -4,20 +4,21 @@ project(libbladeRF_test_gain_compare C) set(INCLUDES ${libbladeRF_SOURCE_DIR}/include ${BLADERF_HOST_COMMON_INCLUDE_DIRS} - ${CMAKE_CURRENT_SOURCE_DIR}/../common/include - ${CMAKE_CURRENT_SOURCE_DIR}/../../libbladeRF/src/streaming ) -set(LIBS libbladerf_shared) +if(MSVC) + set(INCLUDES ${INCLUDES} ${MSVC_C99_INCLUDES}) +endif() -add_definitions(-DLOGGING_ENABLED=1) -set(SRC - src/main.c - ${BLADERF_HOST_COMMON_SOURCE_DIR}/conversions.c - ${BLADERF_HOST_COMMON_SOURCE_DIR}/log.c -) +set(SRC src/main.c ${BLADERF_HOST_COMMON_SOURCE_DIR}/conversions.c) + +if(MSVC) + set(SRC ${SRC} + ${BLADERF_HOST_COMMON_SOURCE_DIR}/windows/getopt_long.c + ) +endif() include_directories(${INCLUDES}) add_executable(libbladeRF_test_gain_compare ${SRC}) -target_link_libraries(libbladeRF_test_gain_compare ${LIBS}) +target_link_libraries(libbladeRF_test_gain_compare libbladerf_shared) diff --git a/host/libraries/libbladeRF_test/test_gain_compare/src/main.c b/host/libraries/libbladeRF_test/test_gain_compare/src/main.c index d6e1310b..d664c423 100644 --- a/host/libraries/libbladeRF_test/test_gain_compare/src/main.c +++ b/host/libraries/libbladeRF_test/test_gain_compare/src/main.c @@ -1,7 +1,7 @@ #include #include #include -#include +#include "host_config.h" #include "log.h" #define CHECK(func_call) do { \ diff --git a/host/libraries/libbladeRF_test/test_streaming/CMakeLists.txt b/host/libraries/libbladeRF_test/test_streaming/CMakeLists.txt index be7095f7..9068ed36 100644 --- a/host/libraries/libbladeRF_test/test_streaming/CMakeLists.txt +++ b/host/libraries/libbladeRF_test/test_streaming/CMakeLists.txt @@ -2,16 +2,23 @@ cmake_minimum_required(VERSION 3.10...3.27) project(libbladeRF_test_streaming C) set(INCLUDES - ${libbladeRF_SOURCE_DIR}/include) -if(MSVC) - set(INCLUDES ${INCLUDES} ${MSVC_C99_INCLUDES}) -endif() + ${libbladeRF_SOURCE_DIR}/include + ${BLADERF_HOST_COMMON_INCLUDE_DIRS}) set(SRC ${BLADERF_HOST_COMMON_SOURCE_DIR}/conversions.c src/main.c) +set(LIBS libbladerf_shared) + +if(MSVC) + set(INCLUDES ${INCLUDES} ${MSVC_C99_INCLUDES}) + set(SRC ${SRC} ${BLADERF_HOST_COMMON_SOURCE_DIR}/windows/getopt_long.c) +else() + set(LIBS ${LIBS} m) +endif() + include_directories(${INCLUDES} ${CURL_INCLUDE_DIR} include) add_executable(${PROJECT_NAME} ${SRC}) -target_link_libraries(${PROJECT_NAME} libbladerf_shared m) +target_link_libraries(${PROJECT_NAME} ${LIBS}) diff --git a/host/libraries/libbladeRF_test/test_streaming/src/main.c b/host/libraries/libbladeRF_test/test_streaming/src/main.c index 0db7c886..de5c5b35 100644 --- a/host/libraries/libbladeRF_test/test_streaming/src/main.c +++ b/host/libraries/libbladeRF_test/test_streaming/src/main.c @@ -3,6 +3,9 @@ #include #include #include +#ifdef _WIN32 +#define _USE_MATH_DEFINES +#endif #include #include "conversions.h" diff --git a/host/utilities/CMakeLists.txt b/host/utilities/CMakeLists.txt index baad7c43..dec80c68 100644 --- a/host/utilities/CMakeLists.txt +++ b/host/utilities/CMakeLists.txt @@ -1,8 +1,8 @@ cmake_minimum_required(VERSION 3.10...3.27) add_subdirectory(bladeRF-cli) -add_subdirectory(bladeRF-power) add_subdirectory(bladeRF-update) if(NOT MSVC) + add_subdirectory(bladeRF-power) add_subdirectory(bladeRF-fsk/c) endif() From 619e05811567b5e76b6d8853c1a328193c3c7161 Mon Sep 17 00:00:00 2001 From: Robert Ghilduta Date: Mon, 21 Apr 2025 23:22:46 -0700 Subject: [PATCH 194/238] matlab: add missing bladerf_image_type_to_string Add missing bladerf_image_type_to_string API_EXPORT declaration and also add it to matlab --- host/libraries/libbladeRF/include/libbladeRF.h | 1 + .../matlab/libbladeRF_proto.m | 16 ++++++++++++++++ 2 files changed, 17 insertions(+) diff --git a/host/libraries/libbladeRF/include/libbladeRF.h b/host/libraries/libbladeRF/include/libbladeRF.h index ab199253..63cb2385 100644 --- a/host/libraries/libbladeRF/include/libbladeRF.h +++ b/host/libraries/libbladeRF/include/libbladeRF.h @@ -3499,6 +3499,7 @@ int CALL_CONV bladerf_image_print_metadata(const struct bladerf_image *image); * @return A pointer to a string representing the image type. Returns "Unknown Type" * for any unrecognized or out-of-range values. */ +API_EXPORT const char* bladerf_image_type_to_string(bladerf_image_type type); /** diff --git a/host/libraries/libbladeRF_bindings/matlab/libbladeRF_proto.m b/host/libraries/libbladeRF_bindings/matlab/libbladeRF_proto.m index 79f57b1a..dbb7f4d0 100644 --- a/host/libraries/libbladeRF_bindings/matlab/libbladeRF_proto.m +++ b/host/libraries/libbladeRF_bindings/matlab/libbladeRF_proto.m @@ -611,6 +611,8 @@ fcns.thunkname{fcnNum}='int32voidPtrbladerf_pmic_registervoidPtrThunk';fcns.name % int bladerf_get_rf_switch_config ( struct bladerf * dev , bladerf_rf_switch_config * config ); fcns.thunkname{fcnNum}='int32voidPtrvoidPtrThunk';fcns.name{fcnNum}='bladerf_get_rf_switch_config'; fcns.calltype{fcnNum}='Thunk'; fcns.LHS{fcnNum}='int32'; fcns.RHS{fcnNum}={'bladerfPtr', 'bladerf_rf_switch_configPtr'};fcnNum=fcnNum+1; +% const char* bladerf_image_type_to_string(bladerf_image_type type); +fcns.thunkname{fcnNum}='cstringint32Thunk';fcns.name{fcnNum}='bladerf_image_type_to_string'; fcns.calltype{fcnNum}='Thunk'; fcns.LHS{fcnNum}='cstring'; fcns.RHS{fcnNum}={'bladerf_image_type'};fcnNum=fcnNum+1; %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % Structures @@ -887,6 +889,20 @@ enuminfo.bladerf_pmic_register=struct('BLADERF_PMIC_CONFIGURATION', 0, ... enuminfo.bladerf_clock_select=struct('CLOCK_SELECT_ONBOARD', 0, ... 'CLOCK_SELECT_EXTERNAL', 1); +enuminfo.bladerf_image_type=struct('BLADERF_IMAGE_TYPE_INVALID', -1, ... + 'BLADERF_IMAGE_TYPE_RAW', 0, ... + 'BLADERF_IMAGE_TYPE_FIRMWARE', 1, ... + 'BLADERF_IMAGE_TYPE_FPGA_40KLE', 2, ... + 'BLADERF_IMAGE_TYPE_FPGA_115KLE', 3, ... + 'BLADERF_IMAGE_TYPE_FPGA_A4', 4, ... + 'BLADERF_IMAGE_TYPE_FPGA_A9', 5, ... + 'BLADERF_IMAGE_TYPE_CALIBRATION', 6, ... + 'BLADERF_IMAGE_TYPE_RX_DC_CAL', 7, ... + 'BLADERF_IMAGE_TYPE_TX_DC_CAL', 8, ... + 'BLADERF_IMAGE_TYPE_RX_IQ_CAL', 9, ... + 'BLADERF_IMAGE_TYPE_TX_IQ_CAL', 10, ... + 'BLADERF_IMAGE_TYPE_FPGA_A5', 11, ... + 'BLADERF_IMAGE_TYPE_GAIN_CAL', 12); %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % Output From ff812e53056e96667d117b048cc09829589798de Mon Sep 17 00:00:00 2001 From: Robert Ghilduta Date: Sat, 19 Apr 2025 02:13:36 -0700 Subject: [PATCH 195/238] bladeRF-fsk: move into its own repo --- host/utilities/bladeRF-fsk/README.md | 139 -- host/utilities/bladeRF-fsk/c/CMakeLists.txt | 368 ----- host/utilities/bladeRF-fsk/c/src/README.txt | 16 - .../utilities/bladeRF-fsk/c/src/bladeRF-fsk.c | 322 ----- host/utilities/bladeRF-fsk/c/src/common.h | 55 - host/utilities/bladeRF-fsk/c/src/config.c | 536 -------- host/utilities/bladeRF-fsk/c/src/config.h | 67 - host/utilities/bladeRF-fsk/c/src/correlator.c | 394 ------ host/utilities/bladeRF-fsk/c/src/correlator.h | 76 -- host/utilities/bladeRF-fsk/c/src/crc32.c | 179 --- host/utilities/bladeRF-fsk/c/src/crc32.h | 37 - host/utilities/bladeRF-fsk/c/src/fir_filter.c | 278 ---- host/utilities/bladeRF-fsk/c/src/fir_filter.h | 62 - host/utilities/bladeRF-fsk/c/src/fsk.c | 305 ----- host/utilities/bladeRF-fsk/c/src/fsk.h | 106 -- host/utilities/bladeRF-fsk/c/src/link.c | 1208 ----------------- host/utilities/bladeRF-fsk/c/src/link.h | 99 -- host/utilities/bladeRF-fsk/c/src/phy.c | 948 ------------- host/utilities/bladeRF-fsk/c/src/phy.h | 167 --- host/utilities/bladeRF-fsk/c/src/pnorm.c | 206 --- host/utilities/bladeRF-fsk/c/src/pnorm.h | 48 - host/utilities/bladeRF-fsk/c/src/prng.c | 129 -- host/utilities/bladeRF-fsk/c/src/prng.h | 63 - .../bladeRF-fsk/c/src/radio_config.c | 280 ---- .../bladeRF-fsk/c/src/radio_config.h | 55 - .../bladeRF-fsk/c/src/rx_ch_filter.h | 82 -- host/utilities/bladeRF-fsk/c/src/test_suite.c | 483 ------- host/utilities/bladeRF-fsk/c/src/utils.c | 303 ----- host/utilities/bladeRF-fsk/c/src/utils.h | 134 -- host/utilities/bladeRF-fsk/matlab/README.txt | 46 - host/utilities/bladeRF-fsk/matlab/fsk.m | 154 --- host/utilities/bladeRF-fsk/matlab/fsk_csv.m | 156 --- host/utilities/bladeRF-fsk/matlab/fsk_demod.m | 85 -- host/utilities/bladeRF-fsk/matlab/fsk_mod.m | 79 -- .../bladeRF-fsk/matlab/fsk_receive.m | 117 -- .../bladeRF-fsk/matlab/fsk_transmit.m | 92 -- 36 files changed, 7874 deletions(-) delete mode 100644 host/utilities/bladeRF-fsk/README.md delete mode 100644 host/utilities/bladeRF-fsk/c/CMakeLists.txt delete mode 100644 host/utilities/bladeRF-fsk/c/src/README.txt delete mode 100644 host/utilities/bladeRF-fsk/c/src/bladeRF-fsk.c delete mode 100644 host/utilities/bladeRF-fsk/c/src/common.h delete mode 100644 host/utilities/bladeRF-fsk/c/src/config.c delete mode 100644 host/utilities/bladeRF-fsk/c/src/config.h delete mode 100644 host/utilities/bladeRF-fsk/c/src/correlator.c delete mode 100644 host/utilities/bladeRF-fsk/c/src/correlator.h delete mode 100644 host/utilities/bladeRF-fsk/c/src/crc32.c delete mode 100644 host/utilities/bladeRF-fsk/c/src/crc32.h delete mode 100644 host/utilities/bladeRF-fsk/c/src/fir_filter.c delete mode 100644 host/utilities/bladeRF-fsk/c/src/fir_filter.h delete mode 100644 host/utilities/bladeRF-fsk/c/src/fsk.c delete mode 100644 host/utilities/bladeRF-fsk/c/src/fsk.h delete mode 100644 host/utilities/bladeRF-fsk/c/src/link.c delete mode 100644 host/utilities/bladeRF-fsk/c/src/link.h delete mode 100644 host/utilities/bladeRF-fsk/c/src/phy.c delete mode 100644 host/utilities/bladeRF-fsk/c/src/phy.h delete mode 100644 host/utilities/bladeRF-fsk/c/src/pnorm.c delete mode 100644 host/utilities/bladeRF-fsk/c/src/pnorm.h delete mode 100644 host/utilities/bladeRF-fsk/c/src/prng.c delete mode 100644 host/utilities/bladeRF-fsk/c/src/prng.h delete mode 100644 host/utilities/bladeRF-fsk/c/src/radio_config.c delete mode 100644 host/utilities/bladeRF-fsk/c/src/radio_config.h delete mode 100644 host/utilities/bladeRF-fsk/c/src/rx_ch_filter.h delete mode 100644 host/utilities/bladeRF-fsk/c/src/test_suite.c delete mode 100644 host/utilities/bladeRF-fsk/c/src/utils.c delete mode 100644 host/utilities/bladeRF-fsk/c/src/utils.h delete mode 100644 host/utilities/bladeRF-fsk/matlab/README.txt delete mode 100644 host/utilities/bladeRF-fsk/matlab/fsk.m delete mode 100644 host/utilities/bladeRF-fsk/matlab/fsk_csv.m delete mode 100644 host/utilities/bladeRF-fsk/matlab/fsk_demod.m delete mode 100644 host/utilities/bladeRF-fsk/matlab/fsk_mod.m delete mode 100644 host/utilities/bladeRF-fsk/matlab/fsk_receive.m delete mode 100644 host/utilities/bladeRF-fsk/matlab/fsk_transmit.m diff --git a/host/utilities/bladeRF-fsk/README.md b/host/utilities/bladeRF-fsk/README.md deleted file mode 100644 index 580e2b6d..00000000 --- a/host/utilities/bladeRF-fsk/README.md +++ /dev/null @@ -1,139 +0,0 @@ -# bladeRF-FSK # - -## Project Overview ## - -The bladeRF-fsk project is a simple frequency shift keying (FSK) based software modem -implemented entirely on the host PC side in C code. The project uses libbladeRF to -transmit/receive samples with a bladeRF device. A USB 3.0 port is not required when using -this modem. The project also contains a MATLAB/Octave simulation/implementation of the -physical layer (PHY) portion of the modem. - -The top level bladeRF-fsk C program demonstrates the functionality of the modem in a -simple bladeRF-to-bladeRF data transfer program. This program can transmit/receive both -text (like a chat program) and binary files (like a file transfer program) with a raw -link rate of 250 kbps. To properly demonstrate the program, two instances of the program -must be run with two separate bladeRF devices (loopback is not supported). - -The modem modulates with continuous-phase frequency shift keying (CPFSK). Baseband I/Q -CPFSK samples are sent to the bladeRF device, inside which they converted from digital -to analog, mixed with quadrature RF carriers, and transmitted through the air. -Received signals are mixed with quadrature RF carriers to downconvert to baseband I/Q, -sampled with an ADC, and sent to the host PC program over the USB connection. - -The physical layer code features an FIR low-pass filter, power normalization, preamble -correlation for signal detection, CPFSK modulation/demodulation, and scrambling. The -link layer code features framing, error detection via CRC32 checksums, and guaranteed -delivery of frames via acknowledgements and retransmissions. - -This project is meant to be an experimental example and should not be treated as a -rigorous modem. - -## Dependencies ## - -- [libbladeRF] - -[libbladeRF]: ../../libraries/libbladeRF - -## Build Instructions ## - -The program builds as part of the bladeRF host side code. Follow the build instructions -listed in [bladeRF/host/README.md]. - -[bladeRF/host/README.md]: ../../README.md - -_NOTE_: Release builds are recommended for this program. -More info: The receiver thread inside phy.c eats up a lot of CPU resources with DSP. -Debug builds do not contain compiler optimization, so running a debug build may -cause RX overruns (i.e. received samples get dropped) which can cause the modem to fail. -If you want to check the %CPU that this thread uses, you can run bladeRF-fsk_test_suite -which contains a function phy_receive_test() that simply runs the receiver thread for -some time. Monitor the CPU usage of the threads using the linux command: -``` -top -H -p $(pidof [path to build/output executables]/bladeRF-fsk_test_suite) -``` -When bladeRF-fsk_test_suite gets to phy_receive_test(), be sure to watch the CPU usage. - -### Build Variables ### - -Below is a list of project-specific CMake options. - -| Option | Description | -| ------------------------------------------------- |:------------------------------------------------------| -| -DBLADERF-FSK_BYPASS_RX_CHANNEL_FILTER=\ | Bypass the RX low-pass channel filter. Default: OFF | -| -DBLADERF-FSK_BYPASS_RX_PNORM=\ | Bypass RX power normalization. Default: OFF | -| -DBLADERF-FSK_BYPASS_PHY_SCRAMBLING=\ | Bypass scrambling in the PHY layer. Default: OFF | -| -DBLADERF-FSK_ENABLE_NOTES_LINK=\ | Print noteworthy messages from link.c. Default: OFF | -| -DBLADERF-FSK_ENABLE_NOTES_PHY=\ | Print noteworthy messages from phy.c. Default: OFF | -| -DBLADERF-FSK_ENABLE_DEBUG_ALL=\ | Print debug messages from all files. Default: OFF | -| -DBLADERF-FSK_ENABLE_DEBUG_TEST_SUITE=\ | Print debug messages from test_suite.c. Default: OFF | -| -DBLADERF-FSK_ENABLE_DEBUG_LINK=\ | Print debug messages from link.c. Default: OFF | -| -DBLADERF-FSK_ENABLE_DEBUG_PHY=\ | Print debug messages from phy.c. Default: OFF | -| -DBLADERF-FSK_ENABLE_DEBUG_FSK=\ | Print debug messages from fsk.c. Default: OFF | -| -DBLADERF-FSK_ENABLE_DEBUG_BLADERF=\ | Print bladeRF debug messages. Default: OFF | - -Setting -DBLADERF-FSK_ENABLE_NOTES_LINK=ON will show you when a frame is received with -CRC errors. Setting -DBLADERF-FSK_ENABLE_NOTES_PHY=ON will show you when RX overruns -occur, meaning the PHY receiver thread could not process a set of samples fast enough -and samples had to be dropped. - -## How to Run ## -To run the top-level bladeRF-fsk program with defaults, type into a terminal: -``` -bladeRF-fsk -``` -To see a list of configuration options and how to set them, type: -``` -bladeRF-fsk -h -``` -_NOTE_: On Windows 10, if you are running two instances of the program on the same PC, you -must specify the bladeRF serial number with the '-d' option, due to [Issue #484](https://github.com/Nuand/bladeRF/issues/484). Example: -``` -bladeRF-fsk -d *:serial=4e -``` -By default the program uses the first available bladeRF device, gets TX input from stdin, -writes RX output to stdout, and uses a default set of transmit/receive frequencies and -gains. Gains may need to be tweaked for a good connection with another bladeRF running -bladeRF-fsk. To transfer files, use the '-i' and '-o' options. If using stdin for tx -data, the program will transmit data line-by-line. - -The program runs until it gets an EOF in its TX input. - -### Example: Transferring Files ### -1) Be sure two bladeRF devices are plugged into your PC (or two separate PCs) with - TX and RX antennas attached. - -2) Run bladeRF-fsk on one of the devices (receiver), with the output RX file specified: -``` -bladeRF-fsk -r 904M -t 924M -o rx.jpg -``` - _NOTE_: On Windows 10, if both bladeRFs are plugged into the same PC, you must also - specify the device serial number with the '-d' option when calling bladeRF-fsk. See - note in the "How to Run" section. - -3) Run bladeRF-fsk on the other device (sender), with opposite frequencies and the input - TX file specified: -``` -bladeRF-fsk -r 924M -t 904M -i puppy.jpg -``` -4) The file will begin transferring, and progress will be printed in the terminal for the - sending device. - -5) Once the transmission is complete, press [CTRL-D] on Linux/OSX or [CTRL-Z then ENTER] - on Windows to stop the program on the receiving end. - -If the sending device does not get any response from the receiving device, it will quit -the program. Try increasing the gains and run it again. - -## Known Limitations ## -1) The program does not currently support the use of an XB-200 transverter expansion - board to transmit/receive at frequencies below 300MHz. In order to add XB-200 support, - a new configuration option as well as functions from the "Expansion boards" section - of the libbladeRF API would need to be added to the source code. - -2) The program is currently unable to perform two file transfers in both directions - simultaneously. Reason #1: The program runs until is gets an EOF in its TX input, - meaning whichever side finishes transmitting its file first will quit and stop - receiving. An EOF bit would need to be added to the link layer packet format in order - to stop this behavior. Reason #2: The program doesn't seem to perform well during - these simultaneous file transfers, and usually loses connection. Further investigation - is required to debug this. diff --git a/host/utilities/bladeRF-fsk/c/CMakeLists.txt b/host/utilities/bladeRF-fsk/c/CMakeLists.txt deleted file mode 100644 index 73f699bb..00000000 --- a/host/utilities/bladeRF-fsk/c/CMakeLists.txt +++ /dev/null @@ -1,368 +0,0 @@ -cmake_minimum_required(VERSION 3.10...3.27) -project(bladeRF-fsk C) - -################################################################################ -# Version information -################################################################################ - -set(VERSION_INFO_MAJOR 0) -set(VERSION_INFO_MINOR 1) -set(VERSION_INFO_PATCH 0) - -################################################################################ -# Dependencies -################################################################################ - -set(SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src) - -if(MSVC) - find_package(LibPThreadsWin32 REQUIRED) -else(MSVC) - find_package(Threads REQUIRED) -endif(MSVC) - -################################################################################ -# Options -################################################################################ -option(BLADERF-FSK_ENABLE_DEBUG_ALL "Print debug messages in all files" OFF) -option(BLADERF-FSK_ENABLE_DEBUG_PHY - "Print debug messages in phy.c" - ${BLADERF-FSK_ENABLE_DEBUG_ALL} -) -option(BLADERF-FSK_ENABLE_DEBUG_LINK - "Print debug messages in link.c" - ${BLADERF-FSK_ENABLE_DEBUG_ALL} -) -option(BLADERF-FSK_ENABLE_DEBUG_FSK - "Print debug messages in fsk.c" - ${BLADERF-FSK_ENABLE_DEBUG_ALL} -) -option( - BLADERF-FSK_ENABLE_DEBUG_TEST_SUITE - "Print debug messages in test_suite.c" - ${BLADERF-FSK_ENABLE_DEBUG_ALL} -) -option(BLADERF-FSK_ENABLE_DEBUG_BLADERF - "Print libbladeRF debug messages" - ${BLADERF-FSK_ENABLE_DEBUG_ALL} -) -option(BLADERF-FSK_ENABLE_NOTES_PHY - "Print noteworthy messages (e.g. recoverable errors) in phy.c" - OFF -) -option(BLADERF-FSK_ENABLE_NOTES_LINK - "Print noteworthy messages (e.g. recoverable errors) in link.c" - OFF -) -option(BLADERF-FSK_BYPASS_RX_CHANNEL_FILTER "Bypass the PHY's RX channel filter." OFF) -option(BLADERF-FSK_BYPASS_PHY_SCRAMBLING "Bypass scrambling in the phy layer" OFF) -option(BLADERF-FSK_BYPASS_RX_PNORM "Bypass the PHY's RX power normalization" OFF) - -if(BLADERF-FSK_ENABLE_DEBUG_PHY) - set_property(SOURCE ${SRC_DIR}/phy.c APPEND_STRING PROPERTY COMPILE_FLAGS "-DDEBUG_MODE ") -endif() -if(BLADERF-FSK_ENABLE_DEBUG_LINK) - set_property(SOURCE ${SRC_DIR}/link.c APPEND_STRING PROPERTY COMPILE_FLAGS "-DDEBUG_MODE ") -endif() -if(BLADERF-FSK_ENABLE_DEBUG_FSK) - set_property(SOURCE ${SRC_DIR}/fsk.c APPEND_STRING PROPERTY COMPILE_FLAGS "-DDEBUG_MODE ") -endif() -if(BLADERF-FSK_ENABLE_DEBUG_BLADERF) - set_property(SOURCE ${SRC_DIR}/radio_config.c APPEND_STRING PROPERTY COMPILE_FLAGS "-DDEBUG_MODE ") -endif() -if(BLADERF-FSK_ENABLE_DEBUG_TEST_SUITE) - set_property(SOURCE ${SRC_DIR}/test_suite.c APPEND_STRING PROPERTY COMPILE_FLAGS "-DDEBUG_MODE ") -endif() - -if(BLADERF-FSK_ENABLE_NOTES_PHY) - set_property(SOURCE ${SRC_DIR}/phy.c APPEND_STRING PROPERTY COMPILE_FLAGS "-DENABLE_NOTES ") -endif() - -if(BLADERF-FSK_ENABLE_NOTES_LINK) - set_property(SOURCE ${SRC_DIR}/link.c APPEND_STRING PROPERTY COMPILE_FLAGS "-DENABLE_NOTES ") -endif() - -if(BLADERF-FSK_BYPASS_RX_CHANNEL_FILTER) - set_property(SOURCE ${SRC_DIR}/phy.c APPEND_STRING PROPERTY COMPILE_FLAGS "-DBYPASS_RX_CHANNEL_FILTER ") -endif() -if(BLADERF-FSK_BYPASS_PHY_SCRAMBLING) - set_property(SOURCE ${SRC_DIR}/phy.c APPEND_STRING PROPERTY COMPILE_FLAGS "-DBYPASS_PHY_SCRAMBLING ") -endif() -if(BLADERF-FSK_BYPASS_RX_PNORM) - set_property(SOURCE ${SRC_DIR}/phy.c APPEND_STRING PROPERTY COMPILE_FLAGS "-DBYPASS_RX_PNORM ") -endif() - -################################################################################ -# Include paths -################################################################################ -set (FSK_INCLUDE_DIRS - ${SRC_DIR} - ${BLADERF_HOST_COMMON_INCLUDE_DIRS} - ${libbladeRF_SOURCE_DIR}/include -) - -if(MSVC) - set(FSK_INCLUDE_DIRS ${FSK_INCLUDE_DIRS} ${MSVC_C99_INCLUDES}) - set(FSK_INCLUDE_DIRS ${FSK_INCLUDE_DIRS} - ${BLADERF_HOST_COMMON_INCLUDE_DIRS}/windows - ${LIBPTHREADSWIN32_INCLUDE_DIRS} - ) -endif() - -if(APPLE) - set(FSK_INCLUDE_DIRS ${FSK_INCLUDE_DIRS} - ${BLADERF_HOST_COMMON_INCLUDE_DIRS}/osx - ) -endif() - -include_directories(${FSK_INCLUDE_DIRS}) - -################################################################################ -# Main bladeRF-fsk program -################################################################################ - -set(BLADERF_FSK_SRC - ${SRC_DIR}/bladeRF-fsk.c - ${SRC_DIR}/config.c - ${BLADERF_HOST_COMMON_SOURCE_DIR}/conversions.c - ${SRC_DIR}/radio_config.c - ${SRC_DIR}/fir_filter.c - ${SRC_DIR}/fsk.c - ${SRC_DIR}/prng.c - ${SRC_DIR}/phy.c - ${SRC_DIR}/crc32.c - ${SRC_DIR}/link.c - ${SRC_DIR}/utils.c - ${SRC_DIR}/pnorm.c - ${SRC_DIR}/correlator.c -) - -if(MSVC) - set(BLADERF_FSK_SRC ${BLADERF_FSK_SRC} - ${BLADERF_HOST_COMMON_SOURCE_DIR}/windows/getopt_long.c - ${BLADERF_HOST_COMMON_SOURCE_DIR}/windows/clock_gettime.c - ) -endif() - -if(APPLE) - set(BLADERF_FSK_SRC ${BLADERF_FSK_SRC} - ${BLADERF_HOST_COMMON_SOURCE_DIR}/osx/clock_gettime.c - ) -endif() - -# Set link libraries -set(BLADERF_FSK_LIBS - libbladerf_shared - ${CMAKE_THREAD_LIBS_INIT} -) - -if(NOT MSVC) - set(BLADERF_FSK_LIBS ${BLADERF_FSK_LIBS} m) -endif() - -if(LIBPTHREADSWIN32_FOUND) - set(BLADERF_FSK_LIBS ${BLADERF_FSK_LIBS} ${LIBPTHREADSWIN32_LIBRARIES}) -endif() - -if(LIBC_VERSION) - # clock_gettime() was moved from librt -> libc in 2.17 - if(${LIBC_VERSION} VERSION_LESS "2.17") - set(BLADERF_FSK_LIBS ${BLADERF_FSK_LIBS} rt) - endif() -endif() - -add_executable(bladeRF-fsk ${BLADERF_FSK_SRC}) -target_link_libraries(bladeRF-fsk ${BLADERF_FSK_LIBS}) - -################################################################################ -# Installation of bladeRF-fsk program -################################################################################ -if (NOT DEFINED BIN_INSTALL_DIR) - set(BIN_INSTALL_DIR bin) -endif() - -install(TARGETS bladeRF-fsk DESTINATION ${BIN_INSTALL_DIR}) - -################################################################################ -# Test suite program -################################################################################ - -set(TEST_SUITE_SRC - ${SRC_DIR}/radio_config.c - ${SRC_DIR}/fir_filter.c - ${SRC_DIR}/fsk.c - ${SRC_DIR}/prng.c - ${SRC_DIR}/crc32.c - ${SRC_DIR}/phy.c - ${SRC_DIR}/link.c - ${SRC_DIR}/test_suite.c - ${SRC_DIR}/utils.c - ${SRC_DIR}/pnorm.c - ${SRC_DIR}/correlator.c -) - -if(MSVC) - set(TEST_SUITE_SRC ${TEST_SUITE_SRC} - ${BLADERF_HOST_COMMON_SOURCE_DIR}/windows/clock_gettime.c - ) -endif() - -if(APPLE) - set(TEST_SUITE_SRC ${TEST_SUITE_SRC} - ${BLADERF_HOST_COMMON_SOURCE_DIR}/osx/clock_gettime.c - ) -endif() - -# Set link libraries -set(TEST_SUITE_LIBS - libbladerf_shared - ${CMAKE_THREAD_LIBS_INIT} -) - -if(NOT MSVC) - set(TEST_SUITE_LIBS ${TEST_SUITE_LIBS} m) -endif() - -if(LIBPTHREADSWIN32_FOUND) - set(TEST_SUITE_LIBS ${TEST_SUITE_LIBS} ${LIBPTHREADSWIN32_LIBRARIES}) -endif() - -if(LIBC_VERSION) - # clock_gettime() was moved from librt -> libc in 2.17 - if(${LIBC_VERSION} VERSION_LESS "2.17") - set(TEST_SUITE_LIBS ${TEST_SUITE_LIBS} rt) - endif() -endif() - -add_executable(bladeRF-fsk_test_suite ${TEST_SUITE_SRC}) -target_link_libraries(bladeRF-fsk_test_suite ${TEST_SUITE_LIBS}) - -################################################################################ -# Configuration test -################################################################################ - -set(TEST_CONFIG_SRC - ${SRC_DIR}/config.c - ${BLADERF_HOST_COMMON_SOURCE_DIR}/conversions.c -) - -if(MSVC) - set(TEST_CONFIG_SRC ${TEST_CONFIG_SRC} - ${BLADERF_HOST_COMMON_SOURCE_DIR}/windows/getopt_long.c - ) -endif() - -# Set link libraries -set(TEST_CONFIG_LIBS - libbladerf_shared -) - -add_executable(bladeRF-fsk_test_config ${TEST_CONFIG_SRC}) -target_compile_definitions(bladeRF-fsk_test_config PRIVATE "-DCONFIG_TEST") -target_link_libraries(bladeRF-fsk_test_config ${TEST_CONFIG_LIBS}) - -################################################################################ -# CRC32 helpers and tools -################################################################################ - -set(CRC32_TEST_SRC ${SRC_DIR}/crc32.c) -add_executable(bladeRF-fsk_test_crc32 ${CRC32_TEST_SRC}) -target_compile_definitions(bladeRF-fsk_test_crc32 PRIVATE "-DCRC32_TEST") - -################################################################################ -# PRNG test -################################################################################ - -set(PRNG_TEST_SRC ${SRC_DIR}/prng.c) -add_executable(bladeRF-fsk_test_prng ${PRNG_TEST_SRC}) -target_compile_definitions(bladeRF-fsk_test_prng PRIVATE "-DPRNG_TEST") - -################################################################################ -# FIR Filter test -################################################################################ - -set(FIR_FILTER_TEST_SRC - ${BLADERF_HOST_COMMON_SOURCE_DIR}/conversions.c - ${SRC_DIR}/fir_filter.c - ${SRC_DIR}/utils.c -) - -if(MSVC) - set(FIR_FILTER_TEST_SRC ${FIR_FILTER_TEST_SRC} - ${BLADERF_HOST_COMMON_SOURCE_DIR}/windows/clock_gettime.c - ) -endif() - -if(APPLE) - set(FIR_FILTER_TEST_SRC ${FIR_FILTER_TEST_SRC} - ${BLADERF_HOST_COMMON_SOURCE_DIR}/osx/clock_gettime.c - ) -endif() - -# Set link libraries -if(NOT MSVC) - set(FIR_FILTER_TEST_LIBS ${FIR_FILTER_TEST_LIBS} m) -endif() - -if(LIBC_VERSION) - # clock_gettime() was moved from librt -> libc in 2.17 - if(${LIBC_VERSION} VERSION_LESS "2.17") - set(FIR_FILTER_TEST_LIBS ${FIR_FILTER_TEST_LIBS} rt) - endif() -endif() - -add_executable(bladeRF-fsk_test_fir_filter ${FIR_FILTER_TEST_SRC}) -target_compile_definitions(bladeRF-fsk_test_fir_filter PRIVATE "-DFIR_FILTER_TEST") -target_link_libraries(bladeRF-fsk_test_fir_filter ${FIR_FILTER_TEST_LIBS}) - -################################################################################ -# Correlator test -################################################################################ - -set(CORRELATOR_TEST_SRC - ${SRC_DIR}/correlator.c - ${SRC_DIR}/utils.c - ${SRC_DIR}/fsk.c -) - -if(MSVC) - set(CORRELATOR_TEST_SRC ${CORRELATOR_TEST_SRC} - ${BLADERF_HOST_COMMON_SOURCE_DIR}/windows/clock_gettime.c - ) -endif() - -if(APPLE) - set(CORRELATOR_TEST_SRC ${CORRELATOR_TEST_SRC} - ${BLADERF_HOST_COMMON_SOURCE_DIR}/osx/clock_gettime.c - ) -endif() - -# Set link libraries -if(NOT MSVC) - set(CORRELATOR_TEST_LIBS ${CORRELATOR_TEST_LIBS} m) -endif() - -if(LIBC_VERSION) - # clock_gettime() was moved from librt -> libc in 2.17 - if(${LIBC_VERSION} VERSION_LESS "2.17") - set(CORRELATOR_TEST_LIBS ${CORRELATOR_TEST_LIBS} rt) - endif() -endif() - -add_executable(bladeRF-fsk_test_correlator ${CORRELATOR_TEST_SRC}) -target_compile_definitions(bladeRF-fsk_test_correlator PRIVATE "-DCORRELATOR_TEST") -target_link_libraries(bladeRF-fsk_test_correlator ${CORRELATOR_TEST_LIBS}) - -################################################################################ -# Power normalizer test -################################################################################ -set(PNORM_TEST_SRC ${SRC_DIR}/pnorm.c) - -# Set link libraries -if(NOT MSVC) - set(PNORM_TEST_LIBS ${PNORM_TEST_LIBS} m) -endif() - -add_executable(bladeRF-fsk_test_pnorm ${PNORM_TEST_SRC}) -target_compile_definitions(bladeRF-fsk_test_pnorm PRIVATE "-DPNORM_TEST") -target_link_libraries(bladeRF-fsk_test_pnorm ${PNORM_TEST_LIBS}) diff --git a/host/utilities/bladeRF-fsk/c/src/README.txt b/host/utilities/bladeRF-fsk/c/src/README.txt deleted file mode 100644 index 1d954fd6..00000000 --- a/host/utilities/bladeRF-fsk/c/src/README.txt +++ /dev/null @@ -1,16 +0,0 @@ -CODE ORGANIZATION ------------------ - -bladeRF-fsk.c other files: - |___________ utils.c - utility functions - | | common.h - common definitions - link.c config.c rx_ch_filter.h - FIR filter taps - |___________ test_suite.c - tests - | | - phy.c crc32.c - |__________________________________________________________________________ - | | | | | | | -{libbladeRF} radio_config.c fsk.c fir_filter.c pnorm.c correlator.c prng.c - | - | -{bladeRF device} diff --git a/host/utilities/bladeRF-fsk/c/src/bladeRF-fsk.c b/host/utilities/bladeRF-fsk/c/src/bladeRF-fsk.c deleted file mode 100644 index ab884ec6..00000000 --- a/host/utilities/bladeRF-fsk/c/src/bladeRF-fsk.c +++ /dev/null @@ -1,322 +0,0 @@ -/** - * @file - * @brief Top-level program that enables data transfer between two devices, using - * link.c to send/receive data - * - * This file is part of the bladeRF project - * - * Copyright (C) 2016 Nuand LLC - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ -#include -#include -#include -#include -#include "thread.h" -#include -#include -#include "host_config.h" - -#include "link.h" -#include "config.h" - -//This should be a multiple of PAYLOAD_LENGTH for best throughput -#define DATA_BUF_SIZE PAYLOAD_LENGTH - -struct bladerf_fsk_handle { - struct link_handle *link; - struct { - FILE *in; - long int filesize; - pthread_t thread; - bool stop; - bool on; - } tx; - struct { - FILE *out; - pthread_t thread; - bool stop; - bool on; - } rx; -}; - -void *sender(void *arg); -void *receiver(void *arg); -struct bladerf_fsk_handle *start(struct config *config); -void stop(struct bladerf_fsk_handle *handle); - -/** - * Thread function which gets bytes from the user via either stdin or a file and sends - * them with link_send_data(). Thread will return when it encounters EOF. Setting - * handle->tx.stop to true will not necessarily stop the thread since it may be stuck - * on fgets(). - * - * @param[in] arg pointer to bladerf_fsk_handle - */ -void *sender(void *arg) -{ - int status; - struct bladerf_fsk_handle *handle = (struct bladerf_fsk_handle *) arg; - uint8_t tx_data[PAYLOAD_LENGTH]; - char *result; - size_t num_bytes; - size_t bytes_sent; - - bytes_sent = 0; - while(!handle->tx.stop){ - //Get input data - if (handle->tx.in == stdin){ - memset(tx_data, 0, sizeof(tx_data)); - result = fgets((char *) tx_data, sizeof(tx_data), stdin); - if (result == NULL){ - break; - } - num_bytes = sizeof(tx_data); - }else{ - //Print progress - fprintf(stderr, "\rSent: %d%% ", - (int)roundf((float)bytes_sent/handle->tx.filesize * 100)); - //Read next chunk from file - num_bytes = fread(tx_data, 1, sizeof(tx_data), handle->tx.in); - if (num_bytes == 0){ - fprintf(stderr, "\n"); - break; //EOF - } - - } - //Transmit the message - status = link_send_data(handle->link, tx_data, (unsigned int)num_bytes); - if (status == -2){ - fprintf(stderr, "ERROR: Transmission failed (no connection)\n"); - break; - }else if (status != 0){ - fprintf(stderr, "ERROR: Transmission failed (unexpected error)\n"); - break; - } - bytes_sent += num_bytes; - } - return NULL; -} - -/** - * Thread function which receives bytes with link_receive_data() and writes them - * to the output FILE pointer. Thread will return within 0.5 seconds if - * handle->rx_stop is true. - * - * @param[in] arg pointer to bladerf_fsk_handle - */ -void *receiver(void *arg) -{ - struct bladerf_fsk_handle *handle = (struct bladerf_fsk_handle *) arg; - uint8_t rx_data[PAYLOAD_LENGTH]; - int bytes_received; - size_t nwritten; - - while(!handle->rx.stop){ - //Receive data into buffer - bytes_received = link_receive_data(handle->link, sizeof(rx_data), 1, rx_data); - if (bytes_received == 0){ - continue; - }else if (bytes_received < 0){ - fprintf(stderr, "ERROR: Receive data failed (unexpected error)\n"); - continue; - } - //Write the received bytes - if (handle->rx.out == stdout){ - //Doing this because on windows null characters print as spaces - printf("%s", rx_data); - fflush(stdout); - }else{ - nwritten = fwrite(rx_data, 1, bytes_received, handle->rx.out); - if ((int)nwritten != bytes_received){ - fprintf(stderr, "ERROR: Couldn't write received data to file: "); - perror(""); - } - } - } - return NULL; -} - -/* - * Initializes the link and starts the sender/receiver threads - * @param[in] config pointer to config struct specifying configuration info - * - * @return pointer to bladerf_fsk_handle on success, NULL on failure - */ -struct bladerf_fsk_handle *start(struct config *config) -{ - int status; - struct bladerf_fsk_handle *handle; - - //Check to see if FPGA is loaded - status = bladerf_is_fpga_configured(config->bladerf_dev); - if (status < 0){ - fprintf(stderr, "Couldn't query FPGA configuration: %s\n", - bladerf_strerror(status)); - return NULL; - }else if (status == 0){ - fprintf(stderr, "FPGA is not loaded on bladeRF device. " - "Load the FPGA or configure autoloading.\n"); - return NULL; - } - - //Allocate memory for bladerf-fsk handle - handle = calloc(1, sizeof(handle[0])); - if (handle == NULL){ - perror("calloc"); - goto error; - } - - //Set input/output files - handle->tx.in = config->tx_input; - handle->tx.filesize = config->tx_filesize; - handle->rx.out = config->rx_output; - - //Init the link - handle->link = link_init(config->bladerf_dev, &config->params); - if (handle->link == NULL){ - goto error; - } - - //Start the receiver thread - status = pthread_create(&(handle->rx.thread), NULL, receiver, handle); - if (status != 0){ - fprintf(stderr, "Couldn't create rx thread: %s\n", strerror(status)); - goto error; - } - handle->rx.on = true; - - //Start the sender thread - status = pthread_create(&(handle->tx.thread), NULL, sender, handle); - if (status != 0){ - fprintf(stderr, "Couldn't create tx thread: %s\n", strerror(status)); - goto error; - } - handle->tx.on = true; - - return handle; - - error: - stop(handle); - config_deinit(config); - return NULL; -} - -/** - * Stop tx/rx threads and close/free all resources - * - * @param[in] handle pointer to bladerf_fsk_handle to stop - */ -void stop(struct bladerf_fsk_handle *handle) -{ - int status; - if (handle != NULL){ - //Stop tx thread if on - if (handle->tx.on){ - handle->tx.stop = true; - status = pthread_join(handle->tx.thread, NULL); - if (status != 0){ - fprintf(stderr, "Error joining tx thread: %s\n", strerror(status)); - } - } - //Stop rx thread if on - if (handle->rx.on){ - handle->rx.stop = true; - status = pthread_join(handle->rx.thread, NULL); - if (status != 0){ - fprintf(stderr, "Error joining rx thread: %s\n", strerror(status)); - } - } - //Close the link - link_close(handle->link); - } - free(handle); -} - -/** - * Run bladeRF-fsk - */ -int main(int argc, char *argv[]) -{ - struct config *config = NULL; - struct bladerf_fsk_handle *handle = NULL; - int status; - - //parse arguments - status = config_init_from_cmdline(argc, argv, &config); - if (status < 0) { - return status; - } else if (status == 1) { - printf( - "Usage: %s \n" - "bladeRF-to-bladeRF text/file transfer program based on a custom FSK software modem\n\n" - "Options:\n", - argv[0] - ); - config_print_options(); - printf( - "\n" - "Notes:\n" - " The -d option takes a device specifier string. See the bladerf_open()\n" - " documentation for more information about the format of this string.\n" - " Double dashed arguments such as --rx-gain need to proceed single dash arguments.\n" - "\n" - "Example: Text chat between two devices at 904MHz/924MHz with TX gain adjusted.\n" - " Device 1> bladeRF-fsk --rx-biast -d *:serial=4a -r 904M -t 924M --tx-vga2 5\n" - " Device 2> bladeRF-fsk --rx-biast -d *:serial=f0 -r 924M -t 904M --tx-vga2 5\n" - "Example: File transfer between two devices at 904MHz/924MHz.\n" - " Receiver > bladeRF-fsk -d *:serial=4a -r 904M -t 924M -o rx.jpg\n" - " Transmitter> bladeRF-fsk -d *:serial=f0 -r 924M -t 904M -i puppy.jpg\n\n" - ); - return 0; - } else if (status > 0) { - fprintf(stderr, "Unexpected return value: %d\n", status); - return status; - } - - if (config->quiet == false){ - printf("=============== bladeRF-fsk ================\n"); - } - //Initialize the bladeRF-fsk handle - handle = start(config); - if (handle == NULL){ - fprintf(stderr, "ERROR: Couldn't start bladeRF-fsk\n"); - return 1; - } - if (handle->tx.in == stdin && config->quiet == false){ - #if BLADERF_OS_WINDOWS - printf("---- Press CTRL-Z then ENTER to quit ----\n"); - #else - printf("---- Press CTRL-D to quit ----\n"); - #endif - printf("\n"); - } - - //Wait for TX thread function to end - meaning tx file ended - status = pthread_join(handle->tx.thread, NULL); - if (status != 0){ - fprintf(stderr, "Error joining tx thread\n"); - } - handle->tx.on = false; - - if (config->quiet == false){ - printf("\nQuitting...\n"); - } - //Stop/cleanup everything else - stop(handle); - config_deinit(config); - return 0; -} diff --git a/host/utilities/bladeRF-fsk/c/src/common.h b/host/utilities/bladeRF-fsk/c/src/common.h deleted file mode 100644 index 714688d9..00000000 --- a/host/utilities/bladeRF-fsk/c/src/common.h +++ /dev/null @@ -1,55 +0,0 @@ -/** - * @file - * @brief Common data structures - * - * This file is part of the bladeRF project - * - * Copyright (C) 2016 Nuand LLC - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#ifndef COMMON_H -#define COMMON_H - -#include -#include - -struct complex_sample { - int16_t i; - int16_t q; -}; - -struct radio_params { - //TX - unsigned int tx_freq; - int tx_vga1_gain; //Range: -35 to -4 dB - int tx_vga2_gain; //Range: 0 to 25 dB - int tx_use_unified; //Boolean - int tx_unified_gain; //Range: 0 to 90 dB [dynamic] - int tx_biastee; //Boolean - - //RX - unsigned int rx_freq; - bladerf_lna_gain rx_lna_gain; //Range: 0 to 6 dB - int rx_vga1_gain; //Range: 5 to 30 dB - int rx_vga2_gain; //Range: 0 to 30 dB - int rx_use_unified; //Boolean - int rx_unified_gain; //Range: 0 to 90 dB [dynamic] - int rx_biastee; //Boolean - int rx_agc; //Boolean -}; - -#endif diff --git a/host/utilities/bladeRF-fsk/c/src/config.c b/host/utilities/bladeRF-fsk/c/src/config.c deleted file mode 100644 index 7d7cccbb..00000000 --- a/host/utilities/bladeRF-fsk/c/src/config.c +++ /dev/null @@ -1,536 +0,0 @@ -/** - * @brief Gets configuration options from command line arguments - * - * This file is part of the bladeRF project - * - * Copyright (C) 2016 Nuand LLC - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#include -#include -#include -#include -#include -#include - -#include "config.h" -#include "conversions.h" - -#ifdef DEBUG_CONFIG -# define pr_dbg(...) fprintf(stderr, "[CONFIG] " __VA_ARGS__) -#else -# define pr_dbg(...) do {} while (0) -#endif - -#define OPTIONS "hd:r:o:t:i:q" - -#define OPTION_HELP 'h' -#define OPTION_DEVICE 'd' -#define OPTION_QUIET 'q' - -#define OPTION_RXFREQ 'r' -#define OPTION_INPUT 'i' -#define OPTION_RXLNA 0x80 -#define OPTION_RXVGA1 0x81 -#define OPTION_RXVGA2 0x82 -#define OPTION_RXGAIN 0x83 -#define OPTION_RXBIAST 0x84 -#define OPTION_RXAGC 0x85 - -#define OPTION_TXFREQ 't' -#define OPTION_OUTPUT 'o' -#define OPTION_TXVGA1 0x90 -#define OPTION_TXVGA2 0x91 -#define OPTION_TXGAIN 0x92 -#define OPTION_TXBIAST 0x93 - -#define UNIFIED_GAIN_MIN 0 -#define UNIFIED_GAIN_MAX 60 - -#define RX_FREQ_DEFAULT 904000000 -#define RX_LNA_DEFAULT BLADERF_LNA_GAIN_MAX -#define RX_VGA1_DEFAULT BLADERF_RXVGA1_GAIN_MAX -#define RX_VGA2_DEFAULT BLADERF_RXVGA2_GAIN_MIN - -#define TX_FREQ_DEFAULT 924000000 -#define TX_VGA1_DEFAULT BLADERF_TXVGA1_GAIN_MAX -#define TX_VGA2_DEFAULT BLADERF_TXVGA2_GAIN_MIN - -static struct option long_options[] = { - { "help", no_argument, NULL, OPTION_HELP }, - { "device", required_argument, NULL, OPTION_DEVICE }, - { "quiet", no_argument, NULL, OPTION_QUIET }, - - { "output", required_argument, NULL, OPTION_OUTPUT }, - { "rx-lna", required_argument, NULL, OPTION_RXLNA }, - { "rx-vga1", required_argument, NULL, OPTION_RXVGA1 }, - { "rx-vga2", required_argument, NULL, OPTION_RXVGA2 }, - { "rx-freq", required_argument, NULL, OPTION_RXFREQ }, - { "rx-gain", required_argument, NULL, OPTION_RXGAIN }, - { "rx-biast", no_argument, NULL, OPTION_RXBIAST }, - { "rx-agc", no_argument, NULL, OPTION_RXAGC }, - - { "input", required_argument, NULL, OPTION_INPUT }, - { "tx-vga1", required_argument, NULL, OPTION_TXVGA1 }, - { "tx-vga2", required_argument, NULL, OPTION_TXVGA2 }, - { "tx-freq", required_argument, NULL, OPTION_TXFREQ }, - { "tx-gain", required_argument, NULL, OPTION_TXGAIN }, - { "tx-biast", no_argument, NULL, OPTION_RXBIAST }, - - { NULL, 0, NULL, 0 }, -}; - -const struct numeric_suffix freq_suffixes[] = { - { "k", 1000 }, - { "KHz", 1000 }, - - { "M", 1000 * 1000 }, - { "MHz", 1000 * 1000 }, - - { "G", 1000 * 1000 * 1000 }, - { "GHz", 1000 * 1000 * 1000 }, -}; - -static const size_t num_freq_suffixes = - sizeof(freq_suffixes) / sizeof(freq_suffixes[0]); - -static struct config *alloc_config_with_defaults() -{ - struct config *config; - - config = calloc(1, sizeof(*config)); - if (!config) { - perror("calloc"); - return NULL; - } - - /* RX defaults */ - config->rx_output = NULL; - - config->params.rx_freq = RX_FREQ_DEFAULT; - - config->params.rx_lna_gain = RX_LNA_DEFAULT; - config->params.rx_vga1_gain = RX_VGA1_DEFAULT; - config->params.rx_vga2_gain = RX_VGA2_DEFAULT; - config->params.rx_agc = 1; - config->params.rx_use_unified = 1; - config->params.rx_unified_gain = 60; - config->params.rx_biastee = 0; - - - /* TX defaults */ - config->tx_input = NULL; - - config->params.tx_freq = TX_FREQ_DEFAULT; - - config->params.tx_vga1_gain = TX_VGA1_DEFAULT; - config->params.tx_vga2_gain = TX_VGA2_DEFAULT; - config->params.tx_use_unified = 1; - config->params.tx_unified_gain = 60; - config->params.tx_biastee = 0; - - return config; -} - -/* Initialize configuration items not provided by user */ -static int init_remaining_params(struct config *config) -{ - int status; - - if (config->bladerf_dev == NULL) { - status = bladerf_open(&config->bladerf_dev, NULL); - if (status != 0) { - fprintf(stderr, "Failed to open any available bladeRF: %s\n", - bladerf_strerror(status)); - return status; - } - } - - if (config->rx_output == NULL) { - config->rx_output = stdout; - } - - if (config->tx_input == NULL) { - config->tx_input = stdin; - config->tx_filesize = -1; - } - - return 0; -} - -int config_init_from_cmdline(int argc, char * const argv[], - struct config **config_out) -{ - int status = 0; - struct config *config = NULL; - int c, idx; - bool valid; - struct stat file_info; - - config = alloc_config_with_defaults(); - if (config == NULL) { - pr_dbg("%s: Failed to alloc config.\n", __FUNCTION__); - return -2; - } - - while ((c = getopt_long(argc, argv, OPTIONS, long_options, &idx)) != -1) { - switch (c) { - case OPTION_HELP: - status = 1; - goto out; - - case OPTION_DEVICE: - if (config->bladerf_dev == NULL) { - status = bladerf_open(&config->bladerf_dev, optarg); - if (status < 0) { - fprintf(stderr, "Failed to open bladeRF=%s: %s\n", - optarg, bladerf_strerror(status)); - goto out; - } - } - break; - - case OPTION_OUTPUT: - if (config->rx_output == NULL) { - if (!strcasecmp(optarg, "stdout")) { - config->rx_output = stdout; - } else { - config->rx_output = fopen(optarg, "wb"); - if (config->rx_output == NULL) { - status = -errno; - fprintf(stderr, "Failed to open %s for writing: %s\n", - optarg, strerror(-status)); - goto out; - } - } - } - break; - - case OPTION_RXLNA: - status = str2lnagain(optarg, &config->params.rx_lna_gain); - if (status != 0) { - fprintf(stderr, "Invalid RX LNA gain: %s\n", optarg); - goto out; - } - break; - - case OPTION_RXVGA1: - config->params.rx_agc = 0; - config->params.rx_use_unified = 0; - config->params.rx_vga1_gain = - str2int(optarg, - BLADERF_RXVGA1_GAIN_MIN, - BLADERF_RXVGA1_GAIN_MAX, - &valid); - - if (!valid) { - status = -1; - fprintf(stderr, "Invalid RX VGA1 gain: %s\n", optarg); - goto out; - } - break; - - case OPTION_RXVGA2: - config->params.rx_agc = 0; - config->params.rx_use_unified = 0; - config->params.rx_vga2_gain = - str2int(optarg, - BLADERF_RXVGA2_GAIN_MIN, - BLADERF_RXVGA2_GAIN_MAX, - &valid); - - if (!valid) { - status = -1; - fprintf(stderr, "Invalid RX VGA2 gain: %s\n", optarg); - goto out; - } - break; - - case OPTION_RXFREQ: - config->params.rx_freq = - str2uint_suffix(optarg, - BLADERF_FREQUENCY_MIN, - BLADERF_FREQUENCY_MAX, - freq_suffixes, num_freq_suffixes, - &valid); - - if (!valid) { - status = -1; - fprintf(stderr, "Invalid RX frequency: %s\n", optarg); - goto out; - } - break; - - case OPTION_RXGAIN: - config->params.rx_agc = 0; - config->params.rx_use_unified = 1; - config->params.rx_unified_gain = str2int(optarg, - UNIFIED_GAIN_MIN, - UNIFIED_GAIN_MAX, - &valid); - - if (!valid) { - status = -1; - fprintf(stderr, "Invalid unified RX gain: %s\n", optarg); - goto out; - } - break; - - case OPTION_RXAGC: - config->params.rx_agc = 1; - break; - - case OPTION_RXBIAST: - config->params.rx_biastee = 1; - break; - - case OPTION_INPUT: - if (config->tx_input == NULL) { - if (!strcasecmp(optarg, "stdin")) { - config->tx_input = stdin; - config->tx_filesize = -1; - } else { - config->tx_input = fopen(optarg, "rb"); - if (config->tx_input == NULL) { - status = -errno; - fprintf(stderr, "Failed to open %s for reading: %s\n", - optarg, strerror(-status)); - goto out; - } - //Get file size - status = stat(optarg, &file_info); - if (status != 0){ - fprintf(stderr, "Couldn't filesize of %s: %s\n", - optarg, strerror(status)); - } - config->tx_filesize = file_info.st_size; - } - } - break; - - case OPTION_TXVGA1: - config->params.tx_use_unified = 0; - config->params.tx_vga1_gain = - str2int(optarg, - BLADERF_TXVGA1_GAIN_MIN, - BLADERF_TXVGA2_GAIN_MAX, - &valid); - - if (!valid) { - status = -1; - fprintf(stderr, "Invalid TX VGA1 gain: %s\n", optarg); - goto out; - } - break; - - case OPTION_TXVGA2: - config->params.tx_use_unified = 0; - config->params.tx_vga2_gain = - str2int(optarg, - BLADERF_TXVGA2_GAIN_MIN, - BLADERF_TXVGA2_GAIN_MAX, - &valid); - - if (!valid) { - status = -1; - fprintf(stderr, "Invalid TX VGA2 gain: %s\n", optarg); - goto out; - } - break; - - case OPTION_TXGAIN: - config->params.tx_use_unified = 1; - config->params.tx_unified_gain = str2int(optarg, - UNIFIED_GAIN_MIN, - UNIFIED_GAIN_MAX, - &valid); - - if (!valid) { - status = -1; - fprintf(stderr, "Invalid unified TX gain: %s\n", optarg); - goto out; - } - break; - - case OPTION_TXBIAST: - config->params.tx_biastee = 1; - break; - - case OPTION_TXFREQ: - config->params.tx_freq = - str2uint_suffix(optarg, - BLADERF_FREQUENCY_MIN, - BLADERF_FREQUENCY_MAX, - freq_suffixes, num_freq_suffixes, - &valid); - if (!valid) { - status = -1; - fprintf(stderr, "Invalid TX frequency: %s\n", optarg); - goto out; - } - break; - - case OPTION_QUIET: - config->quiet = true; - break; - } - } - - /* Initialize any properties not covered by user input */ - status = init_remaining_params(config); - -out: - if (status != 0) { - config_deinit(config); - *config_out = NULL; - } else { - *config_out = config; - } - - return status; -} - -void config_deinit(struct config *config) -{ - if (config == NULL) { - pr_dbg("%s: NULL ptr\n", __FUNCTION__); - return; - } - - pr_dbg("Deinitializing...\n"); - - if (config->bladerf_dev != NULL) { - pr_dbg("\tClosing bladerf.\n"); - bladerf_close(config->bladerf_dev); - config->bladerf_dev = NULL; - } -if (config->rx_output != NULL) { - fclose(config->rx_output); - config->rx_output = NULL; - } - - if (config->tx_input != NULL) { - fclose(config->tx_input); - config->tx_input = NULL; - } - - free(config); -} - -void config_print_options() -{ - printf( - -" -h, --help Show this help text.\n" -" -d, --device Open the specified bladeRF device.\n" -" Any available device is used if not specified.\n" -" -q, --quiet Suppress printing of banner/exit messages.\n" -"\n\n" -" -r, --rx-freq RX frequency in Hz. Default: %d\n" -" -o, --output RX data output. stdout is used if not specified.\n" -"\n" -" RX gains:\n" -" The default RX gain mode is to enable the AGC. To use manual unified gains, use --rx-gain. Alternatively,\n" -" to set specific gain stages on the bladeRF 1 specify --rx-lna, --rx-vga1, --rx-vga2.\n" -"\n" -" --rx-agc Enables slow moving RX AGC (enabled by default)\n" -" --rx-gain RX unified gain. Values: %d to %d. Default %d\n" -" --rx-lna RX LNA gain. Values: bypass, mid, max (default). [bladeRF 1 only]\n" -" --rx-vga1 RX VGA1 gain. Range: %d to %d. Default = %d. [bladeRF 1 only]\n" -" --rx-vga2 RX VGA2 gain. Range: %d to %d. Default = %d. [bladeRF 1 only]\n" -"\n\n" -" -t, --tx-freq TX frequency. Default: %d\n" -" -i, --input TX data input. stdin is used if not specified.\n" -"\n" -" TX gains:\n" -" The default TX gain is to use unified gains, which can be set with --tx-gain. Alternatively,\n" -" to set specific gain stages on the bladeRF 1 specify --tx-vag1, --tx-vga2.\n" -"\n" -" --tx-gain TX unified gain. Values: %d to %d. Default: %d\n" -" --tx-vga1 TX VGA1 gain. Range: %d to %d. Default = %d. [bladeRF 1 only]\n" -" --tx-vga2 TX VGA2 gain. Range: %d to %d. Default = %d. [bladeRF 1 only]\n", - - RX_FREQ_DEFAULT, - UNIFIED_GAIN_MIN, UNIFIED_GAIN_MAX, UNIFIED_GAIN_MAX, - BLADERF_RXVGA1_GAIN_MIN, BLADERF_RXVGA1_GAIN_MAX, RX_VGA1_DEFAULT, - BLADERF_RXVGA2_GAIN_MIN, BLADERF_RXVGA2_GAIN_MAX, RX_VGA2_DEFAULT, - - TX_FREQ_DEFAULT, - UNIFIED_GAIN_MIN, UNIFIED_GAIN_MAX, UNIFIED_GAIN_MAX, - BLADERF_TXVGA1_GAIN_MIN, BLADERF_TXVGA1_GAIN_MAX, TX_VGA1_DEFAULT, - BLADERF_TXVGA2_GAIN_MIN, BLADERF_TXVGA2_GAIN_MAX, TX_VGA2_DEFAULT - - ); -} - -#ifdef CONFIG_TEST -void print_test_help(const char *argv0) -{ - printf("Config structure test\n"); - printf("Usage: %s [options]\n\n", argv0); - printf("Options:\n"); - config_print_options(); - printf("\n"); -} - -void print_config(const struct config *config) -{ - printf("bladeRF handle: %p\n", config->bladerf_dev); - printf("\n"); - printf("RX Parameters:\n"); - printf(" Output handle: %p\n", config->rx_output); - printf(" Frequency (Hz): %u\n", config->params.rx_freq); - printf(" LNA gain: %d\n", config->params.rx_lna_gain); - printf(" VGA1 gain: %d\n", config->params.rx_vga1_gain); - printf(" VGA2 gain: %d\n", config->params.rx_vga2_gain); - printf(" Use unified: %d\n", config->params.rx_use_unified); - printf(" Unified gain: %d\n", config->params.rx_unified_gain); - printf(" Biastee: %d\n", config->params.rx_use_unified); - printf(" AGC enabled: %d\n", config->params.rx_agc); - printf("\n"); - printf("TX Parameters:\n"); - printf(" Input handle: %p\n", config->tx_input); - printf(" Frequency (Hz): %u\n", config->params.tx_freq); - printf(" VGA1 gain: %d\n", config->params.tx_vga1_gain); - printf(" VGA2 gain: %d\n", config->params.tx_vga2_gain); - printf(" Use unified: %d\n", config->params.tx_use_unified); - printf(" Unified gain: %d\n", config->params.tx_unified_gain); - printf(" Biastee: %d\n", config->params.tx_use_unified); - printf("\n"); -} - -int main(int argc, char *argv[]) -{ - int status; - struct config *config = NULL; - - status = config_init_from_cmdline(argc, argv, &config); - if (status < 0) { - return status; - } else if (status == 1) { - print_test_help(argv[0]); - return 0; - } else if (status > 0) { - fprintf(stderr, "Unexpected return value: %d\n", status); - return status; - } - - print_config(config); - config_deinit(config); - return EXIT_SUCCESS; -} -#endif diff --git a/host/utilities/bladeRF-fsk/c/src/config.h b/host/utilities/bladeRF-fsk/c/src/config.h deleted file mode 100644 index 2fe7873c..00000000 --- a/host/utilities/bladeRF-fsk/c/src/config.h +++ /dev/null @@ -1,67 +0,0 @@ -/** - * @file - * @brief Gets configuration options from command line arguments - * - * This file is part of the bladeRF project - * - * Copyright (C) 2016 Nuand LLC - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#include -#include -#include - -#include "common.h" - -/** - * Application configuration parameters - */ -struct config { - struct bladerf *bladerf_dev; //bladeRF device handle - struct radio_params params; //Radio parameters: gains and frequencies - FILE *rx_output; //File to write received data to - FILE *tx_input; //File to read transmitted data from - long int tx_filesize; //Size of the tx_input file, if it is not stdin - bool quiet; //Option to suppress printing of banner message -}; - - -/** - * Create and intialize an application configuration from command line arguments - * - * @param[in] argc argc from main() - * @param[in] argv argv from main() - * @param[out] c Updated to point to configuration struture on success, - * or NULL on non-zero return. - * - * @return 0 on success - * 1 on request for help text - * <0 on failure - */ -int config_init_from_cmdline(int argc, char * const argv[], struct config **c); - -/** - * Deinitialize and deallocate a configuration structure and all of its members - * - * @param c Configuration to deinitialize - */ -void config_deinit(struct config *c); - -/** - * Print help text for options parsed by config_init_from_cmdline() - */ -void config_print_options(); diff --git a/host/utilities/bladeRF-fsk/c/src/correlator.c b/host/utilities/bladeRF-fsk/c/src/correlator.c deleted file mode 100644 index 2a84e228..00000000 --- a/host/utilities/bladeRF-fsk/c/src/correlator.c +++ /dev/null @@ -1,394 +0,0 @@ -/** - * @brief Cross correlates the input waveform with the preamble waveform and - * detects peaks - * - * This file is part of the bladeRF project - * - * Copyright (C) 2016 Nuand LLC - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#include -#include -#include -#include -#include -#include -#include - -#include "correlator.h" -#include "host_config.h" - -#ifdef ENABLE_CORR_DEBUG_MSG -# define DBG(...) fprintf(stderr, "[Corr] " __VA_ARGS__) -#else -# define DBG(...) -#endif - -#define COUNTDOWN_INACTIVE (UINT_MAX) - -#define LOG_FILE_SUFFIX "_correlator_log.csv" - -struct complexf { - float real; - float imag; -}; - -struct correlator { - struct complexf *ref; /* Reference signal to correlate against */ - size_t len; /* Length of reference sig, insamples */ - - float threshold_pwr; /* Correlation power threshold */ - - float max; /* Max correlation value we've seen so far */ - - unsigned int num_counts; /* Number of samples to observe after a - * detected correlation and before asserting - * a match. This is intended to ensure we - * we report the local maxima. - */ - - unsigned int countdown; /* Countdown until a value exceeding the - * max value is reported */ - - uint64_t match_timestamp; /* Timestamp when we found our max - * correlation value */ - - struct complexf *buf; /* Sample buffer */ - struct complexf *ins1; /* Insertion points */ - struct complexf *ins2; - struct complexf *end; /* Pointer to element past buf */ - -# ifdef LOG_CORRELATOR_OUTPUT - FILE *out; -# endif -}; - -#ifdef LOG_CORRELATION_SIGNAL -static void save_reference_sig(struct complexf *ref, size_t len) -{ - size_t i; - FILE *out = fopen("corr_sig.csv", "w"); - if (out == NULL) { - perror("fopen"); - return; - } - - for (i = 0; i < len; i++) { - fprintf(out, "%f,%f\n", ref[i].real, ref[i].imag); - } - - fclose(out); -} -#endif - -struct correlator *corr_init(uint8_t *syms, size_t n, unsigned int sps) -{ - int status = -1; - size_t i; - struct correlator *ret = NULL; - struct fsk_handle *fsk = NULL; - struct complex_sample *raw_samples = NULL; -#ifdef LOG_CORRELATOR_OUTPUT - char log_name[] = "correlator_log.csv"; -#endif - - if (n < 8 || (n % 8 != 0)) { - fprintf(stderr, "Number of correlation symbols must be a multiple of 8.\n"); - return NULL; - } else if (sps < 1) { - fprintf(stderr, "SPS must be >= 1.\n"); - return NULL; - } - - ret = calloc(1, sizeof(ret[0])); - if (ret == NULL) { - perror("malloc"); - goto out; - } - -# ifdef LOG_CORRELATOR_OUTPUT - ret->out = fopen(log_name, "w"); - if (ret->out == NULL) { - perror("fopen"); - goto out; - } -# endif - - //Length is the ceiling of (sps*n/DECIMATION_FACTOR) - ret->len = 1 + (sps*n-1)/DECIMATION_FACTOR; - - ret->ref = malloc(ret->len * sizeof(ret->ref[0])); - if (ret->ref == NULL) { - perror("malloc"); - goto out; - } - - /* Buffer is 2x as a means to implement a shift register using - * moving insertion points */ - ret->buf = malloc(2 * ret->len * sizeof(ret->buf[0])); - if (ret->buf == NULL) { - perror("malloc"); - goto out; - } - - raw_samples = malloc(sps * n * sizeof(raw_samples[0])); - if (raw_samples == NULL) { - perror("malloc"); - goto out; - } - - //generate preamble waveform - fsk = fsk_init(); - if (fsk == NULL){ - fprintf(stderr, "Couldn't initialize FSK modulator\n"); - goto out; - } - fsk_mod(fsk, syms, (int)n/8, raw_samples); - //Convert sc16q11 to complexf and decimate - for (i = 0; i < ret->len; i ++){ - ret->ref[i].real = raw_samples[i*DECIMATION_FACTOR].i/2048.0f; - ret->ref[i].imag = raw_samples[i*DECIMATION_FACTOR].q/2048.0f; - } - - /* Take the complex conjugate of our modulated reference signal - * to avoid needing to do this each time we perform a dot product - * operation later */ - for (i = 0; i < ret->len; i++) { - ret->ref[i].imag = -ret->ref[i].imag; - } - - ret->end = &ret->buf[2 * ret->len]; - //Maximum power is ret->len/DECIMATION_FACTOR * ret->len/DECIMATION_FACTOR - ret->threshold_pwr = ret->len * ret->len * 0.5625f; - - ret->num_counts = sps/DECIMATION_FACTOR - 1; - - corr_reset(ret); - -# ifdef LOG_CORRELATION_SIGNAL - save_reference_sig(ret->ref, ret->len); -# endif - - status = 0; - - DBG("Correlator decimation factor = %u\n", DECIMATION_FACTOR); - DBG("Correlator length: %zd symbols (%zd samples)\n", - n, ret->len); - - DBG("Correlator power threshold: %f\n", ret->threshold_pwr); - - -out: - if (status != 0) { - corr_deinit(ret); - ret = NULL; - } - - fsk_close(fsk); - free(raw_samples); - - return ret; -} - -void corr_deinit(struct correlator *corr) -{ - if (corr) { - free(corr->ref); - free(corr->buf); - -# ifdef LOG_CORRELATOR_OUTPUT - if (corr->out != NULL) { - fclose(corr->out); - } -# endif - - free(corr); - } -} - -static inline void reset_insertion_points(struct correlator *corr) -{ - corr->ins1 = corr->buf; - corr->ins2 = corr->buf + corr->len; -} - -void corr_reset(struct correlator *corr) -{ - size_t i; - - if (corr != NULL) { - reset_insertion_points(corr); - corr->match_timestamp = CORRELATOR_NO_RESULT; - corr->max = corr->threshold_pwr; - corr->countdown = COUNTDOWN_INACTIVE; - - for (i = 0; i < (2 * corr->len); i++) { - corr->buf[i].real = corr->buf[i].imag = 0.0f; - } - } -} - -uint64_t corr_process(struct correlator *corr, - const struct complex_sample *samples, size_t n, - uint64_t timestamp) -{ - size_t i, j; - - uint64_t detected = CORRELATOR_NO_RESULT; - - for (i = 0; i < n; i += DECIMATION_FACTOR) { - struct complexf *ref = corr->ref + corr->len - 1; - struct complexf *buf = corr->ins2; - struct complexf result; - float result_pwr; - - /* Insert sample */ - //Scale by 1/2048 - corr->ins1->real = corr->ins2->real = samples[i].i/2048.0f; - corr->ins1->imag = corr->ins2->imag = samples[i].q/2048.0f; - - result.real = result.imag = 0; - - /* Cross correlate */ - for (j = 0; j < corr->len; j ++) { - result.real += ref->real * buf->real - ref->imag * buf->imag; - result.imag += ref->real * buf->imag + ref->imag * buf->real; - - ref--; - buf--; - } - - result_pwr = result.real * result.real + result.imag * result.imag; - -# ifdef LOG_CORRELATOR_OUTPUT - fprintf(corr->out, "%f, %"PRIu64"\n", result_pwr, timestamp); -# endif - - if (result_pwr > corr->max) { - corr->max = result_pwr; - corr->countdown = corr->num_counts; - corr->match_timestamp = timestamp; - - DBG("Got a match at %"PRIu64", result_pwr=%f. Resetting countdown.\n", - timestamp, result_pwr); - - } else if (corr->countdown != COUNTDOWN_INACTIVE) { - //Find the peak - - if (--corr->countdown == 0) { - /* We have a result! Exit early with it */ - detected = corr->match_timestamp; - - DBG("Countdown complete. Acquired at: %"PRIu64"\n", detected); - - corr_reset(corr); - return detected; - } else { - DBG("Countdown @ %u\n", corr->countdown); - } - } - - /* Update insertion points */ - corr->ins2++; - if (corr->ins2 == corr->end) { - reset_insertion_points(corr); - } else { - corr->ins1++; - } - - /* Update record of which timestamp we're on...*/ - timestamp += 2; - } - - return detected; -} - -#ifdef CORRELATOR_TEST -#include -#include -#include "utils.h" - -static uint8_t code_a[] = { 0x2E, 0x69, 0x2C, 0xF0 }; - -int main(int argc, char *argv[]) -{ - FILE *in = NULL; - int16_t *raw_samples = NULL; - struct complex_sample *samples = NULL; - struct correlator *corr = NULL; - uint64_t timestamp = 0; - uint64_t acquisition = CORRELATOR_NO_RESULT; - int sps; - int i; - int status = -1; - - int num_samples; - - if (argc != 3) { - fprintf(stderr, "Usage: %s \n", argv[0]); - return EXIT_FAILURE; - } - - num_samples = load_samples_from_csv_file(argv[1], false, 0, &raw_samples); - if (num_samples < 0){ - fprintf(stderr, "Couldn't load samples from file\n"); - return 1; - } - printf("Loaded %d samples\n", num_samples); - - sps = atoi(argv[2]); - - samples = calloc(num_samples, sizeof(samples[0])); - if (samples == NULL) { - perror("calloc"); - goto out; - } - - corr = corr_init(code_a, 8 * sizeof(code_a), sps); - if (corr == NULL) { - fprintf(stderr, "Failed to initialize correlator.\n"); - goto out; - } - - //Convert sc16q11 to complex_sample - for (i = 0; i < num_samples; ++i) { - samples[i].i = raw_samples[(2*i)]; - samples[i].q = raw_samples[(2*i)+1]; - } - - acquisition = corr_process(corr, samples, num_samples, timestamp); - - if (acquisition == CORRELATOR_NO_RESULT) { - printf("Correlation symbols not found.\n"); - } else { - printf("Acquired Code. Acquisition = %"PRIu64"\n", acquisition); - } - - status = 0; - -out: - corr_deinit(corr); - - if (in != NULL) { - fclose(in); - } - - free(raw_samples); - free(samples); - return status; -} -#endif diff --git a/host/utilities/bladeRF-fsk/c/src/correlator.h b/host/utilities/bladeRF-fsk/c/src/correlator.h deleted file mode 100644 index b94626cc..00000000 --- a/host/utilities/bladeRF-fsk/c/src/correlator.h +++ /dev/null @@ -1,76 +0,0 @@ -/** - * @file - * @brief Cross correlates the input waveform with the preamble waveform and - * detects peaks - * - * This file is part of the bladeRF project - * - * Copyright (C) 2016 Nuand LLC - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ -#ifndef CORRELATOR_H_ -#define CORRELATOR_H_ - -#include -#include "common.h" -#include "fsk.h" - -struct correlator; - -#define CORRELATOR_NO_RESULT (UINT64_MAX) -//Amount to decimate by. If 1, no decimation will occur. If 2, the correlator will -//use every other sample. If 3 the correlator will use every third sample. And so on. -#define DECIMATION_FACTOR 2 - -/** - * Create a correlator. This is currently limited to symbol lengths that are - * a multiple of 8 (a byte). - * - * @param syms Symbols to correlate against - * @param n Number of symbols in `syms`. Must be a multiple of 8. - * @param sps Samples per symbol for modulation. - * - * @return correlator handle on success, NULL on failure - */ -struct correlator *corr_init(uint8_t *syms, size_t n, unsigned int sps); - -/** - * Deinitialize and deallocate the provided correlator - */ -void corr_deinit(struct correlator *corr); - -/** - * Reset the state of the corrlator. This should be done after a corr_process() - * returns a result. - */ -void corr_reset(struct correlator *corr); - -/** - * Process samples and return timestamp of when correlation occurred - * - * @param samples Samples to process - * @param n Number of provided samples - * @param timestamp Timestamp of first samples in `samples` - * - * @return The timestamp at which the correlation was found to occur, - * or CORRELATOR_NO_RESULT if no match was detected. - */ -uint64_t corr_process(struct correlator *corr, - const struct complex_sample *samples, size_t n, - uint64_t timestamp); - - -#endif diff --git a/host/utilities/bladeRF-fsk/c/src/crc32.c b/host/utilities/bladeRF-fsk/c/src/crc32.c deleted file mode 100644 index ae675249..00000000 --- a/host/utilities/bladeRF-fsk/c/src/crc32.c +++ /dev/null @@ -1,179 +0,0 @@ -/** - * @brief CRC-32 implementation based upon examples provided in Chapter 14 of - * Hacker's Delight (2nd Edition) by Henry S. Warren, Jr. - * - * http://www.hackersdelight.org - * - * This file is part of the bladeRF project - * - * Copyright (C) 2016 Nuand LLC - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#include - -#include "host_config.h" -#include "crc32.h" - -static uint32_t crc32_lut[256]; - -uint32_t crc32(void *data, size_t len) -{ - size_t i; - uint8_t *bytes = (uint8_t *) data; - uint32_t crc = 0xffffffff; - - for (i = 0; i < len; i++) { - crc = (crc >> 8) ^ crc32_lut[(crc ^ bytes[i]) & 0xff]; - } - - return ~crc; -} - -#if defined(CRC32_TEST) -#include -#include -#include -int main(int argc, char *argv[]) -{ - FILE *in; - uint8_t *buf = NULL; - long file_len; - ssize_t n_read; - int status; - uint32_t crc; - - if (argc != 2 || !strcmp(argv[1], "-h") || !strcmp(argv[1], "--help")) { - fprintf(stderr, "%s \n", argv[0]); - return EXIT_FAILURE; - } - - in = fopen(argv[1], "rb"); - if (!in) { - perror("fopen"); - return EXIT_FAILURE; - } - - status = fseek(in, 0, SEEK_END); - if (status != 0) { - perror("fseek"); - goto out; - } - - file_len = ftell(in); - if (file_len < 0) { - perror("ftell"); - goto out; - } - - status = fseek(in, 0, SEEK_SET); - if (status != 0) { - perror("fseek"); - goto out; - } - - buf = malloc(file_len); - if (!buf) { - perror("malloc"); - } - - n_read = fread(buf, 1, file_len, in); - if (n_read < 0) { - perror("fread"); - } - - crc = crc32(buf, file_len); - printf("%08x\n", crc); - -out: - free(buf); - fclose(in); - return status; -} - -#elif defined(CRC32_GEN_TABLE) -#include -int main(int argc, char *argv[]) -{ - uint32_t crc, mask; - unsigned int i, j; - printf("staticx uint32_t crc32_lut[256] = {"); - - for (i = 0; i < 256; i++) { - crc = i; - for (j = 0; j < 8; j++) { - mask = -(crc & 1); - crc = (crc >> 1) ^ (0xedb88320 & mask); - } - - /* Keep lines under 80 char */ - if (i % 6 == 0) { - printf("\n "); - } - printf(" 0x%08x,", crc); - } - - printf("\n};\n"); - - return 0; -} -#endif - -static uint32_t crc32_lut[256] = { - 0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f, - 0xe963a535, 0x9e6495a3, 0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988, - 0x09b64c2b, 0x7eb17cbd, 0xe7b82d07, 0x90bf1d91, 0x1db71064, 0x6ab020f2, - 0xf3b97148, 0x84be41de, 0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7, - 0x136c9856, 0x646ba8c0, 0xfd62f97a, 0x8a65c9ec, 0x14015c4f, 0x63066cd9, - 0xfa0f3d63, 0x8d080df5, 0x3b6e20c8, 0x4c69105e, 0xd56041e4, 0xa2677172, - 0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b, 0x35b5a8fa, 0x42b2986c, - 0xdbbbc9d6, 0xacbcf940, 0x32d86ce3, 0x45df5c75, 0xdcd60dcf, 0xabd13d59, - 0x26d930ac, 0x51de003a, 0xc8d75180, 0xbfd06116, 0x21b4f4b5, 0x56b3c423, - 0xcfba9599, 0xb8bda50f, 0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924, - 0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d, 0x76dc4190, 0x01db7106, - 0x98d220bc, 0xefd5102a, 0x71b18589, 0x06b6b51f, 0x9fbfe4a5, 0xe8b8d433, - 0x7807c9a2, 0x0f00f934, 0x9609a88e, 0xe10e9818, 0x7f6a0dbb, 0x086d3d2d, - 0x91646c97, 0xe6635c01, 0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e, - 0x6c0695ed, 0x1b01a57b, 0x8208f4c1, 0xf50fc457, 0x65b0d9c6, 0x12b7e950, - 0x8bbeb8ea, 0xfcb9887c, 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3, 0xfbd44c65, - 0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2, 0x4adfa541, 0x3dd895d7, - 0xa4d1c46d, 0xd3d6f4fb, 0x4369e96a, 0x346ed9fc, 0xad678846, 0xda60b8d0, - 0x44042d73, 0x33031de5, 0xaa0a4c5f, 0xdd0d7cc9, 0x5005713c, 0x270241aa, - 0xbe0b1010, 0xc90c2086, 0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f, - 0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4, 0x59b33d17, 0x2eb40d81, - 0xb7bd5c3b, 0xc0ba6cad, 0xedb88320, 0x9abfb3b6, 0x03b6e20c, 0x74b1d29a, - 0xead54739, 0x9dd277af, 0x04db2615, 0x73dc1683, 0xe3630b12, 0x94643b84, - 0x0d6d6a3e, 0x7a6a5aa8, 0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1, - 0xf00f9344, 0x8708a3d2, 0x1e01f268, 0x6906c2fe, 0xf762575d, 0x806567cb, - 0x196c3671, 0x6e6b06e7, 0xfed41b76, 0x89d32be0, 0x10da7a5a, 0x67dd4acc, - 0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5, 0xd6d6a3e8, 0xa1d1937e, - 0x38d8c2c4, 0x4fdff252, 0xd1bb67f1, 0xa6bc5767, 0x3fb506dd, 0x48b2364b, - 0xd80d2bda, 0xaf0a1b4c, 0x36034af6, 0x41047a60, 0xdf60efc3, 0xa867df55, - 0x316e8eef, 0x4669be79, 0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236, - 0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f, 0xc5ba3bbe, 0xb2bd0b28, - 0x2bb45a92, 0x5cb36a04, 0xc2d7ffa7, 0xb5d0cf31, 0x2cd99e8b, 0x5bdeae1d, - 0x9b64c2b0, 0xec63f226, 0x756aa39c, 0x026d930a, 0x9c0906a9, 0xeb0e363f, - 0x72076785, 0x05005713, 0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38, - 0x92d28e9b, 0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21, 0x86d3d2d4, 0xf1d4e242, - 0x68ddb3f8, 0x1fda836e, 0x81be16cd, 0xf6b9265b, 0x6fb077e1, 0x18b74777, - 0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c, 0x8f659eff, 0xf862ae69, - 0x616bffd3, 0x166ccf45, 0xa00ae278, 0xd70dd2ee, 0x4e048354, 0x3903b3c2, - 0xa7672661, 0xd06016f7, 0x4969474d, 0x3e6e77db, 0xaed16a4a, 0xd9d65adc, - 0x40df0b66, 0x37d83bf0, 0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9, - 0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6, 0xbad03605, 0xcdd70693, - 0x54de5729, 0x23d967bf, 0xb3667a2e, 0xc4614ab8, 0x5d681b02, 0x2a6f2b94, - 0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d, -}; diff --git a/host/utilities/bladeRF-fsk/c/src/crc32.h b/host/utilities/bladeRF-fsk/c/src/crc32.h deleted file mode 100644 index 3cd4d0c0..00000000 --- a/host/utilities/bladeRF-fsk/c/src/crc32.h +++ /dev/null @@ -1,37 +0,0 @@ -/** - * @file - * @brief CRC-32 implementation based upon examples provided in Chapter 14 of - * Hacker's Delight (2nd Edition) by Henry S. Warren, Jr. - * - * http://www.hackersdelight.org - * - * This file is part of the bladeRF project - * - * Copyright (C) 2016 Nuand LLC - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#ifndef CRC32_CALC_H_ -#define CRC32_CALC_H_ - -#include - -/** - * Compute return a CRC32 checksum computed over the `len` bytes of `data`. - */ -uint32_t crc32(void *data, size_t len); - -#endif diff --git a/host/utilities/bladeRF-fsk/c/src/fir_filter.c b/host/utilities/bladeRF-fsk/c/src/fir_filter.c deleted file mode 100644 index 59f34f0e..00000000 --- a/host/utilities/bladeRF-fsk/c/src/fir_filter.c +++ /dev/null @@ -1,278 +0,0 @@ -/** - * @brief Filters the input signal with the given FIR filter coefficients - * - * This file is part of the bladeRF project - * - * Copyright (C) 2016 Nuand LLC - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#include -#include -#include -#include -#include "host_config.h" - -#include "fir_filter.h" - -#ifdef ENABLE_FIR_FILTER_DEBUG_MSG -# define DBG(...) fprintf(stderr, "[FIR] " __VA_ARGS__) -#else -# define DBG(...) -#endif - -struct fir_filter { - - float *taps; /* Filter taps */ - size_t length; /* Length of the filter, in taps */ - - /* Interpolation or decimation factor */ - unsigned int factor; - - /* Insertion points into "shift register" implementation that utilizes - * two copies of data to achieve a contiguious shifting window. */ - size_t ins1; - size_t ins2; - - /* Filter state buffers */ - int32_t *i; - int32_t *q; -}; - -static void fir_reset(struct fir_filter *filt) -{ - size_t n; - - for (n = 0; n < (2 * filt->length); n++) { - filt->i[n] = 0; - filt->q[n] = 0; - } - - /* Remember, state is 2 copies: array len is 2 * filt->length elts */ - filt->ins1 = 0; - filt->ins2 = filt->length; -} - -void fir_deinit(struct fir_filter *filt) -{ - if (filt) { - free(filt->q); - free(filt->i); - free(filt->taps); - free(filt); - } -} - -struct fir_filter * fir_init(const float *taps, size_t length) -{ - struct fir_filter *filt; - - filt = calloc(1, sizeof(filt[0])); - if (!filt) { - perror("calloc"); - return NULL; - } - - /* Filter state is a sliding window implemented with 2 copies of data */ - filt->i = calloc(2 * length, sizeof(filt->i[0])); - if (!filt->i) { - perror("calloc"); - fir_deinit(filt); - return NULL; - } - - filt->q = calloc(2 * length, sizeof(filt->q[0])); - if (!filt->i) { - perror("calloc"); - fir_deinit(filt); - return NULL; - } - - filt->taps = calloc(length, sizeof(filt->taps[0])); - if (!filt->taps) { - perror("calloc"); - fir_deinit(filt); - return NULL; - } - - memcpy(filt->taps, taps, length * sizeof(filt->taps[0])); - filt->length = length; - - fir_reset(filt); - return filt; -} - -void fir_process(struct fir_filter *f, int16_t *input, - struct complex_sample *output, size_t count) -{ - /* Index into input/output buffers */ - size_t inout_idx; - - /* Index into f->taps array */ - size_t t; - - /* Index into f->i and f->q state arrays */ - size_t s; - - for (inout_idx = 0; inout_idx < (2*count); inout_idx += 2) { - int32_t i = input[inout_idx]; - int32_t q = input[inout_idx+1]; - float result_i = 0; - float result_q = 0; - - /* Insert samples */ - f->i[f->ins1] = f->i[f->ins2] = i; - f->q[f->ins1] = f->q[f->ins2] = q; - - /* Convolve */ - for (t = 0, s = f->ins2; t < f->length; t++, s--) { - float tmp_i, tmp_q; - - tmp_i = f->taps[t] * f->i[s]; - tmp_q = f->taps[t] * f->q[s]; - - result_i += tmp_i; - result_q += tmp_q; - } - - /* Update output sample */ - output[inout_idx/2].i = (int16_t) roundf(result_i); - output[inout_idx/2].q = (int16_t) roundf(result_q); - - /* Advance insertion points */ - f->ins2++; - if (f->ins2 == (2 * f->length)) { - f->ins1 = 0; - f->ins2 = f->length; - } else { - f->ins1++; - } - } -} - -#ifdef FIR_FILTER_TEST -#include -#include "conversions.h" -#include "rx_ch_filter.h" -#include "utils.h" - -int main(int argc, char *argv[]) -{ - int status = EXIT_FAILURE; - FILE *infile = NULL; - FILE *outfile = NULL; - - int16_t *inbuf = NULL, *tempbuf = NULL; - struct complex_sample *outbuf = NULL; - - struct fir_filter *filt = NULL; - - static const unsigned int max_chunk_size = 1024 * 1024 * 1024; - - unsigned int chunk_size = 4096; - size_t n_read, n_written; - bool done = false; - - if (argc < 3 || argc > 4) { - fprintf(stderr, - "Filter sc16q11 samples from and write" - "them to .\n\n"); - - fprintf(stderr, - "Usage: %s [# chunk size(samples)]\n", - argv[0]); - - return EXIT_FAILURE; - } - - if (argc == 4) { - bool valid; - chunk_size = str2uint(argv[3], 1, max_chunk_size, &valid); - if (!valid) { - fprintf(stderr, "Invalid chunk size: %s samples\n", argv[3]); - return EXIT_FAILURE; - } - } - - filt = fir_init(rx_ch_filter, rx_ch_filter_len); - if (!filt) { - fprintf(stderr, "Failed to allocate filter.\n"); - return EXIT_FAILURE; - } - - inbuf = calloc(2*sizeof(int16_t), chunk_size); - if (!inbuf) { - perror("calloc"); - goto out; - } - tempbuf = calloc(2*sizeof(int16_t), chunk_size); - if (!tempbuf) { - perror("calloc"); - goto out; - } - - outbuf = calloc(sizeof(struct complex_sample), chunk_size); - if (!outbuf) { - perror("calloc"); - goto out; - } - - infile = fopen(argv[1], "rb"); - if (!infile) { - perror("Failed to open input file"); - goto out; - } - - outfile = fopen(argv[2], "wb"); - if (!outfile) { - perror("Failed to open output file"); - goto out; - } - - while (!done) { - n_read = fread(inbuf, 2*sizeof(int16_t), chunk_size, infile); - done = n_read != chunk_size; - - fir_process(filt, inbuf, outbuf, n_read); - //convert - conv_struct_to_samples(outbuf, (unsigned int) n_read, tempbuf); - - n_written = fwrite(tempbuf, 2*sizeof(int16_t), n_read, outfile); - if (n_written != n_read) { - fprintf(stderr, "Short write encountered. Exiting.\n"); - status = -1; - goto out; - } - } - - status = 0; - -out: - if (infile) { - fclose(infile); - } - - if (outfile) { - fclose(outfile); - } - free(tempbuf); - free(inbuf); - free(outbuf); - fir_deinit(filt); - - return status; -} -#endif diff --git a/host/utilities/bladeRF-fsk/c/src/fir_filter.h b/host/utilities/bladeRF-fsk/c/src/fir_filter.h deleted file mode 100644 index 7a8cfaa0..00000000 --- a/host/utilities/bladeRF-fsk/c/src/fir_filter.h +++ /dev/null @@ -1,62 +0,0 @@ -/** - * @file - * @brief Filters the input signal with the given FIR filter coefficients - * - * This file is part of the bladeRF project - * - * Copyright (C) 2016 Nuand LLC - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ -#ifndef FIR_FILTER_H_ -#define FIR_FILTER_H_ - -#include "common.h" - -struct fir_filter; - -/** - * Construct a FIR filter with provided taps and decimation factor - * - * @param[in] taps Filter taps. - * - * @param[in] num_tamps Number of taps contained within `taps` - * - * @return `fir_filter` handle on success, - * or NULL on failure or invalid parameter - */ -struct fir_filter * fir_init(const float *taps, size_t num_taps); - -/** - * Deinitialize and deallocate the provided filter - * - * @param filt Filter to deinitialize - */ -void fir_deinit(struct fir_filter *filt); - -/** - * Perform filter operation over the provided samples - * - * @parm[in] filt Filter to use - * - * @param[in] input Input SC16Q11 samples - * @param[in] output Output SC16Q11 samples - * @param[in] count Number samples to process - * - */ -void fir_process(struct fir_filter *filt, int16_t *input, - struct complex_sample *output, size_t count); - -#endif diff --git a/host/utilities/bladeRF-fsk/c/src/fsk.c b/host/utilities/bladeRF-fsk/c/src/fsk.c deleted file mode 100644 index 746dd0e6..00000000 --- a/host/utilities/bladeRF-fsk/c/src/fsk.c +++ /dev/null @@ -1,305 +0,0 @@ -/** - * @brief FSK modulator/demodulator - * - * This file handles raw modulation and demodulation of bits using continuous-phase - * frequency shift keying (CPFSK). fsk_mod() takes in an array of bytes and produces - * a CPFSK signal in the form of baseband IQ samples. fsk_demod() takes in an array of - * CPFSK IQ samples and produces an array of bytes. - * - * This file is part of the bladeRF project - * - * Copyright (C) 2016 Nuand LLC - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ -#include "host_config.h" -#include "fsk.h" - -#ifdef DEBUG_MODE - #define DEBUG_MSG(...) fprintf(stderr, __VA_ARGS__) -#else - #define DEBUG_MSG(...) -#endif - -//internal structs -struct fsk_handle { - struct complex_sample *sample_table; - int points_per_rev; - int samp_per_symb; - //These variables keep track of the demodulator's state when a call to fsk_demod() - //did not fully demodulate the last byte, meaning it needs to be called again with - //more samples to finish demodulating that last byte - bool last_byte_demod_complete; //False if the last byte was partially demodulated - //in a call to fsk_demod() - uint8_t last_byte; - double last_phase; - double curr_dphase_tot; - int curr_samp_index; //Current samples index (0 - SAMP_PER_SYMB-1) - int curr_bit_index; -}; - -//internal functions -static struct complex_sample *fsk_gen_samples_table(int points_per_rev); -static double angle(int i, int q); -static void angle_unwrap(double angle_prev, double *angle); - -/** - * Generate 16bit two's complement IQ samples (SC16 Q11 format) corresponding to angles - * from 0 to 2*pi on the unit circle. Range = [-2048, 2047]. Store in 'sample_table'. - * 0th index is at 1+j0 (2047 + j0). Next indices will rotate counter-clockwise around - * the circle. - * Example: points_per_rev = 12 -> would produce: - * - * |Q - * . ' . - * . | . - * --.----+----.--I - * . | . - * . | . - * ' - * | - * - * @param[in] points_per_rev number of points desired in one revolution (0-2*pi) - * of the complex unit circle - * - * @return pointer to array of complex samples - */ -static struct complex_sample *fsk_gen_samples_table(int points_per_rev) -{ - int i; - struct complex_sample *sample_table; - - sample_table = malloc(points_per_rev*sizeof(struct complex_sample)); - if (sample_table == NULL){ - perror("malloc"); - return NULL; - } - - for (i = 0; i < points_per_rev; i++){ - //Calculate cosine/sine samples. Round to nearest integer. - sample_table[i].i = (int16_t) round(2048.0*cos(i * 2.0 * M_PI / points_per_rev)); - sample_table[i].q = (int16_t) round(2048.0*sin(i * 2.0 * M_PI / points_per_rev)); - //Clamp values to [-2048, 2047] - if (sample_table[i].i > 2047){ - sample_table[i].i = 2047; - } - if (sample_table[i].i < -2048){ - sample_table[i].i = -2048; - } - if (sample_table[i].q > 2047){ - sample_table[i].q = 2047; - } - if (sample_table[i].q < -2048){ - sample_table[i].q = -2048; - } - } - return sample_table; -} - -unsigned int fsk_mod(struct fsk_handle *fsk, uint8_t *data_buf, int num_bytes, - struct complex_sample *samples) -{ - - int samp_table_pos; //current position in samples table - int byte; //current byte (0-(num_bytes-1)) - int bit; //current bit (0-7) in byte - int samp; //current sample in symbol period (0-(samps_per_symb-1)) - int i; //index in samples buffer - - //Set initial position to 0 (1 + 0j) - samp_table_pos = 0; - i = 0; - for (byte = 0; byte < num_bytes; byte++){ - for (bit = 0; bit < 8; bit++){ - //Check for 1 - if ( ((data_buf[byte] >> bit) & 0x01) == 0x01 ){ - //This bit is a 1. Rotate phase CCW - for (samp = 0; samp < fsk->samp_per_symb; samp++){ - if (samp_table_pos == fsk->points_per_rev - 1){ - samp_table_pos = 0; - }else{ - samp_table_pos += 1; //Increment phase - } - samples[i].i = fsk->sample_table[samp_table_pos].i; - samples[i].q = fsk->sample_table[samp_table_pos].q; - i++; - } - }else{ - //This bit is a 0. Rotate phase CW - for (samp = 0; samp < fsk->samp_per_symb; samp++){ - if (samp_table_pos == 0){ - samp_table_pos = fsk->points_per_rev - 1; - }else{ - samp_table_pos -= 1; //Decrement phase - } - samples[i].i = fsk->sample_table[samp_table_pos].i; - samples[i].q = fsk->sample_table[samp_table_pos].q; - i++; - } - } - } - } - return i; -} - -/** - * Unwrap a single angle so it is not wrapped to [-pi, pi]. Example: If angle_prev is 0.9*pi, - * and (*angle) is -0.9*pi, then (*angle) will be changed to 1.1*pi, so the large - * (discontinuous) phase jump is not seen. - * - * @param[in] angle_prev pointer to initial angle in radians - * @param[inout] angle pointer to final angle. If an angle jump greater than pi - * or less than pi is found, this angle will be modified. - */ -static void angle_unwrap(double angle_prev, double *angle) -{ - double diff = *angle - angle_prev; - if (diff > M_PI){ - //Subtract a multiple of 2*pi from the angle - *angle -= 2*M_PI * (int)( (diff+M_PI)/(2*M_PI) ); - }else if (diff < -M_PI){ - //Add a multiple of 2*pi to the angle - *angle += 2*M_PI * (int)( (diff-M_PI)/(-2*M_PI) ); - } -} - -/** - * Returns the angle of I+jQ, using the interval (-pi, pi) - */ -static double angle(int i, int q) -{ - double ratio = (double)q / (double)i; - if (i == 0 && q == 0){ - return 0; //Angle is undefined here. Just return 0. - }else if (i >= 0 && q >= 0){ - return atan(ratio); - }else if (i < 0 && q >= 0){ - return atan(ratio) + M_PI; - }else if (i < 0 && q < 0){ - return atan(ratio) - M_PI; - }else{ //if (i >= 0 && q < 0) - return atan(ratio); - } -} - -unsigned int fsk_demod(struct fsk_handle *fsk, struct complex_sample *samples, - int num_samples, bool new_signal, int num_bytes, uint8_t *data_buf) -{ - int i; //Current samples index (0 to num_samples-1) - int byte = 0; - int bit; - int samp; - double phase, phase_prev, dphase_tot; - - i = 0; - if (new_signal){ - //Reset everything, calculate initial phase - fsk->curr_samp_index = 0; - fsk->curr_dphase_tot = 0; - fsk->curr_bit_index = 0; - fsk->last_phase = angle(samples[0].i, samples[0].q); - i++; - } - phase = fsk->last_phase; - //Initialize byte appropriately if last demod was not fully completed - //(i.e. last byte was partially demodulated) - if (!fsk->last_byte_demod_complete){ - data_buf[0] = fsk->last_byte; - } - //Loop through each byte - for (byte = 0; byte != num_bytes && i < num_samples; byte++){ - //Loop through each bit in the byte - for (bit = fsk->curr_bit_index; bit < 8; bit++){ - //Loop through SAMP_PER_SYMB samples and their corresponding changes in phase - //Stop if we reach the end of the samples buffer - dphase_tot = fsk->curr_dphase_tot; - for (samp = fsk->curr_samp_index; (samp < fsk->samp_per_symb) && i < num_samples; - samp++){ - phase_prev = phase; - phase = angle(samples[i].i, samples[i].q); - //Unwrap angle - angle_unwrap(phase_prev, &phase); - //Add this angle change to the total angle change - dphase_tot += phase - phase_prev; - i++; - } - //Check to see if we broke out of the loop before demodulating the full bit - if (samp != fsk->samp_per_symb){ - //Set demod state information - fsk->last_byte_demod_complete = false; - fsk->last_byte = data_buf[byte]; - fsk->last_phase = phase; - fsk->curr_dphase_tot = dphase_tot; - fsk->curr_samp_index = samp; - fsk->curr_bit_index = bit; - goto out; - } - if (dphase_tot > 0){ - //Received a 1. Set bit to 1. - data_buf[byte] |= 0x01 << bit; - }else{ - //Received a 0. Set bit to 0. - data_buf[byte] &= ~(0x01 << bit); - } - //Reset index variables - fsk->curr_samp_index = 0; - fsk->curr_dphase_tot = 0; - } - fsk->last_phase = phase; - fsk->curr_bit_index = 0; - fsk->last_byte_demod_complete = true; - } - - out: - return byte; -} - -struct fsk_handle *fsk_init(void) -{ - struct fsk_handle *fsk; - - //Allocate memory for handle - fsk = malloc(sizeof(struct fsk_handle)); - if (fsk == NULL){ - perror("malloc"); - return NULL; - } - //Set modulation/demodulation parameters - fsk->samp_per_symb = SAMP_PER_SYMB; - fsk->points_per_rev = POINTS_PER_REV; - //Generate the samples table - fsk->sample_table = fsk_gen_samples_table(POINTS_PER_REV); - if (fsk->sample_table == NULL){ - fprintf(stderr, "Couldn't generate samples table\n"); - free(fsk); - return NULL; - } - //Initialize demod state variables - fsk->last_byte_demod_complete = true; - fsk->last_byte = 0x00; - fsk->curr_dphase_tot = 0; - fsk->last_phase = 0; - fsk->curr_samp_index = 0; - fsk->curr_bit_index = 0; - return fsk; -} - -void fsk_close(struct fsk_handle *fsk) -{ - if (fsk != NULL){ - free(fsk->sample_table); - } - free(fsk); -} diff --git a/host/utilities/bladeRF-fsk/c/src/fsk.h b/host/utilities/bladeRF-fsk/c/src/fsk.h deleted file mode 100644 index 0e0fdcf6..00000000 --- a/host/utilities/bladeRF-fsk/c/src/fsk.h +++ /dev/null @@ -1,106 +0,0 @@ -/** - * @file - * @brief FSK modulator/demodulator - * - * This file handles raw modulation and demodulation of bits using continuous-phase - * frequency shift keying (CPFSK). fsk_mod() takes in an array of bytes and produces - * a CPFSK signal in the form of baseband IQ samples. fsk_demod() takes in an array of - * CPFSK IQ samples and produces an array of bytes. - * - * This file is part of the bladeRF project - * - * Copyright (C) 2016 Nuand LLC - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ -#ifndef FSK_H -#define FSK_H - -#define _USE_MATH_DEFINES -#include -#include -#include -#include -#include - -#include "common.h" - -/* 32 points per revolution and 8 samples per symbol means one quarter turn per - symbol = phase modulation index of pi/2 */ - -//Sample points per one revolution of the complex IQ unit circle -#define POINTS_PER_REV 32 -//Sample points per symbol -#define SAMP_PER_SYMB 8 -//NOTE: If you change these^ two macros, you'll need to change the FIR channel -//filter as well if you want the modem to work - -struct fsk_handle; - -/** - * Initialize an allocate memory for an fsk handle - * - * @return pointer to allocated/initiailized fsk_handle on success, NULL on failure - */ -struct fsk_handle *fsk_init(void); - -/** - * Deinitialize / deallocate memory for an fsk handle - * - * @param pointer to fsk handle to close - */ -void fsk_close(struct fsk_handle *fsk); - -/** - * Convert an array of bytes to an array of CPFSK modulated IQ samples - * Bit order: LSb transmitted first, MSb last - * This function assumes an initial phase of 0 (1 + 0j) - * - * @param[in] fsk pointer to fsk handle - * @param[in] data_buf bytes to transmit - * @param[in] num_bytes number of bytes to transmit from data_buf - * @param[out] samples buffer to place modulated IQ samples in - * - * @return number of IQ samples modulated - */ -unsigned int fsk_mod(struct fsk_handle *fsk, uint8_t *data_buf, int num_bytes, - struct complex_sample *samples); - -/** - * Convert an array of modulated CPFSK IQ samples into an array of bytes. - * Expected bit order: LSb arrives first, MSb arrives last. - * This function will still work when the number of samples line up in a way that the - * last byte is only partially demodulated (e.g. 3 of 8 bits demodulated, 6 of 8 samples - * processed from the 4th bit). It saves off its state to the fsk_handle struct, so in - * the next call to fsk_demod(), it will resume and finish demodulating that byte. - * - * @param[in] fsk fsk_handle struct - * @param[in] samples Array of baseband IQ samples to demodulate - * @param[in] num_samples Number of samples in samples array - * @param[in] new_signal Is this a new FSK signal or a continuation of a previous one? - * If true, the first sample will define the initial phase. Otherwise, - * the previous phase (from last call to fsk_demod()) will define the - * initial phase. - * @param[in] num_bytes number of bytes to attempt to demodulate. If -1, the function will - * demod as many bytes as 'num_samples' will allow. - * @param[out] data_buf buffer to place demodulated bytes in - * - * @return number of bytes demodulated. This number will be less than the 'num_bytes' parameter - * if there weren't enough samples to demod 'num_bytes' bytes - */ -unsigned int fsk_demod(struct fsk_handle *fsk, struct complex_sample *samples, - int num_samples, bool new_signal, int num_bytes, uint8_t *data_buf); - -#endif diff --git a/host/utilities/bladeRF-fsk/c/src/link.c b/host/utilities/bladeRF-fsk/c/src/link.c deleted file mode 100644 index 7ae0c2a7..00000000 --- a/host/utilities/bladeRF-fsk/c/src/link.c +++ /dev/null @@ -1,1208 +0,0 @@ -/** - * @brief Link layer code for modem - * - * This file interfaces with phy.c through its transmit_data_frames() and - * receive_frames() functions. - * - * This file is part of the bladeRF project - * - * Copyright (C) 2016 Nuand LLC - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#include "link.h" -#include "phy.h" -#include "crc32.h" -#include "utils.h" - -#ifdef DEBUG_MODE - #define DEBUG_MSG(...) fprintf(stderr, __VA_ARGS__) - #ifndef ENABLE_NOTES - #define ENABLE_NOTES - #endif -#else - #define DEBUG_MSG(...) -#endif - -#ifdef ENABLE_NOTES - #define NOTE(...) fprintf(stderr, __VA_ARGS__) -#else - #define NOTE(...) -#endif - -/******************************************** - * * - * PRIVATE FUNCTIONS AND DATA STRUCTURES * - * * - ********************************************/ - -struct data_frame { - //Total frame length = 1009 bytes (8072 bits) - uint8_t type; //0x00 = data frame, 0xFF = ack frame - uint16_t seq_num; //Sequence number - uint16_t payload_length; //Length of used payload data in bytes - uint8_t payload[PAYLOAD_LENGTH]; //payload data - uint32_t crc32; //32-bit CRC -}; - -struct ack_frame { - //Total frame length = 7 bytes (56 bits) - uint8_t type; //0x00 = data frame, 0xFF = ack frame - uint16_t ack_num; //Acknowledgement number - uint32_t crc32; //32-bit CRC -}; - -struct tx { - struct data_frame data_frame_buf; //Input data frame buffer - struct ack_frame ack_frame_buf; //Input ack frame buffer - bool stop; //Signal to stop tx thread - bool data_buf_filled; //Is the data frame buffer filled - pthread_t thread; //Transmitter thread - pthread_cond_t data_buf_filled_cond; //pthread condition corresponding to - //data_buf_filled - pthread_mutex_t data_buf_status_lock; //Mutex for data_buf_filled_cond - bool link_on; //Is the transmitter on - bool done; //Has the transmitter finished a transmission - bool success; //Was the transmitter transmission successful -}; - -struct rx { - struct data_frame data_frame_buf; //Output data frame buffer - struct ack_frame ack_frame_buf; //Output ack frame buffer - //Leftover bytes received but not returned to the user after a call to - //link_receive_data() - uint8_t extra_bytes[PAYLOAD_LENGTH]; - unsigned int num_extra_bytes; //Number of bytes in 'extra_bytes' buffer - pthread_t thread; //Receiver thread - bool stop; //Signal to stop rx thread - bool data_buf_filled; //Is the data frame buffer filled - pthread_cond_t data_buf_filled_cond; //pthread condition for data_buf_filled - pthread_mutex_t data_buf_status_lock; //mutex for data_buf_filled_cond - bool ack_buf_filled; //Is the ack frame buffer filled - pthread_cond_t ack_buf_filled_cond; //pthread condition for ack_buf_filled - pthread_mutex_t ack_buf_status_lock; //mutex for ack_buf_filled_cond - bool link_on; //Is the receiver on -}; - -struct link_handle { - struct phy_handle *phy; - struct tx *tx; - struct rx *rx; - bool phy_tx_on; //Is the phy transmitter on - bool phy_rx_on; //Is the phy receiver on -}; - -//internal functions -//tx: -static int start_transmitter(struct link_handle *link); -static int stop_transmitter(struct link_handle *link); -void *transmit_data_frames(void *arg); -static int send_payload(struct link_handle *link, uint8_t *payload, - uint16_t used_payload_length); -//rx: -static int start_receiver(struct link_handle *link); -static int stop_receiver(struct link_handle *link); -void *receive_frames(void *arg); -static int receive_ack(struct link_handle *link, uint16_t ack_num, - unsigned int timeout_ms); -static int receive_payload(struct link_handle *link, uint8_t *payload, - unsigned int timeout_ms); -//utility: -static void convert_data_frame_struct_to_buf(struct data_frame *frame, uint8_t *buf); -static void convert_ack_frame_struct_to_buf(struct ack_frame *frame, uint8_t *buf); -static void convert_buf_to_data_frame_struct(uint8_t *buf, struct data_frame *frame); -static void convert_buf_to_ack_frame_struct(uint8_t *buf, struct ack_frame *frame); - -/**************************************** - * * - * INIT/DEINIT AND UTILITY FUNCTIONS * - * * - ****************************************/ - -struct link_handle *link_init(struct bladerf *dev, struct radio_params *params) -{ - int status; - struct link_handle *link; - - DEBUG_MSG("[LINK] Initializing\n"); - //-------------Allocate memory for link handle struct-------------- - //Calloc so all pointers are initialized to NULL, and all bools are - //initialized to false - link = calloc(1, sizeof(struct link_handle)); - if (link == NULL){ - perror("malloc"); - return NULL; - } - - //---------------Open/Initialize phy handle-------------------------- - link->phy = phy_init(dev, params); - if (link->phy == NULL){ - fprintf(stderr, "[LINK] Couldn't initialize phy handle\n"); - goto error; - } - //Start phy receiver - status = phy_start_receiver(link->phy); - if (status != 0){ - fprintf(stderr, "[LINK] Couldn't start phy recevier\n"); - goto error; - } - link->phy_rx_on = true; - //Start phy transmitter - status = phy_start_transmitter(link->phy); - if (status != 0){ - fprintf(stderr, "[LINK] Couldn't start phy transmitter\n"); - goto error; - } - link->phy_tx_on = true; - - //------------------Allocate memory for tx struct and initialize----- - link->tx = malloc(sizeof(struct tx)); - if (link->tx == NULL){ - perror("malloc"); - goto error; - } - //Initialize control/state variables - link->tx->stop = false; - link->tx->data_buf_filled = false; - link->tx->done = false; - link->tx->success = false; - link->tx->link_on = false; - //Initialize pthread condition variable - status = pthread_cond_init(&(link->tx->data_buf_filled_cond), NULL); - if (status != 0){ - fprintf(stderr, "[LINK] Error initializing pthread_cond: %s\n", - strerror(status)); - goto error; - } - //Initialize pthread mutex variable - status = pthread_mutex_init(&(link->tx->data_buf_status_lock), NULL); - if (status != 0){ - fprintf(stderr, "[LINK] Error initializing pthread_mutex: %s\n", - strerror(status)); - goto error; - } - //------------------Allocate memory for rx struct and initialize----- - link->rx = malloc(sizeof(struct rx)); - if (link->rx == NULL){ - perror("malloc"); - goto error; - } - //Initialize pthread condition variable for data - status = pthread_cond_init(&(link->rx->data_buf_filled_cond), NULL); - if (status != 0){ - fprintf(stderr, "[LINK] Error initializing pthread_cond: %s\n", - strerror(status)); - goto error; - } - //Initialize pthread mutex variable for data - status = pthread_mutex_init(&(link->rx->data_buf_status_lock), NULL); - if (status != 0){ - fprintf(stderr, "[LINK] Error initializing pthread_mutex: %s\n", - strerror(status)); - goto error; - } - //Initialize pthread condition variable for ack - status = pthread_cond_init(&(link->rx->ack_buf_filled_cond), NULL); - if (status != 0){ - fprintf(stderr, "[LINK] Error initializing pthread_cond: %s\n", - strerror(status)); - goto error; - } - //Initialize pthread mutex variable for ack - status = pthread_mutex_init(&(link->rx->ack_buf_status_lock), NULL); - if (status != 0){ - fprintf(stderr, "[LINK] Error initializing pthread_mutex: %s\n", - strerror(status)); - goto error; - } - //Initialize control/state variables - link->rx->stop = false; - link->rx->data_buf_filled = false; - link->rx->ack_buf_filled = false; - link->rx->num_extra_bytes = 0; - link->rx->link_on = false; - - //---------------------Start the link receiver-------------------------- - status = start_receiver(link); - if (status != 0){ - fprintf(stderr, "[LINK] Couldn't start receiver\n"); - goto error; - } - link->rx->link_on = true; - //-------------------Start the link transmitter------------------------- - status = start_transmitter(link); - if (status != 0){ - fprintf(stderr, "[LINK] Couldn't start receiver\n"); - goto error; - } - link->tx->link_on = true; - - DEBUG_MSG("[LINK] Initialization done\n"); - return link; - - error: - link_close(link); - return NULL; -} - -void link_close(struct link_handle *link) -{ - int status; - - DEBUG_MSG("[LINK] Closing\n"); - - //Cleanup all internal resources - if (link != NULL){ - //Cleanup tx struct - if (link->tx != NULL){ - //Stop the link transmitter if it is on - if (link->tx->link_on){ - status = stop_transmitter(link); - if (status != 0){ - fprintf(stderr, "[LINK] Error stopping link transmitter\n"); - } - } - status = pthread_mutex_destroy(&(link->tx->data_buf_status_lock)); - if (status != 0){ - fprintf(stderr, "[LINK] Error destroying pthread_mutex\n"); - } - status = pthread_cond_destroy(&(link->tx->data_buf_filled_cond)); - if (status != 0){ - fprintf(stderr, "[LINK] Error destroying pthread_cond\n"); - } - } - free(link->tx); - //Cleanup rx struct - if (link->rx != NULL){ - //Stop the link receiver if it is on - if (link->rx->link_on){ - status = stop_receiver(link); - if (status != 0){ - fprintf(stderr, "[LINK] Error stopping link receiver\n"); - } - } - status = pthread_mutex_destroy(&(link->rx->data_buf_status_lock)); - if (status != 0){ - fprintf(stderr, "[LINK] Error destroying pthread_mutex\n"); - } - status = pthread_cond_destroy(&(link->rx->data_buf_filled_cond)); - if (status != 0){ - fprintf(stderr, "[LINK] Error destroying pthread_cond\n"); - } - status = pthread_mutex_destroy(&(link->rx->ack_buf_status_lock)); - if (status != 0){ - fprintf(stderr, "[LINK] Error destroying pthread_mutex\n"); - } - status = pthread_cond_destroy(&(link->rx->ack_buf_filled_cond)); - if (status != 0){ - fprintf(stderr, "[LINK] Error destroying pthread_cond\n"); - } - } - free(link->rx); - //Close the phy - if (link->phy != NULL){ - //Stop phy transmitter/receiver if they are on - if (link->phy_tx_on){ - status = phy_stop_transmitter(link->phy); - if (status != 0){ - fprintf(stderr, "[LINK] Error stopping phy transmitter\n"); - } - } - if (link->phy_rx_on){ - status = phy_stop_receiver(link->phy); - if (status != 0){ - fprintf(stderr, "[LINK] Error stopping phy receiver\n"); - } - } - } - //Close phy handle - phy_close(link->phy); - } - free(link); - link = NULL; -} - -/** - * Convert data frame struct to a buffer of uint8_t - * @param[in] frame pointer to data_frame structure to convert - * @param[out] buf pointer to buffer to place the frame in - */ -static void convert_data_frame_struct_to_buf(struct data_frame *frame, uint8_t *buf) -{ - int i = 0; - - //Frame type - memcpy(&buf[i], &(frame->type), sizeof(frame->type)); - i += sizeof(frame->type); - //Seq num - memcpy(&buf[i], &(frame->seq_num), sizeof(frame->seq_num)); - i += sizeof(frame->seq_num); - //payload length - memcpy(&buf[i], &(frame->payload_length), sizeof(frame->payload_length)); - i += sizeof(frame->payload_length); - //payload - memcpy(&buf[i], frame->payload, PAYLOAD_LENGTH); - i += PAYLOAD_LENGTH; - //crc - memcpy(&buf[i], &(frame->crc32), sizeof(frame->crc32)); - i += sizeof(frame->crc32); - - if (i != DATA_FRAME_LENGTH){ - fprintf(stderr, "[LINK] %s: ERROR: Link layer is using a different data frame " - "length (%d) than the phy layer (%d). Update the DATA_FRAME_LENGTH" - " macro in phy.h and recompile or there will be unexpected results\n", - __FUNCTION__, i, DATA_FRAME_LENGTH); - } -} - -/** - * Convert ack frame struct to a buffer of uint8_t - * @param[in] frame pointer to ack_frame structure to convert - * @param[out] buf pointer to buffer to place the frame in - */ -static void convert_ack_frame_struct_to_buf(struct ack_frame *frame, uint8_t *buf) -{ - int i = 0; - - //Frame type - memcpy(&buf[i], &(frame->type), sizeof(frame->type)); - i += sizeof(frame->type); - //ack num - memcpy(&buf[i], &(frame->ack_num), sizeof(frame->ack_num)); - i += sizeof(frame->ack_num); - //crc - memcpy(&buf[i], &(frame->crc32), sizeof(frame->crc32)); - i += sizeof(frame->crc32); - - if (i != ACK_FRAME_LENGTH){ - fprintf(stderr, "[LINK] %s: ERROR: Link layer is using a different ack frame " - "length (%d) than the phy layer (%d). Update the ACK_FRAME_LENGTH" - " macro in phy.h and recompile or there will be unexpected results\n", - __FUNCTION__, i, ACK_FRAME_LENGTH); - } -} - -/** - * Convert uint8_t buffer to data frame struct - * - * @param[in] buf pointer to buffer holding a data frame - * @param[out] frame pointer to data_frame struct to place frame in - */ -static void convert_buf_to_data_frame_struct(uint8_t *buf, struct data_frame *frame) -{ - int i = 0; - - //Frame type - memcpy(&(frame->type), &buf[i], sizeof(frame->type)); - i += sizeof(frame->type); - //Seq num - memcpy(&(frame->seq_num), &buf[i], sizeof(frame->seq_num)); - i += sizeof(frame->seq_num); - //payload length - memcpy(&(frame->payload_length), &buf[i], sizeof(frame->payload_length)); - i += sizeof(frame->payload_length); - //payload - memcpy(frame->payload, &buf[i], PAYLOAD_LENGTH); - i += PAYLOAD_LENGTH; - //crc - memcpy(&(frame->crc32), &buf[i], sizeof(frame->crc32)); - i += sizeof(frame->crc32); - - if (i != DATA_FRAME_LENGTH){ - fprintf(stderr, "[LINK] %s: ERROR: Link layer is using a different data frame " - "length (%d) than the phy layer (%d). Update the DATA_FRAME_LENGTH" - " macro in phy.h and recompile or there will be unexpected results\n", - __FUNCTION__, i, DATA_FRAME_LENGTH); - } -} - -/** - * Convert uint8_t buffer to ack frame struct - * - * @param[in] buf pointer to buffer holding a ack frame - * @param[out] frame pointer to ack_frame struct to place frame in - */ -static void convert_buf_to_ack_frame_struct(uint8_t *buf, struct ack_frame *frame) -{ - int i = 0; - - //Frame type - memcpy(&(frame->type), &buf[i], sizeof(frame->type)); - i += sizeof(frame->type); - //ack num - memcpy(&(frame->ack_num), &buf[i], sizeof(frame->ack_num)); - i += sizeof(frame->ack_num); - //crc - memcpy(&(frame->crc32), &buf[i], sizeof(frame->crc32)); - i += sizeof(frame->crc32); - - if (i != ACK_FRAME_LENGTH){ - fprintf(stderr, "[LINK] %s: ERROR: Link layer is using a different ack frame " - "length (%d) than the phy layer (%d). Update the ACK_FRAME_LENGTH" - " macro in phy.h and recompile or there will be unexpected results\n", - __FUNCTION__, i, ACK_FRAME_LENGTH); - } -} - -/**************************************** - * * - * TRANSMITTER FUNCTIONS * - * * - ****************************************/ - -/** - * Start the transmitter thread - * - * @param[in] link pointer to link handle - * - * @return 0 on success, -1 on failure - */ -static int start_transmitter(struct link_handle *link) -{ - int status; - - link->tx->done = false; - link->tx->success = false; - //be sure stop signal is off - link->tx->stop = false; - //Kick off transmitter thread - status = pthread_create(&(link->tx->thread), NULL, transmit_data_frames, link); - if (status != 0){ - fprintf(stderr, "[LINK] Error creating tx thread: %s\n", - strerror(status)); - return -1; - } - return 0; -} - -/** - * Stop the transmitter thread - * - * @param[in] link pointer to link handle - * - * @return 0 on success, -1 on failure - */ -static int stop_transmitter(struct link_handle *link) -{ - int status; - - DEBUG_MSG("[LINK] TX: Stopping transmitter...\n"); - //signal stop - link->tx->stop = true; - //Signal the buffer filled condition so the thread will stop waiting - //for a filled buffer - status = pthread_mutex_lock(&(link->tx->data_buf_status_lock)); - if (status != 0){ - fprintf(stderr, "[LINK] Error locking pthread_mutex\n"); - } - status = pthread_cond_signal(&(link->tx->data_buf_filled_cond)); - if (status != 0){ - fprintf(stderr, "[LINK] Error signaling pthread_cond\n"); - } - status = pthread_mutex_unlock(&(link->tx->data_buf_status_lock)); - if (status != 0){ - fprintf(stderr, "[LINK] Error unlocking pthread_mutex\n"); - } - //Wait for tx thread to finish - status = pthread_join(link->tx->thread, NULL); - if (status != 0){ - fprintf(stderr, "[LINK] Error joining tx thread: %s\n", - strerror(status)); - return -1; - } - DEBUG_MSG("[LINK] TX: Transmitter stopped\n"); - return 0; -} - -int link_send_data(struct link_handle *link, uint8_t *data, unsigned int data_length) -{ - unsigned int num_full_payloads; - unsigned int i; - unsigned int last_payload_length; - int status; - - num_full_payloads = data_length/PAYLOAD_LENGTH; - - //Loop through each full payload - for(i = 0; i < num_full_payloads; i++){ - //Send the frame - status = send_payload(link, &data[i*PAYLOAD_LENGTH], PAYLOAD_LENGTH); - if (status != 0){ - if (status == -2){ - DEBUG_MSG("[LINK] TX: Send data failed: " - "No response for payload #%d\n", i+1); - }else{ - fprintf(stderr, "[LINK] TX: Send data failed: " - "Unexpected error sending payload #%d\n", i+1); - } - return status; - } - } - - //Send the last payload for the remaining bytes - last_payload_length = data_length % PAYLOAD_LENGTH; - if (last_payload_length != 0){ - status = send_payload(link, &data[i*PAYLOAD_LENGTH], - (uint16_t) last_payload_length); - if (status != 0){ - if (status == -2){ - DEBUG_MSG("[LINK] TX: Send data failed: " - "No response for payload #%d\n", i+1); - }else{ - fprintf(stderr, "[LINK] TX: Send data failed: " - "Unexpected error sending payload #%d\n", i+1); - } - return status; - } - } - return 0; -} - -/** - * Sends a payload. Blocks until either the transmission was successful (with an - * acknowledgement) or there was no response (exceeded max number of retransmissions) - * - * @param[in] link pointer to link handle - * @param[in] payload buffer of bytes to send - * @param[in] used_payload_length number of bytes to send in 'payload'. If less - * than PAYLOAD_LENGTH, zeros will be padded. - * @return 0 on success, -1 on error, -2 on timeout/no response - */ -static int send_payload(struct link_handle *link, uint8_t *payload, - uint16_t used_payload_length) -{ - int status; - - if (used_payload_length > PAYLOAD_LENGTH){ - fprintf(stderr, "[LINK] %s: Invalid payload length of %hu\n", __FUNCTION__, - used_payload_length); - return -1; - } - - //Wait for tx buf to be empty - while(link->tx->data_buf_filled){ - usleep(50); - } - //Copy payload data into frame buffer - memcpy(link->tx->data_frame_buf.payload, payload, used_payload_length); - //Pad zeros to unused portion of the payload - memset(&(link->tx->data_frame_buf.payload[used_payload_length]), 0, - PAYLOAD_LENGTH - used_payload_length); - //Set payload length - link->tx->data_frame_buf.payload_length = used_payload_length; - //Mark tx not done - link->tx->done = false; - //Mark buffer filled - link->tx->data_buf_filled = true; - //Signal the buffer filled condition - status = pthread_mutex_lock(&(link->tx->data_buf_status_lock)); - if (status != 0){ - fprintf(stderr, "[LINK] Error locking pthread_mutex: %s\n", - strerror(status)); - return -1; - } - status = pthread_cond_signal(&(link->tx->data_buf_filled_cond)); - if (status != 0){ - fprintf(stderr, "[LINK] Error signaling pthread_cond: %s\n", - strerror(status)); - return -1; - } - status = pthread_mutex_unlock(&(link->tx->data_buf_status_lock)); - if (status != 0){ - fprintf(stderr, "[LINK] Error unlocking pthread_mutex: %s\n", - strerror(status)); - return -1; - } - //Wait for the transmission to complete - //TODO: Change this to a pthread condition signal - while (!link->tx->done){ - usleep(100); - } - //Check the status of the transmission - if (!link->tx->success){ - return -2; - } - - return 0; -} - -/** - * Thread function that transmits data frames and waits for acks. - * Does not directly receive acks - the receive_frames() function does this. - * Does not transmit acks - the receive_frames function does this. - * - * @param[in] arg pointer to link handle - */ -void *transmit_data_frames(void *arg) -{ - int status; - uint16_t seq_num; - uint32_t crc_32; - unsigned int tries; - uint8_t data_send_buf[DATA_FRAME_LENGTH]; - bool failed; - - //cast arg - struct link_handle *link = (struct link_handle *) arg; - //Set initial sequence number to random value - srand((unsigned int)time(NULL)); - seq_num = rand() % 65536; - DEBUG_MSG("[LINK] TX: Initial seq num = %hu\n", seq_num); - tries = 1; - - while (!link->tx->stop){ - if (tries > LINK_MAX_TRIES){ - DEBUG_MSG("[LINK] TX: Exceeded max tries (%u) without an ACK." - " Skipping frame\n", tries-1); - link->tx->success = false; - link->tx->done = true; - tries = 1; - } - if (tries == 1){ - //---------Wait for data buffer to be filled----------- - //Lock mutex - status = pthread_mutex_lock(&(link->tx->data_buf_status_lock)); - if (status != 0){ - fprintf(stderr, "[LINK] Mutex lock failed: %s\n", - strerror(status)); - goto out; - } - //Wait for condition signal - meaning buffer is full - failed = false; - while (!link->tx->data_buf_filled && !link->tx->stop){ - DEBUG_MSG("[LINK] TX: Waiting for buffer to be filled\n"); - status = pthread_cond_wait(&(link->tx->data_buf_filled_cond), - &(link->tx->data_buf_status_lock)); - if (status != 0){ - fprintf(stderr, "[LINK] transmit_frames(): " - "Condition wait failed: %s\n", strerror(status)); - failed = true; - break; - } - } - //Unlock mutex - status = pthread_mutex_unlock(&(link->tx->data_buf_status_lock)); - if (status != 0){ - fprintf(stderr, "[LINK] transmit_frames(): Mutex unlock failed: %s\n", - strerror(status)); - failed = true; - } - //Stop thread if stop variable is true, or something with pthreads went wrong - if (link->tx->stop || failed){ - link->tx->data_buf_filled = false; - goto out; - } - DEBUG_MSG("[LINK] TX: Frame buffer filled. Sending...\n"); - //Set frame type - link->tx->data_frame_buf.type = DATA_FRAME_CODE; - //Set sequence number - link->tx->data_frame_buf.seq_num = seq_num; - //Copy frame into send buf - convert_data_frame_struct_to_buf(&(link->tx->data_frame_buf), data_send_buf); - //Calculate the CRC - crc_32 = crc32(data_send_buf, DATA_FRAME_LENGTH - sizeof(crc_32)); - //Copy this CRC to the send buf - memcpy(&data_send_buf[DATA_FRAME_LENGTH - sizeof(crc_32)], - &crc_32, sizeof(crc_32)); - //Mark tx data buffer empty - link->tx->data_buf_filled = false; - } - //Transmit the frame - status = phy_fill_tx_buf(link->phy, data_send_buf, DATA_FRAME_LENGTH); - if (status != 0){ - fprintf(stderr, "[LINK] Couldn't fill phy tx buffer\n"); - goto out; - } - DEBUG_MSG("[LINK] TX: Frame sent to PHY. Waiting for ACK...\n"); - //Wait for an ack - status = receive_ack(link, seq_num, ACK_TIMEOUT_MS); - if (status == -2){ - DEBUG_MSG("[LINK] TX: Didn't get an ACK (timed out). Resending\n"); - tries++; - continue; - }else if (status == -3){ - DEBUG_MSG("[LINK] TX: Received wrong ACK number. Resending\n"); - tries++; - continue; - }else if (status < 0){ - fprintf(stderr, "[LINK] TX: Error receiving ACK. " - "Stopping transmitter\n"); - goto out; - } - //Success! - DEBUG_MSG("[LINK] TX: Got an ACK\n"); - link->tx->success = true; - link->tx->done = true; - tries = 1; - seq_num++; - } - - out: - link->tx->done = true; - return NULL; -} - -/**************************************** - * * - * RECEIVER FUNCTIONS * - * * - ****************************************/ - -/** - * Start the receiver thread - * - * @param[in] link pointer to link handle - * - * @return 0 on success, -1 on failure - */ -static int start_receiver(struct link_handle *link) -{ - int status; - - //be sure stop signal is off - link->rx->stop = false; - //Kick off receiver thread - status = pthread_create(&(link->rx->thread), NULL, receive_frames, link); - if (status != 0){ - fprintf(stderr, "[LINK] Error creating rx thread: %s\n", - strerror(status)); - return -1; - } - return 0; -} - -/** - * Stop the receiver thread - * - * @param[in] link pointer to link handle - * - * @return 0 on success, -1 on failure - */ -static int stop_receiver(struct link_handle *link) -{ - int status; - - DEBUG_MSG("[LINK] RX: Stopping receiver...\n"); - //signal stop - link->rx->stop = true; - //Wait for rx thread to finish - status = pthread_join(link->rx->thread, NULL); - if (status != 0){ - fprintf(stderr, "[LINK] Error joining rx thread: %s\n", - strerror(status)); - return -1; - } - DEBUG_MSG("[LINK] RX: Receiver stopped\n"); - return 0; -} - -int link_receive_data(struct link_handle *link, int size, int max_timeouts, - uint8_t *data_buf) -{ - int bytes_received; - int bytes_remaining; - uint8_t temp_buf[PAYLOAD_LENGTH]; - int i; - int timeouts; - - //Check for invalid input - if (size < 0 || max_timeouts < 0){ - fprintf(stderr, "[LINK] RX: link_receive_data(): parameter is negative\n"); - return -1; - } - - timeouts = 0; - //Read any extra bytes left over from the last call to this function - if (size < (int)(link->rx->num_extra_bytes)){ - //Special case: More extra bytes than the request size. - memcpy(data_buf, link->rx->extra_bytes, size); - //Move over the remaining extra_bytes - memmove(link->rx->extra_bytes, &(link->rx->extra_bytes[size]), - link->rx->num_extra_bytes - size); - i = size; - return i; - }else{ - memcpy(data_buf, link->rx->extra_bytes, link->rx->num_extra_bytes); - i = link->rx->num_extra_bytes; - } - - while(i < size && timeouts < max_timeouts){ - bytes_remaining = size - i; - //Make sure to not write more than 'size' bytes. For the last payload(s), - //Use a temp buffer first - if (bytes_remaining < PAYLOAD_LENGTH){ - bytes_received = receive_payload(link, temp_buf, 500); - //Check for timeout - if (bytes_received == -2){ - timeouts++; - continue; - }else if (bytes_received < 0){ - fprintf(stderr, "[LINK] RX: Error receiving payload\n"); - return -1; - } - //Copy bytes from temp buf to data_buf - if (bytes_received < bytes_remaining){ - memcpy(&data_buf[i], temp_buf, bytes_received); - i += bytes_received; - }else{ //bytes_received >= bytes_remaining - memcpy(&data_buf[i], temp_buf, bytes_remaining); - i += bytes_remaining; - //Copy extra bytes to extra_bytes buffer - link->rx->num_extra_bytes = bytes_received - bytes_remaining; - memcpy(link->rx->extra_bytes, &temp_buf[bytes_remaining], - link->rx->num_extra_bytes); - } - //For all other payloads - }else{ - bytes_received = receive_payload(link, &data_buf[i], 500); - //Check for timeout - if (bytes_received == -2){ - timeouts++; - continue; - } - if (bytes_received < 0){ - fprintf(stderr, "[LINK] RX: Error receiving payload\n"); - return -1; - } - i += bytes_received; - } - } - - return i; -} - -/** - * Receives a payload and copies it into the given buffer - * @param[in] link pointer to link handle - * @param[in] timeout_ms Amount of time to wait for a received payload - * @param[out] payload pointer to buffer to place payload in - * - * @return number of bytes received (0 - PAYLOAD_LENGTH), -1 on error, - * -2 on timeout - */ -static int receive_payload(struct link_handle *link, uint8_t *payload, unsigned int timeout_ms) -{ - int payload_length = 10; //must be initialized above 0 - struct timespec timeout_abs; - int status; - - //Create absolute time format timeout - status = create_timeout_abs(timeout_ms, &timeout_abs); - if (status != 0){ - fprintf(stderr, "[LINK] RX: receive_payload(): Error creating timeout\n"); - return -1; - } - - //Prepare to wait with pthread_cond_timedwait() - status = pthread_mutex_lock(&(link->rx->data_buf_status_lock)); - if (status != 0){ - fprintf(stderr, "[LINK] RX: receive_payload(): Error locking mutex: %s\n", - strerror(status)); - return -1; - } - //Wait for condition signal - meaning rx data buffer is full - while (!link->rx->data_buf_filled){ - status = pthread_cond_timedwait(&(link->rx->data_buf_filled_cond), - &(link->rx->data_buf_status_lock), &timeout_abs); - if (status != 0){ - if (status == ETIMEDOUT){ - payload_length = -2; - }else{ - fprintf(stderr, "[LINK] RX: receive_payload(): " - "Condition wait failed: %s\n", strerror(status)); - payload_length = -1; - } - break; - } - } - //Waiting is done. Unlock mutex. - status = pthread_mutex_unlock(&(link->rx->data_buf_status_lock)); - if (status != 0){ - fprintf(stderr, "[LINK] RX: receive_payload(): Mutex unlock failed: %s\n", - strerror(status)); - payload_length = -1; - } - //Did we error or timeout? Return - if (payload_length < 0){ - return payload_length; - } - - //Get the length of the used portion of the payload - payload_length = link->rx->data_frame_buf.payload_length; - //Copy the used portion of the payload - memcpy(payload, link->rx->data_frame_buf.payload, payload_length); - //Mark the rx data buffer empty - link->rx->data_buf_filled = false; - - return payload_length; -} - -/** - * Attempts to receive an ACK with the given ACK number - * Waits until it either receives an ack or times out. - * - * @param[in] link pointer to link handle - * @param[in] ack_num acknowledgement number to look for - * @param[in] timeout_ms amount of time to wait for an ACK, in milliseconds - * - * @return 0 if successfully received ack, -1 if pthread error or wrong ack number, - * -2 if timed out, -3 if wrong ack number - */ -static int receive_ack(struct link_handle *link, uint16_t ack_num, unsigned int timeout_ms) -{ - struct timespec timeout_abs; - int status, ret = 0; - - //Create absolute time format timeout - status = create_timeout_abs(timeout_ms, &timeout_abs); - if (status != 0){ - fprintf(stderr, "[LINK] RX: receive_ack(): Error creating timeout\n"); - return -1; - } - - //Prepare to wait with pthread_cond_timedwait() - status = pthread_mutex_lock(&(link->rx->ack_buf_status_lock)); - if (status != 0){ - fprintf(stderr, "[LINK] RX: receive_ack(): Error locking mutex: %s\n", - strerror(status)); - return -1; - } - //Wait for condition signal - meaning buffer is full - while (!link->rx->ack_buf_filled){ - status = pthread_cond_timedwait(&(link->rx->ack_buf_filled_cond), - &(link->rx->ack_buf_status_lock), &timeout_abs); - if (status != 0){ - if (status == ETIMEDOUT){ - ret = -2; - }else{ - fprintf(stderr, "[LINK] RX: receive_ack(): Condition wait failed: %s\n", - strerror(status)); - ret = -1; - } - break; - } - } - //Waiting is done. Unlock mutex. - status = pthread_mutex_unlock(&(link->rx->ack_buf_status_lock)); - if (status != 0){ - fprintf(stderr, "[LINK] RX: receive_ack(): Mutex unlock failed: %s\n", - strerror(status)); - ret = -1; - } - //Check the sequence number if nothing failed - if (ret == 0 && link->rx->ack_frame_buf.ack_num != ack_num){ - fprintf(stderr, "[LINK] RX: receive_ack(): Incorrect ack number %hu " - "(expected %hu)\n", link->rx->ack_frame_buf.ack_num, ack_num); - ret = -3; - } - //mark the rx ack buffer empty - link->rx->ack_buf_filled = false; - - return ret; -} - -/** - * Thread function which receives data and ACK frames from the PHY, and transmits ACKs. - * Checks CRC on all received frames before copying them to a buffer which other - * functions can use. If the CRC is incorrect, it disregards the frame and does not - * copy it. If a data frame is received, it checks sequence number for duplicate. - * If not a duplicate, it copies the frame to rx data_frame_buf and marks the buffer - * full. An acknowledgement is always sent, regardless of whether or not the received - * data frame is a duplicate. This is the only function that sends acks. - * - * @param[in] arg pointer to link handle - */ -void *receive_frames(void *arg) -{ - uint8_t *rx_buf = NULL; - unsigned int frame_length; - uint32_t crc_32, crc_32_rx; - bool is_data_frame = false; - int status; - uint8_t ack_send_buf[ACK_FRAME_LENGTH]; - uint16_t seq_num = 0; - bool first_frame = true; - bool duplicate; - - //cast arg - struct link_handle *link = (struct link_handle *) arg; - //declare states - enum states {WAIT, CHECK_CRC, COPY, SEND_ACK}; - //current state variable - enum states state = WAIT; - - while(!link->rx->stop){ - switch(state){ - case WAIT: - //--Wait for PHY to receive a frame - //DEBUG_MSG("[LINK] RX: State = WAIT\n"); - rx_buf = phy_request_rx_buf(link->phy, 500); - if (rx_buf == NULL){ - //timed out (or error). Continue waiting. - state = WAIT; - }else{ - state = CHECK_CRC; - } - break; - case CHECK_CRC: - //--We received a frame from the PHY. Check the CRC - DEBUG_MSG("[LINK] RX: State = CHECK_CRC\n"); - //First check if it's an ack or data frame to determine length - if (rx_buf[0] == DATA_FRAME_CODE){ - DEBUG_MSG("[LINK] RX: Received a data frame\n"); - is_data_frame = true; - frame_length = DATA_FRAME_LENGTH; - }else{ - DEBUG_MSG("[LINK] RX: Received a ack frame\n"); - is_data_frame = false; - frame_length = ACK_FRAME_LENGTH; - } - //Copy the received CRC - memcpy(&crc_32_rx, &rx_buf[frame_length - sizeof(crc_32)], - sizeof(crc_32)); - //Compute expected CRC - crc_32 = crc32(rx_buf, frame_length - sizeof(crc_32)); - //Compare received CRC vs expected CRC - if (crc_32_rx != crc_32){ - //Drop the frame since there was an error - //First release the buffer for the PHY - phy_release_rx_buf(link->phy); - NOTE("[LINK] RX: Frame received with errors. Dropping.\n"); - state = WAIT; - }else{ - DEBUG_MSG("[LINK] RX: Frame received with no errors\n"); - state = COPY; - } - break; - case COPY: - //--CRC passed. Now copy the frame to link layer buffer - //--if it is not a duplicate frame - DEBUG_MSG("[LINK] RX: State = COPY\n"); - if (is_data_frame){ - //Is the previous data frame still being worked with? - if (link->rx->data_buf_filled){ - //Instead of causing a disruption, drop the current frame - fprintf(stderr, "[LINK] RX: Data frame dropped!\n"); - phy_release_rx_buf(link->phy); - break; - } - //Copy/convert to data frame struct - convert_buf_to_data_frame_struct(rx_buf, - &(link->rx->data_frame_buf)); - //Release buffer from the phy - phy_release_rx_buf(link->phy); - //Is this frame a duplicate of the last frame? - if (link->rx->data_frame_buf.seq_num == seq_num && !first_frame){ - DEBUG_MSG("[LINK] RX: Received a duplicate frame.\n"); - duplicate = true; - }else{ - duplicate = false; - } - seq_num = link->rx->data_frame_buf.seq_num; - first_frame = false; - //Mark buffer filled if not a duplicate data frame - if (!duplicate){ - //Signal that the link data buffer is filled - link->rx->data_buf_filled = true; - status = pthread_mutex_lock(&(link->rx->data_buf_status_lock)); - if (status != 0){ - fprintf(stderr, "[LINK] RX: receive_frames(): " - "Error locking pthread_mutex\n"); - return NULL; - } - status = pthread_cond_signal(&(link->rx->data_buf_filled_cond)); - if (status != 0){ - fprintf(stderr, "[LINK] RX: receive_frames(): " - "Error signaling pthread_cond\n"); - return NULL; - } - status = pthread_mutex_unlock(&(link->rx->data_buf_status_lock)); - if (status != 0){ - fprintf(stderr, "[LINK] RX: receive_frames(): " - "Error unlocking pthread_mutex\n"); - return NULL; - } - } - //Transition to send acknowledgement - state = SEND_ACK; - }else{ - //Is the previous ack frame still being worked with? - if (link->rx->ack_buf_filled){ - //Instead of causing a disruption, drop the current frame - fprintf(stderr, "[LINK] RX: ACK frame dropped!\n"); - phy_release_rx_buf(link->phy); - break; - } - //Copy/convert to ack frame struct and mark ack buffer filled - convert_buf_to_ack_frame_struct(rx_buf, &(link->rx->ack_frame_buf)); - //Release buffer from the phy - phy_release_rx_buf(link->phy); - //Signal that the link ack buffer is filled - link->rx->ack_buf_filled = true; - status = pthread_mutex_lock(&(link->rx->ack_buf_status_lock)); - if (status != 0){ - fprintf(stderr, "[LINK] RX: receive_frames(): " - "Error locking pthread_mutex\n"); - return NULL; - } - status = pthread_cond_signal(&(link->rx->ack_buf_filled_cond)); - if (status != 0){ - fprintf(stderr, "[LINK] RX: receive_frames(): " - "Error signaling pthread_cond\n"); - return NULL; - } - status = pthread_mutex_unlock(&(link->rx->ack_buf_status_lock)); - if (status != 0){ - fprintf(stderr, "[LINK] RX: receive_frames(): " - "Error unlocking pthread_mutex\n"); - return NULL; - } - //Done with the frame. Go back to WAIT state - state = WAIT; - } - break; - case SEND_ACK: - //--We received a data frame, now it's time to send the ack - DEBUG_MSG("[LINK] RX: State = SEND_ACK (ack# = %hu)\n", seq_num); - - link->tx->ack_frame_buf.type = 0xFF; - link->tx->ack_frame_buf.ack_num = seq_num; - - //Copy frame into send buf - convert_ack_frame_struct_to_buf(&(link->tx->ack_frame_buf), - ack_send_buf); - //Calculate the CRC - crc_32 = crc32(ack_send_buf, ACK_FRAME_LENGTH - sizeof(crc_32)); - //Copy this CRC to the send buf - memcpy(&ack_send_buf[ACK_FRAME_LENGTH - sizeof(crc_32)], &crc_32, - sizeof(crc_32)); - //Transmit with phy - status = phy_fill_tx_buf(link->phy, ack_send_buf, ACK_FRAME_LENGTH); - if (status != 0){ - fprintf(stderr, "[LINK] Couldn't fill phy tx buffer\n"); - goto out; - } - //Done; go back to the WAIT state - state = WAIT; - break; - default: - fprintf(stderr, "[LINK] receive_frames(): invalid state\n"); - return NULL; - } - } - out: - return NULL; -} diff --git a/host/utilities/bladeRF-fsk/c/src/link.h b/host/utilities/bladeRF-fsk/c/src/link.h deleted file mode 100644 index a4948ea7..00000000 --- a/host/utilities/bladeRF-fsk/c/src/link.h +++ /dev/null @@ -1,99 +0,0 @@ -/** - * @file - * @brief Link layer code for modem - * - * This file handles framing, error detection, and guaranteed delivery of frames. - * On the sender side, this file formats payload data into packets to transmit - * using phy.c, and waits for acknowledgements. A retransmission is automatically - * sent if no acknowledgement is received within the timeout period. On the receiver - * side, this file extracts payload data from a packet received using phy.c, and sends - * acknowledgements. - * - * This file is part of the bladeRF project - * - * Copyright (C) 2013 Nuand LLC - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#ifndef LINK_H -#define LINK_H - -#include -#include -#include "thread.h" -#include -#include -#include -#include "host_config.h" - -#include "common.h" - -#define PAYLOAD_LENGTH 1000 //If you change this, DATA_FRAME_LENGTH - //ACK_FRAME_LENGTH must also be changed in phy.h -#define ACK_TIMEOUT_MS 500 //Timeout to wait for an acknowledgement -#define LINK_MAX_TRIES 3 //Maximum number of frame retransmissions before the - //transmitter gives up - -/** Opaque handle to link data structure */ -struct link_handle; - -/** - * Send data of arbitrary length. Breaks data up into packets (if needed) and sends each - * packet one-by-one. - * - * @param[in] link pointer to link handle - * @param[in] data Data to send - * @param[in] data_length Length of data in bytes - * - * @return 0 on success, -1 on error, -2 on no connection - */ -int link_send_data(struct link_handle *link, uint8_t *data, unsigned int data_length); - -/** - * Attempts to receive the number of bytes specified by size and places them into - * data_buf. - * - * @param[in] link pointer to link handle - * @param[in] size number of bytes to attempt to receive - * @param[in] max_timeouts max number of 0.5 second timeouts before the function - * returns - * @param[out] data_buf buffer to place received bytes in - * - * @return number of bytes received on success, -1 on error. In the case of a - * timeout (i.e. when 'max_timeouts' have occured), this return value - * will be less than 'size' - */ -int link_receive_data(struct link_handle *link, int size, int max_timeouts, - uint8_t *data_buf); - -/** - * Initializes/allocates a link handle data structure and starts all threads - * - * @param[in] dev pointer to opened bladeRF device handle - * @param[in] params radio parameters to use when configuring bladeRF device - * - * @return pointer to allocated link_handle struct on success, NULL on error - */ -struct link_handle *link_init(struct bladerf *dev, struct radio_params *params); - -/** - * Deinitializes/closes/frees a link_handle struct. Does nothing if link is NULL - * - * @param[in] link pointer to link handle - */ -void link_close(struct link_handle *link); - -#endif diff --git a/host/utilities/bladeRF-fsk/c/src/phy.c b/host/utilities/bladeRF-fsk/c/src/phy.c deleted file mode 100644 index 9293346e..00000000 --- a/host/utilities/bladeRF-fsk/c/src/phy.c +++ /dev/null @@ -1,948 +0,0 @@ -/** - * @brief Physical layer code for modem - * - * This file handles transmission/reception of data frames over the air. It uses fsk.c to - * perform baseband IQ modulation and demodulation, and libbladeRF to transmit/receive - * samples using the bladeRF device. A different modulator could be used by swapping - * fsk.c with a file that implements a different modulator. On the receive side the file - * uses fir_filter.c to low-pass filter the received signal, pnorm.c to power normalize - * the input signal, and correlator.c to correlate the received signal with a preamble. - * waveform. - * - * The structure of a physical layer transmission is as follows: - * / ramp up | training sequence | preamble | link layer frame | ramp down \ - * - * The ramps at the beginning/end are SAMP_PER_SYMB samples long - * - * This file is part of the bladeRF project - * - * Copyright (C) 2016 Nuand LLC - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ -#include "phy.h" -#include "fir_filter.h" -#include "rx_ch_filter.h" -#include "pnorm.h" -#include "prng.h" -#include "correlator.h" -#include "fsk.h" //modulator/demodulator -#include "radio_config.h" //bladeRF configuration - -#ifdef DEBUG_MODE - #define DEBUG_MSG(...) fprintf(stderr, __VA_ARGS__) - #ifndef ENABLE_NOTES - #define ENABLE_NOTES - #endif -#else - #define DEBUG_MSG(...) -#endif - -#ifdef ENABLE_NOTES - #define NOTE(...) fprintf(stderr, __VA_ARGS__) -#else - #define NOTE(...) -#endif - -//Internal structs -struct rx { - int16_t *in_samples; //Raw input samples from device - struct fir_filter *ch_filt; //Channel filter - struct pnorm_state_t *pnorm; //Power normalizer - struct correlator *corr; //Correlator - struct complex_sample *filt_samples; //Filtered input samples - struct complex_sample *pnorm_samples; //power normalized samples - uint8_t *data_buf; //received data output buffer (no training seq/preamble) - bool buf_filled; //is the rx data buffer filled - bool stop; //control variable to stop the receiver - pthread_t thread; //pthread for the receiver - pthread_cond_t buf_filled_cond; //condition variable for buf_filled - pthread_mutex_t buf_status_lock; //mutex variable for accessing buf_filled -}; -struct tx { - uint8_t *data_buf; //input data to transmit (including training seq/preamble) - unsigned int data_length; //length of data to transmit (not including preamble) - bool buf_filled; - bool stop; - pthread_t thread; - pthread_cond_t buf_filled_cond; - pthread_mutex_t buf_status_lock; - unsigned int max_num_samples; //Maximum number of tx samples to transmit - struct complex_sample *samples; //output samples to transmit -}; - -struct phy_handle { - struct bladerf *dev; //bladeRF device handle - struct fsk_handle *fsk; //fsk handle - struct tx *tx; //tx data structure - struct rx *rx; //rx data structure - uint8_t *scrambling_sequence; -}; - -//Internal functions -void *phy_receive_frames(void *arg); -void *phy_transmit_frames(void *arg); -static void scramble_frame(uint8_t *frame, int frame_length, uint8_t *scrambling_sequence); -static void unscramble_frame(uint8_t *frame, int frame_length, uint8_t *scrambling_sequence); -static void create_ramps(unsigned int ramp_length, struct complex_sample ramp_down_init, - struct complex_sample *ramp_up, struct complex_sample *ramp_down); - -/**************************************** - * * - * INIT/DEINIT FUNCTIONS * - * * - ****************************************/ - -struct phy_handle *phy_init(struct bladerf *dev, struct radio_params *params) -{ - int status; - struct phy_handle *phy; - uint64_t prng_seed; - uint8_t preamble[PREAMBLE_LENGTH] = PREAMBLE; - - //------------Allocate memory for phy handle struct-------------- - //Calloc so all pointers are initialized to NULL - phy = calloc(1, sizeof(struct phy_handle)); - if (phy == NULL){ - perror("malloc"); - return NULL; - } - - DEBUG_MSG("[PHY] Initializing...\n"); - - if (dev == NULL){ - fprintf(stderr, "[PHY] %s: BladeRF device uninitialized", __FUNCTION__); - } - phy->dev = dev; - - //--------Initialize and configure bladeRF device------------- - status = radio_init_and_configure(phy->dev, params); - if (status != 0){ - fprintf(stderr, "[PHY] %s: Couldn't configure bladeRF\n", __FUNCTION__); - goto error; - } - DEBUG_MSG("[PHY] BladeRF initialized and configured successfully\n"); - - //-------------------Open fsk handle------------------------ - phy->fsk = fsk_init(); - if(phy->fsk == NULL){ - fprintf(stderr, "[PHY] %s: Couldn't open fsk handle\n", __FUNCTION__); - goto error; - } - DEBUG_MSG("[PHY] FSK Initialized\n"); - - //------------------Initialize TX struct-------------------- - phy->tx = calloc(1, sizeof(struct tx)); - if (phy->tx == NULL){ - perror("[PHY] malloc"); - goto error; - } - //Allocate memory for tx data buffer - phy->tx->data_buf = malloc(TRAINING_SEQ_LENGTH + PREAMBLE_LENGTH + - MAX_LINK_FRAME_SIZE); - if (phy->tx->data_buf == NULL){ - perror("[PHY] malloc"); - goto error; - } - //Allocate memory for tx samples buffer - //2*RAMP_LENGTH for the ramp up/ramp down - phy->tx->max_num_samples = 2*RAMP_LENGTH + (TRAINING_SEQ_LENGTH + PREAMBLE_LENGTH + - MAX_LINK_FRAME_SIZE) * 8 * SAMP_PER_SYMB; - phy->tx->samples = malloc(phy->tx->max_num_samples * sizeof(struct complex_sample)); - if (phy->tx->samples == NULL){ - perror("[PHY] malloc"); - goto error; - } - //Initialize control variables - phy->tx->data_length = 0; - phy->tx->buf_filled = false; - phy->tx->stop = false; - //Initialize pthread condition variable for buf_filled - status = pthread_cond_init(&(phy->tx->buf_filled_cond), NULL); - if (status != 0){ - fprintf(stderr, "[PHY] %s: Error initializing pthread_cond\n", __FUNCTION__); - goto error; - } - //Initialize pthread mutex variable for buf_filled - status = pthread_mutex_init(&(phy->tx->buf_status_lock), NULL); - if (status != 0){ - fprintf(stderr, "[PHY] %s: Error initializing pthread_mutex\n", __FUNCTION__); - goto error; - } - - //------------------Initialize RX struct------------------ - phy->rx = calloc(1, sizeof(struct rx)); - if (phy->rx == NULL){ - perror("[PHY] malloc"); - goto error; - } - //Allocate memory for rx data buffer - phy->rx->data_buf = malloc(MAX_LINK_FRAME_SIZE); - if (phy->rx->data_buf == NULL){ - perror("[PHY] malloc"); - goto error; - } - //Allocate memory for rx samples buffer - phy->rx->in_samples = malloc(NUM_SAMPLES_RX * 2 * sizeof(phy->rx->in_samples[0])); - if (phy->rx->in_samples == NULL){ - perror("[PHY] malloc"); - goto error; - } - - // Allocate memory for filtered RX samples - phy->rx->filt_samples = malloc(NUM_SAMPLES_RX * sizeof(struct complex_sample)); - if (phy->rx->filt_samples == NULL){ - perror("[PHY] malloc"); - goto error; - } - - //Allocate memory for power normalized samples - phy->rx->pnorm_samples = malloc(NUM_SAMPLES_RX * sizeof(struct complex_sample)); - if (phy->rx->pnorm_samples == NULL){ - perror("[PHY] malloc"); - goto error; - } - - // Create RX Channel Filter - phy->rx->ch_filt = fir_init(rx_ch_filter, rx_ch_filter_len); - if (phy->rx->ch_filt == NULL) { - fprintf(stderr, "[PHY] %s: Failed to create channel filter.\n", __FUNCTION__); - goto error; - } - - // Create power normalizer - phy->rx->pnorm = pnorm_init(0.95f, 0.1f, 20.0f); - if (phy->rx->pnorm == NULL){ - fprintf(stderr, "[PHY] %s: Couldn't initialize power normalizer\n", - __FUNCTION__); - goto error; - } - - //Create RX correlator - phy->rx->corr = corr_init(preamble, 8*PREAMBLE_LENGTH, SAMP_PER_SYMB); - if (phy->rx->corr == NULL){ - fprintf(stderr, "[PHY] %s: Couldn't initialize correlator\n", __FUNCTION__); - goto error; - } - - //Initialize control variables - phy->rx->buf_filled = false; - phy->rx->stop = false; - //Initialize pthread condition variable for buf_filled - status = pthread_cond_init(&(phy->rx->buf_filled_cond), NULL); - if (status != 0){ - fprintf(stderr, "[PHY] %s: Error initializing pthread_cond\n", __FUNCTION__); - goto error; - } - //Initialize pthread mutex variable for buf_filled - status = pthread_mutex_init(&(phy->rx->buf_status_lock), NULL); - if (status != 0){ - fprintf(stderr, "[PHY] %s: Error initializing pthread_mutex\n", __FUNCTION__); - goto error; - } - - //-----------------Load scrambling sequence-------------------- - prng_seed = PRNG_SEED; - phy->scrambling_sequence = prng_fill(&prng_seed, MAX_LINK_FRAME_SIZE); - if (phy->scrambling_sequence == NULL){ - fprintf(stderr, "[PHY] %s: Couldn't load scrambling sequence\n", __FUNCTION__); - goto error; - } - - #ifdef BYPASS_RX_CHANNEL_FILTER - DEBUG_MSG("[PHY] Info: Bypassing rx channel filter\n"); - #endif - #ifdef BYPASS_RX_PNORM - DEBUG_MSG("[PHY] Info: Bypassing rx power normalization\n"); - #endif - #ifdef BYPASS_PHY_SCRAMBLING - DEBUG_MSG("[PHY] Info: Bypassing scrambling\n"); - #endif - - DEBUG_MSG("[PHY] Initialization done\n"); - - return phy; - - error: - phy_close(phy); - return NULL; -} - -void phy_close(struct phy_handle *phy) -{ - int status; - - DEBUG_MSG("[PHY] Closing\n"); - if (phy != NULL){ - //close fsk handle - fsk_close(phy->fsk); - //Stop bladeRF (handle closed elsewhere) - radio_stop(phy->dev); - //free scrambling sequence buffer - free(phy->scrambling_sequence); - //free TX struct and its buffers - if (phy->tx != NULL){ - free(phy->tx->data_buf); - free(phy->tx->samples); - status = pthread_mutex_destroy(&(phy->tx->buf_status_lock)); - if (status != 0){ - fprintf(stderr, "[PHY] %s: Error destroying pthread_mutex\n", - __FUNCTION__); - } - status = pthread_cond_destroy(&(phy->tx->buf_filled_cond)); - if (status != 0){ - fprintf(stderr, "[PHY] %s: Error destroying pthread_cond\n", - __FUNCTION__); - } - } - free(phy->tx); - //free RX struct and its buffers - if (phy->rx != NULL){ - free(phy->rx->data_buf); - fir_deinit(phy->rx->ch_filt); - corr_deinit(phy->rx->corr); - pnorm_deinit(phy->rx->pnorm); - free(phy->rx->in_samples); - free(phy->rx->filt_samples); - free(phy->rx->pnorm_samples); - status = pthread_mutex_destroy(&(phy->rx->buf_status_lock)); - if (status != 0){ - fprintf(stderr, "[PHY] %s: Error destroying pthread_mutex\n", - __FUNCTION__); - } - status = pthread_cond_destroy(&(phy->rx->buf_filled_cond)); - if (status != 0){ - fprintf(stderr, "[PHY] %s: Error destroying pthread_cond\n", - __FUNCTION__); - } - } - free(phy->rx); - } - //free phy struct - free(phy); - phy = NULL; -} - -/**************************************** - * * - * TRANSMITTER FUNCTIONS * - * * - ****************************************/ - -int phy_start_transmitter(struct phy_handle *phy) -{ - int status; - - //turn off stop signal - phy->tx->stop = false; - //Kick off frame transmitter thread - status = pthread_create(&(phy->tx->thread), NULL, phy_transmit_frames, phy); - if (status != 0){ - fprintf(stderr, "[PHY] %s: Error creating tx thread: %s\n", __FUNCTION__, - strerror(status)); - return -1; - } - return 0; -} - -int phy_stop_transmitter(struct phy_handle *phy) -{ - int status; - - DEBUG_MSG("[PHY] TX: Stopping transmitter...\n"); - //signal stop - phy->tx->stop = true; - //Signal the buffer filled condition so that the thread will stop - //waiting for a filled buffer - status = pthread_mutex_lock(&(phy->tx->buf_status_lock)); - if (status != 0){ - fprintf(stderr, "[PHY] %s: Error locking pthread_mutex\n", __FUNCTION__); - } - status = pthread_cond_signal(&(phy->tx->buf_filled_cond)); - if (status != 0){ - fprintf(stderr, "[PHY] %s: Error signaling pthread_cond\n", __FUNCTION__); - } - status = pthread_mutex_unlock(&(phy->tx->buf_status_lock)); - if (status != 0){ - fprintf(stderr, "[PHY] %s: Error unlocking pthread_mutex\n", __FUNCTION__); - } - //Wait for tx thread to finish - status = pthread_join(phy->tx->thread, NULL); - if (status != 0){ - fprintf(stderr, "[PHY] %s: Error joining tx thread: %s\n", __FUNCTION__, - strerror(status)); - return -1; - } - DEBUG_MSG("[PHY] TX: Transmitter stopped\n"); - return 0; -} - -int phy_fill_tx_buf(struct phy_handle *phy, uint8_t *data_buf, unsigned int length) -{ - int status; - - //Check for null - if (data_buf == NULL){ - fprintf(stderr, "[PHY] %s: The supplied data buf is null\n", __FUNCTION__); - return -1; - } - //Check for length outside of bounds - if (length > MAX_LINK_FRAME_SIZE){ - fprintf(stderr, "[PHY] %s: Data length of %u is greater than the maximum " - "allowed length (%u)\n", __FUNCTION__, length, - MAX_LINK_FRAME_SIZE); - return -1; - } - //Wait for the buffer to be empty (and therefore ready for the next frame) - //Not doing a pthread_cond_wait() because this shouldn't take long - while(phy->tx->buf_filled){ - usleep(50); - } - - //Copy the tx data into the phy's tx data buf, just after where the preamble goes - memcpy(&(phy->tx->data_buf[TRAINING_SEQ_LENGTH+PREAMBLE_LENGTH]), data_buf, length); - //Set the data length - phy->tx->data_length = length; - //Mark the buffer filled - phy->tx->buf_filled = true; - //Signal the buffer filled condition - status = pthread_mutex_lock(&(phy->tx->buf_status_lock)); - if (status != 0){ - fprintf(stderr, "[PHY] %s: Error locking pthread_mutex\n", __FUNCTION__); - return -1; - } - status = pthread_cond_signal(&(phy->tx->buf_filled_cond)); - if (status != 0){ - fprintf(stderr, "[PHY] %s: Error signaling pthread_cond\n", __FUNCTION__); - return -1; - } - status = pthread_mutex_unlock(&(phy->tx->buf_status_lock)); - if (status != 0){ - fprintf(stderr, "[PHY] %s: Error unlocking pthread_mutex\n", __FUNCTION__); - return -1; - } - return 0; -} - -/** - * Thread function which transmits data frames - * - * @param[in] arg pointer to phy handle struct - */ -void *phy_transmit_frames(void *arg) -{ - int status; - //Cast arg - struct phy_handle *phy = (struct phy_handle *) arg; - uint8_t preamble[PREAMBLE_LENGTH] = PREAMBLE; - uint8_t training_seq[TRAINING_SEQ_LENGTH] = TRAINING_SEQ; - int ramp_down_index; - int num_mod_samples, num_samples; - bool failed = false; - struct bladerf_metadata metadata; - int16_t *out_samples_raw = NULL; - - out_samples_raw = malloc(phy->tx->max_num_samples * 2 * sizeof(int16_t)); - if (out_samples_raw == NULL){ - perror("[PHY] malloc"); - return NULL; - } - - //Set field(s) in bladerf metadata struct - memset(&metadata, 0, sizeof(metadata)); - metadata.flags = BLADERF_META_FLAG_TX_BURST_START | - BLADERF_META_FLAG_TX_NOW | - BLADERF_META_FLAG_TX_BURST_END; - - while (!phy->tx->stop){ - //--------Wait for buffer to be filled--------- - //Lock mutex - status = pthread_mutex_lock(&(phy->tx->buf_status_lock)); - if (status != 0){ - fprintf(stderr, "[PHY] %s: Mutex lock failed: %s\n", __FUNCTION__, - strerror(status)); - return NULL; - } - //Wait for condition signal - meaning buffer is full - while (!phy->tx->buf_filled && !phy->tx->stop){ - DEBUG_MSG("[PHY] TX: Waiting for buffer to be filled\n"); - status = pthread_cond_wait(&(phy->tx->buf_filled_cond), &(phy->tx->buf_status_lock)); - if (status != 0){ - fprintf(stderr, "[PHY] %s: Condition wait failed: %s\n", __FUNCTION__, - strerror(status)); - failed = true; - break; - } - } - //Unlock mutex - status = pthread_mutex_unlock(&(phy->tx->buf_status_lock)); - if (status != 0){ - fprintf(stderr, "[PHY] %s: Mutex unlock failed: %s\n", __FUNCTION__, - strerror(status)); - failed = true; - } - //Stop thread if stop variable is true, or something with pthreads went wrong - if (phy->tx->stop || failed){ - phy->tx->buf_filled = false; - return NULL; - } - //------------Transmit the frame------------- - DEBUG_MSG("[PHY] TX: Buffer filled. Transmitting.\n"); - //Calculate the number of samples to transmit. - num_samples = 2*RAMP_LENGTH + (TRAINING_SEQ_LENGTH + PREAMBLE_LENGTH + - phy->tx->data_length) * 8 * SAMP_PER_SYMB; - //Add training sequence to tx data buffer - memcpy(phy->tx->data_buf, &training_seq, TRAINING_SEQ_LENGTH); - //Add preamble to tx data buffer - memcpy(&(phy->tx->data_buf[TRAINING_SEQ_LENGTH]), &preamble, PREAMBLE_LENGTH); - #ifndef BYPASS_PHY_SCRAMBLING - //Scramble the frame data (not including the training sequence or preamble) - scramble_frame(&(phy->tx->data_buf[TRAINING_SEQ_LENGTH + PREAMBLE_LENGTH]), - phy->tx->data_length, phy->scrambling_sequence); - #endif - //zero the tx samples buffer - memset(phy->tx->samples, 0, sizeof(int16_t) * 2 * num_samples); - //modulate samples - leave space for ramp up/ramp down in the samples buffer - num_mod_samples = fsk_mod(phy->fsk, phy->tx->data_buf, - TRAINING_SEQ_LENGTH + PREAMBLE_LENGTH + phy->tx->data_length, - &(phy->tx->samples[RAMP_LENGTH])); - //Mark the buffer empty - phy->tx->buf_filled = false; - - //Add the ramp up/ ramp down of samples - ramp_down_index = RAMP_LENGTH+num_mod_samples; - create_ramps(RAMP_LENGTH, phy->tx->samples[ramp_down_index-1], phy->tx->samples, - &(phy->tx->samples[ramp_down_index])); - //Convert samples - conv_struct_to_samples(phy->tx->samples, num_samples, out_samples_raw); - - //transmit all samples. TX_NOW - status = bladerf_sync_tx(phy->dev, out_samples_raw, num_samples, - &metadata, 5000); - if (status != 0){ - fprintf(stderr, "[PHY] %s: Couldn't transmit samples with bladeRF: %s\n", - __FUNCTION__, bladerf_strerror(status)); - return NULL; - } - } - - free(out_samples_raw); - return NULL; -} - -/** - * Creates a ramp up and ramp down of samples in the following format: Ramp up will use - * 'ramp_length' samples to ramp up the I samples from 0 to 2048, and set the Q samples to 0. - * Ramp down will use 'ramp_length' samples to ramp down the I samples from - * ramp_down_init.i to 0, and ramp down the Q samples from ramp_down_init.q to 0. - * - * Ex: If ramp_length is 4, ramp_down_i_init is -2048, and ramp_down_q_init is 0, - * ramp_up buffer will be: - * [.25+0j .5+0j .75+0j 1+0j] scaled by 2048 - * and ramp_down will be - * [-.75+0j -.5+0j -.25+0j 0+0j] scaled by 2048 - */ -static void create_ramps(unsigned int ramp_length, struct complex_sample ramp_down_init, - struct complex_sample *ramp_up, struct complex_sample *ramp_down) -{ - unsigned int samp; - double ramp_up_step = 2048.0/ramp_length; - double ramp_down_step_i; - double ramp_down_step_q; - - //Determine ramp down steps - if (ramp_down_init.i == 0){ - ramp_down_step_i = 0; - }else{ - ramp_down_step_i = (double)ramp_down_init.i/(double)ramp_length; - } - if (ramp_down_init.q == 0){ - ramp_down_step_q = 0; - }else{ - ramp_down_step_q = (double)ramp_down_init.q/(double)ramp_length; - } - //Create the ramps - for (samp = 0; samp < ramp_length-1; samp++){ - //ramp up - ramp_up[samp].i = (int16_t) round(ramp_up_step*(samp+1)); //I - ramp_up[samp].q = 0; //Q - - //ramp down - ramp_down[samp].i = (int16_t) round(ramp_down_init.i - ramp_down_step_i*(samp + 1)); - ramp_down[samp].q = (int16_t) round(ramp_down_init.q - ramp_down_step_q*(samp + 1)); - } - - //Set last ramp up/ ramp down sample (will always be the same) - ramp_up[ramp_length-1].i = 2047; //I - ramp_up[ramp_length-1].q = 0; //Q - - ramp_down[ramp_length-1].i = 0; //I - ramp_down[ramp_length-1].q = 0; //Q -} - -/** - * Scrambles the given data with the given scrambling sequence. The size of the - * scrambling sequence array must be at least as large as the frame. - */ -static void scramble_frame(uint8_t *frame, int frame_length, - uint8_t *scrambling_sequence) -{ - int i; - for (i = 0; i < frame_length; i++){ - //XOR byte with byte from scrambling sequence - frame[i] ^= scrambling_sequence[i]; - } -} - -/**************************************** - * * - * RECEIVER FUNCTIONS * - * * - ****************************************/ - -int phy_start_receiver(struct phy_handle *phy) -{ - int status; - - //turn off stop signal - phy->rx->stop = false; - //Kick off frame receiver thread - status = pthread_create(&(phy->rx->thread), NULL, phy_receive_frames, phy); - if (status != 0){ - fprintf(stderr, "[PHY] %s: Error creating rx thread: %s\n", __FUNCTION__, - strerror(status)); - return -1; - } - return 0; -} - -int phy_stop_receiver(struct phy_handle *phy) -{ - int status; - - DEBUG_MSG("[PHY] RX: Stopping receiver...\n"); - //signal stop - phy->rx->stop = true; - //Wait for rx thread to finish - status = pthread_join(phy->rx->thread, NULL); - if (status != 0){ - fprintf(stderr, "[PHY] %s: Error joining rx thread: %s\n", __FUNCTION__, - strerror(status)); - return -1; - } - DEBUG_MSG("[PHY] RX: Receiver stopped\n"); - return 0; -} - -uint8_t *phy_request_rx_buf(struct phy_handle *phy, unsigned int timeout_ms) -{ - int status; - struct timespec timeout_abs; - bool failed = false; - - //Create absolute time format timeout - status = create_timeout_abs(timeout_ms, &timeout_abs); - if (status != 0){ - fprintf(stderr, "[PHY] %s: Error creating timeout\n", __FUNCTION__); - return NULL; - } - - //Lock mutex - status = pthread_mutex_lock(&(phy->rx->buf_status_lock)); - if (status != 0){ - fprintf(stderr, "[PHY] %s: Error locking mutex: %s\n", __FUNCTION__, - strerror(status)); - return NULL; - } - //Wait for condition signal - meaning buffer is full - while (!phy->rx->buf_filled){ - status = pthread_cond_timedwait(&(phy->rx->buf_filled_cond), &(phy->rx->buf_status_lock), - &timeout_abs); - if (status != 0){ - if (status == ETIMEDOUT){ - //DEBUG_MSG("[PHY] phy_request_rx_buf(): Condition wait timed out\n"); - }else{ - fprintf(stderr, "[PHY] %s: Condition wait failed: %s\n", __FUNCTION__, - strerror(status)); - } - failed = true; - break; - } - } - //Unlock mutex - status = pthread_mutex_unlock(&(phy->rx->buf_status_lock)); - if (status != 0){ - fprintf(stderr, "[PHY] %s: Mutex unlock failed: %s\n", __FUNCTION__, - strerror(status)); - failed = true; - } - - if (failed){ - return NULL; - } - return phy->rx->data_buf; -} - -void phy_release_rx_buf(struct phy_handle *phy) -{ - phy->rx->buf_filled = false; -} - -/** - * Thread function which listens for and receives frames. The steps are: - * 1) Receive samples with libbladeRF - * 2) Low pass filter the samples - * 3) Power normalize the samples - * 4) Correlate the samples with the preamble waveform - * 5) If a match is found, demodulate the samples into data bytes - * 6) Unscramble the data - * 7) Copy the frame to a buffer which can be acquired with phy_request_rx_buf(), or - * drop the frame if the buffer is still in use - * - * @param arg pointer to phy_handle struct - */ -void *phy_receive_frames(void *arg) -{ - struct phy_handle *phy = (struct phy_handle *) arg; - int status; - unsigned int num_bytes_rx; - unsigned int data_index; //Current index of rx_buffer to receive new bytes on - //doubles as the current received frame length - uint64_t samples_index=0; //Current index of samples buffer to correlate/demod - //samples from - bool preamble_detected; - bool new_frame = false; - int frame_length = 0; //link layer frame length - uint8_t *rx_buffer = NULL; //local rx data buffer - uint8_t frame_type; - struct bladerf_metadata metadata; //bladerf metadata for sync_rx() - unsigned int num_bytes_to_demod = 0; - uint64_t timestamp = UINT64_MAX; - - enum states {RECEIVE, PREAMBLE_CORRELATE, DEMOD, - CHECK_FRAME_TYPE, DECODE, COPY}; - enum states state; //current state variable - - /* corr_process() takes a size_t count. - * Ensure a cast from uint64_t to size_t is valid. */ - assert(NUM_SAMPLES_RX < SIZE_MAX); - - //Allocate memory for buffer - rx_buffer = malloc(MAX_LINK_FRAME_SIZE); - if (rx_buffer == NULL){ - perror("[PHY] malloc"); - goto out; - } - - //Set bladeRF metadata - memset(&metadata, 0, sizeof(metadata)); - metadata.flags = BLADERF_META_FLAG_RX_NOW; - - preamble_detected = false; - data_index = 0; - state = RECEIVE; - //Loop until stop signal detected - while(!phy->rx->stop){ - switch(state){ - case RECEIVE: - //--Receive samples, filter, and power normalize - //DEBUG_MSG("[PHY] RX: State = RECEIVE\n"); - samples_index = 0; - status = bladerf_sync_rx(phy->dev, phy->rx->in_samples, NUM_SAMPLES_RX, - &metadata, 5000); - if (status != 0){ - fprintf(stderr, "[PHY] %s: Couldn't receive samples from bladeRF\n", - __FUNCTION__); - goto out; - } - //Check metadata - if (metadata.status & BLADERF_META_STATUS_OVERRUN){ - NOTE("[PHY] %s: Got an overrun. Expected count = %u;" - " actual count = %u. Skipping these samples.\n", - __FUNCTION__, NUM_SAMPLES_RX, metadata.actual_count); - break; - } - if (timestamp != UINT64_MAX && metadata.timestamp != timestamp+NUM_SAMPLES_RX){ - NOTE("[PHY] %s: Unexpected timestamp. Expected %lu, got %lu.\n", - __FUNCTION__, timestamp+NUM_SAMPLES_RX, metadata.timestamp); - } - timestamp = metadata.timestamp; - - #ifndef BYPASS_RX_CHANNEL_FILTER - // Apply channel filter - fir_process(phy->rx->ch_filt, phy->rx->in_samples, - phy->rx->filt_samples, NUM_SAMPLES_RX); - #else - conv_samples_to_struct(phy->rx->in_samples, NUM_SAMPLES_RX, - phy->rx->filt_samples); - #endif - //Power normalize - #ifndef BYPASS_RX_PNORM - pnorm(phy->rx->pnorm, NUM_SAMPLES_RX, phy->rx->filt_samples, - phy->rx->pnorm_samples, NULL, NULL); - #else - memcpy(phy->rx->pnorm_samples, phy->rx->filt_samples, - NUM_SAMPLES_RX * sizeof(struct complex_sample)); - #endif - if (preamble_detected){ - state = DEMOD; - }else{ - state = PREAMBLE_CORRELATE; - } - break; - case PREAMBLE_CORRELATE: - //--Cross correlate received samples with preamble to find start - //--of the data frame - //DEBUG_MSG("[PHY] RX: State = PREAMBLE_CORRELATE\n"); - samples_index = corr_process(phy->rx->corr, - &(phy->rx->pnorm_samples[samples_index]), - (size_t) (NUM_SAMPLES_RX-samples_index), 0); - if (samples_index != CORRELATOR_NO_RESULT){ - DEBUG_MSG("[PHY] RX: Preamble matched @ index %lu\n", samples_index); - preamble_detected = true; - new_frame = true; - //First we only demod the first byte to determine frame type - num_bytes_to_demod = 1; - data_index = 0; - state = DEMOD; - }else{ - //No preamble match. Receive more samples - state = RECEIVE; - } - break; - case DEMOD: - //--Demod samples - DEBUG_MSG("[PHY] RX: State = DEMOD\n"); - num_bytes_rx = fsk_demod(phy->fsk, &(phy->rx->pnorm_samples[samples_index]), - NUM_SAMPLES_RX-(int)samples_index, new_frame, - num_bytes_to_demod, &rx_buffer[data_index]); - if (num_bytes_rx < num_bytes_to_demod){ - //Receive more samples - num_bytes_to_demod -= num_bytes_rx; - state = RECEIVE; - }else{ - if (new_frame){ - state = CHECK_FRAME_TYPE; - //Account for extra sample which defines initial phase - samples_index++; - }else{ - //We demoded all samples in the frame - state = DECODE; - } - } - data_index += num_bytes_rx; - samples_index += num_bytes_rx*8*SAMP_PER_SYMB; - new_frame = false; - break; - case CHECK_FRAME_TYPE: - //--Check the frame type byte - DEBUG_MSG("[PHY] RX: State = CHECK_FRAME_TYPE\n"); - #ifndef BYPASS_PHY_SCRAMBLING - frame_type = rx_buffer[0] ^ phy->scrambling_sequence[0]; - #else - frame_type = rx_buffer[0]; - #endif - //Set frame length according to what type of frame it is - if (frame_type == ACK_FRAME_CODE){ - DEBUG_MSG("[PHY] RX: Getting an ACK frame...\n"); - frame_length = ACK_FRAME_LENGTH; - }else if(frame_type == DATA_FRAME_CODE){ - DEBUG_MSG("[PHY] RX: Getting a data frame...\n"); - frame_length = DATA_FRAME_LENGTH; - }else{ - NOTE("[PHY] %s: rx'ed unknown frame type 0x%.2X\n", - __FUNCTION__, frame_type); - data_index = 0; - preamble_detected = false; - state = RECEIVE; - break; - } - //Demod the rest of the bytes - num_bytes_to_demod = frame_length-1; - state = DEMOD; - break; - case DECODE: - //--Remove any phy encoding on the received frame - DEBUG_MSG("[PHY] RX: State = DECODE\n"); - #ifndef BYPASS_PHY_SCRAMBLING - //Unscramble the frame - unscramble_frame(rx_buffer, frame_length, phy->scrambling_sequence); - #endif - state = COPY; - break; - case COPY: - //--Copy frame into buffer which can be accessed by the link layer - DEBUG_MSG("[PHY] RX: State = COPY\n"); - //Is the link layer still working with the previous frame? - if (phy->rx->buf_filled){ - //Instead of disrupting the link layer, drop this frame - NOTE("[PHY] RX: Frame dropped!\n"); - }else{ - //Copy frame into rx_data_buf - memcpy(phy->rx->data_buf, rx_buffer, - frame_length); - phy->rx->buf_filled = true; - //Signal that the buffer is filled - status = pthread_mutex_lock(&(phy->rx->buf_status_lock)); - if (status != 0){ - fprintf(stderr, "[PHY] %s: Error locking pthread_mutex\n", - __FUNCTION__); - goto out; - } - status = pthread_cond_signal(&(phy->rx->buf_filled_cond)); - if (status != 0){ - fprintf(stderr, "[PHY] %s: Error signaling pthread_cond\n", - __FUNCTION__); - goto out; - } - status = pthread_mutex_unlock(&(phy->rx->buf_status_lock)); - if (status != 0){ - fprintf(stderr, "[PHY] %s: Error unlocking pthread_mutex\n", - __FUNCTION__); - goto out; - } - DEBUG_MSG("[PHY] RX: Frame ready\n"); - } - preamble_detected = false; - - if (samples_index == NUM_SAMPLES_RX){ - state = RECEIVE; - }else{ - state = PREAMBLE_CORRELATE; - } - break; - default: - fprintf(stderr, "[PHY] %s: Invalid state\n", __FUNCTION__); - goto out; - } - } - out: - free(rx_buffer); - return NULL; -} - -/** - * Unscrambles the given data with the given scrambling sequence. The size of the - * scrambling sequence array must be at least as large as the frame. - */ -static void unscramble_frame(uint8_t *frame, int frame_length, - uint8_t *scrambling_sequence) -{ - int i; - for (i = 0; i < frame_length; i++){ - //XOR byte with byte from scrambling sequence - frame[i] ^= scrambling_sequence[i]; - } -} diff --git a/host/utilities/bladeRF-fsk/c/src/phy.h b/host/utilities/bladeRF-fsk/c/src/phy.h deleted file mode 100644 index b59cd40d..00000000 --- a/host/utilities/bladeRF-fsk/c/src/phy.h +++ /dev/null @@ -1,167 +0,0 @@ -/** - * @file - * @brief Physical layer code for modem - * - * This file handles transmission/reception of data frames over the air. It uses fsk.c to - * perform baseband IQ modulation and demodulation, and libbladeRF to transmit/receive - * samples using the bladeRF device. A different modulator could be used by swapping - * fsk.c with a file that implements a different modulator. On the receive side the file - * uses fir_filter.c to low-pass filter the received signal, pnorm.c to power normalize - * the input signal, and correlator.c to correlate the received signal with a preamble. - * waveform. - * - * The structure of a physical layer transmission is as follows: - * ``` - * / ramp up | training sequence | preamble | link layer frame | ramp down \ - * ``` - * The ramps at the beginning/end are SAMP_PER_SYMB samples long - * - * This file is part of the bladeRF project - * - * Copyright (C) 2016 Nuand LLC - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#ifndef PHY_H -#define PHY_H - -#include -#include -#include -#include "thread.h" -#include -#include - -#include "host_config.h" -#include "common.h" -#include "utils.h" - -//Training sequence which goes at the start of every frame -//Note: In order for the preamble waveform not to be messed up, the last -//sample of the modulated training sequence MUST be 1 + 0j (2047 + 0j) -#define TRAINING_SEQ {0xAA, 0xAA, 0xAA, 0xAA} -//Length of training sequence in bytes -#define TRAINING_SEQ_LENGTH 4 -//preamble which goes after the training sequence -#define PREAMBLE {0x2E, 0x69, 0x2C, 0xF0} -//Length of preamble in bytes -#define PREAMBLE_LENGTH 4 -//Byte codes for data/ack frame -#define DATA_FRAME_CODE 0x00 -#define ACK_FRAME_CODE 0xFF -//Frame lengths -#define DATA_FRAME_LENGTH 1009 -#define ACK_FRAME_LENGTH 7 -//Maximum frame size in bytes -#define MAX_LINK_FRAME_SIZE DATA_FRAME_LENGTH -//Seed for pseudorandom number sequence generator -#define PRNG_SEED 0x0109BBA53CFFD081 -//Length (in samples) of ramp up/ramp down -#define RAMP_LENGTH SAMP_PER_SYMB -//Number of samples to receive at a time from bladeRF -#define NUM_SAMPLES_RX SYNC_BUFFER_SIZE -//Correlator countdown size -#define CORR_COUNTDOWN SAMP_PER_SYMB - -struct phy_handle; - -//----------------------Transmitter functions--------------------------- -/** - * Start the PHY transmitter thread - * - * @param[in] phy pointer to phy_handle struct - * - * @return 0 on success, -1 on failure - */ -int phy_start_transmitter(struct phy_handle *phy); - -/** - * Stop the PHY transmitter thread - * - * @param[in] phy pointer to phy_handle struct - * - * @return 0 on success, -1 on failure - */ -int phy_stop_transmitter(struct phy_handle *phy); - -/** - * Fill the tx buffer so its data will be transmitted using phy_transmit_frames() - * - * @param[in] phy pointer to phy handle structure - * @param[in] data_buf bytes to transmit - * @param[in] length length of data buf - * - * @return 0 on success, -1 on failure - */ -int phy_fill_tx_buf(struct phy_handle *phy, uint8_t *data_buf, unsigned int length); - -//------------------------Receiver functions--------------------------- -/** - * Start the PHY receiver thread - * - * @param[in] phy pointer to phy_handle struct - * - * @return 0 on success, -1 on failure - */ -int phy_start_receiver(struct phy_handle *phy); - -/** - * Stop the PHY receiver thread - * - * @param[in] phy pointer to phy_handle struct - * - * @return 0 on success, -1 on failure - */ -int phy_stop_receiver(struct phy_handle *phy); - -/** - * Request a received frame from phy_receive_frames(). Caller should call - * phy_release_rx_buf() when done with the received frame so that - * phy_receive_frames() does not drop any frames. - * - * @param[in] phy pointer to phy_handle struct - * @param[in] timeout_ms amount of time to wait for a buffer from the PHY - * - * @return pointer to filled buffer with received frame inside - */ -uint8_t *phy_request_rx_buf(struct phy_handle *phy, unsigned int timeout_ms); - -/** - * Release RX buffer so that phy_receive_frames() can copy new frames into the buffer - * - * @param[in] phy pointer to phy_handle struct - */ -void phy_release_rx_buf(struct phy_handle *phy); - -//-----------------------Init/Deinit functions------------------------- -/** - * Open/Initialize a phy_handle - * - * @param[in] dev pointer to opened bladeRF device handle - * @param[in] params pointer to radio parameters struct - * - * @return allocated phy_handle on success, NULL on failure - */ -struct phy_handle *phy_init(struct bladerf *dev, struct radio_params *params); - -/** - * Close a phy handle. Does nothing if handle is NULL - * - * @param[in] phy_handle to close - */ -void phy_close(struct phy_handle *phy); - -#endif diff --git a/host/utilities/bladeRF-fsk/c/src/pnorm.c b/host/utilities/bladeRF-fsk/c/src/pnorm.c deleted file mode 100644 index e2f0734e..00000000 --- a/host/utilities/bladeRF-fsk/c/src/pnorm.c +++ /dev/null @@ -1,206 +0,0 @@ -/** - * @brief Normalizes the input IQ signal [-1.0, 1.0] to a power of 1.0 - * - * This file is part of the bladeRF project - * - * Copyright (C) 2016 Nuand LLC - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ -#include -#include -#include -#include -#include -#include -#include -#include -#include "host_config.h" - -#include "pnorm.h" - -struct pnorm_state_t { - float est ; //Estimate of signal power (essentially a running average) - bool hold ; //Hold the current gain? - float alpha ; - float invalpha ; - float min_gain ; - float max_gain ; -} ; - -struct pnorm_state_t *pnorm_init(float alpha, float min_gain, float max_gain) { - struct pnorm_state_t *state ; - state = malloc(sizeof(state[0])) ; - if( state == NULL ) { - perror("malloc") ; - return NULL ; - } - state->est = 1.0f ; - state->hold = false ; - state->alpha = alpha ; - state->invalpha = (1.0f - alpha) ; - - assert(min_gain < max_gain) ; - state->min_gain = min_gain ; - state->max_gain = max_gain ; - - return state ; -} - -void pnorm_reset(struct pnorm_state_t *state) { - state->est = 1.0f ; - state->hold = false ; -} - -void pnorm_deinit(struct pnorm_state_t *state) { - free(state) ; - return ; -} - -void pnorm_hold(struct pnorm_state_t *state, bool val) { - state->hold = val ; - return ; -} - -void pnorm(struct pnorm_state_t *state, uint16_t length, struct complex_sample *in, - struct complex_sample *out, float *ests, float *gains) { - int i ; - float power; - int32_t temp; - float gain, est; - - for( i = 0 ; i < length ; i++ ) { - /* Power IIR filter */ - if( state->hold == false ) { - //New estimate of power (normalized) - est = state->est = state->alpha*state->est + - state->invalpha*(in[i].i*in[i].i + in[i].q*in[i].q)/(SAMP_MAX_ABS*SAMP_MAX_ABS); - } else { - est = state->est ; - } - - /* Ideal power is 1.0, so to get x to 1.0, we need to multiply by 1/est */ - gain = 1.0f/sqrtf(state->est) ; - - /* Check below min gain */ - if( gain < state->min_gain ) { - gain = state->min_gain ; - } - - /* Check above max gain */ - if( gain > state->max_gain ) { - gain = state->max_gain ; - } - - /* Apply gain */ - //Use temp int32_t in case this number goes outside 16bit range - temp = (int32_t) round(in[i].i * gain); - //Clamp - if (temp > CLAMP_VAL_ABS){ - temp = CLAMP_VAL_ABS; - }else if (temp < -CLAMP_VAL_ABS){ - temp = -CLAMP_VAL_ABS; - } - out[i].i = (int16_t) temp; - - temp = (int32_t) round(in[i].q * gain); - //Clamp - if (temp > CLAMP_VAL_ABS){ - temp = CLAMP_VAL_ABS; - }else if (temp < -CLAMP_VAL_ABS){ - temp = -CLAMP_VAL_ABS; - } - out[i].q = (int16_t) temp; - - /* Blank impulse power */ - power = (out[i].i * out[i].i + out[i].q * out[i].q)/(float)(SAMP_MAX_ABS*SAMP_MAX_ABS); - if (power >= 10.0f) { - out[i].i = out[i].q = 0; - } - - //Write to debug buffers - if (ests != NULL){ - ests[i] = est; - } - if (gains != NULL){ - gains[i] = gain; - } - } - return ; -} - -#ifdef PNORM_TEST - -#define NUM_SAMPLES 4000 - -struct complex_sample input[NUM_SAMPLES] ; -struct complex_sample output[NUM_SAMPLES] ; -float est[NUM_SAMPLES] ; -float gain[NUM_SAMPLES] ; - -int main(int argc, char *argv[]) { - FILE *fin, *fout ; - struct pnorm_state_t *state ; - float alpha, min_gain, max_gain ; - unsigned int count, i ; - int result; - - if( argc < 6 ) { - fprintf(stderr, "Usage: %s \n", argv[0]) ; - return 1 ; - } - - fin = fopen( argv[4], "r" ) ; - if( fin == NULL ) { - fprintf( stderr, "Couldn't open %s\n for input csv",argv[2] ) ; - return 1 ; - } - - fout = fopen( argv[5], "w" ) ; - if( fout == NULL ) { - fprintf( stderr, "Couldn't open %s for output csv", argv[3] ) ; - } - - alpha = (float) atof(argv[1]) ; - min_gain = (float) atof(argv[2]) ; - max_gain = (float) atof(argv[3]) ; - - state = pnorm_init(alpha, min_gain, max_gain) ; - while (!feof(fin)) { - count = 0 ; - while( count < sizeof(input) && !feof(fin) ) { - result = fscanf( fin, "%hi,%hi\n", &input[count].i, &input[count].q ) ; - if (result == EOF){ - break; - } - count++ ; - } - pnorm( state, count, input, output, est, gain ) ; - for( i = 0 ; i < count ; i++ ) { - fprintf( fout, "%hi,%hi,%15.9f,%15.9f\n", output[i].i, - output[i].q, est[i], gain[i] ) ; - } - } - - pnorm_deinit(state) ; - - fclose( fin ) ; - fclose( fout ) ; - - return 0 ; -} - -#endif - diff --git a/host/utilities/bladeRF-fsk/c/src/pnorm.h b/host/utilities/bladeRF-fsk/c/src/pnorm.h deleted file mode 100644 index 913807b6..00000000 --- a/host/utilities/bladeRF-fsk/c/src/pnorm.h +++ /dev/null @@ -1,48 +0,0 @@ -/** - * @file - * @brief Normalizes the input IQ signal [-1.0, 1.0] to a power of 1.0 - * - * This file is part of the bladeRF project - * - * Copyright (C) 2016 Nuand LLC - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ -#ifndef PNORM_H_ -#define PNORM_H_ - -#include -#include -#include "common.h" //For struct complex_sample - -#define SAMP_MAX_ABS 2048 -#define CLAMP_VAL_ABS 3072 - -struct pnorm_state_t ; - -struct pnorm_state_t *pnorm_init(float alpha, float min_gain, float max_gain) ; -void pnorm_reset(struct pnorm_state_t *state) ; -void pnorm_deinit(struct pnorm_state_t *state) ; -void pnorm_hold(struct pnorm_state_t *state, bool val) ; - -/** - * Power normalize a set of samples. - * The 'ests' and 'gains' output buffers are for extra debug information. If they are NULL, - * the function will not attempt to place values in them. - */ -void pnorm(struct pnorm_state_t *state, uint16_t length, struct complex_sample *in, - struct complex_sample *out, float *est, float *gain); - -#endif diff --git a/host/utilities/bladeRF-fsk/c/src/prng.c b/host/utilities/bladeRF-fsk/c/src/prng.c deleted file mode 100644 index d2e93050..00000000 --- a/host/utilities/bladeRF-fsk/c/src/prng.c +++ /dev/null @@ -1,129 +0,0 @@ -/** - * @brief XORshift Pseudorandom number generator - * - * https://en.wikipedia.org/wiki/Xorshift#xorshift.2A - * - * This file is part of the bladeRF project - * - * Copyright (C) 2016 Nuand LLC - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ -#include "prng.h" - -uint8_t * prng_fill(uint64_t *state_inout, size_t len) -{ - size_t i; - size_t to_fill; - uint8_t *ret, *curr; - uint64_t state = *state_inout; - - assert(state != 0); - - ret = malloc(len); - if (!ret) { - return NULL; - } - - curr = ret; - - /* Fill 64-bit words first */ - to_fill = (len / 8) * 8; - - for (i = 0; i < to_fill; i += 8, curr += 8) { - state = prng_update(state); - curr[0] = (state >> 0) & 0xff; - curr[1] = (state >> 8) & 0xff; - curr[2] = (state >> 16) & 0xff; - curr[3] = (state >> 24) & 0xff; - curr[4] = (state >> 32) & 0xff; - curr[5] = (state >> 40) & 0xff; - curr[6] = (state >> 48) & 0xff; - curr[7] = (state >> 56) & 0xff; - } - - /* Fill remaining partial words */ - to_fill = len - to_fill; - if (to_fill != 0) { - state = prng_update(state); - for (i = 0; i < to_fill; i++) { - *curr = state & 0xff; - state >>= 8; - curr++; - } - } - - return ret; -} - -#ifdef PRNG_TEST - -#include -#include -#include -#include - -int main(int argc, char *argv[]) -{ - int len; - uint64_t seed; - uint8_t *buf; - FILE *out; - ssize_t n_written; - int status = 0; - - if (argc < 4 || !strcmp(argv[1], "-h") || !strcmp(argv[1], "--help")) { - fprintf(stderr, "Usage: %s \n", argv[0]); - return EXIT_FAILURE; - } - - seed = atol(argv[1]); - if (seed == 0) { - fprintf(stderr, "Seed must be non-zero.\n"); - return EXIT_FAILURE; - } - - len = atoi(argv[2]); - if (len <= 0) { - fprintf(stderr, "Length must be >= 1.\n"); - return EXIT_FAILURE; - } - - buf = prng_fill(&seed, len); - if (!buf) { - fprintf(stderr, "Failed to create PRNG data buffer.\n"); - return EXIT_FAILURE; - } - - out = fopen(argv[3], "wb"); - if (!out) { - fprintf(stderr, "Failed to open %s for writing: %s\n", - argv[3], strerror(errno)); - goto out; - } - - n_written = fwrite(buf, 1, len, out); - if (n_written != len) { - fprintf(stderr, "Failed to write PRNG data.\n"); - status = EXIT_FAILURE; - } - - fclose(out); - -out: - free(buf); - return status; -} -#endif diff --git a/host/utilities/bladeRF-fsk/c/src/prng.h b/host/utilities/bladeRF-fsk/c/src/prng.h deleted file mode 100644 index dd20d421..00000000 --- a/host/utilities/bladeRF-fsk/c/src/prng.h +++ /dev/null @@ -1,63 +0,0 @@ -/** - * @file - * @brief XORshift Pseudorandom number generator - * - * https://en.wikipedia.org/wiki/Xorshift#xorshift.2A - * - * This file is part of the bladeRF project - * - * Copyright (C) 2016 Nuand LLC - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#include -#include -#include - -#include "host_config.h" - -/** - * Update the PRNG value - * - * @param state_in Input PRNG state. Must be non-zero. - * - * @return next PRNG value in the sequence - */ -static inline uint64_t prng_update(uint64_t state_in) -{ - uint64_t state = state_in; - assert(state != 0); - - state ^= state >> 12; - state ^= state << 25; - state ^= state >> 27; - state *= 0x2545f4914f6cdd1d; - - return state; -} - -/** - * Allocate and fill a byte array with PRNG values. The caller is responsible - * for freeing the returned buffer. - * - * @param[inout] state PRNG state or seed. Updated with new state. - * @param[in] len Desired buffer length, in bytes. Recommended - * to be a multiple of 8. - * - * @return Heap-allocated buffer filled with PRNG output on success, - * NULL on failure. - */ -uint8_t * prng_fill(uint64_t *state, size_t len); diff --git a/host/utilities/bladeRF-fsk/c/src/radio_config.c b/host/utilities/bladeRF-fsk/c/src/radio_config.c deleted file mode 100644 index a8d9aed3..00000000 --- a/host/utilities/bladeRF-fsk/c/src/radio_config.c +++ /dev/null @@ -1,280 +0,0 @@ -/** - * @brief BladeRF radio configuration - setting of frequencies, gains, etc. - * - * This file is part of the bladeRF project - * - * Copyright (C) 2016 Nuand LLC - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#include "radio_config.h" - -#ifdef DEBUG_MODE - #define DEBUG_MSG(...) fprintf(stderr, __VA_ARGS__) -#else - #define DEBUG_MSG(...) -#endif - -//private structs -struct module_config{ - bladerf_module module; - unsigned int frequency; - unsigned int bandwidth; - unsigned int samplerate; - /* Gains */ - int use_unified; - int use_agc; - int unified_gain; - bladerf_lna_gain rx_lna; - int vga1; - int vga2; - /* Biastee control */ - int biastee; -}; -//internal functinos -static int radio_configure_module(struct bladerf *dev, struct module_config *c); -static int radio_init_sync(struct bladerf *dev); - -/** - * Configure RX/TX module - */ -static int radio_configure_module(struct bladerf *dev, struct module_config *c) -{ - int status; - status = bladerf_set_frequency(dev, c->module, c->frequency); - if (status != 0) { - fprintf(stderr, "Failed to set frequency = %u: %s\n", - c->frequency, bladerf_strerror(status)); - return status; - } - status = bladerf_set_sample_rate(dev, c->module, c->samplerate, NULL); - if (status != 0) { - fprintf(stderr, "Failed to set samplerate = %u: %s\n", - c->samplerate, bladerf_strerror(status)); - return status; - } - status = bladerf_set_bandwidth(dev, c->module, c->bandwidth, NULL); - if (status != 0) { - fprintf(stderr, "Failed to set bandwidth = %u: %s\n", - c->bandwidth, bladerf_strerror(status)); - return status; - } - switch (c->module) { - case BLADERF_MODULE_RX: - if (c->use_agc) { - status = bladerf_set_gain_mode(dev, c->module, BLADERF_GAIN_AUTOMATIC); - if (status != 0) { - fprintf(stderr, "Failed enable RX AGC: %s\n", - bladerf_strerror(status)); - return status; - } - } else { - status = bladerf_set_gain_mode(dev, c->module, BLADERF_GAIN_MANUAL); - if (status != 0) { - fprintf(stderr, "Failed to disable RX AGC: %s\n", - bladerf_strerror(status)); - return status; - } - if (c->use_unified) { - status = bladerf_set_gain(dev, c->module, c->unified_gain); - if (status != 0) { - fprintf(stderr, "Failed to set unified RX gain: %s\n", - bladerf_strerror(status)); - return status; - } - } else { - /* Configure the gains of the RX LNA, RX VGA1, and RX VGA2 */ - status = bladerf_set_lna_gain(dev, c->rx_lna); - if (status != 0) { - fprintf(stderr, "Failed to set RX LNA gain: %s\n", - bladerf_strerror(status)); - return status; - } - status = bladerf_set_rxvga1(dev, c->vga1); - if (status != 0) { - fprintf(stderr, "Failed to set RX VGA1 gain: %s\n", - bladerf_strerror(status)); - return status; - } - status = bladerf_set_rxvga2(dev, c->vga2); - if (status != 0) { - fprintf(stderr, "Failed to set RX VGA2 gain: %s\n", - bladerf_strerror(status)); - return status; - } - } - } - break; - case BLADERF_MODULE_TX: - if (c->use_unified) { - status = bladerf_set_gain(dev, c->module, c->unified_gain); - if (status != 0) { - fprintf(stderr, "Failed to set unified TX gain: %s\n", - bladerf_strerror(status)); - return status; - } - } else { - /* Configure the TX VGA1 and TX VGA2 gains */ - status = bladerf_set_txvga1(dev, c->vga1); - if (status != 0) { - fprintf(stderr, "Failed to set TX VGA1 gain: %s\n", - bladerf_strerror(status)); - return status; - } - status = bladerf_set_txvga2(dev, c->vga2); - if (status != 0) { - fprintf(stderr, "Failed to set TX VGA2 gain: %s\n", - bladerf_strerror(status)); - return status; - } - } - break; - default: - status = BLADERF_ERR_INVAL; - fprintf(stderr, "%s: Invalid module specified (%d)\n", - __FUNCTION__, c->module); - } - return status; -} - -/** - * Initialize synchronous interface - */ -static int radio_init_sync(struct bladerf *dev) -{ - int status; - const unsigned int num_buffers = 64; - const unsigned int buffer_size = SYNC_BUFFER_SIZE; /* Must be a multiple of 1024 */ - const unsigned int num_transfers = 16; - const unsigned int timeout_ms = 3500; - /* Configure both the device's RX and TX modules for use with the synchronous - * interface. SC16 Q11 samples with metadata are used. */ - status = bladerf_sync_config(dev, - BLADERF_MODULE_RX, - BLADERF_FORMAT_SC16_Q11_META, - num_buffers, - buffer_size, - num_transfers, - timeout_ms); - if (status != 0) { - fprintf(stderr, "Failed to configure RX sync interface: %s\n", - bladerf_strerror(status)); - return status; - } - status = bladerf_sync_config(dev, - BLADERF_MODULE_TX, - BLADERF_FORMAT_SC16_Q11_META, - num_buffers, - buffer_size, - num_transfers, - timeout_ms); - if (status != 0) { - fprintf(stderr, "Failed to configure TX sync interface: %s\n", - bladerf_strerror(status)); - } - return status; -} - -int radio_init_and_configure(struct bladerf *dev, struct radio_params *params) -{ - struct module_config config; - int status; - - #ifdef DEBUG_MODE - bladerf_log_set_verbosity(BLADERF_LOG_LEVEL_DEBUG); - #endif - - //Configure TX parameters - config.module = BLADERF_MODULE_TX; - config.frequency = params->tx_freq; - config.bandwidth = BLADERF_BANDWIDTH; - config.samplerate = BLADERF_SAMPLE_RATE; - config.vga1 = params->tx_vga1_gain; - config.vga2 = params->tx_vga2_gain; - config.use_unified = params->tx_use_unified; - config.unified_gain = params->tx_unified_gain; - config.biastee = params->tx_biastee; - status = radio_configure_module(dev, &config); - if (status != 0){ - fprintf(stderr, "Couldn't configure TX module: %s\n", bladerf_strerror(status)); - return status; - } - - //Configure RX parameters - config.module = BLADERF_MODULE_RX; - config.frequency = params->rx_freq; - config.bandwidth = BLADERF_BANDWIDTH; - config.samplerate = BLADERF_SAMPLE_RATE; - config.rx_lna = params->rx_lna_gain; - config.vga1 = params->rx_vga1_gain; - config.vga2 = params->rx_vga2_gain; - config.use_unified = params->rx_use_unified; - config.unified_gain = params->rx_unified_gain; - config.biastee = params->rx_biastee; - status = radio_configure_module(dev, &config); - if (status != 0){ - fprintf(stderr, "Couldn't configure RX module: %s\n", bladerf_strerror(status)); - return status; - } - - //Unset loopback - status = bladerf_set_loopback(dev, BLADERF_LB_NONE); - if (status != 0){ - fprintf(stderr, "Couldn't set loopback: %s", bladerf_strerror(status)); - return status; - } - - //Initialize synchronous interface - status = radio_init_sync(dev); - if (status != 0){ - fprintf(stderr, "Couldn't initialize synchronous interface: %s\n", - bladerf_strerror(status)); - return status; - } - - //Enable tx module - status = bladerf_enable_module(dev, BLADERF_MODULE_TX, true); - if (status != 0){ - fprintf(stderr, "Couldn't enable TX module: %s\n", bladerf_strerror(status)); - return status; - } - //Enable rx module - status = bladerf_enable_module(dev, BLADERF_MODULE_RX, true); - if (status != 0){ - fprintf(stderr, "Couldn't enable RX module: %s\n", bladerf_strerror(status)); - return status; - } - return 0; -} - -void radio_stop(struct bladerf *dev) -{ - int status; - - if (dev == NULL){ - return; - } - //Disable tx module - status = bladerf_enable_module(dev, BLADERF_MODULE_TX, false); - if (status != 0){ - fprintf(stderr, "Couldn't disable TX module: %s\n", bladerf_strerror(status)); - } - //Disable rx module - status = bladerf_enable_module(dev, BLADERF_MODULE_RX, false); - if (status != 0){ - fprintf(stderr, "Couldn't disable RX module: %s\n", bladerf_strerror(status)); - } -} diff --git a/host/utilities/bladeRF-fsk/c/src/radio_config.h b/host/utilities/bladeRF-fsk/c/src/radio_config.h deleted file mode 100644 index c5ff218c..00000000 --- a/host/utilities/bladeRF-fsk/c/src/radio_config.h +++ /dev/null @@ -1,55 +0,0 @@ -/** - * @file - * @brief BladeRF radio configuration - setting of frequencies, gains, etc. - * - * This file is part of the bladeRF project - * - * Copyright (C) 2016 Nuand LLC - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#ifndef RADIO_CONFIG_H -#define RADIO_CONFIG_H - -#include -#include - -#include "common.h" - -#define SYNC_BUFFER_SIZE 16384 -//1.5MHz -#define BLADERF_BANDWIDTH 1500000 -//2Msps -#define BLADERF_SAMPLE_RATE 2000000 - -/** - * Configure bladeRF device - * - * @param[in] dev pointer to bladeRF device handle - * @param[in] params pointer to radio_params struct specifying frequencies/gains - * - * @return 0 on success, <0 on error - */ -int radio_init_and_configure(struct bladerf *dev, struct radio_params *params); - -/** - * Stop transmitting/receiving with bladerf. Device must be closed elsewhere. - * - * @param[in] dev pointer to bladeRF device handle to stop - */ -void radio_stop(struct bladerf *dev); - -#endif diff --git a/host/utilities/bladeRF-fsk/c/src/rx_ch_filter.h b/host/utilities/bladeRF-fsk/c/src/rx_ch_filter.h deleted file mode 100644 index 1cfe2687..00000000 --- a/host/utilities/bladeRF-fsk/c/src/rx_ch_filter.h +++ /dev/null @@ -1,82 +0,0 @@ -/** - * @file - * @brief FIR filter coefficients for low-pass channel filter - * - * This file is part of the bladeRF project - * - * Copyright (C) 2016 Nuand LLC - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#ifndef RX_CHANNEL_FILTER_H_ -#define RX_CHANNEL_FILTER_H_ - -#include - -/** - * 31st Order Equiripple Low-Pass Filter - * Pass band: Fs / 16 - * Stop band: Fs / 6 - * - * MATLAB command: - * taps = firpm(31, [0 1/8 1/3 1], [1 1 0 0]); - * OR - * taps = remez(31, [0 1/8 1/3 1], [1 1 0 0]); - * - * For FSK implementation with mod_index=pi/2, SPS=8, this filter was designed to: - * - Pass the signal's main lobe - * - Transition in the signal's first side lobe - * - Provide >= 60 dB of rejection at and beyond the second side lobe - */ -static const float rx_ch_filter[] = { - -0.001419485011355f, - -0.002008975606412f, - -0.001265131815619f, - 0.001949590314393f, - 0.006879213394692f, - 0.010409452708224f, - 0.008177393348267f, - -0.002501030091427f, - -0.019324528756445f, - -0.033658544676913f, - -0.032963705706846f, - -0.006721606720265f, - 0.046859333762514f, - 0.117272556273597f, - 0.184063253582650f, - 0.224762721634701f, - 0.224762721634701f, - 0.184063253582650f, - 0.117272556273597f, - 0.046859333762514f, - -0.006721606720265f, - -0.032963705706846f, - -0.033658544676913f, - -0.019324528756445f, - -0.002501030091427f, - 0.008177393348267f, - 0.010409452708224f, - 0.006879213394692f, - 0.001949590314393f, - -0.001265131815619f, - -0.002008975606412f, - -0.001419485011355f, -}; - -static const size_t - rx_ch_filter_len = sizeof(rx_ch_filter) / sizeof(rx_ch_filter[0]); - -#endif diff --git a/host/utilities/bladeRF-fsk/c/src/test_suite.c b/host/utilities/bladeRF-fsk/c/src/test_suite.c deleted file mode 100644 index 2f6e7e6f..00000000 --- a/host/utilities/bladeRF-fsk/c/src/test_suite.c +++ /dev/null @@ -1,483 +0,0 @@ -/** - * @file - * @brief Various modem tests for phy.c, link.c, and fsk.c - * - * This file is part of the bladeRF project - * - * Copyright (C) 2016 Nuand LLC - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ -#include -#include -#include -#include -//Utility files -#include "utils.h" -#include "prng.h" -//Units under test -#include "phy.h" -#include "link.h" -#include "fsk.h" - -#ifdef DEBUG_MODE - #define DEBUG_MSG(...) fprintf(stderr, __VA_ARGS__) -#else - #define DEBUG_MSG(...) -#endif - -/** - * Test link layer code with data transfer between two devices - */ -int link_test(char *dev_id1, char *dev_id2, unsigned int tx_freq1, unsigned int tx_freq2) -{ - struct link_handle *link1 = NULL; - struct link_handle *link2 = NULL; - int status = 0; - int bytes_received; - uint8_t tx_data[900]; - uint8_t tx_data2[900] = "Another message"; - uint8_t rx_data[900]; - struct radio_params params; - struct bladerf *dev1 = NULL, *dev2 = NULL; - char *result; - - printf("------------BEGINNING LINK TEST-----------\n"); - //Open bladeRFs - status = bladerf_open(&dev1, dev_id1); - if (status != 0){ - fprintf(stderr, "Couldn't open bladeRF device #1: %s\n", bladerf_strerror(status)); - goto out; - } - status = bladerf_open(&dev2, dev_id2); - if (status != 0){ - fprintf(stderr, "Couldn't open bladeRF device #2: %s\n", bladerf_strerror(status)); - goto out; - } - - //Zero the tx_data buffer - memset((void *)tx_data, 0, sizeof(tx_data)); - //Prompt for a string - printf("Enter a string to tx using link1: "); - result = fgets((char *) tx_data, sizeof(tx_data), stdin); - if (result == NULL){ - status = -1; - goto out; - } - //Remove newline character - tx_data[strlen((char *)tx_data) - 1] = '\0'; - - //Init link1 - params.tx_freq = tx_freq1; - params.tx_vga1_gain = -4; - params.tx_vga2_gain = 0; - params.rx_freq = tx_freq2; - params.rx_lna_gain = BLADERF_LNA_GAIN_MAX; - params.rx_vga1_gain = 23; - params.rx_vga2_gain = 0; - link1 = link_init(dev1, ¶ms); - if (link1 == NULL){ - fprintf(stderr, "Couldn't initialize link1\n"); - status = -1; - goto out; - } - //Init link2 - params.tx_freq = tx_freq2; - params.rx_freq = tx_freq1; - link2 = link_init(dev2, ¶ms); - if (link2 == NULL){ - fprintf(stderr, "Couldn't initialize link2\n"); - status = -1; - goto out; - } - - //Transmit with link1 - status = link_send_data(link1, tx_data, (unsigned int) strlen((char *)tx_data) + 1); - if (status != 0){ - fprintf(stderr, "Couldn't send data with link1\n"); - goto out; - } - - //Receive with link2 - bytes_received = link_receive_data(link2, (int)strlen((char *)tx_data) + 1, 5, rx_data); - if (bytes_received < 0){ - fprintf(stderr, "Couldn't receive data with link2\n"); - goto out; - }else if (bytes_received != (int)(strlen((char *) tx_data) + 1)){ - fprintf(stderr, "link2 receive timed out\n"); - goto out; - } - printf("Received on link2: '%s'\n", rx_data); - //Transmit with link1 - status = link_send_data(link1, tx_data2, sizeof(tx_data2)); - if (status != 0){ - fprintf(stderr, "Couldn't send data with link1\n"); - goto out; - } - - //Receive with link2 - bytes_received = link_receive_data(link2, 900, 5, rx_data); - if (bytes_received < 0){ - fprintf(stderr, "Couldn't receive data with link2\n"); - goto out; - }else if (bytes_received != 900){ - fprintf(stderr, "link2 receive timed out\n"); - goto out; - } - printf("Received on link2: '%s'\n", rx_data); - - out: - DEBUG_MSG("Closing link 1\n"); - link_close(link1); - DEBUG_MSG("Closing link 2\n"); - link_close(link2); - DEBUG_MSG("Closing bladeRFs\n"); - bladerf_close(dev1); - bladerf_close(dev2); - printf("------------ENDING LINK TEST--------------\n"); - return status; -} - -/** - * Test phy layer code with data transfer between two devices - */ -int phy_test(char *dev_id1, char *dev_id2, unsigned int tx_freq1, unsigned int tx_freq2) -{ - struct phy_handle *phy1 = NULL; - struct phy_handle *phy2 = NULL; - uint8_t tx_data[DATA_FRAME_LENGTH]; - uint8_t *tx_data3 = NULL; - uint8_t *rx_data; - uint64_t prng_seed = 29398283513841632; - int status = 0, ret; - bool rx_on = false, tx_on = false; - struct radio_params params; - struct bladerf *dev1 = NULL, *dev2 = NULL; - char *result; - - printf("------------BEGINNING PHY TEST------------\n"); - //Zero the tx_data buffer - memset(tx_data, 0, sizeof(tx_data)); - //Set first byte to data frame code - tx_data[0] = DATA_FRAME_CODE; - //Prompt for a string - printf("Enter a string to tx using phy1 (frame #1): "); - result = fgets((char *) &tx_data[1], sizeof(tx_data)-1, stdin); - if (result == NULL){ - status = -1; - goto out; - } - //Remove newline character - tx_data[strlen((char *)&tx_data[1])] = '\0'; - - //Init phy1 - status = bladerf_open(&dev1, dev_id1); - if (status != 0){ - fprintf(stderr, "Couldn't open bladeRF device #1: %s\n", bladerf_strerror(status)); - goto out; - } - params.tx_freq = tx_freq1; - params.tx_vga1_gain = -4; - params.tx_vga2_gain = 0; - params.rx_freq = tx_freq2; - params.rx_lna_gain = BLADERF_LNA_GAIN_MAX; - params.rx_vga1_gain = 23; - params.rx_vga2_gain = 0; - phy1 = phy_init(dev1, ¶ms); - if (phy1 == NULL){ - fprintf(stderr, "Couldn't initialize phy1\n"); - status = -1; - goto out; - } - - //Init phy2 - status = bladerf_open(&dev2, dev_id2); - if (status != 0){ - fprintf(stderr, "Couldn't open bladeRF device #2: %s\n", bladerf_strerror(status)); - goto out; - } - params.tx_freq = tx_freq2; - params.rx_freq = tx_freq1; - phy2 = phy_init(dev2, ¶ms); - if (phy2 == NULL){ - fprintf(stderr, "Couldn't initialize phy2\n"); - status = -1; - goto out; - } - - //Start receiving on phy2 - DEBUG_MSG("Starting phy2 receiver\n"); - - status = phy_start_receiver(phy2); - if (status != 0){ - fprintf(stderr, "Couldn't start phy2 receiver\n"); - goto out; - } - rx_on = true; - - //Transmit on phy1 - DEBUG_MSG("Starting phy1 transmitter\n"); - status = phy_start_transmitter(phy1); - if (status != 0){ - fprintf(stderr, "Couldn't start phy1 transmitter\n"); - goto out; - } - tx_on = true; - DEBUG_MSG("Transmitting on phy1\n"); - status = phy_fill_tx_buf(phy1, tx_data, sizeof(tx_data)); - if (status != 0){ - fprintf(stderr, "Couldn't fill tx buffer\n"); - goto out; - } - - //Get the received frame from phy2 - rx_data = phy_request_rx_buf(phy2, 60000); - if (rx_data == NULL){ - fprintf(stderr, "Request buffer failed\n"); - goto out; - } - printf("Received from phy2: "); - //print what is in the buffer - print_chars(&rx_data[1], DATA_FRAME_LENGTH-1); - //Release the rx buffer - phy_release_rx_buf(phy2); - - - //Transmit a pseudo random sequence with phy1 - tx_data3 = prng_fill(&prng_seed, DATA_FRAME_LENGTH); - tx_data3[0] = 0x00; //Set frame type to data frame - DEBUG_MSG("Transmitting pseudo random sequence on phy1\n"); - status = phy_fill_tx_buf(phy1, tx_data3, DATA_FRAME_LENGTH); - if (status != 0){ - fprintf(stderr, "Couldn't transmit frame\n"); - goto out; - } - //Receive - rx_data = phy_request_rx_buf(phy2, 2000); - if (rx_data == NULL){ - fprintf(stderr, "Request buffer failed\n"); - goto out; - } - //Compare with transmitted data - if (strncmp((char *)tx_data3, (char *)rx_data, DATA_FRAME_LENGTH) != 0){ - fprintf(stderr, "RX data did not match TX data. Test failed.\n"); - status = -1; - }else{ - printf("RX data matched TX data. Test passed.\n"); - } - phy_release_rx_buf(phy2); - - out: - ret = status; - //Stop transmitters/receivers - if (tx_on){ - status = phy_stop_transmitter(phy1); - if (status != 0){ - fprintf(stderr, "Couldn't stop phy1 transmitter\n"); - } - } - if (rx_on){ - status = phy_stop_receiver(phy2); - if (status != 0){ - fprintf(stderr, "Couldn't stop phy2 receiver\n"); - } - } - free(tx_data3); - DEBUG_MSG("\tClosing phy1 and phy2\n"); - phy_close(phy1); - phy_close(phy2); - DEBUG_MSG("\tClosing bladeRFs\n"); - bladerf_close(dev1); - bladerf_close(dev2); - printf("------------ENDING PHY TEST---------------\n"); - return ret; -} - -/** - * Test phy receiver thread to see if it's using too much CPU. If ENABLE_NOTES is - * defined, overrun messages will be seen if the PHY receiver is at ~100% CPU. - */ -int phy_receive_test(void) -{ - struct phy_handle *phy = NULL; - uint8_t *rx_data; - int status = 0, ret; - bool rx_on = false; - struct radio_params params; - struct bladerf *dev = NULL; - - printf("------------BEGINNING PHY RECEIVER TEST------------\n"); - //Init phy - status = bladerf_open(&dev, NULL); - if (status != 0){ - fprintf(stderr, "Couldn't open bladeRF device: %s\n", bladerf_strerror(status)); - goto out; - } - params.tx_freq = 904000000; - params.tx_vga1_gain = -4; - params.tx_vga2_gain = 0; - params.rx_freq = 924000000; - params.rx_lna_gain = BLADERF_LNA_GAIN_MAX; - params.rx_vga1_gain = 23; - params.rx_vga2_gain = 0; - phy = phy_init(dev, ¶ms); - if (phy == NULL){ - fprintf(stderr, "Couldn't initialize phy\n"); - status = -1; - goto out; - } - - //Start receiving - DEBUG_MSG("Starting phy receiver\n"); - status = phy_start_receiver(phy); - if (status != 0){ - fprintf(stderr, "Couldn't start phy receiver\n"); - goto out; - } - rx_on = true; - - //Request data - rx_data = phy_request_rx_buf(phy, 10000); - if (rx_data == NULL){ - fprintf(stderr, "Request buffer failed\n"); - goto out; - } - phy_release_rx_buf(phy); - - - out: - ret = status; - //Stop transmitters/receivers - if (rx_on){ - status = phy_stop_receiver(phy); - if (status != 0){ - fprintf(stderr, "Couldn't stop phy receiver\n"); - } - } - DEBUG_MSG("\tClosing phy\n"); - phy_close(phy); - DEBUG_MSG("\tClosing bladeRF\n"); - bladerf_close(dev); - printf("------------ENDING PHY RECEIVE TEST---------------\n"); - return ret; -} - -/** - * FSK mod/demod test. - * Tests the case where part of a byte is received from first set of samples, - * and the rest is received from the next set of samples - */ -int fsk_test1(void) -{ - //tx - struct complex_sample *tx_samples = NULL; - uint8_t tx_data[] = "=Hello-there="; - unsigned int num_samples_tx; - //rx - unsigned int num_bytes_rx1, num_bytes_rx2; - struct fsk_handle *fsk = NULL; - unsigned int num_samples_rx1; - unsigned int num_samples_rx2; - int status = 0; - uint8_t rx_data[512]; - - printf("------------BEGINNING FSK TEST 1-------------\n"); - //Open fsk handle - fsk = fsk_init(); - if (fsk == NULL){ - fprintf(stderr, "Couldn't initialize fsk\n"); - status = -1; - goto out; - } - - num_samples_tx = sizeof(tx_data)*8*SAMP_PER_SYMB+1; - - //Allocate tx samples - tx_samples = (struct complex_sample *) malloc(num_samples_tx * sizeof(struct complex_sample)); - if (tx_samples == NULL){ - perror("malloc"); - status = -1; - goto out; - } - //Initial sample - tx_samples[0].i = 2047; - tx_samples[0].q = 0; - //Modulate - fsk_mod(fsk, tx_data, sizeof(tx_data), &tx_samples[1]); - printf("Modulating: '%s'\n", tx_data); - printf("%u tx samples\n", num_samples_tx); - - num_samples_rx1 = 304; - num_samples_rx2 = num_samples_tx - num_samples_rx1; - - printf("1st demod will receive %u samples\n", num_samples_rx1); - printf("2nd demod will receive %u samples\n", num_samples_rx2); - - //Demod part 1 - num_bytes_rx1 = fsk_demod(fsk, tx_samples, num_samples_rx1, true, -1, rx_data); - printf("Demodulated %u bytes\n", num_bytes_rx1); - print_chars(rx_data, num_bytes_rx1); - - //Demod part 2 - num_bytes_rx2 = fsk_demod(fsk, &tx_samples[num_samples_rx1], num_samples_rx2, false, - sizeof(tx_data)-num_bytes_rx1, &rx_data[num_bytes_rx1]); - printf("Demodulated %u bytes\n", num_bytes_rx2); - print_chars(&rx_data[num_bytes_rx1], num_bytes_rx2); - - printf("Received %u bytes total: ", num_bytes_rx1+num_bytes_rx2); - print_chars(rx_data, num_bytes_rx1+num_bytes_rx2); - - //Check - if (strcmp((char *)rx_data, (char *)tx_data) != 0){ - fprintf(stderr, "Received data is incorrect. Test failed.\n"); - status = -1; - } - - out: - free(tx_samples); - fsk_close(fsk); - if (status != 0){ - fprintf(stderr, "ERROR: Test did not complete successfully\n"); - } - printf("------------ENDING FSK TEST 1----------------\n"); - return status; -} - -/** - * Run all tests - */ -int main(int argc, char *argv[]) -{ - char *dev_id1; - char *dev_id2; - - //Parse arguments - if (argc < 3){ - fprintf(stderr, "Usage: %s [bladeRF device ID 1] [bladeRF device ID 2]\n", - argv[0]); - return 0; - } - - dev_id1 = argv[1]; - dev_id2 = argv[2]; - - fsk_test1(); - phy_receive_test(); - phy_test(dev_id1, dev_id2, 904000000, 924000000); - phy_test(dev_id2, dev_id1, 904000000, 924000000); - link_test(dev_id1, dev_id2, 904000000, 924000000); - - return 0; -} diff --git a/host/utilities/bladeRF-fsk/c/src/utils.c b/host/utilities/bladeRF-fsk/c/src/utils.c deleted file mode 100644 index 30333e00..00000000 --- a/host/utilities/bladeRF-fsk/c/src/utils.c +++ /dev/null @@ -1,303 +0,0 @@ -/** - * @brief Utility functions: loading/saving samples from/to a file, - * conversions, etc. - * - * This file is part of the bladeRF project - * - * Copyright (C) 2016 Nuand LLC - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#include "utils.h" - -int load_samples_from_csv_file(char *filename, bool pad_zeros, int buffer_size, - int16_t **samples) -{ - int i, result, num_samples; - int samples_buf_size; //Max number of samples in buffer - int buf_inc_size; //Number of additional samples to add space for on a realloc() - bool reachedEOF; - int16_t temp_sample1, temp_sample2; - int16_t *tmp_ptr; - - //Open csv file - FILE *fp = fopen(filename, "r"); - if (fp == NULL){ - perror("fopen"); - *samples = NULL; - return -1; - } - - if (pad_zeros){ - buf_inc_size = buffer_size; - }else{ - buf_inc_size = 1024; - } - - //Allocate initial memory for tx_samples - *samples = (int16_t *) malloc(buf_inc_size * 2 * sizeof(int16_t)); - if (*samples == NULL){ - perror("malloc"); - fclose(fp); - return -1; - } - - //Initial size of allocated memory - samples_buf_size = buf_inc_size; - - //Read in samples, and reallocate more memory if needed - i = 0; - num_samples = 0; - reachedEOF = false; - while(true){ - //Check to see if the samples buffer is full - if (num_samples == samples_buf_size){ - //Before allocating more memory, check to see if there are no more samples - result = fscanf(fp, "%hi,%hi\n", &temp_sample1, &temp_sample2 ); - if(result == EOF || reachedEOF){ - break; - } - //allocate more memory. Add space for another 'buf_inc_size' samples - samples_buf_size += buf_inc_size; - tmp_ptr = (int16_t *) realloc(*samples, samples_buf_size * 2 * sizeof(int16_t)); - if (tmp_ptr == NULL){ - perror("realloc"); - free(*samples); - *samples = NULL; - fclose(fp); - return -1; - } - *samples = tmp_ptr; - (*samples)[i] = temp_sample1; - (*samples)[i+1] = temp_sample2; - num_samples++; - i += 2; - continue; - } - if (!reachedEOF){ - result = fscanf(fp, "%hi,%hi\n", &(*samples)[i], &(*samples)[i+1] ); - if (result == EOF){ - reachedEOF = true; - } - } - if (reachedEOF){ - if (pad_zeros){ - //pad with zeros to fill the rest of the buffer - (*samples)[i] = 0; - (*samples)[i+1] = 0; - }else{ - break; - } - } - num_samples++; - i += 2; //increment index - } - fclose(fp); - - return num_samples; -} - -int load_struct_samples_from_csv_file(char *filename, bool pad_zeros, int buffer_size, - struct complex_sample **samples) -{ - int i, result; - int samples_buf_size; //Max number of samples in buffer - int buf_inc_size; //Number of additional samples to add space for on a realloc() - bool reachedEOF; - int16_t temp_sample1, temp_sample2; - struct complex_sample *tmp_ptr; - - //Open csv file - FILE *fp = fopen(filename, "r"); - if (fp == NULL){ - perror("fopen"); - *samples = NULL; - return -1; - } - - if (pad_zeros){ - buf_inc_size = buffer_size; - }else{ - buf_inc_size = 1024; - } - - //Allocate initial memory for tx_samples - *samples = (struct complex_sample *) malloc(buf_inc_size * sizeof(struct complex_sample)); - if (*samples == NULL){ - perror("malloc"); - fclose(fp); - return -1; - } - - //Initial size of allocated memory - samples_buf_size = buf_inc_size; - - //Read in samples, and reallocate more memory if needed - i = 0; - reachedEOF = false; - while(true){ - //Check to see if the samples buffer is full - if (i == samples_buf_size){ - //Before allocating more memory, check to see if there are no more samples - result = fscanf(fp, "%hi,%hi\n", &temp_sample1, &temp_sample2 ); - if(result == EOF || reachedEOF){ - break; - } - //allocate more memory. Add space for another 'buf_inc_size' samples - samples_buf_size += buf_inc_size; - tmp_ptr = (struct complex_sample *) realloc(*samples, - samples_buf_size * sizeof(struct complex_sample)); - if (tmp_ptr == NULL){ - perror("realloc"); - free(*samples); - *samples = NULL; - fclose(fp); - return -1; - } - *samples = tmp_ptr; - (*samples)[i].i = temp_sample1; - (*samples)[i].q = temp_sample2; - i++; - continue; - } - if (!reachedEOF){ - result = fscanf(fp, "%hi,%hi\n", &(*samples)[i].i, &(*samples)[i].q); - if (result == EOF){ - reachedEOF = true; - } - } - if (reachedEOF){ - if (pad_zeros){ - //pad with zeros to fill the rest of the buffer - (*samples)[i].i = 0; - (*samples)[i].q = 0; - }else{ - break; - } - } - i++; //increment index - } - fclose(fp); - - return i; -} - -int write_samples_to_csv_file(char *filename, int16_t *samples, int num_samples) -{ - int i; - //Open file - FILE *fp = fopen(filename, "w"); - if (fp == NULL){ - perror("fopen"); - return -1; - } - //Write file - //Loop through all samples - //First int is the I sample. Second int is the Q sample - for (i = 0; i < num_samples*2; i+= 2){ - fprintf(fp, "%hi,%hi\n", samples[i], samples[i+1]); - } - fclose(fp); - - return 0; -} - -int write_struct_samples_to_csv_file(char *filename, struct complex_sample *samples, - int num_samples) -{ - int i; - //Open file - FILE *fp = fopen(filename, "w"); - if (fp == NULL){ - perror("fopen"); - return -1; - } - //Write file - //Loop through all samples - //First int is the I sample. Second int is the Q sample - for (i = 0; i < num_samples; i++){ - fprintf(fp, "%hi,%hi\n", samples[i].i, samples[i].q); - } - fclose(fp); - - return 0; -} - -void print_chars(uint8_t *data, int num_bytes) -{ - int i; - - printf("'"); - for (i = 0; i < num_bytes; i++){ - printf("%c", data[i]); - } - printf("'\n"); -} - -void print_hex_contents(uint8_t *data, int num_bytes) -{ - int i; - - for (i = 0; i < num_bytes; i++){ - printf("%.2X ", data[i]); - } - printf("\n"); -} - -int create_timeout_abs(unsigned int timeout_ms, struct timespec *timeout_abs) -{ - int status; - - //Get the current time - status = clock_gettime(CLOCK_REALTIME, timeout_abs); - if(status != 0){ - perror("clock_gettime"); - return -1; - } - - //Add the timeout onto the current time - timeout_abs->tv_sec += timeout_ms/1000; - timeout_abs->tv_nsec += (timeout_ms % 1000) * 1000000; - //Check for overflow in nsec - if (timeout_abs->tv_nsec >= 1000000000){ - timeout_abs->tv_sec += timeout_abs->tv_nsec / 1000000000; - timeout_abs->tv_nsec %= 1000000000; - } - - return 0; -} - -void conv_samples_to_struct(int16_t *samples, unsigned int num_samples, - struct complex_sample *struct_samples) -{ - unsigned int i; - - for (i = 0; i < (num_samples*2); i += 2){ - struct_samples[i/2].i = samples[i]; - struct_samples[i/2].q = samples[i+1]; - } -} - -void conv_struct_to_samples(struct complex_sample *struct_samples, unsigned int num_samples, - int16_t *samples) -{ - unsigned int i; - - for (i = 0; i < (num_samples*2); i += 2){ - samples[i] = struct_samples[i/2].i; - samples[i+1] = struct_samples[i/2].q; - } -} diff --git a/host/utilities/bladeRF-fsk/c/src/utils.h b/host/utilities/bladeRF-fsk/c/src/utils.h deleted file mode 100644 index c629edad..00000000 --- a/host/utilities/bladeRF-fsk/c/src/utils.h +++ /dev/null @@ -1,134 +0,0 @@ -/** - * @file - * @brief Utility functions: loading/saving samples from/to a file, - * conversions, etc. - * - * This file is part of the bladeRF project - * - * Copyright (C) 2016 Nuand LLC - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#ifndef UTILS_H -#define UTILS_H - -#include -#include -#include -#include -#include "host_config.h" - -#if BLADERF_OS_WINDOWS || BLADERF_OS_OSX - #include "clock_gettime.h" -#else - #include -#endif - -#include "common.h" - -/** - * Write samples to csv file - * - * @param[in] filename name of csv file to write - * @param[in] samples buffer containing IQ samples to write - * @param[in] num_samples number of IQ samples to write to the file - * - * @return 0 on success, -1 on failure - */ -int write_samples_to_csv_file(char *filename, int16_t *samples, int num_samples); - -/** - * Load samples from csv file into heap memory buffer. Caller is responsible for - * freeing the the buffer when done using it. - * - * @param[in] filename file name to load samples from - * @param[in] pad_zeros If true, the function will pad zeros onto the end until - * the samples fill to a multiple of 'buffer_size' samples - * @param[in] buffer_size buffer size to fill multiples of, if pad_zeros is true. - * Parameter ignored if pad_zeros is false. - * @param[out] samples pointer to the loaded sample buffer. Buffer set to NULL - * on failure. If successful, the buffer must be freed when - * done using it. - * @return number of samples loaded on success; -1 on failure - */ -int load_samples_from_csv_file(char *filename, bool pad_zeros, int buffer_size, - int16_t **samples); - -/** - * Write 'struct complex_sample' samples to csv file - * - * @param[in] filename name of csv file to write - * @param[in] samples buffer containing IQ samples to write - * @param[in] num_samples number of IQ samples to write to the file - * - * @return 0 on success, -1 on failure - */ -int write_struct_samples_to_csv_file(char *filename, struct complex_sample *samples, - int num_samples); - -/** - * Load 'struct complex_sample' samples from csv file into heap memory buffer. - * Caller is responsible for freeing the the buffer when done using it. - * - * @param[in] filename file name to load samples from - * @param[in] pad_zeros If true, the function will pad zeros onto the end until - * the samples fill to a multiple of 'buffer_size' samples - * @param[in] buffer_size buffer size to fill multiples of, if pad_zeros is true. - * Parameter ignored if pad_zeros is false. - * @param[out] samples pointer to the loaded sample buffer. Buffer set to NULL - * on failure. If successful, the buffer must be freed when - * done using it. - * @return number of samples loaded on success; -1 on failure - */ -int load_struct_samples_from_csv_file(char *filename, bool pad_zeros, int buffer_size, - struct complex_sample **samples); - -void print_chars(uint8_t *data, int num_bytes); -void print_hex_contents(uint8_t *data, int num_bytes); - -/** - * Converts a relative timeout to an absolute time (i.e. 5000 ms to 07/02/2016 20:32:10) - * - * @param[in] timeout_ms the timeout to create in ms - * @param[out] timeout_abs pointer to timespec struct to fill - * - * @return 0 on success, -1 on failure - */ -int create_timeout_abs(unsigned int timeout_ms, struct timespec *timeout_abs); - -/** - * Converts an array of int16_t IQ samples to an array of 'complex_sample' structs. - * Caller is responsible for memory allocation. - * - * @param[in] samples array of IQ samples to convert - * @param[in] num_samples number of samples to convert - * @param[out] struct_samples buffer to place converted samples in - */ -void conv_samples_to_struct(int16_t *samples, unsigned int num_samples, - struct complex_sample *struct_samples); - -/** - * Converts an array of complex_sample structs into an array of int16_t - * samples. Caller is responsible for memory allocation. - * - * @param[in] struct_samples complex_sample array to convert - * @param[in] num_samples number of samples to convert - * @param[out] samples buffer to place converted samples in - */ -void conv_struct_to_samples(struct complex_sample *struct_samples, unsigned int num_samples, - int16_t *samples); - -#endif diff --git a/host/utilities/bladeRF-fsk/matlab/README.txt b/host/utilities/bladeRF-fsk/matlab/README.txt deleted file mode 100644 index 8d8f301a..00000000 --- a/host/utilities/bladeRF-fsk/matlab/README.txt +++ /dev/null @@ -1,46 +0,0 @@ -This set of MATLAB files will generate/receive binary CPFSK baseband waveforms. -Works on both MATLAB and GNU Octave. - -Run fsk.m to simulate the FSK modem just in MATLAB. -Run fsk_csv.m to write/read IQ samples to/from a csv file so they can be - transmitted/received on an RF carrier with a bladeRF. In order to run this - successfully you need to add bladeRF/host/misc/matlab to your matlab path - (for the save_csv() and load_csv() functions) - -fsk_mod(): FSK baseband modulator function -- generates CPFSK baseband IQ waveform of the given set of bits - -fsk_demod(): FSK baseband demodulator function -- extracts the bit sequence of the given CPFSK baseband waveform - -fsk_transmit(): Generates baseband signal for an FSK frame -- Calls fsk_mod() with FSK frame, which includes training sequence and preamble - in addition to user data -- Adds a ramp up/ramp down to the beginning/end of the signal - -fsk_receive(): Receives an FSK frame from a baseband signal -- Low-pass filters and normalizes the input signal -- Correlates the input signal with the given preamble waveform to determine - start of FSK data -- Calls fsk_demod() to extract bits from the FSK data signal - -fsk.m: Script for simulating mod/demod just in MATLAB -- prompts for an input string (spaces are welcome) -- converts ASCII string to a set of bits -- calls fsk_transmit to generate the CPFSK baseband IQ waveform -- adds attenuation and noise to the signal to simulate a channel -- calls fsk_receive to process the waveform and extract data bits -- converts bits to ASCII string -- prints received string to command window - -fsk_csv.m: Script for using the modulator/demodulator with samples csv files -- prompts for an input string (spaces are welcome) -- converts ASCII string to a set of bits -- calls fsk_transmit to generate the CPFSK baseband IQ waveform -- writes the samples to a tx csv file -- waits for the user to transmit the samples and receive IQ samples - in a different csv file (e.g. rx_samples.csv) -- reads in samples from the rx csv file -- calls fsk_receive to process the waveform and extract data bits -- converts bits to ASCII string -- prints received string to command window diff --git a/host/utilities/bladeRF-fsk/matlab/fsk.m b/host/utilities/bladeRF-fsk/matlab/fsk.m deleted file mode 100644 index 1abf921b..00000000 --- a/host/utilities/bladeRF-fsk/matlab/fsk.m +++ /dev/null @@ -1,154 +0,0 @@ -%------------------------------------------------------------------------- -% fsk.m: Simulation of PHY portion of CPFSK modem. When compared to the C -% modem this code has the following differences: -% 1) Simpler/less rigorous power normalization -% 2) No scrambling. -% -% Notes: Change 'noise_pow' for different amount of channel AWGN noise. -% Change 'gain' for different amount of channel gain. Change 'null_amt' for -% different amount of flat samples placed at front/back of tx waveform -% -% This file is part of the bladeRF project -% -% Copyright (C) 2016 Nuand LLC -% -% This program is free software; you can redistribute it and/or modify -% it under the terms of the GNU General Public License as published by -% the Free Software Foundation; either version 2 of the License, or -% (at your option) any later version. -% -% This program is distributed in the hope that it will be useful, -% but WITHOUT ANY WARRANTY; without even the implied warranty of -% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -% GNU General Public License for more details. -% -% You should have received a copy of the GNU General Public License along -% with this program; if not, write to the Free Software Foundation, Inc., -% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -%------------------------------------------------------------------------- - -clear; %Clear workspace variables - -Fs = 2e6; %Sample rate of 2 Msps (500ns sample period) -samps_per_symb = 8; %Samples per symbol -h = pi/2; %Phase modulation index (phase deviation per symbol) - %Note: preamble has been optimized for h = pi/2 -dec_factor = 2; %Amount to decimate by when performing correlation - %with preamble - -%32 bit training sequence -%hex: AA, AA, AA, AA -%Note: In order for the preamble waveform not to be messed up, the last -%sample of the modulated training sequence MUST be 1 + 0j -training_seq = ['10101010'; - '10101010'; - '10101010'; - '10101010']; -%32-bit preamble - hex: 2E, 69, 2C, F0 -preamble = ['00101110'; ... - '01101001'; ... - '00101100'; ... - '11110000']; - -%%-------------------TRANSMIT----------------------------- -%Noise power desired in channel (units dBW) -noise_pow = -25; -%gain desired in channel (this should be less than 1) -gain = 0.6; -%Amount of flat samples (0+0j) to add to the beginning/end of tx signal -null_amt = 200; - -%Prompt for string to transmit -prompt = 'Enter a string to tx: '; -str = input(prompt, 's'); -%Convert to bit matrix -tx_bits = dec2bin(uint8(str), 8); - -%Make FSK signal -tx_sig = fsk_transmit(training_seq, preamble, tx_bits, samps_per_symb, h); -%Add some flat output to the front and back of the signal -tx_sig(null_amt+1:length(tx_sig)+null_amt) = tx_sig; -tx_sig(1:null_amt) = 0 + 0j; -tx_sig(length(tx_sig)+1:length(tx_sig)+null_amt) = 0 + 0j; - -%time vector: 1/Fs increments -t = 0 : 1/Fs : (length(tx_sig)-1)/Fs; - -%---------------------CHANNEL------------------------- -%Add gaussian noise and attenuation to signal -noise = wgn(1, length(tx_sig), noise_pow) + ... - 1j*wgn(1, length(tx_sig), noise_pow); -rx_sig = gain*tx_sig + noise; - -%%---------------------RECEIVE--------------------------- -%clamp signal to [-1.0, 1.0] -rx_sig_i = real(rx_sig); -rx_sig_q = imag(rx_sig); -rx_sig_i(rx_sig_i > 1.0) = 1.0; -rx_sig_i(rx_sig_i < -1.0) = -1.0; -rx_sig_q(rx_sig_q > 1.0) = 1.0; -rx_sig_q(rx_sig_q < -1.0) = -1.0; -rx_sig = rx_sig_i + 1j*rx_sig_q; -%Get the modulated IQ waveform for the preamble -preamble_waveform = fsk_mod(preamble, samps_per_symb, h, 0); -%Filter/Normalize/Detect/Demodulate FSK signal -[rx_bits, rx_info] = fsk_receive(preamble_waveform, rx_sig, dec_factor, ... - samps_per_symb, h, size(tx_bits, 1)); - -%----------------------Plot some stuff--------------------- -%TX IQ samples -figure('position', [960 775 960 200]); -plot(t, real(tx_sig), 'Color', [0,.447,.741]); -hold on; -plot(t, imag(tx_sig), 'Color', [.85,.325,.098]); -title('TX IQ samples vs time'); - -%RX IQ samples -figure('position', [960 525 960 200]); -plot(t, real(rx_sig), 'Color', [0,.447,.741]); -hold on; -plot(t, imag(rx_sig), 'Color', [.85,.325,.098]); -ylim([-1, 1]); -title('RX raw IQ samples vs time'); - -%RX raw spectrum -figure('position', [960 275 960 200]); -if (exist('OCTAVE_VERSION', 'builtin') ~= 0) - pwelch(rx_sig, [], [], 256, Fs, 'centerdc'); -else - pwelch(rx_sig, [], [], [], Fs, 'centered'); -end -title('RX raw spectrum'); - -%RX filtered IQ samples -figure('position', [960 0 960 200]); -plot(real(rx_info.iq_filt_norm), 'Color', [0,.447,.741]); -hold on; -plot(imag(rx_info.iq_filt_norm), 'Color', [.85,.325,.098]); -title('RX filtered & normalized IQ samples'); - -%RX cross correlation with preamble. Plot power (i^2 + q^2). -figure('position', [0 775 960 200]); -plot(abs(rx_info.preamble_corr).^2); -title('RX cross correlation with preamble (power)'); - -%RX dphase (data signal only, training/preamble not included) -if (rx_info.dphase ~= -1) - figure('position', [0 500 960, 200]); - plot(rx_info.dphase); - title('RX dphase (data signal only)'); -end - -%---------------------Print received data------------------- -if (rx_bits(1) ~= -1) - fprintf('Received: ''%s''\n', bin2dec(rx_bits)); - if isequal(rx_bits, tx_bits) - fprintf('RX data matched TX data\n'); - else - fprintf(2, 'RX data did not match TX data\n'); - end -end - -fprintf('Press any key to close figures...\n'); -pause; -close all; diff --git a/host/utilities/bladeRF-fsk/matlab/fsk_csv.m b/host/utilities/bladeRF-fsk/matlab/fsk_csv.m deleted file mode 100644 index 2d605c7d..00000000 --- a/host/utilities/bladeRF-fsk/matlab/fsk_csv.m +++ /dev/null @@ -1,156 +0,0 @@ -%------------------------------------------------------------------------- -% fsk_csv.m: MATLAB implementation of PHY portion of CPFSK modem, which -% writes TX samples to a file and reads RX samples from a file. When compared -% to the C modem this code has the following differences: -% 1) Simpler/less rigorous power normalization -% 2) No scrambling. -% -% Notes: In order to run this successfully you need the save_csv() and -% load_csv() functions from the bladeRF repository. If you have the repository -% cloned on your local machine, simply add bladeRF/host/misc/matlab to your -% MATLAB path. -% Change 'null_amt' for different amount of flat samples placed at -% front/back of tx waveform -% -% This file is part of the bladeRF project -% -% Copyright (C) 2016 Nuand LLC -% -% This program is free software; you can redistribute it and/or modify -% it under the terms of the GNU General Public License as published by -% the Free Software Foundation; either version 2 of the License, or -% (at your option) any later version. -% -% This program is distributed in the hope that it will be useful, -% but WITHOUT ANY WARRANTY; without even the implied warranty of -% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -% GNU General Public License for more details. -% -% You should have received a copy of the GNU General Public License along -% with this program; if not, write to the Free Software Foundation, Inc., -% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -%------------------------------------------------------------------------- - -clear; %Clear workspace variables -txfile = 'tx_samples.csv'; -rxfile = 'rx_samples.csv'; - -Fs = 2e6; %Sample rate of 2 Msps (500ns sample period) -samps_per_symb = 8; %Samples per symbol -h = pi/2; %Modulation index (phase deviation per symbol) - %Note: preamble has been optimized for h = pi/2 -dec_factor = 2; %Amount to decimate by when performing correlation - %with preamble - -%32 bit training sequence -%hex: AA, AA, AA, AA -%Note: In order for the preamble waveform not to be messed up, the last -%sample of the modulated training sequence MUST be 1 + 0j -training_seq = ['10101010'; - '10101010'; - '10101010'; - '10101010']; -%32-bit preamble - hex: 2E, 69, 2C, F0 -preamble = ['00101110'; ... - '01101001'; ... - '00101100'; ... - '11110000']; - -%%-------------------TRANSMIT----------------------------- -%Amount of flat samples (0+0j) to add to the beginning/end of tx signal -null_amt = 200; - -%Prompt for string to transmit -prompt = 'Enter a string to tx: '; -str = input(prompt, 's'); -%Convert to bit matrix -tx_bits = dec2bin(uint8(str), 8); - -%Make FSK signal -tx_sig = fsk_transmit(training_seq, preamble, tx_bits, samps_per_symb, h); -%Add some flat output to the front and back of the signal -tx_sig(null_amt+1:length(tx_sig)+null_amt) = tx_sig; -tx_sig(1:null_amt) = 0 + 0j; -tx_sig(length(tx_sig)+1:length(tx_sig)+null_amt) = 0 + 0j; - -%time vector: 1/Fs increments -t = 0 : 1/Fs : (length(tx_sig)-1)/Fs; - -%Write to csv file -save_csv(txfile, tx_sig.'); - -%TX IQ samples -figure('position', [960 775 960 200]); -plot(t, real(tx_sig), 'Color', [0,.447,.741]); -hold on; -plot(t, imag(tx_sig), 'Color', [.85,.325,.098]); -title('TX IQ samples vs time'); - -%Wait for user to transmit/receive these samples with bladeRF -disp('Press any key when rx samples file is ready...'); -pause; - -%%---------------------RECEIVE--------------------------- -%Demodulate the set of samples given in 'rxfile' and print the received -%string. -%Load csv from file -rx_sig = load_csv(rxfile).'; -%Get the modulated IQ waveform for the preamble -preamble_waveform = fsk_mod(preamble, samps_per_symb, h, 0); -%Filter/Normalize/Detect/Demodulate FSK signal -[rx_bits, rx_info] = fsk_receive(preamble_waveform, rx_sig, dec_factor, ... - samps_per_symb, h, size(tx_bits, 1)); - -%----------------------Plot some stuff--------------------- -%time vector: 1/Fs increments -t = 0 : 1/Fs : (length(rx_sig)-1)/Fs; - -%RX IQ samples -figure('position', [960 525 960 200]); -plot(t, real(rx_sig), 'Color', [0,.447,.741]); -hold on; -plot(t, imag(rx_sig), 'Color', [.85,.325,.098]); -ylim([-1, 1]); -title('RX raw IQ samples vs time'); - -%RX raw spectrum -figure('position', [960 275 960 200]); -if (exist('OCTAVE_VERSION', 'builtin') ~= 0) - pwelch(rx_sig, [], [], 256, Fs, 'centerdc'); -else - pwelch(rx_sig, [], [], [], Fs, 'centered'); -end -title('RX raw spectrum'); - -%RX filtered IQ samples -figure('position', [960 0 960 200]); -plot(real(rx_info.iq_filt_norm), 'Color', [0,.447,.741]); -hold on; -plot(imag(rx_info.iq_filt_norm), 'Color', [.85,.325,.098]); -title('RX filtered & normalized IQ samples'); - -%RX cross correlation with preamble. Plot power (i^2 + q^2). -figure('position', [0 775 960 200]); -plot(abs(rx_info.preamble_corr).^2); -title('RX cross correlation with preamble (power)'); - -%RX dphase (data signal only, training/preamble not included) -if (rx_info.dphase ~= -1) - figure('position', [0 500 960, 200]); - plot(rx_info.dphase); - title('RX dphase (data signal only)'); -end - -%---------------------Print received data------------------- -if (rx_bits(1) ~= -1) - fprintf('Received: ''%s''\n', bin2dec(rx_bits)); - if isequal(rx_bits, tx_bits) - fprintf('RX data matched TX data\n'); - else - fprintf(2, 'RX data did not match TX data\n'); - end -end - -fprintf('Press any key to close figures...\n'); -pause; -close all; diff --git a/host/utilities/bladeRF-fsk/matlab/fsk_demod.m b/host/utilities/bladeRF-fsk/matlab/fsk_demod.m deleted file mode 100644 index 6c12c845..00000000 --- a/host/utilities/bladeRF-fsk/matlab/fsk_demod.m +++ /dev/null @@ -1,85 +0,0 @@ -%------------------------------------------------------------------------- -% This file is part of the bladeRF project -% -% Copyright (C) 2016 Nuand LLC -% -% This program is free software; you can redistribute it and/or modify -% it under the terms of the GNU General Public License as published by -% the Free Software Foundation; either version 2 of the License, or -% (at your option) any later version. -% -% This program is distributed in the hope that it will be useful, -% but WITHOUT ANY WARRANTY; without even the implied warranty of -% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -% GNU General Public License for more details. -% -% You should have received a copy of the GNU General Public License along -% with this program; if not, write to the Free Software Foundation, Inc., -% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -%------------------------------------------------------------------------- - -function [bits, dphase] = fsk_demod(fsk_signal, samps_per_symb, num_bytes) -% FSK_DEMOD Produce demodulated bit stream from baseband CPFSK signal -% Demodulated bit stream contains (nrows*ncols) bits. A '1' corresponds -% to a positive frequency (increasing phase) while a '0' corresponds to a -% negative frequency (decreasing phase). -% [FSK_SIGNAL] = fsk_demod(FSK_SIGNAL, SAMPS_PER_SYMB, NROWS, NCOLS) -% -% FSK_SIGNAL is the resulting complex (IQ) FSK modulated baseband signal -% with real and imaginary components within the range [-1.0, 1.0]. -% -% SAMPS_PER_SYMB number of samples per symbol -% -% NUM_BYTES number of bytes to demodulate from the signal -% -% BITS is an Nx8 matrix of received bits. Each bit element in -% the matrix is a char which can either be '1' or '0'. Each row of the -% matrix is a byte - containing 8 of these bit elements. Each byte is -% received in order from smallest row index to largest row index. Each -% bit in the byte is received in order from largest column index to -% smallest column index (i.e. LSb first, MSb last)) -% Example: if bits is | '0' '0' '0' '0' '1' '1' '1' '1'| -% | '0' '0' '1' '1' '1' '0' '1' '0'| -% then the received bit stream was: -% "11110000 01011100" -% Note: You can use dec2bin('test string', 8) to convert a string to -% this bit matrix format, and bin2dec(bits) to convert a bit matrix to a -% string - -%Check to make sure the iq signal is long enough to demod 'num_bytes' bytes -if (length(fsk_signal) < samps_per_symb*num_bytes*8) - fprintf(2, ['fsk_demod(): Signal is not long enough to demod the', ... - ' desired number of bytes (%d)\n'], num_bytes); - bits = -1; - dphase = -1; - return; -end - -%Sum up all changes in phase during symbol period -%If total change is positive -> a 1 was sent -%If total change is negative -> a 0 was sent - -currPos = 2; %First sample just defines initial phase -%Loop through each expected byte -for byte = 1:num_bytes - %Loop through 8 bits - for bit = 8:-1:1 - %Unwrap 1+samps_per_symb angles corresponding to these - %samps_per_symb samples AND the sample preceding them - phase = unwrap(angle(fsk_signal(currPos-1:currPos+samps_per_symb-1))); - dphase_tot = 0; %Initialize dphase_tot to 0 - for samp = 2:samps_per_symb+1 - dphase_tot = dphase_tot + (phase(samp) - phase(samp-1)); - %Update dphase array - dphase(currPos - 1) = phase(samp) - phase(samp-1); - currPos = currPos + 1; - end - if dphase_tot > 0 - bits(byte, bit) = '1'; - else - bits(byte, bit) = '0'; - end - end -end - -end diff --git a/host/utilities/bladeRF-fsk/matlab/fsk_mod.m b/host/utilities/bladeRF-fsk/matlab/fsk_mod.m deleted file mode 100644 index 7652b752..00000000 --- a/host/utilities/bladeRF-fsk/matlab/fsk_mod.m +++ /dev/null @@ -1,79 +0,0 @@ -%------------------------------------------------------------------------- -% This file is part of the bladeRF project -% -% Copyright (C) 2016 Nuand LLC -% -% This program is free software; you can redistribute it and/or modify -% it under the terms of the GNU General Public License as published by -% the Free Software Foundation; either version 2 of the License, or -% (at your option) any later version. -% -% This program is distributed in the hope that it will be useful, -% but WITHOUT ANY WARRANTY; without even the implied warranty of -% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -% GNU General Public License for more details. -% -% You should have received a copy of the GNU General Public License along -% with this program; if not, write to the Free Software Foundation, Inc., -% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -%------------------------------------------------------------------------- - -function [fsk_signal] = fsk_mod(bits, samps_per_symb, mod_index, initial_phase) -% FSK_MOD Produce baseband FSK signal of the input bit stream. A '1' -% corresponds to a positive frequency (increasing phase), while a '0' -% corresponds to a negative frequency (decreasing phase). -% [FSK_SIGNAL] = fsk_mod(BITS, SAMPS_PER_SYMB, MOD_INDEX, INITIAL_PHASE) -% -% BITS is an Nx8 matrix of bits to transmit. Each bit element in -% the matrix is a char which can either be '1' or '0'. Each row of the -% matrix is a byte - containing 8 of these bit elements. Each byte is -% transmitted in order from smallest row index to largest row index. Each -% bit in the byte is transmitted in order from largest column index to -% smallest column index (i.e. LSb first, MSb last)) -% Example: if bits is | '0' '0' '0' '0' '1' '1' '1' '1'| -% | '0' '0' '1' '1' '1' '0' '1' '0'| -% then the transmitted bit stream will be: -% "11110000 01011100" -% Note: You can use dec2bin('test string', 8) to convert a string to -% this bit matrix format, and bin2dec(bits) to convert a bit matrix to a -% string -% -% SAMPS_PER_SYMB number of samples per symbol -% -% MOD_INDEX phase modulation index: the phase deviation per symbol -% -% FSK_SIGNAL is the resulting complex (IQ) CPFSK modulated baseband -% signal with real and imaginary components within the range [-1.0, 1.0]. -% -% INITIAL_PHASE Initial phase to use as a reference (every sample is a -% change in phase, so an initial phase needs to be defined) - -%Calculate phase change per sample -dphase_abs = mod_index / samps_per_symb; - -phase = initial_phase; %Set initial phase -i = 1; %Current samples position -%Loop through each byte -for byte = 1:size(bits,1) - %loop through each bit in the byte in reverse index order - for bit = 8:-1:1 - if bits(byte, bit) == '1' %Transmit 1 - dphase = +dphase_abs; - elseif bits(byte, bit) == '0' - dphase = -dphase_abs; - else - fprintf(2, 'Unidentified character ''%c''. Skipping.\n', ... - bits(byte, bit)); - continue; - end - %Loop through each of the 'samps_per_symb' samples in the symbol - for samp = 1:samps_per_symb - phase_prev = phase; - phase = mod(phase_prev + dphase, 2*pi); - fsk_signal(i) = exp(1j * phase); - i = i + 1; - end - end -end - -end diff --git a/host/utilities/bladeRF-fsk/matlab/fsk_receive.m b/host/utilities/bladeRF-fsk/matlab/fsk_receive.m deleted file mode 100644 index 3eb0b64b..00000000 --- a/host/utilities/bladeRF-fsk/matlab/fsk_receive.m +++ /dev/null @@ -1,117 +0,0 @@ -%------------------------------------------------------------------------- -% This file is part of the bladeRF project -% -% Copyright (C) 2016 Nuand LLC -% -% This program is free software; you can redistribute it and/or modify -% it under the terms of the GNU General Public License as published by -% the Free Software Foundation; either version 2 of the License, or -% (at your option) any later version. -% -% This program is distributed in the hope that it will be useful, -% but WITHOUT ANY WARRANTY; without even the implied warranty of -% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -% GNU General Public License for more details. -% -% You should have received a copy of the GNU General Public License along -% with this program; if not, write to the Free Software Foundation, Inc., -% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -%------------------------------------------------------------------------- - -function [bits, info] = fsk_receive(preamble_waveform, iq_signal, ... - decimation_factor, samps_per_symb, ... - h, num_bytes) -% FSK_RECEIVE Demodulate/receive data bits from an FSK baseband IQ signal. -% Correlates the iq_signal with the given preamble waveform to find the -% start of the data signal -% [BITS, INFO] = fsk_receive(PREAMBLE_WAVEFORM, IQ_SIGNAL, -% SAMPS_PER_SYMB, NUM_BYTES); -% -% PREAMBLE_WAVEFORM preamble iq samples waveform to determine start of -% data in the the iq_signal -% -% IQ_SIGNAL baseband CPFSK signal to receive -% -% DECIMATION_FACTOR amount to decimate by when performing correlation -% with preamble. 1 = no decimation. 2 = use every other sample. -% -% SAMPS_PER_SYMB number of samples per symbol -% -% H modulation index used on the transmitted signal -% -% NUM_BYTES number of data bytes to demodulate from the iq_signal -% -% BITS is an Nx8 matrix of received bits. Each bit element in -% the matrix is a char which can either be '1' or '0'. Each row of the -% matrix is a byte - containing 8 of these bit elements. Each byte is -% received in order from smallest row index to largest row index. Each -% bit in the byte is received in order from largest column index to -% smallest column index (i.e. LSb first, MSb last)) -% Example: if bits is | '0' '0' '0' '0' '1' '1' '1' '1'| -% | '0' '0' '1' '1' '1' '0' '1' '0'| -% then the received bit stream was: -% "11110000 01011100" -% Note: You can use dec2bin('test string', 8) to convert a string to -% this bit matrix format, and bin2dec(bits) to convert a bit matrix to a -% string -% -% INFO a struct containing information to use for debug plots -% INFO.iq_filt_norm = filtered + normalized IQ signal -% INFO.preamble_corr = cross correlation of .iq_filt_norm and -% preamble waveform -% INFO.dphase = vector of phase changes in the .iq_filt_norm - -info = struct( 'iq_filt_norm', -1, ... - 'preamble_corr', -1, ... - 'dphase', -1); - -corr_peak_thresh = 0.5625 * (length(preamble_waveform)/decimation_factor)^2; - -%Low pass filter the IQ signal -passband = 1/samps_per_symb * h*2/pi; -stopband = 1/3 * 8/samps_per_symb * h*2/pi; -if (stopband < 1) - %Design filter - b = remez(31, [0 passband stopband 1], [1 1 0 0]); - iq_signal = filter(b, 1, iq_signal); -end - -%Normalize signal to [-1, 1] -iq_signal = iq_signal / max([ max(real(iq_signal)) max(imag(iq_signal)) ]); -info.iq_filt_norm = iq_signal; - -%Correlate input IQ signal with known preamble waveform -%Decimate iq signal and preamble waveform -iq_signal_dec = iq_signal(1:decimation_factor:end); -preamble_waveform_dec = preamble_waveform(1:decimation_factor:end); -corr = xcorr(iq_signal_dec, preamble_waveform_dec); -info.preamble_corr = corr; - -%Find peaks in cross correlation power (i^2 + q^2) -[peaks, peak_locs] = findpeaks(abs(corr).^2); -%Attempt to find a peak which passes the threshold -peak_index = -1; -for i = 1:length(peaks) - if (peaks(i) >= corr_peak_thresh) - peak_index = peak_locs(i); - break; - end -end -%Stop if no preamble match -if (peak_index == -1) - fprintf(2, 'fsk_receive(): No preamble match in signal\n'); - bits = -1; - return; -end -%Calculate iq_signal start index based on this peak -%Number of zeros that were padded to the end of preamble waveform inside -%the xcorr() function so that both vectors were the same length: -num_padded_zeros = length(iq_signal_dec) - length(preamble_waveform_dec); -sig_start_index = peak_index - num_padded_zeros; -%Calculate the un-decimated iq_signal start index -sig_start_index = sig_start_index * decimation_factor - (decimation_factor-1); - -%Demodulate bits from the IQ signal at the start index -[bits, info.dphase] = fsk_demod(iq_signal(sig_start_index:end), samps_per_symb, num_bytes); - -end diff --git a/host/utilities/bladeRF-fsk/matlab/fsk_transmit.m b/host/utilities/bladeRF-fsk/matlab/fsk_transmit.m deleted file mode 100644 index 4e2d1bda..00000000 --- a/host/utilities/bladeRF-fsk/matlab/fsk_transmit.m +++ /dev/null @@ -1,92 +0,0 @@ -%------------------------------------------------------------------------- -% This file is part of the bladeRF project -% -% Copyright (C) 2016 Nuand LLC -% -% This program is free software; you can redistribute it and/or modify -% it under the terms of the GNU General Public License as published by -% the Free Software Foundation; either version 2 of the License, or -% (at your option) any later version. -% -% This program is distributed in the hope that it will be useful, -% but WITHOUT ANY WARRANTY; without even the implied warranty of -% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -% GNU General Public License for more details. -% -% You should have received a copy of the GNU General Public License along -% with this program; if not, write to the Free Software Foundation, Inc., -% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -%------------------------------------------------------------------------- - -function [iq_samples] = fsk_transmit(training_seq, preamble, data, ... - samps_per_symb, mod_index) -% FSK_TRANSMIT Produce a baseband FSK signal of the input binary data, with -% a ramp up/ramp down at the beginning/end of the signal. -% [IQ_SAMPLES] = fsk_transmit(TRAINING_SEQ, PREAMBLE, DATA, -% SAMPS_PER_SYMB, MOD_INDEX); -% -% TRAINING_SEQ is a matrix of training sequence bits to transmit. Format -% specified below. -% -% PREAMBLE is a matrix of preamble bits to transmit. Format specified -% below -% -% DATA is a matrix of data bits to transmit. Format specified below. -% -% Bits matrix format: Each bit element in the matrix is a char which can -% either be '1' or '0'. Each row of the matrix is a byte - containing 8 -% of these bit elements. Each byte is transmitted in order from smallest -% row index to largest row index. Each bit in the byte is transmitted in -% order from largest column index to smallest column index -% (i.e. LSb first, MSb last)) -% Example: if the matrix is | '0' '0' '0' '0' '1' '1' '1' '1'| -% | '0' '0' '1' '1' '1' '0' '1' '0'| -% then the transmitted bit stream will be: -% "11110000 01011100" -% Note: You can use dec2bin('test string', 8) to convert a string to -% this bit matrix format, and bin2dec(bits) to convert a bit matrix to a -% string -% -% SAMPS_PER_SYMB number of samples per symbol -% -% MOD_INDEX phase modulation index: the phase deviation per symbol -% -% IQ_SAMPLES is the resulting complex (IQ) FSK modulated baseband -% signal with real and imaginary components within the range [-1.0, 1.0]. -% The following shows the content and ordering of this signal: -% / ramp up | training_seq | preamble | data | ramp down \ -% The ramps at the beginning/end of the signal have a length of -% 'samps_per_symb' - -%----Assemble bitstream to transmit -%| training sequence | preamble | data | -bits = training_seq; -bits(size(bits, 1)+1 : size(bits,1)+size(preamble, 1), :) = preamble; -bits(size(bits, 1)+1 : size(bits,1)+size(data, 1), :) = data; - -%----Construct IQ samples vector -%-Ramp up the I samples from 0 to 1, and leave Q samples as zeros -%Length of the ramp is 'samps_per_symb' samples -iq_samples(1:samps_per_symb) = 1/samps_per_symb : 1/samps_per_symb: 1; - -%Modulate the bit stream, and add to iq_samples -sig = fsk_mod(bits, samps_per_symb, mod_index, angle(iq_samples(end))); -iq_samples(length(iq_samples)+1:length(iq_samples)+length(sig)) = sig; - -%-Ramp down the samples (either I or Q) to 0. -%Length of the ramp is 'samps_per_symb' samples -last_samp = iq_samples(end); -if (real(last_samp) ~= 0) - rampdown_I = real(last_samp): -real(last_samp)/samps_per_symb: 0; -else - rampdown_I(1:samps_per_symb+1) = 0; -end -if (imag(last_samp) ~= 0) - rampdown_Q = imag(last_samp): -imag(last_samp)/samps_per_symb: 0; -else - rampdown_Q(1:samps_per_symb+1) = 0; -end -iq_samples(length(iq_samples)+1 : length(iq_samples)+samps_per_symb) = ... - rampdown_I(2:samps_per_symb+1) + 1j*rampdown_Q(2:samps_per_symb+1); - -end From 5e4da73c1cb5eb79523af8a96e10b2b42306cb41 Mon Sep 17 00:00:00 2001 From: Robert Ghilduta Date: Sat, 19 Apr 2025 02:14:30 -0700 Subject: [PATCH 196/238] bladeRF-fsk: add git submodule for bladeRF-fsk repo --- .gitmodules | 3 +++ host/utilities/bladeRF-fsk | 1 + 2 files changed, 4 insertions(+) create mode 160000 host/utilities/bladeRF-fsk diff --git a/.gitmodules b/.gitmodules index c71735dd..4a34c632 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "thirdparty/analogdevicesinc/no-OS"] path = thirdparty/analogdevicesinc/no-OS url = https://github.com/analogdevicesinc/no-OS/ +[submodule "host/utilities/bladeRF-fsk"] + path = host/utilities/bladeRF-fsk + url = https://github.com/Nuand/bladeRF-fsk diff --git a/host/utilities/bladeRF-fsk b/host/utilities/bladeRF-fsk new file mode 160000 index 00000000..b60b1213 --- /dev/null +++ b/host/utilities/bladeRF-fsk @@ -0,0 +1 @@ +Subproject commit b60b121377a5632cd48a03647028a0a45cff7d45 From bcf1f4b8886899af0465292caa91d5aff3d5fa44 Mon Sep 17 00:00:00 2001 From: Robert Ghilduta Date: Sun, 27 Apr 2025 02:43:30 -0700 Subject: [PATCH 197/238] hdl: build A5s as part of build all hosteds --- hdl/quartus/build_bladerf.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hdl/quartus/build_bladerf.sh b/hdl/quartus/build_bladerf.sh index b87e39e7..f6e7419e 100755 --- a/hdl/quartus/build_bladerf.sh +++ b/hdl/quartus/build_bladerf.sh @@ -192,7 +192,7 @@ if [ "$build_hosted" == "1" ]; then mkdir -p build_logs build_pids=() - for config in "bladeRF 40" "bladeRF 115" "bladeRF-micro A4" "bladeRF-micro A9"; do + for config in "bladeRF 40" "bladeRF 115" "bladeRF-micro A4" "bladeRF-micro A5" "bladeRF-micro A9"; do read -r board size <<< "$config" echo "Starting build for $board hosted $size..." $0 -b "$board" -r hosted -s "$size" > "build_logs/$board-hosted-$size.log" 2>&1 & From 20b9810eb023180f83280257fb03d30b315ddc51 Mon Sep 17 00:00:00 2001 From: Robert Ghilduta Date: Mon, 5 May 2025 05:38:37 -0700 Subject: [PATCH 198/238] misc: add missing CHANGELOGs All CHANGELOGs should be up to date now. --- fx3_firmware/CHANGELOG | 1 - host/libraries/libbladeRF/CHANGELOG | 72 +++++++++++++++++++ .../libbladeRF_bindings/python/CHANGELOG | 16 +++++ host/utilities/bladeRF-cli/CHANGELOG | 20 ++++++ 4 files changed, 108 insertions(+), 1 deletion(-) diff --git a/fx3_firmware/CHANGELOG b/fx3_firmware/CHANGELOG index 63480bd3..e3185b3b 100644 --- a/fx3_firmware/CHANGELOG +++ b/fx3_firmware/CHANGELOG @@ -5,7 +5,6 @@ For more detailed information, please see the git change log and issue tracker hosted on GitHub: https://github.com/nuand/bladeRF ================================================================================ - v2.5.0 (2024-07-30) -------------------------------- * Bumped GPIF DMA buffer size to 8192 bytes diff --git a/host/libraries/libbladeRF/CHANGELOG b/host/libraries/libbladeRF/CHANGELOG index 16e1ee47..6b841dee 100644 --- a/host/libraries/libbladeRF/CHANGELOG +++ b/host/libraries/libbladeRF/CHANGELOG @@ -5,6 +5,78 @@ For more detailed information, please see the git change log and issue tracker hosted on GitHub: https://github.com/Nuand/bladeRF ================================================================================ +v2.5.0 (2023-02-13) +-------------------------------- + +This version of libbladeRF is intended for use with: + + FX3 Firmware v2.4.0 + FPGA v0.15.0 + +Changes: + * Added 8-bit SC8_Q11 sample mode support for bladeRF 2.0 micro + * Added oversampling (OC) mode configuration to libbladeRF + * Extended TX bandwidth limit with oversampling enabled + * Improved compatibility checks and guards for sample rate and gain settings + * Fixed mutex locking bug during stream configuration + * Renamed bladerf_set_feature() to bladerf_enable_feature() + * Expanded help menus and command abbreviation support in bladeRF-cli + * Various minor fixes and cleanups + +v2.4.1 (2021-10-04) +-------------------------------- + +This version of libbladeRF is intended for use with: + + FX3 Firmware v2.4.0 + FPGA v0.14.0 + +Changes: + * Added support for bladeRF 2.0 micro xA5 + * Fixed packet mode enable issue on bladeRF 1.0 + * Added Wishbone master control functions + * ConfigFile: Added keywords clock_out, clock_sel, refin_freq, clock_ref + * ConfigFile: Fixed parsing of vctcxo_tamer key + * Minor documentation updates and code cleanups + +v2.4.0 (2020-12-23) +-------------------------------- + +This version of libbladeRF is intended for use with: + + FX3 Firmware v2.4.0 + FPGA v0.12.0 + +Changes: + * Added BLADERF_FORMAT_PACKET_META streaming format + * Added FPGA and firmware version checks for packet meta support + * Added metadata helper functions for packet streaming + * Introduced BLADERF_GPIO_PACKET_CORE_PRESENT definition + * Improved RFIC initialization parameter selection + * Added RFIC fast AGC settings + * Improved internal capability checking functions + * Updated version compatibility tables + * Minor fixes and code cleanups + +v2.2.1 (2019-07-30) +-------------------------------- + +This version of libbladeRF is intended for use with: + + FX3 Firmware v2.3.2 + FPGA v0.11.0 + +Changes: + * bladerf2: Set tuning mode default to host-based + * bladerf2: Include FPGA v0.11.0 compatibility + * streaming: Fix timestamp advancement calculation + * bladerf1: Allow quicktune to control XB GPIO register + * bladerf2: Improve error handling on FIR filter failures + * flash: Add OTP read/write and locking functionality + * host: Update FPGA flash type definitions + * host: Fix formatting error in internal error message + * host: Fix type warnings in flash.c (Windows build) + v2.2.0 (2018-12-21) -------------------------------- diff --git a/host/libraries/libbladeRF_bindings/python/CHANGELOG b/host/libraries/libbladeRF_bindings/python/CHANGELOG index 8185d3bb..2610efda 100644 --- a/host/libraries/libbladeRF_bindings/python/CHANGELOG +++ b/host/libraries/libbladeRF_bindings/python/CHANGELOG @@ -5,6 +5,22 @@ For more detailed information, please see the git change log and issue tracker hosted on GitHub: https://github.com/nuand/bladeRF ================================================================================ +v1.3.0 (2023-02-13) +-------------------------------- + * add special case for loading Windows DLL in Python bindings + * update Python bindings definitions + +v1.2.1 (2021-10-04) +-------------------------------- + * add bladeRF 2.0 micro xA5 support + * fix get_gain_modes and get_*_range functions + * fix Python binding compatibility issue on macOS + +v1.2.0 (2019-07-31) +-------------------------------- + * add OTP functions + * update FPGA flash type definitions + v1.1.2 (2020-12-23) -------------------------------- * update definitions for libbladeRF v2.4.0 diff --git a/host/utilities/bladeRF-cli/CHANGELOG b/host/utilities/bladeRF-cli/CHANGELOG index 953a7d1e..79444a95 100644 --- a/host/utilities/bladeRF-cli/CHANGELOG +++ b/host/utilities/bladeRF-cli/CHANGELOG @@ -5,6 +5,26 @@ For more detailed information, please see the git change log and issue tracker hosted on GitHub: https://github.com/Nuand/bladeRF ================================================================================ +v1.9.0 (2023-02-13) +-------------------------------- + * Added 8-bit sample support for RX/TX, CSV and binary formats + * Introduced "bitmode" and "feature" commands for enhanced device configuration + * Added "generate" command to create waveform samples + * Expanded command abbreviations (e.g., "set freq" for "set frequency") + * Improved help menus and error handling + * Updated samplerate reporting and recommendations for 8-bit and oversample modes + * Internal cleanups and minor fixes + +v1.8.0 (2019-07-30) +-------------------------------- + * Added 'tuning_mode' parameter; allows FPGA or host-based tuning selection + * Added 'filter' command to configure RFIC FIR filter modes for rx/tx paths + * Improved 'print hardware' output; fixed premature exit in FPGA tuning mode + * Updated flash utilities (flash_backup/image/init_cal/restore) + * Improved help text formatting and provided additional command hints + * Display error if FPGA size query fails + * Added internal device type detection and storage + v1.7.1 (2018-12-21) -------------------------------- * tx.c: fix memory leak in CSV-to-SC16Q11 conversion (fixes #694) From 5627503b27fefa407ce3f65af9fca50b579c1525 Mon Sep 17 00:00:00 2001 From: Robert Ghilduta Date: Tue, 6 May 2025 05:13:18 -0700 Subject: [PATCH 199/238] matlab: bump version to 1.1.0 v1.1.0 (2025-05-06) -------------------------------- * Add bladerf_image_type_to_string API binding * Add missing RFIC_BIST loopback type * Improve enum string handling and conversion functions * Fix module default value handling in calibrate method * Standardize version information handling --- host/libraries/libbladeRF_bindings/matlab/CHANGELOG | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/host/libraries/libbladeRF_bindings/matlab/CHANGELOG b/host/libraries/libbladeRF_bindings/matlab/CHANGELOG index 2048d108..ba72f919 100644 --- a/host/libraries/libbladeRF_bindings/matlab/CHANGELOG +++ b/host/libraries/libbladeRF_bindings/matlab/CHANGELOG @@ -5,6 +5,14 @@ For more detailed information, please see the git change log and issue tracker hosted on GitHub: https://github.com/nuand/bladeRF ================================================================================ +v1.1.0 (2025-05-06) +-------------------------------- + * Add bladerf_image_type_to_string API binding + * Add missing RFIC_BIST loopback type + * Improve enum string handling and conversion functions + * Fix module default value handling in calibrate method + * Standardize version information handling + v1.0.5 (2021-10-04) -------------------------------- * Update MATLAB binds to keep up with libbladeRF From 2003fd968fdd0c40ff11d9fc1fe8281ea711ba7f Mon Sep 17 00:00:00 2001 From: Robert Ghilduta Date: Tue, 6 May 2025 05:13:21 -0700 Subject: [PATCH 200/238] python: bump version to 1.4.0 v1.4.0 (2025-05-06) -------------------------------- * add support for SC16_Q11_META format * update Python binding definitions --- host/libraries/libbladeRF_bindings/python/CHANGELOG | 5 +++++ host/libraries/libbladeRF_bindings/python/setup.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/host/libraries/libbladeRF_bindings/python/CHANGELOG b/host/libraries/libbladeRF_bindings/python/CHANGELOG index 2610efda..ff61f5a8 100644 --- a/host/libraries/libbladeRF_bindings/python/CHANGELOG +++ b/host/libraries/libbladeRF_bindings/python/CHANGELOG @@ -5,6 +5,11 @@ For more detailed information, please see the git change log and issue tracker hosted on GitHub: https://github.com/nuand/bladeRF ================================================================================ +v1.4.0 (2025-05-06) +-------------------------------- + * add support for SC16_Q11_META format + * update Python binding definitions + v1.3.0 (2023-02-13) -------------------------------- * add special case for loading Windows DLL in Python bindings diff --git a/host/libraries/libbladeRF_bindings/python/setup.py b/host/libraries/libbladeRF_bindings/python/setup.py index 08702441..aa5e8725 100644 --- a/host/libraries/libbladeRF_bindings/python/setup.py +++ b/host/libraries/libbladeRF_bindings/python/setup.py @@ -19,7 +19,7 @@ with open(path.join(here, 'README.md'), encoding='utf-8') as f: setup( name='bladerf', - version='1.3.0', + version='1.4.0', description='CFFI-based Python 3 binding to libbladeRF', long_description=long_description, url='https://github.com/Nuand/bladeRF', From e1325c0103bafc1c4847bfe967e12012181484b8 Mon Sep 17 00:00:00 2001 From: Robert Ghilduta Date: Tue, 6 May 2025 05:13:52 -0700 Subject: [PATCH 201/238] bladeRF-cli: bump version to 1.10.0 v1.10.0 (2025-05-06) -------------------------------- * Added sc16q11 packed format support * Improved sample format tracking and replaced legacy bit_mode handling * Migrated threading to unified libbladeRF thread macros * Updated CMake minimum requirement to modernized syntax * Fixed RX sample count overflow (issue #941) * Return error code when no available devices detected (issue #844) * Clarified K/M/G prefixes as powers of 1024 in documentation (issue #840) * Updated documentation to reflect sample limit changes --- host/utilities/bladeRF-cli/CHANGELOG | 11 +++++++++++ host/utilities/bladeRF-cli/CMakeLists.txt | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/host/utilities/bladeRF-cli/CHANGELOG b/host/utilities/bladeRF-cli/CHANGELOG index 79444a95..3687d321 100644 --- a/host/utilities/bladeRF-cli/CHANGELOG +++ b/host/utilities/bladeRF-cli/CHANGELOG @@ -5,6 +5,17 @@ For more detailed information, please see the git change log and issue tracker hosted on GitHub: https://github.com/Nuand/bladeRF ================================================================================ +v1.10.0 (2025-05-06) +-------------------------------- + * Added sc16q11 packed format support + * Improved sample format tracking and replaced legacy bit_mode handling + * Migrated threading to unified libbladeRF thread macros + * Updated CMake minimum requirement to modernized syntax + * Fixed RX sample count overflow (issue #941) + * Return error code when no available devices detected (issue #844) + * Clarified K/M/G prefixes as powers of 1024 in documentation (issue #840) + * Updated documentation to reflect sample limit changes + v1.9.0 (2023-02-13) -------------------------------- * Added 8-bit sample support for RX/TX, CSV and binary formats diff --git a/host/utilities/bladeRF-cli/CMakeLists.txt b/host/utilities/bladeRF-cli/CMakeLists.txt index 378d2faa..79cd1822 100644 --- a/host/utilities/bladeRF-cli/CMakeLists.txt +++ b/host/utilities/bladeRF-cli/CMakeLists.txt @@ -6,7 +6,7 @@ project(bladeRF-cli C) ################################################################################ set(VERSION_INFO_MAJOR 1) -set(VERSION_INFO_MINOR 9) +set(VERSION_INFO_MINOR 10) set(VERSION_INFO_PATCH 0) if(NOT DEFINED VERSION_INFO_EXTRA) From f746c5bd135caa38cbd4cc738e02a9d851d0fd3b Mon Sep 17 00:00:00 2001 From: Robert Ghilduta Date: Tue, 6 May 2025 05:14:27 -0700 Subject: [PATCH 202/238] fpga: bump version to 0.16.0 -------------------------------- v0.16.0 (2025-05-06) -------------------------------- This version brings significant FPGA improvements including sc16q11 packed mode support and optimized USB throughput, along with important bug fixes for bladeRF 1.0 and 2.0 micro devices. Features: * hdl: Added sc16q11 packed mode for improved sample efficiency * hdl: Increased FX3 GPIF buffer sizes, boosting USB throughput (~356MB/s) * hdl: Implemented dynamic Nios base address assignment based on RAM size * hdl: Added parallel build support for hosted FPGA variants (40, 115, A4, A5, A9) * nios: Enabled elf-gdb and gdb-server support for improved debugging capability * hdl: Added git revision information to FPGA build outputs Fixes: * hdl: Fixed delayed sample and off-by-one timestamp bugs on bladeRF 1.0 * hdl: Corrected TX meta sample gap issue when timestamp set to META NOW * hdl: Fixed corrupted UART buffer in command_uart component * hdl: Resolved TX deadlock scenarios by refactoring RX/TX DMA prioritization * hdl: Improved FPGA simulation accuracy for bladeRF 1 and 2 micro models * hdl: Fixed false timing paths and resolved multiple timing violations --- hdl/CHANGELOG | 24 +++++++++++++++++++ .../src/board/bladerf1/compatibility.c | 1 + .../src/board/bladerf2/compatibility.c | 1 + 3 files changed, 26 insertions(+) diff --git a/hdl/CHANGELOG b/hdl/CHANGELOG index 013661d7..6ecc518d 100644 --- a/hdl/CHANGELOG +++ b/hdl/CHANGELOG @@ -5,6 +5,30 @@ For more detailed information, please see the git change log and issue tracker hosted on GitHub: https://github.com/nuand/bladeRF ================================================================================ +-------------------------------- +v0.16.0 (2025-05-06) +-------------------------------- + +This version brings significant FPGA improvements including sc16q11 packed mode +support and optimized USB throughput, along with important bug fixes for bladeRF +1.0 and 2.0 micro devices. + + Features: + * hdl: Added sc16q11 packed mode for improved sample efficiency + * hdl: Increased FX3 GPIF buffer sizes, boosting USB throughput (~356MB/s) + * hdl: Implemented dynamic Nios base address assignment based on RAM size + * hdl: Added parallel build support for hosted FPGA variants (40, 115, A4, A5, A9) + * nios: Enabled elf-gdb and gdb-server support for improved debugging capability + * hdl: Added git revision information to FPGA build outputs + + Fixes: + * hdl: Fixed delayed sample and off-by-one timestamp bugs on bladeRF 1.0 + * hdl: Corrected TX meta sample gap issue when timestamp set to META NOW + * hdl: Fixed corrupted UART buffer in command_uart component + * hdl: Resolved TX deadlock scenarios by refactoring RX/TX DMA prioritization + * hdl: Improved FPGA simulation accuracy for bladeRF 1 and 2 micro models + * hdl: Fixed false timing paths and resolved multiple timing violations + -------------------------------- v0.15.3 (2023-08-09) -------------------------------- diff --git a/host/libraries/libbladeRF/src/board/bladerf1/compatibility.c b/host/libraries/libbladeRF/src/board/bladerf1/compatibility.c index a5276fb8..f43e71b5 100644 --- a/host/libraries/libbladeRF/src/board/bladerf1/compatibility.c +++ b/host/libraries/libbladeRF/src/board/bladerf1/compatibility.c @@ -36,6 +36,7 @@ const struct version_compat_table bladerf1_fw_compat_table = {fw_compat, ARRAY_S static const struct compat fpga_compat[] = { /* FPGA requires >= Firmware */ + { VERSION(0, 16, 0), VERSION(2, 6, 0) }, { VERSION(0, 16, 0), VERSION(2, 5, 0) }, { VERSION(0, 15, 3), VERSION(2, 4, 0) }, { VERSION(0, 15, 1), VERSION(2, 4, 0) }, diff --git a/host/libraries/libbladeRF/src/board/bladerf2/compatibility.c b/host/libraries/libbladeRF/src/board/bladerf2/compatibility.c index 8801d174..6be5b81a 100644 --- a/host/libraries/libbladeRF/src/board/bladerf2/compatibility.c +++ b/host/libraries/libbladeRF/src/board/bladerf2/compatibility.c @@ -28,6 +28,7 @@ const struct version_compat_table bladerf2_fw_compat_table = {fw_compat, ARRAY_S static const struct compat fpga_compat[] = { /* FPGA requires >= Firmware */ + { VERSION(0, 16, 0), VERSION(2, 6, 0) }, { VERSION(0, 16, 0), VERSION(2, 5, 0) }, { VERSION(0, 15, 3), VERSION(2, 4, 0) }, { VERSION(0, 15, 2), VERSION(2, 4, 0) }, From 902fc43305fa5f594ff23e4466b9469cddbd1b0f Mon Sep 17 00:00:00 2001 From: Robert Ghilduta Date: Tue, 6 May 2025 05:14:40 -0700 Subject: [PATCH 203/238] firmware: bump version to 2.6.0 v2.6.0 (2025-05-06) -------------------------------- * Fixed missing break in BLADE_USB_CMD_QUERY_FPGA_SOURCE command handling * Improved FX3 SDK setup instructions in README --- fx3_firmware/CHANGELOG | 5 +++++ fx3_firmware/CMakeLists.txt | 2 +- host/libraries/libbladeRF/src/board/bladerf1/compatibility.c | 1 + host/libraries/libbladeRF/src/board/bladerf2/compatibility.c | 1 + 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/fx3_firmware/CHANGELOG b/fx3_firmware/CHANGELOG index e3185b3b..6783e83c 100644 --- a/fx3_firmware/CHANGELOG +++ b/fx3_firmware/CHANGELOG @@ -5,6 +5,11 @@ For more detailed information, please see the git change log and issue tracker hosted on GitHub: https://github.com/nuand/bladeRF ================================================================================ +v2.6.0 (2025-05-06) +-------------------------------- + * Fixed missing break in BLADE_USB_CMD_QUERY_FPGA_SOURCE command handling + * Improved FX3 SDK setup instructions in README + v2.5.0 (2024-07-30) -------------------------------- * Bumped GPIF DMA buffer size to 8192 bytes diff --git a/fx3_firmware/CMakeLists.txt b/fx3_firmware/CMakeLists.txt index fcd98074..278592d2 100644 --- a/fx3_firmware/CMakeLists.txt +++ b/fx3_firmware/CMakeLists.txt @@ -33,7 +33,7 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/../host/cmake/modules) # Update these definitions when updating the firmware version set(VERSION_INFO_MAJOR 2) -set(VERSION_INFO_MINOR 5) +set(VERSION_INFO_MINOR 6) set(VERSION_INFO_PATCH 0) if(NOT DEFINED VERSION_INFO_EXTRA) diff --git a/host/libraries/libbladeRF/src/board/bladerf1/compatibility.c b/host/libraries/libbladeRF/src/board/bladerf1/compatibility.c index f43e71b5..25e58a4b 100644 --- a/host/libraries/libbladeRF/src/board/bladerf1/compatibility.c +++ b/host/libraries/libbladeRF/src/board/bladerf1/compatibility.c @@ -13,6 +13,7 @@ static const struct compat fw_compat[] = { /* Firmware requires >= FPGA */ + { VERSION(2, 6, 0), VERSION(0, 16, 0) }, { VERSION(2, 5, 0), VERSION(0, 16, 0) }, { VERSION(2, 4, 0), VERSION(0, 6, 0) }, { VERSION(2, 3, 2), VERSION(0, 0, 2) }, diff --git a/host/libraries/libbladeRF/src/board/bladerf2/compatibility.c b/host/libraries/libbladeRF/src/board/bladerf2/compatibility.c index 6be5b81a..e67d5b67 100644 --- a/host/libraries/libbladeRF/src/board/bladerf2/compatibility.c +++ b/host/libraries/libbladeRF/src/board/bladerf2/compatibility.c @@ -13,6 +13,7 @@ static const struct compat fw_compat[] = { /* Firmware requires >= FPGA */ + { VERSION(2, 6, 0), VERSION(0, 16, 0) }, { VERSION(2, 5, 0), VERSION(0, 16, 0) }, { VERSION(2, 4, 0), VERSION(0, 6, 0) }, { VERSION(2, 3, 2), VERSION(0, 6, 0) }, From 09c82087786702d2812f3f0fc909beccf3277233 Mon Sep 17 00:00:00 2001 From: Robert Ghilduta Date: Tue, 6 May 2025 05:15:15 -0700 Subject: [PATCH 204/238] libbladeRF: bump version to 2.6.0 v2.6.0 (2025-05-06) -------------------------------- This version of libbladeRF is intended for use with: FX3 Firmware v2.6.0 FPGA v0.16.0 New Features: * Added SC16_Q11 packed sample format support, improving sample efficiency * Increased FX3 GPIF buffer sizes, significantly boosting USB throughput (~356MB/s) * Implemented dynamic Nios base address assignment based on RAM size * Added parallel build support for hosted FPGA variants (40, 115, A4, A5, A9) * Enabled elf-gdb and gdb-server support for improved FPGA debugging capability * Added git revision information to FPGA build outputs * bladeRF 2.0: Added support for gain calibration loading, enabling, and management * bladeRF 2.0: Introduced bladeRF-power CLI tool for managing gain calibration * bladeRF 2.0: Added bladerf_get_gain_target function for gain management * bladeRF 2.0: Added bladerf_format_to_string API call * bladeRF 2.0: Added bladerf_image_print_metadata API to display image metadata * bladeRF 2.0: Improved compatibility checking between FPGA and FX3 firmware GPIF buffers Improvements: * libbladeRF now compiles and runs under MinGW and MSVC on Windows platforms * Replaced libpthreadswin32 dependency with native libbladeRF threading macros * Improved error handling and reporting for out-of-range frequency and sample rate settings * Added detailed logging for USB transfer and Nios access timeouts * Updated Doxygen to v1.9.8, adding support for light/dark modes and modernized configuration * Improved GPIF buffer alignment handling for larger FX3 buffer sizes * Added CMake find_package() support for easier integration into external projects * Streamlined internal error checking macros, simplifying codebase * Enhanced sync_rx_meta example with additional argument parsing and MIMO support * Improved FPGA simulations for bladeRF 1.0 and bladeRF 2.0 micro Bug Fixes: * Fixed delayed sample and off-by-one timestamp issues on bladeRF 1.0 * Corrected TX meta sample gap issue when timestamp set to META_NOW * Resolved corrupted UART buffer in command_uart component * Fixed TX deadlock scenarios by refactoring RX/TX DMA prioritization * Addressed SC16_Q11 packed RX discontinuity issue on overflow condition * Fixed false timing paths and resolved multiple timing violations * Fixed calibration load check in bladerf_get_gain_calibration * Corrected RX meta packet timestamp and flags assignment * Fixed sync TX initialization bug Miscellaneous: * Updated API documentation to reflect larger GPIF buffer sizes * Improved FX3 SDK setup instructions in README * Minor typo and documentation corrections throughout the codebase --- host/libraries/libbladeRF/CHANGELOG | 50 +++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/host/libraries/libbladeRF/CHANGELOG b/host/libraries/libbladeRF/CHANGELOG index 6b841dee..13cec6ad 100644 --- a/host/libraries/libbladeRF/CHANGELOG +++ b/host/libraries/libbladeRF/CHANGELOG @@ -5,6 +5,56 @@ For more detailed information, please see the git change log and issue tracker hosted on GitHub: https://github.com/Nuand/bladeRF ================================================================================ +v2.6.0 (2025-05-06) +-------------------------------- + +This version of libbladeRF is intended for use with: + + FX3 Firmware v2.6.0 + FPGA v0.16.0 + +New Features: + * Added SC16_Q11 packed sample format support, improving sample efficiency + * Increased FX3 GPIF buffer sizes, significantly boosting USB throughput (~356MB/s) + * Implemented dynamic Nios base address assignment based on RAM size + * Added parallel build support for hosted FPGA variants (40, 115, A4, A5, A9) + * Enabled elf-gdb and gdb-server support for improved FPGA debugging capability + * Added git revision information to FPGA build outputs + * bladeRF 2.0: Added support for gain calibration loading, enabling, and management + * bladeRF 2.0: Introduced bladeRF-power CLI tool for managing gain calibration + * bladeRF 2.0: Added bladerf_get_gain_target function for gain management + * bladeRF 2.0: Added bladerf_format_to_string API call + * bladeRF 2.0: Added bladerf_image_print_metadata API to display image metadata + * bladeRF 2.0: Improved compatibility checking between FPGA and FX3 firmware GPIF buffers + +Improvements: + * libbladeRF now compiles and runs under MinGW and MSVC on Windows platforms + * Replaced libpthreadswin32 dependency with native libbladeRF threading macros + * Improved error handling and reporting for out-of-range frequency and sample rate settings + * Added detailed logging for USB transfer and Nios access timeouts + * Updated Doxygen to v1.9.8, adding support for light/dark modes and modernized configuration + * Improved GPIF buffer alignment handling for larger FX3 buffer sizes + * Added CMake find_package() support for easier integration into external projects + * Streamlined internal error checking macros, simplifying codebase + * Enhanced sync_rx_meta example with additional argument parsing and MIMO support + * Improved FPGA simulations for bladeRF 1.0 and bladeRF 2.0 micro + +Bug Fixes: + * Fixed delayed sample and off-by-one timestamp issues on bladeRF 1.0 + * Corrected TX meta sample gap issue when timestamp set to META_NOW + * Resolved corrupted UART buffer in command_uart component + * Fixed TX deadlock scenarios by refactoring RX/TX DMA prioritization + * Addressed SC16_Q11 packed RX discontinuity issue on overflow condition + * Fixed false timing paths and resolved multiple timing violations + * Fixed calibration load check in bladerf_get_gain_calibration + * Corrected RX meta packet timestamp and flags assignment + * Fixed sync TX initialization bug + +Miscellaneous: + * Updated API documentation to reflect larger GPIF buffer sizes + * Improved FX3 SDK setup instructions in README + * Minor typo and documentation corrections throughout the codebase + v2.5.0 (2023-02-13) -------------------------------- From 545f73c5f1c5b31293a0ae21123fa7cd821453b6 Mon Sep 17 00:00:00 2001 From: Robert Ghilduta Date: Tue, 13 May 2025 04:37:12 -0700 Subject: [PATCH 205/238] fx3_firmware: include major update in CHANGELOG --- fx3_firmware/CHANGELOG | 1 + 1 file changed, 1 insertion(+) diff --git a/fx3_firmware/CHANGELOG b/fx3_firmware/CHANGELOG index 6783e83c..50699054 100644 --- a/fx3_firmware/CHANGELOG +++ b/fx3_firmware/CHANGELOG @@ -7,6 +7,7 @@ hosted on GitHub: https://github.com/nuand/bladeRF v2.6.0 (2025-05-06) -------------------------------- + * Increase GPIF buffer size for increase performance * Fixed missing break in BLADE_USB_CMD_QUERY_FPGA_SOURCE command handling * Improved FX3 SDK setup instructions in README From bbdfbe1760254381e45786a19a52a957a3a58f07 Mon Sep 17 00:00:00 2001 From: Robert Ghilduta Date: Wed, 14 May 2025 01:22:16 -0700 Subject: [PATCH 206/238] fsk: bump submodule to include build library fix --- host/utilities/bladeRF-fsk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/host/utilities/bladeRF-fsk b/host/utilities/bladeRF-fsk index b60b1213..43276ad2 160000 --- a/host/utilities/bladeRF-fsk +++ b/host/utilities/bladeRF-fsk @@ -1 +1 @@ -Subproject commit b60b121377a5632cd48a03647028a0a45cff7d45 +Subproject commit 43276ad2b641287018ab502a5eea1d315e8a9ac7 From a59d95fc803015894b675b2fb32f9156eed2b114 Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Thu, 15 May 2025 14:52:12 -0500 Subject: [PATCH 207/238] host: fsk submodule init on make --- host/utilities/CMakeLists.txt | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/host/utilities/CMakeLists.txt b/host/utilities/CMakeLists.txt index dec80c68..2bfc2804 100644 --- a/host/utilities/CMakeLists.txt +++ b/host/utilities/CMakeLists.txt @@ -1,5 +1,29 @@ cmake_minimum_required(VERSION 3.10...3.27) +if(NOT IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/bladeRF-fsk/c) + message(STATUS "bladeRF-fsk: Attempting to initialize missing submodule") + + find_package(Git QUIET) + + if(Git_FOUND) + execute_process( + COMMAND ${Git_EXECUTABLE} submodule init + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} + ) + execute_process( + COMMAND ${Git_EXECUTABLE} submodule update + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} + ) + endif() +endif() + +if(NOT IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/bladeRF-fsk/c) + message(FATAL_ERROR "Directory ${CMAKE_CURRENT_SOURCE_DIR}/bladeRF-fsk was not found. " + "It appears that this submodule has not been properly " + "initialized. Please run 'git submodule init' and " + "'git submodule update', and then re-run cmake.") +endif() + add_subdirectory(bladeRF-cli) add_subdirectory(bladeRF-update) if(NOT MSVC) From 8931d475f30b911b27308a668cb02408325c383b Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Thu, 15 May 2025 21:12:43 -0500 Subject: [PATCH 208/238] host: add ifdef for array size macro --- host/common/include/host_config.h.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/host/common/include/host_config.h.in b/host/common/include/host_config.h.in index 844946dd..fc94a777 100644 --- a/host/common/include/host_config.h.in +++ b/host/common/include/host_config.h.in @@ -316,7 +316,9 @@ /******************************************************************************* * Miscellaneous utility macros ******************************************************************************/ +#ifndef ARRAY_SIZE #define ARRAY_SIZE(n) (sizeof(n) / sizeof(n[0])) +#endif /** * GCC 7+ warns on implicit fallthroughs in switch statements From cd29f93a587c0d9f32b26d41e09f1193d8ab89b3 Mon Sep 17 00:00:00 2001 From: Robert Ghilduta Date: Thu, 15 May 2025 02:15:54 -0700 Subject: [PATCH 209/238] libladeRF: LTO fix Fixes libbladeRF LTO compilation error cmake -DCMAKE_C_FLAGS="-flto -Werror=odr -Werror=lto-type-mismatch -Werror=strict-aliasing" -DCMAKE_BUILD_TYPE=Release .. --- fpga_common/include/ad936x.h | 751 +----------------- host/CMakeLists.txt | 1 + .../0001-0bba46e-nuand-modifications.patch | 9 + 3 files changed, 12 insertions(+), 749 deletions(-) diff --git a/fpga_common/include/ad936x.h b/fpga_common/include/ad936x.h index 5fd43e73..38d0ea9a 100644 --- a/fpga_common/include/ad936x.h +++ b/fpga_common/include/ad936x.h @@ -29,6 +29,8 @@ #include #include +#include + /** * The purpose of this header file is to allow the use of libad9361 without * including all of the unnecessary defines, etc, used during compilation. @@ -46,15 +48,6 @@ * From common.h ******************************************************************************/ -struct clk_onecell_data { - struct clk **clks; - uint32_t clk_num; -}; - -/****************************************************************************** - * From ad9361.h - ******************************************************************************/ - #define AD936X_REG_TX1_OUT_1_PHASE_CORR 0x08E #define AD936X_REG_TX1_OUT_1_GAIN_CORR 0x08F #define AD936X_REG_TX2_OUT_1_PHASE_CORR 0x090 @@ -98,681 +91,6 @@ struct clk_onecell_data { #define AD936X_CNT(x) ((((x)-1) & 0x7) << 12) #define AD936X_ADDR(x) ((x)&0x3FF) -enum dev_id { ID_AD9361, ID_AD9364, ID_AD9363A }; - -enum ad9361_clocks { - BB_REFCLK, - RX_REFCLK, - TX_REFCLK, - BBPLL_CLK, - ADC_CLK, - R2_CLK, - R1_CLK, - CLKRF_CLK, - RX_SAMPL_CLK, - DAC_CLK, - T2_CLK, - T1_CLK, - CLKTF_CLK, - TX_SAMPL_CLK, - RX_RFPLL_INT, - TX_RFPLL_INT, - RX_RFPLL_DUMMY, - TX_RFPLL_DUMMY, - RX_RFPLL, - TX_RFPLL, - NUM_AD9361_CLKS, - EXT_REF_CLK, -}; - -enum rx_gain_table_name { - TBL_200_1300_MHZ, - TBL_1300_4000_MHZ, - TBL_4000_6000_MHZ, - RXGAIN_TBLS_END, -}; - -enum rx_gain_table_type { - RXGAIN_FULL_TBL, - RXGAIN_SPLIT_TBL, -}; - -struct rx_gain_info { - enum rx_gain_table_type tbl_type; - int32_t starting_gain_db; - int32_t max_gain_db; - int32_t gain_step_db; - int32_t max_idx; - int32_t idx_step_offset; -}; - -enum ad9361_pdata_rx_freq { - BBPLL_FREQ, - ADC_FREQ, - R2_FREQ, - R1_FREQ, - CLKRF_FREQ, - RX_SAMPL_FREQ, - NUM_RX_CLOCKS, -}; - -enum ad9361_pdata_tx_freq { - IGNORE_FREQ, - DAC_FREQ, - T2_FREQ, - T1_FREQ, - CLKTF_FREQ, - TX_SAMPL_FREQ, - NUM_TX_CLOCKS, -}; - -struct ad9361_fastlock_entry { - //#define FASTLOOK_INIT 1 - uint8_t flags; - uint8_t alc_orig; - uint8_t alc_written; -}; - -struct ad9361_fastlock { - uint8_t save_profile; - uint8_t current_profile[2]; - struct ad9361_fastlock_entry entry[2][8]; -}; - -enum ad9361_bist_mode { - BIST_DISABLE, - BIST_INJ_TX, - BIST_INJ_RX, -}; - -enum ad9361_clkout { - CLKOUT_DISABLE, - BUFFERED_XTALN_DCXO, - ADC_CLK_DIV_2, - ADC_CLK_DIV_3, - ADC_CLK_DIV_4, - ADC_CLK_DIV_8, - ADC_CLK_DIV_16, -}; - -enum rf_gain_ctrl_mode { - RF_GAIN_MGC, - RF_GAIN_FASTATTACK_AGC, - RF_GAIN_SLOWATTACK_AGC, - RF_GAIN_HYBRID_AGC -}; - -enum f_agc_target_gain_index_type { - MAX_GAIN, - SET_GAIN, - OPTIMIZED_GAIN, - NO_GAIN_CHANGE, -}; - -enum rssi_restart_mode { - AGC_IN_FAST_ATTACK_MODE_LOCKS_THE_GAIN, - EN_AGC_PIN_IS_PULLED_HIGH, - ENTERS_RX_MODE, - GAIN_CHANGE_OCCURS, - SPI_WRITE_TO_REGISTER, - GAIN_CHANGE_OCCURS_OR_EN_AGC_PIN_PULLED_HIGH, -}; - -struct rssi_control { - enum rssi_restart_mode restart_mode; - bool rssi_unit_is_rx_samples; - uint32_t rssi_delay; - uint32_t rssi_wait; - uint32_t rssi_duration; -}; - -struct port_control { - uint8_t pp_conf[3]; - uint8_t rx_clk_data_delay; - uint8_t tx_clk_data_delay; - uint8_t digital_io_ctrl; - uint8_t lvds_bias_ctrl; - uint8_t lvds_invert[2]; - uint8_t clk_out_drive; - uint8_t dataclk_drive; - uint8_t data_port_drive; - uint8_t clk_out_slew; - uint8_t dataclk_slew; - uint8_t data_port_slew; -}; - -struct ctrl_outs_control { - uint8_t index; - uint8_t en_mask; -}; - -struct elna_control { - uint16_t gain_mdB; - uint16_t bypass_loss_mdB; - uint32_t settling_delay_ns; - bool elna_1_control_en; - bool elna_2_control_en; - bool elna_in_gaintable_all_index_en; -}; - -struct auxadc_control { - int8_t offset; - uint32_t temp_time_inteval_ms; - uint32_t temp_sensor_decimation; - bool periodic_temp_measuremnt; - uint32_t auxadc_clock_rate; - uint32_t auxadc_decimation; -}; - -struct auxdac_control { - uint16_t dac1_default_value; - uint16_t dac2_default_value; - bool auxdac_manual_mode_en; - bool dac1_in_rx_en; - bool dac1_in_tx_en; - bool dac1_in_alert_en; - bool dac2_in_rx_en; - bool dac2_in_tx_en; - bool dac2_in_alert_en; - uint8_t dac1_rx_delay_us; - uint8_t dac1_tx_delay_us; - uint8_t dac2_rx_delay_us; - uint8_t dac2_tx_delay_us; -}; - -struct gpo_control { - bool gpo0_inactive_state_high_en; - bool gpo1_inactive_state_high_en; - bool gpo2_inactive_state_high_en; - bool gpo3_inactive_state_high_en; - bool gpo0_slave_rx_en; - bool gpo0_slave_tx_en; - bool gpo1_slave_rx_en; - bool gpo1_slave_tx_en; - bool gpo2_slave_rx_en; - bool gpo2_slave_tx_en; - bool gpo3_slave_rx_en; - bool gpo3_slave_tx_en; - uint8_t gpo0_rx_delay_us; - uint8_t gpo0_tx_delay_us; - uint8_t gpo1_rx_delay_us; - uint8_t gpo1_tx_delay_us; - uint8_t gpo2_rx_delay_us; - uint8_t gpo2_tx_delay_us; - uint8_t gpo3_rx_delay_us; - uint8_t gpo3_tx_delay_us; -}; - -struct tx_monitor_control { - bool tx_mon_track_en; - bool one_shot_mode_en; - uint32_t low_high_gain_threshold_mdB; - uint8_t low_gain_dB; - uint8_t high_gain_dB; - uint16_t tx_mon_delay; - uint16_t tx_mon_duration; - uint8_t tx1_mon_front_end_gain; - uint8_t tx2_mon_front_end_gain; - uint8_t tx1_mon_lo_cm; - uint8_t tx2_mon_lo_cm; -}; - -struct gain_control { - enum rf_gain_ctrl_mode rx1_mode; - enum rf_gain_ctrl_mode rx2_mode; - uint8_t adc_ovr_sample_size; - uint8_t adc_small_overload_thresh; - uint8_t adc_large_overload_thresh; - uint16_t lmt_overload_high_thresh; - uint16_t lmt_overload_low_thresh; - uint16_t dec_pow_measuremnt_duration; - uint8_t low_power_thresh; - bool dig_gain_en; - uint8_t max_dig_gain; - bool mgc_rx1_ctrl_inp_en; - bool mgc_rx2_ctrl_inp_en; - uint8_t mgc_inc_gain_step; - uint8_t mgc_dec_gain_step; - uint8_t mgc_split_table_ctrl_inp_gain_mode; - uint8_t agc_attack_delay_extra_margin_us; - uint8_t agc_outer_thresh_high; - uint8_t agc_outer_thresh_high_dec_steps; - uint8_t agc_inner_thresh_high; - uint8_t agc_inner_thresh_high_dec_steps; - uint8_t agc_inner_thresh_low; - uint8_t agc_inner_thresh_low_inc_steps; - uint8_t agc_outer_thresh_low; - uint8_t agc_outer_thresh_low_inc_steps; - uint8_t adc_small_overload_exceed_counter; - uint8_t adc_large_overload_exceed_counter; - uint8_t adc_large_overload_inc_steps; - bool adc_lmt_small_overload_prevent_gain_inc; - uint8_t lmt_overload_large_exceed_counter; - uint8_t lmt_overload_small_exceed_counter; - uint8_t lmt_overload_large_inc_steps; - uint8_t dig_saturation_exceed_counter; - uint8_t dig_gain_step_size; - bool sync_for_gain_counter_en; - uint32_t gain_update_interval_us; - bool immed_gain_change_if_large_adc_overload; - bool immed_gain_change_if_large_lmt_overload; - uint32_t f_agc_dec_pow_measuremnt_duration; - uint32_t f_agc_state_wait_time_ns; - bool f_agc_allow_agc_gain_increase; - uint8_t f_agc_lp_thresh_increment_time; - uint8_t f_agc_lp_thresh_increment_steps; - uint8_t f_agc_lock_level; - bool f_agc_lock_level_lmt_gain_increase_en; - uint8_t f_agc_lock_level_gain_increase_upper_limit; - uint8_t f_agc_lpf_final_settling_steps; - uint8_t f_agc_lmt_final_settling_steps; - uint8_t f_agc_final_overrange_count; - bool f_agc_gain_increase_after_gain_lock_en; - enum f_agc_target_gain_index_type f_agc_gain_index_type_after_exit_rx_mode; - bool f_agc_use_last_lock_level_for_set_gain_en; - uint8_t f_agc_optimized_gain_offset; - bool f_agc_rst_gla_stronger_sig_thresh_exceeded_en; - uint8_t f_agc_rst_gla_stronger_sig_thresh_above_ll; - bool f_agc_rst_gla_engergy_lost_sig_thresh_exceeded_en; - bool f_agc_rst_gla_engergy_lost_goto_optim_gain_en; - uint8_t f_agc_rst_gla_engergy_lost_sig_thresh_below_ll; - uint8_t f_agc_energy_lost_stronger_sig_gain_lock_exit_cnt; - bool f_agc_rst_gla_large_adc_overload_en; - bool f_agc_rst_gla_large_lmt_overload_en; - bool f_agc_rst_gla_en_agc_pulled_high_en; - enum f_agc_target_gain_index_type f_agc_rst_gla_if_en_agc_pulled_high_mode; - uint8_t f_agc_power_measurement_duration_in_state5; -}; - -struct ad9361_phy_platform_data { - bool rx2tx2; - bool fdd; - bool fdd_independent_mode; - bool split_gt; - bool use_extclk; - bool ensm_pin_pulse_mode; - bool ensm_pin_ctrl; - bool debug_mode; - bool tdd_use_dual_synth; - bool tdd_skip_vco_cal; - bool use_ext_rx_lo; - bool use_ext_tx_lo; - bool rx1rx2_phase_inversion_en; - bool qec_tracking_slow_mode_en; - uint8_t dc_offset_update_events; - uint8_t dc_offset_attenuation_high; - uint8_t dc_offset_attenuation_low; - uint8_t rf_dc_offset_count_high; - uint8_t rf_dc_offset_count_low; - uint8_t dig_interface_tune_skipmode; - uint8_t dig_interface_tune_fir_disable; - uint32_t dcxo_coarse; - uint32_t dcxo_fine; - uint32_t rf_rx_input_sel; - uint32_t rf_tx_output_sel; - uint32_t rx1tx1_mode_use_rx_num; - uint32_t rx1tx1_mode_use_tx_num; - uint32_t rx_path_clks[NUM_RX_CLOCKS]; - uint32_t tx_path_clks[NUM_TX_CLOCKS]; - uint32_t trx_synth_max_fref; - uint64_t rx_synth_freq; - uint64_t tx_synth_freq; - uint32_t rf_rx_bandwidth_Hz; - uint32_t rf_tx_bandwidth_Hz; - int32_t tx_atten; - bool update_tx_gain_via_alert; - uint32_t rx_fastlock_delay_ns; - uint32_t tx_fastlock_delay_ns; - bool trx_fastlock_pinctrl_en[2]; - enum ad9361_clkout ad9361_clkout_mode; - struct gain_control gain_ctrl; - struct rssi_control rssi_ctrl; - struct port_control port_ctrl; - struct ctrl_outs_control ctrl_outs_ctrl; - struct elna_control elna_ctrl; - struct auxadc_control auxadc_ctrl; - struct auxdac_control auxdac_ctrl; - struct gpo_control gpo_ctrl; - struct tx_monitor_control txmon_ctrl; - int32_t gpio_resetb; - int32_t gpio_sync; - int32_t gpio_cal_sw1; - int32_t gpio_cal_sw2; -}; - -struct ad9361_rf_phy { - enum dev_id dev_sel; - uint8_t id_no; - struct spi_device *spi; - struct gpio_device *gpio; - struct clk *clk_refin; - struct clk *clks[NUM_AD9361_CLKS]; - struct refclk_scale *ref_clk_scale[NUM_AD9361_CLKS]; - struct clk_onecell_data clk_data; - uint32_t (*ad9361_rfpll_ext_recalc_rate)(struct refclk_scale *clk_priv); - int32_t (*ad9361_rfpll_ext_round_rate)(struct refclk_scale *clk_priv, - uint32_t rate); - int32_t (*ad9361_rfpll_ext_set_rate)(struct refclk_scale *clk_priv, - uint32_t rate); - struct ad9361_phy_platform_data *pdata; - uint8_t prev_ensm_state; - uint8_t curr_ensm_state; - uint8_t cached_rx_rfpll_div; - uint8_t cached_tx_rfpll_div; - struct rx_gain_info rx_gain[RXGAIN_TBLS_END]; - enum rx_gain_table_name current_table; - bool ensm_pin_ctl_en; - bool auto_cal_en; - uint64_t last_tx_quad_cal_freq; - uint32_t last_tx_quad_cal_phase; - uint64_t current_tx_lo_freq; - uint64_t current_rx_lo_freq; - bool current_tx_use_tdd_table; - bool current_rx_use_tdd_table; - uint32_t flags; - uint32_t cal_threshold_freq; - uint32_t current_rx_bw_Hz; - uint32_t current_tx_bw_Hz; - uint32_t rxbbf_div; - uint32_t rate_governor; - bool bypass_rx_fir; - bool bypass_tx_fir; - bool rx_eq_2tx; - bool filt_valid; - uint32_t filt_rx_path_clks[NUM_RX_CLOCKS]; - uint32_t filt_tx_path_clks[NUM_TX_CLOCKS]; - uint32_t filt_rx_bw_Hz; - uint32_t filt_tx_bw_Hz; - uint8_t tx_fir_int; - uint8_t tx_fir_ntaps; - uint8_t rx_fir_dec; - uint8_t rx_fir_ntaps; - uint8_t agc_mode[2]; - bool rfdc_track_en; - bool bbdc_track_en; - bool quad_track_en; - bool txmon_tdd_en; - uint16_t auxdac1_value; - uint16_t auxdac2_value; - uint32_t tx1_atten_cached; - uint32_t tx2_atten_cached; - struct ad9361_fastlock fastlock; - struct axiadc_converter *adc_conv; - struct axiadc_state *adc_state; - int32_t bist_loopback_mode; - enum ad9361_bist_mode bist_prbs_mode; - enum ad9361_bist_mode bist_tone_mode; - uint32_t bist_tone_freq_Hz; - uint32_t bist_tone_level_dB; - uint32_t bist_tone_mask; - bool bbpll_initialized; -}; - -struct rf_rx_gain { - uint32_t ant; - int32_t gain_db; - uint32_t fgt_lmt_index; - uint32_t lmt_gain; - uint32_t lpf_gain; - uint32_t digital_gain; - uint32_t lna_index; - uint32_t tia_index; - uint32_t mixer_index; -}; - -struct rf_rssi { - uint32_t ant; - uint32_t symbol; - uint32_t preamble; - int32_t multiplier; - uint8_t duration; -}; - -int32_t ad9361_get_rx_gain(struct ad9361_rf_phy *phy, - uint32_t rx_id, - struct rf_rx_gain *rx_gain); -int32_t ad9361_spi_read(struct spi_device *spi, uint32_t reg); -int32_t ad9361_spi_write(struct spi_device *spi, uint32_t reg, uint32_t val); -void ad9361_get_bist_loopback(struct ad9361_rf_phy *phy, int32_t *mode); -int32_t ad9361_bist_loopback(struct ad9361_rf_phy *phy, int32_t mode); - -/****************************************************************************** - * From ad9361_api.h - ******************************************************************************/ - -typedef struct { - enum dev_id dev_sel; - uint8_t id_no; - uint32_t reference_clk_rate; - uint8_t two_rx_two_tx_mode_enable; - uint8_t one_rx_one_tx_mode_use_rx_num; - uint8_t one_rx_one_tx_mode_use_tx_num; - uint8_t frequency_division_duplex_mode_enable; - uint8_t frequency_division_duplex_independent_mode_enable; - uint8_t tdd_use_dual_synth_mode_enable; - uint8_t tdd_skip_vco_cal_enable; - uint32_t tx_fastlock_delay_ns; - uint32_t rx_fastlock_delay_ns; - uint8_t rx_fastlock_pincontrol_enable; - uint8_t tx_fastlock_pincontrol_enable; - uint8_t external_rx_lo_enable; - uint8_t external_tx_lo_enable; - uint8_t dc_offset_tracking_update_event_mask; - uint8_t dc_offset_attenuation_high_range; - uint8_t dc_offset_attenuation_low_range; - uint8_t dc_offset_count_high_range; - uint8_t dc_offset_count_low_range; - uint8_t split_gain_table_mode_enable; - uint32_t trx_synthesizer_target_fref_overwrite_hz; - uint8_t qec_tracking_slow_mode_enable; - uint8_t ensm_enable_pin_pulse_mode_enable; - uint8_t ensm_enable_txnrx_control_enable; - uint64_t rx_synthesizer_frequency_hz; - uint64_t tx_synthesizer_frequency_hz; - uint32_t rx_path_clock_frequencies[6]; - uint32_t tx_path_clock_frequencies[6]; - uint32_t rf_rx_bandwidth_hz; - uint32_t rf_tx_bandwidth_hz; - uint32_t rx_rf_port_input_select; - uint32_t tx_rf_port_input_select; - int32_t tx_attenuation_mdB; - uint8_t update_tx_gain_in_alert_enable; - uint8_t xo_disable_use_ext_refclk_enable; - uint32_t dcxo_coarse_and_fine_tune[2]; - uint32_t clk_output_mode_select; - uint8_t gc_rx1_mode; - uint8_t gc_rx2_mode; - uint8_t gc_adc_large_overload_thresh; - uint8_t gc_adc_ovr_sample_size; - uint8_t gc_adc_small_overload_thresh; - uint16_t gc_dec_pow_measurement_duration; - uint8_t gc_dig_gain_enable; - uint16_t gc_lmt_overload_high_thresh; - uint16_t gc_lmt_overload_low_thresh; - uint8_t gc_low_power_thresh; - uint8_t gc_max_dig_gain; - uint8_t mgc_dec_gain_step; - uint8_t mgc_inc_gain_step; - uint8_t mgc_rx1_ctrl_inp_enable; - uint8_t mgc_rx2_ctrl_inp_enable; - uint8_t mgc_split_table_ctrl_inp_gain_mode; - uint8_t agc_adc_large_overload_exceed_counter; - uint8_t agc_adc_large_overload_inc_steps; - uint8_t agc_adc_lmt_small_overload_prevent_gain_inc_enable; - uint8_t agc_adc_small_overload_exceed_counter; - uint8_t agc_dig_gain_step_size; - uint8_t agc_dig_saturation_exceed_counter; - uint32_t agc_gain_update_interval_us; - uint8_t agc_immed_gain_change_if_large_adc_overload_enable; - uint8_t agc_immed_gain_change_if_large_lmt_overload_enable; - uint8_t agc_inner_thresh_high; - uint8_t agc_inner_thresh_high_dec_steps; - uint8_t agc_inner_thresh_low; - uint8_t agc_inner_thresh_low_inc_steps; - uint8_t agc_lmt_overload_large_exceed_counter; - uint8_t agc_lmt_overload_large_inc_steps; - uint8_t agc_lmt_overload_small_exceed_counter; - uint8_t agc_outer_thresh_high; - uint8_t agc_outer_thresh_high_dec_steps; - uint8_t agc_outer_thresh_low; - uint8_t agc_outer_thresh_low_inc_steps; - uint32_t agc_attack_delay_extra_margin_us; - uint8_t agc_sync_for_gain_counter_enable; - uint32_t fagc_dec_pow_measuremnt_duration; - uint32_t fagc_state_wait_time_ns; - uint8_t fagc_allow_agc_gain_increase; - uint32_t fagc_lp_thresh_increment_time; - uint32_t fagc_lp_thresh_increment_steps; - uint8_t fagc_lock_level_lmt_gain_increase_en; - uint32_t fagc_lock_level_gain_increase_upper_limit; - uint32_t fagc_lpf_final_settling_steps; - uint32_t fagc_lmt_final_settling_steps; - uint32_t fagc_final_overrange_count; - uint8_t fagc_gain_increase_after_gain_lock_en; - uint32_t fagc_gain_index_type_after_exit_rx_mode; - uint8_t fagc_use_last_lock_level_for_set_gain_en; - uint8_t fagc_rst_gla_stronger_sig_thresh_exceeded_en; - uint32_t fagc_optimized_gain_offset; - uint32_t fagc_rst_gla_stronger_sig_thresh_above_ll; - uint8_t fagc_rst_gla_engergy_lost_sig_thresh_exceeded_en; - uint8_t fagc_rst_gla_engergy_lost_goto_optim_gain_en; - uint32_t fagc_rst_gla_engergy_lost_sig_thresh_below_ll; - uint32_t fagc_energy_lost_stronger_sig_gain_lock_exit_cnt; - uint8_t fagc_rst_gla_large_adc_overload_en; - uint8_t fagc_rst_gla_large_lmt_overload_en; - uint8_t fagc_rst_gla_en_agc_pulled_high_en; - uint32_t fagc_rst_gla_if_en_agc_pulled_high_mode; - uint32_t fagc_power_measurement_duration_in_state5; - uint32_t rssi_delay; - uint32_t rssi_duration; - uint8_t rssi_restart_mode; - uint8_t rssi_unit_is_rx_samples_enable; - uint32_t rssi_wait; - uint32_t aux_adc_decimation; - uint32_t aux_adc_rate; - uint8_t aux_dac_manual_mode_enable; - uint32_t aux_dac1_default_value_mV; - uint8_t aux_dac1_active_in_rx_enable; - uint8_t aux_dac1_active_in_tx_enable; - uint8_t aux_dac1_active_in_alert_enable; - uint32_t aux_dac1_rx_delay_us; - uint32_t aux_dac1_tx_delay_us; - uint32_t aux_dac2_default_value_mV; - uint8_t aux_dac2_active_in_rx_enable; - uint8_t aux_dac2_active_in_tx_enable; - uint8_t aux_dac2_active_in_alert_enable; - uint32_t aux_dac2_rx_delay_us; - uint32_t aux_dac2_tx_delay_us; - uint32_t temp_sense_decimation; - uint16_t temp_sense_measurement_interval_ms; - int8_t temp_sense_offset_signed; - uint8_t temp_sense_periodic_measurement_enable; - uint8_t ctrl_outs_enable_mask; - uint8_t ctrl_outs_index; - uint32_t elna_settling_delay_ns; - uint32_t elna_gain_mdB; - uint32_t elna_bypass_loss_mdB; - uint8_t elna_rx1_gpo0_control_enable; - uint8_t elna_rx2_gpo1_control_enable; - uint8_t elna_gaintable_all_index_enable; - uint8_t digital_interface_tune_skip_mode; - uint8_t digital_interface_tune_fir_disable; - uint8_t pp_tx_swap_enable; - uint8_t pp_rx_swap_enable; - uint8_t tx_channel_swap_enable; - uint8_t rx_channel_swap_enable; - uint8_t rx_frame_pulse_mode_enable; - uint8_t two_t_two_r_timing_enable; - uint8_t invert_data_bus_enable; - uint8_t invert_data_clk_enable; - uint8_t fdd_alt_word_order_enable; - uint8_t invert_rx_frame_enable; - uint8_t fdd_rx_rate_2tx_enable; - uint8_t swap_ports_enable; - uint8_t single_data_rate_enable; - uint8_t lvds_mode_enable; - uint8_t half_duplex_mode_enable; - uint8_t single_port_mode_enable; - uint8_t full_port_enable; - uint8_t full_duplex_swap_bits_enable; - uint32_t delay_rx_data; - uint32_t rx_data_clock_delay; - uint32_t rx_data_delay; - uint32_t tx_fb_clock_delay; - uint32_t tx_data_delay; - uint32_t lvds_bias_mV; - uint8_t lvds_rx_onchip_termination_enable; - uint8_t rx1rx2_phase_inversion_en; - uint8_t lvds_invert1_control; - uint8_t lvds_invert2_control; - uint8_t clk_out_drive; - uint8_t dataclk_drive; - uint8_t data_port_drive; - uint8_t clk_out_slew; - uint8_t dataclk_slew; - uint8_t data_port_slew; - uint8_t gpo0_inactive_state_high_enable; - uint8_t gpo1_inactive_state_high_enable; - uint8_t gpo2_inactive_state_high_enable; - uint8_t gpo3_inactive_state_high_enable; - uint8_t gpo0_slave_rx_enable; - uint8_t gpo0_slave_tx_enable; - uint8_t gpo1_slave_rx_enable; - uint8_t gpo1_slave_tx_enable; - uint8_t gpo2_slave_rx_enable; - uint8_t gpo2_slave_tx_enable; - uint8_t gpo3_slave_rx_enable; - uint8_t gpo3_slave_tx_enable; - uint8_t gpo0_rx_delay_us; - uint8_t gpo0_tx_delay_us; - uint8_t gpo1_rx_delay_us; - uint8_t gpo1_tx_delay_us; - uint8_t gpo2_rx_delay_us; - uint8_t gpo2_tx_delay_us; - uint8_t gpo3_rx_delay_us; - uint8_t gpo3_tx_delay_us; - uint32_t low_high_gain_threshold_mdB; - uint32_t low_gain_dB; - uint32_t high_gain_dB; - uint8_t tx_mon_track_en; - uint8_t one_shot_mode_en; - uint32_t tx_mon_delay; - uint32_t tx_mon_duration; - uint32_t tx1_mon_front_end_gain; - uint32_t tx2_mon_front_end_gain; - uint32_t tx1_mon_lo_cm; - uint32_t tx2_mon_lo_cm; - int32_t gpio_resetb; - int32_t gpio_sync; - int32_t gpio_cal_sw1; - int32_t gpio_cal_sw2; - uint32_t (*ad9361_rfpll_ext_recalc_rate)(struct refclk_scale *clk_priv); - int32_t (*ad9361_rfpll_ext_round_rate)(struct refclk_scale *clk_priv, - uint32_t rate); - int32_t (*ad9361_rfpll_ext_set_rate)(struct refclk_scale *clk_priv, - uint32_t rate); -} AD9361_InitParam; - -typedef struct { - uint32_t rx; /* 1, 2, 3(both) */ - int32_t rx_gain; /* -12, -6, 0, 6 */ - uint32_t rx_dec; /* 1, 2, 4 */ - int16_t rx_coef[128]; - uint8_t rx_coef_size; - uint32_t rx_path_clks[6]; - uint32_t rx_bandwidth; -} AD9361_RXFIRConfig; - -typedef struct { - uint32_t tx; /* 1, 2, 3(both) */ - int32_t tx_gain; /* -6, 0 */ - uint32_t tx_int; /* 1, 2, 4 */ - int16_t tx_coef[128]; - uint8_t tx_coef_size; - uint32_t tx_path_clks[6]; - uint32_t tx_bandwidth; -} AD9361_TXFIRConfig; - #define AD936X_A_BALANCED 0 #define AD936X_B_BALANCED 1 #define AD936X_C_BALANCED 2 @@ -789,70 +107,5 @@ typedef struct { #define AD936X_TXA 0 #define AD936X_TXB 1 -int32_t ad9361_init(struct ad9361_rf_phy **ad9361_phy, - AD9361_InitParam *init_param, - void *userdata); -int32_t ad9361_deinit(struct ad9361_rf_phy *phy); -int32_t ad9361_set_rx_rf_gain(struct ad9361_rf_phy *phy, - uint8_t ch, - int32_t gain_db); -int32_t ad9361_set_rx_rf_bandwidth(struct ad9361_rf_phy *phy, - uint32_t bandwidth_hz); -int32_t ad9361_get_rx_rf_bandwidth(struct ad9361_rf_phy *phy, - uint32_t *bandwidth_hz); -int32_t ad9361_set_rx_sampling_freq(struct ad9361_rf_phy *phy, - uint32_t sampling_freq_hz); -int32_t ad9361_get_rx_sampling_freq(struct ad9361_rf_phy *phy, - uint32_t *sampling_freq_hz); -int32_t ad9361_set_rx_lo_freq(struct ad9361_rf_phy *phy, uint64_t lo_freq_hz); -int32_t ad9361_get_rx_lo_freq(struct ad9361_rf_phy *phy, uint64_t *lo_freq_hz); -int32_t ad9361_get_rx_rssi(struct ad9361_rf_phy *phy, - uint8_t ch, - struct rf_rssi *rssi); -int32_t ad9361_set_rx_gain_control_mode(struct ad9361_rf_phy *phy, - uint8_t ch, - uint8_t gc_mode); -int32_t ad9361_get_rx_gain_control_mode(struct ad9361_rf_phy *phy, - uint8_t ch, - uint8_t *gc_mode); -int32_t ad9361_set_rx_fir_config(struct ad9361_rf_phy *phy, - AD9361_RXFIRConfig fir_cfg); -int32_t ad9361_set_rx_fir_en_dis(struct ad9361_rf_phy *phy, uint8_t en_dis); -int32_t ad9361_set_rx_rf_port_input(struct ad9361_rf_phy *phy, uint32_t mode); -int32_t ad9361_get_rx_rf_port_input(struct ad9361_rf_phy *phy, uint32_t *mode); -int32_t ad9361_set_tx_attenuation(struct ad9361_rf_phy *phy, - uint8_t ch, - uint32_t attenuation_mdb); -int32_t ad9361_get_tx_attenuation(struct ad9361_rf_phy *phy, - uint8_t ch, - uint32_t *attenuation_mdb); -int32_t ad9361_set_tx_rf_bandwidth(struct ad9361_rf_phy *phy, - uint32_t bandwidth_hz); -int32_t ad9361_get_tx_rf_bandwidth(struct ad9361_rf_phy *phy, - uint32_t *bandwidth_hz); -int32_t ad9361_set_tx_sampling_freq(struct ad9361_rf_phy *phy, - uint32_t sampling_freq_hz); -int32_t ad9361_get_tx_sampling_freq(struct ad9361_rf_phy *phy, - uint32_t *sampling_freq_hz); -int32_t ad9361_set_tx_lo_freq(struct ad9361_rf_phy *phy, uint64_t lo_freq_hz); -int32_t ad9361_get_tx_lo_freq(struct ad9361_rf_phy *phy, uint64_t *lo_freq_hz); -int32_t ad9361_set_tx_fir_config(struct ad9361_rf_phy *phy, - AD9361_TXFIRConfig fir_cfg); -int32_t ad9361_set_tx_fir_en_dis(struct ad9361_rf_phy *phy, uint8_t en_dis); -int32_t ad9361_get_tx_rssi(struct ad9361_rf_phy *phy, - uint8_t ch, - uint32_t *rssi_db_x_1000); -int32_t ad9361_set_tx_rf_port_output(struct ad9361_rf_phy *phy, uint32_t mode); -int32_t ad9361_get_tx_rf_port_output(struct ad9361_rf_phy *phy, uint32_t *mode); -int32_t ad9361_get_temp(struct ad9361_rf_phy *phy); -int32_t ad9361_rx_fastlock_store(struct ad9361_rf_phy *phy, uint32_t profile); -int32_t ad9361_rx_fastlock_save(struct ad9361_rf_phy *phy, - uint32_t profile, - uint8_t *values); -int32_t ad9361_tx_fastlock_store(struct ad9361_rf_phy *phy, uint32_t profile); -int32_t ad9361_tx_fastlock_save(struct ad9361_rf_phy *phy, - uint32_t profile, - uint8_t *values); -int32_t ad9361_set_no_ch_mode(struct ad9361_rf_phy *phy, uint8_t no_ch_mode); #endif // AD936X_H_ diff --git a/host/CMakeLists.txt b/host/CMakeLists.txt index f76cb32d..69aded1c 100644 --- a/host/CMakeLists.txt +++ b/host/CMakeLists.txt @@ -4,6 +4,7 @@ project(bladeRF C) ################################################################################ # Project configuration ################################################################################ +add_compile_definitions(NUAND_MODIFICATIONS=1) # All build output lands in this directory: set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/output) diff --git a/thirdparty/analogdevicesinc/no-OS_local/patches/0001-0bba46e-nuand-modifications.patch b/thirdparty/analogdevicesinc/no-OS_local/patches/0001-0bba46e-nuand-modifications.patch index 78ef06ee..bd81e2f5 100644 --- a/thirdparty/analogdevicesinc/no-OS_local/patches/0001-0bba46e-nuand-modifications.patch +++ b/thirdparty/analogdevicesinc/no-OS_local/patches/0001-0bba46e-nuand-modifications.patch @@ -492,6 +492,15 @@ index 77ffa44..ff5d7c5 100644 /* Set the Enable State Machine (ENSM) mode. */ int32_t ad9361_set_en_state_machine_mode (struct ad9361_rf_phy *phy, uint32_t mode); /* Get the Enable State Machine (ENSM) mode. */ +@@ -365,6 +381,8 @@ + int32_t ad9361_set_rx_rf_gain (struct ad9361_rf_phy *phy, uint8_t ch, int32_t gain_db); + /* Get current receive RF gain for the selected channel. */ + int32_t ad9361_get_rx_rf_gain (struct ad9361_rf_phy *phy, uint8_t ch, int32_t *gain_db); ++/* Get RFIC temperature */ ++int32_t ad9361_get_temp(struct ad9361_rf_phy *phy); + /* Set the RX RF bandwidth. */ + int32_t ad9361_set_rx_rf_bandwidth (struct ad9361_rf_phy *phy, uint32_t bandwidth_hz); + /* Get the RX RF bandwidth. */ diff --git a/ad9361/sw/ad9361_conv.c b/ad9361/sw/ad9361_conv.c index b20cb71..0491f91 100644 --- a/ad9361/sw/ad9361_conv.c From 85d8d4b22ba90ef30ed0043ca1b60f987e24485a Mon Sep 17 00:00:00 2001 From: Robert Ghilduta Date: Thu, 15 May 2025 02:53:01 -0700 Subject: [PATCH 210/238] hdl: add AD9361 and bladeRF 2.0 micro support headers to include path --- .../platforms/bladerf-micro/software/bladeRF_nios/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/hdl/fpga/platforms/bladerf-micro/software/bladeRF_nios/Makefile b/hdl/fpga/platforms/bladerf-micro/software/bladeRF_nios/Makefile index ac99213a..bbfc42a9 100644 --- a/hdl/fpga/platforms/bladerf-micro/software/bladeRF_nios/Makefile +++ b/hdl/fpga/platforms/bladerf-micro/software/bladeRF_nios/Makefile @@ -36,7 +36,9 @@ LIBAD936X_DIR := ../../../../fpga/ip/analogdevicesinc/no_OS INC_DIRS += $(LIBAD936X_BUILDDIR) \ ../$(LIBAD936X_DIR)/include \ - ../../../../../../host/common/include + ../../../../../../host/common/include \ + ../../../../../../host/build/common/thirdparty/ad936x/ \ + ../../../../../../thirdparty/analogdevicesinc/no-OS_local/platform_bladerf2/ LIB_DIRS += $(LIBAD936X_BUILDDIR) LDDEPS += $(LIBAD936X_BUILDDIR)/libad936x.a From 611e9cbfb3b890b67e933e338f4b1afb4b3bf8fc Mon Sep 17 00:00:00 2001 From: Robert Ghilduta Date: Tue, 20 May 2025 00:19:40 -0700 Subject: [PATCH 211/238] debian: update RBFs and FX3 images --- debian/bladerf-firmware-fx3.postinst | 4 ++-- debian/bladerf-fpga-hostedx115.postinst | 4 ++-- debian/bladerf-fpga-hostedx40.postinst | 4 ++-- debian/bladerf-fpga-hostedxa4.postinst | 4 ++-- debian/bladerf-fpga-hostedxa5.postinst | 4 ++-- debian/bladerf-fpga-hostedxa9.postinst | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/debian/bladerf-firmware-fx3.postinst b/debian/bladerf-firmware-fx3.postinst index 26f2bf49..9a204660 100644 --- a/debian/bladerf-firmware-fx3.postinst +++ b/debian/bladerf-firmware-fx3.postinst @@ -1,7 +1,7 @@ #!/bin/sh -e -UPSTREAM='https://www.nuand.com/fx3/bladeRF_fw_v2.4.0.img' -CHECKSUM='337f570f2e3fdb26abde0f0765196d92' +UPSTREAM='https://www.nuand.com/fx3/bladeRF_fw_v2.6.0.img' +CHECKSUM='7cc51b4eedebf54dd01be83745d1c59f' DATAFILE='/usr/share/Nuand/bladeRF/bladeRF_fw.img' DESCRIPT='firmware' MYNAMEIS='bladerf-firmware-fx3' diff --git a/debian/bladerf-fpga-hostedx115.postinst b/debian/bladerf-fpga-hostedx115.postinst index 447c7e5f..9f473b9b 100644 --- a/debian/bladerf-fpga-hostedx115.postinst +++ b/debian/bladerf-fpga-hostedx115.postinst @@ -1,7 +1,7 @@ #!/bin/sh -e -UPSTREAM='https://www.nuand.com/fpga/v0.14.0/hostedx115.rbf' -CHECKSUM='94ee5c7f68abe5c3392202246789fedd' +UPSTREAM='https://www.nuand.com/fpga/v0.16.0/hostedx115.rbf' +CHECKSUM='a7f25be8abdab3835e734599eb846ea4' DATAFILE='/usr/share/Nuand/bladeRF/hostedx115.rbf' DESCRIPT='FPGA bitstream' MYNAMEIS='bladerf-fpga-hostedx115' diff --git a/debian/bladerf-fpga-hostedx40.postinst b/debian/bladerf-fpga-hostedx40.postinst index 1512dbda..d11baad6 100644 --- a/debian/bladerf-fpga-hostedx40.postinst +++ b/debian/bladerf-fpga-hostedx40.postinst @@ -1,7 +1,7 @@ #!/bin/sh -e -UPSTREAM='https://www.nuand.com/fpga/v0.14.0/hostedx40.rbf' -CHECKSUM='25f402b3734c9aa0d37db9531f93335c' +UPSTREAM='https://www.nuand.com/fpga/v0.16.0/hostedx40.rbf' +CHECKSUM='f3d0e55aa4cae485df6d3c20004b7742' DATAFILE='/usr/share/Nuand/bladeRF/hostedx40.rbf' DESCRIPT='FPGA bitstream' MYNAMEIS='bladerf-fpga-hostedx40' diff --git a/debian/bladerf-fpga-hostedxa4.postinst b/debian/bladerf-fpga-hostedxa4.postinst index 94a42bd2..46845c2f 100644 --- a/debian/bladerf-fpga-hostedxa4.postinst +++ b/debian/bladerf-fpga-hostedxa4.postinst @@ -1,7 +1,7 @@ #!/bin/sh -e -UPSTREAM='https://www.nuand.com/fpga/v0.14.0/hostedxA4.rbf' -CHECKSUM='c24af70cf56b13123295125a22d5e921' +UPSTREAM='https://www.nuand.com/fpga/v0.16.0/hostedxA4.rbf' +CHECKSUM='276a74b748d699a9fc348babd34af19c' DATAFILE='/usr/share/Nuand/bladeRF/hostedxA4.rbf' DESCRIPT='FPGA bitstream' MYNAMEIS='bladerf-fpga-hostedxa4' diff --git a/debian/bladerf-fpga-hostedxa5.postinst b/debian/bladerf-fpga-hostedxa5.postinst index 86e1b43b..1ad7a1cd 100644 --- a/debian/bladerf-fpga-hostedxa5.postinst +++ b/debian/bladerf-fpga-hostedxa5.postinst @@ -1,7 +1,7 @@ #!/bin/sh -e -UPSTREAM='https://www.nuand.com/fpga/v0.14.0/hostedxA5.rbf' -CHECKSUM='ae6391cc3fd467bbb07868450612ce17' +UPSTREAM='https://www.nuand.com/fpga/v0.16.0/hostedxA5.rbf' +CHECKSUM='be0909dc27b48a08c54db33675130f27' DATAFILE='/usr/share/Nuand/bladeRF/hostedxA5.rbf' DESCRIPT='FPGA bitstream' MYNAMEIS='bladerf-fpga-hostedxa5' diff --git a/debian/bladerf-fpga-hostedxa9.postinst b/debian/bladerf-fpga-hostedxa9.postinst index 25100b42..50938bb6 100644 --- a/debian/bladerf-fpga-hostedxa9.postinst +++ b/debian/bladerf-fpga-hostedxa9.postinst @@ -1,7 +1,7 @@ #!/bin/sh -e -UPSTREAM='https://www.nuand.com/fpga/v0.14.0/hostedxA9.rbf' -CHECKSUM='7dfe8c32f260d43a14b9583375a1a6eb' +UPSTREAM='https://www.nuand.com/fpga/v0.16.0/hostedxA9.rbf' +CHECKSUM='1ab3bc8bdcf16a5f0ddf3fcdbaa6556b' DATAFILE='/usr/share/Nuand/bladeRF/hostedxA9.rbf' DESCRIPT='FPGA bitstream' MYNAMEIS='bladerf-fpga-hostedxa9' From 6185546fa9810f03a88fb01cab2d7dd39fa811c1 Mon Sep 17 00:00:00 2001 From: Robert Ghilduta Date: Tue, 20 May 2025 00:30:19 -0700 Subject: [PATCH 212/238] debian: update control Add support for libedit and curl --- debian/control | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/control b/debian/control index 75c93b81..fc13d01a 100644 --- a/debian/control +++ b/debian/control @@ -2,8 +2,8 @@ Source: bladerf Priority: optional Maintainer: Nuand LLC Build-Depends: debhelper (>=9), cmake (>= 2.8.5), pkg-config, doxygen, - libusb-1.0-0-dev (>= 1.0.12), libtecla-dev | libtecla1-dev, libncurses5-dev, - git, help2man, pandoc + libusb-1.0-0-dev (>= 1.0.12), libedit-dev, libncurses5-dev, + git, help2man, pandoc, libcurl4-openssl-dev Standards-Version: 4.1.4 Section: comm Homepage: https://www.nuand.com/bladeRF From 8f99003e3600315269529d655703423d12ff1b14 Mon Sep 17 00:00:00 2001 From: Robert Ghilduta Date: Tue, 20 May 2025 00:32:33 -0700 Subject: [PATCH 213/238] libbladeRF_test: update dependency --- .../libbladeRF_test/test_gain_compare/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/host/libraries/libbladeRF_test/test_gain_compare/requirements.txt b/host/libraries/libbladeRF_test/test_gain_compare/requirements.txt index 2cc080d4..9b8652a1 100644 --- a/host/libraries/libbladeRF_test/test_gain_compare/requirements.txt +++ b/host/libraries/libbladeRF_test/test_gain_compare/requirements.txt @@ -5,7 +5,7 @@ kiwisolver==1.4.5 matplotlib==3.8.0 numpy==1.26.0 packaging==23.2 -Pillow==10.0.1 +Pillow==11.2.1 pyparsing==3.1.1 python-dateutil==2.8.2 six==1.16.0 From 761f39e1d72dc4092ef3b4d464a9745409afcdf5 Mon Sep 17 00:00:00 2001 From: Robert Ghilduta Date: Tue, 20 May 2025 00:47:40 -0700 Subject: [PATCH 214/238] docker: update from yum to DNF --- host/misc/docker/centos-7.Dockerfile | 13 ++++++++----- host/misc/docker/fedora-latest.Dockerfile | 16 +++++++++------- 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/host/misc/docker/centos-7.Dockerfile b/host/misc/docker/centos-7.Dockerfile index 578bcd13..7b2ba3ec 100644 --- a/host/misc/docker/centos-7.Dockerfile +++ b/host/misc/docker/centos-7.Dockerfile @@ -24,14 +24,14 @@ FROM centos:7 LABEL maintainer="Nuand LLC " -LABEL version="0.0.3" +LABEL version="0.0.4" LABEL description="CI build environment for the bladeRF project" LABEL com.nuand.ci.distribution.name="CentOS" LABEL com.nuand.ci.distribution.version="7" # Install things -RUN yum groupinstall -y "Development Tools" \ - && yum install -y \ +RUN dnf install -y @development-tools \ + && dnf install -y \ clang \ cmake \ doxygen \ @@ -40,10 +40,13 @@ RUN yum groupinstall -y "Development Tools" \ libedit-devel \ libusbx \ libusbx-devel \ + ncurses-devel \ + curl-devel \ + awk \ pandoc \ wget \ - && yum clean all \ - && rm -rf /var/cache/yum \ + && dnf clean all \ + && rm -rf /var/cache/dnf \ && echo "/usr/local/lib" > /etc/ld.so.conf.d/locallib.conf \ && echo "/usr/local/lib64" >> /etc/ld.so.conf.d/locallib.conf diff --git a/host/misc/docker/fedora-latest.Dockerfile b/host/misc/docker/fedora-latest.Dockerfile index 9b00c988..9e0ac5c0 100644 --- a/host/misc/docker/fedora-latest.Dockerfile +++ b/host/misc/docker/fedora-latest.Dockerfile @@ -24,14 +24,14 @@ FROM fedora:latest LABEL maintainer="Nuand LLC " -LABEL version="0.0.3" +LABEL version="0.0.4" LABEL description="CI build environment for the bladeRF project" LABEL com.nuand.ci.distribution.name="Fedora" LABEL com.nuand.ci.distribution.version="latest" # Install things -RUN yum groupinstall -y "Development Tools" \ - && yum install -y \ +RUN dnf install -y @development-tools \ + && dnf install -y \ clang \ cmake \ doxygen \ @@ -41,10 +41,13 @@ RUN yum groupinstall -y "Development Tools" \ libedit-devel \ libusbx \ libusbx-devel \ + ncurses-devel \ + curl-devel \ + awk \ pandoc \ wget \ - && yum clean all \ - && rm -rf /var/cache/yum \ + && dnf clean all \ + && rm -rf /var/cache/dnf \ && echo "/usr/local/lib" > /etc/ld.so.conf.d/locallib.conf \ && echo "/usr/local/lib64" >> /etc/ld.so.conf.d/locallib.conf @@ -69,8 +72,7 @@ RUN cd /root/bladeRF/ \ -DCMAKE_BUILD_TYPE=${buildtype} \ -DENABLE_FX3_BUILD=OFF \ -DENABLE_HOST_BUILD=ON \ - -DTAGGED_RELEASE=${taggedrelease} \ - ../ \ + -DTAGGED_RELEASE=${taggedrelease} ../ \ && make -j${parallel} \ && make install \ && ldconfig From 2c1235245759306bf43564dbea596686770e109a Mon Sep 17 00:00:00 2001 From: Robert Ghilduta Date: Tue, 20 May 2025 00:59:47 -0700 Subject: [PATCH 215/238] docker: add Ubuntu distributions, update debian distro packages --- host/misc/docker/clang-scan.Dockerfile | 4 +- .../misc/docker/debian-jessie-i386.Dockerfile | 4 +- host/misc/docker/debian-jessie.Dockerfile | 4 +- .../docker/debian-stretch-i386.Dockerfile | 4 +- host/misc/docker/debian-stretch.Dockerfile | 4 +- .../misc/docker/ubuntu-bionic-i386.Dockerfile | 4 +- host/misc/docker/ubuntu-bionic.Dockerfile | 4 +- .../misc/docker/ubuntu-cosmic-i386.Dockerfile | 4 +- host/misc/docker/ubuntu-cosmic.Dockerfile | 4 +- host/misc/docker/ubuntu-disco-i386.Dockerfile | 4 +- host/misc/docker/ubuntu-disco.Dockerfile | 4 +- host/misc/docker/ubuntu-eoan-i386.Dockerfile | 4 +- host/misc/docker/ubuntu-eoan.Dockerfile | 4 +- host/misc/docker/ubuntu-focal-i386.Dockerfile | 4 +- host/misc/docker/ubuntu-focal.Dockerfile | 4 +- .../misc/docker/ubuntu-groovy-i386.Dockerfile | 76 +++++++++++++++++++ host/misc/docker/ubuntu-groovy.Dockerfile | 76 +++++++++++++++++++ .../docker/ubuntu-hirsute-i386.Dockerfile | 76 +++++++++++++++++++ host/misc/docker/ubuntu-hirsute.Dockerfile | 76 +++++++++++++++++++ .../misc/docker/ubuntu-impish-i386.Dockerfile | 76 +++++++++++++++++++ host/misc/docker/ubuntu-impish.Dockerfile | 76 +++++++++++++++++++ host/misc/docker/ubuntu-jammy-i386.Dockerfile | 76 +++++++++++++++++++ host/misc/docker/ubuntu-jammy.Dockerfile | 76 +++++++++++++++++++ .../docker/ubuntu-kinetic-i386.Dockerfile | 76 +++++++++++++++++++ host/misc/docker/ubuntu-kinetic.Dockerfile | 76 +++++++++++++++++++ .../misc/docker/ubuntu-latest-i386.Dockerfile | 76 +++++++++++++++++++ host/misc/docker/ubuntu-latest.Dockerfile | 76 +++++++++++++++++++ host/misc/docker/ubuntu-lunar-i386.Dockerfile | 76 +++++++++++++++++++ host/misc/docker/ubuntu-lunar.Dockerfile | 76 +++++++++++++++++++ .../misc/docker/ubuntu-mantic-i386.Dockerfile | 76 +++++++++++++++++++ host/misc/docker/ubuntu-mantic.Dockerfile | 76 +++++++++++++++++++ host/misc/docker/ubuntu-noble-i386.Dockerfile | 76 +++++++++++++++++++ host/misc/docker/ubuntu-noble.Dockerfile | 76 +++++++++++++++++++ .../misc/docker/ubuntu-trusty-i386.Dockerfile | 4 +- host/misc/docker/ubuntu-trusty.Dockerfile | 4 +- .../misc/docker/ubuntu-xenial-i386.Dockerfile | 4 +- host/misc/docker/ubuntu-xenial.Dockerfile | 4 +- 37 files changed, 1425 insertions(+), 19 deletions(-) create mode 100644 host/misc/docker/ubuntu-groovy-i386.Dockerfile create mode 100644 host/misc/docker/ubuntu-groovy.Dockerfile create mode 100644 host/misc/docker/ubuntu-hirsute-i386.Dockerfile create mode 100644 host/misc/docker/ubuntu-hirsute.Dockerfile create mode 100644 host/misc/docker/ubuntu-impish-i386.Dockerfile create mode 100644 host/misc/docker/ubuntu-impish.Dockerfile create mode 100644 host/misc/docker/ubuntu-jammy-i386.Dockerfile create mode 100644 host/misc/docker/ubuntu-jammy.Dockerfile create mode 100644 host/misc/docker/ubuntu-kinetic-i386.Dockerfile create mode 100644 host/misc/docker/ubuntu-kinetic.Dockerfile create mode 100644 host/misc/docker/ubuntu-latest-i386.Dockerfile create mode 100644 host/misc/docker/ubuntu-latest.Dockerfile create mode 100644 host/misc/docker/ubuntu-lunar-i386.Dockerfile create mode 100644 host/misc/docker/ubuntu-lunar.Dockerfile create mode 100644 host/misc/docker/ubuntu-mantic-i386.Dockerfile create mode 100644 host/misc/docker/ubuntu-mantic.Dockerfile create mode 100644 host/misc/docker/ubuntu-noble-i386.Dockerfile create mode 100644 host/misc/docker/ubuntu-noble.Dockerfile diff --git a/host/misc/docker/clang-scan.Dockerfile b/host/misc/docker/clang-scan.Dockerfile index d9dfd083..46948a56 100644 --- a/host/misc/docker/clang-scan.Dockerfile +++ b/host/misc/docker/clang-scan.Dockerfile @@ -39,7 +39,9 @@ RUN apt-get update \ doxygen \ git \ help2man \ - libtecla-dev \ + libcurl4-openssl-dev \ + libedit-dev \ + libncurses5-dev \ libusb-1.0-0-dev \ pandoc \ pkg-config \ diff --git a/host/misc/docker/debian-jessie-i386.Dockerfile b/host/misc/docker/debian-jessie-i386.Dockerfile index 39030a2b..77628e16 100644 --- a/host/misc/docker/debian-jessie-i386.Dockerfile +++ b/host/misc/docker/debian-jessie-i386.Dockerfile @@ -39,7 +39,9 @@ RUN apt-get update \ doxygen \ git \ help2man \ - libtecla-dev \ + libcurl4-openssl-dev \ + libedit-dev \ + libncurses5-dev \ libusb-1.0-0-dev \ pandoc \ pkg-config \ diff --git a/host/misc/docker/debian-jessie.Dockerfile b/host/misc/docker/debian-jessie.Dockerfile index d31914d1..a4f4a150 100644 --- a/host/misc/docker/debian-jessie.Dockerfile +++ b/host/misc/docker/debian-jessie.Dockerfile @@ -39,7 +39,9 @@ RUN apt-get update \ doxygen \ git \ help2man \ - libtecla-dev \ + libcurl4-openssl-dev \ + libedit-dev \ + libncurses5-dev \ libusb-1.0-0-dev \ pandoc \ pkg-config \ diff --git a/host/misc/docker/debian-stretch-i386.Dockerfile b/host/misc/docker/debian-stretch-i386.Dockerfile index 389220c7..b711f888 100644 --- a/host/misc/docker/debian-stretch-i386.Dockerfile +++ b/host/misc/docker/debian-stretch-i386.Dockerfile @@ -39,7 +39,9 @@ RUN apt-get update \ doxygen \ git \ help2man \ - libtecla-dev \ + libcurl4-openssl-dev \ + libedit-dev \ + libncurses5-dev \ libusb-1.0-0-dev \ pandoc \ pkg-config \ diff --git a/host/misc/docker/debian-stretch.Dockerfile b/host/misc/docker/debian-stretch.Dockerfile index 97007161..99b80161 100644 --- a/host/misc/docker/debian-stretch.Dockerfile +++ b/host/misc/docker/debian-stretch.Dockerfile @@ -39,7 +39,9 @@ RUN apt-get update \ doxygen \ git \ help2man \ - libtecla-dev \ + libcurl4-openssl-dev \ + libedit-dev \ + libncurses5-dev \ libusb-1.0-0-dev \ pandoc \ pkg-config \ diff --git a/host/misc/docker/ubuntu-bionic-i386.Dockerfile b/host/misc/docker/ubuntu-bionic-i386.Dockerfile index bd9cef91..fe418064 100644 --- a/host/misc/docker/ubuntu-bionic-i386.Dockerfile +++ b/host/misc/docker/ubuntu-bionic-i386.Dockerfile @@ -39,7 +39,9 @@ RUN apt-get update \ doxygen \ git \ help2man \ - libtecla-dev \ + libcurl4-openssl-dev \ + libedit-dev \ + libncurses5-dev \ libusb-1.0-0-dev \ pandoc \ pkg-config \ diff --git a/host/misc/docker/ubuntu-bionic.Dockerfile b/host/misc/docker/ubuntu-bionic.Dockerfile index 98959c31..58b30131 100644 --- a/host/misc/docker/ubuntu-bionic.Dockerfile +++ b/host/misc/docker/ubuntu-bionic.Dockerfile @@ -39,7 +39,9 @@ RUN apt-get update \ doxygen \ git \ help2man \ - libtecla-dev \ + libcurl4-openssl-dev \ + libedit-dev \ + libncurses5-dev \ libusb-1.0-0-dev \ pandoc \ pkg-config \ diff --git a/host/misc/docker/ubuntu-cosmic-i386.Dockerfile b/host/misc/docker/ubuntu-cosmic-i386.Dockerfile index a9ba599f..212584c3 100644 --- a/host/misc/docker/ubuntu-cosmic-i386.Dockerfile +++ b/host/misc/docker/ubuntu-cosmic-i386.Dockerfile @@ -39,7 +39,9 @@ RUN apt-get update \ doxygen \ git \ help2man \ - libtecla-dev \ + libcurl4-openssl-dev \ + libedit-dev \ + libncurses5-dev \ libusb-1.0-0-dev \ pandoc \ pkg-config \ diff --git a/host/misc/docker/ubuntu-cosmic.Dockerfile b/host/misc/docker/ubuntu-cosmic.Dockerfile index 9f4f3974..36f8ec2f 100644 --- a/host/misc/docker/ubuntu-cosmic.Dockerfile +++ b/host/misc/docker/ubuntu-cosmic.Dockerfile @@ -39,7 +39,9 @@ RUN apt-get update \ doxygen \ git \ help2man \ - libtecla-dev \ + libcurl4-openssl-dev \ + libedit-dev \ + libncurses5-dev \ libusb-1.0-0-dev \ pandoc \ pkg-config \ diff --git a/host/misc/docker/ubuntu-disco-i386.Dockerfile b/host/misc/docker/ubuntu-disco-i386.Dockerfile index c7aa8511..0b8e62a9 100644 --- a/host/misc/docker/ubuntu-disco-i386.Dockerfile +++ b/host/misc/docker/ubuntu-disco-i386.Dockerfile @@ -39,7 +39,9 @@ RUN apt-get update \ doxygen \ git \ help2man \ - libtecla-dev \ + libcurl4-openssl-dev \ + libedit-dev \ + libncurses5-dev \ libusb-1.0-0-dev \ pandoc \ pkg-config \ diff --git a/host/misc/docker/ubuntu-disco.Dockerfile b/host/misc/docker/ubuntu-disco.Dockerfile index c2507084..fdfb8871 100644 --- a/host/misc/docker/ubuntu-disco.Dockerfile +++ b/host/misc/docker/ubuntu-disco.Dockerfile @@ -39,7 +39,9 @@ RUN apt-get update \ doxygen \ git \ help2man \ - libtecla-dev \ + libcurl4-openssl-dev \ + libedit-dev \ + libncurses5-dev \ libusb-1.0-0-dev \ pandoc \ pkg-config \ diff --git a/host/misc/docker/ubuntu-eoan-i386.Dockerfile b/host/misc/docker/ubuntu-eoan-i386.Dockerfile index fdbd0489..10f01064 100644 --- a/host/misc/docker/ubuntu-eoan-i386.Dockerfile +++ b/host/misc/docker/ubuntu-eoan-i386.Dockerfile @@ -39,7 +39,9 @@ RUN apt-get update \ doxygen \ git \ help2man \ - libtecla-dev \ + libcurl4-openssl-dev \ + libedit-dev \ + libncurses5-dev \ libusb-1.0-0-dev \ pandoc \ pkg-config \ diff --git a/host/misc/docker/ubuntu-eoan.Dockerfile b/host/misc/docker/ubuntu-eoan.Dockerfile index eeb8ea85..40b6efe5 100644 --- a/host/misc/docker/ubuntu-eoan.Dockerfile +++ b/host/misc/docker/ubuntu-eoan.Dockerfile @@ -39,7 +39,9 @@ RUN apt-get update \ doxygen \ git \ help2man \ - libtecla-dev \ + libcurl4-openssl-dev \ + libedit-dev \ + libncurses5-dev \ libusb-1.0-0-dev \ pandoc \ pkg-config \ diff --git a/host/misc/docker/ubuntu-focal-i386.Dockerfile b/host/misc/docker/ubuntu-focal-i386.Dockerfile index ee00b17d..e5b3d018 100644 --- a/host/misc/docker/ubuntu-focal-i386.Dockerfile +++ b/host/misc/docker/ubuntu-focal-i386.Dockerfile @@ -39,7 +39,9 @@ RUN apt-get update \ doxygen \ git \ help2man \ - libtecla-dev \ + libcurl4-openssl-dev \ + libedit-dev \ + libncurses5-dev \ libusb-1.0-0-dev \ pandoc \ pkg-config \ diff --git a/host/misc/docker/ubuntu-focal.Dockerfile b/host/misc/docker/ubuntu-focal.Dockerfile index fba4d52f..78547b0f 100644 --- a/host/misc/docker/ubuntu-focal.Dockerfile +++ b/host/misc/docker/ubuntu-focal.Dockerfile @@ -39,7 +39,9 @@ RUN apt-get update \ doxygen \ git \ help2man \ - libtecla-dev \ + libcurl4-openssl-dev \ + libedit-dev \ + libncurses5-dev \ libusb-1.0-0-dev \ pandoc \ pkg-config \ diff --git a/host/misc/docker/ubuntu-groovy-i386.Dockerfile b/host/misc/docker/ubuntu-groovy-i386.Dockerfile new file mode 100644 index 00000000..9dfe0876 --- /dev/null +++ b/host/misc/docker/ubuntu-groovy-i386.Dockerfile @@ -0,0 +1,76 @@ +# This file is part of the bladeRF project: +# http://www.github.com/nuand/bladeRF +# +# Copyright (c) 2018-2025 Nuand LLC. +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +# THE SOFTWARE. + +FROM i386/ubuntu:groovy + +LABEL maintainer="Nuand LLC " +LABEL version="0.0.2" +LABEL description="CI build environment for the bladeRF project" +LABEL com.nuand.ci.distribution.name="Ubuntu" +LABEL com.nuand.ci.distribution.codename="groovy" +LABEL com.nuand.ci.distribution.version="20.10-i386" + +# Install things +RUN apt-get update \ + && apt-get install -y \ + build-essential \ + clang \ + cmake \ + doxygen \ + git \ + help2man \ + libcurl4-openssl-dev \ + libedit-dev \ + libncurses5-dev \ + libusb-1.0-0-dev \ + pandoc \ + pkg-config \ + usbutils \ + && apt-get clean + +# Copy in our build context +COPY --from=nuand/bladerf-buildenv:base /root/bladeRF /root/bladeRF +COPY --from=nuand/bladerf-buildenv:base /root/.config /root/.config +WORKDIR /root/bladeRF + +# Build arguments +ARG compiler=gcc +ARG buildtype=Release +ARG taggedrelease=NO +ARG parallel=1 + +# Do the build! +RUN cd /root/bladeRF/ \ + && mkdir -p build \ + && cd build \ + && cmake \ + -DBUILD_DOCUMENTATION=ON \ + -DCMAKE_C_COMPILER=${compiler} \ + -DCMAKE_BUILD_TYPE=${buildtype} \ + -DENABLE_FX3_BUILD=OFF \ + -DENABLE_HOST_BUILD=ON \ + -DTAGGED_RELEASE=${taggedrelease} \ + ../ \ + && make -j${parallel} \ + && make install \ + && ldconfig \ No newline at end of file diff --git a/host/misc/docker/ubuntu-groovy.Dockerfile b/host/misc/docker/ubuntu-groovy.Dockerfile new file mode 100644 index 00000000..11ef6111 --- /dev/null +++ b/host/misc/docker/ubuntu-groovy.Dockerfile @@ -0,0 +1,76 @@ +# This file is part of the bladeRF project: +# http://www.github.com/nuand/bladeRF +# +# Copyright (c) 2018-2025 Nuand LLC. +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +# THE SOFTWARE. + +FROM ubuntu:groovy + +LABEL maintainer="Nuand LLC " +LABEL version="0.0.2" +LABEL description="CI build environment for the bladeRF project" +LABEL com.nuand.ci.distribution.name="Ubuntu" +LABEL com.nuand.ci.distribution.codename="groovy" +LABEL com.nuand.ci.distribution.version="20.10" + +# Install things +RUN apt-get update \ + && apt-get install -y \ + build-essential \ + clang \ + cmake \ + doxygen \ + git \ + help2man \ + libcurl4-openssl-dev \ + libedit-dev \ + libncurses5-dev \ + libusb-1.0-0-dev \ + pandoc \ + pkg-config \ + usbutils \ + && apt-get clean + +# Copy in our build context +COPY --from=nuand/bladerf-buildenv:base /root/bladeRF /root/bladeRF +COPY --from=nuand/bladerf-buildenv:base /root/.config /root/.config +WORKDIR /root/bladeRF + +# Build arguments +ARG compiler=gcc +ARG buildtype=Release +ARG taggedrelease=NO +ARG parallel=1 + +# Do the build! +RUN cd /root/bladeRF/ \ + && mkdir -p build \ + && cd build \ + && cmake \ + -DBUILD_DOCUMENTATION=ON \ + -DCMAKE_C_COMPILER=${compiler} \ + -DCMAKE_BUILD_TYPE=${buildtype} \ + -DENABLE_FX3_BUILD=OFF \ + -DENABLE_HOST_BUILD=ON \ + -DTAGGED_RELEASE=${taggedrelease} \ + ../ \ + && make -j${parallel} \ + && make install \ + && ldconfig \ No newline at end of file diff --git a/host/misc/docker/ubuntu-hirsute-i386.Dockerfile b/host/misc/docker/ubuntu-hirsute-i386.Dockerfile new file mode 100644 index 00000000..fb16895a --- /dev/null +++ b/host/misc/docker/ubuntu-hirsute-i386.Dockerfile @@ -0,0 +1,76 @@ +# This file is part of the bladeRF project: +# http://www.github.com/nuand/bladeRF +# +# Copyright (c) 2018-2025 Nuand LLC. +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +# THE SOFTWARE. + +FROM i386/ubuntu:hirsute + +LABEL maintainer="Nuand LLC " +LABEL version="0.0.2" +LABEL description="CI build environment for the bladeRF project" +LABEL com.nuand.ci.distribution.name="Ubuntu" +LABEL com.nuand.ci.distribution.codename="hirsute" +LABEL com.nuand.ci.distribution.version="21.04-i386" + +# Install things +RUN apt-get update \ + && apt-get install -y \ + build-essential \ + clang \ + cmake \ + doxygen \ + git \ + help2man \ + libcurl4-openssl-dev \ + libedit-dev \ + libncurses5-dev \ + libusb-1.0-0-dev \ + pandoc \ + pkg-config \ + usbutils \ + && apt-get clean + +# Copy in our build context +COPY --from=nuand/bladerf-buildenv:base /root/bladeRF /root/bladeRF +COPY --from=nuand/bladerf-buildenv:base /root/.config /root/.config +WORKDIR /root/bladeRF + +# Build arguments +ARG compiler=gcc +ARG buildtype=Release +ARG taggedrelease=NO +ARG parallel=1 + +# Do the build! +RUN cd /root/bladeRF/ \ + && mkdir -p build \ + && cd build \ + && cmake \ + -DBUILD_DOCUMENTATION=ON \ + -DCMAKE_C_COMPILER=${compiler} \ + -DCMAKE_BUILD_TYPE=${buildtype} \ + -DENABLE_FX3_BUILD=OFF \ + -DENABLE_HOST_BUILD=ON \ + -DTAGGED_RELEASE=${taggedrelease} \ + ../ \ + && make -j${parallel} \ + && make install \ + && ldconfig \ No newline at end of file diff --git a/host/misc/docker/ubuntu-hirsute.Dockerfile b/host/misc/docker/ubuntu-hirsute.Dockerfile new file mode 100644 index 00000000..f25ed766 --- /dev/null +++ b/host/misc/docker/ubuntu-hirsute.Dockerfile @@ -0,0 +1,76 @@ +# This file is part of the bladeRF project: +# http://www.github.com/nuand/bladeRF +# +# Copyright (c) 2018-2025 Nuand LLC. +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +# THE SOFTWARE. + +FROM ubuntu:hirsute + +LABEL maintainer="Nuand LLC " +LABEL version="0.0.2" +LABEL description="CI build environment for the bladeRF project" +LABEL com.nuand.ci.distribution.name="Ubuntu" +LABEL com.nuand.ci.distribution.codename="hirsute" +LABEL com.nuand.ci.distribution.version="21.04" + +# Install things +RUN apt-get update \ + && apt-get install -y \ + build-essential \ + clang \ + cmake \ + doxygen \ + git \ + help2man \ + libcurl4-openssl-dev \ + libedit-dev \ + libncurses5-dev \ + libusb-1.0-0-dev \ + pandoc \ + pkg-config \ + usbutils \ + && apt-get clean + +# Copy in our build context +COPY --from=nuand/bladerf-buildenv:base /root/bladeRF /root/bladeRF +COPY --from=nuand/bladerf-buildenv:base /root/.config /root/.config +WORKDIR /root/bladeRF + +# Build arguments +ARG compiler=gcc +ARG buildtype=Release +ARG taggedrelease=NO +ARG parallel=1 + +# Do the build! +RUN cd /root/bladeRF/ \ + && mkdir -p build \ + && cd build \ + && cmake \ + -DBUILD_DOCUMENTATION=ON \ + -DCMAKE_C_COMPILER=${compiler} \ + -DCMAKE_BUILD_TYPE=${buildtype} \ + -DENABLE_FX3_BUILD=OFF \ + -DENABLE_HOST_BUILD=ON \ + -DTAGGED_RELEASE=${taggedrelease} \ + ../ \ + && make -j${parallel} \ + && make install \ + && ldconfig \ No newline at end of file diff --git a/host/misc/docker/ubuntu-impish-i386.Dockerfile b/host/misc/docker/ubuntu-impish-i386.Dockerfile new file mode 100644 index 00000000..b47d3eba --- /dev/null +++ b/host/misc/docker/ubuntu-impish-i386.Dockerfile @@ -0,0 +1,76 @@ +# This file is part of the bladeRF project: +# http://www.github.com/nuand/bladeRF +# +# Copyright (c) 2018-2025 Nuand LLC. +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +# THE SOFTWARE. + +FROM i386/ubuntu:impish + +LABEL maintainer="Nuand LLC " +LABEL version="0.0.2" +LABEL description="CI build environment for the bladeRF project" +LABEL com.nuand.ci.distribution.name="Ubuntu" +LABEL com.nuand.ci.distribution.codename="impish" +LABEL com.nuand.ci.distribution.version="21.10-i386" + +# Install things +RUN apt-get update \ + && apt-get install -y \ + build-essential \ + clang \ + cmake \ + doxygen \ + git \ + help2man \ + libcurl4-openssl-dev \ + libedit-dev \ + libncurses5-dev \ + libusb-1.0-0-dev \ + pandoc \ + pkg-config \ + usbutils \ + && apt-get clean + +# Copy in our build context +COPY --from=nuand/bladerf-buildenv:base /root/bladeRF /root/bladeRF +COPY --from=nuand/bladerf-buildenv:base /root/.config /root/.config +WORKDIR /root/bladeRF + +# Build arguments +ARG compiler=gcc +ARG buildtype=Release +ARG taggedrelease=NO +ARG parallel=1 + +# Do the build! +RUN cd /root/bladeRF/ \ + && mkdir -p build \ + && cd build \ + && cmake \ + -DBUILD_DOCUMENTATION=ON \ + -DCMAKE_C_COMPILER=${compiler} \ + -DCMAKE_BUILD_TYPE=${buildtype} \ + -DENABLE_FX3_BUILD=OFF \ + -DENABLE_HOST_BUILD=ON \ + -DTAGGED_RELEASE=${taggedrelease} \ + ../ \ + && make -j${parallel} \ + && make install \ + && ldconfig \ No newline at end of file diff --git a/host/misc/docker/ubuntu-impish.Dockerfile b/host/misc/docker/ubuntu-impish.Dockerfile new file mode 100644 index 00000000..25077ceb --- /dev/null +++ b/host/misc/docker/ubuntu-impish.Dockerfile @@ -0,0 +1,76 @@ +# This file is part of the bladeRF project: +# http://www.github.com/nuand/bladeRF +# +# Copyright (c) 2018-2025 Nuand LLC. +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +# THE SOFTWARE. + +FROM ubuntu:impish + +LABEL maintainer="Nuand LLC " +LABEL version="0.0.2" +LABEL description="CI build environment for the bladeRF project" +LABEL com.nuand.ci.distribution.name="Ubuntu" +LABEL com.nuand.ci.distribution.codename="impish" +LABEL com.nuand.ci.distribution.version="21.10" + +# Install things +RUN apt-get update \ + && apt-get install -y \ + build-essential \ + clang \ + cmake \ + doxygen \ + git \ + help2man \ + libcurl4-openssl-dev \ + libedit-dev \ + libncurses5-dev \ + libusb-1.0-0-dev \ + pandoc \ + pkg-config \ + usbutils \ + && apt-get clean + +# Copy in our build context +COPY --from=nuand/bladerf-buildenv:base /root/bladeRF /root/bladeRF +COPY --from=nuand/bladerf-buildenv:base /root/.config /root/.config +WORKDIR /root/bladeRF + +# Build arguments +ARG compiler=gcc +ARG buildtype=Release +ARG taggedrelease=NO +ARG parallel=1 + +# Do the build! +RUN cd /root/bladeRF/ \ + && mkdir -p build \ + && cd build \ + && cmake \ + -DBUILD_DOCUMENTATION=ON \ + -DCMAKE_C_COMPILER=${compiler} \ + -DCMAKE_BUILD_TYPE=${buildtype} \ + -DENABLE_FX3_BUILD=OFF \ + -DENABLE_HOST_BUILD=ON \ + -DTAGGED_RELEASE=${taggedrelease} \ + ../ \ + && make -j${parallel} \ + && make install \ + && ldconfig \ No newline at end of file diff --git a/host/misc/docker/ubuntu-jammy-i386.Dockerfile b/host/misc/docker/ubuntu-jammy-i386.Dockerfile new file mode 100644 index 00000000..1824f113 --- /dev/null +++ b/host/misc/docker/ubuntu-jammy-i386.Dockerfile @@ -0,0 +1,76 @@ +# This file is part of the bladeRF project: +# http://www.github.com/nuand/bladeRF +# +# Copyright (c) 2018-2025 Nuand LLC. +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +# THE SOFTWARE. + +FROM i386/ubuntu:jammy + +LABEL maintainer="Nuand LLC " +LABEL version="0.0.2" +LABEL description="CI build environment for the bladeRF project" +LABEL com.nuand.ci.distribution.name="Ubuntu" +LABEL com.nuand.ci.distribution.codename="jammy" +LABEL com.nuand.ci.distribution.version="22.04-i386" + +# Install things +RUN apt-get update \ + && apt-get install -y \ + build-essential \ + clang \ + cmake \ + doxygen \ + git \ + help2man \ + libcurl4-openssl-dev \ + libedit-dev \ + libncurses5-dev \ + libusb-1.0-0-dev \ + pandoc \ + pkg-config \ + usbutils \ + && apt-get clean + +# Copy in our build context +COPY --from=nuand/bladerf-buildenv:base /root/bladeRF /root/bladeRF +COPY --from=nuand/bladerf-buildenv:base /root/.config /root/.config +WORKDIR /root/bladeRF + +# Build arguments +ARG compiler=gcc +ARG buildtype=Release +ARG taggedrelease=NO +ARG parallel=1 + +# Do the build! +RUN cd /root/bladeRF/ \ + && mkdir -p build \ + && cd build \ + && cmake \ + -DBUILD_DOCUMENTATION=ON \ + -DCMAKE_C_COMPILER=${compiler} \ + -DCMAKE_BUILD_TYPE=${buildtype} \ + -DENABLE_FX3_BUILD=OFF \ + -DENABLE_HOST_BUILD=ON \ + -DTAGGED_RELEASE=${taggedrelease} \ + ../ \ + && make -j${parallel} \ + && make install \ + && ldconfig \ No newline at end of file diff --git a/host/misc/docker/ubuntu-jammy.Dockerfile b/host/misc/docker/ubuntu-jammy.Dockerfile new file mode 100644 index 00000000..b587dc88 --- /dev/null +++ b/host/misc/docker/ubuntu-jammy.Dockerfile @@ -0,0 +1,76 @@ +# This file is part of the bladeRF project: +# http://www.github.com/nuand/bladeRF +# +# Copyright (c) 2018-2025 Nuand LLC. +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +# THE SOFTWARE. + +FROM ubuntu:jammy + +LABEL maintainer="Nuand LLC " +LABEL version="0.0.2" +LABEL description="CI build environment for the bladeRF project" +LABEL com.nuand.ci.distribution.name="Ubuntu" +LABEL com.nuand.ci.distribution.codename="jammy" +LABEL com.nuand.ci.distribution.version="22.04" + +# Install things +RUN apt-get update \ + && apt-get install -y \ + build-essential \ + clang \ + cmake \ + doxygen \ + git \ + help2man \ + libcurl4-openssl-dev \ + libedit-dev \ + libncurses5-dev \ + libusb-1.0-0-dev \ + pandoc \ + pkg-config \ + usbutils \ + && apt-get clean + +# Copy in our build context +COPY --from=nuand/bladerf-buildenv:base /root/bladeRF /root/bladeRF +COPY --from=nuand/bladerf-buildenv:base /root/.config /root/.config +WORKDIR /root/bladeRF + +# Build arguments +ARG compiler=gcc +ARG buildtype=Release +ARG taggedrelease=NO +ARG parallel=1 + +# Do the build! +RUN cd /root/bladeRF/ \ + && mkdir -p build \ + && cd build \ + && cmake \ + -DBUILD_DOCUMENTATION=ON \ + -DCMAKE_C_COMPILER=${compiler} \ + -DCMAKE_BUILD_TYPE=${buildtype} \ + -DENABLE_FX3_BUILD=OFF \ + -DENABLE_HOST_BUILD=ON \ + -DTAGGED_RELEASE=${taggedrelease} \ + ../ \ + && make -j${parallel} \ + && make install \ + && ldconfig \ No newline at end of file diff --git a/host/misc/docker/ubuntu-kinetic-i386.Dockerfile b/host/misc/docker/ubuntu-kinetic-i386.Dockerfile new file mode 100644 index 00000000..a98a0be8 --- /dev/null +++ b/host/misc/docker/ubuntu-kinetic-i386.Dockerfile @@ -0,0 +1,76 @@ +# This file is part of the bladeRF project: +# http://www.github.com/nuand/bladeRF +# +# Copyright (c) 2018-2025 Nuand LLC. +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +# THE SOFTWARE. + +FROM i386/ubuntu:kinetic + +LABEL maintainer="Nuand LLC " +LABEL version="0.0.2" +LABEL description="CI build environment for the bladeRF project" +LABEL com.nuand.ci.distribution.name="Ubuntu" +LABEL com.nuand.ci.distribution.codename="kinetic" +LABEL com.nuand.ci.distribution.version="22.10-i386" + +# Install things +RUN apt-get update \ + && apt-get install -y \ + build-essential \ + clang \ + cmake \ + doxygen \ + git \ + help2man \ + libcurl4-openssl-dev \ + libedit-dev \ + libncurses5-dev \ + libusb-1.0-0-dev \ + pandoc \ + pkg-config \ + usbutils \ + && apt-get clean + +# Copy in our build context +COPY --from=nuand/bladerf-buildenv:base /root/bladeRF /root/bladeRF +COPY --from=nuand/bladerf-buildenv:base /root/.config /root/.config +WORKDIR /root/bladeRF + +# Build arguments +ARG compiler=gcc +ARG buildtype=Release +ARG taggedrelease=NO +ARG parallel=1 + +# Do the build! +RUN cd /root/bladeRF/ \ + && mkdir -p build \ + && cd build \ + && cmake \ + -DBUILD_DOCUMENTATION=ON \ + -DCMAKE_C_COMPILER=${compiler} \ + -DCMAKE_BUILD_TYPE=${buildtype} \ + -DENABLE_FX3_BUILD=OFF \ + -DENABLE_HOST_BUILD=ON \ + -DTAGGED_RELEASE=${taggedrelease} \ + ../ \ + && make -j${parallel} \ + && make install \ + && ldconfig \ No newline at end of file diff --git a/host/misc/docker/ubuntu-kinetic.Dockerfile b/host/misc/docker/ubuntu-kinetic.Dockerfile new file mode 100644 index 00000000..8697a052 --- /dev/null +++ b/host/misc/docker/ubuntu-kinetic.Dockerfile @@ -0,0 +1,76 @@ +# This file is part of the bladeRF project: +# http://www.github.com/nuand/bladeRF +# +# Copyright (c) 2018-2025 Nuand LLC. +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +# THE SOFTWARE. + +FROM ubuntu:kinetic + +LABEL maintainer="Nuand LLC " +LABEL version="0.0.2" +LABEL description="CI build environment for the bladeRF project" +LABEL com.nuand.ci.distribution.name="Ubuntu" +LABEL com.nuand.ci.distribution.codename="kinetic" +LABEL com.nuand.ci.distribution.version="22.10" + +# Install things +RUN apt-get update \ + && apt-get install -y \ + build-essential \ + clang \ + cmake \ + doxygen \ + git \ + help2man \ + libcurl4-openssl-dev \ + libedit-dev \ + libncurses5-dev \ + libusb-1.0-0-dev \ + pandoc \ + pkg-config \ + usbutils \ + && apt-get clean + +# Copy in our build context +COPY --from=nuand/bladerf-buildenv:base /root/bladeRF /root/bladeRF +COPY --from=nuand/bladerf-buildenv:base /root/.config /root/.config +WORKDIR /root/bladeRF + +# Build arguments +ARG compiler=gcc +ARG buildtype=Release +ARG taggedrelease=NO +ARG parallel=1 + +# Do the build! +RUN cd /root/bladeRF/ \ + && mkdir -p build \ + && cd build \ + && cmake \ + -DBUILD_DOCUMENTATION=ON \ + -DCMAKE_C_COMPILER=${compiler} \ + -DCMAKE_BUILD_TYPE=${buildtype} \ + -DENABLE_FX3_BUILD=OFF \ + -DENABLE_HOST_BUILD=ON \ + -DTAGGED_RELEASE=${taggedrelease} \ + ../ \ + && make -j${parallel} \ + && make install \ + && ldconfig \ No newline at end of file diff --git a/host/misc/docker/ubuntu-latest-i386.Dockerfile b/host/misc/docker/ubuntu-latest-i386.Dockerfile new file mode 100644 index 00000000..44024d95 --- /dev/null +++ b/host/misc/docker/ubuntu-latest-i386.Dockerfile @@ -0,0 +1,76 @@ +# This file is part of the bladeRF project: +# http://www.github.com/nuand/bladeRF +# +# Copyright (c) 2018-2025 Nuand LLC. +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +# THE SOFTWARE. + +FROM i386/ubuntu:latest + +LABEL maintainer="Nuand LLC " +LABEL version="0.0.2" +LABEL description="CI build environment for the bladeRF project" +LABEL com.nuand.ci.distribution.name="Ubuntu" +LABEL com.nuand.ci.distribution.codename="latest" +LABEL com.nuand.ci.distribution.version="latest-i386" + +# Install things +RUN apt-get update \ + && apt-get install -y \ + build-essential \ + clang \ + cmake \ + doxygen \ + git \ + help2man \ + libcurl4-openssl-dev \ + libedit-dev \ + libncurses5-dev \ + libusb-1.0-0-dev \ + pandoc \ + pkg-config \ + usbutils \ + && apt-get clean + +# Copy in our build context +COPY --from=nuand/bladerf-buildenv:base /root/bladeRF /root/bladeRF +COPY --from=nuand/bladerf-buildenv:base /root/.config /root/.config +WORKDIR /root/bladeRF + +# Build arguments +ARG compiler=gcc +ARG buildtype=Release +ARG taggedrelease=NO +ARG parallel=1 + +# Do the build! +RUN cd /root/bladeRF/ \ + && mkdir -p build \ + && cd build \ + && cmake \ + -DBUILD_DOCUMENTATION=ON \ + -DCMAKE_C_COMPILER=${compiler} \ + -DCMAKE_BUILD_TYPE=${buildtype} \ + -DENABLE_FX3_BUILD=OFF \ + -DENABLE_HOST_BUILD=ON \ + -DTAGGED_RELEASE=${taggedrelease} \ + ../ \ + && make -j${parallel} \ + && make install \ + && ldconfig \ No newline at end of file diff --git a/host/misc/docker/ubuntu-latest.Dockerfile b/host/misc/docker/ubuntu-latest.Dockerfile new file mode 100644 index 00000000..b1e4d9e7 --- /dev/null +++ b/host/misc/docker/ubuntu-latest.Dockerfile @@ -0,0 +1,76 @@ +# This file is part of the bladeRF project: +# http://www.github.com/nuand/bladeRF +# +# Copyright (c) 2018-2025 Nuand LLC. +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +# THE SOFTWARE. + +FROM ubuntu:latest + +LABEL maintainer="Nuand LLC " +LABEL version="0.0.2" +LABEL description="CI build environment for the bladeRF project" +LABEL com.nuand.ci.distribution.name="Ubuntu" +LABEL com.nuand.ci.distribution.codename="latest" +LABEL com.nuand.ci.distribution.version="latest" + +# Install things +RUN apt-get update \ + && apt-get install -y \ + build-essential \ + clang \ + cmake \ + doxygen \ + git \ + help2man \ + libcurl4-openssl-dev \ + libedit-dev \ + libncurses5-dev \ + libusb-1.0-0-dev \ + pandoc \ + pkg-config \ + usbutils \ + && apt-get clean + +# Copy in our build context +COPY --from=nuand/bladerf-buildenv:base /root/bladeRF /root/bladeRF +COPY --from=nuand/bladerf-buildenv:base /root/.config /root/.config +WORKDIR /root/bladeRF + +# Build arguments +ARG compiler=gcc +ARG buildtype=Release +ARG taggedrelease=NO +ARG parallel=1 + +# Do the build! +RUN cd /root/bladeRF/ \ + && mkdir -p build \ + && cd build \ + && cmake \ + -DBUILD_DOCUMENTATION=ON \ + -DCMAKE_C_COMPILER=${compiler} \ + -DCMAKE_BUILD_TYPE=${buildtype} \ + -DENABLE_FX3_BUILD=OFF \ + -DENABLE_HOST_BUILD=ON \ + -DTAGGED_RELEASE=${taggedrelease} \ + ../ \ + && make -j${parallel} \ + && make install \ + && ldconfig \ No newline at end of file diff --git a/host/misc/docker/ubuntu-lunar-i386.Dockerfile b/host/misc/docker/ubuntu-lunar-i386.Dockerfile new file mode 100644 index 00000000..27f0f7ea --- /dev/null +++ b/host/misc/docker/ubuntu-lunar-i386.Dockerfile @@ -0,0 +1,76 @@ +# This file is part of the bladeRF project: +# http://www.github.com/nuand/bladeRF +# +# Copyright (c) 2018-2025 Nuand LLC. +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +# THE SOFTWARE. + +FROM i386/ubuntu:lunar + +LABEL maintainer="Nuand LLC " +LABEL version="0.0.2" +LABEL description="CI build environment for the bladeRF project" +LABEL com.nuand.ci.distribution.name="Ubuntu" +LABEL com.nuand.ci.distribution.codename="lunar" +LABEL com.nuand.ci.distribution.version="23.04-i386" + +# Install things +RUN apt-get update \ + && apt-get install -y \ + build-essential \ + clang \ + cmake \ + doxygen \ + git \ + help2man \ + libcurl4-openssl-dev \ + libedit-dev \ + libncurses5-dev \ + libusb-1.0-0-dev \ + pandoc \ + pkg-config \ + usbutils \ + && apt-get clean + +# Copy in our build context +COPY --from=nuand/bladerf-buildenv:base /root/bladeRF /root/bladeRF +COPY --from=nuand/bladerf-buildenv:base /root/.config /root/.config +WORKDIR /root/bladeRF + +# Build arguments +ARG compiler=gcc +ARG buildtype=Release +ARG taggedrelease=NO +ARG parallel=1 + +# Do the build! +RUN cd /root/bladeRF/ \ + && mkdir -p build \ + && cd build \ + && cmake \ + -DBUILD_DOCUMENTATION=ON \ + -DCMAKE_C_COMPILER=${compiler} \ + -DCMAKE_BUILD_TYPE=${buildtype} \ + -DENABLE_FX3_BUILD=OFF \ + -DENABLE_HOST_BUILD=ON \ + -DTAGGED_RELEASE=${taggedrelease} \ + ../ \ + && make -j${parallel} \ + && make install \ + && ldconfig \ No newline at end of file diff --git a/host/misc/docker/ubuntu-lunar.Dockerfile b/host/misc/docker/ubuntu-lunar.Dockerfile new file mode 100644 index 00000000..042f787d --- /dev/null +++ b/host/misc/docker/ubuntu-lunar.Dockerfile @@ -0,0 +1,76 @@ +# This file is part of the bladeRF project: +# http://www.github.com/nuand/bladeRF +# +# Copyright (c) 2018-2025 Nuand LLC. +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +# THE SOFTWARE. + +FROM ubuntu:lunar + +LABEL maintainer="Nuand LLC " +LABEL version="0.0.2" +LABEL description="CI build environment for the bladeRF project" +LABEL com.nuand.ci.distribution.name="Ubuntu" +LABEL com.nuand.ci.distribution.codename="lunar" +LABEL com.nuand.ci.distribution.version="23.04" + +# Install things +RUN apt-get update \ + && apt-get install -y \ + build-essential \ + clang \ + cmake \ + doxygen \ + git \ + help2man \ + libcurl4-openssl-dev \ + libedit-dev \ + libncurses5-dev \ + libusb-1.0-0-dev \ + pandoc \ + pkg-config \ + usbutils \ + && apt-get clean + +# Copy in our build context +COPY --from=nuand/bladerf-buildenv:base /root/bladeRF /root/bladeRF +COPY --from=nuand/bladerf-buildenv:base /root/.config /root/.config +WORKDIR /root/bladeRF + +# Build arguments +ARG compiler=gcc +ARG buildtype=Release +ARG taggedrelease=NO +ARG parallel=1 + +# Do the build! +RUN cd /root/bladeRF/ \ + && mkdir -p build \ + && cd build \ + && cmake \ + -DBUILD_DOCUMENTATION=ON \ + -DCMAKE_C_COMPILER=${compiler} \ + -DCMAKE_BUILD_TYPE=${buildtype} \ + -DENABLE_FX3_BUILD=OFF \ + -DENABLE_HOST_BUILD=ON \ + -DTAGGED_RELEASE=${taggedrelease} \ + ../ \ + && make -j${parallel} \ + && make install \ + && ldconfig \ No newline at end of file diff --git a/host/misc/docker/ubuntu-mantic-i386.Dockerfile b/host/misc/docker/ubuntu-mantic-i386.Dockerfile new file mode 100644 index 00000000..12890378 --- /dev/null +++ b/host/misc/docker/ubuntu-mantic-i386.Dockerfile @@ -0,0 +1,76 @@ +# This file is part of the bladeRF project: +# http://www.github.com/nuand/bladeRF +# +# Copyright (c) 2018-2025 Nuand LLC. +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +# THE SOFTWARE. + +FROM i386/ubuntu:mantic + +LABEL maintainer="Nuand LLC " +LABEL version="0.0.2" +LABEL description="CI build environment for the bladeRF project" +LABEL com.nuand.ci.distribution.name="Ubuntu" +LABEL com.nuand.ci.distribution.codename="mantic" +LABEL com.nuand.ci.distribution.version="23.10-i386" + +# Install things +RUN apt-get update \ + && apt-get install -y \ + build-essential \ + clang \ + cmake \ + doxygen \ + git \ + help2man \ + libcurl4-openssl-dev \ + libedit-dev \ + libncurses5-dev \ + libusb-1.0-0-dev \ + pandoc \ + pkg-config \ + usbutils \ + && apt-get clean + +# Copy in our build context +COPY --from=nuand/bladerf-buildenv:base /root/bladeRF /root/bladeRF +COPY --from=nuand/bladerf-buildenv:base /root/.config /root/.config +WORKDIR /root/bladeRF + +# Build arguments +ARG compiler=gcc +ARG buildtype=Release +ARG taggedrelease=NO +ARG parallel=1 + +# Do the build! +RUN cd /root/bladeRF/ \ + && mkdir -p build \ + && cd build \ + && cmake \ + -DBUILD_DOCUMENTATION=ON \ + -DCMAKE_C_COMPILER=${compiler} \ + -DCMAKE_BUILD_TYPE=${buildtype} \ + -DENABLE_FX3_BUILD=OFF \ + -DENABLE_HOST_BUILD=ON \ + -DTAGGED_RELEASE=${taggedrelease} \ + ../ \ + && make -j${parallel} \ + && make install \ + && ldconfig \ No newline at end of file diff --git a/host/misc/docker/ubuntu-mantic.Dockerfile b/host/misc/docker/ubuntu-mantic.Dockerfile new file mode 100644 index 00000000..ae9924d0 --- /dev/null +++ b/host/misc/docker/ubuntu-mantic.Dockerfile @@ -0,0 +1,76 @@ +# This file is part of the bladeRF project: +# http://www.github.com/nuand/bladeRF +# +# Copyright (c) 2018-2025 Nuand LLC. +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +# THE SOFTWARE. + +FROM ubuntu:mantic + +LABEL maintainer="Nuand LLC " +LABEL version="0.0.2" +LABEL description="CI build environment for the bladeRF project" +LABEL com.nuand.ci.distribution.name="Ubuntu" +LABEL com.nuand.ci.distribution.codename="mantic" +LABEL com.nuand.ci.distribution.version="23.10" + +# Install things +RUN apt-get update \ + && apt-get install -y \ + build-essential \ + clang \ + cmake \ + doxygen \ + git \ + help2man \ + libcurl4-openssl-dev \ + libedit-dev \ + libncurses5-dev \ + libusb-1.0-0-dev \ + pandoc \ + pkg-config \ + usbutils \ + && apt-get clean + +# Copy in our build context +COPY --from=nuand/bladerf-buildenv:base /root/bladeRF /root/bladeRF +COPY --from=nuand/bladerf-buildenv:base /root/.config /root/.config +WORKDIR /root/bladeRF + +# Build arguments +ARG compiler=gcc +ARG buildtype=Release +ARG taggedrelease=NO +ARG parallel=1 + +# Do the build! +RUN cd /root/bladeRF/ \ + && mkdir -p build \ + && cd build \ + && cmake \ + -DBUILD_DOCUMENTATION=ON \ + -DCMAKE_C_COMPILER=${compiler} \ + -DCMAKE_BUILD_TYPE=${buildtype} \ + -DENABLE_FX3_BUILD=OFF \ + -DENABLE_HOST_BUILD=ON \ + -DTAGGED_RELEASE=${taggedrelease} \ + ../ \ + && make -j${parallel} \ + && make install \ + && ldconfig \ No newline at end of file diff --git a/host/misc/docker/ubuntu-noble-i386.Dockerfile b/host/misc/docker/ubuntu-noble-i386.Dockerfile new file mode 100644 index 00000000..034a307c --- /dev/null +++ b/host/misc/docker/ubuntu-noble-i386.Dockerfile @@ -0,0 +1,76 @@ +# This file is part of the bladeRF project: +# http://www.github.com/nuand/bladeRF +# +# Copyright (c) 2018-2025 Nuand LLC. +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +# THE SOFTWARE. + +FROM i386/ubuntu:noble + +LABEL maintainer="Nuand LLC " +LABEL version="0.0.2" +LABEL description="CI build environment for the bladeRF project" +LABEL com.nuand.ci.distribution.name="Ubuntu" +LABEL com.nuand.ci.distribution.codename="noble" +LABEL com.nuand.ci.distribution.version="24.04-i386" + +# Install things +RUN apt-get update \ + && apt-get install -y \ + build-essential \ + clang \ + cmake \ + doxygen \ + git \ + help2man \ + libcurl4-openssl-dev \ + libedit-dev \ + libncurses5-dev \ + libusb-1.0-0-dev \ + pandoc \ + pkg-config \ + usbutils \ + && apt-get clean + +# Copy in our build context +COPY --from=nuand/bladerf-buildenv:base /root/bladeRF /root/bladeRF +COPY --from=nuand/bladerf-buildenv:base /root/.config /root/.config +WORKDIR /root/bladeRF + +# Build arguments +ARG compiler=gcc +ARG buildtype=Release +ARG taggedrelease=NO +ARG parallel=1 + +# Do the build! +RUN cd /root/bladeRF/ \ + && mkdir -p build \ + && cd build \ + && cmake \ + -DBUILD_DOCUMENTATION=ON \ + -DCMAKE_C_COMPILER=${compiler} \ + -DCMAKE_BUILD_TYPE=${buildtype} \ + -DENABLE_FX3_BUILD=OFF \ + -DENABLE_HOST_BUILD=ON \ + -DTAGGED_RELEASE=${taggedrelease} \ + ../ \ + && make -j${parallel} \ + && make install \ + && ldconfig \ No newline at end of file diff --git a/host/misc/docker/ubuntu-noble.Dockerfile b/host/misc/docker/ubuntu-noble.Dockerfile new file mode 100644 index 00000000..c3184c35 --- /dev/null +++ b/host/misc/docker/ubuntu-noble.Dockerfile @@ -0,0 +1,76 @@ +# This file is part of the bladeRF project: +# http://www.github.com/nuand/bladeRF +# +# Copyright (c) 2018-2025 Nuand LLC. +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +# THE SOFTWARE. + +FROM ubuntu:noble + +LABEL maintainer="Nuand LLC " +LABEL version="0.0.2" +LABEL description="CI build environment for the bladeRF project" +LABEL com.nuand.ci.distribution.name="Ubuntu" +LABEL com.nuand.ci.distribution.codename="noble" +LABEL com.nuand.ci.distribution.version="24.04" + +# Install things +RUN apt-get update \ + && apt-get install -y \ + build-essential \ + clang \ + cmake \ + doxygen \ + git \ + help2man \ + libcurl4-openssl-dev \ + libedit-dev \ + libncurses5-dev \ + libusb-1.0-0-dev \ + pandoc \ + pkg-config \ + usbutils \ + && apt-get clean + +# Copy in our build context +COPY --from=nuand/bladerf-buildenv:base /root/bladeRF /root/bladeRF +COPY --from=nuand/bladerf-buildenv:base /root/.config /root/.config +WORKDIR /root/bladeRF + +# Build arguments +ARG compiler=gcc +ARG buildtype=Release +ARG taggedrelease=NO +ARG parallel=1 + +# Do the build! +RUN cd /root/bladeRF/ \ + && mkdir -p build \ + && cd build \ + && cmake \ + -DBUILD_DOCUMENTATION=ON \ + -DCMAKE_C_COMPILER=${compiler} \ + -DCMAKE_BUILD_TYPE=${buildtype} \ + -DENABLE_FX3_BUILD=OFF \ + -DENABLE_HOST_BUILD=ON \ + -DTAGGED_RELEASE=${taggedrelease} \ + ../ \ + && make -j${parallel} \ + && make install \ + && ldconfig diff --git a/host/misc/docker/ubuntu-trusty-i386.Dockerfile b/host/misc/docker/ubuntu-trusty-i386.Dockerfile index c739630a..08bdd649 100644 --- a/host/misc/docker/ubuntu-trusty-i386.Dockerfile +++ b/host/misc/docker/ubuntu-trusty-i386.Dockerfile @@ -39,7 +39,9 @@ RUN apt-get update \ doxygen \ git \ help2man \ - libtecla-dev \ + libcurl4-openssl-dev \ + libedit-dev \ + libncurses5-dev \ libusb-1.0-0-dev \ pandoc \ pkg-config \ diff --git a/host/misc/docker/ubuntu-trusty.Dockerfile b/host/misc/docker/ubuntu-trusty.Dockerfile index ac0d4d2f..ba8cdfde 100644 --- a/host/misc/docker/ubuntu-trusty.Dockerfile +++ b/host/misc/docker/ubuntu-trusty.Dockerfile @@ -39,7 +39,9 @@ RUN apt-get update \ doxygen \ git \ help2man \ - libtecla-dev \ + libcurl4-openssl-dev \ + libedit-dev \ + libncurses5-dev \ libusb-1.0-0-dev \ pandoc \ pkg-config \ diff --git a/host/misc/docker/ubuntu-xenial-i386.Dockerfile b/host/misc/docker/ubuntu-xenial-i386.Dockerfile index 60d2d940..951dbc76 100644 --- a/host/misc/docker/ubuntu-xenial-i386.Dockerfile +++ b/host/misc/docker/ubuntu-xenial-i386.Dockerfile @@ -39,7 +39,9 @@ RUN apt-get update \ doxygen \ git \ help2man \ - libtecla-dev \ + libcurl4-openssl-dev \ + libedit-dev \ + libncurses5-dev \ libusb-1.0-0-dev \ pandoc \ pkg-config \ diff --git a/host/misc/docker/ubuntu-xenial.Dockerfile b/host/misc/docker/ubuntu-xenial.Dockerfile index c0953b10..5019b3c9 100644 --- a/host/misc/docker/ubuntu-xenial.Dockerfile +++ b/host/misc/docker/ubuntu-xenial.Dockerfile @@ -39,7 +39,9 @@ RUN apt-get update \ doxygen \ git \ help2man \ - libtecla-dev \ + libcurl4-openssl-dev \ + libedit-dev \ + libncurses5-dev \ libusb-1.0-0-dev \ pandoc \ pkg-config \ From d77b35c7c5d318be9d00016e3680a25c2917f8f1 Mon Sep 17 00:00:00 2001 From: Robert Ghilduta Date: Tue, 20 May 2025 01:10:49 -0700 Subject: [PATCH 216/238] bladeRF-fsk: unitialized value fixup --- host/utilities/bladeRF-fsk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/host/utilities/bladeRF-fsk b/host/utilities/bladeRF-fsk index 43276ad2..4e3e092a 160000 --- a/host/utilities/bladeRF-fsk +++ b/host/utilities/bladeRF-fsk @@ -1 +1 @@ -Subproject commit 43276ad2b641287018ab502a5eea1d315e8a9ac7 +Subproject commit 4e3e092a5ab392bf6c2b104bd823e0f26990b1dc From 8f490c0a67a77b3b3044d8226489c5a8d7f6194f Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Fri, 16 May 2025 18:56:18 -0500 Subject: [PATCH 217/238] libbladeRF: fix max sample throughput warning for oversample feature --- host/libraries/libbladeRF/src/board/bladerf2/common.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/host/libraries/libbladeRF/src/board/bladerf2/common.c b/host/libraries/libbladeRF/src/board/bladerf2/common.c index 60a02699..37bd86ba 100644 --- a/host/libraries/libbladeRF/src/board/bladerf2/common.c +++ b/host/libraries/libbladeRF/src/board/bladerf2/common.c @@ -312,7 +312,8 @@ bool check_total_sample_rate(struct bladerf *dev) bladerf_sample_rate rate_accum = 0; size_t active_channels = 0; - const bladerf_sample_rate MAX_SAMPLE_THROUGHPUT = 80000000; + const bladerf_sample_rate MAX_SAMPLE_THROUGHPUT = + (dev->feature == BLADERF_FEATURE_OVERSAMPLE) ? 160000000 : 80000000; /* Read RFFE control register */ status = dev->backend->rffe_control_read(dev, ®); From 5be9df53a8b86d6386f017b762d777d7237c6a5a Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Fri, 16 May 2025 13:12:50 -0500 Subject: [PATCH 218/238] test: add libbladeRF oversample test --- host/libraries/libbladeRF_test/CMakeLists.txt | 1 + .../test_oversample/CMakeLists.txt | 20 ++++ .../test_oversample/src/main.c | 107 ++++++++++++++++++ 3 files changed, 128 insertions(+) create mode 100644 host/libraries/libbladeRF_test/test_oversample/CMakeLists.txt create mode 100644 host/libraries/libbladeRF_test/test_oversample/src/main.c diff --git a/host/libraries/libbladeRF_test/CMakeLists.txt b/host/libraries/libbladeRF_test/CMakeLists.txt index fc3d90e1..0121c424 100644 --- a/host/libraries/libbladeRF_test/CMakeLists.txt +++ b/host/libraries/libbladeRF_test/CMakeLists.txt @@ -10,6 +10,7 @@ add_subdirectory(test_ctrl) add_subdirectory(test_freq_hop) add_subdirectory(test_fw_check) add_subdirectory(test_open) +add_subdirectory(test_oversample) add_subdirectory(test_packet) add_subdirectory(test_parse) add_subdirectory(test_peripheral_timing) diff --git a/host/libraries/libbladeRF_test/test_oversample/CMakeLists.txt b/host/libraries/libbladeRF_test/test_oversample/CMakeLists.txt new file mode 100644 index 00000000..8253bdb0 --- /dev/null +++ b/host/libraries/libbladeRF_test/test_oversample/CMakeLists.txt @@ -0,0 +1,20 @@ +cmake_minimum_required(VERSION 3.10...3.27) +project(libbladeRF_test_oversample C) + +set(INCLUDES + ${libbladeRF_SOURCE_DIR}/include + ${CMAKE_CURRENT_SOURCE_DIR}/../common/include + ${CMAKE_CURRENT_SOURCE_DIR}/../../../common/include +) +if(MSVC) + set(INCLUDES ${INCLUDES} ${MSVC_C99_INCLUDES}) +endif() + +include_directories(${INCLUDES}) +add_executable(${PROJECT_NAME} src/main.c ../common/src/test_common.c) +target_link_libraries(${PROJECT_NAME} + libbladerf_shared + m +) + +add_test(NAME ${PROJECT_NAME} COMMAND ${PROJECT_NAME}) diff --git a/host/libraries/libbladeRF_test/test_oversample/src/main.c b/host/libraries/libbladeRF_test/test_oversample/src/main.c new file mode 100644 index 00000000..9ddd4b29 --- /dev/null +++ b/host/libraries/libbladeRF_test/test_oversample/src/main.c @@ -0,0 +1,107 @@ +#include +#include +#include +#include +#include // for getopt +#include +#include +#include "log.h" +#include "test_common.h" +#include "libbladeRF.h" + +#define ANSI_COLOR_RED "\x1b[31m" +#define ANSI_COLOR_GREEN "\x1b[32m" +#define ANSI_COLOR_YELLOW "\x1b[33m" +#define ANSI_COLOR_BLUE "\x1b[34m" +#define ANSI_COLOR_MAGENTA "\x1b[35m" +#define ANSI_COLOR_RESET "\x1b[0m" + +void print_usage(const char *prog_name) +{ + printf("Usage: %s [-h] [-v]\n", prog_name); + printf(" -h Show this help message\n"); + printf(" -v Enable verbose logging\n"); +} + +int main(int argc, char *argv[]) +{ + int status = 0; + struct bladerf *dev = NULL; + int opt; + bladerf_log_set_verbosity(BLADERF_LOG_LEVEL_INFO); + + bladerf_frequency freq = 915e6; + bladerf_sample_rate samp_rate = 122.88e6; + + const unsigned int num_buffers = 64; + const unsigned int buffer_size = 16384; + const unsigned int num_transfers = 16; + const unsigned int timeout_ms = 1000; + + struct timespec start, end; + + while ((opt = getopt(argc, argv, "hv")) != -1) { + switch (opt) { + case 'h': + print_usage(argv[0]); + return EXIT_SUCCESS; + case 'v': + bladerf_log_set_verbosity(BLADERF_LOG_LEVEL_VERBOSE); + break; + default: + print_usage(argv[0]); + return EXIT_FAILURE; + } + } + + const unsigned int num_samples = 1*samp_rate; // 1s of samples + int8_t *samples = (int8_t *)malloc(num_samples * sizeof(int16_t)); + double power = 0; + + CHECK_STATUS(bladerf_open(&dev, NULL)); + CHECK_STATUS(bladerf_set_frequency(dev, BLADERF_CHANNEL_RX(0), freq)); + printf("Frequency: %.2f MHz\n", freq / 1e6); + CHECK_STATUS(bladerf_enable_feature(dev, BLADERF_FEATURE_OVERSAMPLE, true)); + CHECK_STATUS(bladerf_sync_config(dev, BLADERF_RX_X1, BLADERF_FORMAT_SC8_Q7, + num_buffers, buffer_size, num_transfers, timeout_ms)); + + // Not only sets the sample rate, but also applies the oversample register configuration + CHECK_STATUS(bladerf_set_sample_rate(dev, BLADERF_CHANNEL_RX(0), samp_rate, NULL)); + printf("Sample Rate: %.2f MHz\n", samp_rate / 1e6); + + // Collect samples + CHECK_STATUS(bladerf_enable_module(dev, BLADERF_MODULE_RX, true)); + CHECK_STATUS(clock_gettime(CLOCK_MONOTONIC_RAW, &start)); + CHECK_STATUS(bladerf_sync_rx(dev, samples, num_samples, NULL, 0)); + CHECK_STATUS(clock_gettime(CLOCK_MONOTONIC_RAW, &end)); + CHECK_STATUS(bladerf_enable_module(dev, BLADERF_MODULE_RX, false)); + + const double expected_sync_time = (double)num_samples / samp_rate; + double time_taken = (end.tv_sec - start.tv_sec) + (end.tv_nsec - start.tv_nsec) * 1e-9; + printf("Time taken: %f seconds\n", time_taken); + printf("Expected sync time: %f seconds\n", expected_sync_time); + printf("%% error: %f\n", (time_taken - expected_sync_time) / expected_sync_time * 100); + + // Throw error if sync time is outside 5% error margin + double error_percent = (time_taken - expected_sync_time) / expected_sync_time * 100; + double tolerance = 1.0; // 1% tolerance + if (error_percent > tolerance || error_percent < -tolerance) { + printf(ANSI_COLOR_RED "Sync time error: %f%%" ANSI_COLOR_RESET "\n", error_percent); + status = 1; + } + + // Calculate power + for (size_t i = 0; i < num_samples/2; i++) { + double i_sample = (double)samples[2*i]; + double q_sample = (double)samples[2*i+1]; + power += i_sample * i_sample + q_sample * q_sample; + } + double avg_power = power / num_samples; + const double MAX_POWER = (INT8_MAX * INT8_MAX) + (INT8_MAX * INT8_MAX); + double dBFS = 20 * log10(avg_power/MAX_POWER); + printf(ANSI_COLOR_GREEN "Avg Power: %fdBFS" ANSI_COLOR_RESET "\n" , dBFS); + +error: + if (dev) bladerf_close(dev); + return (status == 0) ? EXIT_SUCCESS : EXIT_FAILURE; +} From d65b160cd999a805ed5d1faa83419ff76e0c51d7 Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Thu, 15 May 2025 12:39:32 -0500 Subject: [PATCH 219/238] hdl: parallel build terminates and cleans up if exit or failure occures --- hdl/quartus/build_bladerf.sh | 36 +++++++++++++++++++++++++++++++----- 1 file changed, 31 insertions(+), 5 deletions(-) diff --git a/hdl/quartus/build_bladerf.sh b/hdl/quartus/build_bladerf.sh index f6e7419e..b451235f 100755 --- a/hdl/quartus/build_bladerf.sh +++ b/hdl/quartus/build_bladerf.sh @@ -3,6 +3,23 @@ # Build a bladeRF fpga image ################################################################################ +cleanup() { + # Prevent recursive cleanup calls + trap '' INT TERM HUP + + echo "Cleaning up and terminating builds..." + if [ -n "${build_pids[*]}" ]; then + for pid in "${build_pids[@]}"; do + pkill -P $pid 2>/dev/null || true + done + fi + + exit 1 +} + +# Set up trap to catch Ctrl+C and other termination signals +trap cleanup INT TERM HUP + function print_boards() { echo "Supported boards:" for i in ../fpga/platforms/*/build/platform.conf ; do @@ -192,22 +209,31 @@ if [ "$build_hosted" == "1" ]; then mkdir -p build_logs build_pids=() + echo "Starting parallel builds for all hosted configurations..." for config in "bladeRF 40" "bladeRF 115" "bladeRF-micro A4" "bladeRF-micro A5" "bladeRF-micro A9"; do read -r board size <<< "$config" - echo "Starting build for $board hosted $size..." - $0 -b "$board" -r hosted -s "$size" > "build_logs/$board-hosted-$size.log" 2>&1 & + log_file="build_logs/$board-hosted-$size.log" + $0 -b "$board" -r hosted -s "$size" > "$log_file" 2>&1 & build_pids+=($!) + echo " → $board $size (PID: ${build_pids[-1]})" done - echo "Waiting for ${#build_pids[@]} hosted builds to complete..." + echo "Waiting for ${#build_pids[@]} builds to complete..." + # Monitor build processes + failed=0 for pid in "${build_pids[@]}"; do if ! wait "$pid"; then - echo "Build failed. Check build_logs directory for details." - exit 1 + failed=1 fi done + if [ "$failed" -ne 0 ]; then + echo "One or more builds failed. Check build_logs directory for details." + cleanup + exit 1 + fi + echo "All hosted builds completed successfully!" exit 0 fi From 918535854c6683beb30c581db2140f24bb7f8b12 Mon Sep 17 00:00:00 2001 From: Ben Morse Date: Tue, 20 May 2025 13:07:12 -0700 Subject: [PATCH 220/238] bladeRF-fsk: host: various errors and compiler warning fixes on multiple platforms --- hdl/quartus/build_bladerf.sh | 14 +++++++++++-- host/common/include/osx/clock_gettime.h | 2 ++ host/common/include/thread.h | 2 ++ host/common/include/windows/clock_gettime.h | 2 ++ .../doc/examples/freq_range_sweep.c | 7 ++++--- .../test_oversample/src/main.c | 20 +++++++++++++++++-- .../bladeRF-cli/src/input/editline.c | 4 ++++ host/utilities/bladeRF-fsk | 2 +- .../utilities/bladeRF-update/bladeRF-update.c | 14 +++++++++++-- 9 files changed, 57 insertions(+), 10 deletions(-) diff --git a/hdl/quartus/build_bladerf.sh b/hdl/quartus/build_bladerf.sh index b451235f..ebf9fb6f 100755 --- a/hdl/quartus/build_bladerf.sh +++ b/hdl/quartus/build_bladerf.sh @@ -62,6 +62,7 @@ function usage() echo " synth Synthesize the design" echo " full (default) Fit the design and create programming files" echo " -S Fitter seed setting (default: 1)" + echo " -D Output directory name won't contain the date" echo " -h Show this text" echo "" @@ -143,8 +144,9 @@ fi nios_rev="Tiny" flow="full" seed="1" +omit_date=false -while getopts ":cb:r:s:a:Hfn:l:S:h" opt; do +while getopts ":cb:r:s:a:fn:l:S:Dh" opt; do case $opt in c) clear_work_dir=1 @@ -188,6 +190,10 @@ while getopts ":cb:r:s:a:Hfn:l:S:h" opt; do seed=$OPTARG ;; + D) + omit_date=true + ;; + h) usage exit 0 @@ -501,7 +507,11 @@ if [[ ${flow} == "full" ]]; then BUILD_TIME_DONE=$(date -d"$BUILD_TIME_DONE" '+%F_%H.%M.%S') BUILD_NAME="$rev"x"$size" - BUILD_OUTPUT_DIR="$BUILD_NAME"-"$BUILD_TIME_DONE" + if [ "$omit_date" = false ]; then + BUILD_OUTPUT_DIR="$BUILD_NAME"-"$BUILD_TIME_DONE" + else + BUILD_OUTPUT_DIR="$BUILD_NAME" + fi RBF=$BUILD_NAME.rbf mkdir -p "$BUILD_OUTPUT_DIR" diff --git a/host/common/include/osx/clock_gettime.h b/host/common/include/osx/clock_gettime.h index f2ee0cea..db4a0094 100644 --- a/host/common/include/osx/clock_gettime.h +++ b/host/common/include/osx/clock_gettime.h @@ -39,7 +39,9 @@ extern "C" { #endif // __MACH__ typedef int clockid_t; +#ifndef CLOCK_REALTIME #define CLOCK_REALTIME 0 +#endif int clock_gettime(clockid_t clk_id, struct timespec *tp); diff --git a/host/common/include/thread.h b/host/common/include/thread.h index bc6f7d26..9f68ba6f 100644 --- a/host/common/include/thread.h +++ b/host/common/include/thread.h @@ -51,7 +51,9 @@ #include #include #include +#ifndef CLOCK_REALTIME #define CLOCK_REALTIME 0 +#endif #define THREAD pthread_t #define MUTEX pthread_mutex_t diff --git a/host/common/include/windows/clock_gettime.h b/host/common/include/windows/clock_gettime.h index f720a4db..d9ccd932 100644 --- a/host/common/include/windows/clock_gettime.h +++ b/host/common/include/windows/clock_gettime.h @@ -36,7 +36,9 @@ extern "C" { #endif typedef int clockid_t; +#ifndef CLOCK_REALTIME #define CLOCK_REALTIME 0 +#endif int clock_gettime(clockid_t clk_id, struct timespec *tp); diff --git a/host/libraries/libbladeRF/doc/examples/freq_range_sweep.c b/host/libraries/libbladeRF/doc/examples/freq_range_sweep.c index f969ce6f..5f4675d5 100644 --- a/host/libraries/libbladeRF/doc/examples/freq_range_sweep.c +++ b/host/libraries/libbladeRF/doc/examples/freq_range_sweep.c @@ -2,6 +2,7 @@ #include #include #include +#include #define FREQ_HOP_SPACING (bladerf_frequency)40e6 #define ITERATIONS 10000 @@ -78,16 +79,16 @@ int main(int argc, char *argv[]) for (i = 0; i < num_frequencies; i++) { status = bladerf_set_frequency(dev, ch, frequencies[i]); if (status != 0) { - fprintf(stderr, "Failed to set frequency to %lu Hz: %s\n", + fprintf(stderr, "Failed to set frequency to %" PRIu64 " Hz: %s\n", frequencies[i], bladerf_strerror(status)); return status; } bladerf_log_set_verbosity(BLADERF_LOG_LEVEL_VERBOSE); - printf("Frequency: %lu Hz\n", frequencies[i]); + printf("Frequency: %" PRIu64 " Hz\n", frequencies[i]); status = bladerf_get_quick_tune(dev, ch, &quick_tunes[i]); if (status != 0) { - fprintf(stderr, "Failed to get quick tune for %lu Hz: %s\n", + fprintf(stderr, "Failed to get quick tune for %" PRIu64 " Hz: %s\n", frequencies[i], bladerf_strerror(status)); return status; } diff --git a/host/libraries/libbladeRF_test/test_oversample/src/main.c b/host/libraries/libbladeRF_test/test_oversample/src/main.c index 9ddd4b29..34a7e73b 100644 --- a/host/libraries/libbladeRF_test/test_oversample/src/main.c +++ b/host/libraries/libbladeRF_test/test_oversample/src/main.c @@ -16,6 +16,22 @@ #define ANSI_COLOR_MAGENTA "\x1b[35m" #define ANSI_COLOR_RESET "\x1b[0m" +/* Use CLOCK_MONOTONIC as a portable alternative that works on FreeBSD and Linux */ +#ifndef CLOCK_MONOTONIC_PRECISE +#ifdef __FreeBSD__ +/* FreeBSD defines CLOCK_MONOTONIC_PRECISE for higher precision */ +#define TIMING_CLOCK CLOCK_MONOTONIC_PRECISE +#elif defined(CLOCK_MONOTONIC_RAW) && defined(__linux__) +/* Linux has CLOCK_MONOTONIC_RAW which is not affected by NTP adjustments */ +#define TIMING_CLOCK CLOCK_MONOTONIC_RAW +#else +/* Fallback to CLOCK_MONOTONIC which is POSIX standard */ +#define TIMING_CLOCK CLOCK_MONOTONIC +#endif +#else +#define TIMING_CLOCK CLOCK_MONOTONIC_PRECISE +#endif + void print_usage(const char *prog_name) { printf("Usage: %s [-h] [-v]\n", prog_name); @@ -71,9 +87,9 @@ int main(int argc, char *argv[]) // Collect samples CHECK_STATUS(bladerf_enable_module(dev, BLADERF_MODULE_RX, true)); - CHECK_STATUS(clock_gettime(CLOCK_MONOTONIC_RAW, &start)); + CHECK_STATUS(clock_gettime(TIMING_CLOCK, &start)); CHECK_STATUS(bladerf_sync_rx(dev, samples, num_samples, NULL, 0)); - CHECK_STATUS(clock_gettime(CLOCK_MONOTONIC_RAW, &end)); + CHECK_STATUS(clock_gettime(TIMING_CLOCK, &end)); CHECK_STATUS(bladerf_enable_module(dev, BLADERF_MODULE_RX, false)); const double expected_sync_time = (double)num_samples / samp_rate; diff --git a/host/utilities/bladeRF-cli/src/input/editline.c b/host/utilities/bladeRF-cli/src/input/editline.c index a832c45b..893bd83d 100644 --- a/host/utilities/bladeRF-cli/src/input/editline.c +++ b/host/utilities/bladeRF-cli/src/input/editline.c @@ -20,7 +20,11 @@ #include #include #include +#ifdef __FreeBSD__ +#include +#else #include +#endif #include #include #include "input_impl.h" diff --git a/host/utilities/bladeRF-fsk b/host/utilities/bladeRF-fsk index 4e3e092a..2bd65a3a 160000 --- a/host/utilities/bladeRF-fsk +++ b/host/utilities/bladeRF-fsk @@ -1 +1 @@ -Subproject commit 4e3e092a5ab392bf6c2b104bd823e0f26990b1dc +Subproject commit 2bd65a3a97b3ca0de275e96678b6372d1e7933d9 diff --git a/host/utilities/bladeRF-update/bladeRF-update.c b/host/utilities/bladeRF-update/bladeRF-update.c index efe77288..6d20a4e6 100644 --- a/host/utilities/bladeRF-update/bladeRF-update.c +++ b/host/utilities/bladeRF-update/bladeRF-update.c @@ -1130,7 +1130,12 @@ void update_rbf_files(const UpdateInfo* update_info) { if (file_exists(filepath)) { if (verify_file(filepath, latest_version->files[j].md5, latest_version->files[j].sha256, update_info)) { rbf_up_to_date = true; - strncpy(existing_rbf_path, filepath, MAX_PATH_LENGTH - 1); + size_t copy_len = strlen(filepath); + if (copy_len >= MAX_PATH_LENGTH) { + copy_len = MAX_PATH_LENGTH - 1; + } + memcpy(existing_rbf_path, filepath, copy_len); + existing_rbf_path[copy_len] = '\0'; printf("[+] Found up-to-date RBF at %s, skipping download\n", filepath); break; } @@ -1184,7 +1189,12 @@ void update_fw_files(const UpdateInfo* update_info) { if (file_exists(filepath)) { if (verify_file(filepath, update_info->firmware.md5, update_info->firmware.sha256, update_info)) { fw_up_to_date = true; - strncpy(existing_fw_path, filepath, MAX_PATH_LENGTH - 1); + size_t copy_len = strlen(filepath); + if (copy_len >= MAX_PATH_LENGTH) { + copy_len = MAX_PATH_LENGTH - 1; + } + memcpy(existing_fw_path, filepath, copy_len); + existing_fw_path[copy_len] = '\0'; printf("[+] Found up-to-date firmware at %s, skipping download\n", filepath); break; } From 6d61b4f86f9e09d66236eafd2f4545751d320cf4 Mon Sep 17 00:00:00 2001 From: Ben Morse Date: Tue, 20 May 2025 13:26:22 -0700 Subject: [PATCH 221/238] bladeRF-fsk: add cmake flag to build FSK project --- host/utilities/CMakeLists.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/host/utilities/CMakeLists.txt b/host/utilities/CMakeLists.txt index 2bfc2804..00abd4c6 100644 --- a/host/utilities/CMakeLists.txt +++ b/host/utilities/CMakeLists.txt @@ -1,5 +1,7 @@ cmake_minimum_required(VERSION 3.10...3.27) +option(BUILD_BLADERF_FSK "Build bladeRF FSK" ON) + if(NOT IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/bladeRF-fsk/c) message(STATUS "bladeRF-fsk: Attempting to initialize missing submodule") @@ -28,5 +30,7 @@ add_subdirectory(bladeRF-cli) add_subdirectory(bladeRF-update) if(NOT MSVC) add_subdirectory(bladeRF-power) - add_subdirectory(bladeRF-fsk/c) + if(BUILD_BLADERF_FSK) + add_subdirectory(bladeRF-fsk/c) + endif() endif() From 35ec3c657f325854448ad33d43a4595aa205c959 Mon Sep 17 00:00:00 2001 From: Robert Ghilduta Date: Sat, 7 Jun 2025 21:55:08 -0700 Subject: [PATCH 222/238] hdl: update libad936x build order --- .../platforms/bladerf-micro/software/bladeRF_nios/Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/hdl/fpga/platforms/bladerf-micro/software/bladeRF_nios/Makefile b/hdl/fpga/platforms/bladerf-micro/software/bladeRF_nios/Makefile index bbfc42a9..b25c273e 100644 --- a/hdl/fpga/platforms/bladerf-micro/software/bladeRF_nios/Makefile +++ b/hdl/fpga/platforms/bladerf-micro/software/bladeRF_nios/Makefile @@ -82,3 +82,6 @@ $(LIBAD936X_BUILDDIR)/Makefile: $(LIBAD936X_MAKE_DEP) $(LIBAD936X_BUILDDIR)/libad936x.a: $(LIBAD936X_BUILD_DEP) @$(ECHO) Info: Building libad936x @$(MAKE) --no-print-directory -C $(LIBAD936X_BUILDDIR) ad936x + +# Ensure libad936x is built before the application objects that depend on its headers +$(APP_OBJS): $(LIBAD936X_BUILDDIR)/libad936x.a From 09efbb40b8ede1d39f744c561db1eb24ea5a1a99 Mon Sep 17 00:00:00 2001 From: Robert Ghilduta Date: Sun, 8 Jun 2025 12:19:02 -0700 Subject: [PATCH 223/238] hdl: build_bladerf.sh fixups Add H optarg, and ensure submodules are initialized prior to synthesis --- hdl/quartus/build_bladerf.sh | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/hdl/quartus/build_bladerf.sh b/hdl/quartus/build_bladerf.sh index ebf9fb6f..09d52ff4 100755 --- a/hdl/quartus/build_bladerf.sh +++ b/hdl/quartus/build_bladerf.sh @@ -3,6 +3,24 @@ # Build a bladeRF fpga image ################################################################################ +# Ensure we're in the right directory and submodules are initialized +SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +PROJECT_ROOT="$(cd "$SCRIPT_DIR/../.." && pwd)" + +# Initialize and update submodules if needed +echo "Checking and initializing submodules..." +cd "$PROJECT_ROOT" +if [ -f .gitmodules ]; then + # Initialize submodules if not already initialized + git submodule init + + # Update submodules to ensure they're checked out + git submodule update + + echo "Submodules initialized and updated." +fi +cd "$SCRIPT_DIR" + cleanup() { # Prevent recursive cleanup calls trap '' INT TERM HUP @@ -146,7 +164,7 @@ flow="full" seed="1" omit_date=false -while getopts ":cb:r:s:a:fn:l:S:Dh" opt; do +while getopts ":cb:r:s:a:fn:l:S:DhH" opt; do case $opt in c) clear_work_dir=1 From a93191ae39e9d51d094688fa034882bc36621cb9 Mon Sep 17 00:00:00 2001 From: Ben Morse Date: Fri, 13 Jun 2025 15:24:43 -0700 Subject: [PATCH 224/238] bladeRF-fsk: bump - fix compiler error - update windows threading --- host/utilities/bladeRF-fsk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/host/utilities/bladeRF-fsk b/host/utilities/bladeRF-fsk index 2bd65a3a..16387541 160000 --- a/host/utilities/bladeRF-fsk +++ b/host/utilities/bladeRF-fsk @@ -1 +1 @@ -Subproject commit 2bd65a3a97b3ca0de275e96678b6372d1e7933d9 +Subproject commit 16387541dd97ddd34d7e648fc58bfdd7fed56b9f From 86c5063425b068fbc25a3fa46d5e0d302a530179 Mon Sep 17 00:00:00 2001 From: Ben Morse Date: Thu, 22 May 2025 14:17:23 -0700 Subject: [PATCH 225/238] host: Fixes for Windows - Changes around getopt/getopt_long - CLOCK_MONOTONIC fix - link fix --- .../test_oversample/CMakeLists.txt | 27 +++++++++++++++---- .../test_oversample/src/main.c | 20 +++++++++++++- 2 files changed, 41 insertions(+), 6 deletions(-) diff --git a/host/libraries/libbladeRF_test/test_oversample/CMakeLists.txt b/host/libraries/libbladeRF_test/test_oversample/CMakeLists.txt index 8253bdb0..8b9cf347 100644 --- a/host/libraries/libbladeRF_test/test_oversample/CMakeLists.txt +++ b/host/libraries/libbladeRF_test/test_oversample/CMakeLists.txt @@ -5,16 +5,33 @@ set(INCLUDES ${libbladeRF_SOURCE_DIR}/include ${CMAKE_CURRENT_SOURCE_DIR}/../common/include ${CMAKE_CURRENT_SOURCE_DIR}/../../../common/include + ${CMAKE_CURRENT_SOURCE_DIR}/../../../common/include/windows ) if(MSVC) set(INCLUDES ${INCLUDES} ${MSVC_C99_INCLUDES}) endif() -include_directories(${INCLUDES}) -add_executable(${PROJECT_NAME} src/main.c ../common/src/test_common.c) -target_link_libraries(${PROJECT_NAME} - libbladerf_shared - m +set(SRC + src/main.c + ../common/src/test_common.c ) +if(MSVC OR WIN32) + set(SRC ${SRC} + ${CMAKE_CURRENT_SOURCE_DIR}/../../../common/src/windows/getopt_long.c + ${CMAKE_CURRENT_SOURCE_DIR}/../../../common/src/windows/clock_gettime.c + ) +endif() + +include_directories(${INCLUDES}) +add_executable(${PROJECT_NAME} ${SRC}) +target_link_libraries(${PROJECT_NAME} + libbladerf_shared +) + +# Only link with the math library on non-Windows platforms +if(NOT WIN32 AND NOT MSVC) + target_link_libraries(${PROJECT_NAME} m) +endif() + add_test(NAME ${PROJECT_NAME} COMMAND ${PROJECT_NAME}) diff --git a/host/libraries/libbladeRF_test/test_oversample/src/main.c b/host/libraries/libbladeRF_test/test_oversample/src/main.c index 34a7e73b..9d4fcba0 100644 --- a/host/libraries/libbladeRF_test/test_oversample/src/main.c +++ b/host/libraries/libbladeRF_test/test_oversample/src/main.c @@ -2,7 +2,13 @@ #include #include #include +#include +#if !defined(_WIN32) #include // for getopt +#else +#include +#include +#endif #include #include #include "log.h" @@ -17,6 +23,10 @@ #define ANSI_COLOR_RESET "\x1b[0m" /* Use CLOCK_MONOTONIC as a portable alternative that works on FreeBSD and Linux */ +#if defined(_WIN32) +/* On Windows, only CLOCK_REALTIME is supported by our implementation */ +#define TIMING_CLOCK CLOCK_REALTIME +#else #ifndef CLOCK_MONOTONIC_PRECISE #ifdef __FreeBSD__ /* FreeBSD defines CLOCK_MONOTONIC_PRECISE for higher precision */ @@ -31,6 +41,7 @@ #else #define TIMING_CLOCK CLOCK_MONOTONIC_PRECISE #endif +#endif void print_usage(const char *prog_name) { @@ -44,6 +55,7 @@ int main(int argc, char *argv[]) int status = 0; struct bladerf *dev = NULL; int opt; + int opt_ind = 0; bladerf_log_set_verbosity(BLADERF_LOG_LEVEL_INFO); bladerf_frequency freq = 915e6; @@ -56,7 +68,13 @@ int main(int argc, char *argv[]) struct timespec start, end; - while ((opt = getopt(argc, argv, "hv")) != -1) { + struct option longopts[] = { + {"help", no_argument, 0, 'h'}, + {"verbose", no_argument, 0, 'v'}, + {0, 0, 0, 0} + }; + + while ((opt = getopt_long(argc, argv, "hv", longopts, &opt_ind)) != -1) { switch (opt) { case 'h': print_usage(argv[0]); From b2f9503fce2683c1e1273ab6c1d4621aff4d6d94 Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Wed, 4 Jun 2025 09:27:13 -0500 Subject: [PATCH 226/238] bladeRF-power: build: look for brew installed ncurses --- host/utilities/bladeRF-power/CMakeLists.txt | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/host/utilities/bladeRF-power/CMakeLists.txt b/host/utilities/bladeRF-power/CMakeLists.txt index f2b25c58..0a6ba1cf 100644 --- a/host/utilities/bladeRF-power/CMakeLists.txt +++ b/host/utilities/bladeRF-power/CMakeLists.txt @@ -3,6 +3,17 @@ project(bladeRF-power LANGUAGES C) set (CURSES_NEED_NCURSES TRUE) set (CURSES_NEED_WIDE TRUE) + +if(APPLE) + if(EXISTS "/opt/homebrew/opt/ncurses") + list(APPEND CMAKE_PREFIX_PATH "/opt/homebrew/opt/ncurses") + elseif(EXISTS "/usr/local/opt/ncurses") + list(APPEND CMAKE_PREFIX_PATH "/usr/local/opt/ncurses") + else() + message(WARNING "Homebrew ncurses not found. Install it if the build is failing: brew install ncurses") + endif() +endif() + find_package(Curses REQUIRED) include_directories( From ddc83606ff05492a8e3ce2f6493ac18cb85cfd77 Mon Sep 17 00:00:00 2001 From: Ben Morse Date: Sat, 7 Jun 2025 21:38:44 +0000 Subject: [PATCH 227/238] host: fix test_txrx_hwloop - fix duty cycle error for subsequent iterations in the test --- .../test_timestamps/src/test_txrx_hwloop.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/host/libraries/libbladeRF_test/test_timestamps/src/test_txrx_hwloop.c b/host/libraries/libbladeRF_test/test_timestamps/src/test_txrx_hwloop.c index f37b9116..c140bf83 100644 --- a/host/libraries/libbladeRF_test/test_timestamps/src/test_txrx_hwloop.c +++ b/host/libraries/libbladeRF_test/test_timestamps/src/test_txrx_hwloop.c @@ -269,6 +269,18 @@ int main(int argc, char *argv[]) { buf += 2 * to_send; } + // Wait for this burst to complete before scheduling the next one + if (status == 0 && i < (test.iterations - 1)) { + uint64_t burst_end_timestamp = meta.timestamp + test.burst_len; + int wait_status = wait_for_timestamp(dev_tx, BLADERF_MODULE_TX, + burst_end_timestamp, 1000); + if (wait_status != 0) { + fprintf(stderr, "Failed to wait for burst %u to complete: %s\n", + (unsigned int)i, bladerf_strerror(wait_status)); + status = first_error(status, wait_status); + } + } + meta.timestamp += test.period; } From e55e12b8895954aa1ae2b3459fccb7a7874e500a Mon Sep 17 00:00:00 2001 From: Ben Morse Date: Fri, 23 May 2025 02:13:25 -0700 Subject: [PATCH 228/238] docker: fix all docker images - delete many dockers, the rest are fully functioning - build.bash returns with correct exit code - base moves to alpine - add rocky in place of centos - some platforms require a cmake compile to get modern cmake - add i686 build to existing i386 --- host/misc/docker/_base.Dockerfile | 7 +- host/misc/docker/archlinux.Dockerfile | 4 +- host/misc/docker/build.bash | 16 +++- host/misc/docker/centos-7.Dockerfile | 78 ------------------- host/misc/docker/clang-scan.Dockerfile | 12 +-- .../docker/debian-stretch-i386.Dockerfile | 76 ------------------ host/misc/docker/fedora-latest.Dockerfile | 1 + host/misc/docker/freshen.bash | 0 ...ie.Dockerfile => mageia-latest.Dockerfile} | 37 +++++---- host/misc/docker/opensuse-latest.Dockerfile | 5 +- host/misc/docker/parallel.bash | 0 ...sie-i386.Dockerfile => rocky-8.Dockerfile} | 32 ++++---- ...-stretch.Dockerfile => rocky-9.Dockerfile} | 33 ++++---- host/misc/docker/test.bash | 0 .../misc/docker/ubuntu-bionic-i386.Dockerfile | 76 ------------------ host/misc/docker/ubuntu-bionic.Dockerfile | 76 ------------------ .../misc/docker/ubuntu-cosmic-i386.Dockerfile | 76 ------------------ host/misc/docker/ubuntu-cosmic.Dockerfile | 76 ------------------ host/misc/docker/ubuntu-disco-i386.Dockerfile | 76 ------------------ host/misc/docker/ubuntu-disco.Dockerfile | 76 ------------------ host/misc/docker/ubuntu-eoan-i386.Dockerfile | 76 ------------------ host/misc/docker/ubuntu-eoan.Dockerfile | 76 ------------------ host/misc/docker/ubuntu-focal-i386.Dockerfile | 76 ------------------ host/misc/docker/ubuntu-focal.Dockerfile | 2 + .../misc/docker/ubuntu-groovy-i386.Dockerfile | 76 ------------------ host/misc/docker/ubuntu-groovy.Dockerfile | 76 ------------------ .../docker/ubuntu-hirsute-i386.Dockerfile | 76 ------------------ host/misc/docker/ubuntu-hirsute.Dockerfile | 76 ------------------ .../misc/docker/ubuntu-impish-i386.Dockerfile | 76 ------------------ host/misc/docker/ubuntu-impish.Dockerfile | 76 ------------------ host/misc/docker/ubuntu-jammy-i386.Dockerfile | 76 ------------------ host/misc/docker/ubuntu-jammy.Dockerfile | 3 + .../docker/ubuntu-kinetic-i386.Dockerfile | 76 ------------------ host/misc/docker/ubuntu-kinetic.Dockerfile | 76 ------------------ .../misc/docker/ubuntu-latest-i386.Dockerfile | 40 +++++++++- host/misc/docker/ubuntu-latest.Dockerfile | 3 + host/misc/docker/ubuntu-lunar-i386.Dockerfile | 76 ------------------ host/misc/docker/ubuntu-lunar.Dockerfile | 76 ------------------ .../misc/docker/ubuntu-mantic-i386.Dockerfile | 76 ------------------ host/misc/docker/ubuntu-mantic.Dockerfile | 76 ------------------ host/misc/docker/ubuntu-noble-i386.Dockerfile | 76 ------------------ host/misc/docker/ubuntu-noble.Dockerfile | 3 + .../misc/docker/ubuntu-trusty-i386.Dockerfile | 76 ------------------ host/misc/docker/ubuntu-trusty.Dockerfile | 76 ------------------ .../misc/docker/ubuntu-xenial-i386.Dockerfile | 76 ------------------ host/misc/docker/ubuntu-xenial.Dockerfile | 23 +++++- host/utilities/bladeRF-power/src/main.c | 4 +- 47 files changed, 158 insertions(+), 2197 deletions(-) mode change 100644 => 100755 host/misc/docker/build.bash delete mode 100644 host/misc/docker/centos-7.Dockerfile delete mode 100644 host/misc/docker/debian-stretch-i386.Dockerfile mode change 100644 => 100755 host/misc/docker/freshen.bash rename host/misc/docker/{debian-jessie.Dockerfile => mageia-latest.Dockerfile} (74%) mode change 100644 => 100755 host/misc/docker/parallel.bash rename host/misc/docker/{debian-jessie-i386.Dockerfile => rocky-8.Dockerfile} (80%) rename host/misc/docker/{debian-stretch.Dockerfile => rocky-9.Dockerfile} (79%) mode change 100644 => 100755 host/misc/docker/test.bash delete mode 100644 host/misc/docker/ubuntu-bionic-i386.Dockerfile delete mode 100644 host/misc/docker/ubuntu-bionic.Dockerfile delete mode 100644 host/misc/docker/ubuntu-cosmic-i386.Dockerfile delete mode 100644 host/misc/docker/ubuntu-cosmic.Dockerfile delete mode 100644 host/misc/docker/ubuntu-disco-i386.Dockerfile delete mode 100644 host/misc/docker/ubuntu-disco.Dockerfile delete mode 100644 host/misc/docker/ubuntu-eoan-i386.Dockerfile delete mode 100644 host/misc/docker/ubuntu-eoan.Dockerfile delete mode 100644 host/misc/docker/ubuntu-focal-i386.Dockerfile delete mode 100644 host/misc/docker/ubuntu-groovy-i386.Dockerfile delete mode 100644 host/misc/docker/ubuntu-groovy.Dockerfile delete mode 100644 host/misc/docker/ubuntu-hirsute-i386.Dockerfile delete mode 100644 host/misc/docker/ubuntu-hirsute.Dockerfile delete mode 100644 host/misc/docker/ubuntu-impish-i386.Dockerfile delete mode 100644 host/misc/docker/ubuntu-impish.Dockerfile delete mode 100644 host/misc/docker/ubuntu-jammy-i386.Dockerfile delete mode 100644 host/misc/docker/ubuntu-kinetic-i386.Dockerfile delete mode 100644 host/misc/docker/ubuntu-kinetic.Dockerfile delete mode 100644 host/misc/docker/ubuntu-lunar-i386.Dockerfile delete mode 100644 host/misc/docker/ubuntu-lunar.Dockerfile delete mode 100644 host/misc/docker/ubuntu-mantic-i386.Dockerfile delete mode 100644 host/misc/docker/ubuntu-mantic.Dockerfile delete mode 100644 host/misc/docker/ubuntu-noble-i386.Dockerfile delete mode 100644 host/misc/docker/ubuntu-trusty-i386.Dockerfile delete mode 100644 host/misc/docker/ubuntu-trusty.Dockerfile delete mode 100644 host/misc/docker/ubuntu-xenial-i386.Dockerfile diff --git a/host/misc/docker/_base.Dockerfile b/host/misc/docker/_base.Dockerfile index c1b91f93..f6544118 100644 --- a/host/misc/docker/_base.Dockerfile +++ b/host/misc/docker/_base.Dockerfile @@ -23,14 +23,11 @@ # This image is a cleaned version of the current working directory. # It is used to speed up the copy/clean process for later builds. -FROM ubuntu AS first +FROM alpine AS first LABEL maintainer="Nuand LLC " -RUN apt-get update \ - && apt-get install -y \ - git \ - && apt-get clean +RUN apk add --no-cache git COPY . /root/bladeRF ENV work="/root/bladeRF/hdl/quartus/work" diff --git a/host/misc/docker/archlinux.Dockerfile b/host/misc/docker/archlinux.Dockerfile index c769763f..89651bf3 100644 --- a/host/misc/docker/archlinux.Dockerfile +++ b/host/misc/docker/archlinux.Dockerfile @@ -1,7 +1,7 @@ # This file is part of the bladeRF project: # http://www.github.com/nuand/bladeRF # -# Copyright (c) 2018 Nuand LLC. +# Copyright (c) 2025 Nuand LLC. # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -21,7 +21,7 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -FROM archlinux/base +FROM archlinux:latest LABEL maintainer="Nuand LLC " LABEL version="0.0.2" diff --git a/host/misc/docker/build.bash b/host/misc/docker/build.bash old mode 100644 new mode 100755 index 056152eb..6c7fb545 --- a/host/misc/docker/build.bash +++ b/host/misc/docker/build.bash @@ -38,8 +38,12 @@ make_jobs_clangscan=4 # assuming the script is 3 levels down (host/misc/docker) dfdir=$(dirname "${0}") +dfdir=$(cd "${dfdir}" && pwd) # Convert to absolute path basedir=${dfdir}/../../.. +# Always cd to the root. This script is a lot more reliable when we do this +cd $basedir + # globals success="" failure="" @@ -171,18 +175,28 @@ main () { echo "RESULT:SUCCESS:${success}" echo "RESULT:FAILED:${failure}" - [ -n "${failure}" ] && exit 1 + # this if structure is important, script was exiting 1 when it should be passing. bad version: [ -n "${failure}" ] && exit 1 + if [ -n "${failure}" ]; then + exit 1 + fi } if [ $# -gt 0 ]; then # We have an argument, so just build those images... + base_only=true for rootname in "$*"; do if [ "${rootname}" == "_base" ]; then do_base continue fi rels="${rels} ${rootname}" + base_only=false done + + # If we only processed _base targets, exit successfully + if [ "$base_only" = true ] && [ -z "${rels}" ]; then + exit 0 + fi else # No argument, so build everything cd ${basedir} diff --git a/host/misc/docker/centos-7.Dockerfile b/host/misc/docker/centos-7.Dockerfile deleted file mode 100644 index 7b2ba3ec..00000000 --- a/host/misc/docker/centos-7.Dockerfile +++ /dev/null @@ -1,78 +0,0 @@ -# This file is part of the bladeRF project: -# http://www.github.com/nuand/bladeRF -# -# Copyright (c) 2018 Nuand LLC. -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -FROM centos:7 - -LABEL maintainer="Nuand LLC " -LABEL version="0.0.4" -LABEL description="CI build environment for the bladeRF project" -LABEL com.nuand.ci.distribution.name="CentOS" -LABEL com.nuand.ci.distribution.version="7" - -# Install things -RUN dnf install -y @development-tools \ - && dnf install -y \ - clang \ - cmake \ - doxygen \ - help2man \ - libedit \ - libedit-devel \ - libusbx \ - libusbx-devel \ - ncurses-devel \ - curl-devel \ - awk \ - pandoc \ - wget \ - && dnf clean all \ - && rm -rf /var/cache/dnf \ - && echo "/usr/local/lib" > /etc/ld.so.conf.d/locallib.conf \ - && echo "/usr/local/lib64" >> /etc/ld.so.conf.d/locallib.conf - -# Copy in our build context -COPY --from=nuand/bladerf-buildenv:base /root/bladeRF /root/bladeRF -COPY --from=nuand/bladerf-buildenv:base /root/.config /root/.config -WORKDIR /root/bladeRF - -# Build arguments -ARG compiler=gcc -ARG buildtype=Release -ARG taggedrelease=NO -ARG parallel=1 - -# Do the build! -RUN cd /root/bladeRF/ \ - && mkdir -p build \ - && cd build \ - && cmake \ - -DBUILD_DOCUMENTATION=ON \ - -DCMAKE_C_COMPILER=${compiler} \ - -DCMAKE_BUILD_TYPE=${buildtype} \ - -DENABLE_FX3_BUILD=OFF \ - -DENABLE_HOST_BUILD=ON \ - -DTAGGED_RELEASE=${taggedrelease} \ - ../ \ - && make -j${parallel} \ - && make install \ - && ldconfig diff --git a/host/misc/docker/clang-scan.Dockerfile b/host/misc/docker/clang-scan.Dockerfile index 46948a56..2fbb554f 100644 --- a/host/misc/docker/clang-scan.Dockerfile +++ b/host/misc/docker/clang-scan.Dockerfile @@ -1,7 +1,7 @@ # This file is part of the bladeRF project: # http://www.github.com/nuand/bladeRF # -# Copyright (c) 2018 Nuand LLC. +# Copyright (c) 2025 Nuand LLC. # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -21,14 +21,14 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -FROM ubuntu:bionic +FROM ubuntu:noble LABEL maintainer="Nuand LLC " LABEL version="0.0.2" LABEL description="CI build environment for the bladeRF project" LABEL com.nuand.ci.distribution.name="Ubuntu" -LABEL com.nuand.ci.distribution.codename="bionic" -LABEL com.nuand.ci.distribution.version="18.04" +LABEL com.nuand.ci.distribution.codename="noble" +LABEL com.nuand.ci.distribution.version="24.04" # Install things RUN apt-get update \ @@ -60,5 +60,5 @@ ARG parallel=1 RUN cd /root/bladeRF/host \ && mkdir -p build \ && cd build \ - && cmake -DBUILD_DOCUMENTATION=ON -DCMAKE_C_COMPILER=/usr/share/clang/scan-build-6.0/libexec/ccc-analyzer ../ \ - && /usr/share/clang/scan-build-6.0/bin/scan-build -analyze-headers -maxloop 100 -o ./report make -j${parallel} + && scan-build cmake -DBUILD_DOCUMENTATION=ON ../ \ + && scan-build -analyze-headers -maxloop 100 -o ./report make -j${parallel} diff --git a/host/misc/docker/debian-stretch-i386.Dockerfile b/host/misc/docker/debian-stretch-i386.Dockerfile deleted file mode 100644 index b711f888..00000000 --- a/host/misc/docker/debian-stretch-i386.Dockerfile +++ /dev/null @@ -1,76 +0,0 @@ -# This file is part of the bladeRF project: -# http://www.github.com/nuand/bladeRF -# -# Copyright (c) 2018 Nuand LLC. -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -FROM i386/debian:stretch - -LABEL maintainer="Nuand LLC " -LABEL version="0.0.2" -LABEL description="CI build environment for the bladeRF project" -LABEL com.nuand.ci.distribution.name="Debian" -LABEL com.nuand.ci.distribution.codename="stretch-i386" -LABEL com.nuand.ci.distribution.version="9" - -# Install things -RUN apt-get update \ - && apt-get install -y \ - build-essential \ - clang \ - cmake \ - doxygen \ - git \ - help2man \ - libcurl4-openssl-dev \ - libedit-dev \ - libncurses5-dev \ - libusb-1.0-0-dev \ - pandoc \ - pkg-config \ - usbutils \ - && apt-get clean - -# Copy in our build context -COPY --from=nuand/bladerf-buildenv:base /root/bladeRF /root/bladeRF -COPY --from=nuand/bladerf-buildenv:base /root/.config /root/.config -WORKDIR /root/bladeRF - -# Build arguments -ARG compiler=gcc -ARG buildtype=Release -ARG taggedrelease=NO -ARG parallel=1 - -# Do the build! -RUN cd /root/bladeRF/ \ - && mkdir -p build \ - && cd build \ - && cmake \ - -DBUILD_DOCUMENTATION=ON \ - -DCMAKE_C_COMPILER=${compiler} \ - -DCMAKE_BUILD_TYPE=${buildtype} \ - -DENABLE_FX3_BUILD=OFF \ - -DENABLE_HOST_BUILD=ON \ - -DTAGGED_RELEASE=${taggedrelease} \ - ../ \ - && make -j${parallel} \ - && make install \ - && ldconfig diff --git a/host/misc/docker/fedora-latest.Dockerfile b/host/misc/docker/fedora-latest.Dockerfile index 9e0ac5c0..35af359e 100644 --- a/host/misc/docker/fedora-latest.Dockerfile +++ b/host/misc/docker/fedora-latest.Dockerfile @@ -72,6 +72,7 @@ RUN cd /root/bladeRF/ \ -DCMAKE_BUILD_TYPE=${buildtype} \ -DENABLE_FX3_BUILD=OFF \ -DENABLE_HOST_BUILD=ON \ + -DTEST_REGRESSION=ON \ -DTAGGED_RELEASE=${taggedrelease} ../ \ && make -j${parallel} \ && make install \ diff --git a/host/misc/docker/freshen.bash b/host/misc/docker/freshen.bash old mode 100644 new mode 100755 diff --git a/host/misc/docker/debian-jessie.Dockerfile b/host/misc/docker/mageia-latest.Dockerfile similarity index 74% rename from host/misc/docker/debian-jessie.Dockerfile rename to host/misc/docker/mageia-latest.Dockerfile index a4f4a150..c9d1e81e 100644 --- a/host/misc/docker/debian-jessie.Dockerfile +++ b/host/misc/docker/mageia-latest.Dockerfile @@ -1,7 +1,7 @@ # This file is part of the bladeRF project: # http://www.github.com/nuand/bladeRF # -# Copyright (c) 2018 Nuand LLC. +# Copyright (c) 2025 Nuand LLC. # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -21,32 +21,32 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -FROM debian:jessie +FROM mageia:latest LABEL maintainer="Nuand LLC " LABEL version="0.0.2" LABEL description="CI build environment for the bladeRF project" -LABEL com.nuand.ci.distribution.name="Debian" -LABEL com.nuand.ci.distribution.codename="jessie" -LABEL com.nuand.ci.distribution.version="8" +LABEL com.nuand.ci.distribution.name="Mageia Linux" -# Install things -RUN apt-get update \ - && apt-get install -y \ - build-essential \ +# Install development tools and required packages using urpmi (Mageia's package manager) +RUN urpmi.update -a \ + && urpmi --auto \ + task-c-devel \ + task-c++-devel \ clang \ cmake \ doxygen \ git \ help2man \ - libcurl4-openssl-dev \ - libedit-dev \ - libncurses5-dev \ - libusb-1.0-0-dev \ - pandoc \ - pkg-config \ + lib64curl-devel \ + lib64edit-devel \ + lib64ncurses-devel \ + lib64usb1.0-devel \ usbutils \ - && apt-get clean + make \ + gcc \ + gcc-c++ \ + && urpme --auto-orphans # Copy in our build context COPY --from=nuand/bladerf-buildenv:base /root/bladeRF /root/bladeRF @@ -69,8 +69,13 @@ RUN cd /root/bladeRF/ \ -DCMAKE_BUILD_TYPE=${buildtype} \ -DENABLE_FX3_BUILD=OFF \ -DENABLE_HOST_BUILD=ON \ + -DTEST_REGRESSION=ON \ -DTAGGED_RELEASE=${taggedrelease} \ + -DCURSES_INCLUDE_PATH=/usr/include \ + -DCURSES_CURSES_LIBRARY=/usr/lib64/libcurses.so \ + -DCURSES_NCURSES_LIBRARY=/usr/lib64/libncurses.so \ ../ \ && make -j${parallel} \ && make install \ + && echo "/usr/local/lib64" > /etc/ld.so.conf.d/bladerf.conf \ && ldconfig diff --git a/host/misc/docker/opensuse-latest.Dockerfile b/host/misc/docker/opensuse-latest.Dockerfile index dfdacf35..c0c67436 100644 --- a/host/misc/docker/opensuse-latest.Dockerfile +++ b/host/misc/docker/opensuse-latest.Dockerfile @@ -1,7 +1,7 @@ # This file is part of the bladeRF project: # http://www.github.com/nuand/bladeRF # -# Copyright (c) 2018 Nuand LLC. +# Copyright (c) 2025 Nuand LLC. # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -35,12 +35,15 @@ RUN zypper --non-interactive install \ cmake \ doxygen \ gcc \ + gcc-c++ \ git \ help2man \ + libcurl-devel \ libedit \ libedit-devel \ libusb \ libusb-devel \ + ncurses-devel \ pandoc \ wget diff --git a/host/misc/docker/parallel.bash b/host/misc/docker/parallel.bash old mode 100644 new mode 100755 diff --git a/host/misc/docker/debian-jessie-i386.Dockerfile b/host/misc/docker/rocky-8.Dockerfile similarity index 80% rename from host/misc/docker/debian-jessie-i386.Dockerfile rename to host/misc/docker/rocky-8.Dockerfile index 77628e16..b599605d 100644 --- a/host/misc/docker/debian-jessie-i386.Dockerfile +++ b/host/misc/docker/rocky-8.Dockerfile @@ -1,7 +1,7 @@ # This file is part of the bladeRF project: # http://www.github.com/nuand/bladeRF # -# Copyright (c) 2018 Nuand LLC. +# Copyright (c) 2025 Nuand LLC. # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -21,32 +21,34 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -FROM i386/debian:jessie +FROM rockylinux:8-minimal LABEL maintainer="Nuand LLC " LABEL version="0.0.2" LABEL description="CI build environment for the bladeRF project" -LABEL com.nuand.ci.distribution.name="Debian" -LABEL com.nuand.ci.distribution.codename="jessie-i386" +LABEL com.nuand.ci.distribution.name="Rocky Linux" +LABEL com.nuand.ci.distribution.codename="8" LABEL com.nuand.ci.distribution.version="8" -# Install things -RUN apt-get update \ - && apt-get install -y \ - build-essential \ +# Install dnf first, then everything else +RUN microdnf install -y dnf \ + && dnf update -y \ + && dnf install -y epel-release \ + && dnf config-manager --set-enabled powertools \ + && dnf groupinstall -y "Development Tools" \ + && dnf install -y \ clang \ cmake \ doxygen \ git \ help2man \ - libcurl4-openssl-dev \ - libedit-dev \ - libncurses5-dev \ - libusb-1.0-0-dev \ + libcurl-devel \ + libedit-devel \ + ncurses-devel \ + libusb1-devel \ pandoc \ - pkg-config \ usbutils \ - && apt-get clean + && dnf clean all # Copy in our build context COPY --from=nuand/bladerf-buildenv:base /root/bladeRF /root/bladeRF @@ -73,4 +75,4 @@ RUN cd /root/bladeRF/ \ ../ \ && make -j${parallel} \ && make install \ - && ldconfig + && ldconfig \ No newline at end of file diff --git a/host/misc/docker/debian-stretch.Dockerfile b/host/misc/docker/rocky-9.Dockerfile similarity index 79% rename from host/misc/docker/debian-stretch.Dockerfile rename to host/misc/docker/rocky-9.Dockerfile index 99b80161..c8610a15 100644 --- a/host/misc/docker/debian-stretch.Dockerfile +++ b/host/misc/docker/rocky-9.Dockerfile @@ -1,7 +1,7 @@ # This file is part of the bladeRF project: # http://www.github.com/nuand/bladeRF # -# Copyright (c) 2018 Nuand LLC. +# Copyright (c) 2025 Nuand LLC. # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -21,32 +21,34 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -FROM debian:stretch +FROM rockylinux:9-minimal LABEL maintainer="Nuand LLC " LABEL version="0.0.2" LABEL description="CI build environment for the bladeRF project" -LABEL com.nuand.ci.distribution.name="Debian" -LABEL com.nuand.ci.distribution.codename="stretch" +LABEL com.nuand.ci.distribution.name="Rocky Linux" +LABEL com.nuand.ci.distribution.codename="9" LABEL com.nuand.ci.distribution.version="9" -# Install things -RUN apt-get update \ - && apt-get install -y \ - build-essential \ +# Install dnf first, then everything else +RUN microdnf install -y dnf \ + && dnf update -y \ + && dnf install -y epel-release \ + && dnf groupinstall -y "Development Tools" \ + && dnf config-manager --set-enabled crb \ + && dnf install -y \ clang \ cmake \ doxygen \ git \ help2man \ - libcurl4-openssl-dev \ - libedit-dev \ - libncurses5-dev \ - libusb-1.0-0-dev \ + libcurl-devel \ + libedit-devel \ + ncurses-devel \ + libusb1-devel \ pandoc \ - pkg-config \ usbutils \ - && apt-get clean + && dnf clean all # Copy in our build context COPY --from=nuand/bladerf-buildenv:base /root/bladeRF /root/bladeRF @@ -69,8 +71,9 @@ RUN cd /root/bladeRF/ \ -DCMAKE_BUILD_TYPE=${buildtype} \ -DENABLE_FX3_BUILD=OFF \ -DENABLE_HOST_BUILD=ON \ + -DTEST_REGRESSION=ON \ -DTAGGED_RELEASE=${taggedrelease} \ ../ \ && make -j${parallel} \ && make install \ - && ldconfig + && ldconfig \ No newline at end of file diff --git a/host/misc/docker/test.bash b/host/misc/docker/test.bash old mode 100644 new mode 100755 diff --git a/host/misc/docker/ubuntu-bionic-i386.Dockerfile b/host/misc/docker/ubuntu-bionic-i386.Dockerfile deleted file mode 100644 index fe418064..00000000 --- a/host/misc/docker/ubuntu-bionic-i386.Dockerfile +++ /dev/null @@ -1,76 +0,0 @@ -# This file is part of the bladeRF project: -# http://www.github.com/nuand/bladeRF -# -# Copyright (c) 2018 Nuand LLC. -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -FROM i386/ubuntu:bionic - -LABEL maintainer="Nuand LLC " -LABEL version="0.0.2" -LABEL description="CI build environment for the bladeRF project" -LABEL com.nuand.ci.distribution.name="Ubuntu" -LABEL com.nuand.ci.distribution.codename="bionic-i386" -LABEL com.nuand.ci.distribution.version="18.04" - -# Install things -RUN apt-get update \ - && apt-get install -y \ - build-essential \ - clang \ - cmake \ - doxygen \ - git \ - help2man \ - libcurl4-openssl-dev \ - libedit-dev \ - libncurses5-dev \ - libusb-1.0-0-dev \ - pandoc \ - pkg-config \ - usbutils \ - && apt-get clean - -# Copy in our build context -COPY --from=nuand/bladerf-buildenv:base /root/bladeRF /root/bladeRF -COPY --from=nuand/bladerf-buildenv:base /root/.config /root/.config -WORKDIR /root/bladeRF - -# Build arguments -ARG compiler=gcc -ARG buildtype=Release -ARG taggedrelease=NO -ARG parallel=1 - -# Do the build! -RUN cd /root/bladeRF/ \ - && mkdir -p build \ - && cd build \ - && cmake \ - -DBUILD_DOCUMENTATION=ON \ - -DCMAKE_C_COMPILER=${compiler} \ - -DCMAKE_BUILD_TYPE=${buildtype} \ - -DENABLE_FX3_BUILD=OFF \ - -DENABLE_HOST_BUILD=ON \ - -DTAGGED_RELEASE=${taggedrelease} \ - ../ \ - && make -j${parallel} \ - && make install \ - && ldconfig diff --git a/host/misc/docker/ubuntu-bionic.Dockerfile b/host/misc/docker/ubuntu-bionic.Dockerfile deleted file mode 100644 index 58b30131..00000000 --- a/host/misc/docker/ubuntu-bionic.Dockerfile +++ /dev/null @@ -1,76 +0,0 @@ -# This file is part of the bladeRF project: -# http://www.github.com/nuand/bladeRF -# -# Copyright (c) 2018 Nuand LLC. -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -FROM ubuntu:bionic - -LABEL maintainer="Nuand LLC " -LABEL version="0.0.2" -LABEL description="CI build environment for the bladeRF project" -LABEL com.nuand.ci.distribution.name="Ubuntu" -LABEL com.nuand.ci.distribution.codename="bionic" -LABEL com.nuand.ci.distribution.version="18.04" - -# Install things -RUN apt-get update \ - && apt-get install -y \ - build-essential \ - clang \ - cmake \ - doxygen \ - git \ - help2man \ - libcurl4-openssl-dev \ - libedit-dev \ - libncurses5-dev \ - libusb-1.0-0-dev \ - pandoc \ - pkg-config \ - usbutils \ - && apt-get clean - -# Copy in our build context -COPY --from=nuand/bladerf-buildenv:base /root/bladeRF /root/bladeRF -COPY --from=nuand/bladerf-buildenv:base /root/.config /root/.config -WORKDIR /root/bladeRF - -# Build arguments -ARG compiler=gcc -ARG buildtype=Release -ARG taggedrelease=NO -ARG parallel=1 - -# Do the build! -RUN cd /root/bladeRF/ \ - && mkdir -p build \ - && cd build \ - && cmake \ - -DBUILD_DOCUMENTATION=ON \ - -DCMAKE_C_COMPILER=${compiler} \ - -DCMAKE_BUILD_TYPE=${buildtype} \ - -DENABLE_FX3_BUILD=OFF \ - -DENABLE_HOST_BUILD=ON \ - -DTAGGED_RELEASE=${taggedrelease} \ - ../ \ - && make -j${parallel} \ - && make install \ - && ldconfig diff --git a/host/misc/docker/ubuntu-cosmic-i386.Dockerfile b/host/misc/docker/ubuntu-cosmic-i386.Dockerfile deleted file mode 100644 index 212584c3..00000000 --- a/host/misc/docker/ubuntu-cosmic-i386.Dockerfile +++ /dev/null @@ -1,76 +0,0 @@ -# This file is part of the bladeRF project: -# http://www.github.com/nuand/bladeRF -# -# Copyright (c) 2018 Nuand LLC. -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -FROM i386/ubuntu:cosmic - -LABEL maintainer="Nuand LLC " -LABEL version="0.0.2" -LABEL description="CI build environment for the bladeRF project" -LABEL com.nuand.ci.distribution.name="Ubuntu" -LABEL com.nuand.ci.distribution.codename="cosmic-i386" -LABEL com.nuand.ci.distribution.version="18.10" - -# Install things -RUN apt-get update \ - && apt-get install -y \ - build-essential \ - clang \ - cmake \ - doxygen \ - git \ - help2man \ - libcurl4-openssl-dev \ - libedit-dev \ - libncurses5-dev \ - libusb-1.0-0-dev \ - pandoc \ - pkg-config \ - usbutils \ - && apt-get clean - -# Copy in our build context -COPY --from=nuand/bladerf-buildenv:base /root/bladeRF /root/bladeRF -COPY --from=nuand/bladerf-buildenv:base /root/.config /root/.config -WORKDIR /root/bladeRF - -# Build arguments -ARG compiler=gcc -ARG buildtype=Release -ARG taggedrelease=NO -ARG parallel=1 - -# Do the build! -RUN cd /root/bladeRF/ \ - && mkdir -p build \ - && cd build \ - && cmake \ - -DBUILD_DOCUMENTATION=ON \ - -DCMAKE_C_COMPILER=${compiler} \ - -DCMAKE_BUILD_TYPE=${buildtype} \ - -DENABLE_FX3_BUILD=OFF \ - -DENABLE_HOST_BUILD=ON \ - -DTAGGED_RELEASE=${taggedrelease} \ - ../ \ - && make -j${parallel} \ - && make install \ - && ldconfig diff --git a/host/misc/docker/ubuntu-cosmic.Dockerfile b/host/misc/docker/ubuntu-cosmic.Dockerfile deleted file mode 100644 index 36f8ec2f..00000000 --- a/host/misc/docker/ubuntu-cosmic.Dockerfile +++ /dev/null @@ -1,76 +0,0 @@ -# This file is part of the bladeRF project: -# http://www.github.com/nuand/bladeRF -# -# Copyright (c) 2018 Nuand LLC. -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -FROM ubuntu:cosmic - -LABEL maintainer="Nuand LLC " -LABEL version="0.0.2" -LABEL description="CI build environment for the bladeRF project" -LABEL com.nuand.ci.distribution.name="Ubuntu" -LABEL com.nuand.ci.distribution.codename="cosmic" -LABEL com.nuand.ci.distribution.version="18.10" - -# Install things -RUN apt-get update \ - && apt-get install -y \ - build-essential \ - clang \ - cmake \ - doxygen \ - git \ - help2man \ - libcurl4-openssl-dev \ - libedit-dev \ - libncurses5-dev \ - libusb-1.0-0-dev \ - pandoc \ - pkg-config \ - usbutils \ - && apt-get clean - -# Copy in our build context -COPY --from=nuand/bladerf-buildenv:base /root/bladeRF /root/bladeRF -COPY --from=nuand/bladerf-buildenv:base /root/.config /root/.config -WORKDIR /root/bladeRF - -# Build arguments -ARG compiler=gcc -ARG buildtype=Release -ARG taggedrelease=NO -ARG parallel=1 - -# Do the build! -RUN cd /root/bladeRF/ \ - && mkdir -p build \ - && cd build \ - && cmake \ - -DBUILD_DOCUMENTATION=ON \ - -DCMAKE_C_COMPILER=${compiler} \ - -DCMAKE_BUILD_TYPE=${buildtype} \ - -DENABLE_FX3_BUILD=OFF \ - -DENABLE_HOST_BUILD=ON \ - -DTAGGED_RELEASE=${taggedrelease} \ - ../ \ - && make -j${parallel} \ - && make install \ - && ldconfig diff --git a/host/misc/docker/ubuntu-disco-i386.Dockerfile b/host/misc/docker/ubuntu-disco-i386.Dockerfile deleted file mode 100644 index 0b8e62a9..00000000 --- a/host/misc/docker/ubuntu-disco-i386.Dockerfile +++ /dev/null @@ -1,76 +0,0 @@ -# This file is part of the bladeRF project: -# http://www.github.com/nuand/bladeRF -# -# Copyright (c) 2019 Nuand LLC. -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -FROM i386/ubuntu:disco - -LABEL maintainer="Nuand LLC " -LABEL version="0.0.2" -LABEL description="CI build environment for the bladeRF project" -LABEL com.nuand.ci.distribution.name="Ubuntu" -LABEL com.nuand.ci.distribution.codename="disco-i386" -LABEL com.nuand.ci.distribution.version="19.04" - -# Install things -RUN apt-get update \ - && apt-get install -y \ - build-essential \ - clang \ - cmake \ - doxygen \ - git \ - help2man \ - libcurl4-openssl-dev \ - libedit-dev \ - libncurses5-dev \ - libusb-1.0-0-dev \ - pandoc \ - pkg-config \ - usbutils \ - && apt-get clean - -# Copy in our build context -COPY --from=nuand/bladerf-buildenv:base /root/bladeRF /root/bladeRF -COPY --from=nuand/bladerf-buildenv:base /root/.config /root/.config -WORKDIR /root/bladeRF - -# Build arguments -ARG compiler=gcc -ARG buildtype=Release -ARG taggedrelease=NO -ARG parallel=1 - -# Do the build! -RUN cd /root/bladeRF/ \ - && mkdir -p build \ - && cd build \ - && cmake \ - -DBUILD_DOCUMENTATION=ON \ - -DCMAKE_C_COMPILER=${compiler} \ - -DCMAKE_BUILD_TYPE=${buildtype} \ - -DENABLE_FX3_BUILD=OFF \ - -DENABLE_HOST_BUILD=ON \ - -DTAGGED_RELEASE=${taggedrelease} \ - ../ \ - && make -j${parallel} \ - && make install \ - && ldconfig diff --git a/host/misc/docker/ubuntu-disco.Dockerfile b/host/misc/docker/ubuntu-disco.Dockerfile deleted file mode 100644 index fdfb8871..00000000 --- a/host/misc/docker/ubuntu-disco.Dockerfile +++ /dev/null @@ -1,76 +0,0 @@ -# This file is part of the bladeRF project: -# http://www.github.com/nuand/bladeRF -# -# Copyright (c) 2019 Nuand LLC. -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -FROM ubuntu:disco - -LABEL maintainer="Nuand LLC " -LABEL version="0.0.2" -LABEL description="CI build environment for the bladeRF project" -LABEL com.nuand.ci.distribution.name="Ubuntu" -LABEL com.nuand.ci.distribution.codename="disco" -LABEL com.nuand.ci.distribution.version="19.04" - -# Install things -RUN apt-get update \ - && apt-get install -y \ - build-essential \ - clang \ - cmake \ - doxygen \ - git \ - help2man \ - libcurl4-openssl-dev \ - libedit-dev \ - libncurses5-dev \ - libusb-1.0-0-dev \ - pandoc \ - pkg-config \ - usbutils \ - && apt-get clean - -# Copy in our build context -COPY --from=nuand/bladerf-buildenv:base /root/bladeRF /root/bladeRF -COPY --from=nuand/bladerf-buildenv:base /root/.config /root/.config -WORKDIR /root/bladeRF - -# Build arguments -ARG compiler=gcc -ARG buildtype=Release -ARG taggedrelease=NO -ARG parallel=1 - -# Do the build! -RUN cd /root/bladeRF/ \ - && mkdir -p build \ - && cd build \ - && cmake \ - -DBUILD_DOCUMENTATION=ON \ - -DCMAKE_C_COMPILER=${compiler} \ - -DCMAKE_BUILD_TYPE=${buildtype} \ - -DENABLE_FX3_BUILD=OFF \ - -DENABLE_HOST_BUILD=ON \ - -DTAGGED_RELEASE=${taggedrelease} \ - ../ \ - && make -j${parallel} \ - && make install \ - && ldconfig diff --git a/host/misc/docker/ubuntu-eoan-i386.Dockerfile b/host/misc/docker/ubuntu-eoan-i386.Dockerfile deleted file mode 100644 index 10f01064..00000000 --- a/host/misc/docker/ubuntu-eoan-i386.Dockerfile +++ /dev/null @@ -1,76 +0,0 @@ -# This file is part of the bladeRF project: -# http://www.github.com/nuand/bladeRF -# -# Copyright (c) 2018 Nuand LLC. -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -FROM i386/ubuntu:eoan - -LABEL maintainer="Nuand LLC " -LABEL version="0.0.2" -LABEL description="CI build environment for the bladeRF project" -LABEL com.nuand.ci.distribution.name="Ubuntu" -LABEL com.nuand.ci.distribution.codename="eoan" -LABEL com.nuand.ci.distribution.version="19.10-i386" - -# Install things -RUN apt-get update \ - && apt-get install -y \ - build-essential \ - clang \ - cmake \ - doxygen \ - git \ - help2man \ - libcurl4-openssl-dev \ - libedit-dev \ - libncurses5-dev \ - libusb-1.0-0-dev \ - pandoc \ - pkg-config \ - usbutils \ - && apt-get clean - -# Copy in our build context -COPY --from=nuand/bladerf-buildenv:base /root/bladeRF /root/bladeRF -COPY --from=nuand/bladerf-buildenv:base /root/.config /root/.config -WORKDIR /root/bladeRF - -# Build arguments -ARG compiler=gcc -ARG buildtype=Release -ARG taggedrelease=NO -ARG parallel=1 - -# Do the build! -RUN cd /root/bladeRF/ \ - && mkdir -p build \ - && cd build \ - && cmake \ - -DBUILD_DOCUMENTATION=ON \ - -DCMAKE_C_COMPILER=${compiler} \ - -DCMAKE_BUILD_TYPE=${buildtype} \ - -DENABLE_FX3_BUILD=OFF \ - -DENABLE_HOST_BUILD=ON \ - -DTAGGED_RELEASE=${taggedrelease} \ - ../ \ - && make -j${parallel} \ - && make install \ - && ldconfig diff --git a/host/misc/docker/ubuntu-eoan.Dockerfile b/host/misc/docker/ubuntu-eoan.Dockerfile deleted file mode 100644 index 40b6efe5..00000000 --- a/host/misc/docker/ubuntu-eoan.Dockerfile +++ /dev/null @@ -1,76 +0,0 @@ -# This file is part of the bladeRF project: -# http://www.github.com/nuand/bladeRF -# -# Copyright (c) 2018 Nuand LLC. -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -FROM ubuntu:eoan - -LABEL maintainer="Nuand LLC " -LABEL version="0.0.2" -LABEL description="CI build environment for the bladeRF project" -LABEL com.nuand.ci.distribution.name="Ubuntu" -LABEL com.nuand.ci.distribution.codename="eoan" -LABEL com.nuand.ci.distribution.version="19.10" - -# Install things -RUN apt-get update \ - && apt-get install -y \ - build-essential \ - clang \ - cmake \ - doxygen \ - git \ - help2man \ - libcurl4-openssl-dev \ - libedit-dev \ - libncurses5-dev \ - libusb-1.0-0-dev \ - pandoc \ - pkg-config \ - usbutils \ - && apt-get clean - -# Copy in our build context -COPY --from=nuand/bladerf-buildenv:base /root/bladeRF /root/bladeRF -COPY --from=nuand/bladerf-buildenv:base /root/.config /root/.config -WORKDIR /root/bladeRF - -# Build arguments -ARG compiler=gcc -ARG buildtype=Release -ARG taggedrelease=NO -ARG parallel=1 - -# Do the build! -RUN cd /root/bladeRF/ \ - && mkdir -p build \ - && cd build \ - && cmake \ - -DBUILD_DOCUMENTATION=ON \ - -DCMAKE_C_COMPILER=${compiler} \ - -DCMAKE_BUILD_TYPE=${buildtype} \ - -DENABLE_FX3_BUILD=OFF \ - -DENABLE_HOST_BUILD=ON \ - -DTAGGED_RELEASE=${taggedrelease} \ - ../ \ - && make -j${parallel} \ - && make install \ - && ldconfig diff --git a/host/misc/docker/ubuntu-focal-i386.Dockerfile b/host/misc/docker/ubuntu-focal-i386.Dockerfile deleted file mode 100644 index e5b3d018..00000000 --- a/host/misc/docker/ubuntu-focal-i386.Dockerfile +++ /dev/null @@ -1,76 +0,0 @@ -# This file is part of the bladeRF project: -# http://www.github.com/nuand/bladeRF -# -# Copyright (c) 2018 Nuand LLC. -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -FROM i386/ubuntu:focal - -LABEL maintainer="Nuand LLC " -LABEL version="0.0.2" -LABEL description="CI build environment for the bladeRF project" -LABEL com.nuand.ci.distribution.name="Ubuntu" -LABEL com.nuand.ci.distribution.codename="focal" -LABEL com.nuand.ci.distribution.version="20.10-i386" - -# Install things -RUN apt-get update \ - && apt-get install -y \ - build-essential \ - clang \ - cmake \ - doxygen \ - git \ - help2man \ - libcurl4-openssl-dev \ - libedit-dev \ - libncurses5-dev \ - libusb-1.0-0-dev \ - pandoc \ - pkg-config \ - usbutils \ - && apt-get clean - -# Copy in our build context -COPY --from=nuand/bladerf-buildenv:base /root/bladeRF /root/bladeRF -COPY --from=nuand/bladerf-buildenv:base /root/.config /root/.config -WORKDIR /root/bladeRF - -# Build arguments -ARG compiler=gcc -ARG buildtype=Release -ARG taggedrelease=NO -ARG parallel=1 - -# Do the build! -RUN cd /root/bladeRF/ \ - && mkdir -p build \ - && cd build \ - && cmake \ - -DBUILD_DOCUMENTATION=ON \ - -DCMAKE_C_COMPILER=${compiler} \ - -DCMAKE_BUILD_TYPE=${buildtype} \ - -DENABLE_FX3_BUILD=OFF \ - -DENABLE_HOST_BUILD=ON \ - -DTAGGED_RELEASE=${taggedrelease} \ - ../ \ - && make -j${parallel} \ - && make install \ - && ldconfig diff --git a/host/misc/docker/ubuntu-focal.Dockerfile b/host/misc/docker/ubuntu-focal.Dockerfile index 78547b0f..9c98409b 100644 --- a/host/misc/docker/ubuntu-focal.Dockerfile +++ b/host/misc/docker/ubuntu-focal.Dockerfile @@ -30,6 +30,8 @@ LABEL com.nuand.ci.distribution.name="Ubuntu" LABEL com.nuand.ci.distribution.codename="focal" LABEL com.nuand.ci.distribution.version="20.10" +ENV DEBIAN_FRONTEND=noninteractive + # Install things RUN apt-get update \ && apt-get install -y \ diff --git a/host/misc/docker/ubuntu-groovy-i386.Dockerfile b/host/misc/docker/ubuntu-groovy-i386.Dockerfile deleted file mode 100644 index 9dfe0876..00000000 --- a/host/misc/docker/ubuntu-groovy-i386.Dockerfile +++ /dev/null @@ -1,76 +0,0 @@ -# This file is part of the bladeRF project: -# http://www.github.com/nuand/bladeRF -# -# Copyright (c) 2018-2025 Nuand LLC. -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -FROM i386/ubuntu:groovy - -LABEL maintainer="Nuand LLC " -LABEL version="0.0.2" -LABEL description="CI build environment for the bladeRF project" -LABEL com.nuand.ci.distribution.name="Ubuntu" -LABEL com.nuand.ci.distribution.codename="groovy" -LABEL com.nuand.ci.distribution.version="20.10-i386" - -# Install things -RUN apt-get update \ - && apt-get install -y \ - build-essential \ - clang \ - cmake \ - doxygen \ - git \ - help2man \ - libcurl4-openssl-dev \ - libedit-dev \ - libncurses5-dev \ - libusb-1.0-0-dev \ - pandoc \ - pkg-config \ - usbutils \ - && apt-get clean - -# Copy in our build context -COPY --from=nuand/bladerf-buildenv:base /root/bladeRF /root/bladeRF -COPY --from=nuand/bladerf-buildenv:base /root/.config /root/.config -WORKDIR /root/bladeRF - -# Build arguments -ARG compiler=gcc -ARG buildtype=Release -ARG taggedrelease=NO -ARG parallel=1 - -# Do the build! -RUN cd /root/bladeRF/ \ - && mkdir -p build \ - && cd build \ - && cmake \ - -DBUILD_DOCUMENTATION=ON \ - -DCMAKE_C_COMPILER=${compiler} \ - -DCMAKE_BUILD_TYPE=${buildtype} \ - -DENABLE_FX3_BUILD=OFF \ - -DENABLE_HOST_BUILD=ON \ - -DTAGGED_RELEASE=${taggedrelease} \ - ../ \ - && make -j${parallel} \ - && make install \ - && ldconfig \ No newline at end of file diff --git a/host/misc/docker/ubuntu-groovy.Dockerfile b/host/misc/docker/ubuntu-groovy.Dockerfile deleted file mode 100644 index 11ef6111..00000000 --- a/host/misc/docker/ubuntu-groovy.Dockerfile +++ /dev/null @@ -1,76 +0,0 @@ -# This file is part of the bladeRF project: -# http://www.github.com/nuand/bladeRF -# -# Copyright (c) 2018-2025 Nuand LLC. -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -FROM ubuntu:groovy - -LABEL maintainer="Nuand LLC " -LABEL version="0.0.2" -LABEL description="CI build environment for the bladeRF project" -LABEL com.nuand.ci.distribution.name="Ubuntu" -LABEL com.nuand.ci.distribution.codename="groovy" -LABEL com.nuand.ci.distribution.version="20.10" - -# Install things -RUN apt-get update \ - && apt-get install -y \ - build-essential \ - clang \ - cmake \ - doxygen \ - git \ - help2man \ - libcurl4-openssl-dev \ - libedit-dev \ - libncurses5-dev \ - libusb-1.0-0-dev \ - pandoc \ - pkg-config \ - usbutils \ - && apt-get clean - -# Copy in our build context -COPY --from=nuand/bladerf-buildenv:base /root/bladeRF /root/bladeRF -COPY --from=nuand/bladerf-buildenv:base /root/.config /root/.config -WORKDIR /root/bladeRF - -# Build arguments -ARG compiler=gcc -ARG buildtype=Release -ARG taggedrelease=NO -ARG parallel=1 - -# Do the build! -RUN cd /root/bladeRF/ \ - && mkdir -p build \ - && cd build \ - && cmake \ - -DBUILD_DOCUMENTATION=ON \ - -DCMAKE_C_COMPILER=${compiler} \ - -DCMAKE_BUILD_TYPE=${buildtype} \ - -DENABLE_FX3_BUILD=OFF \ - -DENABLE_HOST_BUILD=ON \ - -DTAGGED_RELEASE=${taggedrelease} \ - ../ \ - && make -j${parallel} \ - && make install \ - && ldconfig \ No newline at end of file diff --git a/host/misc/docker/ubuntu-hirsute-i386.Dockerfile b/host/misc/docker/ubuntu-hirsute-i386.Dockerfile deleted file mode 100644 index fb16895a..00000000 --- a/host/misc/docker/ubuntu-hirsute-i386.Dockerfile +++ /dev/null @@ -1,76 +0,0 @@ -# This file is part of the bladeRF project: -# http://www.github.com/nuand/bladeRF -# -# Copyright (c) 2018-2025 Nuand LLC. -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -FROM i386/ubuntu:hirsute - -LABEL maintainer="Nuand LLC " -LABEL version="0.0.2" -LABEL description="CI build environment for the bladeRF project" -LABEL com.nuand.ci.distribution.name="Ubuntu" -LABEL com.nuand.ci.distribution.codename="hirsute" -LABEL com.nuand.ci.distribution.version="21.04-i386" - -# Install things -RUN apt-get update \ - && apt-get install -y \ - build-essential \ - clang \ - cmake \ - doxygen \ - git \ - help2man \ - libcurl4-openssl-dev \ - libedit-dev \ - libncurses5-dev \ - libusb-1.0-0-dev \ - pandoc \ - pkg-config \ - usbutils \ - && apt-get clean - -# Copy in our build context -COPY --from=nuand/bladerf-buildenv:base /root/bladeRF /root/bladeRF -COPY --from=nuand/bladerf-buildenv:base /root/.config /root/.config -WORKDIR /root/bladeRF - -# Build arguments -ARG compiler=gcc -ARG buildtype=Release -ARG taggedrelease=NO -ARG parallel=1 - -# Do the build! -RUN cd /root/bladeRF/ \ - && mkdir -p build \ - && cd build \ - && cmake \ - -DBUILD_DOCUMENTATION=ON \ - -DCMAKE_C_COMPILER=${compiler} \ - -DCMAKE_BUILD_TYPE=${buildtype} \ - -DENABLE_FX3_BUILD=OFF \ - -DENABLE_HOST_BUILD=ON \ - -DTAGGED_RELEASE=${taggedrelease} \ - ../ \ - && make -j${parallel} \ - && make install \ - && ldconfig \ No newline at end of file diff --git a/host/misc/docker/ubuntu-hirsute.Dockerfile b/host/misc/docker/ubuntu-hirsute.Dockerfile deleted file mode 100644 index f25ed766..00000000 --- a/host/misc/docker/ubuntu-hirsute.Dockerfile +++ /dev/null @@ -1,76 +0,0 @@ -# This file is part of the bladeRF project: -# http://www.github.com/nuand/bladeRF -# -# Copyright (c) 2018-2025 Nuand LLC. -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -FROM ubuntu:hirsute - -LABEL maintainer="Nuand LLC " -LABEL version="0.0.2" -LABEL description="CI build environment for the bladeRF project" -LABEL com.nuand.ci.distribution.name="Ubuntu" -LABEL com.nuand.ci.distribution.codename="hirsute" -LABEL com.nuand.ci.distribution.version="21.04" - -# Install things -RUN apt-get update \ - && apt-get install -y \ - build-essential \ - clang \ - cmake \ - doxygen \ - git \ - help2man \ - libcurl4-openssl-dev \ - libedit-dev \ - libncurses5-dev \ - libusb-1.0-0-dev \ - pandoc \ - pkg-config \ - usbutils \ - && apt-get clean - -# Copy in our build context -COPY --from=nuand/bladerf-buildenv:base /root/bladeRF /root/bladeRF -COPY --from=nuand/bladerf-buildenv:base /root/.config /root/.config -WORKDIR /root/bladeRF - -# Build arguments -ARG compiler=gcc -ARG buildtype=Release -ARG taggedrelease=NO -ARG parallel=1 - -# Do the build! -RUN cd /root/bladeRF/ \ - && mkdir -p build \ - && cd build \ - && cmake \ - -DBUILD_DOCUMENTATION=ON \ - -DCMAKE_C_COMPILER=${compiler} \ - -DCMAKE_BUILD_TYPE=${buildtype} \ - -DENABLE_FX3_BUILD=OFF \ - -DENABLE_HOST_BUILD=ON \ - -DTAGGED_RELEASE=${taggedrelease} \ - ../ \ - && make -j${parallel} \ - && make install \ - && ldconfig \ No newline at end of file diff --git a/host/misc/docker/ubuntu-impish-i386.Dockerfile b/host/misc/docker/ubuntu-impish-i386.Dockerfile deleted file mode 100644 index b47d3eba..00000000 --- a/host/misc/docker/ubuntu-impish-i386.Dockerfile +++ /dev/null @@ -1,76 +0,0 @@ -# This file is part of the bladeRF project: -# http://www.github.com/nuand/bladeRF -# -# Copyright (c) 2018-2025 Nuand LLC. -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -FROM i386/ubuntu:impish - -LABEL maintainer="Nuand LLC " -LABEL version="0.0.2" -LABEL description="CI build environment for the bladeRF project" -LABEL com.nuand.ci.distribution.name="Ubuntu" -LABEL com.nuand.ci.distribution.codename="impish" -LABEL com.nuand.ci.distribution.version="21.10-i386" - -# Install things -RUN apt-get update \ - && apt-get install -y \ - build-essential \ - clang \ - cmake \ - doxygen \ - git \ - help2man \ - libcurl4-openssl-dev \ - libedit-dev \ - libncurses5-dev \ - libusb-1.0-0-dev \ - pandoc \ - pkg-config \ - usbutils \ - && apt-get clean - -# Copy in our build context -COPY --from=nuand/bladerf-buildenv:base /root/bladeRF /root/bladeRF -COPY --from=nuand/bladerf-buildenv:base /root/.config /root/.config -WORKDIR /root/bladeRF - -# Build arguments -ARG compiler=gcc -ARG buildtype=Release -ARG taggedrelease=NO -ARG parallel=1 - -# Do the build! -RUN cd /root/bladeRF/ \ - && mkdir -p build \ - && cd build \ - && cmake \ - -DBUILD_DOCUMENTATION=ON \ - -DCMAKE_C_COMPILER=${compiler} \ - -DCMAKE_BUILD_TYPE=${buildtype} \ - -DENABLE_FX3_BUILD=OFF \ - -DENABLE_HOST_BUILD=ON \ - -DTAGGED_RELEASE=${taggedrelease} \ - ../ \ - && make -j${parallel} \ - && make install \ - && ldconfig \ No newline at end of file diff --git a/host/misc/docker/ubuntu-impish.Dockerfile b/host/misc/docker/ubuntu-impish.Dockerfile deleted file mode 100644 index 25077ceb..00000000 --- a/host/misc/docker/ubuntu-impish.Dockerfile +++ /dev/null @@ -1,76 +0,0 @@ -# This file is part of the bladeRF project: -# http://www.github.com/nuand/bladeRF -# -# Copyright (c) 2018-2025 Nuand LLC. -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -FROM ubuntu:impish - -LABEL maintainer="Nuand LLC " -LABEL version="0.0.2" -LABEL description="CI build environment for the bladeRF project" -LABEL com.nuand.ci.distribution.name="Ubuntu" -LABEL com.nuand.ci.distribution.codename="impish" -LABEL com.nuand.ci.distribution.version="21.10" - -# Install things -RUN apt-get update \ - && apt-get install -y \ - build-essential \ - clang \ - cmake \ - doxygen \ - git \ - help2man \ - libcurl4-openssl-dev \ - libedit-dev \ - libncurses5-dev \ - libusb-1.0-0-dev \ - pandoc \ - pkg-config \ - usbutils \ - && apt-get clean - -# Copy in our build context -COPY --from=nuand/bladerf-buildenv:base /root/bladeRF /root/bladeRF -COPY --from=nuand/bladerf-buildenv:base /root/.config /root/.config -WORKDIR /root/bladeRF - -# Build arguments -ARG compiler=gcc -ARG buildtype=Release -ARG taggedrelease=NO -ARG parallel=1 - -# Do the build! -RUN cd /root/bladeRF/ \ - && mkdir -p build \ - && cd build \ - && cmake \ - -DBUILD_DOCUMENTATION=ON \ - -DCMAKE_C_COMPILER=${compiler} \ - -DCMAKE_BUILD_TYPE=${buildtype} \ - -DENABLE_FX3_BUILD=OFF \ - -DENABLE_HOST_BUILD=ON \ - -DTAGGED_RELEASE=${taggedrelease} \ - ../ \ - && make -j${parallel} \ - && make install \ - && ldconfig \ No newline at end of file diff --git a/host/misc/docker/ubuntu-jammy-i386.Dockerfile b/host/misc/docker/ubuntu-jammy-i386.Dockerfile deleted file mode 100644 index 1824f113..00000000 --- a/host/misc/docker/ubuntu-jammy-i386.Dockerfile +++ /dev/null @@ -1,76 +0,0 @@ -# This file is part of the bladeRF project: -# http://www.github.com/nuand/bladeRF -# -# Copyright (c) 2018-2025 Nuand LLC. -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -FROM i386/ubuntu:jammy - -LABEL maintainer="Nuand LLC " -LABEL version="0.0.2" -LABEL description="CI build environment for the bladeRF project" -LABEL com.nuand.ci.distribution.name="Ubuntu" -LABEL com.nuand.ci.distribution.codename="jammy" -LABEL com.nuand.ci.distribution.version="22.04-i386" - -# Install things -RUN apt-get update \ - && apt-get install -y \ - build-essential \ - clang \ - cmake \ - doxygen \ - git \ - help2man \ - libcurl4-openssl-dev \ - libedit-dev \ - libncurses5-dev \ - libusb-1.0-0-dev \ - pandoc \ - pkg-config \ - usbutils \ - && apt-get clean - -# Copy in our build context -COPY --from=nuand/bladerf-buildenv:base /root/bladeRF /root/bladeRF -COPY --from=nuand/bladerf-buildenv:base /root/.config /root/.config -WORKDIR /root/bladeRF - -# Build arguments -ARG compiler=gcc -ARG buildtype=Release -ARG taggedrelease=NO -ARG parallel=1 - -# Do the build! -RUN cd /root/bladeRF/ \ - && mkdir -p build \ - && cd build \ - && cmake \ - -DBUILD_DOCUMENTATION=ON \ - -DCMAKE_C_COMPILER=${compiler} \ - -DCMAKE_BUILD_TYPE=${buildtype} \ - -DENABLE_FX3_BUILD=OFF \ - -DENABLE_HOST_BUILD=ON \ - -DTAGGED_RELEASE=${taggedrelease} \ - ../ \ - && make -j${parallel} \ - && make install \ - && ldconfig \ No newline at end of file diff --git a/host/misc/docker/ubuntu-jammy.Dockerfile b/host/misc/docker/ubuntu-jammy.Dockerfile index b587dc88..883668d4 100644 --- a/host/misc/docker/ubuntu-jammy.Dockerfile +++ b/host/misc/docker/ubuntu-jammy.Dockerfile @@ -30,6 +30,8 @@ LABEL com.nuand.ci.distribution.name="Ubuntu" LABEL com.nuand.ci.distribution.codename="jammy" LABEL com.nuand.ci.distribution.version="22.04" +ENV DEBIAN_FRONTEND=noninteractive + # Install things RUN apt-get update \ && apt-get install -y \ @@ -69,6 +71,7 @@ RUN cd /root/bladeRF/ \ -DCMAKE_BUILD_TYPE=${buildtype} \ -DENABLE_FX3_BUILD=OFF \ -DENABLE_HOST_BUILD=ON \ + -DTEST_REGRESSION=ON \ -DTAGGED_RELEASE=${taggedrelease} \ ../ \ && make -j${parallel} \ diff --git a/host/misc/docker/ubuntu-kinetic-i386.Dockerfile b/host/misc/docker/ubuntu-kinetic-i386.Dockerfile deleted file mode 100644 index a98a0be8..00000000 --- a/host/misc/docker/ubuntu-kinetic-i386.Dockerfile +++ /dev/null @@ -1,76 +0,0 @@ -# This file is part of the bladeRF project: -# http://www.github.com/nuand/bladeRF -# -# Copyright (c) 2018-2025 Nuand LLC. -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -FROM i386/ubuntu:kinetic - -LABEL maintainer="Nuand LLC " -LABEL version="0.0.2" -LABEL description="CI build environment for the bladeRF project" -LABEL com.nuand.ci.distribution.name="Ubuntu" -LABEL com.nuand.ci.distribution.codename="kinetic" -LABEL com.nuand.ci.distribution.version="22.10-i386" - -# Install things -RUN apt-get update \ - && apt-get install -y \ - build-essential \ - clang \ - cmake \ - doxygen \ - git \ - help2man \ - libcurl4-openssl-dev \ - libedit-dev \ - libncurses5-dev \ - libusb-1.0-0-dev \ - pandoc \ - pkg-config \ - usbutils \ - && apt-get clean - -# Copy in our build context -COPY --from=nuand/bladerf-buildenv:base /root/bladeRF /root/bladeRF -COPY --from=nuand/bladerf-buildenv:base /root/.config /root/.config -WORKDIR /root/bladeRF - -# Build arguments -ARG compiler=gcc -ARG buildtype=Release -ARG taggedrelease=NO -ARG parallel=1 - -# Do the build! -RUN cd /root/bladeRF/ \ - && mkdir -p build \ - && cd build \ - && cmake \ - -DBUILD_DOCUMENTATION=ON \ - -DCMAKE_C_COMPILER=${compiler} \ - -DCMAKE_BUILD_TYPE=${buildtype} \ - -DENABLE_FX3_BUILD=OFF \ - -DENABLE_HOST_BUILD=ON \ - -DTAGGED_RELEASE=${taggedrelease} \ - ../ \ - && make -j${parallel} \ - && make install \ - && ldconfig \ No newline at end of file diff --git a/host/misc/docker/ubuntu-kinetic.Dockerfile b/host/misc/docker/ubuntu-kinetic.Dockerfile deleted file mode 100644 index 8697a052..00000000 --- a/host/misc/docker/ubuntu-kinetic.Dockerfile +++ /dev/null @@ -1,76 +0,0 @@ -# This file is part of the bladeRF project: -# http://www.github.com/nuand/bladeRF -# -# Copyright (c) 2018-2025 Nuand LLC. -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -FROM ubuntu:kinetic - -LABEL maintainer="Nuand LLC " -LABEL version="0.0.2" -LABEL description="CI build environment for the bladeRF project" -LABEL com.nuand.ci.distribution.name="Ubuntu" -LABEL com.nuand.ci.distribution.codename="kinetic" -LABEL com.nuand.ci.distribution.version="22.10" - -# Install things -RUN apt-get update \ - && apt-get install -y \ - build-essential \ - clang \ - cmake \ - doxygen \ - git \ - help2man \ - libcurl4-openssl-dev \ - libedit-dev \ - libncurses5-dev \ - libusb-1.0-0-dev \ - pandoc \ - pkg-config \ - usbutils \ - && apt-get clean - -# Copy in our build context -COPY --from=nuand/bladerf-buildenv:base /root/bladeRF /root/bladeRF -COPY --from=nuand/bladerf-buildenv:base /root/.config /root/.config -WORKDIR /root/bladeRF - -# Build arguments -ARG compiler=gcc -ARG buildtype=Release -ARG taggedrelease=NO -ARG parallel=1 - -# Do the build! -RUN cd /root/bladeRF/ \ - && mkdir -p build \ - && cd build \ - && cmake \ - -DBUILD_DOCUMENTATION=ON \ - -DCMAKE_C_COMPILER=${compiler} \ - -DCMAKE_BUILD_TYPE=${buildtype} \ - -DENABLE_FX3_BUILD=OFF \ - -DENABLE_HOST_BUILD=ON \ - -DTAGGED_RELEASE=${taggedrelease} \ - ../ \ - && make -j${parallel} \ - && make install \ - && ldconfig \ No newline at end of file diff --git a/host/misc/docker/ubuntu-latest-i386.Dockerfile b/host/misc/docker/ubuntu-latest-i386.Dockerfile index 44024d95..38bac0ea 100644 --- a/host/misc/docker/ubuntu-latest-i386.Dockerfile +++ b/host/misc/docker/ubuntu-latest-i386.Dockerfile @@ -1,7 +1,7 @@ # This file is part of the bladeRF project: # http://www.github.com/nuand/bladeRF # -# Copyright (c) 2018-2025 Nuand LLC. +# Copyright (c) 2025 Nuand LLC. # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -35,19 +35,34 @@ RUN apt-get update \ && apt-get install -y \ build-essential \ clang \ - cmake \ doxygen \ git \ help2man \ libcurl4-openssl-dev \ libedit-dev \ libncurses5-dev \ + libncurses-dev \ + libncursesw5-dev \ + libssl-dev \ libusb-1.0-0-dev \ pandoc \ pkg-config \ usbutils \ + wget \ && apt-get clean +# Custom compile cmake because the version provided in the i386 repos is too old for our cmake scripts +RUN version=3.28 \ + && build=1 \ + && mkdir ~/temp \ + && cd ~/temp \ + && wget -nv https://cmake.org/files/v$version/cmake-$version.$build.tar.gz \ + && tar -xzf cmake-$version.$build.tar.gz \ + && cd cmake-$version.$build/ \ + && ./bootstrap --parallel=$(nproc) --no-debugger \ + && make -j$(nproc) \ + && make install + # Copy in our build context COPY --from=nuand/bladerf-buildenv:base /root/bladeRF /root/bladeRF COPY --from=nuand/bladerf-buildenv:base /root/.config /root/.config @@ -59,6 +74,8 @@ ARG buildtype=Release ARG taggedrelease=NO ARG parallel=1 +RUN ${compiler} --version + # Do the build! RUN cd /root/bladeRF/ \ && mkdir -p build \ @@ -73,4 +90,23 @@ RUN cd /root/bladeRF/ \ ../ \ && make -j${parallel} \ && make install \ + && ldconfig + +# Do an i686 build +RUN cd /root/bladeRF/ \ + && rm -rf build \ + && mkdir -p build \ + && cd build \ + && cmake \ + -DBUILD_DOCUMENTATION=ON \ + -DCMAKE_C_COMPILER=${compiler} \ + -DCMAKE_BUILD_TYPE=${buildtype} \ + -DCMAKE_C_FLAGS="-march=i686 -mtune=i686" \ + -DCMAKE_CXX_FLAGS="-march=i686 -mtune=i686" \ + -DENABLE_FX3_BUILD=OFF \ + -DENABLE_HOST_BUILD=ON \ + -DTAGGED_RELEASE=${taggedrelease} \ + ../ \ + && make -j${parallel} \ + && make install \ && ldconfig \ No newline at end of file diff --git a/host/misc/docker/ubuntu-latest.Dockerfile b/host/misc/docker/ubuntu-latest.Dockerfile index b1e4d9e7..1a191cbf 100644 --- a/host/misc/docker/ubuntu-latest.Dockerfile +++ b/host/misc/docker/ubuntu-latest.Dockerfile @@ -30,6 +30,8 @@ LABEL com.nuand.ci.distribution.name="Ubuntu" LABEL com.nuand.ci.distribution.codename="latest" LABEL com.nuand.ci.distribution.version="latest" +ENV DEBIAN_FRONTEND=noninteractive + # Install things RUN apt-get update \ && apt-get install -y \ @@ -69,6 +71,7 @@ RUN cd /root/bladeRF/ \ -DCMAKE_BUILD_TYPE=${buildtype} \ -DENABLE_FX3_BUILD=OFF \ -DENABLE_HOST_BUILD=ON \ + -DTEST_REGRESSION=ON \ -DTAGGED_RELEASE=${taggedrelease} \ ../ \ && make -j${parallel} \ diff --git a/host/misc/docker/ubuntu-lunar-i386.Dockerfile b/host/misc/docker/ubuntu-lunar-i386.Dockerfile deleted file mode 100644 index 27f0f7ea..00000000 --- a/host/misc/docker/ubuntu-lunar-i386.Dockerfile +++ /dev/null @@ -1,76 +0,0 @@ -# This file is part of the bladeRF project: -# http://www.github.com/nuand/bladeRF -# -# Copyright (c) 2018-2025 Nuand LLC. -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -FROM i386/ubuntu:lunar - -LABEL maintainer="Nuand LLC " -LABEL version="0.0.2" -LABEL description="CI build environment for the bladeRF project" -LABEL com.nuand.ci.distribution.name="Ubuntu" -LABEL com.nuand.ci.distribution.codename="lunar" -LABEL com.nuand.ci.distribution.version="23.04-i386" - -# Install things -RUN apt-get update \ - && apt-get install -y \ - build-essential \ - clang \ - cmake \ - doxygen \ - git \ - help2man \ - libcurl4-openssl-dev \ - libedit-dev \ - libncurses5-dev \ - libusb-1.0-0-dev \ - pandoc \ - pkg-config \ - usbutils \ - && apt-get clean - -# Copy in our build context -COPY --from=nuand/bladerf-buildenv:base /root/bladeRF /root/bladeRF -COPY --from=nuand/bladerf-buildenv:base /root/.config /root/.config -WORKDIR /root/bladeRF - -# Build arguments -ARG compiler=gcc -ARG buildtype=Release -ARG taggedrelease=NO -ARG parallel=1 - -# Do the build! -RUN cd /root/bladeRF/ \ - && mkdir -p build \ - && cd build \ - && cmake \ - -DBUILD_DOCUMENTATION=ON \ - -DCMAKE_C_COMPILER=${compiler} \ - -DCMAKE_BUILD_TYPE=${buildtype} \ - -DENABLE_FX3_BUILD=OFF \ - -DENABLE_HOST_BUILD=ON \ - -DTAGGED_RELEASE=${taggedrelease} \ - ../ \ - && make -j${parallel} \ - && make install \ - && ldconfig \ No newline at end of file diff --git a/host/misc/docker/ubuntu-lunar.Dockerfile b/host/misc/docker/ubuntu-lunar.Dockerfile deleted file mode 100644 index 042f787d..00000000 --- a/host/misc/docker/ubuntu-lunar.Dockerfile +++ /dev/null @@ -1,76 +0,0 @@ -# This file is part of the bladeRF project: -# http://www.github.com/nuand/bladeRF -# -# Copyright (c) 2018-2025 Nuand LLC. -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -FROM ubuntu:lunar - -LABEL maintainer="Nuand LLC " -LABEL version="0.0.2" -LABEL description="CI build environment for the bladeRF project" -LABEL com.nuand.ci.distribution.name="Ubuntu" -LABEL com.nuand.ci.distribution.codename="lunar" -LABEL com.nuand.ci.distribution.version="23.04" - -# Install things -RUN apt-get update \ - && apt-get install -y \ - build-essential \ - clang \ - cmake \ - doxygen \ - git \ - help2man \ - libcurl4-openssl-dev \ - libedit-dev \ - libncurses5-dev \ - libusb-1.0-0-dev \ - pandoc \ - pkg-config \ - usbutils \ - && apt-get clean - -# Copy in our build context -COPY --from=nuand/bladerf-buildenv:base /root/bladeRF /root/bladeRF -COPY --from=nuand/bladerf-buildenv:base /root/.config /root/.config -WORKDIR /root/bladeRF - -# Build arguments -ARG compiler=gcc -ARG buildtype=Release -ARG taggedrelease=NO -ARG parallel=1 - -# Do the build! -RUN cd /root/bladeRF/ \ - && mkdir -p build \ - && cd build \ - && cmake \ - -DBUILD_DOCUMENTATION=ON \ - -DCMAKE_C_COMPILER=${compiler} \ - -DCMAKE_BUILD_TYPE=${buildtype} \ - -DENABLE_FX3_BUILD=OFF \ - -DENABLE_HOST_BUILD=ON \ - -DTAGGED_RELEASE=${taggedrelease} \ - ../ \ - && make -j${parallel} \ - && make install \ - && ldconfig \ No newline at end of file diff --git a/host/misc/docker/ubuntu-mantic-i386.Dockerfile b/host/misc/docker/ubuntu-mantic-i386.Dockerfile deleted file mode 100644 index 12890378..00000000 --- a/host/misc/docker/ubuntu-mantic-i386.Dockerfile +++ /dev/null @@ -1,76 +0,0 @@ -# This file is part of the bladeRF project: -# http://www.github.com/nuand/bladeRF -# -# Copyright (c) 2018-2025 Nuand LLC. -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -FROM i386/ubuntu:mantic - -LABEL maintainer="Nuand LLC " -LABEL version="0.0.2" -LABEL description="CI build environment for the bladeRF project" -LABEL com.nuand.ci.distribution.name="Ubuntu" -LABEL com.nuand.ci.distribution.codename="mantic" -LABEL com.nuand.ci.distribution.version="23.10-i386" - -# Install things -RUN apt-get update \ - && apt-get install -y \ - build-essential \ - clang \ - cmake \ - doxygen \ - git \ - help2man \ - libcurl4-openssl-dev \ - libedit-dev \ - libncurses5-dev \ - libusb-1.0-0-dev \ - pandoc \ - pkg-config \ - usbutils \ - && apt-get clean - -# Copy in our build context -COPY --from=nuand/bladerf-buildenv:base /root/bladeRF /root/bladeRF -COPY --from=nuand/bladerf-buildenv:base /root/.config /root/.config -WORKDIR /root/bladeRF - -# Build arguments -ARG compiler=gcc -ARG buildtype=Release -ARG taggedrelease=NO -ARG parallel=1 - -# Do the build! -RUN cd /root/bladeRF/ \ - && mkdir -p build \ - && cd build \ - && cmake \ - -DBUILD_DOCUMENTATION=ON \ - -DCMAKE_C_COMPILER=${compiler} \ - -DCMAKE_BUILD_TYPE=${buildtype} \ - -DENABLE_FX3_BUILD=OFF \ - -DENABLE_HOST_BUILD=ON \ - -DTAGGED_RELEASE=${taggedrelease} \ - ../ \ - && make -j${parallel} \ - && make install \ - && ldconfig \ No newline at end of file diff --git a/host/misc/docker/ubuntu-mantic.Dockerfile b/host/misc/docker/ubuntu-mantic.Dockerfile deleted file mode 100644 index ae9924d0..00000000 --- a/host/misc/docker/ubuntu-mantic.Dockerfile +++ /dev/null @@ -1,76 +0,0 @@ -# This file is part of the bladeRF project: -# http://www.github.com/nuand/bladeRF -# -# Copyright (c) 2018-2025 Nuand LLC. -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -FROM ubuntu:mantic - -LABEL maintainer="Nuand LLC " -LABEL version="0.0.2" -LABEL description="CI build environment for the bladeRF project" -LABEL com.nuand.ci.distribution.name="Ubuntu" -LABEL com.nuand.ci.distribution.codename="mantic" -LABEL com.nuand.ci.distribution.version="23.10" - -# Install things -RUN apt-get update \ - && apt-get install -y \ - build-essential \ - clang \ - cmake \ - doxygen \ - git \ - help2man \ - libcurl4-openssl-dev \ - libedit-dev \ - libncurses5-dev \ - libusb-1.0-0-dev \ - pandoc \ - pkg-config \ - usbutils \ - && apt-get clean - -# Copy in our build context -COPY --from=nuand/bladerf-buildenv:base /root/bladeRF /root/bladeRF -COPY --from=nuand/bladerf-buildenv:base /root/.config /root/.config -WORKDIR /root/bladeRF - -# Build arguments -ARG compiler=gcc -ARG buildtype=Release -ARG taggedrelease=NO -ARG parallel=1 - -# Do the build! -RUN cd /root/bladeRF/ \ - && mkdir -p build \ - && cd build \ - && cmake \ - -DBUILD_DOCUMENTATION=ON \ - -DCMAKE_C_COMPILER=${compiler} \ - -DCMAKE_BUILD_TYPE=${buildtype} \ - -DENABLE_FX3_BUILD=OFF \ - -DENABLE_HOST_BUILD=ON \ - -DTAGGED_RELEASE=${taggedrelease} \ - ../ \ - && make -j${parallel} \ - && make install \ - && ldconfig \ No newline at end of file diff --git a/host/misc/docker/ubuntu-noble-i386.Dockerfile b/host/misc/docker/ubuntu-noble-i386.Dockerfile deleted file mode 100644 index 034a307c..00000000 --- a/host/misc/docker/ubuntu-noble-i386.Dockerfile +++ /dev/null @@ -1,76 +0,0 @@ -# This file is part of the bladeRF project: -# http://www.github.com/nuand/bladeRF -# -# Copyright (c) 2018-2025 Nuand LLC. -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -FROM i386/ubuntu:noble - -LABEL maintainer="Nuand LLC " -LABEL version="0.0.2" -LABEL description="CI build environment for the bladeRF project" -LABEL com.nuand.ci.distribution.name="Ubuntu" -LABEL com.nuand.ci.distribution.codename="noble" -LABEL com.nuand.ci.distribution.version="24.04-i386" - -# Install things -RUN apt-get update \ - && apt-get install -y \ - build-essential \ - clang \ - cmake \ - doxygen \ - git \ - help2man \ - libcurl4-openssl-dev \ - libedit-dev \ - libncurses5-dev \ - libusb-1.0-0-dev \ - pandoc \ - pkg-config \ - usbutils \ - && apt-get clean - -# Copy in our build context -COPY --from=nuand/bladerf-buildenv:base /root/bladeRF /root/bladeRF -COPY --from=nuand/bladerf-buildenv:base /root/.config /root/.config -WORKDIR /root/bladeRF - -# Build arguments -ARG compiler=gcc -ARG buildtype=Release -ARG taggedrelease=NO -ARG parallel=1 - -# Do the build! -RUN cd /root/bladeRF/ \ - && mkdir -p build \ - && cd build \ - && cmake \ - -DBUILD_DOCUMENTATION=ON \ - -DCMAKE_C_COMPILER=${compiler} \ - -DCMAKE_BUILD_TYPE=${buildtype} \ - -DENABLE_FX3_BUILD=OFF \ - -DENABLE_HOST_BUILD=ON \ - -DTAGGED_RELEASE=${taggedrelease} \ - ../ \ - && make -j${parallel} \ - && make install \ - && ldconfig \ No newline at end of file diff --git a/host/misc/docker/ubuntu-noble.Dockerfile b/host/misc/docker/ubuntu-noble.Dockerfile index c3184c35..8887d05e 100644 --- a/host/misc/docker/ubuntu-noble.Dockerfile +++ b/host/misc/docker/ubuntu-noble.Dockerfile @@ -30,6 +30,8 @@ LABEL com.nuand.ci.distribution.name="Ubuntu" LABEL com.nuand.ci.distribution.codename="noble" LABEL com.nuand.ci.distribution.version="24.04" +ENV DEBIAN_FRONTEND=noninteractive + # Install things RUN apt-get update \ && apt-get install -y \ @@ -69,6 +71,7 @@ RUN cd /root/bladeRF/ \ -DCMAKE_BUILD_TYPE=${buildtype} \ -DENABLE_FX3_BUILD=OFF \ -DENABLE_HOST_BUILD=ON \ + -DTEST_REGRESSION=ON \ -DTAGGED_RELEASE=${taggedrelease} \ ../ \ && make -j${parallel} \ diff --git a/host/misc/docker/ubuntu-trusty-i386.Dockerfile b/host/misc/docker/ubuntu-trusty-i386.Dockerfile deleted file mode 100644 index 08bdd649..00000000 --- a/host/misc/docker/ubuntu-trusty-i386.Dockerfile +++ /dev/null @@ -1,76 +0,0 @@ -# This file is part of the bladeRF project: -# http://www.github.com/nuand/bladeRF -# -# Copyright (c) 2018 Nuand LLC. -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -FROM i386/ubuntu:trusty - -LABEL maintainer="Nuand LLC " -LABEL version="0.0.2" -LABEL description="CI build environment for the bladeRF project" -LABEL com.nuand.ci.distribution.name="Ubuntu" -LABEL com.nuand.ci.distribution.codename="trusty-i386" -LABEL com.nuand.ci.distribution.version="14.04" - -# Install things -RUN apt-get update \ - && apt-get install -y \ - build-essential \ - clang \ - cmake \ - doxygen \ - git \ - help2man \ - libcurl4-openssl-dev \ - libedit-dev \ - libncurses5-dev \ - libusb-1.0-0-dev \ - pandoc \ - pkg-config \ - usbutils \ - && apt-get clean - -# Copy in our build context -COPY --from=nuand/bladerf-buildenv:base /root/bladeRF /root/bladeRF -COPY --from=nuand/bladerf-buildenv:base /root/.config /root/.config -WORKDIR /root/bladeRF - -# Build arguments -ARG compiler=gcc -ARG buildtype=Release -ARG taggedrelease=NO -ARG parallel=1 - -# Do the build! -RUN cd /root/bladeRF/ \ - && mkdir -p build \ - && cd build \ - && cmake \ - -DBUILD_DOCUMENTATION=ON \ - -DCMAKE_C_COMPILER=${compiler} \ - -DCMAKE_BUILD_TYPE=${buildtype} \ - -DENABLE_FX3_BUILD=OFF \ - -DENABLE_HOST_BUILD=ON \ - -DTAGGED_RELEASE=${taggedrelease} \ - ../ \ - && make -j${parallel} \ - && make install \ - && ldconfig diff --git a/host/misc/docker/ubuntu-trusty.Dockerfile b/host/misc/docker/ubuntu-trusty.Dockerfile deleted file mode 100644 index ba8cdfde..00000000 --- a/host/misc/docker/ubuntu-trusty.Dockerfile +++ /dev/null @@ -1,76 +0,0 @@ -# This file is part of the bladeRF project: -# http://www.github.com/nuand/bladeRF -# -# Copyright (c) 2018 Nuand LLC. -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -FROM ubuntu:trusty - -LABEL maintainer="Nuand LLC " -LABEL version="0.0.2" -LABEL description="CI build environment for the bladeRF project" -LABEL com.nuand.ci.distribution.name="Ubuntu" -LABEL com.nuand.ci.distribution.codename="trusty" -LABEL com.nuand.ci.distribution.version="14.04" - -# Install things -RUN apt-get update \ - && apt-get install -y \ - build-essential \ - clang \ - cmake \ - doxygen \ - git \ - help2man \ - libcurl4-openssl-dev \ - libedit-dev \ - libncurses5-dev \ - libusb-1.0-0-dev \ - pandoc \ - pkg-config \ - usbutils \ - && apt-get clean - -# Copy in our build context -COPY --from=nuand/bladerf-buildenv:base /root/bladeRF /root/bladeRF -COPY --from=nuand/bladerf-buildenv:base /root/.config /root/.config -WORKDIR /root/bladeRF - -# Build arguments -ARG compiler=gcc -ARG buildtype=Release -ARG taggedrelease=NO -ARG parallel=1 - -# Do the build! -RUN cd /root/bladeRF/ \ - && mkdir -p build \ - && cd build \ - && cmake \ - -DBUILD_DOCUMENTATION=ON \ - -DCMAKE_C_COMPILER=${compiler} \ - -DCMAKE_BUILD_TYPE=${buildtype} \ - -DENABLE_FX3_BUILD=OFF \ - -DENABLE_HOST_BUILD=ON \ - -DTAGGED_RELEASE=${taggedrelease} \ - ../ \ - && make -j${parallel} \ - && make install \ - && ldconfig diff --git a/host/misc/docker/ubuntu-xenial-i386.Dockerfile b/host/misc/docker/ubuntu-xenial-i386.Dockerfile deleted file mode 100644 index 951dbc76..00000000 --- a/host/misc/docker/ubuntu-xenial-i386.Dockerfile +++ /dev/null @@ -1,76 +0,0 @@ -# This file is part of the bladeRF project: -# http://www.github.com/nuand/bladeRF -# -# Copyright (c) 2018 Nuand LLC. -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -FROM i386/ubuntu:xenial - -LABEL maintainer="Nuand LLC " -LABEL version="0.0.2" -LABEL description="CI build environment for the bladeRF project" -LABEL com.nuand.ci.distribution.name="Ubuntu" -LABEL com.nuand.ci.distribution.codename="xenial-i386" -LABEL com.nuand.ci.distribution.version="16.04" - -# Install things -RUN apt-get update \ - && apt-get install -y \ - build-essential \ - clang \ - cmake \ - doxygen \ - git \ - help2man \ - libcurl4-openssl-dev \ - libedit-dev \ - libncurses5-dev \ - libusb-1.0-0-dev \ - pandoc \ - pkg-config \ - usbutils \ - && apt-get clean - -# Copy in our build context -COPY --from=nuand/bladerf-buildenv:base /root/bladeRF /root/bladeRF -COPY --from=nuand/bladerf-buildenv:base /root/.config /root/.config -WORKDIR /root/bladeRF - -# Build arguments -ARG compiler=gcc -ARG buildtype=Release -ARG taggedrelease=NO -ARG parallel=1 - -# Do the build! -RUN cd /root/bladeRF/ \ - && mkdir -p build \ - && cd build \ - && cmake \ - -DBUILD_DOCUMENTATION=ON \ - -DCMAKE_C_COMPILER=${compiler} \ - -DCMAKE_BUILD_TYPE=${buildtype} \ - -DENABLE_FX3_BUILD=OFF \ - -DENABLE_HOST_BUILD=ON \ - -DTAGGED_RELEASE=${taggedrelease} \ - ../ \ - && make -j${parallel} \ - && make install \ - && ldconfig diff --git a/host/misc/docker/ubuntu-xenial.Dockerfile b/host/misc/docker/ubuntu-xenial.Dockerfile index 5019b3c9..75f2844e 100644 --- a/host/misc/docker/ubuntu-xenial.Dockerfile +++ b/host/misc/docker/ubuntu-xenial.Dockerfile @@ -1,7 +1,7 @@ # This file is part of the bladeRF project: # http://www.github.com/nuand/bladeRF # -# Copyright (c) 2018 Nuand LLC. +# Copyright (c) 2025 Nuand LLC. # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -42,12 +42,28 @@ RUN apt-get update \ libcurl4-openssl-dev \ libedit-dev \ libncurses5-dev \ + libncurses-dev \ + libncursesw5-dev \ + libssl-dev \ libusb-1.0-0-dev \ pandoc \ pkg-config \ usbutils \ + wget \ && apt-get clean +# Custom compile cmake because the version provided in the xenial repos is too old for our cmake scripts +RUN version=3.28 \ +&& build=1 \ +&& mkdir ~/temp \ +&& cd ~/temp \ +&& wget -nv https://cmake.org/files/v$version/cmake-$version.$build.tar.gz \ +&& tar -xzf cmake-$version.$build.tar.gz \ +&& cd cmake-$version.$build/ \ +&& ./bootstrap --parallel=$(nproc) --no-debugger \ +&& make -j$(nproc) \ +&& make install + # Copy in our build context COPY --from=nuand/bladerf-buildenv:base /root/bladeRF /root/bladeRF COPY --from=nuand/bladerf-buildenv:base /root/.config /root/.config @@ -59,6 +75,8 @@ ARG buildtype=Release ARG taggedrelease=NO ARG parallel=1 +RUN ${compiler} --version + # Do the build! RUN cd /root/bladeRF/ \ && mkdir -p build \ @@ -70,7 +88,8 @@ RUN cd /root/bladeRF/ \ -DENABLE_FX3_BUILD=OFF \ -DENABLE_HOST_BUILD=ON \ -DTAGGED_RELEASE=${taggedrelease} \ - ../ \ + ../ \ && make -j${parallel} \ && make install \ && ldconfig + \ No newline at end of file diff --git a/host/utilities/bladeRF-power/src/main.c b/host/utilities/bladeRF-power/src/main.c index 58baba3f..086ee14c 100644 --- a/host/utilities/bladeRF-power/src/main.c +++ b/host/utilities/bladeRF-power/src/main.c @@ -94,7 +94,7 @@ int main(int argc, char *argv[]) case 't': case 'r': - if (test.direction != DIRECTION_UNSET) { + if ((int)test.direction != DIRECTION_UNSET) { fprintf(stderr, "Only one direction may be specified.\n"); test.direction = ask_direction(); break; @@ -145,7 +145,7 @@ int main(int argc, char *argv[]) CHECK(bladerf_get_devinfo(dev, &devinfo)); printf("Device: %s\n", devinfo.serial); - if (test.direction == DIRECTION_UNSET) { + if ((int)test.direction == DIRECTION_UNSET) { test.direction = ask_direction(); } From a81b7ce4c5e8199eaad7e06bdbe0bbe090507ada Mon Sep 17 00:00:00 2001 From: Ben Morse Date: Wed, 11 Jun 2025 01:46:40 -0700 Subject: [PATCH 229/238] hdl: fix foxhunt build error --- hdl/fpga/platforms/bladerf-micro/software/foxhunt/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hdl/fpga/platforms/bladerf-micro/software/foxhunt/Makefile b/hdl/fpga/platforms/bladerf-micro/software/foxhunt/Makefile index cb8a9e85..4b39a35f 100644 --- a/hdl/fpga/platforms/bladerf-micro/software/foxhunt/Makefile +++ b/hdl/fpga/platforms/bladerf-micro/software/foxhunt/Makefile @@ -38,7 +38,8 @@ LIBAD936X_DIR := ../../../../fpga/ip/analogdevicesinc/no_OS INC_DIRS += $(LIBAD936X_BUILDDIR) \ ../$(LIBAD936X_DIR)/include \ - ../../../../../../host/common/include + ../../../../../../host/common/include \ + ../../../../../../thirdparty/analogdevicesinc/no-OS_local/platform_bladerf2/ LIB_DIRS += $(LIBAD936X_BUILDDIR) LDDEPS += $(LIBAD936X_BUILDDIR)/libad936x.a From 4494aa41abbc8d24d4b49dce7eb8eb474c123fe7 Mon Sep 17 00:00:00 2001 From: Ben Morse Date: Wed, 11 Jun 2025 01:48:08 -0700 Subject: [PATCH 230/238] host: test_regression can build every bitfile --- .../test_regression/CMakeLists.txt | 10 ++ .../test_regression/src/main.cxx | 165 ++++++++++++++++-- 2 files changed, 158 insertions(+), 17 deletions(-) diff --git a/host/libraries/libbladeRF_test/test_regression/CMakeLists.txt b/host/libraries/libbladeRF_test/test_regression/CMakeLists.txt index 78f09b88..5747d519 100644 --- a/host/libraries/libbladeRF_test/test_regression/CMakeLists.txt +++ b/host/libraries/libbladeRF_test/test_regression/CMakeLists.txt @@ -72,6 +72,16 @@ add_custom_target(test_synthesis DEPENDS ${PROJECT_NAME} WORKING_DIRECTORY ${CMAKE_BINARY_DIR}) +add_custom_target(prep_ci + COMMAND ${PROJECT_NAME} --gtest_filter="dump_tests.disk" --gtest_output="json" + DEPENDS ${PROJECT_NAME} + WORKING_DIRECTORY ${CMAKE_BINARY_DIR}) + +add_custom_target(bitfile_ci + COMMAND ${PROJECT_NAME} --gtest_filter="bitfile_ci/synth_ci*" --gtest_output="json":bitfile_ci.json + DEPENDS ${PROJECT_NAME} + WORKING_DIRECTORY ${CMAKE_BINARY_DIR}) + target_link_libraries( ${PROJECT_NAME} libbladerf_shared diff --git a/host/libraries/libbladeRF_test/test_regression/src/main.cxx b/host/libraries/libbladeRF_test/test_regression/src/main.cxx index 3d95ba07..5813c603 100644 --- a/host/libraries/libbladeRF_test/test_regression/src/main.cxx +++ b/host/libraries/libbladeRF_test/test_regression/src/main.cxx @@ -36,9 +36,11 @@ #include #include #include +#include #define TEST_LIBBLADERF libbladeRF #define TEST_XB200 xb200 +#define BLADERF_QUARTUS_CI_DIR "bladeRF/hdl/quartus/" #define BLADERF_QUARTUS_DIR "../../hdl/quartus/" #define BLADERF_MODELSIM_DIR "../../hdl/fpga/platforms/bladerf-micro/modelsim/" #define NIOS2SHELL "~/intelFPGA_lite/20.1/nios2eds/nios2_command_shell.sh" @@ -474,6 +476,20 @@ const std::vector> fpga_images {"bladeRF-micro", "wlan", "A9"} }; +const std::vector> fpga_images_ci = { + {"bladeRF", "hosted", "40"}, + {"bladeRF", "hosted", "115"}, + {"bladeRF", "fsk_bridge", "40"}, + {"bladeRF", "fsk_bridge", "115"}, + {"bladeRF", "qpsk_tx", "40"}, + {"bladeRF", "qpsk_tx", "115"}, + {"bladeRF-micro", "hosted", "A4"}, + {"bladeRF-micro", "hosted", "A9"}, + {"bladeRF-micro", "foxhunt", "A4"}, + {"bladeRF-micro", "foxhunt", "A9"}, + {"bladeRF-micro", "wlan", "A9"} +}; + class synth: public ::testing::TestWithParam> { char build_dir[PATH_MAX]; void SetUp() override { @@ -506,6 +522,8 @@ class synth: public ::testing::TestWithParam(GetParam()); std::string revision = std::get<1>(GetParam()); @@ -521,27 +539,130 @@ TEST_P(synth, synthesis) { EXPECT_EQ(status, 0); } +TEST_P(synth_ci, synthesis) { + std::string board = std::get<0>(GetParam()); + std::string revision = std::get<1>(GetParam()); + std::string size = std::get<2>(GetParam()); + + std::string command = NIOS2SHELL; + command += " ./build_bladerf.sh "; + command += " -b " + board; + command += " -r " + revision; + command += " -s " + size; + command += " -D "; + + status = std::system(command.c_str()); + EXPECT_EQ(status, 0); +} + + +/** + * @brief Convert a tuple into a build output folder used by build_bladerf.sh + * This is only valid when -o is passed to build_bladerf.sh + * + * @param[in] row The tuple + * + * @return The output folder name + */ +std::string build_folder_name(const std::tuple& row) { + std::string name = absl::StrCat( + std::get<1>(row), "x", + std::get<2>(row)); + absl::c_replace_if(name, [](char c) { return !std::isalnum(c); }, '_'); + return name; +} + +/** + * @brief Convert a tuple into a test name. + * + * @param[in] row The tuple + * + * @return The name of the test + */ +std::string test_name(const std::tuple& row) { + std::string name = absl::StrCat( + std::get<0>(row), "_", + std::get<1>(row), "_", + std::get<2>(row)); + absl::c_replace_if(name, [](char c) { return !std::isalnum(c); }, '_'); + return name; +} + +/** + * @brief Convert a TestParamInfo into a test name. + * + * @param[in] row The TestParamInfo + * + * @return The name of the test + */ +std::string info_test_name(const testing::TestParamInfo& info) { + return test_name(info.param); +} + INSTANTIATE_TEST_SUITE_P(synthesize_defaults, synth, ::testing::ValuesIn(fpga_images_defaults), - [](const testing::TestParamInfo& info) { - std::string name = absl::StrCat( - std::get<0>(info.param), "_", - std::get<1>(info.param), "_", - std::get<2>(info.param)); - absl::c_replace_if(name, [](char c) { return !std::isalnum(c); }, '_'); - return name; - }); + info_test_name); INSTANTIATE_TEST_SUITE_P(DISABLED_synthesize_all, synth, ::testing::ValuesIn(fpga_images_all), - [](const testing::TestParamInfo& info) { - std::string name = absl::StrCat( - std::get<0>(info.param), "_", - std::get<1>(info.param), "_", - std::get<2>(info.param)); - absl::c_replace_if(name, [](char c) { return !std::isalnum(c); }, '_'); - return name; - }); + info_test_name); + +INSTANTIATE_TEST_SUITE_P(bitfile_ci, synth_ci, + ::testing::ValuesIn(fpga_images_ci), + info_test_name); + +/** + * @brief Not a test, writes out an artifacts file to disk so CI can pick it up. + * + */ +TEST(dump_tests, disk) { + std::vector out; + for(const auto& row : fpga_images_ci) { + out.push_back(test_name(row)); + out.push_back(std::string(BLADERF_QUARTUS_CI_DIR) + build_folder_name(row)); + } + + std::ofstream file("ci_artifacts.txt"); // Create an ofstream object and open "ci_artifacts.txt" for writing + + if (!file.is_open()) { + std::cerr << "Failed to open file." << std::endl; + FAIL(); + } + + file << "["; + + for(size_t i = 0; i < out.size(); ++i) { + file << "\"" << out[i] << "\""; + if (i < out.size() - 1) { + file << ", "; + } + } + + file << "]" << std::endl; + file.close(); +} + +/** + * @brief Convert argc/argv into a vector, and filter out gtest_ args + * + * @param[in] argc The number of arguments + * @param[in] argv The arguments + * + * @return A vector of arguments + */ +std::vector filter_gtest_args(int argc, char** argv) { + std::vector args; + for (int i = 0; i < argc; ++i) { + std::string arg(argv[i]); + + // skip all arguments that are for gtest + if (i == 0 || arg.find("--gtest_") != 0) { + std::cout << "adding " << arg << "\n"; + args.push_back(arg); + } + } + return args; +} #define OPTARG "v:h" static struct option long_options[] = { @@ -556,8 +677,17 @@ int main(int argc, char** argv) { int opt_ind = 0; bladerf_log_level log_level; + auto filtered = filter_gtest_args(argc, argv); + const int argc_filt = filtered.size(); + const char* argv_filt[argc_filt]; + + // copy back into a c-style array for getopt_long + for (size_t i = 0; i < filtered.size(); ++i) { + argv_filt[i] = filtered[i].c_str(); + } + while (opt != -1) { - opt = getopt_long(argc, argv, OPTARG, long_options, &opt_ind); + opt = getopt_long(argc_filt, const_cast(argv_filt), OPTARG, long_options, &opt_ind); switch (opt) { case 'v': @@ -579,6 +709,7 @@ int main(int argc, char** argv) { printf(" Example filters: \"libbladeRF*\", \"hdl*\", \"synthesis*\"\n"); printf(" --gtest_also_run_disabled_tests Run only the tests matching the filter.\n"); printf(" --gtest_output=\"json\" Generates JSON report of test run.\n"); + printf(" --gtest_help View gtest specific help menu.\n"); printf("\n"); return EXIT_SUCCESS; From 7706720f99b6a4aa14894be3351a402f755dc035 Mon Sep 17 00:00:00 2001 From: Ben Morse Date: Tue, 1 Jul 2025 13:22:22 -0700 Subject: [PATCH 231/238] docker: fix rocky-9 Docker build --- host/misc/docker/rocky-9.Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/host/misc/docker/rocky-9.Dockerfile b/host/misc/docker/rocky-9.Dockerfile index c8610a15..a5042502 100644 --- a/host/misc/docker/rocky-9.Dockerfile +++ b/host/misc/docker/rocky-9.Dockerfile @@ -76,4 +76,5 @@ RUN cd /root/bladeRF/ \ ../ \ && make -j${parallel} \ && make install \ + && echo "/usr/local/lib64" > /etc/ld.so.conf.d/bladerf.conf \ && ldconfig \ No newline at end of file From fa2f917179bd4dd2e8781d2eadb4109d768c0e06 Mon Sep 17 00:00:00 2001 From: ifrasch17 Date: Tue, 1 Jul 2025 17:48:53 -0600 Subject: [PATCH 232/238] bladeRF-fsk: bump version to add configurable sample rate, better test_suite --- host/utilities/bladeRF-fsk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/host/utilities/bladeRF-fsk b/host/utilities/bladeRF-fsk index 16387541..fb903684 160000 --- a/host/utilities/bladeRF-fsk +++ b/host/utilities/bladeRF-fsk @@ -1 +1 @@ -Subproject commit 16387541dd97ddd34d7e648fc58bfdd7fed56b9f +Subproject commit fb903684036217b9db9dcd6be8007548e12a377e From 3d647f3db9c7ba083b749884c6df7e0c4f181bd2 Mon Sep 17 00:00:00 2001 From: Ben Morse Date: Mon, 9 Jun 2025 14:01:30 -0700 Subject: [PATCH 233/238] host: improve txrx_hwloop test - fix bug where test would erroneously pass due to negative value - add gain, better threshold control, png output - requirements.txt now supports Ubuntu 20.04 and newer --- .gitignore | 3 + .../libbladeRF_test/requirements.txt | 15 +- .../test_timestamps/CMakeLists.txt | 2 +- .../scripts/test_txrx_hwloop.py | 204 ++++++++++++++---- .../test_timestamps/src/test_txrx_hwloop.c | 24 +++ .../test_timestamps/src/test_txrx_hwloop.h | 46 +++- 6 files changed, 235 insertions(+), 59 deletions(-) diff --git a/.gitignore b/.gitignore index 3eb0b22f..c060d006 100644 --- a/.gitignore +++ b/.gitignore @@ -57,5 +57,8 @@ host/misc/windows/scripts/work env/ venv/ ENV/ +__pycache__/ +*.py[cod] +*$py.class .vscode/ diff --git a/host/libraries/libbladeRF_test/requirements.txt b/host/libraries/libbladeRF_test/requirements.txt index 875171b7..7f5123fa 100644 --- a/host/libraries/libbladeRF_test/requirements.txt +++ b/host/libraries/libbladeRF_test/requirements.txt @@ -1,14 +1,15 @@ -contourpy==1.3.1 +contourpy>=1.1.1 cycler==0.12.1 fonttools==4.56.0 -kiwisolver==1.4.8 -matplotlib==3.10.0 -numpy==2.2.3 +kiwisolver>=1.4.7 +matplotlib>=3.7.5 +numpy>=1.24.4 packaging==24.2 -pandas==2.2.3 -pillow==11.1.0 -pyparsing==3.2.1 +pandas>=2.0.3 +pillow>=10.4.0 +pyparsing>=3.1.4 python-dateutil==2.9.0.post0 pytz==2025.1 +scipy>=1.8.0 six==1.17.0 tzdata==2025.1 diff --git a/host/libraries/libbladeRF_test/test_timestamps/CMakeLists.txt b/host/libraries/libbladeRF_test/test_timestamps/CMakeLists.txt index 34b40751..455aba83 100644 --- a/host/libraries/libbladeRF_test/test_timestamps/CMakeLists.txt +++ b/host/libraries/libbladeRF_test/test_timestamps/CMakeLists.txt @@ -81,7 +81,7 @@ add_executable(libbladeRF_test_txrx_hwloop ${SRC}) target_link_libraries(libbladeRF_test_txrx_hwloop ${LIBS}) configure_file(scripts/test_txrx_hwloop.py - ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${BIN_NAME}.py + ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libbladeRF_test_txrx_hwloop.py FILE_PERMISSIONS OWNER_EXECUTE OWNER_READ COPYONLY) diff --git a/host/libraries/libbladeRF_test/test_timestamps/scripts/test_txrx_hwloop.py b/host/libraries/libbladeRF_test/test_timestamps/scripts/test_txrx_hwloop.py index 9a832d82..bf9e00f3 100644 --- a/host/libraries/libbladeRF_test/test_timestamps/scripts/test_txrx_hwloop.py +++ b/host/libraries/libbladeRF_test/test_timestamps/scripts/test_txrx_hwloop.py @@ -26,8 +26,10 @@ import matplotlib.pyplot as plt import numpy as np import scipy.stats as st import os +import sys import argparse import subprocess +import json def close_figure(event): if event.key == 'escape': @@ -71,6 +73,8 @@ devarg_tx = "" devarg_rx = "" samp_rate_arg = "" devarg_verbosity = "" +devarg_tx_gain = "" +devarg_rx_gain = "" print_stats = False parser = argparse.ArgumentParser( @@ -84,11 +88,21 @@ parser.add_argument('-sr', '--samprate', type=int, help='Sample Rate (Hz)', defa parser.add_argument('-p', '--period', type=int, help='period length (in samples)') parser.add_argument('-i', '--iterations', type=int, help='number of pulses') parser.add_argument('-t', '--threshold', type=int, help='edge count power threshold') +parser.add_argument('-ts', '--threshold-spread', type=int, help='threshold spread (rising = threshold + spread, falling = threshold - spread)', default=int(1e6)) parser.add_argument('-tx', '--txdev', type=str, help='TX device string') parser.add_argument('-rx', '--rxdev', type=str, help='RX device string') +parser.add_argument('-g', '--tx-gain', type=int, help='TX gain (unified gain mode)') +parser.add_argument('-G', '--rx-gain', type=int, help='RX gain (unified gain mode, MGC)') parser.add_argument('-v', '--verbosity', type=str, help='bladeRF log level', default="info") parser.add_argument('-c', '--compare', help='RF loopback compare', action="store_true", default=False) +parser.add_argument('-l', '--loop', help='Enable RX device', action="store_false", default=True, dest="just_tx") parser.add_argument('-s', '--stats', help='print edge statistics', action="store_true", default=False) +parser.add_argument('-o', '--output', type=str, help='output stats to the specified filename, in JSON format') +parser.add_argument('-ng', '--no-gui', help='No GUI', action="store_false", default=True, dest="gui") +parser.add_argument('-e', '--enforce', type=float, help='enforce results and exit code appropriately (in samples, lower is more strict, less than or equal)', default=False) +parser.add_argument('--save-png', type=str, help='Path to save the plot output as a PNG file. When set the gui will not be shown. Use --png-width and --png-height to control size.') +parser.add_argument('--png-width', type=int, help='Width of saved PNG in pixels (default: 800 for single plot, 1600 for dual plot)', default=None) +parser.add_argument('--png-height', type=int, help='Height of saved PNG in pixels (default: 600)', default=None) args = parser.parse_args() @@ -114,8 +128,20 @@ if args.stats: print_stats = True if args.samprate: samp_rate_arg = f"-s {args.samprate}" +if args.tx_gain: + devarg_tx_gain = f"-g {args.tx_gain}" +if args.rx_gain: + devarg_rx_gain = f"-G {args.rx_gain}" -threshold_spread = 1e6 +plot_count = 2 if not args.just_tx and args.compare else 1 +first_label = "TX" if args.just_tx else "RX" +first_file = "compare.csv" if args.just_tx else "samples.csv" +jout = {} +jout["settings"] = {} +jout["settings"]["python_args"] = " ".join(sys.argv[1:]) +test_pass = True + +threshold_spread = args.threshold_spread rising_threshold = threshold + threshold_spread falling_threshold = threshold - threshold_spread @@ -126,39 +152,68 @@ binary_file = 'libbladeRF_test_txrx_hwloop' output_dir = os.path.dirname(os.path.abspath(__file__)) os.chdir(output_dir) proc = subprocess.run(f"./{binary_file} --fill {fill} --burst {burst} --period {period} " - f"--iterations {iterations} -l {devarg_tx} {devarg_rx} {args.compare * '-c'} " - f"{devarg_verbosity} {samp_rate_arg}", shell=True) + f"--iterations {iterations} {devarg_tx} {devarg_rx} {args.compare * '-c'} {(not args.just_tx) * '-l'} " + f"{devarg_verbosity} {samp_rate_arg} {devarg_tx_gain} {devarg_rx_gain}", shell=True) if proc.returncode != 0: print("Failed to run hwloop binary") exit(1) +if not args.compare and args.just_tx: + print("No output written for python to analyze. Please use a combination of -c and -l to display something useful.") + exit(1) + ################################################################ -# RX Data Analysis +# TX or RX Data Analysis ################################################################ -data = pd.read_csv('samples.csv') +data = pd.read_csv(first_file) + I = data['I'].to_numpy() Q = data['Q'].to_numpy() power = I**2 + Q**2 num_samples = range(len(I)) -if args.compare == True: - fig, ((ax1, ax3), - (ax2, ax4), - (ax5, ax6)) = plt.subplots(nrows=3, ncols=2, figsize=(16, 6)) +# Calculate figure size for custom PNG dimensions or GUI display +if args.save_png: + # For PNG output, calculate figsize based on desired pixel dimensions + default_width = 1600 if plot_count == 2 else 800 + default_height = 600 + + png_width = args.png_width if args.png_width else default_width + png_height = args.png_height if args.png_height else default_height + + # Use DPI of 100 to make calculations simple (pixels = inches * 100) + dpi = 100 + figsize = (png_width/dpi, png_height/dpi) else: - fig, (ax1, ax2, ax5) = plt.subplots(nrows=3, ncols=1, figsize=(8, 6)) + # For GUI display, use the original sizes + figsize = (16, 6) if plot_count == 2 else (8, 6) + dpi = 100 -ax1.set_title('RX Board IQ') -ax1.plot(I, label='I') -ax1.plot(Q, label='Q') -ax2.set_title('RX Board Power') -ax2.plot(power, label='Power', color='red') +if args.gui or args.save_png: + if plot_count == 2: + fig, ((ax1, ax3), + (ax2, ax4), + (ax5, ax6)) = plt.subplots(nrows=3, ncols=2, figsize=figsize, dpi=dpi) + else: + fig, (ax1, ax2, ax5) = plt.subplots(nrows=3, ncols=1, figsize=figsize, dpi=dpi) + + ax1.set_title('%s Board IQ' % first_label) + ax1.plot(I, label='I') + ax1.plot(Q, label='Q') + ax2.set_title('%s Board Power' % first_label) + ax2.plot(power, label='Power', color='red') + + # Add threshold lines + ax2.axhline(y=rising_threshold, color='green', linestyle='--', alpha=0.7, label=f'Rising Threshold ({rising_threshold:.0f})') + ax2.axhline(y=falling_threshold, color='orange', linestyle='--', alpha=0.7, label=f'Falling Threshold ({falling_threshold:.0f})') positive_edge, negative_edge = edge_detector(power, rising_threshold, falling_threshold, cycles_to_debounce) pos_edge_indexes = np.argwhere(positive_edge).flatten() -for i in pos_edge_indexes: - ax2.plot(i, rising_threshold, 'g^', markersize=6) + +if args.gui or args.save_png: + for i in pos_edge_indexes: + ax2.plot(i, rising_threshold, 'g^', markersize=6) time_delta_pos_edges = np.diff(pos_edge_indexes) avg = np.average(time_delta_pos_edges) @@ -172,8 +227,10 @@ if print_stats: print(f" Edge Count: {len(pos_edge_indexes)}") neg_edge_indexes = np.argwhere(negative_edge).flatten() -for i in neg_edge_indexes: - ax2.plot(i, falling_threshold, 'yv', markersize=6) + +if args.gui or args.save_png: + for i in neg_edge_indexes: + ax2.plot(i, falling_threshold, 'yv', markersize=6) time_delta_neg_edges = np.diff(neg_edge_indexes) avg = np.average(time_delta_neg_edges) @@ -186,8 +243,8 @@ if print_stats: print(f" Std.Dev: {dev:.2f}") print(f" Edge Count: {len(neg_edge_indexes)}") -print("\nRX Board") -print(f" Predicted Timestamp: {(avg):.3f} samples, Error: {(avg-period):.3f} samples") +print("\n%s Board" % first_label) +print(f" Measured Timestamp: {(avg):.3f} samples, Error: {(avg-period):.3f} samples") try: fill_expected = int(burst*fill/100) @@ -197,38 +254,59 @@ try: dev = np.std(fill) fill_vs_burst = 100 * avg/burst except ValueError as err: - print(f"[Error] RX Board: Edge count imbalanced.\n{err}") + print(f"[Error] %s Board: Edge count imbalanced.\n{err}" % first_label) print(err) fill = None fill_vs_burst = -1 -ax5.set_title("Fill Error") -ax5.set_xlabel("Error (samples)") -fill_error = fill - fill_expected -ax5.hist(fill_error, alpha=0.7, bins=30, color=('skyblue')) -print(f" Predicted Fill: {fill_vs_burst:.2f}%, Error: {(avg-fill_expected):.2f} samples") +if args.gui or args.save_png: + ax5.set_title("Fill Error") + ax5.set_xlabel("Error (samples)") + fill_error = fill - fill_expected + ax5.hist(fill_error, alpha=0.7, bins=30, color=('skyblue')) + +error_samples=(avg-fill_expected) + +jout[first_label] = { + "measured_fill_percent": fill_vs_burst, + "error_samples": error_samples} + +print(f" Measured Fill: {fill_vs_burst:.2f}%, Error: {error_samples:.2f} samples") + +if args.enforce: + local_pass = abs(error_samples) <= args.enforce + test_pass = False if not local_pass else test_pass + print(f" Test threshold: {args.enforce}, Result: %s" % ("PASS" if local_pass else "FAIL")) + ################################################################ # TX Loopback Compare ################################################################ -if args.compare == True: +if plot_count == 2: data = pd.read_csv('compare.csv') I = data['I'].to_numpy() Q = data['Q'].to_numpy() power = I**2 + Q**2 num_samples = range(len(I)) - ax3.set_title('TX Loopback Compare IQ') - ax3.plot(I, label='I') - ax3.plot(Q, label='Q') - ax4.set_title('TX Loopback Compare Power') - ax4.plot(power, label='Power', color='red') + if args.gui or args.save_png: + ax3.set_title('TX Loopback Compare IQ') + ax3.plot(I, label='I') + ax3.plot(Q, label='Q') + ax4.set_title('TX Loopback Compare Power') + ax4.plot(power, label='Power', color='red') + + # Add threshold lines + ax4.axhline(y=rising_threshold, color='green', linestyle='--', alpha=0.7, label=f'Rising Threshold ({rising_threshold:.0f})') + ax4.axhline(y=falling_threshold, color='orange', linestyle='--', alpha=0.7, label=f'Falling Threshold ({falling_threshold:.0f})') positive_edge, negative_edge = edge_detector(power, rising_threshold, falling_threshold, cycles_to_debounce) pos_edge_indexes = np.argwhere(positive_edge).flatten() - for i in pos_edge_indexes: - ax4.plot(i, rising_threshold, 'g^', markersize=6) + + if args.gui or args.save_png: + for i in pos_edge_indexes: + ax4.plot(i, rising_threshold, 'g^', markersize=6) time_delta_pos_edges = np.diff(pos_edge_indexes) avg = np.average(time_delta_pos_edges) @@ -242,8 +320,10 @@ if args.compare == True: print(f" Edge Count: {len(pos_edge_indexes)}") neg_edge_indexes = np.argwhere(negative_edge).flatten() - for i in neg_edge_indexes: - ax4.plot(i, falling_threshold, 'yv', markersize=6) + + if args.gui or args.save_png: + for i in neg_edge_indexes: + ax4.plot(i, falling_threshold, 'yv', markersize=6) time_delta_neg_edges = np.diff(neg_edge_indexes) avg = np.average(time_delta_neg_edges) @@ -256,8 +336,10 @@ if args.compare == True: print(f" Std.Dev: {dev:.2f}") print(f" Edge Count: {len(neg_edge_indexes)}") + + jout["TX"] = {"measured_timestamp": avg} print("\nTX Board: loopback compare") - print(f" Predicted Timestamp: {(avg):.3f} samples") + print(f" Measured Timestamp: {(avg):.3f} samples") try: fill_compare = neg_edge_indexes - pos_edge_indexes @@ -271,20 +353,41 @@ if args.compare == True: fill_compare = None fill_vs_burst_compare = -1 - print(f" Predicted Fill: {fill_vs_burst_compare:.2f}%, Error: {(avg-fill_expected):.2f} samples") + error_samples=(avg-fill_expected) + jout["TX"]["measured_fill_percent"] = fill_vs_burst_compare + jout["TX"]["error_samples"] = error_samples + print(f" Measured Fill: {fill_vs_burst_compare:.2f}%, Error: {error_samples:.2f} samples") + + if args.enforce: + local_pass = error_samples <= args.enforce + test_pass = False if not local_pass else test_pass + print(f" Test threshold: {args.enforce}, Result: %s" % ("PASS" if local_pass else "FAIL")) print("") print(f"Fill Delta:") fill_delta_avg = 100*(np.average(fill_compare) - np.average(fill))/burst + jout["TX"]["fill_delta_average"] = fill_delta_avg print(f" Average: {fill_delta_avg:.2f}%") - ax6.set_title("Fill Error") - ax6.set_xlabel("Error (samples)") - fill_error = fill_compare - fill_expected - ax6.hist(fill_error, alpha=0.7, bins=30, color=('skyblue')) + if args.gui or args.save_png: + ax6.set_title("Fill Error") + ax6.set_xlabel("Error (samples)") + fill_error = fill_compare - fill_expected + ax6.hist(fill_error, alpha=0.7, bins=30, color=('skyblue')) + +# File Ops +if args.enforce: + jout["exit"] = 1 if not test_pass else 0 +if args.output: + with open(args.output, 'w') as json_file: + json.dump(jout, json_file, indent=4) + +# early exit, as the rest of the script is GUI stuff +if not args.gui and not args.save_png: + exit(1 if not test_pass else 0) # General plot assignments -if args.compare == True: +if plot_count == 2: axis = (ax1, ax2, ax3, ax4) axis_iq = (ax1, ax3) axis_power = (ax2, ax4) @@ -303,6 +406,13 @@ for ax in axis_iq: ax.set_ylim(bottom=-2500, top=2500) fig.subplots_adjust(hspace=1) -print(f"\nPress [Escape] to close figure") -fig.canvas.mpl_connect('key_press_event', close_figure) -plt.show() + +if args.save_png: + plt.savefig(args.save_png, dpi=dpi) + print(f"Plot saved to {args.save_png} ({png_width}x{png_height} pixels)") +elif args.gui: + print(f"\nPress [Escape] to close figure") + fig.canvas.mpl_connect('key_press_event', close_figure) + plt.show() + +exit(1 if not test_pass else 0) diff --git a/host/libraries/libbladeRF_test/test_timestamps/src/test_txrx_hwloop.c b/host/libraries/libbladeRF_test/test_timestamps/src/test_txrx_hwloop.c index c140bf83..0a1eb41d 100644 --- a/host/libraries/libbladeRF_test/test_timestamps/src/test_txrx_hwloop.c +++ b/host/libraries/libbladeRF_test/test_timestamps/src/test_txrx_hwloop.c @@ -63,6 +63,12 @@ static void init_app_params(struct app_params *p, struct test_case *tc) { tc->fill = 50; //percent tc->init_ts_delay = 200000; tc->gain = 30; + + // Initialize gain parameters + tc->tx_gain_set = false; + tc->rx_gain_set = false; + tc->tx_gain = 0; + tc->rx_gain = 0; memset(p, 0, sizeof(p[0])); p->samplerate = 1e6; @@ -164,6 +170,24 @@ int main(int argc, char *argv[]) { } break; + case 'g': + test.tx_gain = str2uint(optarg, 0, UINT_MAX, &ok); + if (!ok) { + fprintf(stderr, "Invalid TX gain: %s\n", optarg); + return -1; + } + test.tx_gain_set = true; + break; + + case 'G': + test.rx_gain = str2uint(optarg, 0, UINT_MAX, &ok); + if (!ok) { + fprintf(stderr, "Invalid RX gain: %s\n", optarg); + return -1; + } + test.rx_gain_set = true; + break; + case 'v': log_level = str2loglevel(optarg, &ok); if (!ok) { diff --git a/host/libraries/libbladeRF_test/test_timestamps/src/test_txrx_hwloop.h b/host/libraries/libbladeRF_test/test_timestamps/src/test_txrx_hwloop.h index f30de91f..add16f7c 100644 --- a/host/libraries/libbladeRF_test/test_timestamps/src/test_txrx_hwloop.h +++ b/host/libraries/libbladeRF_test/test_timestamps/src/test_txrx_hwloop.h @@ -34,7 +34,14 @@ struct test_case { unsigned int fill; unsigned int init_ts_delay; bladerf_frequency frequency; - bladerf_gain gain; + bladerf_gain gain; /* Legacy gain field - kept for compatibility */ + + /* Separate TX and RX gain support */ + bool tx_gain_set; + bool rx_gain_set; + bladerf_gain tx_gain; + bladerf_gain rx_gain; + char* dev_tx_str; char* dev_rx_str; bool just_tx; @@ -51,6 +58,8 @@ static struct option const long_options[] = { { "fill", required_argument, NULL, 'f' }, { "loop", no_argument, NULL, 'l' }, { "iterations", required_argument, NULL, 'i' }, + { "tx-gain", required_argument, NULL, 'g' }, + { "rx-gain", required_argument, NULL, 'G' }, { "verbosity", required_argument, NULL, 'v' }, { "help", no_argument, NULL, 'h' }, { NULL, 0, NULL, 0 }, @@ -95,6 +104,8 @@ static void usage() printf(" -p, --period Length between timestamps in samples\n"); printf(" -f, --fill %% of burst to fill with [2000,2000]\n"); printf(" others set to [0,0]\n"); + printf(" -g, --tx-gain Set TX gain (unified gain mode)\n"); + printf(" -G, --rx-gain Set RX gain (unified gain mode, MGC)\n"); printf(" -l, --loop Enables RX device for TX capture\n"); printf(" -c, --compare Outputs CSV RX capture from TX device\n"); printf(" for multi-device fill comparison\n"); @@ -108,7 +119,7 @@ static void usage() printf("\n"); printf("Loop setup:\n"); - printf(" A bladeRF device will TX into the other bladeRF device’s\n" + printf(" A bladeRF device will TX into the other bladeRF device's\n" " RX port over SMA and a 20dB attenuator. See the following\n" " tested config.\n\n"); printf(" bladeRF micro 2.0 TX -> 20dB att. -> SMA -> RX bladeRF x115\n"); @@ -155,6 +166,27 @@ int module_config_enable(struct bladerf *dev, bladerf_channel ch, return status; } + // Set gain if specified + if (BLADERF_CHANNEL_IS_TX(ch) && test->tx_gain_set) { + status = bladerf_set_gain(dev, ch, test->tx_gain); + if (status != 0) { + fprintf(stderr, "Failed to set TX gain: %s\n", bladerf_strerror(status)); + return status; + } + } else if (!BLADERF_CHANNEL_IS_TX(ch) && test->rx_gain_set) { + status = bladerf_set_gain_mode(dev, ch, BLADERF_GAIN_MGC); + if (status != 0) { + fprintf(stderr, "Failed to set RX gain mode: %s\n", bladerf_strerror(status)); + return status; + } + + status = bladerf_set_gain(dev, ch, test->rx_gain); + if (status != 0) { + fprintf(stderr, "Failed to set RX gain: %s\n", bladerf_strerror(status)); + return status; + } + } + status = bladerf_sync_config(dev, ch, sample_format, params->num_buffers, params->buf_size, params->num_xfers, params->timeout_ms); @@ -194,6 +226,7 @@ int init_devices(struct bladerf** dev_tx, struct bladerf** dev_rx, struct app_pa /** RX init */ if (tc->just_tx == false && tc->compare == true) { + // -l -c printf("Mode: TX -> RX (+RF loopback)\n"); printf(" +---------------+ +---------------+\n"); printf(" | TX Device TX|---┬-->|RX RX Device |\n"); @@ -201,6 +234,7 @@ int init_devices(struct bladerf** dev_tx, struct bladerf** dev_rx, struct app_pa printf(" | RX|<--┘ | |\n"); printf(" +---------------+ +---------------+\n"); } else if (tc->just_tx == true && tc->compare == true) { + // -c printf("Mode: TX -> TX\n"); printf(" +---------------+ +---------------+\n"); printf(" | TX Device TX|---┬ |RX RX Device |\n"); @@ -208,13 +242,15 @@ int init_devices(struct bladerf** dev_tx, struct bladerf** dev_rx, struct app_pa printf(" | RX|<--┘ | |\n"); printf(" +---------------+ +---------------+\n"); } else if (tc->just_tx == false && tc->compare == false) { + // -l printf("Mode: TX -> RX\n"); printf(" +---------------+ +---------------+\n"); printf(" | TX Device TX|------>|RX RX Device |\n"); printf(" | | | |\n"); printf(" | RX| | |\n"); printf(" +---------------+ +---------------+\n"); - } else { + } else {// tc->just_tx == true && tc->compare == false + // defaults, no args printf("Mode: TX Only\n"); printf(" +---------------+ v +---------------+\n"); printf(" | TX Device TX|---┘ |RX RX Device |\n"); @@ -248,7 +284,9 @@ int init_devices(struct bladerf** dev_tx, struct bladerf** dev_rx, struct app_pa return -1; } - status = bladerf_set_gain(*dev_tx, BLADERF_MODULE_RX, tc->gain); + // Use new RX gain CLI argument if set + bladerf_gain compare_gain = tc->rx_gain_set ? tc->rx_gain : tc->gain; + status = bladerf_set_gain(*dev_tx, BLADERF_MODULE_RX, compare_gain); if (status != 0) { fprintf(stderr, "Failed to set gain loopback compare RX gain: %s\n", bladerf_strerror(status)); return -1; From 55b5a0d07c113595689470fc9021949340aef3b4 Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Thu, 3 Jul 2025 21:37:29 -0500 Subject: [PATCH 234/238] libbladeRF: fix OC register from 0x54 to 0xD4 enabling both RX1 and RX2 This occurs because the OC register (0x003) was set to 0x54, which only enables RX1 in oversample mode. Now both channels are enabled by default and appropriately gated at the top level adc_assignment_proc in hosted.vhd. --- host/libraries/libbladeRF/src/bladerf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/host/libraries/libbladeRF/src/bladerf.c b/host/libraries/libbladeRF/src/bladerf.c index 02df2b58..d68595f4 100644 --- a/host/libraries/libbladeRF/src/bladerf.c +++ b/host/libraries/libbladeRF/src/bladerf.c @@ -2165,7 +2165,7 @@ int bladerf_set_oversample_register_config(struct bladerf *dev) { return BLADERF_ERR_UNSUPPORTED; } - bladerf_set_rfic_register(dev,0x003,0x54); // OC Register + bladerf_set_rfic_register(dev,0x003,0xD4); // OC Register /* TX Register Assignments */ bladerf_set_rfic_register(dev,0x02,0xc0); // TX Enable and Filter Control From 2935ce5251306d4705d0e36148b319db053898e7 Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Mon, 7 Jul 2025 12:44:10 -0500 Subject: [PATCH 235/238] test: added oversample test channel select and disabled channel check If we see over 40% of the samples at zero, it's likely that a channel is disabled. Reverting 55b5a0d07c113595689470fc9021949340aef3b4 will get this test to fail. --- .../test_oversample/src/main.c | 38 ++++++++++++++++--- 1 file changed, 32 insertions(+), 6 deletions(-) diff --git a/host/libraries/libbladeRF_test/test_oversample/src/main.c b/host/libraries/libbladeRF_test/test_oversample/src/main.c index 9d4fcba0..19a94d4f 100644 --- a/host/libraries/libbladeRF_test/test_oversample/src/main.c +++ b/host/libraries/libbladeRF_test/test_oversample/src/main.c @@ -45,9 +45,10 @@ void print_usage(const char *prog_name) { - printf("Usage: %s [-h] [-v]\n", prog_name); + printf("Usage: %s [-h] [-v] [-c channel]\n", prog_name); printf(" -h Show this help message\n"); printf(" -v Enable verbose logging\n"); + printf(" -c Channel to test (1 or 2, default: 1)\n"); } int main(int argc, char *argv[]) @@ -60,6 +61,7 @@ int main(int argc, char *argv[]) bladerf_frequency freq = 915e6; bladerf_sample_rate samp_rate = 122.88e6; + bladerf_channel channel = BLADERF_CHANNEL_RX(0); const unsigned int num_buffers = 64; const unsigned int buffer_size = 16384; @@ -71,10 +73,11 @@ int main(int argc, char *argv[]) struct option longopts[] = { {"help", no_argument, 0, 'h'}, {"verbose", no_argument, 0, 'v'}, + {"channel", required_argument, 0, 'c'}, {0, 0, 0, 0} }; - while ((opt = getopt_long(argc, argv, "hv", longopts, &opt_ind)) != -1) { + while ((opt = getopt_long(argc, argv, "hvc:", longopts, &opt_ind)) != -1) { switch (opt) { case 'h': print_usage(argv[0]); @@ -82,6 +85,16 @@ int main(int argc, char *argv[]) case 'v': bladerf_log_set_verbosity(BLADERF_LOG_LEVEL_VERBOSE); break; + case 'c': { + int ch_selected= atoi(optarg); + if (ch_selected != 1 && ch_selected != 2) { + fprintf(stderr, "Error: Channel must be 1 or 2\n"); + print_usage(argv[0]); + return EXIT_FAILURE; + } + channel = BLADERF_CHANNEL_RX(ch_selected - 1); + break; + } default: print_usage(argv[0]); return EXIT_FAILURE; @@ -93,22 +106,23 @@ int main(int argc, char *argv[]) double power = 0; CHECK_STATUS(bladerf_open(&dev, NULL)); - CHECK_STATUS(bladerf_set_frequency(dev, BLADERF_CHANNEL_RX(0), freq)); + CHECK_STATUS(bladerf_set_frequency(dev, channel, freq)); + printf("Channel: %d\n", (channel == BLADERF_CHANNEL_RX(0)) ? 1 : 2); printf("Frequency: %.2f MHz\n", freq / 1e6); CHECK_STATUS(bladerf_enable_feature(dev, BLADERF_FEATURE_OVERSAMPLE, true)); CHECK_STATUS(bladerf_sync_config(dev, BLADERF_RX_X1, BLADERF_FORMAT_SC8_Q7, num_buffers, buffer_size, num_transfers, timeout_ms)); // Not only sets the sample rate, but also applies the oversample register configuration - CHECK_STATUS(bladerf_set_sample_rate(dev, BLADERF_CHANNEL_RX(0), samp_rate, NULL)); + CHECK_STATUS(bladerf_set_sample_rate(dev, channel, samp_rate, NULL)); printf("Sample Rate: %.2f MHz\n", samp_rate / 1e6); // Collect samples - CHECK_STATUS(bladerf_enable_module(dev, BLADERF_MODULE_RX, true)); + CHECK_STATUS(bladerf_enable_module(dev, channel, true)); CHECK_STATUS(clock_gettime(TIMING_CLOCK, &start)); CHECK_STATUS(bladerf_sync_rx(dev, samples, num_samples, NULL, 0)); CHECK_STATUS(clock_gettime(TIMING_CLOCK, &end)); - CHECK_STATUS(bladerf_enable_module(dev, BLADERF_MODULE_RX, false)); + CHECK_STATUS(bladerf_enable_module(dev, channel, false)); const double expected_sync_time = (double)num_samples / samp_rate; double time_taken = (end.tv_sec - start.tv_sec) + (end.tv_nsec - start.tv_nsec) * 1e-9; @@ -135,6 +149,18 @@ int main(int argc, char *argv[]) double dBFS = 20 * log10(avg_power/MAX_POWER); printf(ANSI_COLOR_GREEN "Avg Power: %fdBFS" ANSI_COLOR_RESET "\n" , dBFS); + size_t num_zero_samples = 0; + for (size_t i = 0; i < num_samples; i++) { + if (samples[i] == 0 && samples[i+1] == 0) { + num_zero_samples++; + } + } + + if (num_zero_samples > num_samples * 0.40) { + printf(ANSI_COLOR_RED "%0.2f%% of samples are stuck at 0\n" ANSI_COLOR_RESET, num_zero_samples * 100.0 / num_samples); + status = 1; + } + error: if (dev) bladerf_close(dev); return (status == 0) ? EXIT_SUCCESS : EXIT_FAILURE; From 7d7d87f686ebedb29dba9f35c7313892ba286318 Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Wed, 16 Jul 2025 14:52:29 -0500 Subject: [PATCH 236/238] libbladeRF: improve RFIC BIST loopback error message Change from log_debug to log_error and provide clearer message when RFIC BIST loopback is attempted in FPGA tuning mode. The new message explicitly states the requirement (HOST mode) and current state (FPGA mode), making it actionable for users. --- host/libraries/libbladeRF/src/board/bladerf2/bladerf2.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/host/libraries/libbladeRF/src/board/bladerf2/bladerf2.c b/host/libraries/libbladeRF/src/board/bladerf2/bladerf2.c index 9fd7ee55..5a77ff83 100644 --- a/host/libraries/libbladeRF/src/board/bladerf2/bladerf2.c +++ b/host/libraries/libbladeRF/src/board/bladerf2/bladerf2.c @@ -2471,8 +2471,9 @@ static int bladerf2_set_loopback(struct bladerf *dev, bladerf_loopback mode) IF_COMMAND_MODE(dev, RFIC_COMMAND_FPGA, { if (BLADERF_LB_RFIC_BIST == mode) { - log_debug( - "%s: BLADERF_LB_RFIC_BIST not supported in FPGA command mode\n", + log_error( + "%s: RFIC BIST requires HOST tuning mode (currently FPGA). " + "Check BLADERF_DEFAULT_TUNING_MODE env var.\n", __FUNCTION__); return BLADERF_ERR_UNSUPPORTED; } From 712d49e28f524dc5a2a61d6ed5a34a0996d1e625 Mon Sep 17 00:00:00 2001 From: Robert Ghilduta Date: Thu, 25 Sep 2025 22:22:05 -0700 Subject: [PATCH 237/238] libbladeRF: add RX reordering and prime worker before RX enable - Add RX buffer sequence tracking with reorder queue to deliver in-order buffers despite out-of-order USB completions. Pause submissions when the reorder queue holds data to avoid overwriting, and reset tracking on stream start. - Introduce sync_prime_stream() to start the sync worker and wait until it is running. This is used to avoid start-up gaps. - Call sync_prime_stream() on RX enable paths for bladerf1/bladerf2 boards before backend enable, reducing early stream discontinuities (e.g., with RX_MUX_32BIT_COUNTER). - This does not at affect TX code paths. This improves RX robustness and eliminates potential early out-of-order batches on some platforms under high sample rates and low compute throughput. --- .../libbladeRF/src/board/bladerf1/bladerf1.c | 12 ++ .../libbladeRF/src/board/bladerf2/rfic_fpga.c | 8 + .../libbladeRF/src/board/bladerf2/rfic_host.c | 8 + .../libraries/libbladeRF/src/streaming/sync.c | 69 ++++++++- .../libraries/libbladeRF/src/streaming/sync.h | 69 +++++++++ .../libbladeRF/src/streaming/sync_worker.c | 146 ++++++++++++++++-- 6 files changed, 299 insertions(+), 13 deletions(-) diff --git a/host/libraries/libbladeRF/src/board/bladerf1/bladerf1.c b/host/libraries/libbladeRF/src/board/bladerf1/bladerf1.c index 8a30f767..8d885676 100644 --- a/host/libraries/libbladeRF/src/board/bladerf1/bladerf1.c +++ b/host/libraries/libbladeRF/src/board/bladerf1/bladerf1.c @@ -1369,6 +1369,18 @@ static int bladerf1_enable_module(struct bladerf *dev, } lms_enable_rffe(dev, ch, enable); + + if (enable && !BLADERF_CHANNEL_IS_TX(ch)) { + struct bladerf_sync *sync = &board_data->sync[ch]; + + if (sync->initialized) { + status = sync_prime_stream(sync, 0); + if (status != 0) { + return status; + } + } + } + status = dev->backend->enable_module( dev, BLADERF_CHANNEL_IS_TX(ch) ? BLADERF_TX : BLADERF_RX, enable); diff --git a/host/libraries/libbladeRF/src/board/bladerf2/rfic_fpga.c b/host/libraries/libbladeRF/src/board/bladerf2/rfic_fpga.c index 089a8cb1..f7590d90 100644 --- a/host/libraries/libbladeRF/src/board/bladerf2/rfic_fpga.c +++ b/host/libraries/libbladeRF/src/board/bladerf2/rfic_fpga.c @@ -319,6 +319,14 @@ static int _rfic_fpga_enable_module(struct bladerf *dev, /* Perform backend setup */ if (be_setup) { + if (dir == BLADERF_RX) { + struct bladerf_sync *sync = &board_data->sync[BLADERF_RX]; + + if (sync->initialized) { + CHECK_STATUS(sync_prime_stream(sync, 0)); + } + } + CHECK_STATUS(dev->backend->enable_module(dev, dir, true)); } diff --git a/host/libraries/libbladeRF/src/board/bladerf2/rfic_host.c b/host/libraries/libbladeRF/src/board/bladerf2/rfic_host.c index 202f3a33..56ed4dd1 100644 --- a/host/libraries/libbladeRF/src/board/bladerf2/rfic_host.c +++ b/host/libraries/libbladeRF/src/board/bladerf2/rfic_host.c @@ -337,6 +337,14 @@ static int _rfic_host_enable_module(struct bladerf *dev, } if (dir_enable || backend_clear) { + if (dir == BLADERF_RX) { + struct bladerf_sync *sync = &board_data->sync[BLADERF_RX]; + + if (sync->initialized) { + CHECK_STATUS(sync_prime_stream(sync, 0)); + } + } + CHECK_STATUS(dev->backend->enable_module(dev, dir, true)); } } diff --git a/host/libraries/libbladeRF/src/streaming/sync.c b/host/libraries/libbladeRF/src/streaming/sync.c index 2162b227..6af3ff08 100644 --- a/host/libraries/libbladeRF/src/streaming/sync.c +++ b/host/libraries/libbladeRF/src/streaming/sync.c @@ -271,6 +271,22 @@ int sync_init(struct bladerf_sync *sync, goto error; } + if ((layout & BLADERF_DIRECTION_MASK) == BLADERF_RX) { + sync->buf_mgmt.buffer_seq = + (uint32_t *)malloc(num_buffers * sizeof(uint32_t)); + if (sync->buf_mgmt.buffer_seq == NULL) { + status = BLADERF_ERR_MEM; + goto error; + } + } else { + sync->buf_mgmt.buffer_seq = NULL; + } + + sync->buf_mgmt.expected_seq = 0; + sync->buf_mgmt.next_seq = 0; + sync->buf_mgmt.reorder_len = 0; + sync->buf_mgmt.reorder_limit = 0; + switch (layout & BLADERF_DIRECTION_MASK) { case BLADERF_RX: /* When starting up an RX stream, the first 'num_transfers' @@ -290,6 +306,8 @@ int sync_init(struct bladerf_sync *sync, sync->meta.msg_timestamp = 0; sync->meta.msg_flags = 0; + sync_reset_sequence_tracking(&sync->buf_mgmt, num_transfers); + break; case BLADERF_TX: @@ -332,13 +350,21 @@ void sync_deinit(struct bladerf_sync *sync) sync_worker_deinit(sync->worker, &sync->buf_mgmt.lock, &sync->buf_mgmt.buf_ready); - if (sync->buf_mgmt.actual_lengths) { - free(sync->buf_mgmt.actual_lengths); - } /* De-allocate our buffer management resources */ if (sync->buf_mgmt.status) { MUTEX_DESTROY(&sync->buf_mgmt.lock); free(sync->buf_mgmt.status); + sync->buf_mgmt.status = NULL; + } + + if (sync->buf_mgmt.actual_lengths) { + free(sync->buf_mgmt.actual_lengths); + sync->buf_mgmt.actual_lengths = NULL; + } + + if (sync->buf_mgmt.buffer_seq) { + free(sync->buf_mgmt.buffer_seq); + sync->buf_mgmt.buffer_seq = NULL; } MUTEX_DESTROY(&sync->lock); @@ -379,6 +405,43 @@ static int wait_for_buffer(struct buffer_mgmt *b, # define SYNC_WORKER_START_TIMEOUT_MS 250 #endif +int sync_prime_stream(struct bladerf_sync *sync, unsigned int timeout_ms) +{ + int status; + unsigned int wait_ms = timeout_ms ? timeout_ms : SYNC_WORKER_START_TIMEOUT_MS; + + if (sync == NULL || !sync->initialized) { + return 0; + } + + if ((sync->stream_config.layout & BLADERF_DIRECTION_MASK) != BLADERF_RX) { + return 0; + } + + if (sync->worker == NULL) { + return BLADERF_ERR_INVAL; + } + + switch (sync_worker_get_state(sync->worker, NULL)) { + case SYNC_WORKER_STATE_RUNNING: + return 0; + + case SYNC_WORKER_STATE_IDLE: + break; + + default: + return BLADERF_ERR_UNEXPECTED; + } + + sync_worker_submit_request(sync->worker, SYNC_WORKER_START); + + status = sync_worker_wait_for_state(sync->worker, + SYNC_WORKER_STATE_RUNNING, + wait_ms); + + return status; +} + /* Returns # of timestamps (or time steps) left in a message */ static inline unsigned int ts_remaining(struct bladerf_sync *s) { diff --git a/host/libraries/libbladeRF/src/streaming/sync.h b/host/libraries/libbladeRF/src/streaming/sync.h index e28d0938..99e10f0f 100644 --- a/host/libraries/libbladeRF/src/streaming/sync.h +++ b/host/libraries/libbladeRF/src/streaming/sync.h @@ -23,6 +23,7 @@ #define STREAMING_SYNC_H_ #include +#include #include @@ -47,6 +48,16 @@ typedef enum { SYNC_BUFFER_IN_FLIGHT, /**< Currently being transferred */ } sync_buffer_status; +#ifndef SYNC_RX_MAX_REORDER +#define SYNC_RX_MAX_REORDER 256 +#endif + +struct rx_reorder_entry { + uint32_t seq; + unsigned int buf_idx; + size_t num_samples; +}; + typedef enum { SYNC_META_STATE_HEADER, /**< Extract the metadata header */ SYNC_META_STATE_SAMPLES, /**< Process samples */ @@ -85,12 +96,68 @@ struct buffer_mgmt { * submitting full buffers to the underlying async system */ sync_tx_submitter submitter; + /* RX-specific tracking for out-of-order completions */ + uint32_t *buffer_seq; + uint32_t expected_seq; + uint32_t next_seq; + struct rx_reorder_entry reorder[SYNC_RX_MAX_REORDER]; + size_t reorder_len; + unsigned int reorder_limit; + MUTEX lock; COND buf_ready; /**< Buffer produced by RX callback, or * buffer emptied by TX callback */ }; +static inline void sync_reset_sequence_tracking(struct buffer_mgmt *b, + unsigned int num_in_flight) +{ + if (b == NULL) { + return; + } + + if (!b->buffer_seq) { + b->expected_seq = 0; + b->next_seq = 0; + b->reorder_len = 0; + return; + } + + for (size_t i = 0; i < SYNC_RX_MAX_REORDER; ++i) { + b->reorder[i].seq = 0; + b->reorder[i].buf_idx = 0; + b->reorder[i].num_samples = 0; + } + + for (unsigned int i = 0; i < b->num_buffers; ++i) { + b->buffer_seq[i] = UINT32_MAX; + } + + unsigned int limit = num_in_flight; + if (limit > b->num_buffers) { + limit = b->num_buffers; + } + + for (unsigned int i = 0; i < limit; ++i) { + b->buffer_seq[i] = i; + } + + b->expected_seq = 0; + b->next_seq = limit; + b->reorder_len = 0; + /* Allow a larger reorder window independent of instantaneous slack. */ + if (b->num_buffers > 1) { + unsigned int capacity = b->num_buffers - 1; + if (capacity > SYNC_RX_MAX_REORDER) { + capacity = SYNC_RX_MAX_REORDER; + } + b->reorder_limit = capacity; + } else { + b->reorder_limit = 0; + } +} + /* State of API-side sync interface */ typedef enum { SYNC_STATE_CHECK_WORKER, @@ -189,4 +256,6 @@ unsigned int sync_buf2idx(struct buffer_mgmt *b, void *addr); void *sync_idx2buf(struct buffer_mgmt *b, unsigned int idx); +int sync_prime_stream(struct bladerf_sync *sync, unsigned int timeout_ms); + #endif diff --git a/host/libraries/libbladeRF/src/streaming/sync_worker.c b/host/libraries/libbladeRF/src/streaming/sync_worker.c index cb7911a7..ede1ec23 100644 --- a/host/libraries/libbladeRF/src/streaming/sync_worker.c +++ b/host/libraries/libbladeRF/src/streaming/sync_worker.c @@ -17,6 +17,7 @@ */ #include +#include #include #include @@ -43,6 +44,75 @@ void *sync_worker_task(void *arg); +static void mark_buffer_ready(struct buffer_mgmt *b, + unsigned int idx, + size_t num_samples) +{ + b->status[idx] = SYNC_BUFFER_FULL; + b->actual_lengths[idx] = num_samples; + COND_SIGNAL(&b->buf_ready); +} + +static void flush_reorder_entries(struct buffer_mgmt *b) +{ + bool progressed = true; + + while (progressed && b->reorder_len > 0) { + progressed = false; + + for (size_t i = 0; i < b->reorder_len; ++i) { + if (b->reorder[i].seq == b->expected_seq) { + mark_buffer_ready(b, b->reorder[i].buf_idx, + b->reorder[i].num_samples); + b->expected_seq++; + + for (size_t j = i; j + 1 < b->reorder_len; ++j) { + b->reorder[j] = b->reorder[j + 1]; + } + + b->reorder_len--; + progressed = true; + break; + } + } + } +} + +static bool hold_out_of_order_buffer(struct buffer_mgmt *b, + uint32_t seq, + unsigned int idx, + size_t num_samples) +{ + if (b->reorder_limit == 0 || b->reorder_len >= b->reorder_limit) { + return false; + } + + const uint32_t new_distance = seq - b->expected_seq; + size_t insert_pos = 0; + + while (insert_pos < b->reorder_len) { + const uint32_t existing_distance = + b->reorder[insert_pos].seq - b->expected_seq; + + if (existing_distance > new_distance) { + break; + } + + insert_pos++; + } + + for (size_t i = b->reorder_len; i > insert_pos; --i) { + b->reorder[i] = b->reorder[i - 1]; + } + + b->reorder[insert_pos].seq = seq; + b->reorder[insert_pos].buf_idx = idx; + b->reorder[insert_pos].num_samples = num_samples; + b->reorder_len++; + + return true; +} + static void *rx_callback(struct bladerf *dev, struct bladerf_stream *stream, struct bladerf_metadata *meta, @@ -80,28 +150,81 @@ static void *rx_callback(struct bladerf *dev, if (b->resubmit_count == 0) { if (b->status[b->prod_i] == SYNC_BUFFER_EMPTY) { - /* This buffer is now ready for the consumer */ - b->status[samples_idx] = SYNC_BUFFER_FULL; - b->actual_lengths[samples_idx] = num_samples; - COND_SIGNAL(&b->buf_ready); + bool release_now = true; + uint32_t seq = 0; + + if (b->buffer_seq) { + seq = b->buffer_seq[samples_idx]; + + if (seq != b->expected_seq) { + const uint32_t distance = seq - b->expected_seq; + + if (distance != 0 && distance <= b->reorder_limit) { + if (hold_out_of_order_buffer(b, seq, samples_idx, + num_samples)) { + release_now = false; + log_verbose("%s worker: buf[%u] held for reorder " + "(seq=%u expect=%u)\n", + worker2str(s), samples_idx, seq, + b->expected_seq); + } else { + log_warning("%s worker: RX reorder window full " + "(limit=%u). Forwarding buf[%u] " + "(seq=%u, expect=%u).\n", + worker2str(s), b->reorder_limit, + samples_idx, seq, b->expected_seq); + } + } else if (distance != 0) { + log_warning("%s worker: RX reorder distance %u exceeds " + "window %u. Forwarding buf[%u].\n", + worker2str(s), distance, b->reorder_limit, + samples_idx); + } + } + } + + if (release_now) { + mark_buffer_ready(b, samples_idx, num_samples); + + if (b->buffer_seq && seq == b->expected_seq) { + b->expected_seq++; + flush_reorder_entries(b); + } + + log_verbose("%s worker: buf[%u] = full\n", + worker2str(s), samples_idx); + } /* Update the state of the buffer being submitted next */ next_idx = b->prod_i; b->status[next_idx] = SYNC_BUFFER_IN_FLIGHT; + if (b->buffer_seq) { + b->buffer_seq[next_idx] = b->next_seq++; + } next_buf = b->buffers[next_idx]; /* Advance to the next buffer for the next callback */ b->prod_i = (next_idx + 1) % b->num_buffers; - log_verbose("%s worker: buf[%u] = full, buf[%u] = in_flight\n", - worker2str(s), samples_idx, next_idx); + if (release_now) { + log_verbose("%s worker: buf[%u] now in_flight\n", + worker2str(s), next_idx); + } } else { - /* TODO propagate back the RX Overrun to the sync_rx() caller */ - log_debug("RX overrun @ buffer %u\r\n", samples_idx); + if (b->reorder_len > 0) { + /* We're holding buffers to restore order. Skip submitting a + * new transfer this time to avoid overwriting held data. */ + next_buf = BLADERF_STREAM_NO_DATA; + log_verbose("%s worker: delaying submission while reorder " + "queue drains\n", worker2str(s)); + } else { + /* TODO propagate back the RX Overrun to the sync_rx() caller */ + log_debug("RX overrun @ buffer %u\r\n", samples_idx); - next_buf = samples; - b->resubmit_count = s->stream_config.num_xfers - 1; + next_buf = samples; + b->resubmit_count = s->stream_config.num_xfers - 1; + } } } else { /* We're still recovering from an overrun at this point. Just @@ -428,6 +551,9 @@ static sync_worker_state exec_idle_state(struct bladerf_sync *s) s->buf_mgmt.status[i] = SYNC_BUFFER_EMPTY; } } + + sync_reset_sequence_tracking(&s->buf_mgmt, + s->stream_config.num_xfers); } MUTEX_UNLOCK(&s->buf_mgmt.lock); From fcf9423325ae49f5fdd2e5b52ab68bfc2576ad47 Mon Sep 17 00:00:00 2001 From: Robert Ghilduta Date: Mon, 6 Oct 2025 16:06:05 -0700 Subject: [PATCH 238/238] Bump pillow --- .../libbladeRF_test/test_gain_compare/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/host/libraries/libbladeRF_test/test_gain_compare/requirements.txt b/host/libraries/libbladeRF_test/test_gain_compare/requirements.txt index 9b8652a1..1c587673 100644 --- a/host/libraries/libbladeRF_test/test_gain_compare/requirements.txt +++ b/host/libraries/libbladeRF_test/test_gain_compare/requirements.txt @@ -5,7 +5,7 @@ kiwisolver==1.4.5 matplotlib==3.8.0 numpy==1.26.0 packaging==23.2 -Pillow==11.2.1 +Pillow==11.3.0 pyparsing==3.1.1 python-dateutil==2.8.2 six==1.16.0