kopia lustrzana https://github.com/jamescoxon/dl-fldigi
Upstream version 2.0 (rc)
Stelios Bounanos
rodzic
a9831c865c
commit
25b4b87eb9
2
AUTHORS
2
AUTHORS
|
|
@ -3,7 +3,7 @@ CALLSIGN: W1HKJ
|
|||
EMAIL: w1hkj@w1hkj.com
|
||||
|
||||
AUTHOR: Stelios Bounanos
|
||||
CALLSIGN: M3RNV
|
||||
CALLSIGN: M0GLD
|
||||
EMAIL:
|
||||
|
||||
AUTHOR: Leigh L Klotz, Jr
|
||||
|
|
|
|||
|
|
@ -81,6 +81,8 @@ Change Log:
|
|||
configuration file.
|
||||
You will need to reconfigure and save the program configuration the
|
||||
first time the new version of fldigi is executed.
|
||||
28) Added numerous command line switches which control the look and feel.
|
||||
use "fltk --help" from a terminal window to view the switch options.
|
||||
|
||||
1.34 1) Cleaned up unused code segments
|
||||
2) Modified CW decoder to allow setting upper and lower limits on
|
||||
|
|
|
|||
13
Makefile
13
Makefile
|
|
@ -152,6 +152,7 @@ DEP_DIR = Depends
|
|||
OBJ_DIR = Objects
|
||||
BIN_DIR = Install
|
||||
BINARY = $(BIN_DIR)/fldigi
|
||||
VERSIONS = $(SRC_DIR)/include/versions.h
|
||||
|
||||
#################### begin cfg
|
||||
ifeq ($(CTARG),hamlib)
|
||||
|
|
@ -211,7 +212,7 @@ define preproc_cmd
|
|||
set -e; mkdir -p $(dir $@); \
|
||||
$(CXX) $(CPPFLAGS) -MM "$(subst $(DEP_DIR)/,$(SRC_DIR)/,$(subst .deps,,$@))" \
|
||||
-MT "$(addprefix $(OBJ_DIR)/,$(addsuffix .o,$(notdir $(basename $(basename $@)))))" \
|
||||
-MT "$@" -MF "$@"
|
||||
-MT "$@" -MF "$@" -MG
|
||||
endef
|
||||
|
||||
define compile_cmd
|
||||
|
|
@ -255,8 +256,14 @@ endif # ($(V), 1)
|
|||
# targets
|
||||
|
||||
.PHONY: all print_header directories clean
|
||||
.EXPORT_ALL_VARIABLES: $(VERSIONS)
|
||||
|
||||
all: print_header directories $(BINARY)
|
||||
all: print_header directories $(VERSIONS) $(BINARY)
|
||||
|
||||
$(VERSIONS): $(VERSIONS).in
|
||||
@echo Generating $@
|
||||
@sh scripts/mkversions $< $@ || touch $@
|
||||
versions.h: $(VERSIONS)
|
||||
|
||||
$(BINARY): $(OBJS)
|
||||
$(link_objects)
|
||||
|
|
@ -288,4 +295,4 @@ directories:
|
|||
|
||||
clean:
|
||||
@echo Deleting intermediate files for fldigi
|
||||
@rm -rf $(DEP_DIR) $(OBJ_DIR) $(BINARY)
|
||||
@rm -rf $(DEP_DIR) $(OBJ_DIR) $(BINARY) $(VERSIONS)
|
||||
|
|
|
|||
|
|
@ -0,0 +1,22 @@
|
|||
#!/bin/sh
|
||||
|
||||
[ $# -eq 2 ] || exit 1
|
||||
|
||||
in="$1"
|
||||
out="$2"
|
||||
|
||||
export LC_ALL=C
|
||||
|
||||
COMMENT="This file is generated at compile time. Do not include in source tarballs."
|
||||
COMPILE_CFG="CFG=$CTARG"
|
||||
COMPILE_DATE="`date`"
|
||||
COMPILE_USER="`whoami`"
|
||||
COMPILE_HOST="`hostname`"
|
||||
COMPILER="`$CXX -v 2>&1 | grep version`"
|
||||
CFLAGS="$CPPFLAGS $CXXFLAGS"
|
||||
LDFLAGS="$LDFLAGS"
|
||||
|
||||
sed -e "s!@COMMENT@!${COMMENT}!g; s!@COMPILE_CFG@!${COMPILE_CFG}!g; \
|
||||
s!@COMPILE_DATE@!${COMPILE_DATE}!g; s!@COMPILE_USER@!${COMPILE_USER}!g; \
|
||||
s!@COMPILE_HOST@!${COMPILE_HOST}!g; s!@COMPILER@!${COMPILER}!g; \
|
||||
s!@CFLAGS@!${CFLAGS}!g; s!@LDFLAGS@!${LDFLAGS}!g; s!@HAVE_VERSIONS_H@!1!g" < "$in" > "$out"
|
||||
|
|
@ -2,6 +2,6 @@
|
|||
#define _VERSION_H
|
||||
|
||||
#define FLDIGI_NAME "fldigi"
|
||||
#define FLDIGI_VERSION "2.0pre2"
|
||||
#define FLDIGI_VERSION "2.0"
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -0,0 +1,17 @@
|
|||
// @COMMENT@
|
||||
|
||||
#ifndef VERSIONS_H
|
||||
#define VERSIONS_H
|
||||
|
||||
#define HAVE_VERSIONS_H @HAVE_VERSIONS_H@
|
||||
|
||||
#define COMPILE_CFG "@COMPILE_CFG@"
|
||||
#define COMPILE_DATE "@COMPILE_DATE@"
|
||||
#define COMPILE_USER "@COMPILE_USER@"
|
||||
#define COMPILE_HOST "@COMPILE_HOST@"
|
||||
|
||||
#define COMPILER "@COMPILER@"
|
||||
#define CFLAGS "@CFLAGS@"
|
||||
#define LDFLAGS "@LDFLAGS@"
|
||||
|
||||
#endif // VERSIONS_H
|
||||
50
src/main.cxx
50
src/main.cxx
|
|
@ -29,6 +29,7 @@
|
|||
#include <sys/types.h>
|
||||
#include <sys/ipc.h>
|
||||
#include <sys/msg.h>
|
||||
#include <sys/utsname.h>
|
||||
|
||||
#include <FL/Fl_Shared_Image.H>
|
||||
#ifdef PORTAUDIO
|
||||
|
|
@ -97,6 +98,7 @@ string option_help;
|
|||
void arqchecks(void);
|
||||
void generate_option_help(void);
|
||||
int parse_args(int argc, char **argv, int& idx);
|
||||
void print_versions(void);
|
||||
|
||||
int main(int argc, char ** argv)
|
||||
{
|
||||
|
|
@ -319,9 +321,6 @@ void generate_option_help(void) {
|
|||
<< "" << "The default is: " << progdefaults.tx_msgid
|
||||
<< " or 0x" << hex << progdefaults.tx_msgid << dec << '\n'
|
||||
|
||||
<< setw(width) << setiosflags(ios::left)
|
||||
<< " --fast-text" << "Use fast text widgets\n"
|
||||
|
||||
<< setw(width) << setiosflags(ios::left)
|
||||
<< " --version" << "Print version information\n"
|
||||
|
||||
|
|
@ -393,7 +392,10 @@ void generate_option_help(void) {
|
|||
<< " -to, -tooltips or -not, -notooltips"
|
||||
<< "Enable or disable tooltips\n";
|
||||
|
||||
help << "\nAdditional options:\n"
|
||||
help << "\nAdditional UI options:\n"
|
||||
|
||||
<< setw(width) << setiosflags(ios::left)
|
||||
<< " --fast-text" << "Use fast text widgets\n"
|
||||
|
||||
<< setw(width) << setiosflags(ios::left)
|
||||
<< " --font FONT[:SIZE]"
|
||||
|
|
@ -534,7 +536,7 @@ int parse_args(int argc, char **argv, int& idx)
|
|||
exit(EXIT_SUCCESS);
|
||||
|
||||
case VERSION:
|
||||
cerr << FLDIGI_NAME << ' ' << FLDIGI_VERSION << '\n';
|
||||
print_versions();
|
||||
exit(EXIT_SUCCESS);
|
||||
|
||||
case '?':
|
||||
|
|
@ -548,3 +550,41 @@ int parse_args(int argc, char **argv, int& idx)
|
|||
|
||||
return 0;
|
||||
}
|
||||
|
||||
void print_versions(void)
|
||||
{
|
||||
cerr << FLDIGI_NAME << ' ' << FLDIGI_VERSION << "\n\nSystem: ";
|
||||
struct utsname u;
|
||||
if (uname(&u) != -1) {
|
||||
cerr << u.sysname << ' ' << u.nodename
|
||||
<< ' ' << u.release << ' ' << u.version << ' '
|
||||
<< u.machine << '\n';
|
||||
}
|
||||
|
||||
#include "versions.h"
|
||||
#ifdef HAVE_VERSIONS_H
|
||||
cerr << "\nConfigured with: " << COMPILE_CFG << '\n'
|
||||
<< "Built on " << COMPILE_DATE << " by " << COMPILE_USER
|
||||
<< '@' << COMPILE_HOST << " with:\n"
|
||||
<< ' ' << COMPILER << '\n'
|
||||
<< " CFLAGS=" << CFLAGS << '\n'
|
||||
<< " LDFLAGS=" << LDFLAGS << '\n';
|
||||
#endif // HAVE_VERSIONS_H
|
||||
|
||||
cerr << "Libraries:\n"
|
||||
<< " FLTK " << FL_MAJOR_VERSION << '.' << FL_MINOR_VERSION << '.'
|
||||
<< FL_PATCH_VERSION << '\n';
|
||||
|
||||
#ifndef NO_HAMLIB
|
||||
cerr << ' ' << hamlib_version << '\n';
|
||||
#endif
|
||||
|
||||
#ifdef PORTAUDIO
|
||||
cerr << ' ' << portaudio::System::versionText() << ' '
|
||||
<< portaudio::System::version() << '\n';
|
||||
#endif
|
||||
|
||||
char sndfile_version[32];
|
||||
sf_command(NULL, SFC_GET_LIB_VERSION, sndfile_version, sizeof(sndfile_version));
|
||||
cerr << ' ' << sndfile_version << endl;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -197,10 +197,27 @@ void check_formail() {
|
|||
}
|
||||
}
|
||||
|
||||
bool bSend0x06 = false;
|
||||
|
||||
void send0x06()
|
||||
{
|
||||
if (trx_state == STATE_RX) {
|
||||
bSend0x06 = false;
|
||||
rxmsgid = msgget( (key_t) progdefaults.rx_msgid, 0666 );
|
||||
if ( rxmsgid != -1) {
|
||||
rxmsgst.msg_type = 1;
|
||||
rxmsgst.c = 0x06; // tell arq client that transmit complete
|
||||
msgsnd (rxmsgid, (void *)&rxmsgst, 1, IPC_NOWAIT);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void pskmail_loop(void *)
|
||||
{
|
||||
if (bSend0x06)
|
||||
send0x06();
|
||||
check_formail();
|
||||
Fl::repeat_timeout(1.0, pskmail_loop);
|
||||
Fl::repeat_timeout(0.2, pskmail_loop);//1.0, pskmail_loop);
|
||||
}
|
||||
|
||||
char pskmail_get_char()
|
||||
|
|
@ -208,13 +225,7 @@ char pskmail_get_char()
|
|||
if (pText != mailtext.end())
|
||||
return *pText++;
|
||||
|
||||
rxmsgid = msgget( (key_t) progdefaults.rx_msgid, 0666 );
|
||||
if ( rxmsgid != -1) {
|
||||
rxmsgst.msg_type = 1;
|
||||
rxmsgst.c = 0x06; // tell arq client that transmit complete
|
||||
msgsnd (rxmsgid, (void *)&rxmsgst, 1, IPC_NOWAIT);
|
||||
}
|
||||
|
||||
bSend0x06 = true;
|
||||
pskmail_text_available = false;
|
||||
return 0x03; // tells psk modem to return to rx
|
||||
}
|
||||
|
|
|
|||
Ładowanie…
Reference in New Issue