mirror
/
Hamlib
kopia lustrzana https://github.com/Hamlib/Hamlib
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

astyle meade and prosistel

pull/139/head
Michael Black 2019-11-07 07:52:56 -06:00
rodzic 3bccc571e7
commit b8da8cd4a8
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 6599353EC683404D
2 zmienionych plików z 374 dodań i 298 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

95
meade/meade.c
Wyświetl plik

@ -39,7 +39,8 @@
#include "meade.h" #include "meade.h"
struct meade_priv_data { struct meade_priv_data
{
azimuth_t az; azimuth_t az;
elevation_t el; elevation_t el;
@ -96,7 +97,7 @@ struct meade_priv_data {
* RIG_EIO - if an I/O error occurred while sending/receiving data. * RIG_EIO - if an I/O error occurred while sending/receiving data.
* RIG_ETIMEOUT - if timeout expires without any characters received. * RIG_ETIMEOUT - if timeout expires without any characters received.
*/ */
static int meade_transaction (ROT *rot, const char *cmdstr, static int meade_transaction(ROT *rot, const char *cmdstr,
char *data, size_t *data_len, size_t expected_return_length) char *data, size_t *data_len, size_t expected_return_length)
{ {
struct rot_state *rs; struct rot_state *rs;
@ -105,31 +106,42 @@ static int meade_transaction (ROT *rot, const char *cmdstr,
rs = &rot->state; rs = &rot->state;
while(1) { while (1)
{
serial_flush(&rs->rotport); serial_flush(&rs->rotport);
if (cmdstr) { if (cmdstr)
{
return_value = write_block(&rs->rotport, cmdstr, strlen(cmdstr)); return_value = write_block(&rs->rotport, cmdstr, strlen(cmdstr));
if (return_value != RIG_OK) {
if (return_value != RIG_OK)
{
return return_value; return return_value;
} }
} }
/* Not all commands will send a return value, so use data = NULL if no /* Not all commands will send a return value, so use data = NULL if no
return value is expected, Strings end with '#' */ return value is expected, Strings end with '#' */
if (data != NULL) { if (data != NULL)
memset(data,0,BUFSIZE); {
*data_len = read_string(&rs->rotport, data, expected_return_length + 1, "\n", strlen("\n")); memset(data, 0, BUFSIZE);
if (*data_len < 0) { *data_len = read_string(&rs->rotport, data, expected_return_length + 1, "\n",
if (retry_read++ >= rot->state.rotport.retry) { strlen("\n"));
if (*data_len < 0)
{
if (retry_read++ >= rot->state.rotport.retry)
{
return RIG_ETIMEOUT; return RIG_ETIMEOUT;
} }
} }
else { else
{
return RIG_OK; return RIG_OK;
} }
} }
else { else
{
return RIG_OK; return RIG_OK;
} }
} }
@ -142,12 +154,15 @@ static int meade_init(ROT *rot)
{ {
struct meade_priv_data *priv; struct meade_priv_data *priv;
priv = (struct meade_priv_data*) priv = (struct meade_priv_data *)
malloc(sizeof(struct meade_priv_data)); malloc(sizeof(struct meade_priv_data));
if (!priv) if (!priv)
{
return -RIG_ENOMEM; return -RIG_ENOMEM;
rot->state.priv = (void*)priv; }
rot->state.priv = (void *)priv;
rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__); rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
rot->state.rotport.type.rig = RIG_PORT_SERIAL; rot->state.rotport.type.rig = RIG_PORT_SERIAL;
@ -167,7 +182,9 @@ static int meade_cleanup(ROT *rot)
rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__); rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
if (rot->state.priv) if (rot->state.priv)
{
free(rot->state.priv); free(rot->state.priv);
}
rot->state.priv = NULL; rot->state.priv = NULL;
@ -183,7 +200,7 @@ static int meade_open(ROT *rot)
/* Set Telescope to Land alignment mode to deactivate sloping */ /* Set Telescope to Land alignment mode to deactivate sloping */
/* Allow 0-90 Degree Elevation */ /* Allow 0-90 Degree Elevation */
return meade_transaction(rot, ":AL#:So00#:Sh90#" , NULL, 0, 0); return meade_transaction(rot, ":AL#:So00#:Sh90#", NULL, 0, 0);
} }
/* /*
@ -193,7 +210,7 @@ static int meade_close(ROT *rot)
{ {
rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__); rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
/* Stop all Movement */ /* Stop all Movement */
return meade_transaction(rot, ":Q#" , NULL, 0, 0); return meade_transaction(rot, ":Q#", NULL, 0, 0);
} }
/* /*
@ -210,7 +227,7 @@ static int meade_set_position(ROT *rot, azimuth_t az, elevation_t el)
size_t return_str_size; size_t return_str_size;
float az_degrees, az_minutes, el_degrees, el_minutes; float az_degrees, az_minutes, el_degrees, el_minutes;
rig_debug(RIG_DEBUG_VERBOSE,"%s called: %.2f %.2f\n", __func__, rig_debug(RIG_DEBUG_VERBOSE, "%s called: %.2f %.2f\n", __func__,
az, el); az, el);
az_degrees = floor(az); az_degrees = floor(az);
@ -222,12 +239,18 @@ static int meade_set_position(ROT *rot, azimuth_t az, elevation_t el)
new target is more than 5 Degrees away from old target new target is more than 5 Degrees away from old target
if not, don't accept new target*/ if not, don't accept new target*/
meade_transaction(rot, ":D#", return_str, &return_str_size, 1); meade_transaction(rot, ":D#", return_str, &return_str_size, 1);
if(return_str_size > 0 && return_str[0] == 0x7F) {
if(fabsf(az - priv->target_az) > 5 || fabsf(el - priv->target_el) > 5) if (return_str_size > 0 && return_str[0] == 0x7F)
{
if (fabsf(az - priv->target_az) > 5 || fabsf(el - priv->target_el) > 5)
{
meade_transaction(rot, ":Q#", NULL, 0, 0); meade_transaction(rot, ":Q#", NULL, 0, 0);
}
else else
{
return RIG_OK; return RIG_OK;
} }
}
priv->target_az = az; priv->target_az = az;
priv->target_el = el; priv->target_el = el;
@ -236,11 +259,16 @@ static int meade_set_position(ROT *rot, azimuth_t az, elevation_t el)
az_degrees, az_minutes, el_degrees, el_minutes); az_degrees, az_minutes, el_degrees, el_minutes);
meade_transaction(rot, cmd_str, return_str, &return_str_size, 3); meade_transaction(rot, cmd_str, return_str, &return_str_size, 3);
/* '1' == Azimuth accepted '1' == Elevation accepted '0' == No error */ /* '1' == Azimuth accepted '1' == Elevation accepted '0' == No error */
if(return_str_size > 0 && strstr(return_str , "110") != NULL) if (return_str_size > 0 && strstr(return_str, "110") != NULL)
{
return RIG_OK; return RIG_OK;
}
else else
{
return RIG_EINVAL; return RIG_EINVAL;
}
} }
/* /*
@ -261,15 +289,23 @@ static int meade_get_position(ROT *rot, azimuth_t *az, elevation_t *el)
// DDD.MM:SS#sDD.MM:SS# // DDD.MM:SS#sDD.MM:SS#
// DDD.MM#sDD.MM# // DDD.MM#sDD.MM#
// Tested and working with the Meade LX200 and Autostar 497 // 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); rig_debug(RIG_DEBUG_VERBOSE, "%s: parsing \"%s\" as high precision\n", __func__,
int n = sscanf(return_str,"%d%*c%d:%*d#%d%*c%d:%*d#",&az_degree,&az_minutes,&el_degree,&el_minutes); return_str);
if (n != 4) { 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__); rig_debug(RIG_DEBUG_VERBOSE, "%s: parsing as low precision\n", __func__);
n = sscanf(return_str,"%d%*c%d#%d%*c%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,
if (n != 4) { &el_minutes);
if (n != 4)
{
return RIG_EPROTO; return RIG_EPROTO;
} }
} }
*az = dmmm2dec(az_degree, az_minutes, 0); *az = dmmm2dec(az_degree, az_minutes, 0);
*el = dmmm2dec(el_degree, el_minutes, 0); *el = dmmm2dec(el_degree, el_minutes, 0);
return RIG_OK; return RIG_OK;
@ -327,9 +363,11 @@ static int meade_move(ROT *rot, int direction, int speed)
struct meade_priv_data *priv = (struct meade_priv_data *)rot->state.priv; struct meade_priv_data *priv = (struct meade_priv_data *)rot->state.priv;
rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__); rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
rig_debug(RIG_DEBUG_TRACE, "%s: Direction = %d, Speed = %d\n", __func__, direction, speed); rig_debug(RIG_DEBUG_TRACE, "%s: Direction = %d, Speed = %d\n", __func__,
direction, speed);
switch(direction) { switch (direction)
{
case ROT_MOVE_UP: case ROT_MOVE_UP:
return meade_set_position(rot, priv->target_az, 90); return meade_set_position(rot, priv->target_az, 90);
@ -360,7 +398,8 @@ static const char *meade_get_info(ROT *rot)
* Meade telescope rotator capabilities. * Meade telescope rotator capabilities.
*/ */
const struct rot_caps meade_caps = { const struct rot_caps meade_caps =
{
.rot_model = ROT_MODEL_MEADE, .rot_model = ROT_MODEL_MEADE,
.model_name = "LX200", .model_name = "LX200",
.mfg_name = "Meade", .mfg_name = "Meade",

83
prosistel/prosistel.c
Wyświetl plik

@ -44,7 +44,8 @@
#define STX "\x02" #define STX "\x02"
struct prosistel_rot_priv_data { struct prosistel_rot_priv_data
{
azimuth_t az; azimuth_t az;
elevation_t el; elevation_t el;
@ -69,7 +70,7 @@ struct prosistel_rot_priv_data {
* RIG_EIO - if an I/O error occurred while sending/receiving data. * RIG_EIO - if an I/O error occurred while sending/receiving data.
* RIG_ETIMEOUT - if timeout expires without any characters received. * RIG_ETIMEOUT - if timeout expires without any characters received.
*/ */
static int prosistel_transaction (ROT *rot, const char *cmdstr, static int prosistel_transaction(ROT *rot, const char *cmdstr,
char *data, size_t data_len) char *data, size_t data_len)
{ {
struct rot_state *rs; struct rot_state *rs;
@ -83,37 +84,58 @@ transaction_write:
serial_flush(&rs->rotport); serial_flush(&rs->rotport);
if (cmdstr) { if (cmdstr)
{
retval = write_block(&rs->rotport, cmdstr, strlen(cmdstr)); retval = write_block(&rs->rotport, cmdstr, strlen(cmdstr));
if (retval != RIG_OK) if (retval != RIG_OK)
{
goto transaction_quit; goto transaction_quit;
} }
}
/* Always read the reply to know whether the cmd went OK */ /* Always read the reply to know whether the cmd went OK */
if (!data) if (!data)
{
data = replybuf; data = replybuf;
}
if (!data_len) if (!data_len)
{
data_len = BUFSZ; data_len = BUFSZ;
}
memset(data,0,data_len); memset(data, 0, data_len);
//remember check for STXA,G,R or STXA,?,XXX,R 10 bytes //remember check for STXA,G,R or STXA,?,XXX,R 10 bytes
retval = read_string(&rs->rotport, data, 20, CR, strlen(CR)); retval = read_string(&rs->rotport, data, 20, CR, strlen(CR));
if (retval < 0) {
if (retval < 0)
{
if (retry_read++ < rot->state.rotport.retry) if (retry_read++ < rot->state.rotport.retry)
{
goto transaction_write; goto transaction_write;
}
goto transaction_quit; goto transaction_quit;
} }
//check if reply match issued command //check if reply match issued command
if(data[0]==0x02 && data[3]==cmdstr[2]) { if (data[0] == 0x02 && data[3] == cmdstr[2])
rig_debug(RIG_DEBUG_VERBOSE, "%s Command %c reply received\n", __func__, data[3]); {
rig_debug(RIG_DEBUG_VERBOSE, "%s Command %c reply received\n", __func__,
data[3]);
retval = RIG_OK; retval = RIG_OK;
} else { }
rig_debug(RIG_DEBUG_VERBOSE, "%s Error Command issued: %c doesn't match reply %c\n", __func__, cmdstr[2], data[3]); else
{
rig_debug(RIG_DEBUG_VERBOSE,
"%s Error Command issued: %c doesn't match reply %c\n", __func__, cmdstr[2],
data[3]);
retval = RIG_EIO; retval = RIG_EIO;
} }
transaction_quit: transaction_quit:
return retval; return retval;
} }
@ -138,17 +160,20 @@ static int prosistel_rot_open(ROT *rot)
static int prosistel_rot_set_position(ROT *rot, azimuth_t az, elevation_t el) { static int prosistel_rot_set_position(ROT *rot, azimuth_t az, elevation_t el)
{
char cmdstr[64]; char cmdstr[64];
int retval; int retval;
rig_debug(RIG_DEBUG_VERBOSE,"%s called: %.2f %.2f\n", __func__, rig_debug(RIG_DEBUG_VERBOSE, "%s called: %.2f %.2f\n", __func__,
az, el); az, el);
num_sprintf(cmdstr, STX"AG%03.0f"CR, az); num_sprintf(cmdstr, STX"AG%03.0f"CR, az);
retval = prosistel_transaction(rot, cmdstr, NULL, 0); retval = prosistel_transaction(rot, cmdstr, NULL, 0);
if(retval!=RIG_OK) {
if (retval != RIG_OK)
{
return retval; return retval;
} }
@ -178,18 +203,25 @@ static int prosistel_rot_get_position(ROT *rot, azimuth_t *az, elevation_t *el)
num_sprintf(cmdstr, STX"A?"CR); num_sprintf(cmdstr, STX"A?"CR);
retval = prosistel_transaction(rot, cmdstr, data, sizeof(data)); retval = prosistel_transaction(rot, cmdstr, data, sizeof(data));
if(retval!=RIG_OK) {
if (retval != RIG_OK)
{
return retval; return retval;
} }
// Example response of 100 azimuth // Example response of 100 azimuth
// 02 41 2c 3f 2c 31 30 30 30 2c 52 0d .A,?,1000,R. // 02 41 2c 3f 2c 31 30 30 30 2c 52 0d .A,?,1000,R.
int n = sscanf(data,"%*cA,?,%f,%*c.",&posval); int n = sscanf(data, "%*cA,?,%f,%*c.", &posval);
if (n != 1) {
rig_debug(RIG_DEBUG_ERR, "%s failed to parse azimuth '%s'\n", __func__,data); if (n != 1)
{
rig_debug(RIG_DEBUG_ERR, "%s failed to parse azimuth '%s'\n", __func__, data);
return RIG_EPROTO; return RIG_EPROTO;
} }
posval /= 10.0; posval /= 10.0;
rig_debug(RIG_DEBUG_VERBOSE, "%s got position from '%s' converted to %d\n", __func__,data,posval); rig_debug(RIG_DEBUG_VERBOSE, "%s got position from '%s' converted to %d\n",
__func__, data, posval);
*az = (azimuth_t) posval; *az = (azimuth_t) posval;
@ -200,14 +232,18 @@ static int prosistel_rot_get_position(ROT *rot, azimuth_t *az, elevation_t *el)
retval = prosistel_transaction(rot, cmdstr, data, sizeof(data)); retval = prosistel_transaction(rot, cmdstr, data, sizeof(data));
// Example response of 90 elevation // Example response of 90 elevation
// 02 42 2c 3f 2c 30 39 30 30 2c 52 0d .B,?,0900,R. // 02 42 2c 3f 2c 30 39 30 30 2c 52 0d .B,?,0900,R.
n = sscanf(data,"%*cB,?,%f,%*c.",&posval); n = sscanf(data, "%*cB,?,%f,%*c.", &posval);
if (n != 1) {
rig_debug(RIG_DEBUG_ERR, "%s failed to parse elevation '%s'\n", __func__,data); if (n != 1)
{
rig_debug(RIG_DEBUG_ERR, "%s failed to parse elevation '%s'\n", __func__, data);
return RIG_EPROTO; return RIG_EPROTO;
} }
posval /= 10.0; posval /= 10.0;
rig_debug(RIG_DEBUG_VERBOSE, "%s got position from '%s' converted to %d\n", __func__,data,posval); rig_debug(RIG_DEBUG_VERBOSE, "%s got position from '%s' converted to %d\n",
*el = (elevation_t) posval/10.0; __func__, data, posval);
*el = (elevation_t) posval / 10.0;
return retval; return retval;
} }
@ -220,7 +256,8 @@ static int prosistel_rot_get_position(ROT *rot, azimuth_t *az, elevation_t *el)
* Prosistel rotator capabilities. * Prosistel rotator capabilities.
*/ */
const struct rot_caps prosistel_rot_caps = { const struct rot_caps prosistel_rot_caps =
{
.rot_model = ROT_MODEL_PROSISTEL, .rot_model = ROT_MODEL_PROSISTEL,
.model_name = "Prosistel D", .model_name = "Prosistel D",
.mfg_name = "Prosistel", .mfg_name = "Prosistel",