[Hamlib-commits] Hamlib -- Ham radio control libraries branch master updated. d6baea110e2d799975b80
Library to control radio transceivers and receivers
Brought to you by:
n0nb
Menu
▾
▴
[Hamlib-commits] Hamlib -- Ham radio control libraries branch master updated. d6baea110e2d799975b80c61262cde3cf386c591
|
From: Michael B. <mdb...@us...> - 2021-01-22 06:02:44
|
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 d6baea110e2d799975b80c61262cde3cf386c591 (commit)
via 63b3bfcaa4e3b26635667845dae046e2629c8764 (commit)
via c93060937949c977d9c231eae3335c6ab7512f15 (commit)
via 04bb1b3e791f2fa039110e962075df2fd3f56806 (commit)
via b030d731445d84c46c617bb434c2d2e8cf7d738a (commit)
via 9a870577d0dbbe4368ac186e92e05497c7d90257 (commit)
via b56a577ebb78c667a7b153c0cd4db5e18bfab7a0 (commit)
via bf52ea58d728a4a74701a223708bfdbce389967e (commit)
from 0058cffcc7255ba855bc75129c9ece878e0b829d (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 d6baea110e2d799975b80c61262cde3cf386c591
Author: Michael Black W9MDB <mdb...@ya...>
Date: Thu Jan 21 23:54:21 2021 -0600
Add 32-bit Intel and 32-bit Arm checks to rigtestcaps.c
diff --git a/tests/testrigcaps.c b/tests/testrigcaps.c
index 947c0ecc..1f1d7290 100644
--- a/tests/testrigcaps.c
+++ b/tests/testrigcaps.c
@@ -20,6 +20,8 @@ int main()
#else
int expected = 13280; // should be most 64-bit compilers
#endif
+ if (offset == 9384) expected = 9384; // 32-bit Intel
+ if (offset == 10144) expected = 10144; // 32-bit Arm
if (offset != expected)
{
@@ -39,6 +41,8 @@ int main()
#else
expected = 13696;
#endif
+ if (offset == 9676) expected = 9676; // 32-bit Intel
+ if (offset == 10448) expected = 10448; // 32-bit Arm
if (offset != expected)
{
commit 63b3bfcaa4e3b26635667845dae046e2629c8764
Author: Michael Black W9MDB <mdb...@ya...>
Date: Thu Jan 21 23:45:02 2021 -0600
In newcat.c try to handle the case were AI is on and we need to turn it off
diff --git a/rigs/yaesu/newcat.c b/rigs/yaesu/newcat.c
index a95db6c3..22fb53bd 100644
--- a/rigs/yaesu/newcat.c
+++ b/rigs/yaesu/newcat.c
@@ -745,7 +745,9 @@ int newcat_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
/* duplicate the following line to add more rigs */
special_60m = newcat_is_rig(rig, RIG_MODEL_FTDX5000);
special_60m |= newcat_is_rig(rig, RIG_MODEL_FT450);
- rig_debug(RIG_DEBUG_TRACE, "%s: special_60m=%d, 60m freq=%d, is_ftdx3000=%d\n", __func__, special_60m, freq >= 5300000 && freq <= 5410000, newcat_is_rig(rig, RIG_MODEL_FTDX3000));
+ rig_debug(RIG_DEBUG_TRACE, "%s: special_60m=%d, 60m freq=%d, is_ftdx3000=%d\n",
+ __func__, special_60m, freq >= 5300000
+ && freq <= 5410000, newcat_is_rig(rig, RIG_MODEL_FTDX3000));
if (special_60m && (freq >= 5300000 && freq <= 5410000))
{
@@ -779,7 +781,7 @@ int newcat_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
and select the correct VFO before setting the frequency
*/
// Plus we can't do the VFO swap if transmitting
- if (target_vfo == 'B' && rig->state.cache.ptt == RIG_PTT_ON) return -RIG_ENTARGET;
+ if (target_vfo == 'B' && rig->state.cache.ptt == RIG_PTT_ON) { return -RIG_ENTARGET; }
snprintf(priv->cmd_str, sizeof(priv->cmd_str), "VS%c", cat_term);
@@ -6136,6 +6138,12 @@ int newcat_get_trn(RIG *rig, int *trn)
/* Get Auto Information */
if (RIG_OK != (err = newcat_get_cmd(rig)))
{
+ // if we failed to get AI we turn it off and try again
+ snprintf(priv->cmd_str, sizeof(priv->cmd_str), "%s0%c", command, cat_term);
+ hl_usleep(500 * 1000); // is 500ms enough for the rig to stop sending info?
+ newcat_set_cmd(rig); // don't care about the return here
+ snprintf(priv->cmd_str, sizeof(priv->cmd_str), "%s%c", command, cat_term);
+ err = newcat_get_cmd(rig);
RETURNFUNC(err);
}
commit c93060937949c977d9c231eae3335c6ab7512f15
Author: Michael Black W9MDB <mdb...@ya...>
Date: Thu Jan 21 23:11:20 2021 -0600
Update debug in newcat.c to add some more info
diff --git a/rigs/yaesu/newcat.c b/rigs/yaesu/newcat.c
index b425100f..a95db6c3 100644
--- a/rigs/yaesu/newcat.c
+++ b/rigs/yaesu/newcat.c
@@ -745,7 +745,7 @@ int newcat_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
/* duplicate the following line to add more rigs */
special_60m = newcat_is_rig(rig, RIG_MODEL_FTDX5000);
special_60m |= newcat_is_rig(rig, RIG_MODEL_FT450);
- rig_debug(RIG_DEBUG, "%s: special_60m=%d, 60m freq=%d\n", special_60m, freq >= 5300000 && freq <= 5410000));
+ rig_debug(RIG_DEBUG_TRACE, "%s: special_60m=%d, 60m freq=%d, is_ftdx3000=%d\n", __func__, special_60m, freq >= 5300000 && freq <= 5410000, newcat_is_rig(rig, RIG_MODEL_FTDX3000));
if (special_60m && (freq >= 5300000 && freq <= 5410000))
{
commit 04bb1b3e791f2fa039110e962075df2fd3f56806
Author: Michael Black W9MDB <mdb...@ya...>
Date: Thu Jan 21 23:09:04 2021 -0600
Add some debug for special_60m in newcat.c
FTDX3000 was not being detected correctly
diff --git a/rigs/yaesu/newcat.c b/rigs/yaesu/newcat.c
index 36ee162b..b425100f 100644
--- a/rigs/yaesu/newcat.c
+++ b/rigs/yaesu/newcat.c
@@ -745,6 +745,7 @@ int newcat_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
/* duplicate the following line to add more rigs */
special_60m = newcat_is_rig(rig, RIG_MODEL_FTDX5000);
special_60m |= newcat_is_rig(rig, RIG_MODEL_FT450);
+ rig_debug(RIG_DEBUG, "%s: special_60m=%d, 60m freq=%d\n", special_60m, freq >= 5300000 && freq <= 5410000));
if (special_60m && (freq >= 5300000 && freq <= 5410000))
{
commit b030d731445d84c46c617bb434c2d2e8cf7d738a
Author: Michael Black W9MDB <mdb...@ya...>
Date: Thu Jan 21 22:59:34 2021 -0600
Have FTDX3000 ignore BS02 command
Allow FTDX3000 to set 60M frequencies
diff --git a/rigs/yaesu/newcat.c b/rigs/yaesu/newcat.c
index 5c55976b..36ee162b 100644
--- a/rigs/yaesu/newcat.c
+++ b/rigs/yaesu/newcat.c
@@ -740,9 +740,10 @@ int newcat_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
/* vfo should now be modified to a valid VFO constant. */
/* DX3000/DX5000/450 can only do VFO_MEM on 60M */
/* So we will not change freq in that case */
- special_60m = newcat_is_rig(rig, RIG_MODEL_FTDX3000);
+ // did have FTDX3000 as not capable of 60M set_freq but as of 2021-01-21 it works
+ // special_60m = newcat_is_rig(rig, RIG_MODEL_FTDX3000);
/* duplicate the following line to add more rigs */
- special_60m |= newcat_is_rig(rig, RIG_MODEL_FTDX5000);
+ special_60m = newcat_is_rig(rig, RIG_MODEL_FTDX5000);
special_60m |= newcat_is_rig(rig, RIG_MODEL_FT450);
if (special_60m && (freq >= 5300000 && freq <= 5410000))
@@ -848,6 +849,7 @@ int newcat_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
&& !rig->state.disable_yaesu_bandselect
// remove the split check here -- hopefully works OK
//&& !rig->state.cache.split
+ && !(is_ftdx3000 && newcat_band_index(freq) == 2)
&& !is_ft891 // 891 does not remember bandwidth so don't do this
&& rig->caps->get_vfo != NULL
&& rig->caps->set_vfo != NULL) // gotta' have get_vfo too
commit 9a870577d0dbbe4368ac186e92e05497c7d90257
Author: Michael Black W9MDB <mdb...@ya...>
Date: Thu Jan 21 22:42:19 2021 -0600
Fix FTDX3000 SH commands
diff --git a/rigs/yaesu/newcat.c b/rigs/yaesu/newcat.c
index c9814757..5c55976b 100644
--- a/rigs/yaesu/newcat.c
+++ b/rigs/yaesu/newcat.c
@@ -7862,7 +7862,7 @@ int newcat_set_rx_bandwidth(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
snprintf(priv->cmd_str, sizeof(priv->cmd_str), "SH%c%d%02d;", main_sub_vfo, on,
w);
}
- else if (is_ft2000 || is_ftdx10)
+ else if (is_ft2000 || is_ftdx10 || is_ftdx3000)
{
snprintf(priv->cmd_str, sizeof(priv->cmd_str), "SH0%02d;", w);
}
@@ -8092,7 +8092,7 @@ int newcat_get_rx_bandwidth(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t *width)
if (sh_command_valid)
{
- if (is_ft2000 || is_ftdx10)
+ if (is_ft2000 || is_ftdx10 || is_ftdx3000)
{
snprintf(priv->cmd_str, sizeof(priv->cmd_str), "%s0%c", cmd, cat_term);
}
commit b56a577ebb78c667a7b153c0cd4db5e18bfab7a0
Author: Michael Black W9MDB <mdb...@ya...>
Date: Thu Jan 21 22:39:43 2021 -0600
Fix FTDX10 FT command
diff --git a/rigs/yaesu/newcat.c b/rigs/yaesu/newcat.c
index aff33cde..c9814757 100644
--- a/rigs/yaesu/newcat.c
+++ b/rigs/yaesu/newcat.c
@@ -6722,6 +6722,7 @@ int newcat_set_tx_vfo(RIG *rig, vfo_t tx_vfo)
newcat_is_rig(rig, RIG_MODEL_FTDX5000) ||
newcat_is_rig(rig, RIG_MODEL_FTDX1200) ||
newcat_is_rig(rig, RIG_MODEL_FT991) ||
+ newcat_is_rig(rig, RIG_MODEL_FTDX10) ||
newcat_is_rig(rig, RIG_MODEL_FTDX3000))
{
p1 = p1 + 2; /* use non-Toggle commands */
commit bf52ea58d728a4a74701a223708bfdbce389967e
Author: Michael Black W9MDB <mdb...@ya...>
Date: Thu Jan 21 22:36:24 2021 -0600
Fix FTDX10 SH commands
diff --git a/rigs/yaesu/newcat.c b/rigs/yaesu/newcat.c
index 704908d6..aff33cde 100644
--- a/rigs/yaesu/newcat.c
+++ b/rigs/yaesu/newcat.c
@@ -7854,14 +7854,14 @@ int newcat_set_rx_bandwidth(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
} /* end else */
- if (is_ftdx101 || is_ft891 || is_ftdx10)
+ if (is_ftdx101 || is_ft891)
{
// some rigs now require the bandwidth be turned "on"
int on = is_ft891;
snprintf(priv->cmd_str, sizeof(priv->cmd_str), "SH%c%d%02d;", main_sub_vfo, on,
w);
}
- else if (is_ft2000)
+ else if (is_ft2000 || is_ftdx10)
{
snprintf(priv->cmd_str, sizeof(priv->cmd_str), "SH0%02d;", w);
}
@@ -8091,7 +8091,7 @@ int newcat_get_rx_bandwidth(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t *width)
if (sh_command_valid)
{
- if (is_ft2000)
+ if (is_ft2000 || is_ftdx10)
{
snprintf(priv->cmd_str, sizeof(priv->cmd_str), "%s0%c", cmd, cat_term);
}
-----------------------------------------------------------------------
Summary of changes:
rigs/yaesu/newcat.c | 24 ++++++++++++++++++------
tests/testrigcaps.c | 4 ++++
2 files changed, 22 insertions(+), 6 deletions(-)
hooks/post-receive
--
Hamlib -- Ham radio control libraries
|
