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

remove digital mode extension

pull/19/head
Sebastian Denz 2018-11-20 18:08:36 +01:00
rodzic 9ac16499f6
commit fe6fc763d1
11 zmienionych plików z 52 dodań i 89 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

6
dummy/dummy.c
Wyświetl plik

@ -1456,11 +1456,7 @@ static int dummy_mW2power(RIG * rig, float *power, unsigned int mwpower,
#define DUMMY_MODES (RIG_MODE_AM | RIG_MODE_CW | RIG_MODE_RTTY | \
RIG_MODE_SSB | RIG_MODE_FM | RIG_MODE_WFM | \
RIG_MODE_CWR | RIG_MODE_RTTYR| \
RIG_MODE_PKTUSB | RIG_MODE_PKTUSB2 | RIG_MODE_PKTUSB3 |\
RIG_MODE_PKTLSB | RIG_MODE_PKTLSB2 | RIG_MODE_PKTLSB3 |\
RIG_MODE_AM | RIG_MODE_AM2 | RIG_MODE_AM3 |\
RIG_MODE_FM | RIG_MODE_FM2 | RIG_MODE_FM3)
RIG_MODE_CWR | RIG_MODE_RTTYR)
#define DUMMY_MEM_CAP { \
.bank_num = 1, \

8
dummy/netrigctl.c
Wyświetl plik

