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

Convert the remaining files in rigs/kenwood/

pull/1455/head
George Baltz N3GB 2023-12-19 11:43:58 -05:00
rodzic b38014832f
commit 9af715d244
3 zmienionych plików z 16 dodań i 16 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

6
rigs/kenwood/elecraft.c
Wyświetl plik

@ -99,7 +99,7 @@ int elecraft_open(RIG *rig)
struct kenwood_priv_data *priv = rig->state.priv; struct kenwood_priv_data *priv = rig->state.priv;
char *model = "Unknown"; char *model = "Unknown";
struct rig_state *rs = &rig->state; struct rig_state *rs = &rig->state;
struct hamlib_port *rp = RIGPORT(rig);
rig_debug(RIG_DEBUG_VERBOSE, "%s called, rig version=%s\n", __func__, rig_debug(RIG_DEBUG_VERBOSE, "%s called, rig version=%s\n", __func__,
rig->caps->version); rig->caps->version);
@ -135,7 +135,7 @@ int elecraft_open(RIG *rig)
strcpy(data, "EMPTY"); strcpy(data, "EMPTY");
// Not going to get carried away with retries and such // Not going to get carried away with retries and such
err = write_block(&rs->rigport, (unsigned char *) cmd, strlen(cmd)); err = write_block(rp, (unsigned char *) cmd, strlen(cmd));
if (err != RIG_OK) if (err != RIG_OK)
{ {
@ -143,7 +143,7 @@ int elecraft_open(RIG *rig)
return err; return err;
} }
err = read_string(&rs->rigport, (unsigned char *) buf, sizeof(buf), err = read_string(rp, (unsigned char *) buf, sizeof(buf),
";", 1, 0, 1); ";", 1, 0, 1);
if (err < 0) if (err < 0)

6
rigs/kenwood/ts2000.c
Wyświetl plik

