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

FT-710 fixes, part 1

pull/1339/head
Mikael Nousiainen 2023-07-12 00:29:32 +03:00
rodzic 5a8bd96427
commit d54912e375
3 zmienionych plików z 94 dodań i 59 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
rigs/yaesu/Makefile.am
Wyświetl plik

@ -11,7 +11,7 @@ YAESUSRC = ft100.c ft100.h ft747.c ft747.h ft817.c ft817.h ft847.c ft847.h \
## Yaesu radios that use the new Kenwood style CAT commands
NEWCATSRC = newcat.c newcat.h ft450.c ft450.h ft950.c ft950.h ft991.c ft991.h \
ft2000.c ft2000.h ft9000.c ft9000.h ft5000.c ft5000.h ft1200.c ft1200.h \
ft891.c ft891.h ftdx101.c ftdx101.h ftdx101mp.c ft3000.c ftdx10.c
ft891.c ft891.h ftdx101.c ftdx101.h ftdx101mp.c ft3000.c ftdx10.c ft710.h
noinst_LTLIBRARIES = libhamlib-yaesu.la
libhamlib_yaesu_la_SOURCES = yaesu.c yaesu.h level_gran_yaesu.h $(YAESUSRC) $(NEWCATSRC)

100
rigs/yaesu/ft710.c
Wyświetl plik

