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

This commit is contained in:
Steve Franke 2018-07-07 09:45:00 -05:00
commit cbf8b35b8d
2 changed files with 5 additions and 4 deletions

View File

@ -668,9 +668,10 @@ subroutine split77(msg,nwords,nw,w)
enddo enddo
iz=j !Message length iz=j !Message length
nwords=k !Number of words in msg nwords=k !Number of words in msg
if(nwords.le.0) go to 900
nw(k)=len(trim(w(k))) nw(k)=len(trim(w(k)))
msg(iz+1:)=' ' msg(iz+1:)=' '
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)
@ -678,7 +679,7 @@ subroutine split77(msg,nwords,nw,w)
nwords=nwords-1 nwords=nwords-1
endif endif
return 900 return
end subroutine split77 end subroutine split77

View File

@ -3678,8 +3678,8 @@ void MainWindow::guiUpdate()
//Once per second: //Once per second:
if(nsec != m_sec0) { if(nsec != m_sec0) {
qDebug() << "OneSec:" << m_config.bGenerate77() << m_config.bDecode77() // qDebug() << "OneSec:" << m_config.bGenerate77() << m_config.bDecode77()
<< m_config.FieldDayExchange() << m_config.RTTYExchange(); // << m_config.FieldDayExchange() << m_config.RTTYExchange();
if(m_freqNominal!=0 and m_freqNominal<50000000 and m_config.enable_VHF_features()) { if(m_freqNominal!=0 and m_freqNominal<50000000 and m_config.enable_VHF_features()) {
if(!m_bVHFwarned) vhfWarning(); if(!m_bVHFwarned) vhfWarning();
} else { } else {