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

Fix icmarine duplicate read

pull/58/head^2
Michael Black W9MDB 2018-10-07 08:11:30 -05:00 zatwierdzone przez Nate Bargmann
rodzic aadd458b99
commit a3ea2864a7
3 zmienionych plików z 65 dodań i 24 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

4
icmarine/icm802.c
Wyświetl plik

@ -58,9 +58,9 @@ const struct rig_caps icm802_caps = {
.rig_model = RIG_MODEL_IC_M802, .rig_model = RIG_MODEL_IC_M802,
.model_name = "IC-M802", .model_name = "IC-M802",
.mfg_name = "Icom", .mfg_name = "Icom",
.version = BACKEND_VER, .version = BACKEND_VER".1",
.copyright = "LGPL", .copyright = "LGPL",
.status = RIG_STATUS_UNTESTED, .status = RIG_STATUS_STABLE,
.rig_type = RIG_TYPE_TRANSCEIVER, .rig_type = RIG_TYPE_TRANSCEIVER,
.ptt_type = RIG_PTT_RIG, .ptt_type = RIG_PTT_RIG,
.dcd_type = RIG_DCD_RIG, .dcd_type = RIG_DCD_RIG,

83
icmarine/icmarine.c
Wyświetl plik

@ -220,14 +220,14 @@ int icmarine_transaction(RIG *rig, const char *cmd, const char *param, char *res
int cmd_len = 0; int cmd_len = 0;
unsigned csum = 0; unsigned csum = 0;
rig_debug(RIG_DEBUG_TRACE, "%s: cmd='%s', param=%s\n",__FUNCTION__,cmd,param);
rs = &rig->state; rs = &rig->state;
priv = (struct icmarine_priv_data *)rs->priv; priv = (struct icmarine_priv_data *)rs->priv;
serial_flush(&rs->rigport); serial_flush(&rs->rigport);
/* command formating */ /* command formating */
cmdbuf[BUFSZ]='\0';
cmd_len = snprintf(cmdbuf, BUFSZ, "$PICOA,%02u,%02u,%s", cmd_len = snprintf(cmdbuf, BUFSZ, "$PICOA,%02u,%02u,%s",
CONTROLLER_ID, CONTROLLER_ID,
priv->remote_id, priv->remote_id,
@ -258,8 +258,6 @@ int icmarine_transaction(RIG *rig, const char *cmd, const char *param, char *res
if (retval < OFFSET_CMD+5) if (retval < OFFSET_CMD+5)
return -RIG_EPROTO; return -RIG_EPROTO;
respbuf[retval] = 0;
/* check response */ /* check response */
if (memcmp(respbuf, "$PICOA,", strlen("$PICOA,"))) if (memcmp(respbuf, "$PICOA,", strlen("$PICOA,")))
return -RIG_EPROTO; return -RIG_EPROTO;
@ -274,20 +272,22 @@ int icmarine_transaction(RIG *rig, const char *cmd, const char *param, char *res
return -RIG_ERJCTED; return -RIG_ERJCTED;
} }
/* So this is a query */ /* strip from *checksum and after */
retval = read_string(&rs->rigport, respbuf, BUFSZ, LF, strlen(LF)); char *strip = strrchr(respbuf,'*');
if (retval < 0) if (strip) {
return retval; *strip = 0;
}
/* strip *checksum and CR/LF from string */ else {
respbuf[retval-5] = 0; rig_debug(RIG_DEBUG_ERR, "%s: checksum not in response? response='%s'\n",__FUNCTION__,respbuf);
return -RIG_EPROTO;
p = strchr(respbuf+OFFSET_CMD, ','); }
p = strrchr(respbuf, ',');
if (p) if (p)
strncpy(response, p+1, BUFSZ); strncpy(response, p+1, BUFSZ);
else else
return -RIG_EPROTO; return -RIG_EPROTO;
rig_debug(RIG_DEBUG_VERBOSE, "%s: returning response='%s'\n", __FUNCTION__,response);
return RIG_OK; return RIG_OK;
} }
@ -297,6 +297,8 @@ int icmarine_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
char freqbuf[BUFSZ]; char freqbuf[BUFSZ];
struct icmarine_priv_data *priv; struct icmarine_priv_data *priv;
rig_debug(RIG_DEBUG_TRACE, "%s:\n",__FUNCTION__);
priv = (struct icmarine_priv_data*)rig->state.priv; priv = (struct icmarine_priv_data*)rig->state.priv;
sprintf(freqbuf, "%.6f", freq/MHz(1)); sprintf(freqbuf, "%.6f", freq/MHz(1));
@ -318,6 +320,8 @@ int icmarine_get_freq(RIG *rig, vfo_t vfo, freq_t *freq)
char freqbuf[BUFSZ] = ""; char freqbuf[BUFSZ] = "";
double d; double d;
rig_debug(RIG_DEBUG_TRACE, "%s:\n",__FUNCTION__);
retval = icmarine_transaction (rig, CMD_RXFREQ, NULL, freqbuf); retval = icmarine_transaction (rig, CMD_RXFREQ, NULL, freqbuf);
if (retval != RIG_OK) if (retval != RIG_OK)
return retval; return retval;
@ -325,8 +329,10 @@ int icmarine_get_freq(RIG *rig, vfo_t vfo, freq_t *freq)
if (freqbuf[0] == '\0') { if (freqbuf[0] == '\0') {
*freq = 0; *freq = 0;
} else { } else {
if (sscanf(freqbuf, "%lf", &d) != 1) if (sscanf(freqbuf, "%lf", &d) != 1) {
rig_debug(RIG_DEBUG_ERR,"%s: sscanf('%s') failed\n",__FUNCTION__,freqbuf);
return -RIG_EPROTO; return -RIG_EPROTO;
}
*freq = (freq_t)(d*MHz(1)); *freq = (freq_t)(d*MHz(1));
} }
@ -338,6 +344,8 @@ int icmarine_set_tx_freq(RIG *rig, vfo_t vfo, freq_t freq)
{ {
char freqbuf[BUFSZ]; char freqbuf[BUFSZ];
rig_debug(RIG_DEBUG_TRACE, "%s:\n",__FUNCTION__);
sprintf(freqbuf, "%.6f", freq/MHz(1)); sprintf(freqbuf, "%.6f", freq/MHz(1));
return icmarine_transaction (rig, CMD_TXFREQ, freqbuf, NULL); return icmarine_transaction (rig, CMD_TXFREQ, freqbuf, NULL);
@ -349,6 +357,8 @@ int icmarine_get_tx_freq(RIG *rig, vfo_t vfo, freq_t *freq)
char freqbuf[BUFSZ] = ""; char freqbuf[BUFSZ] = "";
double d; double d;
rig_debug(RIG_DEBUG_TRACE, "%s:\n",__FUNCTION__);
retval = icmarine_transaction (rig, CMD_TXFREQ, NULL, freqbuf); retval = icmarine_transaction (rig, CMD_TXFREQ, NULL, freqbuf);
if (retval != RIG_OK) if (retval != RIG_OK)
return retval; return retval;
@ -369,8 +379,9 @@ int icmarine_set_split_vfo(RIG *rig, vfo_t rx_vfo, split_t split, vfo_t tx_vfo)
{ {
struct icmarine_priv_data *priv; struct icmarine_priv_data *priv;
priv = (struct icmarine_priv_data *)rig->state.priv; rig_debug(RIG_DEBUG_TRACE, "%s:\n",__FUNCTION__);
priv = (struct icmarine_priv_data *)rig->state.priv;
/* when disabling split mode */ /* when disabling split mode */
if (RIG_SPLIT_ON == priv->split && if (RIG_SPLIT_ON == priv->split &&
@ -390,6 +401,8 @@ int icmarine_get_split_vfo(RIG *rig, vfo_t rx_vfo, split_t *split, vfo_t *tx_vfo
{ {
struct icmarine_priv_data *priv; struct icmarine_priv_data *priv;
rig_debug(RIG_DEBUG_TRACE, "%s:\n",__FUNCTION__);
priv = (struct icmarine_priv_data *)rig->state.priv; priv = (struct icmarine_priv_data *)rig->state.priv;
*split = priv->split; *split = priv->split;
@ -403,6 +416,8 @@ int icmarine_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
{ {
const char *pmode; const char *pmode;
rig_debug(RIG_DEBUG_TRACE, "%s:\n",__FUNCTION__);
switch (mode) { switch (mode) {
case RIG_MODE_CW: pmode = MD_CW; break; case RIG_MODE_CW: pmode = MD_CW; break;
case RIG_MODE_USB: pmode = MD_USB; break; case RIG_MODE_USB: pmode = MD_USB; break;
@ -424,11 +439,12 @@ int icmarine_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
int retval; int retval;
char modebuf[BUFSZ]; char modebuf[BUFSZ];
rig_debug(RIG_DEBUG_TRACE, "%s:\n",__FUNCTION__);
retval = icmarine_transaction (rig, CMD_MODE, NULL, modebuf); retval = icmarine_transaction (rig, CMD_MODE, NULL, modebuf);
if (retval != RIG_OK) if (retval != RIG_OK)
return retval; return retval;
if (!memcmp(modebuf, MD_LSB, strlen(MD_LSB))) if (!memcmp(modebuf, MD_LSB, strlen(MD_LSB)))
*mode = RIG_MODE_LSB; *mode = RIG_MODE_LSB;
else if (!memcmp(modebuf, MD_USB, strlen(MD_USB))) else if (!memcmp(modebuf, MD_USB, strlen(MD_USB)))
@ -453,8 +469,15 @@ int icmarine_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
*/ */
int icmarine_set_ptt(RIG *rig, vfo_t vfo, ptt_t ptt) int icmarine_set_ptt(RIG *rig, vfo_t vfo, ptt_t ptt)
{ {
return icmarine_transaction (rig, CMD_PTT, rig_debug(RIG_DEBUG_TRACE, "%s:\n",__FUNCTION__);
int retval = icmarine_transaction (rig, CMD_PTT,
ptt == RIG_PTT_ON ? "TX" : "RX", NULL); ptt == RIG_PTT_ON ? "TX" : "RX", NULL);
if (retval != RIG_OK) {
rig_debug(RIG_DEBUG_ERR, "%s: transaction failed\n",__FUNCTION__);
return retval;
}
return RIG_OK;
} }
int icmarine_get_ptt(RIG *rig, vfo_t vfo, ptt_t *ptt) int icmarine_get_ptt(RIG *rig, vfo_t vfo, ptt_t *ptt)
@ -462,17 +485,23 @@ int icmarine_get_ptt(RIG *rig, vfo_t vfo, ptt_t *ptt)
char pttbuf[BUFSZ]; char pttbuf[BUFSZ];
int retval; int retval;
rig_debug(RIG_DEBUG_TRACE, "%s:\n",__FUNCTION__);
retval = icmarine_transaction (rig, CMD_PTT, NULL, pttbuf); retval = icmarine_transaction (rig, CMD_PTT, NULL, pttbuf);
if (retval != RIG_OK) if (retval != RIG_OK) {
rig_debug(RIG_DEBUG_ERR, "%s: transaction failed\n",__FUNCTION__);
return retval; return retval;
}
if (!strcmp(pttbuf, "TX")) if (strncmp(pttbuf, "TX",2)==0)
*ptt = RIG_PTT_ON; *ptt = RIG_PTT_ON;
else if (!strcmp(pttbuf, "RX")) else if (strncmp(pttbuf, "RX",2)==0)
*ptt = RIG_PTT_OFF; *ptt = RIG_PTT_OFF;
else else {
rig_debug(RIG_DEBUG_ERR, "%s: invalid pttbuf='%s'\n",__FUNCTION__,pttbuf);
retval = -RIG_EPROTO; retval = -RIG_EPROTO;
}
return retval; return retval;
} }
@ -482,6 +511,8 @@ int icmarine_get_dcd(RIG *rig, vfo_t vfo, dcd_t *dcd)
char dcdbuf[BUFSZ]; char dcdbuf[BUFSZ];
int retval; int retval;
rig_debug(RIG_DEBUG_TRACE, "%s:\n",__FUNCTION__);
retval = icmarine_transaction (rig, CMD_SQLS, NULL, dcdbuf); retval = icmarine_transaction (rig, CMD_SQLS, NULL, dcdbuf);
if (retval != RIG_OK) if (retval != RIG_OK)
@ -499,6 +530,8 @@ int icmarine_get_dcd(RIG *rig, vfo_t vfo, dcd_t *dcd)
int icmarine_vfo_op(RIG *rig, vfo_t vfo, vfo_op_t op) int icmarine_vfo_op(RIG *rig, vfo_t vfo, vfo_op_t op)
{ {
rig_debug(RIG_DEBUG_TRACE, "%s:\n",__FUNCTION__);
if (RIG_OP_TUNE != op && RIG_OP_NONE != op) if (RIG_OP_TUNE != op && RIG_OP_NONE != op)
return -RIG_EINVAL; return -RIG_EINVAL;
@ -510,6 +543,8 @@ int icmarine_set_func(RIG *rig, vfo_t vfo, setting_t func, int status)
{ {
int retval; int retval;
rig_debug(RIG_DEBUG_TRACE, "%s:\n",__FUNCTION__);
switch(func) { switch(func) {
case RIG_FUNC_NB: case RIG_FUNC_NB:
retval = icmarine_transaction (rig, CMD_NB, status ? "ON":"OFF", NULL); retval = icmarine_transaction (rig, CMD_NB, status ? "ON":"OFF", NULL);
@ -527,6 +562,8 @@ int icmarine_get_func(RIG *rig, vfo_t vfo, setting_t func, int *status)
char funcbuf[BUFSZ]; char funcbuf[BUFSZ];
int retval; int retval;
rig_debug(RIG_DEBUG_TRACE, "%s:\n",__FUNCTION__);
switch(func) { switch(func) {
case RIG_FUNC_NB: case RIG_FUNC_NB:
retval = icmarine_transaction (rig, CMD_NB, NULL, funcbuf); retval = icmarine_transaction (rig, CMD_NB, NULL, funcbuf);
@ -547,6 +584,8 @@ int icmarine_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
char lvlbuf[BUFSZ]; char lvlbuf[BUFSZ];
int retval; int retval;
rig_debug(RIG_DEBUG_TRACE, "%s:\n",__FUNCTION__);
switch(level) { switch(level) {
case RIG_LEVEL_AF: case RIG_LEVEL_AF:
sprintf(lvlbuf, "%u", (unsigned)(val.f * 255)); sprintf(lvlbuf, "%u", (unsigned)(val.f * 255));
@ -580,6 +619,8 @@ int icmarine_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
char lvlbuf[BUFSZ]; char lvlbuf[BUFSZ];
int retval; int retval;
rig_debug(RIG_DEBUG_TRACE, "%s:\n",__FUNCTION__);
switch(level) { switch(level) {
case RIG_LEVEL_RAWSTR: case RIG_LEVEL_RAWSTR:
retval = icmarine_transaction (rig, CMD_SMETER, NULL, lvlbuf); retval = icmarine_transaction (rig, CMD_SMETER, NULL, lvlbuf);

2
icmarine/icmarine.h
Wyświetl plik

@ -30,7 +30,7 @@
#include <sys/time.h> #include <sys/time.h>
#endif #endif
#define BACKEND_VER "0.1" #define BACKEND_VER "0.2"
struct icmarine_priv_caps { struct icmarine_priv_caps {
unsigned char default_remote_id; /* the remote default equipment's ID */ unsigned char default_remote_id; /* the remote default equipment's ID */