@ -113,7 +113,7 @@ static int netrigctl_open(RIG *rig)
if (ret <= 0)
return (ret < 0) ? ret : -RIG_EPROTO;
ret = num_sscanf(buf, "%"SCNfreq"%"SCNfreq"""%"SCNmode"%d%d%x%x",
ret = num_sscanf(buf, "%"SCNfreq"%"SCNfreq"%x%d%d%x%x",
&rs->rx_range_list[i].start,
&rs->rx_range_list[i].end,
&rs->rx_range_list[i].modes,
@ -132,7 +132,7 @@ static int netrigctl_open(RIG *rig)
if (ret <= 0)
return (ret < 0) ? ret : -RIG_EPROTO;
ret = num_sscanf(buf, "%"SCNfreq"%"SCNfreq"""%"SCNmode"%d%d%x%x",
ret = num_sscanf(buf, "%"SCNfreq"%"SCNfreq"%x%d%d%x%x",
&rs->tx_range_list[i].start,
&rs->tx_range_list[i].end,
&rs->tx_range_list[i].modes,
@ -151,7 +151,7 @@ static int netrigctl_open(RIG *rig)
if (ret <= 0)
return (ret < 0) ? ret : -RIG_EPROTO;
ret = sscanf(buf, "%"SCNmode"%ld",
ret = sscanf(buf, "%x%ld",
&rs->tuning_steps[i].modes,
&rs->tuning_steps[i].ts);
if (ret != 2)
@ -165,7 +165,7 @@ static int netrigctl_open(RIG *rig)
if (ret <= 0)
return (ret < 0) ? ret : -RIG_EPROTO;
ret = sscanf(buf, "%"SCNmode"%ld",
ret = sscanf(buf, "%x%ld",
&rs->filters[i].modes,
&rs->filters[i].width);
if (ret != 2)

6
dummy/trxmanager.c
Wyświetl plik

@ -49,9 +49,8 @@
#define TRXMANAGER_MODES (RIG_MODE_AM | RIG_MODE_CW | RIG_MODE_CWR |\
RIG_MODE_RTTY | RIG_MODE_RTTYR |\
RIG_MODE_PKTLSB | RIG_MODE_PKTUSB | RIG_MODE_PKTLSB2 | RIG_MODE_PKTUSB2 | RIG_MODE_PKTLSB3 | RIG_MODE_PKTUSB3 |\
RIG_MODE_USB | RIG_MODE_LSB |\
RIG_MODE_FM|RIG_MODE_FM2|RIG_MODE_FM3)
RIG_MODE_PKTLSB | RIG_MODE_PKTUSB |\
RIG_MODE_USB | RIG_MODE_LSB | RIG_MODE_FM)
#define streq(s1,s2) (strcmp(s1,s2)==0)
@ -269,7 +268,6 @@ static int trxmanager_init(RIG *rig)
strncpy(rig->state.rigport.pathname, DEFAULTPATH,
sizeof(rig->state.rigport.pathname));
//rig->state.mode_list = modes;
return RIG_OK;
}

2
dummy/trxmanager.h
Wyświetl plik

@ -30,7 +30,7 @@
#include <sys/time.h>
#endif
#define BACKEND_VER "1.2x"
#define BACKEND_VER "1.2"
#define EOM "\r"
#define TRUE 1

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

@ -312,30 +312,6 @@ typedef double freq_t;
#define SCNfreq "lf"
#define FREQFMT SCNfreq
/**
* \brief scanf(3) format to be used for freq_t type
*/
// Turn on 64 bit mode types
#define RMODE64
#ifdef RMODE64
#ifdef __LP64__
#pragma message "64 bit modes requested, 64 bit compilation"
#define SCNmode "lx"
#else
#ifdef __MINGW32__
#pragma message "64 bit modes requested, MINGW32 compilation"
#define SCNmode "I64x"
#else
#pragma message "64 bit modes requested, 32 bit compilation"
#define SCNmode "llx"
#endif
#endif
#else
#pragma message "34 bit modes requested, 32/64 bit compilation"
#define SCNmode "x"
#endif
#define MODEFMT SCNmode
/**
* \brief Short frequency type
@ -892,25 +868,10 @@ typedef enum {
RIG_MODE_DSB = (1 << 19), /*!< \c DSB -- Double sideband suppressed carrier */
RIG_MODE_FMN = (1 << 21), /*!< \c FMN -- FM Narrow Kenwood ts990s */
RIG_MODE_PKTAM = (1 << 22), /*!< \c PKTAM -- Packet/Digital AM mode e.g. IC7300 */
RIG_MODE_MAX = (1 << 23), /* this can never be bigger than 31 or 63 */
#ifdef RMODE64
/* Force rmode_t to be 64 bit */
RIG_MODE_DR = (1ULL << 52),
RIG_MODE_DV = (1ULL << 53),
RIG_MODE_PKTLSB2 = (1ULL << 54),
RIG_MODE_PKTUSB2 = (1ULL << 55),
RIG_MODE_FM2 = (1ULL << 56),
RIG_MODE_AM2 = (1ULL << 57),
RIG_MODE_PKTLSB3 = (1ULL << 58),
RIG_MODE_PKTUSB3 = (1ULL << 59),
RIG_MODE_FM3 = (1ULL << 60),
RIG_MODE_AM3 = (1ULL << 61),
RIG_MODE_TESTS_MAX =(1ULL << 63)
#else
RIG_MODE_TESTS_MAX =(1 << 24) /*!< \c MUST ALWAYS BE LAST, Max Count for dumpcaps.c */
#endif
RIG_MODE_TESTS_MAX /*!< \c MUST ALWAYS BE LAST, Max Count for dumpcaps.c */
} rmode_t;
/**
* \brief macro for backends, not to be used by rig_set_mode et al.
*/
@ -1632,7 +1593,7 @@ struct rig_state {
rmode_t current_mode; /*!< Mode currently set */
pbwidth_t current_width; /*!< Passband width currently set */
vfo_t tx_vfo; /*!< Tx VFO currently set */
rmode_t mode_list; /*!< Complete list of modes for this rig */
int mode_list; /*!< Complete list of modes for this rig */
int transmit; /*!< rig should be transmitting i.e. hard
wired PTT asserted - used by rigs that
don't do CAT while in Tx */

5
kenwood/kenwood.c
Wyświetl plik

@ -2711,7 +2711,10 @@ int kenwood_get_trn(RIG *rig, int *trn)
if (retval != RIG_OK)
return retval;
*trn = trnbuf[2] != '0' ? RIG_TRN_RIG : RIG_TRN_OFF;
if (rig->caps->rig_model == RIG_MODEL_THD74)
*trn = trnbuf[3] != '0' ? RIG_TRN_RIG : RIG_TRN_OFF;
else
*trn = trnbuf[2] != '0' ? RIG_TRN_RIG : RIG_TRN_OFF;
return RIG_OK;
}

39
kenwood/thd74.c
Wyświetl plik

