Rewrite, test, and document hamlib interface for PTT.

	modified:   audio.h
	modified:   config.c
	modified:   direwolf.c
	modified:   man1/direwolf.1
	modified:   ptt.c

Author: wb2osz

audio.h

@@ -182,6 +182,7 @@ struct audio_s {
 	        ptt_method_t ptt_method; /* none, serial port, GPIO, LPT, HAMLIB. */
 
 	        char ptt_device[20];	/* Serial device name for PTT.  e.g. COM1 or /dev/ttyS0 */
+					/* Also used for HAMLIB.  Could be host:port when model is 1. */
 
 	        ptt_line_t ptt_line;	/* Control line when using serial port. PTT_LINE_RTS, PTT_LINE_DTR. */
 	        ptt_line_t ptt_line2;	/* Optional second one:  PTT_LINE_NONE when not used. */
@@ -195,7 +196,8 @@ struct audio_s {
 	        int ptt_invert2;	/* Invert the secondary output. */
 
 #ifdef USE_HAMLIB
-            int ptt_rig;        /* HAMLib rig. */
+
+	        int ptt_model;		/* HAMLIB model.  -1 for AUTO.  2 for rigctld.  Others are radio model. */
 #endif
 
 	    } octrl[NUM_OCTYPES];

config.c

@@ -1,7 +1,7 @@
 //
 //    This file is part of Dire Wolf, an amateur radio packet TNC.
 //
-//    Copyright (C) 2011, 2012, 2013, 2014, 2015  John Langner, WB2OSZ
+//    Copyright (C) 2011, 2012, 2013, 2014, 2015, 2016  John Langner, WB2OSZ
 //
 //    This program is free software: you can redistribute it and/or modify
 //    it under the terms of the GNU General Public License as published by
@@ -46,9 +46,6 @@
 #include <gps.h>		/* for DEFAULT_GPSD_PORT  (2947) */
 #endif
 
-#ifdef USE_HAMLIB
-#include <hamlib/rig.h>
-#endif
 
 #include "ax25_pad.h"
 #include "textcolor.h"
@@ -612,12 +609,6 @@ void config_init (char *fname, struct audio_s *p_audio_config,
 	int adevice;
 	int m;
 
-#if USE_HAMLIB
-	RIG *rig;
-	int rigs = 0;
-#endif
-
-
 #if DEBUG
 	text_color_set(DW_COLOR_DEBUG);
 	dw_printf ("config_init ( %s )\n", fname);
@@ -1460,6 +1451,12 @@ void config_init (char *fname, struct audio_s *p_audio_config,
  * xxx  serial-port [-]rts-or-dtr [ [-]rts-or-dtr ]
  * xxx  GPIO  [-]gpio-num
  * xxx  LPT  [-]bit-num
+ * PTT  RIG  model  port
+ * PTT  RIG  AUTO  port
+ *
+ * 		When model is 2, port would host:port like 127.0.0.1:4532
+ *		Otherwise, port would be a serial port like /dev/ttyS0
+ *
  *
  * Applies to most recent CHANNEL command.
  */
@@ -1544,16 +1541,41 @@ void config_init (char *fname, struct audio_s *p_audio_config,
 	    }
 	    else if (strcasecmp(t, "RIG") == 0) {
 #ifdef USE_HAMLIB
-	      p_audio_config->achan[channel].octrl[ot].ptt_method = PTT_METHOD_HAMLIB;
 
 	      t = split(NULL,0);
 	      if (t == NULL) {
 	        text_color_set(DW_COLOR_ERROR);
-	        dw_printf ("Config file line %d: Missing RIG number.\n", line);
+	        dw_printf ("Config file line %d: Missing model number for hamlib.\n", line);
 	        continue;
 	      }
+	      if (strcasecmp(t, "AUTO") == 0) {
+	        p_audio_config->achan[channel].octrl[ot].ptt_model = -1;
+	      }
+	      else {
+	        int n = atoi(t);
+		if (n < 1 || n > 9999) {
+	          text_color_set(DW_COLOR_ERROR);
+	          dw_printf ("Config file line %d: Unreasonable model number %d for hamlib.\n", line, n);
+	          continue;
+	        }
+	        p_audio_config->achan[channel].octrl[ot].ptt_model = n;
+	      }
+
+	      t = split(NULL,0);
+	      if (t == NULL) {
+	        text_color_set(DW_COLOR_ERROR);
+	        dw_printf ("Config file line %d: Missing port for hamlib.\n", line);
+	        continue;
+	      }
+	      strlcpy (p_audio_config->achan[channel].octrl[ot].ptt_device, t, sizeof(p_audio_config->achan[channel].octrl[ot].ptt_device));
+
+	      t = split(NULL,0);
+	      if (t != NULL) {
+	        text_color_set(DW_COLOR_ERROR);
+	        dw_printf ("Config file line %d: %s was not expected after model & port for hamlib.\n", line, t);
+	      }
 
-	      p_audio_config->achan[channel].octrl[ot].ptt_rig = atoi(t);
+	      p_audio_config->achan[channel].octrl[ot].ptt_method = PTT_METHOD_HAMLIB;
 
 #else
 	      text_color_set(DW_COLOR_ERROR);
@@ -1691,79 +1713,6 @@ void config_init (char *fname, struct audio_s *p_audio_config,
 	    }
 	  }
 
-/*
- * RIG          - HAMLib rig configuration.
- *
- * xxx port model
- *
- * For example a Yeasu FT-817 on /dev/ttyUSB0:
- * RIG /dev/ttyUSB0 120
- *
- * For example rigctld on localhost:
- * RIG 127.0.0.1:4532 2
- */
-
-      else if (strcasecmp(t, "RIG") == 0) {
-#ifdef USE_HAMLIB
-        int n;
-        hamlib_port_t port;
-        rig_model_t rig_model;
-
-        if (rigs == MAX_RIGS) {
-          text_color_set(DW_COLOR_ERROR);
-          dw_printf ("Config file line %d: Maximum number of rigs reached.\n", line);
-          continue;
-        }
-
-	t = split(NULL,0);
-	if (t == NULL) {
-	  text_color_set(DW_COLOR_ERROR);
-	  dw_printf ("Config file line %d: Missing port, model[, key=value].\n", 
-			line);
-	  continue;
-	}
-
-	strncpy (port.pathname, t, FILPATHLEN - 1);
-
-	t = split(NULL,0);
-	if (t == NULL) {
-	  text_color_set(DW_COLOR_ERROR);
-	  dw_printf ("Config file line %d: Missing model[, key=value]\n", line);
-	  continue;
-	}
-
-        if (strcasecmp(t, "AUTO") == 0) {
-          rig_load_all_backends();
-          rig_model = rig_probe(&port);
-        }
-        else {
-          rig_model = atoi(t);
-        }
-
-        rig = rig_init(rig_model);
-        if (!rig) {
-          text_color_set(DW_COLOR_ERROR);
-          dw_printf ("Config file line %d: Unknown rig %d, please check riglist.h.\n", line, rig_model);
-          continue;
-        }
-
-        strncpy (rig->state.rigport.pathname, port.pathname, FILPATHLEN - 1);
-        n = rig_open(rig);
-        if (n != RIG_OK) {
-          text_color_set(DW_COLOR_ERROR);
-          dw_printf ("Config file line %d: Rig open error %d: %s\n", line, n, rigerror(n));
-          continue;
-        }
-
-        p_audio_config->rig[rigs++] = rig;
-        p_audio_config->rigs = rigs;
-    
-#else
-        text_color_set(DW_COLOR_ERROR);
-        dw_printf ("Config file line %d: RIG is only available when hamlib support is enabled.\n", line);
-        continue;
-#endif
-      }
 
 /*
  * DWAIT 		- Extra delay for receiver squelch.

direwolf.c

@@ -67,6 +67,10 @@
 #include <netdb.h>
 #endif
 
+#if USE_HAMLIB
+#include <hamlib/rig.h>
+#endif
+
 
 #define DIREWOLF_C 1
 
@@ -185,7 +189,9 @@ int main (int argc, char *argv[])
 	int d_g_opt = 0;	/* "-d g" option for GPS. Can be repeated for more detail. */
 	int d_o_opt = 0;	/* "-d o" option for output control such as PTT and DCD. */	
 	int d_i_opt = 0;	/* "-d i" option for IGate.  Repeat for more detail */
-	
+#if USE_HAMLIB
+	int d_h_opt = 0;	/* "-d h" option for hamlib debugging.  Repeat for more detail */
+#endif
 
 	strlcpy(l_opt, "", sizeof(l_opt));
 	strlcpy(P_opt, "", sizeof(P_opt));
@@ -230,8 +236,8 @@ int main (int argc, char *argv[])
 
 	text_color_init(t_opt);
 	text_color_set(DW_COLOR_INFO);
-	//dw_printf ("Dire Wolf version %d.%d (%s) Beta Test\n", MAJOR_VERSION, MINOR_VERSION, __DATE__);
-	dw_printf ("Dire Wolf DEVELOPMENT version %d.%d %s (%s)\n", MAJOR_VERSION, MINOR_VERSION, "K", __DATE__);
+	dw_printf ("Dire Wolf version %d.%d (%s) Beta Test\n", MAJOR_VERSION, MINOR_VERSION, __DATE__);
+	//dw_printf ("Dire Wolf DEVELOPMENT version %d.%d %s (%s)\n", MAJOR_VERSION, MINOR_VERSION, "K", __DATE__);
 	//dw_printf ("Dire Wolf version %d.%d\n", MAJOR_VERSION, MINOR_VERSION);
 
 #if defined(ENABLE_GPSD) || defined(USE_HAMLIB)
@@ -453,6 +459,9 @@ int main (int argc, char *argv[])
 	      case 'i':  d_i_opt++; break;
 #if AX25MEMDEBUG
 	      case 'm':  ax25memdebug_set(); break;		// Track down memory leak.  Not documented.		
+#endif
+#if USE_HAMLIB
+	      case 'h':  d_h_opt++; break;			// Hamlib verbose level.
 #endif
 	      default: break;
 	     }
@@ -527,6 +536,10 @@ int main (int argc, char *argv[])
  * Possibly override some by command line options.
  */
 
+#if USE_HAMLIB
+        rig_set_debug(d_h_opt);
+#endif
+
 	symbols_init ();
 
 	config_init (config_file, &audio_config, &digi_config, &tt_config, &igate_config, &misc_config);
@@ -1067,6 +1080,9 @@ static void usage (char **argv)
 	dw_printf ("       t             t = Tracker beacon.\n");
 	dw_printf ("       o             o = output controls such as PTT and DCD.\n");
 	dw_printf ("       i             i = IGate.\n");
+#if USE_HAMLIB
+	dw_printf ("       h             h = hamlib increase verbose level.\n");
+#endif
 	dw_printf ("    -q             Quiet (suppress output) options:\n");
 	dw_printf ("       h             h = Heard line with the audio level.\n");
 	dw_printf ("       d             d = Decoding of APRS packets.\n");

man1/direwolf.1

@@ -84,6 +84,8 @@ t = Tracker beacon.
 o = Output controls such as PTT and DCD.
 .P
 i = IGate
+.P
+h = Hamlib verbose level.  Repeat for more.
 .RE
 .RE
 .PD