mirror
/
Hamlib
kopia lustrzana https://github.com/Hamlib/Hamlib
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Fix TT599 and TT565 NR level to set levels 1-9 and read levels 1-10 

Unable to set level 10 apparently for 599 and probably same for 565
https://github.com/Hamlib/Hamlib/issues/1061
pull/1068/head
Mike Black W9MDB 2022-06-14 09:13:07 -05:00
rodzic e859d6a2c9
commit e66cf67a96
2 zmienionych plików z 7 dodań i 6 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

7
rigs/tentec/orion.c
Wyświetl plik

@ -1212,7 +1212,9 @@ int tt565_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
case RIG_LEVEL_NR: case RIG_LEVEL_NR:
if (rig->caps->rig_model == RIG_MODEL_TT599) if (rig->caps->rig_model == RIG_MODEL_TT599)
{ {
SNPRINTF(cmdbuf, sizeof(cmdbuf), "*RMNN%c" EOM, (int)(val.f * 9)); ii = (int)(val.f * 10);
if (ii > 9) ii=9; // cannot set NR level 10 apparently
SNPRINTF(cmdbuf, sizeof(cmdbuf), "*RMNN%c" EOM, ii);
} }
else else
{ {
@ -1718,8 +1720,7 @@ int tt565_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
__func__, lvlbuf); __func__, lvlbuf);
return -RIG_EPROTO; return -RIG_EPROTO;
} }
sscanf(lvlbuf + 5, "%f", &val->f);
val->f = atof(lvlbuf + 5) / 9.0; /* Note 0-9 -> 0.0 - 1.0 */
break; break;
case RIG_LEVEL_VOXDELAY: /* =VOXDELAY, tenths of secs. */ case RIG_LEVEL_VOXDELAY: /* =VOXDELAY, tenths of secs. */

6
rigs/tentec/orion.h
Wyświetl plik

@ -32,7 +32,7 @@
*/ */
#define BACKEND_VER "20200324" #define BACKEND_VER "20220614"
#define TRUE 1 #define TRUE 1
#define FALSE 0 #define FALSE 0
@ -196,7 +196,7 @@ const struct rig_caps tt565_caps = {
RIG_MODEL(RIG_MODEL_TT565), RIG_MODEL(RIG_MODEL_TT565),
.model_name = "TT-565 Orion", .model_name = "TT-565 Orion",
.mfg_name = "Ten-Tec", .mfg_name = "Ten-Tec",
.version = BACKEND_VER ".1", .version = BACKEND_VER ".0",
.copyright = "LGPL", .copyright = "LGPL",
.status = RIG_STATUS_STABLE, .status = RIG_STATUS_STABLE,
.rig_type = RIG_TYPE_TRANSCEIVER, .rig_type = RIG_TYPE_TRANSCEIVER,
@ -414,7 +414,7 @@ const struct rig_caps tt599_caps = {
RIG_MODEL(RIG_MODEL_TT599), RIG_MODEL(RIG_MODEL_TT599),
.model_name = "TT-599 Eagle", .model_name = "TT-599 Eagle",
.mfg_name = "Ten-Tec", .mfg_name = "Ten-Tec",
.version = BACKEND_VER ".2", .version = BACKEND_VER ".0",
.copyright = "LGPL", .copyright = "LGPL",
.status = RIG_STATUS_STABLE, .status = RIG_STATUS_STABLE,
.rig_type = RIG_TYPE_TRANSCEIVER, .rig_type = RIG_TYPE_TRANSCEIVER,