diff --git a/lib/DXped_pseudo_code.txt b/lib/DXped_pseudo_code.txt index a0469a1f4..081bfda7e 100644 --- a/lib/DXped_pseudo_code.txt +++ b/lib/DXped_pseudo_code.txt @@ -1,7 +1,7 @@ Auto-Sequencing algorithm for DXpedition station: Start: - CQMsg = "CQ VK9MA" (or "CQ UP VK9MA", "CQ 116 VK9MA", etc.) + CQMsg = "CQ KH1DX" (or "CQ UP KH1DX", "CQ 116 KH1DX", etc.) TxMsg = CQMsg Ntry = 0 QCALL = "" # Callsign of current QSO partner @@ -16,7 +16,7 @@ Receive: N = number of decodes # RxMsg[i], i=1,N if(N == 0) go to Transmit - J = index of a reply from current QCALL # RxMsg[J] = "VK9MA QCALL R" + J = index of a reply from current QCALL # RxMsg[J] = "KH1DX QCALL R" if(QCALL == "") # No QSO in progress Select new QCALL # Op chooses a caller @@ -48,7 +48,7 @@ Receive: Auto-Sequencing algorithm for those calling the DXpedition: Start: - TxMsg = "VK9MA MyCall" + TxMsg = "KH1DX MyCall" InQSO = false Transmit: @@ -59,13 +59,13 @@ Receive: RX # (... takes ~14 s) if(RxMsg[i] contains "MyCall ") InQSO = true - TxMsg = "VK9MA MyCall R" + TxMsg = "KH1DX MyCall R" go to Transmit if(RxMsg[i] contains "") TxEnable = false go to Receive - if(RxMsg[i] contains "CQ VK9MA") + if(RxMsg[i] contains "CQ KH1DX") TxEnable = true go to Transmit diff --git a/mainwindow.cpp b/mainwindow.cpp index 296a4dc5a..00d44fd3c 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -891,9 +891,11 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple, splashTimer.setSingleShot (true); splashTimer.start (20 * 1000); + m_bDXped=false; if(m_config.my_callsign()=="K1JT" or m_config.my_callsign()=="K9AN" or m_config.my_callsign()=="G4WJS" || m_config.my_callsign () == "G3PQA") { - ui->actionWSPR_LF->setEnabled(true); + m_bDXped=true; + ui->actionWSPR_LF->setEnabled(true); } if(!ui->cbMenus->isChecked()) { ui->cbMenus->setChecked(true); @@ -3125,8 +3127,7 @@ void MainWindow::guiUpdate() } m_i3bit=0; - bool bDXped=true; - if(m_mode=="FT8" and bDXped) { + if(m_mode=="FT8" and m_bDXped) { ba0=ba; QString t=QString::fromUtf8(ba0); if(t.startsWith("RR73 NOW ")) { diff --git a/mainwindow.h b/mainwindow.h index d5051b0d8..7aea34d2d 100644 --- a/mainwindow.h +++ b/mainwindow.h @@ -458,6 +458,8 @@ private: bool m_bCallingCQ; bool m_bAutoReply; bool m_bCheckedContest; + bool m_bDXped; + enum { CALLING,