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

Fix FTDX3000 EX039 error 

https://github.com/Hamlib/Hamlib/issues/1206
pull/1215/head
Mike Black W9MDB 2023-01-07 16:03:34 -06:00
rodzic 7978d74750
commit 6cb7a8c560
2 zmienionych plików z 24 dodań i 6 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

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

@ -546,6 +546,7 @@ int newcat_open(RIG *rig)
struct rig_state *rig_s = &rig->state; struct rig_state *rig_s = &rig->state;
const char *handshake[3] = {"None", "Xon/Xoff", "Hardware"}; const char *handshake[3] = {"None", "Xon/Xoff", "Hardware"};
int err; int err;
int set_only = 0;
ENTERFUNC; ENTERFUNC;
@ -611,15 +612,24 @@ int newcat_open(RIG *rig)
else if (priv->rig_id == NC_RIGID_FT991A else if (priv->rig_id == NC_RIGID_FT991A
|| rig->caps->rig_model == RIG_MODEL_FT991) { cmd = "EX0321;EX032;"; } || rig->caps->rig_model == RIG_MODEL_FT991) { cmd = "EX0321;EX032;"; }
else if (priv->rig_id == NC_RIGID_FTDX3000 else if (priv->rig_id == NC_RIGID_FTDX3000
|| rig->caps->rig_model == RIG_MODEL_FTDX3000) { cmd = "EX0391;"; } || rig->caps->rig_model == RIG_MODEL_FTDX3000) { cmd = "EX0391;"; set_only = 1; }
else if (priv->rig_id == NC_RIGID_FTDX3000DM else if (priv->rig_id == NC_RIGID_FTDX3000DM
|| rig->caps->rig_model == RIG_MODEL_FTDX3000) { cmd = "EX0391;"; } || rig->caps->rig_model == RIG_MODEL_FTDX3000) { cmd = "EX0391;"; set_only = 1; }
else if (priv->rig_id == NC_RIGID_FTDX5000 else if (priv->rig_id == NC_RIGID_FTDX5000
|| rig->caps->rig_model == RIG_MODEL_FTDX5000) { cmd = "EX0331;EX033"; } || rig->caps->rig_model == RIG_MODEL_FTDX5000) { cmd = "EX0331;EX033"; }
SNPRINTF(priv->cmd_str, sizeof(priv->cmd_str), "%s", cmd); SNPRINTF(priv->cmd_str, sizeof(priv->cmd_str), "%s", cmd);
if (RIG_OK != (err = newcat_get_cmd(rig))) if (set_only)
{
err = newcat_set_cmd(rig);
}
else
{
err = newcat_get_cmd(rig);
}
if (err != RIG_OK)
{ {
RETURNFUNC(err); RETURNFUNC(err);
} }
@ -636,9 +646,17 @@ int newcat_open(RIG *rig)
// Remember EX103 status // Remember EX103 status
SNPRINTF(priv->cmd_str, sizeof(priv->cmd_str), "EX103;"); SNPRINTF(priv->cmd_str, sizeof(priv->cmd_str), "EX103;");
rig_debug(RIG_DEBUG_TRACE, "%s: cmd_str = %s\n", __func__, priv->cmd_str); rig_debug(RIG_DEBUG_TRACE, "%s: cmd_str = %s\n", __func__, priv->cmd_str);
err = newcat_get_cmd(rig);
if (RIG_OK != (err = newcat_get_cmd(rig))) if (set_only)
{
err = newcat_set_cmd(rig);
}
else
{
err = newcat_get_cmd(rig);
}
if (err != RIG_OK)
{ {
RETURNFUNC(err); RETURNFUNC(err);
} }

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 "20230106" #define NEWCAT_VER "20230107"
/* 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