Improve SDRCONSOLE behavior

pull/1551/head
Mike Black W9MDB 2024-05-05 16:03:50 -05:00
rodzic 42c900cb8a
commit c2b8f2b4fe
2 zmienionych plików z 15 dodań i 7 usunięć

Wyświetl plik

@ -1115,11 +1115,15 @@ int kenwood_open(RIG *rig)
}
/* driver mismatch */
rig_debug(RIG_DEBUG_VERBOSE,
// SDRCONSOLE identifies as TS-2000 -- even though it's a sub/superset
if (rig->caps->rig_model == RIG_MODEL_SDRCONSOLE && kenwood_id_string_list[i].model != 2014)
{
rig_debug(RIG_DEBUG_VERBOSE,
"%s: not the right driver apparently (found %u, asked for %d, checked %s)\n",
__func__, rig->caps->rig_model,
kenwood_id_string_list[i].model,
rig->caps->model_name);
}
// we continue to search for other matching IDs/models
}

Wyświetl plik

@ -1494,14 +1494,18 @@ int HAMLIB_API rig_open(RIG *rig)
if (skip_init) { return RIG_OK; }
#if defined(HAVE_PTHREAD)
status = morse_data_handler_start(rig);
if (status < 0)
// Some models don't support CW
if (rig->caps->rig_model != RIG_MODEL_SDRCONSOLE)
{
rig_debug(RIG_DEBUG_ERR, "%s: cw_data_handler_start failed: %s\n", __func__,
status = morse_data_handler_start(rig);
if (status < 0)
{
rig_debug(RIG_DEBUG_ERR, "%s: cw_data_handler_start failed: %s\n", __func__,
rigerror(status));
port_close(rp, rp->type.rig);
RETURNFUNC2(status);
port_close(rp, rp->type.rig);
RETURNFUNC2(status);
}
}
#endif