w4kek
/
WSJT-X
mirror of https://github.com/saitohirga/WSJT-X.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make bDXped a member variable, default to false. 

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8121 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2017-09-25 19:21:25 +00:00
parent 8ea602648c
commit 412b0a64fb
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/DXped_pseudo_code.txt
View File

@ -1,7 +1,7 @@
Auto-Sequencing algorithm for DXpedition station: Auto-Sequencing algorithm for DXpedition station:
Start: 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 TxMsg = CQMsg
Ntry = 0 Ntry = 0
QCALL = "" # Callsign of current QSO partner QCALL = "" # Callsign of current QSO partner
@ -16,7 +16,7 @@ Receive:
N = number of decodes # RxMsg[i], i=1,N N = number of decodes # RxMsg[i], i=1,N
if(N == 0) if(N == 0)
go to Transmit go to Transmit
J = index of a reply from current QCALL # RxMsg[J] = "VK9MA QCALL R<rpt>" J = index of a reply from current QCALL # RxMsg[J] = "KH1DX QCALL R<rpt>"
if(QCALL == "") # No QSO in progress if(QCALL == "") # No QSO in progress
Select new QCALL # Op chooses a caller Select new QCALL # Op chooses a caller
@ -48,7 +48,7 @@ Receive:
Auto-Sequencing algorithm for those calling the DXpedition: Auto-Sequencing algorithm for those calling the DXpedition:
Start: Start:
TxMsg = "VK9MA MyCall" TxMsg = "KH1DX MyCall"
InQSO = false InQSO = false
Transmit: Transmit:
@ -59,13 +59,13 @@ Receive:
RX # (... takes ~14 s) RX # (... takes ~14 s)
if(RxMsg[i] contains "MyCall <rpt>") if(RxMsg[i] contains "MyCall <rpt>")
InQSO = true InQSO = true
TxMsg = "VK9MA MyCall R<rpt>" TxMsg = "KH1DX MyCall R<rpt>"
go to Transmit go to Transmit
if(RxMsg[i] contains "<rpt>") if(RxMsg[i] contains "<rpt>")
TxEnable = false TxEnable = false
go to Receive go to Receive
if(RxMsg[i] contains "CQ VK9MA") if(RxMsg[i] contains "CQ KH1DX")
TxEnable = true TxEnable = true
go to Transmit go to Transmit

7
mainwindow.cpp
View File

@ -891,9 +891,11 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple,
splashTimer.setSingleShot (true); splashTimer.setSingleShot (true);
splashTimer.start (20 * 1000); splashTimer.start (20 * 1000);
m_bDXped=false;
if(m_config.my_callsign()=="K1JT" or m_config.my_callsign()=="K9AN" or if(m_config.my_callsign()=="K1JT" or m_config.my_callsign()=="K9AN" or
m_config.my_callsign()=="G4WJS" || m_config.my_callsign () == "G3PQA") { 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()) { if(!ui->cbMenus->isChecked()) {
ui->cbMenus->setChecked(true); ui->cbMenus->setChecked(true);
@ -3125,8 +3127,7 @@ void MainWindow::guiUpdate()
} }
m_i3bit=0; m_i3bit=0;
bool bDXped=true; if(m_mode=="FT8" and m_bDXped) {
if(m_mode=="FT8" and bDXped) {
ba0=ba; ba0=ba;
QString t=QString::fromUtf8(ba0); QString t=QString::fromUtf8(ba0);
if(t.startsWith("RR73 NOW ")) { if(t.startsWith("RR73 NOW ")) {

2
mainwindow.h
View File

@ -458,6 +458,8 @@ private:
bool m_bCallingCQ; bool m_bCallingCQ;
bool m_bAutoReply; bool m_bAutoReply;
bool m_bCheckedContest; bool m_bCheckedContest;
bool m_bDXped;
enum enum
{ {
CALLING, CALLING,