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

Fix last char index

pull/426/head
Mikael Nousiainen 2020-10-23 09:56:20 +03:00
rodzic ed5815f1b4
commit c152fcb279
1 zmienionych plików z 4 dodań i 3 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

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

@ -3992,7 +3992,7 @@ int newcat_get_func(RIG *rig, vfo_t vfo, setting_t func, int *status)
struct newcat_priv_data *priv = (struct newcat_priv_data *)rig->state.priv; struct newcat_priv_data *priv = (struct newcat_priv_data *)rig->state.priv;
int err; int err;
int ret_data_len; int ret_data_len;
int last_digit_index; int last_char_index;
char *retfunc; char *retfunc;
char main_sub_vfo = '0'; char main_sub_vfo = '0';
@ -4185,13 +4185,14 @@ int newcat_get_func(RIG *rig, vfo_t vfo, setting_t func, int *status)
} }
ret_data_len = strlen(priv->ret_data); ret_data_len = strlen(priv->ret_data);
last_digit_index = ret_data_len - 1;
/* skip command */ /* skip command */
retfunc = priv->ret_data + strlen(priv->cmd_str) - 1; retfunc = priv->ret_data + strlen(priv->cmd_str) - 1;
/* chop term */ /* chop term */
priv->ret_data[ret_data_len - 1] = '\0'; priv->ret_data[ret_data_len - 1] = '\0';
last_char_index = ret_data_len - 2;
rig_debug(RIG_DEBUG_TRACE, "%s: retfunc='%s'\n", __func__, retfunc); rig_debug(RIG_DEBUG_TRACE, "%s: retfunc='%s'\n", __func__, retfunc);
switch (func) switch (func)
{ {
@ -4217,7 +4218,7 @@ int newcat_get_func(RIG *rig, vfo_t vfo, setting_t func, int *status)
case RIG_FUNC_MON: case RIG_FUNC_MON:
// The number of digits varies by rig, but the last digit indicates the status always // The number of digits varies by rig, but the last digit indicates the status always
*status = (retfunc[last_digit_index] == '0') ? 0 : 1; *status = (retfunc[last_char_index] == '0') ? 0 : 1;
break; break;
case RIG_FUNC_ANF: case RIG_FUNC_ANF:
case RIG_FUNC_FBKIN: case RIG_FUNC_FBKIN: