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

Fix RFPOWER level for FT-450D. It uses 5-100, rather than 0-255 that 

the FT-450 does.
pull/44/head
Brian G. Lucas 2018-08-09 16:19:24 -05:00
rodzic ac83428f7b
commit 9b2ba63b73
1 zmienionych plików z 11 dodań i 2 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

13
yaesu/newcat.c
Wyświetl plik

@ -59,6 +59,7 @@ static const char cat_term = ';'; /* Yaesu command terminator */
typedef enum nc_rigid_e { typedef enum nc_rigid_e {
NC_RIGID_NONE = 0, NC_RIGID_NONE = 0,
NC_RIGID_FT450 = 241, NC_RIGID_FT450 = 241,
NC_RIGID_FT450D = 244,
NC_RIGID_FT950 = 310, NC_RIGID_FT950 = 310,
NC_RIGID_FT891 = 135, NC_RIGID_FT891 = 135,
NC_RIGID_FT991 = 135, NC_RIGID_FT991 = 135,
@ -2018,8 +2019,10 @@ int newcat_set_level(RIG * rig, vfo_t vfo, setting_t level, value_t val)
case RIG_LEVEL_RFPOWER: case RIG_LEVEL_RFPOWER:
if (!newcat_valid_command(rig, "PC")) if (!newcat_valid_command(rig, "PC"))
return -RIG_ENAVAIL; return -RIG_ENAVAIL;
scale = (newcat_is_rig(rig, RIG_MODEL_FT950)) ? 100 : 255; scale = (newcat_is_rig(rig, RIG_MODEL_FT450)) &&
scale = (newcat_is_rig(rig, RIG_MODEL_FT1200)) ? 100 : scale; (newcat_get_rigid(rig) == NC_RIGID_FT450D) ? 100. : 255.;
scale = newcat_is_rig(rig, RIG_MODEL_FT950) ? 100. : scale ;
scale = newcat_is_rig(rig, RIG_MODEL_FT1200) ? 100. : scale ;
fpf = newcat_scale_float(scale, val.f); fpf = newcat_scale_float(scale, val.f);
snprintf(priv->cmd_str, sizeof(priv->cmd_str), "PC%03d%c", fpf, cat_term); snprintf(priv->cmd_str, sizeof(priv->cmd_str), "PC%03d%c", fpf, cat_term);
break; break;
@ -2449,6 +2452,12 @@ int newcat_get_level(RIG * rig, vfo_t vfo, setting_t level, value_t * val)
switch (level) { switch (level) {
case RIG_LEVEL_RFPOWER: case RIG_LEVEL_RFPOWER:
scale = (newcat_is_rig(rig, RIG_MODEL_FT450)) &&
(newcat_get_rigid(rig) == NC_RIGID_FT450D) ? 100. : 255.;
scale = newcat_is_rig(rig, RIG_MODEL_FT950) ? 100. : scale ;
scale = newcat_is_rig(rig, RIG_MODEL_FT1200) ? 100. : scale ;
val->f = (float)atoi(retlvl)/scale;
break;
case RIG_LEVEL_VOXGAIN: case RIG_LEVEL_VOXGAIN:
case RIG_LEVEL_COMP: case RIG_LEVEL_COMP:
case RIG_LEVEL_ANTIVOX: case RIG_LEVEL_ANTIVOX: