diff --git a/software/libcariboulite/src/CaribouLiteCpp.cpp b/software/libcariboulite/src/CaribouLiteCpp.cpp index 5e2ea86..2e8ac52 100644 --- a/software/libcariboulite/src/CaribouLiteCpp.cpp +++ b/software/libcariboulite/src/CaribouLiteCpp.cpp @@ -51,7 +51,7 @@ CaribouLite &CaribouLite::GetInstance(bool asyncApi, bool forceFpgaProg, LogLeve { try { - _instance = std::shared_ptr(new CaribouLite(forceFpgaProg, asyncApi, logLvl)); + _instance = std::shared_ptr(new CaribouLite(asyncApi, forceFpgaProg, logLvl)); } catch (std::exception& e) { @@ -75,7 +75,8 @@ CaribouLite::CaribouLite(bool asyncApi, bool forceFpgaProg, LogLevel logLvl) // get information DetectBoard(&_systemVersion, _productName, _productGuid); - CaribouLiteRadio::ApiType api_type = asyncApi ? CaribouLiteRadio::ApiType::Async : CaribouLiteRadio::ApiType::Sync; + //printf("API TYPE: %d\n", asyncApi); + CaribouLiteRadio::ApiType api_type = (asyncApi) ? CaribouLiteRadio::ApiType::Async : CaribouLiteRadio::ApiType::Sync; // populate the radio devices cariboulite_radio_state_st *radio_s1g = cariboulite_get_radio(cariboulite_channel_s1g); diff --git a/software/libcariboulite/src/CaribouLiteRadioCpp.cpp b/software/libcariboulite/src/CaribouLiteRadioCpp.cpp index ed71b18..d2f576b 100644 --- a/software/libcariboulite/src/CaribouLiteRadioCpp.cpp +++ b/software/libcariboulite/src/CaribouLiteRadioCpp.cpp @@ -8,6 +8,8 @@ void CaribouLiteRadio::CaribouLiteRxThread(CaribouLiteRadio* radio) CaribouLiteMeta* rx_meta_buffer = new CaribouLiteMeta[mtu_size]; std::complex* rx_copmlex_data = new std::complex[mtu_size]; + //printf("Enterred Thread\n"); + while (radio->_rx_thread_running) { if (!radio->_rx_is_active) @@ -139,11 +141,12 @@ void CaribouLiteRadio::CaribouLiteTxThread(CaribouLiteRadio* radio) CaribouLiteRadio::CaribouLiteRadio( const cariboulite_radio_state_st* radio, RadioType type, ApiType api_type, - const CaribouLite* parent) + const CaribouLite* parent) : _radio(radio), _device(parent), _type(type), _rxCallbackType(RxCbType::None), _api_type(api_type) { if (_api_type == Async) { + //printf("Creating Radio Type %d ASYNC\n", type); _rx_thread_running = true; _rx_thread = new std::thread(CaribouLiteRadio::CaribouLiteRxThread, this); @@ -152,6 +155,7 @@ CaribouLiteRadio::CaribouLiteRadio( const cariboulite_radio_state_st* radio, } else { + //printf("Creating Radio Type %d SYNC\n", type); _read_samples = NULL; _read_metadata = NULL; size_t mtu_size = GetNativeMtuSample();