kopia lustrzana https://github.com/Hamlib/Hamlib
Added support for ECSS/FAX and meter strength
git-svn-id: https://hamlib.svn.sourceforge.net/svnroot/hamlib/trunk@1786 7ae35d74-ebe9-4afe-98af-79ac388436b8Hamlib-1.2.2
Mark J. Fine
rodzic
caee8b612a
commit
126d5e5556
61
jrc/jrc.c
61
jrc/jrc.c
|
|
@ -2,7 +2,7 @@
|
|||
* Hamlib JRC backend - main file
|
||||
* Copyright (c) 2001-2004 by Stephane Fillod
|
||||
*
|
||||
* $Id: jrc.c,v 1.13 2004-06-04 21:48:03 fillods Exp $
|
||||
* $Id: jrc.c,v 1.14 2004-08-08 20:12:16 fineware 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
|
||||
|
|
@ -56,8 +56,9 @@
|
|||
#define MD_AM '4'
|
||||
#define MD_FM '5'
|
||||
#define MD_AMS '6'
|
||||
#define MD_ECCS_USB '7'
|
||||
#define MD_ECCS_LSB '8'
|
||||
#define MD_FAX '6'
|
||||
#define MD_ECSS_USB '7'
|
||||
#define MD_ECSS_LSB '8'
|
||||
#define MD_WFM '9'
|
||||
|
||||
|
||||
|
|
@ -172,7 +173,6 @@ int jrc_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
|
|||
const char *bandwidth;
|
||||
|
||||
switch (mode) {
|
||||
/* FIXME: ECSS modes */
|
||||
case RIG_MODE_CW: amode = MD_CW; break;
|
||||
case RIG_MODE_USB: amode = MD_USB; break;
|
||||
case RIG_MODE_LSB: amode = MD_LSB; break;
|
||||
|
|
@ -181,6 +181,9 @@ int jrc_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
|
|||
case RIG_MODE_RTTY: amode = MD_RTTY; break;
|
||||
case RIG_MODE_WFM: amode = MD_WFM; break;
|
||||
case RIG_MODE_AMS: amode = MD_AMS; break;
|
||||
case RIG_MODE_FAX: amode = MD_FAX; break;
|
||||
case RIG_MODE_ECSSUSB: amode = MD_ECSS_USB; break;
|
||||
case RIG_MODE_ECSSLSB: amode = MD_ECSS_LSB; break;
|
||||
default:
|
||||
rig_debug(RIG_DEBUG_ERR,
|
||||
"jrc_set_mode: unsupported mode %d\n", mode);
|
||||
|
|
@ -260,9 +263,14 @@ int jrc_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
|
|||
case '3' : *mode = RIG_MODE_LSB; break;
|
||||
case '4' : *mode = RIG_MODE_AM; break;
|
||||
case '5' : *mode = RIG_MODE_FM; break;
|
||||
case '6' : *mode = RIG_MODE_AMS; break; //FAX on nrd535
|
||||
case '7' : *mode = RIG_MODE_AMS; break; //ECSS-USB
|
||||
case '8' : *mode = RIG_MODE_AMS; break; //ECSS-LSB
|
||||
case '6' : if (rig->caps->rig_model == RIG_MODEL_NRD535) {
|
||||
*mode = RIG_MODE_FAX; break; //FAX on nrd535
|
||||
}
|
||||
else {
|
||||
*mode = RIG_MODE_AMS; break; //AMS on nrd545
|
||||
}
|
||||
case '7' : *mode = RIG_MODE_ECSSUSB; break; //ECSS-USB
|
||||
case '8' : *mode = RIG_MODE_ECSSLSB; break; //ECSS-LSB
|
||||
case '9' : *mode = RIG_MODE_WFM; break; //nrd545 only
|
||||
default:
|
||||
rig_debug(RIG_DEBUG_ERR,
|
||||
|
|
@ -531,6 +539,23 @@ int jrc_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
|
|||
val->i = atoi(lvlbuf+1);
|
||||
break;
|
||||
|
||||
case RIG_LEVEL_STRENGTH:
|
||||
/* read calibrated A/D converted value */
|
||||
retval = jrc_transaction (rig, "M" EOM, 2, lvlbuf, &lvl_len);
|
||||
if (retval != RIG_OK)
|
||||
return retval;
|
||||
|
||||
if (lvl_len != 5) {
|
||||
rig_debug(RIG_DEBUG_ERR,"jrc_get_level: wrong answer"
|
||||
"len=%d\n", lvl_len);
|
||||
return -RIG_ERJCTED;
|
||||
}
|
||||
|
||||
lvlbuf[4] = '\0';
|
||||
int ss = atoi(lvlbuf+1);
|
||||
val->i = (int)rig_raw2val(ss,&rig->caps->str_cal);
|
||||
break;
|
||||
|
||||
case RIG_LEVEL_SQLSTAT:
|
||||
return -RIG_ENIMPL; /* get_dcd ? */
|
||||
|
||||
|
|
@ -987,13 +1012,21 @@ static int jrc2rig_mode(RIG *rig, char jmode, char jwidth,
|
|||
rmode_t *mode, pbwidth_t *width)
|
||||
{
|
||||
switch (jmode) {
|
||||
case MD_CW: *mode = RIG_MODE_CW; break;
|
||||
case MD_USB: *mode = RIG_MODE_USB; break;
|
||||
case MD_LSB: *mode = RIG_MODE_LSB; break;
|
||||
case MD_FM: *mode = RIG_MODE_FM; break;
|
||||
case MD_AM: *mode = RIG_MODE_AM; break;
|
||||
case MD_RTTY: *mode = RIG_MODE_RTTY; break;
|
||||
case MD_WFM: *mode = RIG_MODE_WFM; break;
|
||||
case MD_CW: *mode = RIG_MODE_CW; break;
|
||||
case MD_USB: *mode = RIG_MODE_USB; break;
|
||||
case MD_LSB: *mode = RIG_MODE_LSB; break;
|
||||
case MD_FM: *mode = RIG_MODE_FM; break;
|
||||
case MD_AM: *mode = RIG_MODE_AM; break;
|
||||
case MD_AMS: if (rig->caps->rig_model == RIG_MODEL_NRD535) {
|
||||
*mode = RIG_MODE_FAX; break;
|
||||
}
|
||||
else {
|
||||
*mode = RIG_MODE_AMS; break;
|
||||
}
|
||||
case MD_ECSS_USB: *mode = RIG_MODE_ECSSUSB; break;
|
||||
case MD_ECSS_LSB: *mode = RIG_MODE_ECSSLSB; break;
|
||||
case MD_RTTY: *mode = RIG_MODE_RTTY; break;
|
||||
case MD_WFM: *mode = RIG_MODE_WFM; break;
|
||||
default:
|
||||
rig_debug(RIG_DEBUG_ERR,
|
||||
"jrc_set_mode: unsupported mode %c\n",
|
||||
|
|
|
|||
24
jrc/nrd535.c
24
jrc/nrd535.c
|
|
@ -2,7 +2,7 @@
|
|||
* Hamlib JRC backend - NRD-535 DSP description
|
||||
* Copyright (c) 2001-2004 by Stephane Fillod
|
||||
*
|
||||
* $Id: nrd535.c,v 1.6 2004-08-01 21:23:41 fillods Exp $
|
||||
* $Id: nrd535.c,v 1.7 2004-08-08 20:12:55 fineware 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
|
||||
|
|
@ -31,11 +31,11 @@
|
|||
#include "jrc.h"
|
||||
|
||||
|
||||
#define NRD535_MODES (RIG_MODE_AM|RIG_MODE_CW|RIG_MODE_SSB|RIG_MODE_FM|RIG_MODE_RTTY) /* + FAX */
|
||||
#define NRD535_MODES (RIG_MODE_AM|RIG_MODE_CW|RIG_MODE_SSB|RIG_MODE_FM|RIG_MODE_RTTY|RIG_MODE_ECSS|RIG_MODE_FAX) /* + FAX */
|
||||
|
||||
#define NRD535_FUNC (RIG_FUNC_FAGC|RIG_FUNC_NB|RIG_FUNC_ABM)
|
||||
#define NRD535_FUNC (RIG_FUNC_FAGC|RIG_FUNC_NB)
|
||||
|
||||
#define NRD535_LEVEL (RIG_LEVEL_RAWSTR|RIG_LEVEL_ATT|RIG_LEVEL_IF|RIG_LEVEL_AGC|RIG_LEVEL_CWPITCH)
|
||||
#define NRD535_LEVEL (RIG_LEVEL_RAWSTR|RIG_LEVEL_STRENGTH|RIG_LEVEL_ATT|RIG_LEVEL_IF|RIG_LEVEL_AGC|RIG_LEVEL_CWPITCH)
|
||||
|
||||
/* FIXME: add more from "U" command */
|
||||
#define NRD535_PARM (RIG_PARM_TIME|RIG_PARM_BEEP)
|
||||
|
|
@ -47,14 +47,22 @@
|
|||
*
|
||||
* FIXME: measure S-meter levels
|
||||
*/
|
||||
#define NRD535_STR_CAL { 8, { \
|
||||
#define NRD535_STR_CAL { 16, { \
|
||||
{ 0, 60 }, \
|
||||
{ 72, 50 }, \
|
||||
{ 71, 50 }, \
|
||||
{ 75, 40 }, \
|
||||
{ 81, 30 }, \
|
||||
{ 87, 20 }, \
|
||||
{ 93, 10 }, \
|
||||
{ 100, 0 }, \
|
||||
{ 106, -12 }, \
|
||||
{ 103, -6 }, \
|
||||
{ 107, -12 }, \
|
||||
{ 112, -18 }, \
|
||||
{ 118, -24 }, \
|
||||
{ 124, -30 }, \
|
||||
{ 133, -36 }, \
|
||||
{ 143, -42 }, \
|
||||
{ 152, -48 }, \
|
||||
{ 255, -60 }, \
|
||||
} }
|
||||
|
||||
|
|
@ -159,7 +167,7 @@ const struct rig_caps nrd535_caps = {
|
|||
},
|
||||
/* mode/filter list, .remember = order matters! */
|
||||
.filters = {
|
||||
{RIG_MODE_FM, kHz(12)},
|
||||
{NRD535_MODES, kHz(12)},
|
||||
{NRD535_MODES, kHz(2)},
|
||||
{NRD535_MODES, kHz(1)},
|
||||
{NRD535_MODES, kHz(6)},
|
||||
|
|
|
|||
26
jrc/nrd545.c
26
jrc/nrd545.c
|
|
@ -2,7 +2,7 @@
|
|||
* Hamlib JRC backend - NRD-545 DSP description
|
||||
* Copyright (c) 2001-2004 by Stephane Fillod
|
||||
*
|
||||
* $Id: nrd545.c,v 1.10 2004-08-01 21:23:41 fillods Exp $
|
||||
* $Id: nrd545.c,v 1.11 2004-08-08 20:13:19 fineware 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
|
||||
|
|
@ -31,11 +31,11 @@
|
|||
#include "jrc.h"
|
||||
|
||||
|
||||
#define NRD545_MODES (RIG_MODE_AM|RIG_MODE_CW|RIG_MODE_SSB|RIG_MODE_FM|RIG_MODE_RTTY)
|
||||
#define NRD545_MODES (RIG_MODE_AM|RIG_MODE_CW|RIG_MODE_SSB|RIG_MODE_FM|RIG_MODE_RTTY|RIG_MODE_AMS|RIG_MODE_ECSS)
|
||||
|
||||
#define NRD545_FUNC (RIG_FUNC_FAGC|RIG_FUNC_NB|RIG_FUNC_LOCK|RIG_FUNC_ABM|RIG_FUNC_BC|RIG_FUNC_NR)
|
||||
#define NRD545_FUNC (RIG_FUNC_FAGC|RIG_FUNC_NB|RIG_FUNC_LOCK|RIG_FUNC_BC|RIG_FUNC_NR)
|
||||
|
||||
#define NRD545_LEVEL (RIG_LEVEL_SQLSTAT|RIG_LEVEL_RAWSTR|RIG_LEVEL_ATT|RIG_LEVEL_RF|RIG_LEVEL_AF|RIG_LEVEL_AGC|RIG_LEVEL_IF|RIG_LEVEL_NR|RIG_LEVEL_NOTCHF|RIG_LEVEL_SQL|RIG_LEVEL_IF|RIG_LEVEL_CWPITCH)
|
||||
#define NRD545_LEVEL (RIG_LEVEL_SQLSTAT|RIG_LEVEL_RAWSTR|RIG_LEVEL_STRENGTH|RIG_LEVEL_ATT|RIG_LEVEL_RF|RIG_LEVEL_AF|RIG_LEVEL_AGC|RIG_LEVEL_IF|RIG_LEVEL_NR|RIG_LEVEL_NOTCHF|RIG_LEVEL_SQL|RIG_LEVEL_IF|RIG_LEVEL_CWPITCH)
|
||||
|
||||
/* FIXME: add more from "U" command */
|
||||
#define NRD545_PARM (RIG_PARM_TIME|RIG_PARM_BACKLIGHT|RIG_PARM_BEEP)
|
||||
|
|
@ -45,8 +45,22 @@
|
|||
/*
|
||||
* FIXME: measure S-meter levels
|
||||
*/
|
||||
#define NRD545_STR_CAL { 2, { \
|
||||
#define NRD545_STR_CAL { 16, { \
|
||||
{ 0, -60 }, \
|
||||
{ 36, -48 }, \
|
||||
{ 42, -42 }, \
|
||||
{ 48, -36 }, \
|
||||
{ 55, -30 }, \
|
||||
{ 60, -24 }, \
|
||||
{ 67, -18 }, \
|
||||
{ 72, -12 }, \
|
||||
{ 78, -6 }, \
|
||||
{ 87, 0 }, \
|
||||
{ 107, 10 }, \
|
||||
{ 126, 20 }, \
|
||||
{ 146, 30 }, \
|
||||
{ 164, 40 }, \
|
||||
{ 186, 50 }, \
|
||||
{ 255, 60 }, \
|
||||
} }
|
||||
|
||||
|
|
@ -155,7 +169,7 @@ const struct rig_caps nrd545_caps = {
|
|||
},
|
||||
/* mode/filter list, .remember = order matters! */
|
||||
.filters = {
|
||||
{RIG_MODE_AM|RIG_MODE_FM, kHz(10)},
|
||||
{RIG_MODE_AM|RIG_MODE_AMS|RIG_MODE_FM, kHz(10)},
|
||||
{NRD545_MODES, kHz(2.4)},
|
||||
{NRD545_MODES, kHz(1)},
|
||||
{NRD545_MODES, kHz(4.5)},
|
||||
|
|
|
|||
Ładowanie…
Reference in New Issue