diff --git a/icom/ic756.c b/icom/ic756.c index 09fc292f8..6d2b3c49e 100644 --- a/icom/ic756.c +++ b/icom/ic756.c @@ -1,8 +1,8 @@ /* * Hamlib CI-V backend - description of IC-756 and variations - * Copyright (c) 2000,2001 by Stephane Fillod + * Copyright (c) 2000-2002 by Stephane Fillod * - * $Id: ic756.c,v 1.2 2002-01-27 14:47:58 fillods Exp $ + * $Id: ic756.c,v 1.3 2002-07-09 20:43:37 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,17 +25,15 @@ #endif #include -#include /* Standard input/output definitions */ #include /* String function definitions */ -#include /* UNIX standard function definitions */ -#include /* File control definitions */ -#include /* Error number definitions */ -#include /* POSIX terminal control definitions */ -#include #include -#include +#include "token.h" + #include "icom.h" +#include "icom_defs.h" +#include "frame.h" +#include "misc.h" #define IC756_ALL_RX_MODES (RIG_MODE_AM|RIG_MODE_CW|RIG_MODE_SSB|RIG_MODE_RTTY|RIG_MODE_FM) @@ -375,4 +373,279 @@ get_split: icom_get_split, }; +/* + * ic756proII rig capabilities. + * TODO: check every paramters, + * add antenna capabilities + */ +static const struct icom_priv_caps ic756pro2_priv_caps = { + 0x64, /* default address */ + 0, /* 731 mode */ + ic756_ts_sc_list, + IC756PRO_STR_CAL +}; + +/* + * These TOKEN_BACKEND's are on a different name space than conf's + */ +#define TOK_SSBBASS TOKEN_BACKEND(1) +#define TOK_MEMNAME TOKEN_BACKEND(2) +#define TOK_SQLCTRL TOKEN_BACKEND(3) +#define TOK_MYCALL TOKEN_BACKEND(4) + +static const struct confparams ic756pro2_ext_parms[] = { + { TOK_SSBBASS, "ssbbass", "SSB Tx Tone (Bass)", "SSB Tx Tone (Bass)", + NULL, RIG_CONF_NUMERIC, { n: { 0, 10, 1 } } + }, + { TOK_MEMNAME, "memname", "Show mem name", "Show memory name", + NULL, RIG_CONF_CHECKBUTTON, { } + }, + { TOK_SQLCTRL, "sqlctrl", "RF/Sql control", "set RF/Squelch control", + NULL, RIG_CONF_COMBO, { c: {{ "Auto", "Sql", "RF+Sql", NULL }} } + }, + { TOK_MYCALL, "mycall", "Callsign", "My call sign", + NULL, RIG_CONF_STRING, { } + }, + { RIG_CONF_END, NULL, } +}; + + +/* + * NUMERIC: val.f + * COMBO: val.i, starting from 0 + * STRING: val.s + * CHECKBUTTON: val.i 0/1 + */ + +static int ic756pro2_set_ext_parm(RIG *rig, token_t token, value_t val); +static int ic756pro2_get_ext_parm(RIG *rig, token_t token, value_t *val); + +const struct rig_caps ic756pro2_caps = { +rig_model: RIG_MODEL_IC756PROII, +model_name:"IC-756PROII", +mfg_name: "Icom", +version: "0.2", +copyright: "LGPL", +status: RIG_STATUS_UNTESTED, +rig_type: RIG_TYPE_TRANSCEIVER, +ptt_type: RIG_PTT_RIG, +dcd_type: RIG_DCD_RIG, +port_type: RIG_PORT_SERIAL, +serial_rate_min: 300, +serial_rate_max: 19200, +serial_data_bits: 8, +serial_stop_bits: 1, +serial_parity: RIG_PARITY_NONE, +serial_handshake: RIG_HANDSHAKE_NONE, +write_delay: 0, +post_write_delay: 0, +timeout: 200, +retry: 3, +has_get_func: IC756PRO_FUNC_ALL, +has_set_func: IC756PRO_FUNC_ALL, +has_get_level: IC756PRO_LEVEL_ALL, +has_set_level: RIG_LEVEL_SET(IC756PRO_LEVEL_ALL), +has_get_parm: RIG_PARM_NONE, +has_set_parm: RIG_PARM_NONE, /* FIXME: parms */ +level_gran: {}, /* granularity */ +parm_gran: {}, +extparms: ic756pro2_ext_parms, +ctcss_list: common_ctcss_list, +dcs_list: NULL, +preamp: { 10, 20, RIG_DBLST_END, }, /* FIXME: TBC */ +attenuator: { 6, 12, 18, 20, RIG_DBLST_END, }, +max_rit: Hz(9999), +max_xit: Hz(9999), +max_ifshift: Hz(0), +targetable_vfo: 0, +vfo_ops: IC756_VFO_OPS, +scan_ops: IC756_SCAN_OPS, +transceive: RIG_TRN_RIG, +bank_qty: 0, +chan_desc_sz: 0, + +chan_list: { + { 1, 99, RIG_MTYPE_MEM, 0 }, + { 100, 101, RIG_MTYPE_EDGE, 0 }, /* two by two */ + RIG_CHAN_END, + }, + +rx_range_list1: { RIG_FRNG_END, }, /* FIXME: enter region 1 setting */ +tx_range_list1: { RIG_FRNG_END, }, + +rx_range_list2: { {kHz(30),MHz(60),IC756_ALL_RX_MODES,-1,-1,IC756_VFO_ALL}, + RIG_FRNG_END, }, +tx_range_list2: { {kHz(1800),MHz(2)-1,IC756_OTHER_TX_MODES,5000,100000,IC756_VFO_ALL}, /* 100W class */ + {kHz(1800),MHz(2)-1,IC756_AM_TX_MODES,5000,40000,IC756_VFO_ALL}, /* 40W class */ + {kHz(3500),MHz(4)-1,IC756_OTHER_TX_MODES,5000,100000,IC756_VFO_ALL}, + {kHz(3500),MHz(4)-1,IC756_AM_TX_MODES,5000,40000,IC756_VFO_ALL}, + {MHz(7),kHz(7300),IC756_OTHER_TX_MODES,5000,100000,IC756_VFO_ALL}, + {MHz(7),kHz(7300),IC756_AM_TX_MODES,5000,40000,IC756_VFO_ALL}, + {kHz(10100),kHz(10150),IC756_OTHER_TX_MODES,5000,100000,IC756_VFO_ALL}, + {kHz(10100),kHz(10150),IC756_AM_TX_MODES,5000,40000,IC756_VFO_ALL}, + {MHz(14),kHz(14350),IC756_OTHER_TX_MODES,5000,100000,IC756_VFO_ALL}, + {MHz(14),kHz(14350),IC756_AM_TX_MODES,5000,40000,IC756_VFO_ALL}, + {kHz(18068),kHz(18168),IC756_OTHER_TX_MODES,5000,100000,IC756_VFO_ALL}, + {kHz(18068),kHz(18168),IC756_AM_TX_MODES,5000,40000,IC756_VFO_ALL}, + {MHz(21),kHz(21450),IC756_OTHER_TX_MODES,5000,100000,IC756_VFO_ALL}, + {MHz(21),kHz(21450),IC756_AM_TX_MODES,5000,40000,IC756_VFO_ALL}, + {kHz(24890),kHz(24990),IC756_OTHER_TX_MODES,5000,100000,IC756_VFO_ALL}, + {kHz(24890),kHz(24990),IC756_AM_TX_MODES,5000,40000,IC756_VFO_ALL}, + {MHz(28),kHz(29700),IC756_OTHER_TX_MODES,5000,100000,IC756_VFO_ALL}, + {MHz(28),kHz(29700),IC756_AM_TX_MODES,5000,40000,IC756_VFO_ALL}, + {MHz(50),MHz(54),IC756_OTHER_TX_MODES,5000,100000,IC756_VFO_ALL}, + {MHz(50),MHz(54),IC756_AM_TX_MODES,5000,40000,IC756_VFO_ALL}, + RIG_FRNG_END, }, + +tuning_steps: { + {IC756_1HZ_TS_MODES,1}, + {IC756_ALL_RX_MODES,kHz(1)}, + {IC756_ALL_RX_MODES,kHz(5)}, + {IC756_ALL_RX_MODES,kHz(9)}, + {IC756_ALL_RX_MODES,kHz(10)}, + RIG_TS_END, + }, + /* mode/filter list, remember: order matters! */ +filters: { + {RIG_MODE_SSB|RIG_MODE_RTTY, kHz(2.4)}, + {RIG_MODE_CW, Hz(500)}, + {RIG_MODE_AM, kHz(6)}, + {RIG_MODE_AM, kHz(2.4)}, + {RIG_MODE_FM, kHz(15)}, + {RIG_MODE_FM, kHz(8)}, + RIG_FLT_END, + }, + +cfgparams: icom_cfg_params, +set_conf: icom_set_conf, +get_conf: icom_get_conf, + +priv: (void*)&ic756pro2_priv_caps, +rig_init: icom_init, +rig_cleanup: icom_cleanup, +rig_open: NULL, +rig_close: NULL, + +set_freq: icom_set_freq, +get_freq: icom_get_freq, +set_mode: icom_set_mode, +get_mode: icom_get_mode, +set_vfo: icom_set_vfo, + +decode_event: icom_decode_event, +set_level: icom_set_level, +get_level: icom_get_level, +set_func: icom_set_func, +get_func: icom_get_func, +set_mem: icom_set_mem, +vfo_op: icom_vfo_op, +scan: icom_scan, +set_ptt: icom_set_ptt, +get_ptt: icom_get_ptt, +get_dcd: icom_get_dcd, +set_ts: icom_set_ts, +get_ts: icom_get_ts, +set_rptr_shift: icom_set_rptr_shift, +get_rptr_shift: icom_get_rptr_shift, +set_rptr_offs: icom_set_rptr_offs, +get_rptr_offs: icom_get_rptr_offs, +set_ctcss_tone: icom_set_ctcss_tone, +get_ctcss_tone: icom_get_ctcss_tone, +set_ctcss_sql: icom_set_ctcss_sql, +get_ctcss_sql: icom_get_ctcss_sql, +set_split_freq: icom_set_split_freq, +get_split_freq: icom_get_split_freq, +set_split_mode: icom_set_split_mode, +get_split_mode: icom_get_split_mode, +set_split: icom_set_split, +get_split: icom_get_split, + +set_ext_parm: ic756pro2_set_ext_parm, +get_ext_parm: ic756pro2_get_ext_parm, +}; + + +/* + * Assumes rig!=NULL, rig->state.priv!=NULL + */ +static int ic756pro2_set_ext_parm(RIG *rig, token_t token, value_t val) +{ + struct icom_priv_data *priv; + struct rig_state *rs; + unsigned char epbuf[MAXFRAMELEN], ackbuf[MAXFRAMELEN]; + int ack_len, ep_len, val_len; + int ep_menu; /* Menu in $1A $05 */ + int icom_val = 0; + int retval; + + rs = &rig->state; + priv = (struct icom_priv_data*)rs->priv; + + ep_len = 0; /* 0 implies BCD data */ + val_len = 1; + + switch(token) { + case TOK_SSBBASS: + ep_menu = 0x01; + icom_val = val.f; + break; + case TOK_MEMNAME: + ep_menu = 0x14; + icom_val = val.i ? 1 : 0; + break; + case TOK_SQLCTRL: + ep_menu = 0x22; + /* TODO: check range */ + icom_val = val.i; + break; + case TOK_MYCALL: /* max 10 ASCII char */ + ep_len = strlen(val.s); + if (ep_len > 10) + return -RIG_EINVAL; + ep_menu = 0x15; + memcpy(epbuf+1, val.s, ep_len); + break; + default: + return -RIG_EINVAL; + } + + epbuf[0] = ep_menu; + if (ep_len++ == 0) { + to_bcd_be(epbuf+1, (long long)icom_val, val_len*2); + ep_len += val_len; + } + + retval = icom_transaction (rig, C_CTL_MEM, 0x05, epbuf, ep_len, + ackbuf, &ack_len); + if (retval != RIG_OK) + return retval; + + if (ack_len != 1 || ackbuf[0] != ACK) { + rig_debug(RIG_DEBUG_ERR, "%s: ack NG (%#.2x), " + "len=%d\n", __FUNCTION__, ackbuf[0], ack_len); + return -RIG_ERJCTED; + } + return RIG_OK; +} + +/* + * Assumes rig!=NULL, rig->state.priv!=NULL + * and val points to a buffer big enough to hold the conf value. + */ +static int ic756pro2_get_ext_parm(RIG *rig, token_t token, value_t *val) +{ + struct icom_priv_data *priv; + struct rig_state *rs; + + rs = &rig->state; + priv = (struct icom_priv_data*)rs->priv; + + switch(token) { + default: + return -RIG_ENIMPL; + } + return RIG_OK; +} + + diff --git a/icom/icom.c b/icom/icom.c index 988b77a16..e26920bf3 100644 --- a/icom/icom.c +++ b/icom/icom.c @@ -2,7 +2,7 @@ * Hamlib CI-V backend - main file * Copyright (c) 2000-2002 by Stephane Fillod * - * $Id: icom.c,v 1.61 2002-05-30 17:38:07 fillods Exp $ + * $Id: icom.c,v 1.62 2002-07-09 20:43:37 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 @@ -2428,34 +2428,35 @@ rig_model_t probe_icom(port_t *p) */ int initrigs_icom(void *be_handle) { - rig_debug(RIG_DEBUG_VERBOSE, "icom: _init called\n"); + rig_debug(RIG_DEBUG_VERBOSE, "icom: _init called\n"); - rig_register(&ic706_caps); - rig_register(&ic706mkii_caps); - rig_register(&ic706mkiig_caps); - rig_register(&ic718_caps); - rig_register(&ic735_caps); - rig_register(&ic775_caps); - rig_register(&ic756_caps); - rig_register(&ic756pro_caps); + rig_register(&ic706_caps); + rig_register(&ic706mkii_caps); + rig_register(&ic706mkiig_caps); + rig_register(&ic718_caps); + rig_register(&ic735_caps); + rig_register(&ic775_caps); + rig_register(&ic756_caps); + rig_register(&ic756pro_caps); + rig_register(&ic756pro2_caps); - rig_register(&ic821h_caps); - rig_register(&ic910_caps); - rig_register(&ic970_caps); + rig_register(&ic821h_caps); + rig_register(&ic910_caps); + rig_register(&ic970_caps); rig_register(&icr7000_caps); - rig_register(&icr8500_caps); + rig_register(&icr8500_caps); - rig_register(&ic275_caps); - rig_register(&ic475_caps); + rig_register(&ic275_caps); + rig_register(&ic475_caps); - rig_register(&icall_caps); + rig_register(&icall_caps); - rig_register(&os535_caps); - rig_register(&os456_caps); + rig_register(&os535_caps); + rig_register(&os456_caps); - rig_register(&omnivip_caps); + rig_register(&omnivip_caps); - return RIG_OK; + return RIG_OK; } diff --git a/icom/icom.h b/icom/icom.h index 7f694b225..5d1d6fd72 100644 --- a/icom/icom.h +++ b/icom/icom.h @@ -2,7 +2,7 @@ * Hamlib CI-V backend - main header * Copyright (c) 2000-2002 by Stephane Fillod * - * $Id: icom.h,v 1.45 2002-05-30 17:38:07 fillods Exp $ + * $Id: icom.h,v 1.46 2002-07-09 20:43:37 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 @@ -121,6 +121,7 @@ extern const struct rig_caps ic718_caps; extern const struct rig_caps ic735_caps; extern const struct rig_caps ic756_caps; extern const struct rig_caps ic756pro_caps; +extern const struct rig_caps ic756pro2_caps; extern const struct rig_caps ic775_caps; extern const struct rig_caps ic821h_caps; extern const struct rig_caps ic910_caps;