Mike Black W9MDB 2022-06-08 17:10:26 -05:00
rodzic eb453db056
commit 92ba0b92ac
1 zmienionych plików z 15 dodań i 2 usunięć

Wyświetl plik

@ -1210,6 +1210,12 @@ int tt565_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
break; break;
case RIG_LEVEL_NR: case RIG_LEVEL_NR:
if (rig->caps->rig_model == RIG_MODEL_TT599)
{
SNPRINTF(cmdbuf, sizeof(cmdbuf), "*RMNN%c" EOM, (int)(val.f * 9));
}
else
{
/* Noise Reduction (blanking) Float 0.0 - 1.0 /* Noise Reduction (blanking) Float 0.0 - 1.0
For some reason NB setting is supported in 1.372, but For some reason NB setting is supported in 1.372, but
NR, NOTCH, and AN are not. NR, NOTCH, and AN are not.
@ -1218,6 +1224,7 @@ int tt565_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
SNPRINTF(cmdbuf, sizeof(cmdbuf), "*R%cNB%d" EOM, SNPRINTF(cmdbuf, sizeof(cmdbuf), "*R%cNB%d" EOM,
which_receiver(rig, vfo), which_receiver(rig, vfo),
(int)(val.f * 9)); (int)(val.f * 9));
}
break; break;
case RIG_LEVEL_VOXDELAY: case RIG_LEVEL_VOXDELAY:
@ -1687,8 +1694,15 @@ int tt565_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
case RIG_LEVEL_NR: case RIG_LEVEL_NR:
/* RIG_LEVEL_NR controls Orion NB setting - TEMP */ /* RIG_LEVEL_NR controls Orion NB setting - TEMP */
if (rig->caps->rig_model == RIG_MODEL_TT599)
{
SNPRINTF(cmdbuf, sizeof(cmdbuf), "?RMNN" EOM)
}
else
{
SNPRINTF(cmdbuf, sizeof(cmdbuf), "?R%cNB" EOM, SNPRINTF(cmdbuf, sizeof(cmdbuf), "?R%cNB" EOM,
which_receiver(rig, vfo)); which_receiver(rig, vfo));
}
lvl_len = sizeof(lvlbuf); lvl_len = sizeof(lvlbuf);
retval = tt565_transaction(rig, cmdbuf, strlen(cmdbuf), lvlbuf, &lvl_len); retval = tt565_transaction(rig, cmdbuf, strlen(cmdbuf), lvlbuf, &lvl_len);
@ -1698,8 +1712,7 @@ int tt565_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
return retval; return retval;
} }
if (lvlbuf[1] != 'R' || lvlbuf[3] != 'N' || lvlbuf[4] != 'B' || if (lvlbuf[1] != 'R' || lvl_len < 6)
lvl_len < 6)
{ {
rig_debug(RIG_DEBUG_ERR, "%s: unexpected answer '%s'\n", rig_debug(RIG_DEBUG_ERR, "%s: unexpected answer '%s'\n",
__func__, lvlbuf); __func__, lvlbuf);