diff --git a/rigs/yaesu/newcat.c b/rigs/yaesu/newcat.c index c2515a760..858b40394 100644 --- a/rigs/yaesu/newcat.c +++ b/rigs/yaesu/newcat.c @@ -7675,8 +7675,14 @@ int newcat_get_rx_bandwidth(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t *width) if (strlen(priv->ret_data) == 7) { int on; - int n = sscanf(priv->ret_data, "SH0%1d%3d", &on, &w); + // do we need to pay attention to the Main/Sub here? + int n = sscanf(priv->ret_data, "SH%*1d%1d%3d", &on, &w); + if (n != 2) + { + err = -RIG_EPROTO; + } +#if 0 // this may apply to another Yaesu rig if (n == 2) { if (!on) { w = 0; } @@ -7685,6 +7691,7 @@ int newcat_get_rx_bandwidth(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t *width) { err = -RIG_EPROTO; } +#endif } else if (strlen(priv->ret_data) == 6) { diff --git a/rigs/yaesu/newcat.h b/rigs/yaesu/newcat.h index bf7b1dcd8..faa00a1b4 100644 --- a/rigs/yaesu/newcat.h +++ b/rigs/yaesu/newcat.h @@ -50,7 +50,7 @@ typedef char ncboolean; /* shared function version */ -#define NEWCAT_VER "20201216" +#define NEWCAT_VER "20201217" /* Hopefully large enough for future use, 128 chars plus '\0' */ #define NEWCAT_DATA_LEN 129