diff --git a/MORSEM b/MORSEM deleted file mode 100644 index 76dce3f..0000000 --- a/MORSEM +++ /dev/null @@ -1,300 +0,0 @@ - 3 1 9 10 1 0 0 0 - 4 2 11 12 0 2 0 0 - 5 3 13 14 0 0 3 0 - 6 4 15 16 0 0 0 4 - 3 5 9 10 5 0 0 0 - 4 6 11 12 0 6 0 0 - 5 7 13 14 0 0 7 0 - 6 8 15 16 0 0 0 8 - 1 9 9 0 1 2 3 4 - 2 10 0 10 5 6 7 8 - 1 11 11 0 1 2 3 4 - 2 12 0 12 5 6 7 8 - 1 13 13 0 1 2 3 4 - 2 14 0 14 5 6 7 8 - 1 15 15 0 1 2 3 4 - 2 16 0 16 5 6 7 8 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 diff --git a/Makefile b/Makefile index 19c995d..bfb9107 100644 --- a/Makefile +++ b/Makefile @@ -71,11 +71,10 @@ am__dirstamp = $(am__leading_dot)dirstamp am_morse_OBJECTS = src/autocr.$(OBJEXT) src/initl.$(OBJEXT) \ src/likhd.$(OBJEXT) src/path.$(OBJEXT) src/spdtr.$(OBJEXT) \ src/trelis.$(OBJEXT) src/bpfdet.$(OBJEXT) src/inputl.$(OBJEXT) \ - src/model.$(OBJEXT) src/probp.$(OBJEXT) src/rcvr.$(OBJEXT) \ - src/sprob.$(OBJEXT) src/trprob.$(OBJEXT) src/kalfil.$(OBJEXT) \ - src/morse.$(OBJEXT) src/proces.$(OBJEXT) src/savep.$(OBJEXT) \ - src/stats.$(OBJEXT) src/xtrans.$(OBJEXT) src/key.$(OBJEXT) \ - src/noise.$(OBJEXT) src/ptrans.$(OBJEXT) src/simsgi.$(OBJEXT) \ + src/model.$(OBJEXT) src/probp.$(OBJEXT) src/sprob.$(OBJEXT) \ + src/trprob.$(OBJEXT) src/kalfil.$(OBJEXT) src/morse.$(OBJEXT) \ + src/proces.$(OBJEXT) src/savep.$(OBJEXT) src/stats.$(OBJEXT) \ + src/xtrans.$(OBJEXT) src/noise.$(OBJEXT) src/ptrans.$(OBJEXT) \ src/transl.$(OBJEXT) morse_OBJECTS = $(am_morse_OBJECTS) morse_LDADD = $(LDADD) @@ -135,7 +134,7 @@ INSTALL_SCRIPT = ${INSTALL} INSTALL_STRIP_PROGRAM = $(install_sh) -c -s LDFLAGS = LIBOBJS = -LIBS = -lf2c -lm +LIBS = -lm LTLIBOBJS = MAKEINFO = ${SHELL} /home/mauri/Projects/morse/missing --run makeinfo MKDIR_P = /bin/mkdir -p @@ -200,11 +199,10 @@ AM_CFLAGS = -ggdb morse_SOURCES = src/autocr.c src/initl.c src/likhd.c src/path.c\ src/spdtr.c src/trelis.c\ src/bpfdet.c src/inputl.c src/model.c \ - src/probp.c src/rcvr.c src/sprob.c src/trprob.c\ + src/probp.c src/sprob.c src/trprob.c\ src/kalfil.c src/morse.c src/proces.c src/savep.c \ src/stats.c src/xtrans.c\ - src/key.c src/noise.c src/ptrans.c\ - src/simsgi.c src/transl.c + src/noise.c src/ptrans.c src/transl.c all: config.h $(MAKE) $(AM_MAKEFLAGS) all-am @@ -320,7 +318,6 @@ src/inputl.$(OBJEXT): src/$(am__dirstamp) \ src/$(DEPDIR)/$(am__dirstamp) src/model.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp) src/probp.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp) -src/rcvr.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp) src/sprob.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp) src/trprob.$(OBJEXT): src/$(am__dirstamp) \ src/$(DEPDIR)/$(am__dirstamp) @@ -333,12 +330,9 @@ src/savep.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp) src/stats.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp) src/xtrans.$(OBJEXT): src/$(am__dirstamp) \ src/$(DEPDIR)/$(am__dirstamp) -src/key.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp) src/noise.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp) src/ptrans.$(OBJEXT): src/$(am__dirstamp) \ src/$(DEPDIR)/$(am__dirstamp) -src/simsgi.$(OBJEXT): src/$(am__dirstamp) \ - src/$(DEPDIR)/$(am__dirstamp) src/transl.$(OBJEXT): src/$(am__dirstamp) \ src/$(DEPDIR)/$(am__dirstamp) morse$(EXEEXT): $(morse_OBJECTS) $(morse_DEPENDENCIES) $(EXTRA_morse_DEPENDENCIES) @@ -352,7 +346,6 @@ mostlyclean-compile: -rm -f src/initl.$(OBJEXT) -rm -f src/inputl.$(OBJEXT) -rm -f src/kalfil.$(OBJEXT) - -rm -f src/key.$(OBJEXT) -rm -f src/likhd.$(OBJEXT) -rm -f src/model.$(OBJEXT) -rm -f src/morse.$(OBJEXT) @@ -361,9 +354,7 @@ mostlyclean-compile: -rm -f src/probp.$(OBJEXT) -rm -f src/proces.$(OBJEXT) -rm -f src/ptrans.$(OBJEXT) - -rm -f src/rcvr.$(OBJEXT) -rm -f src/savep.$(OBJEXT) - -rm -f src/simsgi.$(OBJEXT) -rm -f src/spdtr.$(OBJEXT) -rm -f src/sprob.$(OBJEXT) -rm -f src/stats.$(OBJEXT) @@ -380,7 +371,6 @@ include src/$(DEPDIR)/bpfdet.Po include src/$(DEPDIR)/initl.Po include src/$(DEPDIR)/inputl.Po include src/$(DEPDIR)/kalfil.Po -include src/$(DEPDIR)/key.Po include src/$(DEPDIR)/likhd.Po include src/$(DEPDIR)/model.Po include src/$(DEPDIR)/morse.Po @@ -389,9 +379,7 @@ include src/$(DEPDIR)/path.Po include src/$(DEPDIR)/probp.Po include src/$(DEPDIR)/proces.Po include src/$(DEPDIR)/ptrans.Po -include src/$(DEPDIR)/rcvr.Po include src/$(DEPDIR)/savep.Po -include src/$(DEPDIR)/simsgi.Po include src/$(DEPDIR)/spdtr.Po include src/$(DEPDIR)/sprob.Po include src/$(DEPDIR)/stats.Po @@ -760,6 +748,8 @@ uninstall-am: uninstall-binPROGRAMS uninstall-am uninstall-binPROGRAMS +# src/simsgi.c src/key.c src/rcvr.c + #dist_noinst_SCRIPTS = autogen.sh # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/Makefile.am b/Makefile.am index ab0f7a9..135f44c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,16 +1,17 @@ AUTOMAKE_OPTIONS = subdir-objects ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS} -LIBS = -lf2c -lm +LIBS = -lm AM_CFLAGS = -ggdb bin_PROGRAMS = morse morse_SOURCES = src/autocr.c src/initl.c src/likhd.c src/path.c\ src/spdtr.c src/trelis.c\ src/bpfdet.c src/inputl.c src/model.c \ - src/probp.c src/rcvr.c src/sprob.c src/trprob.c\ + src/probp.c src/sprob.c src/trprob.c\ src/kalfil.c src/morse.c src/proces.c src/savep.c \ src/stats.c src/xtrans.c\ - src/key.c src/noise.c src/ptrans.c\ - src/simsgi.c src/transl.c + src/noise.c src/ptrans.c src/transl.c + +# src/simsgi.c src/key.c src/rcvr.c #dist_noinst_SCRIPTS = autogen.sh diff --git a/Makefile.in b/Makefile.in index 178070d..8f47592 100644 --- a/Makefile.in +++ b/Makefile.in @@ -71,11 +71,10 @@ am__dirstamp = $(am__leading_dot)dirstamp am_morse_OBJECTS = src/autocr.$(OBJEXT) src/initl.$(OBJEXT) \ src/likhd.$(OBJEXT) src/path.$(OBJEXT) src/spdtr.$(OBJEXT) \ src/trelis.$(OBJEXT) src/bpfdet.$(OBJEXT) src/inputl.$(OBJEXT) \ - src/model.$(OBJEXT) src/probp.$(OBJEXT) src/rcvr.$(OBJEXT) \ - src/sprob.$(OBJEXT) src/trprob.$(OBJEXT) src/kalfil.$(OBJEXT) \ - src/morse.$(OBJEXT) src/proces.$(OBJEXT) src/savep.$(OBJEXT) \ - src/stats.$(OBJEXT) src/xtrans.$(OBJEXT) src/key.$(OBJEXT) \ - src/noise.$(OBJEXT) src/ptrans.$(OBJEXT) src/simsgi.$(OBJEXT) \ + src/model.$(OBJEXT) src/probp.$(OBJEXT) src/sprob.$(OBJEXT) \ + src/trprob.$(OBJEXT) src/kalfil.$(OBJEXT) src/morse.$(OBJEXT) \ + src/proces.$(OBJEXT) src/savep.$(OBJEXT) src/stats.$(OBJEXT) \ + src/xtrans.$(OBJEXT) src/noise.$(OBJEXT) src/ptrans.$(OBJEXT) \ src/transl.$(OBJEXT) morse_OBJECTS = $(am_morse_OBJECTS) morse_LDADD = $(LDADD) @@ -135,7 +134,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ -LIBS = -lf2c -lm +LIBS = -lm LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ @@ -200,11 +199,10 @@ AM_CFLAGS = -ggdb morse_SOURCES = src/autocr.c src/initl.c src/likhd.c src/path.c\ src/spdtr.c src/trelis.c\ src/bpfdet.c src/inputl.c src/model.c \ - src/probp.c src/rcvr.c src/sprob.c src/trprob.c\ + src/probp.c src/sprob.c src/trprob.c\ src/kalfil.c src/morse.c src/proces.c src/savep.c \ src/stats.c src/xtrans.c\ - src/key.c src/noise.c src/ptrans.c\ - src/simsgi.c src/transl.c + src/noise.c src/ptrans.c src/transl.c all: config.h $(MAKE) $(AM_MAKEFLAGS) all-am @@ -320,7 +318,6 @@ src/inputl.$(OBJEXT): src/$(am__dirstamp) \ src/$(DEPDIR)/$(am__dirstamp) src/model.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp) src/probp.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp) -src/rcvr.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp) src/sprob.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp) src/trprob.$(OBJEXT): src/$(am__dirstamp) \ src/$(DEPDIR)/$(am__dirstamp) @@ -333,12 +330,9 @@ src/savep.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp) src/stats.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp) src/xtrans.$(OBJEXT): src/$(am__dirstamp) \ src/$(DEPDIR)/$(am__dirstamp) -src/key.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp) src/noise.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp) src/ptrans.$(OBJEXT): src/$(am__dirstamp) \ src/$(DEPDIR)/$(am__dirstamp) -src/simsgi.$(OBJEXT): src/$(am__dirstamp) \ - src/$(DEPDIR)/$(am__dirstamp) src/transl.$(OBJEXT): src/$(am__dirstamp) \ src/$(DEPDIR)/$(am__dirstamp) morse$(EXEEXT): $(morse_OBJECTS) $(morse_DEPENDENCIES) $(EXTRA_morse_DEPENDENCIES) @@ -352,7 +346,6 @@ mostlyclean-compile: -rm -f src/initl.$(OBJEXT) -rm -f src/inputl.$(OBJEXT) -rm -f src/kalfil.$(OBJEXT) - -rm -f src/key.$(OBJEXT) -rm -f src/likhd.$(OBJEXT) -rm -f src/model.$(OBJEXT) -rm -f src/morse.$(OBJEXT) @@ -361,9 +354,7 @@ mostlyclean-compile: -rm -f src/probp.$(OBJEXT) -rm -f src/proces.$(OBJEXT) -rm -f src/ptrans.$(OBJEXT) - -rm -f src/rcvr.$(OBJEXT) -rm -f src/savep.$(OBJEXT) - -rm -f src/simsgi.$(OBJEXT) -rm -f src/spdtr.$(OBJEXT) -rm -f src/sprob.$(OBJEXT) -rm -f src/stats.$(OBJEXT) @@ -380,7 +371,6 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/initl.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/inputl.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/kalfil.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/key.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/likhd.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/model.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/morse.Po@am__quote@ @@ -389,9 +379,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/probp.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/proces.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/ptrans.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/rcvr.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/savep.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/simsgi.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/spdtr.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/sprob.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/stats.Po@am__quote@ @@ -760,6 +748,8 @@ uninstall-am: uninstall-binPROGRAMS uninstall-am uninstall-binPROGRAMS +# src/simsgi.c src/key.c src/rcvr.c + #dist_noinst_SCRIPTS = autogen.sh # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/NEWS b/NEWS index f0e1f21..9bdbab1 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,6 @@ NEWS & BUGS + 2013-Sept-26 enabled decoding from FLDIGI data feed. clamping x value to 1.0 max as FLDIGI sends values over 20.0 during startup before AGC kicks in. BUG: P(dah) abruptly goes from near 1.0 down and the bounces back => P(max) jumps to huge values diff --git a/OUTPUT b/OUTPUT deleted file mode 100644 index 05119c4..0000000 --- a/OUTPUT +++ /dev/null @@ -1,300 +0,0 @@ - 9 10 1 0 0 0 - 11 12 0 2 0 0 - 13 14 0 0 3 0 - 15 16 0 0 0 4 - 9 10 5 0 0 0 - 11 12 0 6 0 0 - 13 14 0 0 7 0 - 15 16 0 0 0 8 - 9 0 1 2 3 4 - 0 10 5 6 7 8 - 11 0 1 2 3 4 - 0 12 5 6 7 8 - 13 0 1 2 3 4 - 0 14 5 6 7 8 - 15 0 1 2 3 4 - 0 16 5 6 7 8 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 - 0 0 0 0 0 0 diff --git a/README b/README index 88f5032..d56ff1d 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -PROJECT IDEA +MORSE - PROJECT IDEAS 1. Build a simple to use C/C++ advanced Bayesian Morse decoder library @@ -52,8 +52,7 @@ PROJECT IDEA test results by software version http://orgmode.org/worg/org-contrib/babel/examples/data-collection-analysis.html - - + INSTALL FROM SCRATCH aclocal @@ -62,3 +61,8 @@ autoheader automake --add-missing ./configure make + + + + + diff --git a/README.md b/README.md index e1b93a2..487b741 100644 --- a/README.md +++ b/README.md @@ -4,12 +4,15 @@ This software is a Morse decoder orinally created by Dr. E. L. Bell in 1977. The software was manually entered from Fortran program listings and later converted to C++ by AG1LE Mauri Niininen. -2013-Sept-26 +2013-SEP-29 + + +2013-SEP-26 enabled decoding from FLDIGI data feed. clamping x value to 1.0 max as FLDIGI sends values over 20.0 during startup before AGC kicks in. BUG: P(dah) abruptly goes from near 1.0 down and the bounces back => P(max) jumps to huge values too long dahs? -2013-Sept-25 +2013-SEP-25 BUG: missing word space /pause between words QUICK BROWN when < 30 db SNR ? FOUND: enabled noise.c processing in morse.c changed to: @@ -17,7 +20,7 @@ by AG1LE Mauri Niininen. retstat = proces_(&zout, &rn, &xhat, &px, &elmhat, &spdhat, &imax, &pmax); much better decoding with low SNR test signals. -2013-Sept-25 +2013-SEP-25 run "./morse t test/test20db.in | less" BUG: QUICD and FOB when high 20 dB SNR? D should be K and B should be X diff --git a/src/initl.c b/src/initl.c index cd95d21..63152c4 100644 --- a/src/initl.c +++ b/src/initl.c @@ -10,7 +10,8 @@ http://www.netlib.org/f2c/libf2c.zip */ -#include "f2c.h" +//#include "f2c.h" +#include "morse.h" /* Common Block Declarations */ @@ -304,19 +305,17 @@ static integer c__1 = 1; static char fmt_70[] = "(i2)"; /* System generated locals */ - olist o__1; - alist al__1; +// olist o__1; +// alist al__1; /* Builtin functions */ - integer f_open(olist *), s_rsfe(cilist *), do_fio(integer *, char *, - ftnlen), e_rsfe(void), f_end(alist *), s_wsfe(cilist *), e_wsfe( - void); +// integer f_open(olist *), s_rsfe(cilist *), do_fio(integer *, char *, ftnlen), e_rsfe(void), f_end(alist*), s_wsfe(cilist *), e_wsfe(void); /* Local variables */ static integer i__, k, iarray[8]; /* Fortran I/O blocks */ - static cilist io___2 = { 0, 20, 0, fmt_30, 0 }; +/* static cilist io___2 = { 0, 20, 0, fmt_30, 0 }; static cilist io___5 = { 0, 20, 0, fmt_40, 0 }; static cilist io___6 = { 0, 20, 0, fmt_70, 0 }; @@ -336,7 +335,7 @@ static integer c__1 = 1; /* 2 'IMI',0,0,0,0,'BT',0,0,0,'EEE'/ */ /* PRINT 5, IALPH(1:36) */ /* 5 FORMAT(1X,A36) */ - o__1.oerr = 0; +/* o__1.oerr = 0; o__1.ounit = 20; o__1.ofnmlen = 6; o__1.ofnm = "MORSEM"; @@ -358,8 +357,8 @@ static integer c__1 = 1; /* IELMST(1..16) = LAST TWO ELEMENTS */ /* 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 */ /* .^ .~ .w .p -^ -~ -w -p ^. ^- ~. ~- w. w- p. p- */ - for (k = 1; k <= 6; ++k) { -/* L11: */ +/* for (k = 1; k <= 6; ++k) { + blkmem_1.memfcn[i__ + k * 400 - 401] = iarray[k + 1]; } blktrn_1.ltrmap[i__ - 1] = iarray[0]; @@ -370,7 +369,7 @@ static integer c__1 = 1; if (blklam_1.ielmst[i__ - 1] == 8 || blklam_1.ielmst[i__ - 1] == 4) { blktrn_1.iblank[i__ - 1] = 2; } -/* L10: */ + } al__1.aerr = 0; al__1.aunit = 20; @@ -392,7 +391,7 @@ static integer c__1 = 1; ftnlen)sizeof(integer)); } e_wsfe(); -/* L50: */ + } al__1.aerr = 0; al__1.aunit = 20; @@ -412,11 +411,12 @@ static integer c__1 = 1; do_fio(&c__1, (char *)&blktxt_1.itext[i__ - 1], (ftnlen)sizeof( integer)); e_rsfe(); -/* L60: */ + } al__1.aerr = 0; al__1.aunit = 20; f_end(&al__1); +*/ return 0; } /* initl_ */ diff --git a/src/inputl.c b/src/inputl.c index 4fa79c4..d0fdb7b 100644 --- a/src/inputl.c +++ b/src/inputl.c @@ -10,7 +10,9 @@ http://www.netlib.org/f2c/libf2c.zip */ -#include "f2c.h" + +//#include "f2c.h" +#include "morse.h" /* Common Block Declarations */ @@ -48,7 +50,7 @@ struct { /* Subroutine */ int inputl_(void) { /* Format strings */ - static char fmt_100[] = "(1x,\002INPUT KEYING PARMS: RATE,MEAN ELEM DURA" +/* static char fmt_100[] = "(1x,\002INPUT KEYING PARMS: RATE,MEAN ELEM DURA" "TIONS\002)"; static char fmt_150[] = "(1x,\002INPUT ELEM DURATION STD OEVIATIONS\002)"; static char fmt_300[] = "(1x,\002INPUT SIG PARMS- AVAR,BVAR,FCHIRP,TCHIR" @@ -56,33 +58,33 @@ struct { static char fmt_400[] = "(1x,\002INPUT SIG PARMS: GAMMA,FREQ,NOISE\002)"; /* Builtin functions */ - integer s_wsfe(cilist *), e_wsfe(void); - double sqrt(doublereal); +// integer s_wsfe(cilist *), e_wsfe(void); +// double sqrt(doublereal); /* Local variables */ static real fc, rc, avar, bvar, rate, fchirp, phivar, rnoise; /* Fortran I/O blocks */ - static cilist io___1 = { 0, 6, 0, fmt_100, 0 }; + /* static cilist io___1 = { 0, 6, 0, fmt_100, 0 }; static cilist io___2 = { 0, 6, 0, fmt_150, 0 }; static cilist io___3 = { 0, 6, 0, fmt_300, 0 }; static cilist io___4 = { 0, 6, 0, fmt_400, 0 }; - +*/ goto L600; - s_wsfe(&io___1); - e_wsfe(); +// s_wsfe(&io___1); +// e_wsfe(); /* READ 200,RATE,(ESEP(K), K=1,6) */ - s_wsfe(&io___2); - e_wsfe(); +// s_wsfe(&io___2); +// e_wsfe(); /* READ 200,(EDEV(K),K=1,6) */ /* L200: */ - s_wsfe(&io___3); - e_wsfe(); +// s_wsfe(&io___3); +// e_wsfe(); /* READ 210,AVAR,BVAR,FCHIRP,TCHIRP,PHIVAR */ /* L210: */ - s_wsfe(&io___4); - e_wsfe(); +// s_wsfe(&io___4); +// e_wsfe(); /* READ 220, GAMM,FC,RNOISE */ /* L220: */ L600: diff --git a/src/kalfil.c b/src/kalfil.c index a93931e..e92dac6 100644 --- a/src/kalfil.c +++ b/src/kalfil.c @@ -10,7 +10,8 @@ http://www.netlib.org/f2c/libf2c.zip */ -#include "f2c.h" +//#include "f2c.h" +#include "morse.h" #include /* Common Block Declarations */ diff --git a/src/likhd.c b/src/likhd.c index f1a5c5c..82ebe49 100644 --- a/src/likhd.c +++ b/src/likhd.c @@ -10,7 +10,8 @@ http://www.netlib.org/f2c/libf2c.zip */ -#include "f2c.h" +//#include "f2c.h" +#include "morse.h" /* Common Block Declarations */ diff --git a/src/model.c b/src/model.c index f61d691..553aebb 100644 --- a/src/model.c +++ b/src/model.c @@ -10,7 +10,12 @@ http://www.netlib.org/f2c/libf2c.zip */ -#include "f2c.h" +//#include "f2c.h" +#include +#include "morse.h" + + + /* Table of constant values */ @@ -23,7 +28,7 @@ static doublereal c_b5 = 10.; doublereal d1; /* Builtin functions */ - double exp(doublereal), pow_dd(doublereal *, doublereal *); + // double exp(doublereal), pow_dd(doublereal *, doublereal *); /* Local variables */ static real r1, bauds, xsamp; @@ -70,7 +75,8 @@ L100: L200: xsamp = r1 * 22.4f; d1 = (doublereal) (-2 / xsamp); - *phi = pow_dd(&c_b5, &d1); +// *phi = pow_dd(&c_b5, &d1); + *phi = pow(10.0, d1); if (bauds >= 14.f) { *phi = 1.f; } diff --git a/src/morse.c b/src/morse.c index 08b8011..eb4d06d 100644 --- a/src/morse.c +++ b/src/morse.c @@ -11,7 +11,7 @@ */ char debug = '0'; -#include "f2c.h" +//#include "f2c.h" #include #include #include "morse.h" diff --git a/src/morse.h b/src/morse.h index 7739d66..2b3943b 100644 --- a/src/morse.h +++ b/src/morse.h @@ -1,4 +1,9 @@ +typedef long int integer; +typedef unsigned long int uinteger; +typedef float real; +typedef double doublereal; +typedef int ftnlen; extern int rcvr_(real *, real *); extern int noise_(real *, real *, real *); @@ -24,3 +29,4 @@ extern doublereal spdtr_(integer *, integer *, integer *, integer *); #define DECIMATE 20 // Decimation FLDIGI=40 MORSE.M=20 #define SAMPLEDURATION (1000. * DECIMATE) / FSAMPLE // 1000*DECIMATE / FSAMPLE SHOULD BE 5 msec #define NDELAY 200 // 200 SAMPLES * 5 msec = 1000 msec decoding delay + diff --git a/src/noise.c b/src/noise.c index 22c339b..a15578f 100644 --- a/src/noise.c +++ b/src/noise.c @@ -10,7 +10,8 @@ http://www.netlib.org/f2c/libf2c.zip */ -#include "f2c.h" +//#include "f2c.h" +#include "morse.h" /* Subroutine */ int noise_(real *zin, real *rn, real *z__) { diff --git a/src/path.c b/src/path.c index 52b6dce..2418c33 100644 --- a/src/path.c +++ b/src/path.c @@ -10,7 +10,7 @@ http://www.netlib.org/f2c/libf2c.zip */ -#include "f2c.h" +//#include "f2c.h" #include "morse.h" /* Common Block Declarations */ diff --git a/src/proces.c b/src/proces.c index 8f08df0..8c36fb0 100644 --- a/src/proces.c +++ b/src/proces.c @@ -10,7 +10,7 @@ http://www.netlib.org/f2c/libf2c.zip */ -#include "f2c.h" +//#include "f2c.h" #include "morse.h" /* Table of constant values */ diff --git a/src/ptrans.c b/src/ptrans.c index a519f01..5757ba0 100644 --- a/src/ptrans.c +++ b/src/ptrans.c @@ -10,7 +10,7 @@ http://www.netlib.org/f2c/libf2c.zip */ -#include "f2c.h" +//#include "f2c.h" #include "morse.h" /* Common Block Declarations */ diff --git a/src/savep.c b/src/savep.c index a99b90a..7b7b4fc 100644 --- a/src/savep.c +++ b/src/savep.c @@ -10,7 +10,8 @@ http://www.netlib.org/f2c/libf2c.zip */ -#include "f2c.h" +//#include "f2c.h" +#include "morse.h" /* Common Block Declarations */ diff --git a/src/sprob.c b/src/sprob.c index 7446966..a34ae15 100644 --- a/src/sprob.c +++ b/src/sprob.c @@ -10,7 +10,9 @@ http://www.netlib.org/f2c/libf2c.zip */ -#include "f2c.h" +//#include "f2c.h" +#include "morse.h" + #include extern char debug; diff --git a/src/transl.c b/src/transl.c index a87f7fc..3c988a6 100644 --- a/src/transl.c +++ b/src/transl.c @@ -1,4 +1,4 @@ -#include "f2c.h" +//#include "f2c.h" #include #include "morse.h" extern char debug; diff --git a/src/trelis.c b/src/trelis.c index 017a6ef..11b0239 100644 --- a/src/trelis.c +++ b/src/trelis.c @@ -10,7 +10,7 @@ http://www.netlib.org/f2c/libf2c.zip */ -#include "f2c.h" +//#include "f2c.h" #include #include "morse.h" diff --git a/src/trprob.c b/src/trprob.c index ecc4a6a..ea753ba 100644 --- a/src/trprob.c +++ b/src/trprob.c @@ -10,7 +10,8 @@ http://www.netlib.org/f2c/libf2c.zip */ -#include "f2c.h" +//#include "f2c.h" +#include "morse.h" /* Common Block Declarations */ diff --git a/src/xtrans.c b/src/xtrans.c index 475fa4f..bb9b8b1 100644 --- a/src/xtrans.c +++ b/src/xtrans.c @@ -10,7 +10,9 @@ http://www.netlib.org/f2c/libf2c.zip */ -#include "f2c.h" + +//#include "f2c.h" +#include "morse.h" doublereal xtrans_(integer *ielem, real *d0, integer *irate) {