Add DF9GR's ERC model to rotorez backend. Implemented custom get_position for ERC,

custom dcu1_rot_stop() for DCU-1/ERC, and overloaded rotorez_rot_stop() as .reset 
for DCU-1/ERC.



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

include/hamlib/rotlist.h

@@ -123,11 +123,18 @@
  *  The Rotor-EZ backend can be used with rotators that support the
  *  DCU command set by Hy-Gain (currently the DCU-1).
  */
+/*! \def ROT_MODEL_ERC
+ *  \brief A macro that returns the model number of the ERC backend.
+ *
+ *  The Rotor-EZ backend can be used with rotators that support the
+ *  DCU command set by DF9GR (currently the ERC).
+ */
 #define ROT_ROTOREZ 4
 #define ROT_BACKEND_ROTOREZ "rotorez"
 #define ROT_MODEL_ROTOREZ ROT_MAKE_MODEL(ROT_ROTOREZ, 1)
 #define ROT_MODEL_ROTORCARD ROT_MAKE_MODEL(ROT_ROTOREZ, 2)
 #define ROT_MODEL_DCU ROT_MAKE_MODEL(ROT_ROTOREZ, 3)
+#define ROT_MODEL_ERC ROT_MAKE_MODEL(ROT_ROTOREZ, 4)
 
 /*! \def ROT_MODEL_SARTEK1
  *  \brief A macro that returns the model number of the SARtek-1 backend.

rotorez/rotorez.c

@@ -6,7 +6,7 @@
  * This shared library provides an API for communicating
  * via serial interface to a Hy-Gain or Yaesu rotor using
  * the Idiom Press Rotor-EZ or RotorCard interface.  It also
- * supports the Hy-Gain DCU-1.
+ * supports the Hy-Gain DCU-1, and DF9GR ERC.
  *
  * Rotor-EZ is a trademark of Idiom Press
  * Hy-Gain is a trademark of MFJ Enterprises
@@ -14,9 +14,6 @@
  * Tested on a HAM-IV with the Rotor-EZ V1.4S interface installed.
  *
  *
- *    $Id: rotorez.c,v 1.14 2009-01-25 16:14:39 fillods Exp $
- *
- *
  *  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
@@ -178,7 +175,6 @@ const struct rot_caps rotorcard_rot_caps = {
 	.set_conf =			rotorez_rot_set_conf,
 	.get_info =			rotorez_rot_get_info,
 
-
 };
 
 
@@ -216,10 +212,60 @@ const struct rot_caps dcu_rot_caps = {
 	.rot_init =			rotorez_rot_init,
 	.rot_cleanup =		rotorez_rot_cleanup,
 	.set_position =		rotorez_rot_set_position,
+	.stop =				dcu1_rot_stop,
+	.reset =			rotorez_rot_stop,		/* Not a typo! */
 	.get_info =			rotorez_rot_get_info,
 
 };
 
