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

Make newcat.c FUNC_TUNER return EREJECT when AC command returns ?; 

https://github.com/Hamlib/Hamlib/issues/963
pull/976/head
Mike Black W9MDB 2022-02-13 22:42:38 -06:00
rodzic 2a852aee1b
commit d86e2b980a
2 zmienionych plików z 6 dodań i 5 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

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

@ -5784,6 +5784,7 @@ int newcat_set_func(RIG *rig, vfo_t vfo, setting_t func, int status)
RETURNFUNC(-RIG_ENAVAIL); RETURNFUNC(-RIG_ENAVAIL);
} }
priv->question_mark_response_means_rejected = 1;
SNPRINTF(priv->cmd_str, sizeof(priv->cmd_str), "AC00%d%c", SNPRINTF(priv->cmd_str, sizeof(priv->cmd_str), "AC00%d%c",
status == 0 ? 0 : status, status == 0 ? 0 : status,
cat_term); cat_term);
@ -10501,8 +10502,8 @@ int newcat_set_cmd(RIG *rig)
continue; /* usually a timeout - retry */ continue; /* usually a timeout - retry */
} }
rig_debug(RIG_DEBUG_TRACE, "%s: read count = %d, ret_data = %s\n", rig_debug(RIG_DEBUG_TRACE, "%s(%d): read count = %d, ret_data = %s\n",
__func__, rc, priv->ret_data); __func__, __LINE__, rc, priv->ret_data);
rc = RIG_OK; /* received something */ rc = RIG_OK; /* received something */
/* check for error codes */ /* check for error codes */
@ -10569,8 +10570,8 @@ int newcat_set_cmd(RIG *rig)
sizeof(priv->ret_data), sizeof(priv->ret_data),
&cat_term, sizeof(cat_term), 0, 1)) > 0) &cat_term, sizeof(cat_term), 0, 1)) > 0)
{ {
rig_debug(RIG_DEBUG_TRACE, "%s: read count = %d, ret_data = %s\n", rig_debug(RIG_DEBUG_TRACE, "%s(%d): read count = %d, ret_data = %s\n",
__func__, rc, priv->ret_data); __func__, __LINE__, rc, priv->ret_data);
rc = -RIG_BUSBUSY; /* retry */ rc = -RIG_BUSBUSY; /* retry */
} }

2
rigs/yaesu/newcat.h
Wyświetl plik

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