[Hamlib-cvs-digest] CVS: hamlib/src misc.c,1.17,1.18

[Dale E. E. <de...@us...>]

Update of /cvsroot/hamlib/hamlib/src
In directory usw-pr-cvs1:/tmp/cvs-serv10444/hamlib/src

Modified Files:
	misc.c 
Log Message:
Added working TS-2000 files.  There are some changes left out but this
is the minimum I could commit and have a functional rig.  The cost is
that I've broken kylix and others that duplicate rig.h.  I'm in the
process of repairing the damage.  Please be patient.  I hope a day or so,
but am asking for up to a week.  E-mail me about *anything* you find
broken.  Kylix (and similar) is (are) known to not work.


Index: misc.c
===================================================================
RCS file: /cvsroot/hamlib/hamlib/src/misc.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** misc.c	17 Jun 2002 20:59:51 -0000	1.17
--- misc.c	30 Jun 2002 10:17:03 -0000	1.18
***************
*** 254,258 ****
  		}
  
! 		return sprintf (str, "%g%s", f, hz);
  }
  
--- 254,258 ----
  		}
  
! 		return sprintf (str, "%g %s", f, hz);
  }
  
***************
*** 268,275 ****
--- 268,280 ----
  	case RIG_MODE_WFM: return "WFM";
  	case RIG_MODE_NONE: return "";
+ 	default:
  	}
  	return NULL;
  }
  
+ /*
+  * shouldn't this use the same table as parse_vfo()?
+  * It already caused me one bug.  :)		--Dale
+  */
  const char *strvfo(vfo_t vfo)
  {
***************
*** 293,296 ****
--- 298,315 ----
  	case	RIG_VFO_SUB:
  			return "Sub";
+ 	case	RIG_CTRL_SAT:
+ 			return "SAT";
+ 	case	RIG_VFO_MEM_A:
+ 			return "MEMA";
+ 	case	RIG_VFO_MEM_C:
+ 			return "MEMC";
+ 	case	RIG_VFO_CALL_A:
+ 			return "CALLA";
+ 	case	RIG_VFO_CALL_C:
+ 			return "CALLC";
+ 	case	RIG_VFO_AB:
+ 			return "VFOAB";
+ 	case	RIG_VFO_BA:
+ 			return "VFOBA";
  	}
  	return NULL;
***************
*** 330,333 ****
--- 349,353 ----
  
  	case RIG_FUNC_NONE: return "";
+ 	default:
  	}
  	return NULL;
***************
*** 367,370 ****
--- 387,391 ----
  
  	case RIG_LEVEL_NONE: return "";
+ 	default:
  	}
  	return NULL;
***************
*** 382,385 ****
--- 403,407 ----
  
  	case RIG_PARM_NONE: return "";
+ 	default:
  	}
  	return NULL;
***************
*** 393,396 ****
--- 415,419 ----
  
  	case RIG_RPT_SHIFT_NONE: return "None";
+ 	default:
  	}
  	return NULL;
***************
*** 413,428 ****
  
  	case RIG_OP_NONE: return "";
  	}
  	return NULL;
  }
  
! const char *strscan(scan_t scan)
  {
! 	switch (scan) {
  	case RIG_SCAN_STOP: return "STOP";
  	case RIG_SCAN_MEM: return "MEM";
  	case RIG_SCAN_SLCT: return "SLCT";
  	case RIG_SCAN_PRIO: return "PRIO";
  	case RIG_SCAN_DELTA: return "DELTA";
  	}
  	return NULL;
--- 436,455 ----
  
  	case RIG_OP_NONE: return "";
+ 	default:
  	}
  	return NULL;
  }
  
