diff --git a/kenwood/th.c b/kenwood/th.c index a6e8763bc..89b1a23ff 100644 --- a/kenwood/th.c +++ b/kenwood/th.c @@ -1,8 +1,8 @@ /* * Hamlib Kenwood backend - TH handheld primitives - * Copyright (c) 2001-2005 by Stephane Fillod + * Copyright (c) 2001-2008 by Stephane Fillod * - * $Id: th.c,v 1.30 2006-04-13 19:43:49 pa4tu Exp $ + * $Id: th.c,v 1.31 2008-05-04 21:27:26 fillods Exp $ * * This library is free software; you can redistribute it and/or modify * it under the terms of the GNU Library General Public License as @@ -44,15 +44,6 @@ const struct kenwood_priv_caps th_priv_caps = { #define EOM EOM_TH -/* - * modes in use by the "MD" command - */ -#define MD_FM '0' -#define MD_WFM '1' /* or is it AM on the THD7? */ -#define MD_AM '2' -#define MD_LSB '3' -#define MD_USB '4' -#define MD_CW '5' #define ACKBUF_LEN 64 @@ -249,6 +240,8 @@ th_set_mode (RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width) char kmode, mdbuf[24], ackbuf[ACKBUF_LEN]; int retval; size_t ack_len; + const struct kenwood_priv_caps *priv=(const struct kenwood_priv_caps *)rig->caps->priv; + rig_debug(RIG_DEBUG_TRACE, "%s: called\n", __FUNCTION__); if(vfo!=RIG_VFO_CURR) { @@ -256,19 +249,31 @@ th_set_mode (RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width) return -RIG_ENTARGET; } - /* TODO: Find from rig->caps what modes can be supported. */ + if (priv->mode_table) + { + kmode = rmode2kenwood(mode, priv->mode_table); + if (kmode == -1) { + rig_debug(RIG_DEBUG_WARN, "%s: Unsupported Mode value '%s'\n", + __FUNCTION__, rig_strrmode(mode)); + return -RIG_EINVAL; + } + kmode += '0'; + } + else + { switch (mode) { - case RIG_MODE_FM: kmode = '0'; break; /* TH-D7A(G) modes */ - case RIG_MODE_AM: kmode = '1'; break; + case RIG_MODE_FM: kmode = '0'; break; /* TH-D7A(G) modes */ + case RIG_MODE_AM: kmode = '1'; break; default: rig_debug(RIG_DEBUG_ERR,"%s: Unsupported Mode %d\n", __FUNCTION__, mode); return -RIG_EINVAL; } + } sprintf(mdbuf, "MD %c" EOM, kmode); ack_len = 0; retval = kenwood_transaction (rig, mdbuf, strlen(mdbuf), ackbuf, &ack_len); - if (retval != RIG_OK) + if (retval != RIG_OK) return retval; return RIG_OK; @@ -284,6 +289,8 @@ th_get_mode (RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width) char vch, ackbuf[ACKBUF_LEN]; int retval; size_t ack_len=ACKBUF_LEN; + const struct kenwood_priv_caps *priv=(const struct kenwood_priv_caps *)rig->caps->priv; + rig_debug(RIG_DEBUG_TRACE, "%s: called\n", __FUNCTION__); if(vfo!=RIG_VFO_CURR) { @@ -302,6 +309,17 @@ th_get_mode (RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width) return -RIG_ERJCTED; } + if (priv->mode_table) + { + *mode = kenwood2rmode(ackbuf[3], priv->mode_table); + if (*mode == RIG_MODE_NONE) { + rig_debug(RIG_DEBUG_ERR, "%s: Unsupported Mode value '%c'\n", + __FUNCTION__, ackbuf[3]); + return -RIG_EINVAL; + } + } + else + { switch (ackbuf[3]) { case '0': *mode = RIG_MODE_FM; break; /* TH-D7A(G) modes */ case '1': *mode = RIG_MODE_AM; break; @@ -309,10 +327,12 @@ th_get_mode (RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width) rig_debug(RIG_DEBUG_ERR, "%s: Unsupported Mode value '%c'\n", __FUNCTION__, ackbuf[3]); return -RIG_EINVAL; } + } if (width) *width = RIG_PASSBAND_NORMAL; - return RIG_OK; + + return RIG_OK; } /* @@ -339,7 +359,10 @@ th_set_vfo (RIG *rig, vfo_t vfo) sprintf(vfobuf, "VMC 0,0" EOM); break; case RIG_VFO_MEM: - sprintf(vfobuf, "VMC 0,2" EOM); + if (rig->caps->rig_model == RIG_MODEL_THF7E) + sprintf(vfobuf, "VMC 0,1" EOM); + else + sprintf(vfobuf, "VMC 0,2" EOM); break; default: rig_debug(RIG_DEBUG_ERR, "%s: Unsupported VFO %d\n", __FUNCTION__, vfo); @@ -1054,7 +1077,7 @@ int th_get_powerstat(RIG *rig, powerstat_t *status) size_t pwr_len = 50; int retval; - retval = kenwood_transaction (rig, "PS;", 3, pwrbuf, &pwr_len); + retval = kenwood_transaction (rig, "PS" EOM, 3, pwrbuf, &pwr_len); if (retval != RIG_OK) return retval; @@ -1149,15 +1172,8 @@ int th_vfo_op(RIG *rig, vfo_t vfo, vfo_op_t op) return RIG_OK; } -/* get and set channel tested on thg71 */ +/* get and set channel tested on thg71&thf7e */ /* must work on other th and tm kenwood rigs */ -/* Beware : special numbering scheme : */ -/* 0-199 : normal memories */ -/* 200-209 : scan lower limit memories L */ -/* 210-219 : scan upper limit memories U */ -/* 220 : Priority channel */ -/* 221-222 : Call channel */ -/* 223-231 : Band vfo mem */ /* --------------------------------------------------------------------- */ int th_get_channel(RIG *rig, channel_t *chan) { @@ -1166,33 +1182,71 @@ int th_get_channel(RIG *rig, channel_t *chan) size_t ack_len; freq_t freq,offset; char req[16],scf[128]; - int step, shift, rev, tone, ctcss, tonefq, ctcssfq; + int step, shift, rev, tone, ctcss, tonefq, ctcssfq, dcs, dcscode, mode, lockout; + const char *mr_extra; + int channel_num; + vfo_t vfo; + const struct kenwood_priv_caps *priv=(const struct kenwood_priv_caps *)rig->caps->priv; + const chan_t *chan_caps; + + if (chan->vfo == RIG_VFO_MEM) + { + chan_caps = rig_lookup_mem_caps(rig, chan->channel_num); + if (!chan_caps) + return -RIG_ECONF; + } - if(chan->channel_num<200) - sprintf(req,"MR 0,0,%03d",chan->channel_num); + channel_num = chan->channel_num; + vfo = chan->vfo; + memset(chan, 0, sizeof(channel_t)); + chan->channel_num = channel_num; + chan->vfo = vfo; + + if (rig->caps->rig_model == RIG_MODEL_THF7E) + mr_extra = ""; else - if(chan->channel_num<210) { - sprintf(req,"MR 0,0,L%01d",chan->channel_num-200); - sprintf(chan->channel_desc,"L%01d",chan->channel_num-200); - } else - if(chan->channel_num<220) { - sprintf(req,"MR 0,0,U%01d",chan->channel_num-210); - sprintf(chan->channel_desc,"U%01d",chan->channel_num-210); - } else - if(chan->channel_num==220) { - sprintf(req,"MR 0,0,PR"); - sprintf(chan->channel_desc,"Pr"); - } else - if(chan->channel_num<223) { - sprintf(req,"CR 0,%01d",chan->channel_num-221); - if(chan->channel_num==221) sprintf(chan->channel_desc,"Call V"); - if(chan->channel_num==222) sprintf(chan->channel_desc,"Call U"); - } else - if(chan->channel_num<232) { - sprintf(req,"VR %01d",chan->channel_num-222); - sprintf(chan->channel_desc,"BAND %01d",chan->channel_num-222); - } else - return -RIG_EINVAL; + mr_extra = "0,"; + + channel_num -= chan_caps->start; + switch (chan_caps->type) { + case RIG_MTYPE_MEM: + if (chan_caps[1].type == RIG_MTYPE_PRIO) { + /* Info */ + sprintf(req,"MR %s0,I-%01d",mr_extra,channel_num); + } else + sprintf(req,"MR %s0,%03d",mr_extra,channel_num); + break; + case RIG_MTYPE_EDGE: + if (chan_caps[1].type == RIG_MTYPE_EDGE) { + sprintf(req,"MR %s0,L%01d",mr_extra,channel_num); + sprintf(chan->channel_desc,"L%01d",channel_num); + } else { + sprintf(req,"MR %s0,U%01d",mr_extra,channel_num); + sprintf(chan->channel_desc,"U%01d",channel_num); + } + break; + case RIG_MTYPE_PRIO: + if (chan_caps->start == chan_caps->end) { + sprintf(req,"MR %s0,PR",mr_extra); + sprintf(chan->channel_desc,"Pr"); + } else { + sprintf(req,"MR %s0,PR%01d",mr_extra,channel_num+1); + sprintf(chan->channel_desc,"Pr%01d",channel_num+1); + } + break; + case RIG_MTYPE_CALL: + sprintf(req,"CR 0,%01d",channel_num); + if(chan->channel_num==chan_caps->start) sprintf(chan->channel_desc,"Call V"); + else if(chan->channel_num==chan_caps->end) sprintf(chan->channel_desc,"Call U"); + else sprintf(chan->channel_desc,"Call"); + break; + case RIG_MTYPE_BAND: + sprintf(req,"VR %01X",channel_num); + sprintf(chan->channel_desc,"BAND %01X",channel_num); + break; + default: + return -RIG_EINVAL; + } sprintf(membuf,"%s"EOM,req); ack_len=ACKBUF_LEN; @@ -1200,22 +1254,64 @@ int th_get_channel(RIG *rig, channel_t *chan) if (retval != RIG_OK) return retval; - strcpy(scf,req); - strcat(scf,",%"SCNfreq",%d,%d,%d,%d,%d,,%d,,%d,%"SCNfreq); - retval = sscanf(ackbuf, scf, - &freq, &step, &shift, &rev, &tone, - &ctcss, &tonefq, &ctcssfq, &offset); + /* + * TODO: dcs/mode/lockout are not there on TH-G71 + */ + mode = RIG_MODE_NONE; + rev = lockout = dcs = dcscode = 0; + strcpy(scf,req); + if (chan_caps->mem_caps.dcs_sql) + { + /* Step can be hexa + * Lockout is optional on some channels + */ + strcat(scf,",%"SCNfreq",%x,%d,%d,%d,%d,%d,%d,%d,%d,%"SCNfreq",%d,%d"); + retval = sscanf(ackbuf, scf, + &freq, &step, &shift, &rev, &tone, + &ctcss, &dcs, &tonefq, &ctcssfq, &dcscode, + &offset, &mode, &lockout + ); + if (retval < 12) { + rig_debug(RIG_DEBUG_WARN, "%s: sscanf failed %d\n", __FUNCTION__, retval); + return -RIG_EPROTO; + } + } + else + { + strcat(scf,",%"SCNfreq",%x,%d,%d,%d,%d,,%d,,%d,%"SCNfreq); + retval = sscanf(ackbuf, scf, + &freq, &step, &shift, &rev, &tone, + &ctcss, &tonefq, &ctcssfq, &offset); + if (retval != 9) { + rig_debug(RIG_DEBUG_WARN, "%s: sscanf failed %d\n", __FUNCTION__, retval); + } + } + + chan->funcs = rev ? RIG_FUNC_REV : 0; + chan->flags = lockout ? RIG_CHFLAG_SKIP : 0; chan->freq=freq; chan->vfo=RIG_VFO_MEM; chan->tuning_step=rig->state.tuning_steps[step].ts; - if(freq mode=RIG_MODE_AM; - chan->width=kHz(9); - } else { - chan->mode=RIG_MODE_FM; - chan->width=kHz(12); + + if (priv->mode_table) { + chan->mode = kenwood2rmode(mode, priv->mode_table); + if (chan->mode == RIG_MODE_NONE) { + rig_debug(RIG_DEBUG_ERR, "%s: Unsupported Mode value '%d'\n", + __FUNCTION__, mode); + return -RIG_EPROTO; + } } + else + { + /* No mode info (TH-G71, TMV7,..), + * guess it from current freq + */ + chan->mode = (freq < MHz(136)) ? RIG_MODE_AM : RIG_MODE_FM; + } + + chan->width=rig_passband_normal(rig, chan->mode); + switch(shift) { case 0 : chan->rptr_shift=RIG_RPT_SHIFT_NONE; @@ -1225,22 +1321,37 @@ int th_get_channel(RIG *rig, channel_t *chan) break; case 2 : chan->rptr_shift=RIG_RPT_SHIFT_MINUS; + offset = -offset; break; + default: + rig_debug(RIG_DEBUG_ERR, "%s: not supported shift %d\n", + __FUNCTION__, shift); + chan->rptr_shift=RIG_RPT_SHIFT_NONE; } chan->rptr_offs=offset; + /* FIXME: ctcss_list for t[fm]*.c */ + //chan->ctcss_tone=rig->caps->ctcss_list[tonefq==1?0:tonefq-2]; + // chan->ctcss_sql=rig->caps->ctcss_list[ctcssfq==1?0:ctcssfq-2]; if(tone) - chan->ctcss_tone=rig->caps->ctcss_list[tonefq==1?0:tonefq-2]; + chan->ctcss_tone=rig->caps->ctcss_list[tonefq]; else chan->ctcss_tone=0; if(ctcss) - chan->ctcss_sql=rig->caps->ctcss_list[ctcssfq==1?0:ctcssfq-2]; + chan->ctcss_sql=rig->caps->ctcss_list[ctcssfq]; else chan->ctcss_sql=0; + if(dcs) + chan->dcs_sql=chan->dcs_code=rig->caps->dcs_list[dcscode]; + else + chan->dcs_sql=chan->dcs_code=0; chan->tx_freq=RIG_FREQ_NONE; - if(chan->channel_num<223 && shift==0) { - req[5]='1'; + if(shift==RIG_RPT_SHIFT_NONE && + ((chan_caps->type==RIG_MTYPE_MEM && chan_caps->start == 0) || + chan_caps->type==RIG_MTYPE_CALL)) { + /* split ? */ + req[3+strlen(mr_extra)]='1'; sprintf(membuf,"%s"EOM,req); ack_len=ACKBUF_LEN; retval = kenwood_transaction(rig, membuf, strlen(membuf), ackbuf, &ack_len); @@ -1249,21 +1360,41 @@ int th_get_channel(RIG *rig, channel_t *chan) strcat(scf,",%"SCNfreq",%d"); retval = sscanf(ackbuf, scf, &freq, &step); chan->tx_freq=freq; + chan->split=RIG_SPLIT_ON; } } - if(chan->channel_num<200) { - sprintf(membuf,"MNA 0,%03d"EOM,chan->channel_num); + /* If not set already by special channels.. */ + if(chan->channel_desc[0] == '\0') { + if (chan_caps[1].type == RIG_MTYPE_PRIO) + sprintf(membuf,"MNA %sI-%01d"EOM,mr_extra,channel_num); + else + sprintf(membuf,"MNA %s%03d"EOM,mr_extra,channel_num); ack_len=ACKBUF_LEN; + /* Get memory name */ retval = kenwood_transaction(rig, membuf, strlen(membuf), ackbuf, &ack_len); if (retval != RIG_OK) return retval; - memcpy(chan->channel_desc,&ackbuf[10],7); + if (ack_len > rig->caps->chan_desc_sz) + ack_len = rig->caps->chan_desc_sz; + strncpy(chan->channel_desc,ackbuf+strlen(membuf),ack_len); + chan->channel_desc[ack_len] = '\0'; } return RIG_OK; } +static int find_tone_index(const tone_t *tone_list, tone_t tone) +{ + int i; + + for (i = 0; tone_list[i] != 0 && i < RIG_TONEMAX; i++) { + if (tone_list[i] == tone) + return i; + } + return -1; +} + /* --------------------------------------------------------------------- */ int th_set_channel(RIG *rig, const channel_t *chan) { @@ -1271,11 +1402,14 @@ int th_set_channel(RIG *rig, const channel_t *chan) int retval; size_t ack_len; char req[64]; - long freq,offset; - int chn, step, shift, tone, ctcss, tonefq, ctcssfq; + char lockoutstr[8]; + int channel_num, step, shift, rev, tone, ctcss, tonefq, ctcssfq, dcs, dcscode, mode, lockout; + const char *mr_extra; + const struct kenwood_priv_caps *priv=(const struct kenwood_priv_caps *)rig->caps->priv; + const chan_t *chan_caps; + const char *channel_desc; - chn=chan->channel_num; - freq=(long long)chan->freq; + channel_num = chan->channel_num; for(step=0; rig->state.tuning_steps[step].ts!=0;step++) if(chan->tuning_step==rig->state.tuning_steps[step].ts) break; @@ -1291,78 +1425,153 @@ int th_set_channel(RIG *rig, const channel_t *chan) shift=2; break; default: - rig_debug(RIG_DEBUG_ERR, "%s: not supported shift\n", __FUNCTION__); + rig_debug(RIG_DEBUG_ERR, "%s: not supported shift %d\n", + __FUNCTION__, chan->rptr_shift); return -RIG_EINVAL; } - offset=chan->rptr_offs; - + if(chan->ctcss_tone==0) { - tone=0;tonefq=9; + tone=0;tonefq=8; } else { - tone=1; - for (tonefq = 0; rig->caps->ctcss_list[tonefq] != 0 && tonefq < RIG_TONEMAX; tonefq++) { - if (rig->caps->ctcss_list[tonefq] == chan->ctcss_tone) - break; - } - tonefq=tonefq==0?1:tonefq+2; + tone=1; + tonefq = find_tone_index(rig->caps->ctcss_list, chan->ctcss_tone); + if (tonefq == -1) + return -RIG_EINVAL; + tonefq++; } if(chan->ctcss_sql==0) { - ctcss=0;ctcssfq=9; + ctcss=0;ctcssfq=8; } else { - ctcss=1; - for (ctcssfq = 0; rig->caps->ctcss_list[ctcssfq] != 0 && ctcssfq < RIG_TONEMAX; ctcssfq++) { - if (rig->caps->ctcss_list[ctcssfq] == chan->ctcss_sql) - break; - } - ctcssfq=ctcssfq==0?1:ctcssfq+2; + ctcss=1; + ctcssfq = find_tone_index(rig->caps->ctcss_list, chan->ctcss_sql); + if (tonefq == -1) + return -RIG_EINVAL; + ctcssfq++; } - if(chan->channel_num<200) - sprintf(req,"MW 0,0,%03d",chan->channel_num); - else - if(chan->channel_num<210) { - sprintf(req,"MW 0,0,L%01d",chan->channel_num-200); - } else - if(chan->channel_num<220) { - sprintf(req,"MW 0,0,U%01d",chan->channel_num-210); - } else - if(chan->channel_num==220) { - sprintf(req,"MW 0,0,PR"); - } else - if(chan->channel_num<223) { - sprintf(req,"CW 0,%01d",chan->channel_num-221); - } else - if(chan->channel_num<232) { - sprintf(req,"VW %01d",chan->channel_num-222); - } else - return -RIG_EINVAL; + if(chan->dcs_code==0 && chan->dcs_sql==0) { + dcs=0;dcscode=0; + } else { + dcs=1; + dcscode = find_tone_index(rig->caps->dcs_list, chan->dcs_sql); + if (dcscode == -1) + return -RIG_EINVAL; + } - if(chan->channel_num<=220) - sprintf(membuf, "%s,%011ld,%01d,%01d,0,%01d,%01d,,%02d,,%02d,%09"PRIll",0"EOM, - req,(long)freq, step, shift, tone, - ctcss, tonefq, ctcssfq, (long long)offset); - else - sprintf(membuf, "%s,%011ld,%01d,%01d,0,%01d,%01d,,%02d,,%02d,%09"PRIll EOM, - req, (long)freq, step, shift, tone, - ctcss, tonefq, ctcssfq, (long long)offset); + if (chan->vfo == RIG_VFO_MEM) + { + chan_caps = rig_lookup_mem_caps(rig, chan->channel_num); + if (!chan_caps) + return -RIG_ECONF; + } - ack_len = 0; + if (rig->caps->rig_model == RIG_MODEL_THF7E) + mr_extra = ""; + else + mr_extra = "0,"; + + channel_num -= chan_caps->start; + channel_desc = NULL; + switch (chan_caps->type) { + case RIG_MTYPE_MEM: + if (chan_caps[1].type == RIG_MTYPE_PRIO) { + /* Info */ + sprintf(req,"MW %s0,I-%01d",mr_extra,channel_num); + channel_desc = chan->channel_desc; + } else { + /* Regular */ + sprintf(req,"MW %s0,%03d",mr_extra,channel_num); + channel_desc = chan->channel_desc; + } + break; + case RIG_MTYPE_EDGE: + if (chan_caps[1].type == RIG_MTYPE_EDGE) { + sprintf(req,"MW %s0,L%01d",mr_extra,channel_num); + } else { + sprintf(req,"MW %s0,U%01d",mr_extra,channel_num); + } + break; + case RIG_MTYPE_PRIO: + if (chan_caps->start == chan_caps->end) { + sprintf(req,"MW %s0,PR",mr_extra); + } else { + sprintf(req,"MW %s0,PR%01d",mr_extra,channel_num+1); + } + break; + case RIG_MTYPE_CALL: + sprintf(req,"CW 0,%01d",channel_num); + break; + case RIG_MTYPE_BAND: + sprintf(req,"VW %01X",channel_num); + break; + default: + return -RIG_EINVAL; + } + + rev = chan->funcs & RIG_FUNC_REV ? 1 : 0; + lockout = chan->flags & RIG_CHFLAG_SKIP ? 1 : 0; + + if (chan_caps->mem_caps.flags) + sprintf(lockoutstr, ",%d", lockout); + else + strcpy(lockoutstr, ""); + + if (chan_caps->mem_caps.flags && chan_caps->mem_caps.dcs_sql) + { + if (!priv->mode_table) { + rig_debug(RIG_DEBUG_ERR, "%s: Buggy backend, no mode_table '%d'\n", + __FUNCTION__, chan->mode); + return -RIG_ENIMPL; + } + mode = rmode2kenwood(chan->mode, priv->mode_table); + if (mode == -1) { + rig_debug(RIG_DEBUG_ERR, "%s: Unsupported Mode value '%d'\n", + __FUNCTION__, chan->mode); + return -RIG_EINVAL; + } + + /* Step can be hexa */ + retval = sprintf(membuf, "%s,%011"PRIll",%X,%d,%d,%d,%d,%d,%02d,%02d,%03d,%09"PRIll",%d%s"EOM, + req, (long long)chan->freq, step, shift, rev, tone, + ctcss, dcs, tonefq, ctcssfq, dcscode, + (long long)abs(chan->rptr_offs), mode, lockoutstr + ); + } + else + { + /* Without DCS,mode */ + retval = sprintf(membuf, "%s,%011"PRIll",%X,%d,%d,%d,%d,,%02d,,%02d,%09"PRIll"%s" EOM, + req, (long long)chan->freq, step, shift, rev, tone, + ctcss, tonefq, ctcssfq, + (long long)abs(chan->rptr_offs), lockoutstr + ); + } + + ack_len = ACKBUF_LEN; retval = kenwood_transaction(rig, membuf, strlen(membuf), ackbuf, &ack_len); - if (retval != RIG_OK) - return retval; + if (retval != RIG_OK) + return retval; - if(chan->channel_num<223 && chan->tx_freq!=RIG_FREQ_NONE) { - req[5]='1'; - sprintf(membuf, "%s,%011"PRIll",%01d"EOM, req,(long long)chan->tx_freq, step); - ack_len=0; + /* split ? */ + if (chan->tx_freq!=RIG_FREQ_NONE && + ((chan_caps->type==RIG_MTYPE_MEM && chan_caps->start == 0) || + chan_caps->type==RIG_MTYPE_CALL)) { + req[3+strlen(mr_extra)]='1'; + sprintf(membuf, "%s,%011"PRIll",%X"EOM, req,(long long)chan->tx_freq, step); + ack_len=ACKBUF_LEN; retval = kenwood_transaction(rig, membuf, strlen(membuf), ackbuf, &ack_len); if (retval != RIG_OK) return retval; } - if(chan->channel_num<200) { - ack_len=0; - sprintf(membuf,"MNA 0,%03d,%s"EOM,chan->channel_num,chan->channel_desc); + if(channel_desc) { + /* Memory name */ + ack_len=ACKBUF_LEN; + /* TODO: check strlen(channel_desc) < rig->caps->chan_desc_sz */ + if (chan_caps[1].type == RIG_MTYPE_PRIO) + sprintf(membuf,"MNA %sI-%01d,%s"EOM,mr_extra,channel_num,channel_desc); + else + sprintf(membuf,"MNA %s%03d,%s"EOM,mr_extra,channel_num,channel_desc); retval = kenwood_transaction(rig, membuf, strlen(membuf), ackbuf, &ack_len); if (retval != RIG_OK) return retval; @@ -1371,3 +1580,50 @@ int th_set_channel(RIG *rig, const channel_t *chan) return RIG_OK; } +/* + * set the aerial/antenna to use + */ +int th_set_ant (RIG * rig, vfo_t vfo, ant_t ant) +{ + char ackbuf[50]; + const char *cmd; + size_t ack_len = 0; + + switch (ant) { + case RIG_ANT_1: + cmd = "ANT 0"EOM; + case RIG_ANT_2: + cmd = "ANT 1"EOM; + case RIG_ANT_3: + cmd = "ANT 2"EOM; + default: + return -RIG_EINVAL; + } + + return kenwood_transaction (rig, cmd, strlen(cmd), ackbuf, &ack_len); +} + + +/* + * get the aerial/antenna in use + */ +int th_get_ant (RIG * rig, vfo_t vfo, ant_t * ant) +{ + char ackbuf[50]; + size_t ack_len = 50; + int retval; + + retval = kenwood_transaction (rig, "ANT"EOM, 4, ackbuf, &ack_len); + if (RIG_OK != retval) + return retval; + if (4 != ack_len) + return -RIG_EPROTO; + + if (ackbuf[2] <= '0' || ackbuf[2] > '9') + return -RIG_EPROTO; + + *ant = RIG_ANT_N(ackbuf[2]-'0'); + + return RIG_OK; +} + diff --git a/kenwood/th.h b/kenwood/th.h index 0cb02e9db..d2bbb144f 100644 --- a/kenwood/th.h +++ b/kenwood/th.h @@ -1,8 +1,8 @@ /* * Hamlib Kenwood backend - TH handheld header - * Copyright (c) 2001-2005 by Stephane Fillod + * Copyright (c) 2001-2008 by Stephane Fillod * - * $Id: th.h,v 1.10 2005-04-03 20:14:26 fillods Exp $ + * $Id: th.h,v 1.11 2008-05-04 21:27:26 fillods Exp $ * * This library is free software; you can redistribute it and/or modify * it under the terms of the GNU Library General Public License as @@ -23,7 +23,7 @@ #define __TH_H__ 1 #include "idx_builtin.h" -#define TH_VER "0.2" +#define TH_VER "0.3" extern int th_transaction (RIG *rig, const char *cmdstr, char *data, size_t datasize); extern int th_decode_event (RIG *rig); @@ -52,15 +52,20 @@ extern int th_vfo_op(RIG *rig, vfo_t vfo, vfo_op_t op); extern int th_get_dcd(RIG *rig, vfo_t vfo, dcd_t *dcd); extern int th_get_channel(RIG *rig, channel_t *chan); extern int th_set_channel(RIG *rig, const channel_t *chan); +extern int th_set_ant (RIG * rig, vfo_t vfo, ant_t ant); +extern int th_get_ant (RIG * rig, vfo_t vfo, ant_t * ant); + #define TH_CHANNEL_CAPS \ .freq=1,\ .tx_freq=1,\ +.split=1,\ .mode=1,\ .width=1,\ .tuning_step=1,\ .rptr_shift=1,\ .rptr_offs=1,\ +.funcs=RIG_FUNC_REV,\ .ctcss_tone=1,\ .ctcss_sql=1,\ .channel_desc=1 diff --git a/kenwood/thf7.c b/kenwood/thf7.c index aa39ffd97..4643cada6 100644 --- a/kenwood/thf7.c +++ b/kenwood/thf7.c @@ -2,7 +2,7 @@ * Hamlib Kenwood backend - TH-F7 description * Copyright (c) 2001-2004 by Stephane Fillod * - * $Id: thf7.c,v 1.13 2005-04-03 20:14:26 fillods Exp $ + * $Id: thf7.c,v 1.14 2008-05-04 21:27:26 fillods Exp $ * * This library is free software; you can redistribute it and/or modify * it under the terms of the GNU Library General Public License as @@ -25,35 +25,98 @@ #endif #include +#include #include #include "kenwood.h" #include "th.h" -#define THF7_MODES_TX (RIG_MODE_FM|RIG_MODE_AM) -#define THF7_MODES (THF7_MODES_TX|RIG_MODE_WFM|RIG_MODE_SSB|RIG_MODE_CW) +#define THF7_MODES_TX (RIG_MODE_FM) +#define THF7_HIGH_MODES (RIG_MODE_FM|RIG_MODE_AM|RIG_MODE_WFM) +#define THF7_ALL_MODES (THF7_HIGH_MODES|RIG_MODE_SSB|RIG_MODE_CW) -#define THF7_FUNC_ALL (RIG_FUNC_TSQL|RIG_FUNC_AIP|RIG_FUNC_SQL) +#define THF7_FUNC_ALL (RIG_FUNC_TONE|RIG_FUNC_TSQL|RIG_FUNC_TBURST| \ + RIG_FUNC_ARO|RIG_FUNC_LOCK|RIG_FUNC_BC) -#define THF7_LEVEL_ALL (RIG_LEVEL_SQL|RIG_LEVEL_STRENGTH|RIG_LEVEL_AF|RIG_LEVEL_RF|RIG_LEVEL_MICGAIN) -#define THF7_PARMS (RIG_PARM_BACKLIGHT) +/* + * How increadible, there's no RIG_LEVEL_STRENGTH! + */ +#define THF7_LEVEL_ALL (RIG_LEVEL_SQL|RIG_LEVEL_RFPOWER|RIG_LEVEL_ATT|RIG_LEVEL_BALANCE) + +#define THF7_PARMS (RIG_PARM_APO|RIG_PARM_BEEP|RIG_PARM_BACKLIGHT|RIG_PARM_KEYLIGHT) #define THF7_VFO_OP (RIG_OP_UP|RIG_OP_DOWN) +#define THF7_ANTS (RIG_ANT_1|RIG_ANT_2) + /* - * TODO: Band A & B + * TODO: * scan_group can only be get. scan_group=channel_num%50; */ -#define THF7_VFO (RIG_VFO_A|RIG_VFO_C) +#define THF7_CHANNEL_CAPS \ + TH_CHANNEL_CAPS,\ + .flags=1, \ + .dcs_code=1, \ + .dcs_sql=1, + +#define THF7_CHANNEL_CAPS_WO_LO \ + TH_CHANNEL_CAPS,\ + .dcs_code=1, \ + .dcs_sql=1, + +/* CTCSS 01..42 */ +static const tone_t thf7_ctcss_list[] = { + 670, 693, 719, 744, 770, 797, 825, 854, 885, 915, + 948, 974, 1000, 1035, 1072, 1109, 1148, 1188, 1230, 1273, + 1318, 1365, 1413, 1462, 1514, 1567, 1622, 1679, 1738, 1799, + 1862, 1928, 2035, 2065, 2107, 2181, 2257, 2291, 2336, 2418, + 2503, 2541, + 0 + +}; + +/* DCS 0..103 (=104) */ +static const tone_t thf7_dcs_list[] = { + 23, 25, 26, 31, 32, 36, 43, 47, 51, 53, 54, 65, 71, 72, 73, 74, + 114, 115, 116, 122, 125, 131, 132, 134, 143, 145, 152, 155, 156, + 162, 165, 172, 174, 205, 212, 223, 225, 226, 243, 244, 245, 246, + 251, 252, 255, 261, 263, 265, 266, 271, 274, 306, 311, 315, 325, + 331, 332, 343, 346, 351, 356, 364, 365, 371, 411, 412, 413, 423, + 431, 432, 445, 446, 452, 454, 455, 462, 464, 465, 466, 503, 506, + 516, 523, 526, 532, 546, 565, 606, 612, 624, 627, 631, 632, 654, + 662, 664, 703, 712, 723, 731, 732, 734, 743, 754, + 0 +}; + +static rmode_t thf7_mode_table[KENWOOD_MODE_TABLE_MAX] = { + [0] = RIG_MODE_FM, + [1] = RIG_MODE_WFM, + [2] = RIG_MODE_AM, + [3] = RIG_MODE_LSB, + [4] = RIG_MODE_USB, + [5] = RIG_MODE_CW +}; + + +/* + * Band A & B + */ +#define THF7_VFO (RIG_VFO_A|RIG_VFO_B) const struct kenwood_priv_caps thf7_priv_caps = { .cmdtrm = EOM_TH, /* Command termination character */ + .mode_table = thf7_mode_table, }; +static int thf7e_init(RIG *rig); +static int thf7e_open(RIG *rig); +static int thf7_set_vfo (RIG *rig, vfo_t vfo); +static int thf7_get_vfo (RIG *rig, vfo_t *vfo); + /* - * th-f7e rig capabilities. + * TH-F7E rig capabilities. * - * Manual: http://www.mods.dk/select.php3?id=2754&radio=kenwood&model=TH-F7 + * Manual: http://www.k6may.com/KenwoodTHF6Tip1.shtml */ const struct rig_caps thf7e_caps = { .rig_model = RIG_MODEL_THF7E, @@ -61,7 +124,7 @@ const struct rig_caps thf7e_caps = { .mfg_name = "Kenwood", .version = TH_VER, .copyright = "LGPL", -.status = RIG_STATUS_ALPHA, +.status = RIG_STATUS_BETA, .rig_type = RIG_TYPE_HANDHELD, .ptt_type = RIG_PTT_RIG, .dcd_type = RIG_DCD_RIG, @@ -74,7 +137,7 @@ const struct rig_caps thf7e_caps = { .serial_handshake = RIG_HANDSHAKE_NONE, .write_delay = 0, .post_write_delay = 0, -.timeout = 200, +.timeout = 500, .retry = 3, .has_get_func = THF7_FUNC_ALL, @@ -82,15 +145,14 @@ const struct rig_caps thf7e_caps = { .has_get_level = THF7_LEVEL_ALL, .has_set_level = RIG_LEVEL_SET(THF7_LEVEL_ALL), .has_get_parm = THF7_PARMS, -.has_set_parm = THF7_PARMS, /* FIXME: parms */ +.has_set_parm = THF7_PARMS, .level_gran = { - [LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 5 } }, [LVL_SQL] = { .min = { .i = 0 }, .max = { .i = 5 } }, [LVL_RFPOWER] = { .min = { .i = 3 }, .max = { .i = 0 } }, }, .parm_gran = {}, -.ctcss_list = kenwood38_ctcss_list, -.dcs_list = NULL, /* FIXME */ +.ctcss_list = thf7_ctcss_list, +.dcs_list = thf7_dcs_list, .preamp = { RIG_DBLST_END, }, .attenuator = { 20, RIG_DBLST_END, }, .max_rit = Hz(0), @@ -98,51 +160,83 @@ const struct rig_caps thf7e_caps = { .max_ifshift = Hz(0), .vfo_ops = THF7_VFO_OP, .targetable_vfo = RIG_TARGETABLE_FREQ, -.transceive = RIG_TRN_RIG, +.transceive = RIG_TRN_RIG, /* TBC */ .bank_qty = 0, -.chan_desc_sz = 0, +.chan_desc_sz = 8, -.chan_list = { { 1, 435, RIG_MTYPE_MEM }, +.chan_list = { + { 0, 399, RIG_MTYPE_MEM , {THF7_CHANNEL_CAPS}}, /* normal MEM */ + { 400,409, RIG_MTYPE_EDGE, {THF7_CHANNEL_CAPS}}, /* L0-L9 lower scan limit */ + { 410,419, RIG_MTYPE_EDGE, {THF7_CHANNEL_CAPS}}, /* U0-U9 upper scan limit */ + { 420,429, RIG_MTYPE_MEM, {THF7_CHANNEL_CAPS}}, /* I0-I9 info */ + { 430,431, RIG_MTYPE_PRIO, {THF7_CHANNEL_CAPS}}, /* PR0,PR1 priority */ + { 432,434, RIG_MTYPE_CALL, {THF7_CHANNEL_CAPS_WO_LO}}, /* Call (for each ham band) */ + { 435,449, RIG_MTYPE_BAND, {THF7_CHANNEL_CAPS_WO_LO}}, /* VFO */ + /* 3 A-band VFO */ + /* 11 B-band VFO */ + /* TODO: 10 DTMF */ RIG_CHAN_END, - }, /* FIXME: memory channel list: 435? memories */ +}, -.rx_range_list1 = { - {kHz(100),GHz(1.3),THF7_MODES,-1,-1,THF7_VFO}, - RIG_FRNG_END, - }, /* rx range */ -.tx_range_list1 = { - {MHz(144),MHz(146),THF7_MODES_TX,W(0.05),W(5),THF7_VFO}, - {MHz(430),MHz(440),THF7_MODES_TX,W(0.05),W(5),THF7_VFO}, - RIG_FRNG_END, - }, /* tx range */ -.rx_range_list2 = { RIG_FRNG_END, }, /* FIXME: enter region 2 setting */ +.rx_range_list1 = { + /* RIG_ANT_2 is internal bar antenna */ + {MHz(144),MHz(146),THF7_MODES_TX,-1,-1,RIG_VFO_A,RIG_ANT_1}, + {kHz(430),MHz(440),THF7_MODES_TX,-1,-1,RIG_VFO_A,RIG_ANT_1}, + {kHz(100),MHz(470),THF7_ALL_MODES,-1,-1,RIG_VFO_B, RIG_ANT_1|RIG_ANT_2}, + {MHz(470),GHz(1.3),THF7_HIGH_MODES,-1,-1,RIG_VFO_B,RIG_ANT_1}, + RIG_FRNG_END + }, +.tx_range_list1 = { + /* power actually depends on DC power supply */ + {MHz(144),MHz(146),THF7_MODES_TX,W(0.05),W(5),RIG_VFO_A,RIG_ANT_1}, + {MHz(430),MHz(440),THF7_MODES_TX,W(0.05),W(5),RIG_VFO_A,RIG_ANT_1}, + RIG_FRNG_END + }, + + /* region 2 is TH-F6A */ +.rx_range_list2 = { RIG_FRNG_END, }, .tx_range_list2 = { RIG_FRNG_END, }, + .tuning_steps = { - {THF7_MODES,kHz(5)}, - {THF7_MODES,kHz(6.25)}, - {THF7_MODES,kHz(10)}, - {THF7_MODES,kHz(12.5)}, - {THF7_MODES,kHz(15)}, - {THF7_MODES,kHz(20)}, - {THF7_MODES,kHz(25)}, - {THF7_MODES,kHz(30)}, - {THF7_MODES,kHz(50)}, - {THF7_MODES,kHz(100)}, + /* This table is ordered according to protocol, from '0' to 'b' */ + /* The steps are not available on every band/frequency limit 470MHz */ + {THF7_ALL_MODES,kHz(5)}, + {THF7_ALL_MODES,kHz(6.25)}, + {THF7_ALL_MODES,kHz(8.33)}, + {THF7_ALL_MODES,kHz(9)}, + {THF7_ALL_MODES,kHz(10)}, + {THF7_ALL_MODES,kHz(12.5)}, + {THF7_ALL_MODES,kHz(15)}, + {THF7_ALL_MODES,kHz(20)}, + {THF7_ALL_MODES,kHz(25)}, + {THF7_ALL_MODES,kHz(30)}, + {THF7_ALL_MODES,kHz(50)}, + {THF7_ALL_MODES,kHz(100)}, RIG_TS_END, }, + /* mode/filter list, remember: order matters! */ .filters = { - {RIG_MODE_AM|RIG_MODE_FM, kHz(12)}, + /* real width to be checked (missing specs) */ + {RIG_MODE_FM, kHz(12)}, + {RIG_MODE_FM, kHz(6)}, /* narrow FM */ + {RIG_MODE_AM, kHz(9)}, + {RIG_MODE_WFM, kHz(150)}, /* or 230? */ + {RIG_MODE_SSB|RIG_MODE_CW, kHz(3)}, RIG_FLT_END, }, .priv = (void *)&thf7_priv_caps, +.rig_init = thf7e_init, +.rig_open = thf7e_open, + .set_freq = th_set_freq, .get_freq = th_get_freq, .set_mode = th_set_mode, .get_mode = th_get_mode, -.set_vfo = th_set_vfo, +.set_vfo = thf7_set_vfo, +.get_vfo = thf7_get_vfo, .set_ctcss_tone = th_set_ctcss_tone, .get_ctcss_tone = th_get_ctcss_tone, .set_ptt = kenwood_set_ptt, @@ -150,14 +244,165 @@ const struct rig_caps thf7e_caps = { .vfo_op = kenwood_vfo_op, .set_mem = th_set_mem, .get_mem = th_get_mem, -.set_trn = th_set_trn, -.get_trn = th_get_trn, +.set_trn = th_set_trn, /* TBC */ +.get_trn = th_get_trn, /* TBC */ +.decode_event = th_decode_event, /* TBC */ + +.set_func = th_set_func, .get_func = th_get_func, +.set_level = th_set_level, .get_level = th_get_level, .get_parm = th_get_parm, .get_info = th_get_info, -.decode_event = th_decode_event, + +.set_channel = th_set_channel, +.get_channel = th_get_channel, +.set_ant = th_set_ant, +.get_ant = th_get_ant, }; +#define ACKBUF_LEN 64 + +int thf7e_init(RIG *rig) +{ + rig->state.itu_region = RIG_ITU_REGION1; + return RIG_OK; +} + +int thf7e_open(RIG *rig) +{ + /* TH-F7E is Region 1 only. + * Region 2 is supported by TH-F6A + */ + if (rig->state.itu_region != RIG_ITU_REGION1) + return -RIG_ECONF; + return RIG_OK; +} + +/* + */ +int +thf7_set_vfo (RIG *rig, vfo_t vfo) +{ + char vfobuf[16], ackbuf[ACKBUF_LEN]; + int retval; + size_t ack_len; + + rig_debug(RIG_DEBUG_TRACE, "%s: called\n", __FUNCTION__); + + /* + * The band must be active before selecting VFO or MEM. + * The dilemma is whether MEM should be applied to Band A or Band B. + * Remember, not all bands have the same capability + * TODO: if (RIG_VFO_MEM) query current band with BC, then do appropriate VMC + */ + + if (vfo != RIG_VFO_MEM) { + switch (vfo) { + case RIG_VFO_A: + case RIG_VFO_VFO: + case RIG_VFO_MAIN: + sprintf(vfobuf, "BC 0" EOM_TH); + break; + case RIG_VFO_B: + case RIG_VFO_SUB: + sprintf(vfobuf, "BC 1" EOM_TH); + break; + default: + rig_debug(RIG_DEBUG_ERR, "%s: Unsupported BC VFO %d\n", __FUNCTION__, vfo); + return -RIG_EVFO; + } + + /* wait for response, otherwise next issued command may fail */ + ack_len = ACKBUF_LEN-1; + retval = kenwood_transaction(rig, vfobuf, strlen(vfobuf), ackbuf, &ack_len); + if (retval != RIG_OK) + return retval; + } + + switch (vfo) { + case RIG_VFO_VFO: + case RIG_VFO_MAIN: + case RIG_VFO_A: + sprintf(vfobuf, "VMC 0,0" EOM_TH); + break; + case RIG_VFO_SUB: + case RIG_VFO_B: + sprintf(vfobuf, "VMC 1,0" EOM_TH); + break; + case RIG_VFO_MEM: + sprintf(vfobuf, "VMC 0,1" EOM_TH); + break; + default: + rig_debug(RIG_DEBUG_ERR, "%s: Unsupported VFO %d\n", __FUNCTION__, vfo); + return -RIG_EVFO; + } + + /* wait for response, otherwise next issued command may fail */ + ack_len = ACKBUF_LEN-1; + retval = kenwood_transaction(rig, vfobuf, strlen(vfobuf), ackbuf, &ack_len); + if (retval != RIG_OK) + return retval; + + return RIG_OK; +} + +/* + */ +int +thf7_get_vfo (RIG *rig, vfo_t *vfo) +{ + char cmdbuf[16], ackbuf[ACKBUF_LEN],vfoc; + int retval; + size_t ack_len; + + rig_debug(RIG_DEBUG_TRACE, "%s: called\n", __FUNCTION__); + + ack_len=ACKBUF_LEN; + retval = kenwood_transaction (rig, "BC" EOM_TH, 3, ackbuf, &ack_len); + if (retval != RIG_OK) + return retval; + + if (ack_len < 4 ) { + rig_debug(RIG_DEBUG_ERR, "%s: Unexpected reply '%s'\n", __FUNCTION__, ackbuf); + return -RIG_ERJCTED; + } + + vfoc=ackbuf[3]; + switch (vfoc) { + case '0': *vfo = RIG_VFO_A; break; + case '1': *vfo = RIG_VFO_B; break; + default: + rig_debug(RIG_DEBUG_ERR, "%s: Unexpected VFO value '%c'\n", __FUNCTION__, ackbuf[3]); + return -RIG_EVFO; + } + + sprintf(cmdbuf,"VMC %c" EOM_TH,vfoc); + ack_len=ACKBUF_LEN; + retval = kenwood_transaction (rig, cmdbuf, strlen(cmdbuf), ackbuf, &ack_len); + if (retval != RIG_OK) + return retval; + + if (ack_len < 8 ) { + rig_debug(RIG_DEBUG_ERR, "%s: Unexpected reply '%s'\n", __FUNCTION__, ackbuf); + return -RIG_ERJCTED; + } + switch(ackbuf[6]) { + case '0' : + case '3' : /* Fine Step Enable */ + break; + case '1' : /* MR */ + case '2' : /* CALL */ + case '4' : /* INFO */ + *vfo = RIG_VFO_MEM; + break; + default: + rig_debug(RIG_DEBUG_ERR, "%s: Unexpected VFO value '%c'\n", __FUNCTION__, ackbuf[6]); + return -RIG_EVFO; + } + + return RIG_OK; +} +