kopia lustrzana https://github.com/ag1le/morse-wip
Found a problem - speed estimation spdhat (updated in sprob.cxx) doesn't work any more.
AG1LE Mauri
rodzic
acd7afb52d
commit
75f4417801
|
|
@ -1,6 +1,6 @@
|
|||
(C) 2013,2014 AG1LE Mauri Niininen
|
||||
2014-JUL-19
|
||||
git tag -a v0.1.03 -m "Release v0.1.03"
|
||||
git tag -a v0.1.04 -m "Release v0.1.04"
|
||||
Removed all static variables to enable running multiple instances - used in FLDIGI experimental release.
|
||||
|
||||
2014-JUN-22
|
||||
|
|
|
|||
6
Makefile
6
Makefile
|
|
@ -189,15 +189,15 @@ PACKAGE_HOME = https://github.com/ag1le/morse-wip
|
|||
PACKAGE_NAME = bmorse
|
||||
PACKAGE_NEWBUG = https://github.com/ag1le/morse-wip/issues
|
||||
PACKAGE_PROJ = https://github.com/ag1le/morse-wip
|
||||
PACKAGE_STRING = bmorse 0.1.03
|
||||
PACKAGE_STRING = bmorse 0.1.04
|
||||
PACKAGE_TARNAME = bmorse
|
||||
PACKAGE_URL =
|
||||
PACKAGE_VERSION = 0.1.03
|
||||
PACKAGE_VERSION = 0.1.04
|
||||
PATH_SEPARATOR = :
|
||||
SET_MAKE =
|
||||
SHELL = /bin/bash
|
||||
STRIP =
|
||||
VERSION = 0.1.03
|
||||
VERSION = 0.1.04
|
||||
abs_builddir = /home/mauri/Projects/morse
|
||||
abs_srcdir = /home/mauri/Projects/morse
|
||||
abs_top_builddir = /home/mauri/Projects/morse
|
||||
|
|
|
|||
6
config.h
6
config.h
|
|
@ -56,7 +56,7 @@
|
|||
#define PACKAGE_NEWBUG "https://github.com/ag1le/morse-wip/issues"
|
||||
|
||||
/* Define to the full name and version of this package. */
|
||||
#define PACKAGE_STRING "bmorse 0.1.03"
|
||||
#define PACKAGE_STRING "bmorse 0.1.04"
|
||||
|
||||
/* Define to the one symbol short name of this package. */
|
||||
#define PACKAGE_TARNAME "bmorse"
|
||||
|
|
@ -65,7 +65,7 @@
|
|||
#define PACKAGE_URL ""
|
||||
|
||||
/* Define to the version of this package. */
|
||||
#define PACKAGE_VERSION "0.1.03"
|
||||
#define PACKAGE_VERSION "0.1.04"
|
||||
|
||||
/* Define to 1 if you have the ANSI C header files. */
|
||||
#define STDC_HEADERS 1
|
||||
|
|
@ -93,7 +93,7 @@
|
|||
|
||||
|
||||
/* Version number of package */
|
||||
#define VERSION "0.1.03"
|
||||
#define VERSION "0.1.04"
|
||||
|
||||
/* Define to 1 if on MINIX. */
|
||||
/* #undef _MINIX */
|
||||
|
|
|
|||
50
config.log
50
config.log
|
|
@ -1,7 +1,7 @@
|
|||
This file contains any messages produced by compilers while
|
||||
running configure, to aid debugging if configure makes a mistake.
|
||||
|
||||
It was created by bmorse configure 0.1.03, which was
|
||||
It was created by bmorse configure 0.1.04, which was
|
||||
generated by GNU Autoconf 2.69. Invocation command line was
|
||||
|
||||
$ ./configure
|
||||
|
|
@ -178,14 +178,14 @@ configure: failed program was:
|
|||
| /* confdefs.h */
|
||||
| #define PACKAGE_NAME "bmorse"
|
||||
| #define PACKAGE_TARNAME "bmorse"
|
||||
| #define PACKAGE_VERSION "0.1.03"
|
||||
| #define PACKAGE_STRING "bmorse 0.1.03"
|
||||
| #define PACKAGE_VERSION "0.1.04"
|
||||
| #define PACKAGE_STRING "bmorse 0.1.04"
|
||||
| #define PACKAGE_BUGREPORT "ag1le@innomore.com"
|
||||
| #define PACKAGE_URL ""
|
||||
| #define PACKAGE "bmorse"
|
||||
| #define VERSION "0.1.03"
|
||||
| #define VERSION "0.1.04"
|
||||
| #define PACKAGE "bmorse"
|
||||
| #define VERSION "0.1.03"
|
||||
| #define VERSION "0.1.04"
|
||||
| #define FLDIGI_AUTHORS "Mauri Niininen"
|
||||
| #define PACKAGE_HOME "https://github.com/ag1le/morse-wip"
|
||||
| #define PACKAGE_DL "https://github.com/ag1le/morse-wip"
|
||||
|
|
@ -205,14 +205,14 @@ configure: failed program was:
|
|||
| /* confdefs.h */
|
||||
| #define PACKAGE_NAME "bmorse"
|
||||
| #define PACKAGE_TARNAME "bmorse"
|
||||
| #define PACKAGE_VERSION "0.1.03"
|
||||
| #define PACKAGE_STRING "bmorse 0.1.03"
|
||||
| #define PACKAGE_VERSION "0.1.04"
|
||||
| #define PACKAGE_STRING "bmorse 0.1.04"
|
||||
| #define PACKAGE_BUGREPORT "ag1le@innomore.com"
|
||||
| #define PACKAGE_URL ""
|
||||
| #define PACKAGE "bmorse"
|
||||
| #define VERSION "0.1.03"
|
||||
| #define VERSION "0.1.04"
|
||||
| #define PACKAGE "bmorse"
|
||||
| #define VERSION "0.1.03"
|
||||
| #define VERSION "0.1.04"
|
||||
| #define FLDIGI_AUTHORS "Mauri Niininen"
|
||||
| #define PACKAGE_HOME "https://github.com/ag1le/morse-wip"
|
||||
| #define PACKAGE_DL "https://github.com/ag1le/morse-wip"
|
||||
|
|
@ -278,14 +278,14 @@ configure: failed program was:
|
|||
| /* confdefs.h */
|
||||
| #define PACKAGE_NAME "bmorse"
|
||||
| #define PACKAGE_TARNAME "bmorse"
|
||||
| #define PACKAGE_VERSION "0.1.03"
|
||||
| #define PACKAGE_STRING "bmorse 0.1.03"
|
||||
| #define PACKAGE_VERSION "0.1.04"
|
||||
| #define PACKAGE_STRING "bmorse 0.1.04"
|
||||
| #define PACKAGE_BUGREPORT "ag1le@innomore.com"
|
||||
| #define PACKAGE_URL ""
|
||||
| #define PACKAGE "bmorse"
|
||||
| #define VERSION "0.1.03"
|
||||
| #define VERSION "0.1.04"
|
||||
| #define PACKAGE "bmorse"
|
||||
| #define VERSION "0.1.03"
|
||||
| #define VERSION "0.1.04"
|
||||
| #define FLDIGI_AUTHORS "Mauri Niininen"
|
||||
| #define PACKAGE_HOME "https://github.com/ag1le/morse-wip"
|
||||
| #define PACKAGE_DL "https://github.com/ag1le/morse-wip"
|
||||
|
|
@ -347,14 +347,14 @@ configure: failed program was:
|
|||
| /* confdefs.h */
|
||||
| #define PACKAGE_NAME "bmorse"
|
||||
| #define PACKAGE_TARNAME "bmorse"
|
||||
| #define PACKAGE_VERSION "0.1.03"
|
||||
| #define PACKAGE_STRING "bmorse 0.1.03"
|
||||
| #define PACKAGE_VERSION "0.1.04"
|
||||
| #define PACKAGE_STRING "bmorse 0.1.04"
|
||||
| #define PACKAGE_BUGREPORT "ag1le@innomore.com"
|
||||
| #define PACKAGE_URL ""
|
||||
| #define PACKAGE "bmorse"
|
||||
| #define VERSION "0.1.03"
|
||||
| #define VERSION "0.1.04"
|
||||
| #define PACKAGE "bmorse"
|
||||
| #define VERSION "0.1.03"
|
||||
| #define VERSION "0.1.04"
|
||||
| #define FLDIGI_AUTHORS "Mauri Niininen"
|
||||
| #define PACKAGE_HOME "https://github.com/ag1le/morse-wip"
|
||||
| #define PACKAGE_DL "https://github.com/ag1le/morse-wip"
|
||||
|
|
@ -386,7 +386,7 @@ configure:5029: creating ./config.status
|
|||
## Running config.status. ##
|
||||
## ---------------------- ##
|
||||
|
||||
This file was extended by bmorse config.status 0.1.03, which was
|
||||
This file was extended by bmorse config.status 0.1.04, which was
|
||||
generated by GNU Autoconf 2.69. Invocation command line was
|
||||
|
||||
CONFIG_FILES =
|
||||
|
|
@ -519,15 +519,15 @@ PACKAGE_HOME='https://github.com/ag1le/morse-wip'
|
|||
PACKAGE_NAME='bmorse'
|
||||
PACKAGE_NEWBUG='https://github.com/ag1le/morse-wip/issues'
|
||||
PACKAGE_PROJ='https://github.com/ag1le/morse-wip'
|
||||
PACKAGE_STRING='bmorse 0.1.03'
|
||||
PACKAGE_STRING='bmorse 0.1.04'
|
||||
PACKAGE_TARNAME='bmorse'
|
||||
PACKAGE_URL=''
|
||||
PACKAGE_VERSION='0.1.03'
|
||||
PACKAGE_VERSION='0.1.04'
|
||||
PATH_SEPARATOR=':'
|
||||
SET_MAKE=''
|
||||
SHELL='/bin/bash'
|
||||
STRIP=''
|
||||
VERSION='0.1.03'
|
||||
VERSION='0.1.04'
|
||||
ac_ct_CC='gcc'
|
||||
ac_ct_CXX='g++'
|
||||
am__EXEEXT_FALSE=''
|
||||
|
|
@ -578,14 +578,14 @@ target_alias=''
|
|||
/* confdefs.h */
|
||||
#define PACKAGE_NAME "bmorse"
|
||||
#define PACKAGE_TARNAME "bmorse"
|
||||
#define PACKAGE_VERSION "0.1.03"
|
||||
#define PACKAGE_STRING "bmorse 0.1.03"
|
||||
#define PACKAGE_VERSION "0.1.04"
|
||||
#define PACKAGE_STRING "bmorse 0.1.04"
|
||||
#define PACKAGE_BUGREPORT "ag1le@innomore.com"
|
||||
#define PACKAGE_URL ""
|
||||
#define PACKAGE "bmorse"
|
||||
#define VERSION "0.1.03"
|
||||
#define VERSION "0.1.04"
|
||||
#define PACKAGE "bmorse"
|
||||
#define VERSION "0.1.03"
|
||||
#define VERSION "0.1.04"
|
||||
#define FLDIGI_AUTHORS "Mauri Niininen"
|
||||
#define PACKAGE_HOME "https://github.com/ag1le/morse-wip"
|
||||
#define PACKAGE_DL "https://github.com/ag1le/morse-wip"
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
#! /bin/sh
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.69 for bmorse 0.1.03.
|
||||
# Generated by GNU Autoconf 2.69 for bmorse 0.1.04.
|
||||
#
|
||||
# Report bugs to <ag1le@innomore.com>.
|
||||
#
|
||||
|
|
@ -582,8 +582,8 @@ MAKEFLAGS=
|
|||
# Identity of this package.
|
||||
PACKAGE_NAME='bmorse'
|
||||
PACKAGE_TARNAME='bmorse'
|
||||
PACKAGE_VERSION='0.1.03'
|
||||
PACKAGE_STRING='bmorse 0.1.03'
|
||||
PACKAGE_VERSION='0.1.04'
|
||||
PACKAGE_STRING='bmorse 0.1.04'
|
||||
PACKAGE_BUGREPORT='ag1le@innomore.com'
|
||||
PACKAGE_URL=''
|
||||
|
||||
|
|
@ -1288,7 +1288,7 @@ if test "$ac_init_help" = "long"; then
|
|||
# Omit some internal or obsolete options to make the list less imposing.
|
||||
# This message is too long to be a string in the A/UX 3.1 sh.
|
||||
cat <<_ACEOF
|
||||
\`configure' configures bmorse 0.1.03 to adapt to many kinds of systems.
|
||||
\`configure' configures bmorse 0.1.04 to adapt to many kinds of systems.
|
||||
|
||||
Usage: $0 [OPTION]... [VAR=VALUE]...
|
||||
|
||||
|
|
@ -1354,7 +1354,7 @@ fi
|
|||
|
||||
if test -n "$ac_init_help"; then
|
||||
case $ac_init_help in
|
||||
short | recursive ) echo "Configuration of bmorse 0.1.03:";;
|
||||
short | recursive ) echo "Configuration of bmorse 0.1.04:";;
|
||||
esac
|
||||
cat <<\_ACEOF
|
||||
|
||||
|
|
@ -1447,7 +1447,7 @@ fi
|
|||
test -n "$ac_init_help" && exit $ac_status
|
||||
if $ac_init_version; then
|
||||
cat <<\_ACEOF
|
||||
bmorse configure 0.1.03
|
||||
bmorse configure 0.1.04
|
||||
generated by GNU Autoconf 2.69
|
||||
|
||||
Copyright (C) 2012 Free Software Foundation, Inc.
|
||||
|
|
@ -1743,7 +1743,7 @@ cat >config.log <<_ACEOF
|
|||
This file contains any messages produced by compilers while
|
||||
running configure, to aid debugging if configure makes a mistake.
|
||||
|
||||
It was created by bmorse $as_me 0.1.03, which was
|
||||
It was created by bmorse $as_me 0.1.04, which was
|
||||
generated by GNU Autoconf 2.69. Invocation command line was
|
||||
|
||||
$ $0 $@
|
||||
|
|
@ -2093,7 +2093,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
|||
|
||||
|
||||
PACKAGE=bmorse
|
||||
VERSION=0.1.03
|
||||
VERSION=0.1.04
|
||||
|
||||
am__api_version='1.11'
|
||||
|
||||
|
|
@ -2626,7 +2626,7 @@ fi
|
|||
|
||||
# Define the identity of the package.
|
||||
PACKAGE='bmorse'
|
||||
VERSION='0.1.03'
|
||||
VERSION='0.1.04'
|
||||
|
||||
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
|
|
@ -5418,7 +5418,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
|
|||
# report actual input values of CONFIG_FILES etc. instead of their
|
||||
# values after options handling.
|
||||
ac_log="
|
||||
This file was extended by bmorse $as_me 0.1.03, which was
|
||||
This file was extended by bmorse $as_me 0.1.04, which was
|
||||
generated by GNU Autoconf 2.69. Invocation command line was
|
||||
|
||||
CONFIG_FILES = $CONFIG_FILES
|
||||
|
|
@ -5484,7 +5484,7 @@ _ACEOF
|
|||
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
||||
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
|
||||
ac_cs_version="\\
|
||||
bmorse config.status 0.1.03
|
||||
bmorse config.status 0.1.04
|
||||
configured by $0, generated by GNU Autoconf 2.69,
|
||||
with options \\"\$ac_cs_config\\"
|
||||
|
||||
|
|
|
|||
|
|
@ -6,12 +6,12 @@ AC_COPYRIGHT([Copyright (C) 2013,2014 Mauri Niininen, AG1LE])
|
|||
AC_PREREQ(2.61)
|
||||
m4_define(BMORSE_MAJOR, [0])
|
||||
m4_define(BMORSE_MINOR, [1])
|
||||
m4_define(BMORSE_PATCH, [.03])
|
||||
m4_define(BMORSE_PATCH, [.04])
|
||||
|
||||
AC_INIT([bmorse], BMORSE_MAJOR.BMORSE_MINOR[]BMORSE_PATCH, [ag1le@innomore.com])
|
||||
|
||||
PACKAGE=bmorse
|
||||
VERSION=0.1.03
|
||||
VERSION=0.1.04
|
||||
|
||||
AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
|
||||
|
||||
|
|
|
|||
|
|
@ -328,7 +328,7 @@ void process_data(double x)
|
|||
if (x > agc_peak)
|
||||
agc_peak = decayavg(agc_peak, x, 10);
|
||||
else
|
||||
agc_peak = decayavg(agc_peak, x, 900);
|
||||
agc_peak = decayavg(agc_peak, x, 800);
|
||||
|
||||
if (agc_peak != 0.0){
|
||||
x /= agc_peak;
|
||||
|
|
@ -369,7 +369,8 @@ int rx_FFTprocess(const double *buf, int len)
|
|||
int n,i,speclen,Hz;
|
||||
static int smpl_ctr = 0;
|
||||
static double FFTvalue,FFTphase =0.0;
|
||||
fftw_plan plan;
|
||||
|
||||
/* fftw_plan plan;
|
||||
double single_max,noise_sum,sig_sum,Nrms,Srms,fbin;
|
||||
double time_domain[1024];
|
||||
double freq_domain[1024];
|
||||
|
|
@ -530,7 +531,7 @@ void decode_sndfile (SNDFILE *infile, SF_INFO info)
|
|||
printf("# bit filter=%d\n",bfv);
|
||||
printf("# num_items=%d\n",num_items);
|
||||
printf("# sample_duration=%f\n",params.sample_duration);
|
||||
printf("# bitfilter=%d\n",params.bfv);
|
||||
printf("# params.bitfilter=%d\n",params.bfv);
|
||||
printf("# speed(WPM):%d\n",params.speed);
|
||||
printf("# FFT filter bandwidth %f\n",2.0* params.speed/1.2);
|
||||
}
|
||||
|
|
@ -610,17 +611,15 @@ void decode_sndfile (SNDFILE *infile, SF_INFO info)
|
|||
printf ("%s : line %d :out of memory.\n", __FILE__, __LINE__) ;
|
||||
exit (1) ;
|
||||
}
|
||||
memset(buf,0,(num_items+512)*sizeof(double));
|
||||
bp = buf;
|
||||
|
||||
num = sf_read_double(infile,bp,num_items);
|
||||
// printf("Read %d items\n",num);
|
||||
|
||||
for (i = 0; i < num_items; i += 512){
|
||||
|
||||
rx_FFTprocess(bp, 512);
|
||||
bp += 512;
|
||||
|
||||
|
||||
}
|
||||
free(buf);
|
||||
}
|
||||
|
|
|
|||
Ładowanie…
Reference in New Issue