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

Merge pull request #507 from mikaelnousiainen/fix-yaesu-newcat-retries 

Re-enable Yaesu question mark handling and fix newcat_get_cmd retries in case of question mark response (2nd attempt)
pull/518/head
Michael Black 2021-01-12 16:22:21 -06:00 zatwierdzone przez GitHub
rodzic 2c224a9ca1 c46ac9b474
commit a9a806f8e0
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 4AEE18F83AFDEB23
2 zmienionych plików z 190 dodań i 44 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

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

@ -3252,12 +3252,20 @@ int newcat_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
break;
case RIG_LEVEL_IF:
case RIG_LEVEL_IF: {
pbwidth_t width;
rmode_t mode = 0;
if (!newcat_valid_command(rig, "IS"))
{
return -RIG_ENAVAIL;
}
if (is_ft991 || is_ftdx5000 || is_ftdx101)
{
newcat_get_mode(rig, vfo, &mode, &width);
}
rig_debug(RIG_DEBUG_TRACE, "%s: LEVEL_IF val.i=%d\n", __func__, val.i);
if (abs(val.i) > rig->caps->max_ifshift)
@ -3295,10 +3303,15 @@ int newcat_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
}
// Some Yaesu rigs reject this command in AM/FM modes
// Disabling as it's too general
// Need to be rig/mode specific
//priv->question_mark_response_means_rejected = 1;
if (is_ft991 || is_ftdx5000 || is_ftdx101)
{
if (mode & RIG_MODE_AM || mode & RIG_MODE_FM || mode & RIG_MODE_AMN || mode & RIG_MODE_FMN)
{
priv->question_mark_response_means_rejected = 1;
}
}
break;
}
case RIG_LEVEL_CWPITCH:
{
@ -3345,12 +3358,20 @@ int newcat_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
snprintf(priv->cmd_str, sizeof(priv->cmd_str), "KS%03d%c", val.i, cat_term);
break;
case RIG_LEVEL_MICGAIN:
case RIG_LEVEL_MICGAIN: {
pbwidth_t width;
rmode_t mode = 0;
if (!newcat_valid_command(rig, "MG"))
{
return -RIG_ENAVAIL;
}
if (is_ft991 || is_ftdx5000 || is_ftdx101)
{
newcat_get_mode(rig, vfo, &mode, &width);
}
if (is_ftdx1200 || is_ftdx3000 || is_ft891 || is_ft991 || is_ftdx101
|| is_ftdx10)
{
@ -3364,10 +3385,15 @@ int newcat_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
snprintf(priv->cmd_str, sizeof(priv->cmd_str), "MG%03d%c", fpf, cat_term);
// Some Yaesu rigs reject this command in RTTY modes
// Disabling as it's too general
// Need to be rig/mode specific
//priv->question_mark_response_means_rejected = 1;
if (is_ft991 || is_ftdx5000 || is_ftdx101)
{
if (mode & RIG_MODE_RTTY || mode & RIG_MODE_RTTYR)
{
priv->question_mark_response_means_rejected = 1;
}
}
break;
}
case RIG_LEVEL_METER:
if (!newcat_valid_command(rig, "MS"))
@ -3572,11 +3598,6 @@ int newcat_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
priv->cmd_str[2] = main_sub_vfo;
}
}
// Some Yaesu rigs reject this command in AM/FM modes
// Disabling as it's too general
// Need to be rig/mode specific
//priv->question_mark_response_means_rejected = 1;
break;
case RIG_LEVEL_COMP:
@ -4009,12 +4030,20 @@ int newcat_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
cat_term);
break;
case RIG_LEVEL_IF:
case RIG_LEVEL_IF: {
pbwidth_t width;
rmode_t mode = 0;
if (!newcat_valid_command(rig, "IS"))
{
return -RIG_ENAVAIL;
}
if (is_ft991 || is_ftdx5000 || is_ftdx101)
{
newcat_get_mode(rig, vfo, &mode, &width);
}
snprintf(priv->cmd_str, sizeof(priv->cmd_str), "IS%c%c", main_sub_vfo,
cat_term);
@ -4023,7 +4052,16 @@ int newcat_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
priv->cmd_str[2] = main_sub_vfo;
}
// Some Yaesu rigs reject this command in AM/FM modes
if (is_ft991 || is_ftdx5000 || is_ftdx101)
{
if (mode & RIG_MODE_AM || mode & RIG_MODE_FM || mode & RIG_MODE_AMN || mode & RIG_MODE_FMN)
{
priv->question_mark_response_means_rejected = 1;
}
}
break;
}
case RIG_LEVEL_CWPITCH:
if (!newcat_valid_command(rig, "KP"))
@ -4043,14 +4081,32 @@ int newcat_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
snprintf(priv->cmd_str, sizeof(priv->cmd_str), "KS%c", cat_term);
break;
case RIG_LEVEL_MICGAIN:
case RIG_LEVEL_MICGAIN: {
pbwidth_t width;
rmode_t mode = 0;
if (!newcat_valid_command(rig, "MG"))
{
return -RIG_ENAVAIL;
}
if (is_ft991 || is_ftdx5000 || is_ftdx101)
{
newcat_get_mode(rig, vfo, &mode, &width);
}
snprintf(priv->cmd_str, sizeof(priv->cmd_str), "MG%c", cat_term);
// Some Yaesu rigs reject this command in RTTY modes
if (is_ft991 || is_ftdx5000 || is_ftdx101)
{
if (mode & RIG_MODE_RTTY || mode & RIG_MODE_RTTYR)
{
priv->question_mark_response_means_rejected = 1;
}
}
break;
}
case RIG_LEVEL_METER:
if (!newcat_valid_command(rig, "MS"))
@ -4308,6 +4364,9 @@ int newcat_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
err = newcat_get_cmd(rig);
// Clear flag after executing command
priv->question_mark_response_means_rejected = 0;
if (err != RIG_OK)
{
return err;
@ -4850,12 +4909,20 @@ int newcat_set_func(RIG *rig, vfo_t vfo, setting_t func, int status)
switch (func)
{
case RIG_FUNC_ANF:
case RIG_FUNC_ANF: {
pbwidth_t width;
rmode_t mode = 0;
if (!newcat_valid_command(rig, "BC"))
{
return -RIG_ENAVAIL;
}
if (is_ft991 || is_ftdx5000 || is_ftdx101)
{
err = newcat_get_mode(rig, vfo, &mode, &width);
}
snprintf(priv->cmd_str, sizeof(priv->cmd_str), "BC0%d%c", status ? 1 : 0,
cat_term);
@ -4864,18 +4931,31 @@ int newcat_set_func(RIG *rig, vfo_t vfo, setting_t func, int status)
priv->cmd_str[2] = main_sub_vfo;
}
// Some Yaesu rigs reject this command in AM/FM modes
// Disabling as it's too general
// Need to be rig/mode specific
//priv->question_mark_response_means_rejected = 1;
// Some Yaesu rigs reject this command in FM mode
if (is_ft991 || is_ftdx5000 || is_ftdx101)
{
if (mode & RIG_MODE_FM || mode & RIG_MODE_FMN)
{
priv->question_mark_response_means_rejected = 1;
}
}
break;
}
case RIG_FUNC_MN: {
pbwidth_t width;
rmode_t mode = 0;
case RIG_FUNC_MN:
if (!newcat_valid_command(rig, "BP"))
{
return -RIG_ENAVAIL;
}
if (is_ft991 || is_ftdx5000 || is_ftdx101)
{
newcat_get_mode(rig, vfo, &mode, &width);
}
snprintf(priv->cmd_str, sizeof(priv->cmd_str), "BP00%03d%c", status ? 1 : 0,
cat_term);
@ -4884,11 +4964,16 @@ int newcat_set_func(RIG *rig, vfo_t vfo, setting_t func, int status)
priv->cmd_str[2] = main_sub_vfo;
}
// Some Yaesu rigs reject this command in AM/FM modes
// Disabling as it's too general
// Need to be rig/mode specific
//priv->question_mark_response_means_rejected = 1;
// Some Yaesu rigs reject this command in FM mode
if (is_ft991 || is_ftdx5000 || is_ftdx101)
{
if (mode & RIG_MODE_FM || mode & RIG_MODE_FMN)
{
priv->question_mark_response_means_rejected = 1;
}
}
break;
}
case RIG_FUNC_FBKIN:
if (!newcat_valid_command(rig, "BI"))
@ -4978,12 +5063,20 @@ int newcat_set_func(RIG *rig, vfo_t vfo, setting_t func, int status)
break;
case RIG_FUNC_NR:
case RIG_FUNC_NR: {
pbwidth_t width;
rmode_t mode = 0;
if (!newcat_valid_command(rig, "NR"))
{
return -RIG_ENAVAIL;
}
if (is_ft991 || is_ftdx5000 || is_ftdx101)
{
newcat_get_mode(rig, vfo, &mode, &width);
}
snprintf(priv->cmd_str, sizeof(priv->cmd_str), "NR0%d%c", status ? 1 : 0,
cat_term);
@ -4992,18 +5085,31 @@ int newcat_set_func(RIG *rig, vfo_t vfo, setting_t func, int status)
priv->cmd_str[2] = main_sub_vfo;
}
// Some Yaesu rigs reject this command in AM/FM modes
// Disabling as it's too general
// Need to be rig/mode specific
//priv->question_mark_response_means_rejected = 1;
// Some Yaesu rigs reject this command in FM mode
if (is_ft991 || is_ftdx5000 || is_ftdx101)
{
if (mode & RIG_MODE_FM || mode & RIG_MODE_FMN)
{
priv->question_mark_response_means_rejected = 1;
}
}
break;
}
case RIG_FUNC_COMP: {
pbwidth_t width;
rmode_t mode = 0;
case RIG_FUNC_COMP:
if (!newcat_valid_command(rig, "PR"))
{
return -RIG_ENAVAIL;
}
if (is_ft991 || is_ftdx5000 || is_ftdx101)
{
newcat_get_mode(rig, vfo, &mode, &width);
}
if (is_ft891 || is_ft991 || is_ftdx1200 || is_ftdx3000 || is_ftdx101)
{
// There seems to be an error in the manuals for some of these rigs stating that values should be 1 = OFF and 2 = ON, but they are 0 = OFF and 1 = ON instead
@ -5016,7 +5122,17 @@ int newcat_set_func(RIG *rig, vfo_t vfo, setting_t func, int status)
cat_term);
}
// Some Yaesu rigs reject this command in AM/FM/RTTY modes
if (is_ft991 || is_ftdx5000 || is_ftdx101)
{
if (mode & RIG_MODE_AM || mode & RIG_MODE_FM || mode & RIG_MODE_AMN || mode & RIG_MODE_FMN ||
mode & RIG_MODE_RTTY || mode & RIG_MODE_RTTYR)
{
priv->question_mark_response_means_rejected = 1;
}
}
break;
}
case RIG_FUNC_VOX:
if (!newcat_valid_command(rig, "VX"))
@ -5090,12 +5206,20 @@ int newcat_get_func(RIG *rig, vfo_t vfo, setting_t func, int *status)
switch (func)
{
case RIG_FUNC_ANF:
case RIG_FUNC_ANF: {
pbwidth_t width;
rmode_t mode = 0;
if (!newcat_valid_command(rig, "BC"))
{
return -RIG_ENAVAIL;
}
if (is_ft991 || is_ftdx5000 || is_ftdx101)
{
err = newcat_get_mode(rig, vfo, &mode, &width);
}
snprintf(priv->cmd_str, sizeof(priv->cmd_str), "BC0%c", cat_term);
if (rig->caps->targetable_vfo & RIG_TARGETABLE_MODE)
@ -5103,7 +5227,16 @@ int newcat_get_func(RIG *rig, vfo_t vfo, setting_t func, int *status)
priv->cmd_str[2] = main_sub_vfo;
}
// Some Yaesu rigs reject this command in FM mode
if (is_ft991 || is_ftdx5000 || is_ftdx101)
{
if (mode & RIG_MODE_FM || mode & RIG_MODE_FMN)
{
priv->question_mark_response_means_rejected = 1;
}
}
break;
}
case RIG_FUNC_MN:
if (!newcat_valid_command(rig, "BP"))
@ -5264,7 +5397,12 @@ int newcat_get_func(RIG *rig, vfo_t vfo, setting_t func, int *status)
return -RIG_EINVAL;
}
if (RIG_OK != (err = newcat_get_cmd(rig)))
err = newcat_get_cmd(rig);
// Clear flag after executing command
priv->question_mark_response_means_rejected = 0;
if (err != RIG_OK)
{
return err;
}
@ -9088,19 +9226,17 @@ int newcat_get_cmd(RIG *rig)
rc = RIG_OK; /* received something */
/* Check that command termination is correct - alternative is
response is longer that the buffer */
response is longer than the buffer */
if (cat_term != priv->ret_data[strlen(priv->ret_data) - 1])
{
rig_debug(RIG_DEBUG_ERR, "%s: Command is not correctly terminated '%s'\n",
__func__, priv->ret_data);
// we were using BUSBUSY but microham devices need retries
//rc = -RIG_BUSBUSY; /* don't write command again */
// rc = -RIG_EPROTO;
rc = -RIG_EPROTO; /* retry */
/* we could decrement retry_count
here but there is a danger of
infinite looping so we just use up
a retry for safety's sake */
continue; /* retry */
continue;
}
/* check for error codes */
@ -9151,9 +9287,18 @@ int newcat_get_cmd(RIG *rig)
* Followup 20201213 FTDX3000 FB; command returning ?; so do NOT abort
* see https://github.com/Hamlib/Hamlib/issues/464
*/
rig_debug(RIG_DEBUG_ERR, "%s: Command rejected by the rig#1: '%s'\n", __func__,
if (priv->question_mark_response_means_rejected)
{
rig_debug(RIG_DEBUG_ERR, "%s: Command rejected by the rig (get): '%s'\n", __func__,
priv->cmd_str);
// return -RIG_ERJCTED;
return -RIG_ERJCTED;
}
rig_debug(RIG_DEBUG_WARN, "%s: Rig busy - retrying: '%s'\n", __func__,
priv->cmd_str);
rc = -RIG_ERJCTED; /* retry */
break;
}
continue;
@ -9295,13 +9440,14 @@ int newcat_set_cmd(RIG *rig)
*/
if (priv->question_mark_response_means_rejected)
{
rig_debug(RIG_DEBUG_ERR, "%s: Command rejected by the rig#2: '%s'\n", __func__,
rig_debug(RIG_DEBUG_ERR, "%s: Command rejected by the rig (set): '%s'\n", __func__,
priv->cmd_str);
return -RIG_ERJCTED;
}
/* Rig busy wait please */
rig_debug(RIG_DEBUG_WARN, "%s: Rig busy - retrying\n", __func__);
rig_debug(RIG_DEBUG_WARN, "%s: Rig busy - retrying: '%s'\n", __func__,
priv->cmd_str);
/* read the verify command reply */
if ((rc = read_string(&state->rigport, priv->ret_data, sizeof(priv->ret_data),

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

@ -50,7 +50,7 @@
typedef char ncboolean;
/* shared function version */
#define NEWCAT_VER "20210111"
#define NEWCAT_VER "20210112"
/* Hopefully large enough for future use, 128 chars plus '\0' */
#define NEWCAT_DATA_LEN 129