mirror of
https://github.com/AlexandreRouma/SDRPlusPlus.git
synced 2024-12-26 02:48:31 +01:00
started work on the network source
This commit is contained in:
parent
daf0f8c159
commit
ba5380f9bb
@ -17,6 +17,7 @@ option(OPT_BUILD_FILE_SOURCE "Wav file source" ON)
|
|||||||
option(OPT_BUILD_HACKRF_SOURCE "Build HackRF Source Module (Dependencies: libhackrf)" ON)
|
option(OPT_BUILD_HACKRF_SOURCE "Build HackRF Source Module (Dependencies: libhackrf)" ON)
|
||||||
option(OPT_BUILD_HERMES_SOURCE "Build Hermes Source Module (no dependencies required)" ON)
|
option(OPT_BUILD_HERMES_SOURCE "Build Hermes Source Module (no dependencies required)" ON)
|
||||||
option(OPT_BUILD_LIMESDR_SOURCE "Build LimeSDR Source Module (Dependencies: liblimesuite)" OFF)
|
option(OPT_BUILD_LIMESDR_SOURCE "Build LimeSDR Source Module (Dependencies: liblimesuite)" OFF)
|
||||||
|
option(OPT_BUILD_NETWORK_SOURCE "Build Network Source Module (no dependencies required)" on)
|
||||||
option(OPT_BUILD_PERSEUS_SOURCE "Build Perseus Source Module (Dependencies: libperseus-sdr)" OFF)
|
option(OPT_BUILD_PERSEUS_SOURCE "Build Perseus Source Module (Dependencies: libperseus-sdr)" OFF)
|
||||||
option(OPT_BUILD_PLUTOSDR_SOURCE "Build PlutoSDR Source Module (Dependencies: libiio, libad9361)" ON)
|
option(OPT_BUILD_PLUTOSDR_SOURCE "Build PlutoSDR Source Module (Dependencies: libiio, libad9361)" ON)
|
||||||
option(OPT_BUILD_RFSPACE_SOURCE "Build RFspace Source Module (no dependencies required)" ON)
|
option(OPT_BUILD_RFSPACE_SOURCE "Build RFspace Source Module (no dependencies required)" ON)
|
||||||
@ -144,6 +145,10 @@ if (OPT_BUILD_LIMESDR_SOURCE)
|
|||||||
add_subdirectory("source_modules/limesdr_source")
|
add_subdirectory("source_modules/limesdr_source")
|
||||||
endif (OPT_BUILD_LIMESDR_SOURCE)
|
endif (OPT_BUILD_LIMESDR_SOURCE)
|
||||||
|
|
||||||
|
if (OPT_BUILD_NETWORK_SOURCE)
|
||||||
|
add_subdirectory("source_modules/network_source")
|
||||||
|
endif (OPT_BUILD_NETWORK_SOURCE)
|
||||||
|
|
||||||
if (OPT_BUILD_PERSEUS_SOURCE)
|
if (OPT_BUILD_PERSEUS_SOURCE)
|
||||||
add_subdirectory("source_modules/perseus_source")
|
add_subdirectory("source_modules/perseus_source")
|
||||||
endif (OPT_BUILD_PERSEUS_SOURCE)
|
endif (OPT_BUILD_PERSEUS_SOURCE)
|
||||||
|
@ -334,6 +334,7 @@ Modules in beta are still included in releases for the most part but not enabled
|
|||||||
| hackrf_source | Working | libhackrf | OPT_BUILD_HACKRF_SOURCE | ✅ | ✅ | ✅ |
|
| hackrf_source | Working | libhackrf | OPT_BUILD_HACKRF_SOURCE | ✅ | ✅ | ✅ |
|
||||||
| hermes_source | Beta | - | OPT_BUILD_HERMES_SOURCE | ✅ | ✅ | ✅ |
|
| hermes_source | Beta | - | OPT_BUILD_HERMES_SOURCE | ✅ | ✅ | ✅ |
|
||||||
| limesdr_source | Working | liblimesuite | OPT_BUILD_LIMESDR_SOURCE | ⛔ | ✅ | ✅ |
|
| limesdr_source | Working | liblimesuite | OPT_BUILD_LIMESDR_SOURCE | ⛔ | ✅ | ✅ |
|
||||||
|
| network_source | Unfinished | - | OPT_BUILD_NETWORK_SOURCE | ✅ | ✅ | ⛔ |
|
||||||
| perseus_source | Beta | libperseus-sdr | OPT_BUILD_PERSEUS_SOURCE | ⛔ | ✅ | ✅ |
|
| perseus_source | Beta | libperseus-sdr | OPT_BUILD_PERSEUS_SOURCE | ⛔ | ✅ | ✅ |
|
||||||
| plutosdr_source | Working | libiio, libad9361 | OPT_BUILD_PLUTOSDR_SOURCE | ✅ | ✅ | ✅ |
|
| plutosdr_source | Working | libiio, libad9361 | OPT_BUILD_PLUTOSDR_SOURCE | ✅ | ✅ | ✅ |
|
||||||
| rfspace_source | Working | - | OPT_BUILD_RFSPACE_SOURCE | ✅ | ✅ | ✅ |
|
| rfspace_source | Working | - | OPT_BUILD_RFSPACE_SOURCE | ✅ | ✅ | ✅ |
|
||||||
|
6
source_modules/network_source/CMakeLists.txt
Normal file
6
source_modules/network_source/CMakeLists.txt
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
cmake_minimum_required(VERSION 3.13)
|
||||||
|
project(network_source)
|
||||||
|
|
||||||
|
file(GLOB SRC "src/*.cpp")
|
||||||
|
|
||||||
|
include(${SDRPP_MODULE_CMAKE})
|
334
source_modules/network_source/src/main.cpp
Normal file
334
source_modules/network_source/src/main.cpp
Normal file
@ -0,0 +1,334 @@
|
|||||||
|
#include <utils/flog.h>
|
||||||
|
#include <module.h>
|
||||||
|
#include <gui/gui.h>
|
||||||
|
#include <signal_path/signal_path.h>
|
||||||
|
#include <core.h>
|
||||||
|
#include <gui/style.h>
|
||||||
|
#include <config.h>
|
||||||
|
#include <gui/smgui.h>
|
||||||
|
#include <gui/widgets/stepped_slider.h>
|
||||||
|
#include <utils/optionlist.h>
|
||||||
|
#include <utils/net.h>
|
||||||
|
|
||||||
|
#define CONCAT(a, b) ((std::string(a) + b).c_str())
|
||||||
|
|
||||||
|
SDRPP_MOD_INFO{
|
||||||
|
/* Name: */ "network_source",
|
||||||
|
/* Description: */ "UDP/TCP Source Module",
|
||||||
|
/* Author: */ "Ryzerth",
|
||||||
|
/* Version: */ 0, 1, 0,
|
||||||
|
/* Max instances */ 1
|
||||||
|
};
|
||||||
|
|
||||||
|
ConfigManager config;
|
||||||
|
|
||||||
|
enum Protocol {
|
||||||
|
PROTOCOL_TCP_SERVER,
|
||||||
|
PROTOCOL_TCP_CLIENT,
|
||||||
|
PROTOCOL_UDP
|
||||||
|
};
|
||||||
|
|
||||||
|
enum SampleType {
|
||||||
|
SAMPLE_TYPE_INT8,
|
||||||
|
SAMPLE_TYPE_INT16,
|
||||||
|
SAMPLE_TYPE_INT32,
|
||||||
|
SAMPLE_TYPE_FLOAT32
|
||||||
|
};
|
||||||
|
|
||||||
|
class NetworkSourceModule : public ModuleManager::Instance {
|
||||||
|
public:
|
||||||
|
NetworkSourceModule(std::string name) {
|
||||||
|
this->name = name;
|
||||||
|
|
||||||
|
samplerate = 1000000.0;
|
||||||
|
|
||||||
|
handler.ctx = this;
|
||||||
|
handler.selectHandler = menuSelected;
|
||||||
|
handler.deselectHandler = menuDeselected;
|
||||||
|
handler.menuHandler = menuHandler;
|
||||||
|
handler.startHandler = start;
|
||||||
|
handler.stopHandler = stop;
|
||||||
|
handler.tuneHandler = tune;
|
||||||
|
handler.stream = &stream;
|
||||||
|
|
||||||
|
// Define samplerates
|
||||||
|
for (int i = 3000; i <= 192000; i <<= 1) {
|
||||||
|
samplerates.define(i, getSrScaled(i), i);
|
||||||
|
}
|
||||||
|
for (int i = 250000; i < 1000000; i += 250000) {
|
||||||
|
samplerates.define(i, getSrScaled(i), i);
|
||||||
|
}
|
||||||
|
for (int i = 1000000; i < 10000000; i += 500000) {
|
||||||
|
samplerates.define(i, getSrScaled(i), i);
|
||||||
|
}
|
||||||
|
for (int i = 10000000; i <= 100000000; i += 5000000) {
|
||||||
|
samplerates.define(i, getSrScaled(i), i);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Define protocols
|
||||||
|
protocols.define("TCP (Server)", PROTOCOL_TCP_SERVER);
|
||||||
|
protocols.define("TCP (Client)", PROTOCOL_TCP_CLIENT);
|
||||||
|
protocols.define("UDP", PROTOCOL_UDP);
|
||||||
|
|
||||||
|
// Define sample types
|
||||||
|
sampleTypes.define("Int8", SAMPLE_TYPE_INT8);
|
||||||
|
sampleTypes.define("Int16", SAMPLE_TYPE_INT16);
|
||||||
|
sampleTypes.define("Int32", SAMPLE_TYPE_INT32);
|
||||||
|
sampleTypes.define("Float32", SAMPLE_TYPE_FLOAT32);
|
||||||
|
|
||||||
|
// Load config
|
||||||
|
config.acquire();
|
||||||
|
if (config.conf[name].contains("samplerate")) {
|
||||||
|
int sr = config.conf[name]["samplerate"];
|
||||||
|
if (samplerates.keyExists(sr)) { samplerate = samplerates.value(samplerates.keyId(sr)); }
|
||||||
|
}
|
||||||
|
if (config.conf[name].contains("protocol")) {
|
||||||
|
std::string protoStr = config.conf[name]["protocol"];
|
||||||
|
if (protocols.keyExists(protoStr)) { proto = protocols.value(protocols.keyId(protoStr)); }
|
||||||
|
}
|
||||||
|
if (config.conf[name].contains("sampleType")) {
|
||||||
|
std::string sampTypeStr = config.conf[name]["sampleType"];
|
||||||
|
if (sampleTypes.keyExists(sampTypeStr)) { sampType = sampleTypes.value(sampleTypes.keyId(sampTypeStr)); }
|
||||||
|
}
|
||||||
|
if (config.conf[name].contains("host")) {
|
||||||
|
std::string hostStr = config.conf[name]["host"];
|
||||||
|
strcpy(hostname, hostStr.c_str());
|
||||||
|
}
|
||||||
|
if (config.conf[name].contains("port")) {
|
||||||
|
port = config.conf[name]["port"];
|
||||||
|
port = std::clamp<int>(port, 1, 65535);
|
||||||
|
}
|
||||||
|
config.release();
|
||||||
|
|
||||||
|
// Set menu IDs
|
||||||
|
srId = samplerates.valueId(samplerate);
|
||||||
|
protoId = protocols.valueId(proto);
|
||||||
|
sampTypeId = sampleTypes.valueId(sampType);
|
||||||
|
|
||||||
|
sigpath::sourceManager.registerSource("Network", &handler);
|
||||||
|
}
|
||||||
|
|
||||||
|
~NetworkSourceModule() {
|
||||||
|
stop(this);
|
||||||
|
sigpath::sourceManager.unregisterSource("Network");
|
||||||
|
}
|
||||||
|
|
||||||
|
void postInit() {}
|
||||||
|
|
||||||
|
void enable() {
|
||||||
|
enabled = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
void disable() {
|
||||||
|
enabled = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool isEnabled() {
|
||||||
|
return enabled;
|
||||||
|
}
|
||||||
|
|
||||||
|
private:
|
||||||
|
std::string getSrScaled(double sr) {
|
||||||
|
char buf[1024];
|
||||||
|
if (sr >= 1000000.0) {
|
||||||
|
sprintf(buf, "%.1lf MS/s", sr / 1000000.0);
|
||||||
|
}
|
||||||
|
else if (sr >= 1000.0) {
|
||||||
|
sprintf(buf, "%.1lf KS/s", sr / 1000.0);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
sprintf(buf, "%.1lf S/s", sr);
|
||||||
|
}
|
||||||
|
return std::string(buf);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void menuSelected(void* ctx) {
|
||||||
|
NetworkSourceModule* _this = (NetworkSourceModule*)ctx;
|
||||||
|
core::setInputSampleRate(_this->samplerate);
|
||||||
|
flog::info("NetworkSourceModule '{0}': Menu Select!", _this->name);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void menuDeselected(void* ctx) {
|
||||||
|
NetworkSourceModule* _this = (NetworkSourceModule*)ctx;
|
||||||
|
flog::info("NetworkSourceModule '{0}': Menu Deselect!", _this->name);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void start(void* ctx) {
|
||||||
|
NetworkSourceModule* _this = (NetworkSourceModule*)ctx;
|
||||||
|
if (_this->running) { return; }
|
||||||
|
|
||||||
|
// TODO
|
||||||
|
|
||||||
|
_this->running = true;
|
||||||
|
flog::info("NetworkSourceModule '{0}': Start!", _this->name);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void stop(void* ctx) {
|
||||||
|
NetworkSourceModule* _this = (NetworkSourceModule*)ctx;
|
||||||
|
if (!_this->running) { return; }
|
||||||
|
|
||||||
|
// TODO
|
||||||
|
|
||||||
|
_this->running = false;
|
||||||
|
flog::info("NetworkSourceModule '{0}': Stop!", _this->name);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void tune(double freq, void* ctx) {
|
||||||
|
NetworkSourceModule* _this = (NetworkSourceModule*)ctx;
|
||||||
|
if (_this->running) {
|
||||||
|
// Nothing for now
|
||||||
|
}
|
||||||
|
_this->freq = freq;
|
||||||
|
flog::info("NetworkSourceModule '{0}': Tune: {1}!", _this->name, freq);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void menuHandler(void* ctx) {
|
||||||
|
NetworkSourceModule* _this = (NetworkSourceModule*)ctx;
|
||||||
|
|
||||||
|
if (_this->running) { SmGui::BeginDisabled(); }
|
||||||
|
|
||||||
|
// Hostname and port field
|
||||||
|
if (ImGui::InputText(("##iq_exporter_host_" + _this->name).c_str(), _this->hostname, sizeof(_this->hostname))) {
|
||||||
|
config.acquire();
|
||||||
|
config.conf[_this->name]["host"] = _this->hostname;
|
||||||
|
config.release(true);
|
||||||
|
}
|
||||||
|
ImGui::SameLine();
|
||||||
|
ImGui::FillWidth();
|
||||||
|
if (ImGui::InputInt(("##iq_exporter_port_" + _this->name).c_str(), &_this->port, 0, 0)) {
|
||||||
|
_this->port = std::clamp<int>(_this->port, 1, 65535);
|
||||||
|
config.acquire();
|
||||||
|
config.conf[_this->name]["port"] = _this->port;
|
||||||
|
config.release(true);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Samplerate selector
|
||||||
|
ImGui::LeftLabel("Samplerate");
|
||||||
|
ImGui::FillWidth();
|
||||||
|
if (ImGui::Combo(("##iq_exporter_sr_" + _this->name).c_str(), &_this->srId, _this->samplerates.txt)) {
|
||||||
|
_this->samplerate = _this->samplerates.value(_this->srId);
|
||||||
|
core::setInputSampleRate(_this->samplerate);
|
||||||
|
config.acquire();
|
||||||
|
config.conf[_this->name]["samplerate"] = _this->samplerates.key(_this->srId);
|
||||||
|
config.release(true);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Mode protocol selector
|
||||||
|
ImGui::LeftLabel("Protocol");
|
||||||
|
ImGui::FillWidth();
|
||||||
|
if (ImGui::Combo(("##iq_exporter_proto_" + _this->name).c_str(), &_this->protoId, _this->protocols.txt)) {
|
||||||
|
_this->proto = _this->protocols.value(_this->protoId);
|
||||||
|
config.acquire();
|
||||||
|
config.conf[_this->name]["protocol"] = _this->protocols.key(_this->protoId);
|
||||||
|
config.release(true);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Sample type selector
|
||||||
|
ImGui::LeftLabel("Sample type");
|
||||||
|
ImGui::FillWidth();
|
||||||
|
if (ImGui::Combo(("##iq_exporter_samp_" + _this->name).c_str(), &_this->sampTypeId, _this->sampleTypes.txt)) {
|
||||||
|
_this->sampType = _this->sampleTypes.value(_this->sampTypeId);
|
||||||
|
config.acquire();
|
||||||
|
config.conf[_this->name]["sampleType"] = _this->sampleTypes.key(_this->sampTypeId);
|
||||||
|
config.release(true);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (_this->running) { SmGui::EndDisabled(); }
|
||||||
|
}
|
||||||
|
|
||||||
|
void worker() {
|
||||||
|
int frameSize = samplerate / 200;
|
||||||
|
switch (sampType) {
|
||||||
|
case SAMPLE_TYPE_INT8:
|
||||||
|
frameSize *= 2*sizeof(int8_t);;
|
||||||
|
break;
|
||||||
|
case SAMPLE_TYPE_INT16:
|
||||||
|
frameSize *= 2*sizeof(int16_t);
|
||||||
|
break;
|
||||||
|
case SAMPLE_TYPE_INT32:
|
||||||
|
frameSize *= 2*sizeof(int32_t);
|
||||||
|
break;
|
||||||
|
case SAMPLE_TYPE_FLOAT32:
|
||||||
|
frameSize *= sizeof(dsp::complex_t);
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
uint8_t* buffer = dsp::buffer::alloc<uint8_t>(STREAM_BUFFER_SIZE*sizeof(uint32_t));
|
||||||
|
|
||||||
|
while (true) {
|
||||||
|
// Read samples from socket
|
||||||
|
int bytes = sock->recv(buffer, frameSize, true);
|
||||||
|
|
||||||
|
// Convert to CF32
|
||||||
|
int count;
|
||||||
|
switch (sampType) {
|
||||||
|
case SAMPLE_TYPE_INT8:
|
||||||
|
frameSize *= 2*sizeof(int8_t);;
|
||||||
|
break;
|
||||||
|
case SAMPLE_TYPE_INT16:
|
||||||
|
frameSize *= 2*sizeof(int16_t);
|
||||||
|
break;
|
||||||
|
case SAMPLE_TYPE_INT32:
|
||||||
|
frameSize *= 2*sizeof(int32_t);
|
||||||
|
break;
|
||||||
|
case SAMPLE_TYPE_FLOAT32:
|
||||||
|
//memcpy(stream.writeBuf, buffer, )
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Send out converted samples
|
||||||
|
//if (!stream.swap(bufferSize))
|
||||||
|
}
|
||||||
|
|
||||||
|
dsp::buffer::free(buffer);
|
||||||
|
}
|
||||||
|
|
||||||
|
std::string name;
|
||||||
|
bool enabled = true;
|
||||||
|
dsp::stream<dsp::complex_t> stream;
|
||||||
|
SourceManager::SourceHandler handler;
|
||||||
|
bool running = false;
|
||||||
|
double freq;
|
||||||
|
|
||||||
|
int samplerate = 1000000;
|
||||||
|
int srId;
|
||||||
|
Protocol proto = PROTOCOL_TCP_SERVER;
|
||||||
|
int protoId;
|
||||||
|
SampleType sampType = SAMPLE_TYPE_INT16;
|
||||||
|
int sampTypeId;
|
||||||
|
char hostname[1024] = "localhost";
|
||||||
|
int port = 1234;
|
||||||
|
|
||||||
|
OptionList<int, int> samplerates;
|
||||||
|
OptionList<std::string, Protocol> protocols;
|
||||||
|
OptionList<std::string, SampleType> sampleTypes;
|
||||||
|
|
||||||
|
std::thread listenWorkerThread;
|
||||||
|
|
||||||
|
std::mutex sockMtx;
|
||||||
|
std::shared_ptr<net::Socket> sock;
|
||||||
|
std::shared_ptr<net::Listener> listener;
|
||||||
|
};
|
||||||
|
|
||||||
|
MOD_EXPORT void _INIT_() {
|
||||||
|
json def = json({});
|
||||||
|
config.setPath(core::args["root"].s() + "/network_source_config.json");
|
||||||
|
config.load(def);
|
||||||
|
config.enableAutoSave();
|
||||||
|
}
|
||||||
|
|
||||||
|
MOD_EXPORT ModuleManager::Instance* _CREATE_INSTANCE_(std::string name) {
|
||||||
|
return new NetworkSourceModule(name);
|
||||||
|
}
|
||||||
|
|
||||||
|
MOD_EXPORT void _DELETE_INSTANCE_(ModuleManager::Instance* instance) {
|
||||||
|
delete (NetworkSourceModule*)instance;
|
||||||
|
}
|
||||||
|
|
||||||
|
MOD_EXPORT void _END_() {
|
||||||
|
config.disableAutoSave();
|
||||||
|
config.save();
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user