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

Convert set/get AF, RF to use level_gran info.

pull/1346/head
George Baltz N3GB 2023-07-24 17:03:49 -04:00
rodzic ee5b96443f
commit a975a6e8a6
2 zmienionych plików z 5 dodań i 23 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

1
rigs/yaesu/ft891.c
Wyświetl plik

@ -161,6 +161,7 @@ const struct rig_caps ft891_caps =
[LVL_CWPITCH] = { .min = { .i = 300 }, .max = { .i = 1050 }, .step = { .i = 50 } }, [LVL_CWPITCH] = { .min = { .i = 300 }, .max = { .i = 1050 }, .step = { .i = 50 } },
[LVL_KEYSPD] = { .min = { .i = 4 }, .max = { .i = 60 }, .step = { .i = 1 } }, [LVL_KEYSPD] = { .min = { .i = 4 }, .max = { .i = 60 }, .step = { .i = 1 } },
[LVL_NOTCHF] = { .min = { .i = 1 }, .max = { .i = 3200 }, .step = { .i = 10 } }, [LVL_NOTCHF] = { .min = { .i = 1 }, .max = { .i = 3200 }, .step = { .i = 10 } },
[LVL_RF] = { .min = { .f = 0 }, .max = { .f = 1.0f }, .step = { .f = 1.0f/30.0f } },
}, },
.ctcss_list = common_ctcss_list, .ctcss_list = common_ctcss_list,
.dcs_list = NULL, .dcs_list = NULL,

27
rigs/yaesu/newcat.c
Wyświetl plik

@ -4075,9 +4075,10 @@ int newcat_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
RETURNFUNC(-RIG_ENAVAIL); RETURNFUNC(-RIG_ENAVAIL);
} }
//TODO Remove when common level checking enabled
if (val.f > 1.0) { RETURNFUNC(-RIG_EINVAL); } if (val.f > 1.0) { RETURNFUNC(-RIG_EINVAL); }
fpf = newcat_scale_float(255, val.f); fpf = (int)((val.f / level_info->step.f) + 0.5f);
if (is_ftdx10) { main_sub_vfo = '0'; } if (is_ftdx10) { main_sub_vfo = '0'; }
@ -4436,18 +4437,10 @@ int newcat_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
RETURNFUNC(-RIG_ENAVAIL); RETURNFUNC(-RIG_ENAVAIL);
} }
if (is_ft891) fpf = (int)((val.f / level_info->step.f) + 0.5f);
{
scale = 30;
}
else
{
scale = 255;
}
if (is_ftdx10) { main_sub_vfo = '0'; } if (is_ftdx10) { main_sub_vfo = '0'; }
fpf = newcat_scale_float(scale, val.f);
SNPRINTF(priv->cmd_str, sizeof(priv->cmd_str), "RG%c%03d%c", main_sub_vfo, fpf, SNPRINTF(priv->cmd_str, sizeof(priv->cmd_str), "RG%c%03d%c", main_sub_vfo, fpf,
cat_term); cat_term);
break; break;
@ -5661,20 +5654,8 @@ int newcat_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
break; break;
case RIG_LEVEL_AF: case RIG_LEVEL_AF:
val->f = (float)atoi(retlvl) / 255;
break;
case RIG_LEVEL_RF: case RIG_LEVEL_RF:
if (is_ft891) val->f = (float)atoi(retlvl) * level_info->step.f;
{
scale = 30.;
}
else
{
scale = 255.;
}
val->f = (float)atoi(retlvl) / scale;
break; break;
case RIG_LEVEL_SQL: case RIG_LEVEL_SQL: