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

* extended newcat: set_level/get_level, set_func/get_func, set_mem/get_mem, 

vfo_op, get_info
* updated FT-450/FT950 accordingly


git-svn-id: https://hamlib.svn.sourceforge.net/svnroot/hamlib/trunk@2454 7ae35d74-ebe9-4afe-98af-79ac388436b8
Hamlib-1.2.8
Stéphane Fillod, F8CFE 2008-11-01 22:39:07 +00:00
rodzic 17389f8c9f
commit 9ac6029844
6 zmienionych plików z 785 dodań i 112 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

46
yaesu/ft450.c
Wyświetl plik

@ -2,12 +2,13 @@
* hamlib - (C) Frank Singleton 2000 (javabear at users.sourceforge.net) * hamlib - (C) Frank Singleton 2000 (javabear at users.sourceforge.net)
* *
* ft450.c - (C) Nate Bargmann 2007 (n0nb at arrl.net) * ft450.c - (C) Nate Bargmann 2007 (n0nb at arrl.net)
* (C) Stephane Fillod 2008
* *
* This shared library provides an API for communicating * This shared library provides an API for communicating
* via serial interface to an FT-450 using the "CAT" interface * via serial interface to an FT-450 using the "CAT" interface
* *
* *
* $Id: ft450.c,v 1.3 2008-10-25 14:37:19 fillods Exp $ * $Id: ft450.c,v 1.4 2008-11-01 22:39:07 fillods Exp $
* *
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
@ -38,6 +39,7 @@
#include "yaesu.h" #include "yaesu.h"
#include "newcat.h" #include "newcat.h"
#include "ft450.h" #include "ft450.h"
#include "idx_builtin.h"
/* /*
* ft450 rigs capabilities. * ft450 rigs capabilities.
@ -49,7 +51,7 @@ const struct rig_caps ft450_caps = {
.rig_model = RIG_MODEL_FT450, .rig_model = RIG_MODEL_FT450,
.model_name = "FT-450", .model_name = "FT-450",
.mfg_name = "Yaesu", .mfg_name = "Yaesu",
.version = NEWCAT_VER ".0", .version = NEWCAT_VER ".1",
.copyright = "LGPL", .copyright = "LGPL",
.status = RIG_STATUS_BETA, .status = RIG_STATUS_BETA,
.rig_type = RIG_TYPE_TRANSCEIVER, .rig_type = RIG_TYPE_TRANSCEIVER,
@ -66,25 +68,34 @@ const struct rig_caps ft450_caps = {
.post_write_delay = FT450_POST_WRITE_DELAY, .post_write_delay = FT450_POST_WRITE_DELAY,
.timeout = 2000, .timeout = 2000,
.retry = 0, .retry = 0,
.has_get_func = RIG_FUNC_NONE, .has_get_func = FT450_FUNCS,
.has_set_func = RIG_FUNC_NONE, .has_set_func = FT450_FUNCS,
.has_get_level = RIG_LEVEL_NONE, .has_get_level = FT450_LEVELS,
.has_set_level = RIG_LEVEL_NONE, .has_set_level = RIG_LEVEL_SET(FT450_LEVELS),
.has_get_parm = RIG_PARM_NONE, .has_get_parm = RIG_PARM_NONE,
.has_set_parm = RIG_PARM_NONE, .has_set_parm = RIG_PARM_NONE,
.ctcss_list = NULL, .level_gran = {
[LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 255 } },
[LVL_CWPITCH] = { .min = { .i = 400 }, .max = { .i = 800 }, .step = { .i = 100 } },
},
.ctcss_list = NULL, /* TODO */
.dcs_list = NULL, .dcs_list = NULL,
.preamp = { RIG_DBLST_END, }, .preamp = { 10, RIG_DBLST_END, }, /* TBC */
.attenuator = { RIG_DBLST_END, }, .attenuator = { 18, RIG_DBLST_END, }, /* TBC */
.max_rit = Hz(9999), .max_rit = Hz(9999),
.max_xit = Hz(0), .max_xit = Hz(0),
.max_ifshift = Hz(1000), .max_ifshift = Hz(1000),
.vfo_ops = RIG_OP_TUNE, .vfo_ops = FT450_VFO_OPS,
.targetable_vfo = RIG_TARGETABLE_ALL, .targetable_vfo = RIG_TARGETABLE_FREQ,
.transceive = RIG_TRN_OFF, /* May enable later as the 450 has an Auto Info command */ .transceive = RIG_TRN_OFF, /* May enable later as the 450 has an Auto Info command */
.bank_qty = 0, .bank_qty = 0,
.chan_desc_sz = 0, .chan_desc_sz = 0,
.chan_list = { RIG_CHAN_END, }, .str_cal = FT450_STR_CAL,
.chan_list = {
{ 1, 500, RIG_MTYPE_MEM, NEWCAT_MEM_CAP },
{ 501, 504, RIG_MTYPE_EDGE, NEWCAT_MEM_CAP }, /* two by two */
RIG_CHAN_END,
},
.rx_range_list1 = { .rx_range_list1 = {
{kHz(30), MHz(60), FT450_ALL_RX_MODES, -1, -1, FT450_VFO_ALL, FT450_ANTS}, /* General coverage + ham */ {kHz(30), MHz(60), FT450_ALL_RX_MODES, -1, -1, FT450_VFO_ALL, FT450_ANTS}, /* General coverage + ham */
@ -159,8 +170,13 @@ const struct rig_caps ft450_caps = {
// .get_split_vfo = newcat_get_split_vfo, // .get_split_vfo = newcat_get_split_vfo,
// .set_rit = newcat_set_rit, // .set_rit = newcat_set_rit,
// .get_rit = newcat_get_rit, // .get_rit = newcat_get_rit,
// .set_func = newcat_set_func, .get_func = newcat_get_func,
// .get_level = newcat_get_level, .set_func = newcat_set_func,
// .vfo_op = newcat_vfo_op, .get_level = newcat_get_level,
.set_level = newcat_set_level,
.get_mem = newcat_get_mem,
.set_mem = newcat_set_mem,
.vfo_op = newcat_vfo_op,
.get_info = newcat_get_info,
}; };

29
yaesu/ft450.h
Wyświetl plik

@ -2,12 +2,13 @@
* hamlib - (C) Frank Singleton 2000 (javabear at users.sourceforge.net) * hamlib - (C) Frank Singleton 2000 (javabear at users.sourceforge.net)
* *
* ft450.h - (C) Nate Bargmann 2007 (n0nb at arrl.net) * ft450.h - (C) Nate Bargmann 2007 (n0nb at arrl.net)
* (C) Stephane Fillod 2008
* *
* This shared library provides an API for communicating * This shared library provides an API for communicating
* via serial interface to an FT-450 using the "CAT" interface * via serial interface to an FT-450 using the "CAT" interface
* *
* *
* $Id: ft450.h,v 1.1 2007-11-22 04:48:43 n0nb Exp $ * $Id: ft450.h,v 1.2 2008-11-01 22:39:07 fillods Exp $
* *
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
@ -45,11 +46,33 @@
#define FT450_FM_RX_MODES (RIG_MODE_FM) #define FT450_FM_RX_MODES (RIG_MODE_FM)
/* TX caps */ /* TRX caps */
#define FT450_OTHER_TX_MODES (RIG_MODE_CW| RIG_MODE_USB| RIG_MODE_LSB ) /* 100 W class */ #define FT450_OTHER_TX_MODES (RIG_MODE_CW| RIG_MODE_USB| RIG_MODE_LSB ) /* 100 W class */
#define FT450_AM_TX_MODES (RIG_MODE_AM ) /* set 25W max */ #define FT450_AM_TX_MODES (RIG_MODE_AM ) /* set 25W max */
#define FT450_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 FT450_LEVELS (RIG_LEVEL_ATT|RIG_LEVEL_PREAMP|\
RIG_LEVEL_ALC|RIG_LEVEL_RAWSTR|RIG_LEVEL_SWR|\
RIG_LEVEL_RFPOWER|RIG_LEVEL_RF|RIG_LEVEL_SQL|\
RIG_LEVEL_MICGAIN|RIG_LEVEL_IF|RIG_LEVEL_CWPITCH|\
RIG_LEVEL_KEYSPD|RIG_LEVEL_AF|RIG_LEVEL_AGC|\
RIG_LEVEL_METER|RIG_LEVEL_BKINDL|RIG_LEVEL_SQL|\
RIG_LEVEL_VOXGAIN|RIG_LEVEL_VOXDELAY)
#define FT450_FUNCS (RIG_FUNC_TONE|RIG_FUNC_TSQL|RIG_FUNC_LOCK|\
RIG_FUNC_MON|RIG_FUNC_NB|RIG_FUNC_NR|RIG_FUNC_VOX|\
RIG_FUNC_FBKIN|RIG_FUNC_MN)
#define FT450_VFO_OPS (RIG_OP_TUNE|RIG_OP_CPY|RIG_OP_XCHG|\
RIG_OP_UP|RIG_OP_DOWN|RIG_OP_BAND_UP|RIG_OP_BAND_DOWN)
/* TBC */
#define FT450_STR_CAL { 3, \
{ \
{ 10, -60 }, /* S0 */ \
{ 125, 0 }, /* S9 */ \
{ 240, 60 } /* +60 */ \
} }
/* /*

46
yaesu/ft950.c
Wyświetl plik

@ -2,12 +2,13 @@
* hamlib - (C) Frank Singleton 2000 (javabear at users.sourceforge.net) * hamlib - (C) Frank Singleton 2000 (javabear at users.sourceforge.net)
* *
* ft950.c - (C) Nate Bargmann 2007 (n0nb at arrl.net) * ft950.c - (C) Nate Bargmann 2007 (n0nb at arrl.net)
* (C) Stephane Fillod 2008
* *
* This shared library provides an API for communicating * This shared library provides an API for communicating
* via serial interface to an FT-950 using the "CAT" interface * via serial interface to an FT-950 using the "CAT" interface
* *
* *
* $Id: ft950.c,v 1.2 2008-10-25 14:37:19 fillods Exp $ * $Id: ft950.c,v 1.3 2008-11-01 22:39:07 fillods Exp $
* *
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
@ -38,6 +39,7 @@
#include "yaesu.h" #include "yaesu.h"
#include "newcat.h" #include "newcat.h"
#include "ft950.h" #include "ft950.h"
#include "idx_builtin.h"
/* /*
* ft950 rigs capabilities. * ft950 rigs capabilities.
@ -49,7 +51,7 @@ const struct rig_caps ft950_caps = {
.rig_model = RIG_MODEL_FT950, .rig_model = RIG_MODEL_FT950,
.model_name = "FT-950", .model_name = "FT-950",
.mfg_name = "Yaesu", .mfg_name = "Yaesu",
.version = NEWCAT_VER ".0", .version = NEWCAT_VER ".1",
.copyright = "LGPL", .copyright = "LGPL",
.status = RIG_STATUS_ALPHA, .status = RIG_STATUS_ALPHA,
.rig_type = RIG_TYPE_TRANSCEIVER, .rig_type = RIG_TYPE_TRANSCEIVER,
@ -66,25 +68,34 @@ const struct rig_caps ft950_caps = {
.post_write_delay = FT950_POST_WRITE_DELAY, .post_write_delay = FT950_POST_WRITE_DELAY,
.timeout = 2000, .timeout = 2000,
.retry = 0, .retry = 0,
.has_get_func = RIG_FUNC_NONE, .has_get_func = FT950_FUNCS,
.has_set_func = RIG_FUNC_NONE, .has_set_func = FT950_FUNCS,
.has_get_level = RIG_LEVEL_NONE, .has_get_level = FT950_LEVELS,
.has_set_level = RIG_LEVEL_NONE, .has_set_level = RIG_LEVEL_SET(FT950_LEVELS),
.has_get_parm = RIG_PARM_NONE, .has_get_parm = RIG_PARM_NONE,
.has_set_parm = RIG_PARM_NONE, .has_set_parm = RIG_PARM_NONE,
.ctcss_list = NULL, .level_gran = {
[LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 255 } },
[LVL_CWPITCH] = { .min = { .i = 300 }, .max = { .i = 1050 }, .step = { .i = 50 } },
},
.ctcss_list = NULL, /* TODO */
.dcs_list = NULL, .dcs_list = NULL,
.preamp = { RIG_DBLST_END, }, .preamp = { 10, 20, RIG_DBLST_END, }, /* TBC */
.attenuator = { RIG_DBLST_END, }, .attenuator = { 6, 12, 18, RIG_DBLST_END, },
.max_rit = Hz(9999), .max_rit = Hz(9999),
.max_xit = Hz(0), .max_xit = Hz(0),
.max_ifshift = Hz(1000), .max_ifshift = Hz(1000),
.vfo_ops = RIG_OP_TUNE, .vfo_ops = FT950_VFO_OPS,
.targetable_vfo = RIG_TARGETABLE_ALL, .targetable_vfo = RIG_TARGETABLE_FREQ,
.transceive = RIG_TRN_OFF, /* May enable later as the 950 has an Auto Info command */ .transceive = RIG_TRN_OFF, /* May enable later as the 950 has an Auto Info command */
.bank_qty = 0, .bank_qty = 0,
.chan_desc_sz = 0, .chan_desc_sz = 0,
.chan_list = { RIG_CHAN_END, }, .str_cal = FT950_STR_CAL,
.chan_list = {
{ 0, 99, RIG_MTYPE_MEM, NEWCAT_MEM_CAP },
{ 100, 117, RIG_MTYPE_EDGE, NEWCAT_MEM_CAP }, /* two by two */
RIG_CHAN_END,
},
.rx_range_list1 = { .rx_range_list1 = {
{kHz(30), MHz(56), FT950_ALL_RX_MODES, -1, -1, FT950_VFO_ALL, FT950_ANTS}, /* General coverage + ham */ {kHz(30), MHz(56), FT950_ALL_RX_MODES, -1, -1, FT950_VFO_ALL, FT950_ANTS}, /* General coverage + ham */
@ -159,8 +170,13 @@ const struct rig_caps ft950_caps = {
// .get_split_vfo = newcat_get_split_vfo, // .get_split_vfo = newcat_get_split_vfo,
// .set_rit = newcat_set_rit, // .set_rit = newcat_set_rit,
// .get_rit = newcat_get_rit, // .get_rit = newcat_get_rit,
// .set_func = newcat_set_func, .get_func = newcat_get_func,
// .get_level = newcat_get_level, .set_func = newcat_set_func,
// .vfo_op = newcat_vfo_op, .get_level = newcat_get_level,
.set_level = newcat_set_level,
.get_mem = newcat_get_mem,
.set_mem = newcat_set_mem,
.vfo_op = newcat_vfo_op,
.get_info = newcat_get_info,
}; };

32
yaesu/ft950.h
Wyświetl plik

@ -2,12 +2,13 @@
* hamlib - (C) Frank Singleton 2000 (javabear at users.sourceforge.net) * hamlib - (C) Frank Singleton 2000 (javabear at users.sourceforge.net)
* *
* ft950.h - (C) Nate Bargmann 2007 (n0nb at arrl.net) * ft950.h - (C) Nate Bargmann 2007 (n0nb at arrl.net)
* (C) Stephane Fillod 2008
* *
* This shared library provides an API for communicating * This shared library provides an API for communicating
* via serial interface to an FT-950 using the "CAT" interface * via serial interface to an FT-950 using the "CAT" interface
* *
* *
* $Id: ft950.h,v 1.1 2008-09-22 21:31:05 fillods Exp $ * $Id: ft950.h,v 1.2 2008-11-01 22:39:07 fillods Exp $
* *
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
@ -45,11 +46,34 @@
#define FT950_FM_RX_MODES (RIG_MODE_FM) #define FT950_FM_RX_MODES (RIG_MODE_FM)
/* TX caps */ /* TRX caps */
#define FT950_OTHER_TX_MODES (RIG_MODE_CW| RIG_MODE_USB| RIG_MODE_LSB ) /* 100 W class */ #define FT950_OTHER_TX_MODES (RIG_MODE_CW| RIG_MODE_USB| RIG_MODE_LSB ) /* 100 W class */
#define FT950_AM_TX_MODES (RIG_MODE_AM ) /* set 25W max */ #define FT950_AM_TX_MODES (RIG_MODE_AM ) /* set 25W max */
#define FT950_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 FT950_LEVELS (RIG_LEVEL_ATT|RIG_LEVEL_PREAMP|\
RIG_LEVEL_ALC|RIG_LEVEL_RAWSTR|RIG_LEVEL_SWR|\
RIG_LEVEL_RFPOWER|RIG_LEVEL_RF|RIG_LEVEL_SQL|\
RIG_LEVEL_MICGAIN|RIG_LEVEL_IF|RIG_LEVEL_CWPITCH|\
RIG_LEVEL_KEYSPD|RIG_LEVEL_AF|RIG_LEVEL_AGC|\
RIG_LEVEL_METER|RIG_LEVEL_BKINDL|RIG_LEVEL_SQL|\
RIG_LEVEL_VOXGAIN|RIG_LEVEL_VOXDELAY)
#define FT950_FUNCS (RIG_FUNC_TONE|RIG_FUNC_TSQL|RIG_FUNC_LOCK|\
RIG_FUNC_MON|RIG_FUNC_NB|RIG_FUNC_NR|RIG_FUNC_VOX|\
RIG_FUNC_FBKIN|RIG_FUNC_COMP|RIG_FUNC_ANF|RIG_FUNC_MN)
#define FT950_VFO_OPS (RIG_OP_TUNE|RIG_OP_CPY|RIG_OP_XCHG|\
RIG_OP_UP|RIG_OP_DOWN|RIG_OP_BAND_UP|RIG_OP_BAND_DOWN|\
RIG_OP_TO_VFO|RIG_OP_FROM_VFO)
/* TBC */
#define FT950_STR_CAL { 3, \
{ \
{ 10, -60 }, /* S0 */ \
{ 125, 0 }, /* S9 */ \
{ 240, 60 } /* +60 */ \
} }
/* /*
@ -57,7 +81,7 @@
* *
*/ */
#define FT950_ANTS 0 #define FT950_ANTS (RIG_ANT_1|RIG_ANT_2)
#define FT950_MEM_CHNL_LENGTH 1 /* 0x10 P1 = 01 return size */ #define FT950_MEM_CHNL_LENGTH 1 /* 0x10 P1 = 01 return size */
#define FT950_OP_DATA_LENGTH 19 /* 0x10 P1 = 03 return size */ #define FT950_OP_DATA_LENGTH 19 /* 0x10 P1 = 03 return size */

