Merge branch 'master' of

ssh://git.code.sf.net/p/hamlib/code

NEWS

@@ -52,6 +52,7 @@ Version 3.0
 	    selected.  Only the Winradio g313 model uses libdl so test for it
 	    only when Winradio backend is enabled.
 	* New IC-M700PRO, IC-M710, IC-M802.
+	* New Icom ID-5100 model.
 
 Version 1.2.15.3
 	2012-11-01

icom/Android.mk

@@ -7,8 +7,9 @@ LOCAL_SRC_FILES := ic706.c icr8500.c ic735.c ic775.c ic756.c  \
 		icr7000.c ic910.c ic9100.c ic970.c ic725.c ic737.c ic718.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 \
+		ic765.c ic781.c ic471.c icr9000.c icr9500.c \
 		icr10.c icr20.c icr71.c icr72.c icr75.c icrx7.c \
+		id1.c id5100.c \
 		ic707.c ic728.c ic751.c ic761.c \
 		ic78.c ic7800.c ic7000.c ic7100.c ic7200.c ic7600.c ic7700.c \
 		icom.c frame.c optoscan.c

icom/Makefile.am

@@ -3,8 +3,9 @@ ICOMSRC = ic706.c icr8500.c ic735.c ic775.c ic756.c  \
 	icr7000.c ic910.c ic9100.c ic970.c ic725.c ic737.c ic718.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 \
+	ic765.c ic781.c ic471.c icr9000.c icr9500.c \
 	icr10.c icr20.c icr71.c icr72.c icr75.c icrx7.c \
+	id1.c id5100.c \
 	ic707.c ic728.c ic751.c ic761.c \
 	ic78.c ic7800.c ic7000.c ic7100.c ic7200.c ic7600.c ic7700.c \
 	icom.c icom.h icom_defs.h frame.c frame.h optoscan.c optoscan.h

icom/icom.c

@@ -1,6 +1,6 @@
 /*
  *  Hamlib CI-V backend - main file
- *  Copyright (c) 2000-2012 by Stephane Fillod
+ *  Copyright (c) 2000-2015 by Stephane Fillod
  *
  *
  *   This library is free software; you can redistribute it and/or
@@ -3367,6 +3367,7 @@ DECLARE_INITRIG_BACKEND(icom)
 
 	rig_register(&ic92d_caps);
 	rig_register(&id1_caps);
+	rig_register(&id5100_caps);
 
 	return RIG_OK;
 }

icom/icom.h

@@ -1,6 +1,6 @@
 /*
  *  Hamlib CI-V backend - main header
- *  Copyright (c) 2000-2012 by Stephane Fillod
+ *  Copyright (c) 2000-2015 by Stephane Fillod
  *
  *
  *   This library is free software; you can redistribute it and/or
@@ -254,5 +254,6 @@ extern const struct rig_caps os535_caps;
 
 extern const struct rig_caps ic92d_caps;
 extern const struct rig_caps id1_caps;
+extern const struct rig_caps id5100_caps;
 
 #endif /* _ICOM_H */

icom/id5100.c