! const char *strscan(scan_t rscan)
  {
! 	switch (rscan) {
  	case RIG_SCAN_STOP: return "STOP";
  	case RIG_SCAN_MEM: return "MEM";
  	case RIG_SCAN_SLCT: return "SLCT";
  	case RIG_SCAN_PRIO: return "PRIO";
+ 	case RIG_SCAN_PROG: return "PROG";
  	case RIG_SCAN_DELTA: return "DELTA";
+ 	case RIG_SCAN_VFO: return "VFO";
+ 	default:
  	}
  	return NULL;
***************
*** 548,561 ****
  
  
! int sprintf_scan(char *str, scan_t scan)
  {
  		int i, len=0;
  
  		*str = '\0';
! 		if (scan == RIG_SCAN_NONE)
  				return 0;
  
  		for (i = 0; i < 30; i++) {
! 				const char *ms = strscan(scan & (1UL<<i));
  				if (!ms || !ms[0])
  						continue;	/* unknown, FIXME! */
--- 575,588 ----
  
  
! int sprintf_scan(char *str, scan_t rscan)
  {
  		int i, len=0;
  
  		*str = '\0';
! 		if (rscan == RIG_SCAN_NONE)
  				return 0;
  
  		for (i = 0; i < 30; i++) {
! 				const char *ms = strscan(rscan & (1UL<<i));
  				if (!ms || !ms[0])
  						continue;	/* unknown, FIXME! */
***************
*** 601,610 ****
  		{ RIG_VFO_B, "VFOB" },
  		{ RIG_VFO_C, "VFOC" },
! 		{ RIG_VFO_CURR, "currVFO" },
! 		{ RIG_VFO_ALL, "allVFO" },
! 		{ RIG_VFO_MEM, "MEM" },
! 		{ RIG_VFO_VFO, "VFO" },
  		{ RIG_VFO_MAIN, "Main" },
  		{ RIG_VFO_SUB, "Sub" },
  		{ RIG_VFO_NONE, NULL },
  };
--- 628,645 ----
  		{ RIG_VFO_B, "VFOB" },
  		{ RIG_VFO_C, "VFOC" },
! 		{ RIG_VFO_AB, "VFOAB" },
! 		{ RIG_VFO_BA, "VFOBA" },
! 		{ RIG_VFO_MEM_A, "MEMA" },
! 		{ RIG_VFO_MEM_C, "MEMC" },
! 		{ RIG_CTRL_SAT, "SAT" },
! 		{ RIG_VFO_CALL_A, "CALLA" },
! 		{ RIG_VFO_CALL_C, "CALLC" },
  		{ RIG_VFO_MAIN, "Main" },
  		{ RIG_VFO_SUB, "Sub" },
+ // one or more of the following may be ambiguous	--Dale
+ 		{ RIG_VFO_CURR, "currVFO" },
+ 		{ RIG_VFO_VFO, "VFO" },
+ 		{ RIG_VFO_MEM, "MEM" },
+ //		{ RIG_VFO_ALL, "allVFO" },
  		{ RIG_VFO_NONE, NULL },
  };
***************
*** 762,766 ****
  
  static struct { 
! 		scan_t scan;
  		const char *str;
  } scan_str[] = {
--- 797,801 ----
  
  static struct { 
! 		scan_t SCan;
  		const char *str;
  } scan_str[] = {
***************
*** 769,773 ****
--- 804,810 ----
  	{ RIG_SCAN_SLCT, "SLCT" },
  	{ RIG_SCAN_PRIO, "PRIO" },
+ 	{ RIG_SCAN_PROG, "PROG" },
  	{ RIG_SCAN_DELTA, "DELTA" },
+ 	{ RIG_SCAN_VFO, "VFO" },
  	{ RIG_SCAN_NONE, NULL },
  };
***************
*** 777,783 ****
  	int i;
  
! 	for (i=0 ; scan_str[i].str != NULL; i++)
! 			if (!strcmp(s, scan_str[i].str))
! 					return scan_str[i].scan;
  	return RIG_SCAN_NONE;
  }
--- 814,825 ----
  	int i;
  
! 	printf(__FUNCTION__": parsing %s...\n",s);
! 
! 	for (i=0 ; scan_str[i].str != NULL; i++) {
! 		if (strcmp(s, scan_str[i].str) == 0) {
! 			return scan_str[i].SCan;
! 		}
! 	}
! 
  	return RIG_SCAN_NONE;
  }
***************
*** 785,794 ****
  rptr_shift_t parse_rptr_shift(const char *s)
  {
! 	if (!strcmp(s, "+"))
! 			return RIG_RPT_SHIFT_PLUS;
! 	else if (!strcmp(s, "-"))
! 			return RIG_RPT_SHIFT_MINUS;
  	else
! 			return RIG_RPT_SHIFT_NONE;
  }
  
--- 827,838 ----
  rptr_shift_t parse_rptr_shift(const char *s)
  {
! 	if (strcmp(s, "+") == 0)
! 		return RIG_RPT_SHIFT_PLUS;
! 	else if (strcmp(s, "-") == 0)
! 		return RIG_RPT_SHIFT_MINUS;
! 	else if (strcmp(s, "=") == 0)
! 		return RIG_RPT_SHIFT_1750;
  	else
! 		return RIG_RPT_SHIFT_NONE;
  }