kopia lustrzana https://github.com/Hamlib/Hamlib
Ensure all Icom rigs have their own BACKEND version
rodzic
ac8fbf2506
commit
9620cfc3d0
|
@ -49,7 +49,7 @@ const struct rig_caps ic1275_caps =
|
|||
.rig_model = RIG_MODEL_IC1275,
|
||||
.model_name = "IC-1275",
|
||||
.mfg_name = "Icom",
|
||||
.version = BACKEND_VER,
|
||||
.version = BACKEND_VER ".0",
|
||||
.copyright = "LGPL",
|
||||
.status = RIG_STATUS_BETA,
|
||||
.rig_type = RIG_TYPE_TRANSCEIVER,
|
||||
|
|
|
@ -58,7 +58,7 @@ const struct rig_caps ic271_caps =
|
|||
.rig_model = RIG_MODEL_IC271,
|
||||
.model_name = "IC-271",
|
||||
.mfg_name = "Icom",
|
||||
.version = BACKEND_VER,
|
||||
.version = BACKEND_VER ".0",
|
||||
.copyright = "LGPL",
|
||||
.status = RIG_STATUS_UNTESTED,
|
||||
.rig_type = RIG_TYPE_TRANSCEIVER,
|
||||
|
|
|
@ -69,7 +69,7 @@ const struct rig_caps ic2730_caps =
|
|||
.rig_model = RIG_MODEL_IC2730,
|
||||
.model_name = "IC-2730",
|
||||
.mfg_name = "Icom",
|
||||
.version = BACKEND_VER,
|
||||
.version = BACKEND_VER ".0",
|
||||
.copyright = "LGPL",
|
||||
.status = RIG_STATUS_UNTESTED,
|
||||
.rig_type = RIG_TYPE_MOBILE,
|
||||
|
|
|
@ -57,7 +57,7 @@ const struct rig_caps ic471_caps =
|
|||
.rig_model = RIG_MODEL_IC471,
|
||||
.model_name = "IC-471",
|
||||
.mfg_name = "Icom",
|
||||
.version = BACKEND_VER,
|
||||
.version = BACKEND_VER ".0",
|
||||
.copyright = "LGPL",
|
||||
.status = RIG_STATUS_UNTESTED,
|
||||
.rig_type = RIG_TYPE_TRANSCEIVER,
|
||||
|
|
|
@ -89,7 +89,7 @@ const struct rig_caps ic703_caps =
|
|||
.rig_model = RIG_MODEL_IC703,
|
||||
.model_name = "IC-703",
|
||||
.mfg_name = "Icom",
|
||||
.version = BACKEND_VER,
|
||||
.version = BACKEND_VER ".0",
|
||||
.copyright = "LGPL",
|
||||
.status = RIG_STATUS_UNTESTED,
|
||||
.rig_type = RIG_TYPE_MOBILE,
|
||||
|
|
|
@ -63,7 +63,7 @@ const struct rig_caps ic707_caps =
|
|||
.rig_model = RIG_MODEL_IC707,
|
||||
.model_name = "IC-707",
|
||||
.mfg_name = "Icom",
|
||||
.version = BACKEND_VER,
|
||||
.version = BACKEND_VER ".0",
|
||||
.copyright = "LGPL",
|
||||
.status = RIG_STATUS_UNTESTED,
|
||||
.rig_type = RIG_TYPE_TRANSCEIVER,
|
||||
|
|
|
@ -179,7 +179,7 @@ const struct rig_caps ic7100_caps =
|
|||
.rig_model = RIG_MODEL_IC7100,
|
||||
.model_name = "IC-7100",
|
||||
.mfg_name = "Icom",
|
||||
.version = BACKEND_VER,
|
||||
.version = BACKEND_VER ".0",
|
||||
.copyright = "LGPL",
|
||||
.status = RIG_STATUS_UNTESTED,
|
||||
.rig_type = RIG_TYPE_TRANSCEIVER,
|
||||
|
|
|
@ -119,7 +119,7 @@ const struct rig_caps ic7200_caps =
|
|||
.rig_model = RIG_MODEL_IC7200,
|
||||
.model_name = "IC-7200",
|
||||
.mfg_name = "Icom",
|
||||
.version = BACKEND_VER,
|
||||
.version = BACKEND_VER ".0",
|
||||
.copyright = "LGPL",
|
||||
.status = RIG_STATUS_BETA,
|
||||
.rig_type = RIG_TYPE_TRANSCEIVER,
|
||||
|
|
|
@ -63,7 +63,7 @@ const struct rig_caps ic726_caps =
|
|||
.rig_model = RIG_MODEL_IC726,
|
||||
.model_name = "IC-726",
|
||||
.mfg_name = "Icom",
|
||||
.version = BACKEND_VER,
|
||||
.version = BACKEND_VER ".0",
|
||||
.copyright = "LGPL",
|
||||
.status = RIG_STATUS_STABLE,
|
||||
.rig_type = RIG_TYPE_TRANSCEIVER,
|
||||
|
|
|
@ -63,7 +63,7 @@ const struct rig_caps ic728_caps =
|
|||
.rig_model = RIG_MODEL_IC728,
|
||||
.model_name = "IC-728",
|
||||
.mfg_name = "Icom",
|
||||
.version = BACKEND_VER,
|
||||
.version = BACKEND_VER ".0",
|
||||
.copyright = "LGPL",
|
||||
.status = RIG_STATUS_UNTESTED,
|
||||
.rig_type = RIG_TYPE_TRANSCEIVER,
|
||||
|
|
|
@ -67,7 +67,7 @@ const struct rig_caps ic736_caps =
|
|||
.rig_model = RIG_MODEL_IC736,
|
||||
.model_name = "IC-736",
|
||||
.mfg_name = "Icom",
|
||||
.version = BACKEND_VER,
|
||||
.version = BACKEND_VER ".0",
|
||||
.copyright = "LGPL",
|
||||
.status = RIG_STATUS_UNTESTED,
|
||||
.rig_type = RIG_TYPE_TRANSCEIVER,
|
||||
|
|
|
@ -63,7 +63,7 @@ const struct rig_caps ic737_caps =
|
|||
.rig_model = RIG_MODEL_IC737,
|
||||
.model_name = "IC-737",
|
||||
.mfg_name = "Icom",
|
||||
.version = BACKEND_VER,
|
||||
.version = BACKEND_VER ".0",
|
||||
.copyright = "LGPL",
|
||||
.status = RIG_STATUS_UNTESTED,
|
||||
.rig_type = RIG_TYPE_TRANSCEIVER,
|
||||
|
|
|
@ -67,7 +67,7 @@ const struct rig_caps ic738_caps =
|
|||
.rig_model = RIG_MODEL_IC738,
|
||||
.model_name = "IC-738",
|
||||
.mfg_name = "Icom",
|
||||
.version = BACKEND_VER,
|
||||
.version = BACKEND_VER ".0",
|
||||
.copyright = "LGPL",
|
||||
.status = RIG_STATUS_UNTESTED,
|
||||
.rig_type = RIG_TYPE_TRANSCEIVER,
|
||||
|
|
|
@ -113,7 +113,7 @@ const struct rig_caps ic7410_caps =
|
|||
.rig_model = RIG_MODEL_IC7410,
|
||||
.model_name = "IC-7410",
|
||||
.mfg_name = "Icom",
|
||||
.version = BACKEND_VER,
|
||||
.version = BACKEND_VER ".0",
|
||||
.copyright = "LGPL",
|
||||
.status = RIG_STATUS_UNTESTED,
|
||||
.rig_type = RIG_TYPE_TRANSCEIVER,
|
||||
|
|
|
@ -409,7 +409,7 @@ const struct rig_caps ic746pro_caps =
|
|||
.rig_model = RIG_MODEL_IC746PRO,
|
||||
.model_name = "IC-746PRO",
|
||||
.mfg_name = "Icom",
|
||||
.version = BACKEND_VER,
|
||||
.version = BACKEND_VER ".0",
|
||||
.copyright = "LGPL",
|
||||
.status = RIG_STATUS_STABLE,
|
||||
.rig_type = RIG_TYPE_TRANSCEIVER,
|
||||
|
|
|
@ -296,7 +296,7 @@ const struct rig_caps ic756pro_caps =
|
|||
.rig_model = RIG_MODEL_IC756PRO,
|
||||
.model_name = "IC-756PRO",
|
||||
.mfg_name = "Icom",
|
||||
.version = BACKEND_VER,
|
||||
.version = BACKEND_VER ".0",
|
||||
.copyright = "LGPL",
|
||||
.status = RIG_STATUS_UNTESTED,
|
||||
.rig_type = RIG_TYPE_TRANSCEIVER,
|
||||
|
@ -527,7 +527,7 @@ const struct rig_caps ic756pro2_caps =
|
|||
.rig_model = RIG_MODEL_IC756PROII,
|
||||
.model_name = "IC-756PROII",
|
||||
.mfg_name = "Icom",
|
||||
.version = BACKEND_VER,
|
||||
.version = BACKEND_VER ".0",
|
||||
.copyright = "LGPL",
|
||||
.status = RIG_STATUS_ALPHA,
|
||||
.rig_type = RIG_TYPE_TRANSCEIVER,
|
||||
|
|
|
@ -159,7 +159,7 @@ const struct rig_caps ic7600_caps =
|
|||
.rig_model = RIG_MODEL_IC7600,
|
||||
.model_name = "IC-7600",
|
||||
.mfg_name = "Icom",
|
||||
.version = BACKEND_VER,
|
||||
.version = BACKEND_VER ".0",
|
||||
.copyright = "LGPL",
|
||||
.status = RIG_STATUS_BETA,
|
||||
.rig_type = RIG_TYPE_TRANSCEIVER,
|
||||
|
|
|
@ -166,7 +166,7 @@ const struct rig_caps ic7610_caps =
|
|||
.rig_model = RIG_MODEL_IC7610,
|
||||
.model_name = "IC-7610",
|
||||
.mfg_name = "Icom",
|
||||
.version = BACKEND_VER,
|
||||
.version = BACKEND_VER ".0",
|
||||
.copyright = "LGPL",
|
||||
.status = RIG_STATUS_UNTESTED,
|
||||
.rig_type = RIG_TYPE_TRANSCEIVER,
|
||||
|
|
|
@ -63,7 +63,7 @@ const struct rig_caps ic765_caps =
|
|||
.rig_model = RIG_MODEL_IC765,
|
||||
.model_name = "IC-765",
|
||||
.mfg_name = "Icom",
|
||||
.version = BACKEND_VER,
|
||||
.version = BACKEND_VER ".0",
|
||||
.copyright = "LGPL",
|
||||
.status = RIG_STATUS_STABLE,
|
||||
.rig_type = RIG_TYPE_TRANSCEIVER,
|
||||
|
|
|
@ -73,7 +73,7 @@ const struct rig_caps ic78_caps =
|
|||
.rig_model = RIG_MODEL_IC78,
|
||||
.model_name = "IC-78",
|
||||
.mfg_name = "Icom",
|
||||
.version = BACKEND_VER,
|
||||
.version = BACKEND_VER ".0",
|
||||
.copyright = "LGPL",
|
||||
.status = RIG_STATUS_UNTESTED,
|
||||
.rig_type = RIG_TYPE_TRANSCEIVER,
|
||||
|
|
|
@ -59,7 +59,7 @@ const struct rig_caps ic820h_caps =
|
|||
.rig_model = RIG_MODEL_IC820,
|
||||
.model_name = "IC-820H",
|
||||
.mfg_name = "Icom",
|
||||
.version = BACKEND_VER,
|
||||
.version = BACKEND_VER ".0",
|
||||
.copyright = "LGPL",
|
||||
.status = RIG_STATUS_ALPHA,
|
||||
.rig_type = RIG_TYPE_TRANSCEIVER,
|
||||
|
|
|
@ -59,7 +59,7 @@ const struct rig_caps ic821h_caps =
|
|||
.rig_model = RIG_MODEL_IC821H,
|
||||
.model_name = "IC-821H",
|
||||
.mfg_name = "Icom",
|
||||
.version = BACKEND_VER,
|
||||
.version = BACKEND_VER ".0",
|
||||
.copyright = "LGPL",
|
||||
.status = RIG_STATUS_ALPHA,
|
||||
.rig_type = RIG_TYPE_TRANSCEIVER,
|
||||
|
|
|
@ -101,7 +101,7 @@ const struct rig_caps ic92d_caps =
|
|||
.rig_model = RIG_MODEL_IC92D,
|
||||
.model_name = "IC-92D", /* IC-E92D/IC-92AD */
|
||||
.mfg_name = "Icom",
|
||||
.version = BACKEND_VER,
|
||||
.version = BACKEND_VER ".0",
|
||||
.copyright = "LGPL",
|
||||
.status = RIG_STATUS_UNTESTED,
|
||||
.rig_type = RIG_TYPE_HANDHELD,
|
||||
|
|
|
@ -54,7 +54,7 @@ const struct rig_caps ic970_caps =
|
|||
.rig_model = RIG_MODEL_IC970,
|
||||
.model_name = "IC-970",
|
||||
.mfg_name = "Icom",
|
||||
.version = BACKEND_VER,
|
||||
.version = BACKEND_VER ".0",
|
||||
.copyright = "LGPL",
|
||||
.status = RIG_STATUS_UNTESTED,
|
||||
.rig_type = RIG_TYPE_TRANSCEIVER,
|
||||
|
|
12
icom/icom.c
12
icom/icom.c
|
@ -1442,7 +1442,7 @@ int icom_set_vfo(RIG *rig, vfo_t vfo)
|
|||
return -RIG_EINVAL;
|
||||
}
|
||||
|
||||
if ((vfo == RIG_VFO_MAIN || vfo == RIG_VFO_MAIN) && !VFO_HAS_MAIN_SUB)
|
||||
if ((vfo == RIG_VFO_MAIN || vfo == RIG_VFO_SUB) && !VFO_HAS_MAIN_SUB)
|
||||
{
|
||||
rig_debug(RIG_DEBUG_ERR, "%s: Rig does not have VFO Main/Sub?\n", __func__);
|
||||
return -RIG_EINVAL;
|
||||
|
@ -5099,12 +5099,18 @@ static int set_vfo_curr(RIG *rig, vfo_t vfo, vfo_t curr_vfo)
|
|||
rig_debug(RIG_DEBUG_TRACE, "%s: vfo=%s, curr_vfo=%s\n", __func__,
|
||||
rig_strvfo(vfo), rig_strvfo(curr_vfo));
|
||||
|
||||
// first time we will set default to VFOA
|
||||
// first time we will set default to VFOA or Main as
|
||||
// So if you ask for frequency or such without setting VFO first you'll get VFOA
|
||||
if (priv->curr_vfo == RIG_VFO_NONE && vfo == RIG_VFO_CURR)
|
||||
{
|
||||
rig_debug(RIG_DEBUG_TRACE, "%s: setting default as VFOA\n", __func__);
|
||||
retval = rig_set_vfo(rig, RIG_VFO_A); // we'll default to VFOA in this case
|
||||
if (VFO_HAS_MAIN_SUB_ONLY)
|
||||
{
|
||||
retval = rig_set_vfo(rig, RIG_VFO_MAIN); // we'll default to Main in this case
|
||||
}
|
||||
else {
|
||||
retval = rig_set_vfo(rig, RIG_VFO_A); // we'll default to VFOA for all others
|
||||
}
|
||||
|
||||
if (retval != RIG_OK) { return retval; }
|
||||
|
||||
|
|
|
@ -30,7 +30,7 @@
|
|||
#include <sys/time.h>
|
||||
#endif
|
||||
|
||||
#define BACKEND_VER "0.11"
|
||||
#define BACKEND_VER "0.12"
|
||||
|
||||
/*
|
||||
* defines used by comp_cal_str in rig.c
|
||||
|
|
|
@ -60,7 +60,7 @@ const struct rig_caps icr10_caps =
|
|||
.rig_model = RIG_MODEL_ICR10,
|
||||
.model_name = "IC-R10",
|
||||
.mfg_name = "Icom",
|
||||
.version = BACKEND_VER,
|
||||
.version = BACKEND_VER ".0",
|
||||
.copyright = "LGPL",
|
||||
.status = RIG_STATUS_BETA,
|
||||
.rig_type = RIG_TYPE_RECEIVER | RIG_FLAG_HANDHELD,
|
||||
|
|
|
@ -60,7 +60,7 @@ const struct rig_caps icr20_caps =
|
|||
.rig_model = RIG_MODEL_ICR20,
|
||||
.model_name = "IC-R20",
|
||||
.mfg_name = "Icom",
|
||||
.version = BACKEND_VER,
|
||||
.version = BACKEND_VER ".0",
|
||||
.copyright = "LGPL",
|
||||
.status = RIG_STATUS_BETA,
|
||||
.rig_type = RIG_TYPE_RECEIVER | RIG_FLAG_HANDHELD,
|
||||
|
|
|
@ -100,7 +100,7 @@ const struct rig_caps icr30_caps =
|
|||
.rig_model = RIG_MODEL_ICR30,
|
||||
.model_name = "IC-R30",
|
||||
.mfg_name = "Icom",
|
||||
.version = BACKEND_VER,
|
||||
.version = BACKEND_VER ".0",
|
||||
.copyright = "LGPL",
|
||||
.status = RIG_STATUS_ALPHA,
|
||||
.rig_type = RIG_TYPE_RECEIVER | RIG_FLAG_HANDHELD,
|
||||
|
|
|
@ -59,7 +59,7 @@ const struct rig_caps icr6_caps =
|
|||
.rig_model = RIG_MODEL_ICR6,
|
||||
.model_name = "IC-R6",
|
||||
.mfg_name = "Icom",
|
||||
.version = BACKEND_VER,
|
||||
.version = BACKEND_VER ".0",
|
||||
.copyright = "LGPL",
|
||||
.status = RIG_STATUS_BETA,
|
||||
.rig_type = RIG_TYPE_RECEIVER | RIG_FLAG_HANDHELD,
|
||||
|
|
|
@ -53,7 +53,7 @@ const struct rig_caps icr71_caps =
|
|||
.rig_model = RIG_MODEL_ICR71,
|
||||
.model_name = "IC-R71",
|
||||
.mfg_name = "Icom",
|
||||
.version = BACKEND_VER,
|
||||
.version = BACKEND_VER ".0",
|
||||
.copyright = "LGPL",
|
||||
.status = RIG_STATUS_UNTESTED,
|
||||
.rig_type = RIG_TYPE_RECEIVER,
|
||||
|
|
|
@ -54,7 +54,7 @@ const struct rig_caps icr72_caps =
|
|||
.rig_model = RIG_MODEL_ICR72,
|
||||
.model_name = "IC-R72",
|
||||
.mfg_name = "Icom",
|
||||
.version = BACKEND_VER,
|
||||
.version = BACKEND_VER ".0",
|
||||
.copyright = "LGPL",
|
||||
.status = RIG_STATUS_UNTESTED,
|
||||
.rig_type = RIG_TYPE_RECEIVER,
|
||||
|
|
|
@ -109,7 +109,7 @@ const struct rig_caps icr75_caps =
|
|||
.rig_model = RIG_MODEL_ICR75,
|
||||
.model_name = "IC-R75",
|
||||
.mfg_name = "Icom",
|
||||
.version = BACKEND_VER,
|
||||
.version = BACKEND_VER ".0",
|
||||
.copyright = "LGPL",
|
||||
.status = RIG_STATUS_BETA,
|
||||
.rig_type = RIG_TYPE_RECEIVER,
|
||||
|
|
|
@ -58,7 +58,7 @@ const struct rig_caps icrx7_caps =
|
|||
.rig_model = RIG_MODEL_ICRX7,
|
||||
.model_name = "IC-RX7",
|
||||
.mfg_name = "Icom",
|
||||
.version = BACKEND_VER,
|
||||
.version = BACKEND_VER ".0",
|
||||
.copyright = "LGPL",
|
||||
.status = RIG_STATUS_UNTESTED,
|
||||
.rig_type = RIG_TYPE_RECEIVER | RIG_FLAG_HANDHELD,
|
||||
|
|
|
@ -77,7 +77,7 @@ const struct rig_caps id1_caps =
|
|||
.rig_model = RIG_MODEL_ICID1,
|
||||
.model_name = "IC ID-1",
|
||||
.mfg_name = "Icom",
|
||||
.version = BACKEND_VER,
|
||||
.version = BACKEND_VER ".0",
|
||||
.copyright = "LGPL",
|
||||
.status = RIG_STATUS_UNTESTED,
|
||||
.rig_type = RIG_TYPE_MOBILE,
|
||||
|
|
|
@ -87,7 +87,7 @@ const struct rig_caps id5100_caps =
|
|||
.rig_model = RIG_MODEL_ID5100,
|
||||
.model_name = "ID-5100",
|
||||
.mfg_name = "Icom",
|
||||
.version = BACKEND_VER,
|
||||
.version = BACKEND_VER ".0",
|
||||
.copyright = "LGPL",
|
||||
.status = RIG_STATUS_UNTESTED,
|
||||
.rig_type = RIG_TYPE_MOBILE,
|
||||
|
|
Ładowanie…
Reference in New Issue