comicsansg/CubicSDR
1
0
Fork 0
mirror of https://github.com/cjcliffe/CubicSDR.git synced 2026-06-01 21:54:39 -04:00
Code Issues Projects Releases Wiki Activity

Add delta lock -- lock modem relative to center frequency

Browse Source
This commit is contained in:
Charles J. Cliffe
2016-02-15 17:43:10 -05:00
parent 7bf0ad47c5
commit 93d2c73fb9
11 changed files with 141 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/visual/ModeSelectorCanvas.cpp
+1
View File
@@ -183,6 +183,7 @@ void ModeSelectorCanvas::setSelection(int value) {
for (int i = 0; i < numChoices; i++) {
if (selections[i].value == value) {
currentSelection = i;
Refresh();
return;
}
}
src/visual/PrimaryGLContext.cpp
+4
View File
@@ -148,6 +148,10 @@ void PrimaryGLContext::DrawDemodInfo(DemodulatorInstance *demod, RGBA4f color, l
demodLabel = std::string("[S] ") + demodLabel;
}
if (demod->isDeltaLock()) {
demodLabel.append(" [V]");
}
if (demod->getDemodulatorType() == "USB") {
GLFont::getFont(GLFont::GLFONT_SIZE16).drawString(demodLabel, uxPos, hPos, 16, GLFont::GLFONT_ALIGN_LEFT, GLFont::GLFONT_ALIGN_CENTER);
} else if (demod->getDemodulatorType() == "LSB") {
src/visual/TuningCanvas.cpp
+3
View File
@@ -186,6 +186,9 @@ void TuningCanvas::StepTuner(ActiveState state, int exponent, bool up) {
activeDemod->setTracking(true);
activeDemod->setFollow(true);
activeDemod->setFrequency(freq);
if (activeDemod->isDeltaLock()) {
activeDemod->setDeltaLockOfs(activeDemod->getFrequency() - wxGetApp().getFrequency());
}
activeDemod->updateLabel(freq);
}
src/visual/WaterfallCanvas.cpp
+18
View File
@@ -612,6 +612,9 @@ void WaterfallCanvas::OnMouseMoved(wxMouseEvent& event) {
if (bwDiff) {
demod->setFrequency(currentFreq + bwDiff);
if (demod->isDeltaLock()) {
demod->setDeltaLockOfs(demod->getFrequency() - wxGetApp().getFrequency());
}
currentFreq = demod->getFrequency();
demod->updateLabel(currentFreq);
}
@@ -699,6 +702,12 @@ void WaterfallCanvas::OnMouseReleased(wxMouseEvent& event) {
demod->setSquelchEnabled(mgr->isLastSquelchEnabled());
demod->setGain(mgr->getLastGain());
demod->setMuted(mgr->isLastMuted());
if (mgr->getLastDeltaLock()) {
demod->setDeltaLock(true);
demod->setDeltaLockOfs(wxGetApp().getFrequency()-freq);
} else {
demod->setDeltaLock(false);
}
demod->writeModemSettings(mgr->getLastModemSettings(mgr->getLastDemodulatorType()));
demod->run();
@@ -712,6 +721,9 @@ void WaterfallCanvas::OnMouseReleased(wxMouseEvent& event) {
demod->updateLabel(freq);
demod->setFrequency(freq);
if (demod->isDeltaLock()) {
demod->setDeltaLockOfs(demod->getFrequency() - wxGetApp().getFrequency());
}
if (isNew) {
setStatusText("New demodulator at frequency: %s", freq);
@@ -788,6 +800,12 @@ void WaterfallCanvas::OnMouseReleased(wxMouseEvent& event) {
demod->setSquelchEnabled(mgr->isLastSquelchEnabled());
demod->setGain(mgr->getLastGain());
demod->setMuted(mgr->isLastMuted());
if (mgr->getLastDeltaLock()) {
demod->setDeltaLock(true);
demod->setDeltaLockOfs(wxGetApp().getFrequency()-freq);
} else {
demod->setDeltaLock(false);
}
demod->writeModemSettings(mgr->getLastModemSettings(mgr->getLastDemodulatorType()));
demod->run();