[Hamlib-commits] Hamlib -- Ham radio control libraries branch master updated. 1d15625757a8abea22794
Library to control radio transceivers and receivers
Brought to you by:
n0nb
Menu
▾
▴
[Hamlib-commits] Hamlib -- Ham radio control libraries branch master updated. 1d15625757a8abea22794f2efb00be2ed13b9c8f
|
From: Michael B. <mdb...@us...> - 2020-12-19 23:05:04
|
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 1d15625757a8abea22794f2efb00be2ed13b9c8f (commit)
via 2b1bce89bf0834c35619442d5623be3c45cb0974 (commit)
via 5a208a871d115b485b08b17ddcd3a2a23af09ebb (commit)
from e5b7a5442d15fba365e6dc760b332c7e36dcabbf (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 1d15625757a8abea22794f2efb00be2ed13b9c8f
Author: Michael Black W9MDB <mdb...@ya...>
Date: Sat Dec 19 16:48:21 2020 -0600
Do not band select on FT891 as it does not remember bandwidth
diff --git a/rigs/yaesu/ft891.c b/rigs/yaesu/ft891.c
index 0740f055..adc5efa4 100644
--- a/rigs/yaesu/ft891.c
+++ b/rigs/yaesu/ft891.c
@@ -50,7 +50,7 @@ const struct rig_caps ft891_caps =
RIG_MODEL(RIG_MODEL_FT891),
.model_name = "FT-891",
.mfg_name = "Yaesu",
- .version = NEWCAT_VER ".2",
+ .version = NEWCAT_VER ".3",
.copyright = "LGPL",
.status = RIG_STATUS_STABLE,
.rig_type = RIG_TYPE_TRANSCEIVER,
diff --git a/rigs/yaesu/newcat.c b/rigs/yaesu/newcat.c
index 1fc323fe..153ac092 100644
--- a/rigs/yaesu/newcat.c
+++ b/rigs/yaesu/newcat.c
@@ -786,7 +786,8 @@ int newcat_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
// And only when not in split mode
if (newcat_valid_command(rig, "BS")
&& newcat_band_index(freq) != newcat_band_index(rig->state.current_freq)
- && !rig->state.cache.split)
+ && !rig->state.cache.split
+ && !is_ft891) // 891 does not remember bandwidth so don't do this
{
snprintf(priv->cmd_str, sizeof(priv->cmd_str), "BS%02d%c",
newcat_band_index(freq), cat_term);
@@ -7626,7 +7627,7 @@ int newcat_get_rx_bandwidth(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t *width)
char cmd[] = "SH";
char main_sub_vfo = '0';
- rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
+ rig_debug(RIG_DEBUG_VERBOSE, "%s called, vfo=%s, mode=%s\n", __func__, rig_strvfo(vfo), rig_strrmode(mode));
if (!newcat_valid_command(rig, cmd))
{
commit 2b1bce89bf0834c35619442d5623be3c45cb0974
Author: Michael Black W9MDB <mdb...@ya...>
Date: Sat Dec 19 14:30:31 2020 -0600
Fix icom default filter settings
https://github.com/Hamlib/Hamlib/issues/471
diff --git a/rigs/icom/frame.c b/rigs/icom/frame.c
index fbff3dda..5d272eea 100644
--- a/rigs/icom/frame.c
+++ b/rigs/icom/frame.c
@@ -297,6 +297,10 @@ int icom_transaction(RIG *rig, int cmd, int subcmd,
{
int retval, retry;
+ rig_debug(RIG_DEBUG_VERBOSE,
+ "%s: cmd=0x%02x, subcmd=0x%02x, payload_len=%d, data_len=%d\n", __func__,
+ cmd, subcmd, payload_len, *data_len);
+
retry = rig->state.rigport.retry;
do
diff --git a/rigs/icom/icom.c b/rigs/icom/icom.c
index c83d5a7f..22831206 100644
--- a/rigs/icom/icom.c
+++ b/rigs/icom/icom.c
@@ -1631,11 +1631,11 @@ int icom_set_mode_with_data(RIG *rig, vfo_t vfo, rmode_t mode,
if (width != RIG_PASSBAND_NOCHANGE)
{
- if (filter_byte) // then we need the width byte too
+ unsigned char mode_icom; // not usb as it will map to USB/LSB
+ signed char width_icom;
+ rig2icom_mode(rig, vfo, mode, width, &mode_icom, &width_icom);
+ if (filter_byte && width_icom != -1) // then we need the width byte too
{
- unsigned char mode_icom; // not used as it will map to USB/LSB
- signed char width_icom;
- rig2icom_mode(rig, vfo, mode, width, &mode_icom, &width_icom);
// since width_icom is 0-2 for rigs that need this here we have to make it 1-3
datamode[1] = datamode[0] ? width_icom : 0;
retval =
diff --git a/rigs/icom/icom.h b/rigs/icom/icom.h
index 7004bbfd..6b7dadec 100644
--- a/rigs/icom/icom.h
+++ b/rigs/icom/icom.h
@@ -30,7 +30,7 @@
#include <sys/time.h>
#endif
-#define BACKEND_VER "20201216"
+#define BACKEND_VER "20201219"
/*
* defines used by comp_cal_str in rig.c
diff --git a/src/rig.c b/src/rig.c
index c7f48821..b2397fe4 100644
--- a/src/rig.c
+++ b/src/rig.c
@@ -1941,10 +1941,12 @@ pbwidth_t HAMLIB_API rig_passband_normal(RIG *rig, rmode_t mode)
{
if (rs->filters[i].modes & mode)
{
+ rig_debug(RIG_DEBUG_VERBOSE, "%s: return filter#%d, width=%d\n", __func__, i, (int)rs->filters[i].width);
return rs->filters[i].width;
}
}
+ rig_debug(RIG_DEBUG_VERBOSE, "%s: filter not found...return RIG_PASSBAND_NORMAL=%d\n", __func__, (int)RIG_PASSBAND_NORMAL);
return RIG_PASSBAND_NORMAL;
}
commit 5a208a871d115b485b08b17ddcd3a2a23af09ebb
Author: Michael Black W9MDB <mdb...@ya...>
Date: Fri Dec 18 23:57:38 2020 -0600
Reorder newcat_band_index to return 15 for 2M band instead of 14
https://github.com/Hamlib/Hamlib/issues/470
diff --git a/rigs/yaesu/newcat.c b/rigs/yaesu/newcat.c
index fcc4654f..1fc323fe 100644
--- a/rigs/yaesu/newcat.c
+++ b/rigs/yaesu/newcat.c
@@ -399,10 +399,10 @@ static int newcat_band_index(freq_t freq)
// does anybody work LSB or RTTYR at the upper band edge?
// what about band 13 -- what is it?
if (freq >= MHz(420) && freq < MHz(470)) { band = 16; }
+ else if (freq >= MHz(144) && freq < MHz(148)) { band = 15; }
// band 14 is RX only
+ // override band 15 with 14 if needed
else if (freq >= MHz(118) && freq < MHz(164)) { band = 14; }
- // override band 14 with 15 if needed
- else if (freq >= MHz(144) && freq < MHz(148)) { band = 15; }
else if (freq >= MHz(70) && freq < MHz(70.5)) { band = 17; }
else if (freq >= MHz(50) && freq < MHz(55)) { band = 10; }
else if (freq >= MHz(28) && freq < MHz(29.7)) { band = 9; }
@@ -9051,7 +9051,7 @@ int newcat_get_cmd(RIG *rig)
__func__, priv->ret_data);
// we were using BUSBUSY but microham devices need retries
//rc = -RIG_BUSBUSY; /* don't write command again */
- rc = -RIG_EPROTO;
+ // rc = -RIG_EPROTO;
/* we could decrement retry_count
here but there is a danger of
infinite looping so we just use up
diff --git a/rigs/yaesu/newcat.h b/rigs/yaesu/newcat.h
index 63b80501..f784d321 100644
--- a/rigs/yaesu/newcat.h
+++ b/rigs/yaesu/newcat.h
@@ -50,7 +50,7 @@
typedef char ncboolean;
/* shared function version */
-#define NEWCAT_VER "20201218"
+#define NEWCAT_VER "20201219"
/* Hopefully large enough for future use, 128 chars plus '\0' */
#define NEWCAT_DATA_LEN 129
-----------------------------------------------------------------------
Summary of changes:
rigs/icom/frame.c | 4 ++++
rigs/icom/icom.c | 8 ++++----
rigs/icom/icom.h | 2 +-
rigs/yaesu/ft891.c | 2 +-
rigs/yaesu/newcat.c | 11 ++++++-----
rigs/yaesu/newcat.h | 2 +-
src/rig.c | 2 ++
7 files changed, 19 insertions(+), 12 deletions(-)
hooks/post-receive
--
Hamlib -- Ham radio control libraries
|
