mirror of
https://github.com/Hamlib/Hamlib.git
synced 2024-09-22 10:57:21 +00:00
Move kenwood get_id before firmware check and only when first get-id fails
https://github.com/Hamlib/Hamlib/issues/230
This commit is contained in:
parent
d5d6c55439
commit
d1677a71d3
@ -703,9 +703,14 @@ int kenwood_open(RIG *rig)
|
||||
{
|
||||
// Ensure rig is on
|
||||
rig_set_powerstat(rig, 1);
|
||||
/* Try get id again */
|
||||
err = kenwood_get_id(rig, id);
|
||||
if (RIG_OK != err)
|
||||
{
|
||||
rig_debug(RIG_DEBUG_ERR, "%s: no response to get_id from rig...contintuing anyways.\n", __func__);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if (RIG_IS_TS590S)
|
||||
{
|
||||
/* we need the firmware version for these rigs to deal with f/w defects */
|
||||
@ -739,9 +744,6 @@ int kenwood_open(RIG *rig)
|
||||
priv->fw_rev);
|
||||
}
|
||||
|
||||
/* get id in buffer, will be null terminated */
|
||||
err = kenwood_get_id(rig, id);
|
||||
|
||||
if (!RIG_IS_XG3 && -RIG_ETIMEOUT == err)
|
||||
{
|
||||
/* Some Kenwood emulations have no ID command response :(
|
||||
|
@ -27,7 +27,7 @@
|
||||
#include <string.h>
|
||||
#include "token.h"
|
||||
|
||||
#define BACKEND_VER "20200429"
|
||||
#define BACKEND_VER "20200501"
|
||||
|
||||
#define EOM_KEN ';'
|
||||
#define EOM_TH '\r'
|
||||
|
Loading…
Reference in New Issue
Block a user