hamradio/Hamlib
1
0
Fork 0
mirror of https://github.com/Hamlib/Hamlib.git synced 2024-09-21 10:27:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'Hamlib:master' into cbayer-857-pwr-levels-cal

Browse Source
This commit is contained in:
chrbayer84 2024-08-09 04:11:37 -04:00 committed by GitHub
commit 63acc6e6c2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
13 changed files with 71 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rigs/barrett/4100.c
View File

@ -244,7 +244,7 @@ struct rig_caps barrett4100_caps =
.mfg_name = "Rhode&Schwarz",
.version = BACKEND_VER ".1",
.copyright = "LGPL",
.status = RIG_STATUS_BETA,
.status = RIG_STATUS_BETA, // do no promote until somebody confirms it works ok -- nobody to test it
.rig_type = RIG_TYPE_TRANSCEIVER,
.targetable_vfo = RIG_TARGETABLE_FREQ | RIG_TARGETABLE_MODE,
.ptt_type = RIG_PTT_RIG,

16
rigs/commradio/ctx10.c
View File

@ -20,7 +20,7 @@ struct rig_caps ctx10_caps =
RIG_MODEL(RIG_MODEL_CTX10),
.model_name = "CTX-10",
.mfg_name = "Commradio",
.version = "20240118" ".0",
.version = "20240802.0",
.copyright = "LGPL",
.status = RIG_STATUS_STABLE,
.rig_type = RIG_TYPE_TRANSCEIVER,
@ -43,15 +43,15 @@ struct rig_caps ctx10_caps =
.has_set_level = RIG_LEVEL_NONE,
.has_get_parm = RIG_PARM_NONE,
.has_set_parm = RIG_PARM_NONE,
.level_gran = {},
.parm_gran = {},
// .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),
// .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 = (RIG_OP_FROM_VFO|RIG_OP_TO_VFO),
.scan_ops = RIG_SCAN_NONE,

10
rigs/flexradio/smartsdr.c
View File

@ -508,8 +508,15 @@ int smartsdr_set_ptt(RIG *rig, vfo_t vfo, ptt_t ptt)
{
struct smartsdr_priv_data *priv = (struct smartsdr_priv_data *)STATE(rig)->priv;
char cmd[64];
char slicechar[] = { '?','A','B','C','D','E','F','G','H' };
ENTERFUNC;
if (priv->ptt)
{
rig_debug(RIG_DEBUG_ERR, "%s: abort PTT on slice %c, another slice has PTT control\n", __func__, slicechar[priv->slicenum]);
return -RIG_ENTARGET;
}
priv->ptt = ptt;
if (ptt)
{
sprintf(cmd, "dax audio set %d tx=1", priv->slicenum + 1);
@ -518,10 +525,9 @@ int smartsdr_set_ptt(RIG *rig, vfo_t vfo, ptt_t ptt)
}
sprintf(cmd, "slice set %d tx=1", priv->slicenum);
smartsdr_transaction(rig, cmd);
smartsdr_transaction(rig, cmd);
sprintf(cmd, "xmit %d", ptt);
smartsdr_transaction(rig, cmd);
priv->ptt = ptt;
RETURNFUNC(RIG_OK);
}

2
rigs/flexradio/smartsdr_caps.h
View File

@ -1,5 +1,5 @@
.mfg_name = "Flex-radio",
.version = "20240609.0",
.version = "20240807.0",
.copyright = "LGPL",
.status = RIG_STATUS_STABLE,
.rig_type = RIG_TYPE_TRANSCEIVER,

27
rigs/icom/frame.c
View File

