From 9ae7f7535db68e4b811b313efbd6fa541611b4cf Mon Sep 17 00:00:00 2001 From: Mike Black W9MDB Date: Fri, 4 Feb 2022 22:13:22 -0600 Subject: [PATCH] Adjust band_t values to match the Yaesu indexes https://github.com/Hamlib/Hamlib/issues/919 --- include/hamlib/rig.h | 35 ++++++++++++++++++----------------- rigs/yaesu/newcat.c | 4 ++-- 2 files changed, 20 insertions(+), 19 deletions(-) diff --git a/include/hamlib/rig.h b/include/hamlib/rig.h index 9fba0667c..3ee04654f 100644 --- a/include/hamlib/rig.h +++ b/include/hamlib/rig.h @@ -703,23 +703,24 @@ typedef enum { * * \sa rig_set_level() */ -typedef enum { - RIG_BAND_160M = 0, /*!< \c 160M */ - RIG_BAND_80M = (1 << 1), /*!< \c 80M */ - RIG_BAND_60M = (1 << 2), /*!< \c 60M */ - RIG_BAND_40M = (1 << 3), /*!< \c 40M */ - RIG_BAND_30M = (1 << 4), /*!< \c 30M */ - RIG_BAND_20M = (1 << 5), /*!< \c 20M */ - RIG_BAND_17M = (1 << 6), /*!< \c 17M */ - RIG_BAND_15M = (1 << 7), /*!< \c 15M */ - RIG_BAND_12M = (1 << 8), /*!< \c 12M */ - RIG_BAND_10M = (1 << 9), /*!< \c 10M */ - RIG_BAND_6M = (1 << 10), /*!< \c 6M */ - RIG_BAND_144MHZ = (1 << 11), /*!< \c 144MHz */ - RIG_BAND_430MHZ = (1 << 12), /*!< \c 430MHz */ - RIG_BAND_GEN = (1 << 13), /*!< \c 60M */ - RIG_BAND_MW = (1 << 14), /*!< \c Medium Wave */ - RIG_BAND_AIR = (1 << 15), /*!< \c Air band */ +typedef enum { // numbers here reflect the Yaesu values + RIG_BAND_160M = 0, /*!< \c 160M */ + RIG_BAND_80M = 1, /*!< \c 80M */ + RIG_BAND_60M = 2, /*!< \c 60M */ + RIG_BAND_40M = 3, /*!< \c 40M */ + RIG_BAND_30M = 4, /*!< \c 30M */ + RIG_BAND_20M = 5, /*!< \c 20M */ + RIG_BAND_17M = 6, /*!< \c 17M */ + RIG_BAND_15M = 7, /*!< \c 15M */ + RIG_BAND_12M = 8, /*!< \c 12M */ + RIG_BAND_10M = 9, /*!< \c 10M */ + RIG_BAND_6M = 10, /*!< \c 6M */ + RIG_BAND_GEN = 11, /*!< \c 60M */ + RIG_BAND_MW = 12, /*!< \c Medium Wave */ + RIG_BAND_UNUSED = 13, /*!< \c Medium Wave */ + RIG_BAND_AIR = 14, /*!< \c Air band */ + RIG_BAND_144MHZ = 15, /*!< \c 144MHz */ + RIG_BAND_430MHZ = 16, /*!< \c 430MHz */ } hamlib_band_t; diff --git a/rigs/yaesu/newcat.c b/rigs/yaesu/newcat.c index 27ec410d9..f5cd52777 100644 --- a/rigs/yaesu/newcat.c +++ b/rigs/yaesu/newcat.c @@ -3535,11 +3535,11 @@ static int band2rig (hamlib_band_t band) case RIG_BAND_12M: retval = 8;break; case RIG_BAND_10M: retval = 9;break; case RIG_BAND_6M: retval = 10;break; - case RIG_BAND_144MHZ: retval = 15;break; - case RIG_BAND_430MHZ: retval = 16;break; case RIG_BAND_GEN: retval = 11;break; case RIG_BAND_MW: retval = 12;break; case RIG_BAND_AIR: retval = 14;break; + case RIG_BAND_144MHZ: retval = 15;break; + case RIG_BAND_430MHZ: retval = 16;break; default: rig_debug(RIG_DEBUG_ERR, "%s: unknown band index=%d\n", __func__, band); retval = -RIG_EINVAL;