variable common_dcs_list[] with 104 DCS codes

git-svn-id: https://hamlib.svn.sourceforge.net/svnroot/hamlib/trunk@2701 7ae35d74-ebe9-4afe-98af-79ac388436b8
Hamlib-1.2.10
Stéphane Fillod, F8CFE 2009-06-01 16:51:41 +00:00
rodzic 1505ddb1d7
commit c1c220c986
6 zmienionych plików z 43 dodań i 41 usunięć

Wyświetl plik

@ -1,6 +1,6 @@
/*
* Hamlib Kenwood backend - TH-F7 description
* Copyright (c) 2001-2004 by Stephane Fillod
* Copyright (c) 2001-2009 by Stephane Fillod
*
* $Id: thf7.c,v 1.17 2009-02-03 23:22:58 azummo Exp $
*
@ -28,6 +28,7 @@
#include <string.h>
#include <hamlib/rig.h>
#include "tones.h"
#include "kenwood.h"
#include "th.h"
@ -75,19 +76,6 @@ static const tone_t thf7_ctcss_list[] = {
};
/* DCS 0..103 (=104) */
static const tone_t thf7_dcs_list[] = {
23, 25, 26, 31, 32, 36, 43, 47, 51, 53, 54, 65, 71, 72, 73, 74,
114, 115, 116, 122, 125, 131, 132, 134, 143, 145, 152, 155, 156,
162, 165, 172, 174, 205, 212, 223, 225, 226, 243, 244, 245, 246,
251, 252, 255, 261, 263, 265, 266, 271, 274, 306, 311, 315, 325,
331, 332, 343, 346, 351, 356, 364, 365, 371, 411, 412, 413, 423,
431, 432, 445, 446, 452, 454, 455, 462, 464, 465, 466, 503, 506,
516, 523, 526, 532, 546, 565, 606, 612, 624, 627, 631, 632, 654,
662, 664, 703, 712, 723, 731, 732, 734, 743, 754,
0
};
static rmode_t thf7_mode_table[KENWOOD_MODE_TABLE_MAX] = {
[0] = RIG_MODE_FM,
[1] = RIG_MODE_WFM,
@ -152,7 +140,7 @@ const struct rig_caps thf7e_caps = {
},
.parm_gran = {},
.ctcss_list = thf7_ctcss_list,
.dcs_list = thf7_dcs_list,
.dcs_list = common_dcs_list,
.preamp = { RIG_DBLST_END, },
.attenuator = { 20, RIG_DBLST_END, },
.max_rit = Hz(0),

Wyświetl plik

@ -56,6 +56,11 @@ const tone_t full_ctcss_list[] = { FULL_CTCSS_LIST };
*/
const tone_t common_ctcss_list[] = { COMMON_CTCSS_LIST };
/**
* 104 DCS codes
*/
const tone_t common_dcs_list[] = { COMMON_DCS_LIST };
/**
* 106 DCS codes
*/

Wyświetl plik

@ -1,6 +1,6 @@
/*
* Hamlib Interface - CTCSS and DCS tables header
* Copyright (c) 2000-2003 by Stephane Fillod and Frank Singleton
* Copyright (c) 2000-2009 by Stephane Fillod and Frank Singleton
*
* $Id: tones.h,v 1.6 2005-02-21 18:56:22 fillods Exp $
*
@ -61,6 +61,25 @@ static const tone_t static_common_ctcss_list[] = {
COMMON_CTCSS_LIST
};
/*
* 104 DCS codes
*/
#define COMMON_DCS_LIST \
23, 25, 26, 31, 32, 36, 43, 47, 51, 53, \
54, 65, 71, 72, 73, 74, 114, 115, 116, 122, 125, 131, \
132, 134, 143, 145, 152, 155, 156, 162, 165, 172, 174, 205, \
212, 223, 225, 226, 243, 244, 245, 246, 251, 252, 255, 261, \
263, 265, 266, 271, 274, 306, 311, 315, 325, 331, 332, 343, \
346, 351, 356, 364, 365, 371, 411, 412, 413, 423, 431, 432, \
445, 446, 452, 454, 455, 462, 464, 465, 466, 503, 506, 516, \
523, 526, 532, 546, 565, 606, 612, 624, 627, 631, 632, 654, \
662, 664, 703, 712, 723, 731, 732, 734, 743, 754, \
0,
static const tone_t static_common_dcs_list[] = {
COMMON_DCS_LIST
};
/*
* 106 DCS codes
*/
@ -88,12 +107,14 @@ static const tone_t static_full_dcs_list[] = {
#define common_ctcss_list static_common_ctcss_list
#define full_ctcss_list static_full_ctcss_list
#define full_dcs_list static_full_dcs_list
#define common_dcs_list static_common_dcs_list
#else
extern const HAMLIB_EXPORT_VAR(tone_t) full_ctcss_list[];
extern const HAMLIB_EXPORT_VAR(tone_t) common_ctcss_list[];
extern const HAMLIB_EXPORT_VAR(tone_t) full_dcs_list[];
extern const HAMLIB_EXPORT_VAR(tone_t) common_dcs_list[];
#endif

Wyświetl plik

@ -1,5 +1,6 @@
/*
* hamlib - (C) Frank Singleton 2000,2001 (vk3fcs@ix.netcom.com)
* (C) Stephane Fillod 2000-2009
*
* ft817.c - (C) Chris Karpinsky 2001 (aa1vl@arrl.net)
* This shared library provides an API for communicating
@ -117,20 +118,6 @@ static const yaesu_cmd_set_t ncmd[] = {
{ 1, { 0x00, 0x00, 0x00, 0x00, 0x8f } }, /* pwr off */
};
static const tone_t static_ft817_dcs_list[] = {
23, 25, 26, 31, 32, 36, 43, 47, 51, 53,
54, 65, 71, 72, 73, 74, 114, 115, 116, 122,
125, 131, 132, 134, 143, 145, 152, 155, 156, 162,
165, 172, 174, 205, 212, 223, 225, 226, 243, 244,
245, 246, 251, 252, 255, 261, 263, 265, 266, 271,
274, 306, 311, 315, 325, 331, 332, 343, 346, 351,
356, 364, 365, 371, 411, 412, 413, 423, 431, 432,
445, 446, 452, 454, 455, 462, 464, 465, 466, 503,
506, 516, 523, 526, 532, 546, 565, 606, 612, 624,
627, 631, 632, 654, 662, 664, 703, 712, 723, 731,
732, 734, 743, 754, 0
};
#define FT817_ALL_RX_MODES (RIG_MODE_AM|RIG_MODE_CW|RIG_MODE_CWR|RIG_MODE_PKTFM|\
RIG_MODE_USB|RIG_MODE_LSB|RIG_MODE_RTTY|RIG_MODE_FM)
#define FT817_SSB_CW_RX_MODES (RIG_MODE_CW|RIG_MODE_CWR|RIG_MODE_USB|RIG_MODE_LSB|RIG_MODE_RTTY)
@ -168,7 +155,7 @@ const struct rig_caps ft817_caps = {
.rig_model = RIG_MODEL_FT817,
.model_name = "FT-817",
.mfg_name = "Yaesu",
.version = "0.5",
.version = "0.5.1",
.copyright = "LGPL",
.status = RIG_STATUS_BETA,
.rig_type = RIG_TYPE_TRANSCEIVER,
@ -193,8 +180,8 @@ const struct rig_caps ft817_caps = {
.has_set_parm = RIG_PARM_NONE,
.level_gran = {}, /* granularity */
.parm_gran = {},
.ctcss_list = static_common_ctcss_list,
.dcs_list = static_ft817_dcs_list, /* only 104 out of 106 supported */
.ctcss_list = common_ctcss_list,
.dcs_list = common_dcs_list, /* only 104 out of 106 supported */
.preamp = { RIG_DBLST_END, },
.attenuator = { RIG_DBLST_END, },
.max_rit = Hz(9990),

Wyświetl plik

@ -141,7 +141,7 @@ const struct rig_caps ft857_caps = {
.rig_model = RIG_MODEL_FT857,
.model_name = "FT-857",
.mfg_name = "Yaesu",
.version = "0.3",
.version = "0.4",
.copyright = "LGPL",
.status = RIG_STATUS_BETA,
.rig_type = RIG_TYPE_TRANSCEIVER,
@ -166,8 +166,8 @@ const struct rig_caps ft857_caps = {
.has_set_parm = RIG_PARM_NONE,
.level_gran = {}, /* granularity */
.parm_gran = {},
.ctcss_list = static_common_ctcss_list,
.dcs_list = static_full_dcs_list, /* FIXME: only 104 supported */
.ctcss_list = common_ctcss_list,
.dcs_list = common_dcs_list, /* only 104 supported */
.preamp = { RIG_DBLST_END, },
.attenuator = { RIG_DBLST_END, },
.max_rit = Hz(9990),

Wyświetl plik

@ -1,10 +1,11 @@
/* -*- mode: c; c-basic-offset: 2; indent-tabs-mode: nil; -*-
*
* ft897.h - (C) Tomi Manninen 2003 (oh2bns@sral.fi)
* ft897.c - (C) Tomi Manninen 2003 (oh2bns@sral.fi)
* (C) Stephane Fillod 2009
*
* ...derived but heavily modified from:
*
* ft817.h - (C) Chris Karpinsky 2001 (aa1vl@arrl.net)
* ft817.c - (C) Chris Karpinsky 2001 (aa1vl@arrl.net)
*
* This shared library provides an API for communicating
* via serial interface to an FT-897 using the "CAT" interface.
@ -178,7 +179,7 @@ const struct rig_caps ft897_caps = {
.rig_model = RIG_MODEL_FT897,
.model_name = "FT-897",
.mfg_name = "Yaesu",
.version = "0.3.2",
.version = "0.3.3",
.copyright = "LGPL",
.status = RIG_STATUS_BETA,
.rig_type = RIG_TYPE_TRANSCEIVER,
@ -203,8 +204,8 @@ const struct rig_caps ft897_caps = {
.has_set_parm = RIG_PARM_NONE,
.level_gran = {}, /* granularity */
.parm_gran = {},
.ctcss_list = static_common_ctcss_list,
.dcs_list = static_full_dcs_list, /* FIXME: only 104 supported */
.ctcss_list = common_ctcss_list,
.dcs_list = common_dcs_list, /* only 104 supported */
.preamp = { RIG_DBLST_END, },
.attenuator = { RIG_DBLST_END, },
.max_rit = Hz(9990),