[Hamlib-commits] Hamlib -- Ham radio control libraries branch master updated. 37b16fa283602f176fd7b
Library to control radio transceivers and receivers
Brought to you by:
n0nb
Menu
▾
▴
[Hamlib-commits] Hamlib -- Ham radio control libraries branch master updated. 37b16fa283602f176fd7b82d1e095b356b1ac957
|
From: Nate B. <n0...@us...> - 2021-06-10 11:21:34
|
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 37b16fa283602f176fd7b82d1e095b356b1ac957 (commit)
via e427262a89791b345a47f15c48d8abee045f64be (commit)
via fcb2529ed0614ef2c4b2eeab0cff5bfe68895497 (commit)
via 976ba6df02f892e5f30366a0c7fa60c6cbd1ca6b (commit)
via 540ca9cce31cedf8101448c9b283172cef606daf (commit)
via 9d7e1651b2026a7d7c5137b8c98e2d486285577a (commit)
via 840333266f349a01c7d281a923d0732c6f6feb8c (commit)
via ff9a745c7a716791d58932ed6b82036823094ab7 (commit)
via b65fdb61f889b2f22783033a290a1e9ff29bca4a (commit)
via a73046b04e183661e0ffd8e033aea2c552d582fc (commit)
via f41bcaa71af6538679b212ed8f5e0c6dbe447f5b (commit)
via 7d8e99ca2da8ced2b162cf3ee2caaa0bdc233b63 (commit)
from 53476dd14df76edbff6013cd36c1cad0927e5ac0 (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 37b16fa283602f176fd7b82d1e095b356b1ac957
Author: Mike Black W9MDB <mdb...@ya...>
Date: Mon Jun 7 09:32:57 2021 -0500
Improved FLRig error message when requesting a mode that FLRig does not have
diff --git a/rigs/dummy/flrig.c b/rigs/dummy/flrig.c
index fa72bcb6..5f3b8024 100644
--- a/rigs/dummy/flrig.c
+++ b/rigs/dummy/flrig.c
@@ -144,7 +144,7 @@ const struct rig_caps flrig_caps =
RIG_MODEL(RIG_MODEL_FLRIG),
.model_name = "FLRig",
.mfg_name = "FLRig",
- .version = "20210511",
+ .version = "20210607",
.copyright = "LGPL",
.status = RIG_STATUS_STABLE,
.rig_type = RIG_TYPE_TRANSCEIVER,
@@ -674,7 +674,7 @@ static const char *modeMapGetFLRig(rmode_t modeHamlib)
"%s: checking modeMap[%d]=%.0f to modeHamlib=%.0f, mode_flrig='%s'\n", __func__,
i, (double)modeMap[i].mode_hamlib, (double)modeHamlib, modeMap[i].mode_flrig);
- if (modeMap[i].mode_hamlib == modeHamlib)
+ if (modeMap[i].mode_hamlib == modeHamlib && strlen(modeMap[i].mode_flrig) > 0)
{
rig_debug(RIG_DEBUG_TRACE, "%s matched mode=%.0f, returning '%s'\n", __func__,
(double)modeHamlib, modeMap[i].mode_flrig);
@@ -682,7 +682,7 @@ static const char *modeMapGetFLRig(rmode_t modeHamlib)
}
}
- rig_debug(RIG_DEBUG_ERR, "%s: Unknown mode requested: %s\n", __func__,
+ rig_debug(RIG_DEBUG_ERR, "%s: FlRig does not have mode: %s\n", __func__,
rig_strrmode(modeHamlib));
return ("ERROR");
}
commit e427262a89791b345a47f15c48d8abee045f64be
Author: Mike Black W9MDB <mdb...@ya...>
Date: Sun Jun 6 23:02:55 2021 -0500
Promote thd74 to stable
diff --git a/rigs/kenwood/thd74.c b/rigs/kenwood/thd74.c
index c47991fd..4af4a7cb 100644
--- a/rigs/kenwood/thd74.c
+++ b/rigs/kenwood/thd74.c
@@ -1645,7 +1645,7 @@ const struct rig_caps thd74_caps =
.mfg_name = "Kenwood",
.version = BACKEND_VER ".2",
.copyright = "LGPL",
- .status = RIG_STATUS_BETA,
+ .status = RIG_STATUS_STABLE,
.rig_type = RIG_TYPE_HANDHELD | RIG_FLAG_APRS | RIG_FLAG_TNC | RIG_FLAG_DXCLUSTER,
.ptt_type = RIG_PTT_RIG,
.dcd_type = RIG_DCD_RIG,
commit fcb2529ed0614ef2c4b2eeab0cff5bfe68895497
Author: Mike Black W9MDB <mdb...@ya...>
Date: Sun Jun 6 07:57:33 2021 -0500
Have thd74.c call kenwood_open
https://github.com/Hamlib/Hamlib/issues/718
diff --git a/rigs/kenwood/thd74.c b/rigs/kenwood/thd74.c
index 8205c574..c47991fd 100644
--- a/rigs/kenwood/thd74.c
+++ b/rigs/kenwood/thd74.c
@@ -1643,7 +1643,7 @@ const struct rig_caps thd74_caps =
RIG_MODEL(RIG_MODEL_THD74),
.model_name = "TH-D74",
.mfg_name = "Kenwood",
- .version = BACKEND_VER ".1",
+ .version = BACKEND_VER ".2",
.copyright = "LGPL",
.status = RIG_STATUS_BETA,
.rig_type = RIG_TYPE_HANDHELD | RIG_FLAG_APRS | RIG_FLAG_TNC | RIG_FLAG_DXCLUSTER,
@@ -1727,7 +1727,7 @@ const struct rig_caps thd74_caps =
.rig_init = kenwood_init,
.rig_cleanup = kenwood_cleanup,
- .rig_open = thd74_open,
+ .rig_open = kenwood_open,
.set_freq = thd74_set_freq,
.get_freq = thd74_get_freq,
.set_mode = thd74_set_mode,
commit 976ba6df02f892e5f30366a0c7fa60c6cbd1ca6b
Author: Mike Black W9MDB <mdb...@ya...>
Date: Sat Jun 5 22:23:57 2021 -0500
Add small delay in flex6xxx.c after ptt off -- seems to take a short while to really do it for the ANAN rigs
diff --git a/rigs/kenwood/flex6xxx.c b/rigs/kenwood/flex6xxx.c
index 4fca044b..1fcea374 100644
--- a/rigs/kenwood/flex6xxx.c
+++ b/rigs/kenwood/flex6xxx.c
@@ -631,6 +631,7 @@ int flex6k_set_ptt(RIG *rig, vfo_t vfo, ptt_t ptt)
if (ptt_cmd[4] != response[4])
{
rig_debug(RIG_DEBUG_ERR, "%s: %s != %s\n", __func__, ptt_cmd, response);
+ hl_usleep(20*1000); // takes a bit to do PTT off
}
}
while (ptt_cmd[4] != response[4] && --retry);
@@ -1206,7 +1207,7 @@ const struct rig_caps powersdr_caps =
RIG_MODEL(RIG_MODEL_POWERSDR),
.model_name = "PowerSDR/Thetis",
.mfg_name = "FlexRadio/ANAN",
- .version = "20210527.0",
+ .version = "20210605.0",
.copyright = "LGPL",
.status = RIG_STATUS_STABLE,
.rig_type = RIG_TYPE_TRANSCEIVER,
commit 540ca9cce31cedf8101448c9b283172cef606daf
Author: Mike Black W9MDB <mdb...@ya...>
Date: Sat Jun 5 16:54:53 2021 -0500
Remove empty cmd from thd74.c and bump up to beta
https://github.com/Hamlib/Hamlib/issues/718
diff --git a/rigs/kenwood/thd74.c b/rigs/kenwood/thd74.c
index 86333c1e..8205c574 100644
--- a/rigs/kenwood/thd74.c
+++ b/rigs/kenwood/thd74.c
@@ -161,13 +161,14 @@ static struct kenwood_priv_caps thd74_priv_caps =
int thd74_open(RIG *rig)
{
- int ret;
- struct kenwood_priv_data *priv = rig->state.priv;
- strcpy(priv->verify_cmd, "ID\r");
+ //int ret;
+ //struct kenwood_priv_data *priv = rig->state.priv;
+ // this is already done in kenwood_init
+ //strcpy(priv->verify_cmd, "ID\r");
- ret = kenwood_transaction(rig, "", NULL, 0);
+ //ret = kenwood_transaction(rig, "", NULL, 0);
- return ret;
+ return RIG_OK;
}
@@ -1642,9 +1643,9 @@ const struct rig_caps thd74_caps =
RIG_MODEL(RIG_MODEL_THD74),
.model_name = "TH-D74",
.mfg_name = "Kenwood",
- .version = BACKEND_VER ".0",
+ .version = BACKEND_VER ".1",
.copyright = "LGPL",
- .status = RIG_STATUS_ALPHA,
+ .status = RIG_STATUS_BETA,
.rig_type = RIG_TYPE_HANDHELD | RIG_FLAG_APRS | RIG_FLAG_TNC | RIG_FLAG_DXCLUSTER,
.ptt_type = RIG_PTT_RIG,
.dcd_type = RIG_DCD_RIG,
commit 9d7e1651b2026a7d7c5137b8c98e2d486285577a
Merge: ff9a745c 84033326
Author: Michael Black <mdb...@ya...>
Date: Sat Jun 5 14:21:40 2021 -0500
Merge pull request #719 from mikaelnousiainen/add-spectrum-data-for-dummy-rig
Add spectrum scope caps for dummy rig
commit 840333266f349a01c7d281a923d0732c6f6feb8c
Author: Mikael Nousiainen <mik...@ik...>
Date: Sat Jun 5 21:48:10 2021 +0300
Add spectrum scope caps for dummy rig. Fix duplicate definition for IC-785x.
diff --git a/rigs/dummy/dummy.c b/rigs/dummy/dummy.c
index 1d6b5b55..2befa183 100644
--- a/rigs/dummy/dummy.c
+++ b/rigs/dummy/dummy.c
@@ -1059,8 +1059,6 @@ static int dummy_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
if (RIG_LEVEL_IS_FLOAT(level))
{
- if (val.f > 1.0) { RETURNFUNC(-RIG_EINVAL); }
-
sprintf(lstr, "%f", val.f);
}
else
@@ -2139,7 +2137,7 @@ struct rig_caps dummy_caps =
.copyright = "LGPL",
.status = RIG_STATUS_STABLE,
.rig_type = RIG_TYPE_OTHER,
- .targetable_vfo = RIG_TARGETABLE_PTT | RIG_TARGETABLE_RITXIT | RIG_TARGETABLE_FREQ | RIG_TARGETABLE_MODE,
+ .targetable_vfo = RIG_TARGETABLE_PTT | RIG_TARGETABLE_RITXIT | RIG_TARGETABLE_FREQ | RIG_TARGETABLE_MODE | RIG_TARGETABLE_SPECTRUM,
.ptt_type = RIG_PTT_RIG,
.dcd_type = RIG_DCD_RIG,
.port_type = RIG_PORT_NONE,
@@ -2149,7 +2147,12 @@ struct rig_caps dummy_caps =
.has_set_level = RIG_LEVEL_SET(DUMMY_LEVEL),
.has_get_parm = DUMMY_PARM,
.has_set_parm = RIG_PARM_SET(DUMMY_PARM),
- .level_gran = { [LVL_CWPITCH] = { .step = { .i = 10 } } },
+ .level_gran = {
+ [LVL_CWPITCH] = { .step = { .i = 10 } },
+ [LVL_SPECTRUM_SPEED] = {.min = {.i = 0}, .max = {.i = 2}, .step = {.i = 1}},
+ [LVL_SPECTRUM_REF] = {.min = {.f = -30.0f}, .max = {.f = 10.0f}, .step = {.f = 0.5f}},
+ [LVL_SPECTRUM_AVG] = {.min = {.i = 0}, .max = {.i = 3}, .step = {.i = 1}},
+ },
.ctcss_list = common_ctcss_list,
.dcs_list = full_dcs_list,
.chan_list = {
@@ -2163,6 +2166,8 @@ struct rig_caps dummy_caps =
.transceive = RIG_TRN_OFF,
.attenuator = { 10, 20, 30, RIG_DBLST_END, },
.preamp = { 10, RIG_DBLST_END, },
+ .agc_level_count = 7,
+ .agc_levels = { RIG_AGC_OFF, RIG_AGC_SUPERFAST, RIG_AGC_FAST, RIG_AGC_MEDIUM, RIG_AGC_SLOW, RIG_AGC_AUTO, RIG_AGC_USER },
.rx_range_list1 = { {
.startf = kHz(150), .endf = MHz(1500), .modes = DUMMY_MODES,
.low_power = -1, .high_power = -1, DUMMY_VFOS, RIG_ANT_1 | RIG_ANT_2 | RIG_ANT_3 | RIG_ANT_4,
@@ -2210,6 +2215,61 @@ struct rig_caps dummy_caps =
.max_rit = 9990,
.max_xit = 9990,
.max_ifshift = 10000,
+
+ .spectrum_scopes = {
+ {
+ .id = 0,
+ .name = "Main",
+ },
+ {
+ .id = 1,
+ .name = "Sub",
+ },
+ {
+ .id = -1,
+ .name = NULL,
+ },
+ },
+ .spectrum_modes = {
+ RIG_SPECTRUM_MODE_CENTER,
+ RIG_SPECTRUM_MODE_FIXED,
+ RIG_SPECTRUM_MODE_CENTER_SCROLL,
+ RIG_SPECTRUM_MODE_FIXED_SCROLL,
+ RIG_SPECTRUM_MODE_NONE,
+ },
+ .spectrum_spans = {
+ 5000,
+ 10000,
+ 20000,
+ 50000,
+ 100000,
+ 200000,
+ 500000,
+ 1000000,
+ 2000000,
+ 5000000,
+ 0,
+ },
+ .spectrum_avg_modes = {
+ {
+ .id = 0,
+ .name = "OFF",
+ },
+ {
+ .id = 1,
+ .name = "2",
+ },
+ {
+ .id = 2,
+ .name = "3",
+ },
+ {
+ .id = 3,
+ .name = "4",
+ },
+ },
+ .spectrum_attenuator = { 10, 20, 30, RIG_DBLST_END, },
+
.priv = NULL, /* priv */
.extlevels = dummy_ext_levels,
diff --git a/rigs/icom/ic785x.c b/rigs/icom/ic785x.c
index 813460d0..f33fc691 100644
--- a/rigs/icom/ic785x.c
+++ b/rigs/icom/ic785x.c
@@ -287,8 +287,6 @@ const struct rig_caps ic785x_caps =
.max_ifshift = Hz(0),
.agc_level_count = 4,
.agc_levels = { RIG_AGC_OFF, RIG_AGC_FAST, RIG_AGC_MEDIUM, RIG_AGC_SLOW },
- .agc_level_count = 3,
- .agc_levels = { RIG_AGC_FAST, RIG_AGC_MEDIUM, RIG_AGC_SLOW },
.targetable_vfo = RIG_TARGETABLE_FREQ | RIG_TARGETABLE_MODE | RIG_TARGETABLE_SPECTRUM,
.vfo_ops = IC785x_VFO_OPS,
.scan_ops = IC785x_SCAN_OPS,
commit ff9a745c7a716791d58932ed6b82036823094ab7
Author: Mike Black W9MDB <mdb...@ya...>
Date: Fri Jun 4 10:03:40 2021 -0500
Wrap pthread calls in #ifdef HAVE_PTHREAD in rig.c
diff --git a/src/rig.c b/src/rig.c
index e2548990..48669e79 100644
--- a/src/rig.c
+++ b/src/rig.c
@@ -61,7 +61,9 @@
#include <sys/stat.h>
#include <fcntl.h>
#include <errno.h>
+#ifdef HAVE_PTHREAD
#include <pthread.h>
+#endif
#include <hamlib/rig.h>
@@ -1108,6 +1110,7 @@ int HAMLIB_API rig_close(RIG *rig)
// terminate the multicast server
extern int multicast_server_run;
multicast_server_run = 0;
+#ifdef HAVE_PTHREAD
extern pthread_t multicast_server_threadId;
if (multicast_server_threadId != 0)
@@ -1123,6 +1126,7 @@ int HAMLIB_API rig_close(RIG *rig)
multicast_server_threadId = 0;
}
+#endif
if (!rig || !rig->caps)
{
@@ -6551,7 +6555,9 @@ int HAMLIB_API rig_cookie(RIG *rig, enum cookie_e cookie_cmd, char *cookie,
static double time_last_used;
double time_curr;
struct timespec tp;
+#ifdef HAVE_PTHREAD
static pthread_mutex_t cookie_lock = PTHREAD_MUTEX_INITIALIZER;
+#endif
if (cookie_len < 27)
{
commit b65fdb61f889b2f22783033a290a1e9ff29bca4a
Author: Mike Black W9MDB <mdb...@ya...>
Date: Fri Jun 4 09:59:31 2021 -0500
Fix get_rig_conf_type export
diff --git a/src/sprintflst.h b/src/sprintflst.h
index 1a2bc0a0..940a378f 100644
--- a/src/sprintflst.h
+++ b/src/sprintflst.h
@@ -50,7 +50,7 @@ extern HAMLIB_EXPORT( int ) rot_sprintf_status(char *str, int len, rot_status_t
extern HAMLIB_EXPORT( int ) rig_sprintf_spectrum_modes(char *str, int nlen, const enum rig_spectrum_mode_e *modes);
extern HAMLIB_EXPORT( int ) rig_sprintf_spectrum_spans(char *str, int nlen, const freq_t *spans);
extern HAMLIB_EXPORT( int ) rig_sprintf_spectrum_avg_modes(char *str, int nlen, const struct rig_spectrum_avg_mode *avg_modes);
-extern HAMLIB_EXPORT( char ) *get_rig_conf_type(enum rig_conf_e type);
+extern HAMLIB_EXPORT( char *) get_rig_conf_type(enum rig_conf_e type);
extern HAMLIB_EXPORT( int ) print_ext_param(const struct confparams *cfp, rig_ptr_t ptr);
__END_DECLS
commit a73046b04e183661e0ffd8e033aea2c552d582fc
Author: Mike Black W9MDB <mdb...@ya...>
Date: Thu Jun 3 17:21:52 2021 -0500
Clean up clang-static-analyzer warnings
diff --git a/src/rig.c b/src/rig.c
index 34706f5a..e2548990 100644
--- a/src/rig.c
+++ b/src/rig.c
@@ -3913,7 +3913,7 @@ int HAMLIB_API rig_get_split_freq(RIG *rig, vfo_t vfo, freq_t *tx_freq)
else
{
TRACE;
- retcode = caps->get_freq(rig, RIG_VFO_CURR, tx_freq);
+ retcode = caps->get_freq ? caps->get_freq(rig, RIG_VFO_CURR, tx_freq) :-RIG_ENIMPL;
}
/* try and revert even if we had an error above */
@@ -4042,7 +4042,7 @@ int HAMLIB_API rig_set_split_mode(RIG *rig,
else
{
TRACE;
- retcode = caps->set_mode(rig, RIG_VFO_CURR, tx_mode, tx_width);
+ retcode = caps->set_mode ? caps->set_mode(rig, RIG_VFO_CURR, tx_mode, tx_width) : -RIG_ENIMPL;
}
/* try and revert even if we had an error above */
@@ -4165,7 +4165,7 @@ int HAMLIB_API rig_get_split_mode(RIG *rig, vfo_t vfo, rmode_t *tx_mode,
else
{
TRACE;
- retcode = caps->get_mode(rig, RIG_VFO_CURR, tx_mode, tx_width);
+ retcode = caps->get_mode ? caps->get_mode(rig, RIG_VFO_CURR, tx_mode, tx_width) : -RIG_ENIMPL;
}
/* try and revert even if we had an error above */
commit f41bcaa71af6538679b212ed8f5e0c6dbe447f5b
Author: Mike Black W9MDB <mdb...@ya...>
Date: Thu Jun 3 16:13:58 2021 -0500
Add IC-575 rig
diff --git a/rigs/icom/ic475.c b/rigs/icom/ic475.c
index ee0119b7..77e48884 100644
--- a/rigs/icom/ic475.c
+++ b/rigs/icom/ic475.c
@@ -142,7 +142,110 @@ const struct rig_caps ic475_caps =
.decode_event = icom_decode_event,
.set_mem = icom_set_mem,
- .vfo_op = icom_vfo_op,
+ .vfo_op = icom_vfo_op
+};
+static const struct icom_priv_caps ic575_priv_caps =
+{
+ 0x16, /* default address */
+ 0, /* 731 mode */
+ 0, /* no XCHG */
+ ic737_ts_sc_list
};
+const struct rig_caps ic575_caps =
+{
+ RIG_MODEL(RIG_MODEL_IC575),
+ .model_name = "IC-575",
+ .mfg_name = "Icom",
+ .version = BACKEND_VER ".0",
+ .copyright = "LGPL",
+ .status = RIG_STATUS_BETA,
+ .rig_type = RIG_TYPE_TRANSCEIVER,
+ .ptt_type = RIG_PTT_NONE,
+ .dcd_type = RIG_DCD_NONE,
+ .port_type = RIG_PORT_SERIAL,
+ .serial_rate_min = 1200,
+ .serial_rate_max = 9600,
+ .serial_data_bits = 8,
+ .serial_stop_bits = 1,
+ .serial_parity = RIG_PARITY_NONE,
+ .serial_handshake = RIG_HANDSHAKE_NONE,
+ .write_delay = 0,
+ .post_write_delay = 0,
+ .timeout = 1000,
+ .retry = 3,
+ .has_get_func = RIG_FUNC_NONE,
+ .has_set_func = RIG_FUNC_NONE,
+ .has_get_level = RIG_LEVEL_NONE,
+ .has_set_level = RIG_LEVEL_NONE,
+ .has_get_parm = RIG_PARM_NONE,
+ .has_set_parm = RIG_PARM_NONE,
+ .level_gran = {},
+ .parm_gran = {},
+ .ctcss_list = NULL,
+ .dcs_list = NULL,
+ .preamp = { RIG_DBLST_END, },
+ .attenuator = { RIG_DBLST_END, },
+ .max_rit = Hz(0),
+ .max_xit = Hz(0),
+ .max_ifshift = Hz(0),
+ .targetable_vfo = 0,
+ .vfo_ops = IC475_VFO_OPS,
+ .scan_ops = RIG_SCAN_NONE,
+ .transceive = RIG_TRN_RIG,
+ .bank_qty = 0,
+ .chan_desc_sz = 0,
+
+ .chan_list = {
+ { 1, 99, RIG_MTYPE_MEM, IC_MIN_MEM_CAP },
+ { 100, 101, RIG_MTYPE_EDGE, IC_MIN_MEM_CAP },
+ { 102, 102, RIG_MTYPE_CALL, IC_MIN_MEM_CAP },
+ RIG_CHAN_END,
+ },
+
+ .rx_range_list1 = { {MHz(430), MHz(450), IC475_MODES, -1, -1, IC475_VFO_ALL},
+ RIG_FRNG_END,
+ },
+ .tx_range_list1 = { {MHz(430), MHz(440), IC475_MODES, W(2.5), W(25), IC475_VFO_ALL},
+ RIG_FRNG_END,
+ },
+
+ .rx_range_list2 = { {MHz(430), MHz(450), IC475_MODES, -1, -1, IC475_VFO_ALL},
+ RIG_FRNG_END,
+ },
+ .tx_range_list2 = { {MHz(430), MHz(450), IC475_MODES, W(2.5), W(25), IC475_VFO_ALL},
+ RIG_FRNG_END,
+ },
+
+ .tuning_steps = {
+ {IC475_MODES, 10}, /* TBC: does this rig supports settin tuning step? */
+ RIG_TS_END,
+ },
+ /* mode/filter list, remember: order matters! */
+ .filters = {
+ {RIG_MODE_SSB | RIG_MODE_CW, kHz(2.3)},
+ {RIG_MODE_FM, kHz(15)},
+ RIG_FLT_END,
+ },
+
+ .cfgparams = icom_cfg_params,
+ .set_conf = icom_set_conf,
+ .get_conf = icom_get_conf,
+
+ .priv = (void *)& ic575_priv_caps,
+ .rig_init = icom_init,
+ .rig_cleanup = icom_cleanup,
+ .rig_open = icom_rig_open,
+ .rig_close = icom_rig_close,
+
+ .set_freq = icom_set_freq,
+ .get_freq = icom_get_freq,
+ .set_mode = icom_set_mode,
+ .get_mode = icom_get_mode,
+ .set_vfo = icom_set_vfo,
+
+ .decode_event = icom_decode_event,
+ .set_mem = icom_set_mem,
+ .vfo_op = icom_vfo_op
+};
diff --git a/rigs/icom/icom.c b/rigs/icom/icom.c
index 88b8faee..6c37a530 100644
--- a/rigs/icom/icom.c
+++ b/rigs/icom/icom.c
@@ -8868,6 +8868,7 @@ DECLARE_INITRIG_BACKEND(icom)
rig_register(&ic275_caps);
rig_register(&ic471_caps);
rig_register(&ic475_caps);
+ rig_register(&ic575_caps);
rig_register(&ic1275_caps);
rig_register(&os535_caps);
diff --git a/rigs/icom/icom.h b/rigs/icom/icom.h
index 29697889..25ca989e 100644
--- a/rigs/icom/icom.h
+++ b/rigs/icom/icom.h
@@ -455,6 +455,7 @@ extern const struct rig_caps ic271_caps;
extern const struct rig_caps ic275_caps;
extern const struct rig_caps ic471_caps;
extern const struct rig_caps ic475_caps;
+extern const struct rig_caps ic575_caps;
extern const struct rig_caps ic1275_caps;
extern const struct rig_caps omnivip_caps;
commit 7d8e99ca2da8ced2b162cf3ee2caaa0bdc233b63
Author: Mike Black W9MDB <mdb...@ya...>
Date: Wed Jun 2 23:06:22 2021 -0500
Fix ICOM UDP network setup
diff --git a/src/rig.c b/src/rig.c
index 91e93979..34706f5a 100644
--- a/src/rig.c
+++ b/src/rig.c
@@ -720,7 +720,7 @@ int HAMLIB_API rig_open(RIG *rig)
rs->rigport.pathname);
rs->rigport.type.rig = RIG_PORT_NETWORK;
- if ((rig->caps->rig_model & RIG_ICOM) == RIG_ICOM)
+ if (RIG_BACKEND_NUM(rig->caps->rig_model) == RIG_ICOM)
{
rig_debug(RIG_DEBUG_TRACE, "%s(%d): Icom rig UDP network enabled\n", __FILE__,
__LINE__);
-----------------------------------------------------------------------
Summary of changes:
rigs/dummy/dummy.c | 68 +++++++++++++++++++++++++++++--
rigs/dummy/flrig.c | 6 +--
rigs/icom/ic475.c | 105 +++++++++++++++++++++++++++++++++++++++++++++++-
rigs/icom/ic785x.c | 2 -
rigs/icom/icom.c | 1 +
rigs/icom/icom.h | 1 +
rigs/kenwood/flex6xxx.c | 3 +-
rigs/kenwood/thd74.c | 17 ++++----
src/rig.c | 14 +++++--
src/sprintflst.h | 2 +-
10 files changed, 195 insertions(+), 24 deletions(-)
hooks/post-receive
--
Hamlib -- Ham radio control libraries
|
