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

Add FTX-1 radio support to Hamlib 

- Add FTX-1 rig model (ID 840) to riglist.h
- Create ftx1.c and ftx1.h with FTX-1 implementation
- Add FTX-1 to Yaesu Makefile.am
- Integrate FTX-1 into newcat.c command validation system
- Update yaesu.c and yaesu.h for FTX-1 support
- Based on FT-991A CAT protocol compatibility
pull/1801/head
jeremybox 2025-07-11 01:42:24 -04:00
rodzic 48e7bd734a
commit 69d203fd1c
7 zmienionych plików z 1423 dodań i 6 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

1
include/hamlib/riglist.h
Wyświetl plik

@ -144,6 +144,7 @@
#define RIG_MODEL_FT990UNI RIG_MAKE_MODEL(RIG_YAESU, 48)
#define RIG_MODEL_FT710 RIG_MAKE_MODEL(RIG_YAESU, 49)
#define RIG_MODEL_FT9000OLD RIG_MAKE_MODEL(RIG_YAESU, 50)
#define RIG_MODEL_FTX1 RIG_MAKE_MODEL(RIG_YAESU, 51)
/*
* Kenwood

3
rigs/yaesu/Makefile.am
Wyświetl plik

@ -11,7 +11,8 @@ YAESUSRC = ft100.c ft100.h ft747.c ft747.h ft817.c ft817.h ft847.c ft847.h \
## Yaesu radios that use the new Kenwood style CAT commands
NEWCATSRC = newcat.c newcat.h ft450.c ft450.h ft950.c ft950.h ft991.c ft991.h \
ft2000.c ft2000.h ft9000.c ft9000.h ft5000.c ft5000.h ft1200.c ft1200.h \
ft891.c ft891.h ftdx101.c ftdx101.h ftdx101mp.c ft3000.c ftdx10.c ft710.h
ft891.c ft891.h ftdx101.c ftdx101.h ftdx101mp.c ft3000.c ftdx10.c ft710.h\
ftx1.c ftx1.h
noinst_LTLIBRARIES = libhamlib-yaesu.la
libhamlib_yaesu_la_SOURCES = yaesu.c yaesu.h level_gran_yaesu.h $(YAESUSRC) $(NEWCATSRC)

1210
rigs/yaesu/ftx1.c 100644
Wyświetl plik

Plik diff jest za duży Load Diff

195
rigs/yaesu/ftx1.h 100644
Wyświetl plik

@ -0,0 +1,195 @@
/*
* hamlib - (C) Frank Singleton 2000 (javabear at users.sourceforge.net)
*
* ftx1.h - (C) Jeremy Miller KO4SSD 2025 (ko4ssd at ko4ssd.com)
*
* This shared library provides an API for communicating
* via USB interface to an FTX-1 using the "CAT" interface
*
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
#ifndef _FTX1_H
#define _FTX1_H 1
#define FTX1_VFO_ALL (RIG_VFO_A|RIG_VFO_B|RIG_VFO_MEM)
/* Receiver caps */
#define FTX1_ALL_RX_MODES (RIG_MODE_AM|RIG_MODE_CW|RIG_MODE_CWR|RIG_MODE_SSB|\
RIG_MODE_RTTY|RIG_MODE_RTTYR|RIG_MODE_PKTLSB|RIG_MODE_PKTUSB|RIG_MODE_PKTFM|\
RIG_MODE_C4FM|RIG_MODE_FM|RIG_MODE_AMN|RIG_MODE_FMN)
#define FTX1_SSB_CW_RX_MODES (RIG_MODE_CW|RIG_MODE_CWR|RIG_MODE_SSB|\
RIG_MODE_RTTY|RIG_MODE_RTTYR|RIG_MODE_PKTLSB|RIG_MODE_PKTUSB)
#define FTX1_AM_RX_MODES (RIG_MODE_AM|RIG_MODE_AMN)
#define FTX1_FM_WIDE_RX_MODES (RIG_MODE_FM|RIG_MODE_PKTFM|RIG_MODE_C4FM)
#define FTX1_FM_RX_MODES (FTX1_FM_WIDE_RX_MODES|RIG_MODE_FMN)
#define FTX1_CW_RX_MODES (RIG_MODE_CW|RIG_MODE_CWR)
#define FTX1_RTTY_DATA_RX_MODES (RIG_MODE_RTTY|RIG_MODE_RTTYR|RIG_MODE_PKTUSB|RIG_MODE_PKTLSB)
/* TRX caps */
#define FTX1_OTHER_TX_MODES (RIG_MODE_CW|RIG_MODE_USB|RIG_MODE_LSB|RIG_MODE_PKTUSB|RIG_MODE_PKTLSB|\
RIG_MODE_FM|RIG_MODE_PKTFM|RIG_MODE_FMN) /* 100 W class */
#define FTX1_AM_TX_MODES (RIG_MODE_AM|RIG_MODE_AMN) /* set 25W max */
#define FTX1_LEVELS (RIG_LEVEL_ATT|RIG_LEVEL_PREAMP|RIG_LEVEL_STRENGTH|\
RIG_LEVEL_ALC|RIG_LEVEL_RAWSTR|RIG_LEVEL_STRENGTH|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_BKIN_DLYMS|RIG_LEVEL_SQL|\
RIG_LEVEL_VOXGAIN|RIG_LEVEL_VOXDELAY|RIG_LEVEL_COMP|\
RIG_LEVEL_ANTIVOX|RIG_LEVEL_NR|RIG_LEVEL_NB|RIG_LEVEL_NOTCHF|\
RIG_LEVEL_MONITOR_GAIN|RIG_LEVEL_RFPOWER_METER|RIG_LEVEL_RFPOWER_METER_WATTS|\
RIG_LEVEL_COMP_METER|RIG_LEVEL_VD_METER|RIG_LEVEL_ID_METER|\
RIG_LEVEL_BAND_SELECT)
#define FTX1_FUNCS (RIG_FUNC_TONE|RIG_FUNC_TSQL|RIG_FUNC_CSQL|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|\
RIG_FUNC_RIT|RIG_FUNC_XIT|\
RIG_FUNC_TUNER|RIG_FUNC_APF)
#define FTX1_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)
// Borrowed from FLRig -- Thanks to Dave W1HKJ
#define FTX1_RFPOWER_METER_CAL \
{ \
7, \
{ \
{0, 0.0f}, \
{10, 0.8f}, \
{50, 8.0f}, \
{100, 26.0f}, \
{150, 54.0f}, \
{200, 92.0f}, \
{250, 140.0f}, \
} \
}
/* TBC */
#define FTX1_STR_CAL { 16, \
{ \
{ 0, -54 }, /* S0 */ \
{ 12, -48 }, /* S1 */ \
{ 27, -42 }, /* S2 */ \
{ 40, -36 }, /* S3 */ \
{ 55, -30 }, /* S4 */ \
{ 65, -24 }, /* S5 */ \
{ 80, -18 }, /* S6 */ \
{ 95, -12 }, /* S7 */ \
{ 112, -6 }, /* S8 */ \
{ 130, 0 }, /* S9 */ \
{ 150, 10 }, /* +10 */ \
{ 172, 20 }, /* +20 */ \
{ 190, 30 }, /* +30 */ \
{ 220, 40 }, /* +40 */ \
{ 240, 50 }, /* +50 */ \
{ 255, 60 }, /* +60 */ \
} }
#define FTX1_ID_CAL { 7, \
{ \
{ 0, 0.0f }, \
{ 53, 5.0f }, \
{ 65, 6.0f }, \
{ 78, 7.0f }, \
{ 86, 8.0f }, \
{ 98, 9.0f }, \
{ 107, 10.0f } \
} \
}
/* TBC */
#define FTX1_VD_CAL { 2, \
{ \
{ 0, 0.0f }, \
{ 192, 13.8f }, \
} \
}
#define FTX1_COMP_CAL { 9, \
{ \
{ 0, 0.0f }, \
{ 40, 2.5f }, \
{ 60, 5.0f }, \
{ 85, 7.5f }, \
{ 135, 10.0f }, \
{ 150, 12.5f }, \
{ 175, 15.0f }, \
{ 195, 17.5f }, \
{ 220, 20.0f } \
} \
}
/*
* Other features (used by rig_caps)
*
*/
// The FTX1 does not have antenna selection
#define FTX1_ANTS (RIG_ANT_CURR)
#define FTX1_MEM_CHNL_LENGTH 1 /* 0x10 P1 = 01 return size */
#define FTX1_OP_DATA_LENGTH 19 /* 0x10 P1 = 03 return size */
#define FTX1_VFO_DATA_LENGTH 18 /* 0x10 P1 = 03 return size -- A & B returned */
#define FTX1_MEM_CHNL_DATA_LENGTH 19 /* 0x10 P1 = 04, P4 = 0x01-0x20 return size */
#define FTX1_STATUS_FLAGS_LENGTH 5 /* 0xf7, 0xfa return size */
#define FTX1_ALL_DATA_LENGTH 649 /* 0x10 P1 = 00 return size */
/* Timing values in mS */
// #define FTX1_PACING_INTERVAL 5
// #define FTX1_PACING_DEFAULT_VALUE 0
/* Delay between bytes sent to FTX-1
* Should not exceed value set in CAT TOT menu (rig default is 10 mSec)
*/
#define FTX1_WRITE_DELAY 0
/* Delay sequential fast writes */
#define FTX1_POST_WRITE_DELAY 2
typedef struct
{
char command[2]; /* depends on command "IF", "MR", "MW" "OI" */
char memory_ch[3]; /* 001 -> 117 */
char vfo_freq[9]; /* 9 digit value in Hz */
char clarifier[5]; /* '+' | '-', 0000 -> 9999 Hz */
char rx_clarifier; /* '0' = off, '1' = on */
char tx_clarifier; /* '0' = off, '1' = on */
char mode; /* '1'=LSB, '2'=USB, '3'=CW, '4'=FM, '5'=AM, */
/* '6'=RTTY-LSB, '7'=CW-R, '8'=DATA-LSB, */
/* '9'=RTTY-USB,'A'=DATA-FM, 'B'=FM-N, */
/* 'C'=DATA-USB, 'D'=AM-N, 'E'=C4FM */
char vfo_memory; /* '0'=VFO, '1'=Memory, '2'=Memory Tune, */
/* '3'=Quick Memory Bank, '4'=QMB-MT, '5'=PMS, '6'=HOME */
char tone_mode; /* '0' = off, CTCSS '1' ENC, '2' ENC/DEC, */
/* '3' = DCS ENC/DEC, '4' = ENC */
char fixed[2]; /* Always '0', '0' */
char repeater_offset; /* '0' = Simplex, '1' Plus, '2' minus */
char terminator; /* ';' */
} ftx1info;
#endif /* _FTX1_H */

