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

Add RIG_TARGETABLE_ANT and fix Yaesu rigs -- Yaesu are only ones needing this right now 

https://github.com/Hamlib/Hamlib/pull/495
pull/497/head
Michael Black W9MDB 2021-01-08 07:16:45 -06:00
rodzic 62066d5b74
commit 19e819948f
8 zmienionych plików z 10 dodań i 9 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

1
include/hamlib/rig.h
Wyświetl plik

@ -473,6 +473,7 @@ typedef unsigned int vfo_t;
#define RIG_TARGETABLE_PTT (1<<7) #define RIG_TARGETABLE_PTT (1<<7)
#define RIG_TARGETABLE_MEM (1<<8) #define RIG_TARGETABLE_MEM (1<<8)
#define RIG_TARGETABLE_BANK (1<<9) #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_COMMON (RIG_TARGETABLE_RITXIT | RIG_TARGETABLE_PTT | RIG_TARGETABLE_MEM | RIG_TARGETABLE_BANK)
#define RIG_TARGETABLE_ALL 0x7fffffff #define RIG_TARGETABLE_ALL 0x7fffffff
//! @endcond //! @endcond

2
rigs/yaesu/ft5000.c
Wyświetl plik

@ -126,7 +126,7 @@ const struct rig_caps ftdx5000_caps =
.max_xit = Hz(9999), .max_xit = Hz(9999),
.max_ifshift = Hz(1000), .max_ifshift = Hz(1000),
.vfo_ops = FTDX5000_VFO_OPS, .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 */ .transceive = RIG_TRN_OFF, /* May enable later as the 5000 has an Auto Info command */
.bank_qty = 0, .bank_qty = 0,
.chan_desc_sz = 0, .chan_desc_sz = 0,

2
rigs/yaesu/ft9000.c
Wyświetl plik

@ -89,7 +89,7 @@ const struct rig_caps ft9000_caps =
.max_xit = Hz(9999), .max_xit = Hz(9999),
.max_ifshift = Hz(1000), .max_ifshift = Hz(1000),
.vfo_ops = FT9000_VFO_OPS, .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 */ .transceive = RIG_TRN_OFF, /* May enable later as the 9000 has an Auto Info command */
.bank_qty = 0, .bank_qty = 0,
.chan_desc_sz = 0, .chan_desc_sz = 0,

4
rigs/yaesu/ftdx10.c
Wyświetl plik

@ -214,8 +214,8 @@ const struct rig_caps ftdx10_caps =
.get_rit = newcat_get_rit, .get_rit = newcat_get_rit,
.set_xit = newcat_set_xit, .set_xit = newcat_set_xit,
.get_xit = newcat_get_xit, .get_xit = newcat_get_xit,
.set_ant = newcat_set_ant, .set_ant = NULL,
.get_ant = newcat_get_ant, .get_ant = NULL,
.get_func = newcat_get_func, .get_func = newcat_get_func,
.set_func = newcat_set_func, .set_func = newcat_set_func,
.get_level = newcat_get_level, .get_level = newcat_get_level,

2
rigs/yaesu/ftdx101.c
Wyświetl plik

@ -113,7 +113,7 @@ const struct rig_caps ftdx101d_caps =
.max_xit = Hz(9999), .max_xit = Hz(9999),
.max_ifshift = Hz(1200), .max_ifshift = Hz(1200),
.vfo_ops = FTDX101_VFO_OPS, .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 */ .transceive = RIG_TRN_OFF, /* May enable later as the FTDX101 has an Auto Info command */
.bank_qty = 0, .bank_qty = 0,
.chan_desc_sz = 0, .chan_desc_sz = 0,

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

@ -3010,7 +3010,7 @@ int newcat_set_ant(RIG *rig, vfo_t vfo, ant_t ant, value_t option)
return err; 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'; main_sub_vfo = (RIG_VFO_B == vfo || RIG_VFO_SUB == vfo) ? '1' : '0';
} }

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

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

4
src/rig.c
Wyświetl plik

@ -4289,7 +4289,7 @@ int HAMLIB_API rig_set_ant(RIG *rig, vfo_t vfo, ant_t ant, value_t option)
return -RIG_ENAVAIL; return -RIG_ENAVAIL;
} }
if ((caps->targetable_vfo & RIG_TARGETABLE_PURE) if ((caps->targetable_vfo & RIG_TARGETABLE_ANT)
|| vfo == RIG_VFO_CURR || vfo == RIG_VFO_CURR
|| vfo == rig->state.current_vfo) || 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; return -RIG_ENAVAIL;
} }
if ((caps->targetable_vfo & RIG_TARGETABLE_PURE) if ((caps->targetable_vfo & RIG_TARGETABLE_ANT)
|| vfo == RIG_VFO_CURR || vfo == RIG_VFO_CURR
|| vfo == rig->state.current_vfo) || vfo == rig->state.current_vfo)
{ {