[Hamlib-commits] Hamlib -- Ham radio control libraries branch master updated. f81d0ca96e6302fe063c5
Library to control radio transceivers and receivers
Brought to you by:
n0nb
Menu
▾
▴
[Hamlib-commits] Hamlib -- Ham radio control libraries branch master updated. f81d0ca96e6302fe063c5d55221db22ec9b45c44
|
From: Nate B. <n0...@us...> - 2021-02-14 19:37:08
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Hamlib -- Ham radio control libraries".
The branch, master has been updated
via f81d0ca96e6302fe063c5d55221db22ec9b45c44 (commit)
via bcc603a70edcf45ad060244dc4ad31a3151febde (commit)
via 4b5239c6f9c6aad5e90b60bc1a09fde27ec84b88 (commit)
via 660fd9496263abe5a663dae7496a6efee3a002ed (commit)
from 0335498edc98dd78d6eb8b5dc79ad8a4fe227781 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit f81d0ca96e6302fe063c5d55221db22ec9b45c44
Author: Michael Black W9MDB <mdb...@ya...>
Date: Sun Feb 14 07:37:02 2021 -0600
Add info for set_ant
diff --git a/doc/man1/rigctl.1 b/doc/man1/rigctl.1
index fedc9fcd..aff36b53 100644
--- a/doc/man1/rigctl.1
+++ b/doc/man1/rigctl.1
@@ -671,15 +671,15 @@ Number is 1-based antenna# (\(oq1\(cq, \(oq2\(cq, \(oq3\(cq, ...).
.IP
Option depends on rig..for Icom it probably sets the Tx & Rx antennas as in the IC-7851. See your manual for rig specific option values. Most rigs don't care about the option.
.IP
-For the IC-7851 (and perhaps others) it means this:
+For the IC-7851, FTDX3000 (and perhaps others) it means this:
.IP
.in +4n
.EX
1 = TX/RX = ANT1
2 = TX/RX = ANT2
3 = TX/RX = ANT3
-4 = TX/RX = ANT1/ANT4
-5 = TX/RX = ANT2/ANT4
+4 = TX/RX = ANT1/ANT4 or ANT1/ANT3
+5 = TX/RX = ANT2/ANT4 or ANT2/ANT3
6 = TX/RX = ANT3/ANT4
.EE
.in
commit bcc603a70edcf45ad060244dc4ad31a3151febde
Author: Michael Black W9MDB <mdb...@ya...>
Date: Sat Feb 13 23:04:28 2021 -0600
Add set_ant to FT3000 for TRX R3/1 R3/2 modes
https://github.com/Hamlib/Hamlib/issues/510
diff --git a/rigs/yaesu/ft3000.c b/rigs/yaesu/ft3000.c
index c6575cfa..a3d90b72 100644
--- a/rigs/yaesu/ft3000.c
+++ b/rigs/yaesu/ft3000.c
@@ -85,6 +85,36 @@ int ftdx3000_ext_tokens[] =
TOK_ROOFING_FILTER, TOK_BACKEND_NONE
};
+int ft3000_set_ant(RIG *rig, vfo_t vfo, ant_t ant, value_t option)
+{
+ char *cmd;
+ int err;
+ struct newcat_priv_data *priv = (struct newcat_priv_data *)rig->state.priv;
+
+ ENTERFUNC;
+ switch (ant)
+ {
+ case 3:
+ cmd = "EX0320"; // TRX ANT3
+ break;
+ case 4:
+ cmd = "EX0321"; // R3/1 ANT1/ANT3
+ break;
+ case 5:
+ cmd = "EX0322"; // RE/2 ANT2/ANT3
+ break;
+ default:
+ rig_debug(RIG_DEBUG_ERR, "%s: expected 3,4,5 got %d\n", __func__, ant);
+ RETURNFUNC(-RIG_EINVAL);
+ }
+ snprintf(priv->cmd_str, sizeof(priv->cmd_str), "%s", cmd);
+ if (RIG_OK != (err = newcat_get_cmd(rig)))
+ {
+ RETURNFUNC(err);
+ }
+ RETURNFUNC(RIG_OK);
+}
+
int ft3000_get_ant(RIG *rig, vfo_t vfo, ant_t dummy, value_t *option,
ant_t *ant_curr, ant_t *ant_tx, ant_t *ant_rx)
{
@@ -120,13 +150,13 @@ int ft3000_get_ant(RIG *rig, vfo_t vfo, ant_t dummy, value_t *option,
break;
default:
rig_debug(RIG_DEBUG_ERR, "%s: unknown antenna=%c\n", __func__, c);
- return -RIG_EPROTO;
+ RETURNFUNC(-RIG_EPROTO);
}
}
*ant_curr = *ant_tx; // current points to tx antenna
- return RIG_OK;
+ RETURNFUNC(RIG_OK);
}
@@ -275,7 +305,7 @@ const struct rig_caps ftdx3000_caps =
.get_rit = newcat_get_rit,
.set_xit = newcat_set_xit,
.get_xit = newcat_get_xit,
- .set_ant = newcat_set_ant,
+ .set_ant = ft3000_set_ant,
.get_ant = ft3000_get_ant,
.get_func = newcat_get_func,
.set_func = newcat_set_func,
commit 4b5239c6f9c6aad5e90b60bc1a09fde27ec84b88
Author: Michael Black W9MDB <mdb...@ya...>
Date: Sat Feb 13 17:43:00 2021 -0600
Fix FTDX3000 get_ant function -- returns TX antenna for AntCurr
AntCurr: ANT2
Option: 0
AntTx: ANT2
AntRx: ANT3
https://github.com/Hamlib/Hamlib/issues/510
diff --git a/rigs/yaesu/ft3000.c b/rigs/yaesu/ft3000.c
index 1b0197e6..c6575cfa 100644
--- a/rigs/yaesu/ft3000.c
+++ b/rigs/yaesu/ft3000.c
@@ -30,6 +30,8 @@
#endif
#include "hamlib/rig.h"
+#include "misc.h"
+#include "newcat.h"
#include "bandplan.h"
#include "newcat.h"
#include "ft5000.h"
@@ -83,6 +85,51 @@ int ftdx3000_ext_tokens[] =
TOK_ROOFING_FILTER, TOK_BACKEND_NONE
};
+int ft3000_get_ant(RIG *rig, vfo_t vfo, ant_t dummy, value_t *option,
+ ant_t *ant_curr, ant_t *ant_tx, ant_t *ant_rx)
+{
+ struct newcat_priv_data *priv = (struct newcat_priv_data *)rig->state.priv;
+ int err;
+
+ ENTERFUNC;
+
+ option->i = 0; // default to no options
+
+ // find out what ANT3 setting
+ snprintf(priv->cmd_str, sizeof(priv->cmd_str), "%s", "EX032;");
+ if (RIG_OK != (err = newcat_get_cmd(rig)))
+ {
+ RETURNFUNC(err);
+ }
+
+ if (strlen(priv->ret_data) >= 7)
+ {
+ char c = priv->ret_data[5];
+ switch(c)
+ {
+ case '0':
+ *ant_rx = *ant_tx = RIG_ANT_3;
+ break;
+ case '1':
+ *ant_rx = RIG_ANT_3;
+ *ant_tx = RIG_ANT_1;
+ break;
+ case '2':
+ *ant_rx = RIG_ANT_3;
+ *ant_tx = RIG_ANT_2;
+ break;
+ default:
+ rig_debug(RIG_DEBUG_ERR, "%s: unknown antenna=%c\n", __func__, c);
+ return -RIG_EPROTO;
+ }
+ }
+
+ *ant_curr = *ant_tx; // current points to tx antenna
+
+ return RIG_OK;
+}
+
+
/*
* FTDX 3000 rig capabilities
* Seems to be largely compatible with the FTDX 5000,
@@ -94,7 +141,7 @@ const struct rig_caps ftdx3000_caps =
RIG_MODEL(RIG_MODEL_FTDX3000),
.model_name = "FTDX-3000",
.mfg_name = "Yaesu",
- .version = NEWCAT_VER ".2",
+ .version = NEWCAT_VER ".3",
.copyright = "LGPL",
.status = RIG_STATUS_STABLE,
.rig_type = RIG_TYPE_TRANSCEIVER,
@@ -229,7 +276,7 @@ const struct rig_caps ftdx3000_caps =
.set_xit = newcat_set_xit,
.get_xit = newcat_get_xit,
.set_ant = newcat_set_ant,
- .get_ant = newcat_get_ant,
+ .get_ant = ft3000_get_ant,
.get_func = newcat_get_func,
.set_func = newcat_set_func,
.get_level = newcat_get_level,
@@ -260,3 +307,4 @@ const struct rig_caps ftdx3000_caps =
.get_ext_level = newcat_get_ext_level,
};
+
commit 660fd9496263abe5a663dae7496a6efee3a002ed
Author: Michael Black W9MDB <mdb...@ya...>
Date: Fri Feb 12 16:37:17 2021 -0600
Change all icom rigs to watts for RIG_LEVEL_RFPOWER_METER_WATTS
Divide by 100 for old power call
diff --git a/rigs/icom/ic7000.c b/rigs/icom/ic7000.c
index aef25f6a..a14eaf74 100644
--- a/rigs/icom/ic7000.c
+++ b/rigs/icom/ic7000.c
@@ -95,13 +95,24 @@
{ 120, 1.0f } \
} }
-#define IC7000_RFPOWER_METER_CAL { 3, \
+#define IC7000_RFPOWER_METER_CAL { 13, \
{ \
{ 0, 0.0f }, \
- { 143, 0.5f }, \
- { 213, 1.0f } \
+ { 21, 5.0f }, \
+ { 43, 10.0f }, \
+ { 65, 15.0f }, \
+ { 83, 20.0f }, \
+ { 95, 25.0f }, \
+ { 105, 30.0f }, \
+ { 114, 35.0f }, \
+ { 124, 40.0f }, \
+ { 143, 50.0f }, \
+ { 183, 75.0f }, \
+ { 213, 100.0f }, \
+ { 255, 120.0f } \
} }
+
#define IC7000_COMP_METER_CAL { 3, \
{ \
{ 0, 0.0f }, \
diff --git a/rigs/icom/ic7100.c b/rigs/icom/ic7100.c
index 50032220..a1e1f617 100644
--- a/rigs/icom/ic7100.c
+++ b/rigs/icom/ic7100.c
@@ -140,13 +140,24 @@ struct cmdparams ic7100_extcmds[] =
{ 120, 1.0f } \
} }
-#define IC7100_RFPOWER_METER_CAL { 3, \
+#define IC7100_RFPOWER_METER_CAL { 13, \
{ \
{ 0, 0.0f }, \
- { 143, 0.5f }, \
- { 213, 1.0f } \
+ { 21, 5.0f }, \
+ { 43, 10.0f }, \
+ { 65, 15.0f }, \
+ { 83, 20.0f }, \
+ { 95, 25.0f }, \
+ { 105, 30.0f }, \
+ { 114, 35.0f }, \
+ { 124, 40.0f }, \
+ { 143, 50.0f }, \
+ { 183, 75.0f }, \
+ { 213, 100.0f }, \
+ { 255, 120.0f } \
} }
+
#define IC7100_COMP_METER_CAL { 3, \
{ \
{ 0, 0.0f }, \
diff --git a/rigs/icom/ic7200.c b/rigs/icom/ic7200.c
index 411bd5cf..f54430a6 100644
--- a/rigs/icom/ic7200.c
+++ b/rigs/icom/ic7200.c
@@ -84,13 +84,24 @@
{ 120, 1.0f } \
} }
-#define IC7200_RFPOWER_METER_CAL { 3, \
+#define IC7200_RFPOWER_METER_CAL { 13, \
{ \
{ 0, 0.0f }, \
- { 143, 0.5f }, \
- { 213, 1.0f } \
+ { 21, 5.0f }, \
+ { 43, 10.0f }, \
+ { 65, 15.0f }, \
+ { 83, 20.0f }, \
+ { 95, 25.0f }, \
+ { 105, 30.0f }, \
+ { 114, 35.0f }, \
+ { 124, 40.0f }, \
+ { 143, 50.0f }, \
+ { 183, 75.0f }, \
+ { 213, 100.0f }, \
+ { 255, 120.0f } \
} }
+
int ic7200_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val);
int ic7200_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val);
diff --git a/rigs/icom/ic7300.c b/rigs/icom/ic7300.c
index 963093d0..c5ed85cf 100644
--- a/rigs/icom/ic7300.c
+++ b/rigs/icom/ic7300.c
@@ -90,11 +90,21 @@ static int ic7300_get_parm(RIG *rig, setting_t parm, value_t *val);
{ 120, 1.0f } \
} }
-#define IC7300_RFPOWER_METER_CAL { 3, \
+#define IC7300_RFPOWER_METER_CAL { 13, \
{ \
{ 0, 0.0f }, \
- { 143, 0.5f }, \
- { 213, 1.0f } \
+ { 21, 5.0f }, \
+ { 43, 10.0f }, \
+ { 65, 15.0f }, \
+ { 83, 20.0f }, \
+ { 95, 25.0f }, \
+ { 105, 30.0f }, \
+ { 114, 35.0f }, \
+ { 124, 40.0f }, \
+ { 143, 50.0f }, \
+ { 183, 75.0f }, \
+ { 213, 100.0f }, \
+ { 255, 120.0f } \
} }
#define IC7300_COMP_METER_CAL { 3, \
@@ -166,11 +176,21 @@ static int ic7300_get_parm(RIG *rig, setting_t parm, value_t *val);
{ 120, 1.0f } \
} }
-#define IC9700_RFPOWER_METER_CAL { 3, \
+#define IC9700_RFPOWER_METER_CAL { 13, \
{ \
{ 0, 0.0f }, \
- { 143, 0.5f }, \
- { 213, 1.0f } \
+ { 21, 5.0f }, \
+ { 43, 10.0f }, \
+ { 65, 15.0f }, \
+ { 83, 20.0f }, \
+ { 95, 25.0f }, \
+ { 105, 30.0f }, \
+ { 114, 35.0f }, \
+ { 124, 40.0f }, \
+ { 143, 50.0f }, \
+ { 183, 75.0f }, \
+ { 213, 100.0f }, \
+ { 255, 120.0f } \
} }
#define IC9700_COMP_METER_CAL { 3, \
@@ -281,7 +301,7 @@ const struct rig_caps ic7300_caps =
RIG_MODEL(RIG_MODEL_IC7300),
.model_name = "IC-7300",
.mfg_name = "Icom",
- .version = BACKEND_VER ".2",
+ .version = BACKEND_VER ".3",
.copyright = "LGPL",
.status = RIG_STATUS_STABLE,
.rig_type = RIG_TYPE_TRANSCEIVER,
@@ -454,7 +474,7 @@ const struct rig_caps ic9700_caps =
RIG_MODEL(RIG_MODEL_IC9700),
.model_name = "IC-9700",
.mfg_name = "Icom",
- .version = BACKEND_VER ".1",
+ .version = BACKEND_VER ".2",
.copyright = "LGPL",
.status = RIG_STATUS_STABLE,
.rig_type = RIG_TYPE_TRANSCEIVER,
diff --git a/rigs/icom/ic7410.c b/rigs/icom/ic7410.c
index 2c42920a..d4ffdfd2 100644
--- a/rigs/icom/ic7410.c
+++ b/rigs/icom/ic7410.c
@@ -78,13 +78,24 @@
{ 120, 1.0f } \
} }
-#define IC7410_RFPOWER_METER_CAL { 3, \
+#define IC7410_RFPOWER_METER_CAL { 13, \
{ \
{ 0, 0.0f }, \
- { 143, 0.5f }, \
- { 213, 1.0f } \
+ { 21, 5.0f }, \
+ { 43, 10.0f }, \
+ { 65, 15.0f }, \
+ { 83, 20.0f }, \
+ { 95, 25.0f }, \
+ { 105, 30.0f }, \
+ { 114, 35.0f }, \
+ { 124, 40.0f }, \
+ { 143, 50.0f }, \
+ { 183, 75.0f }, \
+ { 213, 100.0f }, \
+ { 255, 120.0f } \
} }
+
struct cmdparams ic7410_extcmds[] =
{
{ {.s = RIG_LEVEL_VOXDELAY}, CMD_PARAM_TYPE_LEVEL, C_CTL_MEM, S_MEM_PARM, SC_MOD_RW, 1, {0x75 }, CMD_DAT_INT, 1 },
diff --git a/rigs/icom/ic756.c b/rigs/icom/ic756.c
index f36bd4f7..a434f144 100644
--- a/rigs/icom/ic756.c
+++ b/rigs/icom/ic756.c
@@ -943,13 +943,24 @@ static const struct icom_priv_caps ic756pro3_priv_caps =
{ 120, 1.0f } \
} }
-#define IC756PROIII_RFPOWER_METER_CAL { 3, \
+#define IC756PROIII_RFPOWER_METER_CAL { 13, \
{ \
{ 0, 0.0f }, \
- { 143, 0.5f }, \
- { 213, 1.0f } \
+ { 21, 5.0f }, \
+ { 43, 10.0f }, \
+ { 65, 15.0f }, \
+ { 83, 20.0f }, \
+ { 95, 25.0f }, \
+ { 105, 30.0f }, \
+ { 114, 35.0f }, \
+ { 124, 40.0f }, \
+ { 143, 50.0f }, \
+ { 183, 75.0f }, \
+ { 213, 100.0f }, \
+ { 255, 120.0f } \
} }
+
#define IC756PROIII_COMP_METER_CAL { 3, \
{ \
{ 0, 0.0f }, \
diff --git a/rigs/icom/ic7600.c b/rigs/icom/ic7600.c
index 2c33c9d8..4f3422dc 100644
--- a/rigs/icom/ic7600.c
+++ b/rigs/icom/ic7600.c
@@ -91,13 +91,24 @@
{ 120, 1.0f } \
} }
-#define IC7600_RFPOWER_METER_CAL { 3, \
+#define IC7600_RFPOWER_METER_CAL { 13, \
{ \
{ 0, 0.0f }, \
- { 143, 0.5f }, \
- { 213, 1.0f } \
+ { 21, 5.0f }, \
+ { 43, 10.0f }, \
+ { 65, 15.0f }, \
+ { 83, 20.0f }, \
+ { 95, 25.0f }, \
+ { 105, 30.0f }, \
+ { 114, 35.0f }, \
+ { 124, 40.0f }, \
+ { 143, 50.0f }, \
+ { 183, 75.0f }, \
+ { 213, 100.0f }, \
+ { 255, 120.0f } \
} }
+
#define IC7600_COMP_METER_CAL { 3, \
{ \
{ 0, 0.0f }, \
diff --git a/rigs/icom/ic7610.c b/rigs/icom/ic7610.c
index dbb5be53..f26b3b67 100644
--- a/rigs/icom/ic7610.c
+++ b/rigs/icom/ic7610.c
@@ -92,13 +92,24 @@
{ 120, 1.0f } \
} }
-#define IC7610_RFPOWER_METER_CAL { 3, \
+#define IC7610_RFPOWER_METER_CAL { 13, \
{ \
{ 0, 0.0f }, \
- { 143, 0.5f }, \
- { 212, 1.0f } \
+ { 21, 5.0f }, \
+ { 43, 10.0f }, \
+ { 65, 15.0f }, \
+ { 83, 20.0f }, \
+ { 95, 25.0f }, \
+ { 105, 30.0f }, \
+ { 114, 35.0f }, \
+ { 124, 40.0f }, \
+ { 143, 50.0f }, \
+ { 183, 75.0f }, \
+ { 213, 100.0f }, \
+ { 255, 120.0f } \
} }
+
#define IC7610_COMP_METER_CAL { 3, \
{ \
{ 0, 0.0f }, \
diff --git a/rigs/icom/ic7700.c b/rigs/icom/ic7700.c
index 9e62eb0b..0a148453 100644
--- a/rigs/icom/ic7700.c
+++ b/rigs/icom/ic7700.c
@@ -76,13 +76,24 @@
{ 120, 1.0f } \
} }
-#define IC7700_RFPOWER_METER_CAL { 3, \
+#define IC7700_RFPOWER_METER_CAL { 13, \
{ \
{ 0, 0.0f }, \
- { 143, 0.5f }, \
- { 213, 1.0f } \
+ { 21, 5.0f }, \
+ { 43, 10.0f }, \
+ { 65, 15.0f }, \
+ { 83, 20.0f }, \
+ { 95, 25.0f }, \
+ { 105, 30.0f }, \
+ { 114, 35.0f }, \
+ { 124, 40.0f }, \
+ { 143, 50.0f }, \
+ { 183, 75.0f }, \
+ { 213, 100.0f }, \
+ { 255, 120.0f } \
} }
+
#define IC7700_COMP_METER_CAL { 3, \
{ \
{ 0, 0.0f }, \
diff --git a/rigs/icom/ic7800.c b/rigs/icom/ic7800.c
index 715e30e1..83091b3c 100644
--- a/rigs/icom/ic7800.c
+++ b/rigs/icom/ic7800.c
@@ -76,13 +76,24 @@
{ 120, 1.0f } \
} }
-#define IC7800_RFPOWER_METER_CAL { 3, \
+#define IC7800_RFPOWER_METER_CAL { 13, \
{ \
{ 0, 0.0f }, \
- { 143, 0.5f }, \
- { 213, 1.0f } \
+ { 21, 5.0f }, \
+ { 43, 10.0f }, \
+ { 65, 15.0f }, \
+ { 83, 20.0f }, \
+ { 95, 25.0f }, \
+ { 105, 30.0f }, \
+ { 114, 35.0f }, \
+ { 124, 40.0f }, \
+ { 143, 50.0f }, \
+ { 183, 75.0f }, \
+ { 213, 100.0f }, \
+ { 255, 120.0f } \
} }
+
#define IC7800_COMP_METER_CAL { 3, \
{ \
{ 0, 0.0f }, \
diff --git a/rigs/icom/ic785x.c b/rigs/icom/ic785x.c
index 3703d564..99029bb5 100644
--- a/rigs/icom/ic785x.c
+++ b/rigs/icom/ic785x.c
@@ -77,13 +77,24 @@
{ 120, 1.0f } \
} }
-#define IC785x_RFPOWER_METER_CAL { 3, \
+#define IC785x_RFPOWER_METER_CAL { 13, \
{ \
{ 0, 0.0f }, \
- { 143, 0.5f }, \
- { 213, 1.0f } \
+ { 21, 5.0f }, \
+ { 43, 10.0f }, \
+ { 65, 15.0f }, \
+ { 83, 20.0f }, \
+ { 95, 25.0f }, \
+ { 105, 30.0f }, \
+ { 114, 35.0f }, \
+ { 124, 40.0f }, \
+ { 143, 50.0f }, \
+ { 183, 75.0f }, \
+ { 213, 100.0f }, \
+ { 255, 120.0f } \
} }
+
#define IC785x_COMP_METER_CAL { 3, \
{ \
{ 0, 0.0f }, \
diff --git a/rigs/icom/icom.c b/rigs/icom/icom.c
index 9c60086a..26b7426f 100644
--- a/rigs/icom/icom.c
+++ b/rigs/icom/icom.c
@@ -69,11 +69,21 @@ const cal_table_float_t icom_default_alc_cal =
const cal_table_float_t icom_default_rfpower_meter_cal =
{
- 3,
- {
- {0, 0.0f},
- {143, 0.5f},
- {213, 1.0f}
+ 13,
+ {
+ { 0, 0.0f },
+ { 21, 5.0f },
+ { 43, 10.0f },
+ { 65, 15.0f },
+ { 83, 20.0f },
+ { 95, 25.0f },
+ { 105, 30.0f },
+ { 114, 35.0f },
+ { 124, 40.0f },
+ { 143, 50.0f },
+ { 183, 75.0f },
+ { 213, 100.0f },
+ { 255, 120.0f }
}
};
@@ -3089,39 +3099,32 @@ int icom_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
break;
case RIG_LEVEL_RFPOWER_METER:
+ // rig table in Watts needs to be divided by 100
if (rig->caps->rfpower_meter_cal.size == 0)
{
val->f =
- rig_raw2val_float(icom_val, &icom_default_rfpower_meter_cal);
+ rig_raw2val_float(icom_val, &icom_default_rfpower_meter_cal) * 0.01;
}
else
{
val->f =
- rig_raw2val_float(icom_val, &rig->caps->rfpower_meter_cal);
+ rig_raw2val_float(icom_val, &rig->caps->rfpower_meter_cal) * 0.01;
}
break;
case RIG_LEVEL_RFPOWER_METER_WATTS:
- // eventually we should change all the Icom tables to watts
+ // All Icom backends should be in Watts now
if (rig->caps->rfpower_meter_cal.size == 0)
{
val->f =
- rig_raw2val_float(icom_val, &icom_default_rfpower_meter_cal) * 100;
+ rig_raw2val_float(icom_val, &icom_default_rfpower_meter_cal);
}
else
{
- float scale = 100;
-
- if (rig->caps->rig_model == RIG_MODEL_IC705
- || rig->caps->rig_model == RIG_MODEL_IC703)
- {
- scale = 10;
- }
-
val->f =
- rig_raw2val_float(icom_val, &rig->caps->rfpower_meter_cal) * scale;
+ rig_raw2val_float(icom_val, &rig->caps->rfpower_meter_cal);
}
break;
diff --git a/rigs/icom/icom.h b/rigs/icom/icom.h
index 8e7923e3..17ecbd5b 100644
--- a/rigs/icom/icom.h
+++ b/rigs/icom/icom.h
@@ -30,7 +30,7 @@
#include <sys/time.h>
#endif
-#define BACKEND_VER "20210203"
+#define BACKEND_VER "20210212"
/*
* defines used by comp_cal_str in rig.c
-----------------------------------------------------------------------
Summary of changes:
doc/man1/rigctl.1 | 6 ++--
rigs/icom/ic7000.c | 17 +++++++++--
rigs/icom/ic7100.c | 17 +++++++++--
rigs/icom/ic7200.c | 17 +++++++++--
rigs/icom/ic7300.c | 36 ++++++++++++++++++-----
rigs/icom/ic7410.c | 17 +++++++++--
rigs/icom/ic756.c | 17 +++++++++--
rigs/icom/ic7600.c | 17 +++++++++--
rigs/icom/ic7610.c | 17 +++++++++--
rigs/icom/ic7700.c | 17 +++++++++--
rigs/icom/ic7800.c | 17 +++++++++--
rigs/icom/ic785x.c | 17 +++++++++--
rigs/icom/icom.c | 39 +++++++++++++------------
rigs/icom/icom.h | 2 +-
rigs/yaesu/ft3000.c | 84 +++++++++++++++++++++++++++++++++++++++++++++++++++--
15 files changed, 274 insertions(+), 63 deletions(-)
hooks/post-receive
--
Hamlib -- Ham radio control libraries
|
