Commit f588b177 authored by Joop Stakenborg's avatar Joop Stakenborg Committed by Christoph Berg

Import Debian changes 0.9.30-1

tlf (0.9.30-1) unstable; urgency=low

  * New upstream release
  * Use libhamlib-dev as a build dependency from now on.
parents ca9b7c66 452cd09f
......@@ -3,7 +3,7 @@
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
timestamp='2005-08-03'
timestamp='2006-02-23'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
......@@ -106,7 +106,7 @@ set_cc_for_build='
trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
: ${TMPDIR=/tmp} ;
{ tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
{ tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
{ test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
{ tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
{ echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
......@@ -206,6 +206,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
*:ekkoBSD:*:*)
echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
exit ;;
*:SolidBSD:*:*)
echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
exit ;;
macppc:MirBSD:*:*)
echo powerppc-unknown-mirbsd${UNAME_RELEASE}
exit ;;
......@@ -764,7 +767,12 @@ EOF
echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
exit ;;
*:FreeBSD:*:*)
echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
case ${UNAME_MACHINE} in
pc98)
echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
*)
echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
esac
exit ;;
i*:CYGWIN*:*)
echo ${UNAME_MACHINE}-pc-cygwin
......@@ -772,6 +780,9 @@ EOF
i*:MINGW*:*)
echo ${UNAME_MACHINE}-pc-mingw32
exit ;;
i*:MSYS_NT-*:*:*)
echo ${UNAME_MACHINE}-pc-mingw32
exit ;;
i*:windows32*:*)
# uname -m includes "-pc" on this system.
echo ${UNAME_MACHINE}-mingw32
......@@ -779,8 +790,11 @@ EOF
i*:PW*:*)
echo ${UNAME_MACHINE}-pc-pw32
exit ;;
x86:Interix*:[34]*)
echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
x86:Interix*:[345]*)
echo i586-pc-interix${UNAME_RELEASE}
exit ;;
EM64T:Interix*:[345]*)
echo x86_64-unknown-interix${UNAME_RELEASE}
exit ;;
[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
echo i${UNAME_MACHINE}-pc-mks
......@@ -851,7 +865,11 @@ EOF
#endif
#endif
EOF
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
/^CPU/{
s: ::g
p
}'`"
test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
;;
mips64:Linux:*:*)
......@@ -870,7 +888,11 @@ EOF
#endif
#endif
EOF
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
/^CPU/{
s: ::g
p
}'`"
test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
;;
or32:Linux:*:*)
......@@ -919,6 +941,9 @@ EOF
sparc:Linux:*:* | sparc64:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
vax:Linux:*:*)
echo ${UNAME_MACHINE}-dec-linux-gnu
exit ;;
x86_64:Linux:*:*)
echo x86_64-unknown-linux-gnu
exit ;;
......@@ -964,7 +989,7 @@ EOF
LIBC=gnulibc1
# endif
#else
#ifdef __INTEL_COMPILER
#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__sun)
LIBC=gnu
#else
LIBC=gnuaout
......@@ -974,7 +999,11 @@ EOF
LIBC=dietlibc
#endif
EOF
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
/^LIBC/{
s: ::g
p
}'`"
test x"${LIBC}" != x && {
echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
exit
......@@ -1185,7 +1214,6 @@ EOF
*:Darwin:*:*)
UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
case $UNAME_PROCESSOR in
*86) UNAME_PROCESSOR=i686 ;;
unknown) UNAME_PROCESSOR=powerpc ;;
esac
echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
......@@ -1264,6 +1292,9 @@ EOF
i*86:skyos:*:*)
echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
exit ;;
i*86:rdos:*:*)
echo ${UNAME_MACHINE}-pc-rdos
exit ;;
esac
#echo '(No uname command or uname output not recognized.)' 1>&2
......
......@@ -3,7 +3,7 @@
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
timestamp='2005-07-08'
timestamp='2006-02-23'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
......@@ -119,8 +119,9 @@ esac
# Here we must recognize all the valid KERNEL-OS combinations.
maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
case $maybe_os in
nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
storm-chaos* | os2-emx* | rtmk-nova*)
os=-$maybe_os
basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
;;
......@@ -171,6 +172,10 @@ case $os in
-hiux*)
os=-hiuxwe2
;;
-sco6)
os=-sco5v6
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
;;
-sco5)
os=-sco3.2v5
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
......@@ -187,6 +192,10 @@ case $os in
# Don't forget version if it is 3.2v4 or newer.
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
;;
-sco5v6*)
# Don't forget version if it is 3.2v4 or newer.
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
;;
-sco*)
os=-sco3.2v2
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
......@@ -239,7 +248,7 @@ case $basic_machine in
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
| i370 | i860 | i960 | ia64 \
| ip2k | iq2000 \
| m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \
| m32r | m32rle | m68000 | m68k | m88k | maxq | mb | microblaze | mcore \
| mips | mipsbe | mipseb | mipsel | mipsle \
| mips16 \
| mips64 | mips64el \
......@@ -257,8 +266,9 @@ case $basic_machine in
| mipsisa64sr71k | mipsisa64sr71kel \
| mipstx39 | mipstx39el \
| mn10200 | mn10300 \
| ms1 \
| mt \
| msp430 \
| nios | nios2 \
| ns16k | ns32k \
| or32 \
| pdp10 | pdp11 | pj | pjl \
......@@ -286,6 +296,9 @@ case $basic_machine in
;;
m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
;;
ms1)
basic_machine=mt-unknown
;;
# We use `pc' rather than `unknown'
# because (1) that's what they normally are, and
......@@ -336,8 +349,9 @@ case $basic_machine in
| mipsisa64sr71k-* | mipsisa64sr71kel-* \
| mipstx39-* | mipstx39el-* \
| mmix-* \
| ms1-* \
| mt-* \
| msp430-* \
| nios-* | nios2-* \
| none-* | np1-* | ns16k-* | ns32k-* \
| orion-* \
| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
......@@ -696,6 +710,9 @@ case $basic_machine in
basic_machine=i386-pc
os=-msdos
;;
ms1-*)
basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
;;
mvs)
basic_machine=i370-ibm
os=-mvs
......@@ -803,6 +820,12 @@ case $basic_machine in
pc532 | pc532-*)
basic_machine=ns32k-pc532
;;
pc98)
basic_machine=i386-pc
;;
pc98-*)
basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
pentium | p5 | k5 | k6 | nexgen | viac3)
basic_machine=i586-pc
;;
......@@ -859,6 +882,10 @@ case $basic_machine in
basic_machine=i586-unknown
os=-pw32
;;
rdos)
basic_machine=i386-pc
os=-rdos
;;
rom68k)
basic_machine=m68k-rom68k
os=-coff
......@@ -1174,21 +1201,23 @@ case $os in
| -aos* \
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
| -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
| -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
| -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
| -openbsd* | -solidbsd* \
| -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
| -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
| -chorusos* | -chorusrdb* \
| -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
| -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
| -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
| -uxpv* | -beos* | -mpeix* | -udk* \
| -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
| -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
| -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
| -skyos* | -haiku*)
| -skyos* | -haiku* | -rdos*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
-qnx*)
......
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.59 for src 0.9.27.
# Generated by GNU Autoconf 2.59 for src 0.9.30.
#
# Report bugs to <rein@couperus.com>.
#
......@@ -269,8 +269,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='src'
PACKAGE_TARNAME='src'
PACKAGE_VERSION='0.9.27'
PACKAGE_STRING='src 0.9.27'
PACKAGE_VERSION='0.9.30'
PACKAGE_STRING='src 0.9.30'
PACKAGE_BUGREPORT='rein@couperus.com'
# Factoring default headers for most tests.
......@@ -779,7 +779,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 src 0.9.27 to adapt to many kinds of systems.
\`configure' configures src 0.9.30 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
......@@ -845,7 +845,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of src 0.9.27:";;
short | recursive ) echo "Configuration of src 0.9.30:";;
esac
cat <<\_ACEOF
......@@ -964,7 +964,7 @@ fi
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
src configure 0.9.27
src configure 0.9.30
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
......@@ -978,7 +978,7 @@ cat >&5 <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by src $as_me 0.9.27, which was
It was created by src $as_me 0.9.30, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
......@@ -1621,7 +1621,7 @@ fi
# Define the identity of the package.
PACKAGE=tlf
VERSION=0.9.27
VERSION=0.9.30
cat >>confdefs.h <<_ACEOF
......@@ -5500,7 +5500,7 @@ _ASBOX
} >&5
cat >&5 <<_CSEOF
This file was extended by src $as_me 0.9.27, which was
This file was extended by src $as_me 0.9.30, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
......@@ -5563,7 +5563,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
src config.status 0.9.27
src config.status 0.9.30
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
......
# Process this file with autoconf to produce a configure script.
AC_INIT(src, 0.9.27, rein@couperus.com)
AM_INIT_AUTOMAKE(tlf, 0.9.27)
AC_INIT(src, 0.9.30, rein@couperus.com)
AM_INIT_AUTOMAKE(tlf, 0.9.30)
AM_CONFIG_HEADER(config.h)
# Checks for programs.
......
tlf (0.9.30-1) unstable; urgency=low
* New upstream release
* Use libhamlib-dev as a build dependency from now on.
-- Joop Stakenborg <pa3aba@debian.org> Wed, 19 Apr 2006 19:07:28 +0200
tlf (0.9.27-1) unstable; urgency=low
* New upstream release. Closes: 343669.
......
......@@ -3,12 +3,12 @@ Section: hamradio
Priority: optional
Maintainer: Joop Stakenborg <pa3aba@debian.org>
Standards-Version: 3.6.2
Build-Depends: debhelper (>=4), libncurses5-dev, hamlib-dev (>= 1.2.4-1), autotools-dev, automake1.4
Build-Depends: debhelper (>=4), libncurses5-dev, libhamlib-dev, autotools-dev, automake1.4
Package: tlf
Architecture: any
Depends: ${shlibs:Depends}
Recommends: cwdaemon (>= 0.9)
Recommends: cwdaemon
Suggests: xplanet
Description: Console mode purpose CW keyer, logging- and contest program
Tlf is a console (ncurses) mode general purpose CW keyer, logging- and
......
tlf-0.9.30
==========
Bug fixes:
- exchange needed at least 1 character in dxped mode
RTTY miniterm changed to display line feeds (reading formatted texst is easier)
RTTY now sends linefeeds before and after the macro.
tlf-0.9.29
==========
Bug fixes:
- Date display error
- Spurious character error
- Malloc free error in socket.c
I also included Fabian's patch to searchlog.c for testing...I like it.
tlf-0.9.28
==========
Bug fixes (country indication did not work, wrong mults file for arrldx_dx).
Added interface to gMFSK to enable RTTY contesting.
Added new parameters for the logcfg.dat file:
GMFSK (use gMFSK as an output device)
RTTYMODE (start tlf in RTTY mode)
DIGIMODEM=/home/youruser/gmfsk_autofile
You need the special version of gMFSK which is used for pskmail (http://pskmail.wikispaces.com).
Information on how to install this hacked version of gMFSK-0.6 is on the pskmail wiki.
Tlf takes care of all contest related stuff, exactly as you are used to in CW mode...
Yyou can use keyboard mode (Alt-K in CW mode) by switching to the gMFSK send field
with "Alt-TAB". This toggles between tlf and gMFSK.
This will be necessary until I have time to redo the gMFSK interface (a socket interface is
on the todo list).
tlf-0.9.27
==========
Bug fixes (segfault at startup at some systems)
tlf-0.9.26
==========
Bug fix (segfault using the voice keyer).
......
......@@ -6,7 +6,7 @@ CONTEST=arrldx_dx
LOGFILE=arrltest.log
CONTEST_MODE
#
MULT_LIST=arrlsections
MULT_LIST=/usr/local/share/tlf/usa_canada_states
COUNTRYLIST=W,VE
USE_COUNTRYLIST_ONLY
COUNTRY_LIST_POINTS=3
......
......@@ -79,7 +79,7 @@ i = 1;
}
if (trxmode == DIGIMODE && keyerport == MFJ1278_KEYER)
if (trxmode == DIGIMODE && (keyerport == MFJ1278_KEYER || keyerport == GMFSK))
rx_rtty();
......
......@@ -120,9 +120,10 @@ printcall();
{
time_update();
if (trxmode == DIGIMODE && keyerport == MFJ1278_KEYER)
if (trxmode == DIGIMODE && (keyerport == GMFSK || keyerport == MFJ1278_KEYER)){
show_rtty();
printcall();
}
if (i == 0 || strlen(hiscall) == 0)
{
......@@ -132,8 +133,10 @@ printcall();
time_update();
if (trxmode == DIGIMODE && keyerport == MFJ1278_KEYER)
if (trxmode == DIGIMODE && (keyerport == GMFSK || keyerport == MFJ1278_KEYER)){
show_rtty();
printcall();
}
x = onechar();
......@@ -1256,8 +1259,11 @@ printcall();
time_update();
if (trxmode == DIGIMODE && keyerport == MFJ1278_KEYER)
if (trxmode == DIGIMODE && (keyerport == GMFSK || keyerport == MFJ1278_KEYER )) {
show_rtty();
mvprintw(12, 54, comment);
refresh();
}
}
......
......@@ -44,18 +44,28 @@ extern float node_frequencies[MAXNODES] ;
extern char thisnode;
extern int time_master;
extern int nroflines;
extern struct tm *time_ptr;
int f, j, k;
char inputbuffer[160] = "";
char time_buf[40] = "";
static int frcounter;
static int daysecs = 0;
attron(COLOR_PAIR(COLOR_CYAN) | A_STANDOUT);
strncpy(time_buf, timestr, 8) ;
mvaddstr(12, 0, band[bandinx]);
mvprintw(12, 17, time_buf);
if (daysecs > 60) { // update the date 1x per minute
daysecs = 0;
get_time();
strftime(time_buf, 60, "%d-%b-%y", time_ptr);
mvprintw(12, 7,time_buf);
} else {
daysecs++;
}
if (trx_control == 1) {
if (freq != 0.0) {
......
......@@ -28,6 +28,7 @@
#include "freq_display.h"
#include "lancode.h"
#include "cluster_bg.h"
#include "get_time.h"
void clusterinfo(char *timestr);
......@@ -88,8 +88,8 @@ int edit_last(void)
refresh();
} else {
// logview();
// j = 27;
logview();
j = 27;
}
}else if(j == 153) { // down
......
......@@ -28,7 +28,7 @@ int get_time(void)
{
extern struct tm *time_ptr;
extern int timeoffset;
extern int timecorr;
extern long timecorr;
time_t now;
......
......@@ -70,7 +70,9 @@ extern int itumult;
extern int pfxmult;
extern int exc_cont;
extern char continent[];
extern int keyerport;
extern int commentfield;
extern int dxped;
int i;
int x = 0;
......@@ -120,7 +122,7 @@ instring[1] = '\0';
mvprintw(12, 54, " ");
mvprintw(12, 54, comment);
commentfield = 1;
for (i=strlen(comment) ; i<=25; i++)
{
x = onechar();
......@@ -282,6 +284,7 @@ instring[1] = '\0';
if (ctcomp == 1) x = 92; // enter logs immediately
if (trxmode == SSBMODE) x = 92;
if (contest != 1) x = 92;
// if (dxped == 1) x = 92;
break;
}
......@@ -300,6 +303,10 @@ instring[1] = '\0';
instring[0] = x;
addch(x);
strcat(comment, instring);
if (keyerport == GMFSK){
show_rtty();
mvprintw(12, 54, comment);
}
refresh();
}
} else i--;
......@@ -310,7 +317,6 @@ instring[1] = '\0';
if (arrlss == 1) x = checkexchange(x);
if (cqww == 1) x = checkexchange(x);
if (x == '\n' || x == 9 || x == 11|| x == 92){
if ( (exchange_serial ==1)){ /* align serial nr. */
......@@ -417,7 +423,7 @@ instring[1] = '\0';
}
}
commentfield = 0;
return(x);
}
......@@ -426,7 +432,7 @@ instring[1] = '\0';
char cmpattern[]=" "; // global
char ssexchange[30] = "";
char section[4]="";
char section[8]="";
char callupdate[7];
int call_update = 0;
char zone_export[3] = " ";
......@@ -440,7 +446,7 @@ int checkexchange (int x) {
extern char mults_possible[MAX_MULTS][12] ;
extern int cqww;
extern int arrlss;
extern char section[4];
extern char section[];
extern char callupdate[];
extern char hiscall[];
extern int call_update;
......@@ -872,7 +878,6 @@ if ((serial_section_mult == 1) || (sectn_mult == 1) || dx_arrlsections == 1) {
strncpy (checksection, comment, 3);
checksection[3]='\0';
for (jj=0 ; jj < max_multipliers ; jj++) {
if ((strlen(mults_possible[jj] )>=1) && (strstr(checksection, mults_possible[jj]) != NULL)) {
......
......@@ -37,6 +37,7 @@
#include "writeparas.h"
#include "lancode.h"
#include "keyer.h"
#include "rtty.h"
int getexchange(void);
int checkexchange (int x);
......
......@@ -54,6 +54,7 @@ extern int itumult;
extern int qsonum;
extern int exchange_serial;
extern char tonestr[];
extern int dxped;
int callreturn = 0;
int qrg_out = 0;
......@@ -98,7 +99,7 @@ else
if (callreturn == '\n' && strlen(hiscall) >= 3 )
{
if (!strlen(comment) && contest == CONTEST && !ctcomp && defer_store)
if (!strlen(comment) && contest == CONTEST && !ctcomp && !dxped)
defer_store = 0;
if ((cqmode == CQ ) && (contest == CONTEST ) && (defer_store == 0)){ /* contest */
if (trxmode == CWMODE || trxmode == DIGIMODE)
......
......@@ -56,6 +56,7 @@
};
int debugflag = 0;
int editor = EDITOR_JOE;
char rttyoutput[120];
int use_vk = 0;
int tune_val = 0;
int use_bandoutput = 0;
......@@ -133,7 +134,9 @@
int ua9_cty;
char tlfversion[80] = "";
char multiplierlist[40]="";
char testbuffer[120] = "";
char multiplierlist[80]="";
char multsfile[80] = "";
char exchange_list[40] = "";
int timeoffset=0;
int multi = 0; /* 0 = SO , 1 = MOST, 2 = MM */
......@@ -224,6 +227,8 @@
int k_ptt;
char controllerport[80] = "/dev/ttyS0";
int miniterm = 0;
char modem_mode[8];
int commentfield = 0;
/*-------------------------------------packet-------------------------------*/
char spot_ptr[MAX_SPOTS][82];
......@@ -612,7 +617,7 @@ if (main_ie_list == NULL)
showmsg("Keyer is cwdaemon");
if (verbose == 1) sleep(1);
}
if (keyerport == MFJ1278_KEYER) {
if (keyerport == MFJ1278_KEYER || keyerport == GMFSK) {
init_controller();
}
......
......@@ -179,7 +179,7 @@ int parse_logcfg(char *inputbuffer){
extern int timeoffset;
extern int time_master;
extern int ctcomp;
extern char multiplierlist[40];
extern char multiplierlist[];
extern int multlist;
extern int universal;
extern int serial_section_mult;
......@@ -208,6 +208,7 @@ int parse_logcfg(char *inputbuffer){
extern int lowband_point_mult;
extern int sc_sidetone;
extern char sc_volume[];
extern char modem_mode[];
/* LZ3NY mods */
extern int mult_side;
......@@ -238,7 +239,7 @@ extern char clusterlogin[];
extern int cw_bandwidth;
extern int nobandchange;
extern int change_rst;
extern char rttyoutput[];
char commands[MAX_COMMANDS][30]= {
......@@ -392,8 +393,12 @@ extern int change_rst;
"CLUSTER_LOG",
"SERIAL+GRID4",
"CHANGE_RST",
"GMFSK=",
"RTTYMODE", /* 150 */
"DIGIMODEM=",
"",
"",
""
};
char teststring[80];
......@@ -810,7 +815,7 @@ extern int change_rst;
}
case 87 : {
multiplierlist[0] = '\0';
strcat(multiplierlist, inputbuffer + 10);
strncat(multiplierlist, inputbuffer + 10, 79);
multlist = 1;
universal = 1;
break;
......@@ -1181,6 +1186,24 @@ extern int change_rst;
change_rst = 1;
break;
}
case 149 : {
keyerport = GMFSK;
strncpy(controllerport, inputbuffer + 6, sizeof (controllerport) -1 );
controllerport[strlen(controllerport)-1] = '\0';
break;
}
case 150: { // start in digital mode
trxmode = DIGIMODE;
modem_mode[0] = '\0';
strcat(modem_mode, "RTTY");
break;
}
case 151 : {
rttyoutput[0] = '\0';
strncat(rttyoutput, inputbuffer + 10, 110);
rttyoutput[strlen(rttyoutput)-1] = '\0';
break;