[Hamlib-commits] Hamlib -- Ham radio control libraries branch master updated. ef3e2782031967ffb6fee
Library to control radio transceivers and receivers
Brought to you by:
n0nb
Menu
▾
▴
[Hamlib-commits] Hamlib -- Ham radio control libraries branch master updated. ef3e2782031967ffb6feeb5176cc47cd2e080f4b
|
From: n0nb <n0...@us...> - 2025-06-26 18:20:33
|
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 ef3e2782031967ffb6feeb5176cc47cd2e080f4b (commit)
via ef0b7e30bd6fa770a2bccd27cd5e8b554a7dd764 (commit)
via 82dd540d3a3fc181a81f1c3c3891f4331e770bbd (commit)
via 6dffee33df0a9b79401a17150d5c431e268b8a64 (commit)
via 8abe1ec8e4fe08560fc14ebb2965f89105213a18 (commit)
via a09603fdd4e5699a72f509db284f9bbb494f4e10 (commit)
from 31c3c973520e8bf87478e17dc6136845351e2e74 (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 ef3e2782031967ffb6feeb5176cc47cd2e080f4b
Merge: 31c3c9735 ef0b7e30b
Author: Nate Bargmann <n0...@n0...>
Date: Thu Jun 26 13:14:29 2025 -0500
Merge GitHub PR #1776
commit ef0b7e30bd6fa770a2bccd27cd5e8b554a7dd764
Author: Mark J. Fine <mar...@fi...>
Date: Thu Jun 26 13:38:23 2025 -0400
Reverted CW Pitch value<->knob conversion for non-ICR75 radios. Apparently R75 is the only one using the set mode command.
Edited out all non-essential code commenting that was done during local testing.
diff --git a/rigs/icom/icom.c b/rigs/icom/icom.c
index 17c6aa76c..24ba8f0ee 100644
--- a/rigs/icom/icom.c
+++ b/rigs/icom/icom.c
@@ -3683,8 +3683,15 @@ int icom_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
icom_val = 900;
}
else
+ {
icom_val = val.i;
- //icom_val = (int) lroundf(((float) icom_val - 300) * (255.0f / 600.0f));
+ }
+
+ if (!RIG_IS_ICR75)
+ {
+ //interpolate to return knob value
+ icom_val = (int) lroundf(((float) icom_val - 300) * (255.0f / 600.0f));
+ }
break;
default:
@@ -3877,7 +3884,6 @@ int icom_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
}
else
{
- // Legacy mapping that does not apply to all rigs
switch (val.i)
{
case RIG_AGC_OFF:
@@ -4686,8 +4692,15 @@ int icom_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
break;
case RIG_LEVEL_CWPITCH:
- //val->i = (int) lroundf(300.0f + ((float) icom_val * 600.0f / 255.0f));
- val->i = icom_val;
+ if (!RIG_IS_ICR75)
+ {
+ //use knob value and interpolate
+ val->i = (int) lroundf(300.0f + ((float) icom_val * 600.0f / 255.0f));
+ }
+ else
+ {
+ val->i = icom_val;
+ }
break;
case RIG_LEVEL_KEYSPD:
diff --git a/rigs/icom/icom_alt_agc.c b/rigs/icom/icom_alt_agc.c
index 0de9f9592..0f163e320 100644
--- a/rigs/icom/icom_alt_agc.c
+++ b/rigs/icom/icom_alt_agc.c
@@ -19,25 +19,11 @@
*
*/
-//#include <stdlib.h>
-//#include <string.h> /* String function definitions */
-//#include <unistd.h> /* UNIX standard function definitions */
-//#include <math.h>
-
-//#include <hamlib/rig.h>
-//#include <serial.h>
-//#include <cal.h>
-//#include <token.h>
-//#include <register.h>
-
#include "icom.h"
#include "icom_defs.h"
#include "icom_alt_agc.h"
#include "frame.h"
#include "misc.h"
-//#include "event.h"
-//#include "cache.h"
-
/*
* Note:
@@ -259,7 +245,6 @@ int icom_rig_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
}
else
{
- //struct rig_state *rs = STATE(rig);
unsigned char cmdbuf[MAXFRAMELEN], ackbuf[MAXFRAMELEN];
int cmd_len, ack_len = sizeof(ackbuf);
int lvl_cn, lvl_sc; /* Command Number, Subcommand */
@@ -387,7 +372,6 @@ int icom_rig_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
}
else
{
- //struct rig_state *rs;
unsigned char cmdbuf[MAXFRAMELEN], respbuf[MAXFRAMELEN];
int cmd_len, resp_len;
int lvl_cn, lvl_sc; /* Command Number, Subcommand */
@@ -413,8 +397,6 @@ int icom_rig_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
rig_debug(RIG_DEBUG_TRACE, "%s: no extcmd found\n", __func__);
- //rs = STATE(rig);
-
cmd_len = 0;
lvl_cn = C_CTL_FUNC;
diff --git a/rigs/icom/icom_defs.h b/rigs/icom/icom_defs.h
index 0776a1287..6313ec2de 100644
--- a/rigs/icom/icom_defs.h
+++ b/rigs/icom/icom_defs.h
@@ -233,11 +233,11 @@
* Set AGC (S_FUNC_AGC) data
*/
#define D_AGC_OFF 0x00
-#define D_AGC_SUPERFAST 0x01 //was 0x03 /* IC746 pro */
-#define D_AGC_FAST 0x02 //was 0x00
-#define D_AGC_SLOW 0x03 //was 0x02
+#define D_AGC_SUPERFAST 0x01
+#define D_AGC_FAST 0x02
+#define D_AGC_SLOW 0x03
#define D_AGC_USER 0x04
-#define D_AGC_MID 0x05 //was 0x01
+#define D_AGC_MID 0x05
#define D_AGC_AUTO 0x06
/*
commit 82dd540d3a3fc181a81f1c3c3891f4331e770bbd
Author: Mark J. Fine <mar...@fi...>
Date: Thu Jun 26 13:04:58 2025 -0400
Part 2 of Issue#1775: Adds optional wrappers for rigs that need to use the alternate AGC mapping originally specified in icom.c. Instructions for employment are provided within icom_alt_agc.c.
diff --git a/rigs/icom/Makefile.am b/rigs/icom/Makefile.am
index b295fe8d1..38b3fd7e9 100644
--- a/rigs/icom/Makefile.am
+++ b/rigs/icom/Makefile.am
@@ -1,4 +1,5 @@
-ICOMSRC = icom.c icom.h icom_defs.h frame.c frame.h ic706.c icr8500.c ic735.c ic775.c ic756.c \
+ICOMSRC = icom.c icom.h icom_defs.h icom_alt_agc.c icom_alt_agc.h frame.c frame.h \
+ ic706.c icr8500.c ic735.c ic775.c ic756.c \
ic275.c ic475.c ic1275.c ic820h.c ic821h.c \
icr7000.c ic910.c ic9100.c ic970.c ic725.c ic737.c ic718.c \
os535.c os456.c omni.c delta2.c ic92d.c \
diff --git a/rigs/icom/icom_alt_agc.c b/rigs/icom/icom_alt_agc.c
new file mode 100644
index 000000000..0de9f9592
--- /dev/null
+++ b/rigs/icom/icom_alt_agc.c
@@ -0,0 +1,506 @@
+/*
+ * Hamlib CI-V backend - wrapper to get/set alternate AGC levels
+ * Copyright (c) 2000-2025 by Stephane Fillod
+ *
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ */
+
+//#include <stdlib.h>
+//#include <string.h> /* String function definitions */
+//#include <unistd.h> /* UNIX standard function definitions */
+//#include <math.h>
+
+//#include <hamlib/rig.h>
+//#include <serial.h>
+//#include <cal.h>
+//#include <token.h>
+//#include <register.h>
+
+#include "icom.h"
+#include "icom_defs.h"
+#include "icom_alt_agc.h"
+#include "frame.h"
+#include "misc.h"
+//#include "event.h"
+//#include "cache.h"
+
+
+/*
+ * Note:
+ * This file contains a wrapper to utilize the original AGC settings routines
+ * for specific radios that require this alternate mapping.
+ *
+ * In order to make use of it, modify your rig's backend with the following:
+ *
+ * 1. Add `#include icom_alt_agc.h`
+ *
+ * 2. Change
+ * `.set_level = icom_set_level,`
+ * To
+ * `.set_level = icom_rig_set_level,`
+ *
+ * 3. Change
+ * `.get_level = icom_get_level,`
+ * To
+ * `.get_level = icom_rig_get_level,`
+ *
+ * All other level set/get routines other than AGC should be unaffected.
+ */
+
+static int icom_check_ack(int ack_len, unsigned char *ackbuf)
+{
+ if ((ack_len >= 1 && ackbuf[0] != ACK) && (ack_len >= 2 && ackbuf[1] != NAK))
+ {
+ // if we don't get ACK/NAK some serial corruption occurred
+ // so we'll call it a timeout for retry purposes
+ rig_debug(RIG_DEBUG_WARN, "%s: command timed out (%#.2x)\n", __func__,
+ ackbuf[0]);
+ return -RIG_ETIMEOUT;
+ }
+
+ if (ack_len != 1 || ackbuf[0] != ACK)
+ {
+ rig_debug(RIG_DEBUG_ERR, "%s: command not acknowledged (%#.2x), len=%d\n",
+ __func__,
+ ackbuf[0], ack_len);
+ return -RIG_ERJCTED;
+ }
+
+ return RIG_OK;
+}
+
+static int icom_set_cmd(RIG *rig, vfo_t vfo, struct cmdparams *par, value_t val)
+{
+ ENTERFUNC;
+
+ unsigned char cmdbuf[MAXFRAMELEN];
+ int cmdlen = 0;
+ unsigned char ackbuf[MAXFRAMELEN];
+ int ack_len = 0;
+
+ if (!(par->submod & SC_MOD_WR)) { RETURNFUNC(-RIG_EINVAL); }
+
+ if ((par->submod & SC_MOD_RW12) == SC_MOD_RW12)
+ {
+ cmdbuf[0] = 0x01;
+ cmdlen = 1;
+ }
+ else
+ {
+ cmdlen = par->sublen;
+ memcpy(cmdbuf, par->subext, cmdlen);
+ }
+
+ int wrd = val.i;
+ int i;
+
+ switch (par->dattyp)
+ {
+ case CMD_DAT_WRD:
+ for (i = 1; i <= par->datlen; i++)
+ {
+ cmdbuf[cmdlen + par->datlen - i] = wrd & 0xff;
+ wrd >>= 8;
+ }
+
+ break;
+
+ case CMD_DAT_BUF:
+ memcpy(&cmdbuf[cmdlen], val.b.d, par->datlen);
+ break;
+
+ case CMD_DAT_INT:
+ case CMD_DAT_BOL:
+ to_bcd_be(&cmdbuf[cmdlen], val.i, (par->datlen * 2));
+ break;
+
+ case CMD_DAT_FLT:
+ to_bcd_be(&cmdbuf[cmdlen], (int) val.f, (par->datlen * 2));
+ break;
+
+ case CMD_DAT_LVL:
+ to_bcd_be(&cmdbuf[cmdlen], (int)(val.f * 255.0), (par->datlen * 2));
+ break;
+
+ case CMD_DAT_TIM: // returned as seconds since midnight
+ to_bcd_be(&cmdbuf[cmdlen],
+ ((((int)val.i / 3600) * 100) + (((int)val.i / 60) % 60)), (par->datlen * 2));
+ break;
+
+ default:
+ break;
+ }
+
+ cmdlen += par->datlen;
+ RETURNFUNC(icom_transaction(rig, par->command, par->subcmd, cmdbuf, cmdlen,
+ ackbuf,
+ &ack_len));
+}
+
+static int icom_get_cmd(RIG *rig, vfo_t vfo, struct cmdparams *par, value_t *val)
+{
+
+ ENTERFUNC;
+
+ unsigned char ssc = 0x02;
+ unsigned char resbuf[MAXFRAMELEN];
+ int reslen = sizeof(resbuf);
+ int retval;
+
+ if (!(par->submod & SC_MOD_RD)) { RETURNFUNC(-RIG_EINVAL); }
+
+ if ((par->submod & SC_MOD_RW12) == SC_MOD_RW12)
+ {
+ retval = icom_get_raw_buf(rig, par->command, par->subcmd, 1, &ssc, &reslen,
+ resbuf);
+ }
+ else
+ {
+ retval = icom_get_raw_buf(rig, par->command, par->subcmd,
+ par->sublen, (unsigned char *)par->subext, &reslen, resbuf);
+ }
+
+ if (retval != RIG_OK)
+ {
+ RETURNFUNC(retval);
+ }
+
+ switch (par->dattyp)
+ {
+ case CMD_DAT_WRD:
+ {
+ int wrd = 0;
+ int i;
+
+ for (i = 0; i < par->datlen; i++)
+ {
+ wrd = (wrd << 8) + resbuf[i];
+ }
+
+ val->i = wrd;
+ }
+ break;
+
+ case CMD_DAT_STR:
+ if (strlen(val->s) < reslen)
+ {
+ RETURNFUNC(-RIG_EINTERNAL);
+ }
+
+ memcpy(val->s, resbuf, reslen);
+ val->s[reslen] = 0;
+ break;
+
+ case CMD_DAT_BUF:
+ if (reslen > val->b.l)
+ {
+ RETURNFUNC(-RIG_EINTERNAL);
+ }
+
+ memcpy(val->b.d, resbuf, reslen);
+ val->b.l = reslen;
+ break;
+
+ case CMD_DAT_INT:
+ val->i = from_bcd_be(resbuf, (reslen * 2));
+ break;
+
+ case CMD_DAT_FLT:
+ val->f = (float) from_bcd_be(resbuf, (reslen * 2));
+ break;
+
+ case CMD_DAT_LVL:
+ val->f = (float) from_bcd_be(resbuf, (reslen * 2)) / 255.0;
+ break;
+
+ case CMD_DAT_BOL:
+ val->i = (from_bcd_be(resbuf, (reslen * 2)) == 0) ? 0 : 1;
+ break;
+
+ case CMD_DAT_TIM:
+ val->i = (from_bcd_be(resbuf, 2) * 3600) + (from_bcd_be(&resbuf[1], 2) * 60);
+ break;
+
+ default:
+ val->i = 0;
+ break;
+ }
+
+ RETURNFUNC(RIG_OK);
+}
+
+/*
+ * icom_rig_set_level
+ * rig-specific wrapper for setting alternate AGC values only
+ * Assumes rig!=NULL, STATE(rig)->priv!=NULL
+ */
+int icom_rig_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
+{
+ int retval;
+
+ if (level != RIG_LEVEL_AGC)
+ {
+ retval = icom_set_level(rig, vfo, level, val);
+ RETURNFUNC(retval);
+ }
+ else
+ {
+ //struct rig_state *rs = STATE(rig);
+ unsigned char cmdbuf[MAXFRAMELEN], ackbuf[MAXFRAMELEN];
+ int cmd_len, ack_len = sizeof(ackbuf);
+ int lvl_cn, lvl_sc; /* Command Number, Subcommand */
+ int icom_val;
+ int i;
+ const struct icom_priv_caps *priv_caps =
+ (const struct icom_priv_caps *) rig->caps->priv;
+
+ ENTERFUNC;
+
+ const struct cmdparams *extcmds = priv_caps->extcmds;
+
+ for (i = 0; extcmds && extcmds[i].id.s != 0; i++)
+ {
+ if (extcmds[i].cmdparamtype == CMD_PARAM_TYPE_LEVEL && extcmds[i].id.s == level)
+ {
+ RETURNFUNC(icom_set_cmd(rig, vfo, (struct cmdparams *)&extcmds[i], val));
+ }
+ }
+
+ /*
+ * Many levels of float type are in [0.0..1.0] range
+ */
+ if (RIG_LEVEL_IS_FLOAT(level))
+ {
+ icom_val = val.f * 255;
+ }
+ else
+ {
+ icom_val = val.i;
+ }
+
+ /*
+ * Most of the time, the data field is a 3 digit BCD,
+ * but in *big endian* order: 0000..0255
+ * (from_bcd is little endian)
+ */
+ cmd_len = 2;
+ to_bcd_be(cmdbuf, (long long) icom_val, cmd_len * 2);
+
+ lvl_cn = C_CTL_FUNC;
+ lvl_sc = S_FUNC_AGC;
+ cmd_len = 1;
+
+ if (priv_caps->agc_levels_present)
+ {
+ int found = 0;
+
+ for (i = 0;
+ i <= HAMLIB_MAX_AGC_LEVELS
+ && priv_caps->agc_levels[i].level != RIG_AGC_LAST; i++)
+ {
+ if (priv_caps->agc_levels[i].level == val.i)
+ {
+ cmdbuf[0] = priv_caps->agc_levels[i].icom_level;
+ found = 1;
+ break;
+ }
+ }
+
+ if (!found)
+ {
+ RETURNFUNC(-RIG_EINVAL);
+ }
+ }
+ else
+ {
+ // Legacy mapping that does not apply to all rigs
+ switch (val.i)
+ {
+ case RIG_AGC_SUPERFAST:
+ cmdbuf[0] = ICOM_AGC_SUPERFAST;
+ break;
+
+ case RIG_AGC_FAST:
+ cmdbuf[0] = ICOM_AGC_FAST;
+ break;
+
+ case RIG_AGC_SLOW:
+ cmdbuf[0] = ICOM_AGC_SLOW;
+ break;
+
+ case RIG_AGC_MEDIUM:
+ cmdbuf[0] = ICOM_AGC_MID;
+ break;
+
+ default:
+ rig_debug(RIG_DEBUG_ERR, "%s: unsupported LEVEL_AGC %d\n",
+ __func__, val.i);
+ RETURNFUNC(-RIG_EINVAL);
+ }
+ }
+
+ retval = icom_transaction(rig, lvl_cn, lvl_sc, cmdbuf, cmd_len, ackbuf,
+ &ack_len);
+
+ if (retval != RIG_OK)
+ {
+ RETURNFUNC(retval);
+ }
+
+ if ((retval = icom_check_ack(ack_len, ackbuf)) != RIG_OK)
+ {
+ RETURNFUNC(retval);
+ }
+
+ RETURNFUNC(RIG_OK);
+ }
+}
+
+/*
+ * icom_rig_get_level
+ * rig-specific wrapper for getting alternate AGC values only
+ * Assumes rig!=NULL, STATE(rig)->priv!=NULL, val!=NULL
+ *
+ */
+int icom_rig_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
+{
+ int retval;
+
+ if (level != RIG_LEVEL_AGC)
+ {
+ retval = icom_get_level(rig, vfo, level, val);
+ RETURNFUNC(retval);
+ }
+ else
+ {
+ //struct rig_state *rs;
+ unsigned char cmdbuf[MAXFRAMELEN], respbuf[MAXFRAMELEN];
+ int cmd_len, resp_len;
+ int lvl_cn, lvl_sc; /* Command Number, Subcommand */
+ int icom_val;
+ int cmdhead;
+ const struct icom_priv_caps *priv_caps =
+ (const struct icom_priv_caps *) rig->caps->priv;
+
+ ENTERFUNC;
+
+ const struct cmdparams *extcmds = priv_caps->extcmds;
+ int i;
+
+ for (i = 0; extcmds && extcmds[i].id.s != 0; i++)
+ {
+ //rig_debug(RIG_DEBUG_TRACE, "%s: i=%d\n", __func__, i);
+
+ if (extcmds[i].cmdparamtype == CMD_PARAM_TYPE_LEVEL && extcmds[i].id.s == level)
+ {
+ RETURNFUNC(icom_get_cmd(rig, vfo, (struct cmdparams *)&extcmds[i], val));
+ }
+ }
+
+ rig_debug(RIG_DEBUG_TRACE, "%s: no extcmd found\n", __func__);
+
+ //rs = STATE(rig);
+
+ cmd_len = 0;
+
+ lvl_cn = C_CTL_FUNC;
+ lvl_sc = S_FUNC_AGC;
+
+ /* use cmdbuf and cmd_len for 'set mode' subcommand */
+ retval = icom_transaction(rig, lvl_cn, lvl_sc, cmdbuf, cmd_len, respbuf,
+ &resp_len);
+
+ if (retval != RIG_OK)
+ {
+ RETURNFUNC(retval);
+ }
+
+ /*
+ * strbuf should contain Cn,Sc,Data area
+ */
+ cmdhead = ((lvl_sc == -1) ? 1 : 2) + cmd_len;
+ resp_len -= cmdhead;
+
+ if (respbuf[0] != lvl_cn)
+ {
+ rig_debug(RIG_DEBUG_ERR, "%s: ack NG (%#.2x), len=%d\n", __func__,
+ respbuf[0], resp_len);
+ RETURNFUNC(-RIG_ERJCTED);
+ }
+
+ /*
+ * The result is a 3 digit BCD, but in *big endian* order: 0000..0255
+ * (from_bcd is little endian)
+ */
+ icom_val = from_bcd_be(respbuf + cmdhead, resp_len * 2);
+
+ if (priv_caps->agc_levels_present)
+ {
+ int found = 0;
+
+ for (i = 0;
+ i <= HAMLIB_MAX_AGC_LEVELS && priv_caps->agc_levels[i].level >= 0; i++)
+ {
+ if (priv_caps->agc_levels[i].icom_level == icom_val)
+ {
+ val->i = priv_caps->agc_levels[i].level;
+ found = 1;
+ break;
+ }
+ }
+
+ if (!found)
+ {
+ rig_debug(RIG_DEBUG_ERR, "%s: unexpected AGC 0x%02x\n", __func__,
+ icom_val);
+ RETURNFUNC(-RIG_EPROTO);
+ }
+ }
+ else
+ {
+ switch (icom_val)
+ {
+ case ICOM_AGC_SUPERFAST:
+ val->i = RIG_AGC_SUPERFAST;
+ break;
+
+ case ICOM_AGC_FAST:
+ val->i = RIG_AGC_FAST;
+ break;
+
+ case ICOM_AGC_SLOW:
+ val->i = RIG_AGC_SLOW;
+ break;
+
+ case ICOM_AGC_MID:
+ val->i = RIG_AGC_MEDIUM;
+ break;
+
+ default:
+ rig_debug(RIG_DEBUG_ERR, "%s: unexpected AGC 0x%02x\n", __func__,
+ icom_val);
+ RETURNFUNC(-RIG_EPROTO);
+ }
+ }
+
+ rig_debug(RIG_DEBUG_TRACE, "%s: %d %d %d %f\n", __func__, resp_len,
+ icom_val, val->i, val->f);
+
+ RETURNFUNC(RIG_OK);
+ }
+}
+
diff --git a/rigs/icom/icom_alt_agc.h b/rigs/icom/icom_alt_agc.h
new file mode 100644
index 000000000..76c2e0200
--- /dev/null
+++ b/rigs/icom/icom_alt_agc.h
@@ -0,0 +1,33 @@
+/*
+ * Hamlib CI-V backend - alternate AGC header
+ * Copyright (c) 2000-2025 by Stephane Fillod
+ *
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ */
+
+#ifndef _ICOM_ALT_AGC_H
+#define _ICOM_ALT_AGC_H 1
+
+#define ICOM_AGC_FAST 0x00
+#define ICOM_AGC_MID 0x01
+#define ICOM_AGC_SLOW 0x02
+#define ICOM_AGC_SUPERFAST 0x03 /* IC746 pro */
+
+int icom_rig_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val);
+int icom_rig_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val);
+
+#endif /* _ICOM_ALT_AGC_H */
\ No newline at end of file
commit 6dffee33df0a9b79401a17150d5c431e268b8a64
Author: markjfine <mar...@fi...>
Date: Mon Jun 23 17:46:06 2025 -0400
Correct CWPitch set/get for Icom radios
Icom has two confusing ways to set/get CW Pitch. The first way is to read/write the knob setting using CI-V command 14 subcommand 9. The second way is just to set/get the actual value via mode command 10.
At some point the commands in hamlib changed from the former to the latter, but never adjusted the interpolation code of the former.
This commit fixes the set and get routines appropriately.
diff --git a/rigs/icom/icom.c b/rigs/icom/icom.c
index 5bb420348..17c6aa76c 100644
--- a/rigs/icom/icom.c
+++ b/rigs/icom/icom.c
@@ -3682,8 +3682,9 @@ int icom_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
{
icom_val = 900;
}
-
- icom_val = (int) lroundf(((float) icom_val - 300) * (255.0f / 600.0f));
+ else
+ icom_val = val.i;
+ //icom_val = (int) lroundf(((float) icom_val - 300) * (255.0f / 600.0f));
break;
default:
@@ -4685,7 +4686,8 @@ int icom_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
break;
case RIG_LEVEL_CWPITCH:
- val->i = (int) lroundf(300.0f + ((float) icom_val * 600.0f / 255.0f));
+ //val->i = (int) lroundf(300.0f + ((float) icom_val * 600.0f / 255.0f));
+ val->i = icom_val;
break;
case RIG_LEVEL_KEYSPD:
commit 8abe1ec8e4fe08560fc14ebb2965f89105213a18
Author: markjfine <mar...@fi...>
Date: Mon Jun 23 17:07:17 2025 -0400
Correct mapping of D_AGC values
Ref issue#1775 (part 1)
Corrected mapping of D_AGC values to currently enumerated AGC set. Will separately provide alternate mapping, if required, in backends that require it.
diff --git a/rigs/icom/icom.c b/rigs/icom/icom.c
index 85b6d1e68..5bb420348 100644
--- a/rigs/icom/icom.c
+++ b/rigs/icom/icom.c
@@ -3879,20 +3879,32 @@ int icom_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
// Legacy mapping that does not apply to all rigs
switch (val.i)
{
- case RIG_AGC_SLOW:
- cmdbuf[0] = D_AGC_SLOW;
+ case RIG_AGC_OFF:
+ cmdbuf[0] = D_AGC_OFF;
break;
- case RIG_AGC_MEDIUM:
- cmdbuf[0] = D_AGC_MID;
+ case RIG_AGC_SUPERFAST:
+ cmdbuf[0] = D_AGC_SUPERFAST;
break;
case RIG_AGC_FAST:
cmdbuf[0] = D_AGC_FAST;
break;
- case RIG_AGC_SUPERFAST:
- cmdbuf[0] = D_AGC_SUPERFAST;
+ case RIG_AGC_SLOW:
+ cmdbuf[0] = D_AGC_SLOW;
+ break;
+
+ case RIG_AGC_USER:
+ cmdbuf[0] = D_AGC_USER;
+ break;
+
+ case RIG_AGC_MEDIUM:
+ cmdbuf[0] = D_AGC_MID;
+ break;
+
+ case RIG_AGC_AUTO:
+ cmdbuf[0] = D_AGC_AUTO;
break;
default:
@@ -4526,20 +4538,32 @@ int icom_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
{
switch (icom_val)
{
- case D_AGC_SLOW:
- val->i = RIG_AGC_SLOW;
+ case D_AGC_OFF:
+ val->i = RIG_AGC_OFF;
break;
- case D_AGC_MID:
- val->i = RIG_AGC_MEDIUM;
+ case D_AGC_SUPERFAST:
+ val->i = RIG_AGC_SUPERFAST;
break;
- case D_AGC_FAST:
+ case D_AGC_FAST:
val->i = RIG_AGC_FAST;
break;
- case D_AGC_SUPERFAST:
- val->i = RIG_AGC_SUPERFAST;
+ case D_AGC_SLOW:
+ val->i = RIG_AGC_SLOW;
+ break;
+
+ case D_AGC_USER:
+ val->i = RIG_AGC_USER;
+ break;
+
+ case D_AGC_MID:
+ val->i = RIG_AGC_MEDIUM;
+ break;
+
+ case D_AGC_AUTO:
+ val->i = RIG_AGC_AUTO;
break;
default:
commit a09603fdd4e5699a72f509db284f9bbb494f4e10
Author: markjfine <mar...@fi...>
Date: Mon Jun 23 17:02:26 2025 -0400
Correct and update mapping of D_AGC values
Ref issue#1775 (part 1)
Corrected mapping of D_AGC values to currently enumerated AGC set. Will separately provide alternate mapping, if required, in backends that require it.
diff --git a/rigs/icom/icom_defs.h b/rigs/icom/icom_defs.h
index 7ac84f8e2..0776a1287 100644
--- a/rigs/icom/icom_defs.h
+++ b/rigs/icom/icom_defs.h
@@ -232,10 +232,13 @@
/*
* Set AGC (S_FUNC_AGC) data
*/
-#define D_AGC_FAST 0x00
-#define D_AGC_MID 0x01
-#define D_AGC_SLOW 0x02
-#define D_AGC_SUPERFAST 0x03 /* IC746 pro */
+#define D_AGC_OFF 0x00
+#define D_AGC_SUPERFAST 0x01 //was 0x03 /* IC746 pro */
+#define D_AGC_FAST 0x02 //was 0x00
+#define D_AGC_SLOW 0x03 //was 0x02
+#define D_AGC_USER 0x04
+#define D_AGC_MID 0x05 //was 0x01
+#define D_AGC_AUTO 0x06
/*
* Set antenna (C_SET_ANT) subcommands
-----------------------------------------------------------------------
Summary of changes:
rigs/icom/Makefile.am | 3 +-
rigs/icom/icom.c | 71 +++-
rigs/icom/icom_alt_agc.c | 488 ++++++++++++++++++++++++++
rigs/{alinco/alinco.c => icom/icom_alt_agc.h} | 32 +-
rigs/icom/icom_defs.h | 11 +-
5 files changed, 563 insertions(+), 42 deletions(-)
create mode 100644 rigs/icom/icom_alt_agc.c
copy rigs/{alinco/alinco.c => icom/icom_alt_agc.h} (62%)
hooks/post-receive
--
Hamlib -- Ham radio control libraries
|
