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

Stated WSPR power levels below 0 dBm are not allowed. Remove them from TxPowerComboBox.

Browse Source
This commit is contained in:
Joe Taylor 2020-04-14 12:12:53 -04:00
parent e82b9ffa38
commit dc71fd70d5
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -1304,12 +1304,11 @@ target_link_libraries (jt9code wsjt_fort wsjt_cxx)
add_executable (wsprcode lib/wsprcode/wsprcode.f90 lib/wsprcode/nhash.c add_executable (wsprcode lib/wsprcode/wsprcode.f90 lib/wsprcode/nhash.c
wsjtx.rc) wsjtx.rc)
target_link_libraries (wsprcode wsjt_fort wsjt_cxx)
add_executable (encode77 lib/77bit/encode77.f90 wsjtx.rc) add_executable (encode77 lib/77bit/encode77.f90 wsjtx.rc)
target_link_libraries (encode77 wsjt_fort wsjt_cxx) target_link_libraries (encode77 wsjt_fort wsjt_cxx)
target_link_libraries (wsprcode wsjt_fort wsjt_cxx)
add_executable (wsprsim ${wsprsim_CSRCS}) add_executable (wsprsim ${wsprsim_CSRCS})
add_executable (jt4code lib/jt4code.f90 wsjtx.rc) add_executable (jt4code lib/jt4code.f90 wsjtx.rc)

14
widgets/mainwindow.cpp
View File

@ -781,8 +781,7 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple,
SLOT(setFreq4(int,int))); SLOT(setFreq4(int,int)));
decodeBusy(false); decodeBusy(false);
QString t1[28]={"1 uW","2 uW","5 uW","10 uW","20 uW","50 uW","100 uW","200 uW","500 uW", QString t1[19]={"1 mW","2 mW","5 mW","10 mW","20 mW","50 mW","100 mW","200 mW","500 mW",
"1 mW","2 mW","5 mW","10 mW","20 mW","50 mW","100 mW","200 mW","500 mW",
"1 W","2 W","5 W","10 W","20 W","50 W","100 W","200 W","500 W","1 kW"}; "1 W","2 W","5 W","10 W","20 W","50 W","100 W","200 W","500 W","1 kW"};
m_msg[0][0]=0; m_msg[0][0]=0;
@ -792,11 +791,12 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple,
ui->labNextCall->setVisible(false); ui->labNextCall->setVisible(false);
ui->labNextCall->setToolTip(""); //### Possibly temporary ? ### ui->labNextCall->setToolTip(""); //### Possibly temporary ? ###
for(int i=0; i<28; i++) { //Initialize dBm values for(int i=0; i<19; i++) { //Initialize dBm values
float dbm=(10.0*i)/3.0 - 30.0; float dbm=(10.0*i)/3.0;
int ndbm=0; // int ndbm=0;
if(dbm<0) ndbm=int(dbm-0.5); // if(dbm<0) ndbm=int(dbm-0.5);
if(dbm>=0) ndbm=int(dbm+0.5); // if(dbm>=0) ndbm=int(dbm+0.5);
int ndbm=int(dbm+0.5);
QString t; QString t;
t.sprintf("%d dBm ",ndbm); t.sprintf("%d dBm ",ndbm);
t+=t1[i]; t+=t1[i];