@ -150,16 +150,20 @@ int icom_one_transaction(RIG *rig, unsigned char cmd, int subcmd,
ctrl_id = priv_caps->serial_full_duplex == 0 ? CTRLID : 0x80;
frm_len = make_cmd_frame(sendbuf, priv->re_civ_addr, ctrl_id, cmd,
subcmd, payload, payload_len);
/*
* should check return code and that write wrote cmd_len chars!
*/
set_transaction_active(rig);
collision_retry:
//rig_flush(rp);
// The IC7100 cannot separate the CI-V port from the USB CI-V
// We see async packets coming in so we'll try and do the flush
// This also means the IC7100 will not support async packets anymore
if (rig->caps->rig_model == RIG_MODEL_IC7100)
rig_flush(rp);
frm_len = make_cmd_frame(sendbuf, priv->re_civ_addr, ctrl_id, cmd,
subcmd, payload, payload_len);
if (data_len) { *data_len = 0; }
@ -214,11 +218,11 @@ again1:
// if we get a reply that is not our cmd/subcmd we should just ignore it and retry the read.
// this should somewhat allow splitting the COM port between two controllers
if (cmd != buf[4]) {
rig_debug(RIG_DEBUG_VERBOSE, "%s: cmd x%02d != buf x%02x so retry read\n", __func__, cmd, buf[4]);
rig_debug(RIG_DEBUG_VERBOSE, "%s: cmd x%02x != buf x%02x so retry read\n", __func__, cmd, buf[4]);
goto again1;
}
if (subcmd != -1 && subcmd != buf[5]) {
rig_debug(RIG_DEBUG_VERBOSE, "%s: subcmd x%02d != buf x%02x so retry read\n", __func__, subcmd, buf[5]);
rig_debug(RIG_DEBUG_VERBOSE, "%s: subcmd x%02x != buf x%02x so retry read\n", __func__, subcmd, buf[5]);
goto again1;
}
@ -322,6 +326,17 @@ again2:
priv->serial_USB_echo_off = 0;
goto again2;
}
// https://github.com/Hamlib/Hamlib/issues/1575
// these types of async can interrupt the cmd we sent
// if our host number changes must not be for us
if (sendbuf[3] != buf[2])
{
rig_debug(RIG_DEBUG_VERBOSE, "%s: unknown async? read again\n", __func__);
hl_usleep(100);
rig_flush(rp);
goto collision_retry;
}
if (icom_is_async_frame(rig, frm_len, buf))
{

2
rigs/icom/ic7100.c
View File

@ -342,7 +342,7 @@ struct rig_caps ic7100_caps =
.serial_handshake = RIG_HANDSHAKE_NONE,
.write_delay = 0,
.post_write_delay = 0,
.timeout = 1000,
.timeout = 700,
.retry = 3,
.has_get_func = IC7100_FUNC_ALL,
.has_set_func = IC7100_FUNC_ALL | RIG_FUNC_RESUME,

2
rigs/icom/icom.c
View File

@ -8971,7 +8971,7 @@ int icom_is_async_frame(RIG *rig, size_t frame_length,
/* Spectrum scope data is not CI-V transceive data, but handled the same way as it is pushed by the rig */
// IC-7100 sends 0xe1 for broadcast frame?
return frame[2] == 0xe1 || frame[2] == BCASTID || (frame[2] == CTRLID && frame[4] == C_CTL_SCP
return frame[2] == BCASTID || (frame[2] == CTRLID && frame[4] == C_CTL_SCP
&& frame[5] == S_SCP_DAT);
}

2
rigs/icom/icom.h
View File

@ -35,7 +35,7 @@
#include <sys/time.h>
#endif
#define BACKEND_VER "20240726"
#define BACKEND_VER "20240804"
#define ICOM_IS_ID31 rig_is_model(rig, RIG_MODEL_ID31)
#define ICOM_IS_ID51 rig_is_model(rig, RIG_MODEL_ID51)

3
rigs/kenwood/kenwood.c
View File

@ -378,7 +378,6 @@ transaction_write:
skip |= strncmp(cmdstr, "PS1", 3) == 0;
skip |= strncmp(cmdstr, "PS0", 3) == 0;
skip |= strncmp(cmdstr, "K22", 3) == 0;
skip |= (rig->caps->rig_model == RIG_MODEL_PT8000A && (strncmp(cmdstr, "TQ", 2) == 0)); // Skip Hilberling TQn command check
if (skip)
{
@ -1964,6 +1963,7 @@ int kenwood_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
if (priv->verify_cmd[1] == 'A' && vfo_letter == 'B') { priv->verify_cmd[1] = 'A'; }
err = kenwood_transaction(rig, freqbuf, NULL, 0);
hl_usleep(50*1000); // TS480 is slow to change freq so give it some time as well as others just in case
if (priv->verify_cmd[1] == 'B' && vfo_letter == 'B') { priv->verify_cmd[1] = 'A'; }
@ -5161,6 +5161,7 @@ int kenwood_set_trn(RIG *rig, int trn)
case RIG_MODEL_POWERSDR: // powersdr doesn't have AI command
case RIG_MODEL_THETIS: // powersdr doesn't have AI command
case RIG_MODEL_PT8000A: // powersdr doesn't have AI command
RETURNFUNC(-RIG_ENAVAIL);
case RIG_MODEL_TS990S:

2
rigs/kenwood/kenwood.h
View File

@ -28,7 +28,7 @@
#include "token.h"
#include "idx_builtin.h"
#define BACKEND_VER "20240712"
#define BACKEND_VER "20240807"
#define EOM_KEN ';'
#define EOM_TH '\r'

20
rigs/kenwood/ts480.c
View File

@ -44,10 +44,16 @@
#define TS480_LEVEL_GET (RIG_LEVEL_RFPOWER|RIG_LEVEL_AF|RIG_LEVEL_RF|RIG_LEVEL_SQL|RIG_LEVEL_AGC|RIG_LEVEL_MICGAIN|RIG_LEVEL_STRENGTH|RIG_LEVEL_KEYSPD|RIG_LEVEL_CWPITCH| \
RIG_LEVEL_MONITOR_GAIN|RIG_LEVEL_NB|RIG_LEVEL_NR|RIG_LEVEL_PREAMP|RIG_LEVEL_COMP|RIG_LEVEL_ATT|RIG_LEVEL_VOXDELAY|RIG_LEVEL_VOXGAIN|RIG_LEVEL_BKIN_DLYMS| \
RIG_LEVEL_SWR|RIG_LEVEL_COMP_METER|RIG_LEVEL_ALC|RIG_LEVEL_RFPOWER_METER|RIG_LEVEL_SLOPE_HIGH|RIG_LEVEL_SLOPE_LOW)
#define PT8000A_LEVEL_GET (RIG_LEVEL_RFPOWER|RIG_LEVEL_AF|RIG_LEVEL_RF|RIG_LEVEL_SQL|RIG_LEVEL_AGC|RIG_LEVEL_MICGAIN|RIG_LEVEL_STRENGTH|RIG_LEVEL_CWPITCH| \
RIG_LEVEL_MONITOR_GAIN|RIG_LEVEL_NB|RIG_LEVEL_NR|RIG_LEVEL_PREAMP|RIG_LEVEL_COMP|RIG_LEVEL_ATT|RIG_LEVEL_VOXDELAY|RIG_LEVEL_VOXGAIN|RIG_LEVEL_BKIN_DLYMS| \
RIG_LEVEL_SWR|RIG_LEVEL_COMP_METER|RIG_LEVEL_ALC|RIG_LEVEL_RFPOWER_METER|RIG_LEVEL_SLOPE_HIGH|RIG_LEVEL_SLOPE_LOW)
#define TS480_LEVEL_SET (RIG_LEVEL_RFPOWER|RIG_LEVEL_AF|RIG_LEVEL_RF|RIG_LEVEL_SQL|RIG_LEVEL_AGC|RIG_LEVEL_MICGAIN|RIG_LEVEL_KEYSPD|RIG_LEVEL_CWPITCH| \
RIG_LEVEL_MONITOR_GAIN|RIG_LEVEL_NB|RIG_LEVEL_NR|RIG_LEVEL_PREAMP|RIG_LEVEL_COMP|RIG_LEVEL_ATT|RIG_LEVEL_VOXDELAY|RIG_LEVEL_VOXGAIN|RIG_LEVEL_BKIN_DLYMS| \
RIG_LEVEL_METER|RIG_LEVEL_SLOPE_HIGH|RIG_LEVEL_SLOPE_LOW)
#define PT8000A_LEVEL_SET (RIG_LEVEL_RFPOWER|RIG_LEVEL_AF|RIG_LEVEL_RF|RIG_LEVEL_SQL|RIG_LEVEL_AGC|RIG_LEVEL_MICGAIN|RIG_LEVEL_CWPITCH| \
RIG_LEVEL_MONITOR_GAIN|RIG_LEVEL_NB|RIG_LEVEL_NR|RIG_LEVEL_PREAMP|RIG_LEVEL_COMP|RIG_LEVEL_ATT|RIG_LEVEL_VOXDELAY|RIG_LEVEL_VOXGAIN|RIG_LEVEL_BKIN_DLYMS| \
RIG_LEVEL_METER|RIG_LEVEL_SLOPE_HIGH|RIG_LEVEL_SLOPE_LOW)
#define TS480_FUNC_ALL (RIG_FUNC_NB|RIG_FUNC_COMP|RIG_FUNC_VOX|RIG_FUNC_NR|RIG_FUNC_NR|RIG_FUNC_BC|RIG_FUNC_BC2|RIG_FUNC_RIT|RIG_FUNC_XIT| \
RIG_FUNC_TUNER|RIG_FUNC_MON|RIG_FUNC_FBKIN|RIG_FUNC_LOCK)
@ -1830,7 +1836,7 @@ struct rig_caps qrplabs_caps =
};
/*
* Hilberling PS8000A TS480 emulation
* Hilberling PT8000A TS480 emulation
* Notice that some rigs share the same functions.
*/
struct rig_caps pt8000a_caps =
@ -1838,7 +1844,7 @@ struct rig_caps pt8000a_caps =
RIG_MODEL(RIG_MODEL_PT8000A),
.model_name = "PT-8000A",
.mfg_name = "Hilberling",
.version = BACKEND_VER ".3",
.version = BACKEND_VER ".2",
.copyright = "LGPL",
.status = RIG_STATUS_STABLE,
.rig_type = RIG_TYPE_TRANSCEIVER,
@ -1891,6 +1897,7 @@ struct rig_caps pt8000a_caps =
},
/* mode/filter list, remember: order matters! */
.filters = {
{RIG_MODE_SSB, kHz(6.0)},
{RIG_MODE_SSB, kHz(1.0)},
{RIG_MODE_SSB, kHz(1.2)},
{RIG_MODE_SSB, kHz(1.4)},
@ -1914,7 +1921,6 @@ struct rig_caps pt8000a_caps =
{RIG_MODE_SSB, kHz(3.4)},
{RIG_MODE_SSB, kHz(3.5)},
{RIG_MODE_SSB, kHz(4.6)},
{RIG_MODE_SSB, kHz(6.0)},
{RIG_MODE_CW, Hz(50)},
{RIG_MODE_CW, Hz(100)},
{RIG_MODE_CW, Hz(200)},
@ -1981,15 +1987,15 @@ struct rig_caps pt8000a_caps =
.get_ptt = kenwood_get_ptt,
.set_ptt = kenwood_set_ptt,
.get_dcd = kenwood_get_dcd,
.set_powerstat = kenwood_set_powerstat,
.get_powerstat = kenwood_get_powerstat,
// .set_powerstat = kenwood_set_powerstat,
// .get_powerstat = kenwood_get_powerstat,
.get_info = kenwood_ts480_get_info,
.reset = kenwood_reset,
.set_ant = kenwood_set_ant,
.get_ant = kenwood_get_ant,
.scan = kenwood_scan, /* not working, invalid arguments using rigctl; kenwood_scan does only support on/off and not tone and CTCSS scan */
.has_set_level = TS480_LEVEL_SET,
.has_get_level = TS480_LEVEL_GET,
.has_set_level = PT8000A_LEVEL_SET,
.has_get_level = PT8000A_LEVEL_GET,
.set_level = kenwood_ts480_set_level,
.get_level = kenwood_ts480_get_level,
.has_get_func = TS480_FUNC_ALL,

15
src/iofunc.c
View File

@ -960,13 +960,22 @@ static int port_wait_for_data(hamlib_port_t *p, int direct)
int HAMLIB_API write_block_sync(hamlib_port_t *p, const unsigned char *txbuffer,
size_t count)
{
int retval = RIG_OK;
if (p->asyncio)
{
return (int) write(p->fd_sync_write, txbuffer, count);
retval = write(p->fd_sync_write, txbuffer, count);
}
return (int) write(p->fd, txbuffer, count);
else
{
retval = write(p->fd, txbuffer, count);
}
if (retval != count)
{
rig_debug(RIG_DEBUG_ERR, "%s: write failed: %s\n", __func__, strerror(errno));
retval = -RIG_EIO;
}
return retval;
}
int HAMLIB_API write_block_sync_error(hamlib_port_t *p,

1
src/network.c
View File

@ -1093,6 +1093,7 @@ void *multicast_publisher(void *arg)
"%s: error sending UDP packet: %s\n", __func__,
strerror(errno));
flag = 1;
break; // we'll just quit this routine for now -- debug in the future
}
}
}