PianetaRadio 2022-11-03 20:24:55 +01:00 zatwierdzone przez GitHub
rodzic 846293a019
commit 60ed269bfb
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 4AEE18F83AFDEB23
3 zmienionych plików z 9 dodań i 6 usunięć

Wyświetl plik

@ -219,6 +219,9 @@ void MainWindow::guiInit()
ui->comboBox_Meter->clear();
if (rig_has_get_level(my_rig, RIG_METER_SWR)) ui->comboBox_Meter->addItem("SWR");
if (rig_has_get_level(my_rig, RIG_METER_ALC)) ui->comboBox_Meter->addItem("ALC");
if (rig_has_get_level(my_rig, RIG_METER_COMP)) ui->comboBox_Meter->addItem("COMP");
if (rig_has_get_level(my_rig, RIG_METER_IC)) ui->comboBox_Meter->addItem("ID");
if (rig_has_get_level(my_rig, RIG_METER_VDD)) ui->comboBox_Meter->addItem("VDD");
rigSet.meter = levelmeterstr (ui->comboBox_Meter->currentText());
setSubMeter();

Wyświetl plik

@ -160,15 +160,15 @@ ant_t antstr (QString antString)
return ant;
}
unsigned levelmeterstr (QString meterString)
unsigned long long levelmeterstr (QString meterString)
{
unsigned levelMeter;
unsigned long long levelMeter;
if (meterString == "SWR") levelMeter = RIG_LEVEL_SWR;
else if (meterString == "COMP") levelMeter = RIG_LEVEL_COMP;
else if (meterString == "ALC") levelMeter = RIG_LEVEL_ALC;
//...
else if (meterString == "COMP") levelMeter = RIG_LEVEL_COMP;
else if (meterString == "ID") levelMeter = RIG_LEVEL_ID_METER;
else if (meterString == "VDD") levelMeter = RIG_LEVEL_VD_METER;
else levelMeter = RIG_METER_NONE;
return levelMeter;
}

Wyświetl plik

@ -33,4 +33,4 @@ agc_level_e levelagcvalue (int agcValue);
agc_level_e levelagcstr (QString agcString);
value_t valueagclevel (agc_level_e agcLevel);
ant_t antstr (QString antString);
unsigned levelmeterstr (QString meterString);
unsigned long long levelmeterstr (QString meterString); //Convert Submeter combo box string into Hamlib RIG_LEVEL constant