kopia lustrzana https://github.com/Hamlib/Hamlib
Add RIG_TARGETABLE_ANT and fix Yaesu rigs -- Yaesu are only ones needing this right now
https://github.com/Hamlib/Hamlib/pull/495pull/497/head
rodzic
62066d5b74
commit
19e819948f
|
@ -473,6 +473,7 @@ typedef unsigned int vfo_t;
|
|||
#define RIG_TARGETABLE_PTT (1<<7)
|
||||
#define RIG_TARGETABLE_MEM (1<<8)
|
||||
#define RIG_TARGETABLE_BANK (1<<9)
|
||||
#define RIG_TARGETABLE_ANT (1<<10)
|
||||
#define RIG_TARGETABLE_COMMON (RIG_TARGETABLE_RITXIT | RIG_TARGETABLE_PTT | RIG_TARGETABLE_MEM | RIG_TARGETABLE_BANK)
|
||||
#define RIG_TARGETABLE_ALL 0x7fffffff
|
||||
//! @endcond
|
||||
|
|
|
@ -126,7 +126,7 @@ const struct rig_caps ftdx5000_caps =
|
|||
.max_xit = Hz(9999),
|
||||
.max_ifshift = Hz(1000),
|
||||
.vfo_ops = FTDX5000_VFO_OPS,
|
||||
.targetable_vfo = RIG_TARGETABLE_FREQ | RIG_TARGETABLE_MODE | RIG_TARGETABLE_FUNC | RIG_TARGETABLE_LEVEL,
|
||||
.targetable_vfo = RIG_TARGETABLE_FREQ | RIG_TARGETABLE_MODE | RIG_TARGETABLE_FUNC | RIG_TARGETABLE_LEVEL | RIG_TARGETABLE_ANT,
|
||||
.transceive = RIG_TRN_OFF, /* May enable later as the 5000 has an Auto Info command */
|
||||
.bank_qty = 0,
|
||||
.chan_desc_sz = 0,
|
||||
|
|
|
@ -89,7 +89,7 @@ const struct rig_caps ft9000_caps =
|
|||
.max_xit = Hz(9999),
|
||||
.max_ifshift = Hz(1000),
|
||||
.vfo_ops = FT9000_VFO_OPS,
|
||||
.targetable_vfo = RIG_TARGETABLE_FREQ | RIG_TARGETABLE_MODE,
|
||||
.targetable_vfo = RIG_TARGETABLE_FREQ | RIG_TARGETABLE_MODE | RIG_TARGETABLE_ANT,
|
||||
.transceive = RIG_TRN_OFF, /* May enable later as the 9000 has an Auto Info command */
|
||||
.bank_qty = 0,
|
||||
.chan_desc_sz = 0,
|
||||
|
|
|
@ -214,8 +214,8 @@ const struct rig_caps ftdx10_caps =
|
|||
.get_rit = newcat_get_rit,
|
||||
.set_xit = newcat_set_xit,
|
||||
.get_xit = newcat_get_xit,
|
||||
.set_ant = newcat_set_ant,
|
||||
.get_ant = newcat_get_ant,
|
||||
.set_ant = NULL,
|
||||
.get_ant = NULL,
|
||||
.get_func = newcat_get_func,
|
||||
.set_func = newcat_set_func,
|
||||
.get_level = newcat_get_level,
|
||||
|
|
|
@ -113,7 +113,7 @@ const struct rig_caps ftdx101d_caps =
|
|||
.max_xit = Hz(9999),
|
||||
.max_ifshift = Hz(1200),
|
||||
.vfo_ops = FTDX101_VFO_OPS,
|
||||
.targetable_vfo = RIG_TARGETABLE_FREQ | RIG_TARGETABLE_MODE | RIG_TARGETABLE_FUNC | RIG_TARGETABLE_LEVEL | RIG_TARGETABLE_COMMON,
|
||||
.targetable_vfo = RIG_TARGETABLE_FREQ | RIG_TARGETABLE_MODE | RIG_TARGETABLE_FUNC | RIG_TARGETABLE_LEVEL | RIG_TARGETABLE_COMMON | RIG_TARGETABLE_ANT,
|
||||
.transceive = RIG_TRN_OFF, /* May enable later as the FTDX101 has an Auto Info command */
|
||||
.bank_qty = 0,
|
||||
.chan_desc_sz = 0,
|
||||
|
|
|
@ -3010,7 +3010,7 @@ int newcat_set_ant(RIG *rig, vfo_t vfo, ant_t ant, value_t option)
|
|||
return err;
|
||||
}
|
||||
|
||||
if ((rig->caps->targetable_vfo & RIG_TARGETABLE_MODE) && !is_ft2000)
|
||||
if ((rig->caps->targetable_vfo & RIG_TARGETABLE_ANT))
|
||||
{
|
||||
main_sub_vfo = (RIG_VFO_B == vfo || RIG_VFO_SUB == vfo) ? '1' : '0';
|
||||
}
|
||||
|
|
|
@ -50,7 +50,7 @@
|
|||
typedef char ncboolean;
|
||||
|
||||
/* shared function version */
|
||||
#define NEWCAT_VER "20210104"
|
||||
#define NEWCAT_VER "20210108"
|
||||
|
||||
/* Hopefully large enough for future use, 128 chars plus '\0' */
|
||||
#define NEWCAT_DATA_LEN 129
|
||||
|
|
|
@ -4289,7 +4289,7 @@ int HAMLIB_API rig_set_ant(RIG *rig, vfo_t vfo, ant_t ant, value_t option)
|
|||
return -RIG_ENAVAIL;
|
||||
}
|
||||
|
||||
if ((caps->targetable_vfo & RIG_TARGETABLE_PURE)
|
||||
if ((caps->targetable_vfo & RIG_TARGETABLE_ANT)
|
||||
|| vfo == RIG_VFO_CURR
|
||||
|| vfo == rig->state.current_vfo)
|
||||
{
|
||||
|
@ -4364,7 +4364,7 @@ int HAMLIB_API rig_get_ant(RIG *rig, vfo_t vfo, ant_t ant, value_t *option,
|
|||
return -RIG_ENAVAIL;
|
||||
}
|
||||
|
||||
if ((caps->targetable_vfo & RIG_TARGETABLE_PURE)
|
||||
if ((caps->targetable_vfo & RIG_TARGETABLE_ANT)
|
||||
|| vfo == RIG_VFO_CURR
|
||||
|| vfo == rig->state.current_vfo)
|
||||
{
|
||||
|
|
Ładowanie…
Reference in New Issue