Skip to content

Commit

Permalink
Merge tag 'v3.21.70' of git://git.berlios.de/fldigi
Browse files Browse the repository at this point in the history 
Conflicts:
	src/dialogs/confdialog.cxx
	src/dialogs/confdialog.fl
  • Loading branch information
@jamescoxon
jamescoxon committed Nov 29, 2013
2 parents f440cfc + d052e14 commit d1e0e9a
Show file tree
Hide file tree
Showing 23 changed files with 512 additions and 170 deletions.
35 changes: 30 additions & 5 deletions ChangeLog
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,42 @@


=Version 3.21.69=
=Version 3.21.70=

2013-04-13 David Freese <[email protected]>

ab4e0f2: Contestia/Olivia
45be148: Tabs Colors

2013-04-13 Arvo Järve <[email protected]>

89e1df1: Double Click bug fix

2013-04-12 David Freese <[email protected]>

efce800: RTTY update
e2b050e: Fltk backward compatibility
27e753e: Compiler warning fix

2013-04-09 David Freese <[email protected]>
2013-04-11 Kamal Mostafa <[email protected]>

5f770be: Fix glob_t usage

2013-04-11 David Freese <[email protected]>

1e94067: Spotting
fc68397: ADIF case


=Version 3.21.69=

b5d08e4: QSO NBR/NXT macro tag
3f99de8: TX lower case
524864e: QSO NBR/NXT macro tag
303681e: TX lower case
69bab69: WX parser
6e5a68d: Signal Browser
2ecbeca: Compiler Warnings
5134b81: Free BSD mods
f794566: flstring
234380f: RTTY filters
92ede71: RTTY filters
6e9a943: Serial by-id
5a2c244: RTTY tx symbol shaper
093796f: Misc NBEMS mods
Expand Down
2 changes: 1 addition & 1 deletion configure.ac
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ dnl major and minor must be integers; patch may
dnl contain other characters or be empty
m4_define(FLDIGI_MAJOR, [3])
m4_define(FLDIGI_MINOR, [21])
m4_define(FLDIGI_PATCH, [.69])
m4_define(FLDIGI_PATCH, [.70])
m4_define(FLARQ_MAJOR, [4])
m4_define(FLARQ_MINOR, [3])
m4_define(FLARQ_PATCH, [.4])
Expand Down
11 changes: 9 additions & 2 deletions m4/fltk.m4
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,21 @@ AC_DEFUN([AC_FLDIGI_FLTK], [
])
fi
HAVE_FLTK_API_VERSION=no
FLTK_API_VERSION="`$FLTK_CONFIG --api-version`"
FLTK_API_VERSION="`$FLTK_CONFIG --version`"
if test $? -ne 0; then
AC_MSG_ERROR([$FLTK_CONFIG failed])
fi
if test -n "$(expr $FLTK_API_VERSION : '1\.1[3]')"; then
HAVE_FLTK_API_VERSION=yes
fi
FLDIGI_FLTK_API_MAJOR=${FLTK_API_VERSION%%.*}
FLDIGI_FLTK_API_MINOR=${FLTK_API_VERSION#*.}; FLDIGI_FLTK_API_MINOR=${FLDIGI_FLTK_API_MINOR%%.*}
FLDIGI_FLTK_API_MINOR=${FLTK_API_VERSION#*.};
FLDIGI_FLTK_API_MINOR=${FLDIGI_FLTK_API_MINOR%%.*}
FLDIGI_FLTK_API_PATCH=${FLTK_API_VERSION#*.};
FLDIGI_FLTK_API_PATCH=${FLDIGI_FLTK_API_PATCH#*.};
if test "${HAVE_FLTK_API_VERSION}" = "no"; then
AC_MSG_ERROR([
*** The version of FLTK found on your system provides API version $FLTK_API_VERSION.
Expand All @@ -50,6 +56,7 @@ AC_DEFUN([AC_FLDIGI_FLTK], [
AC_DEFINE_UNQUOTED([FLTK_BUILD_VERSION], ["`$FLTK_CONFIG --version`"], [FLTK version])
AC_DEFINE_UNQUOTED([FLDIGI_FLTK_API_MAJOR], [$FLDIGI_FLTK_API_MAJOR], [FLTK API major version])
AC_DEFINE_UNQUOTED([FLDIGI_FLTK_API_MINOR], [$FLDIGI_FLTK_API_MINOR], [FLTK API minor version])
AC_DEFINE_UNQUOTED([FLDIGI_FLTK_API_PATCH], [$FLDIGI_FLTK_API_PATCH], [FLTK API patch])
AC_ARG_VAR([FLUID], [Fast Light User-Interface Designer])
AC_CHECK_PROG([FLUID], [fluid], [fluid])
Expand Down
2 changes: 2 additions & 0 deletions src/Makefile.am
View file
Original file line number Diff line number Diff line change
Expand Up @@ -540,6 +540,8 @@ dl_fldigi_SOURCES += \
widgets/picture.cxx \
widgets/progress.cxx \
widgets/psk_browser.cxx \
widgets/missing_strings.c \
widgets/missing_strings.h \
wwv/analysis.cxx \
wwv/wwv.cxx \
logbook/xmlrpc_log.cxx \
Expand Down
63 changes: 19 additions & 44 deletions src/cw_rtty/rtty.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -164,56 +164,22 @@ void rtty::reset_filters()
{
int filter_length = 1024;

/* filtertype:
* 0 - extended rcos(0); K * (t/T)
* 1 - extended rcos(1)
* 2 - extended rcos(2)
* 3 - smf rcos(0)
* 4 - smf rcos(1)
* 5 - smf rcos(2)
* 6 - sinc
* 7 - smf3
* 8 - matched
*/

// Stefan:
// rtty_filter
// 1.25 ==> best performance on Dave's computer(s)
// 1.5 ===> best performance on Stefan's computer
// see fftfilt.h and fftfilt.cxx
//
if (mark_filt) {
if (progdefaults.rtty_filter == 1)
mark_filt->rtty_order(rtty_baud/samplerate, 0,
progdefaults.rtty_filter, 1.0);
else
mark_filt->rtty_order(rtty_baud/samplerate, 0,
progdefaults.rtty_filter, 1.0);
mark_filt->rtty_order(rtty_baud/samplerate, 0,
progdefaults.rtty_filter, 1.0);
} else {
mark_filt = new fftfilt(rtty_baud/samplerate, filter_length);
if (progdefaults.rtty_filter == 1)
mark_filt->rtty_order(rtty_baud/samplerate, 0,
progdefaults.rtty_filter, 1.0);
else
mark_filt->rtty_order(rtty_baud/samplerate, 0,
progdefaults.rtty_filter, 1.0);
mark_filt->rtty_order(rtty_baud/samplerate, 0,
progdefaults.rtty_filter, 1.0);
}

if (space_filt) {
if (progdefaults.rtty_filter == 1)
space_filt->rtty_order(rtty_baud/samplerate, 0,
progdefaults.rtty_filter, 1.0);
else
space_filt->rtty_order(rtty_baud/samplerate, 0,
progdefaults.rtty_filter, 1.0);
space_filt->rtty_order(rtty_baud/samplerate, 0,
progdefaults.rtty_filter, 1.0);
} else {
space_filt = new fftfilt(rtty_baud/samplerate, filter_length);
if (progdefaults.rtty_filter == 1)
space_filt->rtty_order(rtty_baud/samplerate, 0,
progdefaults.rtty_filter, 1.0);
else
space_filt->rtty_order(rtty_baud/samplerate, 0,
progdefaults.rtty_filter, 1.0);
space_filt->rtty_order(rtty_baud/samplerate, 0,
progdefaults.rtty_filter, 1.0);
}
}

Expand Down Expand Up @@ -432,7 +398,7 @@ bool rtty::is_mark_space( int &correction)
// test for mark/space straddle point
for (int i = 0; i < symbollen; i++)
correction += bit_buf[i];
if (abs(symbollen/2 - correction) < 6) // too small & bad signals as not decoded
if (abs(symbollen/2 - correction) < 6) // too small & bad signals are not decoded
return true;
}
return false;
Expand Down Expand Up @@ -606,7 +572,7 @@ int rtty::rx_process(const double *buf, int len)

if (rttyviewer && !bHistory &&
(!progdefaults.report_when_visible ||
progdefaults.report_when_visible && (dlgViewer->visible() || progStatus.show_channels)))
(progdefaults.report_when_visible && (dlgViewer->visible() || progStatus.show_channels))))
rttyviewer->rx_process(buf, len);

if (progStatus.rtty_filter_changed) {
Expand Down Expand Up @@ -680,6 +646,15 @@ if (mnum < 2 * filter_length)
if (mclipped < noise_floor) mclipped = noise_floor;
if (sclipped < noise_floor) sclipped = noise_floor;

switch (progdefaults.rtty_cwi) {
case 1 : // mark only decode
space_env = sclipped = noise_floor;
break;
case 2: // space only decode
mark_env = mclipped = noise_floor;
default : ;
}

// double v0, v1, v2, v3, v4, v5;
double v3;
// no ATC
Expand Down
40 changes: 20 additions & 20 deletions src/dialogs/Viewer.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,11 +72,11 @@ void initViewer()
mainViewer->usb = usb;
mainViewer->rfc = rfc;
mainViewer->setfont(progdefaults.ViewerFontnbr, progdefaults.ViewerFontsize);
mainViewer->HighLight_1(progdefaults.bwsrHiLight1);
mainViewer->HighLight_2(progdefaults.bwsrHiLight2);
mainViewer->SelectColor(progdefaults.bwsrSelect);
mainViewer->Background1(progdefaults.bwsrBackgnd1);
mainViewer->Background2(progdefaults.bwsrBackgnd2);
mainViewer->HighLight_1((Fl_Color)progdefaults.bwsrHiLight1);
mainViewer->HighLight_2((Fl_Color)progdefaults.bwsrHiLight2);
mainViewer->SelectColor((Fl_Color)progdefaults.bwsrSelect);
mainViewer->Background1((Fl_Color)progdefaults.bwsrBackgnd1);
mainViewer->Background2((Fl_Color)progdefaults.bwsrBackgnd2);
mainViewer->makecolors();
mainViewer->clear();
if (active_modem->get_mode() == MODE_RTTY) {
Expand All @@ -91,11 +91,11 @@ void initViewer()
brwsViewer->usb = usb;
brwsViewer->rfc = rfc;
brwsViewer->setfont(progdefaults.ViewerFontnbr, progdefaults.ViewerFontsize);
brwsViewer->HighLight_1(progdefaults.bwsrHiLight1);
brwsViewer->HighLight_2(progdefaults.bwsrHiLight2);
brwsViewer->SelectColor(progdefaults.bwsrSelect);
brwsViewer->Background1(progdefaults.bwsrBackgnd1);
brwsViewer->Background2(progdefaults.bwsrBackgnd2);
brwsViewer->HighLight_1((Fl_Color)progdefaults.bwsrHiLight1);
brwsViewer->HighLight_2((Fl_Color)progdefaults.bwsrHiLight2);
brwsViewer->SelectColor((Fl_Color)progdefaults.bwsrSelect);
brwsViewer->Background1((Fl_Color)progdefaults.bwsrBackgnd1);
brwsViewer->Background2((Fl_Color)progdefaults.bwsrBackgnd2);
brwsViewer->makecolors();
brwsViewer->clear();
dlgViewer->size(dlgViewer->w(), dlgViewer->h() - brwsViewer->h() +
Expand Down Expand Up @@ -158,11 +158,11 @@ void viewer_redraw()
if (mainViewer) {
mainViewer->usb = usb;
mainViewer->rfc = rfc;
mainViewer->HighLight_1(progdefaults.bwsrHiLight1);
mainViewer->HighLight_2(progdefaults.bwsrHiLight2);
mainViewer->SelectColor(progdefaults.bwsrSelect);
mainViewer->Background1(progdefaults.bwsrBackgnd1);
mainViewer->Background2(progdefaults.bwsrBackgnd2);
mainViewer->HighLight_1((Fl_Color)progdefaults.bwsrHiLight1);
mainViewer->HighLight_2((Fl_Color)progdefaults.bwsrHiLight2);
mainViewer->SelectColor((Fl_Color)progdefaults.bwsrSelect);
mainViewer->Background1((Fl_Color)progdefaults.bwsrBackgnd1);
mainViewer->Background2((Fl_Color)progdefaults.bwsrBackgnd2);
mainViewer->makecolors();
mainViewer->resize(mainViewer->x(), mainViewer->y(), mainViewer->w(), mainViewer->h());
}
Expand All @@ -171,11 +171,11 @@ void viewer_redraw()
brwsViewer->rfc = rfc;
brwsViewer->resize(
brwsViewer->x(), brwsViewer->y(), brwsViewer->w(), brwsViewer->h());
brwsViewer->HighLight_1(progdefaults.bwsrHiLight1);
brwsViewer->HighLight_2(progdefaults.bwsrHiLight2);
brwsViewer->SelectColor(progdefaults.bwsrSelect);
brwsViewer->Background1(progdefaults.bwsrBackgnd1);
brwsViewer->Background2(progdefaults.bwsrBackgnd2);
brwsViewer->HighLight_1((Fl_Color)progdefaults.bwsrHiLight1);
brwsViewer->HighLight_2((Fl_Color)progdefaults.bwsrHiLight2);
brwsViewer->SelectColor((Fl_Color)progdefaults.bwsrSelect);
brwsViewer->Background1((Fl_Color)progdefaults.bwsrBackgnd1);
brwsViewer->Background2((Fl_Color)progdefaults.bwsrBackgnd2);
brwsViewer->makecolors();
dlgViewer->redraw();
}
Expand Down
Loading

0 comments on commit d1e0e9a

Please sign in to comment.