hamradio/Hamlib
1
0
Fork 0
mirror of https://github.com/Hamlib/Hamlib.git synced 2024-09-21 10:27:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix start/end names

Browse Source
This commit is contained in:
Michael Black 2019-08-23 22:53:25 -05:00
parent 63fc56e9c8
commit 5d16de90ee
No known key found for this signature in database
GPG Key ID: 6599353EC683404D
6 changed files with 27 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/memload.c
View File

@ -147,8 +147,8 @@ int set_chan(RIG *rig, channel_t *chan, xmlNodePtr node)
/* find channel caps */
for (i = 0; i < CHANLSTSIZ ; i++)
{
if (rig->state.chan_list[i].start <= n
&& rig->state.chan_list[i].end >= n)
if (rig->state.chan_list[i].startc <= n
&& rig->state.chan_list[i].endc >= n)
{
break;

5
tests/rigctl_parse.c
View File

@ -4105,6 +4105,11 @@ declare_proto_rig(send_cmd)
/* '0xf0'--test if rigctld called with -o|--vfo option */
declare_proto_rig(chk_vfo)
{
if ((interactive && prompt) || (interactive && !prompt && ext_resp))
{
fprintf(fout, "%s: ", cmd->arg1); /* i.e. "Frequency" */
}
fprintf(fout, "CHKVFO %d\n", vfo_mode);
return RIG_OK;

28
tests/rigmatrix.c
View File

@ -426,18 +426,18 @@ static void draw_range(const freq_range_t range_list[],
{
float start_pix, end_pix;
if (range_list[i].start == 0 && range_list[i].end == 0)
if (range_list[i].startf == 0 && range_list[i].endf == 0)
{
break;
}
start_pix = range_list[i].start;
end_pix = range_list[i].end;
start_pix = range_list[i].startf;
end_pix = range_list[i].endf;
/*
* HF
*/
if (range_list[i].start < MHz(30))
if (range_list[i].startf < MHz(30))
{
start_pix = start_pix / MHz(30) * RANGE_WIDTH;
end_pix = end_pix / MHz(30) * RANGE_WIDTH;
@ -460,12 +460,12 @@ static void draw_range(const freq_range_t range_list[],
/*
* VHF
*/
start_pix = range_list[i].start;
end_pix = range_list[i].end;
start_pix = range_list[i].startf;
end_pix = range_list[i].endf;
if ((range_list[i].start > MHz(30) && range_list[i].start < MHz(300))
|| (range_list[i].start < MHz(30)
&& range_list[i].end > MHz(30)))
if ((range_list[i].startf > MHz(30) && range_list[i].startf < MHz(300))
|| (range_list[i].startf < MHz(30)
&& range_list[i].endf > MHz(30)))
{
start_pix = (start_pix - MHz(30)) / MHz(300) * RANGE_WIDTH;
@ -494,12 +494,12 @@ static void draw_range(const freq_range_t range_list[],
/*
* UHF
*/
start_pix = range_list[i].start;
end_pix = range_list[i].end;
start_pix = range_list[i].startf;
end_pix = range_list[i].endf;
if ((range_list[i].start > MHz(300) && range_list[i].start < GHz(3))
|| (range_list[i].start < MHz(300)
&& range_list[i].end > MHz(300)))
if ((range_list[i].startf > MHz(300) && range_list[i].startf < GHz(3))
|| (range_list[i].startf < MHz(300)
&& range_list[i].endf > MHz(300)))
{
start_pix = (start_pix - MHz(300)) / GHz(3) * RANGE_WIDTH;

4
winradio/g303.c
View File

@ -142,11 +142,11 @@ const struct rig_caps g303_caps = {
.transceive = RIG_TRN_OFF,
.max_ifshift = kHz(2),
.attenuator = { 20, RIG_DBLST_END, }, /* TBC */
.rx_range_list1 = { {.start = kHz(9),.end = MHz(30),.modes = G303_MODES,
.rx_range_list1 = { {.startf = kHz(9),.endf = MHz(30),.modes = G303_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 = G303_MODES,
.rx_range_list2 = { {.startf = kHz(9),.endf = MHz(30),.modes = G303_MODES,
.low_power = -1,.high_power = -1,.vfo = RIG_VFO_A},
RIG_FRNG_END, },
.tx_range_list2 = { RIG_FRNG_END, },

4
winradio/g305.c
View File

@ -143,11 +143,11 @@ const struct rig_caps g305_caps = {
.transceive = RIG_TRN_OFF,
.max_ifshift = kHz(2),
.attenuator = { 20, RIG_DBLST_END, }, /* TBC */
.rx_range_list1 = { {.start = kHz(9),.end = MHz(30),.modes = G305_MODES,
.rx_range_list1 = { {.startf = kHz(9),.endf = MHz(30),.modes = G305_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 = G305_MODES,
.rx_range_list2 = { {.startf = kHz(9),.endf = MHz(30),.modes = G305_MODES,
.low_power = -1,.high_power = -1,.vfo = RIG_VFO_A},
RIG_FRNG_END, },
.tx_range_list2 = { RIG_FRNG_END, },

4
winradio/g313-win.c
View File

@ -177,14 +177,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,