Porównaj commity

...

3 Commity

5 zmienionych plików z 23 dodań i 5 usunięć

Wyświetl plik

@ -736,6 +736,18 @@ static int netrigctl_open(RIG *rig)
if (!has) { rig->caps->get_conf = NULL; }
}
else if (strcmp(setting, "has_get_ant") == 0)
{
int has = strtol(value, NULL, 0);
if (!has) { rig->caps->get_ant = NULL; }
}
else if (strcmp(setting, "has_set_ant") == 0)
{
int has = strtol(value, NULL, 0);
if (!has) { rig->caps->set_ant = NULL; }
}
#if 0 // for the future
else if (strcmp(setting, "has_set_trn") == 0)
@ -2811,7 +2823,7 @@ struct rig_caps netrigctl_caps =
RIG_MODEL(RIG_MODEL_NETRIGCTL),
.model_name = "NET rigctl",
.mfg_name = "Hamlib",
.version = "20231004.0",
.version = "20231229.0",
.copyright = "LGPL",
.status = RIG_STATUS_STABLE,
.rig_type = RIG_TYPE_OTHER,

Wyświetl plik

@ -2732,8 +2732,9 @@ int newcat_set_split_vfo(RIG *rig, vfo_t vfo, split_t split, vfo_t tx_vfo)
}
if (newcat_60m_exception(rig, rig->state.cache.freqMainA, rig->state.cache.modeMainA))
{
rig_debug(RIG_DEBUG_VERBOSE, "%s: ignoring set_split since we're on 60M exception\n", __func__);
return RIG_OK; // fake the return code to make things happy
rig_debug(RIG_DEBUG_VERBOSE, "%s: force set_split off since we're on 60M exception\n", __func__);
split = RIG_SPLIT_OFF;
//return RIG_OK; // fake the return code to make things happy
}
if (is_ft991)

Wyświetl plik

@ -50,7 +50,7 @@
typedef char ncboolean;
/* shared function version */
#define NEWCAT_VER "20231204"
#define NEWCAT_VER "20231230"
/* Hopefully large enough for future use, 128 chars plus '\0' */
#define NEWCAT_DATA_LEN 129

Wyświetl plik

@ -566,7 +566,7 @@ int rig_sprintf_parm_gran(char *str, int nlen, setting_t parm,
if (RIG_PARM_IS_FLOAT(rig_idx2setting(i)))
{
len += sprintf(str + len,
len += snprintf(str + len, nlen,
"%s(%.g..%.g/%.g) ",
ms,
gran[i].min.f,
@ -578,10 +578,13 @@ int rig_sprintf_parm_gran(char *str, int nlen, setting_t parm,
if (gran[i].step.s)
{
rig_debug(RIG_DEBUG_ERR, "%s: BAND_SELECT?\n", __func__);
if (strcmp(ms,"BANDSELECT")!=0)
{
len += sprintf(str + len,
"%s(%s) ",
ms,
gran[i].step.s);
}
}
}
else

Wyświetl plik

@ -4671,6 +4671,8 @@ declare_proto_rig(dump_state)
// fprintf(fout, "has_get_trn=%d\n", rig->caps->get_trn != NULL);
fprintf(fout, "has_power2mW=%d\n", rig->caps->power2mW != NULL);
fprintf(fout, "has_mW2power=%d\n", rig->caps->mW2power != NULL);
fprintf(fout, "has_get_ant=%d\n", rig->caps->get_ant != NULL);
fprintf(fout, "has_set_ant=%d\n", rig->caps->set_ant != NULL);
fprintf(fout, "timeout=%d\n", rig->caps->timeout);
fprintf(fout, "rig_model=%d\n", rig->caps->rig_model);
fprintf(fout, "rigctld_version=%s\n", hamlib_version2);