* added set_split_mode/get_split_mode

git-svn-id: https://hamlib.svn.sourceforge.net/svnroot/hamlib/trunk@465 7ae35d74-ebe9-4afe-98af-79ac388436b8

icom/ic706.c

@@ -7,7 +7,7 @@
  * using the "CI-V" interface.
  *
  *
- * $Id: ic706.c,v 1.19 2001-04-22 14:48:57 f4cfe Exp $  
+ * $Id: ic706.c,v 1.20 2001-04-28 12:38:02 f4cfe Exp $  
  *
  *
  *
@@ -374,41 +374,10 @@ set_rptr_offs: icom_set_rptr_offs,
 get_rptr_offs: icom_get_rptr_offs,
 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,
 };
 
 
-/*
- * Function definitions below
- */
-
-#if 0
-static const int mkiig_raw[STR_CAL_LENGTH] = {
-100, 104, 108, 111, 114, 118, 121, 125, 129, 133, 137, 142, 146, 151, 156, 161
-};
-static const int mkiig_db[STR_CAL_LENGTH] = {
--18, -16, -14, -12, -10,  -8,  -6,  -4,  -2,   0,   2,   4,   6,   8,  10,  12
-};
-
-/*
- * called by icom_init
- * assume rig!=NULL, rig->state.priv!=NULL
- */
-int ic706mkiig_str_cal_init(RIG *rig)
-{
-	int i;
-	struct icom_priv_data *p = (struct icom_priv_data *)rig->state.priv;
-
-	/*
-	 * initialize the S Meter calibration table
-	 */
-	for (i=0; i<STR_CAL_LENGTH; i++) {
-			p->str_cal_raw[i] = mkiig_raw[i];
-			p->str_cal_db[i] = mkiig_db[i];
-	}
-	return RIG_OK;
-}
-
-#endif
-

icom/icall.c

@@ -1,13 +1,13 @@
 /*
  * hamlib - (C) Frank Singleton 2000 (vk3fcs@ix.netcom.com)
  *
- * icall.c - Copyright (C) 2000 Stephane Fillod
+ * icall.c - Copyright (C) 2000,2001 Stephane Fillod
  * This shared library provides an API for communicating
  * via serial interface to a virtual do-it-all Icom (for debug purpose)
  * using the "CI-V" interface.
  *
  *
- * 		$Id: icall.c,v 1.2 2001-03-04 13:03:41 f4cfe Exp $  
+ * 		$Id: icall.c,v 1.3 2001-04-28 12:38:02 f4cfe Exp $  
  *
  *
  * This program is free software; you can redistribute it and/or
@@ -172,6 +172,8 @@ set_rptr_offs: icom_set_rptr_offs,
 get_rptr_offs: icom_get_rptr_offs,
 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_ctcss: icom_set_ctcss,

icom/icom.c

@@ -6,7 +6,7 @@
  * via serial interface to an ICOM using the "CI-V" interface.
  *
  *
- * $Id: icom.c,v 1.23 2001-04-26 21:31:01 f4cfe Exp $  
+ * $Id: icom.c,v 1.24 2001-04-28 12:38:02 f4cfe Exp $  
  *
  *
  *
@@ -1050,6 +1050,44 @@ int icom_get_split_freq(RIG *rig, vfo_t vfo, freq_t *rx_freq, freq_t *tx_freq)
 		return status;
 }
 
+/*
+ * icom_set_split_mode
+ * Assumes rig!=NULL, rig->state.priv!=NULL, 
+ * 	icom_set_vfo,icom_set_mode works for this rig
+ * FIXME: status
+ */
+int icom_set_split_mode(RIG *rig, vfo_t vfo, rmode_t rx_mode, pbwidth_t rx_width, rmode_t tx_mode, pbwidth_t tx_width)
+{
+		int status;
+
+		status = icom_set_vfo(rig, RIG_VFO_B);
+		status |= icom_set_mode(rig, RIG_VFO_CURR, tx_mode, tx_width);
+		status |= icom_set_vfo(rig, RIG_VFO_A);
+		status |= icom_set_mode(rig, RIG_VFO_CURR, rx_mode, rx_width);
+
+		return status;
+}
+
+/*
+ * icom_get_split_mode
+ * Assumes rig!=NULL, rig->state.priv!=NULL, 
+ *  rx_mode!=NULL, rx_width!=NULL, tx_mode!=NULL, tx_width!=NULL
+ * 	icom_set_vfo,icom_get_mode works for this rig
+ * FIXME: status
+ */
+int icom_get_split_mode(RIG *rig, vfo_t vfo, rmode_t *rx_mode, pbwidth_t *rx_width, rmode_t *tx_mode, pbwidth_t *tx_width)
+{
+		int status;
+
+		status = icom_set_vfo(rig, RIG_VFO_B);
+		status |= icom_get_mode(rig, RIG_VFO_CURR, tx_mode, tx_width);
+		status |= icom_set_vfo(rig, RIG_VFO_A);
+		status |= icom_get_mode(rig, RIG_VFO_CURR, rx_mode, rx_width);
+
+		return status;
+}
+
+
 /*
  * icom_set_split
  * Assumes rig!=NULL, rig->state.priv!=NULL

icom/icom.h

@@ -6,7 +6,7 @@
  * via serial interface to an ICOM using the "CI-V" interface.
  *
  *
- *    $Id: icom.h,v 1.16 2001-03-04 13:03:41 f4cfe Exp $  
+ *    $Id: icom.h,v 1.17 2001-04-28 12:38:02 f4cfe Exp $  
  *
  *
  * This program is free software; you can redistribute it and/or
@@ -81,6 +81,8 @@ int icom_set_rptr_offs(RIG *rig, vfo_t vfo, shortfreq_t rptr_offs);
 int icom_get_rptr_offs(RIG *rig, vfo_t vfo, shortfreq_t *rptr_offs);
 int icom_set_split_freq(RIG *rig, vfo_t vfo, freq_t rx_freq, freq_t tx_freq);
 int icom_get_split_freq(RIG *rig, vfo_t vfo, freq_t *rx_freq, freq_t *tx_freq);
+int icom_set_split_mode(RIG *rig, vfo_t vfo, rmode_t rx_mode, pbwidth_t rx_width, rmode_t tx_mode, pbwidth_t tx_width);
+int icom_get_split_mode(RIG *rig, vfo_t vfo, rmode_t *rx_mode, pbwidth_t *rx_width, rmode_t *tx_mode, pbwidth_t *tx_width);
 int icom_set_split(RIG *rig, vfo_t vfo, split_t split);
 int icom_get_split(RIG *rig, vfo_t vfo, split_t *split);
 int icom_set_ts(RIG *rig, vfo_t vfo, shortfreq_t ts);