[Hamlib-commits] Hamlib -- Ham radio control libraries branch master updated. c5fba04747ddb6309cfd1
Library to control radio transceivers and receivers
Brought to you by:
n0nb
Menu
▾
▴
[Hamlib-commits] Hamlib -- Ham radio control libraries branch master updated. c5fba04747ddb6309cfd16af1a490f59ec01d309
|
From: Michael B. <mdb...@us...> - 2021-03-09 14:03:14
|
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 c5fba04747ddb6309cfd16af1a490f59ec01d309 (commit)
via 68d4388df290c4dcd7de34a0538960808502ee32 (commit)
from 59dcb2e9b6f3f38c0749c425a36a58db07413268 (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 c5fba04747ddb6309cfd16af1a490f59ec01d309
Author: Michael Black W9MDB <mdb...@ya...>
Date: Tue Mar 9 08:02:35 2021 -0600
Fix STRENGHT report for ftdx101d and ftdx101mp
https://github.com/Hamlib/Hamlib/issues/594
diff --git a/rigs/yaesu/ftdx101.c b/rigs/yaesu/ftdx101.c
index 0e73d39a..3587f5d1 100644
--- a/rigs/yaesu/ftdx101.c
+++ b/rigs/yaesu/ftdx101.c
@@ -37,27 +37,6 @@
#include "newcat.h"
#include "ftdx101.h"
-#define FTDX101D_STR_CAL { 16, \
- { \
- { 0x00, -54 }, /* S0 */ \
- { 0x01, -48 }, \
- { 0x02, -42 }, \
- { 0x03, -36 }, \
- { 0x04, -30 }, \
- { 0x05, -24 }, \
- { 0x06, -18 }, \
- { 0x07, -12 }, \
- { 0x08, -6 }, \
- { 0x09, 0 }, /* S9 */ \
- { 0x0A, 10 }, /* +10 */ \
- { 0x0B, 20 }, /* +20 */ \
- { 0x0C, 30 }, /* +30 */ \
- { 0x0D, 40 }, /* +40 */ \
- { 0x0E, 50 }, /* +50 */ \
- { 0x0F, 60 } /* +60 */ \
- } }
-
-
const struct newcat_priv_caps ftdx101d_priv_caps =
{
.roofing_filter_count = 6,
@@ -97,7 +76,7 @@ const struct rig_caps ftdx101d_caps =
RIG_MODEL(RIG_MODEL_FTDX101D),
.model_name = "FTDX-101D",
.mfg_name = "Yaesu",
- .version = NEWCAT_VER ".10",
+ .version = NEWCAT_VER ".11",
.copyright = "LGPL",
.status = RIG_STATUS_STABLE,
.rig_type = RIG_TYPE_TRANSCEIVER,
@@ -139,7 +118,7 @@ const struct rig_caps ftdx101d_caps =
.bank_qty = 0,
.chan_desc_sz = 0,
.rfpower_meter_cal = FTDX101D_RFPOWER_METER_WATTS_CAL,
- .str_cal = FTDX101D_RFPOWER_METER_CAL,
+ .str_cal = FTDX101D_STR_CAL,
.swr_cal = FTDX101D_SWR_CAL,
.str_cal = FTDX101D_STR_CAL,
.chan_list = {
diff --git a/rigs/yaesu/ftdx101.h b/rigs/yaesu/ftdx101.h
index 198bb2f9..78acea89 100644
--- a/rigs/yaesu/ftdx101.h
+++ b/rigs/yaesu/ftdx101.h
@@ -148,6 +148,23 @@
} \
}
+#define FTDX101D_STR_CAL { 12, \
+ { \
+ { 0, -60 }, /* S0 */ \
+ { 17, -54 }, /* S0 */ \
+ { 25, -48 }, \
+ { 34, -42 }, \
+ { 51, -36 }, \
+ { 68, -30 }, \
+ { 85, -24 }, \
+ { 102, -18 }, \
+ { 119, -12 }, \
+ { 136, -6 }, \
+ { 160, 0 }, /* S9 */ \
+ { 255, 60 }, /* +60 */ \
+ } }
+
+
/*
* Other features (used by rig_caps)
*/
diff --git a/rigs/yaesu/ftdx101mp.c b/rigs/yaesu/ftdx101mp.c
index 9ff6a9ec..a5dfb7c7 100644
--- a/rigs/yaesu/ftdx101mp.c
+++ b/rigs/yaesu/ftdx101mp.c
@@ -77,7 +77,7 @@ const struct rig_caps ftdx101mp_caps =
RIG_MODEL(RIG_MODEL_FTDX101MP),
.model_name = "FTDX-101MP",
.mfg_name = "Yaesu",
- .version = NEWCAT_VER ".1",
+ .version = NEWCAT_VER ".2",
.copyright = "LGPL",
.status = RIG_STATUS_STABLE,
.rig_type = RIG_TYPE_TRANSCEIVER,
@@ -119,7 +119,7 @@ const struct rig_caps ftdx101mp_caps =
.bank_qty = 0,
.chan_desc_sz = 0,
.rfpower_meter_cal = FTDX101MP_RFPOWER_METER_WATTS_CAL,
- .str_cal = FTDX101MP_RFPOWER_METER_CAL,
+ .str_cal = FTDX101D_STR_CAL,
.swr_cal = FTDX101D_SWR_CAL,
.chan_list = {
{ 1, 99, RIG_MTYPE_MEM, NEWCAT_MEM_CAP },
commit 68d4388df290c4dcd7de34a0538960808502ee32
Author: Michael Black W9MDB <mdb...@ya...>
Date: Tue Mar 9 07:42:16 2021 -0600
Fix Yaesu not setting frequency
https://github.com/Hamlib/Hamlib/issues/594
diff --git a/rigs/yaesu/newcat.c b/rigs/yaesu/newcat.c
index 3445ab14..e69c6223 100644
--- a/rigs/yaesu/newcat.c
+++ b/rigs/yaesu/newcat.c
@@ -9727,8 +9727,6 @@ int newcat_set_cmd_validate(RIG *rig)
RETURNFUNC(-RIG_ENIMPL);
}
- if (strlen(valcmd) == 0) { return RIG_OK; }
-
while (rc != RIG_OK && retry++ < retries)
{
int bytes;
@@ -9739,6 +9737,8 @@ int newcat_set_cmd_validate(RIG *rig)
if (rc != RIG_OK) { RETURNFUNC(-RIG_EIO); }
+ if (strlen(valcmd) == 0) { RETURNFUNC(RIG_OK); }
+
bytes = read_string(&state->rigport, priv->ret_data, sizeof(priv->ret_data),
&cat_term, sizeof(cat_term));
diff --git a/rigs/yaesu/newcat.h b/rigs/yaesu/newcat.h
index 127ebfbb..19ea6aa0 100644
--- a/rigs/yaesu/newcat.h
+++ b/rigs/yaesu/newcat.h
@@ -50,7 +50,7 @@
typedef char ncboolean;
/* shared function version */
-#define NEWCAT_VER "20210308"
+#define NEWCAT_VER "20210309"
/* Hopefully large enough for future use, 128 chars plus '\0' */
#define NEWCAT_DATA_LEN 129
-----------------------------------------------------------------------
Summary of changes:
rigs/yaesu/ftdx101.c | 25 ++-----------------------
rigs/yaesu/ftdx101.h | 17 +++++++++++++++++
rigs/yaesu/ftdx101mp.c | 4 ++--
rigs/yaesu/newcat.c | 4 ++--
rigs/yaesu/newcat.h | 2 +-
5 files changed, 24 insertions(+), 28 deletions(-)
hooks/post-receive
--
Hamlib -- Ham radio control libraries
|
