kopia lustrzana https://github.com/Hamlib/Hamlib
Get more firmware info for Elecraft K3
rodzic
1e93364f7d
commit
8ebadb3b7d
|
@ -319,8 +319,42 @@ int elecraft_open(RIG *rig)
|
||||||
|
|
||||||
if (err != RIG_OK)
|
if (err != RIG_OK)
|
||||||
{
|
{
|
||||||
|
rig_debug(RIG_DEBUG_ERR, "%s: Firmware RVM failed\n", __func__);
|
||||||
return err;
|
return err;
|
||||||
}
|
}
|
||||||
|
err = elecraft_get_firmware_revision_level(rig, "RVD", priv->fw_rev,
|
||||||
|
(sizeof(k3_fw_rev) / sizeof(k3_fw_rev[0])));
|
||||||
|
|
||||||
|
if (err != RIG_OK)
|
||||||
|
{
|
||||||
|
rig_debug(RIG_DEBUG_ERR, "%s: Firmware RVD failed\n", __func__);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (priv->is_k3)
|
||||||
|
{
|
||||||
|
err = elecraft_get_firmware_revision_level(rig, "RVA", priv->fw_rev,
|
||||||
|
(sizeof(k3_fw_rev) / sizeof(k3_fw_rev[0])));
|
||||||
|
|
||||||
|
if (err != RIG_OK)
|
||||||
|
{
|
||||||
|
rig_debug(RIG_DEBUG_ERR, "%s: Firmware RVA failed\n", __func__);
|
||||||
|
}
|
||||||
|
err = elecraft_get_firmware_revision_level(rig, "RVR", priv->fw_rev,
|
||||||
|
(sizeof(k3_fw_rev) / sizeof(k3_fw_rev[0])));
|
||||||
|
|
||||||
|
if (err != RIG_OK)
|
||||||
|
{
|
||||||
|
rig_debug(RIG_DEBUG_ERR, "%s: Firmware RVR failed\n", __func__);
|
||||||
|
}
|
||||||
|
err = elecraft_get_firmware_revision_level(rig, "RVF", priv->fw_rev,
|
||||||
|
(sizeof(k3_fw_rev) / sizeof(k3_fw_rev[0])));
|
||||||
|
|
||||||
|
if (err != RIG_OK)
|
||||||
|
{
|
||||||
|
rig_debug(RIG_DEBUG_ERR, "%s: Firmware RVF failed\n", __func__);
|
||||||
|
return err;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
@ -486,6 +520,17 @@ int elecraft_get_firmware_revision_level(RIG *rig, const char *cmd,
|
||||||
int err;
|
int err;
|
||||||
char *bufptr;
|
char *bufptr;
|
||||||
char buf[KENWOOD_MAX_BUF_LEN];
|
char buf[KENWOOD_MAX_BUF_LEN];
|
||||||
|
char rvp = cmd[3];
|
||||||
|
char *rv = "UNK";
|
||||||
|
switch(rvp)
|
||||||
|
{
|
||||||
|
case 'M': rv = "MCU";break;
|
||||||
|
case 'D': rv = "DSP";break;
|
||||||
|
case 'A': rv = "AUX";break;
|
||||||
|
case 'R': rv = "DVR";break;
|
||||||
|
case 'F': rv = "FPF";break;
|
||||||
|
default: rv = "???";break;
|
||||||
|
}
|
||||||
|
|
||||||
rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
|
rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
|
||||||
|
|
||||||
|
@ -519,8 +564,8 @@ int elecraft_get_firmware_revision_level(RIG *rig, const char *cmd,
|
||||||
/* Copy out */
|
/* Copy out */
|
||||||
strncpy(fw_rev, bufptr, fw_rev_sz - 1);
|
strncpy(fw_rev, bufptr, fw_rev_sz - 1);
|
||||||
|
|
||||||
rig_debug(RIG_DEBUG_VERBOSE, "%s: Elecraft firmware revision is %s\n", __func__,
|
rig_debug(RIG_DEBUG_VERBOSE, "%s: Elecraft %s firmware revision is %s\n", __func__,
|
||||||
fw_rev);
|
rv, fw_rev);
|
||||||
|
|
||||||
return RIG_OK;
|
return RIG_OK;
|
||||||
}
|
}
|
||||||
|
|
Ładowanie…
Reference in New Issue