+
+/*
+ * Rotor capabilities for DF9GR ERC
+ *
+ * TODO: Learn of additional capabilities of the ERC
+ */
+
+const struct rot_caps erc_rot_caps = {
+	.rot_model =		ROT_MODEL_ERC,
+	.model_name =		"ERC",
+	.mfg_name =			"DF9GR",
+	.version =			"0.1",
+	.copyright =		"LGPL",
+	.status =			RIG_STATUS_UNTESTED,
+	.rot_type =			ROT_TYPE_OTHER,
+	.port_type =		RIG_PORT_SERIAL,
+	.serial_rate_min =	4800,
+	.serial_rate_max =	4800,
+	.serial_data_bits =	8,
+	.serial_stop_bits =	1,
+	.serial_parity =	RIG_PARITY_NONE,
+	.serial_handshake =	RIG_HANDSHAKE_NONE,
+	.write_delay =		0,
+	.post_write_delay =	500,
+	.timeout =			1500,
+	.retry =			2,
+
+	.min_az =			0,
+	.max_az =			360,
+	.min_el =			0,
+	.max_el =			0,
+
+	.priv =				NULL,	/* priv */
+//	.cfgparams =		rotorez_cfg_params,
+
+	.rot_init =			rotorez_rot_init,
+	.rot_cleanup =		rotorez_rot_cleanup,
+	.set_position =		rotorez_rot_set_position,
+	.get_position =		erc_rot_get_position,
+	.stop =				dcu1_rot_stop,
+	.reset =			rotorez_rot_stop,		/* Not a typo! */
+//	.stop =				rotorez_rot_stop,
+//	.set_conf =			rotorez_rot_set_conf,
+	.get_info =			rotorez_rot_get_info,
+
+};
+
+
 /* ************************************
  *
  * API functions
@@ -341,8 +387,8 @@ static int rotorez_rot_get_position(ROT *rot, azimuth_t *azimuth, elevation_t *e
 
 		/* The azimuth string should be ';xxx' beginning at offset 0.  If the
 		 * ';' is not there, it's likely the RotorEZ has received an invalid
-     * command and the buffer needs to be flushed.  See rotorez_flush_buffer()
+		 * command and the buffer needs to be flushed.  See
-     * definition below for a complete description.
+		 * rotorez_flush_buffer() definition below for a complete description.
 		 */
 		if (az[0] != ';') {
 			err = rotorez_flush_buffer(rot);
@@ -387,7 +433,80 @@ static int rotorez_rot_get_position(ROT *rot, azimuth_t *azimuth, elevation_t *e
 
 
 /*
- * Stop rotation
+ * Get position for ERC
+ * Returns current azimuth position in whole degrees.
+ * Range returned from ERC is an integer, 0 to 359 degrees
+ * Elevation is set to 0
+ */
+
+static int erc_rot_get_position(ROT *rot, azimuth_t *azimuth, elevation_t *elevation) {
+	struct rot_state *rs;
+	char cmdstr[5] = "AI1;";
+	char az[5];			/* read azimuth string */
+	char *p;
+	azimuth_t tmp = 0;
+	int err;
+
+	rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
+
+	if (!rot)
+		return -RIG_EINVAL;
+
+	do {
+		err = rotorez_send_priv_cmd(rot, cmdstr);
+		if (err != RIG_OK)
+		  return err;
+
+		rs = &rot->state;
+
+		err = read_block(&rs->rotport, az, AZ_READ_LEN);
+		if (err != AZ_READ_LEN)
+		  return -RIG_ETRUNC;
+
+		/* The azimuth string returned by the ERC should be 'xxx;'
+		 * beginning at offset 0.
+		 */
+
+		/* Check if remaining chars are digits if az[3] == ';' */
+		if (az[3] == ';') {
+			for (p = az; p < az + 3; p++)
+				if (isdigit(*p))
+					continue;
+				else
+					err = -RIG_EINVAL;
+		}
+	} while (err == -RIG_EINVAL);
+
+	/*
+	 * ERC returns a four octet string consisting of three octets followed
+	 * by ';' containing the rotor's position in degrees.  The
+	 * semi-colon is ignored when passing the string to atof().
+	 */
+	az[4] = 0x00;				/* NULL terminated string */
+	p = az;						/* advance past leading ';' */
+	tmp = (azimuth_t)atof(p);
+	rig_debug(RIG_DEBUG_TRACE, "%s: \"%s\" after conversion = %.1f\n",
+				__func__, p, tmp);
+
+	if (tmp == 360)
+		tmp = 0;
+	else if (tmp < 0 || tmp > 359)
+		return -RIG_EINVAL;
+
+	*azimuth = tmp;
+	*elevation = 0;				/* ERC does not support elevation */
+	rig_debug(RIG_DEBUG_TRACE,
+				"%s: azimuth = %.1f deg; elevation = %.1f deg\n",
+				__func__, *azimuth, *elevation);
+
+	return RIG_OK;
+}
+
+
+/*
+ * Stop rotation on RotorEZ, reset on DCU-1
+ *
+ * Sending the ";" string will stop rotation on the RotorEZ and reset the DCU-1
  */
 
 static int rotorez_rot_stop(ROT *rot) {
@@ -407,6 +526,27 @@ static int rotorez_rot_stop(ROT *rot) {
 }
 
 
+/*
+ * Stop rotation on DCU-1
+ */
+
+static int dcu1_rot_stop(ROT *rot) {
+	char cmdstr[5] = "AS1;";
+	int err;
+
+	rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
+
+	if (!rot)
+		return -RIG_EINVAL;
+
+	err = rotorez_send_priv_cmd(rot, cmdstr);
+	if (err != RIG_OK)
+		return err;
+
+	return RIG_OK;
+}
+
+
 /*
  * Send configuration character
  *
@@ -421,8 +561,7 @@ static int rotorez_rot_set_conf(ROT *rot, token_t token, const char *val) {
 	int err;
 
 	rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
-    rig_debug(RIG_DEBUG_TRACE, "%s: token = %d, *val = %c\n",
+	rig_debug(RIG_DEBUG_TRACE, "%s: token = %d, *val = %c\n", __func__, token, *val);
-              __func__, token, *val);
 
 	if (!rot)
 		return -RIG_EINVAL;
@@ -560,6 +699,7 @@ DECLARE_INITROT_BACKEND(rotorez)
 	rot_register(&rotorez_rot_caps);
 	rot_register(&rotorcard_rot_caps);
 	rot_register(&dcu_rot_caps);
+	rot_register(&erc_rot_caps);
 
 	return RIG_OK;
 }

rotorez/rotorez.h

@@ -38,6 +38,7 @@
 extern const struct rot_caps rotorez_rot_caps;
 extern const struct rot_caps rotorcard_rot_caps;
 extern const struct rot_caps dcu_rot_caps;
+extern const struct rot_caps erc_rot_caps;
 
 /*
  * Tokens used by rotorez_rot_set_conf and the 'C' command in rotctl
@@ -59,8 +60,10 @@ static int rotorez_rot_cleanup(ROT *rot);
 
 static int rotorez_rot_set_position(ROT *rot, azimuth_t azimuth, elevation_t elevation);
 static int rotorez_rot_get_position(ROT *rot, azimuth_t *azimuth, elevation_t *elevation);
+static int erc_rot_get_position(ROT *rot, azimuth_t *azimuth, elevation_t *elevation);
 
 static int rotorez_rot_stop(ROT *rot);
+static int dcu1_rot_stop(ROT *rot);
 
 static int rotorez_rot_set_conf(ROT *rot, token_t token, const char *val);