Skip to content

Commit 565fa4c

Browse files
tehmazetehmaze
committed
Added HAMLib support for PTT control
1 parent b14f1d0 commit 565fa4c

File tree

5 files changed

+210
-8
lines changed

5 files changed

+210
-8
lines changed

‎Makefile.linux

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,11 @@ LDLIBS += -lasound
204204
#LDLIBS += -lgps
205205

206206

207+
# Uncomment following lines to enable hamlib support.
208+
CFLAGS += -DUSE_HAMLIB
209+
LDLIBS += -lhamlib
210+
211+
207212
# Name of current directory.
208213
# Used to generate zip file name for distribution.
209214

‎audio.h

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@
1212
#ifndef AUDIO_H
1313
#define AUDIO_H 1
1414

15+
#ifdef USE_HAMLIB
16+
#include <hamlib/rig.h>
17+
#endif
18+
1519
#include "direwolf.h" /* for MAX_CHANS used throughout the application. */
1620
#include "ax25_pad.h" /* for AX25_MAX_ADDR_LEN */
1721

@@ -25,7 +29,8 @@ enum ptt_method_e {
2529
PTT_METHOD_NONE, /* VOX or no transmit. */
2630
PTT_METHOD_SERIAL, /* Serial port RTS or DTR. */
2731
PTT_METHOD_GPIO, /* General purpose I/O, Linux only. */
28-
PTT_METHOD_LPT }; /* Parallel printer port, Linux only. */
32+
PTT_METHOD_LPT, /* Parallel printer port, Linux only. */
33+
PTT_METHOD_HAMLIB }; /* HAMLib, Linux only. */
2934

3035
typedef enum ptt_method_e ptt_method_t;
3136

