Skip to content

Commit

Permalink
WIP: Minimally working drift inspector
Browse files Browse the repository at this point in the history
  • Loading branch information
BatchDrake committed May 14, 2023
1 parent 17cabd5 commit 0a32036
Show file tree
Hide file tree
Showing 9 changed files with 903 additions and 7 deletions.
8 changes: 8 additions & 0 deletions AmateurDSN.pro
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,9 @@ SOURCES += \
ChirpCorrector.cpp \
DopplerTool.cpp \
DopplerToolFactory.cpp \
DriftProcessor.cpp \
DriftTool.cpp \
DriftToolFactory.cpp \
ExternalTool.cpp \
ExternalToolFactory.cpp \
ForwarderWidget.cpp \
Expand All @@ -59,14 +62,19 @@ target.path = $$PLUGIN_DIRECTORY

FORMS += \
DopplerTool.ui \
DriftTool.ui \
ExternalTool.ui \
ForwarderWidget.ui \
SNRTool.ui

HEADERS += \
AmateurDSNHelpers.h \
ChirpCorrector.h \
DopplerTool.h \
DopplerToolFactory.h \
DriftProcessor.h \
DriftTool.h \
DriftToolFactory.h \
ExternalTool.h \
ExternalToolFactory.h \
ForwarderWidget.h \
Expand Down
48 changes: 48 additions & 0 deletions AmateurDSNHelpers.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
//
// AmateurDSNHelpers.h: description
// Copyright (C) 2023 Gonzalo José Carracedo Carballal
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as
// published by the Free Software Foundation, either version 3 of the
// License, or (at your option) any later version.
//
// This program is distributed in the hope that it will be useful, but
// WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU Lesser General Public License for more details.
//
// You should have received a copy of the GNU Lesser General Public
// License along with this program. If not, see
// <http://www.gnu.org/licenses/>
//
#ifndef AMATEURDSNHELPERS_H
#define AMATEURDSNHELPERS_H

#define ADSN_SPEED_OF_LIGHT 299792458. // [m/s]

static inline double
shift2vel(double f0, double shift)
{
return -ADSN_SPEED_OF_LIGHT / f0 * shift;
}

static inline double
vel2shift(double f0, double vel)
{
return -f0 / ADSN_SPEED_OF_LIGHT * vel;
}

static inline double
drift2accel(double f0, double drift)
{
return -ADSN_SPEED_OF_LIGHT / f0 * drift;
}

static inline double
accel2drift(double f0, double accel)
{
return -f0 / ADSN_SPEED_OF_LIGHT * accel;
}

#endif // AMATEURDSNHELPERS_H
11 changes: 5 additions & 6 deletions DopplerTool.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,7 @@
#include <MainSpectrum.h>
#include <QMessageBox>
#include "ChirpCorrector.h"

#define DOPPLERTOOL_SPEED_OF_LIGHT 299792458. // [m/s]
#include "AmateurDSNHelpers.h"

using namespace SigDigger;

Expand Down Expand Up @@ -146,7 +145,7 @@ DopplerTool::setFromVelocity(qreal velocity)
//

m_panelConfig->velocity = velocity;
m_currResetFreq = -freq / DOPPLERTOOL_SPEED_OF_LIGHT * velocity;
m_currResetFreq = vel2shift(freq, velocity);

m_corrector->setResetFrequency(m_currResetFreq);
}
Expand All @@ -156,7 +155,7 @@ DopplerTool::setFromShift(qreal shift)
{
SUFREQ freq = m_mediator->getCurrentCenterFreq();

m_panelConfig->velocity = -DOPPLERTOOL_SPEED_OF_LIGHT / freq * shift;
m_panelConfig->velocity = shift2vel(freq, shift);
m_currResetFreq = shift;

m_corrector->setResetFrequency(m_currResetFreq);
Expand All @@ -175,7 +174,7 @@ DopplerTool::setFromAccel(qreal accel)
//

m_panelConfig->accel = accel;
m_currRate = -freq / DOPPLERTOOL_SPEED_OF_LIGHT * accel;
m_currRate = accel2drift(freq, accel);
m_correctedRate = m_currRate + m_panelConfig->bias;

m_corrector->setChirpRate(m_correctedRate);
Expand All @@ -188,7 +187,7 @@ DopplerTool::setFromRate(qreal rate)

// See setFromAccel for details

m_panelConfig->accel = -DOPPLERTOOL_SPEED_OF_LIGHT / freq * rate;
m_panelConfig->accel = drift2accel(freq, rate);
m_currRate = rate;
m_correctedRate = rate + m_panelConfig->bias;

Expand Down
Loading

0 comments on commit 0a32036

Please sign in to comment.