Added support for ECSS/FAX and meter strength

git-svn-id: https://hamlib.svn.sourceforge.net/svnroot/hamlib/trunk@1786 7ae35d74-ebe9-4afe-98af-79ac388436b8
Hamlib-1.2.2
Mark J. Fine 2004-08-08 20:13:19 +00:00
rodzic caee8b612a
commit 126d5e5556
3 zmienionych plików z 120 dodań i 65 usunięć

131
jrc/jrc.c
Wyświetl plik

@ -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'
@ -144,7 +145,7 @@ int jrc_get_freq(RIG *rig, vfo_t vfo, freq_t *freq)
retval = jrc_transaction (rig, "I" EOM, 2, freqbuf, &freq_len);
if (retval != RIG_OK)
return retval;
//I command returns Iabdffffffffg<CR>
if (freqbuf[0] != 'I' || freq_len != priv->info_len) {
rig_debug(RIG_DEBUG_ERR,"jrc_get_freq: wrong answer %s, "
@ -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);
@ -222,7 +225,7 @@ int jrc_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
char freqbuf[BUFSZ];
char cmode;
char cwidth;
//note: JRCs use "I" to get information
retval = jrc_transaction (rig, "I" EOM, 2, freqbuf, &freq_len);
if (retval != RIG_OK)
@ -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,
@ -356,7 +364,7 @@ int jrc_get_func(RIG *rig, vfo_t vfo, setting_t func, int *status)
}
//*status = funcbuf[1] != '2';
*status = funcbuf[4+priv->max_freq_len] != '2';
return RIG_OK;
case RIG_FUNC_NB:
@ -469,8 +477,8 @@ int jrc_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
case RIG_LEVEL_AGC:
if (val.i < 10)
cmd_len = sprintf(cmdbuf, "G%d" EOM,
val.i == RIG_AGC_SLOW ? 0 :
cmd_len = sprintf(cmdbuf, "G%d" EOM,
val.i == RIG_AGC_SLOW ? 0 :
val.i == RIG_AGC_FAST ? 1 : 2);
else
cmd_len = sprintf(cmdbuf, "G3%03d" EOM, val.i/20);
@ -520,17 +528,34 @@ int jrc_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
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';
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 ? */
@ -578,7 +603,7 @@ int jrc_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
retval = jrc_transaction (rig, "HH" EOM, 3, lvlbuf, &lvl_len);
if (retval != RIG_OK)
return retval;
if (lvl_len != 6) {
rig_debug(RIG_DEBUG_ERR,"jrc_get_level: wrong answer"
"len=%d\n", lvl_len);
@ -595,7 +620,7 @@ int jrc_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
retval = jrc_transaction (rig, "JJ" EOM, 3, lvlbuf, &lvl_len);
if (retval != RIG_OK)
return retval;
if (lvl_len != 6) {
rig_debug(RIG_DEBUG_ERR,"jrc_get_level: wrong answer"
"len=%d\n", lvl_len);
@ -607,12 +632,12 @@ int jrc_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
sscanf(lvlbuf+2, "%u", &lvl);
val->f = (float)lvl/255.0;
break;
case RIG_LEVEL_SQL:
retval = jrc_transaction (rig, "LL" EOM, 3, lvlbuf, &lvl_len);
if (retval != RIG_OK)
return retval;
if (lvl_len != 6) {
rig_debug(RIG_DEBUG_ERR,"jrc_get_level: wrong answer"
"len=%d\n", lvl_len);
@ -624,12 +649,12 @@ int jrc_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
sscanf(lvlbuf+2, "%u", &lvl);
val->f = (float)lvl/255.0;
break;
case RIG_LEVEL_NOTCHF:
retval = jrc_transaction (rig, "GG" EOM, 3, lvlbuf, &lvl_len);
if (retval != RIG_OK)
return retval;
if (lvl_len != 8) {
rig_debug(RIG_DEBUG_ERR,"jrc_get_level: wrong answer"
"len=%d\n", lvl_len);
@ -648,7 +673,7 @@ int jrc_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
retval = jrc_transaction (rig, cwbuf, cw_len, lvlbuf, &lvl_len);
if (retval != RIG_OK)
return retval;
if (lvl_len != cw_len+5) {
rig_debug(RIG_DEBUG_ERR,"jrc_get_level: wrong answer"
"len=%d\n", lvl_len);
@ -663,7 +688,7 @@ int jrc_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
retval = jrc_transaction (rig, "P" EOM, 2, lvlbuf, &lvl_len);
if (retval != RIG_OK)
return retval;
if (lvlbuf[0] != 'P' || lvl_len != priv->pbs_info_len) {
rig_debug(RIG_DEBUG_ERR,"jrc_get_level: wrong answer"
"len=%d\n", lvl_len);
@ -709,21 +734,21 @@ int jrc_set_parm(RIG *rig, setting_t parm, value_t val)
case RIG_PARM_BEEP:
cmd_len = sprintf(cmdbuf, "U%0*d" EOM, priv->beep_len, priv->beep + val.i?1:0);
return jrc_transaction (rig, cmdbuf, cmd_len, NULL, NULL);
case RIG_PARM_TIME:
minutes = val.i/60;
cmd_len = sprintf(cmdbuf, "R1%02d%02d" EOM,
cmd_len = sprintf(cmdbuf, "R1%02d%02d" EOM,
minutes/60, minutes%60);
return jrc_transaction (rig, cmdbuf, cmd_len, NULL, NULL);
default:
rig_debug(RIG_DEBUG_ERR,"Unsupported set_parm %d\n", parm);
return -RIG_EINVAL;
}
return RIG_OK;
}
@ -747,14 +772,14 @@ int jrc_get_parm(RIG *rig, setting_t parm, value_t *val)
retval = jrc_transaction (rig, "R0" EOM, 3, lvlbuf, &lvl_len);
if (retval != RIG_OK)
return retval;
/* "Rhhmmss"CR */
if (lvl_len != 8) {
rig_debug(RIG_DEBUG_ERR,"jrc_get_parm: wrong answer"
"len=%d\n", lvl_len);
return -RIG_ERJCTED;
}
/* convert ASCII to numeric 0..9 */
for (i=1; i<7; i++) {
lvlbuf[i] -= '0';
@ -763,13 +788,13 @@ int jrc_get_parm(RIG *rig, setting_t parm, value_t *val)
10*lvlbuf[3] + lvlbuf[4])*60 + /* minutes */
10*lvlbuf[5] + lvlbuf[6]; /* secondes */
break;
case RIG_PARM_BEEP:
cmd_len = sprintf(cmdbuf, "U%d" EOM, priv->beep/10);
cmd_len = sprintf(cmdbuf, "U%d" EOM, priv->beep/10);
retval = jrc_transaction (rig, cmdbuf, cmd_len, lvlbuf, &lvl_len);
if (retval != RIG_OK)
return retval;
if (lvl_len != priv->beep_len+2) {
rig_debug(RIG_DEBUG_ERR,"jrc_get_parm: wrong answer"
"len=%d\n", lvl_len);
@ -778,7 +803,7 @@ int jrc_get_parm(RIG *rig, setting_t parm, value_t *val)
val->i = lvlbuf[priv->beep_len] == 0 ? 0 : 1;
break;
default:
rig_debug(RIG_DEBUG_ERR,"Unsupported get_parm %d\n", parm);
return -RIG_EINVAL;
@ -876,7 +901,7 @@ int jrc_reset(RIG *rig, reset_t reset)
case RIG_RESET_MCALL: rst='1'; break; /* mem clear */
case RIG_RESET_VFO: rst='2'; break; /* user setup default */
case RIG_RESET_MASTER: rst='3'; break; /* 1 + 2 */
default:
default:
rig_debug(RIG_DEBUG_ERR,"jrc_reset: unsupported reset %d\n",
reset);
return -RIG_EINVAL;
@ -945,7 +970,7 @@ int jrc_vfo_op(RIG *rig, vfo_t vfo, vfo_op_t op)
switch(op) {
case RIG_OP_FROM_VFO: cmd="E1" EOM; break;
default:
default:
rig_debug(RIG_DEBUG_ERR,"jrc_vfo_op: unsupported op %#x\n",
op);
return -RIG_EINVAL;
@ -959,7 +984,7 @@ int jrc_vfo_op(RIG *rig, vfo_t vfo, vfo_op_t op)
* jrc_scan, scan operation
* Assumes rig!=NULL
*
* Not really a scan operation so speaking.
* Not really a scan operation so speaking.
* You just make the rig increment frequency of decrement continuously,
* depending on the sign of ch.
* However, using DCD sensing, followed by a stop, you get it.
@ -983,17 +1008,25 @@ int jrc_scan(RIG *rig, vfo_t vfo, scan_t scan, int ch)
return jrc_transaction (rig, scan_cmd, 3, NULL, NULL);
}
static int jrc2rig_mode(RIG *rig, char jmode, char jwidth,
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",
@ -1036,7 +1069,7 @@ int jrc_decode_event(RIG *rig)
struct rig_state *rs;
freq_t freq;
rmode_t mode;
pbwidth_t width;
pbwidth_t width;
int count;
char buf[BUFSZ];
@ -1066,7 +1099,7 @@ int jrc_decode_event(RIG *rig)
if (rig->callbacks.freq_event) {
long long f;
//buf[14] = '\0'; /* side-effect: destroy AGC first digit! */
buf[4+priv->max_freq_len] = '\0'; /* side-effect: destroy AGC first digit! */
sscanf(buf+4, "%lld", &f);
@ -1074,13 +1107,13 @@ int jrc_decode_event(RIG *rig)
return rig->callbacks.freq_event(rig, RIG_VFO_CURR, freq,
rig->callbacks.freq_arg);
}
if (rig->callbacks.mode_event) {
jrc2rig_mode(rig, buf[3], buf[2], &mode, &width);
return rig->callbacks.mode_event(rig, RIG_VFO_CURR, mode, width,
rig->callbacks.freq_arg);
}
return RIG_OK;
}

Wyświetl plik

@ -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 }, \
} }
@ -68,7 +76,7 @@
.width = 1, \
.funcs = RIG_FUNC_FAGC, \
.levels = RIG_LEVEL_ATT|RIG_LEVEL_AGC, \
}
}
static const struct jrc_priv_caps nrd535_priv_caps = {
.max_freq_len = 8,
@ -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)},

Wyświetl plik

@ -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 }, \
} }
@ -58,7 +72,7 @@
.mode = 1, \
.width = 1, \
.levels = RIG_LEVEL_ATT|RIG_LEVEL_AGC, \
}
}
static const struct jrc_priv_caps nrd545_priv_caps = {
@ -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)},