[Hamlib-commits] Hamlib -- Ham radio control libraries branch master updated. b6a960d48e12035a94530
Library to control radio transceivers and receivers
Brought to you by:
n0nb
Menu
▾
▴
[Hamlib-commits] Hamlib -- Ham radio control libraries branch master updated. b6a960d48e12035a94530ad56ceff469849491fd
|
From: Michael B. <mdb...@us...> - 2020-06-23 14:02:22
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Hamlib -- Ham radio control libraries".
The branch, master has been updated
via b6a960d48e12035a94530ad56ceff469849491fd (commit)
via b50975729ca5e44871f96db797617e9a0f9b820c (commit)
via 1be5c71e76d60573c80c42699b95f1f7c7443d26 (commit)
from 2c64ba9bbaa58b70efa0d89351e45256170e3c89 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit b6a960d48e12035a94530ad56ceff469849491fd
Author: Michael Black W9MDB <mdb...@ya...>
Date: Tue Jun 23 09:01:46 2020 -0500
All conversions to rig_flush now done
https://github.com/Hamlib/Hamlib/issues/307
diff --git a/rigs/adat/adat.c b/rigs/adat/adat.c
index 49e5403c..f71b2d11 100644
--- a/rigs/adat/adat.c
+++ b/rigs/adat/adat.c
@@ -1264,7 +1264,7 @@ int adat_send(RIG *pRig,
"*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = %p, pcData = %s\n",
gFnLevel, __func__, __FILE__, __LINE__, pRig, pcData);
- serial_flush(&pRigState->rigport);
+ rig_flush(&pRigState->rigport);
nRC = write_block(&pRigState->rigport, pcData, strlen(pcData));
@@ -1562,7 +1562,7 @@ int adat_get_single_cmd_result(RIG *pRig)
}
}
- serial_flush(&pRigState->rigport);
+ rig_flush(&pRigState->rigport);
pPriv->nRC = nRC;
}
diff --git a/rigs/alinco/dx77.c b/rigs/alinco/dx77.c
index b6f07ce2..fb2ebc0c 100644
--- a/rigs/alinco/dx77.c
+++ b/rigs/alinco/dx77.c
@@ -308,7 +308,7 @@ int dx77_transaction(RIG *rig,
rs = &rig->state;
- serial_flush(&rs->rigport);
+ rig_flush(&rs->rigport);
retval = write_block(&rs->rigport, cmd, cmd_len);
diff --git a/rigs/alinco/dxsr8.c b/rigs/alinco/dxsr8.c
index 86eae83e..ceda53d4 100644
--- a/rigs/alinco/dxsr8.c
+++ b/rigs/alinco/dxsr8.c
@@ -251,7 +251,7 @@ int dxsr8_transaction(RIG *rig,
rs = &rig->state;
- serial_flush(&rs->rigport);
+ rig_flush(&rs->rigport);
retval = write_block(&rs->rigport, cmd, cmd_len);
diff --git a/rigs/aor/aor.c b/rigs/aor/aor.c
index b1300290..38430d36 100644
--- a/rigs/aor/aor.c
+++ b/rigs/aor/aor.c
@@ -80,7 +80,7 @@ static int aor_transaction(RIG *rig, const char *cmd, int cmd_len, char *data,
rs = &rig->state;
- serial_flush(&rs->rigport);
+ rig_flush(&rs->rigport);
retval = write_block(&rs->rigport, cmd, cmd_len);
diff --git a/rigs/aor/ar3000.c b/rigs/aor/ar3000.c
index 0805bdea..b962ada0 100644
--- a/rigs/aor/ar3000.c
+++ b/rigs/aor/ar3000.c
@@ -196,7 +196,7 @@ static int ar3k_transaction(RIG *rig, const char *cmd, int cmd_len, char *data,
rs = &rig->state;
- serial_flush(&rs->rigport);
+ rig_flush(&rs->rigport);
retval = write_block(&rs->rigport, cmd, cmd_len);
diff --git a/rigs/aor/ar3030.c b/rigs/aor/ar3030.c
index 4f836e28..edacb729 100644
--- a/rigs/aor/ar3030.c
+++ b/rigs/aor/ar3030.c
@@ -231,7 +231,7 @@ static int ar3030_transaction(RIG *rig, const char *cmd, int cmd_len,
data = tmpdata;
}
- serial_flush(&rs->rigport);
+ rig_flush(&rs->rigport);
do
{
@@ -315,7 +315,7 @@ int ar3030_close(RIG *rig)
rig_debug(RIG_DEBUG_TRACE, "%s:\n", __func__);
rs = &rig->state;
- serial_flush(&rs->rigport);
+ rig_flush(&rs->rigport);
retval = ar3030_transaction(rig, "Q" CR, strlen("Q" CR), NULL, NULL);
rig_debug(RIG_DEBUG_TRACE, "%s: retval=%d\n", __func__, retval);
diff --git a/rigs/aor/sr2200.c b/rigs/aor/sr2200.c
index 0f90da7b..aac33f72 100644
--- a/rigs/aor/sr2200.c
+++ b/rigs/aor/sr2200.c
@@ -285,7 +285,7 @@ static int sr2200_transaction(RIG *rig, const char *cmd, int cmd_len,
rs = &rig->state;
- serial_flush(&rs->rigport);
+ rig_flush(&rs->rigport);
retval = write_block(&rs->rigport, cmd, cmd_len);
diff --git a/rigs/barrett/barrett.c b/rigs/barrett/barrett.c
index 66e59dca..c251a425 100644
--- a/rigs/barrett/barrett.c
+++ b/rigs/barrett/barrett.c
@@ -231,7 +231,7 @@ int barrett_transaction(RIG *rig, char *cmd, int expected, char **result)
cmd_len = snprintf(cmd_buf, sizeof(cmd_buf), "%s%s", cmd, EOM);
- serial_flush(&rs->rigport);
+ rig_flush(&rs->rigport);
retval = write_block(&rs->rigport, cmd_buf, cmd_len);
if (retval < 0)
diff --git a/rigs/drake/drake.c b/rigs/drake/drake.c
index c8808dfe..06687252 100644
--- a/rigs/drake/drake.c
+++ b/rigs/drake/drake.c
@@ -69,7 +69,7 @@ int drake_transaction(RIG *rig, const char *cmd, int cmd_len, char *data,
rs = &rig->state;
- serial_flush(&rs->rigport);
+ rig_flush(&rs->rigport);
retval = write_block(&rs->rigport, cmd, cmd_len);
diff --git a/rigs/elad/elad.c b/rigs/elad/elad.c
index 369da640..5173fed6 100644
--- a/rigs/elad/elad.c
+++ b/rigs/elad/elad.c
@@ -223,15 +223,7 @@ transaction_write:
}
/* flush anything in the read buffer before command is sent */
- if (rs->rigport.type.rig == RIG_PORT_NETWORK
- || rs->rigport.type.rig == RIG_PORT_UDP_NETWORK)
- {
- network_flush(&rs->rigport);
- }
- else
- {
- serial_flush(&rs->rigport);
- }
+ rig_flush(&rs->rigport);
retval = write_block(&rs->rigport, cmd, len);
diff --git a/rigs/icmarine/icmarine.c b/rigs/icmarine/icmarine.c
index fcd26b88..d56a01e4 100644
--- a/rigs/icmarine/icmarine.c
+++ b/rigs/icmarine/icmarine.c
@@ -256,7 +256,7 @@ int icmarine_transaction(RIG *rig, const char *cmd, const char *param,
rs = &rig->state;
priv = (struct icmarine_priv_data *)rs->priv;
- serial_flush(&rs->rigport);
+ rig_flush(&rs->rigport);
/* command formating */
cmd_len = snprintf(cmdbuf, BUFSZ, "$PICOA,%02d,%02u,%s",
diff --git a/rigs/icom/frame.c b/rigs/icom/frame.c
index bc707a30..3510dd12 100644
--- a/rigs/icom/frame.c
+++ b/rigs/icom/frame.c
@@ -130,7 +130,7 @@ int icom_one_transaction(RIG *rig, int cmd, int subcmd,
// cppcheck-suppress *
Hold_Decode(rig);
- serial_flush(&rs->rigport);
+ rig_flush(&rs->rigport);
retval = write_block(&rs->rigport, (char *) sendbuf, frm_len);
diff --git a/rigs/icom/icom.c b/rigs/icom/icom.c
index c9a2988d..3b6e2f72 100644
--- a/rigs/icom/icom.c
+++ b/rigs/icom/icom.c
@@ -7279,7 +7279,7 @@ DECLARE_PROBERIG_BACKEND(icom)
frm_len = make_cmd_frame((char *) buf, civ_addr, CTRLID,
C_RD_TRXID, S_RD_TRXID, NULL, 0);
- serial_flush(port);
+ rig_flush(port);
write_block(port, (char *) buf, frm_len);
/* read out the bytes we just sent
@@ -7353,7 +7353,7 @@ DECLARE_PROBERIG_BACKEND(icom)
frm_len = make_cmd_frame((char *) buf, civ_addr, CTRLID,
C_CTL_MISC, S_OPTO_RDID, NULL, 0);
- serial_flush(port);
+ rig_flush(port);
write_block(port, (char *) buf, frm_len);
/* read out the bytes we just sent
diff --git a/rigs/jrc/jrc.c b/rigs/jrc/jrc.c
index 5a6ca0d1..3f665ccf 100644
--- a/rigs/jrc/jrc.c
+++ b/rigs/jrc/jrc.c
@@ -75,7 +75,7 @@ static int jrc_transaction(RIG *rig, const char *cmd, int cmd_len, char *data,
rs = &rig->state;
- serial_flush(&rs->rigport);
+ rig_flush(&rs->rigport);
// cppcheck-suppress *
Hold_Decode(rig);
diff --git a/rigs/kachina/kachina.c b/rigs/kachina/kachina.c
index 72923ae4..2d798e35 100644
--- a/rigs/kachina/kachina.c
+++ b/rigs/kachina/kachina.c
@@ -84,7 +84,7 @@ static int kachina_transaction(RIG *rig, unsigned char cmd1, unsigned char cmd2)
buf4[2] = cmd2;
buf4[3] = ETX;
- serial_flush(&rs->rigport);
+ rig_flush(&rs->rigport);
retval = write_block(&rs->rigport, (char *) buf4, 4);
@@ -119,7 +119,7 @@ static int kachina_trans_n(RIG *rig, unsigned char cmd1, const char *data,
cmd_len = data_len + 3;
- serial_flush(&rs->rigport);
+ rig_flush(&rs->rigport);
retval = write_block(&rs->rigport, (char *) buf, cmd_len);
@@ -270,7 +270,7 @@ int kachina_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
/* telemetry sent to the PC automatically at a 50msec rate */
- serial_flush(&rig->state.rigport);
+ rig_flush(&rig->state.rigport);
count = read_string(&rig->state.rigport, (char *) buf, 31, rcv_signal_range,
128);
diff --git a/rigs/kenwood/ic10.c b/rigs/kenwood/ic10.c
index e1618184..5039ebcf 100644
--- a/rigs/kenwood/ic10.c
+++ b/rigs/kenwood/ic10.c
@@ -89,7 +89,7 @@ int ic10_transaction(RIG *rig, const char *cmd, int cmd_len, char *data,
rs = &rig->state;
transaction:
- serial_flush(&rs->rigport);
+ rig_flush(&rs->rigport);
retval = write_block(&rs->rigport, cmd, cmd_len);
diff --git a/rigs/kenwood/kenwood.c b/rigs/kenwood/kenwood.c
index 5bcee48d..11707f12 100644
--- a/rigs/kenwood/kenwood.c
+++ b/rigs/kenwood/kenwood.c
@@ -311,15 +311,7 @@ transaction_write:
}
/* flush anything in the read buffer before command is sent */
- if (rs->rigport.type.rig == RIG_PORT_NETWORK
- || rs->rigport.type.rig == RIG_PORT_UDP_NETWORK)
- {
- network_flush(&rs->rigport);
- }
- else
- {
- serial_flush(&rs->rigport);
- }
+ rig_flush(&rs->rigport);
retval = write_block(&rs->rigport, cmd, len);
diff --git a/rigs/kenwood/thd72.c b/rigs/kenwood/thd72.c
index 0385c30e..7fcb32a5 100644
--- a/rigs/kenwood/thd72.c
+++ b/rigs/kenwood/thd72.c
@@ -1514,7 +1514,7 @@ int thd72_get_chan_all_cb(RIG *rig, chan_cb_t chan_cb, rig_ptr_t arg)
hl_usleep(100 * 1000); /* let the pcr settle */
- serial_flush(rp); /* flush any remaining data */
+ rig_flush(rp); /* flush any remaining data */
ret = ser_set_rts(rp, 1); /* setRTS or Hardware flow control? */
if (ret != RIG_OK)
diff --git a/rigs/kenwood/thd74.c b/rigs/kenwood/thd74.c
index 69ecbded..61649672 100644
--- a/rigs/kenwood/thd74.c
+++ b/rigs/kenwood/thd74.c
@@ -1526,7 +1526,7 @@ int thd74_get_chan_all_cb(RIG *rig, chan_cb_t chan_cb, rig_ptr_t arg)
hl_usleep(100 * 1000); /* let the pcr settle */
- serial_flush(rp); /* flush any remaining data */
+ rig_flush(rp); /* flush any remaining data */
ret = ser_set_rts(rp, 1); /* setRTS or Hardware flow control? */
if (ret != RIG_OK)
diff --git a/rigs/kit/drt1.c b/rigs/kit/drt1.c
index 78e6e4d3..5c59ea70 100644
--- a/rigs/kit/drt1.c
+++ b/rigs/kit/drt1.c
@@ -415,7 +415,7 @@ int drt1_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
priv = (struct drt1_priv_data *)rig->state.priv;
- serial_flush(port);
+ rig_flush(port);
/* Initialization */
ad_ioupd(port, 0);
diff --git a/rigs/kit/elektor304.c b/rigs/kit/elektor304.c
index 56280dd0..17449c9a 100644
--- a/rigs/kit/elektor304.c
+++ b/rigs/kit/elektor304.c
@@ -345,7 +345,7 @@ int elektor304_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
priv = (struct elektor304_priv_data *)rig->state.priv;
- serial_flush(port);
+ rig_flush(port);
/* Initialization */
ad_fsync(port, 0);
diff --git a/rigs/kit/miniVNA.c b/rigs/kit/miniVNA.c
index 0df35acf..03234325 100644
--- a/rigs/kit/miniVNA.c
+++ b/rigs/kit/miniVNA.c
@@ -46,7 +46,7 @@ static int miniVNA_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
rig_debug(RIG_DEBUG_TRACE, "%s called: %s %s\n", __func__,
rig_strvfo(vfo), fstr);
- serial_flush(&rig->state.rigport);
+ rig_flush(&rig->state.rigport);
sprintf(cmdstr, "0\r%lu\r1\r0\r", (unsigned long int)(freq * DDS_RATIO));
diff --git a/rigs/kit/rs_hfiq.c b/rigs/kit/rs_hfiq.c
index 7c2d1381..2ba78adf 100644
--- a/rigs/kit/rs_hfiq.c
+++ b/rigs/kit/rs_hfiq.c
@@ -79,7 +79,7 @@ static int rshfiq_open(RIG *rig)
}
}
- serial_flush(&rig->state.rigport);
+ rig_flush(&rig->state.rigport);
snprintf(versionstr, sizeof(versionstr), "*w\r");
rig_debug(RIG_DEBUG_TRACE, "%s: cmdstr = %s\n", __func__, versionstr);
@@ -132,7 +132,7 @@ static int rshfiq_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
rig_debug(RIG_DEBUG_TRACE, "%s called: %s %s\n", __func__,
rig_strvfo(vfo), fstr);
- serial_flush(&rig->state.rigport);
+ rig_flush(&rig->state.rigport);
snprintf(cmdstr, sizeof(cmdstr), "*f%lu\r", (unsigned long int)(freq));
@@ -150,7 +150,7 @@ static int rshfiq_get_freq(RIG *rig, vfo_t vfo, freq_t *freq)
char cmdstr[15];
char stopset[2];
int retval;
- serial_flush(&rig->state.rigport);
+ rig_flush(&rig->state.rigport);
stopset[0] = '\r';
stopset[1] = '\n';
diff --git a/rigs/lowe/lowe.c b/rigs/lowe/lowe.c
index 7b236c68..72d3698e 100644
--- a/rigs/lowe/lowe.c
+++ b/rigs/lowe/lowe.c
@@ -63,7 +63,7 @@ int lowe_transaction(RIG *rig, const char *cmd, int cmd_len, char *data,
rs = &rig->state;
- serial_flush(&rs->rigport);
+ rig_flush(&rs->rigport);
retval = write_block(&rs->rigport, cmd, cmd_len);
diff --git a/rigs/pcr/pcr.c b/rigs/pcr/pcr.c
index 8c3c7c0c..8352987f 100644
--- a/rigs/pcr/pcr.c
+++ b/rigs/pcr/pcr.c
@@ -384,7 +384,7 @@ pcr_transaction(RIG *rig, const char *cmd)
if (!priv->auto_update)
{
- serial_flush(&rs->rigport);
+ rig_flush(&rs->rigport);
}
pcr_send(rig, cmd);
@@ -582,7 +582,7 @@ pcr_open(RIG *rig)
/* let the pcr settle and flush any remaining data*/
hl_usleep(100 * 1000);
- serial_flush(&rs->rigport);
+ rig_flush(&rs->rigport);
/* try powering on twice, sometimes the pcr answers H100 (off) */
pcr_send(rig, "H101");
@@ -591,7 +591,7 @@ pcr_open(RIG *rig)
pcr_send(rig, "H101");
hl_usleep(100 * 250);
- serial_flush(&rs->rigport);
+ rig_flush(&rs->rigport);
/* return RIG_ERJCTED if power is off */
err = pcr_transaction(rig, "H1?");
diff --git a/rigs/prm80/prm80.c b/rigs/prm80/prm80.c
index 77a1c31f..0b841a9d 100644
--- a/rigs/prm80/prm80.c
+++ b/rigs/prm80/prm80.c
@@ -78,7 +78,7 @@ static int prm80_transaction(RIG *rig, const char *cmd, int cmd_len, char *data,
rs = &rig->state;
- serial_flush(&rs->rigport);
+ rig_flush(&rs->rigport);
retval = write_block(&rs->rigport, cmd, cmd_len);
diff --git a/rigs/racal/ra37xx.c b/rigs/racal/ra37xx.c
index 8e819b2d..ca09bf1e 100644
--- a/rigs/racal/ra37xx.c
+++ b/rigs/racal/ra37xx.c
@@ -104,7 +104,7 @@ static int ra37xx_one_transaction(RIG *rig, const char *cmd, char *data,
cmd_len = sprintf(cmdbuf, SOM "%s" EOM, cmd);
}
- serial_flush(&rs->rigport);
+ rig_flush(&rs->rigport);
retval = write_block(&rs->rigport, cmdbuf, cmd_len);
diff --git a/rigs/racal/racal.c b/rigs/racal/racal.c
index 695b1af8..96dd4ccf 100644
--- a/rigs/racal/racal.c
+++ b/rigs/racal/racal.c
@@ -84,7 +84,7 @@ static int racal_transaction(RIG *rig, const char *cmd, char *data,
cmd_len = sprintf(cmdbuf, SOM "%u%s" EOM, priv->receiver_id, cmd);
- serial_flush(&rs->rigport);
+ rig_flush(&rs->rigport);
retval = write_block(&rs->rigport, cmdbuf, cmd_len);
diff --git a/rigs/rft/rft.c b/rigs/rft/rft.c
index 58a8dca3..06a154bb 100644
--- a/rigs/rft/rft.c
+++ b/rigs/rft/rft.c
@@ -55,7 +55,7 @@ int rft_transaction(RIG *rig, const char *cmd, int cmd_len, char *data,
rs = &rig->state;
- serial_flush(&rs->rigport);
+ rig_flush(&rs->rigport);
retval = write_block(&rs->rigport, cmd, cmd_len);
diff --git a/rigs/rs/gp2000.c b/rigs/rs/gp2000.c
index ebf1548a..cbf9c5ab 100644
--- a/rigs/rs/gp2000.c
+++ b/rigs/rs/gp2000.c
@@ -71,7 +71,7 @@ gp2000_transaction(RIG *rig, const char *cmd, int cmd_len, char *data,
rs = &rig->state;
- serial_flush(&rs->rigport);
+ rig_flush(&rs->rigport);
rig_debug(RIG_DEBUG_VERBOSE, "gp2000_transaction: len=%d,cmd=%s\n",
cmd_len, cmd);
diff --git a/rigs/rs/rs.c b/rigs/rs/rs.c
index e7a34a03..138d680e 100644
--- a/rigs/rs/rs.c
+++ b/rigs/rs/rs.c
@@ -64,7 +64,7 @@ int rs_transaction(RIG *rig, const char *cmd, int cmd_len, char *data,
rs = &rig->state;
- serial_flush(&rs->rigport);
+ rig_flush(&rs->rigport);
retval = write_block(&rs->rigport, cmd, cmd_len);
diff --git a/rigs/skanti/skanti.c b/rigs/skanti/skanti.c
index cc6e1bfe..20e103b0 100644
--- a/rigs/skanti/skanti.c
+++ b/rigs/skanti/skanti.c
@@ -71,7 +71,7 @@ static int skanti_transaction(RIG *rig, const char *cmd, int cmd_len,
rs = &rig->state;
- serial_flush(&rs->rigport);
+ rig_flush(&rs->rigport);
retval = write_block(&rs->rigport, cmd, cmd_len);
diff --git a/rigs/tapr/tapr.c b/rigs/tapr/tapr.c
index aa201b1f..baf34356 100644
--- a/rigs/tapr/tapr.c
+++ b/rigs/tapr/tapr.c
@@ -58,7 +58,7 @@ static int tapr_cmd(RIG *rig, unsigned char cmd, unsigned char c1,
rs = &rig->state;
- serial_flush(&rs->rigport);
+ rig_flush(&rs->rigport);
cmdbuf[0] = ESC;
cmdbuf[1] = cmd;
diff --git a/rigs/tentec/omnivii.c b/rigs/tentec/omnivii.c
index cb978d8a..a2f495f3 100644
--- a/rigs/tentec/omnivii.c
+++ b/rigs/tentec/omnivii.c
@@ -268,7 +268,7 @@ static int tt588_transaction(RIG *rig, const char *cmd, int cmd_len, char *data,
for (i = 0; i < 3; ++i) // We'll try 3 times
{
char xxbuf[32];
- serial_flush(&rs->rigport);
+ rig_flush(&rs->rigport);
// We add 1 to data_len here for the null byte inserted by read_string eventually
// That way all the callers can use the expected response length for the cmd_len paramter here
diff --git a/rigs/tentec/orion.c b/rigs/tentec/orion.c
index ece1a7ad..7a0a4208 100644
--- a/rigs/tentec/orion.c
+++ b/rigs/tentec/orion.c
@@ -130,7 +130,7 @@ static int tt565_transaction(RIG *rig, const char *cmd, int cmd_len, char *data,
{
int retval;
rs = &rig->state;
- serial_flush(&rs->rigport); /* discard pending i/p */
+ rig_flush(&rs->rigport); /* discard pending i/p */
retval = write_block(&rs->rigport, cmd, cmd_len);
if (retval != RIG_OK)
diff --git a/rigs/tentec/paragon.c b/rigs/tentec/paragon.c
index 9d9527bf..807c817f 100644
--- a/rigs/tentec/paragon.c
+++ b/rigs/tentec/paragon.c
@@ -582,7 +582,7 @@ int tt585_get_status_data(RIG *rig)
return RIG_OK;
}
- serial_flush(rigport);
+ rig_flush(rigport);
/* send STATUS comand to fetch data*/
diff --git a/rigs/tentec/rx331.c b/rigs/tentec/rx331.c
index 88e04e1a..3161ad71 100644
--- a/rigs/tentec/rx331.c
+++ b/rigs/tentec/rx331.c
@@ -253,7 +253,7 @@ static int rx331_transaction(RIG *rig, const char *cmd, int cmd_len, char *data,
rs = &rig->state;
- serial_flush(&rs->rigport);
+ rig_flush(&rs->rigport);
num_snprintf(str, BUFSZ, "$%u%s", priv->receiver_id, cmd);
retval = write_block(&rs->rigport, str, strlen(str));
diff --git a/rigs/tentec/rx340.c b/rigs/tentec/rx340.c
index b6f03ea7..ec9f81d8 100644
--- a/rigs/tentec/rx340.c
+++ b/rigs/tentec/rx340.c
@@ -204,7 +204,7 @@ static int rx340_transaction(RIG *rig, const char *cmd, int cmd_len, char *data,
rs = &rig->state;
- serial_flush(&rs->rigport);
+ rig_flush(&rs->rigport);
retval = write_block(&rs->rigport, cmd, cmd_len);
diff --git a/rigs/tentec/tentec.c b/rigs/tentec/tentec.c
index dc7bb01b..7f21d96c 100644
--- a/rigs/tentec/tentec.c
+++ b/rigs/tentec/tentec.c
@@ -70,7 +70,7 @@ int tentec_transaction(RIG *rig, const char *cmd, int cmd_len, char *data,
rs = &rig->state;
- serial_flush(&rs->rigport);
+ rig_flush(&rs->rigport);
retval = write_block(&rs->rigport, cmd, cmd_len);
diff --git a/rigs/tentec/tt550.c b/rigs/tentec/tt550.c
index 9612d4ec..20215f5c 100644
--- a/rigs/tentec/tt550.c
+++ b/rigs/tentec/tt550.c
@@ -85,7 +85,7 @@ tt550_transaction(RIG *rig, const char *cmd, int cmd_len, char *data,
// cppcheck-suppress *
Hold_Decode(rig);
- serial_flush(&rs->rigport);
+ rig_flush(&rs->rigport);
retval = write_block(&rs->rigport, cmd, cmd_len);
diff --git a/rigs/uniden/uniden.c b/rigs/uniden/uniden.c
index b19c07ab..7d50f91b 100644
--- a/rigs/uniden/uniden.c
+++ b/rigs/uniden/uniden.c
@@ -132,7 +132,7 @@ uniden_transaction(RIG *rig, const char *cmdstr, int cmd_len,
transaction_write:
- serial_flush(&rs->rigport);
+ rig_flush(&rs->rigport);
if (cmdstr)
{
diff --git a/rigs/uniden/uniden_digital.c b/rigs/uniden/uniden_digital.c
index bcb74a22..9c770fa8 100644
--- a/rigs/uniden/uniden_digital.c
+++ b/rigs/uniden/uniden_digital.c
@@ -114,7 +114,7 @@ uniden_digital_transaction(RIG *rig, const char *cmdstr, int cmd_len,
transaction_write:
- serial_flush(&rs->rigport);
+ rig_flush(&rs->rigport);
if (cmdstr)
{
diff --git a/rigs/wj/wj.c b/rigs/wj/wj.c
index b58f0f80..93563607 100644
--- a/rigs/wj/wj.c
+++ b/rigs/wj/wj.c
@@ -177,7 +177,7 @@ static int wj_transaction(RIG *rig, int monitor)
/* buf[9]: not used if command byte, but must be transmitted */
- serial_flush(&rig->state.rigport);
+ rig_flush(&rig->state.rigport);
retval = write_block(&rig->state.rigport, (char *) buf, CMDSZ);
diff --git a/rigs/yaesu/frg100.c b/rigs/yaesu/frg100.c
index 8bb3cf78..cb395100 100644
--- a/rigs/yaesu/frg100.c
+++ b/rigs/yaesu/frg100.c
@@ -233,7 +233,7 @@ static int frg100_do_transaction(RIG *rig,
rs = &rig->state;
memset(retbuf, 0, retbuf_len);
- serial_flush(&rs->rigport);
+ rig_flush(&rs->rigport);
retval = write_block(&rs->rigport, (const char *)cmd, YAESU_CMD_LENGTH);
if (retval != RIG_OK) { return retval; }
@@ -409,7 +409,7 @@ int frg100_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
return -RIG_EINVAL;
}
- serial_flush(&rig->state.rigport);
+ rig_flush(&rig->state.rigport);
/* send READ STATUS(Meter only) cmd to rig */
retval = write_block(&rig->state.rigport, (char *) cmd, YAESU_CMD_LENGTH);
diff --git a/rigs/yaesu/ft100.c b/rigs/yaesu/ft100.c
index 32a90821..8083c363 100644
--- a/rigs/yaesu/ft100.c
+++ b/rigs/yaesu/ft100.c
@@ -403,7 +403,7 @@ static int ft100_read_status(RIG *rig)
priv = (struct ft100_priv_data *)rig->state.priv;
- serial_flush(&rig->state.rigport);
+ rig_flush(&rig->state.rigport);
ret = ft100_send_priv_cmd(rig, FT100_NATIVE_CAT_READ_STATUS);
@@ -432,7 +432,7 @@ static int ft100_read_flags(RIG *rig)
rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
- serial_flush(&rig->state.rigport);
+ rig_flush(&rig->state.rigport);
ret = ft100_send_priv_cmd(rig, FT100_NATIVE_CAT_READ_FLAGS);
diff --git a/rigs/yaesu/ft1000mp.c b/rigs/yaesu/ft1000mp.c
index 8c7ae3dc..030b17fe 100644
--- a/rigs/yaesu/ft1000mp.c
+++ b/rigs/yaesu/ft1000mp.c
@@ -1516,7 +1516,7 @@ static int ft1000mp_send_priv_cmd(RIG *rig, unsigned char ci)
}
cmd = (unsigned char *) p->pcs[cmd_index].nseq; /* get native sequence */
- serial_flush(&rig_s->rigport);
+ rig_flush(&rig_s->rigport);
write_block(&rig_s->rigport, (char *) cmd, YAESU_CMD_LENGTH);
return RIG_OK;
diff --git a/rigs/yaesu/ft600.c b/rigs/yaesu/ft600.c
index 5b7383f9..349fe6b3 100644
--- a/rigs/yaesu/ft600.c
+++ b/rigs/yaesu/ft600.c
@@ -313,7 +313,7 @@ static int ft600_read_status(RIG *rig)
priv = (struct ft600_priv_data *)rig->state.priv;
- serial_flush(&rig->state.rigport);
+ rig_flush(&rig->state.rigport);
ret = ft600_send_priv_cmd(rig, FT600_NATIVE_CAT_READ_STATUS);
diff --git a/rigs/yaesu/ft736.c b/rigs/yaesu/ft736.c
index 60dda021..37abff24 100644
--- a/rigs/yaesu/ft736.c
+++ b/rigs/yaesu/ft736.c
@@ -440,7 +440,7 @@ int ft736_get_dcd(RIG *rig, vfo_t vfo, dcd_t *dcd)
unsigned char cmd[YAESU_CMD_LENGTH] = { 0x00, 0x00, 0x00, 0x00, 0xe7};
int retval;
- serial_flush(&rig->state.rigport);
+ rig_flush(&rig->state.rigport);
retval = write_block(&rig->state.rigport, (char *) cmd, YAESU_CMD_LENGTH);
@@ -475,7 +475,7 @@ int ft736_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
return -RIG_EINVAL;
}
- serial_flush(&rig->state.rigport);
+ rig_flush(&rig->state.rigport);
/* send Test S-meter cmd to rig */
retval = write_block(&rig->state.rigport, (char *) cmd, YAESU_CMD_LENGTH);
diff --git a/rigs/yaesu/ft747.c b/rigs/yaesu/ft747.c
index 4e33773f..5f36bc27 100644
--- a/rigs/yaesu/ft747.c
+++ b/rigs/yaesu/ft747.c
@@ -869,7 +869,7 @@ static int ft747_get_update_data(RIG *rig)
{
int ret;
int port_timeout;
- serial_flush(rigport);
+ rig_flush(rigport);
/* send UPDATE comand to fetch data*/
diff --git a/rigs/yaesu/ft757gx.c b/rigs/yaesu/ft757gx.c
index c097275f..5c9ca6f8 100644
--- a/rigs/yaesu/ft757gx.c
+++ b/rigs/yaesu/ft757gx.c
@@ -652,7 +652,7 @@ int ft757_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
return -RIG_EINVAL;
}
- serial_flush(&rig->state.rigport);
+ rig_flush(&rig->state.rigport);
/* send READ STATUS(Meter only) cmd to rig */
retval = write_block(&rig->state.rigport, (char *)cmd, YAESU_CMD_LENGTH);
@@ -702,7 +702,7 @@ int ft757_get_update_data(RIG *rig)
does not fix things. So we restart the read from scratch, it works most of times. */
for (nbtries = 0 ; nbtries < maxtries ; nbtries++)
{
- serial_flush(&rig->state.rigport);
+ rig_flush(&rig->state.rigport);
/* send READ STATUS cmd to rig */
retval = write_block(&rig->state.rigport, (char *)cmd, YAESU_CMD_LENGTH);
diff --git a/rigs/yaesu/ft767gx.c b/rigs/yaesu/ft767gx.c
index 5760078b..33c15d51 100644
--- a/rigs/yaesu/ft767gx.c
+++ b/rigs/yaesu/ft767gx.c
@@ -460,7 +460,7 @@ int ft767_open(RIG *rig)
struct ft767_priv_data *priv = (struct ft767_priv_data *)rig->state.priv;
int retval;
- serial_flush(&rig->state.rigport);
+ rig_flush(&rig->state.rigport);
/* send 0 delay PACING cmd to rig */
retval = ft767_enter_CAT(rig);
@@ -492,7 +492,7 @@ int ft767_open(RIG *rig)
int ft767_close(RIG *rig)
{
- serial_flush(&rig->state.rigport);
+ rig_flush(&rig->state.rigport);
return RIG_OK;
}
@@ -1225,7 +1225,7 @@ int ft767_set_split_vfo(RIG *rig, vfo_t vfo, split_t split, vfo_t tx_vfo)
return -RIG_EINVAL; /* sorry, wrong VFO */
}
- serial_flush(&rig->state.rigport);
+ rig_flush(&rig->state.rigport);
retval = ft767_enter_CAT(rig);
@@ -1538,7 +1538,7 @@ int ft767_get_update_data(RIG *rig)
struct ft767_priv_data *priv = (struct ft767_priv_data *)rig->state.priv;
int retval;
- serial_flush(&rig->state.rigport);
+ rig_flush(&rig->state.rigport);
/* Entering CAT updates our data structures */
retval = ft767_enter_CAT(rig);
@@ -1569,7 +1569,7 @@ int ft767_set_split(RIG *rig, unsigned int split)
int retval;
unsigned int curr_split;
- serial_flush(&rig->state.rigport);
+ rig_flush(&rig->state.rigport);
/* Entering CAT updates our data structures */
retval = ft767_enter_CAT(rig);
diff --git a/rigs/yaesu/ft817.c b/rigs/yaesu/ft817.c
index 1f9c2388..b1a87931 100644
--- a/rigs/yaesu/ft817.c
+++ b/rigs/yaesu/ft817.c
@@ -451,7 +451,7 @@ static int ft817_get_status(RIG *rig, int status)
do
{
- serial_flush(&rig->state.rigport);
+ rig_flush(&rig->state.rigport);
write_block(&rig->state.rigport, (char *) p->pcs[status].nseq,
YAESU_CMD_LENGTH);
n = read_block(&rig->state.rigport, (char *) data, len);
diff --git a/rigs/yaesu/ft847.c b/rigs/yaesu/ft847.c
index 18eb6fe6..121bf38c 100644
--- a/rigs/yaesu/ft847.c
+++ b/rigs/yaesu/ft847.c
@@ -1143,7 +1143,7 @@ static int ft847_get_status(RIG *rig, int status_ci)
return -RIG_EINTERNAL;
}
- serial_flush(&rig->state.rigport);
+ rig_flush(&rig->state.rigport);
n = write_block(&rig->state.rigport, (char *) ncmd[status_ci].nseq,
YAESU_CMD_LENGTH);
diff --git a/rigs/yaesu/ft857.c b/rigs/yaesu/ft857.c
index 2da3c002..dc062083 100644
--- a/rigs/yaesu/ft857.c
+++ b/rigs/yaesu/ft857.c
@@ -438,7 +438,7 @@ static int ft857_get_status(RIG *rig, int status)
return -RIG_EINTERNAL;
}
- serial_flush(&rig->state.rigport);
+ rig_flush(&rig->state.rigport);
write_block(&rig->state.rigport, (char *) p->pcs[status].nseq,
YAESU_CMD_LENGTH);
diff --git a/rigs/yaesu/ft897.c b/rigs/yaesu/ft897.c
index ae20a39e..de84830e 100644
--- a/rigs/yaesu/ft897.c
+++ b/rigs/yaesu/ft897.c
@@ -473,7 +473,7 @@ static int ft897_get_status(RIG *rig, int status)
return -RIG_EINTERNAL;
}
- serial_flush(&rig->state.rigport);
+ rig_flush(&rig->state.rigport);
write_block(&rig->state.rigport, (char *) p->pcs[status].nseq,
YAESU_CMD_LENGTH);
diff --git a/rigs/yaesu/ft980.c b/rigs/yaesu/ft980.c
index 5eebfa7b..461d0e5d 100644
--- a/rigs/yaesu/ft980.c
+++ b/rigs/yaesu/ft980.c
@@ -635,7 +635,7 @@ int ft980_transaction(RIG *rig, const unsigned char *cmd, unsigned char *data,
int retval;
char echo_back[YAESU_CMD_LENGTH];
- serial_flush(&rig->state.rigport);
+ rig_flush(&rig->state.rigport);
retval = write_block(&rig->state.rigport, (const char *)cmd, YAESU_CMD_LENGTH);
diff --git a/rigs/yaesu/newcat.c b/rigs/yaesu/newcat.c
index 8cc8b187..550dc55a 100644
--- a/rigs/yaesu/newcat.c
+++ b/rigs/yaesu/newcat.c
@@ -6520,7 +6520,7 @@ int newcat_set_cmd(RIG *rig)
while (rc != RIG_OK && retry_count++ <= state->rigport.retry)
{
- serial_flush(&state->rigport); /* discard any unsolicited data */
+ rig_flush(&state->rigport); /* discard any unsolicited data */
/* send the command */
rig_debug(RIG_DEBUG_TRACE, "cmd_str = %s\n", priv->cmd_str);
diff --git a/rigs/yaesu/vr5000.c b/rigs/yaesu/vr5000.c
index 35aacbb3..eeb403cf 100644
--- a/rigs/yaesu/vr5000.c
+++ b/rigs/yaesu/vr5000.c
@@ -412,7 +412,7 @@ int vr5000_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
return -RIG_EINVAL;
}
- serial_flush(&rig->state.rigport);
+ rig_flush(&rig->state.rigport);
/* send READ STATUS(Meter only) cmd to rig */
retval = write_block(&rig->state.rigport, (char *) cmd, YAESU_CMD_LENGTH);
@@ -446,7 +446,7 @@ int vr5000_get_dcd(RIG *rig, vfo_t vfo, dcd_t *dcd)
unsigned char cmd[YAESU_CMD_LENGTH] = { 0x00, 0x00, 0x00, 0x00, 0xe7};
int retval;
- serial_flush(&rig->state.rigport);
+ rig_flush(&rig->state.rigport);
/* send READ STATUS(Meter only) cmd to rig */
retval = write_block(&rig->state.rigport, (char *) cmd, YAESU_CMD_LENGTH);
diff --git a/rigs/yaesu/vx1700.c b/rigs/yaesu/vx1700.c
index 068c5753..f99b9c76 100644
--- a/rigs/yaesu/vx1700.c
+++ b/rigs/yaesu/vx1700.c
@@ -240,7 +240,7 @@ static int vx1700_do_transaction(RIG *rig,
rs = &rig->state;
memset(retbuf, 0, retbuf_len);
- serial_flush(&rs->rigport);
+ rig_flush(&rs->rigport);
retval = write_block(&rs->rigport, (const char *)cmd, YAESU_CMD_LENGTH);
if (retval != RIG_OK) { return retval; }
diff --git a/src/misc.c b/src/misc.c
index b8f90c8d..c665346e 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -1492,7 +1492,11 @@ int HAMLIB_API rig_flush(hamlib_port_t *port)
return RIG_OK;
}
- return serial_flush(port);
+ if (port->type.rig != RIG_PORT_SERIAL)
+ {
+ rig_debug(RIG_DEBUG_WARN, "%s: Expected serial port type!!\nWhat is this rig?\n", __func__);
+ }
+ return serial_flush(port); // we must be on serial port
}
//! @endcond
diff --git a/src/serial.c b/src/serial.c
index 35832044..72c7402e 100644
--- a/src/serial.c
+++ b/src/serial.c
@@ -203,9 +203,7 @@ int HAMLIB_API serial_open(hamlib_port_t *rp)
/*
* Open in Non-blocking mode. Watch for EAGAIN errors!
*/
- rig_debug(RIG_DEBUG_TRACE, "%s: OPEN before\n", __func__);
fd = OPEN(rp->pathname, O_RDWR | O_NOCTTY | O_NDELAY);
- rig_debug(RIG_DEBUG_TRACE, "%s: OPEN after\n", __func__);
if (fd == -1)
{
@@ -220,9 +218,7 @@ int HAMLIB_API serial_open(hamlib_port_t *rp)
rp->fd = fd;
- rig_debug(RIG_DEBUG_TRACE, "%s: serial_setup before\n", __func__);
err = serial_setup(rp);
- rig_debug(RIG_DEBUG_TRACE, "%s: serial_setup after\n", __func__);
if (err != RIG_OK)
{
@@ -230,9 +226,7 @@ int HAMLIB_API serial_open(hamlib_port_t *rp)
return err;
}
- rig_debug(RIG_DEBUG_TRACE, "%s: serial_flush before\n", __func__);
serial_flush(rp); // ensure nothing is there when we open
- rig_debug(RIG_DEBUG_TRACE, "%s: serial_flush before\n", __func__);
return RIG_OK;
}
commit b50975729ca5e44871f96db797617e9a0f9b820c
Author: Michael Black W9MDB <mdb...@ya...>
Date: Tue Jun 23 08:44:27 2020 -0500
Rotators and amplifiers converted to rig_flush
https://github.com/Hamlib/Hamlib/issues/307
diff --git a/amplifiers/elecraft/kpa.c b/amplifiers/elecraft/kpa.c
index 5c78d54d..dc066de6 100644
--- a/amplifiers/elecraft/kpa.c
+++ b/amplifiers/elecraft/kpa.c
@@ -98,7 +98,7 @@ int kpa_flushbuffer(AMP *amp)
rs = &->state;
- return serial_flush(&rs->ampport);
+ return rig_flush(&rs->ampport);
}
int kpa_transaction(AMP *amp, const char *cmd, char *response, int response_len)
diff --git a/rotators/celestron/celestron.c b/rotators/celestron/celestron.c
index 4028b03c..f095b6fe 100644
--- a/rotators/celestron/celestron.c
+++ b/rotators/celestron/celestron.c
@@ -67,7 +67,7 @@ celestron_transaction(ROT *rot, const char *cmdstr,
transaction_write:
- serial_flush(&rs->rotport);
+ rig_flush(&rs->rotport);
if (cmdstr)
{
diff --git a/rotators/easycomm/easycomm.c b/rotators/easycomm/easycomm.c
index 0d565e91..bd2c7d19 100644
--- a/rotators/easycomm/easycomm.c
+++ b/rotators/easycomm/easycomm.c
@@ -63,7 +63,7 @@ easycomm_transaction(ROT *rot, const char *cmdstr, char *data, size_t data_len)
}
rs = &rot->state;
- serial_flush(&rs->rotport);
+ rig_flush(&rs->rotport);
retval = write_block(&rs->rotport, cmdstr, strlen(cmdstr));
if (retval != RIG_OK)
diff --git a/rotators/gs232a/gs232.c b/rotators/gs232a/gs232.c
index a2886402..b179b116 100644
--- a/rotators/gs232a/gs232.c
+++ b/rotators/gs232a/gs232.c
@@ -69,7 +69,7 @@ gs232_transaction(ROT *rot, const char *cmdstr,
transaction_write:
- serial_flush(&rs->rotport);
+ rig_flush(&rs->rotport);
if (cmdstr)
{
diff --git a/rotators/gs232a/gs232a.c b/rotators/gs232a/gs232a.c
index d837ed4b..f0718eee 100644
--- a/rotators/gs232a/gs232a.c
+++ b/rotators/gs232a/gs232a.c
@@ -74,7 +74,7 @@ gs232a_transaction(ROT *rot, const char *cmdstr,
transaction_write:
- serial_flush(&rs->rotport);
+ rig_flush(&rs->rotport);
if (cmdstr)
{
diff --git a/rotators/gs232a/gs232b.c b/rotators/gs232a/gs232b.c
index 935f4e4d..eebaad67 100644
--- a/rotators/gs232a/gs232b.c
+++ b/rotators/gs232a/gs232b.c
@@ -75,7 +75,7 @@ gs232b_transaction(ROT *rot, const char *cmdstr,
transaction_write:
- serial_flush(&rs->rotport);
+ rig_flush(&rs->rotport);
if (cmdstr)
{
diff --git a/rotators/ioptron/rot_ioptron.c b/rotators/ioptron/rot_ioptron.c
index bcdbc1a8..137d9916 100644
--- a/rotators/ioptron/rot_ioptron.c
+++ b/rotators/ioptron/rot_ioptron.c
@@ -83,7 +83,7 @@ ioptron_transaction(ROT *rot, const char *cmdstr,
transaction_write:
- serial_flush(&rs->rotport);
+ rig_flush(&rs->rotport);
if (cmdstr)
{
diff --git a/rotators/m2/rc2800.c b/rotators/m2/rc2800.c
index 2f7927e4..b2cd4379 100644
--- a/rotators/m2/rc2800.c
+++ b/rotators/m2/rc2800.c
@@ -179,7 +179,7 @@ rc2800_transaction(ROT *rot, const char *cmdstr,
transaction_write:
- serial_flush(&rs->rotport);
+ rig_flush(&rs->rotport);
if (cmdstr)
{
diff --git a/rotators/meade/meade.c b/rotators/meade/meade.c
index ec3438d5..0aaa9341 100644
--- a/rotators/meade/meade.c
+++ b/rotators/meade/meade.c
@@ -111,7 +111,7 @@ static int meade_transaction(ROT *rot, const char *cmdstr,
while (1)
{
transaction:
- serial_flush(&rs->rotport);
+ rig_flush(&rs->rotport);
if (cmdstr)
{
diff --git a/rotators/prosistel/prosistel.c b/rotators/prosistel/prosistel.c
index 3d0f80b8..7b892969 100644
--- a/rotators/prosistel/prosistel.c
+++ b/rotators/prosistel/prosistel.c
@@ -83,7 +83,7 @@ static int prosistel_transaction(ROT *rot, const char *cmdstr,
transaction_write:
- serial_flush(&rs->rotport);
+ rig_flush(&rs->rotport);
if (cmdstr)
{
commit 1be5c71e76d60573c80c42699b95f1f7c7443d26
Author: Michael Black W9MDB <mdb...@ya...>
Date: Tue Jun 23 08:39:11 2020 -0500
More conversions to rig_flush
https://github.com/Hamlib/Hamlib/issues/307
diff --git a/tests/ampctl_parse.c b/tests/ampctl_parse.c
index cc2decb9..521301ba 100644
--- a/tests/ampctl_parse.c
+++ b/tests/ampctl_parse.c
@@ -1937,7 +1937,7 @@ declare_proto_amp(send_cmd)
rs = &->state;
- serial_flush(&rs->ampport);
+ rig_flush(&rs->ampport);
retval = write_block(&rs->ampport, bufcmd, cmd_len);
diff --git a/tests/rigctl_parse.c b/tests/rigctl_parse.c
index 3c9befc9..36e4fe99 100644
--- a/tests/rigctl_parse.c
+++ b/tests/rigctl_parse.c
@@ -4394,7 +4394,7 @@ declare_proto_rig(send_cmd)
rs = &rig->state;
- serial_flush(&rs->rigport);
+ rig_flush(&rs->rigport);
rig_debug(RIG_DEBUG_TRACE, "%s: rigport=%d, bufcmd=%s, cmd_len=%d\n", __func__,
rs->rigport.fd, hasbinary(bufcmd) ? "BINARY" : bufcmd, cmd_len);
diff --git a/tests/rigctlcom.c b/tests/rigctlcom.c
index e3f3f9f3..e2cdb95c 100644
--- a/tests/rigctlcom.c
+++ b/tests/rigctlcom.c
@@ -614,7 +614,7 @@ int main(int argc, char *argv[])
char *stop_set = ";\n\r";
memset(ts2000, 0, sizeof(ts2000));
- serial_flush(&my_com); // get rid of anything in the queue
+ rig_flush(&my_com); // get rid of anything in the queue
status = read_string(&my_com,
ts2000,
diff --git a/tests/rotctl_parse.c b/tests/rotctl_parse.c
index 87fb78c7..a0dce570 100644
--- a/tests/rotctl_parse.c
+++ b/tests/rotctl_parse.c
@@ -1959,7 +1959,7 @@ declare_proto_rot(send_cmd)
rs = &rot->state;
- serial_flush(&rs->rotport);
+ rig_flush(&rs->rotport);
retval = write_block(&rs->rotport, bufcmd, cmd_len);
-----------------------------------------------------------------------
Summary of changes:
amplifiers/elecraft/kpa.c | 2 +-
rigs/adat/adat.c | 4 ++--
rigs/alinco/dx77.c | 2 +-
rigs/alinco/dxsr8.c | 2 +-
rigs/aor/aor.c | 2 +-
rigs/aor/ar3000.c | 2 +-
rigs/aor/ar3030.c | 4 ++--
rigs/aor/sr2200.c | 2 +-
rigs/barrett/barrett.c | 2 +-
rigs/drake/drake.c | 2 +-
rigs/elad/elad.c | 10 +---------
rigs/icmarine/icmarine.c | 2 +-
rigs/icom/frame.c | 2 +-
rigs/icom/icom.c | 4 ++--
rigs/jrc/jrc.c | 2 +-
rigs/kachina/kachina.c | 6 +++---
rigs/kenwood/ic10.c | 2 +-
rigs/kenwood/kenwood.c | 10 +---------
rigs/kenwood/thd72.c | 2 +-
rigs/kenwood/thd74.c | 2 +-
rigs/kit/drt1.c | 2 +-
rigs/kit/elektor304.c | 2 +-
rigs/kit/miniVNA.c | 2 +-
rigs/kit/rs_hfiq.c | 6 +++---
rigs/lowe/lowe.c | 2 +-
rigs/pcr/pcr.c | 6 +++---
rigs/prm80/prm80.c | 2 +-
rigs/racal/ra37xx.c | 2 +-
rigs/racal/racal.c | 2 +-
rigs/rft/rft.c | 2 +-
rigs/rs/gp2000.c | 2 +-
rigs/rs/rs.c | 2 +-
rigs/skanti/skanti.c | 2 +-
rigs/tapr/tapr.c | 2 +-
rigs/tentec/omnivii.c | 2 +-
rigs/tentec/orion.c | 2 +-
rigs/tentec/paragon.c | 2 +-
rigs/tentec/rx331.c | 2 +-
rigs/tentec/rx340.c | 2 +-
rigs/tentec/tentec.c | 2 +-
rigs/tentec/tt550.c | 2 +-
rigs/uniden/uniden.c | 2 +-
rigs/uniden/uniden_digital.c | 2 +-
rigs/wj/wj.c | 2 +-
rigs/yaesu/frg100.c | 4 ++--
rigs/yaesu/ft100.c | 4 ++--
rigs/yaesu/ft1000mp.c | 2 +-
rigs/yaesu/ft600.c | 2 +-
rigs/yaesu/ft736.c | 4 ++--
rigs/yaesu/ft747.c | 2 +-
rigs/yaesu/ft757gx.c | 4 ++--
rigs/yaesu/ft767gx.c | 10 +++++-----
rigs/yaesu/ft817.c | 2 +-
rigs/yaesu/ft847.c | 2 +-
rigs/yaesu/ft857.c | 2 +-
rigs/yaesu/ft897.c | 2 +-
rigs/yaesu/ft980.c | 2 +-
rigs/yaesu/newcat.c | 2 +-
rigs/yaesu/vr5000.c | 4 ++--
rigs/yaesu/vx1700.c | 2 +-
rotators/celestron/celestron.c | 2 +-
rotators/easycomm/easycomm.c | 2 +-
rotators/gs232a/gs232.c | 2 +-
rotators/gs232a/gs232a.c | 2 +-
rotators/gs232a/gs232b.c | 2 +-
rotators/ioptron/rot_ioptron.c | 2 +-
rotators/m2/rc2800.c | 2 +-
rotators/meade/meade.c | 2 +-
rotators/prosistel/prosistel.c | 2 +-
src/misc.c | 6 +++++-
src/serial.c | 6 ------
tests/ampctl_parse.c | 2 +-
tests/rigctl_parse.c | 2 +-
tests/rigctlcom.c | 2 +-
tests/rotctl_parse.c | 2 +-
75 files changed, 96 insertions(+), 114 deletions(-)
hooks/post-receive
--
Hamlib -- Ham radio control libraries
|
