From 98896df1638431effadbf47ae450b1ce6dab5e87 Mon Sep 17 00:00:00 2001 From: Michael Black W9MDB Date: Sun, 31 May 2020 06:59:13 -0500 Subject: [PATCH 1/4] Add check for Audiostar in meade.c to provide arcminutes on elevation limit https://github.com/Hamlib/Hamlib/issues/266 --- rotators/meade/meade.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/rotators/meade/meade.c b/rotators/meade/meade.c index fb5c54180..7438f3b93 100644 --- a/rotators/meade/meade.c +++ b/rotators/meade/meade.c @@ -230,7 +230,14 @@ static int meade_open(ROT *rot) /* Set Telescope to Land alignment mode to deactivate sloping */ /* Allow 0-90 Degree Elevation */ - retval = meade_transaction(rot, ":AL#:So00#:Sh90#", NULL, 0, 0); + if (strcmp(priv->product_name, "Audiostar")) // if we're not an audiostar + { + retval = meade_transaction(rot, ":AL#:So00#:Sh90#", NULL, 0, 0); + } + { + // Audiostar elevation is in arcminutes + retval = meade_transaction(rot, ":So00#:Sh5400#", NULL, 0, 0); + } if (retval != RIG_OK) { rig_debug(RIG_DEBUG_ERR, "%s: meade_transaction %s\n", __func__, rigerror(retval)); } @@ -299,6 +306,7 @@ static int meade_set_position(ROT *rot, azimuth_t az, elevation_t el) meade_transaction(rot, cmd_str, return_str, &return_str_size, 3); /* '1' == Azimuth accepted '1' == Elevation accepted '0' == No error */ + /* MA command may return 1=Lower than or 2=Higher than min/max elevation */ if (return_str_size > 0 && strstr(return_str, "110") != NULL) { return RIG_OK; From 785dd267d53e09f82cdf0dd1fa12f7a739da4409 Mon Sep 17 00:00:00 2001 From: Michael Black W9MDB Date: Sun, 31 May 2020 07:07:44 -0500 Subject: [PATCH 2/4] Update version for meade.c --- rotators/meade/meade.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rotators/meade/meade.c b/rotators/meade/meade.c index 7438f3b93..84607e23b 100644 --- a/rotators/meade/meade.c +++ b/rotators/meade/meade.c @@ -459,7 +459,7 @@ const struct rot_caps meade_caps = ROT_MODEL(ROT_MODEL_MEADE), .model_name = "LX200/Autostar", .mfg_name = "Meade", - .version = "20200528", + .version = "20200531", .copyright = "LGPL", .status = RIG_STATUS_STABLE, .rot_type = ROT_TYPE_AZEL, From cbe269077b53a0901c38645a6544a1853fd1434d Mon Sep 17 00:00:00 2001 From: Michael Black W9MDB Date: Sun, 31 May 2020 10:05:44 -0500 Subject: [PATCH 3/4] Fix one more cache expire for caps->get_vfo https://github.com/Hamlib/Hamlib/issues/270 --- src/rig.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/rig.c b/src/rig.c index d1c96ae28..620a97d7b 100644 --- a/src/rig.c +++ b/src/rig.c @@ -1993,6 +1993,9 @@ int HAMLIB_API rig_get_vfo(RIG *rig, vfo_t *vfo) rig->state.cache.vfo = *vfo; cache_ms = elapsed_ms(&rig->state.cache.time_vfo, ELAPSED_SET); } + else { + cache_ms = elapsed_ms(&rig->state.cache.time_vfo, ELAPSED_INVALIDATE); + } return retcode; } From e36910e384fcdca51c87a5f9af9484316d813afc Mon Sep 17 00:00:00 2001 From: Michael Black W9MDB Date: Sun, 31 May 2020 11:49:04 -0500 Subject: [PATCH 4/4] Fix Autostar spelling...duh... --- rotators/meade/meade.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rotators/meade/meade.c b/rotators/meade/meade.c index 84607e23b..b28875cdc 100644 --- a/rotators/meade/meade.c +++ b/rotators/meade/meade.c @@ -230,7 +230,7 @@ static int meade_open(ROT *rot) /* Set Telescope to Land alignment mode to deactivate sloping */ /* Allow 0-90 Degree Elevation */ - if (strcmp(priv->product_name, "Audiostar")) // if we're not an audiostar + if (strcmp(priv->product_name, "Autostar")) // if we're not an audiostar { retval = meade_transaction(rot, ":AL#:So00#:Sh90#", NULL, 0, 0); }