@@ -0,0 +1,223 @@
+/*
+ *  Hamlib CI-V backend - description of ID-5100 and variations
+ *  Copyright (c) 2015 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 "idx_builtin.h"
+#include "icom.h"
+
+/*
+ * Specs and protocol details comes from the chapter 13 of ID-5100_Full-Inst_Manual.pdf 
+ *
+ * NB: while the port labeled "Data" is used for firmware upgrades,
+ * you have to use the port labeled "SP2" for rig control.
+ *
+ * TODO:
+ * - DV mode
+ * - GPS support
+ * - Single/dual watch (RIG_LEVEL_BALANCE)
+ */
+
+#define ID5100_MODES (RIG_MODE_FM)
+#define ID5100_ALL_RX_MODES (RIG_MODE_AM|ID5100_MODES)
+
+#define ID5100_VFO_ALL (RIG_VFO_MAIN|RIG_VFO_SUB)
+
+#define ID5100_SCAN_OPS RIG_SCAN_NONE
+
+#define ID5100_VFO_OPS  RIG_OP_NONE
+
+#define ID5100_FUNC_ALL ( \
+                            RIG_FUNC_TONE| \
+                            RIG_FUNC_TSQL| \
+                            RIG_FUNC_VOX)
+
+#define ID5100_LEVEL_ALL    (RIG_LEVEL_AF| \
+                            RIG_LEVEL_BALANCE| /* TODO 0x16 0x59 */\
+                            RIG_LEVEL_SQL| \
+                            RIG_LEVEL_RAWSTR| \
+                            RIG_LEVEL_RFPOWER| \
+                            RIG_LEVEL_MICGAIN| \
+                            RIG_LEVEL_VOXGAIN)
+
+#define ID5100_PARM_ALL RIG_PARM_NONE
+
+
+/*
+ * FIXME: real measurement
+ */
+#define ID5100_STR_CAL	UNKNOWN_IC_STR_CAL
+
+
+
+/*
+ */
+static const struct icom_priv_caps id5100_priv_caps = {
+		0x8C,	/* default address */
+		0,		/* 731 mode */
+		1,      /* no XCHG */
+};
+
+const struct rig_caps id5100_caps = {
+.rig_model =  RIG_MODEL_ID5100,
+.model_name = "ID-5100",
+.mfg_name =  "Icom",
+.version =  BACKEND_VER,
+.copyright =  "LGPL",
+.status =  RIG_STATUS_UNTESTED,
+.rig_type =  RIG_TYPE_MOBILE,
+.ptt_type =  RIG_PTT_RIG,
+.dcd_type =  RIG_DCD_RIG,
+.port_type =  RIG_PORT_SERIAL,
+.serial_rate_min =  4800,
+.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 =  1000,
+.retry =  3,
+.has_get_func =  ID5100_FUNC_ALL,
+.has_set_func =  ID5100_FUNC_ALL,
+.has_get_level =  ID5100_LEVEL_ALL,
+.has_set_level =  RIG_LEVEL_SET(ID5100_LEVEL_ALL),
+.has_get_parm =  ID5100_PARM_ALL,
+.has_set_parm =  ID5100_PARM_ALL,
+.level_gran = {
+	[LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 255 } },
+},
+.parm_gran =  {},
+.ctcss_list =  common_ctcss_list,
+.dcs_list =  full_dcs_list,
+.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 =  ID5100_VFO_OPS,
+.scan_ops =  ID5100_SCAN_OPS,
+.transceive =  RIG_TRN_RIG,
+.bank_qty =   0,
+.chan_desc_sz =  0,
+
+.chan_list =  {
+	// There's no memory support through CI-V,
+	// but there is a clone mode apart.
+		   RIG_CHAN_END,
+	},
+
+.rx_range_list1 =   {
+	{MHz(118),MHz(174),ID5100_ALL_RX_MODES,-1,-1,ID5100_VFO_ALL},
+	{MHz(375),MHz(550),ID5100_ALL_RX_MODES,-1,-1,ID5100_VFO_ALL},
+	RIG_FRNG_END, },
+.tx_range_list1 =  {
+	{MHz(144),MHz(146),ID5100_MODES,W(5),W(25),ID5100_VFO_ALL},
+	{MHz(430),MHz(440),ID5100_MODES,W(5),W(25),ID5100_VFO_ALL},
+	RIG_FRNG_END, },
+
+.rx_range_list2 =   {
+	{MHz(118),MHz(174),ID5100_ALL_RX_MODES,-1,-1,ID5100_VFO_ALL},
+	{MHz(375),MHz(550),ID5100_ALL_RX_MODES,-1,-1,ID5100_VFO_ALL},
+	RIG_FRNG_END, },
+.tx_range_list2 =  {
+	{MHz(144),MHz(148),ID5100_MODES,W(5),W(50),ID5100_VFO_ALL},
+	{MHz(430),MHz(450),ID5100_MODES,W(5),W(50),ID5100_VFO_ALL},
+	RIG_FRNG_END, },
+
+.tuning_steps = 	{
+	// Rem: no support for changing tuning step
+	 {ID5100_ALL_RX_MODES,kHz(5)},
+	 {ID5100_ALL_RX_MODES,kHz(6.25)},
+	 // The 8.33 kHz step is not selectable, depending on the operating band or mode.
+	 {ID5100_ALL_RX_MODES,kHz(8.33)},
+	 {ID5100_ALL_RX_MODES,kHz(10)},
+	 {ID5100_ALL_RX_MODES,12500},
+	 {ID5100_ALL_RX_MODES,kHz(15)},
+	 {ID5100_ALL_RX_MODES,kHz(20)},
+	 {ID5100_ALL_RX_MODES,kHz(25)},
+	 {ID5100_ALL_RX_MODES,kHz(30)},
+	 {ID5100_ALL_RX_MODES,kHz(50)},
+	 RIG_TS_END,
+	},
+	/* mode/filter list, remember: order matters! */
+.filters = 	{
+		{RIG_MODE_FM|RIG_MODE_AM, kHz(12)},
+		{RIG_MODE_FM|RIG_MODE_AM, kHz(6)},
+		RIG_FLT_END,
+	},
+.str_cal = ID5100_STR_CAL,
+
+.cfgparams =  icom_cfg_params,
+.set_conf =  icom_set_conf,
+.get_conf =  icom_get_conf,
+
+.priv =  (void*)&id5100_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,
+
+.set_powerstat = icom_set_powerstat,
+.get_powerstat = icom_get_powerstat,
+.decode_event =  icom_decode_event,
+
+.set_func =  icom_set_func,
+.get_func =  icom_get_func,
+.set_level =  icom_set_level,
+.get_level =  icom_get_level,
+
+.set_ptt =  icom_set_ptt,
+.get_ptt =  icom_get_ptt,
+.get_dcd =  icom_get_dcd,
+
+.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_dcs_sql =  icom_set_dcs_code,
+.get_dcs_sql =  icom_get_dcs_code,
+
+.set_split_vfo = icom_set_split_vfo,
+.get_split_vfo = icom_get_split_vfo,
+.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,
+
+};

include/hamlib/riglist.h

@@ -207,7 +207,8 @@
 #define RIG_MODEL_IC9100 RIG_MAKE_MODEL(RIG_ICOM, 68)
 #define RIG_MODEL_ICRX7 RIG_MAKE_MODEL(RIG_ICOM, 69)
 #define RIG_MODEL_IC7100 RIG_MAKE_MODEL(RIG_ICOM, 70)
-/* next one is 71 */
+#define RIG_MODEL_ID5100 RIG_MAKE_MODEL(RIG_ICOM, 71)
+/* next one is 72 */
 
 	/*
 	 * Optoelectronics (CI-V)