18
rigs/yaesu/newcat.c
Wyświetl plik

@ -71,6 +71,7 @@ typedef enum nc_rigid_e
NC_RIGID_FTDX101D = 681,
NC_RIGID_FTDX101MP = 682,
NC_RIGID_FT710 = 800,
NC_RIGID_FTX1 = 840,
} nc_rigid_t;
@ -95,6 +96,7 @@ typedef struct _yaesu_newcat_commands
ncboolean ftdx10;
ncboolean ft101mp;
ncboolean ft710;
ncboolean ftx1;
ncboolean ft9000Old;
} yaesu_newcat_commands_t;
@ -225,6 +227,7 @@ static ncboolean is_ftdx3000dm;
static ncboolean is_ftdx101d;
static ncboolean is_ftdx101mp;
static ncboolean is_ftdx10;
static ncboolean is_ftx1;
static ncboolean is_ftdx9000Old;
/*
@ -245,10 +248,10 @@ static ncboolean is_ftdx9000Old;
*/
static const yaesu_newcat_commands_t valid_commands[] =
{
/* Command FT-450 FT-950 FT-891 FT-991 FT-2000 FT-9000 FT-5000 FT-1200 FT-3000 FTDX101D FTDX10 FTDX101MP FT710 FT9000Old*/
{"AB", FALSE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE },
{"AC", TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE },
{"AG", TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE },
/* Command FT-450 FT-950 FT-891 FT-991 FT-2000 FT-9000 FT-5000 FT-1200 FT-3000 FTDX101D FTDX10 FTDX101MP FT710 FTX1 FT9000Old*/
{"AB", FALSE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE },
{"AC", TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE },
{"AG", TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE },
{"AI", TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE },
{"AM", FALSE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE },
{"AN", FALSE, TRUE, FALSE, FALSE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, TRUE, FALSE, TRUE },
@ -519,6 +522,7 @@ int newcat_init(RIG *rig)
is_ftdx101mp = newcat_is_rig(rig, RIG_MODEL_FTDX101MP);
is_ftdx10 = newcat_is_rig(rig, RIG_MODEL_FTDX10);
is_ft710 = newcat_is_rig(rig, RIG_MODEL_FT710);
is_ftx1 = newcat_is_rig(rig, RIG_MODEL_FTX1);
RETURNFUNC(RIG_OK);
}
@ -8167,7 +8171,7 @@ ncboolean newcat_valid_command(RIG *rig, char const *const command)
if (!is_ft450 && !is_ft950 && !is_ft891 && !is_ft991 && !is_ft2000
&& !is_ftdx5000 && !is_ftdx9000 && !is_ftdx1200 && !is_ftdx3000 && !is_ftdx101d
&& !is_ftdx101mp && !is_ftdx10 && !is_ft710)
&& !is_ftdx101mp && !is_ftdx10 && !is_ft710 && !is_ftx1)
{
rig_debug(RIG_DEBUG_ERR, "%s: '%s' is unknown\n", __func__, caps->model_name);
RETURNFUNC2(FALSE);
@ -8258,6 +8262,10 @@ ncboolean newcat_valid_command(RIG *rig, char const *const command)
{
RETURNFUNC2(TRUE);
}
else if (is_ftx1 && valid_commands[search_index].ftx1)
{
RETURNFUNC2(TRUE);
}
else
{
rig_debug(RIG_DEBUG_TRACE, "%s: '%s' command '%s' not supported\n",

1
rigs/yaesu/yaesu.c
Wyświetl plik

@ -112,6 +112,7 @@ DECLARE_INITRIG_BACKEND(yaesu)
rig_register(&vx1700_caps);
rig_register(&ftdx1200_caps);
rig_register(&ft991_caps);
rig_register(&ftx1_caps);
rig_register(&ft891_caps);
rig_register(&ft847uni_caps);
rig_register(&ftdx101d_caps);

1
rigs/yaesu/yaesu.h
Wyświetl plik

@ -69,6 +69,7 @@ extern struct rig_caps ft980_caps;
extern struct rig_caps ft990_caps;
extern struct rig_caps ft990uni_caps;
extern struct rig_caps ft991_caps;
extern struct rig_caps ftx1_caps;
extern struct rig_caps ft1000mp_caps;
extern struct rig_caps ft1000mpmkv_caps;
extern struct rig_caps ft1000mpmkvfld_caps;