Hi Steve,
A minor update to the suggested patch is attached.
73
Bill
G4WJS.
diff --git a/Modulator.cpp b/Modulator.cpp
index dce905b..e4918d7 100644
--- a/Modulator.cpp
+++ b/Modulator.cpp
@@ -43,7 +43,7 @@ Modulator::Modulator (unsigned frameRate, unsigned
periodLengthInSeconds,
}
void Modulator::start (unsigned symbolsLength, double framesPerSymbol,
- unsigned frequency, double toneSpacing,
+ double frequency, double toneSpacing,
SoundOutput * stream, Channel channel,
bool synchronize, double dBSNR)
{
diff --git a/Modulator.hpp b/Modulator.hpp
index 630d33e..de16fbd 100644
--- a/Modulator.hpp
+++ b/Modulator.hpp
@@ -27,15 +27,15 @@ public:
void close () override;
bool isTuning () const {return m_tuning;}
- unsigned frequency () const {return m_frequency;}
+ double frequency () const {return m_frequency;}
bool isActive () const {return m_state != Idle;}
void setSpread(double s) {m_fSpread=s;}
void setPeriod(unsigned p) {m_period=p;}
- Q_SLOT void start (unsigned symbolsLength, double framesPerSymbol, unsigned
frequency, double toneSpacing, SoundOutput *, Channel = Mono, bool synchronize
= true, double dBSNR = 99.);
+ Q_SLOT void start (unsigned symbolsLength, double framesPerSymbol, double
frequency, double toneSpacing, SoundOutput *, Channel = Mono, bool synchronize
= true, double dBSNR = 99.);
Q_SLOT void stop (bool quick = false);
Q_SLOT void tune (bool newState = true);
- Q_SLOT void setFrequency (unsigned newFrequency) {m_frequency =
newFrequency;}
+ Q_SLOT void setFrequency (double newFrequency) {m_frequency = newFrequency;}
Q_SIGNAL void stateChanged (ModulatorState) const;
protected:
diff --git a/mainwindow.cpp b/mainwindow.cpp
index 5bdda3d..65a61c6 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -3696,7 +3696,7 @@ void MainWindow::transmit (double snr)
if (m_mode=="WSPR-2") { //### Similar
code needed for WSPR-15 ###
Q_EMIT sendMessage (NUM_WSPR_SYMBOLS, 8192.0,
- ui->TxFreqSpinBox->value()-2, m_toneSpacing,
+ ui->TxFreqSpinBox->value() - 1.5 * 12000 / 8192,
m_toneSpacing,
&m_soundOutput, m_config.audio_output_channel(),
true, snr);
}
diff --git a/mainwindow.h b/mainwindow.h
index 2358415..8dea8c2 100644
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -246,11 +246,11 @@ private:
Q_SIGNAL void startDetector (AudioDevice::Channel) const;
Q_SIGNAL void detectorClose () const;
Q_SIGNAL void finished () const;
- Q_SIGNAL void transmitFrequency (unsigned) const;
+ Q_SIGNAL void transmitFrequency (double) const;
Q_SIGNAL void endTransmitMessage (bool quick = false) const;
Q_SIGNAL void tune (bool = true) const;
Q_SIGNAL void sendMessage (unsigned symbolsLength, double framesPerSymbol,
- unsigned frequency, double toneSpacing,
+ double frequency, double toneSpacing,
SoundOutput *, AudioDevice::Channel = AudioDevice::Mono,
bool synchronize = true, double dBSNR = 99.) const;
Q_SIGNAL void outAttenuationChanged (qreal) const;
------------------------------------------------------------------------------
One dashboard for servers and applications across Physical-Virtual-Cloud
Widest out-of-the-box monitoring support with 50+ applications
Performance metrics, stats and reports that give you Actionable Insights
Deep dive visibility with transaction tracing using APM Insight.
http://ad.doubleclick.net/ddm/clk/290420510;117567292;y
_______________________________________________
wsjt-devel mailing list
wsjt-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/wsjt-devel
