From f81c20eb378c14ab405389d13e48530aebbdce43 Mon Sep 17 00:00:00 2001 From: Mike Black W9MDB Date: Mon, 28 Nov 2022 10:48:17 -0600 Subject: [PATCH] Astyle files --- rigs/yaesu/ft736.c | 4 ++-- simulators/simicom9700.c | 2 +- simulators/simpowersdr.c | 4 ++-- src/rig.c | 2 ++ src/sprintflst.c | 3 ++- tests/rigctl_parse.c | 9 ++++++--- 6 files changed, 15 insertions(+), 9 deletions(-) diff --git a/rigs/yaesu/ft736.c b/rigs/yaesu/ft736.c index 2725f119a..eda6cea0c 100644 --- a/rigs/yaesu/ft736.c +++ b/rigs/yaesu/ft736.c @@ -132,7 +132,7 @@ const struct rig_caps ft736_caps = .max_rit = Hz(0), .max_xit = Hz(0), .max_ifshift = Hz(0), - .targetable_vfo = RIG_TARGETABLE_FREQ|RIG_TARGETABLE_MODE, + .targetable_vfo = RIG_TARGETABLE_FREQ | RIG_TARGETABLE_MODE, .transceive = RIG_TRN_OFF, .bank_qty = 0, .chan_desc_sz = 0, @@ -305,7 +305,7 @@ int ft736_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width) unsigned char md; struct ft736_priv_data *priv = (struct ft736_priv_data *)rig->state.priv; - if (vfo == RIG_VFO_B) return ft736_set_split_mode(rig, vfo, mode, width); + if (vfo == RIG_VFO_B) { return ft736_set_split_mode(rig, vfo, mode, width); } if (priv->split == RIG_SPLIT_ON) { diff --git a/simulators/simicom9700.c b/simulators/simicom9700.c index 291c34e1b..25f8996b2 100644 --- a/simulators/simicom9700.c +++ b/simulators/simicom9700.c @@ -382,7 +382,7 @@ void frameParse(int fd, unsigned char *frame, int len) frame[11] = 0xfd; unsigned char frame2[11]; - + frame2[0] = 0xfe; frame2[1] = 0xfe; frame2[2] = 0x00; // send transceive frame diff --git a/simulators/simpowersdr.c b/simulators/simpowersdr.c index 4c8d4ac49..2f258374a 100644 --- a/simulators/simpowersdr.c +++ b/simulators/simpowersdr.c @@ -274,13 +274,13 @@ int main(int argc, char *argv[]) n = write(fd, buf, strlen(buf)); continue; } - else if (strncmp(buf,"ZZFL;", 5)==0) + else if (strncmp(buf, "ZZFL;", 5) == 0) { SNPRINTF(buf, sizeof(buf), "ZZFL+%04d;", 100); n = write(fd, buf, strlen(buf)); continue; } - else if (strncmp(buf,"ZZFH;", 5)==0) + else if (strncmp(buf, "ZZFH;", 5) == 0) { SNPRINTF(buf, sizeof(buf), "ZZFH+%04d;", 3500); n = write(fd, buf, strlen(buf)); diff --git a/src/rig.c b/src/rig.c index 83170a09a..03e5c7879 100644 --- a/src/rig.c +++ b/src/rig.c @@ -7421,6 +7421,7 @@ HAMLIB_EXPORT(int) rig_send_raw(RIG *rig, const unsigned char *send, rig->caps->model_name); return -RIG_ENAVAIL; } + ELAPSED1; rig_debug(RIG_DEBUG_VERBOSE, "%s: writing %d bytes\n", __func__, send_len); @@ -7483,6 +7484,7 @@ HAMLIB_EXPORT(int) rig_send_raw(RIG *rig, const unsigned char *send, { RETURNFUNC(retval); } + ELAPSED2; RETURNFUNC(nbytes > 0 ? nbytes : -RIG_EPROTO); diff --git a/src/sprintflst.c b/src/sprintflst.c index b3b0070a7..07e3c347c 100644 --- a/src/sprintflst.c +++ b/src/sprintflst.c @@ -919,7 +919,8 @@ int rig_sprintf_agc_levels(RIG *rig, char *str, int lenstr) { if (strlen(str) > 0) { strcat(str, " "); } - sprintf(tmpbuf, "%d=%s", priv_caps->agc_levels[i].icom_level, rig_stragclevel(priv_caps->agc_levels[i].level)); + sprintf(tmpbuf, "%d=%s", priv_caps->agc_levels[i].icom_level, + rig_stragclevel(priv_caps->agc_levels[i].level)); if (strlen(str) + strlen(tmpbuf) < lenstr - 1) { diff --git a/tests/rigctl_parse.c b/tests/rigctl_parse.c index 400ac8d36..b8689f41d 100644 --- a/tests/rigctl_parse.c +++ b/tests/rigctl_parse.c @@ -1737,9 +1737,12 @@ readline_repeat: if (retcode == RIG_OK) { rig_powerstat = stat; } - if (rig_powerstat != RIG_POWER_ON) { rig_debug(RIG_DEBUG_ERR, - "%s: rig_powerstat is not on = %d\n", __func__, - rig_powerstat); } + if (rig_powerstat != RIG_POWER_ON) + { + rig_debug(RIG_DEBUG_ERR, + "%s: rig_powerstat is not on = %d\n", __func__, + rig_powerstat); + } } // Allow only certain commands when the rig is powered off