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

Merge pull request #680 from mikaelnousiainen/ts480-fixes 

Extend TS-480 backend functionality significantly
pull/691/head
Michael Black 2021-04-25 09:42:11 -05:00 zatwierdzone przez GitHub
rodzic ec68495bd3 9ca111a5a5
commit a8b6695547
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 4AEE18F83AFDEB23
6 zmienionych plików z 1784 dodań i 421 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

4
include/hamlib/rig.h
Wyświetl plik

@ -897,8 +897,8 @@ typedef uint64_t rig_level_e;
#define RIG_LEVEL_METER CONSTANT_64BIT_FLAG(20) /*!< \c METER -- Display meter, arg int (see enum meter_level_e) */
#define RIG_LEVEL_VOXGAIN CONSTANT_64BIT_FLAG(21) /*!< \c VOXGAIN -- VOX gain level, arg float [0.0 ... 1.0] */
#define RIG_LEVEL_ANTIVOX CONSTANT_64BIT_FLAG(22) /*!< \c ANTIVOX -- anti-VOX level, arg float [0.0 ... 1.0] */
#define RIG_LEVEL_SLOPE_LOW CONSTANT_64BIT_FLAG(23) /*!< \c SLOPE_LOW -- Slope tune, low frequency cut, */
#define RIG_LEVEL_SLOPE_HIGH CONSTANT_64BIT_FLAG(24) /*!< \c SLOPE_HIGH -- Slope tune, high frequency cut, */
#define RIG_LEVEL_SLOPE_LOW CONSTANT_64BIT_FLAG(23) /*!< \c SLOPE_LOW -- Slope tune, low frequency cut, arg int (Hz) */
#define RIG_LEVEL_SLOPE_HIGH CONSTANT_64BIT_FLAG(24) /*!< \c SLOPE_HIGH -- Slope tune, high frequency cut, arg int (Hz) */
#define RIG_LEVEL_BKIN_DLYMS CONSTANT_64BIT_FLAG(25) /*!< \c BKIN_DLYMS -- BKin Delay, arg int Milliseconds */
/*!< These are not settable */

2
rigs/kenwood/Makefile.am
Wyświetl plik

@ -1,7 +1,7 @@
TSSRC = ts850.c ts870s.c ts570.c ts450s.c ts950.c ts50s.c \
ts790.c ts2000.c k2.c k3.c xg3.c ts930.c \
ts680.c ts690.c ts140.c ts480.c trc80.c ts590.c \
ts680.c ts690.c ts140.c ts480.c trc80.c ts590.c ts890s.c \
ts990s.c ts990s.h flex6xxx.c pihpsdr.c
IC10SRC = ts440.c ts940.c ts711.c ts811.c r5000.c

435
rigs/kenwood/kenwood.c
Wyświetl plik

