[Hamlib-commits] Hamlib -- Ham radio control libraries branch master updated. 31c3c973520e8bf87478e
Library to control radio transceivers and receivers
Brought to you by:
n0nb
Menu
▾
▴
[Hamlib-commits] Hamlib -- Ham radio control libraries branch master updated. 31c3c973520e8bf87478e17dc6136845351e2e74
|
From: n0nb <n0...@us...> - 2025-06-26 02:38:09
|
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 31c3c973520e8bf87478e17dc6136845351e2e74 (commit)
via e163aa2645d9b7c8ae823edfc5d1066b346ce230 (commit)
via 55b0599b752d5cd5c3e1ec1791624aaf8d8f3dbb (commit)
via 921a6a9de372adedf68dd57eec620ed7b323c097 (commit)
via 0b75b96ef160a5d14be39361b8bcf0a59f04982c (commit)
via aa3e6cb6e9a8a45a2b2f627d11155e14f6808b99 (commit)
via ec4590df8decc4c47a57e6dc78e92871b92c230e (commit)
via 4653b8f96c4cf0f489a021e647a7c30d790eee90 (commit)
from 92a0775855109aae116f4352139a6d69c5c0ff46 (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 31c3c973520e8bf87478e17dc6136845351e2e74
Merge: 92a077585 e163aa264
Author: Nate Bargmann <n0...@n0...>
Date: Wed Jun 25 21:32:26 2025 -0500
Merge GitHub PR #1783
commit e163aa2645d9b7c8ae823edfc5d1066b346ce230
Author: George Baltz N3GB <Geo...@gm...>
Date: Wed Jun 25 10:53:50 2025 -0400
Another reversion
diff --git a/src/sprintflst.c b/src/sprintflst.c
index d1ae9758b..2bbe1c612 100644
--- a/src/sprintflst.c
+++ b/src/sprintflst.c
@@ -819,7 +819,7 @@ int rot_sprintf_status(char *str, int nlen, rot_status_t status)
return 0;
}
- for (i = 0; i <= HAMLIB_MAX_ROTORS; i++)
+ for (i = 0; i < HAMLIB_MAX_ROTORS; i++)
{
const char *sv = rot_strstatus(status & ROT_STATUS_N(i));
commit 55b0599b752d5cd5c3e1ec1791624aaf8d8f3dbb
Author: George Baltz N3GB <Geo...@gm...>
Date: Wed Jun 25 10:41:55 2025 -0400
Stop the blithering
diff --git a/include/hamlib/rig.h b/include/hamlib/rig.h
index a7fd2bb4f..a72e47474 100644
--- a/include/hamlib/rig.h
+++ b/include/hamlib/rig.h
@@ -286,7 +286,7 @@ typedef struct s_rig RIG;
#define HAMLIB_MAX_CAL_LENGTH 32 /* max calibration plots in cal_table_t */
#define HAMLIB_MAX_MODES 63
#define HAMLIB_MAX_VFOS 31
-#define HAMLIB_MAX_ROTORS 63
+#define HAMLIB_MAX_ROTORS 31
#define HAMLIB_MAX_VFO_OPS 31
#define HAMLIB_MAX_RSCANS 31
#define HAMLIB_MAX_SNAPSHOT_PACKET_SIZE 16384 /* maximum number of bytes in a UDP snapshot packet */
diff --git a/include/hamlib/rotator.h b/include/hamlib/rotator.h
index 10889cb97..0a183c668 100644
--- a/include/hamlib/rotator.h
+++ b/include/hamlib/rotator.h
@@ -358,8 +358,6 @@ typedef enum {
ROT_STATUS_OVERLAP_LEFT = (1 << 14), /*!< The azimuth rotator has rotated left (CCW) past 0 degrees. */
ROT_STATUS_OVERLAP_RIGHT = (1 << 16), /*!< The azimuth rotator has rotated right (CW) past 360 degrees. */
} rot_status_t;
-// Update this if any additions to status definitions
-#define HAMLIB_MAX_ROTOR_STATUS 16
//! @cond Doxygen_Suppress
/* So far only used in tests/sprintflst.c. */
diff --git a/src/sprintflst.c b/src/sprintflst.c
index da0b96521..d1ae9758b 100644
--- a/src/sprintflst.c
+++ b/src/sprintflst.c
@@ -819,7 +819,7 @@ int rot_sprintf_status(char *str, int nlen, rot_status_t status)
return 0;
}
- for (i = 0; i <= HAMLIB_MAX_ROTOR_STATUS; i++)
+ for (i = 0; i <= HAMLIB_MAX_ROTORS; i++)
{
const char *sv = rot_strstatus(status & ROT_STATUS_N(i));
commit 921a6a9de372adedf68dd57eec620ed7b323c097
Author: George Baltz N3GB <Geo...@gm...>
Date: Wed Jun 25 10:01:16 2025 -0400
Still more cppcheck cleanups
diff --git a/NEWS b/NEWS
index aee6e4b92..31627e686 100644
--- a/NEWS
+++ b/NEWS
@@ -18,7 +18,7 @@ Version 4.7.0
such as the TM-D710/TM-V71 that use EOM_TH (\r) as the command terminator.
(TNX, Lars Kellogg-Stedman and George Baltz).
* Reduce/repair excess output from cppcheck.sh - mostly cosmetic changes (WIP)
- Output from `wc -l cppcheck.log` - 4.6.2: 981 now: 732
+ Output from `wc -l cppcheck.log` - 4.6.2: 981 now: 673
* Remove dead getopt code. GitHub PR #1709. (TNX Daniele Forsi)
* Move rig_cache to separate(calloc) storage. Prepare for other moves.
Issue #1420
diff --git a/src/serial.c b/src/serial.c
index 6fdecc739..1421f51fd 100644
--- a/src/serial.c
+++ b/src/serial.c
@@ -892,7 +892,7 @@ int HAMLIB_API serial_flush(hamlib_port_t *p)
{
// we pass an empty stopset so read_string can determine
// the appropriate stopset for async data
- const char stopset[1];
+ const char stopset[1] = "";
len = read_string(p, buf, sizeof(buf) - 1, stopset, 0, 1, 1);
if (len > 0)
diff --git a/tests/hamlibmodels.c b/tests/hamlibmodels.c
index a7cfac7f0..398629633 100644
--- a/tests/hamlibmodels.c
+++ b/tests/hamlibmodels.c
@@ -16,7 +16,7 @@ static int hash_model_list(const struct rig_caps *caps, void *data)
return 1; /* !=0, we want them all ! */
}
-int mycmp(const void *p1, const void *p2)
+static int mycmp(const void *p1, const void *p2)
{
const char **s1 = (const char **)p1;
const char **s2 = (const char **)p2;
diff --git a/tests/rigfreqwalk.c b/tests/rigfreqwalk.c
index 5ae1a1394..c268c3f4f 100644
--- a/tests/rigfreqwalk.c
+++ b/tests/rigfreqwalk.c
@@ -17,7 +17,7 @@ double history[HISTORYSIZE];
int nhistory;
int historyinit = 1;
-double compute_mean(const double arr[], int length)
+static double compute_mean(const double arr[], int length)
{
double sum = 0.0;
@@ -29,7 +29,7 @@ double compute_mean(const double arr[], int length)
return sum / length;
}
-double sigma(double arr[], int length)
+static double sigma(double arr[], int length)
{
double mean = compute_mean(arr, length);
double sum_of_squares = 0.0;
diff --git a/tests/rigmatrix.c b/tests/rigmatrix.c
index 72e8e182f..35652e7e5 100644
--- a/tests/rigmatrix.c
+++ b/tests/rigmatrix.c
@@ -112,7 +112,7 @@ int print_caps_sum(struct rig_caps *caps, void *data)
/*
* IO params et al.
*/
-int print_caps_parameters(struct rig_caps *caps, void *data)
+static int print_caps_parameters(struct rig_caps *caps, void *data)
{
printf("<A NAME=\"parms%u\"><TR><TD>%s</TD><TD>",
caps->rig_model,
@@ -223,7 +223,7 @@ int print_caps_parameters(struct rig_caps *caps, void *data)
*
* TODO: add new API calls!
*/
-int print_caps_caps(struct rig_caps *caps, void *data)
+static int print_caps_caps(struct rig_caps *caps, void *data)
{
printf("<A NAME=\"caps%u\"><TR><TD>%s</TD>",
caps->rig_model,
@@ -271,7 +271,7 @@ int print_caps_caps(struct rig_caps *caps, void *data)
/*
* Get/Set parm abilities
*/
-int print_caps_parm(struct rig_caps *caps, void *data)
+static int print_caps_parm(struct rig_caps *caps, void *data)
{
setting_t parm;
int i;
@@ -307,7 +307,7 @@ int print_caps_parm(struct rig_caps *caps, void *data)
/*
* VFO Ops capabilities
*/
-int print_caps_vfo_ops(struct rig_caps *caps, void *data)
+static int print_caps_vfo_ops(struct rig_caps *caps, void *data)
{
setting_t vfo_ops;
int i;
@@ -345,7 +345,7 @@ int print_caps_vfo_ops(struct rig_caps *caps, void *data)
/*
* Get/Set level abilities
*/
-int print_caps_level(struct rig_caps *caps, void *data)
+static int print_caps_level(struct rig_caps *caps, void *data)
{
setting_t level;
int i;
@@ -382,7 +382,7 @@ int print_caps_level(struct rig_caps *caps, void *data)
/*
* Get/Set func abilities
*/
-int print_caps_func(struct rig_caps *caps, void *data)
+static int print_caps_func(struct rig_caps *caps, void *data)
{
setting_t func;
int i;
@@ -421,7 +421,7 @@ int print_caps_func(struct rig_caps *caps, void *data)
*
* FIXME: default output pics is for region2: add region 1 too!
*/
-int print_caps_range(struct rig_caps *caps, void *data)
+static int print_caps_range(struct rig_caps *caps, void *data)
{
create_png_range(caps->rx_range_list2, caps->tx_range_list2,
caps->rig_model);
@@ -567,7 +567,7 @@ static void draw_range(const freq_range_t range_list[],
}
-int create_png_range(const freq_range_t rx_range_list[],
+static int create_png_range(const freq_range_t rx_range_list[],
const freq_range_t tx_range_list[],
int num)
{
diff --git a/tests/rotctl.c b/tests/rotctl.c
index 4ec0d929d..3896d94a8 100644
--- a/tests/rotctl.c
+++ b/tests/rotctl.c
@@ -444,7 +444,6 @@ int main(int argc, char *argv[])
}
}
- // cppcheck-suppress knownConditionTrueFalse
while (retcode == 0 || retcode == 2);
#ifdef HAVE_LIBREADLINE
commit 0b75b96ef160a5d14be39361b8bcf0a59f04982c
Author: George Baltz N3GB <Geo...@gm...>
Date: Tue Jun 24 21:48:09 2025 -0400
Fix rotctl \dump_caps output
rot_sprintf_status() was printing items multiple times.
Cause of problem noticed by cppcheck.
diff --git a/include/hamlib/rotator.h b/include/hamlib/rotator.h
index 0a183c668..10889cb97 100644
--- a/include/hamlib/rotator.h
+++ b/include/hamlib/rotator.h
@@ -358,6 +358,8 @@ typedef enum {
ROT_STATUS_OVERLAP_LEFT = (1 << 14), /*!< The azimuth rotator has rotated left (CCW) past 0 degrees. */
ROT_STATUS_OVERLAP_RIGHT = (1 << 16), /*!< The azimuth rotator has rotated right (CW) past 360 degrees. */
} rot_status_t;
+// Update this if any additions to status definitions
+#define HAMLIB_MAX_ROTOR_STATUS 16
//! @cond Doxygen_Suppress
/* So far only used in tests/sprintflst.c. */
diff --git a/src/sprintflst.c b/src/sprintflst.c
index 2bbe1c612..da0b96521 100644
--- a/src/sprintflst.c
+++ b/src/sprintflst.c
@@ -819,7 +819,7 @@ int rot_sprintf_status(char *str, int nlen, rot_status_t status)
return 0;
}
- for (i = 0; i < HAMLIB_MAX_ROTORS; i++)
+ for (i = 0; i <= HAMLIB_MAX_ROTOR_STATUS; i++)
{
const char *sv = rot_strstatus(status & ROT_STATUS_N(i));
commit aa3e6cb6e9a8a45a2b2f627d11155e14f6808b99
Author: George Baltz N3GB <Geo...@gm...>
Date: Tue Jun 24 05:17:54 2025 -0400
Fix cppcheck "errors" in rigs/icom/*.c
diff --git a/rigs/icom/ic7300.c b/rigs/icom/ic7300.c
index ac867a311..c80297654 100644
--- a/rigs/icom/ic7300.c
+++ b/rigs/icom/ic7300.c
@@ -1989,7 +1989,7 @@ int ic7300_set_parm(RIG *rig, setting_t parm, value_t val)
int ic7300_get_parm(RIG *rig, setting_t parm, value_t *val)
{
- const unsigned char prmbuf[MAXFRAMELEN];
+ const unsigned char prmbuf[MAXFRAMELEN] = "";
unsigned char resbuf[MAXFRAMELEN];
int prm_len = 0, res_len;
int prm_cn = 0, prm_sc = 0;
diff --git a/rigs/icom/ic746.c b/rigs/icom/ic746.c
index 45e398205..6781f9cf4 100644
--- a/rigs/icom/ic746.c
+++ b/rigs/icom/ic746.c
@@ -609,7 +609,7 @@ struct rig_caps ic746pro_caps =
*/
static int ic746pro_set_ext_parm(RIG *rig, hamlib_token_t token, value_t val)
{
- unsigned char epbuf[MAXFRAMELEN], ackbuf[MAXFRAMELEN];
+ unsigned char epbuf[MAXFRAMELEN] = "", ackbuf[MAXFRAMELEN];
int ack_len, ep_len, val_len;
int ep_cmd = C_CTL_MEM;
int ep_sc; /* Subcommand in $1A $05xx */
diff --git a/rigs/icom/icom.c b/rigs/icom/icom.c
index 85b6d1e68..e5ac8b0a2 100644
--- a/rigs/icom/icom.c
+++ b/rigs/icom/icom.c
@@ -3649,7 +3649,6 @@ int icom_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
switch (level)
{
- int i;
case RIG_LEVEL_KEYSPD:
if (val.i < 6)
@@ -4593,8 +4592,6 @@ int icom_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
case RIG_LEVEL_RFPOWER_METER_WATTS:
{
- freq_range_t range_list;
-
// All Icom backends should be in Watts now
if (rig->caps->rfpower_meter_cal.size == 0)
{
@@ -4617,10 +4614,6 @@ int icom_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
val->f /= 10; // power scale is different for 10GHz
}
- rig_get_range(&range_list, STATE(rig)->current_freq, STATE(rig)->current_mode);
- rig_debug(RIG_DEBUG_VERBOSE, "%s: maxpower=%d\n", __func__,
- range_list.high_power);
-
break;
}
@@ -8781,7 +8774,7 @@ int icom_vfo_op(RIG *rig, vfo_t vfo, vfo_op_t op)
*/
int icom_scan(RIG *rig, vfo_t vfo, scan_t scan, int ch)
{
- unsigned char scanbuf[MAXFRAMELEN];
+ unsigned char scanbuf[MAXFRAMELEN] = "";
unsigned char ackbuf[MAXFRAMELEN];
int scan_len, ack_len = sizeof(ackbuf), retval;
int scan_cn, scan_sc;
commit ec4590df8decc4c47a57e6dc78e92871b92c230e
Author: George Baltz N3GB <Geo...@gm...>
Date: Mon Jun 23 12:55:12 2025 -0400
Restore TS-590S/SG RIG_LEVEL_RFPOWER_METER
diff --git a/rigs/kenwood/ts590.c b/rigs/kenwood/ts590.c
index 3cc9cc786..9f2e3c464 100644
--- a/rigs/kenwood/ts590.c
+++ b/rigs/kenwood/ts590.c
@@ -1014,15 +1014,14 @@ static int ts590_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
case RIG_LEVEL_RFPOWER_METER:
case RIG_LEVEL_RFPOWER_METER_WATTS:
{
- static cal_table_t power_meter =
+ int raw_value;
+ const static cal_table_t power_meter =
{
7, { { 0, 0}, { 3, 5}, { 6, 10}, { 8, 15}, {12, 25},
{ 17, 50}, { 30, 100}
}
};
- int raw_value;
-
if (CACHE(rig)->ptt == RIG_PTT_OFF)
{
val->f = 0;
@@ -1038,8 +1037,6 @@ static int ts590_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
sscanf(ackbuf, "SM0%d", &raw_value);
-// val->f = (float) raw_value / 30.0f;
-
if (level == RIG_LEVEL_RFPOWER_METER_WATTS)
{
val->f = roundf(rig_raw2val(raw_value, &power_meter));
@@ -1050,7 +1047,11 @@ static int ts590_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
}
}
-
+ else
+ {
+ val->f = (float) raw_value / 30.0f;
+ }
+
break;
}
commit 4653b8f96c4cf0f489a021e647a7c30d790eee90
Author: George Baltz N3GB <Geo...@gm...>
Date: Mon Jun 23 12:34:59 2025 -0400
More cppcheck "errors" in rigs/kenwood/*
Still mostly cosmetic - currently ignoring syntax cppcheck can't cope with.
diff --git a/rigs/kenwood/k3.c b/rigs/kenwood/k3.c
index 4a9064b9b..f7bc05644 100644
--- a/rigs/kenwood/k3.c
+++ b/rigs/kenwood/k3.c
@@ -2361,10 +2361,10 @@ static int k3_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
return retval;
}
- sscanf(levelbuf + 2, "%d", &val->i);
+ sscanf(levelbuf + 2, "%d", &lvl);
}
- val->f = (float) val->i / 10.0f;
+ val->f = (float) lvl / 10.0f;
break;
default:
diff --git a/rigs/kenwood/tmd710.c b/rigs/kenwood/tmd710.c
index 7130b9076..ab77a24fc 100644
--- a/rigs/kenwood/tmd710.c
+++ b/rigs/kenwood/tmd710.c
@@ -839,7 +839,7 @@ static int tmd710_scan_me(char *buf, tmd710_me *me_struct)
* Push/pull naming is used inside the backend rather than get/set.
* There is one unknown field.
*/
-int tmd710_pull_me(RIG *rig, int ch, tmd710_me *me_struct)
+static int tmd710_pull_me(RIG *rig, int ch, tmd710_me *me_struct)
{
char cmdbuf[8];
char buf[80];
@@ -865,7 +865,7 @@ int tmd710_pull_me(RIG *rig, int ch, tmd710_me *me_struct)
return RIG_OK;
}
-int tmd710_push_me(RIG *rig, const tmd710_me *me_struct)
+static int tmd710_push_me(RIG *rig, const tmd710_me *me_struct)
{
char cmdbuf[80];
char buf[80];
@@ -886,7 +886,7 @@ int tmd710_push_me(RIG *rig, const tmd710_me *me_struct)
return kenwood_transaction(rig, cmdbuf, buf, sizeof(buf));
}
-int tmd710_get_memory_name(RIG *rig, int ch, char *name)
+static int tmd710_get_memory_name(RIG *rig, int ch, char *name)
{
char cmdbuf[8];
char buf[80];
@@ -913,7 +913,7 @@ int tmd710_get_memory_name(RIG *rig, int ch, char *name)
return RIG_OK;
}
-int tmd710_set_memory_name(RIG *rig, int ch, char *name)
+static int tmd710_set_memory_name(RIG *rig, int ch, char *name)
{
char cmdbuf[32];
char buf[80];
@@ -922,7 +922,7 @@ int tmd710_set_memory_name(RIG *rig, int ch, char *name)
rig_debug(RIG_DEBUG_TRACE, "%s: called on channel %d with name %s\n", __func__,
ch, name);
- snprintf(cmdbuf, sizeof(cmdbuf), "MN %03d,%s", ch, name);
+ snprintf(cmdbuf, sizeof(cmdbuf), "MN %03d,%.8s", ch, name);
retval = kenwood_transaction(rig, cmdbuf, buf, sizeof(buf));
if (retval != RIG_OK)
@@ -938,7 +938,7 @@ int tmd710_set_memory_name(RIG *rig, int ch, char *name)
* This function pulls that string from the radio given a VFO.
* Push/pull language is used inside the backend rather than get/set.
*/
-int tmd710_pull_fo(RIG *rig, vfo_t vfo, tmd710_fo *fo_struct)
+static int tmd710_pull_fo(RIG *rig, vfo_t vfo, tmd710_fo *fo_struct)
{
char cmdbuf[8];
char buf[80];
@@ -980,7 +980,7 @@ int tmd710_pull_fo(RIG *rig, vfo_t vfo, tmd710_fo *fo_struct)
return RIG_OK;
}
-int tmd710_push_fo(RIG *rig, vfo_t vfo, tmd710_fo *fo_struct)
+static int tmd710_push_fo(RIG *rig, vfo_t vfo, tmd710_fo *fo_struct)
{
char cmdbuf[80];
char buf[80];
@@ -1023,7 +1023,7 @@ int tmd710_push_fo(RIG *rig, vfo_t vfo, tmd710_fo *fo_struct)
return RIG_OK;
}
-int tmd710_scan_mu(char *buf, tmd710_mu *mu_struct)
+static int tmd710_scan_mu(char *buf, tmd710_mu *mu_struct)
{
int retval;
@@ -1086,7 +1086,7 @@ int tmd710_scan_mu(char *buf, tmd710_mu *mu_struct)
return RIG_OK;
}
-int tmd710_pull_mu(RIG *rig, tmd710_mu *mu_struct)
+static int tmd710_pull_mu(RIG *rig, tmd710_mu *mu_struct)
{
char buf[128];
int retval;
@@ -1110,7 +1110,7 @@ int tmd710_pull_mu(RIG *rig, tmd710_mu *mu_struct)
return RIG_OK;
}
-int tmd710_push_mu(RIG *rig, tmd710_mu *mu_struct)
+static int tmd710_push_mu(RIG *rig, tmd710_mu *mu_struct)
{
char cmdbuf[128];
char buf[128];
@@ -1722,7 +1722,7 @@ static int tmd710_get_ts(RIG *rig, vfo_t vfo, shortfreq_t *ts)
return retval;
}
-int tmd710_get_rptr_shift_tmd710_value(rptr_shift_t shift, int *tmd710_shift)
+static int tmd710_get_rptr_shift_tmd710_value(rptr_shift_t shift, int *tmd710_shift)
{
switch (shift)
{
@@ -1774,7 +1774,7 @@ int tmd710_set_rptr_shift(RIG *rig, vfo_t vfo, rptr_shift_t shift)
return tmd710_push_fo(rig, vfo, &fo_struct);
}
-int tmd710_get_rptr_shift_hamlib_value(int tmd710_shift, rptr_shift_t *shift)
+static int tmd710_get_rptr_shift_hamlib_value(int tmd710_shift, rptr_shift_t *shift)
{
switch (tmd710_shift)
{
diff --git a/rigs/kenwood/ts480.c b/rigs/kenwood/ts480.c
index 17cb9a1c5..0361a6f51 100644
--- a/rigs/kenwood/ts480.c
+++ b/rigs/kenwood/ts480.c
@@ -1252,6 +1252,7 @@ static int qrplabs_open(RIG *rig)
RETURNFUNC(retval);
}
+#if 0
int qdx_set_ptt(RIG *rig, vfo_t vfo, ptt_t ptt)
{
const char *ptt_cmd;
@@ -1278,7 +1279,7 @@ int qdx_set_ptt(RIG *rig, vfo_t vfo, ptt_t ptt)
RETURNFUNC(retval);
}
-
+#endif
static int qrplabs_get_clock(RIG *rig, int *year, int *month, int *day, int *hour,
int *min, int *sec, double *msec, int *utc_offset)
{
diff --git a/rigs/kenwood/ts890s.c b/rigs/kenwood/ts890s.c
index db9aa255a..dfd40a2c0 100644
--- a/rigs/kenwood/ts890s.c
+++ b/rigs/kenwood/ts890s.c
@@ -367,16 +367,16 @@ static int kenwood_ts890_get_level(RIG *rig, vfo_t vfo, setting_t level,
return retval;
}
- sscanf(ackbuf + 2, "%d", &val->i);
+ sscanf(ackbuf + 2, "%d", &levelint);
if (level == RIG_LEVEL_RFPOWER_METER_WATTS)
{
- val->f = roundf(rig_raw2val(val->i, &power_meter));
+ val->f = roundf(rig_raw2val(levelint, &power_meter));
}
else
{
/* Convert reading back to dB (rounded) */
- val->i = (int)floorf(rig_raw2val_float(val->i, table) + 0.5f);
+ val->i = (int)floorf(rig_raw2val_float(levelint, table) + 0.5f);
}
return RIG_OK;
-----------------------------------------------------------------------
Summary of changes:
NEWS | 2 +-
include/hamlib/rig.h | 2 +-
rigs/icom/ic7300.c | 2 +-
rigs/icom/ic746.c | 2 +-
rigs/icom/icom.c | 9 +--------
rigs/kenwood/k3.c | 4 ++--
rigs/kenwood/tmd710.c | 24 ++++++++++++------------
rigs/kenwood/ts480.c | 3 ++-
rigs/kenwood/ts590.c | 13 +++++++------
rigs/kenwood/ts890s.c | 6 +++---
src/serial.c | 2 +-
tests/hamlibmodels.c | 2 +-
tests/rigfreqwalk.c | 4 ++--
tests/rigmatrix.c | 16 ++++++++--------
tests/rotctl.c | 1 -
15 files changed, 43 insertions(+), 49 deletions(-)
hooks/post-receive
--
Hamlib -- Ham radio control libraries
|
