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

Fix start/end names

pull/124/head
Michael Black 2019-08-23 22:53:25 -05:00
rodzic 63fc56e9c8
commit 5d16de90ee
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 6599353EC683404D
6 zmienionych plików z 27 dodań i 22 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

4
tests/memload.c
Wyświetl plik

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

5
tests/rigctl_parse.c
Wyświetl plik

@ -4105,6 +4105,11 @@ declare_proto_rig(send_cmd)
/* '0xf0'--test if rigctld called with -o|--vfo option */ /* '0xf0'--test if rigctld called with -o|--vfo option */
declare_proto_rig(chk_vfo) 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); fprintf(fout, "CHKVFO %d\n", vfo_mode);
return RIG_OK; return RIG_OK;

28
tests/rigmatrix.c
Wyświetl plik

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

4
winradio/g303.c
Wyświetl plik

@ -142,11 +142,11 @@ const struct rig_caps g303_caps = {
.transceive = RIG_TRN_OFF, .transceive = RIG_TRN_OFF,
.max_ifshift = kHz(2), .max_ifshift = kHz(2),
.attenuator = { 20, RIG_DBLST_END, }, /* TBC */ .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}, .low_power = -1,.high_power = -1,.vfo = RIG_VFO_A},
RIG_FRNG_END, }, RIG_FRNG_END, },
.tx_range_list1 = { 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}, .low_power = -1,.high_power = -1,.vfo = RIG_VFO_A},
RIG_FRNG_END, }, RIG_FRNG_END, },
.tx_range_list2 = { RIG_FRNG_END, }, .tx_range_list2 = { RIG_FRNG_END, },

4
winradio/g305.c
Wyświetl plik

@ -143,11 +143,11 @@ const struct rig_caps g305_caps = {
.transceive = RIG_TRN_OFF, .transceive = RIG_TRN_OFF,
.max_ifshift = kHz(2), .max_ifshift = kHz(2),
.attenuator = { 20, RIG_DBLST_END, }, /* TBC */ .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}, .low_power = -1,.high_power = -1,.vfo = RIG_VFO_A},
RIG_FRNG_END, }, RIG_FRNG_END, },
.tx_range_list1 = { 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}, .low_power = -1,.high_power = -1,.vfo = RIG_VFO_A},
RIG_FRNG_END, }, RIG_FRNG_END, },
.tx_range_list2 = { RIG_FRNG_END, }, .tx_range_list2 = { RIG_FRNG_END, },

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

@ -177,14 +177,14 @@ const struct rig_caps g313_caps = {
.max_ifshift = kHz(2), .max_ifshift = kHz(2),
.attenuator = { 20, RIG_DBLST_END, }, /* TBC */ .attenuator = { 20, RIG_DBLST_END, }, /* TBC */
.rx_range_list1 = { { .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 .low_power = -1,.high_power = -1,.vfo = RIG_VFO_A
}, },
RIG_FRNG_END, RIG_FRNG_END,
}, },
.tx_range_list1 = { RIG_FRNG_END, }, .tx_range_list1 = { RIG_FRNG_END, },
.rx_range_list2 = { { .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 .low_power = -1,.high_power = -1,.vfo = RIG_VFO_A
}, },
RIG_FRNG_END, RIG_FRNG_END,