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

Add FT-1000 in write-only mode 

freq,mode,ptt,vfo functions implemented
pull/1434/head
Mike Black W9MDB 2023-11-24 17:06:35 -06:00
rodzic 9841e500b9
commit 5bb669edbd
3 zmienionych plików z 188 dodań i 4 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

190
rigs/yaesu/ft1000d.c
Wyświetl plik

@ -115,13 +115,18 @@ static int ft1000d_open(RIG *rig);
static int ft1000d_close(RIG *rig);
static int ft1000d_set_freq(RIG *rig, vfo_t vfo, freq_t freq);
static int ft1000d_get_freq(RIG *rig, vfo_t vfo, freq_t *freq);
static int ft1000_get_freq(RIG *rig, vfo_t vfo, freq_t *freq);
static int ft1000d_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width);
static int ft1000d_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode,
pbwidth_t *width);
static int ft1000_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode,
pbwidth_t *width);
static int ft1000d_set_vfo(RIG *rig, vfo_t vfo);
static int ft1000d_get_vfo(RIG *rig, vfo_t *vfo);
static int ft1000_get_vfo(RIG *rig, vfo_t *vfo);
static int ft1000d_set_ptt(RIG *rig, vfo_t vfo, ptt_t ptt);
static int ft1000d_get_ptt(RIG *rig, vfo_t vfo, ptt_t *ptt);
static int ft1000_get_ptt(RIG *rig, vfo_t vfo, ptt_t *ptt);
static int ft1000d_set_rptr_shift(RIG *rig, vfo_t vfo, rptr_shift_t rptr_shift);
static int ft1000d_get_rptr_shift(RIG *rig, vfo_t vfo,
rptr_shift_t *rptr_shift);
@ -410,6 +415,152 @@ struct rig_caps ft1000d_caps =
.hamlib_check_rig_caps = HAMLIB_CHECK_RIG_CAPS
};
struct rig_caps ft1000_caps =
{
RIG_MODEL(RIG_MODEL_FT1000),
.model_name = "FT-1000",
.mfg_name = "Yaesu",
.version = "20231124.0",
.copyright = "LGPL",
.status = RIG_STATUS_STABLE,
.rig_type = RIG_TYPE_TRANSCEIVER,
.ptt_type = RIG_PTT_RIG,
.dcd_type = RIG_DCD_NONE,
.port_type = RIG_PORT_SERIAL,
.serial_rate_min = 4800,
.serial_rate_max = 4800,
.serial_data_bits = 8,
.serial_stop_bits = 2,
.serial_parity = RIG_PARITY_NONE,
.serial_handshake = RIG_HANDSHAKE_NONE,
.write_delay = FT1000D_WRITE_DELAY,
.post_write_delay = FT1000D_POST_WRITE_DELAY,
.timeout = 500,
.retry = 2,
// .has_get_func = RIG_FUNC_LOCK | RIG_FUNC_TUNER | RIG_FUNC_MON,
// .has_set_func = RIG_FUNC_LOCK | RIG_FUNC_TUNER,
// .has_get_level = RIG_LEVEL_STRENGTH | RIG_LEVEL_SWR | RIG_LEVEL_ALC | RIG_LEVEL_RFPOWER | RIG_LEVEL_COMP,
// .has_set_level = RIG_LEVEL_BAND_SELECT,
.has_get_parm = RIG_PARM_NONE,
// .has_set_parm = RIG_PARM_BACKLIGHT,
// .level_gran =
// {
//#include "level_gran_yaesu.h"
// },
// .parm_gran = {
// [PARM_BACKLIGHT] = {.min = {.f = 0.0f}, .max = {.f = 1.0f}, .step = {.f = 1.0f / 13.0f}},
// },
.ctcss_list = NULL,
.dcs_list = NULL,
.preamp = { RIG_DBLST_END, },
.attenuator = { RIG_DBLST_END, },
.max_rit = Hz(9999),
.max_xit = Hz(9999),
.max_ifshift = Hz(1200),
// .vfo_ops = RIG_OP_CPY | RIG_OP_FROM_VFO | RIG_OP_TO_VFO |
// RIG_OP_UP | RIG_OP_DOWN | RIG_OP_TUNE | RIG_OP_TOGGLE,
.targetable_vfo = RIG_TARGETABLE_ALL,
.transceive = RIG_TRN_OFF, /* Yaesus have to be polled, sigh */
.bank_qty = 0,
.chan_desc_sz = 0,
// .chan_list = {
// {1, 90, RIG_MTYPE_MEM, FT1000D_MEM_CAP},
// RIG_CHAN_END,
// },
.rx_range_list1 = {
{kHz(100), MHz(30), FT1000D_ALL_RX_MODES, -1, -1, FT1000D_VFO_ALL, FT1000D_ANTS}, /* General coverage + ham */
RIG_FRNG_END,
},
.tx_range_list1 = {
FRQ_RNG_HF(1, FT1000D_OTHER_TX_MODES, W(5), W(100), FT1000D_VFO_ALL, FT1000D_ANTS),
FRQ_RNG_HF(1, FT1000D_AM_TX_MODES, W(2), W(25), FT1000D_VFO_ALL, FT1000D_ANTS), /* AM class */
RIG_FRNG_END,
},
.rx_range_list2 = {
{kHz(100), MHz(30), FT1000D_ALL_RX_MODES, -1, -1, FT1000D_VFO_ALL, FT1000D_ANTS},
RIG_FRNG_END,
},
.tx_range_list2 = {
FRQ_RNG_HF(2, FT1000D_OTHER_TX_MODES, W(5), W(100), FT1000D_VFO_ALL, FT1000D_ANTS),
FRQ_RNG_HF(2, FT1000D_AM_TX_MODES, W(2), W(25), FT1000D_VFO_ALL, FT1000D_ANTS), /* AM class */
RIG_FRNG_END,
},
.tuning_steps = {
{FT1000D_SSB_CW_RX_MODES, Hz(10)}, /* Normal */
{FT1000D_SSB_CW_RX_MODES, Hz(100)}, /* Fast */
{FT1000D_AM_RX_MODES, Hz(100)}, /* Normal */
{FT1000D_AM_RX_MODES, kHz(1)}, /* Fast */
{FT1000D_FM_RX_MODES, Hz(100)}, /* Normal */
{FT1000D_FM_RX_MODES, kHz(1)}, /* Fast */
{FT1000D_RTTY_RX_MODES, Hz(10)}, /* Normal */
{FT1000D_RTTY_RX_MODES, Hz(100)}, /* Fast */
RIG_TS_END,
},
/* mode/filter list, .remember = order matters! */
.filters = {
{RIG_MODE_SSB, RIG_FLT_ANY}, /* Enable all filters for SSB */
{RIG_MODE_CW, RIG_FLT_ANY}, /* Enable all filters for CW */
{RIG_MODE_RTTY, RIG_FLT_ANY}, /* Enable all filters for RTTY */
{RIG_MODE_RTTYR, RIG_FLT_ANY}, /* Enable all filters for Reverse RTTY */
{RIG_MODE_PKTLSB, RIG_FLT_ANY}, /* Enable all filters for Packet Radio LSB */
{RIG_MODE_AM, kHz(6)}, /* normal AM filter */
{RIG_MODE_AM, kHz(2.4)}, /* narrow AM filter */
{RIG_MODE_FM, kHz(8)}, /* FM standard filter */
{RIG_MODE_PKTFM, kHz(8)}, /* FM standard filter for Packet Radio FM */
RIG_FLT_END,
},
.priv = NULL, /* private data FIXME: */
.rig_init = ft1000d_init,
.rig_cleanup = ft1000d_cleanup,
.rig_open = ft1000d_open, /* port opened */
.rig_close = ft1000d_close, /* port closed */
.set_freq = ft1000d_set_freq,
.get_freq = ft1000_get_freq,
.set_mode = ft1000d_set_mode,
.get_mode = ft1000_get_mode,
.set_vfo = ft1000d_set_vfo,
.get_vfo = ft1000_get_vfo,
.set_ptt = ft1000d_set_ptt,
.get_ptt = ft1000_get_ptt,
// .set_rptr_shift = ft1000d_set_rptr_shift,
// .get_rptr_shift = ft1000d_get_rptr_shift,
// .set_rptr_offs = ft1000d_set_rptr_offs,
// .set_split_freq = ft1000d_set_split_freq, /* Added December 2016 to expand range of FT1000D functions. */
// .get_split_freq = ft1000d_get_split_freq, /* Added December 2016 to expand range of FT1000D functions. */
// .set_split_mode = ft1000d_set_split_mode, /* Added December 2016 to expand range of FT1000D functions. */
// .get_split_mode = ft1000d_get_split_mode, /* Added December 2016 to expand range of FT1000D functions. */
// .set_split_vfo = ft1000d_set_split_vfo, /* Changed in December 2016 so that vfos toggle back and forth like pressing Split button on rig */
// .get_split_vfo = ft1000d_get_split_vfo,
// .set_rit = ft1000d_set_rit,
// .get_rit = ft1000d_get_rit,
// .set_xit = ft1000d_set_xit,
// .get_xit = ft1000d_get_xit,
// .set_func = ft1000d_set_func,
// .get_func = ft1000d_get_func,
// .set_parm = ft1000d_set_parm,
// .get_level = ft1000d_get_level,
// .set_mem = ft1000d_set_mem,
// .get_mem = ft1000d_get_mem,
// .vfo_op = ft1000d_vfo_op,
// .set_channel = ft1000d_set_channel,
// .get_channel = ft1000d_get_channel,
.hamlib_check_rig_caps = HAMLIB_CHECK_RIG_CAPS
};
/*
* ************************************
@ -513,11 +664,14 @@ static int ft1000d_open(RIG *rig)
// Get current rig settings and status
err = ft1000d_get_update_data(rig, FT1000D_NATIVE_UPDATE_OP_DATA, 0);
if (err != RIG_OK)
if (rig->caps->rig_model != RIG_MODEL_FT1000)
{
return err;
err = ft1000d_get_update_data(rig, FT1000D_NATIVE_UPDATE_OP_DATA, 0);
if (err != RIG_OK)
{
return err;
}
}
return RIG_OK;
@ -3959,5 +4113,33 @@ static int ft1000d_get_split_mode(RIG *rig, vfo_t vfo, rmode_t *tx_mode,
return RIG_OK;
}
static int ft1000_get_freq(RIG *rig, vfo_t vfo, freq_t *freq)
{
if (vfo == RIG_VFO_A)
*freq = rig->state.cache.freqMainA;
else
*freq = rig->state.cache.freqMainB;
return RIG_OK;
}
static int ft1000_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
{
*mode = rig->state.cache.modeMainA;
return RIG_OK;
}
static int ft1000_get_vfo(RIG *rig, vfo_t *vfo)
{
*vfo = rig->state.current_vfo;
return RIG_OK;
}
static int ft1000_get_ptt(RIG *rig, vfo_t vfo, ptt_t *ptt)
{
*ptt = rig->state.cache.ptt;
return RIG_OK;
}

1
rigs/yaesu/yaesu.c
Wyświetl plik

@ -95,6 +95,7 @@ DECLARE_INITRIG_BACKEND(yaesu)
rig_register(&ft980_caps);
rig_register(&ft990_caps);
rig_register(&ft990uni_caps);
rig_register(&ft1000_caps);
rig_register(&ft1000d_caps);
rig_register(&ft1000mp_caps);
rig_register(&ft1000mpmkv_caps);

1
rigs/yaesu/yaesu.h
Wyświetl plik

@ -72,6 +72,7 @@ extern struct rig_caps ft991_caps;
extern struct rig_caps ft1000mp_caps;
extern struct rig_caps ft1000mpmkv_caps;
extern struct rig_caps ft1000mpmkvfld_caps;
extern struct rig_caps ft1000_caps;
extern struct rig_caps ft1000d_caps;
extern struct rig_caps ft2000_caps;
extern struct rig_caps ftdx3000_caps;