kopia lustrzana https://github.com/Hamlib/Hamlib
Added support for meter strength
git-svn-id: https://hamlib.svn.sourceforge.net/svnroot/hamlib/trunk@1787 7ae35d74-ebe9-4afe-98af-79ac388436b8Hamlib-1.2.2
Mark J. Fine
rodzic
126d5e5556
commit
62dbcf78a6
|
|
@ -2,7 +2,7 @@
|
|||
* Hamlib Drake backend - main file
|
||||
* Copyright (c) 2001-2004 by Stephane Fillod
|
||||
*
|
||||
* $Id: drake.c,v 1.9 2004-06-04 21:48:05 fillods Exp $
|
||||
* $Id: drake.c,v 1.10 2004-08-08 20:14:03 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
|
||||
|
|
@ -33,6 +33,7 @@
|
|||
#include "hamlib/rig.h"
|
||||
#include "serial.h"
|
||||
#include "misc.h"
|
||||
#include "cal.h"
|
||||
#include "register.h"
|
||||
|
||||
#include "drake.h"
|
||||
|
|
@ -636,7 +637,7 @@ int drake_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
|
|||
char lvlbuf[BUFSZ];
|
||||
char mc;
|
||||
|
||||
if (level != RIG_LEVEL_RAWSTR) {
|
||||
if ((level != RIG_LEVEL_RAWSTR)&&(level != RIG_LEVEL_STRENGTH)) {
|
||||
retval = drake_transaction (rig, "RM" EOM, 3, lvlbuf, &lvl_len);
|
||||
if (retval != RIG_OK)
|
||||
return retval;
|
||||
|
|
@ -663,6 +664,21 @@ int drake_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
|
|||
lvlbuf[3] = '\0';
|
||||
val->i = strtol(lvlbuf+1, (char **)NULL, 16);
|
||||
break;
|
||||
case RIG_LEVEL_STRENGTH:
|
||||
retval = drake_transaction (rig, "RSS" EOM, 4, lvlbuf, &lvl_len);
|
||||
if (retval != RIG_OK)
|
||||
return retval;
|
||||
|
||||
if (lvl_len != 5) {
|
||||
rig_debug(RIG_DEBUG_ERR,"drake_get_level: wrong answer"
|
||||
"len=%d\n", lvl_len);
|
||||
return -RIG_ERJCTED;
|
||||
}
|
||||
|
||||
lvlbuf[3] = '\0';
|
||||
int ss = strtol(lvlbuf+1, (char **)NULL, 16);
|
||||
val->i = (int)rig_raw2val(ss,&rig->caps->str_cal);
|
||||
break;
|
||||
case RIG_LEVEL_PREAMP:
|
||||
mc = lvlbuf[2];
|
||||
if (mc=='8'||mc=='9'||mc==':'||mc==';')
|
||||
|
|
|
|||
34
drake/r8a.c
34
drake/r8a.c
|
|
@ -2,7 +2,7 @@
|
|||
* Hamlib Drake backend - R-8A description
|
||||
* Copyright (c) 2001-2004 by Stephane Fillod
|
||||
*
|
||||
* $Id: r8a.c,v 1.2 2004-06-04 21:48:05 fillods Exp $
|
||||
* $Id: r8a.c,v 1.3 2004-08-08 20:14:25 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
|
||||
|
|
@ -34,7 +34,7 @@
|
|||
|
||||
#define R8A_FUNC (RIG_FUNC_MN|RIG_FUNC_LOCK|RIG_FUNC_NB)
|
||||
|
||||
#define R8A_LEVEL_ALL (RIG_LEVEL_PREAMP|RIG_LEVEL_ATT|RIG_LEVEL_AGC|RIG_LEVEL_RAWSTR)
|
||||
#define R8A_LEVEL_ALL (RIG_LEVEL_PREAMP|RIG_LEVEL_ATT|RIG_LEVEL_AGC|RIG_LEVEL_RAWSTR|RIG_LEVEL_STRENGTH)
|
||||
|
||||
#define R8A_PARM_ALL (RIG_PARM_TIME)
|
||||
|
||||
|
|
@ -44,6 +44,25 @@
|
|||
|
||||
#define R8A_ANTS (RIG_ANT_1|RIG_ANT_2|RIG_ANT_3)
|
||||
|
||||
#define R8A_STR_CAL { 16, { \
|
||||
{ 0, -60 }, \
|
||||
{ 1, -48 }, \
|
||||
{ 11, -42 }, \
|
||||
{ 27, -36 }, \
|
||||
{ 39, -30 }, \
|
||||
{ 51, -24 }, \
|
||||
{ 64, -18 }, \
|
||||
{ 80, -12 }, \
|
||||
{ 97, -6 }, \
|
||||
{ 116, 0 }, \
|
||||
{ 138, 10 }, \
|
||||
{ 163, 20 }, \
|
||||
{ 195, 30 }, \
|
||||
{ 217, 40 }, \
|
||||
{ 228, 50 }, \
|
||||
{ 255, 60 }, \
|
||||
} }
|
||||
|
||||
/*
|
||||
* R-8A rig capabilities.
|
||||
*
|
||||
|
|
@ -119,14 +138,15 @@ const struct rig_caps r8a_caps = {
|
|||
},
|
||||
/* mode/filter list, remember: order matters! */
|
||||
.filters = {
|
||||
{RIG_MODE_SSB|RIG_MODE_CW|RIG_MODE_RTTY|RIG_MODE_AM, kHz(2.3)}, /* normal */
|
||||
{RIG_MODE_SSB|RIG_MODE_CW|RIG_MODE_RTTY|RIG_MODE_AM, kHz(6)}, /* wide */
|
||||
{RIG_MODE_SSB|RIG_MODE_CW|RIG_MODE_RTTY|RIG_MODE_AM, kHz(4)},
|
||||
{RIG_MODE_SSB|RIG_MODE_CW|RIG_MODE_RTTY|RIG_MODE_AM, kHz(1.8)}, /* narrow */
|
||||
{RIG_MODE_SSB|RIG_MODE_CW|RIG_MODE_RTTY|RIG_MODE_AM, Hz(500)},
|
||||
{RIG_MODE_SSB|RIG_MODE_CW|RIG_MODE_RTTY|RIG_MODE_AM|RIG_MODE_AMS, kHz(2.3)}, /* normal */
|
||||
{RIG_MODE_SSB|RIG_MODE_CW|RIG_MODE_RTTY|RIG_MODE_AM|RIG_MODE_AMS, kHz(6)}, /* wide */
|
||||
{RIG_MODE_SSB|RIG_MODE_CW|RIG_MODE_RTTY|RIG_MODE_AM|RIG_MODE_AMS, kHz(4)},
|
||||
{RIG_MODE_SSB|RIG_MODE_CW|RIG_MODE_RTTY|RIG_MODE_AM|RIG_MODE_AMS, kHz(1.8)}, /* narrow */
|
||||
{RIG_MODE_SSB|RIG_MODE_CW|RIG_MODE_RTTY|RIG_MODE_AM|RIG_MODE_AMS, Hz(500)},
|
||||
{RIG_MODE_FM, kHz(12)},
|
||||
RIG_FLT_END,
|
||||
},
|
||||
.str_cal = R8A_STR_CAL,
|
||||
.priv = NULL,
|
||||
|
||||
.rig_init = drake_init,
|
||||
|
|
|
|||
33
drake/r8b.c
33
drake/r8b.c
|
|
@ -2,7 +2,7 @@
|
|||
* Hamlib Drake backend - R-8B description
|
||||
* Copyright (c) 2001-2004 by Stephane Fillod
|
||||
*
|
||||
* $Id: r8b.c,v 1.6 2004-06-04 21:48:05 fillods Exp $
|
||||
* $Id: r8b.c,v 1.7 2004-08-08 20:14:46 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
|
||||
|
|
@ -34,7 +34,7 @@
|
|||
|
||||
#define R8B_FUNC (RIG_FUNC_MN|RIG_FUNC_LOCK|RIG_FUNC_NB)
|
||||
|
||||
#define R8B_LEVEL_ALL (RIG_LEVEL_PREAMP|RIG_LEVEL_ATT|RIG_LEVEL_AGC|RIG_LEVEL_RAWSTR)
|
||||
#define R8B_LEVEL_ALL (RIG_LEVEL_PREAMP|RIG_LEVEL_ATT|RIG_LEVEL_AGC|RIG_LEVEL_RAWSTR|RIG_LEVEL_STRENGTH)
|
||||
|
||||
#define R8B_PARM_ALL (RIG_PARM_TIME)
|
||||
|
||||
|
|
@ -44,6 +44,24 @@
|
|||
|
||||
#define R8B_ANTS (RIG_ANT_1|RIG_ANT_2|RIG_ANT_3)
|
||||
|
||||
#define R8B_STR_CAL { 16, { \
|
||||
{ 0, -60 }, \
|
||||
{ 1, -48 }, \
|
||||
{ 11, -42 }, \
|
||||
{ 27, -36 }, \
|
||||
{ 39, -30 }, \
|
||||
{ 51, -24 }, \
|
||||
{ 64, -18 }, \
|
||||
{ 80, -12 }, \
|
||||
{ 97, -6 }, \
|
||||
{ 116, 0 }, \
|
||||
{ 138, 10 }, \
|
||||
{ 163, 20 }, \
|
||||
{ 195, 30 }, \
|
||||
{ 217, 40 }, \
|
||||
{ 228, 50 }, \
|
||||
{ 255, 60 }, \
|
||||
} }
|
||||
|
||||
/*
|
||||
* R-8B rig capabilities.
|
||||
|
|
@ -120,14 +138,15 @@ const struct rig_caps r8b_caps = {
|
|||
},
|
||||
/* mode/filter list, remember: order matters! */
|
||||
.filters = {
|
||||
{RIG_MODE_SSB|RIG_MODE_CW|RIG_MODE_RTTY|RIG_MODE_AM, kHz(2.3)}, /* normal */
|
||||
{RIG_MODE_SSB|RIG_MODE_CW|RIG_MODE_RTTY|RIG_MODE_AM, kHz(6)}, /* wide */
|
||||
{RIG_MODE_SSB|RIG_MODE_CW|RIG_MODE_RTTY|RIG_MODE_AM, kHz(4)},
|
||||
{RIG_MODE_SSB|RIG_MODE_CW|RIG_MODE_RTTY|RIG_MODE_AM, kHz(1.8)}, /* narrow */
|
||||
{RIG_MODE_SSB|RIG_MODE_CW|RIG_MODE_RTTY|RIG_MODE_AM, Hz(500)},
|
||||
{RIG_MODE_SSB|RIG_MODE_CW|RIG_MODE_RTTY|RIG_MODE_AM|RIG_MODE_AMS, kHz(2.3)}, /* normal */
|
||||
{RIG_MODE_SSB|RIG_MODE_CW|RIG_MODE_RTTY|RIG_MODE_AM|RIG_MODE_AMS, kHz(6)}, /* wide */
|
||||
{RIG_MODE_SSB|RIG_MODE_CW|RIG_MODE_RTTY|RIG_MODE_AM|RIG_MODE_AMS, kHz(4)},
|
||||
{RIG_MODE_SSB|RIG_MODE_CW|RIG_MODE_RTTY|RIG_MODE_AM|RIG_MODE_AMS, kHz(1.8)}, /* narrow */
|
||||
{RIG_MODE_SSB|RIG_MODE_CW|RIG_MODE_RTTY|RIG_MODE_AM|RIG_MODE_AMS, Hz(500)},
|
||||
{RIG_MODE_FM, kHz(12)},
|
||||
RIG_FLT_END,
|
||||
},
|
||||
.str_cal = R8B_STR_CAL,
|
||||
.priv = NULL,
|
||||
|
||||
.rig_init = drake_init,
|
||||
|
|
|
|||
Ładowanie…
Reference in New Issue