@ -4,10 +4,10 @@
* ft710.c - (C) Nate Bargmann 2007 (n0nb at arrl.net)
* (C) Stephane Fillod 2008-2010
* (C) Terry Embry 2008-2009
* (C) Mikael Nousiainen 2020
* (C) Mikael Nousiainen 2023
*
* This shared library provides an API for communicating
* via serial interface to an FTDX10(D/MP) using the "CAT" interface
* via serial interface to an FT-710 using the "CAT" interface
*
*
* This library is free software; you can redistribute it and/or
@ -33,34 +33,16 @@
#include "tones.h"
#include "newcat.h"
#include "yaesu.h"
#include "ftdx10.h" // reuse this until we know different
#include "ft710.h"
const struct newcat_priv_caps ft710_priv_caps =
{
.roofing_filter_count = 6,
.roofing_filters =
{
// The index must match ext level combo index
{ .index = 0, .set_value = '0', .get_value = 0, .width = 12000, .optional = 0 },
{ .index = 1, .set_value = '1', .get_value = '6', .width = 12000, .optional = 0 },
{ .index = 2, .set_value = '2', .get_value = '7', .width = 3000, .optional = 0 },
// { .index = 3, .set_value = '3', .get_value = '8', .width = 1200, .optional = 1 },
{ .index = 4, .set_value = '4', .get_value = '9', .width = 500, .optional = 0 },
{ .index = 5, .set_value = '5', .get_value = 'A', .width = 300, .optional = 0 },
}
.roofing_filter_count = 0,
.roofing_filters = {}
};
const struct confparams ft710_ext_levels[] =
{
{
TOK_ROOFING_FILTER,
"ROOFINGFILTER",
"Roofing filter",
"Roofing filter",
NULL,
RIG_CONF_COMBO,
{ .c = { .combostr = { "AUTO", "12 kHz", "3 kHz", "500 Hz", "300 Hz (optional)", NULL } } }
},
{
TOK_KEYER,
"KEYER",
@ -127,7 +109,7 @@ const struct confparams ft710_ext_levels[] =
int ft710_ext_tokens[] =
{
TOK_ROOFING_FILTER, TOK_KEYER, TOK_APF_FREQ, TOK_APF_WIDTH,
TOK_KEYER, TOK_APF_FREQ, TOK_APF_WIDTH,
TOK_CONTOUR, TOK_CONTOUR_FREQ, TOK_CONTOUR_LEVEL, TOK_CONTOUR_WIDTH,
TOK_BACKEND_NONE
};
@ -137,7 +119,7 @@ const struct rig_caps ft710_caps =
RIG_MODEL(RIG_MODEL_FT710),
.model_name = "FT-710",
.mfg_name = "Yaesu",
.version = NEWCAT_VER ".3",
.version = NEWCAT_VER ".4",
.copyright = "LGPL",
.status = RIG_STATUS_STABLE,
.rig_type = RIG_TYPE_TRANSCEIVER,
@ -154,10 +136,10 @@ const struct rig_caps ft710_caps =
.post_write_delay = 20,
.timeout = 1000,
.retry = 3,
.has_get_func = FTDX10_FUNCS,
.has_set_func = FTDX10_FUNCS,
.has_get_level = FTDX10_LEVELS,
.has_set_level = RIG_LEVEL_SET(FTDX10_LEVELS),
.has_get_func = FT710_FUNCS,
.has_set_func = FT710_FUNCS,
.has_get_level = FT710_LEVELS,
.has_set_level = RIG_LEVEL_SET(FT710_LEVELS),
.has_get_parm = RIG_PARM_NONE,
.has_set_parm = RIG_PARM_NONE,
.level_gran =
@ -177,14 +159,18 @@ const struct rig_caps ft710_caps =
.max_ifshift = Hz(1200),
.agc_level_count = 5,
.agc_levels = { RIG_AGC_OFF, RIG_AGC_FAST, RIG_AGC_MEDIUM, RIG_AGC_SLOW, RIG_AGC_AUTO },
.vfo_ops = FTDX10_VFO_OPS,
.vfo_ops = FT710_VFO_OPS,
.scan_ops = RIG_SCAN_VFO,
.targetable_vfo = RIG_TARGETABLE_FREQ | RIG_TARGETABLE_FUNC | RIG_TARGETABLE_LEVEL | RIG_TARGETABLE_COMMON | RIG_TARGETABLE_TONE | RIG_TARGETABLE_MODE,
.transceive = RIG_TRN_OFF, /* May enable later as the FTDX10 has an Auto Info command */
.targetable_vfo = RIG_TARGETABLE_FREQ | RIG_TARGETABLE_FUNC | RIG_TARGETABLE_LEVEL,
.transceive = RIG_TRN_OFF, /* May enable later as the FT-710 has an Auto Info command */
.bank_qty = 0,
.chan_desc_sz = 0,
.rfpower_meter_cal = FTDX10_RFPOWER_METER_CAL,
.swr_cal = FTDX10_SWR_CAL,
.rfpower_meter_cal = FT710_RFPOWER_METER_CAL,
.swr_cal = FT710_SWR_CAL,
.str_cal = FT710_STR_CAL,
.id_meter_cal = FT710_ID_CAL,
.vd_meter_cal = FT710_VD_CAL,
.comp_meter_cal = FT710_COMP_CAL,
.chan_list = {
{ 1, 99, RIG_MTYPE_MEM, NEWCAT_MEM_CAP },
RIG_CHAN_END,
@ -192,44 +178,44 @@ const struct rig_caps ft710_caps =
.rx_range_list1 = {
/* General coverage + ham, ANT_5 is RX only antenna */
{kHz(30), MHz(60), FTDX10_ALL_RX_MODES, -1, -1, FTDX10_VFO_ALL, FTDX10_TX_ANTS, "USA"},
{kHz(30), MHz(60), FT710_ALL_RX_MODES, -1, -1, FT710_VFO_ALL, FT710_TX_ANTS, "USA"},
RIG_FRNG_END,
},
.tx_range_list1 = { /* the 101DX is 100W and the MP is 200W */
FRQ_RNG_HF(1, FTDX10_OTHER_TX_MODES, W(5), W(200), FTDX10_VFO_ALL, FTDX10_TX_ANTS),
FRQ_RNG_HF(1, FTDX10_AM_TX_MODES, W(2), W(75), FTDX10_VFO_ALL, FTDX10_TX_ANTS), /* AM class */
FRQ_RNG_6m(1, FTDX10_OTHER_TX_MODES, W(5), W(200), FTDX10_VFO_ALL, FTDX10_TX_ANTS),
FRQ_RNG_6m(1, FTDX10_AM_TX_MODES, W(2), W(75), FTDX10_VFO_ALL, FTDX10_TX_ANTS), /* AM class */
FRQ_RNG_HF(1, FT710_OTHER_TX_MODES, W(5), W(200), FT710_VFO_ALL, FT710_TX_ANTS),
FRQ_RNG_HF(1, FT710_AM_TX_MODES, W(2), W(75), FT710_VFO_ALL, FT710_TX_ANTS), /* AM class */
FRQ_RNG_6m(1, FT710_OTHER_TX_MODES, W(5), W(200), FT710_VFO_ALL, FT710_TX_ANTS),
FRQ_RNG_6m(1, FT710_AM_TX_MODES, W(2), W(75), FT710_VFO_ALL, FT710_TX_ANTS), /* AM class */
RIG_FRNG_END,
},
.rx_range_list2 = {
{kHz(30), MHz(60), FTDX10_ALL_RX_MODES, -1, -1, FTDX10_VFO_ALL, FTDX10_TX_ANTS, "EUR"},
{kHz(30), MHz(60), FT710_ALL_RX_MODES, -1, -1, FT710_VFO_ALL, FT710_TX_ANTS, "EUR"},
RIG_FRNG_END,
},
.tx_range_list2 = {
FRQ_RNG_HF(2, FTDX10_OTHER_TX_MODES, W(5), W(200), FTDX10_VFO_ALL, FTDX10_TX_ANTS),
FRQ_RNG_HF(2, FTDX10_AM_TX_MODES, W(2), W(75), FTDX10_VFO_ALL, FTDX10_TX_ANTS), /* AM class */
FRQ_RNG_6m(2, FTDX10_OTHER_TX_MODES, W(5), W(200), FTDX10_VFO_ALL, FTDX10_TX_ANTS),
FRQ_RNG_6m(2, FTDX10_AM_TX_MODES, W(2), W(75), FTDX10_VFO_ALL, FTDX10_TX_ANTS), /* AM class */
FRQ_RNG_4m_REGION2(FTDX10_OTHER_TX_MODES, W(5), W(200), FTDX10_VFO_ALL, FTDX10_TX_ANTS),
FRQ_RNG_4m_REGION2(FTDX10_AM_TX_MODES, W(2), W(75), FTDX10_VFO_ALL, FTDX10_TX_ANTS), /* AM class */
FRQ_RNG_HF(2, FT710_OTHER_TX_MODES, W(5), W(200), FT710_VFO_ALL, FT710_TX_ANTS),
FRQ_RNG_HF(2, FT710_AM_TX_MODES, W(2), W(75), FT710_VFO_ALL, FT710_TX_ANTS), /* AM class */
FRQ_RNG_6m(2, FT710_OTHER_TX_MODES, W(5), W(200), FT710_VFO_ALL, FT710_TX_ANTS),
FRQ_RNG_6m(2, FT710_AM_TX_MODES, W(2), W(75), FT710_VFO_ALL, FT710_TX_ANTS), /* AM class */
FRQ_RNG_4m_REGION2(FT710_OTHER_TX_MODES, W(5), W(200), FT710_VFO_ALL, FT710_TX_ANTS),
FRQ_RNG_4m_REGION2(FT710_AM_TX_MODES, W(2), W(75), FT710_VFO_ALL, FT710_TX_ANTS), /* AM class */
RIG_FRNG_END,
},
.tuning_steps = {
{FTDX10_SSB_CW_RX_MODES, Hz(10)}, /* Normal */
{FTDX10_SSB_CW_RX_MODES, Hz(100)}, /* Fast */
{FT710_SSB_CW_RX_MODES, Hz(10)}, /* Normal */
{FT710_SSB_CW_RX_MODES, Hz(100)}, /* Fast */
{FTDX10_AM_RX_MODES, Hz(100)}, /* Normal */
{FTDX10_AM_RX_MODES, kHz(1)}, /* Fast */
{FT710_AM_RX_MODES, Hz(100)}, /* Normal */
{FT710_AM_RX_MODES, kHz(1)}, /* Fast */
{FTDX10_FM_RX_MODES, Hz(100)}, /* Normal */
{FTDX10_FM_RX_MODES, kHz(1)}, /* Fast */
{FT710_FM_RX_MODES, Hz(100)}, /* Normal */
{FT710_FM_RX_MODES, kHz(1)}, /* Fast */
RIG_TS_END,
@ -237,10 +223,10 @@ const struct rig_caps ft710_caps =
/* mode/filter list, remember that order matters! */
.filters = {
{FTDX10_CW_RTTY_PKT_RX_MODES, Hz(600)}, /* Normal CW, RTTY, PKT/USER */
{FTDX10_CW_RTTY_PKT_RX_MODES, Hz(300)}, /* Narrow CW, RTTY, PKT/USER */
{FTDX10_CW_RTTY_PKT_RX_MODES, Hz(2400)}, /* Wide CW, RTTY, PKT/USER */
{FTDX10_CW_RTTY_PKT_RX_MODES, Hz(1200)}, /* Normal CW, RTTY, PKT/USER */
{FT710_CW_RTTY_PKT_RX_MODES, Hz(600)}, /* Normal CW, RTTY, PKT/USER */
{FT710_CW_RTTY_PKT_RX_MODES, Hz(300)}, /* Narrow CW, RTTY, PKT/USER */
{FT710_CW_RTTY_PKT_RX_MODES, Hz(2400)}, /* Wide CW, RTTY, PKT/USER */
{FT710_CW_RTTY_PKT_RX_MODES, Hz(1200)}, /* Normal CW, RTTY, PKT/USER */
{RIG_MODE_SSB, Hz(2400)}, /* Normal SSB */
{RIG_MODE_SSB, Hz(1800)}, /* Narrow SSB */
{RIG_MODE_SSB, Hz(3000)}, /* Wide SSB */
@ -248,7 +234,7 @@ const struct rig_caps ft710_caps =
{RIG_MODE_AMN, Hz(6000)}, /* Narrow AM */
{RIG_MODE_FM | RIG_MODE_PKTFM, Hz(16000)}, /* Normal FM */
{RIG_MODE_FMN | RIG_MODE_PKTFMN, Hz(9000)}, /* Narrow FM */
{FTDX10_CW_RTTY_PKT_RX_MODES | RIG_MODE_SSB, RIG_FLT_ANY},
{FT710_CW_RTTY_PKT_RX_MODES | RIG_MODE_SSB, RIG_FLT_ANY},
RIG_FLT_END,
},

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

@ -2250,6 +2250,28 @@ 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,
cat_term);
}
else if (is_ft710)
{
if (freq >= 28000000 && freq <= 29700000)
{
strcpy(command, "EX010318");
}
else if (freq >= 50000000 && freq <= 54000000)
{
strcpy(command, "EX010319");
}
else
{
// only valid on 10m and 6m bands
RETURNFUNC(-RIG_EINVAL);
}
// Step size is 1 kHz
offs /= 1000;
SNPRINTF(priv->cmd_str, sizeof(priv->cmd_str), "%s%04li%c", command, offs,
cat_term);
}
else if (is_ftdx1200)
{
if (freq >= 28000000 && freq <= 29700000)
@ -2464,6 +2486,26 @@ int newcat_get_rptr_offs(RIG *rig, vfo_t vfo, shortfreq_t *offs)
// Step size is 1 kHz
step = 1000;
}
else if (is_ft710)
{
if (freq >= 28000000 && freq <= 29700000)
{
SNPRINTF(priv->cmd_str, sizeof(priv->cmd_str), "EX010318%c", cat_term);
}
else if (freq >= 50000000 && freq <= 54000000)
{
SNPRINTF(priv->cmd_str, sizeof(priv->cmd_str), "EX010319%c", cat_term);
}
else
{
// only valid on 10m and 6m bands
*offs = 0;
RETURNFUNC(RIG_OK);
}
// Step size is 1 kHz
step = 1000;
}
else if (is_ftdx1200)
{
if (freq >= 28000000 && freq <= 29700000)
@ -7124,7 +7166,14 @@ int newcat_vfo_op(RIG *rig, vfo_t vfo, vfo_op_t op)
switch (op)
{
case RIG_OP_TUNE:
SNPRINTF(priv->cmd_str, sizeof(priv->cmd_str), "AC002%c", cat_term);
if (is_ft710)
{
SNPRINTF(priv->cmd_str, sizeof(priv->cmd_str), "AC003%c", cat_term);
}
else
{
SNPRINTF(priv->cmd_str, sizeof(priv->cmd_str), "AC002%c", cat_term);
}
break;
case RIG_OP_CPY: