mirror
/
Hamlib
kopia lustrzana https://github.com/Hamlib/Hamlib
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

rigctld/rotctld: Remove -e|--end-marker option 

Remove support for deprecated "End Marker" protocol in rigctld and
rotctld.
Hamlib-3.0
Nate Bargmann 2013-02-05 12:54:05 -06:00
rodzic 59160c5d03
commit 7e9f628648
9 zmienionych plików z 24 dodań i 58 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

5
NEWS
Wyświetl plik

@ -8,6 +8,7 @@ Please send Hamlib bug reports to hamlib-developer@lists.sourceforge.net
Version 3.0
2013-??-??
* Kill RPC backends and rpc.rigd/rpc.rotd
* Remove -e|--end-marker option from rigctld and rotctld
* Build system updates--remove obsolete macros, autogen.sh now
runs autoreconf to invoke Autotools to bootstrap the build
system, libltdl is installed into the source tree as a part
@ -20,7 +21,9 @@ Version 3.0
Fixed TCL binding installation, fixed Perl binding build so it
is not invoked by 'make dist' and clean up build files. Cleaned
up bindings builds to occur in alphabetical order. Use new
ax_pkg_swig macro and update ax_python_devel macro.
ax_pkg_swig macro and update ax_python_devel macro. Test for
presence of pkg-config before testing for pkg-config use.
* Implement new RIT/XIT activation/deactivation through rig_get/set_func()
* IC-PCR1500/2500 default write_delay to 0, IC-746/756, IC-PCR8500
fixes, pcr.c, pcr1500.c: Add DSP support. TNX Paul, KE7ZZ
* WinRadio G313 updates. TNX Julian Campbel

6
tests/rigctl.c
Wyświetl plik

@ -1,5 +1,7 @@
/*
* rigctl.c - (C) Stephane Fillod 2000-2009
* rigctl.c - (C) Stephane Fillod 2000-2010
* (C) Nate Bargmann 2003,2006,2008,2010,2011,2012,2013
* (C) The Hamlib Group 2002,2006,2007,2012
*
* This program test/control a radio using Hamlib.
* It takes commands in interactive mode as well as
@ -83,7 +85,6 @@ static struct option long_options[] =
int interactive = 1; /* if no cmd on command line, switch to interactive */
int prompt = 1; /* Print prompt in rigctl */
int opt_end = 0; /* only used by rigctld */
int vfo_mode = 0; /* vfo_mode = 0 means target VFO is 'currVFO' */
char send_cmd_term = '\r'; /* send_cmd termination char */
@ -371,4 +372,3 @@ void usage(void)
printf("\nReport bugs to <hamlib-developer@lists.sourceforge.net>.\n");
}

11
tests/rigctl_parse.c
Wyświetl plik

@ -1,7 +1,8 @@
/*
* rigctl_parse.c - (C) Stephane Fillod 2000-2011
* (C) Nate Bargmann 2003,2006,2008,2010,2011,2012,2013
* (C) Terry Embry 2008-2009
* (C) The Hamlib Group 2010
* (C) The Hamlib Group 2002,2006,2007,2008,2009,2010,2011
*
* This program tests/controls a radio using Hamlib.
* It takes commands in interactive mode as well as
@ -349,7 +350,6 @@ static int scanfc(FILE *fin, const char *format, void *p)
extern int interactive;
extern int prompt;
extern int opt_end;
extern int vfo_mode;
extern char send_cmd_term;
int ext_resp = 0;
@ -599,7 +599,7 @@ int rigctl_parse(RIG *my_rig, FILE *fin, FILE *fout, char *argv[], int argc)
if (interactive && !prompt) {
/* netrigctl RIG_OK */
if (!(cmd_entry->flags & ARG_OUT)
&& !opt_end && !ext_resp && cmd != 0xf0)
&& !ext_resp && cmd != 0xf0)
fprintf(fout, NETRIGCTL_RET "0\n");
/* Extended Response protocol */
@ -608,10 +608,6 @@ int rigctl_parse(RIG *my_rig, FILE *fin, FILE *fout, char *argv[], int argc)
ext_resp = 0;
resp_sep = '\n';
}
/* Nate's protocol (obsolete) */
else if ((cmd_entry->flags & ARG_OUT) && opt_end)
fprintf(fout, "END\n");
}
}
@ -2301,4 +2297,3 @@ declare_proto_rig(halt)
return RIG_OK;
}

9
tests/rigctld.8
Wyświetl plik

