Skip to content

Commit a5d9fc3

Browse files
wb2oszwb2osz
authored
Merge branch 'dev' into gpiod
2 parents 654bf67 + 6f0c151 commit a5d9fc3

File tree

3 files changed

+88
-29
lines changed

3 files changed

+88
-29
lines changed

‎CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ project(direwolf)
44

55
# configure version
66
set(direwolf_VERSION_MAJOR "1")
7-
set(direwolf_VERSION_MINOR "7")
7+
set(direwolf_VERSION_MINOR "8")
88
set(direwolf_VERSION_PATCH "0")
99
set(direwolf_VERSION_SUFFIX "Development")
1010

‎src/config.c

+72-14
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//
22
// This file is part of Dire Wolf, an amateur radio packet TNC.
33
//
4-
// Copyright (C) 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2021 John Langner, WB2OSZ
4+
// Copyright (C) 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2021, 2023 John Langner, WB2OSZ
55
//
66
// This program is free software: you can redistribute it and/or modify
77
// it under the terms of the GNU General Public License as published by
@@ -755,12 +755,13 @@ void config_init (char *fname, struct audio_s *p_audio_config,
755755
strlcpy (p_audio_config->adev[adevice].adevice_out, DEFAULT_ADEVICE, sizeof(p_audio_config->adev[adevice].adevice_out));
756756

757757
p_audio_config->adev[adevice].defined = 0;
758+
p_audio_config->adev[adevice].copy_from = -1;
758759
p_audio_config->adev[adevice].num_channels = DEFAULT_NUM_CHANNELS; /* -2 stereo */
759760
p_audio_config->adev[adevice].samples_per_sec = DEFAULT_SAMPLES_PER_SEC; /* -r option */
760761
p_audio_config->adev[adevice].bits_per_sample = DEFAULT_BITS_PER_SAMPLE; /* -8 option for 8 instead of 16 bits */
761762
}
762763

763-
p_audio_config->adev[0].defined = 1;
764+
p_audio_config->adev[0].defined = 2; // 2 means it was done by default and not the user's config file.
764765

