kopia lustrzana https://github.com/Hamlib/Hamlib
Use general meter reader to get SWR value for TS-990.
rodzic
e05b79acd3
commit
176c49240d
|
@ -1100,15 +1100,6 @@ int kenwood_open(RIG *rig)
|
|||
// mismatched IDs can still be tested
|
||||
rig->state.rigport.retry = retry_save;
|
||||
|
||||
|
||||
// TS-990S needs to ensure all RM meters are turned off as first one with read on gets read
|
||||
// Any RM commands need to be ON/READ/OFF to allow other apps or threads to read meters
|
||||
|
||||
if (RIG_IS_TS990S)
|
||||
{
|
||||
kenwood_transaction(rig, "RM10;RM20;RM30;RM40;RM50;RM60;", NULL, 0);
|
||||
}
|
||||
|
||||
RETURNFUNC(RIG_OK);
|
||||
}
|
||||
|
||||
|
|
|
@ -647,16 +647,12 @@ int ts990s_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
|
|||
break;
|
||||
|
||||
case RIG_LEVEL_SWR:
|
||||
// we need to turn on read, read it, and turn it off again
|
||||
// first RM meter with read on is the that gets read with RM;
|
||||
retval = kenwood_safe_transaction(rig, "RM21;RM;RM20", lvlbuf, sizeof(lvlbuf), 8);
|
||||
|
||||
retval = get_kenwood_meter_reading(rig, '2', &lvl);
|
||||
if (retval != RIG_OK)
|
||||
{
|
||||
return retval;
|
||||
}
|
||||
|
||||
sscanf(lvlbuf, "RM2%d", &lvl);
|
||||
val->f = rig_raw2val_float(lvl, &rig->caps->swr_cal);
|
||||
val->f = round(val->f*10)/10.0; // 1 decimal place precision
|
||||
break;
|
||||
|
|
Ładowanie…
Reference in New Issue