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

Add repeater offset support for many Yaesu newcat rigs and fix FT-991 repeater offset step

pull/436/head
Mikael Nousiainen 2020-11-09 22:18:57 +02:00
rodzic 78b469d193
commit e122955213
10 zmienionych plików z 357 dodań i 36 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
rigs/yaesu/ft1200.c
Wyświetl plik

@ -235,6 +235,8 @@ const struct rig_caps ftdx1200_caps =
.mW2power = newcat_mW2power,
.set_rptr_shift = newcat_set_rptr_shift,
.get_rptr_shift = newcat_get_rptr_shift,
.set_rptr_offs = newcat_set_rptr_offs,
.get_rptr_offs = newcat_get_rptr_offs,
.set_ctcss_tone = newcat_set_ctcss_tone,
.get_ctcss_tone = newcat_get_ctcss_tone,
.set_ctcss_sql = newcat_set_ctcss_sql,

2
rigs/yaesu/ft2000.c
Wyświetl plik

@ -236,6 +236,8 @@ const struct rig_caps ft2000_caps =
.mW2power = newcat_mW2power,
.set_rptr_shift = newcat_set_rptr_shift,
.get_rptr_shift = newcat_get_rptr_shift,
.set_rptr_offs = newcat_set_rptr_offs,
.get_rptr_offs = newcat_get_rptr_offs,
.set_ctcss_tone = newcat_set_ctcss_tone,
.get_ctcss_tone = newcat_get_ctcss_tone,
.set_ctcss_sql = newcat_set_ctcss_sql,

2
rigs/yaesu/ft3000.c
Wyświetl plik

@ -238,6 +238,8 @@ const struct rig_caps ftdx3000_caps =
.mW2power = newcat_mW2power,
.set_rptr_shift = newcat_set_rptr_shift,
.get_rptr_shift = newcat_get_rptr_shift,
.set_rptr_offs = newcat_set_rptr_offs,
.get_rptr_offs = newcat_get_rptr_offs,
.set_ctcss_tone = newcat_set_ctcss_tone,
.get_ctcss_tone = newcat_get_ctcss_tone,
.set_ctcss_sql = newcat_set_ctcss_sql,

10
rigs/yaesu/ft450.c
Wyświetl plik

