w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-06-25 06:35:17 -04:00
Code Issues Packages Projects Releases Wiki Activity

NA_VHF now basically functional in MSK144 mode.

Browse Source
This commit is contained in:
Joe Taylor 2018-07-31 13:18:57 -04:00
parent 396cf98c0b
commit 8a732f40a5
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/stdmsg.f90
View File

@ -39,6 +39,8 @@ function stdmsg(msg0)
msg(23:37)=' ' msg(23:37)=' '
stdmsg=(msg(1:22).eq.msg1(1:22)) .and. (itype.ge.0) .and. (itype.ne.6) stdmsg=(msg(1:22).eq.msg1(1:22)) .and. (itype.ge.0) .and. (itype.ne.6)
if(.not.stdmsg) then if(.not.stdmsg) then
i0=index(msg1,' ')
msg1(i0:)=' '
call parse77(msg1,i3,n3) call parse77(msg1,i3,n3)
if(i3.gt.0 .or. n3.gt.0) stdmsg=.true. if(i3.gt.0 .or. n3.gt.0) stdmsg=.true.
endif endif

19
mainwindow.cpp
View File

@ -3682,7 +3682,8 @@ void MainWindow::guiUpdate()
} }
} }
if(ui->txrb1->isEnabled() and (m_mode=="FT8" or m_mode=="MSK144") and m_nContest!=NONE) { if(ui->txrb1->isEnabled() and (m_mode=="FT8" or m_mode=="MSK144")
and m_nContest!=NONE and m_nContest!=EU_VHF) {
//We're in a contest-like mode, don't use Tx1. //We're in a contest-like mode, don't use Tx1.
ui->tx1->setEnabled(false); ui->tx1->setEnabled(false);
} }
@ -4150,7 +4151,7 @@ void MainWindow::processMessage (DecodedText const& message, Qt::KeyboardModifie
QString hisgrid; QString hisgrid;
message.deCallAndGrid(/*out*/hiscall,hisgrid); message.deCallAndGrid(/*out*/hiscall,hisgrid);
auto is_73 = message_words.filter (QRegularExpression {"^(73|RR73)$"}).size (); bool is_73 = message_words.filter (QRegularExpression {"^(73|RR73)$"}).size ();
if (!is_73 and !message.isStandardMessage() and !message.string().contains("<")) { if (!is_73 and !message.isStandardMessage() and !message.string().contains("<")) {
qDebug () << "Not processing message - hiscall:" << hiscall << "hisgrid:" << hisgrid; qDebug () << "Not processing message - hiscall:" << hiscall << "hisgrid:" << hisgrid;
return; return;
@ -5249,8 +5250,8 @@ void MainWindow::on_actionFT8_triggered()
if(!m_config.bFox() and !m_config.bHound()) { if(!m_config.bFox() and !m_config.bHound()) {
QString t0=""; QString t0="";
if(m_config.bGenerate77()) t0=" Tx2.0 "; if(m_config.bGenerate77()) t0=" Tx2.0 ";
if(m_config.bEU_VHF_Contest()) t0+="EU VHF";
if(m_config.bNA_VHF_Contest()) t0+="NA VHF"; if(m_config.bNA_VHF_Contest()) t0+="NA VHF";
if(m_config.bEU_VHF_Contest()) t0+="EU VHF";
if(m_config.bFieldDay()) t0+="Field Day"; if(m_config.bFieldDay()) t0+="Field Day";
if(m_config.bRTTYroundup()) t0+="RTTY"; if(m_config.bRTTYroundup()) t0+="RTTY";
if(t0=="") { if(t0=="") {
@ -5272,6 +5273,8 @@ void MainWindow::on_actionFT8_triggered()
statusChanged(); statusChanged();
} }
void MainWindow::on_actionJT4_triggered() void MainWindow::on_actionJT4_triggered()
{ {
m_mode="JT4"; m_mode="JT4";
@ -5558,6 +5561,16 @@ void MainWindow::on_actionMSK144_triggered()
displayWidgets(nWidgets("101111110100000000010001000010000")); displayWidgets(nWidgets("101111110100000000010001000010000"));
fast_config(m_bFastMode); fast_config(m_bFastMode);
statusChanged(); statusChanged();
QString t0="";
if(m_config.bNA_VHF_Contest()) t0+="NA VHF";
if(m_config.bEU_VHF_Contest()) t0+="EU VHF";
if(t0=="") {
ui->labDXped->setVisible(false);
} else {
ui->labDXped->setVisible(true);
ui->labDXped->setText(t0);
}
} }
void MainWindow::on_actionWSPR_triggered() void MainWindow::on_actionWSPR_triggered()