Skip to content

Commit 1cad6ed

Browse files
wb2oszwb2osz
committed
Allow radio channel number for -x transmit calibration tone option.
1 parent 8bca486 commit 1cad6ed

File tree

2 files changed

+103
-55
lines changed

2 files changed

+103
-55
lines changed

‎man/direwolf.1

+19-2
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,8 @@ Quiet (suppress output). Specify one or more of the following in place of x.
137137
h = Heard line with the audio level.
138138
.P
139139
d = Decoding of APRS packets.
140+
.P
141+
x = Silence FX.25 information.
140142
.RE
141143
.RE
142144
.PD
@@ -151,11 +153,26 @@ Text colors. 0=disabled. 1=default. 2,3,4,... alternatives. Use 9 to test com
151153
Enable pseudo terminal for KISS protocol.
152154

153155
.TP
154-
.B "-x "
156+
.BI "-x "
155157
Send Xmit level calibration tones.
158+
.PD 0
159+
.RS
160+
.RS
161+
a = Alternating mark/space tones.
162+
.P
163+
m = steady Mark tone (e.g. 1200 Hz)
164+
.P
165+
s = steady Space tone (e.g. 2200 Hz)
166+
.P
167+
p = selence (set Ptt only).
168+
.P
169+
Optionally add a number to specify radio channel.
170+
.RE
171+
.RE
172+
.PD
156173

157174
.TP
158-
.B "-U "
175+
.B "-u "
159176
Print UTF-8 test string and exit.
160177

161178
.TP

‎src/direwolf.c

+84-53
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,8 @@ int main (int argc, char *argv[])
230230
float e_recv_ber = 0.0; /* Receive Bit Error Rate (BER). */
231231
int X_fx25_xmit_enable = 0; /* FX.25 transmit enable. */
232232

233-
int x_opt = 0; /* "-x N" option for transmitting calibration tones. */
233+
char x_opt_mode = ' '; /* "-x N" option for transmitting calibration tones. */
234+
int x_opt_chan = 0; /* Split into 2 parts. Mode e.g. m, a, and optional channel. */
234235

235236
strlcpy(l_opt_logdir, "", sizeof(l_opt_logdir));
236237
strlcpy(L_opt_logfile, "", sizeof(L_opt_logfile));
@@ -492,21 +493,42 @@ int main (int argc, char *argv[])
492493
break;
493494

