From caee8b612aa897842724f9862f789285d76d6d6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Fillod=2C=20F8CFE?= Date: Sun, 8 Aug 2004 19:42:59 +0000 Subject: [PATCH] added ECSSUSB/ECSSLSB and FAX modes git-svn-id: https://hamlib.svn.sourceforge.net/svnroot/hamlib/trunk@1785 7ae35d74-ebe9-4afe-98af-79ac388436b8 --- aor/ar3030.c | 12 +++++------- bindings/hamlibvb.bas.in | 6 ++++++ include/hamlib/rig.h | 11 +++++++++-- lowe/lowe.c | 10 +++++----- src/misc.c | 5 ++++- tests/rigctl.1 | 10 +++++++--- 6 files changed, 36 insertions(+), 18 deletions(-) diff --git a/aor/ar3030.c b/aor/ar3030.c index c6b6cb2ee..ee046c48e 100644 --- a/aor/ar3030.c +++ b/aor/ar3030.c @@ -2,7 +2,7 @@ * Hamlib AOR backend - AR3030 description * Copyright (c) 2000-2004 by Stephane Fillod * - * $Id: ar3030.c,v 1.4 2004-07-16 11:47:40 t_mills Exp $ + * $Id: ar3030.c,v 1.5 2004-08-08 19:42:59 fillods Exp $ * * This library is free software; you can redistribute it and/or modify * it under the terms of the GNU Library General Public License as @@ -61,10 +61,8 @@ struct ar3030_priv_data { * set_channel(emulated?),rig_vfo_op * rig_reset(RIG_RESET_MCALL) * quit the remote control mode on close? - * - * Modes: FAX */ -#define AR3030_MODES (RIG_MODE_AM|RIG_MODE_AMS|RIG_MODE_CW|RIG_MODE_SSB|RIG_MODE_FM) +#define AR3030_MODES (RIG_MODE_AM|RIG_MODE_AMS|RIG_MODE_CW|RIG_MODE_SSB|RIG_MODE_FM|RIG_MODE_FAX) #define AR3030_FUNC_ALL (RIG_FUNC_NONE) @@ -370,7 +368,7 @@ int ar3030_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width) case RIG_MODE_LSB: aormode = 'L'; break; case RIG_MODE_FM: aormode = 'N'; break; case RIG_MODE_AMS: aormode = 'S'; break; - /*case RIG_MODE_FAX: aormode = 'X'; break;*/ + case RIG_MODE_FAX: aormode = 'X'; break; default: rig_debug(RIG_DEBUG_ERR,"%s: unsupported mode %d\n", __FUNCTION__,mode); @@ -412,7 +410,7 @@ int ar3030_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width) case 'C': *mode = RIG_MODE_CW; break; case 'S': *mode = RIG_MODE_AMS; break; case 'N': *mode = RIG_MODE_FM; break; - /*case 'X': *mode = RIG_MODE_FAX; break;*/ + case 'X': *mode = RIG_MODE_FAX; break; default: rig_debug(RIG_DEBUG_ERR,"%s: unsupported mode '%c'\n", __FUNCTION__,buf[25]); @@ -597,7 +595,7 @@ int ar3030_get_channel(RIG *rig, channel_t *chan) case 'C': chan->mode = RIG_MODE_CW; break; case 'S': chan->mode = RIG_MODE_AMS; break; case 'N': chan->mode = RIG_MODE_FM; break; - /*case 'X': chan->mode = RIG_MODE_FAX; break;*/ + case 'X': chan->mode = RIG_MODE_FAX; break; default: rig_debug(RIG_DEBUG_ERR,"%s: unsupported mode '%c'\n", __FUNCTION__,infobuf[22]); diff --git a/bindings/hamlibvb.bas.in b/bindings/hamlibvb.bas.in index fb9465b8f..1067b5ea2 100644 --- a/bindings/hamlibvb.bas.in +++ b/bindings/hamlibvb.bas.in @@ -45,6 +45,12 @@ Public Enum RMode_t RIG_MODE_CWR = 128& RIG_MODE_RTTYR = 256& RIG_MODE_AMS = 512& + RIG_MODE_PKTLSB = 1024& + RIG_MODE_PKTUSB = 2048& + RIG_MODE_PKTFM = 4096& + RIG_MODE_ECSSUSB = 8192& + RIG_MODE_ECSSLSB = 16384& + RIG_MODE_FAX = 32768& End Enum diff --git a/include/hamlib/rig.h b/include/hamlib/rig.h index 19210d61a..dfd899465 100644 --- a/include/hamlib/rig.h +++ b/include/hamlib/rig.h @@ -2,7 +2,7 @@ * Hamlib Interface - API header * Copyright (c) 2000-2004 by Stephane Fillod and Frank Singleton * - * $Id: rig.h,v 1.96 2004-05-19 09:11:34 fillods Exp $ + * $Id: rig.h,v 1.97 2004-08-08 19:42:47 fillods Exp $ * * This library is free software; you can redistribute it and/or modify * it under the terms of the GNU Library General Public License as @@ -700,12 +700,19 @@ typedef enum { RIG_MODE_AMS = (1<<9), /*!< Amplitude Modulation Synchronous */ RIG_MODE_PKTLSB = (1<<10),/*!< Packet/Digital LSB mode (dedicated port) */ RIG_MODE_PKTUSB = (1<<11),/*!< Packet/Digital USB mode (dedicated port) */ - RIG_MODE_PKTFM = (1<<12) /*!< Packet/Digital FM mode (dedicated port) */ + RIG_MODE_PKTFM = (1<<12),/*!< Packet/Digital FM mode (dedicated port) */ + RIG_MODE_ECSSUSB = (1<<13),/*!< Exalted Carrier Single Sideband USB */ + RIG_MODE_ECSSLSB = (1<<14),/*!< Exalted Carrier Single Sideband LSB */ + RIG_MODE_FAX = (1<<15) /*!< Facsimile Mode */ + } rmode_t; /** \brief macro for backends, no to be used by rig_set_mode et al. */ #define RIG_MODE_SSB (RIG_MODE_USB|RIG_MODE_LSB) +/** \brief macro for backends, no to be used by rig_set_mode et al. */ +#define RIG_MODE_ECSS (RIG_MODE_ECSSUSB|RIG_MODE_ECSSLSB) + #define RIG_DBLST_END 0 /* end marker in a preamp/att level list */ #define RIG_IS_DBLST_END(d) ((d)==0) diff --git a/lowe/lowe.c b/lowe/lowe.c index 5d332d103..311345488 100644 --- a/lowe/lowe.c +++ b/lowe/lowe.c @@ -1,8 +1,8 @@ /* * Hamlib Lowe backend - main file - * Copyright (c) 2003 by Stephane Fillod + * Copyright (c) 2003-2004 by Stephane Fillod * - * $Id: lowe.c,v 1.2 2003-10-01 19:31:59 fillods Exp $ + * $Id: lowe.c,v 1.3 2004-08-08 19:42:59 fillods Exp $ * * This library is free software; you can redistribute it and/or modify * it under the terms of the GNU Library General Public License as @@ -136,7 +136,7 @@ int lowe_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width) case RIG_MODE_LSB: mode_sel = MD_LSB; break; case RIG_MODE_FM: mode_sel = MD_FM; break; case RIG_MODE_AM: mode_sel = MD_AM; break; - case RIG_MODE_RTTY: mode_sel = MD_FAX; break; /* TBC */ + case RIG_MODE_FAX: mode_sel = MD_FAX; break; case RIG_MODE_AMS: mode_sel = MD_AMS; break; default: rig_debug(RIG_DEBUG_ERR,"lowe_set_mode: " @@ -173,8 +173,8 @@ int lowe_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width) *mode = RIG_MODE_LSB; else if (!strcmp(mdbuf+1, MD_FM)) *mode = RIG_MODE_FM; - else if (!strcmp(mdbuf+1, MD_FAX)) /* TBC */ - *mode = RIG_MODE_RTTY; + else if (!strcmp(mdbuf+1, MD_FAX)) + *mode = RIG_MODE_FAX; else if (!strcmp(mdbuf+1, MD_AMS)) *mode = RIG_MODE_AMS; else if (!strcmp(mdbuf+1, MD_AM)) diff --git a/src/misc.c b/src/misc.c index ca0fcf29c..4ed1a2b67 100644 --- a/src/misc.c +++ b/src/misc.c @@ -2,7 +2,7 @@ * Hamlib Interface - toolbox * Copyright (c) 2000-2004 by Stephane Fillod * - * $Id: misc.c,v 1.32 2004-05-17 21:09:44 fillods Exp $ + * $Id: misc.c,v 1.33 2004-08-08 19:42:58 fillods Exp $ * * This library is free software; you can redistribute it and/or modify * it under the terms of the GNU Library General Public License as @@ -310,6 +310,9 @@ static struct { { RIG_MODE_PKTLSB, "PKTLSB" }, { RIG_MODE_PKTUSB, "PKTUSB" }, { RIG_MODE_PKTFM, "PKTFM" }, + { RIG_MODE_ECSSUSB, "ECSSUSB" }, + { RIG_MODE_ECSSLSB, "ECSSLSB" }, + { RIG_MODE_FAX, "FAX" }, { RIG_MODE_NONE, "" }, }; diff --git a/tests/rigctl.1 b/tests/rigctl.1 index dda58477e..b20b5b6ae 100644 --- a/tests/rigctl.1 +++ b/tests/rigctl.1 @@ -2,7 +2,7 @@ .\" First parameter, NAME, should be all caps .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection .\" other parameters are allowed: see man(7), man(1) -.TH RIGCTL "1" "May 25, 2004" "Hamlib" +.TH RIGCTL "1" "August 8, 2004" "Hamlib" .\" Please adjust this date whenever revising the manpage. .\" .\" Some roff macros, for reference: @@ -118,7 +118,9 @@ Set frequency, in Hz. Get frequency, in Hz. .TP .B M, set_mode -Set mode/passband: AM, FM, CW, CWR, USB, LSB, RTTY, RTTYR, WFM, AMS. +Set mode/passband: AM, FM, CW, CWR, USB, LSB, RTTY, RTTYR, WFM, AMS, +PKTLSB, PKTUSB, PKTFM, ECSSUSB, ECSSLSB, FAX. + The passband is the exact passband in Hz, or 0 for the default. .TP .B m, get_mode @@ -179,7 +181,9 @@ Set TX frequency, in Hz. Get TX frequency. .TP .B X, set_split_mode -Set transmit mode/passband: AM, FM, CW, CWR, USB, LSB, RTTY, RTTYR, WFM, AMS. +Set transmit mode/passband: AM, FM, CW, CWR, USB, LSB, RTTY, RTTYR, WFM, AMS, +PKTLSB, PKTUSB, PKTFM, ECSSUSB, ECSSLSB, FAX. + The passband is the exact passband in Hz, or 0 for the default. .TP .B x, get_split_mode