@ -35,8 +35,8 @@
#include "misc.h"
#define THD74_MODES (RIG_MODE_FM|RIG_MODE_DV|RIG_MODE_AM|RIG_MODE_LSB|RIG_MODE_USB|RIG_MODE_CW|RIG_MODE_FMN|RIG_MODE_DR|RIG_MODE_WFM|RIG_MODE_CWR)
#define THD74_MODES_TX (RIG_MODE_FM|RIG_MODE_DV|RIG_MODE_DR)
#define THD74_MODES (RIG_MODE_FM|RIG_MODE_AM|RIG_MODE_LSB|RIG_MODE_USB|RIG_MODE_CW|RIG_MODE_FMN|RIG_MODE_WFM|RIG_MODE_CWR)
#define THD74_MODES_TX (RIG_MODE_FM)
#define THD74_FUNC_ALL (RIG_FUNC_TSQL| \
RIG_FUNC_TONE)
@ -56,13 +56,13 @@
static rmode_t thd74_mode_table[10] =
{
[0] = RIG_MODE_FM, /* normal, but narrow compared to broadcast */
[1] = RIG_MODE_DV,
// [1] = RIG_MODE_DV,
[2] = RIG_MODE_AM,
[3] = RIG_MODE_LSB,
[4] = RIG_MODE_USB,
[5] = RIG_MODE_CW,
[6] = RIG_MODE_FMN, /* what kenwood calls narrow */
[7] = RIG_MODE_DR,
// [7] = RIG_MODE_DR,
[8] = RIG_MODE_WFM,
[9] = RIG_MODE_CWR,
};
@ -251,6 +251,7 @@ static int thd74_get_freq_info(RIG *rig, vfo_t vfo, char *buf)
int retval;
char c, cmd[8];
rig_debug(RIG_DEBUG_TRACE, "%s: called\n", __func__);
retval = thd74_vfoc(rig, vfo, &c);
if (retval != RIG_OK)
@ -300,6 +301,8 @@ static int thd74_set_freq_item(RIG *rig, vfo_t vfo, int item, int val)
int retval;
char buf[128];
rig_debug(RIG_DEBUG_TRACE, "%s: called\n", __func__);
retval = thd74_get_freq_info(rig, vfo, buf);
if (retval != RIG_OK)
@ -314,7 +317,7 @@ static int thd74_set_freq_item(RIG *rig, vfo_t vfo, int item, int val)
static int thd74_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
{
int retval;
char buf[64], fbuf[11];
char buf[128], fbuf[11];
rig_debug(RIG_DEBUG_TRACE, "%s: called\n", __func__);
@ -382,7 +385,7 @@ int thd74_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
case RIG_MODE_AM: kmode = '1'; break;
case RIG_MODE_DV: kmode = '2'; break;
// case RIG_MODE_DV: kmode = '2'; break;
case RIG_MODE_LSB: kmode = '3'; break;
@ -392,7 +395,7 @@ int thd74_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
case RIG_MODE_FMN: kmode = '6'; break;
case RIG_MODE_DR: kmode = '7'; break;
// case RIG_MODE_DR: kmode = '7'; break;
case RIG_MODE_WFM: kmode = '8'; break;
@ -424,10 +427,6 @@ static int thd74_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
char modec, buf[128];
rig_debug(RIG_DEBUG_TRACE, "%s: called\n", __func__);
rig_debug(RIG_DEBUG_TRACE, "%s: %ld\n", __func__, RIG_MODE_AM);
rig_debug(RIG_DEBUG_TRACE, "%s: %ld\n", __func__, RIG_MODE_FMN);
rig_debug(RIG_DEBUG_TRACE, "%s: %ld\n", __func__, RIG_MODE_DR);
rig_debug(RIG_DEBUG_TRACE, "%s: %ld\n", __func__, RIG_MODE_TESTS_MAX);
retval = thd74_get_freq_info(rig, vfo, buf);
@ -775,6 +774,23 @@ static int thd74_get_ctcss_sql(RIG *rig, vfo_t vfo, tone_t *tone)
return RIG_OK;
}
int thd74_set_ptt(RIG *rig, vfo_t vfo, ptt_t ptt)
{
const char *ptt_cmd;
rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
if (!rig)
return -RIG_EINVAL;
switch (ptt) {
case RIG_PTT_ON: ptt_cmd = "TX"; break;
case RIG_PTT_OFF: ptt_cmd = "RX"; break;
default: return -RIG_EINVAL;
}
return kenwood_transaction(rig, ptt_cmd, NULL, 0);
}
static int thd74_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
{
int retval, lvl;
@ -1514,6 +1530,7 @@ const struct rig_caps thd74_caps =
.get_mode = thd74_get_mode,
.set_vfo = thd74_set_vfo,
.get_vfo = thd74_get_vfo,
.set_ptt = thd74_set_ptt,
.set_rptr_shift = thd74_set_rptr_shft,
.get_rptr_shift = thd74_get_rptr_shft,
.set_rptr_offs = thd74_set_rptr_offs,

12
src/misc.c
Wyświetl plik

@ -334,16 +334,6 @@ static struct
{ RIG_MODE_SAL, "SAL" },
{ RIG_MODE_SAH, "SAH" },
{ RIG_MODE_DSB, "DSB"},
{ RIG_MODE_PKTLSB2, "PKTLSB2" },
{ RIG_MODE_PKTLSB3, "PKTLSB3" },
{ RIG_MODE_PKTUSB2, "PKTUSB2" },
{ RIG_MODE_PKTUSB3, "PKTUSB3" },
{ RIG_MODE_AM2, "PKTAM2" },
{ RIG_MODE_AM3, "PKTAM3" },
{ RIG_MODE_FM2, "PKTFM2" },
{ RIG_MODE_FM3, "PKTFM3" },
{ RIG_MODE_DV, "DV"},
{ RIG_MODE_DR, "DR"},
{ RIG_MODE_NONE, "" },
};
@ -391,7 +381,7 @@ const char * HAMLIB_API rig_strrmode(rmode_t mode)
return "";
}
for (i = 0 ; mode_str[i].str[0]!='\0' ; i++)
for (i = 0 ; mode_str[i].str[0] != '\0'; i++)
{
if (mode == mode_str[i].mode)
{

5
tests/dumpcaps.c
Wyświetl plik

@ -537,10 +537,9 @@ int dumpcaps(RIG *rig, FILE *fout)
fprintf(fout, "Bandwidths:");
for (rmode_t l = 1; l < RIG_MODE_TESTS_MAX; l <<= 1)
for (i = 1; i < RIG_MODE_TESTS_MAX; i <<= 1)
{
if (strlen(rig_strrmode(i)) == 0) continue;
pbwidth_t pbnorm = rig_passband_normal(rig, l);
pbwidth_t pbnorm = rig_passband_normal(rig, i);
if (pbnorm == 0)
{

8
tests/rigctl_parse.c
Wyświetl plik

@ -3788,7 +3788,7 @@ declare_proto_rig(dump_state)
for (i = 0; i < FRQRANGESIZ && !RIG_IS_FRNG_END(rs->rx_range_list[i]); i++)
{
fprintf(fout,
"%"FREQFMT" %"FREQFMT" 0x%"MODEFMT" %d %d 0x%x 0x%x\n",
"%"FREQFMT" %"FREQFMT" 0x%x %d %d 0x%x 0x%x\n",
rs->rx_range_list[i].start,
rs->rx_range_list[i].end,
rs->rx_range_list[i].modes,
@ -3803,7 +3803,7 @@ declare_proto_rig(dump_state)
for (i = 0; i < FRQRANGESIZ && !RIG_IS_FRNG_END(rs->tx_range_list[i]); i++)
{
fprintf(fout,
"%"FREQFMT" %"FREQFMT" 0x%"MODEFMT" %d %d 0x%x 0x%x\n",
"%"FREQFMT" %"FREQFMT" 0x%x %d %d 0x%x 0x%x\n",
rs->tx_range_list[i].start,
rs->tx_range_list[i].end,
rs->tx_range_list[i].modes,
@ -3818,7 +3818,7 @@ declare_proto_rig(dump_state)
for (i = 0; i < TSLSTSIZ && !RIG_IS_TS_END(rs->tuning_steps[i]); i++)
{
fprintf(fout,
"0x%"MODEFMT" %ld\n",
"0x%x %ld\n",
rs->tuning_steps[i].modes,
rs->tuning_steps[i].ts);
}
@ -3828,7 +3828,7 @@ declare_proto_rig(dump_state)
for (i = 0; i < FLTLSTSIZ && !RIG_IS_FLT_END(rs->filters[i]); i++)
{
fprintf(fout,
"0x%"MODEFMT" %ld\n",
"0x%x %ld\n",
rs->filters[i].modes,
rs->filters[i].width);
}

5
tests/sprintflst.c
Wyświetl plik

@ -112,10 +112,9 @@ int sprintf_mode(char *str, rmode_t mode)
return 0;
}
for (i = 0; i < 63; i++)
for (i = 0; i < 30; i++)
{
rmode_t qmode = (rmode_t)1 << i;
const char *ms = rig_strrmode(mode & qmode);
const char *ms = rig_strrmode(mode & (1UL << i));
if (!ms || !ms[0])
{