kopia lustrzana https://github.com/PianetaRadio/CatRadio
Porównaj commity
3 Commity
7c4fad92a5
...
2043bb7b2a
Autor | SHA1 | Data |
---|---|---|
PianetaRadio | 2043bb7b2a | |
PianetaRadio | 0e932dd3c5 | |
PianetaRadio | 8781583cd9 |
|
@ -53,10 +53,11 @@ else: unix:!android: target.path = /opt/$${TARGET}/bin
|
||||||
LIBS += -L$$PWD/hamlib/ -lhamlib
|
LIBS += -L$$PWD/hamlib/ -lhamlib
|
||||||
INCLUDEPATH += $$PWD/hamlib
|
INCLUDEPATH += $$PWD/hamlib
|
||||||
|
|
||||||
|
# RESOURCES += theme/breeze.qrc
|
||||||
RESOURCES += qdarkstyle/dark/darkstyle.qrc
|
RESOURCES += qdarkstyle/dark/darkstyle.qrc
|
||||||
# RESOURCES += qdarkstyle/light/lightstyle.qrc
|
# RESOURCES += qdarkstyle/light/lightstyle.qrc
|
||||||
|
|
||||||
VERSION = 1.3.0
|
VERSION = 1.4.0
|
||||||
|
|
||||||
RC_ICONS = catradio.ico
|
RC_ICONS = catradio.ico
|
||||||
|
|
||||||
|
|
|
@ -7,6 +7,7 @@ CatRadio
|
||||||
+ High SWR indicator
|
+ High SWR indicator
|
||||||
+ Meter peak hold indicator
|
+ Meter peak hold indicator
|
||||||
+ Debug mode
|
+ Debug mode
|
||||||
|
* Bug fix: Repeater shift
|
||||||
* Bug fix: Power status
|
* Bug fix: Power status
|
||||||
* Bug fix: COM port list
|
* Bug fix: COM port list
|
||||||
* Updated to library Hamlib 4.5.5
|
* Updated to library Hamlib 4.5.5
|
||||||
|
|
|
@ -420,8 +420,8 @@ void MainWindow::guiUpdate()
|
||||||
ui->label_vfoSub->setText(rig_strvfo(rigGet.vfoSub));
|
ui->label_vfoSub->setText(rig_strvfo(rigGet.vfoSub));
|
||||||
|
|
||||||
//* Mode
|
//* Mode
|
||||||
ui->comboBox_Mode->setCurrentText(rig_strrmode(rigGet.mode));
|
if (!rigCmd.mode) ui->comboBox_Mode->setCurrentText(rig_strrmode(rigGet.mode));
|
||||||
ui->comboBox_ModeSub->setCurrentText(rig_strrmode(rigGet.modeSub));
|
if (!rigCmd.modeSub) ui->comboBox_ModeSub->setCurrentText(rig_strrmode(rigGet.modeSub));
|
||||||
|
|
||||||
if (guiCmd.tabList) //Select appropriate mode function tab
|
if (guiCmd.tabList) //Select appropriate mode function tab
|
||||||
{
|
{
|
||||||
|
@ -472,7 +472,7 @@ void MainWindow::guiUpdate()
|
||||||
guiCmd.bwidthList = 0;
|
guiCmd.bwidthList = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
ui->comboBox_BW->setCurrentText(QString::number(rigGet.bwidth));
|
if (!rigCmd.bwidth) ui->comboBox_BW->setCurrentText(QString::number(rigGet.bwidth));
|
||||||
ui->checkBox_NAR->setChecked(rigGet.bwNarrow);
|
ui->checkBox_NAR->setChecked(rigGet.bwNarrow);
|
||||||
|
|
||||||
//* Range list
|
//* Range list
|
||||||
|
@ -546,10 +546,10 @@ void MainWindow::guiUpdate()
|
||||||
}
|
}
|
||||||
|
|
||||||
//* RF
|
//* RF
|
||||||
ui->radioButton_Tuner->setChecked(rigGet.tuner);
|
if (!rigCmd.tuner) ui->radioButton_Tuner->setChecked(rigGet.tuner);
|
||||||
ui->comboBox_AGC->setCurrentText(rig_stragclevel(rigGet.agc));
|
if (!rigCmd.agc) ui->comboBox_AGC->setCurrentText(rig_stragclevel(rigGet.agc));
|
||||||
ui->comboBox_Att->setCurrentText(QString::number(rigGet.att));
|
if (!rigCmd.att) ui->comboBox_Att->setCurrentText(QString::number(rigGet.att));
|
||||||
ui->comboBox_Preamp->setCurrentText(QString::number(rigGet.pre));
|
if (!rigCmd.pre) ui->comboBox_Preamp->setCurrentText(QString::number(rigGet.pre));
|
||||||
|
|
||||||
//* Split
|
//* Split
|
||||||
if (rigGet.split == RIG_SPLIT_ON)
|
if (rigGet.split == RIG_SPLIT_ON)
|
||||||
|
@ -621,19 +621,19 @@ void MainWindow::guiUpdate()
|
||||||
if (!ui->verticalSlider_micGain->isSliderDown() && !rigCmd.micGain) ui->verticalSlider_micGain->setValue((int)(rigGet.micGain*100));
|
if (!ui->verticalSlider_micGain->isSliderDown() && !rigCmd.micGain) ui->verticalSlider_micGain->setValue((int)(rigGet.micGain*100));
|
||||||
if (!ui->verticalSlider_micMonitor->isSliderDown() && !rigCmd.micMonLevel) ui->verticalSlider_micMonitor->setValue((int)(rigGet.micMonLevel*100));
|
if (!ui->verticalSlider_micMonitor->isSliderDown() && !rigCmd.micMonLevel) ui->verticalSlider_micMonitor->setValue((int)(rigGet.micMonLevel*100));
|
||||||
if (!ui->verticalSlider_micCompressor->isSliderDown() && !rigCmd.micCompLevel) ui->verticalSlider_micCompressor->setValue((int)(rigGet.micCompLevel*100));
|
if (!ui->verticalSlider_micCompressor->isSliderDown() && !rigCmd.micCompLevel) ui->verticalSlider_micCompressor->setValue((int)(rigGet.micCompLevel*100));
|
||||||
ui->checkBox_micCompressor->setChecked(rigGet.micComp);
|
if (!rigCmd.micComp) ui->checkBox_micCompressor->setChecked(rigGet.micComp);
|
||||||
ui->checkBox_micMonitor->setChecked(rigGet.micMon);
|
if (!rigCmd.micMon) ui->checkBox_micMonitor->setChecked(rigGet.micMon);
|
||||||
|
|
||||||
//* Filter
|
//* Filter
|
||||||
ui->checkBox_NB->setChecked(rigGet.noiseBlanker);
|
if (!rigCmd.noiseBlanker) ui->checkBox_NB->setChecked(rigGet.noiseBlanker);
|
||||||
ui->checkBox_NB2->setChecked(rigGet.noiseBlanker2);
|
if (!rigCmd.noiseBlanker2) ui->checkBox_NB2->setChecked(rigGet.noiseBlanker2);
|
||||||
ui->checkBox_NR->setChecked(rigGet.noiseReduction);
|
if (!rigCmd.noiseReduction) ui->checkBox_NR->setChecked(rigGet.noiseReduction);
|
||||||
ui->spinBox_NR->setValue(rigGet.noiseReductionLevel);
|
if (!rigCmd.noiseReductionLevel) ui->spinBox_NR->setValue(rigGet.noiseReductionLevel);
|
||||||
ui->checkBox_NF->setChecked(rigGet.notchFilter);
|
if (!rigCmd.notchFilter) ui->checkBox_NF->setChecked(rigGet.notchFilter);
|
||||||
if (!ui->horizontalSlider_IFshift->isSliderDown() && !rigCmd.ifShift) ui->horizontalSlider_IFshift->setValue(rigGet.ifShift);
|
if (!ui->horizontalSlider_IFshift->isSliderDown() && !rigCmd.ifShift) ui->horizontalSlider_IFshift->setValue(rigGet.ifShift);
|
||||||
|
|
||||||
//* Clarifier
|
//* Clarifier
|
||||||
ui->checkBox_clar->setChecked(rigGet.clar);
|
if (!rigCmd.clar) ui->checkBox_clar->setChecked(rigGet.clar);
|
||||||
if (rigSet.xit)
|
if (rigSet.xit)
|
||||||
{
|
{
|
||||||
ui->radioButton_clarXIT->setChecked(true);
|
ui->radioButton_clarXIT->setChecked(true);
|
||||||
|
@ -646,15 +646,15 @@ void MainWindow::guiUpdate()
|
||||||
}
|
}
|
||||||
|
|
||||||
//* CW
|
//* CW
|
||||||
ui->checkBox_BKIN->setChecked(rigGet.bkin);
|
if (!rigCmd.bkin) ui->checkBox_BKIN->setChecked(rigGet.bkin);
|
||||||
ui->checkBox_APF->setChecked(rigGet.apf);
|
if (!rigCmd.apf) ui->checkBox_APF->setChecked(rigGet.apf);
|
||||||
ui->spinBox_WPM->setValue(rigGet.wpm);
|
if (!rigCmd.wpm) ui->spinBox_WPM->setValue(rigGet.wpm);
|
||||||
|
|
||||||
//* FM
|
//* FM
|
||||||
if (rigGet.rptShift == RIG_RPT_SHIFT_MINUS) ui->radioButton_RPTshiftMinus->setChecked(true); //-
|
if (rigGet.rptShift == RIG_RPT_SHIFT_MINUS && !rigCmd.rptShift) ui->radioButton_RPTshiftMinus->setChecked(true); //-
|
||||||
else if (rigGet.rptShift == RIG_RPT_SHIFT_PLUS) ui->radioButton_RPTshiftPlus->setChecked(true); //+
|
else if (rigGet.rptShift == RIG_RPT_SHIFT_PLUS && !rigCmd.rptShift) ui->radioButton_RPTshiftPlus->setChecked(true); //+
|
||||||
else ui->radioButton_RPTshiftSimplex->setChecked(true); //Simplex
|
else ui->radioButton_RPTshiftSimplex->setChecked(true); //Simplex
|
||||||
ui->spinBox_RPToffset->setValue(rigGet.rptOffset/1000); //Offset (kHz)
|
if (!rigCmd.rptOffset) ui->spinBox_RPToffset->setValue(rigGet.rptOffset/1000); //Offset (kHz)
|
||||||
|
|
||||||
switch (rigGet.toneType)
|
switch (rigGet.toneType)
|
||||||
{
|
{
|
||||||
|
|
|
@ -27,7 +27,7 @@
|
||||||
|
|
||||||
#define RELEASE_DATE __DATE__
|
#define RELEASE_DATE __DATE__
|
||||||
#define VERSION_MAJ 1
|
#define VERSION_MAJ 1
|
||||||
#define VERSION_MIN 3
|
#define VERSION_MIN 4
|
||||||
#define VERSION_MIC 0
|
#define VERSION_MIC 0
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -1765,7 +1765,7 @@
|
||||||
</rect>
|
</rect>
|
||||||
</property>
|
</property>
|
||||||
<property name="currentIndex">
|
<property name="currentIndex">
|
||||||
<number>0</number>
|
<number>2</number>
|
||||||
</property>
|
</property>
|
||||||
<widget class="QWidget" name="tab_clar">
|
<widget class="QWidget" name="tab_clar">
|
||||||
<property name="autoFillBackground">
|
<property name="autoFillBackground">
|
||||||
|
@ -1979,6 +1979,9 @@
|
||||||
<property name="maximum">
|
<property name="maximum">
|
||||||
<number>10000</number>
|
<number>10000</number>
|
||||||
</property>
|
</property>
|
||||||
|
<property name="singleStep">
|
||||||
|
<number>100</number>
|
||||||
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
</layout>
|
</layout>
|
||||||
|
|
|
@ -453,10 +453,11 @@ void RigDaemon::rigUpdate(RIG *my_rig)
|
||||||
|
|
||||||
if (rigCmd.noiseReductionLevel)
|
if (rigCmd.noiseReductionLevel)
|
||||||
{
|
{
|
||||||
retvalue.i = rigSet.noiseReductionLevel;
|
retvalue.f = rigSet.noiseReductionLevel/15.0;
|
||||||
retcode = rig_set_level(my_rig, RIG_VFO_CURR, RIG_LEVEL_NR, retvalue);
|
retcode = rig_set_level(my_rig, RIG_VFO_CURR, RIG_LEVEL_NR, retvalue);
|
||||||
if (retcode == RIG_OK) rigGet.noiseReductionLevel = rigSet.noiseReductionLevel;
|
if (retcode == RIG_OK) rigGet.noiseReductionLevel = rigSet.noiseReductionLevel;
|
||||||
rigCmd.noiseReductionLevel = 0;
|
rigCmd.noiseReductionLevel = 0;
|
||||||
|
//qDebug()<<"set "<<retvalue.f;
|
||||||
}
|
}
|
||||||
|
|
||||||
//* NF notch filter
|
//* NF notch filter
|
||||||
|
@ -745,7 +746,8 @@ void RigDaemon::rigUpdate(RIG *my_rig)
|
||||||
if (rig_has_get_level(my_rig, RIG_LEVEL_NR))
|
if (rig_has_get_level(my_rig, RIG_LEVEL_NR))
|
||||||
{
|
{
|
||||||
rig_get_level(my_rig, RIG_VFO_CURR, RIG_LEVEL_NR, &retvalue);
|
rig_get_level(my_rig, RIG_VFO_CURR, RIG_LEVEL_NR, &retvalue);
|
||||||
rigGet.noiseReductionLevel = retvalue.i;
|
rigGet.noiseReductionLevel = (retvalue.f + 0.003) * 15.0;
|
||||||
|
//qDebug()<<"get "<<retvalue.f<<" "<<rigGet.noiseReductionLevel;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Ładowanie…
Reference in New Issue