Re-enable EU VHF Contest mode messages in MSK144 mode

Also bring  message checking utilities up  to date with the  latest EU
VHF Contest mode source encodings.
This commit is contained in:
Bill Somerville 2021-02-24 02:21:31 +00:00
parent c44bcb1f44
commit 01dff71070
No known key found for this signature in database
GPG Key ID: D864B06D1E81618F
5 changed files with 8 additions and 5 deletions

View File

@ -65,7 +65,8 @@ program ft4code
if(i3.eq.2) msgtype="EU VHF Contest" if(i3.eq.2) msgtype="EU VHF Contest"
if(i3.eq.3) msgtype="ARRL RTTY Roundup" if(i3.eq.3) msgtype="ARRL RTTY Roundup"
if(i3.eq.4) msgtype="Nonstandard calls" if(i3.eq.4) msgtype="Nonstandard calls"
if(i3.ge.5) msgtype="Undefined msg type" if(i3.eq.5) msgtype="EU VHF Contest"
if(i3.ge.6) msgtype="Undefined msg type"
if(i3.ge.1) n3=-1 if(i3.ge.1) n3=-1
bad=" " bad=" "
comment=' ' comment=' '

View File

@ -64,7 +64,8 @@ program ft8code
if(i3.eq.2) msgtype="EU VHF Contest" if(i3.eq.2) msgtype="EU VHF Contest"
if(i3.eq.3) msgtype="ARRL RTTY Roundup" if(i3.eq.3) msgtype="ARRL RTTY Roundup"
if(i3.eq.4) msgtype="Nonstandard call" if(i3.eq.4) msgtype="Nonstandard call"
if(i3.ge.5) msgtype="Undefined type" if(i3.eq.5) msgtype="EU VHF Contest"
if(i3.ge.6) msgtype="Undefined type"
if(i3.ge.1) n3=-1 if(i3.ge.1) n3=-1
bad=" " bad=" "
comment=' ' comment=' '

View File

@ -51,7 +51,8 @@ program msk144code
if(i3.eq.2) msgtype="EU VHF Contest" if(i3.eq.2) msgtype="EU VHF Contest"
if(i3.eq.3) msgtype="ARRL RTTY Roundup" if(i3.eq.3) msgtype="ARRL RTTY Roundup"
if(i3.eq.4) msgtype="Nonstandard calls" if(i3.eq.4) msgtype="Nonstandard calls"
if(i3.ge.5) msgtype="Undefined msg type" if(i3.eq.5) msgtype="EU VHF Contest"
if(i3.ge.6) msgtype="Undefined msg type"
if(i3.ge.1) n3=-1 if(i3.ge.1) n3=-1
if(i4tone(41).lt.0) then if(i4tone(41).lt.0) then
msgtype="Sh msg" msgtype="Sh msg"

View File

@ -100,7 +100,7 @@ subroutine msk144decodeframe(c,softbits,msgreceived,nsuccess)
nsuccess=1 nsuccess=1
write(c77,'(77i1)') decoded77 write(c77,'(77i1)') decoded77
read(c77(72:77),'(2b3)') n3,i3 read(c77(72:77),'(2b3)') n3,i3
if( (i3.eq.0.and.(n3.eq.1 .or. n3.eq.3 .or. n3.eq.4 .or. n3.gt.5)) .or. i3.eq.3 .or. i3.gt.4 ) then if( (i3.eq.0.and.(n3.eq.1 .or. n3.eq.3 .or. n3.eq.4 .or. n3.gt.5)) .or. i3.eq.3 .or. i3.gt.5 ) then
nsuccess=0 nsuccess=0
else else
call unpack77(c77,1,msgreceived,unpk77_success) call unpack77(c77,1,msgreceived,unpk77_success)

View File

@ -5718,7 +5718,7 @@ void MainWindow::msgtype(QString t, QLineEdit* tx) //msgtype()
p.setColor(QPalette::Base,"#66ffff"); //light blue p.setColor(QPalette::Base,"#66ffff"); //light blue
} else { } else {
p.setColor(QPalette::Base,Qt::transparent); p.setColor(QPalette::Base,Qt::transparent);
if(m_mode=="MSK144" and t.mid(0,1)=="<") { if ("MSK144" == m_mode && t.count ('<') == 1) {
p.setColor(QPalette::Base,"#00ffff"); //another light blue p.setColor(QPalette::Base,"#00ffff"); //another light blue
} }
} }