w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2024-11-18 10:01:57 -05:00
Code Issues Packages Projects Releases Wiki Activity

When MSK144 message is changed between long and short format, must inform Modulator.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6909 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2016-07-13 19:17:47 +00:00
parent 42b6ef859c
commit 857388722d
3 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Modulator.hpp
View File

@ -32,6 +32,7 @@ public:
bool isActive () const {return m_state != Idle;} bool isActive () const {return m_state != Idle;}
void setSpread(double s) {m_fSpread=s;} void setSpread(double s) {m_fSpread=s;}
void setPeriod(unsigned p) {m_period=p;} void setPeriod(unsigned p) {m_period=p;}
void set_nsym(int n) {m_symbolsLength=n;}
Q_SLOT void start (unsigned symbolsLength, double framesPerSymbol, double frequency, Q_SLOT void start (unsigned symbolsLength, double framesPerSymbol, double frequency,
double toneSpacing, SoundOutput *, Channel = Mono, double toneSpacing, SoundOutput *, Channel = Mono,

2
lib/genmsk144.f90
View File

@ -83,7 +83,7 @@ subroutine genmsk144(msg0,ichk,msgsent,i4tone,itype,pchk_file)
if(message(1:1).eq.'<') then if(message(1:1).eq.'<') then
call genmsk32(message,msgsent,ichk,i4tone,itype) call genmsk32(message,msgsent,ichk,i4tone,itype)
if(itype.lt.0) go to 999 if(itype.lt.0) go to 999
i4tone(33)=-35 i4tone(33)=-32
go to 999 go to 999
endif endif

12
mainwindow.cpp
View File

@ -2744,15 +2744,21 @@ void MainWindow::guiUpdate()
len1, len1); len1, len1);
if(m_modeTx=="JTMSK") genmsk_(message, &ichk, msgsent, const_cast<int *> (itone), if(m_modeTx=="JTMSK") genmsk_(message, &ichk, msgsent, const_cast<int *> (itone),
&m_currentMessageType, len1, len1); &m_currentMessageType, len1, len1);
if(m_modeTx=="MSK144") genmsk144_(message, &ichk, msgsent, const_cast<int *> (itone), if(m_modeTx=="MSK144") {
genmsk144_(message, &ichk, msgsent, const_cast<int *> (itone),
&m_currentMessageType, &m_pchkFile[0], len1, len1, 512); &m_currentMessageType, &m_pchkFile[0], len1, len1, 512);
if(m_restart) {
int nsym=144;
if(itone[32]==-32) nsym=32;
m_modulator->set_nsym(nsym);
}
}
msgsent[22]=0; msgsent[22]=0;
} }
} }
m_currentMessage = QString::fromLatin1(msgsent); m_currentMessage = QString::fromLatin1(msgsent);
if (m_tune) if (m_tune) {
{
m_currentMessage = "TUNE"; m_currentMessage = "TUNE";
m_currentMessageType = -1; m_currentMessageType = -1;
} }