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

Fix FTDX101MP detection and renamae ft101 to ft101d

pull/608/head
Michael Black W9MDB 2021-03-07 14:23:09 -06:00
rodzic 8296ca7ecd
commit b4dd01f6f3
1 zmienionych plików z 59 dodań i 62 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

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

@ -90,7 +90,7 @@ typedef struct _yaesu_newcat_commands
ncboolean ft5000; ncboolean ft5000;
ncboolean ft1200; ncboolean ft1200;
ncboolean ft3000; ncboolean ft3000;
ncboolean ft101; ncboolean ft101d;
ncboolean ft10; ncboolean ft10;
ncboolean ft101mp; ncboolean ft101mp;
} yaesu_newcat_commands_t; } yaesu_newcat_commands_t;
@ -210,7 +210,7 @@ static ncboolean is_ftdx9000;
static ncboolean is_ftdx5000; static ncboolean is_ftdx5000;
static ncboolean is_ftdx1200; static ncboolean is_ftdx1200;
static ncboolean is_ftdx3000; static ncboolean is_ftdx3000;
static ncboolean is_ftdx101; static ncboolean is_ftdx101d;
static ncboolean is_ftdx101mp; static ncboolean is_ftdx101mp;
static ncboolean is_ftdx10; static ncboolean is_ftdx10;
@ -785,7 +785,7 @@ int newcat_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
// some rigs like FTDX101D cannot change non-TX vfo freq // some rigs like FTDX101D cannot change non-TX vfo freq
// but they can change the TX vfo // but they can change the TX vfo
if ((is_ftdx101 || is_ftdx101mp) && rig->state.cache.ptt == RIG_PTT_ON) if ((is_ftdx101d || is_ftdx101mp) && rig->state.cache.ptt == RIG_PTT_ON)
{ {
rig_debug(RIG_DEBUG_TRACE, "%s: ftdx101 check vfo OK, vfo=%s, tx_vfo=%s\n", rig_debug(RIG_DEBUG_TRACE, "%s: ftdx101 check vfo OK, vfo=%s, tx_vfo=%s\n",
__func__, rig_strvfo(vfo), rig_strvfo(rig->state.tx_vfo)); __func__, rig_strvfo(vfo), rig_strvfo(rig->state.tx_vfo));
@ -1955,7 +1955,7 @@ int newcat_set_rptr_offs(RIG *rig, vfo_t vfo, shortfreq_t offs)
snprintf(priv->cmd_str, sizeof(priv->cmd_str), "%s%04li%c", command, offs, snprintf(priv->cmd_str, sizeof(priv->cmd_str), "%s%04li%c", command, offs,
cat_term); cat_term);
} }
else if (is_ftdx101 || is_ftdx101mp || is_ftdx10) else if (is_ftdx101d || is_ftdx101mp || is_ftdx10)
{ {
if (freq >= 28000000 && freq <= 29700000) if (freq >= 28000000 && freq <= 29700000)
{ {
@ -2163,7 +2163,7 @@ int newcat_get_rptr_offs(RIG *rig, vfo_t vfo, shortfreq_t *offs)
// Step size is 1 kHz // Step size is 1 kHz
step = 1000; step = 1000;
} }
else if (is_ftdx101 || is_ftdx101mp || is_ftdx10) else if (is_ftdx101d || is_ftdx101mp || is_ftdx10)
{ {
if (freq >= 28000000 && freq <= 29700000) if (freq >= 28000000 && freq <= 29700000)
{ {
@ -2269,7 +2269,7 @@ int newcat_set_split_vfo(RIG *rig, vfo_t vfo, split_t split, vfo_t tx_vfo)
vfo = RIG_VFO_A; vfo = RIG_VFO_A;
tx_vfo = RIG_SPLIT_ON == split ? RIG_VFO_B : RIG_VFO_A; tx_vfo = RIG_SPLIT_ON == split ? RIG_VFO_B : RIG_VFO_A;
} }
else if (is_ftdx101 || is_ftdx101mp) else if (is_ftdx101d || is_ftdx101mp)
{ {
vfo = RIG_VFO_MAIN; vfo = RIG_VFO_MAIN;
tx_vfo = RIG_SPLIT_ON == split ? RIG_VFO_SUB : RIG_VFO_MAIN; tx_vfo = RIG_SPLIT_ON == split ? RIG_VFO_SUB : RIG_VFO_MAIN;
@ -2796,7 +2796,7 @@ int newcat_set_ctcss_tone(RIG *rig, vfo_t vfo, tone_t tone)
} }
else else
{ {
if (is_ft891 || is_ft991 || is_ftdx101 || is_ftdx101mp || is_ftdx10) if (is_ft891 || is_ft991 || is_ftdx101d || is_ftdx101mp || is_ftdx10)
{ {
snprintf(priv->cmd_str, sizeof(priv->cmd_str), "CN%c0%03d%cCT%c2%c", snprintf(priv->cmd_str, sizeof(priv->cmd_str), "CN%c0%03d%cCT%c2%c",
main_sub_vfo, i, cat_term, main_sub_vfo, cat_term); main_sub_vfo, i, cat_term, main_sub_vfo, cat_term);
@ -2841,7 +2841,7 @@ int newcat_get_ctcss_tone(RIG *rig, vfo_t vfo, tone_t *tone)
main_sub_vfo = (RIG_VFO_B == vfo || RIG_VFO_SUB == vfo) ? '1' : '0'; main_sub_vfo = (RIG_VFO_B == vfo || RIG_VFO_SUB == vfo) ? '1' : '0';
} }
if (is_ft891 || is_ft991 || is_ftdx101 || is_ftdx101mp || is_ftdx10) if (is_ft891 || is_ft991 || is_ftdx101d || is_ftdx101mp || is_ftdx10)
{ {
snprintf(priv->cmd_str, sizeof(priv->cmd_str), "%s%c0%c", cmd, main_sub_vfo, snprintf(priv->cmd_str, sizeof(priv->cmd_str), "%s%c0%c", cmd, main_sub_vfo,
cat_term); cat_term);
@ -3454,7 +3454,7 @@ int newcat_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
} }
if (is_ft950 || is_ftdx1200 || is_ftdx3000 || is_ft891 || is_ft991 if (is_ft950 || is_ftdx1200 || is_ftdx3000 || is_ft891 || is_ft991
|| is_ftdx101 || is_ftdx101mp || is_ftdx10) || is_ftdx101d || is_ftdx101mp || is_ftdx10)
{ {
scale = 100.; scale = 100.;
} }
@ -3469,7 +3469,7 @@ int newcat_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
fpf = newcat_scale_float(scale, val.f); fpf = newcat_scale_float(scale, val.f);
if (is_ft950 || is_ft891 || is_ft991 || is_ftdx3000 || is_ftdx101 || is_ftdx101mp || is_ftdx10) if (is_ft950 || is_ft891 || is_ft991 || is_ftdx3000 || is_ftdx101d || is_ftdx101mp || is_ftdx10)
{ {
// Minimum is 5 watts on these rigs // Minimum is 5 watts on these rigs
if (fpf < 5) if (fpf < 5)
@ -3543,7 +3543,7 @@ int newcat_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
RETURNFUNC(-RIG_ENAVAIL); RETURNFUNC(-RIG_ENAVAIL);
} }
if (is_ft991 || is_ftdx5000 || is_ftdx101 || is_ftdx101mp) if (is_ft991 || is_ftdx5000 || is_ftdx101d || is_ftdx101mp)
{ {
newcat_get_mode(rig, vfo, &mode, &width); newcat_get_mode(rig, vfo, &mode, &width);
} }
@ -3562,7 +3562,7 @@ int newcat_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
} }
} }
if (is_ftdx101 || is_ftdx101mp || is_ftdx10) if (is_ftdx101d || is_ftdx101mp || is_ftdx10)
{ {
snprintf(priv->cmd_str, sizeof(priv->cmd_str), "IS%c0%+.4d%c", main_sub_vfo, snprintf(priv->cmd_str, sizeof(priv->cmd_str), "IS%c0%+.4d%c", main_sub_vfo,
val.i, cat_term); val.i, cat_term);
@ -3585,7 +3585,7 @@ 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 // Some Yaesu rigs reject this command in AM/FM modes
if (is_ft991 || is_ftdx5000 || is_ftdx101 || is_ftdx101mp) if (is_ft991 || is_ftdx5000 || is_ftdx101d || is_ftdx101mp)
{ {
if (mode & RIG_MODE_AM || mode & RIG_MODE_FM || mode & RIG_MODE_AMN if (mode & RIG_MODE_AM || mode & RIG_MODE_FM || mode & RIG_MODE_AMN
|| mode & RIG_MODE_FMN) || mode & RIG_MODE_FMN)
@ -3652,14 +3652,14 @@ int newcat_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
RETURNFUNC(-RIG_ENAVAIL); RETURNFUNC(-RIG_ENAVAIL);
} }
if (is_ft991 || is_ftdx5000 || is_ftdx101 || is_ftdx101mp) if (is_ft991 || is_ftdx5000 || is_ftdx101d || is_ftdx101mp)
{ {
newcat_get_mode(rig, vfo, &mode, &width); newcat_get_mode(rig, vfo, &mode, &width);
} }
if (val.f > 1.0) { RETURNFUNC(-RIG_EINVAL); } if (val.f > 1.0) { RETURNFUNC(-RIG_EINVAL); }
if (is_ftdx1200 || is_ftdx3000 || is_ft891 || is_ft991 || is_ftdx101 || is_ftdx101mp if (is_ftdx1200 || is_ftdx3000 || is_ft891 || is_ft991 || is_ftdx101d || is_ftdx101mp
|| is_ftdx10) || is_ftdx10)
{ {
fpf = newcat_scale_float(100, val.f); fpf = newcat_scale_float(100, val.f);
@ -3672,7 +3672,7 @@ 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); snprintf(priv->cmd_str, sizeof(priv->cmd_str), "MG%03d%c", fpf, cat_term);
// Some Yaesu rigs reject this command in RTTY modes // Some Yaesu rigs reject this command in RTTY modes
if (is_ft991 || is_ftdx5000 || is_ftdx101 || is_ftdx101mp) if (is_ft991 || is_ftdx5000 || is_ftdx101d || is_ftdx101mp)
{ {
if (mode & RIG_MODE_RTTY || mode & RIG_MODE_RTTYR) if (mode & RIG_MODE_RTTY || mode & RIG_MODE_RTTYR)
{ {
@ -3689,7 +3689,7 @@ int newcat_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
RETURNFUNC(-RIG_ENAVAIL); RETURNFUNC(-RIG_ENAVAIL);
} }
if (is_ftdx101 || is_ftdx101mp) // new format for the command with VFO selection if (is_ftdx101d || is_ftdx101mp) // new format for the command with VFO selection
{ {
format = "MS0%d;"; format = "MS0%d;";
@ -3928,7 +3928,7 @@ int newcat_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
millis = dot10ths_to_millis(val.i, keyspd.i); millis = dot10ths_to_millis(val.i, keyspd.i);
if (is_ftdx101 || is_ftdx101mp || is_ftdx10) if (is_ftdx101d || is_ftdx101mp || is_ftdx10)
{ {
if (millis <= 30) { snprintf(priv->cmd_str, sizeof(priv->cmd_str), "SD00;"); } if (millis <= 30) { snprintf(priv->cmd_str, sizeof(priv->cmd_str), "SD00;"); }
else if (millis <= 50) { snprintf(priv->cmd_str, sizeof(priv->cmd_str), "SD01;"); } else if (millis <= 50) { snprintf(priv->cmd_str, sizeof(priv->cmd_str), "SD01;"); }
@ -4011,7 +4011,7 @@ int newcat_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
RETURNFUNC(-RIG_ENAVAIL); RETURNFUNC(-RIG_ENAVAIL);
} }
if (is_ft891 || is_ft991 || is_ftdx101 || is_ftdx101mp || is_ftdx10) if (is_ft891 || is_ft991 || is_ftdx101d || is_ftdx101mp || is_ftdx10)
{ {
scale = 100; scale = 100;
} }
@ -4049,7 +4049,7 @@ int newcat_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
snprintf(priv->cmd_str, sizeof(priv->cmd_str), "VD%04d%c", val.i, cat_term); snprintf(priv->cmd_str, sizeof(priv->cmd_str), "VD%04d%c", val.i, cat_term);
} }
else if (is_ftdx101 || is_ftdx101mp || is_ftdx10) // new lookup table argument else if (is_ftdx101d || is_ftdx101mp || is_ftdx10) // new lookup table argument
{ {
rig_debug(RIG_DEBUG_TRACE, "%s: ft101 #1 val.i=%d\n", __func__, val.i); rig_debug(RIG_DEBUG_TRACE, "%s: ft101 #1 val.i=%d\n", __func__, val.i);
@ -4105,7 +4105,7 @@ int newcat_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
break; break;
case RIG_LEVEL_ANTIVOX: case RIG_LEVEL_ANTIVOX:
if (is_ftdx101 || is_ftdx101mp || is_ftdx10) if (is_ftdx101d || is_ftdx101mp || is_ftdx10)
{ {
fpf = newcat_scale_float(100, val.f); fpf = newcat_scale_float(100, val.f);
snprintf(priv->cmd_str, sizeof(priv->cmd_str), "AV%03d%c", fpf, cat_term); snprintf(priv->cmd_str, sizeof(priv->cmd_str), "AV%03d%c", fpf, cat_term);
@ -4170,7 +4170,7 @@ int newcat_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
} }
} }
if (is_ft891 || is_ft991 || is_ftdx101 || is_ftdx101mp || is_ftdx10) if (is_ft891 || is_ft991 || is_ftdx101d || is_ftdx101mp || is_ftdx10)
{ {
if (val.i > 320) if (val.i > 320)
{ {
@ -4214,7 +4214,7 @@ int newcat_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
if (val.f > 1.0) { RETURNFUNC(-RIG_EINVAL); } if (val.f > 1.0) { RETURNFUNC(-RIG_EINVAL); }
if (is_ftdx1200 || is_ftdx3000 || is_ft891 || is_ft991 || is_ftdx101 || is_ftdx101mp if (is_ftdx1200 || is_ftdx3000 || is_ft891 || is_ft991 || is_ftdx101d || is_ftdx101mp
|| is_ftdx10) || is_ftdx10)
{ {
fpf = newcat_scale_float(100, val.f); fpf = newcat_scale_float(100, val.f);
@ -4331,7 +4331,7 @@ int newcat_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
RETURNFUNC(-RIG_ENAVAIL); RETURNFUNC(-RIG_ENAVAIL);
} }
if (is_ft991 || is_ftdx5000 || is_ftdx101 || is_ftdx101mp) if (is_ft991 || is_ftdx5000 || is_ftdx101d || is_ftdx101mp)
{ {
newcat_get_mode(rig, vfo, &mode, &width); newcat_get_mode(rig, vfo, &mode, &width);
} }
@ -4345,7 +4345,7 @@ int newcat_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
} }
// Some Yaesu rigs reject this command in AM/FM modes // Some Yaesu rigs reject this command in AM/FM modes
if (is_ft991 || is_ftdx5000 || is_ftdx101 || is_ftdx101mp) if (is_ft991 || is_ftdx5000 || is_ftdx101d || is_ftdx101mp)
{ {
if (mode & RIG_MODE_AM || mode & RIG_MODE_FM || mode & RIG_MODE_AMN if (mode & RIG_MODE_AM || mode & RIG_MODE_FM || mode & RIG_MODE_AMN
|| mode & RIG_MODE_FMN) || mode & RIG_MODE_FMN)
@ -4385,7 +4385,7 @@ int newcat_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
RETURNFUNC(-RIG_ENAVAIL); RETURNFUNC(-RIG_ENAVAIL);
} }
if (is_ft991 || is_ftdx5000 || is_ftdx101 || is_ftdx101mp) if (is_ft991 || is_ftdx5000 || is_ftdx101d || is_ftdx101mp)
{ {
newcat_get_mode(rig, vfo, &mode, &width); newcat_get_mode(rig, vfo, &mode, &width);
} }
@ -4393,7 +4393,7 @@ int newcat_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
snprintf(priv->cmd_str, sizeof(priv->cmd_str), "MG%c", cat_term); snprintf(priv->cmd_str, sizeof(priv->cmd_str), "MG%c", cat_term);
// Some Yaesu rigs reject this command in RTTY modes // Some Yaesu rigs reject this command in RTTY modes
if (is_ft991 || is_ftdx5000 || is_ftdx101 || is_ftdx101mp) if (is_ft991 || is_ftdx5000 || is_ftdx101d || is_ftdx101mp)
{ {
if (mode & RIG_MODE_RTTY || mode & RIG_MODE_RTTYR) if (mode & RIG_MODE_RTTY || mode & RIG_MODE_RTTYR)
{ {
@ -4545,7 +4545,7 @@ int newcat_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
snprintf(priv->cmd_str, sizeof(priv->cmd_str), "RM08%c", cat_term); snprintf(priv->cmd_str, sizeof(priv->cmd_str), "RM08%c", cat_term);
} }
if (is_ftdx101 || is_ftdx101mp) if (is_ftdx101d || is_ftdx101mp)
{ {
// separate meters for Main and Sub // separate meters for Main and Sub
snprintf(priv->cmd_str, sizeof(priv->cmd_str), "RM0%c", cat_term); snprintf(priv->cmd_str, sizeof(priv->cmd_str), "RM0%c", cat_term);
@ -4585,7 +4585,7 @@ int newcat_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
break; break;
case RIG_LEVEL_ANTIVOX: case RIG_LEVEL_ANTIVOX:
if (is_ftdx101 || is_ftdx101mp || is_ftdx10) if (is_ftdx101d || is_ftdx101mp || is_ftdx10)
{ {
snprintf(priv->cmd_str, sizeof(priv->cmd_str), "AV%c", cat_term); snprintf(priv->cmd_str, sizeof(priv->cmd_str), "AV%c", cat_term);
} }
@ -4687,7 +4687,7 @@ int newcat_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
{ {
case RIG_LEVEL_RFPOWER: case RIG_LEVEL_RFPOWER:
if (is_ft950 || is_ftdx1200 || is_ftdx3000 || is_ft891 || is_ft991 if (is_ft950 || is_ftdx1200 || is_ftdx3000 || is_ft891 || is_ft991
|| is_ftdx101 || is_ftdx101mp || is_ftdx10) || is_ftdx101d || is_ftdx101mp || is_ftdx10)
{ {
scale = 100.; scale = 100.;
} }
@ -4857,7 +4857,7 @@ int newcat_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
break; break;
case RIG_LEVEL_MICGAIN: case RIG_LEVEL_MICGAIN:
if (is_ftdx1200 || is_ftdx3000 || is_ft891 || is_ft991 || is_ftdx101 || is_ftdx101mp if (is_ftdx1200 || is_ftdx3000 || is_ft891 || is_ft991 || is_ftdx101d || is_ftdx101mp
|| is_ftdx10) || is_ftdx10)
{ {
scale = 100.; scale = 100.;
@ -4888,7 +4888,7 @@ int newcat_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
break; break;
case RIG_LEVEL_SQL: case RIG_LEVEL_SQL:
if (is_ft891 || is_ft991 || is_ftdx101 || is_ftdx101mp || is_ftdx10) if (is_ft891 || is_ft991 || is_ftdx101d || is_ftdx101mp || is_ftdx10)
{ {
scale = 100.; scale = 100.;
} }
@ -4906,7 +4906,7 @@ int newcat_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
int millis; int millis;
value_t keyspd; value_t keyspd;
if (is_ftdx101 || is_ftdx101mp || is_ftdx10) if (is_ftdx101d || is_ftdx101mp || is_ftdx10)
{ {
switch (raw_value) switch (raw_value)
{ {
@ -4954,7 +4954,7 @@ int newcat_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
} }
if (is_ftdx1200 || is_ftdx3000 || is_ftdx5000 || is_ft891 || is_ft991 if (is_ftdx1200 || is_ftdx3000 || is_ftdx5000 || is_ft891 || is_ft991
|| is_ftdx101 || is_ftdx101mp || is_ftdx10) || is_ftdx101d || is_ftdx101mp || is_ftdx10)
{ {
val->i = round(rig_raw2val(atoi(retlvl), &yaesu_default_str_cal)); val->i = round(rig_raw2val(atoi(retlvl), &yaesu_default_str_cal));
} }
@ -5016,7 +5016,7 @@ int newcat_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
case RIG_LEVEL_VOXDELAY: case RIG_LEVEL_VOXDELAY:
val->i = atoi(retlvl); val->i = atoi(retlvl);
if (is_ftdx101 || is_ftdx101mp) if (is_ftdx101d || is_ftdx101mp)
{ {
switch (val->i) switch (val->i)
{ {
@ -5169,7 +5169,7 @@ int newcat_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
break; break;
case RIG_LEVEL_MONITOR_GAIN: case RIG_LEVEL_MONITOR_GAIN:
if (is_ftdx1200 || is_ftdx3000 || is_ft891 || is_ft991 || is_ftdx101 || is_ftdx101mp) if (is_ftdx1200 || is_ftdx3000 || is_ft891 || is_ft991 || is_ftdx101d || is_ftdx101mp)
{ {
scale = 100.; scale = 100.;
} }
@ -5222,7 +5222,7 @@ int newcat_set_func(RIG *rig, vfo_t vfo, setting_t func, int status)
RETURNFUNC(-RIG_ENAVAIL); RETURNFUNC(-RIG_ENAVAIL);
} }
if (is_ft991 || is_ftdx5000 || is_ftdx101 || is_ftdx101mp) if (is_ft991 || is_ftdx5000 || is_ftdx101d || is_ftdx101mp)
{ {
err = newcat_get_mode(rig, vfo, &mode, &width); err = newcat_get_mode(rig, vfo, &mode, &width);
} }
@ -5236,7 +5236,7 @@ int newcat_set_func(RIG *rig, vfo_t vfo, setting_t func, int status)
} }
// Some Yaesu rigs reject this command in FM mode // Some Yaesu rigs reject this command in FM mode
if (is_ft991 || is_ftdx5000 || is_ftdx101 || is_ftdx101mp) if (is_ft991 || is_ftdx5000 || is_ftdx101d || is_ftdx101mp)
{ {
if (mode & RIG_MODE_FM || mode & RIG_MODE_FMN) if (mode & RIG_MODE_FM || mode & RIG_MODE_FMN)
{ {
@ -5257,7 +5257,7 @@ int newcat_set_func(RIG *rig, vfo_t vfo, setting_t func, int status)
RETURNFUNC(-RIG_ENAVAIL); RETURNFUNC(-RIG_ENAVAIL);
} }
if (is_ft991 || is_ftdx5000 || is_ftdx101 || is_ftdx101mp) if (is_ft991 || is_ftdx5000 || is_ftdx101d || is_ftdx101mp)
{ {
newcat_get_mode(rig, vfo, &mode, &width); newcat_get_mode(rig, vfo, &mode, &width);
} }
@ -5271,7 +5271,7 @@ int newcat_set_func(RIG *rig, vfo_t vfo, setting_t func, int status)
} }
// Some Yaesu rigs reject this command in FM mode // Some Yaesu rigs reject this command in FM mode
if (is_ft991 || is_ftdx5000 || is_ftdx101 || is_ftdx101mp) if (is_ft991 || is_ftdx5000 || is_ftdx101d || is_ftdx101mp)
{ {
if (mode & RIG_MODE_FM || mode & RIG_MODE_FMN) if (mode & RIG_MODE_FM || mode & RIG_MODE_FMN)
{ {
@ -5330,7 +5330,7 @@ int newcat_set_func(RIG *rig, vfo_t vfo, setting_t func, int status)
RETURNFUNC(-RIG_ENAVAIL); RETURNFUNC(-RIG_ENAVAIL);
} }
if (is_ftdx1200 || is_ftdx3000 || is_ftdx5000 || is_ftdx101 || is_ftdx101mp) if (is_ftdx1200 || is_ftdx3000 || is_ftdx5000 || is_ftdx101d || is_ftdx101mp)
{ {
// These rigs can lock Main/Sub VFO dials individually // These rigs can lock Main/Sub VFO dials individually
snprintf(priv->cmd_str, sizeof(priv->cmd_str), "LK%d%c", status ? 7 : 4, snprintf(priv->cmd_str, sizeof(priv->cmd_str), "LK%d%c", status ? 7 : 4,
@ -5380,7 +5380,7 @@ int newcat_set_func(RIG *rig, vfo_t vfo, setting_t func, int status)
RETURNFUNC(-RIG_ENAVAIL); RETURNFUNC(-RIG_ENAVAIL);
} }
if (is_ft991 || is_ftdx5000 || is_ftdx101 || is_ftdx101mp) if (is_ft991 || is_ftdx5000 || is_ftdx101d || is_ftdx101mp)
{ {
newcat_get_mode(rig, vfo, &mode, &width); newcat_get_mode(rig, vfo, &mode, &width);
} }
@ -5394,7 +5394,7 @@ int newcat_set_func(RIG *rig, vfo_t vfo, setting_t func, int status)
} }
// Some Yaesu rigs reject this command in FM mode // Some Yaesu rigs reject this command in FM mode
if (is_ft991 || is_ftdx5000 || is_ftdx101 || is_ftdx101mp) if (is_ft991 || is_ftdx5000 || is_ftdx101d || is_ftdx101mp)
{ {
if (mode & RIG_MODE_FM || mode & RIG_MODE_FMN) if (mode & RIG_MODE_FM || mode & RIG_MODE_FMN)
{ {
@ -5415,12 +5415,12 @@ int newcat_set_func(RIG *rig, vfo_t vfo, setting_t func, int status)
RETURNFUNC(-RIG_ENAVAIL); RETURNFUNC(-RIG_ENAVAIL);
} }
if (is_ft991 || is_ftdx5000 || is_ftdx101 || is_ftdx101mp) if (is_ft991 || is_ftdx5000 || is_ftdx101d || is_ftdx101mp)
{ {
newcat_get_mode(rig, vfo, &mode, &width); newcat_get_mode(rig, vfo, &mode, &width);
} }
if (is_ft891 || is_ft991 || is_ftdx1200 || is_ftdx3000 || is_ftdx101 || is_ftdx101mp) if (is_ft891 || is_ft991 || is_ftdx1200 || is_ftdx3000 || is_ftdx101d || is_ftdx101mp)
{ {
// 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 // 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
snprintf(priv->cmd_str, sizeof(priv->cmd_str), "PR0%d%c", status ? 1 : 0, snprintf(priv->cmd_str, sizeof(priv->cmd_str), "PR0%d%c", status ? 1 : 0,
@ -5433,7 +5433,7 @@ int newcat_set_func(RIG *rig, vfo_t vfo, setting_t func, int status)
} }
// Some Yaesu rigs reject this command in AM/FM/RTTY modes // Some Yaesu rigs reject this command in AM/FM/RTTY modes
if (is_ft991 || is_ftdx5000 || is_ftdx101 || is_ftdx101mp) if (is_ft991 || is_ftdx5000 || is_ftdx101d || is_ftdx101mp)
{ {
if (mode & RIG_MODE_AM || mode & RIG_MODE_FM || mode & RIG_MODE_AMN if (mode & RIG_MODE_AM || mode & RIG_MODE_FM || mode & RIG_MODE_AMN
|| mode & RIG_MODE_FMN || || mode & RIG_MODE_FMN ||
@ -5528,7 +5528,7 @@ int newcat_get_func(RIG *rig, vfo_t vfo, setting_t func, int *status)
RETURNFUNC(-RIG_ENAVAIL); RETURNFUNC(-RIG_ENAVAIL);
} }
if (is_ft991 || is_ftdx5000 || is_ftdx101 || is_ftdx101mp) if (is_ft991 || is_ftdx5000 || is_ftdx101d || is_ftdx101mp)
{ {
err = newcat_get_mode(rig, vfo, &mode, &width); err = newcat_get_mode(rig, vfo, &mode, &width);
} }
@ -5541,7 +5541,7 @@ int newcat_get_func(RIG *rig, vfo_t vfo, setting_t func, int *status)
} }
// Some Yaesu rigs reject this command in FM mode // Some Yaesu rigs reject this command in FM mode
if (is_ft991 || is_ftdx5000 || is_ftdx101 || is_ftdx101mp) if (is_ft991 || is_ftdx5000 || is_ftdx101d || is_ftdx101mp)
{ {
if (mode & RIG_MODE_FM || mode & RIG_MODE_FMN) if (mode & RIG_MODE_FM || mode & RIG_MODE_FMN)
{ {
@ -5660,7 +5660,7 @@ int newcat_get_func(RIG *rig, vfo_t vfo, setting_t func, int *status)
RETURNFUNC(-RIG_ENAVAIL); RETURNFUNC(-RIG_ENAVAIL);
} }
if (is_ftdx1200 || is_ftdx3000 || is_ft891 || is_ft991 || is_ftdx101 || is_ftdx101mp) if (is_ftdx1200 || is_ftdx3000 || is_ft891 || is_ft991 || is_ftdx101d || is_ftdx101mp)
{ {
snprintf(priv->cmd_str, sizeof(priv->cmd_str), "PR0%c", cat_term); snprintf(priv->cmd_str, sizeof(priv->cmd_str), "PR0%c", cat_term);
} }
@ -5748,7 +5748,7 @@ int newcat_get_func(RIG *rig, vfo_t vfo, setting_t func, int *status)
break; break;
case RIG_FUNC_LOCK: case RIG_FUNC_LOCK:
if (is_ftdx1200 || is_ftdx3000 || is_ftdx5000 || is_ftdx101 || is_ftdx101mp) if (is_ftdx1200 || is_ftdx3000 || is_ftdx5000 || is_ftdx101d || is_ftdx101mp)
{ {
// These rigs can lock Main/Sub VFO dials individually // These rigs can lock Main/Sub VFO dials individually
*status = (retfunc[0] == '0' || retfunc[0] == '4') ? 0 : 1; *status = (retfunc[0] == '0' || retfunc[0] == '4') ? 0 : 1;
@ -6589,7 +6589,6 @@ ncboolean newcat_valid_command(RIG *rig, char const *const command)
const struct rig_caps *caps; const struct rig_caps *caps;
int search_high; int search_high;
int search_low; int search_low;
struct newcat_priv_data *priv = (struct newcat_priv_data *)rig->state.priv;
//ENTERFUNC; //ENTERFUNC;
rig_debug(RIG_DEBUG_TRACE, "%s %s\n", __func__, command); rig_debug(RIG_DEBUG_TRACE, "%s %s\n", __func__, command);
@ -6617,14 +6616,12 @@ ncboolean newcat_valid_command(RIG *rig, char const *const command)
is_ftdx5000 = newcat_is_rig(rig, RIG_MODEL_FTDX5000); is_ftdx5000 = newcat_is_rig(rig, RIG_MODEL_FTDX5000);
is_ftdx1200 = newcat_is_rig(rig, RIG_MODEL_FTDX1200); is_ftdx1200 = newcat_is_rig(rig, RIG_MODEL_FTDX1200);
is_ftdx3000 = newcat_is_rig(rig, RIG_MODEL_FTDX3000); is_ftdx3000 = newcat_is_rig(rig, RIG_MODEL_FTDX3000);
is_ftdx101 = newcat_is_rig(rig, RIG_MODEL_FTDX101D) is_ftdx101d = newcat_is_rig(rig, RIG_MODEL_FTDX101D);
&& priv->rig_id == NC_RIGID_FTDX101D; is_ftdx101mp = newcat_is_rig(rig, RIG_MODEL_FTDX101MP);
is_ftdx101mp = newcat_is_rig(rig, RIG_MODEL_FTDX101D)
&& priv->rig_id == NC_RIGID_FTDX101MP;
is_ftdx10 = newcat_is_rig(rig, RIG_MODEL_FTDX10); is_ftdx10 = newcat_is_rig(rig, RIG_MODEL_FTDX10);
if (!is_ft450 && !is_ft950 && !is_ft891 && !is_ft991 && !is_ft2000 if (!is_ft450 && !is_ft950 && !is_ft891 && !is_ft991 && !is_ft2000
&& !is_ftdx5000 && !is_ftdx9000 && !is_ftdx1200 && !is_ftdx3000 && !is_ftdx101 && !is_ftdx101mp && !is_ftdx10) && !is_ftdx5000 && !is_ftdx9000 && !is_ftdx1200 && !is_ftdx3000 && !is_ftdx101d && !is_ftdx101mp && !is_ftdx10)
{ {
rig_debug(RIG_DEBUG_ERR, "%s: '%s' is unknown\n", __func__, caps->model_name); rig_debug(RIG_DEBUG_ERR, "%s: '%s' is unknown\n", __func__, caps->model_name);
RETURNFUNC(FALSE); RETURNFUNC(FALSE);
@ -6695,7 +6692,7 @@ ncboolean newcat_valid_command(RIG *rig, char const *const command)
{ {
RETURNFUNC(TRUE); RETURNFUNC(TRUE);
} }
else if (is_ftdx101 && valid_commands[search_index].ft101) else if (is_ftdx101d && valid_commands[search_index].ft101d)
{ {
RETURNFUNC(TRUE); RETURNFUNC(TRUE);
} }
@ -6803,7 +6800,7 @@ int newcat_set_tx_vfo(RIG *rig, vfo_t tx_vfo)
p1 = p1 + 2; /* use non-Toggle commands */ p1 = p1 + 2; /* use non-Toggle commands */
} }
if (is_ftdx101 || is_ftdx101mp) if (is_ftdx101d || is_ftdx101mp)
{ {
// what other Yaeus rigs should be using this? // what other Yaeus rigs should be using this?
// The DX101D returns FT0 when in split and not transmitting // The DX101D returns FT0 when in split and not transmitting
@ -6834,7 +6831,7 @@ int newcat_get_tx_vfo(RIG *rig, vfo_t *tx_vfo)
ENTERFUNC; ENTERFUNC;
if (is_ftdx101 || is_ftdx101mp) if (is_ftdx101d || is_ftdx101mp)
{ {
// what other Yaeus rigs should be using this? // what other Yaeus rigs should be using this?
// The DX101D returns FT0 when in split and not transmitting // The DX101D returns FT0 when in split and not transmitting
@ -7690,7 +7687,7 @@ int newcat_set_rx_bandwidth(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
RETURNFUNC(err); RETURNFUNC(err);
} }
} // end is_ftdx5000 } // end is_ftdx5000
else if (is_ftdx101 || is_ftdx101mp || is_ftdx10) else if (is_ftdx101d || is_ftdx101mp || is_ftdx10)
{ {
switch (mode) switch (mode)
{ {
@ -7932,7 +7929,7 @@ int newcat_set_rx_bandwidth(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
} /* end else */ } /* end else */
if (is_ftdx101 || is_ftdx101mp || is_ft891) if (is_ftdx101d || is_ftdx101mp || is_ft891)
{ {
// some rigs now require the bandwidth be turned "on" // some rigs now require the bandwidth be turned "on"
int on = is_ft891; int on = is_ft891;
@ -8934,7 +8931,7 @@ int newcat_get_rx_bandwidth(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t *width)
} /* end switch(mode) */ } /* end switch(mode) */
} /* end if is_ftdx5000 */ } /* end if is_ftdx5000 */
else if (is_ftdx101 || is_ftdx101mp || is_ftdx10) else if (is_ftdx101d || is_ftdx101mp || is_ftdx10)
{ {
rig_debug(RIG_DEBUG_TRACE, "%s: is_ftdx101 w=%d, mode=%s\n", __func__, w, rig_debug(RIG_DEBUG_TRACE, "%s: is_ftdx101 w=%d, mode=%s\n", __func__, w,
rig_strrmode(mode)); rig_strrmode(mode));