mirror of
https://github.com/AlexandreRouma/SDRPlusPlus.git
synced 2025-10-09 15:29:54 +02:00
Fix DSP source block initialization and add linux support to hydrasdr_source
Some checks failed
Build Binaries / build_debian_buster_amd64 (push) Failing after 18s
Build Binaries / build_debian_bullseye_amd64 (push) Failing after 4s
Build Binaries / build_debian_bookworm_amd64 (push) Failing after 4s
Build Binaries / build_debian_sid_amd64 (push) Failing after 4s
Build Binaries / build_ubuntu_focal_amd64 (push) Failing after 4s
Build Binaries / build_ubuntu_jammy_amd64 (push) Failing after 4s
Build Binaries / build_ubuntu_noble_amd64 (push) Failing after 4s
Build Binaries / build_ubuntu_oracular_amd64 (push) Failing after 4s
Build Binaries / build_android (push) Failing after 5s
Build Binaries / check_spelling (push) Failing after 3s
Build Binaries / check_formatting (push) Successful in 4s
Build Binaries / build_windows (push) Has been cancelled
Build Binaries / build_macos_intel (push) Has been cancelled
Build Binaries / build_macos_arm (push) Has been cancelled
Build Binaries / build_debian_buster_aarch64 (push) Has been cancelled
Build Binaries / build_debian_bullseye_aarch64 (push) Has been cancelled
Build Binaries / build_debian_bookworm_aarch64 (push) Has been cancelled
Build Binaries / build_debian_sid_aarch64 (push) Has been cancelled
Build Binaries / build_ubuntu_focal_aarch64 (push) Has been cancelled
Build Binaries / build_ubuntu_jammy_aarch64 (push) Has been cancelled
Build Binaries / build_ubuntu_noble_aarch64 (push) Has been cancelled
Build Binaries / build_ubuntu_oracular_aarch64 (push) Has been cancelled
Build Binaries / build_raspios_bullseye_armhf (push) Has been cancelled
Build Binaries / create_full_archive (push) Has been cancelled
Build Binaries / update_nightly_release (push) Has been cancelled
Some checks failed
Build Binaries / build_debian_buster_amd64 (push) Failing after 18s
Build Binaries / build_debian_bullseye_amd64 (push) Failing after 4s
Build Binaries / build_debian_bookworm_amd64 (push) Failing after 4s
Build Binaries / build_debian_sid_amd64 (push) Failing after 4s
Build Binaries / build_ubuntu_focal_amd64 (push) Failing after 4s
Build Binaries / build_ubuntu_jammy_amd64 (push) Failing after 4s
Build Binaries / build_ubuntu_noble_amd64 (push) Failing after 4s
Build Binaries / build_ubuntu_oracular_amd64 (push) Failing after 4s
Build Binaries / build_android (push) Failing after 5s
Build Binaries / check_spelling (push) Failing after 3s
Build Binaries / check_formatting (push) Successful in 4s
Build Binaries / build_windows (push) Has been cancelled
Build Binaries / build_macos_intel (push) Has been cancelled
Build Binaries / build_macos_arm (push) Has been cancelled
Build Binaries / build_debian_buster_aarch64 (push) Has been cancelled
Build Binaries / build_debian_bullseye_aarch64 (push) Has been cancelled
Build Binaries / build_debian_bookworm_aarch64 (push) Has been cancelled
Build Binaries / build_debian_sid_aarch64 (push) Has been cancelled
Build Binaries / build_ubuntu_focal_aarch64 (push) Has been cancelled
Build Binaries / build_ubuntu_jammy_aarch64 (push) Has been cancelled
Build Binaries / build_ubuntu_noble_aarch64 (push) Has been cancelled
Build Binaries / build_ubuntu_oracular_aarch64 (push) Has been cancelled
Build Binaries / build_raspios_bullseye_armhf (push) Has been cancelled
Build Binaries / create_full_archive (push) Has been cancelled
Build Binaries / update_nightly_release (push) Has been cancelled
This commit is contained in:
@@ -5,8 +5,6 @@ namespace dsp {
|
|||||||
template <class T>
|
template <class T>
|
||||||
class Source : public block {
|
class Source : public block {
|
||||||
public:
|
public:
|
||||||
Source() {}
|
|
||||||
|
|
||||||
Source() { init(); }
|
Source() { init(); }
|
||||||
|
|
||||||
virtual ~Source() {}
|
virtual ~Source() {}
|
||||||
|
@@ -14,5 +14,16 @@ if (MSVC)
|
|||||||
elseif (ANDROID)
|
elseif (ANDROID)
|
||||||
# TODO
|
# TODO
|
||||||
else (MSVC)
|
else (MSVC)
|
||||||
# TODO
|
find_package(PkgConfig)
|
||||||
|
|
||||||
|
pkg_check_modules(LIBHYDRASDR REQUIRED libhydrasdr)
|
||||||
|
|
||||||
|
target_include_directories(hydrasdr_source PRIVATE ${LIBHYDRASDR_INCLUDE_DIRS})
|
||||||
|
target_link_directories(hydrasdr_source PRIVATE ${LIBHYDRASDR_LIBRARY_DIRS})
|
||||||
|
target_link_libraries(hydrasdr_source PRIVATE ${LIBHYDRASDR_LIBRARIES})
|
||||||
|
|
||||||
|
# Include it because for some reason pkgconfig doesn't look here?
|
||||||
|
if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
|
||||||
|
target_include_directories(hydrasdr_source PRIVATE "/usr/local/include")
|
||||||
|
endif()
|
||||||
endif ()
|
endif ()
|
@@ -36,6 +36,9 @@ public:
|
|||||||
ports.define("rx1", "RX1", RF_PORT_RX1);
|
ports.define("rx1", "RX1", RF_PORT_RX1);
|
||||||
ports.define("rx2", "RX2", RF_PORT_RX2);
|
ports.define("rx2", "RX2", RF_PORT_RX2);
|
||||||
|
|
||||||
|
regStr[0] = 0;
|
||||||
|
valStr[0] = 0;
|
||||||
|
|
||||||
sampleRate = 10000000.0;
|
sampleRate = 10000000.0;
|
||||||
|
|
||||||
handler.ctx = this;
|
handler.ctx = this;
|
||||||
@@ -567,8 +570,32 @@ private:
|
|||||||
config.release(true);
|
config.release(true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
SmGui::LeftLabel("Reg");
|
||||||
|
SmGui::FillWidth();
|
||||||
|
SmGui::InputText(CONCAT("##_badgesdr_reg_", _this->name), _this->regStr, 256);
|
||||||
|
SmGui::LeftLabel("Value");
|
||||||
|
SmGui::FillWidth();
|
||||||
|
SmGui::InputText(CONCAT("##_badgesdr_val_", _this->name), _this->valStr, 256);
|
||||||
|
SmGui::FillWidth();
|
||||||
|
if (ImGui::Button(CONCAT("Read##_badgesdr_rd_", _this->name))) {
|
||||||
|
if (_this->running) {
|
||||||
|
uint8_t val;
|
||||||
|
hydrasdr_r82x_read(_this->openDev, std::stoi(_this->regStr, NULL, 16), &val);
|
||||||
|
sprintf(_this->valStr, "%02X", val);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
SmGui::FillWidth();
|
||||||
|
if (ImGui::Button(CONCAT("Write##_badgesdr_wr_", _this->name))) {
|
||||||
|
if (_this->running) {
|
||||||
|
hydrasdr_r82x_write(_this->openDev, std::stoi(_this->regStr, NULL, 16), std::stoi(_this->valStr, NULL, 16));
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
char valStr[256];
|
||||||
|
char regStr[256];
|
||||||
|
|
||||||
static int callback(hydrasdr_transfer_t* transfer) {
|
static int callback(hydrasdr_transfer_t* transfer) {
|
||||||
HydraSDRSourceModule* _this = (HydraSDRSourceModule*)transfer->ctx;
|
HydraSDRSourceModule* _this = (HydraSDRSourceModule*)transfer->ctx;
|
||||||
memcpy(_this->stream.writeBuf, transfer->samples, transfer->sample_count * sizeof(dsp::complex_t));
|
memcpy(_this->stream.writeBuf, transfer->samples, transfer->sample_count * sizeof(dsp::complex_t));
|
||||||
|
Reference in New Issue
Block a user