From d18f540b3561cb13a3db1dff1f7f868fb8a12cde Mon Sep 17 00:00:00 2001 From: Mike Black W9MDB Date: Mon, 29 Mar 2021 12:40:11 -0500 Subject: [PATCH 1/3] Fix FT857 unnecessary vfo check in ft857_set_split_freq_mode https://github.com/Hamlib/Hamlib/issues/636 --- rigs/yaesu/ft857.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/rigs/yaesu/ft857.c b/rigs/yaesu/ft857.c index 0ed04f5e8..36e8fa137 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 = "20210329.0", .copyright = "LGPL", .status = RIG_STATUS_STABLE, .rig_type = RIG_TYPE_TRANSCEIVER, @@ -1021,13 +1021,6 @@ int ft857_set_split_vfo(RIG *rig, vfo_t vfo, split_t split, vfo_t tx_vfo) rig_debug(RIG_DEBUG_VERBOSE, "%s: called \n", __func__); - if (vfo != RIG_VFO_CURR) - { - return -RIG_ENTARGET; - } - - rig_debug(RIG_DEBUG_VERBOSE, "%s: called\n", __func__); - switch (split) { case RIG_SPLIT_ON: From f55fcd9353902f87de3c64bd4475b76d8726f84c Mon Sep 17 00:00:00 2001 From: Mike Black W9MDB Date: Mon, 29 Mar 2021 12:45:45 -0500 Subject: [PATCH 2/3] Remove checks for VFO_CURR from FT847 FT857 FT897 -- we don't care what VFO is requested --- rigs/yaesu/ft847.c | 15 ------- rigs/yaesu/ft857.c | 100 -------------------------------------------- rigs/yaesu/ft897.c | 102 --------------------------------------------- 3 files changed, 217 deletions(-) diff --git a/rigs/yaesu/ft847.c b/rigs/yaesu/ft847.c index 1af53c82f..9ac8e0815 100644 --- a/rigs/yaesu/ft847.c +++ b/rigs/yaesu/ft847.c @@ -1346,11 +1346,6 @@ int ft847_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val) return -RIG_ENIMPL; } - if (vfo != RIG_VFO_CURR) - { - return -RIG_ENTARGET; - } - switch (level) { case RIG_LEVEL_STRENGTH: @@ -1483,11 +1478,6 @@ int ft847_set_rptr_shift(RIG *rig, vfo_t vfo, rptr_shift_t rptr_shift) { unsigned char cmd_index; /* index of sequence to send */ - if (vfo != RIG_VFO_CURR) - { - return -RIG_ENTARGET; - } - switch (rptr_shift) { case RIG_RPT_SHIFT_NONE: @@ -1518,11 +1508,6 @@ int ft847_set_rptr_offs(RIG *rig, vfo_t vfo, shortfreq_t rptr_offs) return -RIG_ENIMPL; } - if (vfo != RIG_VFO_CURR) - { - return -RIG_ENTARGET; - } - memcpy(p_cmd, &ncmd[FT_847_NATIVE_CAT_SET_RPT_OFFSET].nseq, YAESU_CMD_LENGTH); diff --git a/rigs/yaesu/ft857.c b/rigs/yaesu/ft857.c index 36e8fa137..f4602debc 100644 --- a/rigs/yaesu/ft857.c +++ b/rigs/yaesu/ft857.c @@ -564,11 +564,6 @@ int ft857_get_freq(RIG *rig, vfo_t vfo, freq_t *freq) rig_debug(RIG_DEBUG_VERBOSE, "%s: called \n", __func__); - if (vfo != RIG_VFO_CURR && vfo != RIG_VFO_A) - { - return -RIG_ENTARGET; - } - if (check_cache_timeout(&p->fm_status_tv)) { int n; @@ -661,11 +656,6 @@ int ft857_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width) rig_debug(RIG_DEBUG_VERBOSE, "%s: called \n", __func__); - if (vfo != RIG_VFO_CURR) - { - return -RIG_ENTARGET; - } - if (check_cache_timeout(&p->fm_status_tv)) { int n; @@ -688,11 +678,6 @@ int ft857_get_split_freq_mode(RIG *rig, vfo_t vfo, freq_t *freq, rmode_t *mode, rig_debug(RIG_DEBUG_VERBOSE, "%s: called \n", __func__); - if (vfo != RIG_VFO_CURR && vfo != RIG_VFO_TX) - { - return -RIG_ENTARGET; - } - retcode = ft857_send_cmd(rig, FT857_NATIVE_CAT_SET_VFOAB); if (RIG_OK != retcode) @@ -719,11 +704,6 @@ int ft857_get_split_vfo(RIG *rig, vfo_t vfo, split_t *split, vfo_t *tx_vfo) rig_debug(RIG_DEBUG_VERBOSE, "%s: called \n", __func__); - if (vfo != RIG_VFO_CURR) - { - return -RIG_ENTARGET; - } - if (check_cache_timeout(&p->tx_status_tv)) if ((n = ft857_get_status(rig, FT857_NATIVE_CAT_GET_TX_STATUS)) < 0) { @@ -756,11 +736,6 @@ int ft857_get_ptt(RIG *rig, vfo_t vfo, ptt_t *ptt) rig_debug(RIG_DEBUG_VERBOSE, "%s: called \n", __func__); - if (vfo != RIG_VFO_CURR) - { - return -RIG_ENTARGET; - } - if (check_cache_timeout(&p->tx_status_tv)) { int n; @@ -831,11 +806,6 @@ int ft857_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val) { rig_debug(RIG_DEBUG_VERBOSE, "%s: called \n", __func__); - if (vfo != RIG_VFO_CURR) - { - return -RIG_ENTARGET; - } - switch (level) { case RIG_LEVEL_STRENGTH: @@ -857,11 +827,6 @@ int ft857_get_dcd(RIG *rig, vfo_t vfo, dcd_t *dcd) rig_debug(RIG_DEBUG_VERBOSE, "%s: called \n", __func__); - if (vfo != RIG_VFO_CURR) - { - return -RIG_ENTARGET; - } - if (check_cache_timeout(&p->rx_status_tv)) { int n; @@ -891,11 +856,6 @@ int ft857_set_freq(RIG *rig, vfo_t vfo, freq_t freq) rig_debug(RIG_DEBUG_VERBOSE, "%s: called \n", __func__); - if (vfo != RIG_VFO_CURR) - { - return -RIG_ENTARGET; - } - rig_debug(RIG_DEBUG_VERBOSE, "ft857: requested freq = %"PRIfreq" Hz\n", freq); /* fill in the frequency */ @@ -913,14 +873,6 @@ int ft857_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width) rig_debug(RIG_DEBUG_VERBOSE, "%s: called \n", __func__); - if (vfo != RIG_VFO_CURR) - { - rig_debug(RIG_DEBUG_ERR, "%s: must have RIG_VFO_CURR, got %s\n", - rig_strvfo(RIG_VFO_CURR), rig_strvfo(vfo)); - - return -RIG_ENTARGET; - } - rig_debug(RIG_DEBUG_VERBOSE, "%s: generic mode = %s\n", __func__, rig_strrmode(mode)); @@ -986,11 +938,6 @@ int ft857_set_split_freq_mode(RIG *rig, vfo_t vfo, freq_t freq, rmode_t mode, rig_debug(RIG_DEBUG_VERBOSE, "%s: called \n", __func__); - if (vfo != RIG_VFO_CURR && vfo != RIG_VFO_TX) - { - return -RIG_ENTARGET; - } - retcode = rig_set_split_vfo(rig, RIG_VFO_A, RIG_SPLIT_ON, RIG_VFO_B); if (retcode != RIG_OK) { RETURNFUNC(retcode); } @@ -1054,13 +1001,6 @@ int ft857_set_ptt(RIG *rig, vfo_t vfo, ptt_t ptt) rig_debug(RIG_DEBUG_VERBOSE, "%s: called \n", __func__); - if (vfo != RIG_VFO_CURR) - { - return -RIG_ENTARGET; - } - - rig_debug(RIG_DEBUG_VERBOSE, "%s: called\n", __func__); - switch (ptt) { case RIG_PTT_ON: @@ -1092,11 +1032,6 @@ int ft857_set_func(RIG *rig, vfo_t vfo, setting_t func, int status) { rig_debug(RIG_DEBUG_VERBOSE, "%s: called \n", __func__); - if (vfo != RIG_VFO_CURR) - { - return -RIG_ENTARGET; - } - switch (func) { case RIG_FUNC_LOCK: @@ -1165,11 +1100,6 @@ int ft857_set_dcs_code(RIG *rig, vfo_t vfo, tone_t code) rig_debug(RIG_DEBUG_VERBOSE, "%s: called \n", __func__); - if (vfo != RIG_VFO_CURR) - { - return -RIG_ENTARGET; - } - rig_debug(RIG_DEBUG_VERBOSE, "ft857: set DCS code (%u)\n", code); if (code == 0) @@ -1196,11 +1126,6 @@ int ft857_set_ctcss_tone(RIG *rig, vfo_t vfo, tone_t tone) rig_debug(RIG_DEBUG_VERBOSE, "%s: called \n", __func__); - if (vfo != RIG_VFO_CURR) - { - return -RIG_ENTARGET; - } - rig_debug(RIG_DEBUG_VERBOSE, "ft857: set CTCSS tone (%.1f)\n", tone / 10.0); if (tone == 0) @@ -1227,11 +1152,6 @@ int ft857_set_dcs_sql(RIG *rig, vfo_t vfo, tone_t code) rig_debug(RIG_DEBUG_VERBOSE, "%s: called \n", __func__); - if (vfo != RIG_VFO_CURR) - { - return -RIG_ENTARGET; - } - rig_debug(RIG_DEBUG_VERBOSE, "ft857: set DCS sql (%u)\n", code); if (code == 0) @@ -1258,11 +1178,6 @@ int ft857_set_ctcss_sql(RIG *rig, vfo_t vfo, tone_t tone) rig_debug(RIG_DEBUG_VERBOSE, "%s: called \n", __func__); - if (vfo != RIG_VFO_CURR) - { - return -RIG_ENTARGET; - } - rig_debug(RIG_DEBUG_VERBOSE, "ft857: set CTCSS sql (%.1f)\n", tone / 10.0); if (tone == 0) @@ -1286,11 +1201,6 @@ int ft857_set_rptr_shift(RIG *rig, vfo_t vfo, rptr_shift_t shift) { rig_debug(RIG_DEBUG_VERBOSE, "%s: called \n", __func__); - if (vfo != RIG_VFO_CURR) - { - return -RIG_ENTARGET; - } - rig_debug(RIG_DEBUG_VERBOSE, "ft857: set repeter shift = %i\n", shift); switch (shift) @@ -1314,11 +1224,6 @@ int ft857_set_rptr_offs(RIG *rig, vfo_t vfo, shortfreq_t offs) rig_debug(RIG_DEBUG_VERBOSE, "%s: called \n", __func__); - if (vfo != RIG_VFO_CURR) - { - return -RIG_ENTARGET; - } - rig_debug(RIG_DEBUG_VERBOSE, "ft857: set repeter offs = %li\n", offs); /* fill in the offset freq */ @@ -1334,11 +1239,6 @@ int ft857_set_rit(RIG *rig, vfo_t vfo, shortfreq_t rit) rig_debug(RIG_DEBUG_VERBOSE, "%s: called \n", __func__); - if (vfo != RIG_VFO_CURR) - { - return -RIG_ENTARGET; - } - rig_debug(RIG_DEBUG_VERBOSE, "ft857: set rit = %li)\n", rit); /* fill in the RIT freq */ diff --git a/rigs/yaesu/ft897.c b/rigs/yaesu/ft897.c index 95b95134f..ccc40395e 100644 --- a/rigs/yaesu/ft897.c +++ b/rigs/yaesu/ft897.c @@ -659,12 +659,6 @@ int ft897_get_freq(RIG *rig, vfo_t vfo, freq_t *freq) rig_debug(RIG_DEBUG_VERBOSE, "%s: called\n", __func__); - // can only deal with VFO_CURR and VFO_A - if (vfo != RIG_VFO_CURR && vfo != RIG_VFO_A) - { - return -RIG_ENTARGET; - } - if (check_cache_timeout(&p->fm_status_tv)) { int n; @@ -686,11 +680,6 @@ int ft897_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width) rig_debug(RIG_DEBUG_VERBOSE, "%s: called\n", __func__); - if (vfo != RIG_VFO_CURR) - { - return -RIG_ENTARGET; - } - if (check_cache_timeout(&p->fm_status_tv)) { int n; @@ -775,11 +764,6 @@ int ft897_get_ptt(RIG *rig, vfo_t vfo, ptt_t *ptt) rig_debug(RIG_DEBUG_VERBOSE, "%s: called\n", __func__); - if (vfo != RIG_VFO_CURR) - { - return -RIG_ENTARGET; - } - if (check_cache_timeout(&p->tx_status_tv)) { int n; @@ -898,11 +882,6 @@ int ft897_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val) { rig_debug(RIG_DEBUG_VERBOSE, "%s: called\n", __func__); - if (vfo != RIG_VFO_CURR) - { - return -RIG_ENTARGET; - } - switch (level) { case RIG_LEVEL_STRENGTH: @@ -930,11 +909,6 @@ int ft897_get_dcd(RIG *rig, vfo_t vfo, dcd_t *dcd) rig_debug(RIG_DEBUG_VERBOSE, "%s: called\n", __func__); - if (vfo != RIG_VFO_CURR) - { - return -RIG_ENTARGET; - } - if (check_cache_timeout(&p->rx_status_tv)) { int n; @@ -1009,11 +983,6 @@ int ft897_set_freq(RIG *rig, vfo_t vfo, freq_t freq) rig_debug(RIG_DEBUG_VERBOSE, "%s: called\n", __func__); - if (vfo != RIG_VFO_CURR) - { - return -RIG_ENTARGET; - } - rig_debug(RIG_DEBUG_VERBOSE, "%s: requested freq = %"PRIfreq" Hz\n", __func__, freq); @@ -1033,11 +1002,6 @@ int ft897_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width) rig_debug(RIG_DEBUG_VERBOSE, "%s: called\n", __func__); - if (vfo != RIG_VFO_CURR) - { - return -RIG_ENTARGET; - } - rig_debug(RIG_DEBUG_VERBOSE, "%s: generic mode = %s\n", __func__, rig_strrmode(mode)); @@ -1098,13 +1062,6 @@ int ft897_set_ptt(RIG *rig, vfo_t vfo, ptt_t ptt) rig_debug(RIG_DEBUG_VERBOSE, "%s: called\n", __func__); - if (vfo != RIG_VFO_CURR) - { - return -RIG_ENTARGET; - } - - rig_debug(RIG_DEBUG_VERBOSE, "%s: called\n", __func__); - switch (ptt) { case RIG_PTT_ON: @@ -1138,13 +1095,6 @@ int ft897_vfo_op(RIG *rig, vfo_t vfo, vfo_op_t op) rig_debug(RIG_DEBUG_VERBOSE, "%s: called\n", __func__); - if (vfo != RIG_VFO_CURR) - { - return -RIG_ENTARGET; - } - - rig_debug(RIG_DEBUG_VERBOSE, "%s: called\n", __func__); - switch (op) { case RIG_OP_TOGGLE: @@ -1173,13 +1123,6 @@ int ft897_set_split_vfo(RIG *rig, vfo_t vfo, split_t split, vfo_t tx_vfo) rig_debug(RIG_DEBUG_VERBOSE, "%s: called\n", __func__); - if (vfo != RIG_VFO_CURR) - { - return -RIG_ENTARGET; - } - - rig_debug(RIG_DEBUG_VERBOSE, "%s: called\n", __func__); - switch (split) { case RIG_SPLIT_OFF: @@ -1214,11 +1157,6 @@ int ft897_get_split_vfo(RIG *rig, vfo_t vfo, split_t *split, vfo_t *tx_vfo) rig_debug(RIG_DEBUG_VERBOSE, "%s: called\n", __func__); - if (vfo != RIG_VFO_CURR) - { - return -RIG_ENTARGET; - } - if (check_cache_timeout(&p->tx_status_tv)) if ((n = ft897_get_status(rig, FT897_NATIVE_CAT_GET_TX_STATUS)) < 0) { @@ -1249,11 +1187,6 @@ int ft897_set_func(RIG *rig, vfo_t vfo, setting_t func, int status) { rig_debug(RIG_DEBUG_VERBOSE, "%s: called\n", __func__); - if (vfo != RIG_VFO_CURR) - { - return -RIG_ENTARGET; - } - switch (func) { case RIG_FUNC_LOCK: @@ -1322,11 +1255,6 @@ int ft897_set_dcs_code(RIG *rig, vfo_t vfo, tone_t code) rig_debug(RIG_DEBUG_VERBOSE, "%s: called\n", __func__); - if (vfo != RIG_VFO_CURR) - { - return -RIG_ENTARGET; - } - rig_debug(RIG_DEBUG_VERBOSE, "ft897: set DCS code (%u)\n", code); if (code == 0) @@ -1353,11 +1281,6 @@ int ft897_set_ctcss_tone(RIG *rig, vfo_t vfo, tone_t tone) rig_debug(RIG_DEBUG_VERBOSE, "%s: called\n", __func__); - if (vfo != RIG_VFO_CURR) - { - return -RIG_ENTARGET; - } - rig_debug(RIG_DEBUG_VERBOSE, "ft897: set CTCSS tone (%.1f)\n", tone / 10.0); if (tone == 0) @@ -1384,11 +1307,6 @@ int ft897_set_dcs_sql(RIG *rig, vfo_t vfo, tone_t code) rig_debug(RIG_DEBUG_VERBOSE, "%s: called\n", __func__); - if (vfo != RIG_VFO_CURR) - { - return -RIG_ENTARGET; - } - rig_debug(RIG_DEBUG_VERBOSE, "ft897: set DCS sql (%u)\n", code); if (code == 0) @@ -1415,11 +1333,6 @@ int ft897_set_ctcss_sql(RIG *rig, vfo_t vfo, tone_t tone) rig_debug(RIG_DEBUG_VERBOSE, "%s: called\n", __func__); - if (vfo != RIG_VFO_CURR) - { - return -RIG_ENTARGET; - } - rig_debug(RIG_DEBUG_VERBOSE, "ft897: set CTCSS sql (%.1f)\n", tone / 10.0); if (tone == 0) @@ -1443,11 +1356,6 @@ int ft897_set_rptr_shift(RIG *rig, vfo_t vfo, rptr_shift_t shift) { rig_debug(RIG_DEBUG_VERBOSE, "%s: called\n", __func__); - if (vfo != RIG_VFO_CURR) - { - return -RIG_ENTARGET; - } - rig_debug(RIG_DEBUG_VERBOSE, "ft897: set repeter shift = %i\n", shift); switch (shift) @@ -1471,11 +1379,6 @@ int ft897_set_rptr_offs(RIG *rig, vfo_t vfo, shortfreq_t offs) rig_debug(RIG_DEBUG_VERBOSE, "%s: called\n", __func__); - if (vfo != RIG_VFO_CURR) - { - return -RIG_ENTARGET; - } - rig_debug(RIG_DEBUG_VERBOSE, "ft897: set repeter offs = %li\n", offs); /* fill in the offset freq */ @@ -1491,11 +1394,6 @@ int ft897_set_rit(RIG *rig, vfo_t vfo, shortfreq_t rit) rig_debug(RIG_DEBUG_VERBOSE, "%s: called\n", __func__); - if (vfo != RIG_VFO_CURR) - { - return -RIG_ENTARGET; - } - rig_debug(RIG_DEBUG_VERBOSE, "ft897: set rit = %li)\n", rit); /* fill in the RIT freq */ From f6dc32778ba95fecd11328def654d77924237580 Mon Sep 17 00:00:00 2001 From: Mike Black W9MDB Date: Mon, 29 Mar 2021 13:01:26 -0500 Subject: [PATCH 3/3] Reduce verbosity in iofunc.c --- src/iofunc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/iofunc.c b/src/iofunc.c index aefa48df8..c7008f5ed 100644 --- a/src/iofunc.c +++ b/src/iofunc.c @@ -247,6 +247,7 @@ static ssize_t port_read(hamlib_port_t *p, void *buf, size_t count) int i; ssize_t ret; + //ENTERFUNC; // too verbose /* * Since WIN32 does its special serial read, we have * to catch the microHam case to do just "read". @@ -273,7 +274,8 @@ static ssize_t port_read(hamlib_port_t *p, void *buf, size_t count) } } - RETURNFUNC(ret); + //RETURNFUNC(ret); // too verbose + return ret; } else if (p->type.rig == RIG_PORT_NETWORK || p->type.rig == RIG_PORT_UDP_NETWORK)