diff --git a/mainwindow.cpp b/mainwindow.cpp index 719f170..d469853 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -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(); diff --git a/rigcommand.cpp b/rigcommand.cpp index fa6cb77..5a62dc4 100644 --- a/rigcommand.cpp +++ b/rigcommand.cpp @@ -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; } diff --git a/rigcommand.h b/rigcommand.h index 7c76aeb..fc98a09 100644 --- a/rigcommand.h +++ b/rigcommand.h @@ -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