comicsansg/CubicSDR
comicsansg/CubicSDR
1
0
Fork 0
mirror of https://github.com/cjcliffe/CubicSDR.git synced 2024-11-23 20:28:40 -05:00
Code Issues Projects Releases Wiki Activity

Finished messaging pop-up started implementing advanced modulations

Browse Source
This commit is contained in:
corne lukken 2015-05-29 13:45:15 +02:00
parent c8f76addc3
commit e5bdcb1fc9
5 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/AppFrame.cpp
View File

@ -58,10 +58,23 @@ AppFrame::AppFrame() :
demodModeSelector->addChoice(DEMOD_TYPE_LSB, "LSB");
demodModeSelector->addChoice(DEMOD_TYPE_USB, "USB");
demodModeSelector->addChoice(DEMOD_TYPE_DSB, "DSB");
demodModeSelector->setSelection(DEMOD_TYPE_FM);
demodModeSelector->setHelpTip("Choose modulation type: Frequency Modulation, Amplitude Modulation and Lower, Upper or Double Side-Band.");
demodTray->Add(demodModeSelector, 2, wxEXPAND | wxALL, 0);
demodModeSelectoradv = new ModeSelectorCanvas(this, attribList);
demodModeSelectoradv->addChoice(DEMOD_TYPE_ASK, "ASK");
demodModeSelectoradv->addChoice(DEMOD_TYPE_APSK, "APSK");
demodModeSelectoradv->addChoice(DEMOD_TYPE_BPSK, "BPSK");
demodModeSelectoradv->addChoice(DEMOD_TYPE_DPSK, "DPSK");
demodModeSelectoradv->addChoice(DEMOD_TYPE_PSK, "PSK");
demodModeSelectoradv->addChoice(DEMOD_TYPE_OOK, "OOK");
demodModeSelectoradv->addChoice(DEMOD_TYPE_ST, "ST");
demodModeSelectoradv->addChoice(DEMOD_TYPE_SQAM, "SQAM");
demodModeSelectoradv->addChoice(DEMOD_TYPE_QAM, "QAM");
demodModeSelectoradv->addChoice(DEMOD_TYPE_QPSK, "QPSK");
demodModeSelectoradv->setHelpTip("Choose advanced modulation types.");
demodTray->Add(demodModeSelectoradv, 3, wxEXPAND | wxALL, 0);
// demodTray->AddSpacer(2);
demodSpectrumCanvas = new SpectrumCanvas(this, attribList);

2
src/AppFrame.h
View File

@ -62,6 +62,8 @@ private:
SpectrumCanvas *spectrumCanvas;
WaterfallCanvas *waterfallCanvas;
ModeSelectorCanvas *demodModeSelector;
ModeSelectorCanvas *demodModeSelectoradv;
ModeSelectorCanvas *demodModeSelectoradv2;
SpectrumCanvas *demodSpectrumCanvas;
WaterfallCanvas *demodWaterfallCanvas;
MeterCanvas *demodSignalMeter;

4
src/CubicSDR.cpp
View File

@ -88,7 +88,7 @@ bool CubicSDR::OnInit() {
sdrThread->setDeviceId(devId);
}
else if(devs.size() == 0) {
wxGetApp().OnMessage("No devices found!", "warning");
wxGetApp().showMessage("No devices found!", "warning");
}
t_PostSDR = new std::thread(&SDRPostThread::threadMain, sdrPostThread);
@ -290,7 +290,7 @@ int CubicSDR::getFrequencySnap() {
return snap;
}
void CubicSDR::OnMessage(std::string text, std::string title) {
void CubicSDR::showMessage(std::string text, std::string title) {
wxMessageDialog *message = new wxMessageDialog(NULL, wxString::Format(text.c_str()), wxString::Format(title.c_str()), wxOK | wxICON_ERROR );
message->ShowModal();
}

2
src/CubicSDR.h
View File

@ -62,7 +62,7 @@ public:
void showFrequencyInput();
void OnMessage(std::string message, std::string title);
void showMessage(std::string message, std::string title);
private:
AppFrame *appframe;

10
src/demod/DemodDefs.h
View File

@ -13,6 +13,16 @@
#define DEMOD_TYPE_LSB 3
#define DEMOD_TYPE_USB 4
#define DEMOD_TYPE_DSB 5
#define DEMOD_TYPE_ASK 6
#define DEMOD_TYPE_APSK 7
#define DEMOD_TYPE_BPSK 8
#define DEMOD_TYPE_DPSK 9
#define DEMOD_TYPE_PSK 10
#define DEMOD_TYPE_OOK 11
#define DEMOD_TYPE_ST 12
#define DEMOD_TYPE_SQAM 13
#define DEMOD_TYPE_QAM 14
#define DEMOD_TYPE_QPSK 15
class DemodulatorThread;
class DemodulatorThreadCommand {