mirror
/
Hamlib
kopia lustrzana https://github.com/Hamlib/Hamlib
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Fix set_split_mode for Icom rigs 

Add some more send_morse fixes - still can't do speed change yet
pull/1347/head
Mike Black W9MDB 2023-07-18 12:37:54 -05:00
rodzic b58c0a0fa4
commit f7bed3320e
5 zmienionych plików z 95 dodań i 20 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

11
doc/man1/rigctl.1
Wyświetl plik

@ -1024,6 +1024,17 @@ Parm is a token: \(oqANN\(cq, \(oqAPO\(cq, \(oqBACKLIGHT\(cq, \(oqBEEP\(cq,
Passing a \(oq?\(cq (query) as the first argument instead of a Parm token will
return a space separated list of radio backend supported set parameter tokens.
Use this to determine the supported parameters of a given radio backend.
.IP
ANN -- "Announce" level, see ann_t
APO -- Auto power off, int in minute
BACKLIGHT -- LCD light, float [0.0 ... 1.0]
BEEP -- Beep on keypressed, int (0,1)
TIME -- hh:mm:ss, int in seconds from 00:00:00
BAT -- battery level, float [0.0 ... 1.0]
KEYLIGHT -- Button backlight, on/off
SCREENSAVER -- rig specific timeouts
AFIF -- 0=AF audio, 1=IF audio -- see IC-7300/9700/705
.
.TP
.BR p ", " get_parm " \(aq" \fIParm\fP \(aq

8
rigs/icom/icom.c
Wyświetl plik

@ -2625,8 +2625,8 @@ int icom_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
{
unsigned char modebuf[MAXFRAMELEN];
const struct icom_priv_caps *priv_caps;
struct icom_priv_data *priv_data;
vfo_t vfocurr = vfo_fixup(rig, rig->state.current_vfo, 0);
struct icom_priv_data *priv_data = (struct icom_priv_data *) rig->state.priv;
vfo_t vfocurr = vfo_fixup(rig, rig->state.current_vfo, priv_data->split_on);
int mode_len, retval;
rig_debug(RIG_DEBUG_VERBOSE, "%s called vfo=%s\n", __func__, rig_strvfo(vfo));
@ -2646,7 +2646,7 @@ int icom_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
&& (rig->caps->rig_model != RIG_MODEL_IC7800))
{
int vfosel = 0x00;
vfo_t vfoask = vfo_fixup(rig, vfo, 0);
vfo_t vfoask = vfo_fixup(rig, vfo, priv_data->split_on);
rig_debug(RIG_DEBUG_TRACE, "%s: vfo=%s, vfoask=%s, vfocurr=%s\n", __func__,
rig_strvfo(vfo), rig_strvfo(vfoask), rig_strvfo(vfocurr));
@ -6072,7 +6072,7 @@ int icom_set_split_mode(RIG *rig, vfo_t vfo, rmode_t tx_mode,
RETURNFUNC(retval);
}
if (RIG_OK != (retval = rig->caps->set_mode(rig, RIG_VFO_CURR, tx_mode,
if (RIG_OK != (retval = rig->caps->set_mode(rig, tx_vfo, tx_mode,
tx_width)))
{
RETURNFUNC(retval);

15
simulators/simic9700.c
Wyświetl plik

@ -43,6 +43,7 @@ pbwidth_t widthB = 1;
ant_t ant_curr = 0;
int ant_option = 0;
int ptt = 0;
int dualwatch = 0;
int satmode = 0;
int agc_time = 1;
int ovf_status = 0;
@ -302,6 +303,20 @@ void frameParse(int fd, unsigned char *frame, int len)
case 0x16:
switch (frame[5])
{
case 0x59:
if (frame[6] == 0xfe)
{
dualwatch = frame[6];
}
else
{
frame[6] = dualwatch;
frame[7] = 0xfd;
n = write(fd, frame, 8);
}
break;
case 0x5a:
if (frame[6] == 0xfe)
{

76
src/rig.c
Wyświetl plik

@ -256,6 +256,7 @@ typedef struct morse_data_handler_priv_data_s
static int morse_data_handler_start(RIG *rig);
static int morse_data_handler_stop(RIG *rig);
int morse_data_handler_set_keyspd(RIG *rig, int keyspd);
void *morse_data_handler(void *arg);
/*
@ -4628,8 +4629,8 @@ int HAMLIB_API rig_set_split_mode(RIG *rig,
}
else
{
rig_debug(RIG_DEBUG_TRACE, "%s: mode %s is different from A=%s and B=%s\n",
__func__, rig_strrmode(tx_mode), rig_strrmode(rig->state.cache.modeMainA),
rig_debug(RIG_DEBUG_TRACE, "%s: vfo=%s mode %s is different from A=%s and B=%s\n",
__func__, rig_strvfo(vfo), rig_strrmode(tx_mode), rig_strrmode(rig->state.cache.modeMainA),
rig_strrmode(rig->state.cache.modeMainB));
}
@ -4787,14 +4788,16 @@ int HAMLIB_API rig_set_split_mode(RIG *rig,
rig_set_split_vfo(rig, rx_vfo, RIG_SPLIT_ON, tx_vfo);
if (vfo == RIG_VFO_A || vfo == RIG_VFO_MAIN)
#if 0
if (vfo == RIG_VFO_A || vfo == RIG_VFO_MAIN || vfo == RIG_VFO_MAIN_A)
{
rig->state.cache.modeMainA = tx_mode;
}
else
else if (vfo == RIG_VFO_B ||
{
rig->state.cache.modeMainB = tx_mode;
}
#endif
ELAPSED2;
@ -6980,7 +6983,7 @@ static int wait_morse_ptt(RIG *rig, vfo_t vfo)
}
// every 25ms should be short enough
hl_usleep(25 * 1000);
hl_usleep(50 * 1000);
++loops;
}
while (pttStatus == RIG_PTT_ON && loops <= 600);
@ -7805,7 +7808,7 @@ static int morse_data_handler_start(RIG *rig)
keyspd.i = 25; // default value if KEYSPD doesn't work
rig_get_level(rig, RIG_VFO_CURR, RIG_LEVEL_KEYSPD, &keyspd);
morse_data_handler_priv->keyspd = keyspd.i;
rig_debug(RIG_DEBUG_VERBOSE, "%s: keyspd=%d\n", __func__, keyspd.i);
rig_debug(RIG_DEBUG_VERBOSE, "%s(%d): keyspd=%d\n", __func__, __LINE__, keyspd.i);
int err = pthread_create(&morse_data_handler_priv->thread_id, NULL,
morse_data_handler, &morse_data_handler_priv->args);
@ -8005,31 +8008,65 @@ void *morse_data_handler(void *arg)
while (rs->morse_data_handler_thread_run)
{
char c[11]; // up to 10 chars to be sent
char c[2]; // up to 1 char to be sent -- this allows speed change inter-char
memset(c, 0, sizeof(c));
int n = 0;
for (n = 0; n < sizeof(c) - 1; n++)
{
int d = pop(rig->state.fifo_morse);
int d = peek(rig->state.fifo_morse);
if (d < 0)
{
break;
}
d = pop(rig->state.fifo_morse);
c[n] = (char) d;
}
if (n > 0)
{
do
char *p;
// if we have + or - we will adjust speed and send before/speed/after which hopefully works
// I suspect some rigs will change speed immediately and not wait for queued character to flush
morse_data_handler_priv_data *morse_data_handler_priv = (morse_data_handler_priv_data *) rs->morse_data_handler_priv_data;
value_t keyspd;
keyspd.i = morse_data_handler_priv->keyspd;
rig_debug(RIG_DEBUG_VERBOSE, "%s(%d): keyspd=%d\n", __func__, __LINE__, keyspd.i);
if ((p=strchr(c,'+')) || (p=strchr(c,'-')))
{
result = rig->caps->send_morse(rig, RIG_VFO_CURR, c);
if (result != RIG_OK)
{
rig_debug(RIG_DEBUG_ERR, "%s: error: %s\n", __func__, rigerror(result));
hl_usleep(100 * 1000);
HAMLIB_TRACE;
char spdchg = *p;
*p = 0;
if (strlen(c) > 0) rig->caps->send_morse(rig, RIG_VFO_CURR, c);
rig_debug(RIG_DEBUG_VERBOSE, "%s(%d): keyspd=%d\n", __func__, __LINE__, keyspd.i);
keyspd.i+=spdchg=='+'?5:-5;
rig_debug(RIG_DEBUG_VERBOSE, "%s(%d): keyspd=%d\n", __func__, __LINE__, keyspd.i);
while(p[1] == '+' || p[1] == '-') {
HAMLIB_TRACE;
keyspd.i+=p[1]=='+'?5:-5;
rig_debug(RIG_DEBUG_VERBOSE, "%s(%d): keyspd=%d\n", __func__, __LINE__, keyspd.i);
p++;
}
} while (result != RIG_OK && rig->state.fifo_morse->flush == 0);
p++;
rig_debug(RIG_DEBUG_VERBOSE, "%s(%d): keyspd=%d\n", __func__, __LINE__, keyspd.i);
rig_set_level(rig, RIG_VFO_CURR, RIG_LEVEL_KEYSPD, keyspd);
morse_data_handler_priv->keyspd = keyspd.i;
memmove(c,p,p-c+1);
}
if (strlen(c) > 0)
{
do
{
result = rig->caps->send_morse(rig, RIG_VFO_CURR, c);
if (result != RIG_OK)
{
rig_debug(RIG_DEBUG_ERR, "%s: error: %s\n", __func__, rigerror(result));
hl_usleep(100 * 1000);
}
wait_morse_ptt(rig, RIG_VFO_CURR);
} while (result != RIG_OK && rig->state.fifo_morse->flush == 0);
}
}
rig->state.fifo_morse->flush = 0; // reset flush flag
@ -8210,4 +8247,11 @@ HAMLIB_EXPORT(int) rig_is_model(RIG *rig, rig_model_t model)
}
int morse_data_handler_set_keyspd(RIG *rig, int keyspd)
{
struct rig_state *rs = &rig->state;
morse_data_handler_priv_data *morse_data_handler_priv = (morse_data_handler_priv_data *) rs->morse_data_handler_priv_data;
morse_data_handler_priv->keyspd = keyspd;
rig_debug(RIG_DEBUG_VERBOSE, "%s: keyspd=%d\n", __func__, keyspd);
return RIG_OK;
}

5
src/settings.c
Wyświetl plik

@ -94,6 +94,11 @@ int HAMLIB_API rig_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
|| vfo == RIG_VFO_CURR
|| vfo == rig->state.current_vfo)
{
if (level == RIG_LEVEL_KEYSPD)
{
extern int morse_data_handler_set_keyspd(RIG *rig, int keyspd);
morse_data_handler_set_keyspd(rig, val.i);
}
return caps->set_level(rig, vfo, level, val);
}