494495
case 'x': /* -x N for transmit calibration tones. */
495-
496-
switch (*optarg) {
497-
case 'a': x_opt = 1; break; // Alternating tones
498-
case 'm': x_opt = 2; break; // Mark tone
499-
case '1': x_opt = 2; break; // Mark tone alternative
500-
case 's': x_opt = 3; break; // Space tone
501-
case '2': x_opt = 3; break; // Space tone alternative
502-
case 'p': x_opt = 4; break; // Set PTT only
496+
/* N is composed of a channel number and/or one letter */
497+
/* for the mode: mark, space, alternate, ptt-only. */
498+
499+
for (char *p = optarg; *p != '\0'; p++ ) {
500+
switch (*p) {
501+
case '0':
502+
case '1':
503+
case '2':
504+
case '3':
505+
case '4':
506+
case '5':
507+
case '6':
508+
case '7':
509+
case '8':
510+
case '9':
511+
x_opt_chan = x_opt_chan * 10 + *p - '0';
512+
if (x_opt_mode == ' ') x_opt_mode = 'a';
513+
break;
514+
case 'a': x_opt_mode = *p; break; // Alternating tones
515+
case 'm': x_opt_mode = *p; break; // Mark tone
516+
case 's': x_opt_mode = *p; break; // Space tone
517+
case 'p': x_opt_mode = *p; break; // Set PTT only
503518
default:
504-
text_color_set(DW_COLOR_ERROR);
505-
dw_printf ("Invalid option for -x. \n");
519+
text_color_set(DW_COLOR_ERROR);
520+
dw_printf ("Invalid option '%c' for -x. Must be a, m, s, or p.\n", *p);
521+
text_color_set(DW_COLOR_INFO);
506522
exit (EXIT_FAILURE);
507523
break;
508524
}
509-
525+
}
526+
if (x_opt_chan < 0 || x_opt_chan >= MAX_CHANS) {
527+
text_color_set(DW_COLOR_ERROR);
528+
dw_printf ("Invalid channel %d for -x. \n", x_opt_chan);
529+
text_color_set(DW_COLOR_INFO);
530+
exit (EXIT_FAILURE);
531+
}
510532
break;
511533

512534
case 'r': /* -r audio samples/sec. e.g. 44100 */
@@ -923,65 +945,72 @@ int main (int argc, char *argv[])
923945
/*
924946
* If -x N option specified, transmit calibration tones for transmitter
925947
* audio level adjustment, up to 1 minute then quit.
926-
* N = a: Alternating mark/space tones
927-
* N = m: (or 1): Mark tone (e.g. 1200Hz)
928-
* N = s: (or 2): Space tone (e.g. 2200Hz)
929-
* N = p: Set PTT only.
930-
* TODO: enhance for more than one channel.
948+
* a: Alternating mark/space tones
949+
* m: Mark tone (e.g. 1200Hz)
950+
* s: Space tone (e.g. 2200Hz)
951+
* p: Set PTT only.
952+
* A leading or trailing number is the channel.
931953
*/
932954

933-
if (x_opt != 0) {
934-
if (audio_config.achan[0].mark_freq
935-
&& audio_config.achan[0].space_freq) {
955+
if (x_opt_mode != ' ') {
956+
if (audio_config.achan[x_opt_chan].medium == MEDIUM_RADIO) {
957+
if (audio_config.achan[x_opt_chan].mark_freq
958+
&& audio_config.achan[x_opt_chan].space_freq) {
936959
int max_duration = 60;
937-
int n = audio_config.achan[0].baud * max_duration;
938-
int chan = 0;
960+
int n = audio_config.achan[x_opt_chan].baud * max_duration;
939961

940962
text_color_set(DW_COLOR_INFO);
941-
ptt_set(OCTYPE_PTT, chan, 1);
942-
943-
switch (x_opt) {
944-
case 1: // Alternating tones: -x a
945-
dw_printf(
946-
"\nSending alternating mark/space calibration tones (%d/%dHz).\nPress control-C to terminate.\n",
947-
audio_config.achan[0].mark_freq,
948-
audio_config.achan[0].space_freq);
963+
ptt_set(OCTYPE_PTT, x_opt_chan, 1);
964+
965+
switch (x_opt_mode) {
966+
default:
967+
case 'a': // Alternating tones: -x a
968+
dw_printf("\nSending alternating mark/space calibration tones (%d/%dHz) on channel %d.\nPress control-C to terminate.\n",
969+
audio_config.achan[x_opt_chan].mark_freq,
970+
audio_config.achan[x_opt_chan].space_freq,
971+
x_opt_chan);
949972
while (n-- > 0) {
950-
tone_gen_put_bit(chan, n & 1);
973+
tone_gen_put_bit(x_opt_chan, n & 1);
951974
}
952975
break;
953-
case 2: // "Mark" tone: -x m
954-
dw_printf(
955-
"\nSending mark calibration tone (%dHz).\nPress control-C to terminate.\n",
956-
audio_config.achan[0].mark_freq);
976+
case 'm': // "Mark" tone: -x m
977+
dw_printf("\nSending mark calibration tone (%dHz) on channel %d.\nPress control-C to terminate.\n",
978+
audio_config.achan[x_opt_chan].mark_freq,
979+
x_opt_chan);
957980
while (n-- > 0) {
958-
tone_gen_put_bit(chan, 0);
981+
tone_gen_put_bit(x_opt_chan, 0);
959982
}
960983
break;
961-
case 3: // "Space" tone: -x s
962-
dw_printf(
963-
"\nSending space calibration tone (%dHz).\nPress control-C to terminate.\n",
964-
audio_config.achan[0].space_freq);
984+
case 's': // "Space" tone: -x s
985+
dw_printf("\nSending space calibration tone (%dHz) on channel %d.\nPress control-C to terminate.\n",
986+
audio_config.achan[x_opt_chan].space_freq,
987+
x_opt_chan);
965988
while (n-- > 0) {
966-
tone_gen_put_bit(chan, 1);
989+
tone_gen_put_bit(x_opt_chan, 1);
967990
}
968991
break;
969-
case 4: // Silence - set PTT only: -x p
970-
dw_printf(
971-
"\nSending silence (Set PTT only).\nPress control-C to terminate.\n");
972-
sleep(max_duration);
992+
case 'p': // Silence - set PTT only: -x p
993+
dw_printf("\nSending silence (Set PTT only) on channel %d.\nPress control-C to terminate.\n", x_opt_chan);
994+
SLEEP_SEC(max_duration);
973995
break;
974996
}
975997

976-
ptt_set(OCTYPE_PTT, chan, 0);
977-
exit(0);
998+
ptt_set(OCTYPE_PTT, x_opt_chan, 0);
999+
text_color_set(DW_COLOR_INFO);
1000+
exit(EXIT_SUCCESS);
9781001

9791002
} else {
9801003
text_color_set(DW_COLOR_ERROR);
981-
dw_printf(
982-
"\nSpace/mark frequencies not defined. Cannot calibrate using this modem type.\n");
1004+
dw_printf("\nMark/Space frequencies not defined for channel %d. Cannot calibrate using this modem type.\n", x_opt_chan);
1005+
text_color_set(DW_COLOR_INFO);
9831006
exit(EXIT_FAILURE);
9841007
}
1008+
} else {
1009+
text_color_set(DW_COLOR_ERROR);
1010+
dw_printf("\nChannel %d is not configured as a radio channel.\n", x_opt_chan);
1011+
text_color_set(DW_COLOR_INFO);
1012+
exit(EXIT_FAILURE);
1013+
}
9851014
}
9861015

9871016

@@ -1562,10 +1591,11 @@ static void usage (char **argv)
15621591
dw_printf (" -p Enable pseudo terminal for KISS protocol.\n");
15631592
#endif
15641593
dw_printf (" -x Send Xmit level calibration tones.\n");
1565-
dw_printf (" a a = Alternating mark/space tones.\n");
1566-
dw_printf (" m m (or 1) = Steady mark tone (e.g. 1200Hz).\n");
1567-
dw_printf (" s s (or 2) = Steady space tone (e.g. 2200Hz).\n");
1568-
dw_printf (" p p = Silence (Set PTT only).\n");
1594+
dw_printf (" a a = Alternating mark/space tones.\n");
1595+
dw_printf (" m m = Steady mark tone (e.g. 1200Hz).\n");
1596+
dw_printf (" s s = Steady space tone (e.g. 2200Hz).\n");
1597+
dw_printf (" p p = Silence (Set PTT only).\n");
1598+
dw_printf (" chan Optionally add a number to specify radio channel.\n");
15691599
dw_printf (" -u Print UTF-8 test string and exit.\n");
15701600
dw_printf (" -S Print symbol tables and exit.\n");
15711601
dw_printf (" -T fmt Time stamp format for sent and received frames.\n");
@@ -1583,6 +1613,7 @@ static void usage (char **argv)
15831613
dw_printf ("Complete documentation can be found in /usr/local/share/doc/direwolf\n");
15841614
#endif
15851615
dw_printf ("or online at https://github.com/wb2osz/direwolf/tree/master/doc\n");
1616+
text_color_set(DW_COLOR_INFO);
15861617
exit (EXIT_FAILURE);
15871618
}
15881619

0 commit comments

Comments
 (0)