@ -2,7 +2,7 @@
.\" First parameter, NAME, should be all caps
.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
.\" other parameters are allowed: see man(7), man(1)
.TH RIGCTLD "8" "January 23, 2013" "Hamlib" "Rig Control Daemon"
.TH RIGCTLD "8" "February 5, 2013" "Hamlib" "Rig Control Daemon"
.\" Please adjust this date whenever revising the manpage.
.\"
.\" Some roff macros, for reference:
@ -133,13 +133,6 @@ command (except \fI\\set_vfo\fP!). Otherwise, 'currVFO' is assumed when this
option is not set and an extra VFO argument is not used. See \fI\\chk_vfo\fP
below.
.TP
.B \-e, --end-marker
Use END marker in rigctld protocol.
.sp
\fBN.B.\fP: This option should be considered obsolete. Please consider using
the Extended Response protocol instead (see \fIPROTOCOL\fP below). This option
will be removed in a future Hamlib release.
.TP
.B \-v, --verbose
Set verbose mode, cumulative (see \fIDIAGNOSTICS\fP below).
.TP

13
tests/rigctld.c
Wyświetl plik

@ -1,5 +1,7 @@
/*
* rigctld.c - (C) Stephane Fillod 2000-2011
* (C) Nate Bargmann 2008,2010,2011,2012,2013
* (C) The Hamlib Group 2012
*
* This program test/control a radio using Hamlib.
* It takes commands from network connection.
@ -70,7 +72,7 @@
* NB: do NOT use -W since it's reserved by POSIX.
* TODO: add an option to read from a file
*/
#define SHORT_OPTIONS "m:r:p:d:P:D:s:c:T:t:C:lLuoevhV"
#define SHORT_OPTIONS "m:r:p:d:P:D:s:c:T:t:C:lLuovhV"
static struct option long_options[] =
{
{"model", 1, 0, 'm'},
@ -88,7 +90,6 @@ static struct option long_options[] =
{"show-conf", 0, 0, 'L'},
{"dump-caps", 0, 0, 'u'},
{"vfo", 0, 0, 'o'},
{"end-marker", 0, 0, 'e'},
{"verbose", 0, 0, 'v'},
{"help", 0, 0, 'h'},
{"version", 0, 0, 'V'},
@ -107,7 +108,6 @@ void usage(void);
int interactive = 1; /* no cmd because of daemon */
int prompt = 0; /* Daemon mode for rigparse return string */
int opt_end = 0; /* END marker for rigctld */
int vfo_mode = 0; /* vfo_mode=0 means target VFO is current VFO */
char send_cmd_term = '\r'; /* send_cmd termination char */
@ -274,10 +274,6 @@ int main (int argc, char *argv[])
case 'u':
dump_caps_opt++;
break;
case 'e':
opt_end++;
fprintf(stderr, "-e|--end-marker option is deprecated!\nPlease consider using the Extended Response protocol instead.\n");
break;
default:
usage(); /* unknown option? */
exit(1);
@ -557,7 +553,6 @@ void usage(void)
" -l, --list list all model numbers and exit\n"
" -u, --dump-caps dump capabilities and exit\n"
" -o, --vfo do not default to VFO_CURR, require extra vfo arg\n"
" -e, --end-marker use END marker in rigctld protocol (obsolete)\n"
" -v, --verbose set verbose mode, cumulative\n"
" -h, --help display this help and exit\n"
" -V, --version output version information and exit\n\n",
@ -568,5 +563,3 @@ void usage(void)
printf("\nReport bugs to <hamlib-developer@lists.sourceforge.net>.\n");
}

4
tests/rotctl.c
Wyświetl plik

@ -1,5 +1,7 @@
/*
* rotctl.c - (C) Stephane Fillod 2000-2010
* (C) Nate Bargmann 2003,2007,2010,2011,2012,2013
* (C) The Hamlib Group 2002,2006
*
* This program test/control a rotator using Hamlib.
* It takes commands in interactive mode as well as
@ -71,7 +73,6 @@ static struct option long_options[] =
int interactive = 1; /* if no cmd on command line, switch to interactive */
int prompt = 1; /* Print prompt in rotctl */
int opt_end= 0 ; /* only used by rotctld */
char send_cmd_term = '\r'; /* send_cmd termination char */
@ -269,4 +270,3 @@ void usage()
printf("\nReport bugs to <hamlib-developer@lists.sourceforge.net>.\n");
}

10
tests/rotctl_parse.c
Wyświetl plik

