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

2002-11-21 

Update:
		Corrected problem with "NULL pointer" in ft920_get_vfo
		Updated rx/tx ranges for regions 1 & 2 with bandplan.h
		Changed license in ft920.c/h to LGPL
		Bumped backend version to 0.1.2


git-svn-id: https://hamlib.svn.sourceforge.net/svnroot/hamlib/trunk@1291 7ae35d74-ebe9-4afe-98af-79ac388436b8
Hamlib-1.1.4
Nate Bargmann, N0NB 2002-11-22 03:04:30 +00:00
rodzic bf1dbe677b
commit eb5cd383f8
2 zmienionych plików z 73 dodań i 81 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

101
yaesu/ft920.c
Wyświetl plik

@ -1,9 +1,9 @@
/* /*
* hamlib - (C) Frank Singleton 2000 (vk3fcs@ix.netcom.com) * hamlib - (C) Frank Singleton 2000 (javabear at users.sourceforge.net)
* *
* ft920.c - (C) Frank Singleton 2000 (vk3fcs@ix.netcom.com) * ft920.c - (C) Frank Singleton 2000 (javabear at users.sourceforge.net)
* (C) Nate Bargmann 2002 (n0nb@arrl.net) * (C) Nate Bargmann 2002 (n0nb at arrl.net)
* (C) Stephane Fillod 2002 (fillods@users.sourceforge.net) * (C) Stephane Fillod 2002 (fillods at users.sourceforge.net)
* *
* This shared library provides an API for communicating * This shared library provides an API for communicating
* via serial interface to an FT-920 using the "CAT" interface * via serial interface to an FT-920 using the "CAT" interface
@ -12,22 +12,22 @@
* pages 86 to 90 * pages 86 to 90
* *
* *
* $Id: ft920.c,v 1.8 2002-11-21 23:06:37 fillods Exp $ * $Id: ft920.c,v 1.9 2002-11-22 03:04:30 n0nb Exp $
* *
* *
* This program is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU Lesser General Public
* as published by the Free Software Foundation; either version 2 * License as published by the Free Software Foundation; either
* of the License, or (at your option) any later version. * version 2 of the License, or (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* GNU General Public License for more details. * Lesser General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU Lesser General Public
* along with this program; if not, write to the Free Software * License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
* *
*/ */
@ -43,6 +43,7 @@
#include <hamlib/rig.h> #include <hamlib/rig.h>
#include <hamlib/riglist.h> #include <hamlib/riglist.h>
#include <bandplan.h>
#include "serial.h" #include "serial.h"
#include "misc.h" #include "misc.h"
#include "yaesu.h" #include "yaesu.h"
@ -147,7 +148,6 @@ struct ft920_priv_data {
unsigned char update_data[FT920_VFO_DATA_LENGTH]; /* returned data--max value, some are less */ unsigned char update_data[FT920_VFO_DATA_LENGTH]; /* returned data--max value, some are less */
}; };
/* /*
* ft920 rigs capabilities. * ft920 rigs capabilities.
* Also this struct is READONLY! * Also this struct is READONLY!
@ -158,8 +158,8 @@ const struct rig_caps ft920_caps = {
.rig_model = RIG_MODEL_FT920, .rig_model = RIG_MODEL_FT920,
.model_name = "FT-920", .model_name = "FT-920",
.mfg_name = "Yaesu", .mfg_name = "Yaesu",
.version = "0.1.0", .version = "0.1.2",
.copyright = "GPL", .copyright = "LGPL",
.status = RIG_STATUS_ALPHA, .status = RIG_STATUS_ALPHA,
.rig_type = RIG_TYPE_TRANSCEIVER, .rig_type = RIG_TYPE_TRANSCEIVER,
.ptt_type = RIG_PTT_NONE, .ptt_type = RIG_PTT_NONE,
@ -194,50 +194,35 @@ const struct rig_caps ft920_caps = {
.chan_desc_sz = 0, .chan_desc_sz = 0,
.chan_list = { RIG_CHAN_END, }, /* FIXME: memory channel list: 122 (!) */ .chan_list = { RIG_CHAN_END, }, /* FIXME: memory channel list: 122 (!) */
.rx_range_list1 = { RIG_FRNG_END, }, /* FIXME: enter region 1 setting */ .rx_range_list1 = {
{kHz(100), MHz(30), FT920_ALL_RX_MODES, -1, -1, FT920_VFO_ALL, FT920_ANTS}, /* General coverage + ham */
{MHz(48), MHz(56), FT920_ALL_RX_MODES, -1, -1, FT920_VFO_ALL, FT920_ANTS}, /* 6m! */
RIG_FRNG_END,
}, /* FIXME: Are these the correct Region 1 values? */
.tx_range_list1 = { RIG_FRNG_END, }, .tx_range_list1 = {
FRQ_RNG_HF(1, FT920_OTHER_TX_MODES, W(5), W(100), FT920_VFO_ALL, FT920_ANTS),
FRQ_RNG_HF(1, FT920_AM_TX_MODES, W(2), W(25), FT920_VFO_ALL, FT920_ANTS), /* AM class */
FRQ_RNG_6m(1, FT920_OTHER_TX_MODES, W(5), W(100), FT920_VFO_ALL, FT920_ANTS),
FRQ_RNG_6m(1, FT920_AM_TX_MODES, W(2), W(25), FT920_VFO_ALL, FT920_ANTS), /* AM class */
RIG_FRNG_END,
},
.rx_range_list2 = { .rx_range_list2 = {
{kHz(100), MHz(30), FT920_ALL_RX_MODES, -1, -1, FT920_VFO_ALL}, /* General coverage + ham */ {kHz(100), MHz(30), FT920_ALL_RX_MODES, -1, -1, FT920_VFO_ALL, FT920_ANTS},
{MHz(48), MHz(56), FT920_ALL_RX_MODES, -1, -1, FT920_VFO_ALL}, /* 6m! */ {MHz(48), MHz(56), FT920_ALL_RX_MODES, -1, -1, FT920_VFO_ALL, FT920_ANTS},
RIG_FRNG_END, RIG_FRNG_END,
}, /* Region 2 rx ranges */ },
.tx_range_list2 = { .tx_range_list2 = {
{kHz(1800), Hz(1999990), FT920_OTHER_TX_MODES, W(5), W(100), FT920_VFO_ALL}, /* 100W class */ FRQ_RNG_HF(2, FT920_OTHER_TX_MODES, W(5), W(100), FT920_VFO_ALL, FT920_ANTS),
{kHz(1800), Hz(1999990), FT920_AM_TX_MODES, W(2), W(25), FT920_VFO_ALL}, /* 25W class */ FRQ_RNG_HF(2, FT920_AM_TX_MODES, W(2), W(25), FT920_VFO_ALL, FT920_ANTS), /* AM class */
{kHz(3500), Hz(3999990), FT920_OTHER_TX_MODES, W(5), W(100), FT920_VFO_ALL},
{kHz(3500), Hz(3999990), FT920_AM_TX_MODES, W(2), W(25), FT920_VFO_ALL},
{MHz(7), Hz(7299990), FT920_OTHER_TX_MODES, W(5), W(100), FT920_VFO_ALL},
{MHz(7), Hz(7299990), FT920_AM_TX_MODES, W(2), W(25), FT920_VFO_ALL},
{kHz(10100), Hz(10149990), FT920_OTHER_TX_MODES, W(5), W(100), FT920_VFO_ALL},
{kHz(10100), Hz(10149990), FT920_AM_TX_MODES, W(2), W(25), FT920_VFO_ALL},
{MHz(14), Hz(14349990), FT920_OTHER_TX_MODES, W(5), W(100), FT920_VFO_ALL},
{MHz(14), Hz(14349990), FT920_AM_TX_MODES, W(2), W(25), FT920_VFO_ALL},
{kHz(18068), Hz(18167990), FT920_OTHER_TX_MODES, W(5), W(100), FT920_VFO_ALL},
{kHz(18068), Hz(18167990), FT920_AM_TX_MODES, W(2), W(25), FT920_VFO_ALL},
{MHz(21), Hz(21449990), FT920_OTHER_TX_MODES, W(5), W(100), FT920_VFO_ALL},
{MHz(21), Hz(21449990), FT920_AM_TX_MODES, W(2), W(25), FT920_VFO_ALL},
{kHz(24890), Hz(24989990), FT920_OTHER_TX_MODES, W(5), W(100), FT920_VFO_ALL},
{kHz(24890), Hz(24989990), FT920_AM_TX_MODES, W(2), W(25), FT920_VFO_ALL},
{MHz(28), Hz(29699990), FT920_OTHER_TX_MODES, W(5), W(100), FT920_VFO_ALL},
{MHz(28), Hz(29699990), FT920_AM_TX_MODES, W(2), W(25), FT920_VFO_ALL},
{MHz(50), Hz(53999990), FT920_OTHER_TX_MODES, W(5), W(100), FT920_VFO_ALL},
{MHz(50), Hz(53999990), FT920_AM_TX_MODES, W(2), W(25), FT920_VFO_ALL},
FRQ_RNG_6m(2, FT920_OTHER_TX_MODES, W(5), W(100), FT920_VFO_ALL, FT920_ANTS),
FRQ_RNG_6m(2, FT920_AM_TX_MODES, W(2), W(25), FT920_VFO_ALL, FT920_ANTS), /* AM class */
RIG_FRNG_END, RIG_FRNG_END,
}, /* region 2 TX ranges */ },
.tuning_steps = { .tuning_steps = {
{FT920_SSB_CW_RX_MODES, Hz(10)}, /* Normal */ {FT920_SSB_CW_RX_MODES, Hz(10)}, /* Normal */
@ -876,7 +861,7 @@ int ft920_get_vfo(RIG *rig, vfo_t *vfo) {
FT920_STATUS_FLAGS_LENGTH); FT920_STATUS_FLAGS_LENGTH);
status_0 = priv->update_data[FT920_SUMO_DISPLAYED_STATUS_0]; status_0 = priv->update_data[FT920_SUMO_DISPLAYED_STATUS_0];
status_0 &= SF_VFOAB; /* get VFO B (sub display) active bits */ status_0 &= SF_VFOB; /* get VFO B (sub display) active bits */
status_1 = priv->update_data[FT920_SUMO_DISPLAYED_STATUS_1]; status_1 = priv->update_data[FT920_SUMO_DISPLAYED_STATUS_1];
status_1 &= SF_VFO_MASK; /* get VFO/MEM (main display) active bits */ status_1 &= SF_VFO_MASK; /* get VFO/MEM (main display) active bits */
@ -895,7 +880,7 @@ int ft920_get_vfo(RIG *rig, vfo_t *vfo) {
* *
*/ */
switch (status_0) { switch (status_0) {
case SF_VFOAB: case SF_VFOB:
*vfo = RIG_VFO_B; *vfo = RIG_VFO_B;
priv->current_vfo = RIG_VFO_B; priv->current_vfo = RIG_VFO_B;
return RIG_OK; return RIG_OK;
@ -921,7 +906,7 @@ int ft920_get_vfo(RIG *rig, vfo_t *vfo) {
*vfo = RIG_VFO_A; *vfo = RIG_VFO_A;
priv->current_vfo = RIG_VFO_A; priv->current_vfo = RIG_VFO_A;
return RIG_OK; return RIG_OK;
case 0: case SF_VFOA:
*vfo = RIG_VFO_A; *vfo = RIG_VFO_A;
priv->current_vfo = RIG_VFO_A; priv->current_vfo = RIG_VFO_A;
return RIG_OK; return RIG_OK;

41
yaesu/ft920.h
Wyświetl plik

@ -1,30 +1,30 @@
/* /*
* hamlib - (C) Frank Singleton 2000 (vk3fcs@@ix.netcom.com) * hamlib - (C) Frank Singleton 2000 (javabear at users.sourceforge.net)
* *
* ft920.h - (C) Frank Singleton 2000 (vk3fcs@@ix.netcom.com) * ft920.h - (C) Frank Singleton 2000 (javabear at users.sourceforge.net)
* (C) Nate Bargmann 2002 (n0nb@arrl.net) * (C) Nate Bargmann 2002 (n0nb at arrl.net)
* (C) Stephane Fillod 2002 (fillods@users.sourceforge.net) * (C) Stephane Fillod 2002 (fillods at users.sourceforge.net)
* *
* This shared library provides an API for communicating * This shared library provides an API for communicating
* via serial interface to an FT-920 using the "CAT" interface * via serial interface to an FT-920 using the "CAT" interface
* *
* *
* $Id: ft920.h,v 1.6 2002-11-15 13:15:25 n0nb Exp $ * $Id: ft920.h,v 1.7 2002-11-22 03:04:30 n0nb Exp $
* *
* *
* This program is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU Lesser General Public
* as published by the Free Software Foundation; either version 2 * License as published by the Free Software Foundation; either
* of the License, or (at your option) any later version. * version 2 of the License, or (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* GNU General Public License for more details. * Lesser General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU Lesser General Public
* along with this program; if not, write to the Free Software * License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
* *
*/ */
@ -54,6 +54,12 @@
#define FT920_FUNC_ALL (RIG_FUNC_FAGC|RIG_FUNC_NB|RIG_FUNC_COMP|RIG_FUNC_VOX|RIG_FUNC_TONE|RIG_FUNC_TSQL|RIG_FUNC_SBKIN|RIG_FUNC_FBKIN) /* fix */ #define FT920_FUNC_ALL (RIG_FUNC_FAGC|RIG_FUNC_NB|RIG_FUNC_COMP|RIG_FUNC_VOX|RIG_FUNC_TONE|RIG_FUNC_TSQL|RIG_FUNC_SBKIN|RIG_FUNC_FBKIN) /* fix */
/*
* Other features
*/
#define FT920_ANTS 0 /* FIXME: declare Ant A & B and RX input */
/* /*
* Returned data length in bytes * Returned data length in bytes
* *
@ -207,9 +213,10 @@ typedef enum ft920_native_cmd_e ft920_native_cmd_t;
*/ */
#define FT920_SUMO_DISPLAYED_STATUS_0 0x00 /* Status flag byte 0 */ #define FT920_SUMO_DISPLAYED_STATUS_0 0x00 /* Status flag byte 0 */
#define SF_VFOA 0x00 /* bits 0 & 1, VFO A TX/RX == 0 */
#define SF_SPLITA 0x01 /* Split operation with VFO-B on TX */ #define SF_SPLITA 0x01 /* Split operation with VFO-B on TX */
#define SF_SPLITB 0x02 /* Split operation with VFO-B on RX */ #define SF_SPLITB 0x02 /* Split operation with VFO-B on RX */
#define SF_VFOAB 0x03 /* bits 0 & 1, VFO A TX/RX == 0, VFO B TX/RX == 3 */ #define SF_VFOB 0x03 /* bits 0 & 1, VFO B TX/RX == 3 */
#define FT920_SUMO_DISPLAYED_STATUS_1 0x01 /* Status flag byte 1 */ #define FT920_SUMO_DISPLAYED_STATUS_1 0x01 /* Status flag byte 1 */
#define SF_QMB 0x08 /* Quick Memory Bank (QMB) selected */ #define SF_QMB 0x08 /* Quick Memory Bank (QMB) selected */