kopia lustrzana https://github.com/Hamlib/Hamlib
Update AOR 3030 to actually work now. Tested with WSJT-X
(cherry picked from commit 7893b9f6d8)
Hamlib-3.2
Michael Black W9MDB
Nate Bargmann
rodzic
34c32a3cd7
commit
423a1186e8
|
|
@ -26,6 +26,7 @@
|
|||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <unistd.h>
|
||||
|
||||
#include "hamlib/rig.h"
|
||||
#include "serial.h"
|
||||
|
|
@ -99,9 +100,9 @@ const struct rig_caps ar3030_caps = {
|
|||
.rig_model = RIG_MODEL_AR3030,
|
||||
.model_name = "AR3030",
|
||||
.mfg_name = "AOR",
|
||||
.version = "0.4",
|
||||
.version = "1.0",
|
||||
.copyright = "LGPL",
|
||||
.status = RIG_STATUS_UNTESTED,
|
||||
.status = RIG_STATUS_STABLE,
|
||||
.rig_type = RIG_TYPE_RECEIVER,
|
||||
.ptt_type = RIG_PTT_NONE,
|
||||
.dcd_type = RIG_DCD_NONE,
|
||||
|
|
@ -113,7 +114,7 @@ const struct rig_caps ar3030_caps = {
|
|||
.serial_parity = RIG_PARITY_NONE,
|
||||
.serial_handshake = RIG_HANDSHAKE_HARDWARE,
|
||||
.write_delay = 0,
|
||||
.post_write_delay = 1, /* ms */
|
||||
.post_write_delay = 50, /* ms */
|
||||
.timeout = 500,
|
||||
.retry = 0,
|
||||
.has_get_func = AR3030_FUNC_ALL,
|
||||
|
|
@ -140,7 +141,8 @@ const struct rig_caps ar3030_caps = {
|
|||
|
||||
.chan_list = {
|
||||
{ 0, 99, RIG_MTYPE_MEM, AR3030_MEM_CAP },
|
||||
RIG_CHAN_END, },
|
||||
RIG_CHAN_END,
|
||||
},
|
||||
|
||||
.rx_range_list1 = {
|
||||
{kHz(30),MHz(30),AR3030_MODES,-1,-1,AR3030_VFO},
|
||||
|
|
@ -201,7 +203,8 @@ const struct rig_caps ar3030_caps = {
|
|||
|
||||
|
||||
/* is LF really needed? */
|
||||
#define EOM "\x0a\x0d"
|
||||
#define CR "\x0d"
|
||||
#define EOM "\x0d\x0a"
|
||||
|
||||
#define BUFSZ 64
|
||||
|
||||
|
|
@ -210,31 +213,45 @@ const struct rig_caps ar3030_caps = {
|
|||
* We assume that rig!=NULL, rig->state!= NULL
|
||||
* Otherwise, you'll get a nice seg fault. You've been warned!
|
||||
* 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)
|
||||
{
|
||||
int retval;
|
||||
struct rig_state *rs;
|
||||
int retry=3;
|
||||
char tmpdata[BUFSZ];
|
||||
|
||||
rs = &rig->state;
|
||||
|
||||
if (data==NULL) {
|
||||
data = tmpdata;
|
||||
}
|
||||
serial_flush(&rs->rigport);
|
||||
|
||||
do {
|
||||
retval = write_block(&rs->rigport, cmd, cmd_len);
|
||||
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)
|
||||
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);
|
||||
|
||||
return RIG_OK;
|
||||
}
|
||||
|
|
@ -269,8 +286,15 @@ int ar3030_cleanup(RIG *rig)
|
|||
int ar3030_close(RIG *rig)
|
||||
{
|
||||
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__);
|
||||
|
||||
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;
|
||||
}
|
||||
|
|
@ -285,9 +309,14 @@ int ar3030_set_vfo(RIG *rig, vfo_t vfo)
|
|||
case RIG_VFO_CURR:
|
||||
return RIG_OK;
|
||||
case RIG_VFO_VFO:
|
||||
case RIG_VFO_A: cmd = "D" EOM; break;
|
||||
case RIG_VFO_MEM: cmd = "M" EOM; break;
|
||||
default: return -RIG_EINVAL;
|
||||
case RIG_VFO_A:
|
||||
cmd = "D" CR;
|
||||
break;
|
||||
case RIG_VFO_MEM:
|
||||
cmd = "M" CR;
|
||||
break;
|
||||
default:
|
||||
return -RIG_EINVAL;
|
||||
}
|
||||
|
||||
retval = ar3030_transaction (rig, cmd, strlen(cmd), NULL, NULL);
|
||||
|
|
@ -317,7 +346,7 @@ int ar3030_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
|
|||
char freqbuf[BUFSZ];
|
||||
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);
|
||||
if (retval != RIG_OK)
|
||||
|
|
@ -343,7 +372,7 @@ int ar3030_get_freq(RIG *rig, vfo_t vfo, freq_t *freq)
|
|||
* D Rn Gn Bn Tn Fnnnnnnnn C
|
||||
* 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)
|
||||
return retval;
|
||||
|
||||
|
|
@ -351,7 +380,10 @@ int ar3030_get_freq(RIG *rig, vfo_t vfo, freq_t *freq)
|
|||
rfp = strchr(freqbuf, 'F');
|
||||
if (!rfp)
|
||||
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;
|
||||
}
|
||||
|
|
@ -366,13 +398,27 @@ int ar3030_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
|
|||
int mdbuf_len, aormode, retval;
|
||||
|
||||
switch (mode) {
|
||||
case RIG_MODE_AM: aormode = 'A'; break;
|
||||
case RIG_MODE_CW: aormode = 'C'; break;
|
||||
case RIG_MODE_USB: aormode = 'U'; break;
|
||||
case RIG_MODE_LSB: aormode = 'L'; break;
|
||||
case RIG_MODE_FM: aormode = 'N'; break;
|
||||
case RIG_MODE_AMS: aormode = 'S'; break;
|
||||
case RIG_MODE_FAX: aormode = 'X'; break;
|
||||
case RIG_MODE_AM:
|
||||
aormode = 'A';
|
||||
break;
|
||||
case RIG_MODE_CW:
|
||||
aormode = 'C';
|
||||
break;
|
||||
case RIG_MODE_USB:
|
||||
aormode = 'U';
|
||||
break;
|
||||
case RIG_MODE_LSB:
|
||||
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);
|
||||
|
|
@ -380,10 +426,10 @@ int ar3030_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
|
|||
}
|
||||
|
||||
if (width != RIG_PASSBAND_NOCHANGE) {
|
||||
mdbuf_len = sprintf(mdbuf, "%c" EOM, aormode);
|
||||
mdbuf_len = sprintf(mdbuf, "%c" CR, aormode);
|
||||
}
|
||||
else {
|
||||
mdbuf_len = sprintf(mdbuf, "%dB%c" EOM,
|
||||
mdbuf_len = sprintf(mdbuf, "%dB%c" CR,
|
||||
width < rig_passband_normal(rig,mode) ? 1 : 0,
|
||||
aormode);
|
||||
}
|
||||
|
|
@ -406,20 +452,34 @@ int ar3030_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
|
|||
* D Rn Gn Bn Tn Fnnnnnnnn C
|
||||
* 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)
|
||||
return retval;
|
||||
|
||||
priv->curr_vfo = RIG_VFO_A;
|
||||
|
||||
switch (buf[25]) {
|
||||
case 'A': *mode = RIG_MODE_AM; break;
|
||||
case 'L': *mode = RIG_MODE_LSB; break;
|
||||
case 'U': *mode = RIG_MODE_USB; break;
|
||||
case 'C': *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;
|
||||
case 'A':
|
||||
*mode = RIG_MODE_AM;
|
||||
break;
|
||||
case 'L':
|
||||
*mode = RIG_MODE_LSB;
|
||||
break;
|
||||
case 'U':
|
||||
*mode = RIG_MODE_USB;
|
||||
break;
|
||||
case 'C':
|
||||
*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]);
|
||||
|
|
@ -440,7 +500,7 @@ int ar3030_set_mem(RIG *rig, vfo_t vfo, int ch)
|
|||
int cmd_len, retval=RIG_OK;
|
||||
|
||||
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);
|
||||
}
|
||||
|
||||
|
|
@ -461,7 +521,7 @@ int ar3030_get_mem(RIG *rig, vfo_t vfo, int *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)
|
||||
return retval;
|
||||
|
||||
|
|
@ -494,11 +554,11 @@ int ar3030_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
|
|||
switch(level) {
|
||||
case RIG_LEVEL_AGC:
|
||||
/* SLOW otherwise */
|
||||
cmd = val.i == RIG_AGC_FAST ? "1G" EOM : "0G" EOM;
|
||||
cmd = val.i == RIG_AGC_FAST ? "1G" CR : "0G" CR;
|
||||
break;
|
||||
case RIG_LEVEL_ATT:
|
||||
cmd = val.i == 0 ? "0R" EOM :
|
||||
(val.i == 1 ? "1R" EOM : "2R" EOM);
|
||||
cmd = val.i == 0 ? "0R" CR :
|
||||
(val.i == 1 ? "1R" CR : "2R" CR);
|
||||
break;
|
||||
default:
|
||||
return -RIG_EINVAL;
|
||||
|
|
@ -523,7 +583,7 @@ int ar3030_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
|
|||
/*
|
||||
* 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)
|
||||
return retval;
|
||||
|
||||
|
|
@ -538,7 +598,7 @@ int ar3030_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
|
|||
/*
|
||||
* 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)
|
||||
return retval;
|
||||
|
||||
|
|
@ -550,7 +610,7 @@ int ar3030_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
|
|||
return RIG_OK;
|
||||
|
||||
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)
|
||||
return retval;
|
||||
|
||||
|
|
@ -572,7 +632,7 @@ int ar3030_get_channel(RIG *rig, channel_t *chan)
|
|||
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);
|
||||
if (retval != RIG_OK)
|
||||
return retval;
|
||||
|
|
@ -598,13 +658,27 @@ int ar3030_get_channel(RIG *rig, channel_t *chan)
|
|||
chan->freq *= 10;
|
||||
|
||||
switch (infobuf[22]) {
|
||||
case 'A': chan->mode = RIG_MODE_AM; break;
|
||||
case 'L': chan->mode = RIG_MODE_LSB; break;
|
||||
case 'U': chan->mode = RIG_MODE_USB; break;
|
||||
case 'C': 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;
|
||||
case 'A':
|
||||
chan->mode = RIG_MODE_AM;
|
||||
break;
|
||||
case 'L':
|
||||
chan->mode = RIG_MODE_LSB;
|
||||
break;
|
||||
case 'U':
|
||||
chan->mode = RIG_MODE_USB;
|
||||
break;
|
||||
case 'C':
|
||||
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]);
|
||||
|
|
@ -632,10 +706,10 @@ int ar3030_vfo_op(RIG *rig, vfo_t vfo, vfo_op_t op)
|
|||
|
||||
switch(op) {
|
||||
case RIG_OP_MCL:
|
||||
len = sprintf(buf,"%02d%%" EOM, priv->curr_ch);
|
||||
len = sprintf(buf,"%02d%%" CR, priv->curr_ch);
|
||||
break;
|
||||
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;
|
||||
break;
|
||||
default:
|
||||
|
|
|
|||
Ładowanie…
Reference in New Issue