From 6583104a966d8683353c27065ff0143ae39a3ec7 Mon Sep 17 00:00:00 2001 From: Maxime Biette Date: Mon, 12 Jul 2021 17:53:38 -0400 Subject: [PATCH 1/2] Add error details on libhackrf open/close --- hackrf_source/src/main.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/hackrf_source/src/main.cpp b/hackrf_source/src/main.cpp index 3bcba7e..f1f4b18 100644 --- a/hackrf_source/src/main.cpp +++ b/hackrf_source/src/main.cpp @@ -228,9 +228,9 @@ private: return; } - int err = hackrf_open_by_serial(_this->selectedSerial.c_str(), &_this->openDev); - if (err != 0) { - spdlog::error("Could not open HackRF {0}", _this->selectedSerial); + auto err = static_cast(hackrf_open_by_serial(_this->selectedSerial.c_str(), &_this->openDev)); + if (err != hackrf_error::HACKRF_SUCCESS) { + spdlog::error("Could not open HackRF {0}: {1}", _this->selectedSerial, hackrf_error_name(err)); return; } @@ -257,7 +257,10 @@ private: _this->running = false; _this->stream.stopWriter(); // TODO: Stream stop - hackrf_close(_this->openDev); + auto err = static_cast(hackrf_close(_this->openDev)); + if (err != hackrf_error::HACKRF_SUCCESS) { + spdlog::error("Could not close HackRF {0}: {1}", _this->selectedSerial, hackrf_error_name(err)); + } _this->stream.clearWriteStop(); spdlog::info("HackRFSourceModule '{0}': Stop!", _this->name); } From c0f3babc4956188e3fe54d37b599df3ae9173ca1 Mon Sep 17 00:00:00 2001 From: AlexandreRouma Date: Tue, 13 Jul 2021 21:12:07 +0200 Subject: [PATCH 2/2] Fixed code style --- hackrf_source/src/main.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/hackrf_source/src/main.cpp b/hackrf_source/src/main.cpp index f1f4b18..75d90e9 100644 --- a/hackrf_source/src/main.cpp +++ b/hackrf_source/src/main.cpp @@ -228,8 +228,8 @@ private: return; } - auto err = static_cast(hackrf_open_by_serial(_this->selectedSerial.c_str(), &_this->openDev)); - if (err != hackrf_error::HACKRF_SUCCESS) { + int err = hackrf_open_by_serial(_this->selectedSerial.c_str(), &_this->openDev); + if (err != HACKRF_SUCCESS) { spdlog::error("Could not open HackRF {0}: {1}", _this->selectedSerial, hackrf_error_name(err)); return; } @@ -257,8 +257,8 @@ private: _this->running = false; _this->stream.stopWriter(); // TODO: Stream stop - auto err = static_cast(hackrf_close(_this->openDev)); - if (err != hackrf_error::HACKRF_SUCCESS) { + int err = hackrf_close(_this->openDev); + if (err != HACKRF_SUCCESS) { spdlog::error("Could not close HackRF {0}: {1}", _this->selectedSerial, hackrf_error_name(err)); } _this->stream.clearWriteStop(); @@ -410,4 +410,4 @@ MOD_EXPORT void _DELETE_INSTANCE_(ModuleManager::Instance* instance) { MOD_EXPORT void _END_() { config.disableAutoSave(); config.save(); -} \ No newline at end of file +}