@ -1,5 +1,7 @@
/*
* rotctl_parse.c - (C) Stephane Fillod 2000-2010
* (C) Nate Bargmann 2003,2007,2010,2011,2012,2013
* (C) The Hamlib Group 2002,2006,2011
*
* This program test/control a rotator using Hamlib.
* It takes commands in interactive mode as well as
@ -252,7 +254,6 @@ static int scanfc(FILE *fin, const char *format, void *p)
extern int interactive;
extern int prompt;
extern int opt_end;
extern char send_cmd_term;
int ext_resp = 0;
unsigned char resp_sep = '\n'; /* Default response separator */
@ -500,7 +501,7 @@ int rotctl_parse(ROT *my_rot, FILE *fin, FILE *fout, char *argv[], int argc)
/* only for rotctld */
if (interactive && !prompt) {
/* netrotctl RIG_OK */
if (!(cmd_entry->flags & ARG_OUT) && !opt_end && !ext_resp)
if (!(cmd_entry->flags & ARG_OUT) && !ext_resp)
fprintf(fout, NETROTCTL_RET "0\n");
/* Extended Response protocol */
@ -509,10 +510,6 @@ int rotctl_parse(ROT *my_rot, FILE *fin, FILE *fout, char *argv[], int argc)
ext_resp = 0;
resp_sep = '\n';
}
/* Nate's protocol (obsolete) */
else if ((cmd_entry->flags & ARG_OUT) && opt_end)
fprintf(fout, "END\n");
}
}
@ -1085,4 +1082,3 @@ declare_proto_rot(dist_sp2dist_lp)
return RIG_OK;
}

13
tests/rotctld.8
Wyświetl plik

@ -2,7 +2,7 @@
.\" First parameter, NAME, should be all caps
.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
.\" other parameters are allowed: see man(7), man(1)
.TH ROTCTLD "8" "March 1, 2012" "Hamlib" "Rotator Control Daemon"
.TH ROTCTLD "8" "February 5, 2013" "Hamlib" "Rotator Control Daemon"
.\" Please adjust this date whenever revising the manpage.
.\"
.\" Some roff macros, for reference:
@ -103,14 +103,7 @@ the cmd window in Windows. The output can be piped to 'more' or 'less',
e.g. 'rotctld -l | more'.
.TP
.B \-u, --dump-caps
Dump capabilities for the radio defined with -m above and exit.
.TP
.B \-e, --end-marker
Use END marker in rotctld protocol.
.sp
N.B.: This option should be considered obsolete. Please consider using the
Extended Response protocol instead (see \fIPROTOCOL\fP below). This option
will be removed in a future Hamlib release.
Dump capabilities for the rotator defined with -m above and exit.
.TP
.B \-v, --verbose
Set verbose mode, cumulative (see DIAGNOSTICS below).
@ -457,7 +450,7 @@ Written by Stephane Fillod, Nate Bargmann, and the Hamlib Group
.SH COPYRIGHT
Copyright \(co 2000-2009 Stephane Fillod
.br
Copyright \(co 2011-2012 Nate Bargmann
Copyright \(co 2011-2013 Nate Bargmann
.br
Copyright \(co 2000-2009 the Hamlib Group.
.PP

11
tests/rotctld.c
Wyświetl plik

@ -1,5 +1,6 @@
/*
* rotctld.c - (C) Stephane Fillod 2000-2011
* (C) Nate Bargmann 2010,2011,2012,2013
*
* This program test/control a rotator using Hamlib.
* It takes commands from network connection.
@ -78,7 +79,7 @@ void usage();
* NB: do NOT use -W since it's reserved by POSIX.
* TODO: add an option to read from a file
*/
#define SHORT_OPTIONS "m:r:s:C:t:T:LuevhVl"
#define SHORT_OPTIONS "m:r:s:C:t:T:LuvhVl"
static struct option long_options[] =
{
{"model", 1, 0, 'm'},
@ -90,7 +91,6 @@ static struct option long_options[] =
{"set-conf", 1, 0, 'C'},
{"show-conf", 0, 0, 'L'},
{"dump-caps", 0, 0, 'u'},
{"end-marker", 0, 0, 'e'},
{"verbose", 0, 0, 'v'},
{"help", 0, 0, 'h'},
{"version", 0, 0, 'V'},
@ -99,7 +99,6 @@ static struct option long_options[] =
int interactive = 1; /* no cmd because of daemon */
int prompt= 0 ; /* Daemon mode for rigparse return string */
int opt_end= 0 ; /* END marker for rotctld */
const char *portno = "4533";
const char *src_addr = NULL; /* INADDR_ANY */
@ -199,10 +198,6 @@ int main (int argc, char *argv[])
case 'u':
dump_caps_opt++;
break;
case 'e':
opt_end = 1;
fprintf(stderr, "-e|--end-marker option is deprecated!\nPlease consider using the Extended Response protocol instead.\n");
break;
default:
usage(); /* unknown option? */
exit(1);
@ -461,7 +456,6 @@ void usage()
" -L, --show-conf list all config parameters\n"
" -l, --list list all model numbers and exit\n"
" -u, --dump-caps dump capabilities and exit\n"
" -e, --end-marker use END marker in rotctld protocol (obsolete)\n"
" -v, --verbose set verbose mode, cumulative\n"
" -h, --help display this help and exit\n"
" -V, --version output version information and exit\n\n",
@ -471,4 +465,3 @@ void usage()
printf("\nReport bugs to <hamlib-developer@lists.sourceforge.net>.\n");
}