mirror/SDRPlusPlus
0
0
Fork 0
mirror of https://github.com/AlexandreRouma/SDRPlusPlus.git synced 2025-01-24 08:44:44 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Push before merge

Browse Source
This commit is contained in:
Ryzerth 2020-10-22 02:33:50 +02:00
parent fbd7321b48
commit 087380c966
7 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/signal_path/vfo_manager.cpp
View File

@ -46,6 +46,10 @@ int VFOManager::VFO::getOutputBlockSize() {
return dspVFO->getOutputBlockSize(); return dspVFO->getOutputBlockSize();
} }
void VFOManager::VFO::setSnapInterval(double interval) {
wtfVFO->setSnapInterval(interval);
}
VFOManager::VFOManager() { VFOManager::VFOManager() {

1
core/src/signal_path/vfo_manager.h
View File

@ -18,6 +18,7 @@ public:
void setSampleRate(double sampleRate, double bandwidth); void setSampleRate(double sampleRate, double bandwidth);
void setReference(int ref); void setReference(int ref);
int getOutputBlockSize(); int getOutputBlockSize();
void setSnapInterval(double interval);
dsp::stream<dsp::complex_t>* output; dsp::stream<dsp::complex_t>* output;

8
radio/src/main.cpp
View File

@ -26,6 +26,7 @@ public:
sigPath.init(name, 200000, 1000); sigPath.init(name, 200000, 1000);
sigPath.start(); sigPath.start();
sigPath.setDemodulator(SigPath::DEMOD_FM, bandWidth); sigPath.setDemodulator(SigPath::DEMOD_FM, bandWidth);
sigPath.vfo->setSnapInterval(100000.0);
gui::menu.registerEntry(name, menuHandler, this); gui::menu.registerEntry(name, menuHandler, this);
ScriptManager::ScriptRunHandler_t handler; ScriptManager::ScriptRunHandler_t handler;
@ -121,12 +122,19 @@ private:
_this->sigPath.setBandwidth(_this->bandWidth); _this->sigPath.setBandwidth(_this->bandWidth);
} }
ImGui::Text("Squelch");
ImGui::SameLine();
ImGui::SetNextItemWidth(menuColumnWidth - ImGui::GetCursorPosX());
ImGui::SliderFloat(CONCAT("##_squelch_select_", _this->name), &_this->sigPath.squelch.level, -100, 0); ImGui::SliderFloat(CONCAT("##_squelch_select_", _this->name), &_this->sigPath.squelch.level, -100, 0);
ImGui::PopItemWidth(); ImGui::PopItemWidth();
ImGui::Text("Snap Interval"); ImGui::Text("Snap Interval");
ImGui::SameLine();
ImGui::SetNextItemWidth(menuColumnWidth - ImGui::GetCursorPosX()); ImGui::SetNextItemWidth(menuColumnWidth - ImGui::GetCursorPosX());
if (ImGui::InputDouble(CONCAT("##_snap_select_", _this->name), &_this->snapInterval)) {
_this->sigPath.vfo->setSnapInterval(_this->snapInterval);
}
} }
static void scriptCreateHandler(void* ctx, duk_context* dukCtx, duk_idx_t objId) { static void scriptCreateHandler(void* ctx, duk_context* dukCtx, duk_idx_t objId) {

2
radio/src/path.cpp
View File

@ -36,7 +36,7 @@ void SigPath::init(std::string vfoName, uint64_t sampleRate, int blockSize) {
// TODO: Add a mono to stereo for different modes // TODO: Add a mono to stereo for different modes
squelch.init(vfo->output, 800); squelch.init(vfo->output, 800);
squelch.level = 40; squelch.level = -100.0;
squelch.onCount = 1; squelch.onCount = 1;
squelch.offCount = 2560; squelch.offCount = 2560;

3
radio/src/path.h
View File

@ -46,11 +46,12 @@ public:
dsp::FMDeemphasis deemp; dsp::FMDeemphasis deemp;
dsp::Squelch squelch; dsp::Squelch squelch;
VFOManager::VFO* vfo;
private: private:
static int sampleRateChangeHandler(void* ctx, double sampleRate); static int sampleRateChangeHandler(void* ctx, double sampleRate);
VFOManager::VFO* vfo;
dsp::stream<dsp::complex_t> input; dsp::stream<dsp::complex_t> input;

12
root_dev/config.json
View File

@ -6,9 +6,9 @@
"volume": 0.60546875 "volume": 0.60546875
}, },
"Radio 1": { "Radio 1": {
"device": "CABLE-A Input (VB-Audio Cable A)", "device": "Speakers (Realtek High Definition Audio)",
"sampleRate": 48000.0, "sampleRate": 48000.0,
"volume": 1.0 "volume": 0.609375
}, },
"Radio 2": { "Radio 2": {
"device": "CABLE Input (VB-Audio Virtual Cable)", "device": "CABLE Input (VB-Audio Virtual Cable)",
@ -18,10 +18,10 @@
}, },
"bandPlan": "General", "bandPlan": "General",
"bandPlanEnabled": true, "bandPlanEnabled": true,
"fftHeight": 300, "fftHeight": 298,
"frequency": 99100000, "frequency": 98200000,
"max": 0.0, "max": 0.0,
"maximized": false, "maximized": true,
"menuOrder": [ "menuOrder": [
"Source", "Source",
"Radio", "Radio",
@ -32,7 +32,7 @@
"Display" "Display"
], ],
"menuWidth": 300, "menuWidth": 300,
"min": -72.05882263183594, "min": -53.676475524902344,
"showWaterfall": true, "showWaterfall": true,
"source": "", "source": "",
"sourceSettings": {}, "sourceSettings": {},

4
root_dev/soapy_source_config.json
View File

@ -1,5 +1,5 @@
{ {
"device": "Generic RTL2832U OEM :: 00000001", "device": "HackRF One #0 901868dc282c8f8b",
"devices": { "devices": {
"AirSpy HF+ [c852435de0224af7]": { "AirSpy HF+ [c852435de0224af7]": {
"gains": { "gains": {
@ -18,7 +18,7 @@
"gains": { "gains": {
"AMP": 0.0, "AMP": 0.0,
"LNA": 24.711999893188477, "LNA": 24.711999893188477,
"VGA": 15.906000137329102 "VGA": 14.282999992370605
}, },
"sampleRate": 8000000.0 "sampleRate": 8000000.0
}, },