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

Fix ic7300 VFOs and sprintflst to be more generic

pull/149/head
Michael Black 2019-12-02 14:46:41 -06:00
rodzic e6264c4f6f
commit 72565fe621
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 6599353EC683404D
3 zmienionych plików z 19 dodań i 81 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

32
icom/ic7300.c
Wyświetl plik

@ -277,27 +277,27 @@ const struct rig_caps ic7300_caps =
RIG_CHAN_END,
},
.rx_range_list1 = { {kHz(30), MHz(74.8), IC7300_ALL_RX_MODES, -1, -1, IC9700_VFOS}, RIG_FRNG_END, },
.rx_range_list1 = { {kHz(30), MHz(74.8), IC7300_ALL_RX_MODES, -1, -1, IC7300_VFOS}, RIG_FRNG_END, },
.tx_range_list1 = {
FRQ_RNG_HF(1, IC7300_OTHER_TX_MODES, W(2), W(100), IC9700_VFOS, RIG_ANT_1),
FRQ_RNG_60m(1, IC7300_OTHER_TX_MODES, W(2), W(100), IC9700_VFOS, RIG_ANT_1),
FRQ_RNG_6m(1, IC7300_OTHER_TX_MODES, W(2), W(100), IC9700_VFOS, RIG_ANT_1),
FRQ_RNG_4m(1, IC7300_OTHER_TX_MODES, W(2), W(100), IC9700_VFOS, RIG_ANT_1),
FRQ_RNG_HF(1, IC7300_AM_TX_MODES, W(1), W(40), IC9700_VFOS, RIG_ANT_1), /* AM class */
FRQ_RNG_60m(1, IC7300_AM_TX_MODES, W(1), W(40), IC9700_VFOS, RIG_ANT_1), /* AM class */
FRQ_RNG_6m(1, IC7300_AM_TX_MODES, W(1), W(40), IC9700_VFOS, RIG_ANT_1), /* AM class */
FRQ_RNG_4m(1, IC7300_AM_TX_MODES, W(1), W(40), IC9700_VFOS, RIG_ANT_1), /* AM class */
FRQ_RNG_HF(1, IC7300_OTHER_TX_MODES, W(2), W(100), IC7300_VFOS, RIG_ANT_1),
FRQ_RNG_60m(1, IC7300_OTHER_TX_MODES, W(2), W(100), IC7300_VFOS, RIG_ANT_1),
FRQ_RNG_6m(1, IC7300_OTHER_TX_MODES, W(2), W(100), IC7300_VFOS, RIG_ANT_1),
FRQ_RNG_4m(1, IC7300_OTHER_TX_MODES, W(2), W(100), IC7300_VFOS, RIG_ANT_1),
FRQ_RNG_HF(1, IC7300_AM_TX_MODES, W(1), W(40), IC7300_VFOS, RIG_ANT_1), /* AM class */
FRQ_RNG_60m(1, IC7300_AM_TX_MODES, W(1), W(40), IC7300_VFOS, RIG_ANT_1), /* AM class */
FRQ_RNG_6m(1, IC7300_AM_TX_MODES, W(1), W(40), IC7300_VFOS, RIG_ANT_1), /* AM class */
FRQ_RNG_4m(1, IC7300_AM_TX_MODES, W(1), W(40), IC7300_VFOS, RIG_ANT_1), /* AM class */
RIG_FRNG_END,
},
.rx_range_list2 = { {kHz(30), MHz(74.8), IC7300_ALL_RX_MODES, -1, -1, IC9700_VFOS}, RIG_FRNG_END, },
.rx_range_list2 = { {kHz(30), MHz(74.8), IC7300_ALL_RX_MODES, -1, -1, IC7300_VFOS}, RIG_FRNG_END, },
.tx_range_list2 = {
FRQ_RNG_HF(2, IC7300_OTHER_TX_MODES, W(2), W(100), IC9700_VFOS, RIG_ANT_1),
FRQ_RNG_60m(2, IC7300_OTHER_TX_MODES, W(2), W(100), IC9700_VFOS, RIG_ANT_1),
FRQ_RNG_6m(2, IC7300_OTHER_TX_MODES, W(2), W(100), IC9700_VFOS, RIG_ANT_1),
FRQ_RNG_HF(2, IC7300_AM_TX_MODES, W(1), W(40), IC9700_VFOS, RIG_ANT_1), /* AM class */
FRQ_RNG_60m(2, IC7300_AM_TX_MODES, W(1), W(40), IC9700_VFOS, RIG_ANT_1), /* AM class */
FRQ_RNG_6m(2, IC7300_AM_TX_MODES, W(1), W(40), IC9700_VFOS, RIG_ANT_1), /* AM class */
FRQ_RNG_HF(2, IC7300_OTHER_TX_MODES, W(2), W(100), IC7300_VFOS, RIG_ANT_1),
FRQ_RNG_60m(2, IC7300_OTHER_TX_MODES, W(2), W(100), IC7300_VFOS, RIG_ANT_1),
FRQ_RNG_6m(2, IC7300_OTHER_TX_MODES, W(2), W(100), IC7300_VFOS, RIG_ANT_1),
FRQ_RNG_HF(2, IC7300_AM_TX_MODES, W(1), W(40), IC7300_VFOS, RIG_ANT_1), /* AM class */
FRQ_RNG_60m(2, IC7300_AM_TX_MODES, W(1), W(40), IC7300_VFOS, RIG_ANT_1), /* AM class */
FRQ_RNG_6m(2, IC7300_AM_TX_MODES, W(1), W(40), IC7300_VFOS, RIG_ANT_1), /* AM class */
RIG_FRNG_END,
},

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

