From 8c5190959540faad301764e49aabb932839dc48d Mon Sep 17 00:00:00 2001 From: Michael Black W9MDB Date: Wed, 7 Oct 2020 12:48:25 -0500 Subject: [PATCH] astyle files --- rigs/kenwood/kenwood.c | 3 ++- rigs/yaesu/newcat.c | 39 +++++++++++++++++++++++++-------------- 2 files changed, 27 insertions(+), 15 deletions(-) diff --git a/rigs/kenwood/kenwood.c b/rigs/kenwood/kenwood.c index 9dc0efa73..343a9bbb7 100644 --- a/rigs/kenwood/kenwood.c +++ b/rigs/kenwood/kenwood.c @@ -2264,7 +2264,8 @@ static int kenwood_get_power_minmax(RIG *rig, int *power_now, int *power_min, // Don't do this if PTT is on...don't want to max out power!! if (rig->state.cache.ptt == RIG_PTT_ON) { - rig_debug(RIG_DEBUG_TRACE, "%s: ptt on so not checking min/max power levels\n", __func__); + rig_debug(RIG_DEBUG_TRACE, "%s: ptt on so not checking min/max power levels\n", + __func__); // return the last values we got *power_now = rig->state.power_now; *power_min = rig->state.power_min; diff --git a/rigs/yaesu/newcat.c b/rigs/yaesu/newcat.c index e232c97f3..98e7e39ae 100644 --- a/rigs/yaesu/newcat.c +++ b/rigs/yaesu/newcat.c @@ -5755,7 +5755,8 @@ int newcat_set_rx_bandwidth(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width) } // end is_ft1200 else if (is_ft101) { - int roof_width; + int roof_width; + switch (mode) { case RIG_MODE_PKTUSB: @@ -5813,13 +5814,16 @@ int newcat_set_rx_bandwidth(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width) else if (width <= 3500) { w = 22; } else { w = 23; } // 4000Hz } // end switch(mode) - // set roofing filter to allow for requested bandwith - // widths of 3 and 5 are optional so won't do them - if (width <= 600) roof_width = 4; - else if (width <= 3000) roof_width = 2; - else roof_width = 1; - snprintf(priv->cmd_str, sizeof(priv->cmd_str), "RF%c%1d%c", main_sub_vfo, roof_width, - cat_term); + + // set roofing filter to allow for requested bandwith + // widths of 3 and 5 are optional so won't do them + if (width <= 600) { roof_width = 4; } + else if (width <= 3000) { roof_width = 2; } + else { roof_width = 1; } + + snprintf(priv->cmd_str, sizeof(priv->cmd_str), "RF%c%1d%c", main_sub_vfo, + roof_width, + cat_term); if (RIG_OK != (err = newcat_set_cmd(rig))) { @@ -5982,17 +5986,24 @@ int newcat_get_rx_bandwidth(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t *width) if (strlen(priv->ret_data) == 7) { if (sscanf(priv->ret_data, "SH%*1d0%3d", &w) != 1) - err = -RIG_EPROTO; + { + err = -RIG_EPROTO; + } } else if (strlen(priv->ret_data) == 6) { - if (sscanf(priv->ret_data, "SH%*1d%3d", &w) != 1) - err = -RIG_EPROTO; + if (sscanf(priv->ret_data, "SH%*1d%3d", &w) != 1) + { + err = -RIG_EPROTO; + } } - else { - rig_debug(RIG_DEBUG_ERR, "%s: unknown SH response='%s'\n", __func__, priv->ret_data); - return -RIG_EPROTO; + else + { + rig_debug(RIG_DEBUG_ERR, "%s: unknown SH response='%s'\n", __func__, + priv->ret_data); + return -RIG_EPROTO; } + if (err != RIG_OK) { rig_debug(RIG_DEBUG_ERR, "%s: unable to parse width from '%s'\n", __func__,