@ -519,7 +519,7 @@ static int ts2000_read_meter(RIG *rig, int expected_meter, int *value)
{ {
int retval; int retval;
char cmdbuf[8]; char cmdbuf[8];
struct rig_state *rs = &rig->state; struct hamlib_port *rp = RIGPORT(rig);
char ackbuf[32]; char ackbuf[32];
int expected_len = 8; int expected_len = 8;
int read_meter; int read_meter;
@ -529,7 +529,7 @@ static int ts2000_read_meter(RIG *rig, int expected_meter, int *value)
SNPRINTF(cmdbuf, sizeof(cmdbuf), "RM;"); SNPRINTF(cmdbuf, sizeof(cmdbuf), "RM;");
retval = write_block(&rs->rigport, (unsigned char *) cmdbuf, strlen(cmdbuf)); retval = write_block(rp, (unsigned char *) cmdbuf, strlen(cmdbuf));
rig_debug(RIG_DEBUG_TRACE, "%s: write_block retval=%d\n", __func__, retval); rig_debug(RIG_DEBUG_TRACE, "%s: write_block retval=%d\n", __func__, retval);
@ -540,7 +540,7 @@ static int ts2000_read_meter(RIG *rig, int expected_meter, int *value)
// TS-2000 returns values for a single meter at the same time, for example: RM10000; // TS-2000 returns values for a single meter at the same time, for example: RM10000;
retval = read_string(&rs->rigport, (unsigned char *) ackbuf, expected_len + 1, retval = read_string(rp, (unsigned char *) ackbuf, expected_len + 1,
NULL, 0, 0, 1); NULL, 0, 0, 1);
rig_debug(RIG_DEBUG_TRACE, "%s: read_string retval=%d\n", __func__, retval); rig_debug(RIG_DEBUG_TRACE, "%s: read_string retval=%d\n", __func__, retval);

20
rigs/kenwood/xg3.c
Wyświetl plik

@ -198,7 +198,7 @@ int xg3_init(RIG *rig)
} }
rig->state.priv = (void *)priv; rig->state.priv = (void *)priv;
rig->state.rigport.type.rig = RIG_PORT_SERIAL; RIGPORT(rig)->type.rig = RIG_PORT_SERIAL;
// Tried set_trn to turn transceiver on/off but turning it on isn't enabled in hamlib for some reason // Tried set_trn to turn transceiver on/off but turning it on isn't enabled in hamlib for some reason
// So we use PTT instead // So we use PTT instead
// rig->state.transceive = RIG_TRN_RIG; // this allows xg3_set_trn to be called // rig->state.transceive = RIG_TRN_RIG; // this allows xg3_set_trn to be called
@ -280,7 +280,7 @@ int xg3_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
char cmdbuf[32], replybuf[32]; char cmdbuf[32], replybuf[32];
int retval; int retval;
size_t replysize = sizeof(replybuf); size_t replysize = sizeof(replybuf);
struct rig_state *rs = &rig->state; struct hamlib_port *rp = RIGPORT(rig);
rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__); rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
@ -288,7 +288,7 @@ int xg3_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
{ {
case RIG_LEVEL_RFPOWER: case RIG_LEVEL_RFPOWER:
SNPRINTF(cmdbuf, sizeof(cmdbuf), "L;"); SNPRINTF(cmdbuf, sizeof(cmdbuf), "L;");
retval = write_block(&rs->rigport, (unsigned char *) cmdbuf, strlen(cmdbuf)); retval = write_block(rp, (unsigned char *) cmdbuf, strlen(cmdbuf));
if (retval != RIG_OK) if (retval != RIG_OK)
{ {
@ -297,7 +297,7 @@ int xg3_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
return retval; return retval;
} }
retval = read_string(&rs->rigport, (unsigned char *) replybuf, replysize, retval = read_string(rp, (unsigned char *) replybuf, replysize,
";", 1, 0, 1); ";", 1, 0, 1);
if (retval < 0) if (retval < 0)
@ -424,7 +424,7 @@ int xg3_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
*/ */
int xg3_get_freq(RIG *rig, vfo_t vfo, freq_t *freq) int xg3_get_freq(RIG *rig, vfo_t vfo, freq_t *freq)
{ {
struct rig_state *rs; struct hamlib_port *rp;
char freqbuf[50]; char freqbuf[50];
int freqsize = sizeof(freqbuf); int freqsize = sizeof(freqbuf);
char cmdbuf[16]; char cmdbuf[16];
@ -441,7 +441,7 @@ int xg3_get_freq(RIG *rig, vfo_t vfo, freq_t *freq)
tvfo = (vfo == RIG_VFO_CURR || tvfo = (vfo == RIG_VFO_CURR ||
vfo == RIG_VFO_VFO) ? rig->state.current_vfo : vfo; vfo == RIG_VFO_VFO) ? rig->state.current_vfo : vfo;
rs = &rig->state; rp = RIGPORT(rig);
switch (tvfo) switch (tvfo)
{ {
@ -467,7 +467,7 @@ int xg3_get_freq(RIG *rig, vfo_t vfo, freq_t *freq)
SNPRINTF(cmdbuf, sizeof(cmdbuf), "F;"); SNPRINTF(cmdbuf, sizeof(cmdbuf), "F;");
} }
retval = write_block(&rs->rigport, (unsigned char *) cmdbuf, strlen(cmdbuf)); retval = write_block(rp, (unsigned char *) cmdbuf, strlen(cmdbuf));
if (retval != RIG_OK) if (retval != RIG_OK)
{ {
@ -475,7 +475,7 @@ int xg3_get_freq(RIG *rig, vfo_t vfo, freq_t *freq)
return retval; return retval;
} }
retval = read_string(&rs->rigport, (unsigned char *) freqbuf, freqsize, retval = read_string(rp, (unsigned char *) freqbuf, freqsize,
";", 1, 0, 1); ";", 1, 0, 1);
if (retval < 0) if (retval < 0)
@ -574,7 +574,7 @@ int xg3_get_mem(RIG *rig, vfo_t vfo, int *ch)
char cmdbuf[32]; char cmdbuf[32];
char reply[32]; char reply[32];
int retval; int retval;
struct rig_state *rs = &rig->state; struct hamlib_port *rp = RIGPORT(rig);
rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__); rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
@ -586,7 +586,7 @@ int xg3_get_mem(RIG *rig, vfo_t vfo, int *ch)
return retval; return retval;
} }
retval = read_string(&rs->rigport, (unsigned char *) reply, sizeof(reply), retval = read_string(rp, (unsigned char *) reply, sizeof(reply),
";", 1, 0, 1); ";", 1, 0, 1);
if (retval < 0) if (retval < 0)