mirror/SDRPlusPlus
0
0
Fork 0
mirror of https://github.com/AlexandreRouma/SDRPlusPlus.git synced 2024-11-07 03:07:34 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Starman0620/SDRPlusPlus; branch 'master' of https://github.com/AlexandreRouma/SDRPlusPlus

Browse Source 
Merge updated files
This commit is contained in:
Cam K 2021-04-19 21:02:45 -04:00
commit 13949e0dde
9 changed files with 33 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
core/src/config.cpp
View File

@ -83,36 +83,3 @@ void ConfigManager::autoSaveWorker(ConfigManager* _this) {
std::this_thread::sleep_for(std::chrono::milliseconds(1000));
}
}
// void ConfigManager::setResourceDir(std::string path) {
// if (!std::filesystem::exists(path)) {
// spdlog::error("Resource directory '{0}' does not exist", path);
// return;
// }
// if (!std::filesystem::is_regular_file(path)) {
// spdlog::error("Resource directory '{0}' is not a directory", path);
// return;
// }
// resDir = path;
// }
// std::string ConfigManager::getResourceDir() {
// return resDir;
// }
// void ConfigManager::setConfigDir(std::string path) {
// if (!std::filesystem::exists(path)) {
// spdlog::error("Resource directory '{0}' does not exist", path);
// return;
// }
// if (!std::filesystem::is_regular_file(path)) {
// spdlog::error("Resource directory '{0}' is not a directory", path);
// return;
// }
// resDir = path;
// }
// std::string ConfigManager::getConfigDir() {
// return configDir;
// }

1
core/src/credits.cpp
View File

@ -25,6 +25,7 @@ namespace sdrpp_credits {
};
const char* patrons[] = {
"Croccydile",
"Daniele D'Agnelli",
"W4IPA",
"Lee Donaghy",

21
core/src/event.h
View File

@ -3,12 +3,7 @@
#include <spdlog/spdlog.h>
template <class T>
class Event {
public:
Event() {}
~Event() {}
struct EventHandler {
struct EventHandler {
EventHandler() {}
EventHandler(void (*handler)(T, void*), void* ctx) {
this->handler = handler;
@ -17,7 +12,13 @@ public:
void (*handler)(T, void*);
void* ctx;
};
};
template <class T>
class Event {
public:
Event() {}
~Event() {}
void emit(T value) {
for (auto const& handler : handlers) {
@ -25,11 +26,11 @@ public:
}
}
void bindHandler(const EventHandler& handler) {
void bindHandler(const EventHandler<T>& handler) {
handlers.push_back(handler);
}
void unbindHandler(const EventHandler& handler) {
void unbindHandler(const EventHandler<T>& handler) {
if (handlers.find(handler) == handlers.end()) {
spdlog::error("Tried to remove a non-existant event handler");
return;
@ -38,6 +39,6 @@ public:
}
private:
std::vector<EventHandler> handlers;
std::vector<EventHandler<T>> handlers;
};

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

@ -14,11 +14,11 @@ SinkManager::SinkManager() {
registerSinkProvider("None", prov);
}
SinkManager::Stream::Stream(dsp::stream<dsp::stereo_t>* in, const Event<float>::EventHandler& srChangeHandler, float sampleRate) {
SinkManager::Stream::Stream(dsp::stream<dsp::stereo_t>* in, const EventHandler<float>& srChangeHandler, float sampleRate) {
init(in, srChangeHandler, sampleRate);
}
void SinkManager::Stream::init(dsp::stream<dsp::stereo_t>* in, const Event<float>::EventHandler& srChangeHandler, float sampleRate) {
void SinkManager::Stream::init(dsp::stream<dsp::stereo_t>* in, const EventHandler<float>& srChangeHandler, float sampleRate) {
_in = in;
srChange.bindHandler(srChangeHandler);
_sampleRate = sampleRate;

4
core/src/signal_path/sink.h
View File

@ -25,9 +25,9 @@ public:
class Stream {
public:
Stream() {}
Stream(dsp::stream<dsp::stereo_t>* in, const Event<float>::EventHandler& srChangeHandler, float sampleRate);
Stream(dsp::stream<dsp::stereo_t>* in, const EventHandler<float>& srChangeHandler, float sampleRate);
void init(dsp::stream<dsp::stereo_t>* in, const Event<float>::EventHandler& srChangeHandler, float sampleRate);
void init(dsp::stream<dsp::stereo_t>* in, const EventHandler<float>& srChangeHandler, float sampleRate);
void start();
void stop();

1
make_windows_package.ps1
View File

@ -35,6 +35,7 @@ cp build/soapy_source/Release/soapy_source.dll sdrpp_windows_x64/modules/
cp build/file_source/Release/file_source.dll sdrpp_windows_x64/modules/
cp build/sdrplay_source/Release/sdrplay_source.dll sdrpp_windows_x64/modules/
cp 'C:/Program Files/SDRplay/API/x64/sdrplay_api.dll' sdrpp_windows_x64/
cp build/meteor_demodulator/Release/meteor_demodulator.dll sdrpp_windows_x64/modules/

2
radio/src/main.cpp
View File

@ -199,7 +199,7 @@ private:
dsp::NullSink<dsp::complex_t> ns;
Event<float>::EventHandler srChangeHandler;
EventHandler<float> srChangeHandler;
SinkManager::Stream stream;
};

1
readme.md
View File

@ -219,6 +219,7 @@ I will soon publish a contributing.md listing the code style to use.
## Patrons
* [Croccydile](https://example.com/)
* [Daniele D'Agnelli](https://linkedin.com/in/dagnelli)
* [W4IPA](https://twitter.com/W4IPAstroke5)
* [Lee Donaghy](https://github.com/github)

9
sdrplay_source/src/main.cpp
View File

@ -514,7 +514,16 @@ private:
_this->openDevParams->rxChannelA->tunerParams.rfFreq.rfHz = _this->freq;
_this->openDevParams->rxChannelA->tunerParams.gain.gRdB = _this->gain;
_this->openDevParams->rxChannelA->tunerParams.gain.LNAstate = _this->lnaGain;
// Hard coded AGC parameters
_this->openDevParams->rxChannelA->ctrlParams.agc.attack_ms = 500;
_this->openDevParams->rxChannelA->ctrlParams.agc.decay_ms = 500;
_this->openDevParams->rxChannelA->ctrlParams.agc.decay_delay_ms = 200;
_this->openDevParams->rxChannelA->ctrlParams.agc.decay_threshold_dB = 5;
_this->openDevParams->rxChannelA->ctrlParams.agc.setPoint_dBfs = -30;
_this->openDevParams->rxChannelA->ctrlParams.agc.enable = agcModes[_this->agc];
sdrplay_api_Update(_this->openDev.dev, _this->openDev.tuner, sdrplay_api_Update_Dev_Fs, sdrplay_api_Update_Ext1_None);
sdrplay_api_Update(_this->openDev.dev, _this->openDev.tuner, sdrplay_api_Update_Tuner_BwType, sdrplay_api_Update_Ext1_None);
sdrplay_api_Update(_this->openDev.dev, _this->openDev.tuner, sdrplay_api_Update_Tuner_Frf, sdrplay_api_Update_Ext1_None);