w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2024-11-23 12:48:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

1. New startup default frequencies for 40, 30, and 6m.

Browse Source 
2. Don'l knowingly allow transmitting in the 30m WSPR band.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3479 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2013-07-11 19:37:01 +00:00
parent b88d1567a3
commit ca54c58caa
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
mainwindow.cpp
View File

@ -26,8 +26,8 @@ wchar_t buffer[256];
bool btxok; //True if OK to transmit bool btxok; //True if OK to transmit
bool btxMute; bool btxMute;
double outputLatency; //Latency in seconds double outputLatency; //Latency in seconds
double dFreq[]={0.13613,0.4742,1.838,3.576,5.357,7.036,10.136,14.076, double dFreq[]={0.13613,0.4742,1.838,3.576,5.357,7.076,10.138,14.076,
18.102,21.076,24.917,28.076,50.293,70.091,144.489,432.178}; 18.102,21.076,24.917,28.076,50.276,70.091,144.489,432.178};
WideGraph* g_pWideGraph = NULL; WideGraph* g_pWideGraph = NULL;
LogQSO* logDlg = NULL; LogQSO* logDlg = NULL;
@ -1563,6 +1563,7 @@ void MainWindow::guiUpdate()
static int nsendingsh=0; static int nsendingsh=0;
static int giptt00=-1; static int giptt00=-1;
static int gcomport00=-1; static int gcomport00=-1;
static double onAirFreq0=0.0;
int ret=0; int ret=0;
QString rt; QString rt;
@ -1586,6 +1587,20 @@ void MainWindow::guiUpdate()
bTxTime=true; bTxTime=true;
} }
double onAirFreq=m_dialFreq+1.e-6*m_txFreq;
if(onAirFreq>10.139900 and onAirFreq<10.140320) {
bTxTime=false;
if(onAirFreq!=onAirFreq0) {
onAirFreq0=onAirFreq;
on_autoButton_clicked();
QString t="Please choose another Tx frequency.\nWSJT-X will not ";
t+="knowingly transmit\nbetween 10.139 900 and 10.140 320 MHz,\n";
t+="the 30 m sub-band for WSPR transmissions.";
msgBox0.setText(t);
msgBox0.show();
}
}
float fTR=float((nsec%m_TRperiod))/m_TRperiod; float fTR=float((nsec%m_TRperiod))/m_TRperiod;
if(g_iptt==0 and ((bTxTime and !btxMute and fTR<0.4) or m_tune )) { if(g_iptt==0 and ((bTxTime and !btxMute and fTR<0.4) or m_tune )) {
icw[0]=m_ncw; icw[0]=m_ncw;

2
wsjtx_opti.iss
View File

@ -1,6 +1,6 @@
[Setup] [Setup]
AppName=wsjtx AppName=wsjtx
AppVerName=wsjtx Version 1.1.0 r3477 AppVerName=wsjtx Version 1.1.0 r3478
AppCopyright=Copyright (C) 2001-2013 by Joe Taylor, K1JT AppCopyright=Copyright (C) 2001-2013 by Joe Taylor, K1JT
DefaultDirName=c:\wsjtx2 DefaultDirName=c:\wsjtx2
DefaultGroupName=wsjtx2 DefaultGroupName=wsjtx2