Fix newcat check for passband nochange

https://github.com/Hamlib/Hamlib/issues/1163
pull/1169/head
Mike Black W9MDB 2022-12-01 10:25:51 -06:00
rodzic b504d25107
commit e46da0c86e
2 zmienionych plików z 14 dodań i 2 usunięć

Wyświetl plik

@ -1358,10 +1358,22 @@ int newcat_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
{ {
rig_get_mode(rig, vfo, &tmode, &twidth); rig_get_mode(rig, vfo, &tmode, &twidth);
if (mode == tmode && (twidth == width || twidth == RIG_PASSBAND_NOCHANGE)) if (mode == tmode && (twidth == width || width == RIG_PASSBAND_NOCHANGE))
{ {
RETURNFUNC(RIG_OK); RETURNFUNC(RIG_OK);
} }
if (mode != tmode)
{
rig_debug(RIG_DEBUG_VERBOSE, "%s: mode changing from %s to %s\n", __func__,
rig_strrmode(mode), rig_strrmode(tmode));
}
if (width != twidth)
{
rig_debug(RIG_DEBUG_VERBOSE, "%s: width changing from %d to %d\n", __func__,
(int)width, (int)twidth);
}
} }
SNPRINTF(priv->cmd_str, sizeof(priv->cmd_str), "MD0x%c", cat_term); SNPRINTF(priv->cmd_str, sizeof(priv->cmd_str), "MD0x%c", cat_term);

Wyświetl plik

@ -50,7 +50,7 @@
typedef char ncboolean; typedef char ncboolean;
/* shared function version */ /* shared function version */
#define NEWCAT_VER "20221130" #define NEWCAT_VER "20221201"
/* 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