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

- revert creation of RIG_MODE_WAM and RIG_MODE_SFM 

- sr2200:
  - fix filter width of WFM
  - prevent symbol littering


git-svn-id: https://hamlib.svn.sourceforge.net/svnroot/hamlib/trunk@3044 7ae35d74-ebe9-4afe-98af-79ac388436b8
Hamlib-1.2.13
Stéphane Fillod, F8CFE 2011-02-08 22:21:11 +00:00
rodzic fe147f28df
commit 01e2396ead
3 zmienionych plików z 30 dodań i 26 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

47
aor/sr2200.c
Wyświetl plik

@ -1,7 +1,7 @@
/*
* Hamlib AOR backend - SR2200 description
*
* Copyright (c) 2000-2008 by Stephane Fillod
* Copyright (c) 2000-2011 by Stephane Fillod
*
* Author: Stefano Speretta, Innovative Solutions In Space BV
*
@ -90,18 +90,18 @@
static int sr2200_set_freq(RIG *rig, vfo_t vfo, freq_t freq);
int parse_s2200_aor_mode(RIG *rig, char aormode, char aorwidth, rmode_t *mode, pbwidth_t *width);
static int parse_s2200_aor_mode(RIG *rig, char aormode, char aorwidth, rmode_t *mode, pbwidth_t *width);
static int sr2200_transaction(RIG *rig, const char *cmd, int cmd_len, char *data, int *data_len);
int sr2200_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width);
int sr2200_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width);
static int sr2200_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width);
static int sr2200_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width);
int sr2200_get_vfo(RIG *rig, vfo_t *vfo);
int sr2200_set_vfo(RIG *rig, vfo_t vfo);
static int sr2200_get_vfo(RIG *rig, vfo_t *vfo);
static int sr2200_set_vfo(RIG *rig, vfo_t vfo);
int sr2200_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val);
int sr2200_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val);
static int sr2200_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val);
static int sr2200_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val);
static const struct aor_priv_caps sr2200_priv_caps = {
.bank_base1 = '0',
@ -174,7 +174,10 @@ const struct rig_caps sr2200_caps = {
.tx_range_list1 = { RIG_FRNG_END, },
.rx_range_list2 = { RIG_FRNG_END, }, /* rx range */
.rx_range_list2 = {
{MHz(25),MHz(3000),SR2200_MODES,-1,-1,SR2200_VFO},
RIG_FRNG_END,
},
.tx_range_list2 = { RIG_FRNG_END, }, /* no tx range, this is a scanner! */
@ -201,11 +204,11 @@ const struct rig_caps sr2200_caps = {
},
/* mode/filter list, .remember = order matters! */
.filters = {
{RIG_MODE_WAM, kHz(15)},
{RIG_MODE_SFM, kHz(6)},
{RIG_MODE_AM, kHz(6)},
{RIG_MODE_AM, kHz(15)},
{RIG_MODE_FM, kHz(15)}, /* narrow */
{RIG_MODE_WFM, kHz(3000)}, /* wide */
{RIG_MODE_FM, kHz(6)},
{RIG_MODE_WFM, kHz(300)}, /* wide */
RIG_FLT_END,
},
@ -361,13 +364,19 @@ int sr2200_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
{
char mdbuf[BUFSZ];
int mdbuf_len, aormode, retval;
pbwidth_t normal_width;
normal_width = rig_passband_normal(rig, mode);
if (width == 0)
width = normal_width;
switch (mode) {
case RIG_MODE_AM: aormode = '2'; break;
case RIG_MODE_FM: aormode = '0'; break;
case RIG_MODE_WFM: aormode = '1'; break;
case RIG_MODE_SFM: aormode = '3'; break;
case RIG_MODE_WAM: aormode = '4'; break;
case RIG_MODE_AM: aormode = width > normal_width ?
SR2200_WAM : SR2200_AM; break;
case RIG_MODE_FM: aormode = width < normal_width ?
SR2200_SFM : SR2200_FM; break;
case RIG_MODE_WFM: aormode = SR2200_WFM; break;
default:
rig_debug(RIG_DEBUG_ERR,"%s: unsupported mode %d\n",
__FUNCTION__,mode);
@ -410,8 +419,8 @@ int parse_s2200_aor_mode(RIG *rig, char aormode, char aorwidth, rmode_t *mode, p
switch (aormode) {
case SR2200_FM: *mode = RIG_MODE_FM; break;
case SR2200_AM: *mode = RIG_MODE_AM; break;
case SR2200_SFM: *mode = RIG_MODE_SFM; break;
case SR2200_WAM: *mode = RIG_MODE_WAM; break;
case SR2200_SFM: *mode = RIG_MODE_FM; break;
case SR2200_WAM: *mode = RIG_MODE_AM; break;
case SR2200_WFM: *mode = RIG_MODE_WFM; break;
default:
rig_debug(RIG_DEBUG_ERR,"%s: unsupported mode '%c'\n",

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

@ -1,9 +1,8 @@
/*
* Hamlib Interface - API header
* Copyright (c) 2000-2003 by Frank Singleton
* Copyright (c) 2000-2009 by Stephane Fillod
* Copyright (c) 2000-2011 by Stephane Fillod
*
* $Id: rig.h,v 1.141 2009-02-20 14:14:30 fillods Exp $
*
* This library is free software; you can redistribute it and/or modify
* it under the terms of the GNU Library General Public License as
@ -790,8 +789,6 @@ typedef enum {
RIG_MODE_SAL = (1<<17),/*!< \c SAL -- Synchronous AM lower sideband */
RIG_MODE_SAH = (1<<18),/*!< \c SAH -- Synchronous AM upper (higher) sideband */
RIG_MODE_DSB = (1<<19), /*!< \c DSB -- Double sideband suppressed carrier */
RIG_MODE_SFM = (1<<20), /*!< \c SFM -- Synchronous FM */
RIG_MODE_WAM = (1<<21), /*!< \c WAM -- Wide band AM */
RIG_MODE_TESTS_MAX /*!< \c MUST ALWAYS BE LAST, Max Count for dumpcaps.c */
} rmode_t;

4
src/misc.c
Wyświetl plik

@ -1,6 +1,6 @@
/*
* Hamlib Interface - toolbox
* Copyright (c) 2000-2010 by Stephane Fillod
* Copyright (c) 2000-2011 by Stephane Fillod
*
* This library is free software; you can redistribute it and/or modify
* it under the terms of the GNU Library General Public License as
@ -278,8 +278,6 @@ static struct {
{ RIG_MODE_SAL, "SAL" },
{ RIG_MODE_SAH, "SAH" },
{ RIG_MODE_DSB, "DSB"},
{ RIG_MODE_SFM, "SFM"},
{ RIG_MODE_WAM, "WAM"},
{ RIG_MODE_NONE, "" },
};