PierMesh
/
direwolf
mirror of https://github.com/wb2osz/direwolf.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/wb2osz/direwolf into dev

This commit is contained in:
WB2OSZ 2017-06-11 22:47:09 -04:00
parent 4f4583dc37 ebdc124a07
commit ed67bdfd84
6 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config.c
View File

@ -5004,7 +5004,7 @@ static int beacon_options(char *cmd, struct beacon_s *b, int line, struct audio_
} }
else { else {
text_color_set(DW_COLOR_ERROR); text_color_set(DW_COLOR_ERROR);
dw_printf ("Config file, line %d: When any of ZONE, EASTING, NORTHING specifed, they must all be specified.\n", line); dw_printf ("Config file, line %d: When any of ZONE, EASTING, NORTHING specified, they must all be specified.\n", line);
} }
} }

2
decode_aprs.c
View File

@ -1461,7 +1461,7 @@ static void aprs_mic_e (decode_aprs_t *A, packet_t pp, unsigned char *info, int
* *
* A->g_message_number Message number if any. Required for ack/rej. * A->g_message_number Message number if any. Required for ack/rej.
* *
* Description: An APRS message is a text string with a specifed addressee. * Description: An APRS message is a text string with a specified addressee.
* *
* It's a lot more complicated with different types of addressees * It's a lot more complicated with different types of addressees
* and replies with acknowledgement or rejection. * and replies with acknowledgement or rejection.

2
gen_packets.c
View File

@ -446,7 +446,7 @@ int main(int argc, char **argv)
if (strlen(output_file) == 0) { if (strlen(output_file) == 0) {
text_color_set(DW_COLOR_ERROR); text_color_set(DW_COLOR_ERROR);
dw_printf ("ERROR: The -o ouput file option must be specified.\n"); dw_printf ("ERROR: The -o output file option must be specified.\n");
usage (argv); usage (argv);
exit (1); exit (1);
} }

2
man1/decode_aprs.1
View File

@ -48,11 +48,13 @@ Dire Wolf will usually tell you what is wrong. First,
cut-n-paste the bad packets into a text file. Here a few examples: cut-n-paste the bad packets into a text file. Here a few examples:
.P .P
.RS .RS
.nf
n2cma>APRS,TCPIP*,qAC,SEVENTH:@212127z43.2333n/77.1w_338/002g001t025P000h65b10208.wview_5_19_0 n2cma>APRS,TCPIP*,qAC,SEVENTH:@212127z43.2333n/77.1w_338/002g001t025P000h65b10208.wview_5_19_0
.P .P
K0YTH-10>APNU3B,NULL,qAR,K0DMF-10:!4601.5NS09255.52W#PHG6360/W2,MNn 444.575 K0YTH-10>APNU3B,NULL,qAR,K0DMF-10:!4601.5NS09255.52W#PHG6360/W2,MNn 444.575
.P .P
00 82 a0 ae ae 62 60 e0 82 96 68 84 40 40 60 9c 68 b0 ae 86 40 e0 40 ae 92 88 8a 64 63 03 f0 3e 45 4d 36 34 6e 65 2f 23 20 45 63 68 6f 6c 69 6e 6b 20 31 34 35 2e 33 31 30 2f 31 30 30 68 7a 20 54 6f 6e 65 00 82 a0 ae ae 62 60 e0 82 96 68 84 40 40 60 9c 68 b0 ae 86 40 e0 40 ae 92 88 8a 64 63 03 f0 3e 45 4d 36 34 6e 65 2f 23 20 45 63 68 6f 6c 69 6e 6b 20 31 34 35 2e 33 31 30 2f 31 30 30 68 7a 20 54 6f 6e 65
+.fi
.RE .RE
.P .P
If you simply fed this into decode_aprs, it would complain about the If you simply fed this into decode_aprs, it would complain about the

4
man1/direwolf.1
View File

@ -135,13 +135,13 @@ gqrx (2.3 and later) has the ability to send streaming audio through a UDP socke
direwolf can listen over a UDP port with options like this: direwolf can listen over a UDP port with options like this:
.RS .RS
.P .P
direwolf -n 1 -r 48000 -b 16 udp:7355 direwolf \-n 1 \-r 48000 \-b 16 udp:7355
.RE .RE
.P .P
Other SDR applications might produce audio on stdout so it is convenient to pipe into the next application. In this example, the final "-" means read from stdin. Other SDR applications might produce audio on stdout so it is convenient to pipe into the next application. In this example, the final "-" means read from stdin.
.RS .RS
.P .P
rtl_fm -f 144.39M -o 4 - | direwolf -n 1 -r 24000 -b 16 - rtl_fm \-f 144.39M \-o 4 \- | direwolf \-n 1 \-r 24000 \-b 16 \-
.RE .RE

18
man1/gen_packets.1
View File

@ -5,12 +5,12 @@ gen_packets \- Generate audio file for AX.25 frames.
.SH SYNOPSIS .SH SYNOPSIS
.B gen_packets -o .B gen_packets \-o
.I wav-file-out .I wav-file-out
[ \fIoptions\fR ] [ \fItext-file\fR | - ] [ \fIoptions\fR ] [ \fItext-file\fR | \- ]
.RS .RS
.P .P
\fIwav-file-out\fR is the result. The -o option is required. \fIwav-file-out\fR is the result. The \-o option is required.
.P .P
\fItext-file\fR may contain AX.25 packets in the standard monitoring format. Use "-" to read from stdin. If not specified, a default builtin message will be used. \fItext-file\fR may contain AX.25 packets in the standard monitoring format. Use "-" to read from stdin. If not specified, a default builtin message will be used.
.RE .RE
@ -70,7 +70,7 @@ Send output to .wav file.
.SH EXAMPLES .SH EXAMPLES
.P .P
.B gen_packets -o x.wav .B gen_packets \-o x.wav
.P .P
.RS .RS
With all defaults, a built-in test message is generated With all defaults, a built-in test message is generated
@ -78,27 +78,27 @@ with standard Bell 202 tones used for packet radio on ordinary
VHF FM transceivers. VHF FM transceivers.
.RE .RE
.P .P
.B gen_packets -o x.wav -g -b 9600 .B gen_packets \-o x.wav \-g \-b 9600
.PD 0 .PD 0
.P .P
.PD .PD
.B gen_packets -o x.wav -B 9600 .B gen_packets \-o x.wav \-B 9600
.P .P
.RS .RS
Both of these are equivalent. "-B 9600" automatically selects scrambled baseband rather than AFSK. Both of these are equivalent. "-B 9600" automatically selects scrambled baseband rather than AFSK.
.RE .RE
.P .P
.B gen_packets -o x.wav -m 1600 -s 1800 -b 300 .B gen_packets \-o x.wav \-m 1600 \-s 1800 \-b 300
.PD 0 .PD 0
.P .P
.PD .PD
.B gen_packets -o x.wav -B 300 .B gen_packets \-o x.wav \-B 300
.P .P
.RS .RS
Both of these generate 200 Hz shift, 300 baud, suitable for HF SSB transceiver. Both of these generate 200 Hz shift, 300 baud, suitable for HF SSB transceiver.
.RE .RE
.P .P
.B echo -n 'WB2OSZ>WORLD:Hello, world!' | gen_packets -a 25 -o x.wav - .B echo \-n 'WB2OSZ>WORLD:Hello, world!' | gen_packets \-a 25 \-o x.wav \-
.PD 0 .PD 0
.P .P
.PD .PD