[Hamlib-commits] Hamlib -- Ham radio control libraries branch master updated. 8e1fae4ea44fd47f58526
Library to control radio transceivers and receivers
Brought to you by:
n0nb
Menu
▾
▴
[Hamlib-commits] Hamlib -- Ham radio control libraries branch master updated. 8e1fae4ea44fd47f585262f34abd82f9eba48c9e
|
From: Michael B. <mdb...@us...> - 2021-04-01 22:57:21
|
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 8e1fae4ea44fd47f585262f34abd82f9eba48c9e (commit)
via ac5a94a6f19338bee22d7036dcf6225b7979f1b0 (commit)
via ca090e258c9987ddfe4ea21c518ef626110d0a07 (commit)
via 42c842c1a56c8b6be67dfa467e050a0e36ec9d03 (commit)
via da46e7cbdffd42675b85b96315a82f477bbec4f1 (commit)
via bcb3aaf162c8b1bc97716263a93c551cb7f211ee (commit)
via 92a4b76c0bd8627c80eb48a31205a4ff982d48df (commit)
via c6608569fcd07895d2a1a8f523b8851fd55e3957 (commit)
via 36fbb266559f6945d59da5527771a153a3a9cb06 (commit)
via ebbf96efacb82289a7c8752dcf8c3c3fc302b0d1 (commit)
via 169c0ed2b59db5b6f1591ba03a35b3971bb11112 (commit)
via b696391a66d2f2a5a521ef40f2d1f231ce5a7f4b (commit)
via b16eb6ac425d165028e1a076b5ee593dc840298a (commit)
via ea269b224c939a7772380d18ffc3defa56f7be11 (commit)
via 1bac47ecc140c9c2911b93c5c00f63742b7f1992 (commit)
via dcf7d10b253cd27921c68196f5b642b1e89982d5 (commit)
via fffaf27f872701fa8469c68194d0dba02e3d2fc0 (commit)
via 91527ccd54b85d6db4bee71b47728c7dec60f816 (commit)
via 3317dd3d7a0f7eab99ad8c71b7df17ed3a01ec1d (commit)
via 0063cb7549a7393957a80bb4010864adda88b727 (commit)
from e70d33f59db41d586d76a7db2d6a3427019f7325 (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 8e1fae4ea44fd47f585262f34abd82f9eba48c9e
Author: Mike Black W9MDB <mdb...@ya...>
Date: Thu Apr 1 08:02:49 2021 -0500
Fix rig_set_split_freq in rig.c -- was not setting freq at all for non-targetable rigs
https://github.com/Hamlib/Hamlib/issues/640
diff --git a/src/rig.c b/src/rig.c
index f8ab6d0e..14ab3cfd 100644
--- a/src/rig.c
+++ b/src/rig.c
@@ -3605,22 +3605,19 @@ int HAMLIB_API rig_set_split_freq(RIG *rig, vfo_t vfo, freq_t tx_freq)
do
{
-#if 0 // this verification seems to be causing bad behavior on some reigs
-
+ // doing get_freq seems to break on some rigs that can't read freq immediately after set
if (caps->set_split_freq)
{
retcode = caps->set_split_freq(rig, vfo, tx_freq);
- rig_get_freq(rig, vfo, &tfreq);
+ //rig_get_freq(rig, vfo, &tfreq);
}
else
{
retcode = rig_set_freq(rig, RIG_VFO_CURR, tx_freq);
- rig_get_freq(rig, vfo, &tfreq);
+ //rig_get_freq(rig, vfo, &tfreq);
}
-#else
tfreq = tx_freq;
-#endif
}
while (tfreq != tx_freq && retry-- > 0 && retcode == RIG_OK);
commit ac5a94a6f19338bee22d7036dcf6225b7979f1b0
Author: Mike Black W9MDB <mdb...@ya...>
Date: Thu Apr 1 07:57:49 2021 -0500
Fix debug statement in rig.c
diff --git a/src/rig.c b/src/rig.c
index 77160795..f8ab6d0e 100644
--- a/src/rig.c
+++ b/src/rig.c
@@ -4042,7 +4042,7 @@ int HAMLIB_API rig_set_split_freq_mode(RIG *rig,
// in split mode we alwasy use VFOB
// in the future we may start using RIG_VFO_TX and let the backend figure out what VFO to use
vfo = RIG_VFO_B; // in split mode we always use VFOB
- rig_debug(RIG_DEBUG_VERBOSE, "%s: vfo=%s, tx_freq=%.0f, tx_mode=%s, tx_width=%d\n", __func__, rig_strvfo(vfo), tx_freq, rig_strvfo(tx_mode), (int)tx_width);
+ rig_debug(RIG_DEBUG_VERBOSE, "%s: vfo=%s, tx_freq=%.0f, tx_mode=%s, tx_width=%d\n", __func__, rig_strvfo(vfo), tx_freq, rig_strrmode(tx_mode), (int)tx_width);
if (caps->set_split_freq_mode)
{
commit ca090e258c9987ddfe4ea21c518ef626110d0a07
Author: Mike Black W9MDB <mdb...@ya...>
Date: Wed Mar 31 22:55:36 2021 -0500
Force rig_set_split_freq_mode to use VFOB
https://github.com/Hamlib/Hamlib/issues/640
diff --git a/src/rig.c b/src/rig.c
index f229fb09..77160795 100644
--- a/src/rig.c
+++ b/src/rig.c
@@ -4039,6 +4039,10 @@ int HAMLIB_API rig_set_split_freq_mode(RIG *rig,
caps = rig->caps;
+ // in split mode we alwasy use VFOB
+ // in the future we may start using RIG_VFO_TX and let the backend figure out what VFO to use
+ vfo = RIG_VFO_B; // in split mode we always use VFOB
+ rig_debug(RIG_DEBUG_VERBOSE, "%s: vfo=%s, tx_freq=%.0f, tx_mode=%s, tx_width=%d\n", __func__, rig_strvfo(vfo), tx_freq, rig_strvfo(tx_mode), (int)tx_width);
if (caps->set_split_freq_mode)
{
commit 42c842c1a56c8b6be67dfa467e050a0e36ec9d03
Merge: da46e7cb bcb3aaf1
Author: Mike Black W9MDB <mdb...@ya...>
Date: Wed Mar 31 22:17:09 2021 -0500
Merge branch 'master' of https://github.com/Hamlib/Hamlib
commit da46e7cbdffd42675b85b96315a82f477bbec4f1
Author: Mike Black W9MDB <mdb...@ya...>
Date: Wed Mar 31 22:16:21 2021 -0500
Remove 3.8 python check from configure.ac to enable Mac python bindings work on python 3.8/3.9
https://github.com/Hamlib/Hamlib/issues/642
diff --git a/configure.ac b/configure.ac
index 5c49ee4d..4ba505b3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -578,12 +578,6 @@ dnl Determine whether to install pytest.py or py3test.py to $(docdir)/examples
AM_PYTHON_CHECK_VERSION([${PYTHON}], [3.0], [pyver_3="yes"], [pyver_3="no"])
AM_CONDITIONAL([PYVER_3], [test x"${pyver_3}" = x"yes"])
-dnl Determine whether to link libpython as it is unneeded for Python >= 3.8
-AM_PYTHON_CHECK_VERSION([${PYTHON}], [3.8], [pyver_3_8="yes"], [pyver_3_8="no"])
-AS_IF([test x"${pyver_3_8}" = "xyes"],[
- PYTHON_LIBS=""
-])
-
# Tcl binding
AC_MSG_CHECKING([Whether to build Tcl bindings])
AC_ARG_WITH([tcl-binding],
commit bcb3aaf162c8b1bc97716263a93c551cb7f211ee
Author: Michael Black W9MDB <mdb...@ya...>
Date: Wed Mar 31 16:37:46 2021 -0500
Increase flrig timeout to 2 seconds
diff --git a/rigs/dummy/flrig.c b/rigs/dummy/flrig.c
index 9efa9ca2..4ef18e6d 100644
--- a/rigs/dummy/flrig.c
+++ b/rigs/dummy/flrig.c
@@ -129,7 +129,7 @@ const struct rig_caps flrig_caps =
.port_type = RIG_PORT_NETWORK,
.write_delay = 0,
.post_write_delay = 0,
- .timeout = 1000,
+ .timeout = 2000,
.retry = 2,
.has_get_func = RIG_FUNC_NONE,
diff --git a/rigs/dummy/flrig.h b/rigs/dummy/flrig.h
index 464a8db0..59f9a975 100644
--- a/rigs/dummy/flrig.h
+++ b/rigs/dummy/flrig.h
@@ -28,7 +28,7 @@
#include <sys/time.h>
#endif
-#define BACKEND_VER "20210315"
+#define BACKEND_VER "20210331"
#define EOM "\r"
#define TRUE 1
commit 92a4b76c0bd8627c80eb48a31205a4ff982d48df
Merge: ebbf96ef c6608569
Author: Mike Black W9MDB <mdb...@ya...>
Date: Wed Mar 31 16:29:03 2021 -0500
Merge branch 'master' of https://github.com/Hamlib/Hamlib
commit c6608569fcd07895d2a1a8f523b8851fd55e3957
Merge: 36fbb266 169c0ed2
Author: Michael Black W9MDB <mdb...@ya...>
Date: Wed Mar 31 11:41:06 2021 -0500
Merge branch 'master' of https://github.com/Hamlib/Hamlib
commit 36fbb266559f6945d59da5527771a153a3a9cb06
Author: Michael Black W9MDB <mdb...@ya...>
Date: Wed Mar 31 11:40:48 2021 -0500
Fix parsing of targetable_vfo in netrigctl.c
diff --git a/rigs/dummy/netrigctl.c b/rigs/dummy/netrigctl.c
index c8de5277..575fa567 100644
--- a/rigs/dummy/netrigctl.c
+++ b/rigs/dummy/netrigctl.c
@@ -584,9 +584,8 @@ static int netrigctl_open(RIG *rig)
}
else if (strcmp(setting, "targetable_vfo") == 0)
{
- int has = strtol(value, NULL, 0);
-
- if (!has) { rig->caps->targetable_vfo = strtol(value, NULL, 0); }
+ rig->caps->targetable_vfo = strtol(value, NULL, 0);
+ rig_debug(RIG_DEBUG_ERR, "%s: targetable_vfo=0x%2x\n", __func__, rig->caps->targetable_vfo);
}
else if (strcmp(setting, "has_set_vfo") == 0)
{
commit ebbf96efacb82289a7c8752dcf8c3c3fc302b0d1
Author: Mike Black W9MDB <mdb...@ya...>
Date: Wed Mar 31 07:41:16 2021 -0500
Fix spelling error in rig.c
diff --git a/src/rig.c b/src/rig.c
index c4813acb..f229fb09 100644
--- a/src/rig.c
+++ b/src/rig.c
@@ -3571,7 +3571,7 @@ int HAMLIB_API rig_set_split_freq(RIG *rig, vfo_t vfo, freq_t tx_freq)
if (retcode != RIG_OK) { RETURNFUNC(retcode); }
-#if 0 // this verification seems to be causing bad behavior on some reigs
+#if 0 // this verification seems to be causing bad behavior on some rigs
retcode = rig_get_freq(rig, tx_vfo, &tfreq);
#else
tfreq = tx_freq;
commit 169c0ed2b59db5b6f1591ba03a35b3971bb11112
Author: Mike Black W9MDB <mdb...@ya...>
Date: Tue Mar 30 23:05:04 2021 -0500
Fix rig_set_split_vfo to use tx_vfo on non-vfo swap check
https://github.com/Hamlib/Hamlib/issues/640
diff --git a/src/rig.c b/src/rig.c
index ffa9560e..c4813acb 100644
--- a/src/rig.c
+++ b/src/rig.c
@@ -3535,10 +3535,20 @@ int HAMLIB_API rig_set_split_freq(RIG *rig, vfo_t vfo, freq_t tx_freq)
caps = rig->caps;
+ /* Use previously setup TxVFO */
+ if (vfo == RIG_VFO_CURR || vfo == RIG_VFO_TX)
+ {
+ tx_vfo = rig->state.tx_vfo;
+ }
+ else
+ {
+ tx_vfo = vfo;
+ }
+
if (caps->set_split_freq
&& (vfo == RIG_VFO_CURR
|| vfo == RIG_VFO_TX
- || vfo == rig->state.current_vfo))
+ || tx_vfo == rig->state.current_vfo))
{
retcode = caps->set_split_freq(rig, vfo, tx_freq);
RETURNFUNC(retcode);
@@ -3550,16 +3560,6 @@ int HAMLIB_API rig_set_split_freq(RIG *rig, vfo_t vfo, freq_t tx_freq)
/* Assisted mode */
curr_vfo = rig->state.current_vfo;
- /* Use previously setup TxVFO */
- if (vfo == RIG_VFO_CURR || vfo == RIG_VFO_TX)
- {
- tx_vfo = rig->state.tx_vfo;
- }
- else
- {
- tx_vfo = vfo;
- }
-
if (caps->set_freq && (caps->targetable_vfo & RIG_TARGETABLE_FREQ))
{
int retry = 3;
commit b696391a66d2f2a5a521ef40f2d1f231ce5a7f4b
Author: Michael Black W9MDB <mdb...@ya...>
Date: Tue Mar 30 15:40:17 2021 -0500
Try another method of setting Icom default vfo
diff --git a/rigs/icom/icom.c b/rigs/icom/icom.c
index 7316a06d..5ad415ba 100644
--- a/rigs/icom/icom.c
+++ b/rigs/icom/icom.c
@@ -45,6 +45,7 @@
#include "frame.h"
static int set_vfo_curr(RIG *rig, vfo_t vfo, vfo_t curr_vfo);
+static int icom_set_default_vfo(RIG *rig);
const cal_table_float_t icom_default_swr_cal =
{
@@ -804,7 +805,7 @@ icom_rig_open(RIG *rig)
}
}
- rig_set_vfo(rig,RIG_VFO_MAIN_A); // set rig to default vfo
+ icom_set_default_vfo(rig);
priv->poweron = 1;
if (rig->caps->has_get_func & RIG_FUNC_SATMODE)
@@ -877,7 +878,7 @@ icom_rig_close(RIG *rig)
* So they will get defaults of Main/VFOA as the selected VFO
* and we force that selection
*/
-int icom_set_default_vfo(RIG *rig)
+static int icom_set_default_vfo(RIG *rig)
{
int retval;
commit b16eb6ac425d165028e1a076b5ee593dc840298a
Author: Michael Black W9MDB <mdb...@ya...>
Date: Tue Mar 30 14:48:41 2021 -0500
Force Icom rigs to MAIN_A on open
diff --git a/rigs/icom/icom.c b/rigs/icom/icom.c
index cb325b5d..7316a06d 100644
--- a/rigs/icom/icom.c
+++ b/rigs/icom/icom.c
@@ -804,6 +804,7 @@ icom_rig_open(RIG *rig)
}
}
+ rig_set_vfo(rig,RIG_VFO_MAIN_A); // set rig to default vfo
priv->poweron = 1;
if (rig->caps->has_get_func & RIG_FUNC_SATMODE)
commit ea269b224c939a7772380d18ffc3defa56f7be11
Author: Michael Black W9MDB <mdb...@ya...>
Date: Tue Mar 30 14:43:57 2021 -0500
Fix vfo selection for Icom rigs when in split mode
https://github.com/Hamlib/Hamlib/issues/637
diff --git a/rigs/icom/icom.c b/rigs/icom/icom.c
index 47ce5409..cb325b5d 100644
--- a/rigs/icom/icom.c
+++ b/rigs/icom/icom.c
@@ -2241,6 +2241,8 @@ int icom_set_vfo(RIG *rig, vfo_t vfo)
{
// If we're being asked for A/Main but we are a MainA/MainB rig change it
vfo = RIG_VFO_MAIN;
+
+ if (rig->state.cache.split == RIG_SPLIT_ON) { vfo = RIG_VFO_A; }
}
else if ((vfo == RIG_VFO_B || vfo == RIG_VFO_SUB) && VFO_HAS_DUAL)
{
@@ -2252,6 +2254,7 @@ int icom_set_vfo(RIG *rig, vfo_t vfo)
{
vfo = RIG_VFO_SUB_A;
}
+ else if (rig->state.cache.split == RIG_SPLIT_ON) { vfo = RIG_VFO_B; }
}
else if ((vfo == RIG_VFO_A || vfo == RIG_VFO_B) && !VFO_HAS_A_B
&& VFO_HAS_MAIN_SUB)
commit 1bac47ecc140c9c2911b93c5c00f63742b7f1992
Author: Michael Black W9MDB <mdb...@ya...>
Date: Tue Mar 30 12:04:16 2021 -0500
Add VFO abtstraction info
diff --git a/VFOs.txt b/VFOs.txt
new file mode 100644
index 00000000..0e55edfe
--- /dev/null
+++ b/VFOs.txt
@@ -0,0 +1,23 @@
+VFO Abstraction
+2021-03-30
+Mike Black W9MDB
+
+Main_A
+ RIG_VFO_A
+ RIG_VFO_MAIN
+ RIG_VFO_MAIN_A
+Main_B
+ RIG_VFO_B
+ RIG_VFO_SUB -- for single VFO rig or dual VFO not in satmode
+ RIG_VFO_MAIN_B
+Sub_A
+ RIG_VFO_SUB -- for dual VFO when in satmode
+ RIG_VFO_SUB_A
+Sub_B
+ RIG_VFO_SUB_B -- unknown use for this so far but has set/get functions
+
+Main_C
+ RIG_VFO_C -- - unknown use for this so far but has set/get functions
+ RIG_VFO_MAIN_C -- - unknown use for this so far but has set/get functions
+Sub_C
+ RIG_VFO_SUB_C -- unknown use for this so far but has set/get functions
commit dcf7d10b253cd27921c68196f5b642b1e89982d5
Merge: fffaf27f 91527ccd
Author: Michael Black W9MDB <mdb...@ya...>
Date: Tue Mar 30 11:49:25 2021 -0500
Merge branch 'master' of https://github.com/Hamlib/Hamlib
commit fffaf27f872701fa8469c68194d0dba02e3d2fc0
Author: Michael Black W9MDB <mdb...@ya...>
Date: Tue Mar 30 11:48:25 2021 -0500
Change icom.c to use Main instead of Main_A and Sub instead of Main_B
https://github.com/Hamlib/Hamlib/issues/637
diff --git a/rigs/icom/icom.c b/rigs/icom/icom.c
index 0afebe10..47ce5409 100644
--- a/rigs/icom/icom.c
+++ b/rigs/icom/icom.c
@@ -2240,12 +2240,12 @@ int icom_set_vfo(RIG *rig, vfo_t vfo)
else if ((vfo == RIG_VFO_A || vfo == RIG_VFO_MAIN) && VFO_HAS_DUAL)
{
// If we're being asked for A/Main but we are a MainA/MainB rig change it
- vfo = RIG_VFO_MAIN_A;
+ vfo = RIG_VFO_MAIN;
}
else if ((vfo == RIG_VFO_B || vfo == RIG_VFO_SUB) && VFO_HAS_DUAL)
{
// If we're being asked for B/Sub but we are a MainA/MainB rig change it
- vfo = RIG_VFO_MAIN_B;
+ vfo = RIG_VFO_SUB;
// If we're in satmode for rigs like IC9700 we want the 2nd VFO
if (rig->state.cache.satmode)
diff --git a/rigs/icom/icom.h b/rigs/icom/icom.h
index c43fc484..286e6536 100644
--- a/rigs/icom/icom.h
+++ b/rigs/icom/icom.h
@@ -30,7 +30,7 @@
#include <sys/time.h>
#endif
-#define BACKEND_VER "20210326"
+#define BACKEND_VER "20210330"
/*
* defines used by comp_cal_str in rig.c
commit 91527ccd54b85d6db4bee71b47728c7dec60f816
Author: Michael Black W9MDB <mdb...@ya...>
Date: Tue Mar 30 11:25:13 2021 -0500
Fix merge error in ft857.c
https://github.com/Hamlib/Hamlib/issues/636
diff --git a/rigs/yaesu/ft857.c b/rigs/yaesu/ft857.c
index b4d6df76..3b0768ef 100644
--- a/rigs/yaesu/ft857.c
+++ b/rigs/yaesu/ft857.c
@@ -155,11 +155,7 @@ const struct rig_caps ft857_caps =
RIG_MODEL(RIG_MODEL_FT857),
.model_name = "FT-857",
.mfg_name = "Yaesu",
-<<<<<<< HEAD
.version = "20210330.0",
-=======
- .version = "20210329.0",
->>>>>>> e70d33f59db41d586d76a7db2d6a3427019f7325
.copyright = "LGPL",
.status = RIG_STATUS_STABLE,
.rig_type = RIG_TYPE_TRANSCEIVER,
commit 3317dd3d7a0f7eab99ad8c71b7df17ed3a01ec1d
Merge: 0063cb75 e70d33f5
Author: Michael Black W9MDB <mdb...@ya...>
Date: Tue Mar 30 10:54:39 2021 -0500
Merge branch 'master' of https://github.com/Hamlib/Hamlib
diff --cc rigs/yaesu/ft857.c
index eb133ba9,f4602deb..b4d6df76
--- a/rigs/yaesu/ft857.c
+++ b/rigs/yaesu/ft857.c
@@@ -155,7 -155,7 +155,11 @@@ const struct rig_caps ft857_caps
RIG_MODEL(RIG_MODEL_FT857),
.model_name = "FT-857",
.mfg_name = "Yaesu",
++<<<<<<< HEAD
+ .version = "20210330.0",
++=======
+ .version = "20210329.0",
++>>>>>>> e70d33f59db41d586d76a7db2d6a3427019f7325
.copyright = "LGPL",
.status = RIG_STATUS_STABLE,
.rig_type = RIG_TYPE_TRANSCEIVER,
commit 0063cb7549a7393957a80bb4010864adda88b727
Author: Michael Black W9MDB <mdb...@ya...>
Date: Tue Mar 30 10:53:47 2021 -0500
In ft857.c add a 200ms delay during set_ptt OFF -- seems to take a while to come out of TX
https://github.com/Hamlib/Hamlib/issues/636
diff --git a/rigs/yaesu/ft857.c b/rigs/yaesu/ft857.c
index 0ed04f5e..eb133ba9 100644
--- a/rigs/yaesu/ft857.c
+++ b/rigs/yaesu/ft857.c
@@ -155,7 +155,7 @@ const struct rig_caps ft857_caps =
RIG_MODEL(RIG_MODEL_FT857),
.model_name = "FT-857",
.mfg_name = "Yaesu",
- .version = "20210221.0",
+ .version = "20210330.0",
.copyright = "LGPL",
.status = RIG_STATUS_STABLE,
.rig_type = RIG_TYPE_TRANSCEIVER,
@@ -1083,6 +1083,7 @@ int ft857_set_ptt(RIG *rig, vfo_t vfo, ptt_t ptt)
}
n = ft857_send_cmd(rig, index);
+ if (ptt == RIG_PTT_OFF) hl_usleep(200*1000); // FT857 takes a bit to come out of PTT
rig_force_cache_timeout(&((struct ft857_priv_data *)
rig->state.priv)->tx_status_tv);
-----------------------------------------------------------------------
Summary of changes:
VFOs.txt | 23 +++++++++++++++++++++++
configure.ac | 6 ------
rigs/dummy/flrig.c | 2 +-
rigs/dummy/flrig.h | 2 +-
rigs/dummy/netrigctl.c | 5 ++---
rigs/icom/icom.c | 11 ++++++++---
rigs/icom/icom.h | 2 +-
rigs/yaesu/ft857.c | 3 ++-
src/rig.c | 37 +++++++++++++++++++------------------
9 files changed, 57 insertions(+), 34 deletions(-)
create mode 100644 VFOs.txt
hooks/post-receive
--
Hamlib -- Ham radio control libraries
|
