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

Change freq & chan struct start/end to avoid colliding with LUA SWIG start/end

pull/124/head
Michael Black 2019-08-17 23:20:48 -05:00
rodzic 6ae564a1ec
commit 73c1ecd165
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 6599353EC683404D
42 zmienionych plików z 212 dodań i 212 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

10
aor/aor.c
Wyświetl plik

@ -1023,8 +1023,8 @@ int aor_get_channel(RIG *rig, channel_t *chan)
* find mem_caps in caps, we'll need it later
*/
for (i=0; i<CHANLSTSIZ && !RIG_IS_CHAN_END(chan_list[i]); i++) {
if (channel_num >= chan_list[i].start &&
channel_num <= chan_list[i].end) {
if (channel_num >= chan_list[i].startc &&
channel_num <= chan_list[i].endc) {
mem_caps = &chan_list[i].mem_caps;
break;
}
@ -1083,10 +1083,10 @@ int aor_get_chan_all_cb (RIG * rig, chan_cb_t chan_cb, rig_ptr_t arg)
char aorcmd[BUFSZ];
int cmd_len, chan_len;
char chanbuf[BUFSZ];
int chan_next = chan_list[0].start;
int chan_next = chan_list[0].startc;
chan_count = chan_list[0].end - chan_list[0].start + 1;
chan_count = chan_list[0].endc - chan_list[0].startc + 1;
/*
* setting chan to NULL means the application
@ -1123,7 +1123,7 @@ int aor_get_chan_all_cb (RIG * rig, chan_cb_t chan_cb, rig_ptr_t arg)
return retval;
/* notify the end? */
chan_next = chan_next < chan_list[i].end ? chan_next+1 : chan_next;
chan_next = chan_next < chan_list[i].endc ? chan_next+1 : chan_next;
/*
* provide application with channel data,

4
aor/ar7030p.c
Wyświetl plik

@ -478,8 +478,8 @@ static int ar7030p_set_freq( RIG * rig, vfo_t vfo, freq_t freq )
{
caps = rig->caps;
if ( ( caps->rx_range_list1[ 0 ].end > freq ) &&
( caps->rx_range_list1[ 0 ].start < freq ) )
if ( ( caps->rx_range_list1[ 0 ].endf > freq ) &&
( caps->rx_range_list1[ 0 ].startf < freq ) )
{
switch( vfo )
{

8
aor/sr2200.c
Wyświetl plik

@ -323,15 +323,15 @@ int sr2200_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
ret_freq_len = BUFSZ;
if (freq < sr2200_caps.rx_range_list1[0].start) {
if (freq < sr2200_caps.rx_range_list1[0].startf) {
rig_debug(RIG_DEBUG_WARN, "Error in %s: frequency is lower than minimum supported value (%.0f Hz)\n",
__FUNCTION__, sr2200_caps.rx_range_list1[0].start);
__FUNCTION__, sr2200_caps.rx_range_list1[0].startf);
return -RIG_EPROTO;
}
if (freq > sr2200_caps.rx_range_list1[0].end) {
if (freq > sr2200_caps.rx_range_list1[0].endf) {
rig_debug(RIG_DEBUG_WARN, "Error in %s: frequency is higher than maximum supported value (%.0f Hz)\n",
__FUNCTION__, sr2200_caps.rx_range_list1[0].end);
__FUNCTION__, sr2200_caps.rx_range_list1[0].endf);
return -RIG_EPROTO;
}

2
barrett/barrett.c
Wyświetl plik

@ -112,7 +112,7 @@ const struct rig_caps barrett_caps = {
// .vfo_ops = DUMMY_VFO_OP,
.transceive = RIG_TRN_RIG,
.rx_range_list1 = {{
.start = kHz(1600), .end = MHz(30), .modes = BARRETT_MODES,
.startf = kHz(1600), .endf = MHz(30), .modes = BARRETT_MODES,
.low_power = -1, .high_power = -1, BARRETT_VFOS, RIG_ANT_1
},
RIG_FRNG_END,

4
c++/rigclass.cc
Wyświetl plik

@ -681,7 +681,7 @@ rmode_t Rig::RngRxModes (freq_t freq)
if (RIG_IS_FRNG_END(*rng)) {
return (rmode_t)modes;
}
if (freq >= rng->start && freq <= rng->end)
if (freq >= rng->startf && freq <= rng->endf)
modes |= (unsigned)rng->modes;
}
@ -699,7 +699,7 @@ rmode_t Rig::RngTxModes (freq_t freq)
if (RIG_IS_FRNG_END(*rng)) {
return (rmode_t)modes;
}
if (freq >= rng->start && freq <= rng->end)
if (freq >= rng->startf && freq <= rng->endf)
modes |= (unsigned)rng->modes;
}

6
dummy/dummy.c
Wyświetl plik

@ -1554,13 +1554,13 @@ const struct rig_caps dummy_caps = {
.transceive = RIG_TRN_OFF,
.attenuator = { 10, 20, 30, RIG_DBLST_END, },
.preamp = { 10, RIG_DBLST_END, },
.rx_range_list1 = { {.start=kHz(150),.end=MHz(1500),.modes=DUMMY_MODES,
.rx_range_list1 = { {.startf=kHz(150),.endf=MHz(1500),.modes=DUMMY_MODES,
.low_power=-1,.high_power=-1,DUMMY_VFOS, RIG_ANT_1|RIG_ANT_2},
RIG_FRNG_END, },
.tx_range_list1 = { {.start=kHz(150),.end=MHz(1500),.modes=DUMMY_MODES,
.tx_range_list1 = { {.startf=kHz(150),.endf=MHz(1500),.modes=DUMMY_MODES,
.low_power=W(5),.high_power=W(100),DUMMY_VFOS, RIG_ANT_1|RIG_ANT_2},
RIG_FRNG_END, },
.rx_range_list2 = { {.start=kHz(150),.end=MHz(1500),.modes=DUMMY_MODES,
.rx_range_list2 = { {.startf=kHz(150),.endf=MHz(1500),.modes=DUMMY_MODES,
.low_power=-1,.high_power=-1,DUMMY_VFOS, RIG_ANT_1|RIG_ANT_2},
RIG_FRNG_END, },
.tx_range_list2 = { RIG_FRNG_END, },

4
dummy/flrig.c
Wyświetl plik

@ -127,14 +127,14 @@ const struct rig_caps flrig_caps = {
},
.rx_range_list1 = {{
.start = kHz(1),.end = GHz(10),.modes = FLRIG_MODES,
.startf = kHz(1),.endf = GHz(10),.modes = FLRIG_MODES,
.low_power = -1,.high_power = -1, FLRIG_VFOS, RIG_ANT_1
},
RIG_FRNG_END,
},
.tx_range_list1 = {RIG_FRNG_END,},
.rx_range_list2 = {{
.start = kHz(1),.end = GHz(10),.modes = FLRIG_MODES,
.startf = kHz(1),.endf = GHz(10),.modes = FLRIG_MODES,
.low_power = -1,.high_power = -1, FLRIG_VFOS, RIG_ANT_1
},
RIG_FRNG_END,

8
dummy/netrigctl.c
Wyświetl plik

@ -243,8 +243,8 @@ static int netrigctl_open(RIG *rig)
}
ret = num_sscanf(buf, "%"SCNfreq"%"SCNfreq"%"SCNXll"%d%d%x%x",
&rs->rx_range_list[i].start,
&rs->rx_range_list[i].end,
&rs->rx_range_list[i].startf,
&rs->rx_range_list[i].endf,
&rs->rx_range_list[i].modes,
&rs->rx_range_list[i].low_power,
&rs->rx_range_list[i].high_power,
@ -273,8 +273,8 @@ static int netrigctl_open(RIG *rig)
}
ret = num_sscanf(buf, "%"SCNfreq"%"SCNfreq"%"SCNXll"%d%d%x%x",
&rs->tx_range_list[i].start,
&rs->tx_range_list[i].end,
&rs->tx_range_list[i].startf,
&rs->tx_range_list[i].endf,
&rs->tx_range_list[i].modes,
&rs->tx_range_list[i].low_power,
&rs->tx_range_list[i].high_power,

4
dummy/trxmanager.c
Wyświetl plik

@ -135,14 +135,14 @@ struct rig_caps trxmanager_caps = {
},
.rx_range_list1 = {{
.start = kHz(1),.end = GHz(10),.modes = TRXMANAGER_MODES,
.startf = kHz(1),.endf = GHz(10),.modes = TRXMANAGER_MODES,
.low_power = -1,.high_power = -1, TRXMANAGER_VFOS, RIG_ANT_1
},
RIG_FRNG_END,
},
.tx_range_list1 = {RIG_FRNG_END,},
.rx_range_list2 = {{
.start = kHz(1),.end = GHz(10),.modes = TRXMANAGER_MODES,
.startf = kHz(1),.endf = GHz(10),.modes = TRXMANAGER_MODES,
.low_power = -1,.high_power = -1, TRXMANAGER_VFOS, RIG_ANT_1
},
RIG_FRNG_END,

8
flexradio/dttsp.c
Wyświetl plik

@ -186,11 +186,11 @@ const struct rig_caps dttsp_rig_caps = {
.attenuator = { RIG_DBLST_END, },
.preamp = { RIG_DBLST_END, },
/* In fact, RX and TX ranges are dependant on the tuner */
.rx_range_list1 = { {.start=kHz(150),.end=MHz(1500),.modes=DTTSP_MODES,
.rx_range_list1 = { {.startf=kHz(150),.endf=MHz(1500),.modes=DTTSP_MODES,
.low_power=-1,.high_power=-1,DTTSP_VFO},
RIG_FRNG_END, },
.tx_range_list1 = { RIG_FRNG_END, }, /* TODO */
.rx_range_list2 = { {.start=kHz(150),.end=MHz(1500),.modes=DTTSP_MODES,
.rx_range_list2 = { {.startf=kHz(150),.endf=MHz(1500),.modes=DTTSP_MODES,
.low_power=-1,.high_power=-1,DTTSP_VFO},
RIG_FRNG_END, },
.tx_range_list2 = { RIG_FRNG_END, }, /* TODO */
@ -263,11 +263,11 @@ const struct rig_caps dttsp_udp_rig_caps = {
.attenuator = { RIG_DBLST_END, },
.preamp = { RIG_DBLST_END, },
/* In fact, RX and TX ranges are dependant on the tuner */
.rx_range_list1 = { {.start=kHz(150),.end=MHz(1500),.modes=DTTSP_MODES,
.rx_range_list1 = { {.startf=kHz(150),.endf=MHz(1500),.modes=DTTSP_MODES,
.low_power=-1,.high_power=-1,DTTSP_VFO},
RIG_FRNG_END, },
.tx_range_list1 = { RIG_FRNG_END, }, /* TODO */
.rx_range_list2 = { {.start=kHz(150),.end=MHz(1500),.modes=DTTSP_MODES,
.rx_range_list2 = { {.startf=kHz(150),.endf=MHz(1500),.modes=DTTSP_MODES,
.low_power=-1,.high_power=-1,DTTSP_VFO},
RIG_FRNG_END, },
.tx_range_list2 = { RIG_FRNG_END, }, /* TODO */

4
flexradio/sdr1k.c
Wyświetl plik

@ -145,7 +145,7 @@ const struct rig_caps sdr1k_rig_caps = {
.attenuator = { RIG_DBLST_END, },
.preamp = { 14, RIG_DBLST_END, },
.rx_range_list1 = { {.start=Hz(1),.end=MHz(65),.modes=SDR1K_MODES,
.rx_range_list1 = { {.startf=Hz(1),.endf=MHz(65),.modes=SDR1K_MODES,
.low_power=-1,.high_power=-1,SDR1K_VFO},
RIG_FRNG_END, },
.tx_range_list1 = {
@ -154,7 +154,7 @@ const struct rig_caps sdr1k_rig_caps = {
FRQ_RNG_6m(1,SDR1K_MODES, W(1),W(1),SDR1K_VFO,SDR1K_ANTS),
RIG_FRNG_END, },
.rx_range_list2 = { {.start=Hz(1),.end=MHz(65),.modes=SDR1K_MODES,
.rx_range_list2 = { {.startf=Hz(1),.endf=MHz(65),.modes=SDR1K_MODES,
.low_power=-1,.high_power=-1,SDR1K_VFO},
RIG_FRNG_END, },
.tx_range_list2 = {

12
icom/ic910.c
Wyświetl plik

@ -73,18 +73,18 @@ static int compareFrequencies(RIG *rig, freq_t freq1, freq_t freq2)
int freq1band = 0, freq2band = 0;
freq_range_t noband = RIG_FRNG_END;
while (rig->caps->rx_range_list1[freq1band].start != noband.start) {
if (freq1 >= rig->caps->rx_range_list1[freq1band].start &&
freq1 <= rig->caps->rx_range_list1[freq1band].end)
while (rig->caps->rx_range_list1[freq1band].startf != noband.startf) {
if (freq1 >= rig->caps->rx_range_list1[freq1band].startf &&
freq1 <= rig->caps->rx_range_list1[freq1band].endf)
break;
++freq1band;
//fprintf(stderr, "%i\n", freq1band);
}
while (rig->caps->rx_range_list1[freq2band].start != noband.start) {
if (freq2 >= rig->caps->rx_range_list1[freq2band].start &&
freq2 <= rig->caps->rx_range_list1[freq2band].end)
while (rig->caps->rx_range_list1[freq2band].startf != noband.startf) {
if (freq2 >= rig->caps->rx_range_list1[freq2band].startf &&
freq2 <= rig->caps->rx_range_list1[freq2band].endf)
break;
++freq2band;

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

@ -72,9 +72,9 @@
defined __xlC__
# define thread_local __thread
# else
# warn "Please see if you can find a thread_local definition for this compiler"
# warn "You can comment out the error after this line but rigctld will not be thread safe for vfo_mode and ext_resp and will require up to 4 rigctld's for the 4 possible combinations of vfo_mode and ext_resp"
# error "Cannot define thread_local"
# pragma warning "Please see if you can find a thread_local definition for this compiler"
# pragma warning "You can comment out the error after this line but rigctld will not be thread safe for vfo_mode and ext_resp and will require up to 4 rigctld's for the 4 possible combinations of vfo_mode and ext_resp"
# pragma error "Cannot define thread_local"
# define thread_local
# endif
#endif
@ -107,7 +107,7 @@
double-precision floating point type internally for number
representations (max 53 bits of precision) so makes a string
constant from a constant number literal using ull */
#define CONSTANT_64BIT_FLAG(BIT) (1 << (BIT))
#define CONSTANT_64BIT_FLAG(BIT) (1ull << (BIT))
#endif
__BEGIN_DECLS
@ -1019,8 +1019,8 @@ typedef uint64_t rmode_t;
* what frequencies your rig has access to.
*/
typedef struct freq_range_list {
freq_t start; /*!< Start frequency */
freq_t end; /*!< End frequency */
freq_t startf; /*!< Start frequency */
freq_t endf; /*!< End frequency */
rmode_t modes; /*!< Bit field of RIG_MODE's */
int low_power; /*!< Lower RF power in mW, -1 for no power (ie. rx list) */
int high_power; /*!< Higher RF power in mW, -1 for no power (ie. rx list) */
@ -1029,7 +1029,7 @@ typedef struct freq_range_list {
} freq_range_t;
#define RIG_FRNG_END {Hz(0),Hz(0),RIG_MODE_NONE,0,0,RIG_VFO_NONE}
#define RIG_IS_FRNG_END(r) ((r).start == Hz(0) && (r).end == Hz(0))
#define RIG_IS_FRNG_END(r) ((r).startf == Hz(0) && (r).endf == Hz(0))
#define RIG_ITU_REGION1 1
@ -1249,8 +1249,8 @@ typedef enum {
\endcode
*/
struct chan_list {
int start; /*!< Starting memory channel \b number */
int end; /*!< Ending memory channel \b number */
int startc; /*!< Starting memory channel \b number */
int endc; /*!< Ending memory channel \b number */
chan_type_t type; /*!< Memory type. see chan_type_t */
channel_cap_t
mem_caps; /*!< Definition of attributes that can be stored/retrieved */

2
jrc/jrc.c
Wyświetl plik

@ -1115,7 +1115,7 @@ int jrc_set_mem(RIG *rig, vfo_t vfo, int ch)
char membuf[BUFSZ];
int cmd_len, mem_len;
if (ch < 0 || ch > rig->caps->chan_list[0].end)
if (ch < 0 || ch > rig->caps->chan_list[0].endc)
return -RIG_EINVAL;
cmd_len = sprintf(cmdbuf, "C%03u" EOM, ch);

16
kenwood/th.c
Wyświetl plik

@ -1970,7 +1970,7 @@ int th_get_channel(RIG *rig, channel_t *chan)
mr_extra = "0, ";
}
channel_num -= chan_caps->start;
channel_num -= chan_caps->startc;
switch (chan_caps->type)
{
@ -2002,7 +2002,7 @@ int th_get_channel(RIG *rig, channel_t *chan)
break;
case RIG_MTYPE_PRIO:
if (chan_caps->start == chan_caps->end)
if (chan_caps->startc == chan_caps->endc)
{
snprintf(req, sizeof(req), "MR %s0,PR", mr_extra);
sprintf(chan->channel_desc, "Pr");
@ -2018,8 +2018,8 @@ int th_get_channel(RIG *rig, channel_t *chan)
case RIG_MTYPE_CALL:
sprintf(req, "CR 0,%01d", channel_num);
if (chan->channel_num == chan_caps->start) { sprintf(chan->channel_desc, "Call V"); }
else if (chan->channel_num == chan_caps->end) { sprintf(chan->channel_desc, "Call U"); }
if (chan->channel_num == chan_caps->startc) { sprintf(chan->channel_desc, "Call V"); }
else if (chan->channel_num == chan_caps->endc) { sprintf(chan->channel_desc, "Call U"); }
else { sprintf(chan->channel_desc, "Call"); }
break;
@ -2164,7 +2164,7 @@ int th_get_channel(RIG *rig, channel_t *chan)
chan->tx_freq = RIG_FREQ_NONE;
if (shift == RIG_RPT_SHIFT_NONE &&
((chan_caps->type == RIG_MTYPE_MEM && chan_caps->start == 0) ||
((chan_caps->type == RIG_MTYPE_MEM && chan_caps->startc == 0) ||
chan_caps->type == RIG_MTYPE_CALL))
{
/* split ? */
@ -2335,7 +2335,7 @@ int th_set_channel(RIG *rig, const channel_t *chan)
return -RIG_ECONF;
}
channel_num -= chan_caps->start;
channel_num -= chan_caps->startc;
}
else
{
@ -2385,7 +2385,7 @@ int th_set_channel(RIG *rig, const channel_t *chan)
break;
case RIG_MTYPE_PRIO:
if (chan_caps->start == chan_caps->end)
if (chan_caps->startc == chan_caps->endc)
{
sprintf(req, "MW %s0,PR", mr_extra);
}
@ -2468,7 +2468,7 @@ int th_set_channel(RIG *rig, const channel_t *chan)
/* split ? */
if (chan->tx_freq != RIG_FREQ_NONE &&
((chan_caps->type == RIG_MTYPE_MEM && chan_caps->start == 0) ||
((chan_caps->type == RIG_MTYPE_MEM && chan_caps->startc == 0) ||
chan_caps->type == RIG_MTYPE_CALL))
{

8
kenwood/thg71.c
Wyświetl plik

@ -433,11 +433,11 @@ int thg71_open(RIG *rig)
stru=strtok(NULL,",");
if(strl==NULL && stru==NULL)
break;
frng.start=MHz(atoi(strl));
frng.end=MHz(atoi(stru));
frng.startf=MHz(atoi(strl));
frng.endf=MHz(atoi(stru));
frng.vfo=RIG_VFO_A;
frng.ant=0;
if(frng.end<=MHz(135))
if(frng.endf<=MHz(135))
frng.modes=RIG_MODE_AM;
else
frng.modes=RIG_MODE_FM;
@ -445,7 +445,7 @@ int thg71_open(RIG *rig)
frng.high_power=-1;
frng.low_power=-1;
rig->state.rx_range_list[i]=frng;
if(frng.start> MHz(200))
if(frng.startf> MHz(200))
frng.high_power=mW(5500);
else
frng.high_power=mW(6000);

4
kit/fifisdr.c
Wyświetl plik

@ -171,7 +171,7 @@ const struct rig_caps fifisdr_caps = {
.rx_range_list1 = {
{
.start = kHz(39.1), .end = MHz(175.0),
.startf = kHz(39.1), .endf = MHz(175.0),
.modes = RIG_MODE_AM | RIG_MODE_SSB | RIG_MODE_FM,
.low_power = -1, .high_power = -1,
.vfo = RIG_VFO_A, .ant = RIG_ANT_1
@ -181,7 +181,7 @@ const struct rig_caps fifisdr_caps = {
.tx_range_list1 = { RIG_FRNG_END, },
.rx_range_list2 = {
{
.start = kHz(39.1), .end = MHz(175.0),
.startf = kHz(39.1), .endf = MHz(175.0),
.modes = RIG_MODE_AM | RIG_MODE_SSB | RIG_MODE_FM,
.low_power = -1, .high_power = -1,
.vfo = RIG_VFO_A, .ant = RIG_ANT_1

8
kit/hiqsdr.c
Wyświetl plik

@ -129,16 +129,16 @@ const struct rig_caps hiqsdr_caps = {
.attenuator = { 2, 4, 6, 10, 20, 30, 44, RIG_DBLST_END }, // -2dB steps in fact
.preamp = { 10, RIG_DBLST_END, }, // TODO
.rx_range_list1 = { {.start=kHz(100),.end=MHz(66),.modes=HIQSDR_MODES,
.rx_range_list1 = { {.startf=kHz(100),.endf=MHz(66),.modes=HIQSDR_MODES,
.low_power=-1,.high_power=-1,HIQSDR_VFO,HIQSDR_ANT},
RIG_FRNG_END, },
.tx_range_list1 = { {.start=kHz(100),.end=MHz(66),.modes=HIQSDR_MODES,
.tx_range_list1 = { {.startf=kHz(100),.endf=MHz(66),.modes=HIQSDR_MODES,
.low_power=mW(1),.high_power=mW(50),HIQSDR_VFO,HIQSDR_ANT},
RIG_FRNG_END, },
.rx_range_list2 = { {.start=kHz(100),.end=MHz(66),.modes=HIQSDR_MODES,
.rx_range_list2 = { {.startf=kHz(100),.endf=MHz(66),.modes=HIQSDR_MODES,
.low_power=-1,.high_power=-1,HIQSDR_VFO,HIQSDR_ANT},
RIG_FRNG_END, },
.tx_range_list2 = { {.start=kHz(100),.end=MHz(66),.modes=HIQSDR_MODES,
.tx_range_list2 = { {.startf=kHz(100),.endf=MHz(66),.modes=HIQSDR_MODES,
.low_power=mW(1),.high_power=mW(50),HIQSDR_VFO,HIQSDR_ANT},
RIG_FRNG_END, },
.tuning_steps = { {HIQSDR_MODES,1}, RIG_TS_END, },

4
kit/miniVNA.c
Wyświetl plik

@ -77,9 +77,9 @@ const struct rig_caps miniVNA_caps = {
.timeout = 1000,
.retry = 3,
.rx_range_list1 = { {.start=kHz(100),.end=MHz(180),.modes=RIG_MODE_NONE, .low_power=-1,.high_power=-1,RIG_VFO_A},
.rx_range_list1 = { {.startf=kHz(100),.endf=MHz(180),.modes=RIG_MODE_NONE, .low_power=-1,.high_power=-1,RIG_VFO_A},
RIG_FRNG_END, },
.tx_range_list1 = { {.start=kHz(100),.end=MHz(180),.modes=RIG_MODE_NONE, .low_power=-1,.high_power=-1,RIG_VFO_A},
.tx_range_list1 = { {.startf=kHz(100),.endf=MHz(180),.modes=RIG_MODE_NONE, .low_power=-1,.high_power=-1,RIG_VFO_A},
RIG_FRNG_END, },
.tuning_steps = { {RIG_MODE_NONE,1}, RIG_TS_END, },

18
kit/rs_hfiq.c
Wyświetl plik

@ -177,17 +177,17 @@ const struct rig_caps rshfiq_caps = {
.timeout = 1000,
.retry = 3,
.rx_range_list1 = { {.start=kHz(3500),.end=MHz(30),.modes=RIG_MODE_NONE, .low_power=-1,.high_power=-1,RIG_VFO_A},
.rx_range_list1 = { {.startf=kHz(3500),.endf=MHz(30),.modes=RIG_MODE_NONE, .low_power=-1,.high_power=-1,RIG_VFO_A},
RIG_FRNG_END, },
.rx_range_list2 = { {.start=kHz(3500),.end=MHz(30),.modes=RIG_MODE_NONE, .low_power=-1,.high_power=-1,RIG_VFO_A},
.rx_range_list2 = { {.startf=kHz(3500),.endf=MHz(30),.modes=RIG_MODE_NONE, .low_power=-1,.high_power=-1,RIG_VFO_A},
RIG_FRNG_END, },
.tx_range_list1 = { {.start=kHz(3500),.end=kHz(3800),.modes=RIG_MODE_NONE, .low_power=-1,.high_power=-1,RIG_VFO_A},
{.start=kHz(7000),.end=kHz(7200),.modes=RIG_MODE_NONE, .low_power=-1,.high_power=-1,RIG_VFO_A},
{.start=kHz(10100),.end=kHz(10150),.modes=RIG_MODE_NONE, .low_power=-1,.high_power=-1,RIG_VFO_A},
{.start=MHz(14),.end=kHz(14350),.modes=RIG_MODE_NONE, .low_power=-1,.high_power=-1,RIG_VFO_A},
{.start=MHz(21),.end=kHz(21450),.modes=RIG_MODE_NONE, .low_power=-1,.high_power=-1,RIG_VFO_A},
{.start=kHz(24890),.end=kHz(24990),.modes=RIG_MODE_NONE, .low_power=-1,.high_power=-1,RIG_VFO_A},
{.start=MHz(28),.end=kHz(29700),.modes=RIG_MODE_NONE, .low_power=-1,.high_power=-1,RIG_VFO_A},
.tx_range_list1 = { {.startf=kHz(3500),.endf=kHz(3800),.modes=RIG_MODE_NONE, .low_power=-1,.high_power=-1,RIG_VFO_A},
{.startf=kHz(7000),.endf=kHz(7200),.modes=RIG_MODE_NONE, .low_power=-1,.high_power=-1,RIG_VFO_A},
{.startf=kHz(10100),.endf=kHz(10150),.modes=RIG_MODE_NONE, .low_power=-1,.high_power=-1,RIG_VFO_A},
{.startf=MHz(14),.endf=kHz(14350),.modes=RIG_MODE_NONE, .low_power=-1,.high_power=-1,RIG_VFO_A},
{.startf=MHz(21),.endf=kHz(21450),.modes=RIG_MODE_NONE, .low_power=-1,.high_power=-1,RIG_VFO_A},
{.startf=kHz(24890),.endf=kHz(24990),.modes=RIG_MODE_NONE, .low_power=-1,.high_power=-1,RIG_VFO_A},
{.startf=MHz(28),.endf=kHz(29700),.modes=RIG_MODE_NONE, .low_power=-1,.high_power=-1,RIG_VFO_A},
RIG_FRNG_END, },
.tuning_steps = { {RIG_MODE_NONE,Hz(1)}, RIG_TS_END, },

16
src/mem.c
Wyświetl plik

@ -963,7 +963,7 @@ int get_chan_all_cb_generic(RIG *rig, chan_cb_t chan_cb, rig_ptr_t arg)
* future data for channel channel_num
*/
chan = NULL;
retval = chan_cb(rig, &chan, chan_list[i].start, chan_list, arg);
retval = chan_cb(rig, &chan, chan_list[i].startc, chan_list, arg);
if (retval != RIG_OK)
{
@ -975,7 +975,7 @@ int get_chan_all_cb_generic(RIG *rig, chan_cb_t chan_cb, rig_ptr_t arg)
return -RIG_ENOMEM;
}
for (j = chan_list[i].start; j <= chan_list[i].end; j++)
for (j = chan_list[i].startc; j <= chan_list[i].endc; j++)
{
int chan_next;
@ -1002,7 +1002,7 @@ int get_chan_all_cb_generic(RIG *rig, chan_cb_t chan_cb, rig_ptr_t arg)
return retval;
}
chan_next = j < chan_list[i].end ? j + 1 : j;
chan_next = j < chan_list[i].endc ? j + 1 : j;
chan_cb(rig, &chan, chan_next, chan_list, arg);
}
@ -1021,7 +1021,7 @@ int set_chan_all_cb_generic(RIG *rig, chan_cb_t chan_cb, rig_ptr_t arg)
for (i = 0; !RIG_IS_CHAN_END(chan_list[i]) && i < CHANLSTSIZ; i++)
{
for (j = chan_list[i].start; j <= chan_list[i].end; j++)
for (j = chan_list[i].startc; j <= chan_list[i].endc; j++)
{
chan_cb(rig, &chan, j, chan_list, arg);
@ -1585,7 +1585,7 @@ const chan_t *HAMLIB_API rig_lookup_mem_caps(RIG *rig, int ch)
{
memset(&chan_list_all, 0, sizeof(chan_list_all));
chan_list = rig->state.chan_list;
chan_list_all.start = chan_list[0].start;
chan_list_all.startc = chan_list[0].startc;
chan_list_all.type = RIG_MTYPE_NONE; /* meaningless */
for (i = 0; i < CHANLSTSIZ && !RIG_IS_CHAN_END(chan_list[i]); i++)
@ -1604,7 +1604,7 @@ const chan_t *HAMLIB_API rig_lookup_mem_caps(RIG *rig, int ch)
}
/* til the end, most probably meaningless */
chan_list_all.end = chan_list[i].end;
chan_list_all.endc = chan_list[i].endc;
}
return &chan_list_all;
@ -1614,7 +1614,7 @@ const chan_t *HAMLIB_API rig_lookup_mem_caps(RIG *rig, int ch)
for (i = 0; i < CHANLSTSIZ && !RIG_IS_CHAN_END(chan_list[i]); i++)
{
if (ch >= chan_list[i].start && ch <= chan_list[i].end)
if (ch >= chan_list[i].startc && ch <= chan_list[i].endc)
{
return &chan_list[i];
}
@ -1649,7 +1649,7 @@ int HAMLIB_API rig_mem_count(RIG *rig)
for (i = 0; i < CHANLSTSIZ && !RIG_IS_CHAN_END(chan_list[i]); i++)
{
count += chan_list[i].end - chan_list[i].start + 1;
count += chan_list[i].endc - chan_list[i].startc + 1;
}
return count;

4
src/rig.c
Wyświetl plik

@ -4373,12 +4373,12 @@ const freq_range_t * HAMLIB_API rig_get_range(const freq_range_t range_list[],
for (i = 0; i < FRQRANGESIZ; i++)
{
if (range_list[i].start == 0 && range_list[i].end == 0)
if (range_list[i].startf == 0 && range_list[i].endf == 0)
{
return NULL;
}
if (freq >= range_list[i].start && freq <= range_list[i].end &&
if (freq >= range_list[i].startf && freq <= range_list[i].endf &&
(range_list[i].modes & mode))
{
return &range_list[i];

4
tentec/orion.c
Wyświetl plik

@ -334,11 +334,11 @@ int tt565_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
in_range = FALSE;
for (i=0; i<FRQRANGESIZ; i++) {
this_range = rig->state.rx_range_list[i];
if (this_range.start == 0 && this_range.end == 0) {
if (this_range.startf == 0 && this_range.endf == 0) {
break; /* have come to early end of range list */
}
/* We don't care about mode setting, but vfo must match. */
if (freq >= this_range.start && freq <= this_range.end &&
if (freq >= this_range.startf && freq <= this_range.endf &&
( this_range.vfo == rig->state.current_vfo )) {
in_range = TRUE;
break;

12
tests/dumpcaps.c
Wyświetl plik

@ -418,8 +418,8 @@ int dumpcaps(RIG *rig, FILE *fout)
{
fprintf(fout,
"\n\t%d..%d: \t%s",
caps->chan_list[i].start,
caps->chan_list[i].end,
caps->chan_list[i].startc,
caps->chan_list[i].endc,
rig_strmtype(caps->chan_list[i].type));
fprintf(fout, "\n\t Mem caps: ");
dump_chan_caps(&caps->chan_list[i].mem_caps, fout);
@ -754,11 +754,11 @@ void range_print(FILE *fout, const struct freq_range_list range_list[], int rx)
char prntbuf[1024]; /* a malloc would be better.. */
for (i = 0; i < FRQRANGESIZ; i++) {
if (range_list[i].start == 0 && range_list[i].end == 0) {
if (range_list[i].startf == 0 && range_list[i].endf == 0) {
break;
}
fprintf(fout, "\t%.0f Hz - %.0f Hz\n", range_list[i].start, range_list[i].end);
fprintf(fout, "\t%.0f Hz - %.0f Hz\n", range_list[i].startf, range_list[i].endf);
fprintf(fout, "\t\tVFO list: ");
sprintf_vfo(prntbuf, range_list[i].vfo);
@ -800,12 +800,12 @@ int range_sanity_check(const struct freq_range_list range_list[], int rx)
for (i = 0; i < FRQRANGESIZ; i++)
{
if (range_list[i].start == 0 && range_list[i].end == 0)
if (range_list[i].startf == 0 && range_list[i].endf == 0)
{
break;
}
if (range_list[i].start > range_list[i].end)
if (range_list[i].startf > range_list[i].endf)
{
return -1;
}

2
tests/memcsv.c
Wyświetl plik

@ -746,7 +746,7 @@ int set_channel_data(RIG *rig,
/* find chanel caps of appropriate memory group? */
for (j = 0; j < CHANLSTSIZ; j++)
{
if (rig->state.chan_list[j].start <= n && rig->state.chan_list[j].end >= n)
if (rig->state.chan_list[j].startc <= n && rig->state.chan_list[j].endc >= n)
{
break;
}

8
tests/rigctl_parse.c
Wyświetl plik

@ -3784,8 +3784,8 @@ declare_proto_rig(dump_state)
{
fprintf(fout,
"%"FREQFMT" %"FREQFMT" 0x%"PRXll" %d %d 0x%x 0x%x\n",
rs->rx_range_list[i].start,
rs->rx_range_list[i].end,
rs->rx_range_list[i].startf,
rs->rx_range_list[i].endf,
rs->rx_range_list[i].modes,
rs->rx_range_list[i].low_power,
rs->rx_range_list[i].high_power,
@ -3799,8 +3799,8 @@ declare_proto_rig(dump_state)
{
fprintf(fout,
"%"FREQFMT" %"FREQFMT" 0x%"PRXll" %d %d 0x%x 0x%x\n",
rs->tx_range_list[i].start,
rs->tx_range_list[i].end,
rs->tx_range_list[i].startf,
rs->tx_range_list[i].endf,
rs->tx_range_list[i].modes,
rs->tx_range_list[i].low_power,
rs->tx_range_list[i].high_power,

4
tests/rigmem.c
Wyświetl plik

@ -475,8 +475,8 @@ int clear_chans(RIG *rig, const char *infilename)
for (i = 0; rig->state.chan_list[i].type && i < CHANLSTSIZ; i++)
{
for (j = rig->state.chan_list[i].start;
j <= rig->state.chan_list[i].end; j++)
for (j = rig->state.chan_list[i].startc;
j <= rig->state.chan_list[i].endc; j++)
{
chan.channel_num = j;

4
tuner/v4l.c
Wyświetl plik

@ -176,8 +176,8 @@ int v4l_open(RIG *rig)
break;
fact = (vt.flags & VIDEO_TUNER_LOW) == 0 ? 16 : 16000;
rs->rx_range_list[i].start = vt.rangelow/fact;
rs->rx_range_list[i].end = vt.rangehigh/fact;
rs->rx_range_list[i].startf = vt.rangelow/fact;
rs->rx_range_list[i].endf = vt.rangehigh/fact;
rs->rx_range_list[i].modes = vt.rangehigh/fact < MHz(30) ? RIG_MODE_AM : RIG_MODE_WFM;
/* hack! hack! store the resolution in low_power! */
rs->rx_range_list[i].low_power = rint(fact);

4
tuner/v4l2.c
Wyświetl plik

@ -176,8 +176,8 @@ int v4l2_open(RIG *rig)
break;
fact = (vt.capability & V4L2_TUNER_CAP_LOW) == 0 ? 16 : 16000;
rs->rx_range_list[i].start = vt.rangelow/fact;
rs->rx_range_list[i].end = vt.rangehigh/fact;
rs->rx_range_list[i].startf = vt.rangelow/fact;
rs->rx_range_list[i].endf = vt.rangehigh/fact;
rs->rx_range_list[i].modes = vt.rangehigh/fact < MHz(30) ? RIG_MODE_AM : RIG_MODE_WFM;
/* hack! hack! store the resolution in low_power! */
rs->rx_range_list[i].low_power = rint(fact);

4
winradio/g313-posix.c
Wyświetl plik

@ -551,14 +551,14 @@ const struct rig_caps g313_caps =
.max_ifshift = kHz(2),
.attenuator = { 20, RIG_DBLST_END, }, /* TBC */
.rx_range_list1 = { {
.start = kHz(9),.end = MHz(30),.modes = G313_MODES,
.startf = kHz(9),.endf = MHz(30),.modes = G313_MODES,
.low_power = -1,.high_power = -1,.vfo = RIG_VFO_A
},
RIG_FRNG_END,
},
.tx_range_list1 = { RIG_FRNG_END, },
.rx_range_list2 = { {
.start = kHz(9),.end = MHz(30),.modes = G313_MODES,
.startf = kHz(9),.endf = MHz(30),.modes = G313_MODES,
.low_power = -1,.high_power = -1,.vfo = RIG_VFO_A
},
RIG_FRNG_END,

12
winradio/wr1000.c
Wyświetl plik

@ -61,19 +61,19 @@ const struct rig_caps wr1000_caps = {
.chan_list = { RIG_CHAN_END, },
.transceive = RIG_TRN_OFF,
.attenuator = { 20, RIG_DBLST_END, },
.rx_range_list1 = { {.start=kHz(500),.end=MHz(1300),.modes=WR1000_MODES,
.rx_range_list1 = { {.startf=kHz(500),.endf=MHz(1300),.modes=WR1000_MODES,
.low_power=-1,.high_power=-1,.vfo=RIG_VFO_A},
{.start=MHz(30),.end=MHz(1300),.modes=RIG_MODE_WFM,
{.startf=MHz(30),.endf=MHz(1300),.modes=RIG_MODE_WFM,
.low_power=-1,.high_power=-1,.vfo=RIG_VFO_A},
RIG_FRNG_END, },
.rx_range_list2 = { {.start=kHz(500),.end=MHz(824),.modes=WR1000_MODES,
.rx_range_list2 = { {.startf=kHz(500),.endf=MHz(824),.modes=WR1000_MODES,
.low_power=-1,.high_power=-1,.vfo=RIG_VFO_A},
{.start=MHz(30),.end=MHz(824),.modes=RIG_MODE_WFM,
{.startf=MHz(30),.endf=MHz(824),.modes=RIG_MODE_WFM,
.low_power=-1,.high_power=-1,.vfo=RIG_VFO_A},
{.start=MHz(849),.end=MHz(869),
{.startf=MHz(849),.endf=MHz(869),
.modes=WR1000_MODES|RIG_MODE_WFM,
.low_power=-1,.high_power=-1,.vfo=RIG_VFO_A},
{.start=MHz(894),.end=MHz(1300),
{.startf=MHz(894),.endf=MHz(1300),
.modes=WR1000_MODES|RIG_MODE_WFM,
.low_power=-1,.high_power=-1,.vfo=RIG_VFO_A},
RIG_FRNG_END, },

12
winradio/wr1500.c
Wyświetl plik

@ -61,19 +61,19 @@ const struct rig_caps wr1500_caps = {
.transceive = RIG_TRN_OFF,
.max_ifshift = kHz(2),
.attenuator = { 20, RIG_DBLST_END, },
.rx_range_list1 = { {.start = kHz(150),.end = MHz(1500),.modes = WR1500_MODES,
.rx_range_list1 = { {.startf = kHz(150),.endf = MHz(1500),.modes = WR1500_MODES,
.low_power = -1,.high_power = -1,.vfo = RIG_VFO_A},
{.start = MHz(30),.end = MHz(1500),.modes = RIG_MODE_WFM,
{.startf = MHz(30),.endf = MHz(1500),.modes = RIG_MODE_WFM,
.low_power = -1,.high_power = -1,.vfo = RIG_VFO_A},
RIG_FRNG_END, },
.rx_range_list2 = { {.start = kHz(150),.end = MHz(824),.modes = WR1500_MODES,
.rx_range_list2 = { {.startf = kHz(150),.endf = MHz(824),.modes = WR1500_MODES,
.low_power = -1,.high_power = -1,.vfo = RIG_VFO_A},
{.start = MHz(30),.end = MHz(824),.modes = RIG_MODE_WFM,
{.startf = MHz(30),.endf = MHz(824),.modes = RIG_MODE_WFM,
.low_power = -1,.high_power = -1,.vfo = RIG_VFO_A},
{.start = MHz(849),.end = MHz(869),
{.startf = MHz(849),.endf = MHz(869),
.modes = WR1500_MODES|RIG_MODE_WFM,
.low_power = -1,.high_power = -1,.vfo = RIG_VFO_A},
{.start = MHz(894),.end = MHz(1500),
{.startf = MHz(894),.endf = MHz(1500),
.modes = WR1500_MODES|RIG_MODE_WFM,
.low_power = -1,.high_power = -1,.vfo = RIG_VFO_A},
RIG_FRNG_END, },

12
winradio/wr1550.c
Wyświetl plik

@ -61,19 +61,19 @@ const struct rig_caps wr1550_caps = {
.transceive = RIG_TRN_OFF,
.max_ifshift = kHz(2),
.attenuator = { 20, RIG_DBLST_END, },
.rx_range_list1 = { {.start = kHz(150),.end = MHz(1500),.modes = WR1550_MODES,
.rx_range_list1 = { {.startf = kHz(150),.endf = MHz(1500),.modes = WR1550_MODES,
.low_power = -1,.high_power = -1,.vfo = RIG_VFO_A},
{.start = MHz(30),.end = MHz(1500),.modes = RIG_MODE_WFM,
{.startf = MHz(30),.endf = MHz(1500),.modes = RIG_MODE_WFM,
.low_power = -1,.high_power = -1,.vfo = RIG_VFO_A},
RIG_FRNG_END, },
.rx_range_list2 = { {.start = kHz(150),.end = MHz(824),.modes = WR1550_MODES,
.rx_range_list2 = { {.startf = kHz(150),.endf = MHz(824),.modes = WR1550_MODES,
.low_power = -1,.high_power = -1,.vfo = RIG_VFO_A},
{.start = MHz(30),.end = MHz(824),.modes = RIG_MODE_WFM,
{.startf = MHz(30),.endf = MHz(824),.modes = RIG_MODE_WFM,
.low_power = -1,.high_power = -1,.vfo = RIG_VFO_A},
{.start = MHz(849),.end = MHz(869),
{.startf = MHz(849),.endf = MHz(869),
.modes = WR1550_MODES|RIG_MODE_WFM,
.low_power = -1,.high_power = -1,.vfo = RIG_VFO_A},
{.start = MHz(894),.end = MHz(1500),
{.startf = MHz(894),.endf = MHz(1500),
.modes = WR1550_MODES|RIG_MODE_WFM,
.low_power = -1,.high_power = -1,.vfo = RIG_VFO_A},
RIG_FRNG_END, },

12
winradio/wr3100.c
Wyświetl plik

@ -61,19 +61,19 @@ const struct rig_caps wr3100_caps = {
.transceive = RIG_TRN_OFF,
.max_ifshift = kHz(2),
.attenuator = { 20, RIG_DBLST_END, },
.rx_range_list2 = { {.start = kHz(150),.end = MHz(1500),.modes = WR3100_MODES,
.rx_range_list2 = { {.startf = kHz(150),.endf = MHz(1500),.modes = WR3100_MODES,
.low_power = -1,.high_power = -1,.vfo = RIG_VFO_A},
{.start = MHz(30),.end = MHz(1500),.modes = RIG_MODE_WFM,
{.startf = MHz(30),.endf = MHz(1500),.modes = RIG_MODE_WFM,
.low_power = -1,.high_power = -1,.vfo = RIG_VFO_A},
RIG_FRNG_END, },
.rx_range_list1 = { {.start = kHz(150),.end = MHz(824),.modes = WR3100_MODES,
.rx_range_list1 = { {.startf = kHz(150),.endf = MHz(824),.modes = WR3100_MODES,
.low_power = -1,.high_power = -1,.vfo = RIG_VFO_A},
{.start = MHz(30),.end = MHz(824),.modes = RIG_MODE_WFM,
{.startf = MHz(30),.endf = MHz(824),.modes = RIG_MODE_WFM,
.low_power = -1,.high_power = -1,.vfo = RIG_VFO_A},
{.start = MHz(849),.end = MHz(869),
{.startf = MHz(849),.endf = MHz(869),
.modes = WR3100_MODES|RIG_MODE_WFM,
.low_power = -1,.high_power = -1,.vfo = RIG_VFO_A},
{.start = MHz(894),.end = MHz(1500),
{.startf = MHz(894),.endf = MHz(1500),
.modes = WR3100_MODES|RIG_MODE_WFM,
.low_power = -1,.high_power = -1,.vfo = RIG_VFO_A},
RIG_FRNG_END, },

12
winradio/wr3150.c
Wyświetl plik

@ -61,19 +61,19 @@ const struct rig_caps wr3150_caps = {
.transceive = RIG_TRN_OFF,
.max_ifshift = kHz(2),
.attenuator = { 20, RIG_DBLST_END, },
.rx_range_list1 = { {.start = kHz(150),.end = MHz(1500),.modes = WR3150_MODES,
.rx_range_list1 = { {.startf = kHz(150),.endf = MHz(1500),.modes = WR3150_MODES,
.low_power = -1,.high_power = -1,.vfo = RIG_VFO_A},
{.start = MHz(30),.end = MHz(1500),.modes = RIG_MODE_WFM,
{.startf = MHz(30),.endf = MHz(1500),.modes = RIG_MODE_WFM,
.low_power = -1,.high_power = -1,.vfo = RIG_VFO_A},
RIG_FRNG_END, },
.rx_range_list2 = { {.start = kHz(150),.end = MHz(824),.modes = WR3150_MODES,
.rx_range_list2 = { {.startf = kHz(150),.endf = MHz(824),.modes = WR3150_MODES,
.low_power = -1,.high_power = -1,.vfo = RIG_VFO_A},
{.start = MHz(30),.end = MHz(824),.modes = RIG_MODE_WFM,
{.startf = MHz(30),.endf = MHz(824),.modes = RIG_MODE_WFM,
.low_power = -1,.high_power = -1,.vfo = RIG_VFO_A},
{.start = MHz(849),.end = MHz(869),
{.startf = MHz(849),.endf = MHz(869),
.modes = WR3150_MODES|RIG_MODE_WFM,
.low_power = -1,.high_power = -1,.vfo = RIG_VFO_A},
{.start = MHz(894),.end = MHz(1500),
{.startf = MHz(894),.endf = MHz(1500),
.modes = WR3150_MODES|RIG_MODE_WFM,
.low_power = -1,.high_power = -1,.vfo = RIG_VFO_A},
RIG_FRNG_END, },

12
winradio/wr3500.c
Wyświetl plik

@ -61,19 +61,19 @@ const struct rig_caps wr3500_caps = {
.transceive = RIG_TRN_OFF,
.max_ifshift = kHz(2),
.attenuator = { 20, RIG_DBLST_END, },
.rx_range_list1 = { {.start = kHz(150),.end = GHz(2.6),.modes = WR3500_MODES,
.rx_range_list1 = { {.startf = kHz(150),.endf = GHz(2.6),.modes = WR3500_MODES,
.low_power = -1,.high_power = -1,.vfo = RIG_VFO_A},
{.start = MHz(30),.end = GHz(2.6),.modes = RIG_MODE_WFM,
{.startf = MHz(30),.endf = GHz(2.6),.modes = RIG_MODE_WFM,
.low_power = -1,.high_power = -1,.vfo = RIG_VFO_A},
RIG_FRNG_END, },
.rx_range_list2 = { {.start = kHz(150),.end = MHz(824),.modes = WR3500_MODES,
.rx_range_list2 = { {.startf = kHz(150),.endf = MHz(824),.modes = WR3500_MODES,
.low_power = -1,.high_power = -1,.vfo = RIG_VFO_A},
{.start = MHz(30),.end = MHz(824),.modes = RIG_MODE_WFM,
{.startf = MHz(30),.endf = MHz(824),.modes = RIG_MODE_WFM,
.low_power = -1,.high_power = -1,.vfo = RIG_VFO_A},
{.start = MHz(849),.end = MHz(869),
{.startf = MHz(849),.endf = MHz(869),
.modes = WR3500_MODES|RIG_MODE_WFM,
.low_power = -1,.high_power = -1,.vfo = RIG_VFO_A},
{.start = MHz(894),.end = GHz(2.6),
{.startf = MHz(894),.endf = GHz(2.6),
.modes = WR3500_MODES|RIG_MODE_WFM,
.low_power = -1,.high_power = -1,.vfo = RIG_VFO_A},
RIG_FRNG_END, },

12
winradio/wr3700.c
Wyświetl plik

@ -61,19 +61,19 @@ const struct rig_caps wr3700_caps = {
.transceive = RIG_TRN_OFF,
.max_ifshift = kHz(2),
.attenuator = { 20, RIG_DBLST_END, },
.rx_range_list1 = { {.start = kHz(150),.end = GHz(4),.modes = WR3700_MODES,
.rx_range_list1 = { {.startf = kHz(150),.endf = GHz(4),.modes = WR3700_MODES,
.low_power = -1,.high_power = -1,.vfo = RIG_VFO_A},
{.start = MHz(30),.end = GHz(4),.modes = RIG_MODE_WFM,
{.startf = MHz(30),.endf = GHz(4),.modes = RIG_MODE_WFM,
.low_power = -1,.high_power = -1,.vfo = RIG_VFO_A},
RIG_FRNG_END, },
.rx_range_list2 = { {.start = kHz(150),.end = MHz(824),.modes = WR3700_MODES,
.rx_range_list2 = { {.startf = kHz(150),.endf = MHz(824),.modes = WR3700_MODES,
.low_power = -1,.high_power = -1,.vfo = RIG_VFO_A},
{.start = MHz(30),.end = MHz(824),.modes = RIG_MODE_WFM,
{.startf = MHz(30),.endf = MHz(824),.modes = RIG_MODE_WFM,
.low_power = -1,.high_power = -1,.vfo = RIG_VFO_A},
{.start = MHz(849),.end = MHz(869),
{.startf = MHz(849),.endf = MHz(869),
.modes = WR3700_MODES|RIG_MODE_WFM,
.low_power = -1,.high_power = -1,.vfo = RIG_VFO_A},
{.start = MHz(894),.end = GHz(4),
{.startf = MHz(894),.endf = GHz(4),
.modes = WR3700_MODES|RIG_MODE_WFM,
.low_power = -1,.high_power = -1,.vfo = RIG_VFO_A},
RIG_FRNG_END, },

36
yaesu/ft747.c
Wyświetl plik

@ -206,37 +206,37 @@ const struct rig_caps ft747_caps = {
.tx_range_list1 = { RIG_FRNG_END, },
.rx_range_list2 = { { .start = kHz(100), .end = 29999900,
.rx_range_list2 = { { .startf = kHz(100), .endf = 29999900,
.modes = FT747_ALL_RX_MODES,.low_power = -1,.high_power = -1, .vfo = FT747_VFOS},
RIG_FRNG_END, }, /* rx range */
.tx_range_list2 = { {kHz(1500),1999900,FT747_OTHER_TX_MODES,.low_power = 5000,.high_power = 100000, .vfo = FT747_VFOS}, /* 100W class */
{.start = kHz(1500),.end = 1999900,FT747_AM_TX_MODES,.low_power = 2000,.high_power = 25000, .vfo = FT747_VFOS}, /* 25W class */
{.startf = kHz(1500),.endf = 1999900,FT747_AM_TX_MODES,.low_power = 2000,.high_power = 25000, .vfo = FT747_VFOS}, /* 25W class */
{.start = kHz(3500),3999900,FT747_OTHER_TX_MODES,5000,100000,FT747_VFOS},
{.start = kHz(3500),3999900,FT747_AM_TX_MODES,2000,25000,FT747_VFOS},
{.startf = kHz(3500),3999900,FT747_OTHER_TX_MODES,5000,100000,FT747_VFOS},
{.startf = kHz(3500),3999900,FT747_AM_TX_MODES,2000,25000,FT747_VFOS},
{.start = kHz(7000),7499900,FT747_OTHER_TX_MODES,5000,100000,FT747_VFOS},
{.start = kHz(7000),7499900,FT747_AM_TX_MODES,2000,25000,FT747_VFOS},
{.startf = kHz(7000),7499900,FT747_OTHER_TX_MODES,5000,100000,FT747_VFOS},
{.startf = kHz(7000),7499900,FT747_AM_TX_MODES,2000,25000,FT747_VFOS},
{.start = MHz(10),10499900,FT747_OTHER_TX_MODES,5000,100000,FT747_VFOS},
{.start = MHz(10),10499900,FT747_AM_TX_MODES,2000,25000,FT747_VFOS},
{.startf = MHz(10),10499900,FT747_OTHER_TX_MODES,5000,100000,FT747_VFOS},
{.startf = MHz(10),10499900,FT747_AM_TX_MODES,2000,25000,FT747_VFOS},
{.start = MHz(14),14499900,FT747_OTHER_TX_MODES,5000,100000,FT747_VFOS},
{.start = MHz(14),14499900,FT747_AM_TX_MODES,2000,25000,FT747_VFOS},
{.startf = MHz(14),14499900,FT747_OTHER_TX_MODES,5000,100000,FT747_VFOS},
{.startf = MHz(14),14499900,FT747_AM_TX_MODES,2000,25000,FT747_VFOS},
{.start = MHz(18),18499900,FT747_OTHER_TX_MODES,5000,100000,FT747_VFOS},
{.start = MHz(18),18499900,FT747_AM_TX_MODES,2000,25000,FT747_VFOS},
{.startf = MHz(18),18499900,FT747_OTHER_TX_MODES,5000,100000,FT747_VFOS},
{.startf = MHz(18),18499900,FT747_AM_TX_MODES,2000,25000,FT747_VFOS},
{.start = MHz(21),21499900,FT747_OTHER_TX_MODES,5000,100000,FT747_VFOS},
{.start = MHz(21),21499900,FT747_AM_TX_MODES,2000,25000,FT747_VFOS},
{.startf = MHz(21),21499900,FT747_OTHER_TX_MODES,5000,100000,FT747_VFOS},
{.startf = MHz(21),21499900,FT747_AM_TX_MODES,2000,25000,FT747_VFOS},
{.start = kHz(24500),24999900,FT747_OTHER_TX_MODES,5000,100000,FT747_VFOS},
{.start = kHz(24500),24999900,FT747_AM_TX_MODES,2000,25000,FT747_VFOS},
{.startf = kHz(24500),24999900,FT747_OTHER_TX_MODES,5000,100000,FT747_VFOS},
{.startf = kHz(24500),24999900,FT747_AM_TX_MODES,2000,25000,FT747_VFOS},
{.start = MHz(28),29999900,FT747_OTHER_TX_MODES,5000,100000,FT747_VFOS},
{.start = MHz(28),29999900,FT747_AM_TX_MODES,2000,25000,FT747_VFOS},
{.startf = MHz(28),29999900,FT747_OTHER_TX_MODES,5000,100000,FT747_VFOS},
{.startf = MHz(28),29999900,FT747_AM_TX_MODES,2000,25000,FT747_VFOS},
RIG_FRNG_END, },

38
yaesu/ft757gx.c
Wyświetl plik

@ -128,7 +128,7 @@ const struct rig_caps ft757gx_caps = {
.tx_range_list1 = { RIG_FRNG_END, },
.rx_range_list2 = { {
.start = kHz(500), .end = 29999990,
.startf = kHz(500), .endf = 29999990,
.modes = FT757GX_ALL_RX_MODES, .low_power = -1, .high_power = -1
},
RIG_FRNG_END,
@ -136,21 +136,21 @@ const struct rig_caps ft757gx_caps = {
.tx_range_list2 = { {kHz(1500), 1999900, FT757GX_ALL_TX_MODES, .low_power = 5000, .high_power = 100000},
{.start = kHz(3500), 3999900, FT757GX_ALL_TX_MODES, 5000, 100000},
{.startf = kHz(3500), 3999900, FT757GX_ALL_TX_MODES, 5000, 100000},
{.start = kHz(7000), 7499900, FT757GX_ALL_TX_MODES, 5000, 100000},
{.startf = kHz(7000), 7499900, FT757GX_ALL_TX_MODES, 5000, 100000},
{.start = MHz(10), 10499900, FT757GX_ALL_TX_MODES, 5000, 100000},
{.startf = MHz(10), 10499900, FT757GX_ALL_TX_MODES, 5000, 100000},
{.start = MHz(14), 14499900, FT757GX_ALL_TX_MODES, 5000, 100000},
{.startf = MHz(14), 14499900, FT757GX_ALL_TX_MODES, 5000, 100000},
{.start = MHz(18), 18499900, FT757GX_ALL_TX_MODES, 5000, 100000},
{.startf = MHz(18), 18499900, FT757GX_ALL_TX_MODES, 5000, 100000},
{.start = MHz(21), 21499900, FT757GX_ALL_TX_MODES, 5000, 100000},
{.startf = MHz(21), 21499900, FT757GX_ALL_TX_MODES, 5000, 100000},
{.start = kHz(24500), 24999900, FT757GX_ALL_TX_MODES, 5000, 100000},
{.startf = kHz(24500), 24999900, FT757GX_ALL_TX_MODES, 5000, 100000},
{.start = MHz(28), 29999900, FT757GX_ALL_TX_MODES, 5000, 100000},
{.startf = MHz(28), 29999900, FT757GX_ALL_TX_MODES, 5000, 100000},
RIG_FRNG_END,
},
@ -244,8 +244,8 @@ const struct rig_caps ft757gx2_caps = {
.tx_range_list1 = { RIG_FRNG_END, },
.rx_range_list2 = { {
.start = kHz(150),
.end = 29999990,
.startf = kHz(150),
.endf = 29999990,
.modes = FT757GX_ALL_RX_MODES,
.low_power = -1,
.high_power = -1
@ -256,21 +256,21 @@ const struct rig_caps ft757gx2_caps = {
/* FIXME: 10m is "less" and AM is 25W carrier */
.tx_range_list2 = { {kHz(1500), 1999900, FT757GX_ALL_TX_MODES, .low_power = 5000, .high_power = 100000},
{.start = kHz(3500), 3999900, FT757GX_ALL_TX_MODES, 5000, 100000},
{.startf = kHz(3500), 3999900, FT757GX_ALL_TX_MODES, 5000, 100000},
{.start = kHz(7000), 7499900, FT757GX_ALL_TX_MODES, 5000, 100000},
{.startf = kHz(7000), 7499900, FT757GX_ALL_TX_MODES, 5000, 100000},
{.start = MHz(10), 10499900, FT757GX_ALL_TX_MODES, 5000, 100000},
{.startf = MHz(10), 10499900, FT757GX_ALL_TX_MODES, 5000, 100000},
{.start = MHz(14), 14499900, FT757GX_ALL_TX_MODES, 5000, 100000},
{.startf = MHz(14), 14499900, FT757GX_ALL_TX_MODES, 5000, 100000},
{.start = MHz(18), 18499900, FT757GX_ALL_TX_MODES, 5000, 100000},
{.startf = MHz(18), 18499900, FT757GX_ALL_TX_MODES, 5000, 100000},
{.start = MHz(21), 21499900, FT757GX_ALL_TX_MODES, 5000, 100000},
{.startf = MHz(21), 21499900, FT757GX_ALL_TX_MODES, 5000, 100000},
{.start = kHz(24500), 24999900, FT757GX_ALL_TX_MODES, 5000, 100000},
{.startf = kHz(24500), 24999900, FT757GX_ALL_TX_MODES, 5000, 100000},
{.start = MHz(28), 29999900, FT757GX_ALL_TX_MODES, 5000, 100000},
{.startf = MHz(28), 29999900, FT757GX_ALL_TX_MODES, 5000, 100000},
RIG_FRNG_END,
},

24
yaesu/ft767gx.c
Wyświetl plik

@ -292,33 +292,33 @@ const struct rig_caps ft767gx_caps = {
.tx_range_list1 = { RIG_FRNG_END, },
.rx_range_list2 = { { .start = kHz(100), .end = 29999999,
.rx_range_list2 = { { .startf = kHz(100), .endf = 29999999,
.modes = FT767GX_ALL_RX_MODES,.low_power = -1,.high_power = -1},
RIG_FRNG_END, }, /* rx range */
.tx_range_list2 = { {kHz(1500),1999900,FT767GX_HF_TX_MODES,.low_power = 5000,.high_power = 100000},
{.start = kHz(3500),3999900,FT767GX_HF_TX_MODES,5000,100000},
{.startf = kHz(3500),3999900,FT767GX_HF_TX_MODES,5000,100000},
{.start = kHz(7000),7499900,FT767GX_HF_TX_MODES,5000,100000},
{.startf = kHz(7000),7499900,FT767GX_HF_TX_MODES,5000,100000},
{.start = MHz(10),10499900,FT767GX_HF_TX_MODES,5000,100000},
{.startf = MHz(10),10499900,FT767GX_HF_TX_MODES,5000,100000},
{.start = MHz(14),14499900,FT767GX_HF_TX_MODES,5000,100000},
{.startf = MHz(14),14499900,FT767GX_HF_TX_MODES,5000,100000},
{.start = MHz(18),18499900,FT767GX_HF_TX_MODES,5000,100000},
{.startf = MHz(18),18499900,FT767GX_HF_TX_MODES,5000,100000},
{.start = MHz(21),21499900,FT767GX_HF_TX_MODES,5000,100000},
{.startf = MHz(21),21499900,FT767GX_HF_TX_MODES,5000,100000},
{.start = kHz(24500),24999900,FT767GX_HF_TX_MODES,5000,100000},
{.startf = kHz(24500),24999900,FT767GX_HF_TX_MODES,5000,100000},
{.start = MHz(28),29999900,FT767GX_HF_TX_MODES,5000,100000},
{.startf = MHz(28),29999900,FT767GX_HF_TX_MODES,5000,100000},
{.start = MHz(50),59999900,FT767GX_ALL_TX_MODES,5000,10000},
{.startf = MHz(50),59999900,FT767GX_ALL_TX_MODES,5000,10000},
{.start = MHz(144),147999900,FT767GX_ALL_TX_MODES,5000,10000},
{.startf = MHz(144),147999900,FT767GX_ALL_TX_MODES,5000,10000},
{.start = MHz(430),449999990,FT767GX_ALL_TX_MODES,5000,10000},
{.startf = MHz(430),449999990,FT767GX_ALL_TX_MODES,5000,10000},
RIG_FRNG_END, },

20
yaesu/newcat.c
Wyświetl plik

@ -484,11 +484,11 @@ int newcat_set_freq(RIG *rig, vfo_t vfo, freq_t freq) {
rig_debug(RIG_DEBUG_TRACE, "%s: passed freq = %"PRIfreq" Hz\n", __func__, freq);
/* additional debugging */
rig_debug(RIG_DEBUG_TRACE, "%s: R2 minimum freq = %"PRIfreq" Hz\n", __func__, caps->rx_range_list2[0].start);
rig_debug(RIG_DEBUG_TRACE, "%s: R2 maximum freq = %"PRIfreq" Hz\n", __func__, caps->rx_range_list2[0].end);
rig_debug(RIG_DEBUG_TRACE, "%s: R2 minimum freq = %"PRIfreq" Hz\n", __func__, caps->rx_range_list2[0].startf);
rig_debug(RIG_DEBUG_TRACE, "%s: R2 maximum freq = %"PRIfreq" Hz\n", __func__, caps->rx_range_list2[0].endf);
if (freq < caps->rx_range_list1[0].start || freq > caps->rx_range_list1[0].end ||
freq < caps->rx_range_list2[0].start || freq > caps->rx_range_list2[0].end)
if (freq < caps->rx_range_list1[0].startf || freq > caps->rx_range_list1[0].endf ||
freq < caps->rx_range_list2[0].startf || freq > caps->rx_range_list2[0].endf)
return -RIG_EINVAL;
err = newcat_set_vfo_from_alias(rig, &vfo);
@ -2891,8 +2891,8 @@ int newcat_set_mem(RIG * rig, vfo_t vfo, int ch)
chan_list = rig->caps->chan_list;
for (i=0; i<CHANLSTSIZ && !RIG_IS_CHAN_END(chan_list[i]); i++) {
if (ch >= chan_list[i].start &&
ch <= chan_list[i].end) {
if (ch >= chan_list[i].startc &&
ch <= chan_list[i].endc) {
mem_caps = &chan_list[i].mem_caps;
break;
}
@ -3137,8 +3137,8 @@ int newcat_set_channel(RIG * rig, const channel_t * chan)
chan_list = rig->caps->chan_list;
for (i=0; i<CHANLSTSIZ && !RIG_IS_CHAN_END(chan_list[i]); i++) {
if (chan->channel_num >= chan_list[i].start &&
chan->channel_num <= chan_list[i].end &&
if (chan->channel_num >= chan_list[i].startc &&
chan->channel_num <= chan_list[i].endc &&
// writable memory types... NOT 60-METERS or READ-ONLY channels
(chan_list[i].type == RIG_MTYPE_MEM ||
chan_list[i].type == RIG_MTYPE_EDGE) ) {
@ -3267,8 +3267,8 @@ int newcat_get_channel(RIG * rig, channel_t * chan)
chan_list = rig->caps->chan_list;
for (i=0; i<CHANLSTSIZ && !RIG_IS_CHAN_END(chan_list[i]); i++) {
if (chan->channel_num >= chan_list[i].start &&
chan->channel_num <= chan_list[i].end) {
if (chan->channel_num >= chan_list[i].startc &&
chan->channel_num <= chan_list[i].endc) {
mem_caps = &chan_list[i].mem_caps;
break;
}

8
yaesu/vr5000.c
Wyświetl plik

@ -489,14 +489,14 @@ void correct_frequency(RIG *rig, vfo_t vfo, freq_t curr_freq, freq_t *freq)
}
/* Check for frequencies out on true rx range */
if ((freq_t)correct_freq < rig->caps->rx_range_list1->start) {
correct_freq = (unsigned long long)rig->caps->rx_range_list1->start;
if ((freq_t)correct_freq < rig->caps->rx_range_list1->startf) {
correct_freq = (unsigned long long)rig->caps->rx_range_list1->startf;
if (correct_freq%ts != 0) {
correct_freq += (ts-(correct_freq%ts));
}
}
else if ((freq_t)correct_freq > rig->caps->rx_range_list1->end) {
correct_freq = (unsigned long long)rig->caps->rx_range_list1->end;
else if ((freq_t)correct_freq > rig->caps->rx_range_list1->endf) {
correct_freq = (unsigned long long)rig->caps->rx_range_list1->endf;
if (correct_freq%ts != 0) {
correct_freq -= (correct_freq%ts);
}