719
yaesu/newcat.c
Wyświetl plik

Plik diff jest za duży Load Diff

25
yaesu/newcat.h
Wyświetl plik

@ -12,7 +12,7 @@
* FT-950, FT-450. Much testing remains. -N0NB * FT-950, FT-450. Much testing remains. -N0NB
* *
* *
* $Id: newcat.h,v 1.5 2008-10-25 14:37:19 fillods Exp $ * $Id: newcat.h,v 1.6 2008-11-01 22:39:07 fillods Exp $
* *
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
@ -50,7 +50,7 @@
typedef char ncboolean; typedef char ncboolean;
/* shared function version */ /* shared function version */
#define NEWCAT_VER "0.1" #define NEWCAT_VER "0.2"
/* Hopefully large enough for future use, 128 chars plus '\0' */ /* Hopefully large enough for future use, 128 chars plus '\0' */
#define NEWCAT_DATA_LEN 129 #define NEWCAT_DATA_LEN 129
@ -59,6 +59,18 @@ typedef char ncboolean;
#define NEWCAT_DEFAULT_READ_TIMEOUT (NEWCAT_DATA_LEN * 5) #define NEWCAT_DEFAULT_READ_TIMEOUT (NEWCAT_DATA_LEN * 5)
#define NEWCAT_MEM_CAP { \
.freq = 1, \
.mode = 1, \
.width = 1, \
.rit = 1, \
.xit = 1, \
.rptr_offs = 1, \
.ctcss_tone = 1,\
.ctcss_sql = 1,\
.funcs = (RIG_FUNC_TONE|RIG_FUNC_TSQL), \
}
/* /*
* Functions considered to be Stable: * Functions considered to be Stable:
* *
@ -101,5 +113,14 @@ int newcat_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width);
int newcat_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width); int newcat_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width);
int newcat_set_ptt(RIG *rig, vfo_t vfo, ptt_t ptt); int newcat_set_ptt(RIG *rig, vfo_t vfo, ptt_t ptt);
int newcat_set_level(RIG * rig, vfo_t vfo, setting_t level, value_t val);
int newcat_get_level(RIG * rig, vfo_t vfo, setting_t level, value_t * val);
int newcat_set_func(RIG * rig, vfo_t vfo, setting_t func, int status);
int newcat_get_func(RIG * rig, vfo_t vfo, setting_t func, int *status);
int newcat_set_mem(RIG * rig, vfo_t vfo, int ch);
int newcat_get_mem(RIG * rig, vfo_t vfo, int *ch);
int newcat_vfo_op(RIG * rig, vfo_t vfo, vfo_op_t op);
const char *newcat_get_info(RIG * rig);
#endif /* _NEWCAT_H */ #endif /* _NEWCAT_H */