@ -32,19 +32,13 @@
#include "hamlib/rig.h"
#include "bandplan.h"
#include "serial.h"
#include "misc.h"
#include "yaesu.h"
#include "newcat.h"
#include "ft450.h"
#include "idx_builtin.h"
/*
* ft450 rigs capabilities.
* Also this struct is READONLY!
*
* FT-450 rig capabilities
*/
const struct rig_caps ft450_caps =
{
RIG_MODEL(RIG_MODEL_FT450),
@ -192,6 +186,8 @@ const struct rig_caps ft450_caps =
.mW2power = newcat_mW2power,
.set_rptr_shift = newcat_set_rptr_shift,
.get_rptr_shift = newcat_get_rptr_shift,
.set_rptr_offs = newcat_set_rptr_offs,
.get_rptr_offs = newcat_get_rptr_offs,
.set_ctcss_tone = newcat_set_ctcss_tone,
.get_ctcss_tone = newcat_get_ctcss_tone,
.set_ctcss_sql = newcat_set_ctcss_sql,

2
rigs/yaesu/ft5000.c
Wyświetl plik

@ -233,6 +233,8 @@ const struct rig_caps ftdx5000_caps =
.mW2power = newcat_mW2power,
.set_rptr_shift = newcat_set_rptr_shift,
.get_rptr_shift = newcat_get_rptr_shift,
.set_rptr_offs = newcat_set_rptr_offs,
.get_rptr_offs = newcat_get_rptr_offs,
.set_ctcss_tone = newcat_set_ctcss_tone,
.get_ctcss_tone = newcat_get_ctcss_tone,
.set_ctcss_sql = newcat_set_ctcss_sql,

2
rigs/yaesu/ft891.c
Wyświetl plik

@ -215,6 +215,8 @@ const struct rig_caps ft891_caps =
.mW2power = newcat_mW2power,
.set_rptr_shift = newcat_set_rptr_shift,
.get_rptr_shift = newcat_get_rptr_shift,
.set_rptr_offs = newcat_set_rptr_offs,
.get_rptr_offs = newcat_get_rptr_offs,
.set_ctcss_tone = newcat_set_ctcss_tone,
.get_ctcss_tone = newcat_get_ctcss_tone,
.set_ctcss_sql = newcat_set_ctcss_sql,

2
rigs/yaesu/ft950.c
Wyświetl plik

@ -262,6 +262,8 @@ const struct rig_caps ft950_caps =
.mW2power = newcat_mW2power,
.set_rptr_shift = newcat_set_rptr_shift,
.get_rptr_shift = newcat_get_rptr_shift,
.set_rptr_offs = newcat_set_rptr_offs,
.get_rptr_offs = newcat_get_rptr_offs,
.set_ctcss_tone = newcat_set_ctcss_tone,
.get_ctcss_tone = newcat_get_ctcss_tone,
.set_ctcss_sql = newcat_set_ctcss_sql,

4
rigs/yaesu/ft991.c
Wyświetl plik

@ -207,8 +207,8 @@ const struct rig_caps ft991_caps =
.mW2power = newcat_mW2power,
.set_rptr_shift = newcat_set_rptr_shift,
.get_rptr_shift = newcat_get_rptr_shift,
.set_rptr_offs = newcat_set_rptr_offs, /*ve9gj */
.get_rptr_offs = newcat_get_rptr_offs, /*ve9gj */
.set_rptr_offs = newcat_set_rptr_offs,
.get_rptr_offs = newcat_get_rptr_offs,
.set_ctcss_tone = ft991_set_ctcss_tone,
.get_ctcss_tone = ft991_get_ctcss_tone,
.set_dcs_code = ft991_set_dcs_code,

2
rigs/yaesu/ftdx101.c
Wyświetl plik

@ -229,6 +229,8 @@ const struct rig_caps ftdx101d_caps =
.mW2power = newcat_mW2power,
.set_rptr_shift = newcat_set_rptr_shift,
.get_rptr_shift = newcat_get_rptr_shift,
.set_rptr_offs = newcat_set_rptr_offs,
.get_rptr_offs = newcat_get_rptr_offs,
.set_ctcss_tone = newcat_set_ctcss_tone,
.get_ctcss_tone = newcat_get_ctcss_tone,
.set_ctcss_sql = newcat_set_ctcss_sql,

365
rigs/yaesu/newcat.c
Wyświetl plik

@ -1492,21 +1492,91 @@ int newcat_set_rptr_offs(RIG *rig, vfo_t vfo, shortfreq_t offs)
{
struct newcat_priv_data *priv = (struct newcat_priv_data *)rig->state.priv;
int err;
char command[16] ;
freq_t freq;
char command[32];
freq_t freq = 0;
rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
if (newcat_is_rig(rig, RIG_MODEL_FT991))
err = newcat_get_freq(rig, vfo, &freq); // Need to get freq to determine band
if (err < 0)
{
freq = 0;
err = newcat_get_freq(rig, vfo, &freq); // Need to get freq to determine band
return err;
}
if (err < 0)
if (is_ft450)
{
strcpy(command, "EX050");
// Step size is 100 kHz
offs /= 100000;
snprintf(priv->cmd_str, sizeof(priv->cmd_str), "%s%03li%c", command, offs, cat_term);
}
else if (is_ft2000)
{
if (freq >= 28000000 && freq <= 29700000)
{
return err;
strcpy(command, "EX076");
}
else if (freq >= 50000000 && freq <= 54000000)
{
strcpy(command, "EX077");
}
else
{
// only valid on 10m and 6m bands
return -RIG_EINVAL;
}
// Step size is 1 kHz
offs /= 1000;
snprintf(priv->cmd_str, sizeof(priv->cmd_str), "%s%04li%c", command, offs, cat_term);
}
else if (is_ft950)
{
if (freq >= 28000000 && freq <= 29700000)
{
strcpy(command, "EX057");
}
else if (freq >= 50000000 && freq <= 54000000)
{
strcpy(command, "EX058");
}
else
{
// only valid on 10m and 6m bands
return -RIG_EINVAL;
}
// Step size is 1 kHz
offs /= 1000;
snprintf(priv->cmd_str, sizeof(priv->cmd_str), "%s%04li%c", command, offs, cat_term);
}
else if (is_ft891)
{
if (freq >= 28000000 && freq <= 29700000)
{
strcpy(command, "EX0904");
}
else if (freq >= 50000000 && freq <= 54000000)
{
strcpy(command, "EX0905");
}
else
{
// only valid on 10m and 6m bands
return -RIG_EINVAL;
}
// Step size is 1 kHz
offs /= 1000;
snprintf(priv->cmd_str, sizeof(priv->cmd_str), "%s%04li%c", command, offs, cat_term);
}
else if (is_ft991)
{
if (freq >= 28000000 && freq <= 29700000)
{
strcpy(command, "EX080");
@ -1526,15 +1596,104 @@ int newcat_set_rptr_offs(RIG *rig, vfo_t vfo, shortfreq_t offs)
else
{
// only valid on 10m to 70cm bands
return RIG_OK;
return -RIG_EINVAL;
}
snprintf(priv->cmd_str, sizeof(priv->cmd_str), "%s%04li%c", command, offs,
cat_term);
return newcat_set_cmd(rig);
// Step size is 1 kHz
offs /= 1000;
snprintf(priv->cmd_str, sizeof(priv->cmd_str), "%s%04li%c", command, offs, cat_term);
}
else if (is_ftdx1200)
{
if (freq >= 28000000 && freq <= 29700000)
{
strcpy(command, "EX087");
}
else if (freq >= 50000000 && freq <= 54000000)
{
strcpy(command, "EX088");
}
else
{
// only valid on 10m and 6m bands
return -RIG_EINVAL;
}
// Step size is 1 kHz
offs /= 1000;
snprintf(priv->cmd_str, sizeof(priv->cmd_str), "%s%04li%c", command, offs, cat_term);
}
else if (is_ftdx3000)
{
if (freq >= 28000000 && freq <= 29700000)
{
strcpy(command, "EX086");
}
else if (freq >= 50000000 && freq <= 54000000)
{
strcpy(command, "EX087");
}
else
{
// only valid on 10m and 6m bands
return -RIG_EINVAL;
}
// TODO: Confirm: Step size is 1 kHz or 10 kHz -- CAT documentation is difficult to interpret
offs /= 1000;
snprintf(priv->cmd_str, sizeof(priv->cmd_str), "%s%04li%c", command, offs, cat_term);
}
else if (is_ftdx5000)
{
if (freq >= 28000000 && freq <= 29700000)
{
strcpy(command, "EX081");
}
else if (freq >= 50000000 && freq <= 54000000)
{
strcpy(command, "EX082");
}
else
{
// only valid on 10m and 6m bands
return -RIG_EINVAL;
}
// TODO: Confirm: Step size is 1 kHz or 10 kHz -- CAT documentation is difficult to interpret
offs /= 1000;
snprintf(priv->cmd_str, sizeof(priv->cmd_str), "%s%04li%c", command, offs, cat_term);
}
else if (is_ftdx101)
{
if (freq >= 28000000 && freq <= 29700000)
{
strcpy(command, "EX010315");
}
else if (freq >= 50000000 && freq <= 54000000)
{
strcpy(command, "EX010316");
}
else
{
// only valid on 10m and 6m bands
return -RIG_EINVAL;
}
// Step size is 1 kHz
offs /= 1000;
snprintf(priv->cmd_str, sizeof(priv->cmd_str), "%s%04li%c", command, offs, cat_term);
}
else
{
return -RIG_ENAVAIL;
}
return -RIG_ENAVAIL;
return newcat_set_cmd(rig);
}
@ -1544,20 +1703,86 @@ int newcat_get_rptr_offs(RIG *rig, vfo_t vfo, shortfreq_t *offs)
int err;
int ret_data_len;
char *retoffs;
freq_t freq;
freq_t freq = 0;
int step;
rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
if (newcat_is_rig(rig, RIG_MODEL_FT991))
err = newcat_get_freq(rig, vfo, &freq); // Need to get freq to determine band
if (err < 0)
{
freq = 0;
err = newcat_get_freq(rig, vfo, &freq); // Need to get freq to determine band
return err;
}
if (err < 0)
if (is_ft450)
{
snprintf(priv->cmd_str, sizeof(priv->cmd_str), "EX050%c", cat_term);
// Step size is 100 kHz
step = 100000;
}
else if (is_ft2000)
{
if (freq >= 28000000 && freq <= 29700000)
{
return err;
snprintf(priv->cmd_str, sizeof(priv->cmd_str), "EX076%c", cat_term);
}
else if (freq >= 50000000 && freq <= 54000000)
{
snprintf(priv->cmd_str, sizeof(priv->cmd_str), "EX077%c", cat_term);
}
else
{
// only valid on 10m and 6m bands
*offs = 0;
return RIG_OK;
}
// Step size is 1 kHz
step = 1000;
}
else if (is_ft950)
{
if (freq >= 28000000 && freq <= 29700000)
{
snprintf(priv->cmd_str, sizeof(priv->cmd_str), "EX057%c", cat_term);
}
else if (freq >= 50000000 && freq <= 54000000)
{
snprintf(priv->cmd_str, sizeof(priv->cmd_str), "EX058%c", cat_term);
}
else
{
// only valid on 10m and 6m bands
*offs = 0;
return RIG_OK;
}
// Step size is 1 kHz
step = 1000;
}
else if (is_ft891)
{
if (freq >= 28000000 && freq <= 29700000)
{
snprintf(priv->cmd_str, sizeof(priv->cmd_str), "EX0904%c", cat_term);
}
else if (freq >= 50000000 && freq <= 54000000)
{
snprintf(priv->cmd_str, sizeof(priv->cmd_str), "EX0905%c", cat_term);
}
else
{
// only valid on 10m and 6m bands
*offs = 0;
return RIG_OK;
}
// Step size is 1 kHz
step = 1000;
}
else if (is_ft991)
{
if (freq >= 28000000 && freq <= 29700000)
{
snprintf(priv->cmd_str, sizeof(priv->cmd_str), "EX080%c", cat_term);
@ -1576,28 +1801,114 @@ int newcat_get_rptr_offs(RIG *rig, vfo_t vfo, shortfreq_t *offs)
}
else
{
*offs = 0; // only valid on 10m to 70cm bands
// only valid on 10m to 70cm bands
*offs = 0;
return RIG_OK;
}
if (RIG_OK != (err = newcat_get_cmd(rig)))
// Step size is 1 kHz
step = 1000;
}
else if (is_ftdx1200)
{
if (freq >= 28000000 && freq <= 29700000)
{
return err;
snprintf(priv->cmd_str, sizeof(priv->cmd_str), "EX087%c", cat_term);
}
else if (freq >= 50000000 && freq <= 54000000)
{
snprintf(priv->cmd_str, sizeof(priv->cmd_str), "EX088%c", cat_term);
}
else
{
// only valid on 10m and 6m bands
*offs = 0;
return RIG_OK;
}
ret_data_len = strlen(priv->ret_data);
// Step size is 1 kHz
step = 1000;
}
else if (is_ftdx3000)
{
if (freq >= 28000000 && freq <= 29700000)
{
snprintf(priv->cmd_str, sizeof(priv->cmd_str), "EX086%c", cat_term);
}
else if (freq >= 50000000 && freq <= 54000000)
{
snprintf(priv->cmd_str, sizeof(priv->cmd_str), "EX087%c", cat_term);
}
else
{
// only valid on 10m and 6m bands
*offs = 0;
return RIG_OK;
}
/* skip command */
retoffs = priv->ret_data + strlen(priv->cmd_str) - 1;
/* chop term */
priv->ret_data[ret_data_len - 1] = '\0';
*offs = atoi(retoffs);
// TODO: Confirm: Step size is 1 kHz or 10 kHz -- CAT documentation is difficult to interpret
step = 1000;
}
else if (is_ftdx5000)
{
if (freq >= 28000000 && freq <= 29700000)
{
snprintf(priv->cmd_str, sizeof(priv->cmd_str), "EX081%c", cat_term);
}
else if (freq >= 50000000 && freq <= 54000000)
{
snprintf(priv->cmd_str, sizeof(priv->cmd_str), "EX082%c", cat_term);
}
else
{
// only valid on 10m and 6m bands
*offs = 0;
return RIG_OK;
}
// TODO: Confirm: Step size is 1 kHz or 10 kHz -- CAT documentation is difficult to interpret
step = 1000;
}
else if (is_ftdx101)
{
if (freq >= 28000000 && freq <= 29700000)
{
snprintf(priv->cmd_str, sizeof(priv->cmd_str), "EX010315%c", cat_term);
}
else if (freq >= 50000000 && freq <= 54000000)
{
snprintf(priv->cmd_str, sizeof(priv->cmd_str), "EX010316%c", cat_term);
}
else
{
// only valid on 10m and 6m bands
*offs = 0;
return RIG_OK;
}
// Step size is 1 kHz
step = 1000;
}
else
{
return -RIG_ENAVAIL;
}
err = newcat_get_cmd(rig);
if (err != RIG_OK)
{
return err;
}
ret_data_len = strlen(priv->ret_data);
/* skip command */
retoffs = priv->ret_data + strlen(priv->cmd_str) - 1;
/* chop term */
priv->ret_data[ret_data_len - 1] = '\0';
*offs = atoi(retoffs) * step;
return RIG_OK;
}