Merge branch 'integrate-77bit' of bitbucket.org:k1jt/wsjtx into integrate-77bit

This commit is contained in:
Steve Franke 2018-07-07 10:36:08 -05:00
commit b691ad6351
2 changed files with 4 additions and 3 deletions

View File

@ -674,8 +674,8 @@ subroutine split77(msg,nwords,nw,w)
if(nwords.lt.3) go to 900 if(nwords.lt.3) go to 900
call chkcall(w(3),bcall_1,ok1) call chkcall(w(3),bcall_1,ok1)
if(ok1 .and. w(1)(1:3).eq.'CQ ') then if(ok1 .and. w(1)(1:3).eq.'CQ ') then
w(1)='CQ_'//w(2)(1:10) w(1)='CQ_'//w(2)(1:10) !Make "CQ " into "CQ_"
w(2:12)=w(3:13) w(2:12)=w(3:13) !Move all remeining words down by one
nwords=nwords-1 nwords=nwords-1
endif endif

View File

@ -3500,7 +3500,8 @@ void MainWindow::guiUpdate()
m_isync=1; m_isync=1;
if(!m_config.bGenerate77() and itype == 6 and (m_i3>0 or m_n3>0)) m_isync=2; if(!m_config.bGenerate77() and itype == 6 and (m_i3>0 or m_n3>0)) m_isync=2;
if(m_config.bGenerate77()) m_isync=2; if(m_config.bGenerate77()) m_isync=2;
qDebug() << "itype=" << itype << "i3, n3:"<< m_i3 << m_n3 << "isync="<< m_isync << ui->tx6->text(); qDebug() << "itype i3 n3 isync :" << itype << m_i3 << m_n3 << m_isync
<< QString::fromStdString(message).trimmed();
int ft8msgbits[77]; int ft8msgbits[77];
genft8_(message, MyGrid, &bcontest, &m_i3, &m_n3, &m_isync, msgsent, genft8_(message, MyGrid, &bcontest, &m_i3, &m_n3, &m_isync, msgsent,