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

finer grained targetable vfo cap 

git-svn-id: https://hamlib.svn.sourceforge.net/svnroot/hamlib/trunk@746 7ae35d74-ebe9-4afe-98af-79ac388436b8
Hamlib-1.1.3
Stéphane Fillod, F8CFE 2001-12-16 11:17:42 +00:00
rodzic 95c6c458dc
commit 3d6b1e5131
9 zmienionych plików z 112 dodań i 108 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

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

@ -2,7 +2,7 @@
* Hamlib Interface - API header
* Copyright (c) 2000,2001 by Stephane Fillod and Frank Singleton
*
* $Id: rig.h,v 1.52 2001-10-16 21:18:02 f4cfe Exp $
* $Id: rig.h,v 1.53 2001-12-16 11:17:42 fillods Exp $
*
* This library is free software; you can redistribute it and/or modify
* it under the terms of the GNU Library General Public License as
@ -274,6 +274,11 @@ typedef signed long shortfreq_t;
*/
typedef int vfo_t;
#define RIG_TARGETABLE_NONE 0x00
#define RIG_TARGETABLE_FREQ 0x01
#define RIG_TARGETABLE_MODE 0x02
#define RIG_TARGETABLE_ALL 0xffffffff
#define RIG_PASSBAND_NORMAL Hz(0)
/*

4
kenwood/thd7.c
Wyświetl plik

@ -2,7 +2,7 @@
* Hamlib Kenwood backend - TH-D7 description
* Copyright (c) 2000,2001 by Stephane Fillod
*
* $Id: thd7.c,v 1.2 2001-11-09 15:45:38 f4cfe Exp $
* $Id: thd7.c,v 1.3 2001-12-16 11:17:42 fillods Exp $
*
* This library is free software; you can redistribute it and/or modify
* it under the terms of the GNU Library General Public License as
@ -94,7 +94,7 @@ max_rit: Hz(0),
max_xit: Hz(0),
max_ifshift: Hz(0),
vfo_ops: THD7_VFO_OP,
targetable_vfo: 0,
targetable_vfo: RIG_TARGETABLE_FREQ,
transceive: RIG_TRN_RIG,
bank_qty: 0,
chan_desc_sz: 0,

4
kenwood/thf7.c
Wyświetl plik

@ -2,7 +2,7 @@
* Hamlib Kenwood backend - TH-F7 description
* Copyright (c) 2001 by Stephane Fillod
*
* $Id: thf7.c,v 1.1 2001-11-09 15:44:38 f4cfe Exp $
* $Id: thf7.c,v 1.2 2001-12-16 11:17:42 fillods Exp $
*
* This library is free software; you can redistribute it and/or modify
* it under the terms of the GNU Library General Public License as
@ -94,7 +94,7 @@ max_rit: Hz(0),
max_xit: Hz(0),
max_ifshift: Hz(0),
vfo_ops: THF7_VFO_OP,
targetable_vfo: 0,
targetable_vfo: RIG_TARGETABLE_FREQ,
transceive: RIG_TRN_RIG,
bank_qty: 0,
chan_desc_sz: 0,

4
kenwood/ts2000.c
Wyświetl plik

@ -2,7 +2,7 @@
* Hamlib Kenwood backend - TS2000 description
* Copyright (c) 2000,2001 by Stephane Fillod
*
* $Id: ts2000.c,v 1.1 2001-12-11 21:58:28 fillods Exp $
* $Id: ts2000.c,v 1.2 2001-12-16 11:17:42 fillods Exp $
*
* This library is free software; you can redistribute it and/or modify
* it under the terms of the GNU Library General Public License as
@ -112,7 +112,7 @@ attenuator: { 20, RIG_DBLST_END, },
max_rit: kHz(20),
max_xit: kHz(20),
max_ifshift: kHz(1),
targetable_vfo: 0,
targetable_vfo: RIG_TARGETABLE_FREQ,
transceive: RIG_TRN_RIG,
bank_qty: 0,
chan_desc_sz: 0,

4
kenwood/ts450s.c
Wyświetl plik

@ -2,7 +2,7 @@
* Hamlib Kenwood backend - TS450S description
* Copyright (c) 2000,2001 by Stephane Fillod
*
* $Id: ts450s.c,v 1.1 2001-08-08 21:31:12 f4cfe Exp $
* $Id: ts450s.c,v 1.2 2001-12-16 11:17:42 fillods Exp $
*
* This library is free software; you can redistribute it and/or modify
* it under the terms of the GNU Library General Public License as
@ -93,7 +93,7 @@ attenuator: { 6, 12, 18, RIG_DBLST_END, },
max_rit: Hz(9999),
max_xit: Hz(0),
max_ifshift: Hz(0),
targetable_vfo: 0,
targetable_vfo: RIG_TARGETABLE_FREQ,
transceive: RIG_TRN_RIG,
bank_qty: 0,
chan_desc_sz: 0,

6
kenwood/ts570.c
Wyświetl plik

@ -2,7 +2,7 @@
* Hamlib Kenwood backend - TS570 description
* Copyright (c) 2001 by Stephane Fillod
*
* $Id: ts570.c,v 1.3 2001-07-13 19:08:15 f4cfe Exp $
* $Id: ts570.c,v 1.4 2001-12-16 11:17:42 fillods Exp $
*
* This library is free software; you can redistribute it and/or modify
* it under the terms of the GNU Library General Public License as
@ -88,7 +88,7 @@ max_rit: Hz(9990),
max_xit: Hz(9990),
max_ifshift: Hz(0),
vfo_ops: TS570_VFO_OP,
targetable_vfo: 0,
targetable_vfo: RIG_TARGETABLE_FREQ,
transceive: RIG_TRN_RIG,
bank_qty: 0,
chan_desc_sz: 0,
@ -248,7 +248,7 @@ max_rit: Hz(9990),
max_xit: Hz(9990),
max_ifshift: Hz(0),
vfo_ops: TS570_VFO_OP,
targetable_vfo: 0,
targetable_vfo: RIG_TARGETABLE_FREQ,
transceive: RIG_TRN_RIG,
bank_qty: 0,
chan_desc_sz: 0,

4
kenwood/ts870s.c
Wyświetl plik

@ -2,7 +2,7 @@
* Hamlib Kenwood backend - TS870S description
* Copyright (c) 2000,2001 by Stephane Fillod
*
* $Id: ts870s.c,v 1.16 2001-07-13 19:08:15 f4cfe Exp $
* $Id: ts870s.c,v 1.17 2001-12-16 11:17:42 fillods Exp $
*
* This library is free software; you can redistribute it and/or modify
* it under the terms of the GNU Library General Public License as
@ -93,7 +93,7 @@ attenuator: { 6, 12, 18, RIG_DBLST_END, },
max_rit: Hz(9999),
max_xit: Hz(0),
max_ifshift: Hz(0),
targetable_vfo: 0,
targetable_vfo: RIG_TARGETABLE_FREQ,
transceive: RIG_TRN_RIG,
bank_qty: 0,
chan_desc_sz: 0,

183
src/rig.c
Wyświetl plik

@ -12,7 +12,7 @@
* Hamlib Interface - main file
* Copyright (c) 2000,2001 by Stephane Fillod and Frank Singleton
*
* $Id: rig.c,v 1.47 2001-10-25 21:22:49 f4cfe Exp $
* $Id: rig.c,v 1.48 2001-12-16 11:17:42 fillods Exp $
*
* This library is free software; you can redistribute it and/or modify
* it under the terms of the GNU Library General Public License as
@ -43,7 +43,6 @@
#include <fcntl.h>
#define HAMLIB_DLL
#include <hamlib/rig.h>
#include <serial.h>
#include "event.h"
@ -621,8 +620,8 @@ int rig_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
if (caps->set_freq == NULL)
return -RIG_ENAVAIL;
if (caps->targetable_vfo || vfo == RIG_VFO_CURR ||
vfo == rig->state.current_vfo)
if ((caps->targetable_vfo&RIG_TARGETABLE_FREQ) ||
vfo == RIG_VFO_CURR || vfo == rig->state.current_vfo)
return caps->set_freq(rig, vfo, freq);
if (!caps->set_vfo)
@ -668,8 +667,8 @@ int rig_get_freq(RIG *rig, vfo_t vfo, freq_t *freq)
if (caps->get_freq == NULL)
return -RIG_ENAVAIL;
if (caps->targetable_vfo || vfo == RIG_VFO_CURR ||
vfo == rig->state.current_vfo) {
if ((caps->targetable_vfo&RIG_TARGETABLE_FREQ) ||
vfo == RIG_VFO_CURR || vfo == rig->state.current_vfo) {
retcode = caps->get_freq(rig, vfo, freq);
} else {
if (!caps->set_vfo)
@ -719,8 +718,8 @@ int rig_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
if (caps->set_mode == NULL)
return -RIG_ENAVAIL;
if (caps->targetable_vfo || vfo == RIG_VFO_CURR ||
vfo == rig->state.current_vfo)
if ((caps->targetable_vfo&RIG_TARGETABLE_ALL) ||
vfo == RIG_VFO_CURR || vfo == rig->state.current_vfo)
return caps->set_mode(rig, vfo, mode, width);
if (!caps->set_vfo)
@ -769,8 +768,8 @@ int rig_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
if (caps->get_mode == NULL)
return -RIG_ENAVAIL;
if (caps->targetable_vfo || vfo == RIG_VFO_CURR ||
vfo == rig->state.current_vfo)
if ((caps->targetable_vfo&RIG_TARGETABLE_ALL) ||
vfo == RIG_VFO_CURR || vfo == rig->state.current_vfo)
return caps->get_mode(rig, vfo, mode, width);
if (!caps->set_vfo)
@ -1001,8 +1000,8 @@ int rig_set_ptt(RIG *rig, vfo_t vfo, ptt_t ptt)
if (caps->set_ptt == NULL)
return -RIG_ENIMPL;
if (caps->targetable_vfo || vfo == RIG_VFO_CURR ||
vfo == rig->state.current_vfo)
if ((caps->targetable_vfo&RIG_TARGETABLE_ALL) ||
vfo == RIG_VFO_CURR || vfo == rig->state.current_vfo)
return caps->set_ptt(rig, vfo, ptt);
if (!caps->set_vfo)
@ -1065,8 +1064,8 @@ int rig_get_ptt(RIG *rig, vfo_t vfo, ptt_t *ptt)
if (caps->get_ptt == NULL)
return -RIG_ENIMPL;
if (caps->targetable_vfo || vfo == RIG_VFO_CURR ||
vfo == rig->state.current_vfo)
if ((caps->targetable_vfo&RIG_TARGETABLE_ALL) ||
vfo == RIG_VFO_CURR || vfo == rig->state.current_vfo)
return caps->get_ptt(rig, vfo, ptt);
if (!caps->set_vfo)
@ -1129,8 +1128,8 @@ int rig_get_dcd(RIG *rig, vfo_t vfo, dcd_t *dcd)
if (caps->get_dcd == NULL)
return -RIG_ENIMPL;
if (caps->targetable_vfo || vfo == RIG_VFO_CURR ||
vfo == rig->state.current_vfo)
if ((caps->targetable_vfo&RIG_TARGETABLE_ALL) ||
vfo == RIG_VFO_CURR || vfo == rig->state.current_vfo)
return caps->get_dcd(rig, vfo, dcd);
if (!caps->set_vfo)
@ -1193,8 +1192,8 @@ int rig_set_rptr_shift(RIG *rig, vfo_t vfo, rptr_shift_t rptr_shift)
if (caps->set_rptr_shift == NULL)
return -RIG_ENAVAIL;
if (caps->targetable_vfo || vfo == RIG_VFO_CURR ||
vfo == rig->state.current_vfo)
if ((caps->targetable_vfo&RIG_TARGETABLE_ALL) ||
vfo == RIG_VFO_CURR || vfo == rig->state.current_vfo)
return caps->set_rptr_shift(rig, vfo, rptr_shift);
if (!caps->set_vfo)
@ -1237,8 +1236,8 @@ int rig_get_rptr_shift(RIG *rig, vfo_t vfo, rptr_shift_t *rptr_shift)
if (caps->get_rptr_shift == NULL)
return -RIG_ENAVAIL;
if (caps->targetable_vfo || vfo == RIG_VFO_CURR ||
vfo == rig->state.current_vfo)
if ((caps->targetable_vfo&RIG_TARGETABLE_ALL) ||
vfo == RIG_VFO_CURR || vfo == rig->state.current_vfo)
return caps->get_rptr_shift(rig, vfo, rptr_shift);
if (!caps->set_vfo)
@ -1282,8 +1281,8 @@ int rig_set_rptr_offs(RIG *rig, vfo_t vfo, shortfreq_t rptr_offs)
if (caps->set_rptr_offs == NULL)
return -RIG_ENAVAIL;
if (caps->targetable_vfo || vfo == RIG_VFO_CURR ||
vfo == rig->state.current_vfo)
if ((caps->targetable_vfo&RIG_TARGETABLE_ALL) ||
vfo == RIG_VFO_CURR || vfo == rig->state.current_vfo)
return caps->set_rptr_offs(rig, vfo, rptr_offs);
if (!caps->set_vfo)
@ -1327,8 +1326,8 @@ int rig_get_rptr_offs(RIG *rig, vfo_t vfo, shortfreq_t *rptr_offs)
if (caps->get_rptr_offs == NULL)
return -RIG_ENAVAIL;
if (caps->targetable_vfo || vfo == RIG_VFO_CURR ||
vfo == rig->state.current_vfo)
if ((caps->targetable_vfo&RIG_TARGETABLE_ALL) ||
vfo == RIG_VFO_CURR || vfo == rig->state.current_vfo)
return caps->get_rptr_offs(rig, vfo, rptr_offs);
if (!caps->set_vfo)
@ -1373,8 +1372,8 @@ int rig_set_split_freq(RIG *rig, vfo_t vfo, freq_t tx_freq)
if (caps->set_split_freq == NULL)
return -RIG_ENAVAIL;
if (caps->targetable_vfo || vfo == RIG_VFO_CURR ||
vfo == rig->state.current_vfo)
if ((caps->targetable_vfo&RIG_TARGETABLE_ALL) ||
vfo == RIG_VFO_CURR || vfo == rig->state.current_vfo)
return caps->set_split_freq(rig, vfo, tx_freq);
if (!caps->set_vfo)
@ -1417,8 +1416,8 @@ int rig_get_split_freq(RIG *rig, vfo_t vfo, freq_t *tx_freq)
if (caps->get_split_freq == NULL)
return -RIG_ENAVAIL;
if (caps->targetable_vfo || vfo == RIG_VFO_CURR ||
vfo == rig->state.current_vfo)
if ((caps->targetable_vfo&RIG_TARGETABLE_ALL) ||
vfo == RIG_VFO_CURR || vfo == rig->state.current_vfo)
return caps->get_split_freq(rig, vfo, tx_freq);
if (!caps->set_vfo)
@ -1463,8 +1462,8 @@ int rig_set_split_mode(RIG *rig, vfo_t vfo, rmode_t tx_mode, pbwidth_t tx_width)
if (caps->set_split_mode == NULL)
return -RIG_ENAVAIL;
if (caps->targetable_vfo || vfo == RIG_VFO_CURR ||
vfo == rig->state.current_vfo)
if ((caps->targetable_vfo&RIG_TARGETABLE_ALL) ||
vfo == RIG_VFO_CURR || vfo == rig->state.current_vfo)
return caps->set_split_mode(rig, vfo, tx_mode, tx_width);
if (!caps->set_vfo)
@ -1508,8 +1507,8 @@ int rig_get_split_mode(RIG *rig, vfo_t vfo, rmode_t *tx_mode, pbwidth_t *tx_widt
if (caps->get_split_mode == NULL)
return -RIG_ENAVAIL;
if (caps->targetable_vfo || vfo == RIG_VFO_CURR ||
vfo == rig->state.current_vfo)
if ((caps->targetable_vfo&RIG_TARGETABLE_ALL) ||
vfo == RIG_VFO_CURR || vfo == rig->state.current_vfo)
return caps->get_split_mode(rig, vfo, tx_mode, tx_width);
if (!caps->set_vfo)
@ -1553,8 +1552,8 @@ int rig_set_split(RIG *rig, vfo_t vfo, split_t split)
if (caps->set_split == NULL)
return -RIG_ENAVAIL;
if (caps->targetable_vfo || vfo == RIG_VFO_CURR ||
vfo == rig->state.current_vfo)
if ((caps->targetable_vfo&RIG_TARGETABLE_ALL) ||
vfo == RIG_VFO_CURR || vfo == rig->state.current_vfo)
return caps->set_split(rig, vfo, split);
if (!caps->set_vfo)
@ -1597,8 +1596,8 @@ int rig_get_split(RIG *rig, vfo_t vfo, split_t *split)
if (caps->get_split == NULL)
return -RIG_ENAVAIL;
if (caps->targetable_vfo || vfo == RIG_VFO_CURR ||
vfo == rig->state.current_vfo)
if ((caps->targetable_vfo&RIG_TARGETABLE_ALL) ||
vfo == RIG_VFO_CURR || vfo == rig->state.current_vfo)
return caps->get_split(rig, vfo, split);
if (!caps->set_vfo)
@ -1642,8 +1641,8 @@ int rig_set_rit(RIG *rig, vfo_t vfo, shortfreq_t rit)
if (caps->set_rit == NULL)
return -RIG_ENAVAIL;
if (caps->targetable_vfo || vfo == RIG_VFO_CURR ||
vfo == rig->state.current_vfo)
if ((caps->targetable_vfo&RIG_TARGETABLE_ALL) ||
vfo == RIG_VFO_CURR || vfo == rig->state.current_vfo)
return caps->set_rit(rig, vfo, rit);
if (!caps->set_vfo)
@ -1687,8 +1686,8 @@ int rig_get_rit(RIG *rig, vfo_t vfo, shortfreq_t *rit)
if (caps->get_rit == NULL)
return -RIG_ENAVAIL;
if (caps->targetable_vfo || vfo == RIG_VFO_CURR ||
vfo == rig->state.current_vfo)
if ((caps->targetable_vfo&RIG_TARGETABLE_ALL) ||
vfo == RIG_VFO_CURR || vfo == rig->state.current_vfo)
return caps->get_rit(rig, vfo, rit);
if (!caps->set_vfo)
@ -1732,8 +1731,8 @@ int rig_set_xit(RIG *rig, vfo_t vfo, shortfreq_t xit)
if (caps->set_xit == NULL)
return -RIG_ENAVAIL;
if (caps->targetable_vfo || vfo == RIG_VFO_CURR ||
vfo == rig->state.current_vfo)
if ((caps->targetable_vfo&RIG_TARGETABLE_ALL) ||
vfo == RIG_VFO_CURR || vfo == rig->state.current_vfo)
return caps->set_xit(rig, vfo, xit);
if (!caps->set_vfo)
@ -1777,8 +1776,8 @@ int rig_get_xit(RIG *rig, vfo_t vfo, shortfreq_t *xit)
if (caps->get_xit == NULL)
return -RIG_ENAVAIL;
if (caps->targetable_vfo || vfo == RIG_VFO_CURR ||
vfo == rig->state.current_vfo)
if ((caps->targetable_vfo&RIG_TARGETABLE_ALL) ||
vfo == RIG_VFO_CURR || vfo == rig->state.current_vfo)
return caps->get_xit(rig, vfo, xit);
if (!caps->set_vfo)
@ -1824,8 +1823,8 @@ int rig_set_ts(RIG *rig, vfo_t vfo, shortfreq_t ts)
if (caps->set_ts == NULL)
return -RIG_ENAVAIL;
if (caps->targetable_vfo || vfo == RIG_VFO_CURR ||
vfo == rig->state.current_vfo)
if ((caps->targetable_vfo&RIG_TARGETABLE_ALL) ||
vfo == RIG_VFO_CURR || vfo == rig->state.current_vfo)
return caps->set_ts(rig, vfo, ts);
if (!caps->set_vfo)
@ -1869,8 +1868,8 @@ int rig_get_ts(RIG *rig, vfo_t vfo, shortfreq_t *ts)
if (caps->get_ts == NULL)
return -RIG_ENAVAIL;
if (caps->targetable_vfo || vfo == RIG_VFO_CURR ||
vfo == rig->state.current_vfo)
if ((caps->targetable_vfo&RIG_TARGETABLE_ALL) ||
vfo == RIG_VFO_CURR || vfo == rig->state.current_vfo)
return caps->get_ts(rig, vfo, ts);
if (!caps->set_vfo)
@ -1914,8 +1913,8 @@ int rig_set_ant(RIG *rig, vfo_t vfo, ant_t ant)
if (caps->set_ant == NULL)
return -RIG_ENAVAIL;
if (caps->targetable_vfo || vfo == RIG_VFO_CURR ||
vfo == rig->state.current_vfo)
if ((caps->targetable_vfo&RIG_TARGETABLE_ALL) ||
vfo == RIG_VFO_CURR || vfo == rig->state.current_vfo)
return caps->set_ant(rig, vfo, ant);
if (!caps->set_vfo)
@ -1959,8 +1958,8 @@ int rig_get_ant(RIG *rig, vfo_t vfo, ant_t *ant)
if (caps->get_ant == NULL)
return -RIG_ENAVAIL;
if (caps->targetable_vfo || vfo == RIG_VFO_CURR ||
vfo == rig->state.current_vfo)
if ((caps->targetable_vfo&RIG_TARGETABLE_ALL) ||
vfo == RIG_VFO_CURR || vfo == rig->state.current_vfo)
return caps->get_ant(rig, vfo, ant);
if (!caps->set_vfo)
@ -2128,8 +2127,8 @@ int rig_set_ctcss_tone(RIG *rig, vfo_t vfo, tone_t tone)
if (caps->set_ctcss_tone == NULL)
return -RIG_ENAVAIL;
if (caps->targetable_vfo || vfo == RIG_VFO_CURR ||
vfo == rig->state.current_vfo)
if ((caps->targetable_vfo&RIG_TARGETABLE_ALL) ||
vfo == RIG_VFO_CURR || vfo == rig->state.current_vfo)
return caps->set_ctcss_tone(rig, vfo, tone);
if (!caps->set_vfo)
@ -2177,8 +2176,8 @@ int rig_get_ctcss_tone(RIG *rig, vfo_t vfo, tone_t *tone)
if (caps->get_ctcss_tone == NULL)
return -RIG_ENAVAIL;
if (caps->targetable_vfo || vfo == RIG_VFO_CURR ||
vfo == rig->state.current_vfo)
if ((caps->targetable_vfo&RIG_TARGETABLE_ALL) ||
vfo == RIG_VFO_CURR || vfo == rig->state.current_vfo)
return caps->get_ctcss_tone(rig, vfo, tone);
if (!caps->set_vfo)
@ -2222,8 +2221,8 @@ int rig_set_dcs_code(RIG *rig, vfo_t vfo, tone_t code)
if (caps->set_dcs_code == NULL)
return -RIG_ENAVAIL;
if (caps->targetable_vfo || vfo == RIG_VFO_CURR ||
vfo == rig->state.current_vfo)
if ((caps->targetable_vfo&RIG_TARGETABLE_ALL) ||
vfo == RIG_VFO_CURR || vfo == rig->state.current_vfo)
return caps->set_dcs_code(rig, vfo, code);
if (!caps->set_vfo)
@ -2266,8 +2265,8 @@ int rig_get_dcs_code(RIG *rig, vfo_t vfo, tone_t *code)
if (caps->get_dcs_code == NULL)
return -RIG_ENAVAIL;
if (caps->targetable_vfo || vfo == RIG_VFO_CURR ||
vfo == rig->state.current_vfo)
if ((caps->targetable_vfo&RIG_TARGETABLE_ALL) ||
vfo == RIG_VFO_CURR || vfo == rig->state.current_vfo)
return caps->get_dcs_code(rig, vfo, code);
if (!caps->set_vfo)
@ -2316,8 +2315,8 @@ int rig_set_ctcss_sql(RIG *rig, vfo_t vfo, tone_t tone)
if (caps->set_ctcss_sql == NULL)
return -RIG_ENAVAIL;
if (caps->targetable_vfo || vfo == RIG_VFO_CURR ||
vfo == rig->state.current_vfo)
if ((caps->targetable_vfo&RIG_TARGETABLE_ALL) ||
vfo == RIG_VFO_CURR || vfo == rig->state.current_vfo)
return caps->set_ctcss_sql(rig, vfo, tone);
if (!caps->set_vfo)
@ -2365,8 +2364,8 @@ int rig_get_ctcss_sql(RIG *rig, vfo_t vfo, tone_t *tone)
if (caps->get_ctcss_sql == NULL)
return -RIG_ENAVAIL;
if (caps->targetable_vfo || vfo == RIG_VFO_CURR ||
vfo == rig->state.current_vfo)
if ((caps->targetable_vfo&RIG_TARGETABLE_ALL) ||
vfo == RIG_VFO_CURR || vfo == rig->state.current_vfo)
return caps->get_ctcss_sql(rig, vfo, tone);
if (!caps->set_vfo)
@ -2410,8 +2409,8 @@ int rig_set_dcs_sql(RIG *rig, vfo_t vfo, tone_t code)
if (caps->set_dcs_sql == NULL)
return -RIG_ENAVAIL;
if (caps->targetable_vfo || vfo == RIG_VFO_CURR ||
vfo == rig->state.current_vfo)
if ((caps->targetable_vfo&RIG_TARGETABLE_ALL) ||
vfo == RIG_VFO_CURR || vfo == rig->state.current_vfo)
return caps->set_dcs_sql(rig, vfo, code);
if (!caps->set_vfo)
@ -2454,8 +2453,8 @@ int rig_get_dcs_sql(RIG *rig, vfo_t vfo, tone_t *code)
if (caps->get_dcs_sql == NULL)
return -RIG_ENAVAIL;
if (caps->targetable_vfo || vfo == RIG_VFO_CURR ||
vfo == rig->state.current_vfo)
if ((caps->targetable_vfo&RIG_TARGETABLE_ALL) ||
vfo == RIG_VFO_CURR || vfo == rig->state.current_vfo)
return caps->get_dcs_sql(rig, vfo, code);
if (!caps->set_vfo)
@ -2604,8 +2603,8 @@ int rig_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
if (caps->set_level == NULL || !rig_has_set_level(rig,level))
return -RIG_ENAVAIL;
if (caps->targetable_vfo || vfo == RIG_VFO_CURR ||
vfo == rig->state.current_vfo)
if ((caps->targetable_vfo&RIG_TARGETABLE_ALL) ||
vfo == RIG_VFO_CURR || vfo == rig->state.current_vfo)
return caps->set_level(rig, vfo, level, val);
if (!caps->set_vfo)
@ -2658,8 +2657,8 @@ int rig_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
if (caps->get_level == NULL || !rig_has_get_level(rig,level))
return -RIG_ENAVAIL;
if (caps->targetable_vfo || vfo == RIG_VFO_CURR ||
vfo == rig->state.current_vfo)
if ((caps->targetable_vfo&RIG_TARGETABLE_ALL) ||
vfo == RIG_VFO_CURR || vfo == rig->state.current_vfo)
return caps->get_level(rig, vfo, level, val);
if (!caps->set_vfo)
@ -2904,8 +2903,8 @@ int rig_set_func(RIG *rig, vfo_t vfo, setting_t func, int status)
if (caps->set_func == NULL || !rig_has_set_func(rig,func))
return -RIG_ENAVAIL;
if (caps->targetable_vfo || vfo == RIG_VFO_CURR ||
vfo == rig->state.current_vfo)
if ((caps->targetable_vfo&RIG_TARGETABLE_ALL) ||
vfo == RIG_VFO_CURR || vfo == rig->state.current_vfo)
return caps->set_func(rig, vfo, func, status);
if (!caps->set_vfo)
@ -2952,8 +2951,8 @@ int rig_get_func(RIG *rig, vfo_t vfo, setting_t func, int *status)
if (caps->get_func == NULL || !rig_has_get_func(rig,func))
return -RIG_ENAVAIL;
if (caps->targetable_vfo || vfo == RIG_VFO_CURR ||
vfo == rig->state.current_vfo)
if ((caps->targetable_vfo&RIG_TARGETABLE_ALL) ||
vfo == RIG_VFO_CURR || vfo == rig->state.current_vfo)
return caps->get_func(rig, vfo, func, status);
if (!caps->set_vfo)
@ -3056,8 +3055,8 @@ int rig_set_mem(RIG *rig, vfo_t vfo, int ch)
if (caps->set_mem == NULL)
return -RIG_ENAVAIL;
if (caps->targetable_vfo || vfo == RIG_VFO_CURR ||
vfo == rig->state.current_vfo)
if ((caps->targetable_vfo&RIG_TARGETABLE_ALL) ||
vfo == RIG_VFO_CURR || vfo == rig->state.current_vfo)
return caps->set_mem(rig, vfo, ch);
if (!caps->set_vfo)
@ -3102,8 +3101,8 @@ int rig_get_mem(RIG *rig, vfo_t vfo, int *ch)
if (caps->get_mem == NULL)
return -RIG_ENAVAIL;
if (caps->targetable_vfo || vfo == RIG_VFO_CURR ||
vfo == rig->state.current_vfo)
if ((caps->targetable_vfo&RIG_TARGETABLE_ALL) ||
vfo == RIG_VFO_CURR || vfo == rig->state.current_vfo)
return caps->get_mem(rig, vfo, ch);
if (!caps->set_vfo)
@ -3172,8 +3171,8 @@ int rig_vfo_op(RIG *rig, vfo_t vfo, vfo_op_t op)
if (caps->vfo_op == NULL || !rig_has_vfo_op(rig,op))
return -RIG_ENAVAIL;
if (caps->targetable_vfo || vfo == RIG_VFO_CURR ||
vfo == rig->state.current_vfo)
if ((caps->targetable_vfo&RIG_TARGETABLE_ALL) ||
vfo == RIG_VFO_CURR || vfo == rig->state.current_vfo)
return caps->vfo_op(rig, vfo, op);
if (!caps->set_vfo)
@ -3244,8 +3243,8 @@ int rig_scan(RIG *rig, vfo_t vfo, scan_t scan, int ch)
(scan!=RIG_SCAN_STOP && !rig_has_scan(rig, scan)))
return -RIG_ENAVAIL;
if (caps->targetable_vfo || vfo == RIG_VFO_CURR ||
vfo == rig->state.current_vfo)
if ((caps->targetable_vfo&RIG_TARGETABLE_ALL) ||
vfo == RIG_VFO_CURR || vfo == rig->state.current_vfo)
return caps->scan(rig, vfo, scan, ch);
if (!caps->set_vfo)
@ -3289,8 +3288,8 @@ int rig_send_dtmf(RIG *rig, vfo_t vfo, const char *digits)
if (caps->send_dtmf == NULL)
return -RIG_ENAVAIL;
if (caps->targetable_vfo || vfo == RIG_VFO_CURR ||
vfo == rig->state.current_vfo)
if ((caps->targetable_vfo&RIG_TARGETABLE_ALL) ||
vfo == RIG_VFO_CURR || vfo == rig->state.current_vfo)
return caps->send_dtmf(rig, vfo, digits);
if (!caps->set_vfo)
@ -3335,8 +3334,8 @@ int rig_recv_dtmf(RIG *rig, vfo_t vfo, char *digits, int *length)
if (caps->recv_dtmf == NULL)
return -RIG_ENAVAIL;
if (caps->targetable_vfo || vfo == RIG_VFO_CURR ||
vfo == rig->state.current_vfo)
if ((caps->targetable_vfo&RIG_TARGETABLE_ALL) ||
vfo == RIG_VFO_CURR || vfo == rig->state.current_vfo)
return caps->recv_dtmf(rig, vfo, digits, length);
if (!caps->set_vfo)
@ -3380,8 +3379,8 @@ int rig_send_morse(RIG *rig, vfo_t vfo, const char *msg)
if (caps->send_morse == NULL)
return -RIG_ENAVAIL;
if (caps->targetable_vfo || vfo == RIG_VFO_CURR ||
vfo == rig->state.current_vfo)
if ((caps->targetable_vfo&RIG_TARGETABLE_ALL) ||
vfo == RIG_VFO_CURR || vfo == rig->state.current_vfo)
return caps->send_morse(rig, vfo, msg);
if (!caps->set_vfo)
@ -3428,8 +3427,8 @@ int rig_set_bank(RIG *rig, vfo_t vfo, int bank)
if (caps->set_bank == NULL)
return -RIG_ENAVAIL;
if (caps->targetable_vfo || vfo == RIG_VFO_CURR ||
vfo == rig->state.current_vfo)
if ((caps->targetable_vfo&RIG_TARGETABLE_ALL) ||
vfo == RIG_VFO_CURR || vfo == rig->state.current_vfo)
return caps->set_bank(rig, vfo, bank);
if (!caps->set_vfo)

4
yaesu/ft847.c
Wyświetl plik

@ -6,7 +6,7 @@
* via serial interface to an FT-847 using the "CAT" interface.
*
*
* $Id: ft847.c,v 1.17 2001-12-11 22:04:45 fillods Exp $
* $Id: ft847.c,v 1.18 2001-12-16 11:17:42 fillods Exp $
*
*
*
@ -219,7 +219,7 @@ attenuator: { RIG_DBLST_END, },
max_rit: Hz(9999),
max_xit: Hz(0),
max_ifshift: Hz(0),
targetable_vfo: 1,
targetable_vfo: RIG_TARGETABLE_FREQ,
transceive: RIG_TRN_OFF,
bank_qty: 0,
chan_desc_sz: 0,