diff --git a/software/libcariboulite/build/cariboulite_app b/software/libcariboulite/build/cariboulite_app index 6650d86..5e102ce 100755 Binary files a/software/libcariboulite/build/cariboulite_app and b/software/libcariboulite/build/cariboulite_app differ diff --git a/software/libcariboulite/build/test/fpgacomm b/software/libcariboulite/build/test/fpgacomm index 1a7efb7..020773e 100755 Binary files a/software/libcariboulite/build/test/fpgacomm and b/software/libcariboulite/build/test/fpgacomm differ diff --git a/software/libcariboulite/build/test/ice40programmer b/software/libcariboulite/build/test/ice40programmer index 00b6940..5e9713b 100755 Binary files a/software/libcariboulite/build/test/ice40programmer and b/software/libcariboulite/build/test/ice40programmer differ diff --git a/software/libcariboulite/src/at86rf215/build/CMakeFiles/at86rf215.dir/C.includecache b/software/libcariboulite/src/at86rf215/build/CMakeFiles/at86rf215.dir/C.includecache index 2d79720..d9e2d2f 100644 --- a/software/libcariboulite/src/at86rf215/build/CMakeFiles/at86rf215.dir/C.includecache +++ b/software/libcariboulite/src/at86rf215/build/CMakeFiles/at86rf215.dir/C.includecache @@ -88,6 +88,32 @@ at86rf215_common.h at86rf215_radio.h /home/pi/projects/cariboulite/software/libcariboulite/src/at86rf215/at86rf215_radio.h +/home/pi/projects/cariboulite/software/libcariboulite/src/at86rf215/at86rf215_baseband.c +stdint.h +- +math.h +- +string.h +- +stdbool.h +- +stdio.h +- +zf_log/zf_log.h +/home/pi/projects/cariboulite/software/libcariboulite/src/at86rf215/zf_log/zf_log.h +io_utils/io_utils.h +/home/pi/projects/cariboulite/software/libcariboulite/src/at86rf215/io_utils/io_utils.h +io_utils/io_utils_spi.h +/home/pi/projects/cariboulite/software/libcariboulite/src/at86rf215/io_utils/io_utils_spi.h +at86rf215_radio.h +/home/pi/projects/cariboulite/software/libcariboulite/src/at86rf215/at86rf215_radio.h +at86rf215_baseband.h +/home/pi/projects/cariboulite/software/libcariboulite/src/at86rf215/at86rf215_baseband.h +at86rf215_regs.h +/home/pi/projects/cariboulite/software/libcariboulite/src/at86rf215/at86rf215_regs.h + +/home/pi/projects/cariboulite/software/libcariboulite/src/at86rf215/at86rf215_baseband.h + /home/pi/projects/cariboulite/software/libcariboulite/src/at86rf215/at86rf215_common.h stdio.h - @@ -108,6 +134,36 @@ io_utils/io_utils_spi.h at86rf215_regs.h /home/pi/projects/cariboulite/software/libcariboulite/src/at86rf215/at86rf215_regs.h +/home/pi/projects/cariboulite/software/libcariboulite/src/at86rf215/at86rf215_events.c +stdio.h +- +zf_log/zf_log.h +/home/pi/projects/cariboulite/software/libcariboulite/src/at86rf215/zf_log/zf_log.h +at86rf215_common.h +/home/pi/projects/cariboulite/software/libcariboulite/src/at86rf215/at86rf215_common.h + +/home/pi/projects/cariboulite/software/libcariboulite/src/at86rf215/at86rf215_radio.c +stdint.h +- +math.h +- +string.h +- +stdbool.h +- +stdio.h +- +zf_log/zf_log.h +/home/pi/projects/cariboulite/software/libcariboulite/src/at86rf215/zf_log/zf_log.h +io_utils/io_utils.h +/home/pi/projects/cariboulite/software/libcariboulite/src/at86rf215/io_utils/io_utils.h +io_utils/io_utils_spi.h +/home/pi/projects/cariboulite/software/libcariboulite/src/at86rf215/io_utils/io_utils_spi.h +at86rf215_radio.h +/home/pi/projects/cariboulite/software/libcariboulite/src/at86rf215/at86rf215_radio.h +at86rf215_regs.h +/home/pi/projects/cariboulite/software/libcariboulite/src/at86rf215/at86rf215_regs.h + /home/pi/projects/cariboulite/software/libcariboulite/src/at86rf215/at86rf215_radio.h stdio.h - diff --git a/software/libcariboulite/src/at86rf215/build/CMakeFiles/test_at86rf215.dir/C.includecache b/software/libcariboulite/src/at86rf215/build/CMakeFiles/test_at86rf215.dir/C.includecache index 7575f1e..950f7ca 100644 --- a/software/libcariboulite/src/at86rf215/build/CMakeFiles/test_at86rf215.dir/C.includecache +++ b/software/libcariboulite/src/at86rf215/build/CMakeFiles/test_at86rf215.dir/C.includecache @@ -56,12 +56,64 @@ stdio.h pigpio.h - +../../zf_log/zf_log.h + +/home/pi/projects/cariboulite/software/libcariboulite/src/at86rf215/at86rf215.c +stdint.h +- +math.h +- +string.h +- +stdbool.h +- +stdio.h +- +zf_log/zf_log.h +/home/pi/projects/cariboulite/software/libcariboulite/src/at86rf215/zf_log/zf_log.h +at86rf215.h +/home/pi/projects/cariboulite/software/libcariboulite/src/at86rf215/at86rf215.h +io_utils/io_utils.h +/home/pi/projects/cariboulite/software/libcariboulite/src/at86rf215/io_utils/io_utils.h +io_utils/io_utils_spi.h +/home/pi/projects/cariboulite/software/libcariboulite/src/at86rf215/io_utils/io_utils_spi.h +at86rf215_radio.h +/home/pi/projects/cariboulite/software/libcariboulite/src/at86rf215/at86rf215_radio.h +at86rf215_regs.h +/home/pi/projects/cariboulite/software/libcariboulite/src/at86rf215/at86rf215_regs.h + /home/pi/projects/cariboulite/software/libcariboulite/src/at86rf215/at86rf215.h at86rf215_common.h /home/pi/projects/cariboulite/software/libcariboulite/src/at86rf215/at86rf215_common.h at86rf215_radio.h /home/pi/projects/cariboulite/software/libcariboulite/src/at86rf215/at86rf215_radio.h +/home/pi/projects/cariboulite/software/libcariboulite/src/at86rf215/at86rf215_baseband.c +stdint.h +- +math.h +- +string.h +- +stdbool.h +- +stdio.h +- +zf_log/zf_log.h +/home/pi/projects/cariboulite/software/libcariboulite/src/at86rf215/zf_log/zf_log.h +io_utils/io_utils.h +/home/pi/projects/cariboulite/software/libcariboulite/src/at86rf215/io_utils/io_utils.h +io_utils/io_utils_spi.h +/home/pi/projects/cariboulite/software/libcariboulite/src/at86rf215/io_utils/io_utils_spi.h +at86rf215_radio.h +/home/pi/projects/cariboulite/software/libcariboulite/src/at86rf215/at86rf215_radio.h +at86rf215_baseband.h +/home/pi/projects/cariboulite/software/libcariboulite/src/at86rf215/at86rf215_baseband.h +at86rf215_regs.h +/home/pi/projects/cariboulite/software/libcariboulite/src/at86rf215/at86rf215_regs.h + +/home/pi/projects/cariboulite/software/libcariboulite/src/at86rf215/at86rf215_baseband.h + /home/pi/projects/cariboulite/software/libcariboulite/src/at86rf215/at86rf215_common.h stdio.h - @@ -82,6 +134,36 @@ io_utils/io_utils_spi.h at86rf215_regs.h /home/pi/projects/cariboulite/software/libcariboulite/src/at86rf215/at86rf215_regs.h +/home/pi/projects/cariboulite/software/libcariboulite/src/at86rf215/at86rf215_events.c +stdio.h +- +zf_log/zf_log.h +/home/pi/projects/cariboulite/software/libcariboulite/src/at86rf215/zf_log/zf_log.h +at86rf215_common.h +/home/pi/projects/cariboulite/software/libcariboulite/src/at86rf215/at86rf215_common.h + +/home/pi/projects/cariboulite/software/libcariboulite/src/at86rf215/at86rf215_radio.c +stdint.h +- +math.h +- +string.h +- +stdbool.h +- +stdio.h +- +zf_log/zf_log.h +/home/pi/projects/cariboulite/software/libcariboulite/src/at86rf215/zf_log/zf_log.h +io_utils/io_utils.h +/home/pi/projects/cariboulite/software/libcariboulite/src/at86rf215/io_utils/io_utils.h +io_utils/io_utils_spi.h +/home/pi/projects/cariboulite/software/libcariboulite/src/at86rf215/io_utils/io_utils_spi.h +at86rf215_radio.h +/home/pi/projects/cariboulite/software/libcariboulite/src/at86rf215/at86rf215_radio.h +at86rf215_regs.h +/home/pi/projects/cariboulite/software/libcariboulite/src/at86rf215/at86rf215_regs.h + /home/pi/projects/cariboulite/software/libcariboulite/src/at86rf215/at86rf215_radio.h stdio.h - diff --git a/software/libcariboulite/src/at86rf215/build/test_at86rf215 b/software/libcariboulite/src/at86rf215/build/test_at86rf215 index 598b709..abb13ae 100755 Binary files a/software/libcariboulite/src/at86rf215/build/test_at86rf215 and b/software/libcariboulite/src/at86rf215/build/test_at86rf215 differ diff --git a/software/libcariboulite/src/cariboulite.c b/software/libcariboulite/src/cariboulite.c index d77ffa5..3b0993c 100644 --- a/software/libcariboulite/src/cariboulite.c +++ b/software/libcariboulite/src/cariboulite.c @@ -1,6 +1,7 @@ #ifndef ZF_LOG_LEVEL #define ZF_LOG_LEVEL ZF_LOG_VERBOSE #endif + #define ZF_LOG_DEF_SRCLOC ZF_LOG_SRCLOC_LONG #define ZF_LOG_TAG "CARIBOULITE Main" #include "zf_log/zf_log.h" diff --git a/software/libcariboulite/src/cariboulite_setup.c b/software/libcariboulite/src/cariboulite_setup.c index 93116a1..f7739e3 100644 --- a/software/libcariboulite/src/cariboulite_setup.c +++ b/software/libcariboulite/src/cariboulite_setup.c @@ -240,7 +240,7 @@ int cariboulite_self_test(cariboulite_st* sys, cariboulite_self_test_result_st* if (sys->fpga_versions.sys_ver != 0x01 || sys->fpga_versions.sys_manu_id != 0x01) { - ZF_LOGI("FPGA firmware didn't pass - sys_ver = %02X, manu_id = %02X", + ZF_LOGE("FPGA firmware didn't pass - sys_ver = %02X, manu_id = %02X", sys->fpga_versions.sys_ver, sys->fpga_versions.sys_manu_id); res->fpga_fail = 1; error_occured = 1; @@ -253,7 +253,7 @@ int cariboulite_self_test(cariboulite_st* sys, cariboulite_self_test_result_st* at86rf215_get_versions(&sys->modem, &modem_pn, &modem_vn); if (modem_pn != 0x34) { - ZF_LOGI("The assembled modem is not AT86RF215 (product number: 0x%02x)", modem_pn); + ZF_LOGE("The assembled modem is not AT86RF215 (product number: 0x%02x)", modem_pn); res->modem_fail = 1; error_occured = 1; } @@ -264,7 +264,7 @@ int cariboulite_self_test(cariboulite_st* sys, cariboulite_self_test_result_st* rffc507x_readback_status(&sys->mixer, &dev_id, NULL); if (dev_id.device_id != 0x1140 && dev_id.device_id != 0x11C0) { - ZF_LOGI("The assembled mixer is not RFFC5071/2[A]"); + ZF_LOGE("The assembled mixer is not RFFC5071/2[A]"); res->mixer_fail = 1; error_occured = 1; } @@ -280,7 +280,7 @@ int cariboulite_self_test(cariboulite_st* sys, cariboulite_self_test_result_st* return 0; } - ZF_LOGI("Self-test process finished with errors"); + ZF_LOGE("Self-test process finished with errors"); return -1; } @@ -324,6 +324,7 @@ int cariboulite_release_submodules(cariboulite_st* sys) int cariboulite_init_driver(cariboulite_st *sys, void* signal_handler_cb, cariboulite_board_info_st *info) { zf_log_set_output_level(ZF_LOG_ERROR); + //zf_log_set_output_level(ZF_LOG_VERBOSE); ZF_LOGI("driver initializing"); if (info == NULL) diff --git a/software/libcariboulite/src/soapy_api/Cariboulite.cpp b/software/libcariboulite/src/soapy_api/Cariboulite.cpp index 89d0482..d3f59e1 100644 --- a/software/libcariboulite/src/soapy_api/Cariboulite.cpp +++ b/software/libcariboulite/src/soapy_api/Cariboulite.cpp @@ -315,18 +315,18 @@ static at86rf215_radio_rx_bw_en convertRxBandwidth(double bw_numeric) static double convertRxBandwidth(at86rf215_radio_rx_bw_en bw_en) { float fact = 1.25; - if (at86rf215_radio_rx_bw_BW160KHZ_IF250KHZ == bw_en) return 160000; - if (at86rf215_radio_rx_bw_BW200KHZ_IF250KHZ == bw_en) return 200000; - if (at86rf215_radio_rx_bw_BW250KHZ_IF250KHZ == bw_en) return 250000; - if (at86rf215_radio_rx_bw_BW320KHZ_IF500KHZ == bw_en) return 320000; - if (at86rf215_radio_rx_bw_BW400KHZ_IF500KHZ == bw_en) return 400000; - if (at86rf215_radio_rx_bw_BW500KHZ_IF500KHZ == bw_en) return 500000; - if (at86rf215_radio_rx_bw_BW630KHZ_IF1000KHZ == bw_en) return 630000; - if (at86rf215_radio_rx_bw_BW800KHZ_IF1000KHZ == bw_en) return 800000; - if (at86rf215_radio_rx_bw_BW1000KHZ_IF1000KHZ == bw_en) return 1000000; - if (at86rf215_radio_rx_bw_BW1250KHZ_IF2000KHZ == bw_en) return 1250000; - if (at86rf215_radio_rx_bw_BW1600KHZ_IF2000KHZ == bw_en) return 1600000; - if (at86rf215_radio_rx_bw_BW2000KHZ_IF2000KHZ == bw_en) return 2000000; + if (at86rf215_radio_rx_bw_BW160KHZ_IF250KHZ == bw_en) return 160000 * fact; + if (at86rf215_radio_rx_bw_BW200KHZ_IF250KHZ == bw_en) return 200000 * fact; + if (at86rf215_radio_rx_bw_BW250KHZ_IF250KHZ == bw_en) return 250000 * fact; + if (at86rf215_radio_rx_bw_BW320KHZ_IF500KHZ == bw_en) return 320000 * fact; + if (at86rf215_radio_rx_bw_BW400KHZ_IF500KHZ == bw_en) return 400000 * fact; + if (at86rf215_radio_rx_bw_BW500KHZ_IF500KHZ == bw_en) return 500000 * fact; + if (at86rf215_radio_rx_bw_BW630KHZ_IF1000KHZ == bw_en) return 630000 * fact; + if (at86rf215_radio_rx_bw_BW800KHZ_IF1000KHZ == bw_en) return 800000 * fact; + if (at86rf215_radio_rx_bw_BW1000KHZ_IF1000KHZ == bw_en) return 1000000 * fact; + if (at86rf215_radio_rx_bw_BW1250KHZ_IF2000KHZ == bw_en) return 1250000 * fact; + if (at86rf215_radio_rx_bw_BW1600KHZ_IF2000KHZ == bw_en) return 1600000 * fact; + if (at86rf215_radio_rx_bw_BW2000KHZ_IF2000KHZ == bw_en) return 2000000 * fact; return 2000000 * fact; } @@ -411,18 +411,19 @@ std::vector Cariboulite::listBandwidths( const int direction, const size std::vector options; if (direction == SOAPY_SDR_RX) { - options.push_back( 160000 ); - options.push_back( 200000 ); - options.push_back( 250000 ); - options.push_back( 320000 ); - options.push_back( 400000 ); - options.push_back( 500000 ); - options.push_back( 630000 ); - options.push_back( 800000 ); - options.push_back( 1000000 ); - options.push_back( 1250000 ); - options.push_back( 1600000 ); - options.push_back( 2000000 ); + float fact = 1.25; + options.push_back( 160000*fact ); + options.push_back( 200000*fact ); + options.push_back( 250000*fact ); + options.push_back( 320000*fact ); + options.push_back( 400000*fact ); + options.push_back( 500000*fact ); + options.push_back( 630000*fact ); + options.push_back( 800000*fact ); + options.push_back( 1000000*fact ); + options.push_back( 1250000*fact ); + options.push_back( 1600000*fact ); + options.push_back( 2000000*fact ); } else { diff --git a/software/libcariboulite/src/soapy_api/Cariboulite.hpp b/software/libcariboulite/src/soapy_api/Cariboulite.hpp index aa858f9..d99516b 100644 --- a/software/libcariboulite/src/soapy_api/Cariboulite.hpp +++ b/software/libcariboulite/src/soapy_api/Cariboulite.hpp @@ -14,7 +14,8 @@ #include #include -#define ZF_LOG_LEVEL ZF_LOG_ERROR +//#define ZF_LOG_LEVEL ZF_LOG_ERROR +#define ZF_LOG_LEVEL ZF_LOG_VERBOSE #include "datatypes/tsqueue.h" #include "cariboulite_setup.h"