@ -363,7 +363,7 @@ typedef signed long shortfreq_t;
* Aliases may or may not be honored by a backend and are defined using
* high significant bits, i.e. RIG_VFO_MEM, RIG_VFO_MAIN, etc.
*/
typedef int vfo_t;
typedef unsigned int vfo_t;
/** \brief '' -- used in caps */
@ -411,6 +411,7 @@ typedef int vfo_t;
#define RIG_VFO_CURR RIG_VFO_N(29)
#define RIG_VFO_TX_FLAG RIG_VFO_N(30)
// we and also use RIG_VFO_N(31) if needed
// Misc VFO Macros

65
tests/sprintflst.c
Wyświetl plik

@ -53,70 +53,7 @@ int sprintf_vfo(char *str, vfo_t vfo)
return 0;
}
sv = rig_strvfo(vfo & RIG_VFO_CURR);
if (sv && sv[0])
{
len += sprintf(str + len, "%s ", sv);
}
sv = rig_strvfo(vfo & RIG_VFO_MEM);
if (sv && sv[0])
{
len += sprintf(str + len, "%s ", sv);
}
sv = rig_strvfo(vfo & RIG_VFO_VFO);
if (sv && sv[0])
{
len += sprintf(str + len, "%s ", sv);
}
sv = rig_strvfo(vfo & RIG_VFO_MAIN);
if (sv && sv[0])
{
len += sprintf(str + len, "%s ", sv);
}
sv = rig_strvfo(vfo & RIG_VFO_MAIN_A);
if (sv && sv[0])
{
len += sprintf(str + len, "%s ", sv);
}
sv = rig_strvfo(vfo & RIG_VFO_MAIN_B);
if (sv && sv[0])
{
len += sprintf(str + len, "%s ", sv);
}
sv = rig_strvfo(vfo & RIG_VFO_SUB);
if (sv && sv[0])
{
len += sprintf(str + len, "%s ", sv);
}
sv = rig_strvfo(vfo & RIG_VFO_SUB_A);
if (sv && sv[0])
{
len += sprintf(str + len, "%s ", sv);
}
sv = rig_strvfo(vfo & RIG_VFO_SUB_B);
if (sv && sv[0])
{
len += sprintf(str + len, "%s ", sv);
}
for (i = 0; i < 16; i++)
for (i = 0; i < 32; i++)
{
sv = rig_strvfo(vfo & RIG_VFO_N(i));