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

Updates and cleanups to newcat.c to make more use of priv data structure. 

Set port read timeout in newcat.h
Forgot yaesu.* last night which caused CVS build to not recognize FT-450


git-svn-id: https://hamlib.svn.sourceforge.net/svnroot/hamlib/trunk@2248 7ae35d74-ebe9-4afe-98af-79ac388436b8
Hamlib-1.2.7
Nate Bargmann, N0NB 2007-11-23 03:31:26 +00:00
rodzic 62bd7d5d88
commit 658fc853ed
4 zmienionych plików z 68 dodań i 78 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

122
yaesu/newcat.c
Wyświetl plik

@ -9,7 +9,7 @@
* "new" text CAT interface. * "new" text CAT interface.
* *
* *
* $Id: newcat.c,v 1.1 2007-11-22 04:48:43 n0nb Exp $ * $Id: newcat.c,v 1.2 2007-11-23 03:31:26 n0nb Exp $
* *
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
@ -48,17 +48,15 @@ static char cat_term = ';'; /* Yaesu command terminator */
* future - private data * future - private data
* *
* FIXME: Does this need to be exposed to the application/frontend through * FIXME: Does this need to be exposed to the application/frontend through
* newcat_caps.priv? -N0NB * rig_caps.priv? I'm guessing not since it's private to the backend. -N0NB
*/ */
struct newcat_priv_data { struct newcat_priv_data {
// unsigned char pacing; /* pacing value */ unsigned int read_update_delay; /* depends on pacing value */
// unsigned int read_update_delay; /* depends on pacing value */
vfo_t current_vfo; /* active VFO from last cmd */ vfo_t current_vfo; /* active VFO from last cmd */
// unsigned char p_cmd[YAESU_CMD_LENGTH]; /* private copy of 1 constructed CAT cmd */ char cmd_str[NEWCAT_DATA_LEN]; /* command string buffer */
// yaesu_cmd_set_t pcs[FT450_NATIVE_SIZE]; /* private cmd set */ char ret_data[NEWCAT_DATA_LEN]; /* returned data--max value, most are less */
// unsigned char update_data[FT450_ALL_DATA_LENGTH]; /* returned data--max value, some are less */ unsigned char current_mem; /* private memory channel number */
// unsigned char current_mem; /* private memory channel number */
}; };
@ -89,7 +87,7 @@ int newcat_init(RIG *rig) {
/* TODO: read pacing from preferences */ /* TODO: read pacing from preferences */
// priv->pacing = NEWCAT_PACING_DEFAULT_VALUE; /* set pacing to minimum for now */ // priv->pacing = NEWCAT_PACING_DEFAULT_VALUE; /* set pacing to minimum for now */
// priv->read_update_delay = FT450_DEFAULT_READ_TIMEOUT; /* set update timeout to safe value */ priv->read_update_delay = NEWCAT_DEFAULT_READ_TIMEOUT; /* set update timeout to safe value */
priv->current_vfo = RIG_VFO_MAIN; /* default to whatever */ priv->current_vfo = RIG_VFO_MAIN; /* default to whatever */
rig->state.priv = (void *)priv; rig->state.priv = (void *)priv;
@ -128,14 +126,14 @@ int newcat_cleanup(RIG *rig) {
int newcat_open(RIG *rig) { int newcat_open(RIG *rig) {
struct rig_state *rig_s; struct rig_state *rig_s;
struct newcat_priv_data *priv; // struct newcat_priv_data *priv;
rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__); rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
if (!rig) if (!rig)
return -RIG_EINVAL; return -RIG_EINVAL;
priv = (struct newcat_priv_data *)rig->state.priv; // priv = (struct newcat_priv_data *)rig->state.priv;
rig_s = &rig->state; rig_s = &rig->state;
rig_debug(RIG_DEBUG_TRACE, "%s: write_delay = %i msec\n", rig_debug(RIG_DEBUG_TRACE, "%s: write_delay = %i msec\n",
@ -177,8 +175,7 @@ int newcat_close(RIG *rig) {
int newcat_set_freq(RIG *rig, vfo_t vfo, freq_t freq) { int newcat_set_freq(RIG *rig, vfo_t vfo, freq_t freq) {
const struct rig_caps *caps; const struct rig_caps *caps;
struct newcat_priv_data *priv; struct newcat_priv_data *priv;
struct rig_state *rig_s; struct rig_state *state;
char cmd_str[16]; /* Up to 999.999999999 GHz ;-) */
char c; char c;
int err, len; int err, len;
@ -189,7 +186,7 @@ int newcat_set_freq(RIG *rig, vfo_t vfo, freq_t freq) {
priv = (struct newcat_priv_data *)rig->state.priv; priv = (struct newcat_priv_data *)rig->state.priv;
caps = rig->caps; caps = rig->caps;
rig_s = &rig->state; state = &rig->state;
rig_debug(RIG_DEBUG_TRACE, "%s: passed vfo = 0x%02x\n", __func__, vfo); rig_debug(RIG_DEBUG_TRACE, "%s: passed vfo = 0x%02x\n", __func__, vfo);
rig_debug(RIG_DEBUG_TRACE, "%s: passed freq = %"PRIfreq" Hz\n", __func__, freq); rig_debug(RIG_DEBUG_TRACE, "%s: passed freq = %"PRIfreq" Hz\n", __func__, freq);
@ -231,11 +228,11 @@ int newcat_set_freq(RIG *rig, vfo_t vfo, freq_t freq) {
return -RIG_EINTERNAL; /* bad news */ return -RIG_EINTERNAL; /* bad news */
/* Build the command string */ /* Build the command string */
snprintf(cmd_str, len, "F%c%d%c", c, (int)freq, cat_term); snprintf(priv->cmd_str, len, "F%c%d%c", c, (int)freq, cat_term);
rig_debug(RIG_DEBUG_TRACE, "%s: cmd_str = %s\n", __func__, cmd_str); rig_debug(RIG_DEBUG_TRACE, "%s: cmd_str = %s\n", __func__, priv->cmd_str);
err = write_block(&rig_s->rigport, cmd_str, strlen(cmd_str)); err = write_block(&state->rigport, priv->cmd_str, strlen(priv->cmd_str));
if (err != RIG_OK) if (err != RIG_OK)
return err; return err;
@ -252,13 +249,7 @@ int newcat_set_freq(RIG *rig, vfo_t vfo, freq_t freq) {
int newcat_get_freq(RIG *rig, vfo_t vfo, freq_t *freq) { int newcat_get_freq(RIG *rig, vfo_t vfo, freq_t *freq) {
struct newcat_priv_data *priv; struct newcat_priv_data *priv;
struct rig_state *rig_s; struct rig_state *state;
char cmd_str[4]; /* command + terminator */
char ret_data[15]; /* freq string returned from rig up to 999.999999999 GHz*/
// unsigned char *p;
// unsigned char offset;
// freq_t f;
// int err, cmd_index, count;
char c; char c;
int err; int err;
@ -269,12 +260,13 @@ int newcat_get_freq(RIG *rig, vfo_t vfo, freq_t *freq) {
return -RIG_EINVAL; return -RIG_EINVAL;
priv = (struct newcat_priv_data *)rig->state.priv; priv = (struct newcat_priv_data *)rig->state.priv;
rig_s = &rig->state; state = &rig->state;
if (vfo == RIG_VFO_CURR) { if (vfo == RIG_VFO_CURR) {
err = newcat_get_vfo(rig, &priv->current_vfo); err = newcat_get_vfo(rig, &priv->current_vfo);
if (err != RIG_OK) if (err != RIG_OK)
return err; return err;
vfo = priv->current_vfo; /* from previous get_vfo cmd */ vfo = priv->current_vfo; /* from previous get_vfo cmd */
rig_debug(RIG_DEBUG_TRACE, rig_debug(RIG_DEBUG_TRACE,
"%s: priv->current_vfo = 0x%02x\n", __func__, vfo); "%s: priv->current_vfo = 0x%02x\n", __func__, vfo);
@ -283,52 +275,47 @@ int newcat_get_freq(RIG *rig, vfo_t vfo, freq_t *freq) {
switch(vfo) { switch(vfo) {
case RIG_VFO_A: case RIG_VFO_A:
case RIG_VFO_VFO: case RIG_VFO_VFO:
// cmd_index = FT890_NATIVE_VFO_DATA;
// offset = FT890_SUMO_VFO_A_FREQ;
// count = FT890_VFO_DATA_LENGTH;
c = 'A'; c = 'A';
break; break;
case RIG_VFO_B: case RIG_VFO_B:
// cmd_index = FT890_NATIVE_VFO_DATA;
// offset = FT890_SUMO_VFO_B_FREQ;
// count = FT890_VFO_DATA_LENGTH;
c = 'B'; c = 'B';
break; break;
// case RIG_VFO_MEM: // case RIG_VFO_MEM:
// case RIG_VFO_MAIN: // case RIG_VFO_MAIN:
// cmd_index = FT890_NATIVE_OP_DATA;
// offset = FT890_SUMO_DISPLAYED_FREQ;
// count = FT890_OP_DATA_LENGTH;
// break; // break;
default: default:
return -RIG_EINVAL; /* sorry, unsupported VFO */ return -RIG_EINVAL; /* sorry, unsupported VFO */
} }
/* Build the command string */ /* Build the command string */
snprintf(cmd_str, sizeof(cmd_str), "F%c%c", c, cat_term); snprintf(priv->cmd_str, sizeof(priv->cmd_str), "F%c%c", c, cat_term);
rig_debug(RIG_DEBUG_TRACE, "cmd_str = %s\n", cmd_str);
rig_debug(RIG_DEBUG_TRACE, "cmd_str = %s\n", priv->cmd_str);
/* get freq */ /* get freq */
err = write_block(&rig_s->rigport, cmd_str, strlen(cmd_str)); err = write_block(&state->rigport, priv->cmd_str, strlen(priv->cmd_str));
if (err != RIG_OK) if (err != RIG_OK)
return err; return err;
err = read_string(&rig_s->rigport, ret_data, sizeof(ret_data), &cat_term, sizeof(cat_term)); err = read_string(&state->rigport, priv->ret_data, sizeof(priv->ret_data),
&cat_term, sizeof(cat_term));
if (err < 0) if (err < 0)
return err; return err;
rig_debug(RIG_DEBUG_TRACE, "%s: read count = %d, ret_data = %s\n", rig_debug(RIG_DEBUG_TRACE, "%s: read count = %d, ret_data = %s\n",
__func__, err, ret_data); __func__, err, priv->ret_data);
/* Check that command termination is correct */ /* Check that command termination is correct */
if (strchr(cat_term, ret_data[strlen(ret_data) - 1]) == NULL) { if (strchr(&cat_term, priv->ret_data[strlen(priv->ret_data) - 1]) == NULL) {
rig_debug(RIG_DEBUG_ERR, "%s: Command is not correctly terminated '%s'\n", rig_debug(RIG_DEBUG_ERR, "%s: Command is not correctly terminated '%s'\n",
__func__, ret_data); __func__, priv->ret_data);
return -RIG_EPROTO; return -RIG_EPROTO;
} }
/* convert the read frequency string into freq_t and store in *freq */ /* convert the read frequency string into freq_t and store in *freq */
sscanf(ret_data+2, "%"SCNfreq, freq); sscanf(priv->ret_data+2, "%"SCNfreq, freq);
rig_debug(RIG_DEBUG_TRACE, rig_debug(RIG_DEBUG_TRACE,
"%s: freq = %"PRIfreq" Hz for vfo 0x%02x\n", __func__, freq, vfo); "%s: freq = %"PRIfreq" Hz for vfo 0x%02x\n", __func__, freq, vfo);
@ -347,8 +334,7 @@ int newcat_get_freq(RIG *rig, vfo_t vfo, freq_t *freq) {
int newcat_set_vfo(RIG *rig, vfo_t vfo) { int newcat_set_vfo(RIG *rig, vfo_t vfo) {
struct newcat_priv_data *priv; struct newcat_priv_data *priv;
struct rig_state *rig_s; struct rig_state *state;
char cmd_str[5]; /* command + VFO + terminator + \0 */
char c; char c;
int err; int err;
@ -360,7 +346,7 @@ int newcat_set_vfo(RIG *rig, vfo_t vfo) {
rig_debug(RIG_DEBUG_TRACE, "%s: passed vfo = 0x%02x\n", __func__, vfo); rig_debug(RIG_DEBUG_TRACE, "%s: passed vfo = 0x%02x\n", __func__, vfo);
priv = (struct newcat_priv_data *)rig->state.priv; priv = (struct newcat_priv_data *)rig->state.priv;
rig_s = &rig->state; state = &rig->state;
if (vfo == RIG_VFO_CURR) { if (vfo == RIG_VFO_CURR) {
vfo = priv->current_vfo; /* from previous vfo cmd */ vfo = priv->current_vfo; /* from previous vfo cmd */
@ -397,10 +383,11 @@ int newcat_set_vfo(RIG *rig, vfo_t vfo) {
} }
/* Build the command string */ /* Build the command string */
snprintf(cmd_str, sizeof(cmd_str), "VS%c%c", c, cat_term); snprintf(priv->cmd_str, sizeof(priv->cmd_str), "VS%c%c", c, cat_term);
rig_debug(RIG_DEBUG_TRACE, "cmd_str = %s\n", cmd_str);
err = write_block(&rig_s->rigport, cmd_str, strlen(cmd_str)); rig_debug(RIG_DEBUG_TRACE, "cmd_str = %s\n", priv->cmd_str);
err = write_block(&state->rigport, priv->cmd_str, strlen(priv->cmd_str));
if (err != RIG_OK) if (err != RIG_OK)
return err; return err;
@ -420,60 +407,49 @@ int newcat_set_vfo(RIG *rig, vfo_t vfo) {
int newcat_get_vfo(RIG *rig, vfo_t *vfo) { int newcat_get_vfo(RIG *rig, vfo_t *vfo) {
struct newcat_priv_data *priv; struct newcat_priv_data *priv;
struct rig_state *rig_s; struct rig_state *state;
char cmd_str[] = "VS;"; /* command + terminator string */
char ret_data[5]; /* string returned from rig */
char c; char c;
int err; int err;
// unsigned char status_0; /* newcat status flag 0 */
// unsigned char stat_vfo, stat_mem; /* status tests */
rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__); rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
if (!rig) if (!rig)
return -RIG_EINVAL; return -RIG_EINVAL;
priv = (struct newcat_priv_data *)rig->state.priv; priv = (struct newcat_priv_data *)rig->state.priv;
rig_s = &rig->state; state = &rig->state;
rig_debug(RIG_DEBUG_TRACE, "%s: cmd_str = %s\n", __func__, cmd_str); /* Build the command string */
snprintf(priv->cmd_str, sizeof(priv->cmd_str), "VS;");
rig_debug(RIG_DEBUG_TRACE, "%s: cmd_str = %s\n", __func__, priv->cmd_str);
/* Get VFO */ /* Get VFO */
err = write_block(&rig_s->rigport, cmd_str, strlen(cmd_str)); err = write_block(&state->rigport, priv->cmd_str, strlen(priv->cmd_str));
if (err != RIG_OK) if (err != RIG_OK)
return err; return err;
err = read_string(&rig_s->rigport, ret_data, sizeof(ret_data), &cat_term, sizeof(cat_term)); err = read_string(&state->rigport, priv->ret_data, sizeof(priv->ret_data),
&cat_term, sizeof(cat_term));
if (err < 0) if (err < 0)
return err; return err;
/* Check that command termination is correct */ /* Check that command termination is correct */
if (strchr(cat_term, ret_data[strlen(ret_data) - 1]) == NULL) { if (strchr(&cat_term, priv->ret_data[strlen(priv->ret_data) - 1]) == NULL) {
rig_debug(RIG_DEBUG_ERR, "%s: Command is not correctly terminated '%s'\n", rig_debug(RIG_DEBUG_ERR, "%s: Command is not correctly terminated '%s'\n",
__func__, ret_data); __func__, priv->ret_data);
return -RIG_EPROTO; return -RIG_EPROTO;
} }
rig_debug(RIG_DEBUG_TRACE, "%s: read count = %d, ret_data = %s, VFO value = %c\n", rig_debug(RIG_DEBUG_TRACE, "%s: read count = %d, ret_data = %s, VFO value = %c\n",
__func__, err, ret_data, ret_data[2]); __func__, err, priv->ret_data, priv->ret_data[2]);
/* /*
* The current VFO value is a digit ('0' or '1' ('A' or 'B' respectively)) * The current VFO value is a digit ('0' or '1' ('A' or 'B' respectively))
* embedded at ret_data[2] in the read string. * embedded at ret_data[2] in the read string.
*/ */
c = ret_data[2]; c = priv->ret_data[2];
// status_0 = priv->update_data[FT450_SUMO_DISPLAYED_STATUS_0];
// stat_vfo = status_0 & SF_VFO_MASK; /* get VFO active bits */
// stat_mem = status_0 & SF_MEM_MASK; /* get MEM active bits */
// rig_debug(RIG_DEBUG_TRACE,
// "%s: vfo status_0 = 0x%02x\n", __func__, status_0);
// rig_debug(RIG_DEBUG_TRACE,
// "%s: stat_vfo = 0x%02x\n", __func__, stat_vfo);
// rig_debug(RIG_DEBUG_TRACE,
// "%s: stat_mem = 0x%02x\n", __func__, stat_mem);
switch (c) { switch (c) {
case '0': case '0':

14
yaesu/newcat.h
Wyświetl plik

@ -9,7 +9,7 @@
* interface commands that are similar to the Kenwood command set. * interface commands that are similar to the Kenwood command set.
* *
* *
* $Id: newcat.h,v 1.1 2007-11-22 04:48:43 n0nb Exp $ * $Id: newcat.h,v 1.2 2007-11-23 03:31:26 n0nb Exp $
* *
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
@ -32,6 +32,16 @@
#ifndef _NEWCAT_H #ifndef _NEWCAT_H
#define _NEWCAT_H 1 #define _NEWCAT_H 1
/* Handy constants */
/* Hopefully large enough for future use, 128 chars plus '\0' */
#define NEWCAT_DATA_LEN 129
/* arbitrary value for now. 11 bits (8N2+1) == 2.2917 mS @ 4800 bps */
#define NEWCAT_DEFAULT_READ_TIMEOUT NEWCAT_DATA_LEN * 5
/* /*
* Functions considered to be Stable: * Functions considered to be Stable:
* *
@ -39,7 +49,9 @@
* *
* Functions considered to be Alpha: * Functions considered to be Alpha:
* newcat_set_freq * newcat_set_freq
* newcat_get_freq
* newcat_set_vfo * newcat_set_vfo
* newcat_get_vfo
* *
* Functions not yet implemented * Functions not yet implemented
* most everything at this time. * most everything at this time.

3
yaesu/yaesu.c
Wyświetl plik

@ -7,7 +7,7 @@
* via serial interface to a Yaesu rig * via serial interface to a Yaesu rig
* *
* *
* $Id: yaesu.c,v 1.26 2007-10-05 04:19:18 sconklin Exp $ * $Id: yaesu.c,v 1.27 2007-11-23 03:31:26 n0nb Exp $
* *
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
@ -76,6 +76,7 @@ DECLARE_INITRIG_BACKEND(yaesu)
rig_debug(RIG_DEBUG_VERBOSE, "yaesu: %s called\n", __func__); rig_debug(RIG_DEBUG_VERBOSE, "yaesu: %s called\n", __func__);
rig_register(&ft100_caps); rig_register(&ft100_caps);
rig_register(&ft450_caps);
rig_register(&ft736_caps); rig_register(&ft736_caps);
rig_register(&ft747_caps); rig_register(&ft747_caps);
rig_register(&ft757gx_caps); rig_register(&ft757gx_caps);

3
yaesu/yaesu.h
Wyświetl plik

@ -6,7 +6,7 @@
* *
* Common yaesu declarations for hamlib * Common yaesu declarations for hamlib
* *
* $Id: yaesu.h,v 1.26 2007-10-05 04:19:18 sconklin Exp $ * $Id: yaesu.h,v 1.27 2007-11-23 03:31:26 n0nb Exp $
* *
* *
* *
@ -48,6 +48,7 @@ struct yaesu_cmd_set {
typedef struct yaesu_cmd_set yaesu_cmd_set_t; typedef struct yaesu_cmd_set yaesu_cmd_set_t;
extern const struct rig_caps ft100_caps; extern const struct rig_caps ft100_caps;
extern const struct rig_caps ft450_caps;
extern const struct rig_caps ft736_caps; extern const struct rig_caps ft736_caps;
extern const struct rig_caps ft747_caps; extern const struct rig_caps ft747_caps;
extern const struct rig_caps ft757gx_caps; extern const struct rig_caps ft757gx_caps;