hamradio/Hamlib
1
0
Fork 0
mirror of https://github.com/Hamlib/Hamlib.git synced 2024-09-22 10:57:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Meade parsing and promote to stable

Browse Source
This commit is contained in:
Michael Black 2019-11-06 23:19:46 -06:00
parent 5a6a58f478
commit 3bccc571e7
No known key found for this signature in database
GPG Key ID: 6599353EC683404D
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
meade/meade.c
View File

@ -254,15 +254,18 @@ static int meade_get_position(ROT *rot, azimuth_t *az, elevation_t *el)
rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
meade_transaction(rot, ":GZ#:GA#", return_str, &return_str_size, 14);
meade_transaction(rot, ":GZ#:GA#", return_str, &return_str_size, BUFSIZE);
// answer expecting one of two formats depending on precision setting
// DDD*MM'SS#:sDD*MM'SS#
// DDD*MM#T:sDD*MM#
// The Meade manual is not clear on this format
// The period separator is coming back as 0xdf so we won't assume which char it is
// DDD.MM:SS#sDD.MM:SS#
// DDD.MM#sDD.MM#
// Tested and working with the Meade LX200 and Autostar 497
rig_debug(RIG_DEBUG_VERBOSE, "%s: parsing \"%s\" as high precision\n", __func__, return_str);
int n = sscanf(return_str,"%d*%d'%*d#:%d*%d",&az_degree,&az_minutes,&el_degree,&el_minutes);
int n = sscanf(return_str,"%d%*c%d:%*d#%d%*c%d:%*d#",&az_degree,&az_minutes,&el_degree,&el_minutes);
if (n != 4) {
rig_debug(RIG_DEBUG_VERBOSE, "%s: parsing as low precision\n", __func__);
n = sscanf(return_str,"%d*%d#%*c#:%d*%d",&az_degree,&az_minutes,&el_degree,&el_minutes);
n = sscanf(return_str,"%d%*c%d#%d%*c%d",&az_degree,&az_minutes,&el_degree,&el_minutes);
if (n != 4) {
return RIG_EPROTO;
}