add IC-RX7

NEWS

@@ -6,7 +6,7 @@ Copyright (C) 2000-2011  Stephane Fillod, and others
 Please send Hamlib bug reports to hamlib-developer@lists.sourceforge.net
 
 Version 1.2.15
-	* New models: TT-599 Eagle
+	* New models: TT-599 Eagle, IC-RX7
 	* New rotator backends: Celestron (telescope mount)
 	* Fixes and features: K3
 

icom/Makefile.am

@@ -4,7 +4,7 @@ ICOMSRCLIST = ic706.c icr8500.c ic735.c ic775.c ic756.c  \
 		os535.c os456.c omni.c delta2.c ic92d.c \
 		ic736.c ic738.c ic7410.c ic746.c ic703.c ic726.c ic271.c \
 		ic765.c ic781.c ic471.c id1.c icr9000.c icr9500.c \
-		icr10.c icr20.c icr71.c icr72.c icr75.c \
+		icr10.c icr20.c icr71.c icr72.c icr75.c icrx7.c \
 		ic707.c ic728.c ic751.c ic761.c \
 		ic78.c ic7800.c ic7000.c ic7200.c ic7600.c ic7700.c
 

icom/icom.c

@@ -305,6 +305,7 @@ static const struct icom_addr icom_addr_list[] = {
 	{ RIG_MODEL_ICR71, 0x1a },
 	{ RIG_MODEL_ICR72, 0x32 },
 	{ RIG_MODEL_ICR75, 0x5a },
+	{ RIG_MODEL_ICRX7, 0x78 },
 	{ RIG_MODEL_IC78, 0x62 },
 	{ RIG_MODEL_ICR7000, 0x08 },
 	{ RIG_MODEL_ICR7100, 0x34 },
@@ -3180,6 +3181,7 @@ DECLARE_INITRIG_BACKEND(icom)
 	rig_register(&ic9100_caps);
 	rig_register(&ic970_caps);
 
+        rig_register(&icrx7_caps);
         rig_register(&icr10_caps);
         rig_register(&icr20_caps);
         rig_register(&icr71_caps);

icom/icom.h

@@ -223,6 +223,7 @@ extern const struct rig_caps ic821h_caps;
 extern const struct rig_caps ic910_caps;
 extern const struct rig_caps ic9100_caps;
 extern const struct rig_caps ic970_caps;
+extern const struct rig_caps icrx7_caps;
 extern const struct rig_caps icr10_caps;
 extern const struct rig_caps icr20_caps;
 extern const struct rig_caps icr71_caps;

icom/icrx7.c

@@ -0,0 +1,147 @@
+/*
+ *  Hamlib CI-V backend - description of IC-RX7
+ *  Copyright (c) 2011 by Stephane Fillod
+ *
+ *
+ *   This library is free software; you can redistribute it and/or
+ *   modify it under the terms of the GNU Lesser General Public
+ *   License as published by the Free Software Foundation; either
+ *   version 2.1 of the License, or (at your option) any later version.
+ *
+ *   This library is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *   Lesser General Public License for more details.
+ *
+ *   You should have received a copy of the GNU Lesser General Public
+ *   License along with this library; if not, write to the Free Software
+ *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <stdlib.h>
+
+#include "hamlib/rig.h"
+#include "icom.h"
+#include "idx_builtin.h"
+
+#define ICRX7_MODES (RIG_MODE_AM|RIG_MODE_FM|RIG_MODE_WFM)
+
+#define ICRX7_FUNC_ALL (RIG_FUNC_NONE)
+
+#define ICRX7_LEVEL_ALL (RIG_LEVEL_RAWSTR)
+
+#define ICRX7_VFO_ALL (RIG_VFO_A)
+
+#define ICRX7_VFO_OPS (RIG_OP_NONE)
+#define ICRX7_SCAN_OPS (RIG_SCAN_NONE)
+
+/*
+ * FIXME: S-meter measurement
+ */
+#define ICRX7_STR_CAL UNKNOWN_IC_STR_CAL
+
+static const struct icom_priv_caps icrx7_priv_caps = {
+		0x78,	/* default address */
+		0,		/* 731 mode */
+		r8500_ts_sc_list	/* wrong, but don't have set_ts anyway */
+};
+
+const struct rig_caps icrx7_caps = {
+.rig_model =  RIG_MODEL_ICRX7,
+.model_name = "IC-RX7",
+.mfg_name =  "Icom",
+.version =  BACKEND_VER,
+.copyright =  "LGPL",
+.status =  RIG_STATUS_UNTESTED,
+.rig_type =  RIG_TYPE_RECEIVER|RIG_FLAG_HANDHELD,
+.ptt_type =  RIG_PTT_NONE,
+.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 =  ICRX7_FUNC_ALL,
+.has_set_func =  ICRX7_FUNC_ALL,
+.has_get_level =  ICRX7_LEVEL_ALL,
+.has_set_level =  RIG_LEVEL_SET(ICRX7_LEVEL_ALL),
+.has_get_parm =  RIG_PARM_NONE,
+.has_set_parm =  RIG_PARM_NONE,
+.level_gran = {
+	[LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 255 } },
+},
+.parm_gran =  {},
+.ctcss_list =  NULL,
+.dcs_list =  NULL,
+.preamp =   { RIG_DBLST_END, },
+.attenuator =   { RIG_DBLST_END, },
+.max_rit =  Hz(0),
+.max_xit =  Hz(0),
+.max_ifshift =  Hz(0),
+.targetable_vfo =  0,
+.vfo_ops =  ICRX7_VFO_OPS,
+.scan_ops =  ICRX7_SCAN_OPS,
+.transceive =  RIG_TRN_RIG,
+.bank_qty =   0,
+.chan_desc_sz =  0,
+
+.chan_list =  {
+		   /* Unfortunately, not accessible through CI-V */
+		   RIG_CHAN_END,
+		},
+
+.rx_range_list1 =   {
+	{kHz(150),GHz(1.3),ICRX7_MODES,-1,-1,ICRX7_VFO_ALL},
+	RIG_FRNG_END, },
+.tx_range_list1 =   { RIG_FRNG_END, },
+
+.rx_range_list2 =   {
+	{kHz(150),MHz(821.995),ICRX7_MODES,-1,-1,ICRX7_VFO_ALL},
+	{MHz(851),MHz(866.995),ICRX7_MODES,-1,-1,ICRX7_VFO_ALL},
+	{MHz(896),GHz(1.3),ICRX7_MODES,-1,-1,ICRX7_VFO_ALL},
+	RIG_FRNG_END, },
+.tx_range_list2 =   { RIG_FRNG_END, },
+
+.tuning_steps = 	{
+	 {ICRX7_MODES,Hz(100)},
+	 RIG_TS_END,
+	},
+.filters = 	{
+		{RIG_MODE_AM|RIG_MODE_FM, kHz(15)},
+		{RIG_MODE_WFM, kHz(150)},
+		RIG_FLT_END,
+	},
+.str_cal = ICRX7_STR_CAL,
+
+.cfgparams =  icom_cfg_params,
+.set_conf =  icom_set_conf,
+.get_conf =  icom_get_conf,
+
+.priv =  (void*)&icrx7_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,	/* TODO: do not pass bandwidth data */
+.get_mode =  icom_get_mode,
+
+.decode_event =  icom_decode_event,
+.get_level =  icom_get_level,
+.get_dcd =  icom_get_dcd,
+
+};
+

include/hamlib/riglist.h

@@ -200,7 +200,8 @@
 #define RIG_MODEL_ICR9500 RIG_MAKE_MODEL(RIG_ICOM, 66)
 #define RIG_MODEL_IC7410 RIG_MAKE_MODEL(RIG_ICOM, 67)
 #define RIG_MODEL_IC9100 RIG_MAKE_MODEL(RIG_ICOM, 68)
-/* next one is 69 */
+#define RIG_MODEL_ICRX7 RIG_MAKE_MODEL(RIG_ICOM, 69)
+/* next one is 70 */
 
 	/*
 	 * Optoelectronics (CI-V)