Merge branch 'master' of https://github.com/mdblack98/Hamlib

include/hamlib/rotator.h

@@ -491,6 +491,7 @@ dec2dmmm HAMLIB_PARAMS((double dec,
 extern HAMLIB_EXPORT(double)
 dmmm2dec HAMLIB_PARAMS((int degrees,
                         double minutes,
+                        double seconds,
                         int sw));
 
 //! @endcond

rotators/meade/meade.c

@@ -358,8 +358,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);
-    *el = dmmm2dec(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);
     return RIG_OK;
 }
 

src/locator.c

@@ -193,7 +193,7 @@ double HAMLIB_API dms2dec(int degrees, int minutes, double seconds, int sw)
  *
  * \sa dec2dmmm()
  */
-double HAMLIB_API dmmm2dec(int degrees, double minutes, int sw)
+double HAMLIB_API dmmm2dec(int degrees, double minutes, double seconds, int sw)
 {
     double st;
 
@@ -209,7 +209,7 @@ double HAMLIB_API dmmm2dec(int degrees, double minutes, int sw)
         minutes = fabs(minutes);
     }
 
-    st = (double)degrees + minutes / 60.;
+    st = (double)degrees + (minutes / 60) + (seconds / 3600);
 
     if (sw == 1)
     {

tests/rotctl_parse.c

@@ -2155,7 +2155,7 @@ declare_proto_rot(d_mm2dec)
     CHKSCN1ARG(sscanf(arg2, "%lf", &min));
     CHKSCN1ARG(sscanf(arg3, "%d", &sw));
 
-    dec_deg = dmmm2dec(deg, min, sw);
+    dec_deg = dmmm2dec(deg, min, sw, 0.0); // we'll add real seconds when somebody asks for it
 
     if ((interactive && prompt) || (interactive && !prompt && ext_resp))
     {