kopia lustrzana https://github.com/Hamlib/Hamlib
Merge branch 'master' of https://github.com/Hamlib/Hamlib
commit
7ac58fcd23
|
@ -283,6 +283,14 @@ int elecraft_open(RIG *rig)
|
||||||
it's not supported */
|
it's not supported */
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// For rigs like K3X vfo emulation need to set VFO_A to start
|
||||||
|
vfo_t vfo;
|
||||||
|
rig_get_vfo(rig, &vfo);
|
||||||
|
if (vfo != RIG_VFO_A && vfo != RIG_VFO_B)
|
||||||
|
{
|
||||||
|
rig_set_vfo(rig, RIG_VFO_A);
|
||||||
|
}
|
||||||
|
|
||||||
return RIG_OK;
|
return RIG_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -309,7 +309,7 @@ th_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
|
||||||
|
|
||||||
kmode = rmode2kenwood(mode, priv->mode_table);
|
kmode = rmode2kenwood(mode, priv->mode_table);
|
||||||
|
|
||||||
if (kmode == -1)
|
if (kmode < 0)
|
||||||
{
|
{
|
||||||
rig_debug(RIG_DEBUG_WARN, "%s: Unsupported Mode value '%s'\n",
|
rig_debug(RIG_DEBUG_WARN, "%s: Unsupported Mode value '%s'\n",
|
||||||
__func__, rig_strrmode(mode));
|
__func__, rig_strrmode(mode));
|
||||||
|
|
|
@ -470,7 +470,7 @@ int thd74_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
|
||||||
{
|
{
|
||||||
kmode = rmode2kenwood(mode, priv->mode_table);
|
kmode = rmode2kenwood(mode, priv->mode_table);
|
||||||
|
|
||||||
if (kmode == -1)
|
if (kmode < 0)
|
||||||
{
|
{
|
||||||
rig_debug(RIG_DEBUG_WARN, "%s: Unsupported Mode value '%s'\n",
|
rig_debug(RIG_DEBUG_WARN, "%s: Unsupported Mode value '%s'\n",
|
||||||
__func__, rig_strrmode(mode));
|
__func__, rig_strrmode(mode));
|
||||||
|
|
|
@ -776,6 +776,8 @@ static void *read_device(void *p)
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
#if defined(HAVE_PTHREAD) && defined(HAVE_SOCKETPAIR) && defined(HAVE_SELECT)
|
||||||
//
|
//
|
||||||
// This is the right place to ensure that a heartbeat is sent
|
// This is the right place to ensure that a heartbeat is sent
|
||||||
// to the microham device regularly (15 sec delay is the maximum
|
// to the microham device regularly (15 sec delay is the maximum
|
||||||
|
@ -785,6 +787,7 @@ static void *read_device(void *p)
|
||||||
{
|
{
|
||||||
heartbeat();
|
heartbeat();
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
//
|
//
|
||||||
// Wait for something to arrive, either from the microham device
|
// Wait for something to arrive, either from the microham device
|
||||||
|
|
Ładowanie…
Reference in New Issue