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

Update AOR 3030 to actually work now. Tested with WSJT-X 

(cherry picked from commit 7893b9f6d8)
Hamlib-3.2
Michael Black W9MDB 2018-03-19 14:23:23 -04:00 zatwierdzone przez Nate Bargmann
rodzic 34c32a3cd7
commit 423a1186e8
1 zmienionych plików z 444 dodań i 370 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

814
aor/ar3030.c 100644 → 100755
Wyświetl plik

@ -26,6 +26,7 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <unistd.h>
#include "hamlib/rig.h" #include "hamlib/rig.h"
#include "serial.h" #include "serial.h"
@ -51,8 +52,8 @@ static int ar3030_close(RIG *rig);
static int ar3030_vfo_op(RIG *rig, vfo_t vfo, vfo_op_t op); static int ar3030_vfo_op(RIG *rig, vfo_t vfo, vfo_op_t op);
struct ar3030_priv_data { struct ar3030_priv_data {
int curr_ch; int curr_ch;
int curr_vfo; int curr_vfo;
}; };
/* /*
@ -96,100 +97,101 @@ struct ar3030_priv_data {
* ar3030 rig capabilities. * ar3030 rig capabilities.
*/ */
const struct rig_caps ar3030_caps = { const struct rig_caps ar3030_caps = {
.rig_model = RIG_MODEL_AR3030, .rig_model = RIG_MODEL_AR3030,
.model_name = "AR3030", .model_name = "AR3030",
.mfg_name = "AOR", .mfg_name = "AOR",
.version = "0.4", .version = "1.0",
.copyright = "LGPL", .copyright = "LGPL",
.status = RIG_STATUS_UNTESTED, .status = RIG_STATUS_STABLE,
.rig_type = RIG_TYPE_RECEIVER, .rig_type = RIG_TYPE_RECEIVER,
.ptt_type = RIG_PTT_NONE, .ptt_type = RIG_PTT_NONE,
.dcd_type = RIG_DCD_NONE, .dcd_type = RIG_DCD_NONE,
.port_type = RIG_PORT_SERIAL, .port_type = RIG_PORT_SERIAL,
.serial_rate_min = 4800, .serial_rate_min = 4800,
.serial_rate_max = 9600, .serial_rate_max = 9600,
.serial_data_bits = 8, .serial_data_bits = 8,
.serial_stop_bits = 2, .serial_stop_bits = 2,
.serial_parity = RIG_PARITY_NONE, .serial_parity = RIG_PARITY_NONE,
.serial_handshake = RIG_HANDSHAKE_HARDWARE, .serial_handshake = RIG_HANDSHAKE_HARDWARE,
.write_delay = 0, .write_delay = 0,
.post_write_delay = 1, /* ms */ .post_write_delay = 50, /* ms */
.timeout = 500, .timeout = 500,
.retry = 0, .retry = 0,
.has_get_func = AR3030_FUNC_ALL, .has_get_func = AR3030_FUNC_ALL,
.has_set_func = AR3030_FUNC_ALL, .has_set_func = AR3030_FUNC_ALL,
.has_get_level = AR3030_LEVEL, .has_get_level = AR3030_LEVEL,
.has_set_level = RIG_LEVEL_SET(AR3030_LEVEL), .has_set_level = RIG_LEVEL_SET(AR3030_LEVEL),
.has_get_parm = AR3030_PARM, .has_get_parm = AR3030_PARM,
.has_set_parm = RIG_PARM_NONE, .has_set_parm = RIG_PARM_NONE,
.level_gran = {}, /* FIXME: granularity */ .level_gran = {}, /* FIXME: granularity */
.parm_gran = {}, .parm_gran = {},
.ctcss_list = NULL, .ctcss_list = NULL,
.dcs_list = NULL, .dcs_list = NULL,
.preamp = { RIG_DBLST_END, }, .preamp = { RIG_DBLST_END, },
.attenuator = { 10, 20, RIG_DBLST_END, }, .attenuator = { 10, 20, RIG_DBLST_END, },
.max_rit = Hz(0), .max_rit = Hz(0),
.max_xit = Hz(0), .max_xit = Hz(0),
.max_ifshift = Hz(0), .max_ifshift = Hz(0),
.targetable_vfo = 0, .targetable_vfo = 0,
.transceive = RIG_TRN_OFF, .transceive = RIG_TRN_OFF,
.bank_qty = 0, .bank_qty = 0,
.chan_desc_sz = 0, .chan_desc_sz = 0,
.vfo_ops = AR3030_VFO_OPS, .vfo_ops = AR3030_VFO_OPS,
.str_cal = AR3030_STR_CAL, .str_cal = AR3030_STR_CAL,
.chan_list = { .chan_list = {
{ 0, 99, RIG_MTYPE_MEM, AR3030_MEM_CAP }, { 0, 99, RIG_MTYPE_MEM, AR3030_MEM_CAP },
RIG_CHAN_END, }, RIG_CHAN_END,
},
.rx_range_list1 = { .rx_range_list1 = {
{kHz(30),MHz(30),AR3030_MODES,-1,-1,AR3030_VFO}, {kHz(30),MHz(30),AR3030_MODES,-1,-1,AR3030_VFO},
RIG_FRNG_END, RIG_FRNG_END,
}, },
.tx_range_list1 = { RIG_FRNG_END, }, .tx_range_list1 = { RIG_FRNG_END, },
.rx_range_list2 = { .rx_range_list2 = {
{kHz(30),MHz(30),AR3030_MODES,-1,-1,AR3030_VFO}, {kHz(30),MHz(30),AR3030_MODES,-1,-1,AR3030_VFO},
RIG_FRNG_END, RIG_FRNG_END,
}, /* rx range */ }, /* rx range */
.tx_range_list2 = { RIG_FRNG_END, }, /* no tx range, this is a receiver! */ .tx_range_list2 = { RIG_FRNG_END, }, /* no tx range, this is a receiver! */
.tuning_steps = { .tuning_steps = {
{AR3030_MODES,10}, {AR3030_MODES,10},
{AR3030_MODES,100}, {AR3030_MODES,100},
{AR3030_MODES,kHz(1)}, {AR3030_MODES,kHz(1)},
{AR3030_MODES,MHz(1)}, {AR3030_MODES,MHz(1)},
RIG_TS_END, RIG_TS_END,
}, },
/* mode/filter list, .remember = order matters! */ /* mode/filter list, .remember = order matters! */
.filters = { .filters = {
{RIG_MODE_AM, kHz(6)}, {RIG_MODE_AM, kHz(6)},
{RIG_MODE_SSB|RIG_MODE_CW|RIG_MODE_AM, kHz(2.4)}, {RIG_MODE_SSB|RIG_MODE_CW|RIG_MODE_AM, kHz(2.4)},
{RIG_MODE_CW, 500}, {RIG_MODE_CW, 500},
{RIG_MODE_FM, kHz(15)}, {RIG_MODE_FM, kHz(15)},
RIG_FLT_END, RIG_FLT_END,
}, },
.rig_init = ar3030_init, .rig_init = ar3030_init,
.rig_cleanup = ar3030_cleanup, .rig_cleanup = ar3030_cleanup,
.rig_close = ar3030_close, .rig_close = ar3030_close,
.set_freq = ar3030_set_freq, .set_freq = ar3030_set_freq,
.get_freq = ar3030_get_freq, .get_freq = ar3030_get_freq,
.set_mode = ar3030_set_mode, .set_mode = ar3030_set_mode,
.get_mode = ar3030_get_mode, .get_mode = ar3030_get_mode,
.set_vfo = ar3030_set_vfo, .set_vfo = ar3030_set_vfo,
.get_vfo = ar3030_get_vfo, .get_vfo = ar3030_get_vfo,
.set_level = ar3030_set_level, .set_level = ar3030_set_level,
.get_level = ar3030_get_level, .get_level = ar3030_get_level,
.set_mem = ar3030_set_mem, .set_mem = ar3030_set_mem,
.get_mem = ar3030_get_mem, .get_mem = ar3030_get_mem,
.get_channel = ar3030_get_channel, .get_channel = ar3030_get_channel,
.vfo_op = ar3030_vfo_op, .vfo_op = ar3030_vfo_op,
}; };
@ -201,7 +203,8 @@ const struct rig_caps ar3030_caps = {
/* is LF really needed? */ /* is LF really needed? */
#define EOM "\x0a\x0d" #define CR "\x0d"
#define EOM "\x0d\x0a"
#define BUFSZ 64 #define BUFSZ 64
@ -210,100 +213,126 @@ const struct rig_caps ar3030_caps = {
* We assume that rig!=NULL, rig->state!= NULL * We assume that rig!=NULL, rig->state!= NULL
* Otherwise, you'll get a nice seg fault. You've been warned! * Otherwise, you'll get a nice seg fault. You've been warned!
* return value: RIG_OK if everything's fine, negative value otherwise * return value: RIG_OK if everything's fine, negative value otherwise
* TODO: error case handling
*/ */
static int ar3030_transaction(RIG *rig, const char *cmd, int cmd_len, char *data, int *data_len) static int ar3030_transaction(RIG *rig, const char *cmd, int cmd_len, char *data, int *data_len)
{ {
int retval; int retval;
struct rig_state *rs; struct rig_state *rs;
int retry=3;
char tmpdata[BUFSZ];
rs = &rig->state; rs = &rig->state;
serial_flush(&rs->rigport); if (data==NULL) {
data = tmpdata;
}
serial_flush(&rs->rigport);
do {
retval = write_block(&rs->rigport, cmd, cmd_len);
if (retval != RIG_OK) {
rig_debug(RIG_DEBUG_ERR,"%s: write_block error=%d\n",__func__,retval);
return retval;
}
if (data) {
/* expecting 0x0d0x0a on all commands so wait for the 0x0a */
retval = read_string(&rs->rigport, data, BUFSZ, "\x0a", 1);
if (retval == -RIG_ETIMEOUT) {
rig_debug(RIG_DEBUG_ERR,"%s:timeout retry=%d\n",__func__,retry);
usleep(50000);
}
}
rig_debug(RIG_DEBUG_TRACE,"%s: retval=%d retry=%d\n",__func__,retval,retry);
} while((retval <= 0) && (--retry > 0));
usleep(1000); // 1ms sleep per manual
if (data_len!=NULL && retval > 0) {
*data_len = 0;
/* only set data_len non-zero if not a command response */
if (retval > 0 && data[0]!= 0x00 && data[0]!=0x0d) {
*data_len=retval;
}
}
rig_debug(RIG_DEBUG_TRACE,"%s: return data_len=%d retry=%d\n",__func__,data_len?*data_len:0,retry);
retval = write_block(&rs->rigport, cmd, cmd_len); return RIG_OK;
if (retval != RIG_OK)
return retval;
/* will flush data on next transaction */
if (!data || !data_len)
return RIG_OK;
retval = read_string(&rs->rigport, data, BUFSZ, EOM, strlen(EOM));
if (retval == -RIG_ETIMEOUT)
retval = 0;
if (retval < 0)
return retval;
*data_len = retval;
return RIG_OK;
} }
int ar3030_init(RIG *rig) int ar3030_init(RIG *rig)
{ {
struct ar3030_priv_data *priv; struct ar3030_priv_data *priv;
priv = malloc(sizeof(struct ar3030_priv_data)); priv = malloc(sizeof(struct ar3030_priv_data));
if (!priv) if (!priv)
return -RIG_ENOMEM; return -RIG_ENOMEM;
priv->curr_ch = 99; /* huh! FIXME: get_mem in open() ? */ priv->curr_ch = 99; /* huh! FIXME: get_mem in open() ? */
priv->curr_vfo = RIG_VFO_A; priv->curr_vfo = RIG_VFO_A;
rig->state.priv = priv; rig->state.priv = priv;
return RIG_OK; return RIG_OK;
} }
int ar3030_cleanup(RIG *rig) int ar3030_cleanup(RIG *rig)
{ {
struct ar3030_priv_data *priv = rig->state.priv; struct ar3030_priv_data *priv = rig->state.priv;
free(priv); free(priv);
return RIG_OK; return RIG_OK;
} }
int ar3030_close(RIG *rig) int ar3030_close(RIG *rig)
{ {
int retval; int retval;
struct rig_state *rs;
retval = ar3030_transaction (rig, "Q" EOM, strlen("Q" EOM), NULL, NULL); rig_debug(RIG_DEBUG_TRACE,"%s:\n",__func__);
return retval; rs = &rig->state;
serial_flush(&rs->rigport);
retval = ar3030_transaction (rig, "Q" CR, strlen("Q" CR), NULL, NULL);
rig_debug(RIG_DEBUG_TRACE,"%s: retval=%d\n",__func__,retval);
return retval;
} }
int ar3030_set_vfo(RIG *rig, vfo_t vfo) int ar3030_set_vfo(RIG *rig, vfo_t vfo)
{ {
struct ar3030_priv_data *priv = (struct ar3030_priv_data *)rig->state.priv; struct ar3030_priv_data *priv = (struct ar3030_priv_data *)rig->state.priv;
char *cmd = ""; char *cmd = "";
int retval; int retval;
switch(vfo) { switch(vfo) {
case RIG_VFO_CURR: case RIG_VFO_CURR:
return RIG_OK; return RIG_OK;
case RIG_VFO_VFO: case RIG_VFO_VFO:
case RIG_VFO_A: cmd = "D" EOM; break; case RIG_VFO_A:
case RIG_VFO_MEM: cmd = "M" EOM; break; cmd = "D" CR;
default: return -RIG_EINVAL; break;
} case RIG_VFO_MEM:
cmd = "M" CR;
break;
default:
return -RIG_EINVAL;
}
retval = ar3030_transaction (rig, cmd, strlen(cmd), NULL, NULL); retval = ar3030_transaction (rig, cmd, strlen(cmd), NULL, NULL);
if (retval == RIG_OK) if (retval == RIG_OK)
priv->curr_vfo = vfo; priv->curr_vfo = vfo;
return retval; return retval;
} }
int ar3030_get_vfo(RIG *rig, vfo_t *vfo) int ar3030_get_vfo(RIG *rig, vfo_t *vfo)
{ {
struct ar3030_priv_data *priv = (struct ar3030_priv_data *)rig->state.priv; struct ar3030_priv_data *priv = (struct ar3030_priv_data *)rig->state.priv;
*vfo = priv->curr_vfo; *vfo = priv->curr_vfo;
return RIG_OK; return RIG_OK;
} }
@ -313,19 +342,19 @@ int ar3030_get_vfo(RIG *rig, vfo_t *vfo)
*/ */
int ar3030_set_freq(RIG *rig, vfo_t vfo, freq_t freq) int ar3030_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
{ {
struct ar3030_priv_data *priv = (struct ar3030_priv_data *)rig->state.priv; struct ar3030_priv_data *priv = (struct ar3030_priv_data *)rig->state.priv;
char freqbuf[BUFSZ]; char freqbuf[BUFSZ];
int freq_len, retval; int freq_len, retval;
freq_len = sprintf(freqbuf,"%03.4f" EOM, ((double)freq)/MHz(1)); freq_len = sprintf(freqbuf,"%03.6f" CR, ((double)freq)/MHz(1));
retval = ar3030_transaction (rig, freqbuf, freq_len, NULL, NULL); retval = ar3030_transaction (rig, freqbuf, freq_len, NULL, NULL);
if (retval != RIG_OK) if (retval != RIG_OK)
return retval; return retval;
priv->curr_vfo = RIG_VFO_A; priv->curr_vfo = RIG_VFO_A;
return RIG_OK; return RIG_OK;
} }
/* /*
@ -334,26 +363,29 @@ int ar3030_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
*/ */
int ar3030_get_freq(RIG *rig, vfo_t vfo, freq_t *freq) int ar3030_get_freq(RIG *rig, vfo_t vfo, freq_t *freq)
{ {
struct ar3030_priv_data *priv = (struct ar3030_priv_data *)rig->state.priv; struct ar3030_priv_data *priv = (struct ar3030_priv_data *)rig->state.priv;
char *rfp; char *rfp;
int freq_len, retval; int freq_len, retval;
char freqbuf[BUFSZ]; char freqbuf[BUFSZ];
/* /*
* D Rn Gn Bn Tn Fnnnnnnnn C * D Rn Gn Bn Tn Fnnnnnnnn C
* Note: spaces are transmitted. * Note: spaces are transmitted.
*/ */
retval = ar3030_transaction (rig, "D" EOM, 3, freqbuf, &freq_len); retval = ar3030_transaction (rig, "D" CR, 2, freqbuf, &freq_len);
if (retval != RIG_OK) if (retval != RIG_OK)
return retval; return retval;
priv->curr_vfo = RIG_VFO_A; priv->curr_vfo = RIG_VFO_A;
rfp = strchr(freqbuf, 'F'); rfp = strchr(freqbuf, 'F');
if (!rfp) if (!rfp)
return -RIG_EPROTO; return -RIG_EPROTO;
sscanf(rfp+1,"%"SCNfreq, freq); long lfreq;
sscanf(rfp+1,"%ld", &lfreq);
*freq = lfreq;
rig_debug(RIG_DEBUG_ERR,"%s: read lfreq=%d, freq=%.6f\n",__func__,lfreq,*freq);
return RIG_OK; return RIG_OK;
} }
/* /*
@ -362,34 +394,48 @@ int ar3030_get_freq(RIG *rig, vfo_t vfo, freq_t *freq)
*/ */
int ar3030_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width) int ar3030_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
{ {
char mdbuf[BUFSZ]; char mdbuf[BUFSZ];
int mdbuf_len, aormode, retval; int mdbuf_len, aormode, retval;
switch (mode) { switch (mode) {
case RIG_MODE_AM: aormode = 'A'; break; case RIG_MODE_AM:
case RIG_MODE_CW: aormode = 'C'; break; aormode = 'A';
case RIG_MODE_USB: aormode = 'U'; break; break;
case RIG_MODE_LSB: aormode = 'L'; break; case RIG_MODE_CW:
case RIG_MODE_FM: aormode = 'N'; break; aormode = 'C';
case RIG_MODE_AMS: aormode = 'S'; break; break;
case RIG_MODE_FAX: aormode = 'X'; break; case RIG_MODE_USB:
default: aormode = 'U';
rig_debug(RIG_DEBUG_ERR,"%s: unsupported mode %d\n", break;
__FUNCTION__,mode); case RIG_MODE_LSB:
return -RIG_EINVAL; aormode = 'L';
} break;
case RIG_MODE_FM:
aormode = 'N';
break;
case RIG_MODE_AMS:
aormode = 'S';
break;
case RIG_MODE_FAX:
aormode = 'X';
break;
default:
rig_debug(RIG_DEBUG_ERR,"%s: unsupported mode %d\n",
__FUNCTION__,mode);
return -RIG_EINVAL;
}
if (width != RIG_PASSBAND_NOCHANGE) { if (width != RIG_PASSBAND_NOCHANGE) {
mdbuf_len = sprintf(mdbuf, "%c" EOM, aormode); mdbuf_len = sprintf(mdbuf, "%c" CR, aormode);
} }
else { else {
mdbuf_len = sprintf(mdbuf, "%dB%c" EOM, mdbuf_len = sprintf(mdbuf, "%dB%c" CR,
width < rig_passband_normal(rig,mode) ? 1 : 0, width < rig_passband_normal(rig,mode) ? 1 : 0,
aormode); aormode);
} }
retval = ar3030_transaction (rig, mdbuf, mdbuf_len, NULL, NULL); retval = ar3030_transaction (rig, mdbuf, mdbuf_len, NULL, NULL);
return retval; return retval;
} }
/* /*
@ -398,252 +444,280 @@ int ar3030_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
*/ */
int ar3030_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width) int ar3030_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
{ {
struct ar3030_priv_data *priv = (struct ar3030_priv_data *)rig->state.priv; struct ar3030_priv_data *priv = (struct ar3030_priv_data *)rig->state.priv;
int buf_len, retval; int buf_len, retval;
char buf[BUFSZ]; char buf[BUFSZ];
/* /*
* D Rn Gn Bn Tn Fnnnnnnnn C * D Rn Gn Bn Tn Fnnnnnnnn C
* Note: spaces are transmitted * Note: spaces are transmitted
*/ */
retval = ar3030_transaction (rig, "D" EOM, 3, buf, &buf_len); retval = ar3030_transaction (rig, "D" CR, 2, buf, &buf_len);
if (retval != RIG_OK) if (retval != RIG_OK)
return retval; return retval;
priv->curr_vfo = RIG_VFO_A; priv->curr_vfo = RIG_VFO_A;
switch (buf[25]) { switch (buf[25]) {
case 'A': *mode = RIG_MODE_AM; break; case 'A':
case 'L': *mode = RIG_MODE_LSB; break; *mode = RIG_MODE_AM;
case 'U': *mode = RIG_MODE_USB; break; break;
case 'C': *mode = RIG_MODE_CW; break; case 'L':
case 'S': *mode = RIG_MODE_AMS; break; *mode = RIG_MODE_LSB;
case 'N': *mode = RIG_MODE_FM; break; break;
case 'X': *mode = RIG_MODE_FAX; break; case 'U':
default: *mode = RIG_MODE_USB;
rig_debug(RIG_DEBUG_ERR,"%s: unsupported mode '%c'\n", break;
__FUNCTION__,buf[25]); case 'C':
return -RIG_EPROTO; *mode = RIG_MODE_CW;
} break;
case 'S':
*mode = RIG_MODE_AMS;
break;
case 'N':
*mode = RIG_MODE_FM;
break;
case 'X':
*mode = RIG_MODE_FAX;
break;
default:
rig_debug(RIG_DEBUG_ERR,"%s: unsupported mode '%c'\n",
__FUNCTION__,buf[25]);
return -RIG_EPROTO;
}
*width = buf[9] == '1' ? rig_passband_narrow(rig, *mode) : *width = buf[9] == '1' ? rig_passband_narrow(rig, *mode) :
rig_passband_normal(rig, *mode); rig_passband_normal(rig, *mode);
return RIG_OK; return RIG_OK;
} }
int ar3030_set_mem(RIG *rig, vfo_t vfo, int ch) int ar3030_set_mem(RIG *rig, vfo_t vfo, int ch)
{ {
struct ar3030_priv_data *priv = (struct ar3030_priv_data *)rig->state.priv; struct ar3030_priv_data *priv = (struct ar3030_priv_data *)rig->state.priv;
char cmdbuf[BUFSZ]; char cmdbuf[BUFSZ];
int cmd_len, retval=RIG_OK; int cmd_len, retval=RIG_OK;
if (priv->curr_vfo == RIG_VFO_MEM) { if (priv->curr_vfo == RIG_VFO_MEM) {
cmd_len = sprintf(cmdbuf, "%02dM" EOM, ch); cmd_len = sprintf(cmdbuf, "%02dM" CR, ch);
retval = ar3030_transaction (rig, cmdbuf, cmd_len, NULL, NULL); retval = ar3030_transaction (rig, cmdbuf, cmd_len, NULL, NULL);
} }
if (retval == RIG_OK) { if (retval == RIG_OK) {
priv->curr_ch = ch; priv->curr_ch = ch;
} }
return retval; return retval;
} }
int ar3030_get_mem(RIG *rig, vfo_t vfo, int *ch) int ar3030_get_mem(RIG *rig, vfo_t vfo, int *ch)
{ {
struct ar3030_priv_data *priv = (struct ar3030_priv_data *)rig->state.priv; struct ar3030_priv_data *priv = (struct ar3030_priv_data *)rig->state.priv;
char infobuf[BUFSZ]; char infobuf[BUFSZ];
int info_len, retval; int info_len, retval;
if (priv->curr_vfo != RIG_VFO_MEM) { if (priv->curr_vfo != RIG_VFO_MEM) {
*ch = priv->curr_ch; *ch = priv->curr_ch;
} }
retval = ar3030_transaction (rig, "M" EOM, 3, infobuf, &info_len); retval = ar3030_transaction (rig, "M" CR, 2, infobuf, &info_len);
if (retval != RIG_OK) if (retval != RIG_OK)
return retval; return retval;
/* /*
* MnnPnRnGnBnTnFnnnnnnnnC * MnnPnRnGnBnTnFnnnnnnnnC
*/ */
if (infobuf[0] != 'M') { if (infobuf[0] != 'M') {
return -RIG_EPROTO; return -RIG_EPROTO;
} }
/* /*
* Is it a blank mem channel ? * Is it a blank mem channel ?
*/ */
if (infobuf[1] == '-' && infobuf[2] == '-') { if (infobuf[1] == '-' && infobuf[2] == '-') {
*ch = -1; /* FIXME: return error instead? */ *ch = -1; /* FIXME: return error instead? */
return RIG_OK; return RIG_OK;
} }
*ch = priv->curr_ch = atoi(infobuf+1); *ch = priv->curr_ch = atoi(infobuf+1);
return RIG_OK; return RIG_OK;
} }
int ar3030_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val) int ar3030_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
{ {
char *cmd; char *cmd;
int retval; int retval;
switch(level) { switch(level) {
case RIG_LEVEL_AGC: case RIG_LEVEL_AGC:
/* SLOW otherwise */ /* SLOW otherwise */
cmd = val.i == RIG_AGC_FAST ? "1G" EOM : "0G" EOM; cmd = val.i == RIG_AGC_FAST ? "1G" CR : "0G" CR;
break; break;
case RIG_LEVEL_ATT: case RIG_LEVEL_ATT:
cmd = val.i == 0 ? "0R" EOM : cmd = val.i == 0 ? "0R" CR :
(val.i == 1 ? "1R" EOM : "2R" EOM); (val.i == 1 ? "1R" CR : "2R" CR);
break; break;
default: default:
return -RIG_EINVAL; return -RIG_EINVAL;
} }
retval = ar3030_transaction (rig, cmd, strlen(cmd), NULL, NULL); retval = ar3030_transaction (rig, cmd, strlen(cmd), NULL, NULL);
if (retval != RIG_OK) if (retval != RIG_OK)
return retval; return retval;
return RIG_OK; return RIG_OK;
} }
int ar3030_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val) int ar3030_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
{ {
struct ar3030_priv_data *priv = (struct ar3030_priv_data *)rig->state.priv; struct ar3030_priv_data *priv = (struct ar3030_priv_data *)rig->state.priv;
int info_len, retval; int info_len, retval;
char infobuf[BUFSZ], *p; char infobuf[BUFSZ], *p;
switch(level) { switch(level) {
case RIG_LEVEL_ATT: case RIG_LEVEL_ATT:
/* /*
* DRnGnBnTnFnnnnnnnnC * DRnGnBnTnFnnnnnnnnC
*/ */
retval = ar3030_transaction (rig, "D" EOM, 3, infobuf, &info_len); retval = ar3030_transaction (rig, "D" CR, 2, infobuf, &info_len);
if (retval != RIG_OK) if (retval != RIG_OK)
return retval; return retval;
priv->curr_vfo = RIG_VFO_A; priv->curr_vfo = RIG_VFO_A;
p = strchr(infobuf, 'R'); p = strchr(infobuf, 'R');
if (!p) if (!p)
return -RIG_EPROTO; return -RIG_EPROTO;
val->i = p[1] == '0' ? 0 : rig->caps->attenuator[p[1] - '1']; val->i = p[1] == '0' ? 0 : rig->caps->attenuator[p[1] - '1'];
return RIG_OK; return RIG_OK;
case RIG_LEVEL_AGC: case RIG_LEVEL_AGC:
/* /*
* DRnGnBnTnFnnnnnnnnC * DRnGnBnTnFnnnnnnnnC
*/ */
retval = ar3030_transaction (rig, "D" EOM, 3, infobuf, &info_len); retval = ar3030_transaction (rig, "D" CR, 2, infobuf, &info_len);
if (retval != RIG_OK) if (retval != RIG_OK)
return retval; return retval;
priv->curr_vfo = RIG_VFO_A; priv->curr_vfo = RIG_VFO_A;
p = strchr(infobuf, 'G'); p = strchr(infobuf, 'G');
if (!p) if (!p)
return -RIG_EPROTO; return -RIG_EPROTO;
val->i = p[1] == '0' ? RIG_AGC_SLOW : RIG_AGC_FAST; val->i = p[1] == '0' ? RIG_AGC_SLOW : RIG_AGC_FAST;
return RIG_OK; return RIG_OK;
case RIG_LEVEL_RAWSTR: case RIG_LEVEL_RAWSTR:
retval = ar3030_transaction (rig, "Y" EOM, 3, infobuf, &info_len); retval = ar3030_transaction (rig, "Y" CR, 2, infobuf, &info_len);
if (retval != RIG_OK) if (retval != RIG_OK)
return retval; return retval;
infobuf[3] = '\0'; infobuf[3] = '\0';
val->i = strtol(infobuf, (char **)NULL, 16); val->i = strtol(infobuf, (char **)NULL, 16);
return RIG_OK; return RIG_OK;
default: default:
return -RIG_EINVAL; return -RIG_EINVAL;
} }
return RIG_OK; return RIG_OK;
} }
int ar3030_get_channel(RIG *rig, channel_t *chan) int ar3030_get_channel(RIG *rig, channel_t *chan)
{ {
struct ar3030_priv_data *priv = (struct ar3030_priv_data *)rig->state.priv; struct ar3030_priv_data *priv = (struct ar3030_priv_data *)rig->state.priv;
char cmdbuf[BUFSZ], infobuf[BUFSZ]; char cmdbuf[BUFSZ], infobuf[BUFSZ];
int info_len, cmd_len, retval; int info_len, cmd_len, retval;
cmd_len = sprintf(cmdbuf, "%02dM" EOM, chan->channel_num); cmd_len = sprintf(cmdbuf, "%02dM" CR, chan->channel_num);
retval = ar3030_transaction (rig, cmdbuf, cmd_len, infobuf, &info_len); retval = ar3030_transaction (rig, cmdbuf, cmd_len, infobuf, &info_len);
if (retval != RIG_OK) if (retval != RIG_OK)
return retval; return retval;
priv->curr_vfo = RIG_VFO_A; priv->curr_vfo = RIG_VFO_A;
/* /*
* MnnPnRnGnBnTnFnnnnnnnnC * MnnPnRnGnBnTnFnnnnnnnnC
*/ */
if (infobuf[0] != 'M') { if (infobuf[0] != 'M') {
return -RIG_EPROTO; return -RIG_EPROTO;
} }
/* /*
* Is it a blank mem channel ? * Is it a blank mem channel ?
*/ */
if (infobuf[1] == '-' && infobuf[2] == '-') { if (infobuf[1] == '-' && infobuf[2] == '-') {
chan->freq = RIG_FREQ_NONE; chan->freq = RIG_FREQ_NONE;
return RIG_OK; return RIG_OK;
} }
sscanf(infobuf+14,"%"SCNfreq, &chan->freq); sscanf(infobuf+14,"%"SCNfreq, &chan->freq);
chan->freq *= 10; chan->freq *= 10;
switch (infobuf[22]) { switch (infobuf[22]) {
case 'A': chan->mode = RIG_MODE_AM; break; case 'A':
case 'L': chan->mode = RIG_MODE_LSB; break; chan->mode = RIG_MODE_AM;
case 'U': chan->mode = RIG_MODE_USB; break; break;
case 'C': chan->mode = RIG_MODE_CW; break; case 'L':
case 'S': chan->mode = RIG_MODE_AMS; break; chan->mode = RIG_MODE_LSB;
case 'N': chan->mode = RIG_MODE_FM; break; break;
case 'X': chan->mode = RIG_MODE_FAX; break; case 'U':
default: chan->mode = RIG_MODE_USB;
rig_debug(RIG_DEBUG_ERR,"%s: unsupported mode '%c'\n", break;
__FUNCTION__,infobuf[22]); case 'C':
return -RIG_EPROTO; chan->mode = RIG_MODE_CW;
} break;
case 'S':
chan->mode = RIG_MODE_AMS;
break;
case 'N':
chan->mode = RIG_MODE_FM;
break;
case 'X':
chan->mode = RIG_MODE_FAX;
break;
default:
rig_debug(RIG_DEBUG_ERR,"%s: unsupported mode '%c'\n",
__FUNCTION__,infobuf[22]);
return -RIG_EPROTO;
}
chan->width = infobuf[10] == '1' ? chan->width = infobuf[10] == '1' ?
rig_passband_narrow(rig, chan->mode) : rig_passband_narrow(rig, chan->mode) :
rig_passband_normal(rig, chan->mode); rig_passband_normal(rig, chan->mode);
chan->levels[LVL_ATT].i = infobuf[6] == '0' ? 0 : rig->caps->attenuator[infobuf[4] - '1']; chan->levels[LVL_ATT].i = infobuf[6] == '0' ? 0 : rig->caps->attenuator[infobuf[4] - '1'];
chan->levels[LVL_AGC].i = infobuf[8] == '0' ? RIG_AGC_SLOW : RIG_AGC_FAST; chan->levels[LVL_AGC].i = infobuf[8] == '0' ? RIG_AGC_SLOW : RIG_AGC_FAST;
chan->flags = infobuf[4] == '1' ? RIG_CHFLAG_SKIP : RIG_CHFLAG_NONE; chan->flags = infobuf[4] == '1' ? RIG_CHFLAG_SKIP : RIG_CHFLAG_NONE;
return RIG_OK; return RIG_OK;
} }
int ar3030_vfo_op(RIG *rig, vfo_t vfo, vfo_op_t op) int ar3030_vfo_op(RIG *rig, vfo_t vfo, vfo_op_t op)
{ {
struct ar3030_priv_data *priv = (struct ar3030_priv_data *)rig->state.priv; struct ar3030_priv_data *priv = (struct ar3030_priv_data *)rig->state.priv;
char buf[16]; char buf[16];
int len, retval; int len, retval;
switch(op) { switch(op) {
case RIG_OP_MCL: case RIG_OP_MCL:
len = sprintf(buf,"%02d%%" EOM, priv->curr_ch); len = sprintf(buf,"%02d%%" CR, priv->curr_ch);
break; break;
case RIG_OP_FROM_VFO: case RIG_OP_FROM_VFO:
len = sprintf(buf,"%02dW" EOM, priv->curr_ch); len = sprintf(buf,"%02dW" CR, priv->curr_ch);
priv->curr_vfo = RIG_VFO_MEM; priv->curr_vfo = RIG_VFO_MEM;
break; break;
default: default:
return -RIG_EINVAL; return -RIG_EINVAL;
} }
retval = ar3030_transaction(rig, buf, len, NULL, NULL); retval = ar3030_transaction(rig, buf, len, NULL, NULL);
return retval; return retval;
} }