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

TS950 now uses kenwood_get_mode_if() 

Like other Kenwood rigs of its vintage, the TS-950 series provides the
mode information in the IF command response.  Filter bandwidth is
set/read using the FL command.
Hamlib-3.0
Nate Bargmann 2012-06-02 07:18:40 -05:00
rodzic de329c1ed7
commit 1d6a7249fb
2 zmienionych plików z 11 dodań i 11 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

6
kenwood/kenwood.c
Wyświetl plik

@ -983,7 +983,8 @@ int kenwood_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
if (rig->caps->rig_model == RIG_MODEL_TS450S if (rig->caps->rig_model == RIG_MODEL_TS450S
|| rig->caps->rig_model == RIG_MODEL_TS690S || rig->caps->rig_model == RIG_MODEL_TS690S
|| rig->caps->rig_model == RIG_MODEL_TS850) { || rig->caps->rig_model == RIG_MODEL_TS850
|| rig->caps->rig_model == RIG_MODEL_TS950SDX) {
err = kenwood_set_filter(rig, width); err = kenwood_set_filter(rig, width);
/* non fatal */ /* non fatal */
@ -1087,7 +1088,8 @@ int kenwood_get_mode_if(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
if (rig->caps->rig_model == RIG_MODEL_TS450S if (rig->caps->rig_model == RIG_MODEL_TS450S
|| rig->caps->rig_model == RIG_MODEL_TS690S || rig->caps->rig_model == RIG_MODEL_TS690S
|| rig->caps->rig_model == RIG_MODEL_TS850) { || rig->caps->rig_model == RIG_MODEL_TS850
|| rig->caps->rig_model == RIG_MODEL_TS950SDX) {
err = kenwood_get_filter(rig, width); err = kenwood_get_filter(rig, width);
/* non fatal */ /* non fatal */

16
kenwood/ts950.c
Wyświetl plik

@ -1,6 +1,6 @@
/* /*
* Hamlib Kenwood backend - TS950 description * Hamlib Kenwood backend - TS950 description
* Copyright (c) 2002-2012 by Stephane Fillod * Copyright (c) 2002-2012 by Stephane Fillod
* *
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
@ -52,9 +52,9 @@ static struct kenwood_priv_caps ts950_priv_caps = {
* There are minor differences between the SDX and other models, but they are * There are minor differences between the SDX and other models, but they are
* in commands not implemented here. * in commands not implemented here.
* *
* Reference: TS-950series External Control Instruction Manual (1992) * Reference: TS-950 series External Control Instruction Manual (1992)
*/ */
const struct rig_caps ts950sdx_caps = { const struct rig_caps ts950sdx_caps = {
.rig_model = RIG_MODEL_TS950SDX, .rig_model = RIG_MODEL_TS950SDX,
.model_name = "TS-950SDX", .model_name = "TS-950SDX",
@ -78,12 +78,12 @@ const struct rig_caps ts950sdx_caps = {
.retry = 3, .retry = 3,
.has_get_func = RIG_FUNC_NONE, .has_get_func = RIG_FUNC_NONE,
.has_set_func = RIG_FUNC_NONE, .has_set_func = RIG_FUNC_NONE,
.has_get_level = TS950_GET_LEVEL, .has_get_level = TS950_GET_LEVEL,
.has_set_level = RIG_LEVEL_NONE, .has_set_level = RIG_LEVEL_NONE,
.has_get_parm = RIG_PARM_NONE, .has_get_parm = RIG_PARM_NONE,
.has_set_parm = RIG_PARM_NONE, .has_set_parm = RIG_PARM_NONE,
.level_gran = {}, .level_gran = {},
.parm_gran = {}, .parm_gran = {},
@ -168,9 +168,7 @@ const struct rig_caps ts950sdx_caps = {
.set_xit = kenwood_set_xit, .set_xit = kenwood_set_xit,
.get_xit = kenwood_get_xit, .get_xit = kenwood_get_xit,
.set_mode = kenwood_set_mode, .set_mode = kenwood_set_mode,
/* 950 can't read mode .get_mode = kenwood_get_mode_if,
* .get_mode = kenwood_get_mode,
*/
.set_vfo = kenwood_set_vfo, .set_vfo = kenwood_set_vfo,
.get_vfo = kenwood_get_vfo_if, .get_vfo = kenwood_get_vfo_if,
.set_ctcss_tone = kenwood_set_ctcss_tone, .set_ctcss_tone = kenwood_set_ctcss_tone,
@ -184,7 +182,7 @@ const struct rig_caps ts950sdx_caps = {
* .set_level = kenwood_set_level, * .set_level = kenwood_set_level,
*/ */
.get_level = kenwood_get_level, .get_level = kenwood_get_level,
/* /*
* .send_morse = kenwood_send_morse, * .send_morse = kenwood_send_morse,
*/ */
.vfo_op = kenwood_vfo_op, .vfo_op = kenwood_vfo_op,