diff --git a/icom/ic1275.c b/icom/ic1275.c index 8d5d0dc01..64c5f7288 100644 --- a/icom/ic1275.c +++ b/icom/ic1275.c @@ -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, diff --git a/icom/ic271.c b/icom/ic271.c index 7880ecb55..3fc3cae2f 100644 --- a/icom/ic271.c +++ b/icom/ic271.c @@ -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, diff --git a/icom/ic2730.c b/icom/ic2730.c index 6794104b1..3bf9e9c9e 100644 --- a/icom/ic2730.c +++ b/icom/ic2730.c @@ -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, diff --git a/icom/ic471.c b/icom/ic471.c index a66f894ae..1c2ba7c98 100644 --- a/icom/ic471.c +++ b/icom/ic471.c @@ -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, diff --git a/icom/ic703.c b/icom/ic703.c index ceb4e17bf..c510a678b 100644 --- a/icom/ic703.c +++ b/icom/ic703.c @@ -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, diff --git a/icom/ic707.c b/icom/ic707.c index 79f6f1541..3a8b83f35 100644 --- a/icom/ic707.c +++ b/icom/ic707.c @@ -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, diff --git a/icom/ic7100.c b/icom/ic7100.c index 882e46167..b8ced4173 100644 --- a/icom/ic7100.c +++ b/icom/ic7100.c @@ -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, diff --git a/icom/ic7200.c b/icom/ic7200.c index 2ba3e5be9..a30906728 100644 --- a/icom/ic7200.c +++ b/icom/ic7200.c @@ -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, diff --git a/icom/ic726.c b/icom/ic726.c index 66265ff05..ebe590060 100644 --- a/icom/ic726.c +++ b/icom/ic726.c @@ -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, diff --git a/icom/ic728.c b/icom/ic728.c index 5aa2983d8..8b09b2bfa 100644 --- a/icom/ic728.c +++ b/icom/ic728.c @@ -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, diff --git a/icom/ic736.c b/icom/ic736.c index 3285086d4..2170d3f45 100644 --- a/icom/ic736.c +++ b/icom/ic736.c @@ -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, diff --git a/icom/ic737.c b/icom/ic737.c index 2936e254c..48d83d6f1 100644 --- a/icom/ic737.c +++ b/icom/ic737.c @@ -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, diff --git a/icom/ic738.c b/icom/ic738.c index 912328b31..bd00fd619 100644 --- a/icom/ic738.c +++ b/icom/ic738.c @@ -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, diff --git a/icom/ic7410.c b/icom/ic7410.c index 4775dad40..5a67ddc1a 100644 --- a/icom/ic7410.c +++ b/icom/ic7410.c @@ -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, diff --git a/icom/ic746.c b/icom/ic746.c index ce013a068..b523b5170 100644 --- a/icom/ic746.c +++ b/icom/ic746.c @@ -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, diff --git a/icom/ic756.c b/icom/ic756.c index a3ffdf493..c8943125e 100644 --- a/icom/ic756.c +++ b/icom/ic756.c @@ -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, diff --git a/icom/ic7600.c b/icom/ic7600.c index fa2f865e3..1ec95e931 100644 --- a/icom/ic7600.c +++ b/icom/ic7600.c @@ -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, diff --git a/icom/ic7610.c b/icom/ic7610.c index 828d9165d..11ce2f868 100644 --- a/icom/ic7610.c +++ b/icom/ic7610.c @@ -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, diff --git a/icom/ic765.c b/icom/ic765.c index 9134c211d..92e8b1551 100644 --- a/icom/ic765.c +++ b/icom/ic765.c @@ -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, diff --git a/icom/ic78.c b/icom/ic78.c index 36afbd13e..85c791f44 100644 --- a/icom/ic78.c +++ b/icom/ic78.c @@ -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, diff --git a/icom/ic820h.c b/icom/ic820h.c index 3e3dbb292..45b2b2230 100644 --- a/icom/ic820h.c +++ b/icom/ic820h.c @@ -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, diff --git a/icom/ic821h.c b/icom/ic821h.c index 4face6c4a..492db0f0c 100644 --- a/icom/ic821h.c +++ b/icom/ic821h.c @@ -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, diff --git a/icom/ic92d.c b/icom/ic92d.c index f89964a84..a36c49bb9 100644 --- a/icom/ic92d.c +++ b/icom/ic92d.c @@ -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, diff --git a/icom/ic970.c b/icom/ic970.c index e08e1c421..893f16874 100644 --- a/icom/ic970.c +++ b/icom/ic970.c @@ -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, diff --git a/icom/icom.c b/icom/icom.c index 51959cd3f..98f7f6019 100644 --- a/icom/icom.c +++ b/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; } diff --git a/icom/icom.h b/icom/icom.h index a7df016da..3fc009761 100644 --- a/icom/icom.h +++ b/icom/icom.h @@ -30,7 +30,7 @@ #include #endif -#define BACKEND_VER "0.11" +#define BACKEND_VER "0.12" /* * defines used by comp_cal_str in rig.c diff --git a/icom/icr10.c b/icom/icr10.c index 0d21577e5..f8b7d69b8 100644 --- a/icom/icr10.c +++ b/icom/icr10.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, diff --git a/icom/icr20.c b/icom/icr20.c index 0fe225130..9e7569a3e 100644 --- a/icom/icr20.c +++ b/icom/icr20.c @@ -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, diff --git a/icom/icr30.c b/icom/icr30.c index 13aaab636..b184825a5 100644 --- a/icom/icr30.c +++ b/icom/icr30.c @@ -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, diff --git a/icom/icr6.c b/icom/icr6.c index f986b74f2..0282260b1 100644 --- a/icom/icr6.c +++ b/icom/icr6.c @@ -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, diff --git a/icom/icr71.c b/icom/icr71.c index 8093b6a2a..794cb65b7 100644 --- a/icom/icr71.c +++ b/icom/icr71.c @@ -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, diff --git a/icom/icr72.c b/icom/icr72.c index da7d52ad6..bac7ae91a 100644 --- a/icom/icr72.c +++ b/icom/icr72.c @@ -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, diff --git a/icom/icr75.c b/icom/icr75.c index 9d7a4c77d..8d23e64e8 100644 --- a/icom/icr75.c +++ b/icom/icr75.c @@ -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, diff --git a/icom/icrx7.c b/icom/icrx7.c index 7eec4b05c..53ffff74d 100644 --- a/icom/icrx7.c +++ b/icom/icrx7.c @@ -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, diff --git a/icom/id1.c b/icom/id1.c index f092fd5ea..f906663ca 100644 --- a/icom/id1.c +++ b/icom/id1.c @@ -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, diff --git a/icom/id5100.c b/icom/id5100.c index e5b371659..775734bcd 100644 --- a/icom/id5100.c +++ b/icom/id5100.c @@ -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,