@@ -175,13 +180,14 @@ struct audio_s {
175180

176181
#define OCTYPE_PTT 0
177182
#define OCTYPE_DCD 1
178-
#define OCTYPE_FUTURE 2
183+
#define OCTYPE_RIG 2
184+
#define OCTYPE_FUTURE 3
179185

180-
#define NUM_OCTYPES 3 /* number of values above */
186+
#define NUM_OCTYPES 4 /* number of values above */
181187

182188
struct {
183189

184-
ptt_method_t ptt_method; /* none, serial port, GPIO, LPT. */
190+
ptt_method_t ptt_method; /* none, serial port, GPIO, LPT, HAMLIB. */
185191

186192
char ptt_device[20]; /* Serial device name for PTT. e.g. COM1 or /dev/ttyS0 */
187193

@@ -196,6 +202,10 @@ struct audio_s {
196202
int ptt_invert; /* Invert the output. */
197203
int ptt_invert2; /* Invert the secondary output. */
198204

205+
#ifdef USE_HAMLIB
206+
int ptt_rig; /* HAMLib rig. */
207+
#endif
208+
199209
} octrl[NUM_OCTYPES];
200210

201211
/* Transmit timing. */
@@ -224,6 +234,11 @@ struct audio_s {
224234

225235
} achan[MAX_CHANS];
226236

237+
#ifdef USE_HAMLIB
238+
int rigs; /* Total number of configured rigs */
239+
RIG *rig[MAX_RIGS]; /* HAMLib rig instances */
240+
#endif
241+
227242
};
228243

229244

@@ -299,7 +314,6 @@ struct audio_s {
299314
* Use one or the other depending on the platform.
300315
*/
301316

302-
303317
int audio_open (struct audio_s *pa);
304318

305319
int audio_get (int a); /* a = audio device, 0 for first */

‎config.c

Lines changed: 100 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,10 @@
4646
#include <pthread.h>
4747
#endif
4848

49+
#ifdef USE_HAMLIB
50+
#include <hamlib/rig.h>
51+
#endif
52+
4953
#include "ax25_pad.h"
5054
#include "textcolor.h"
5155
#include "audio.h"
@@ -489,6 +493,10 @@ void config_init (char *fname, struct audio_s *p_audio_config,
489493
int line;
490494
int channel;
491495
int adevice;
496+
#if USE_HAMLIB
497+
RIG *rig;
498+
int rigs = 0;
499+
#endif
492500

493501
#if DEBUG
494502
text_color_set(DW_COLOR_DEBUG);
@@ -1367,6 +1375,24 @@ void config_init (char *fname, struct audio_s *p_audio_config,
13671375
dw_printf ("Config file line %d: %s with LPT is only available on x86 Linux.\n", line, otname);
13681376
#endif
13691377
}
1378+
else if (strcasecmp(t, "RIG") == 0) {
1379+
#ifdef USE_HAMLIB
1380+
p_audio_config->achan[channel].octrl[ot].ptt_method = PTT_METHOD_HAMLIB;
1381+
1382+
t = strtok (NULL, " ,\t\n\r");
1383+
if (t == NULL) {
1384+
text_color_set(DW_COLOR_ERROR);
1385+
dw_printf ("Config file line %d: Missing RIG number.\n", line);
1386+
continue;
1387+
}
1388+
1389+
p_audio_config->achan[channel].octrl[ot].ptt_rig = atoi(t);
1390+
1391+
#else
1392+
text_color_set(DW_COLOR_ERROR);
1393+
dw_printf ("Config file line %d: %s with RIG is only available when hamlib support is enabled.\n", line, otname);
1394+
#endif
1395+
}
13701396
else {
13711397

13721398
/* serial port case. */
@@ -1451,6 +1477,80 @@ void config_init (char *fname, struct audio_s *p_audio_config,
14511477
} /* end of PTT */
14521478

14531479

1480+
/*
1481+
* RIG - HAMLib rig configuration.
1482+
*
1483+
* xxx port model
1484+
*
1485+
* For example a Yeasu FT-817 on /dev/ttyUSB0:
1486+
* RIG /dev/ttyUSB0 120
1487+
*
1488+
* For example rigctld on localhost:
1489+
* RIG 127.0.0.1:4532 2
1490+
*/
1491+
1492+
else if (strcasecmp(t, "RIG") == 0) {
1493+
#ifdef USE_HAMLIB
1494+
int n;
1495+
hamlib_port_t port;
1496+
rig_model_t rig_model;
1497+
1498+
if (rigs == MAX_RIGS) {
1499+
text_color_set(DW_COLOR_ERROR);
1500+
dw_printf ("Config file line %d: Maximum number of rigs reached.\n", line);
1501+
continue;
1502+
}
1503+
1504+
t = strtok (NULL, " ,\t\n\r");
1505+
if (t == NULL) {
1506+
text_color_set(DW_COLOR_ERROR);
1507+
dw_printf ("Config file line %d: Missing port, model[, key=value].\n",
1508+
line);
1509+
continue;
1510+
}
1511+
1512+
strncpy (port.pathname, t, FILPATHLEN - 1);
1513+
1514+
t = strtok (NULL, " ,\t\n\r");
1515+
if (t == NULL) {
1516+
text_color_set(DW_COLOR_ERROR);
1517+
dw_printf ("Config file line %d: Missing model[, key=value]\n", line);
1518+
continue;
1519+
}
1520+
1521+
if (strcasecmp(t, "AUTO") == 0) {
1522+
rig_load_all_backends();
1523+
rig_model = rig_probe(&port);
1524+
}
1525+
else {
1526+
rig_model = atoi(t);
1527+
}
1528+
1529+
rig = rig_init(rig_model);
1530+
if (!rig) {
1531+
text_color_set(DW_COLOR_ERROR);
1532+
dw_printf ("Config file line %d: Unknown rig %d, please check riglist.h.\n", line, rig_model);
1533+
continue;
1534+
}
1535+
1536+
strncpy (rig->state.rigport.pathname, port.pathname, FILPATHLEN - 1);
1537+
n = rig_open(rig);
1538+
if (n != RIG_OK) {
1539+
text_color_set(DW_COLOR_ERROR);
1540+
dw_printf ("Config file line %d: Rig open error %d: %s\n", line, n, rigerror(n));
1541+
continue;
1542+
}
1543+
1544+
p_audio_config->rig[rigs++] = rig;
1545+
p_audio_config->rigs = rigs;
1546+
1547+
#else
1548+
text_color_set(DW_COLOR_ERROR);
1549+
dw_printf ("Config file line %d: RIG is only available when hamlib support is enabled.\n", line);
1550+
continue;
1551+
#endif
1552+
}
1553+
14541554
/*
14551555
* DWAIT - Extra delay for receiver squelch.
14561556
*/

‎direwolf.h

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,14 @@
3131

3232
#define MAX_CHANS ((MAX_ADEVS) * 2)
3333

34+
/*
35+
* Maximum number of rigs.
36+
*/
37+
38+
#ifdef USE_HAMLIB
39+
#define MAX_RIGS MAX_CHANS
40+
#endif
41+
3442
/*
3543
* Get audio device number for given channel.
3644
* and first channel for given device.
@@ -158,4 +166,4 @@ typedef pthread_mutex_t dw_mutex_t;
158166

159167

160168

161-
#endif /* ifndef DIREWOLF_H */
169+
#endif /* ifndef DIREWOLF_H */

‎ptt.c

Lines changed: 77 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,7 @@ void ptt_set_debug(int debug)
121121
* PTT_METHOD_SERIAL - serial (com) port.
122122
* PTT_METHOD_GPIO - general purpose I/O.
123123
* PTT_METHOD_LPT - Parallel printer port.
124+
* PTT_METHOD_HAMLIB - HAMLib rig control.
124125
*
125126
* ptt_device Name of serial port device.
126127
* e.g. COM1 or /dev/ttyS0.
@@ -173,6 +174,7 @@ void ptt_init (struct audio_s *audio_config_p)
173174

174175
strcpy (otnames[OCTYPE_PTT], "PTT");
175176
strcpy (otnames[OCTYPE_DCD], "DCD");
177+
strcpy (otnames[OCTYPE_RIG], "RIG");
176178
strcpy (otnames[OCTYPE_FUTURE], "FUTURE");
177179

178180

@@ -314,7 +316,7 @@ void ptt_init (struct audio_s *audio_config_p)
314316
#else
315317

316318
/*
317-
* Does any of them use GPIO?
319+
* Does any of them use GPIO or HAMLIB?
318320
*/
319321

320322
using_gpio = 0;
@@ -561,6 +563,36 @@ void ptt_init (struct audio_s *audio_config_p)
561563

562564
#endif /* x86 Linux */
563565

566+
#ifdef USE_HAMLIB
567+
for (ch = 0; ch < MAX_CHANS; ch++) {
568+
if (save_audio_config_p->achan[ch].valid) {
569+
int ot, retcode;
570+
RIG *rig;
571+
freq_t freq;
572+
573+
for (ot = 0; ot < NUM_OCTYPES; ot++) {
574+
if (audio_config_p->achan[ch].octrl[ot].ptt_method == PTT_METHOD_HAMLIB) {
575+
if (audio_config_p->achan[ch].octrl[ot].ptt_rig - 1 >= audio_config_p->rigs) {
576+
text_color_set(DW_COLOR_ERROR);
577+
dw_printf ("Error: RIG %d not available.\n", audio_config_p->achan[ch].octrl[ot].ptt_rig);
578+
audio_config_p->achan[ch].octrl[ot].ptt_method = PTT_METHOD_NONE;
579+
}
580+
581+
rig = audio_config_p->rig[audio_config_p->achan[ch].octrl[ot].ptt_rig];
582+
retcode = rig_get_freq(rig, RIG_VFO_CURR, &freq);
583+
if (retcode == RIG_OK) {
584+
text_color_set(DW_COLOR_INFO);
585+
dw_printf ("RIG tuned on %"PRIfreq"\n", freq);
586+
} else {
587+
text_color_set(DW_COLOR_ERROR);
588+
dw_printf ("RIG rig_get_freq error %s, PTT probably will not work\n", rigerror(retcode));
589+
}
590+
}
591+
}
592+
}
593+
}
594+
#endif
595+
564596

565597
/* Why doesn't it transmit? Probably forgot to specify PTT option. */
566598

@@ -586,7 +618,7 @@ void ptt_init (struct audio_s *audio_config_p)
586618
* probably be renamed something like octrl_set.
587619
*
588620
* Inputs: ot - Output control type:
589-
* OCTYPE_PTT, OCTYPE_DCD, OCTYPE_FUTURE
621+
* OCTYPE_PTT, OCTYPE_DCD, OCTYPE_HAMLIB, OCTYPE_FUTURE
590622
*
591623
* chan - channel, 0 .. (number of channels)-1
592624
*
@@ -758,6 +790,24 @@ void ptt_set (int ot, int chan, int ptt_signal)
758790

759791
#endif /* x86 Linux */
760792

793+
#ifdef USE_HAMLIB
794+
/*
795+
* Using hamlib?
796+
*/
797+
798+
if (save_audio_config_p->achan[chan].octrl[ot].ptt_method == PTT_METHOD_HAMLIB) {
799+
int retcode;
800+
RIG *rig = save_audio_config_p->rig[save_audio_config_p->achan[chan].octrl[ot].ptt_rig];
801+
802+
if ((retcode = rig_set_ptt(rig, RIG_VFO_CURR, ptt ? RIG_PTT_ON : RIG_PTT_OFF)) != RIG_OK) {
803+
text_color_set(DW_COLOR_ERROR);
804+
dw_printf ("Error sending rig_set_ptt command for channel %d %s\n", chan, otnames[ot]);
805+
dw_printf ("%s\n", rigerror(retcode));
806+
}
807+
}
808+
809+
#endif
810+
761811

762812
} /* end ptt_set */
763813

@@ -803,6 +853,31 @@ void ptt_term (void)
803853
}
804854
}
805855
}
856+
857+
#ifdef USE_HAMLIB
858+
for (n = 0; n < save_audio_config_p->rigs; n++) {
859+
RIG *rig = save_audio_config_p->rig[n];
860+
int retcode;
861+
862+
if ((retcode = rig_set_ptt(rig, RIG_VFO_CURR, RIG_PTT_OFF)) != RIG_OK) {
863+
text_color_set(DW_COLOR_ERROR);
864+
dw_printf ("Error sending rig_set_ptt command for rig %d\n", n);
865+
dw_printf ("%s\n", rigerror(retcode));
866+
}
867+
868+
if ((retcode = rig_close(rig)) != RIG_OK) {
869+
text_color_set(DW_COLOR_ERROR);
870+
dw_printf ("Error sending rig_close command for rig %d\n", n);
871+
dw_printf ("%s\n", rigerror(retcode));
872+
}
873+
874+
if ((retcode = rig_cleanup(rig)) != RIG_OK) {
875+
text_color_set(DW_COLOR_ERROR);
876+
dw_printf ("Error sending rig_cleanup command for rig %d\n", n);
877+
dw_printf ("%s\n", rigerror(retcode));
878+
}
879+
}
880+
#endif
806881
}
807882

808883

0 commit comments

Comments
 (0)