[Hamlib-commits] Hamlib -- Ham radio control libraries branch master updated. c66044f89bc55e24395d3
Library to control radio transceivers and receivers
Brought to you by:
n0nb
Menu
▾
▴
[Hamlib-commits] Hamlib -- Ham radio control libraries branch master updated. c66044f89bc55e24395d31c9d227c322b4b57de0
|
From: Nate B. <n0...@us...> - 2020-06-18 21:57:40
|
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 c66044f89bc55e24395d31c9d227c322b4b57de0 (commit)
via 44a61ac9d908c1ffeb04b840aaaaca661f94b3c1 (commit)
via 95e869d087a0d186835cdaad19be6a9e027b6ce7 (commit)
via 90609a4bfc2dad91868f76e33860db225d66f964 (commit)
from 5d890fd1735726148bbe69718e6bc209a0157d89 (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 c66044f89bc55e24395d31c9d227c322b4b57de0
Author: Michael Black W9MDB <mdb...@ya...>
Date: Thu Jun 18 16:48:28 2020 -0500
Add set_split_vfo to ft1000mp.c
diff --git a/rigs/yaesu/ft1000mp.c b/rigs/yaesu/ft1000mp.c
index eec9b808..911e2879 100644
--- a/rigs/yaesu/ft1000mp.c
+++ b/rigs/yaesu/ft1000mp.c
@@ -230,7 +230,7 @@ const struct rig_caps ft1000mp_caps =
.serial_handshake = RIG_HANDSHAKE_NONE,
.write_delay = FT1000MP_WRITE_DELAY,
.post_write_delay = FT1000MP_POST_WRITE_DELAY,
- .timeout = 1000, // was 2000 -- see https://github.com/Hamlib/Hamlib/issues/308
+ .timeout = 500, // was 2000 -- see https://github.com/Hamlib/Hamlib/issues/308
.retry = 1,
.has_get_func = FT1000MP_FUNC_ALL,
.has_set_func = FT1000MP_FUNC_ALL,
@@ -325,6 +325,8 @@ const struct rig_caps ft1000mp_caps =
.set_vfo = ft1000mp_set_vfo, /* set vfo */
.get_vfo = ft1000mp_get_vfo, /* get vfo */
+ .set_split_vfo = ft1000mp_set_split_vfo,
+
.get_rit = ft1000mp_get_rit,
.set_rit = ft1000mp_set_rit,
.get_xit = ft1000mp_get_xit,
@@ -451,6 +453,8 @@ const struct rig_caps ft1000mpmkv_caps =
.set_vfo = ft1000mp_set_vfo, /* set vfo */
.get_vfo = ft1000mp_get_vfo, /* get vfo */
+ .set_split_vfo = ft1000mp_set_split_vfo,
+
.get_rit = ft1000mp_get_rit,
.set_rit = ft1000mp_set_rit,
.get_xit = ft1000mp_get_xit,
@@ -577,6 +581,8 @@ const struct rig_caps ft1000mpmkvfld_caps =
.set_vfo = ft1000mp_set_vfo, /* set vfo */
.get_vfo = ft1000mp_get_vfo, /* get vfo */
+ .set_split_vfo = ft1000mp_set_split_vfo,
+
.get_rit = ft1000mp_get_rit,
.set_rit = ft1000mp_set_rit,
.get_xit = ft1000mp_get_xit,
@@ -1506,3 +1512,35 @@ static int ft1000mp_send_priv_cmd(RIG *rig, unsigned char ci)
return RIG_OK;
}
+
+int newcat_set_split_vfo(RIG *rig, vfo_t vfo, split_t split, vfo_t tx_vfo)
+{
+ // FT1000 transmits on A and receives on B
+
+ unsigned char cmd_index = 0; /* index of sequence to send */
+
+ rig_debug(RIG_DEBUG_TRACE, "%s called rx_vfo=%s, tx_vfo=%s\n", __func__,
+ rig_strvfo(vfo), rig_strvfo(tx_vfo));
+
+ switch (split)
+ {
+ case RIG_SPLIT_OFF:
+ cmd_index = FT1000MP_NATIVE_SPLIT_OFF;
+ break;
+
+ case RIG_SPLIT_ON:
+ cmd_index = FT1000MP_NATIVE_SPLIT_ON;
+ break;
+
+ default:
+ rig_debug(RIG_DEBUG_VERBOSE, "%s: Unknown split value = %d\n", __func__, split);
+ return -RIG_EINVAL; /* sorry, wrong VFO */
+ }
+
+ rig->state.current_vfo = RIG_VFO_B; // Rx on VFO_B
+ rig->state.tx_vfo = RIG_VFO_A;
+ ft1000mp_send_priv_cmd(rig, FT1000MP_NATIVE_VFO_B); // make B active
+ ft1000mp_send_priv_cmd(rig, cmd_index);
+
+ return RIG_OK;
+}
commit 44a61ac9d908c1ffeb04b840aaaaca661f94b3c1
Author: Michael Black W9MDB <mdb...@ya...>
Date: Thu Jun 18 11:09:15 2020 -0500
Add debug for retry for ft1000mp
https://github.com/Hamlib/Hamlib/issues/308
diff --git a/rigs/yaesu/ft1000mp.c b/rigs/yaesu/ft1000mp.c
index d35513e9..eec9b808 100644
--- a/rigs/yaesu/ft1000mp.c
+++ b/rigs/yaesu/ft1000mp.c
@@ -1456,6 +1456,11 @@ static int ft1000mp_get_update_data(RIG *rig, unsigned char ci,
ft1000mp_send_priv_cmd(rig, ci);
n = read_block(&rig_s->rigport, (char *) p->update_data, rl);
+
+ if (n == -RIG_ETIMEOUT)
+ {
+ rig_debug(RIG_DEBUG_TRACE, "%s: Timeout retry count = %d\n", __func__, retry);
+ }
}
while (retry-- && n == -RIG_ETIMEOUT);
commit 95e869d087a0d186835cdaad19be6a9e027b6ce7
Author: Michael Black W9MDB <mdb...@ya...>
Date: Thu Jun 18 10:54:21 2020 -0500
Fix ft1000mp to use rig->state retry value instead of caps
https://github.com/Hamlib/Hamlib/issues/308
diff --git a/rigs/yaesu/ft1000mp.c b/rigs/yaesu/ft1000mp.c
index 781707b7..d35513e9 100644
--- a/rigs/yaesu/ft1000mp.c
+++ b/rigs/yaesu/ft1000mp.c
@@ -215,7 +215,7 @@ const struct rig_caps ft1000mp_caps =
RIG_MODEL(RIG_MODEL_FT1000MP),
.model_name = "FT-1000MP",
.mfg_name = "Yaesu",
- .version = "20200617.0",
+ .version = "20200618.0",
.copyright = "LGPL",
.status = RIG_STATUS_BETA,
.rig_type = RIG_TYPE_TRANSCEIVER,
@@ -341,7 +341,7 @@ const struct rig_caps ft1000mpmkv_caps =
RIG_MODEL(RIG_MODEL_FT1000MPMKV),
.model_name = "MARK-V FT-1000MP",
.mfg_name = "Yaesu",
- .version = "20200616.0",
+ .version = "20200618.0",
.copyright = "LGPL",
.status = RIG_STATUS_BETA,
.rig_type = RIG_TYPE_TRANSCEIVER,
@@ -467,7 +467,7 @@ const struct rig_caps ft1000mpmkvfld_caps =
RIG_MODEL(RIG_MODEL_FT1000MPMKVFLD),
.model_name = "MARK-V Field FT-1000MP",
.mfg_name = "Yaesu",
- .version = "20200616.0",
+ .version = "20200618.0",
.copyright = "LGPL",
.status = RIG_STATUS_BETA,
.rig_type = RIG_TYPE_TRANSCEIVER,
@@ -1316,7 +1316,7 @@ int ft1000mp_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
unsigned char lvl_data[YAESU_CMD_LENGTH];
int m;
int retval;
- int retry = rig->caps->retry;
+ int retry = rig->state.rigport.retry;
rs = &rig->state;
priv = (struct ft1000mp_priv_data *)rs->priv;
@@ -1442,7 +1442,7 @@ static int ft1000mp_get_update_data(RIG *rig, unsigned char ci,
struct rig_state *rig_s;
struct ft1000mp_priv_data *p;
int n; /* for read_ */
- int retry = rig->caps->retry;
+ int retry = rig->state.rigport.retry;
rig_debug(RIG_DEBUG_VERBOSE, "%s: called\n", __func__);
commit 90609a4bfc2dad91868f76e33860db225d66f964
Author: Michael Black W9MDB <mdb...@ya...>
Date: Wed Jun 17 22:29:32 2020 -0500
Move ft100mp get_vfo from init to open
diff --git a/rigs/yaesu/ft1000mp.c b/rigs/yaesu/ft1000mp.c
index 3027bb3c..781707b7 100644
--- a/rigs/yaesu/ft1000mp.c
+++ b/rigs/yaesu/ft1000mp.c
@@ -215,7 +215,7 @@ const struct rig_caps ft1000mp_caps =
RIG_MODEL(RIG_MODEL_FT1000MP),
.model_name = "FT-1000MP",
.mfg_name = "Yaesu",
- .version = "20200616.0",
+ .version = "20200617.0",
.copyright = "LGPL",
.status = RIG_STATUS_BETA,
.rig_type = RIG_TYPE_TRANSCEIVER,
@@ -621,7 +621,6 @@ int ft1000mp_init(RIG *rig)
FT1000MP_PACING_DEFAULT_VALUE; /* set pacing to minimum for now */
priv->read_update_delay =
FT1000MP_DEFAULT_READ_TIMEOUT; /* set update timeout to safe value */
- ft1000mp_get_vfo(rig, &rig->state.current_vfo);
return RIG_OK;
}
@@ -682,6 +681,7 @@ int ft1000mp_open(RIG *rig)
cmd = p->p_cmd;
write_block(&rig_s->rigport, (char *) cmd, YAESU_CMD_LENGTH);
+ ft1000mp_get_vfo(rig, &rig->state.current_vfo);
/* TODO */
return RIG_OK;
-----------------------------------------------------------------------
Summary of changes:
rigs/yaesu/ft1000mp.c | 57 ++++++++++++++++++++++++++++++++++++++++++++-------
1 file changed, 50 insertions(+), 7 deletions(-)
hooks/post-receive
--
Hamlib -- Ham radio control libraries
|
