kopia lustrzana https://github.com/Hamlib/Hamlib
Fix ability to get Sub VFO in newcat get_func
https://github.com/Hamlib/Hamlib/issues/413pull/420/head
rodzic
b8da9b6bba
commit
5453a9c036
|
@ -3926,6 +3926,11 @@ int newcat_get_func(RIG *rig, vfo_t vfo, setting_t func, int *status)
|
||||||
|
|
||||||
rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
|
rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
|
||||||
|
|
||||||
|
if (rig->caps->targetable_vfo & (RIG_TARGETABLE_MODE | RIG_TARGETABLE_TONE))
|
||||||
|
{
|
||||||
|
main_sub_vfo = (RIG_VFO_B == vfo || RIG_VFO_SUB == vfo) ? '1' : '0';
|
||||||
|
}
|
||||||
|
|
||||||
switch (func)
|
switch (func)
|
||||||
{
|
{
|
||||||
case RIG_FUNC_ANF:
|
case RIG_FUNC_ANF:
|
||||||
|
@ -6753,6 +6758,9 @@ int newcat_get_cmd(RIG *rig)
|
||||||
|| strcmp(priv->cmd_str, "NL1;") == 0
|
|| strcmp(priv->cmd_str, "NL1;") == 0
|
||||||
|| strcmp(priv->cmd_str, "NR0;") == 0
|
|| strcmp(priv->cmd_str, "NR0;") == 0
|
||||||
|| strcmp(priv->cmd_str, "NR1;") == 0
|
|| strcmp(priv->cmd_str, "NR1;") == 0
|
||||||
|
|| strcmp(priv->cmd_str, "NR0;") == 0
|
||||||
|
|| strcmp(priv->cmd_str, "NR1;") == 0
|
||||||
|
|| strcmp(priv->cmd_str, "OS0;") == 0
|
||||||
|| strcmp(priv->cmd_str, "OS0;") == 0
|
|| strcmp(priv->cmd_str, "OS0;") == 0
|
||||||
|| strcmp(priv->cmd_str, "OS1;") == 0
|
|| strcmp(priv->cmd_str, "OS1;") == 0
|
||||||
|| strcmp(priv->cmd_str, "PA0;") == 0
|
|| strcmp(priv->cmd_str, "PA0;") == 0
|
||||||
|
|
|
@ -50,7 +50,7 @@
|
||||||
typedef char ncboolean;
|
typedef char ncboolean;
|
||||||
|
|
||||||
/* shared function version */
|
/* shared function version */
|
||||||
#define NEWCAT_VER "20201010"
|
#define NEWCAT_VER "20201011"
|
||||||
|
|
||||||
/* Hopefully large enough for future use, 128 chars plus '\0' */
|
/* Hopefully large enough for future use, 128 chars plus '\0' */
|
||||||
#define NEWCAT_DATA_LEN 129
|
#define NEWCAT_DATA_LEN 129
|
||||||
|
|
Ładowanie…
Reference in New Issue