@ -28,7 +28,6 @@
#include <stdio.h>
#include <string.h> /* String function definitions */
#include <unistd.h> /* UNIX standard function definitions */
#include <math.h>
#include <ctype.h>
#include "hamlib/rig.h"
@ -994,7 +993,7 @@ int kenwood_get_id(RIG *rig, char *buf)
* Retrieves the transceiver status
*
*/
static int kenwood_get_if(RIG *rig)
int kenwood_get_if(RIG *rig)
{
struct kenwood_priv_data *priv = rig->state.priv;
struct kenwood_priv_caps *caps = kenwood_caps(rig);
@ -1704,6 +1703,7 @@ int kenwood_get_rit(RIG *rig, vfo_t vfo, shortfreq_t *rit)
RETURNFUNC(retval);
}
// TODO: Fix for different rigs
memcpy(buf, &priv->info[17], 6);
buf[6] = '\0';
@ -1830,6 +1830,42 @@ static int kenwood_set_filter(RIG *rig, pbwidth_t width)
RETURNFUNC(kenwood_transaction(rig, cmd, NULL, 0));
}
static int kenwood_set_filter_width(RIG *rig, rmode_t mode, pbwidth_t width)
{
struct kenwood_priv_caps *caps = kenwood_caps(rig);
struct kenwood_filter_width *selected_filter_width = NULL;
char cmd[20];
int i;
rig_debug(RIG_DEBUG_VERBOSE, "%s called, width=%ld\n", __func__, width);
if (caps->filter_width == NULL)
{
RETURNFUNC(-RIG_ENAVAIL);
}
for (i = 0; caps->filter_width[i].value >= 0; i++)
{
if (caps->filter_width[i].modes & mode)
{
selected_filter_width = &caps->filter_width[i];
if (caps->filter_width[i].width_hz >= width)
{
break;
}
}
}
if (selected_filter_width == NULL)
{
RETURNFUNC(-RIG_EINVAL);
}
snprintf(cmd, sizeof(cmd), "FW%04d", selected_filter_width->value);
RETURNFUNC(kenwood_transaction(rig, cmd, NULL, 0));
}
/*
* kenwood_set_mode
*/
@ -1975,6 +2011,15 @@ int kenwood_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
kenwood_set_filter(rig, width);
/* non fatal */
}
else if (RIG_IS_TS480)
{
err = kenwood_set_filter_width(rig, mode, width);
if (err != RIG_OK)
{
// Ignore errors as non-fatal
rig_debug(RIG_DEBUG_ERR, "%s: error setting filter width, error: %d\n", __func__, err);
}
}
RETURNFUNC(RIG_OK);
}
@ -2039,6 +2084,44 @@ static int kenwood_get_filter(RIG *rig, pbwidth_t *width)
RETURNFUNC(RIG_OK);
}
static int kenwood_get_filter_width(RIG *rig, rmode_t mode, pbwidth_t *width)
{
struct kenwood_priv_caps *caps = kenwood_caps(rig);
char ackbuf[20];
int i;
int retval;
int filter_value;
rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
if (caps->filter_width == NULL)
{
RETURNFUNC(-RIG_ENAVAIL);
}
retval = kenwood_safe_transaction(rig, "FW", ackbuf, sizeof(ackbuf), 6);
if (retval != RIG_OK)
{
RETURNFUNC(retval);
}
sscanf(ackbuf, "FW%d", &filter_value);
for (i = 0; caps->filter_width[i].value >= 0; i++)
{
if (caps->filter_width[i].modes & mode)
{
if (caps->filter_width[i].value == filter_value)
{
*width = caps->filter_width[i].width_hz;
RETURNFUNC(RIG_OK);
}
}
}
RETURNFUNC(-RIG_EINVAL);
}
/*
* kenwood_get_mode
*/
@ -2152,8 +2235,20 @@ int kenwood_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
}
}
/* XXX ? */
if (RIG_IS_TS480)
{
retval = kenwood_get_filter_width(rig, *mode, width);
if (retval != RIG_OK)
{
// Ignore errors as non-fatal
rig_debug(RIG_DEBUG_ERR, "%s: error getting filter width, error: %d\n", __func__, retval);
*width = rig_passband_normal(rig, *mode);
}
}
else
{
*width = rig_passband_normal(rig, *mode);
}
RETURNFUNC(RIG_OK);
}
@ -2379,11 +2474,110 @@ static int kenwood_get_power_minmax(RIG *rig, int *power_now, int *power_min,
RETURNFUNC(RIG_OK);
}
static int kenwood_find_slope_filter_for_frequency(RIG *rig, vfo_t vfo, struct kenwood_slope_filter *filter, int frequency_hz, int *value)
{
int retval;
int i;
struct kenwood_slope_filter *last_filter = NULL;
freq_t freq;
int cache_ms_freq;
rmode_t mode;
int cache_ms_mode;
pbwidth_t width;
int cache_ms_width;
int data_mode_filter_active;
if (filter == NULL)
{
return -RIG_ENAVAIL;
}
retval = rig_get_cache(rig, vfo, &freq, &cache_ms_freq, &mode, &cache_ms_mode, &width, &cache_ms_width);
if (retval != RIG_OK)
{
return -RIG_EINVAL;
}
retval = rig_get_ext_func(rig, vfo, TOK_FUNC_FILTER_WIDTH_DATA, &data_mode_filter_active);
if (retval != RIG_OK)
{
// Ignore errors, e.g. if the command is not supported
data_mode_filter_active = 0;
}
for (i = 0; filter[i].value >= 0; i++)
{
if (filter[i].modes & mode && filter[i].data_mode_filter == data_mode_filter_active)
{
if (filter[i].frequency_hz >= frequency_hz)
{
*value = filter[i].value;
return RIG_OK;
}
last_filter = &filter[i];
}
}
if (last_filter != NULL)
{
*value = last_filter->value;
return RIG_OK;
}
return -RIG_EINVAL;
}
static int kenwood_find_slope_filter_for_value(RIG *rig, vfo_t vfo, struct kenwood_slope_filter *filter, int value, int *frequency_hz)
{
int retval;
int i;
freq_t freq;
int cache_ms_freq;
rmode_t mode;
int cache_ms_mode;
pbwidth_t width;
int cache_ms_width;
int data_mode_filter_active;
if (filter == NULL)
{
return -RIG_ENAVAIL;
}
retval = rig_get_cache(rig, vfo, &freq, &cache_ms_freq, &mode, &cache_ms_mode, &width, &cache_ms_width);
if (retval != RIG_OK)
{
return -RIG_EINVAL;
}
retval = rig_get_ext_func(rig, vfo, TOK_FUNC_FILTER_WIDTH_DATA, &data_mode_filter_active);
if (retval != RIG_OK)
{
// Ignore errors, e.g. if the command is not supported
data_mode_filter_active = 0;
}
for (i = 0; filter[i].value >= 0; i++)
{
if (filter[i].modes & mode && filter[i].data_mode_filter == data_mode_filter_active)
{
if (filter[i].value == value)
{
*frequency_hz = filter[i].frequency_hz;
return RIG_OK;
}
}
}
return -RIG_EINVAL;
}
int kenwood_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
{
char levelbuf[16];
int i, kenwood_val;
struct kenwood_priv_data *priv = rig->state.priv;
struct kenwood_priv_caps *caps = kenwood_caps(rig);
rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
@ -2556,21 +2750,33 @@ int kenwood_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
break;
case RIG_LEVEL_SLOPE_HIGH:
retval = kenwood_find_slope_filter_for_frequency(rig, vfo, caps->slope_filter_high, val.i, &kenwood_val);
if (retval != RIG_OK)
{
// Fall back to using raw values
if (val.i > 20 || val.i < 0)
{
RETURNFUNC(-RIG_EINVAL);
}
kenwood_val = val.i;
}
snprintf(levelbuf, sizeof(levelbuf), "SH%02d", (val.i));
snprintf(levelbuf, sizeof(levelbuf), "SH%02d", kenwood_val);
break;
case RIG_LEVEL_SLOPE_LOW:
retval = kenwood_find_slope_filter_for_frequency(rig, vfo, caps->slope_filter_low, val.i, &kenwood_val);
if (retval != RIG_OK)
{
// Fall back to using raw values
if (val.i > 20 || val.i < 0)
{
RETURNFUNC(-RIG_EINVAL);
}
kenwood_val = val.i;
}
snprintf(levelbuf, sizeof(levelbuf), "SL%02d", (val.i));
snprintf(levelbuf, sizeof(levelbuf), "SL%02d", kenwood_val);
break;
case RIG_LEVEL_CWPITCH:
@ -2583,7 +2789,7 @@ int kenwood_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
break;
case RIG_LEVEL_KEYSPD:
if (val.i > 50 || val.i < 5)
if (val.i > 60 || val.i < 5)
{
RETURNFUNC(-RIG_EINVAL);
}
@ -2591,6 +2797,41 @@ int kenwood_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
snprintf(levelbuf, sizeof(levelbuf), "KS%03d", val.i);
break;
case RIG_LEVEL_COMP:
if (RIG_IS_TS990S)
{
kenwood_val = val.f * 255.0f;
}
else
{
kenwood_val = val.f * 100.0f;
}
snprintf(levelbuf, sizeof(levelbuf), "PL%03d%03d", kenwood_val, kenwood_val);
break;
case RIG_LEVEL_VOXDELAY:
if (val.i > 3000 || val.i < 0)
{
RETURNFUNC(-RIG_EINVAL);
}
snprintf(levelbuf, sizeof(levelbuf), "VD%04d", val.i);
break;
case RIG_LEVEL_VOXGAIN:
kenwood_val = val.f * 9.0f;
snprintf(levelbuf, sizeof(levelbuf), "VG%03d", kenwood_val);
break;
case RIG_LEVEL_BKIN_DLYMS:
if (val.i > 1000 || val.i < 0)
{
RETURNFUNC(-RIG_EINVAL);
}
snprintf(levelbuf, sizeof(levelbuf), "SD%04d", val.i);
break;
default:
rig_debug(RIG_DEBUG_ERR, "%s: unsupported set_level %s", __func__,
rig_strlevel(level));
@ -2641,8 +2882,9 @@ int kenwood_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
char *cmd;
int retval;
int lvl;
int i, ret, agclevel, len;
int i, ret, agclevel, len, value;
struct kenwood_priv_data *priv = rig->state.priv;
struct kenwood_priv_caps *caps = kenwood_caps(rig);
rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
@ -2937,7 +3179,21 @@ int kenwood_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
RETURNFUNC(retval);
}
val->i = atoi(&lvlbuf[2]);
value = atoi(&lvlbuf[2]);
retval = kenwood_find_slope_filter_for_value(rig, vfo, caps->slope_filter_low, value, &val->i);
if (retval != RIG_OK)
{
if (retval == -RIG_ENAVAIL)
{
// Fall back to using raw values
val->i = value;
}
else
{
RETURNFUNC(retval);
}
}
break;
case RIG_LEVEL_SLOPE_HIGH:
@ -2948,7 +3204,21 @@ int kenwood_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
RETURNFUNC(retval);
}
val->i = atoi(&lvlbuf[2]);
value = atoi(&lvlbuf[2]);
retval = kenwood_find_slope_filter_for_value(rig, vfo, caps->slope_filter_high, value, &val->i);
if (retval != RIG_OK)
{
if (retval == -RIG_ENAVAIL)
{
// Fall back to using raw values
val->i = value;
}
else
{
RETURNFUNC(retval);
}
}
break;
case RIG_LEVEL_CWPITCH:
@ -2974,13 +3244,80 @@ int kenwood_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
sscanf(lvlbuf + 2, "%d", &val->i);
break;
case RIG_LEVEL_COMP: {
int raw_value;
retval = kenwood_safe_transaction(rig, "PL", lvlbuf, 50, 8);
if (retval != RIG_OK)
{
RETURNFUNC(retval);
}
sscanf(lvlbuf + 2, "%3d", &raw_value);
if (RIG_IS_TS990S)
{
val->f = (float) raw_value / 255.0f;
}
else
{
val->f = (float) raw_value / 100.0f;
}
break;
}
case RIG_LEVEL_VOXDELAY: {
int raw_value;
retval = kenwood_safe_transaction(rig, "VD", lvlbuf, 50, 6);
if (retval != RIG_OK)
{
RETURNFUNC(retval);
}
sscanf(lvlbuf + 2, "%d", &raw_value);
// Value is in milliseconds
val->i = raw_value / 100;
break;
}
case RIG_LEVEL_VOXGAIN: {
int raw_value;
retval = kenwood_safe_transaction(rig, "VG", lvlbuf, 50, 5);
if (retval != RIG_OK)
{
RETURNFUNC(retval);
}
sscanf(lvlbuf + 2, "%d", &raw_value);
val->f = (float) raw_value / 9.0f;
break;
}
case RIG_LEVEL_BKIN_DLYMS: {
int raw_value;
retval = kenwood_safe_transaction(rig, "SD", lvlbuf, 50, 6);
if (retval != RIG_OK)
{
RETURNFUNC(retval);
}
sscanf(lvlbuf + 2, "%d", &raw_value);
val->i = raw_value;
break;
}
case RIG_LEVEL_IF:
case RIG_LEVEL_APF:
case RIG_LEVEL_NR:
case RIG_LEVEL_PBT_IN:
case RIG_LEVEL_PBT_OUT:
case RIG_LEVEL_NOTCHF:
case RIG_LEVEL_COMP:
case RIG_LEVEL_BKINDL:
case RIG_LEVEL_BALANCE:
RETURNFUNC(-RIG_ENIMPL);
@ -3106,6 +3443,14 @@ int kenwood_set_func(RIG *rig, vfo_t vfo, setting_t func, int status)
snprintf(buf, sizeof(buf), "XT%c", (status == 0) ? '0' : '1');
RETURNFUNC(kenwood_transaction(rig, buf, NULL, 0));
case RIG_FUNC_TUNER:
snprintf(buf, sizeof(buf), "AC1%c0", (status == 0) ? '0' : '1');
RETURNFUNC(kenwood_transaction(rig, buf, NULL, 0));
case RIG_FUNC_FBKIN:
snprintf(buf, sizeof(buf), "SD%04d", (status == 1) ? 0 : 50);
RETURNFUNC(kenwood_transaction(rig, buf, NULL, 0));
default:
rig_debug(RIG_DEBUG_ERR, "Unsupported set_func %s", rig_strfunc(func));
RETURNFUNC(-RIG_EINVAL);
@ -3152,8 +3497,9 @@ int get_kenwood_func(RIG *rig, const char *cmd, int *status)
int kenwood_get_func(RIG *rig, vfo_t vfo, setting_t func, int *status)
{
char *cmd;
char fctbuf[20];
char respbuf[20];
int retval;
int raw_value;
rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
@ -3165,14 +3511,14 @@ int kenwood_get_func(RIG *rig, vfo_t vfo, setting_t func, int *status)
switch (func)
{
case RIG_FUNC_FAGC:
retval = kenwood_safe_transaction(rig, "GT", fctbuf, 20, 5);
retval = kenwood_safe_transaction(rig, "GT", respbuf, 20, 5);
if (retval != RIG_OK)
{
RETURNFUNC(retval);
}
*status = fctbuf[4] != '4' ? 1 : 0;
*status = respbuf[4] != '4' ? 1 : 0;
RETURNFUNC(RIG_OK);
case RIG_FUNC_NB:
@ -3209,21 +3555,21 @@ int kenwood_get_func(RIG *rig, vfo_t vfo, setting_t func, int *status)
/* FIXME on TS2000 */
// Check for BC #1
case RIG_FUNC_BC: // Most will return BC1 or BC0, if BC2 then BC1 is off
retval = get_kenwood_func(rig, "BC", status);
retval = get_kenwood_func(rig, "BC", &raw_value);
if (retval == RIG_OK)
{
*status = *status == '1' ? 1 : 0;
*status = raw_value == 1 ? 1 : 0;
}
RETURNFUNC(retval);
case RIG_FUNC_BC2: // TS-890 check Beat Cancel 2 we return boolean true/false
retval = get_kenwood_func(rig, "BC", status);
retval = get_kenwood_func(rig, "BC", &raw_value);
if (retval == RIG_OK)
{
*status = *status == '2' ? 1 : 0;
*status = raw_value == 2 ? 1 : 0;
}
RETURNFUNC(retval);
@ -3240,6 +3586,35 @@ int kenwood_get_func(RIG *rig, vfo_t vfo, setting_t func, int *status)
case RIG_FUNC_RIT:
RETURNFUNC(get_kenwood_func(rig, "RT", status));
case RIG_FUNC_XIT:
RETURNFUNC(get_kenwood_func(rig, "XT", status));
case RIG_FUNC_TUNER:
retval = kenwood_safe_transaction(rig, "AC", respbuf, 20, 5);
if (retval != RIG_OK)
{
RETURNFUNC(retval);
}
*status = respbuf[3] != '0' ? 1 : 0;
RETURNFUNC(RIG_OK);
case RIG_FUNC_FBKIN: {
int raw_value;
retval = kenwood_safe_transaction(rig, "SD", respbuf, 20, 6);
if (retval != RIG_OK)
{
RETURNFUNC(retval);
}
sscanf(respbuf + 2, "%d", &raw_value);
*status = (raw_value == 0) ? 1 : 0;
RETURNFUNC(RIG_OK);
}
default:
rig_debug(RIG_DEBUG_ERR, "Unsupported get_func %s", rig_strfunc(func));
RETURNFUNC(-RIG_EINVAL);
@ -3787,7 +4162,8 @@ int kenwood_get_dcd(RIG *rig, vfo_t vfo, dcd_t *dcd)
{
char busybuf[10];
int retval;
int offs = 2;
int expected;
int offs;
rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
@ -3796,17 +4172,30 @@ int kenwood_get_dcd(RIG *rig, vfo_t vfo, dcd_t *dcd)
RETURNFUNC(-RIG_EINVAL);
}
retval = kenwood_safe_transaction(rig, "BY", busybuf, 10, 3);
if (RIG_IS_TS480 || RIG_IS_TS590S || RIG_IS_TS590SG || RIG_IS_TS990S || RIG_IS_TS2000)
{
expected = 4;
}
else
{
expected = 3;
}
retval = kenwood_safe_transaction(rig, "BY", busybuf, 10, expected);
if (retval != RIG_OK)
{
RETURNFUNC(retval);
}
if (RIG_IS_TS990S && RIG_VFO_SUB == vfo)
if ((RIG_IS_TS990S && RIG_VFO_SUB == vfo) || (RIG_IS_TS2000 && RIG_VFO_SUB == vfo))
{
offs = 3;
}
else
{
offs = 2;
}
*dcd = (busybuf[offs] == '1') ? RIG_DCD_ON : RIG_DCD_OFF;
@ -4126,6 +4515,12 @@ int kenwood_vfo_op(RIG *rig, vfo_t vfo, vfo_op_t op)
case RIG_OP_BAND_DOWN:
RETURNFUNC(kenwood_transaction(rig, "BD", NULL, 0));
case RIG_OP_TUNE:
RETURNFUNC(kenwood_transaction(rig, "AC111", NULL, 0));
case RIG_OP_CPY:
RETURNFUNC(kenwood_transaction(rig, "VV", NULL, 0));
default:
rig_debug(RIG_DEBUG_ERR, "%s: unsupported op %#x\n",
__func__, op);

21
rigs/kenwood/kenwood.h
Wyświetl plik

@ -47,6 +47,8 @@
#define TOK_RIT TOKEN_BACKEND(4)
#define TOK_NO_ID TOKEN_BACKEND(5)
#define TOK_FUNC_FILTER_WIDTH_DATA TOKEN_BACKEND(6) // Data communications mode that affects SL/SH/FW commands
/* Token structure assigned to .cfgparams in rig_caps */
extern const struct confparams kenwood_cfg_params[];
@ -106,11 +108,29 @@ extern const struct confparams kenwood_cfg_params[];
#define RIG_IS_POWERSDR (rig->caps->rig_model == RIG_MODEL_POWERSDR)
#define RIG_IS_MALACHITE (rig->caps->rig_model == RIG_MODEL_MALACHITE)
struct kenwood_filter_width
{
rmode_t modes;
int value;
pbwidth_t width_hz;
};
struct kenwood_slope_filter
{
rmode_t modes;
int data_mode_filter;
int value;
pbwidth_t frequency_hz;
};
struct kenwood_priv_caps
{
char cmdtrm; /* Command termination chars (ken=';' or th='\r') */
int if_len; /* length of IF; answer excluding ';' terminator */
rmode_t *mode_table;
struct kenwood_filter_width *filter_width; /* Last entry should have value == -1 and width_hz == -1 */
struct kenwood_slope_filter *slope_filter_high; /* Last entry should have value == -1 and frequency_hz == -1 */
struct kenwood_slope_filter *slope_filter_low; /* Last entry should have value == -1 and frequency_hz == -1 */
};
struct kenwood_priv_data
@ -217,6 +237,7 @@ int kenwood_set_channel(RIG *rig, vfo_t vfo, const channel_t *chan);
int kenwood_scan(RIG *rig, vfo_t vfo, scan_t scan, int ch);
const char *kenwood_get_info(RIG *rig);
int kenwood_get_id(RIG *rig, char *buf);
int kenwood_get_if(RIG *rig);
int kenwood_set_trn(RIG *rig, int trn);
int kenwood_get_trn(RIG *rig, int *trn);

1319
rigs/kenwood/ts480.c
Wyświetl plik

Plik diff jest za duży Load Diff

374
rigs/kenwood/ts890s.c 100644
Wyświetl plik

@ -0,0 +1,374 @@
/*
* Hamlib Kenwood backend - TS-890S description
* Copyright (c) 2000-2004 by Stephane Fillod and Juergen Rinas
*
* 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
*
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <stdio.h>
#include <hamlib/rig.h>
#include "kenwood.h"
// TODO: Copied from TS-480, to be verified
#define TS890_VFO (RIG_VFO_A|RIG_VFO_B)
#define TS890_ALL_MODES (RIG_MODE_LSB|RIG_MODE_USB|RIG_MODE_CW|RIG_MODE_FM|RIG_MODE_AM|RIG_MODE_RTTY|RIG_MODE_CWR|RIG_MODE_RTTYR|RIG_MODE_PSK|RIG_MODE_PSKR|RIG_MODE_PKTLSB|RIG_MODE_PKTUSB|RIG_MODE_PKTFM|RIG_MODE_PKTAM)
// TODO: Copied from TS-480, to be verified
#define TS890_OTHER_TX_MODES (RIG_MODE_CW|RIG_MODE_SSB|RIG_MODE_FM|RIG_MODE_RTTY)
// TODO: Copied from TS-480, to be verified
#define TS890_AM_TX_MODES RIG_MODE_AM
// TODO: Copied from TS-480, to be verified
#define TS890_LEVEL_ALL (RIG_LEVEL_RFPOWER|RIG_LEVEL_AF|RIG_LEVEL_RF|RIG_LEVEL_SQL|RIG_LEVEL_AGC)
#define TS890_FUNC_ALL (RIG_FUNC_NB|RIG_FUNC_NB2|RIG_FUNC_COMP|RIG_FUNC_VOX|RIG_FUNC_NR|RIG_FUNC_NR|RIG_FUNC_BC|RIG_FUNC_BC2|RIG_FUNC_RIT|RIG_FUNC_XIT|RIG_FUNC_TUNER)
#define TS890_VFO_OPS (RIG_OP_UP|RIG_OP_DOWN|RIG_OP_BAND_UP|RIG_OP_BAND_DOWN|RIG_OP_CPY|RIG_OP_TUNE)
int kenwood_ts890_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
{
char levelbuf[16];
int kenwood_val;
rig_debug(RIG_DEBUG_TRACE, "%s called\n", __func__);
switch (level)
{
case RIG_LEVEL_RF:
kenwood_val = val.f * 255;
sprintf(levelbuf, "RG%03d", kenwood_val);
break;
case RIG_LEVEL_SQL:
kenwood_val = val.f * 255;
sprintf(levelbuf, "SQ%03d", kenwood_val);
break;
case RIG_LEVEL_AGC:
/* hamlib argument is int, possible values rig.h:enum agc_level_e */
/* possible values for TS890 0(=off), 1(=slow), 2(=mid), 3(=fast), 4(=off/Last) */
rig_debug(RIG_DEBUG_VERBOSE, "%s TS890S RIG_LEVEL_AGC\n", __func__);
switch (val.i)
{
case RIG_AGC_OFF:
kenwood_val = 0;
break;
case RIG_AGC_SLOW:
kenwood_val = 1;
break;
case RIG_AGC_MEDIUM:
kenwood_val = 2;
break;
case RIG_AGC_FAST:
kenwood_val = 3;
break;
case RIG_AGC_AUTO:
kenwood_val = 4;
break;
default:
rig_debug(RIG_DEBUG_ERR, "%s: unsupported agc value", __func__);
return -RIG_EINVAL;
}
sprintf(levelbuf, "GC%d", kenwood_val);
break;
default:
return kenwood_set_level(rig, vfo, level, val);
}
return kenwood_transaction(rig, levelbuf, NULL, 0);
}
int kenwood_ts890_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
{
char ackbuf[50];
size_t ack_len, ack_len_expected;
int levelint;
int retval;
rig_debug(RIG_DEBUG_TRACE, "%s called\n", __func__);
switch (level)
{
case RIG_LEVEL_RF:
retval = kenwood_transaction(rig, "RG", ackbuf, sizeof(ackbuf));
if (RIG_OK != retval)
{
return retval;
}
ack_len = strlen(ackbuf);
if (5 != ack_len)
{
return -RIG_EPROTO;
}
if (1 != sscanf(&ackbuf[2], "%d", &levelint))
{
return -RIG_EPROTO;
}
val->f = levelint / (float) 255;
return RIG_OK;
case RIG_LEVEL_SQL:
retval = kenwood_transaction(rig, "SQ", ackbuf, sizeof(ackbuf));
ack_len_expected = 5;
if (RIG_OK != retval)
{
return retval;
}
ack_len = strlen(ackbuf);
if (ack_len != ack_len_expected)
{
return -RIG_EPROTO;
}
if (1 != sscanf(&ackbuf[ack_len_expected - 3], "%d", &levelint))
{
return -RIG_EPROTO;
}
val->f = (float) levelint / 255.;
return RIG_OK;
case RIG_LEVEL_AGC:
retval = kenwood_transaction(rig, "GC", ackbuf, sizeof(ackbuf));
ack_len_expected = 3;
if (RIG_OK != retval)
{
return retval;
}
ack_len = strlen(ackbuf);
if (ack_len != ack_len_expected)
{
return -RIG_EPROTO;
}
switch (ackbuf[ack_len_expected - 1])
{
case '0':
val->i = RIG_AGC_OFF;
break;
case '1':
val->i = RIG_AGC_SLOW;
break;
case '2':
val->i = RIG_AGC_MEDIUM;
break;
case '3':
val->i = RIG_AGC_FAST;
break;
case '4':
val->i = RIG_AGC_AUTO;
break;
default:
return -RIG_EPROTO;
}
return RIG_OK;
default:
return kenwood_get_level(rig, vfo, level, val);
}
}
static struct kenwood_priv_caps ts890s_priv_caps =
{
.cmdtrm = EOM_KEN,
};
/*
* TS-890S rig capabilities
* Copied from ts480_caps, many of the values have not been verified.
* Notice that some rigs share the same functions.
*/
const struct rig_caps ts890s_caps =
{
RIG_MODEL(RIG_MODEL_TS890S),
.model_name = "TS-890S",
.mfg_name = "Kenwood",
.version = BACKEND_VER ".0",
.copyright = "LGPL",
.status = RIG_STATUS_STABLE,
.rig_type = RIG_TYPE_TRANSCEIVER,
.ptt_type = RIG_PTT_RIG_MICDATA,
.dcd_type = RIG_DCD_RIG,
.port_type = RIG_PORT_SERIAL,
.serial_rate_min = 4800,
.serial_rate_max = 115200,
.serial_data_bits = 8,
.serial_stop_bits = 1,
.serial_parity = RIG_PARITY_NONE,
.serial_handshake = RIG_HANDSHAKE_NONE,
.write_delay = 0,
.post_write_delay = 0,
.timeout = 200,
.retry = 10,
.preamp = {12, RIG_DBLST_END,},
.attenuator = {12, RIG_DBLST_END,},
.max_rit = kHz(9.99),
.max_xit = kHz(9.99),
.max_ifshift = Hz(0),
.targetable_vfo = RIG_TARGETABLE_FREQ,
.transceive = RIG_TRN_RIG,
.rx_range_list1 = {
{kHz(100), Hz(59999999), TS890_ALL_MODES, -1, -1, TS890_VFO},
RIG_FRNG_END,
}, /*!< Receive frequency range list for ITU region 1 */
.tx_range_list1 = {
{kHz(1810), kHz(1850), TS890_OTHER_TX_MODES, 5000, 100000, TS890_VFO}, /* 100W class */
{kHz(1810), kHz(1850), TS890_AM_TX_MODES, 5000, 25000, TS890_VFO}, /* 25W class */
{kHz(3500), kHz(3800), TS890_OTHER_TX_MODES, 5000, 100000, TS890_VFO},
{kHz(3500), kHz(3800), TS890_AM_TX_MODES, 5000, 25000, TS890_VFO},
{MHz(7), kHz(7200), TS890_OTHER_TX_MODES, 5000, 100000, TS890_VFO},
{MHz(7), kHz(7200), TS890_AM_TX_MODES, 5000, 25000, TS890_VFO},
{kHz(10100), kHz(10150), TS890_OTHER_TX_MODES, 5000, 100000, TS890_VFO},
{kHz(10100), kHz(10150), TS890_AM_TX_MODES, 5000, 25000, TS890_VFO},
{MHz(14), kHz(14350), TS890_OTHER_TX_MODES, 5000, 100000, TS890_VFO},
{MHz(14), kHz(14350), TS890_AM_TX_MODES, 5000, 25000, TS890_VFO},
{kHz(18068), kHz(18168), TS890_OTHER_TX_MODES, 5000, 100000, TS890_VFO},
{kHz(18068), kHz(18168), TS890_AM_TX_MODES, 5000, 25000, TS890_VFO},
{MHz(21), kHz(21450), TS890_OTHER_TX_MODES, 5000, 100000, TS890_VFO},
{MHz(21), kHz(21450), TS890_AM_TX_MODES, 5000, 25000, TS890_VFO},
{kHz(24890), kHz(24990), TS890_OTHER_TX_MODES, 5000, 100000, TS890_VFO},
{kHz(24890), kHz(24990), TS890_AM_TX_MODES, 5000, 25000, TS890_VFO},
{MHz(28), kHz(29700), TS890_OTHER_TX_MODES, 5000, 100000, TS890_VFO},
{MHz(28), kHz(29700), TS890_AM_TX_MODES, 5000, 25000, TS890_VFO},
{MHz(50), kHz(52000), TS890_OTHER_TX_MODES, 5000, 100000, TS890_VFO},
{MHz(50), kHz(52000), TS890_AM_TX_MODES, 5000, 25000, TS890_VFO},
RIG_FRNG_END,
}, /*!< Transmit frequency range list for ITU region 1 */
.rx_range_list2 = {
{kHz(100), Hz(59999999), TS890_ALL_MODES, -1, -1, TS890_VFO},
RIG_FRNG_END,
}, /*!< Receive frequency range list for ITU region 2 */
.tx_range_list2 = {
{kHz(1800), MHz(2) - 1, TS890_OTHER_TX_MODES, 5000, 100000, TS890_VFO}, /* 100W class */
{kHz(1800), MHz(2) - 1, TS890_AM_TX_MODES, 5000, 25000, TS890_VFO}, /* 25W class */
{kHz(3500), MHz(4) - 1, TS890_OTHER_TX_MODES, 5000, 100000, TS890_VFO},
{kHz(3500), MHz(4) - 1, TS890_AM_TX_MODES, 5000, 25000, TS890_VFO},
{kHz(5250), kHz(5450), TS890_OTHER_TX_MODES, 5000, 100000, TS890_VFO},
{kHz(5250), kHz(5450), TS890_AM_TX_MODES, 5000, 25000, TS890_VFO},
{MHz(7), kHz(7300), TS890_OTHER_TX_MODES, 5000, 100000, TS890_VFO},
{MHz(7), kHz(7300), TS890_AM_TX_MODES, 5000, 25000, TS890_VFO},
{kHz(10100), kHz(10150), TS890_OTHER_TX_MODES, 5000, 100000, TS890_VFO},
{kHz(10100), kHz(10150), TS890_AM_TX_MODES, 5000, 25000, TS890_VFO},
{MHz(14), kHz(14350), TS890_OTHER_TX_MODES, 5000, 100000, TS890_VFO},
{MHz(14), kHz(14350), TS890_AM_TX_MODES, 5000, 25000, TS890_VFO},
{kHz(18068), kHz(18168), TS890_OTHER_TX_MODES, 5000, 100000, TS890_VFO},
{kHz(18068), kHz(18168), TS890_AM_TX_MODES, 5000, 25000, TS890_VFO},
{MHz(21), kHz(21450), TS890_OTHER_TX_MODES, 5000, 100000, TS890_VFO},
{MHz(21), kHz(21450), TS890_AM_TX_MODES, 5000, 25000, TS890_VFO},
{kHz(24890), kHz(24990), TS890_OTHER_TX_MODES, 5000, 100000, TS890_VFO},
{kHz(24890), kHz(24990), TS890_AM_TX_MODES, 5000, 25000, TS890_VFO},
{MHz(28), kHz(29700), TS890_OTHER_TX_MODES, 5000, 100000, TS890_VFO},
{MHz(28), kHz(29700), TS890_AM_TX_MODES, 5000, 25000, TS890_VFO},
{MHz(50), kHz(52000), TS890_OTHER_TX_MODES, 5000, 100000, TS890_VFO},
{MHz(50), kHz(52000), TS890_AM_TX_MODES, 5000, 25000, TS890_VFO},
RIG_FRNG_END,
}, /*!< Transmit frequency range list for ITU region 2 */
.tuning_steps = {
{TS890_ALL_MODES, kHz(1)},
{TS890_ALL_MODES, Hz(2500)},
{TS890_ALL_MODES, kHz(5)},
{TS890_ALL_MODES, Hz(6250)},
{TS890_ALL_MODES, kHz(10)},
{TS890_ALL_MODES, Hz(12500)},
{TS890_ALL_MODES, kHz(15)},
{TS890_ALL_MODES, kHz(20)},
{TS890_ALL_MODES, kHz(25)},
{TS890_ALL_MODES, kHz(30)},
{TS890_ALL_MODES, kHz(100)},
{TS890_ALL_MODES, kHz(500)},
{TS890_ALL_MODES, MHz(1)},
{TS890_ALL_MODES, 0}, /* any tuning step */
RIG_TS_END,
},
/* mode/filter list, remember: order matters! */
.filters = {
{RIG_MODE_SSB, kHz(2.4)},
{RIG_MODE_CW, Hz(200)},
{RIG_MODE_RTTY, Hz(500)},
{RIG_MODE_AM, kHz(9)},
{RIG_MODE_FM, kHz(15)},
RIG_FLT_END,
},
.vfo_ops = TS890_VFO_OPS,
.priv = (void *)& ts890s_priv_caps,
.rig_init = kenwood_init,
.rig_open = kenwood_open,
.rig_cleanup = kenwood_cleanup,
.set_freq = kenwood_set_freq,
.get_freq = kenwood_get_freq,
.set_rit = kenwood_set_rit,
.get_rit = kenwood_get_rit,
.set_xit = kenwood_set_xit,
.get_xit = kenwood_get_xit,
.set_mode = kenwood_set_mode,
.get_mode = kenwood_get_mode,
.set_vfo = kenwood_set_vfo,
.get_vfo = kenwood_get_vfo_if,
.set_split_vfo = kenwood_set_split_vfo,
.get_split_vfo = kenwood_get_split_vfo_if,
.get_ptt = kenwood_get_ptt,
.set_ptt = kenwood_set_ptt,
.get_dcd = kenwood_get_dcd,
.set_powerstat = kenwood_set_powerstat,
.get_powerstat = kenwood_get_powerstat,
.get_info = NULL,
.reset = kenwood_reset,
.set_ant = kenwood_set_ant,
.get_ant = kenwood_get_ant,
.scan = kenwood_scan, /* not working, invalid arguments using rigctl; kenwood_scan does only support on/off and not tone and CTCSS scan */
.has_set_level = TS890_LEVEL_ALL,
.has_get_level = TS890_LEVEL_ALL,
.set_level = kenwood_ts890_set_level,
.get_level = kenwood_ts890_get_level,
.has_get_func = TS890_FUNC_ALL,
.has_set_func = TS890_FUNC_ALL,
.set_func = kenwood_set_func,
.get_func = kenwood_get_func,
};