diff --git a/.gitignore b/.gitignore index 51c9944db..5af52a7b3 100644 --- a/.gitignore +++ b/.gitignore @@ -43,18 +43,6 @@ macros/ltsugar.m4 macros/ltversion.m4 macros/lt~obsolete.m4 macros/pkg.m4 -rpcrig/rpc.rigd -rpcrig/rpcrig.h -rpcrig/rpcrig_clnt.c -rpcrig/rpcrig_svc.c -rpcrig/rpcrig_xdr.c -rpcrig/rpcrig_xdr_lt.c -rpcrot/rpc.rotd -rpcrot/rpcrot.h -rpcrot/rpcrot_clnt.c -rpcrot/rpcrot_svc.c -rpcrot/rpcrot_xdr.c -rpcrot/rpcrot_xdr_lt.c tests/rigctl tests/rigctld tests/rigmem diff --git a/android/config.h b/android/config.h index 237176c4d..c4043bebf 100644 --- a/android/config.h +++ b/android/config.h @@ -112,12 +112,6 @@ /* If available, contains the Python version number currently in use. */ /* #undef HAVE_PYTHON */ -/* Define to 1 if you have the header file. */ -/* #undef HAVE_RPC_RPCENT_H */ - -/* Define to 1 if you have the header file. */ -#define HAVE_RPC_RPC_H 1 - /* Define to 1 if you have the `select' function. */ #define HAVE_SELECT 1 diff --git a/dummy/netrigctl.c b/dummy/netrigctl.c index 8b7910ccc..ee246fc9a 100644 --- a/dummy/netrigctl.c +++ b/dummy/netrigctl.c @@ -65,9 +65,6 @@ static int netrigctl_transaction(RIG *rig, char *cmd, int len, char *buf) } -/* - * mimics rpcrig_open() from rpcrig/rpcrig_backend.c - */ static int netrigctl_open(RIG *rig) { int ret, len, i; @@ -1426,4 +1423,3 @@ const struct rig_caps netrigctl_caps = { .set_channel = netrigctl_set_channel, .get_channel = netrigctl_get_channel, }; - diff --git a/kenwood/README.ts2k b/kenwood/README.ts2k index 5d85b9802..6dc392408 100644 --- a/kenwood/README.ts2k +++ b/kenwood/README.ts2k @@ -39,7 +39,7 @@ File change summary: (Hopefully, I'll keep this updated...) It just occured to me that it would be very nice to have a default hamlib menu. If a rig don't have any or no menu functions yet, the levels and other items - can be presented as a default menu. + can be presented as a default menu. ts2000.c Inserted my version. mv'd orig to ts2000.c.orig ts2000.h renamed ts2000.c to ts2000.h @@ -64,7 +64,6 @@ File change summary: (Hopefully, I'll keep this updated...) kylix/hamlib_rigapi.pas // same as rig.h (Hold the Press!) kenwood/ // ok pcr/ // ok - rpcrig/ // ok src/ // ok tests/dumpcaps.c // uses bitwise mask (&) yaesu/ft100.c // uses RIG_VFO1 directly, etc... diff --git a/src/register.c b/src/register.c index dedf3caa3..70e6b343d 100644 --- a/src/register.c +++ b/src/register.c @@ -80,7 +80,6 @@ DEFINE_INITRIG_BACKEND(winradio); DEFINE_INITRIG_BACKEND(tentec); DEFINE_INITRIG_BACKEND(alinco); DEFINE_INITRIG_BACKEND(kachina); -// DEFINE_INITRIG_BACKEND(rpc); DEFINE_INITRIG_BACKEND(tapr); DEFINE_INITRIG_BACKEND(flexradio); DEFINE_INITRIG_BACKEND(rft); @@ -104,35 +103,34 @@ static struct { const char *be_name; int (* be_init_all)(void * handle); rig_model_t (* be_probe_all)(hamlib_port_t*, rig_probe_func_t, rig_ptr_t); -} rig_backend_list[RIG_BACKEND_MAX] = -{ - { RIG_DUMMY, RIG_BACKEND_DUMMY, RIG_FUNCNAMA(dummy) }, - { RIG_YAESU, RIG_BACKEND_YAESU, RIG_FUNCNAM(yaesu) }, - { RIG_KENWOOD, RIG_BACKEND_KENWOOD, RIG_FUNCNAM(kenwood) }, - { RIG_ICOM, RIG_BACKEND_ICOM, RIG_FUNCNAM(icom) }, - { RIG_PCR, RIG_BACKEND_PCR, RIG_FUNCNAMA(pcr) }, - { RIG_AOR, RIG_BACKEND_AOR, RIG_FUNCNAMA(aor) }, - { RIG_JRC, RIG_BACKEND_JRC, RIG_FUNCNAMA(jrc) }, - { RIG_UNIDEN, RIG_BACKEND_UNIDEN, RIG_FUNCNAM(uniden) }, - { RIG_DRAKE, RIG_BACKEND_DRAKE, RIG_FUNCNAM(drake) }, - { RIG_LOWE, RIG_BACKEND_LOWE, RIG_FUNCNAM(lowe) }, - { RIG_RACAL, RIG_BACKEND_RACAL, RIG_FUNCNAMA(racal) }, - { RIG_WJ, RIG_BACKEND_WJ, RIG_FUNCNAMA(wj) }, - { RIG_SKANTI, RIG_BACKEND_SKANTI, RIG_FUNCNAMA(skanti) }, - { RIG_WINRADIO, RIG_BACKEND_WINRADIO, RIG_FUNCNAMA(winradio) }, - { RIG_TENTEC, RIG_BACKEND_TENTEC, RIG_FUNCNAMA(tentec) }, - { RIG_ALINCO, RIG_BACKEND_ALINCO, RIG_FUNCNAMA(alinco) }, - { RIG_KACHINA, RIG_BACKEND_KACHINA, RIG_FUNCNAMA(kachina) }, - /* { RIG_RPC, RIG_BACKEND_RPC, RIG_FUNCNAM(rpc) }, */ - { RIG_TAPR, RIG_BACKEND_TAPR, RIG_FUNCNAMA(tapr) }, - { RIG_FLEXRADIO, RIG_BACKEND_FLEXRADIO, RIG_FUNCNAMA(flexradio) }, - { RIG_RFT, RIG_BACKEND_RFT, RIG_FUNCNAMA(rft) }, - { RIG_KIT, RIG_BACKEND_KIT, RIG_FUNCNAMA(kit) }, - { RIG_TUNER, RIG_BACKEND_TUNER, RIG_FUNCNAMA(tuner) }, - { RIG_RS, RIG_BACKEND_RS, RIG_FUNCNAMA(rs) }, - { RIG_PRM80, RIG_BACKEND_PRM80, RIG_FUNCNAMA(prm80) }, - { RIG_ADAT, RIG_BACKEND_ADAT, RIG_FUNCNAM(adat) }, - { 0, NULL }, /* end */ +} rig_backend_list[RIG_BACKEND_MAX] = +{ + { RIG_DUMMY, RIG_BACKEND_DUMMY, RIG_FUNCNAMA(dummy) }, + { RIG_YAESU, RIG_BACKEND_YAESU, RIG_FUNCNAM(yaesu) }, + { RIG_KENWOOD, RIG_BACKEND_KENWOOD, RIG_FUNCNAM(kenwood) }, + { RIG_ICOM, RIG_BACKEND_ICOM, RIG_FUNCNAM(icom) }, + { RIG_PCR, RIG_BACKEND_PCR, RIG_FUNCNAMA(pcr) }, + { RIG_AOR, RIG_BACKEND_AOR, RIG_FUNCNAMA(aor) }, + { RIG_JRC, RIG_BACKEND_JRC, RIG_FUNCNAMA(jrc) }, + { RIG_UNIDEN, RIG_BACKEND_UNIDEN, RIG_FUNCNAM(uniden) }, + { RIG_DRAKE, RIG_BACKEND_DRAKE, RIG_FUNCNAM(drake) }, + { RIG_LOWE, RIG_BACKEND_LOWE, RIG_FUNCNAM(lowe) }, + { RIG_RACAL, RIG_BACKEND_RACAL, RIG_FUNCNAMA(racal) }, + { RIG_WJ, RIG_BACKEND_WJ, RIG_FUNCNAMA(wj) }, + { RIG_SKANTI, RIG_BACKEND_SKANTI, RIG_FUNCNAMA(skanti) }, + { RIG_WINRADIO, RIG_BACKEND_WINRADIO, RIG_FUNCNAMA(winradio) }, + { RIG_TENTEC, RIG_BACKEND_TENTEC, RIG_FUNCNAMA(tentec) }, + { RIG_ALINCO, RIG_BACKEND_ALINCO, RIG_FUNCNAMA(alinco) }, + { RIG_KACHINA, RIG_BACKEND_KACHINA, RIG_FUNCNAMA(kachina) }, + { RIG_TAPR, RIG_BACKEND_TAPR, RIG_FUNCNAMA(tapr) }, + { RIG_FLEXRADIO, RIG_BACKEND_FLEXRADIO, RIG_FUNCNAMA(flexradio) }, + { RIG_RFT, RIG_BACKEND_RFT, RIG_FUNCNAMA(rft) }, + { RIG_KIT, RIG_BACKEND_KIT, RIG_FUNCNAMA(kit) }, + { RIG_TUNER, RIG_BACKEND_TUNER, RIG_FUNCNAMA(tuner) }, + { RIG_RS, RIG_BACKEND_RS, RIG_FUNCNAMA(rs) }, + { RIG_PRM80, RIG_BACKEND_PRM80, RIG_FUNCNAMA(prm80) }, + { RIG_ADAT, RIG_BACKEND_ADAT, RIG_FUNCNAM(adat) }, + { 0, NULL }, /* end */ }; /* @@ -383,4 +381,3 @@ int HAMLIB_API rig_load_backend(const char *be_name) return -RIG_EINVAL; } - diff --git a/src/rot_reg.c b/src/rot_reg.c index 4bdd0dad8..fb78ed4e0 100644 --- a/src/rot_reg.c +++ b/src/rot_reg.c @@ -60,7 +60,6 @@ DEFINE_INITROT_BACKEND(dummy); -DEFINE_INITROT_BACKEND(rpc); DEFINE_INITROT_BACKEND(easycomm); DEFINE_INITROT_BACKEND(fodtrack); DEFINE_INITROT_BACKEND(rotorez); @@ -90,25 +89,24 @@ static struct { const char *be_name; int (*be_init)(void *); rot_model_t (*be_probe)(hamlib_port_t *); -} rot_backend_list[ROT_BACKEND_MAX] = -{ - { ROT_DUMMY, ROT_BACKEND_DUMMY, ROT_FUNCNAMA(dummy) }, - /* { ROT_RPC, ROT_BACKEND_RPC, ROT_FUNCNAMA(rpc) }, */ - { ROT_EASYCOMM, ROT_BACKEND_EASYCOMM, ROT_FUNCNAMA(easycomm) }, - { ROT_FODTRACK, ROT_BACKEND_FODTRACK, ROT_FUNCNAMA(fodtrack) }, - { ROT_ROTOREZ, ROT_BACKEND_ROTOREZ, ROT_FUNCNAMA(rotorez) }, - { ROT_SARTEK, ROT_BACKEND_SARTEK, ROT_FUNCNAMA(sartek) }, - { ROT_GS232A, ROT_BACKEND_GS232A, ROT_FUNCNAMA(gs232a) }, - { ROT_KIT, ROT_BACKEND_KIT, ROT_FUNCNAMA(kit) }, - { ROT_HEATHKIT, ROT_BACKEND_HEATHKIT, ROT_FUNCNAMA(heathkit) }, - { ROT_SPID, ROT_BACKEND_SPID, ROT_FUNCNAMA(spid) }, - { ROT_M2, ROT_BACKEND_M2, ROT_FUNCNAMA(m2) }, - { ROT_ARS, ROT_BACKEND_ARS, ROT_FUNCNAMA(ars) }, - { ROT_AMSAT, ROT_BACKEND_AMSAT, ROT_FUNCNAMA(amsat) }, - { ROT_TS7400, ROT_BACKEND_TS7400, ROT_FUNCNAMA(ts7400) }, - { ROT_CELESTRON, ROT_BACKEND_CELESTRON, ROT_FUNCNAMA(celestron) }, - { ROT_ETHER6, ROT_BACKEND_ETHER6, ROT_FUNCNAMA(ether6) }, - { 0, NULL }, /* end */ +} rot_backend_list[ROT_BACKEND_MAX] = +{ + { ROT_DUMMY, ROT_BACKEND_DUMMY, ROT_FUNCNAMA(dummy) }, + { ROT_EASYCOMM, ROT_BACKEND_EASYCOMM, ROT_FUNCNAMA(easycomm) }, + { ROT_FODTRACK, ROT_BACKEND_FODTRACK, ROT_FUNCNAMA(fodtrack) }, + { ROT_ROTOREZ, ROT_BACKEND_ROTOREZ, ROT_FUNCNAMA(rotorez) }, + { ROT_SARTEK, ROT_BACKEND_SARTEK, ROT_FUNCNAMA(sartek) }, + { ROT_GS232A, ROT_BACKEND_GS232A, ROT_FUNCNAMA(gs232a) }, + { ROT_KIT, ROT_BACKEND_KIT, ROT_FUNCNAMA(kit) }, + { ROT_HEATHKIT, ROT_BACKEND_HEATHKIT, ROT_FUNCNAMA(heathkit) }, + { ROT_SPID, ROT_BACKEND_SPID, ROT_FUNCNAMA(spid) }, + { ROT_M2, ROT_BACKEND_M2, ROT_FUNCNAMA(m2) }, + { ROT_ARS, ROT_BACKEND_ARS, ROT_FUNCNAMA(ars) }, + { ROT_AMSAT, ROT_BACKEND_AMSAT, ROT_FUNCNAMA(amsat) }, + { ROT_TS7400, ROT_BACKEND_TS7400, ROT_FUNCNAMA(ts7400) }, + { ROT_CELESTRON, ROT_BACKEND_CELESTRON, ROT_FUNCNAMA(celestron) }, + { ROT_ETHER6, ROT_BACKEND_ETHER6, ROT_FUNCNAMA(ether6) }, + { 0, NULL }, /* end */ }; // Apparently, no rotator can be probed. @@ -340,4 +338,3 @@ int HAMLIB_API rot_load_backend(const char *be_name) return -EINVAL; } - diff --git a/tests/rig_split_lst.awk b/tests/rig_split_lst.awk index e4c38ab25..6a4f62875 100755 --- a/tests/rig_split_lst.awk +++ b/tests/rig_split_lst.awk @@ -39,7 +39,6 @@ BEGIN { bkendlst[16]="tentec" bkendlst[17]="alinco" bkendlst[18]="kachina" - bkendlst[19]="rpcrig" bkendlst[20]="gnuradio" bkendlst[21]="microtune" bkendlst[22]="tapr" @@ -87,4 +86,3 @@ END { print "" >> lst_dir"/"bkendlst[bke]"_lst.html" } } - diff --git a/tests/rigctld.8 b/tests/rigctld.8 index aee006985..e6f689caa 100644 --- a/tests/rigctld.8 +++ b/tests/rigctld.8 @@ -666,14 +666,15 @@ $ rigctld -m 114 -r /dev/ttyUSB1 -s 4800 -C stop_bits=2 & Start \fBrigctld\fP for an Elecraft K3 using COM2 on Win32: .sp $ rigctld -m 229 -r COM2 -.sp +.PP Connect to the already running \fBrigctld\fP, and set current frequency to 14.266 MHz with a 1 second read timeout using the default protocol from the shell prompt: -.PP +.sp $ echo "\\set_freq 14266000" | nc -w 1 localhost 4532 -Connect to a running \fBrigctld\fP with \fBrigctl\fP on the local host: .PP +Connect to a running \fBrigctld\fP with \fBrigctl\fP on the local host: +.sp $ rigctl -m2 .SH DIAGNOSTICS The \fB-v\fP, \fB--verbose\fP, option allows different levels of diagnostics diff --git a/tests/rotctl.1 b/tests/rotctl.1 index d7cb6b263..b4df5ae2a 100644 --- a/tests/rotctl.1 +++ b/tests/rotctl.1 @@ -273,10 +273,6 @@ Start \fBrotctl\fP for RotorEZ using COM2 on Win32: .sp $ rotctl -m 401 -r COM2 .sp -Start \fBrotctl\fP using \fBrpc.rotd\fP and querying the position: -.sp -$ rotctl -m 101 -r localhost \\get_pos -.sp Connect to a running \fBrotctld\fP with rotor model 2 ("NET rotctl") on the local host and specifying the TCP port, and querying the position: .sp