mirror of
https://github.com/AlexandreRouma/SDRPlusPlus.git
synced 2024-12-25 02:18:30 +01:00
Merge pull request #886 from AlexandreRouma/rigctl_client
Beginning of rigctl client (not yet usable)
This commit is contained in:
commit
68ba6d7d19
@ -59,6 +59,7 @@ option(OPT_BUILD_WEATHER_SAT_DECODER "Build the HRPT decoder module (no dependen
|
|||||||
option(OPT_BUILD_DISCORD_PRESENCE "Build the Discord Rich Presence module" ON)
|
option(OPT_BUILD_DISCORD_PRESENCE "Build the Discord Rich Presence module" ON)
|
||||||
option(OPT_BUILD_FREQUENCY_MANAGER "Build the Frequency Manager module" ON)
|
option(OPT_BUILD_FREQUENCY_MANAGER "Build the Frequency Manager module" ON)
|
||||||
option(OPT_BUILD_RECORDER "Audio and baseband recorder" ON)
|
option(OPT_BUILD_RECORDER "Audio and baseband recorder" ON)
|
||||||
|
option(OPT_BUILD_RIGCTL_CLIENT "Rigctl client to make SDR++ act as a panadapter" OFF)
|
||||||
option(OPT_BUILD_RIGCTL_SERVER "Rigctl backend for controlling SDR++ with software like gpredict" ON)
|
option(OPT_BUILD_RIGCTL_SERVER "Rigctl backend for controlling SDR++ with software like gpredict" ON)
|
||||||
option(OPT_BUILD_SCANNER "Frequency scanner" ON)
|
option(OPT_BUILD_SCANNER "Frequency scanner" ON)
|
||||||
option(OPT_BUILD_SCHEDULER "Build the scheduler" OFF)
|
option(OPT_BUILD_SCHEDULER "Build the scheduler" OFF)
|
||||||
@ -189,6 +190,10 @@ if (OPT_BUILD_RECORDER)
|
|||||||
add_subdirectory("misc_modules/recorder")
|
add_subdirectory("misc_modules/recorder")
|
||||||
endif (OPT_BUILD_RECORDER)
|
endif (OPT_BUILD_RECORDER)
|
||||||
|
|
||||||
|
if (OPT_BUILD_RIGCTL_CLIENT)
|
||||||
|
add_subdirectory("misc_modules/rigctl_client")
|
||||||
|
endif (OPT_BUILD_RIGCTL_CLIENT)
|
||||||
|
|
||||||
if (OPT_BUILD_RIGCTL_SERVER)
|
if (OPT_BUILD_RIGCTL_SERVER)
|
||||||
add_subdirectory("misc_modules/rigctl_server")
|
add_subdirectory("misc_modules/rigctl_server")
|
||||||
endif (OPT_BUILD_RIGCTL_SERVER)
|
endif (OPT_BUILD_RIGCTL_SERVER)
|
||||||
|
@ -195,6 +195,10 @@ int sdrpp_main(int argc, char* argv[]) {
|
|||||||
defConfig["moduleInstances"]["Frequency Manager"] = "frequency_manager";
|
defConfig["moduleInstances"]["Frequency Manager"] = "frequency_manager";
|
||||||
defConfig["moduleInstances"]["Recorder"] = "recorder";
|
defConfig["moduleInstances"]["Recorder"] = "recorder";
|
||||||
defConfig["moduleInstances"]["Rigctl Server"] = "rigctl_server";
|
defConfig["moduleInstances"]["Rigctl Server"] = "rigctl_server";
|
||||||
|
// defConfig["moduleInstances"]["Rigctl Client"] = "rigctl_client";
|
||||||
|
// TODO: Enable rigctl_client when ready
|
||||||
|
// defConfig["moduleInstances"]["Scanner"] = "scanner";
|
||||||
|
// TODO: Enable scanner when ready
|
||||||
|
|
||||||
|
|
||||||
// Themes
|
// Themes
|
||||||
|
@ -84,7 +84,9 @@ void SourceManager::tune(double freq) {
|
|||||||
if (selectedHandler == NULL) {
|
if (selectedHandler == NULL) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
selectedHandler->tuneHandler(freq + tuneOffset, selectedHandler->ctx);
|
// TODO: No need to always retune the hardware in panadpter mode
|
||||||
|
selectedHandler->tuneHandler(((tuneMode == TuningMode::NORMAL) ? freq : ifFreq) + tuneOffset, selectedHandler->ctx);
|
||||||
|
onRetune.emit(freq);
|
||||||
currentFreq = freq;
|
currentFreq = freq;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -92,3 +94,13 @@ void SourceManager::setTuningOffset(double offset) {
|
|||||||
tuneOffset = offset;
|
tuneOffset = offset;
|
||||||
tune(currentFreq);
|
tune(currentFreq);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void SourceManager::setTuningMode(TuningMode mode) {
|
||||||
|
tuneMode = mode;
|
||||||
|
tune(currentFreq);
|
||||||
|
}
|
||||||
|
|
||||||
|
void SourceManager::setPanadpterIF(double freq) {
|
||||||
|
ifFreq = freq;
|
||||||
|
tune(currentFreq);
|
||||||
|
}
|
@ -21,6 +21,11 @@ public:
|
|||||||
void* ctx;
|
void* ctx;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
enum TuningMode {
|
||||||
|
NORMAL,
|
||||||
|
PANADAPTER
|
||||||
|
};
|
||||||
|
|
||||||
void registerSource(std::string name, SourceHandler* handler);
|
void registerSource(std::string name, SourceHandler* handler);
|
||||||
void unregisterSource(std::string name);
|
void unregisterSource(std::string name);
|
||||||
void selectSource(std::string name);
|
void selectSource(std::string name);
|
||||||
@ -29,12 +34,15 @@ public:
|
|||||||
void stop();
|
void stop();
|
||||||
void tune(double freq);
|
void tune(double freq);
|
||||||
void setTuningOffset(double offset);
|
void setTuningOffset(double offset);
|
||||||
|
void setTuningMode(TuningMode mode);
|
||||||
|
void setPanadpterIF(double freq);
|
||||||
|
|
||||||
std::vector<std::string> getSourceNames();
|
std::vector<std::string> getSourceNames();
|
||||||
|
|
||||||
Event<std::string> onSourceRegistered;
|
Event<std::string> onSourceRegistered;
|
||||||
Event<std::string> onSourceUnregister;
|
Event<std::string> onSourceUnregister;
|
||||||
Event<std::string> onSourceUnregistered;
|
Event<std::string> onSourceUnregistered;
|
||||||
|
Event<double> onRetune;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
std::map<std::string, SourceHandler*> sources;
|
std::map<std::string, SourceHandler*> sources;
|
||||||
@ -42,5 +50,7 @@ private:
|
|||||||
SourceHandler* selectedHandler = NULL;
|
SourceHandler* selectedHandler = NULL;
|
||||||
double tuneOffset;
|
double tuneOffset;
|
||||||
double currentFreq;
|
double currentFreq;
|
||||||
|
double ifFreq = 0.0;
|
||||||
|
TuningMode tuneMode;
|
||||||
dsp::stream<dsp::complex_t> nullSource;
|
dsp::stream<dsp::complex_t> nullSource;
|
||||||
};
|
};
|
24
misc_modules/rigctl_client/CMakeLists.txt
Normal file
24
misc_modules/rigctl_client/CMakeLists.txt
Normal file
@ -0,0 +1,24 @@
|
|||||||
|
cmake_minimum_required(VERSION 3.13)
|
||||||
|
project(rigctl_client)
|
||||||
|
|
||||||
|
file(GLOB SRC "src/*.cpp")
|
||||||
|
|
||||||
|
add_library(rigctl_client SHARED ${SRC})
|
||||||
|
target_link_libraries(rigctl_client PRIVATE sdrpp_core)
|
||||||
|
set_target_properties(rigctl_client PROPERTIES PREFIX "")
|
||||||
|
|
||||||
|
target_include_directories(rigctl_client PRIVATE "src/")
|
||||||
|
target_include_directories(rigctl_client PRIVATE "../recorder/src")
|
||||||
|
target_include_directories(rigctl_client PRIVATE "../../decoder_modules/meteor_demodulator/src")
|
||||||
|
target_include_directories(rigctl_client PRIVATE "../../decoder_modules/radio/src")
|
||||||
|
|
||||||
|
if (MSVC)
|
||||||
|
target_compile_options(rigctl_client PRIVATE /O2 /Ob2 /std:c++17 /EHsc)
|
||||||
|
elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
|
||||||
|
target_compile_options(rigctl_client PRIVATE -O3 -std=c++17 -Wno-unused-command-line-argument -undefined dynamic_lookup)
|
||||||
|
else ()
|
||||||
|
target_compile_options(rigctl_client PRIVATE -O3 -std=c++17)
|
||||||
|
endif ()
|
||||||
|
|
||||||
|
# Install directives
|
||||||
|
install(TARGETS rigctl_client DESTINATION lib/sdrpp/plugins)
|
159
misc_modules/rigctl_client/src/main.cpp
Normal file
159
misc_modules/rigctl_client/src/main.cpp
Normal file
@ -0,0 +1,159 @@
|
|||||||
|
#include <utils/networking.h>
|
||||||
|
#include <imgui.h>
|
||||||
|
#include <module.h>
|
||||||
|
#include <gui/gui.h>
|
||||||
|
#include <gui/style.h>
|
||||||
|
#include <signal_path/signal_path.h>
|
||||||
|
#include <core.h>
|
||||||
|
#include <recorder_interface.h>
|
||||||
|
#include <meteor_demodulator_interface.h>
|
||||||
|
#include <config.h>
|
||||||
|
#include <cctype>
|
||||||
|
#include <radio_interface.h>
|
||||||
|
#define CONCAT(a, b) ((std::string(a) + b).c_str())
|
||||||
|
|
||||||
|
#define MAX_COMMAND_LENGTH 8192
|
||||||
|
|
||||||
|
SDRPP_MOD_INFO{
|
||||||
|
/* Name: */ "rigctl_client",
|
||||||
|
/* Description: */ "My fancy new module",
|
||||||
|
/* Author: */ "Ryzerth",
|
||||||
|
/* Version: */ 0, 1, 0,
|
||||||
|
/* Max instances */ 1
|
||||||
|
};
|
||||||
|
|
||||||
|
enum {
|
||||||
|
RECORDER_TYPE_RECORDER,
|
||||||
|
RECORDER_TYPE_METEOR_DEMODULATOR
|
||||||
|
};
|
||||||
|
|
||||||
|
ConfigManager config;
|
||||||
|
|
||||||
|
class SigctlServerModule : public ModuleManager::Instance {
|
||||||
|
public:
|
||||||
|
SigctlServerModule(std::string name) {
|
||||||
|
this->name = name;
|
||||||
|
|
||||||
|
strcpy(host, "127.0.0.1");
|
||||||
|
|
||||||
|
_retuneHandler.ctx = this;
|
||||||
|
_retuneHandler.handler = retuneHandler;
|
||||||
|
|
||||||
|
gui::menu.registerEntry(name, menuHandler, this, NULL);
|
||||||
|
}
|
||||||
|
|
||||||
|
~SigctlServerModule() {
|
||||||
|
stop();
|
||||||
|
gui::menu.removeEntry(name);
|
||||||
|
}
|
||||||
|
|
||||||
|
void postInit() {
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
void enable() {
|
||||||
|
enabled = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
void disable() {
|
||||||
|
enabled = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool isEnabled() {
|
||||||
|
return enabled;
|
||||||
|
}
|
||||||
|
|
||||||
|
void start() {
|
||||||
|
std::lock_guard<std::recursive_mutex> lck(mtx);
|
||||||
|
if (running) { return; }
|
||||||
|
|
||||||
|
sigpath::sourceManager.setPanadpterIF(ifFreq);
|
||||||
|
sigpath::sourceManager.setTuningMode(SourceManager::TuningMode::PANADAPTER);
|
||||||
|
sigpath::sourceManager.onRetune.bindHandler(&_retuneHandler);
|
||||||
|
running = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
void stop() {
|
||||||
|
std::lock_guard<std::recursive_mutex> lck(mtx);
|
||||||
|
if (!running) { return; }
|
||||||
|
|
||||||
|
sigpath::sourceManager.onRetune.unbindHandler(&_retuneHandler);
|
||||||
|
sigpath::sourceManager.setTuningMode(SourceManager::TuningMode::NORMAL);
|
||||||
|
running = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
private:
|
||||||
|
static void menuHandler(void* ctx) {
|
||||||
|
SigctlServerModule* _this = (SigctlServerModule*)ctx;
|
||||||
|
float menuWidth = ImGui::GetContentRegionAvail().x;
|
||||||
|
|
||||||
|
if (_this->running) { style::beginDisabled(); }
|
||||||
|
if (ImGui::InputText(CONCAT("##_rigctl_cli_host_", _this->name), _this->host, 1023)) {
|
||||||
|
config.acquire();
|
||||||
|
config.conf[_this->name]["host"] = std::string(_this->host);
|
||||||
|
config.release(true);
|
||||||
|
}
|
||||||
|
ImGui::SameLine();
|
||||||
|
ImGui::SetNextItemWidth(menuWidth - ImGui::GetCursorPosX());
|
||||||
|
if (ImGui::InputInt(CONCAT("##_rigctl_cli_port_", _this->name), &_this->port, 0, 0)) {
|
||||||
|
config.acquire();
|
||||||
|
config.conf[_this->name]["port"] = _this->port;
|
||||||
|
config.release(true);
|
||||||
|
}
|
||||||
|
if (_this->running) { style::endDisabled(); }
|
||||||
|
|
||||||
|
ImGui::LeftLabel("IF Frequency");
|
||||||
|
ImGui::FillWidth();
|
||||||
|
if (ImGui::InputDouble(CONCAT("##_rigctl_if_freq_", _this->name), &_this->ifFreq, 100.0, 100000.0, "%.0f")) {
|
||||||
|
if (_this->running) {
|
||||||
|
sigpath::sourceManager.setPanadpterIF(_this->ifFreq);
|
||||||
|
}
|
||||||
|
config.acquire();
|
||||||
|
config.conf[_this->name]["ifFreq"] = _this->ifFreq;
|
||||||
|
config.release(true);
|
||||||
|
}
|
||||||
|
|
||||||
|
ImGui::FillWidth();
|
||||||
|
if (_this->running && ImGui::Button(CONCAT("Stop##_rigctl_cli_stop_", _this->name), ImVec2(menuWidth, 0))) {
|
||||||
|
_this->stop();
|
||||||
|
}
|
||||||
|
else if (!_this->running && ImGui::Button(CONCAT("Start##_rigctl_cli_stop_", _this->name), ImVec2(menuWidth, 0))) {
|
||||||
|
_this->start();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static void retuneHandler(double freq, void* ctx) {
|
||||||
|
spdlog::warn("PAN RETUNE: {0}", freq);
|
||||||
|
}
|
||||||
|
|
||||||
|
std::string name;
|
||||||
|
bool enabled = true;
|
||||||
|
bool running = false;
|
||||||
|
std::recursive_mutex mtx;
|
||||||
|
|
||||||
|
char host[1024];
|
||||||
|
int port = 4532;
|
||||||
|
|
||||||
|
double ifFreq = 8830000.0;
|
||||||
|
|
||||||
|
EventHandler<double> _retuneHandler;
|
||||||
|
};
|
||||||
|
|
||||||
|
MOD_EXPORT void _INIT_() {
|
||||||
|
config.setPath(core::args["root"].s() + "/rigctl_client_config.json");
|
||||||
|
config.load(json::object());
|
||||||
|
config.enableAutoSave();
|
||||||
|
}
|
||||||
|
|
||||||
|
MOD_EXPORT ModuleManager::Instance* _CREATE_INSTANCE_(std::string name) {
|
||||||
|
return new SigctlServerModule(name);
|
||||||
|
}
|
||||||
|
|
||||||
|
MOD_EXPORT void _DELETE_INSTANCE_(void* instance) {
|
||||||
|
delete (SigctlServerModule*)instance;
|
||||||
|
}
|
||||||
|
|
||||||
|
MOD_EXPORT void _END_() {
|
||||||
|
config.disableAutoSave();
|
||||||
|
config.save();
|
||||||
|
}
|
10
misc_modules/rigctl_client/src/rigctl_client.h
Normal file
10
misc_modules/rigctl_client/src/rigctl_client.h
Normal file
@ -0,0 +1,10 @@
|
|||||||
|
#pragma once
|
||||||
|
#include <utils/networking.h>
|
||||||
|
|
||||||
|
class RigCTLClient {
|
||||||
|
public:
|
||||||
|
|
||||||
|
|
||||||
|
private:
|
||||||
|
|
||||||
|
};
|
Loading…
Reference in New Issue
Block a user