kopia lustrzana https://github.com/PianetaRadio/CatRadio
rodzic
97f2b54ab8
commit
ef30ab50eb
|
@ -3,6 +3,7 @@ CatRadio
|
||||||
(+ New, * Updated, - Removed)
|
(+ New, * Updated, - Removed)
|
||||||
|
|
||||||
1.4.0 - 2023-mm-dd
|
1.4.0 - 2023-mm-dd
|
||||||
|
+ High SWR indicator
|
||||||
+ Meter peak hold indicator
|
+ Meter peak hold indicator
|
||||||
+ Debug mode
|
+ Debug mode
|
||||||
* Bug fix: Power status
|
* Bug fix: Power status
|
||||||
|
|
|
@ -288,6 +288,7 @@ void MainWindow::guiInit()
|
||||||
if (rig_has_get_level(my_rig, RIG_METER_VDD)) ui->comboBox_Meter->addItem("VDD");
|
if (rig_has_get_level(my_rig, RIG_METER_VDD)) ui->comboBox_Meter->addItem("VDD");
|
||||||
rigSet.meter = levelmeterstr (ui->comboBox_Meter->currentText());
|
rigSet.meter = levelmeterstr (ui->comboBox_Meter->currentText());
|
||||||
setSubMeter();
|
setSubMeter();
|
||||||
|
ui->label_hiSWR->setVisible(false);
|
||||||
|
|
||||||
//* Attenuator comboBox
|
//* Attenuator comboBox
|
||||||
ui->comboBox_Att->clear();
|
ui->comboBox_Att->clear();
|
||||||
|
@ -586,6 +587,7 @@ void MainWindow::guiUpdate()
|
||||||
}
|
}
|
||||||
ui->progressBar_Smeter->setValue(rigGet.powerMeter.f*100);
|
ui->progressBar_Smeter->setValue(rigGet.powerMeter.f*100);
|
||||||
ui->progressBar_subMeter->setValue(rigGet.subMeter.f);
|
ui->progressBar_subMeter->setValue(rigGet.subMeter.f);
|
||||||
|
if (rigGet.hiSWR.f > 2) ui->label_hiSWR->setVisible(true);
|
||||||
}
|
}
|
||||||
else //RIG_PTT_OFF
|
else //RIG_PTT_OFF
|
||||||
{
|
{
|
||||||
|
@ -598,6 +600,7 @@ void MainWindow::guiUpdate()
|
||||||
ui->progressBar_Smeter->setTx(false);
|
ui->progressBar_Smeter->setTx(false);
|
||||||
ui->progressBar_Smeter->setValue(-54);
|
ui->progressBar_Smeter->setValue(-54);
|
||||||
ui->progressBar_Smeter->resetPeakValue();
|
ui->progressBar_Smeter->resetPeakValue();
|
||||||
|
ui->label_hiSWR->setVisible(false);
|
||||||
//if (rigSet.meter == RIG_LEVEL_SWR) ui->progressBar_subMeter->setValue(1.0);
|
//if (rigSet.meter == RIG_LEVEL_SWR) ui->progressBar_subMeter->setValue(1.0);
|
||||||
//else ui->progressBar_subMeter->setValue(0.0);
|
//else ui->progressBar_subMeter->setValue(0.0);
|
||||||
//ui->progressBar_subMeter->resetPeakValue();
|
//ui->progressBar_subMeter->resetPeakValue();
|
||||||
|
|
|
@ -1129,7 +1129,7 @@
|
||||||
<widget class="SubMeter" name="progressBar_subMeter" native="true">
|
<widget class="SubMeter" name="progressBar_subMeter" native="true">
|
||||||
<property name="geometry">
|
<property name="geometry">
|
||||||
<rect>
|
<rect>
|
||||||
<x>250</x>
|
<x>240</x>
|
||||||
<y>0</y>
|
<y>0</y>
|
||||||
<width>161</width>
|
<width>161</width>
|
||||||
<height>61</height>
|
<height>61</height>
|
||||||
|
@ -1146,6 +1146,19 @@
|
||||||
</rect>
|
</rect>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
|
<widget class="QLabel" name="label_hiSWR">
|
||||||
|
<property name="geometry">
|
||||||
|
<rect>
|
||||||
|
<x>410</x>
|
||||||
|
<y>0</y>
|
||||||
|
<width>63</width>
|
||||||
|
<height>20</height>
|
||||||
|
</rect>
|
||||||
|
</property>
|
||||||
|
<property name="text">
|
||||||
|
<string>Hi SWR</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
</widget>
|
</widget>
|
||||||
<widget class="QTabWidget" name="tabWidget_level">
|
<widget class="QTabWidget" name="tabWidget_level">
|
||||||
<property name="geometry">
|
<property name="geometry">
|
||||||
|
|
|
@ -149,7 +149,13 @@ void RigDaemon::rigUpdate(RIG *my_rig)
|
||||||
if (rigGet.ptt == 1 || rigSet.ptt == 1)
|
if (rigGet.ptt == 1 || rigSet.ptt == 1)
|
||||||
{
|
{
|
||||||
rig_get_level(my_rig, RIG_VFO_CURR, RIG_LEVEL_RFPOWER_METER, &rigGet.powerMeter);
|
rig_get_level(my_rig, RIG_VFO_CURR, RIG_LEVEL_RFPOWER_METER, &rigGet.powerMeter);
|
||||||
rig_get_level(my_rig, RIG_VFO_CURR, rigSet.meter, &rigGet.subMeter);
|
if (rigSet.meter != RIG_METER_NONE) rig_get_level(my_rig, RIG_VFO_CURR, rigSet.meter, &rigGet.subMeter);
|
||||||
|
|
||||||
|
if (rig_has_get_level(my_rig, RIG_METER_SWR) && (rigSet.meter != RIG_LEVEL_SWR))
|
||||||
|
{
|
||||||
|
rig_get_level(my_rig, RIG_VFO_CURR, RIG_LEVEL_SWR, &rigGet.hiSWR);
|
||||||
|
}
|
||||||
|
else if (rigSet.meter == RIG_LEVEL_SWR) rigGet.hiSWR = rigGet.subMeter;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|
|
@ -51,6 +51,7 @@ typedef struct {
|
||||||
value_t sMeter; //Smeter signal strenght
|
value_t sMeter; //Smeter signal strenght
|
||||||
value_t powerMeter; //RF power meter
|
value_t powerMeter; //RF power meter
|
||||||
value_t subMeter; //secondary meter
|
value_t subMeter; //secondary meter
|
||||||
|
value_t hiSWR; //SWR level for Hi SWR indicator
|
||||||
unsigned long long meter; //secondary meter type
|
unsigned long long meter; //secondary meter type
|
||||||
float rfPower; //RF power output level
|
float rfPower; //RF power output level
|
||||||
float rfGain; //RF gain rx
|
float rfGain; //RF gain rx
|
||||||
|
|
Ładowanie…
Reference in New Issue