Skip to content

Misc fixes for upstream #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 7 commits into from
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -10,6 +10,20 @@ direwolf.conf
*.wav
fsk_fast_filter.h

# Binaries
aclients
atest
decode_aprs
direwolf
direwolf.desktop
gen_fff
gen_packets
ll2utm
log2gpx
text2tt
tt2text
ttcalc
utm2ll

# Object files
*.o
6 changes: 3 additions & 3 deletions Makefile.linux
Original file line number Diff line number Diff line change
@@ -327,7 +327,7 @@ gen_packets : gen_packets.c ax25_pad.c hdlc_send.c fcs_calc.c gen_tone.c morse.c

# Unit test for AFSK demodulator

atest : atest.c fsk_fast_filter.h demod.c demod_afsk.c demod_9600.c \
atest : atest.c demod.o demod_afsk.o demod_9600.c \
dsp.o hdlc_rec.c hdlc_rec2.o multi_modem.o rrbb.o \
fcs_calc.c ax25_pad.c decode_aprs.c dwgpsnmea.o \
dwgps.o dwgpsd.o serial_port.o telemetry.c latlong.c symbols.c tt_text.c textcolor.c \
@@ -692,7 +692,7 @@ itest : igate.c textcolor.c ax25_pad.c fcs_calc.c textcolor.o misc.a

# Unit test for UDP reception with AFSK demodulator

udptest : udp_test.c demod.c dsp.c demod_afsk.c demod_9600.c hdlc_rec.c hdlc_rec2.c multi_modem.c rrbb.c
udptest : udp_test.c demod.o dsp.c demod_afsk.o demod_9600.c hdlc_rec.c hdlc_rec2.c multi_modem.c rrbb.c \
fcs_calc.c ax25_pad.c decode_aprs.c symbols.c textcolor.c misc.a
$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS)
./udptest
@@ -701,7 +701,7 @@ demod.o : tune.h
demod_afsk.o : tune.h
demod_9600.o : tune.h

testagc : atest.c demod.c dsp.c demod_afsk.c demod_9600.c hdlc_rec.c hdlc_rec2.o multi_modem.o rrbb.o \
testagc : atest.c demod.o dsp.c demod_afsk.o demod_9600.c hdlc_rec.c hdlc_rec2.o multi_modem.o rrbb.o \
fcs_calc.c ax25_pad.c decode_aprs.c telemetry.c latlong.c symbols.c tune.h textcolor.c misc.a
$(CC) $(CFLAGS) -o atest $^ $(LDFLAGS)
./atest 02_Track_2.wav | grep "packets decoded in" > atest.out
1 change: 1 addition & 0 deletions aclients.c
Original file line number Diff line number Diff line change
@@ -67,6 +67,7 @@
#include <sys/types.h>
#include <sys/ioctl.h>
#include <sys/socket.h>
#include <arpa/inet.h>
#include <netinet/in.h>
#include <netinet/tcp.h>
#include <fcntl.h>
2 changes: 1 addition & 1 deletion audio.c
Original file line number Diff line number Diff line change
@@ -1134,7 +1134,7 @@ int audio_flush (int a)
{
#if USE_ALSA
int k;
char *psound;
unsigned char *psound;
int retries = 10;
snd_pcm_status_t *status;

2 changes: 1 addition & 1 deletion config.c
Original file line number Diff line number Diff line change
@@ -1233,7 +1233,7 @@ void config_init (char *fname, struct audio_s *p_audio_config,
/* Later, we check for valid letters and no more than one letter if + specified. */

for (pc = t; *pc != '\0'; pc++) {
if ( ! isalpha(*pc) && ! *pc == '+') {
if ( ! isalpha(*pc) && ! (*pc == '+')) {
text_color_set(DW_COLOR_ERROR);
dw_printf ("Line %d: Demodulator type can only contain letters and + character.\n", line);
}
2 changes: 1 addition & 1 deletion demod_afsk.c
Original file line number Diff line number Diff line change
@@ -720,7 +720,7 @@ static void emit_macro (char *name, int size, float *coeff)
dw_printf ("\n");
}

int main ()
int main (void)
{
//int n;
char fff_profile;
1 change: 1 addition & 0 deletions dwgpsd.c
Original file line number Diff line number Diff line change
@@ -41,6 +41,7 @@
#include <string.h>
#include <errno.h>
#include <time.h>
#include <math.h>

#if __WIN32__
#error Not for Windows
1 change: 1 addition & 0 deletions igate.c
Original file line number Diff line number Diff line change
@@ -78,6 +78,7 @@
#include <sys/types.h>
#include <sys/ioctl.h>
#include <sys/socket.h>
#include <arpa/inet.h>
#include <netinet/in.h>
#include <netinet/tcp.h>
#endif
2 changes: 1 addition & 1 deletion kiss.c
Original file line number Diff line number Diff line change
@@ -685,7 +685,7 @@ void kiss_send_rec_packet (int chan, unsigned char *fbuf, int flen)
text_color_set(DW_COLOR_DEBUG);
dw_printf ("\n");
dw_printf ("Packet content before adding KISS framing and any escapes:\n");
hex_dump ((char*)fbuf, flen);
hex_dump (fbuf, flen);
}

kiss_len = kiss_encapsulate (stemp, flen+1, kiss_buff);
2 changes: 1 addition & 1 deletion kissnet.c
Original file line number Diff line number Diff line change
@@ -511,7 +511,7 @@ void kissnet_send_rec_packet (int chan, unsigned char *fbuf, int flen)
text_color_set(DW_COLOR_DEBUG);
dw_printf ("\n");
dw_printf ("Packet content before adding KISS framing and any escapes:\n");
hex_dump ((char*)fbuf, flen);
hex_dump (fbuf, flen);
}

kiss_len = kiss_encapsulate (stemp, flen+1, kiss_buff);
1 change: 1 addition & 0 deletions ttcalc.c
Original file line number Diff line number Diff line change
@@ -57,6 +57,7 @@
#include <sys/types.h>
#include <sys/ioctl.h>
#include <sys/socket.h>
#include <arpa/inet.h>
#include <netinet/in.h>
#include <netinet/tcp.h>
#include <sys/errno.h>