[Hamlib-commits] Hamlib -- Ham radio control libraries branch master updated. bddd3ace002ede56a2674
Library to control radio transceivers and receivers
Brought to you by:
n0nb
Menu
▾
▴
[Hamlib-commits] Hamlib -- Ham radio control libraries branch master updated. bddd3ace002ede56a26741838f5e11157ab7ef0d
|
From: n0nb <n0...@us...> - 2025-06-14 17:04:26
|
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 bddd3ace002ede56a26741838f5e11157ab7ef0d (commit)
from df2bf0c6349dfc88004348631a5d9ca8bfeb138e (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 bddd3ace002ede56a26741838f5e11157ab7ef0d
Author: Nate Bargmann <n0...@n0...>
Date: Sat Jun 14 11:22:00 2025 -0500
Revert 17b404a6c71f3d0bd60153a9191088e6cc9960c5
These changes were unnecessary as the real bug is that the incorrect
function was being called in meade.c.
Closes GitHub issue #268.
Fix testloc.c
diff --git a/include/hamlib/rotator.h b/include/hamlib/rotator.h
index 4ddf4f5a1..0a183c668 100644
--- a/include/hamlib/rotator.h
+++ b/include/hamlib/rotator.h
@@ -909,7 +909,6 @@ dec2dmmm HAMLIB_PARAMS((double dec,
extern HAMLIB_EXPORT(double)
dmmm2dec HAMLIB_PARAMS((int degrees,
double minutes,
- double seconds,
int sw));
extern HAMLIB_EXPORT(setting_t) rot_parse_func(const char *s);
diff --git a/rotators/meade/meade.c b/rotators/meade/meade.c
index 997ec24cc..b3fad52f9 100644
--- a/rotators/meade/meade.c
+++ b/rotators/meade/meade.c
@@ -353,8 +353,8 @@ static int meade_get_position(ROT *rot, azimuth_t *az, elevation_t *el)
rig_debug(RIG_DEBUG_VERBOSE, "%s: az=%03d:%02d:%02d, el=%03d:%02d:%02d\n",
__func__, az_degrees, az_minutes, az_seconds, el_degrees, el_minutes,
el_seconds);
- *az = dmmm2dec(az_degrees, az_minutes, az_seconds, az_seconds);
- *el = dmmm2dec(el_degrees, el_minutes, el_seconds, el_seconds);
+ *az = dms2dec(az_degrees, az_minutes, az_seconds, 0);
+ *el = dms2dec(el_degrees, el_minutes, el_seconds, 0);
return RIG_OK;
}
diff --git a/src/locator.c b/src/locator.c
index 652ca007b..7480a36d4 100644
--- a/src/locator.c
+++ b/src/locator.c
@@ -217,14 +217,13 @@ double HAMLIB_API dms2dec(int degrees, int minutes, double seconds, int sw)
*
* \param degrees Degrees, whole degrees.
* \param minutes Minutes, decimal minutes.
- * \param seconds Seconds, decimal seconds.
* \param sw South or West.
*
* Convert a degrees decimal minutes (D M.MMM) notation common on many GPS
* units to a decimal degrees (D.DDD) angle value.
*
- * \note For the parameters \a degrees > 360, \a minutes > 60.0, \a seconds >
- * 60.0 are allowed, but the resulting angle will not be normalized.
+ * \note For the parameters \a degrees > 360, \a minutes > 60.0 are allowed, but
+ * the resulting angle will not be normalized.
*
* When the variable \a sw is passed a value of 1, the returned decimal
* degrees value will be negative (*South* or *West*). When passed a value of
@@ -234,7 +233,7 @@ double HAMLIB_API dms2dec(int degrees, int minutes, double seconds, int sw)
*
* \sa dec2dmmm()
*/
-double HAMLIB_API dmmm2dec(int degrees, double minutes, double seconds, int sw)
+double HAMLIB_API dmmm2dec(int degrees, double minutes, int sw)
{
double st;
@@ -250,7 +249,7 @@ double HAMLIB_API dmmm2dec(int degrees, double minutes, double seconds, int sw)
minutes = fabs(minutes);
}
- st = (double)degrees + (minutes / 60) + (seconds / 3600);
+ st = (double)degrees + minutes / 60;
if (sw == 1)
{
diff --git a/tests/rotctl_parse.c b/tests/rotctl_parse.c
index 5b843f03a..97e64d3af 100644
--- a/tests/rotctl_parse.c
+++ b/tests/rotctl_parse.c
@@ -2769,8 +2769,7 @@ declare_proto_rot(d_mm2dec)
CHKSCN1ARG(sscanf(arg2, "%lf", &min));
CHKSCN1ARG(sscanf(arg3, "%d", &sw));
- dec_deg = dmmm2dec(deg, min, sw,
- 0.0); // we'll add real seconds when somebody asks for it
+ dec_deg = dmmm2dec(deg, min, sw);
if ((interactive && prompt) || (interactive && !prompt && ext_resp))
{
diff --git a/tests/testloc.c b/tests/testloc.c
index 64a156413..578d03e1c 100644
--- a/tests/testloc.c
+++ b/tests/testloc.c
@@ -93,7 +93,7 @@ int main(int argc, char *argv[])
printf(" GPS lon:\t%f\t%c%d %.3f'\n", lon1, sign, deg, mmm);
/* hamlib function to convert deg, decimal min to decimal degrees */
- lon1 = dmmm2dec(deg, mmm, nesw, 0.0);
+ lon1 = dmmm2dec(deg, mmm, nesw);
printf(" Recoded GPS:\t%f\n", lon1);
/* hamlib function to convert decimal degrees to deg, min, sec */
@@ -141,7 +141,7 @@ int main(int argc, char *argv[])
printf(" GPS lat:\t%f\t%c%d %.3f'\n", lat1, sign, deg, mmm);
/* hamlib function to convert deg, decimal min to decimal degrees */
- lat1 = dmmm2dec(deg, mmm, nesw, 0.0);
+ lat1 = dmmm2dec(deg, mmm, nesw);
printf(" Recoded GPS:\t%f\n", lat1);
/* hamlib function to convert decimal degrees to maidenhead */
@@ -216,7 +216,7 @@ int main(int argc, char *argv[])
printf(" GPS lon:\t%f\t%c%d %.3f'\n", lon2, sign, deg, mmm);
/* hamlib function to convert deg, decimal min to decimal degrees */
- lon2 = dmmm2dec(deg, mmm, nesw, 0.0);
+ lon2 = dmmm2dec(deg, mmm, nesw);
printf(" Recoded GPS:\t%f\n", lon2);
/* hamlib function to convert decimal degrees to deg, min, sec */
@@ -264,7 +264,7 @@ int main(int argc, char *argv[])
printf(" GPS lat:\t%f\t%c%d %.3f'\n", lat2, sign, deg, mmm);
/* hamlib function to convert deg, decimal min to decimal degrees */
- lat2 = dmmm2dec(deg, mmm, nesw, 0.0);
+ lat2 = dmmm2dec(deg, mmm, nesw);
printf(" Recoded GPS:\t%f\n", lat2);
/* hamlib function to convert decimal degrees to maidenhead */
-----------------------------------------------------------------------
Summary of changes:
include/hamlib/rotator.h | 1 -
rotators/meade/meade.c | 4 ++--
src/locator.c | 9 ++++-----
tests/rotctl_parse.c | 3 +--
tests/testloc.c | 8 ++++----
5 files changed, 11 insertions(+), 14 deletions(-)
hooks/post-receive
--
Hamlib -- Ham radio control libraries
|
