From: n0nb <n0...@us...> - 2025-09-05 12:19:33
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Hamlib -- Ham radio control libraries". The branch, master has been updated via 23bc557ed7d64dad18108e3907eb3e6309c16f1f (commit) via d8565776c22f5a2383b804446a0cd5565568344c (commit) via 6b4c6200d01c5bdffe60d21c64160c3b30925795 (commit) via b8f42e4a6d9a200a291160ddac9f642749195697 (commit) from 00562fbc509ffe9cca351870c658b2bd842f3469 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 23bc557ed7d64dad18108e3907eb3e6309c16f1f Merge: 00562fbc5 d8565776c Author: Nate Bargmann <n0...@n0...> Date: Thu Sep 4 18:38:38 2025 -0500 Merge GitHub PR #1878 commit d8565776c22f5a2383b804446a0cd5565568344c Author: Daniele Forsi IU5HKX <iu...@gm...> Date: Thu Sep 4 22:43:38 2025 +0200 Add a short description of INDI (Instrument Neutral Distributed Interface) diff --git a/doc/man1/rotctl.1 b/doc/man1/rotctl.1 index 6ffaa15a7..7da2249d4 100644 --- a/doc/man1/rotctl.1 +++ b/doc/man1/rotctl.1 @@ -828,7 +828,15 @@ for INDI using the local domain on Linux: .RB $ " rotctl -m 2001 -r @/tmp/indiserver" .EE .in -. +.PP +INDI (Instrument Neutral Distributed Interface) is an LGPLv2 +software to control astronomical equipment, +including telescope mounts that can be used to rotate antennas. +.PP +For more information see +.UR https://indilib.org/ +indilib.org +.UE . .SH BUGS . commit 6b4c6200d01c5bdffe60d21c64160c3b30925795 Author: Daniele Forsi IU5HKX <iu...@gm...> Date: Tue Sep 2 00:07:13 2025 +0200 Add examples of using INDI rotators diff --git a/doc/man1/rotctl.1 b/doc/man1/rotctl.1 index 83175119c..6ffaa15a7 100644 --- a/doc/man1/rotctl.1 +++ b/doc/man1/rotctl.1 @@ -5,7 +5,7 @@ .\" .\" Note: Please keep this page in sync with the source, rotctl.c .\" -.TH ROTCTL "1" "2020-09-09" "Hamlib" "Hamlib Utilities" +.TH ROTCTL "1" "2025-09-01" "Hamlib" "Hamlib Utilities" . . .SH NAME @@ -805,6 +805,30 @@ TCP port, and querying the position: .EE .in . +.PP +Start +.B rotctl +for INDI using an address other than the default \fIlocalhost:5764\fP: +. +.PP +.in +4n +.EX +.RB $ " rotctl -m 2001 -r example.com:12345" +.EE +.in +. +.PP +Start +.B rotctl +for INDI using the local domain on Linux: +. +.PP +.in +4n +.EX +.RB $ " rotctl -m 2001 -r @/tmp/indiserver" +.EE +.in +. . .SH BUGS . commit b8f42e4a6d9a200a291160ddac9f642749195697 Author: Daniele Forsi IU5HKX <iu...@gm...> Date: Fri Aug 29 23:31:27 2025 +0200 Do not hardcode host and port number of INDI server This allows to connect to the server running on another machine or on a different port. Defaults to the old value of localhost:7624. It is still possible to connect to the local domain, eg. with --rot-file @/tmp/indiserver diff --git a/rotators/indi/indi.c b/rotators/indi/indi.c index e40538248..39ec6411c 100644 --- a/rotators/indi/indi.c +++ b/rotators/indi/indi.c @@ -30,7 +30,7 @@ const struct rot_caps indi_rot_caps = ROT_MODEL(ROT_MODEL_INDI), .model_name = "INDI", .mfg_name = "INDI", - .version = "0.1", + .version = "0.2", .copyright = "LGPL", .status = RIG_STATUS_STABLE, .rot_type = ROT_TYPE_OTHER, diff --git a/rotators/indi/indi_wrapper.cpp b/rotators/indi/indi_wrapper.cpp index 0ae8f1758..0861fd7d0 100644 --- a/rotators/indi/indi_wrapper.cpp +++ b/rotators/indi/indi_wrapper.cpp @@ -597,9 +597,20 @@ extern "C" const char *indi_wrapper_get_info(ROT *rot) extern "C" int indi_wrapper_open(ROT *rot) { + hamlib_port_t *rotp = ROTPORT(rot); + char host[256]; + char port[6]; + rig_debug(RIG_DEBUG_TRACE, "%s called\n", __func__); - indi_wrapper_client->setServer("localhost", 7624); + if (parse_hoststr(rotp->pathname, strlen(rotp->pathname), host, port) == RIG_OK) + { + indi_wrapper_client->setServer(host, atoi(port)); + } + else + { + indi_wrapper_client->setServer("localhost", 7624); + } if (!indi_wrapper_client->connectServer()) { diff --git a/rotators/indi/indi_wrapper.hpp b/rotators/indi/indi_wrapper.hpp index c96bf277c..69b90b32f 100644 --- a/rotators/indi/indi_wrapper.hpp +++ b/rotators/indi/indi_wrapper.hpp @@ -26,6 +26,7 @@ #include <libindi/baseclient.h> #include <hamlib/rotator.h> +#include "misc.h" class RotINDIClient : public INDI::BaseClient { ----------------------------------------------------------------------- Summary of changes: doc/man1/rotctl.1 | 34 +++++++++++++++++++++++++++++++++- rotators/indi/indi.c | 2 +- rotators/indi/indi_wrapper.cpp | 13 ++++++++++++- rotators/indi/indi_wrapper.hpp | 1 + 4 files changed, 47 insertions(+), 3 deletions(-) hooks/post-receive -- Hamlib -- Ham radio control libraries |