765766
for (channel=0; channel<MAX_CHANS; channel++) {
766767
int ot, it;
@@ -925,10 +926,13 @@ void config_init (char *fname, struct audio_s *p_audio_config,
925926

926927
p_misc_config->maxframe_extended = AX25_K_MAXFRAME_EXTENDED_DEFAULT; /* Max frames to send before ACK. mod 128 "Window" size. */
927928

928-
p_misc_config->maxv22 = AX25_N2_RETRY_DEFAULT / 3; /* Max SABME before falling back to SABM. */
929-
p_misc_config->v20_addrs = NULL; /* Go directly to v2.0 for stations listed. */
929+
p_misc_config->maxv22 = AX25_N2_RETRY_DEFAULT / 3; /* Send SABME this many times before falling back to SABM. */
930+
p_misc_config->v20_addrs = NULL; /* Go directly to v2.0 for stations listed */
931+
/* without trying v2.2 first. */
930932
p_misc_config->v20_count = 0;
931933
p_misc_config->noxid_addrs = NULL; /* Don't send XID to these stations. */
934+
/* Might work with a partial v2.2 implementation */
935+
/* on the other end. */
932936
p_misc_config->noxid_count = 0;
933937

934938
/*
@@ -1012,7 +1016,11 @@ void config_init (char *fname, struct audio_s *p_audio_config,
10121016
* ADEVICE plughw:1,0 -- same for in and out.
10131017
* ADEVICE plughw:2,0 plughw:3,0 -- different in/out for a channel or channel pair.
10141018
* ADEVICE1 udp:7355 default -- from Software defined radio (SDR) via UDP.
1015-
*
1019+
*
1020+
* New in 1.8: Ability to map to another audio device.
1021+
* This allows multiple modems (i.e. data speeds) on the same audio interface.
1022+
*
1023+
* ADEVICEn = n -- Copy from different already defined channel.
10161024
*/
10171025

10181026
/* Note that ALSA name can contain comma such as hw:1,0 */
@@ -1040,17 +1048,42 @@ void config_init (char *fname, struct audio_s *p_audio_config,
10401048
exit(EXIT_FAILURE);
10411049
}
10421050

1051+
// Do not allow same adevice to be defined more than once.
1052+
// Overriding the default for adevice 0 is ok.
1053+
// In that case definded was 2. That's why we check for 1, not just non-zero.
1054+
1055+
if (p_audio_config->adev[adevice].defined == 1) { // 1 means defined by user.
1056+
text_color_set(DW_COLOR_ERROR);
1057+
dw_printf ("Config file: ADEVICE%d can't be defined more than once. Line %d.\n", adevice, line);
1058+
continue;
1059+
}
1060+
10431061
p_audio_config->adev[adevice].defined = 1;
1044-
1045-
/* First channel of device is valid. */
1046-
p_audio_config->chan_medium[ADEVFIRSTCHAN(adevice)] = MEDIUM_RADIO;
10471062

1048-
strlcpy (p_audio_config->adev[adevice].adevice_in, t, sizeof(p_audio_config->adev[adevice].adevice_in));
1049-
strlcpy (p_audio_config->adev[adevice].adevice_out, t, sizeof(p_audio_config->adev[adevice].adevice_out));
1063+
// New case for release 1.8.
10501064

1051-
t = split(NULL,0);
1052-
if (t != NULL) {
1065+
if (strcmp(t, "=") == 0) {
1066+
t = split(NULL,0);
1067+
if (t != NULL) {
1068+
1069+
}
1070+
1071+
///////// to be continued.... FIXME
1072+
1073+
}
1074+
else {
1075+
/* First channel of device is valid. */
1076+
// This might be changed to UDP or STDIN when the device name is examined.
1077+
p_audio_config->chan_medium[ADEVFIRSTCHAN(adevice)] = MEDIUM_RADIO;
1078+
1079+
strlcpy (p_audio_config->adev[adevice].adevice_in, t, sizeof(p_audio_config->adev[adevice].adevice_in));
10531080
strlcpy (p_audio_config->adev[adevice].adevice_out, t, sizeof(p_audio_config->adev[adevice].adevice_out));
1081+
1082+
t = split(NULL,0);
1083+
if (t != NULL) {
1084+
// Different audio devices for receive and transmit.
1085+
strlcpy (p_audio_config->adev[adevice].adevice_out, t, sizeof(p_audio_config->adev[adevice].adevice_out));
1086+
}
10541087
}
10551088
}
10561089

@@ -2210,7 +2243,7 @@ void config_init (char *fname, struct audio_s *p_audio_config,
22102243
else {
22112244
p_audio_config->achan[channel].slottime = DEFAULT_SLOTTIME;
22122245
text_color_set(DW_COLOR_ERROR);
2213-
dw_printf ("Line %d: Invalid delay time for persist algorithm. Using %d.\n",
2246+
dw_printf ("Line %d: Invalid delay time for persist algorithm. Using default %d.\n",
22142247
line, p_audio_config->achan[channel].slottime);
22152248
}
22162249
}
@@ -2234,7 +2267,7 @@ void config_init (char *fname, struct audio_s *p_audio_config,
22342267
else {
22352268
p_audio_config->achan[channel].persist = DEFAULT_PERSIST;
22362269
text_color_set(DW_COLOR_ERROR);
2237-
dw_printf ("Line %d: Invalid probability for persist algorithm. Using %d.\n",
2270+
dw_printf ("Line %d: Invalid probability for persist algorithm. Using default %d.\n",
22382271
line, p_audio_config->achan[channel].persist);
22392272
}
22402273
}
@@ -2253,6 +2286,19 @@ void config_init (char *fname, struct audio_s *p_audio_config,
22532286
}
22542287
n = atoi(t);
22552288
if (n >= 0 && n <= 255) {
2289+
text_color_set(DW_COLOR_ERROR);
2290+
if (n == 0) {
2291+
dw_printf ("Line %d: Setting TXDELAY to 0 is a REALLY BAD idea if you want other stations to hear you.\n",
2292+
line);
2293+
dw_printf ("Line %d: See User Guide, \"Radio Channel - Transmit Timing\" for an explanation.\n",
2294+
line);
2295+
}
2296+
if (n >= 100) {
2297+
dw_printf ("Line %d: Keeping with tradition, going back to the 1980s, TXDELAY is in 10 millisecond units.\n",
2298+
line);
2299+
dw_printf ("Line %d: The value %d would be %.3f seconds which seems rather excessive. Are you sure you want that?\n",
2300+
line, n, (double)n * 10. / 1000.);
2301+
}
22562302
p_audio_config->achan[channel].txdelay = n;
22572303
}
22582304
else {
@@ -2277,6 +2323,18 @@ void config_init (char *fname, struct audio_s *p_audio_config,
22772323
}
22782324
n = atoi(t);
22792325
if (n >= 0 && n <= 255) {
2326+
if (n == 0) {
2327+
dw_printf ("Line %d: Setting TXTAIL to 0 is a REALLY BAD idea if you want other stations to hear you.\n",
2328+
line);
2329+
dw_printf ("Line %d: See User Guide, \"Radio Channel - Transmit Timing\" for an explanation.\n",
2330+
line);
2331+
}
2332+
if (n >= 50) {
2333+
dw_printf ("Line %d: Keeping with tradition, going back to the 1980s, TXTAIL is in 10 millisecond units.\n",
2334+
line);
2335+
dw_printf ("Line %d: The value %d would be %.3f seconds which seems rather excessive. Are you sure you want that?\n",
2336+
line, n, (double)n * 10. / 1000.);
2337+
}
22802338
p_audio_config->achan[channel].txtail = n;
22812339
}
22822340
else {

‎src/direwolf.c

+15-14
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ static int d_u_opt = 0; /* "-d u" command line option to print UTF-8 also in h
186186
static int d_p_opt = 0; /* "-d p" option for dumping packets over radio. */
187187

188188
static int q_h_opt = 0; /* "-q h" Quiet, suppress the "heard" line with audio level. */
189-
static int q_d_opt = 0; /* "-q d" Quiet, suppress the printing of decoded of APRS packets. */
189+
static int q_d_opt = 0; /* "-q d" Quiet, suppress the printing of description of APRS packets. */
190190

191191
static int A_opt_ais_to_obj = 0; /* "-A" Convert received AIS to APRS "Object Report." */
192192

@@ -302,26 +302,27 @@ int main (int argc, char *argv[])
302302
text_color_init(t_opt);
303303
text_color_set(DW_COLOR_INFO);
304304
//dw_printf ("Dire Wolf version %d.%d (%s) BETA TEST 7\n", MAJOR_VERSION, MINOR_VERSION, __DATE__);
305-
//dw_printf ("Dire Wolf DEVELOPMENT version %d.%d %s (%s)\n", MAJOR_VERSION, MINOR_VERSION, "G", __DATE__);
306-
dw_printf ("Dire Wolf version %d.%d\n", MAJOR_VERSION, MINOR_VERSION);
305+
dw_printf ("Dire Wolf DEVELOPMENT version %d.%d %s (%s)\n", MAJOR_VERSION, MINOR_VERSION, "A", __DATE__);
306+
//dw_printf ("Dire Wolf version %d.%d\n", MAJOR_VERSION, MINOR_VERSION);
307307

308308

309-
#if defined(ENABLE_GPSD) || defined(USE_HAMLIB) || defined(USE_CM108) || USE_AVAHI_CLIENT || USE_MACOS_DNSSD
309+
#if defined(ENABLE_GPSD) || defined(USE_HAMLIB) || defined(USE_CM108) || USE_AVAHI_CLIENT || USE_MACOS_DNSSD || USE_GPIOD
310310
dw_printf ("Includes optional support for: ");
311-
#if defined(ENABLE_GPSD)
311+
#if defined(ENABLE_GPSD)
312312
dw_printf (" gpsd");
313-
#endif
314-
#if defined(USE_HAMLIB)
313+
#endif
314+
#if defined(USE_HAMLIB)
315315
dw_printf (" hamlib");
316-
#endif
317-
#if defined(USE_CM108)
316+
#endif
317+
#if defined(USE_CM108)
318318
dw_printf (" cm108-ptt");
319-
#endif
320-
#if defined(USE_GPIOD)
319+
#endif
320+
#if defined(USE_GPIOD)
321321
dw_printf (" libgpiod");
322-
#if (USE_AVAHI_CLIENT|USE_MACOS_DNSSD)
322+
#endif
323+
#if (USE_AVAHI_CLIENT|USE_MACOS_DNSSD)
323324
dw_printf (" dns-sd");
324-
#endif
325+
#endif
325326
dw_printf ("\n");
326327
#endif
327328

@@ -1710,7 +1711,7 @@ static void usage (char **argv)
17101711
dw_printf (" d d = APRStt (DTMF to APRS object translation).\n");
17111712
dw_printf (" -q Quiet (suppress output) options:\n");
17121713
dw_printf (" h h = Heard line with the audio level.\n");
1713-
dw_printf (" d d = Decoding of APRS packets.\n");
1714+
dw_printf (" d d = Description of APRS packets.\n");
17141715
dw_printf (" x x = Silence FX.25 information.\n");
17151716
dw_printf (" -t n Text colors. 0=disabled. 1=default. 2,3,4,... alternatives.\n");
17161717
dw_printf (" Use 9 to test compatibility with your terminal.\n");

0 commit comments

Comments
 (0)