Fixes the default initialization of ranges by defaulting to range_list1.

Another step in migration of rigs to separate model numbers for variations in models
We default to using range_list1 now and eventually there will only be 1 range_list per model
We have enough room in the model numbers now to expand...so for example we will have
5 models for the IC-9700
IC-9700 USA
IC-9700 EUR
IC-9700 ITR
IC-9700 TPE
IC-9700 KOR

src/conf.c

@@ -73,9 +73,14 @@ static const struct confparams frontend_cfg_params[] =
         "0", RIG_CONF_NUMERIC, { .n = { 0, 10, 1 } }
     },
     {
-        TOK_ITU_REGION, "itu_region", "ITU region",
-        "ITU region this rig has been manufactured for (freq. band plan)",
-        "0", RIG_CONF_NUMERIC, { .n = { 1, 3, 1 } }
+        TOK_RANGE_SELECTED, "Selected range list", "Range list#",
+        "The tx/rx range list in use",
+        "0", RIG_CONF_NUMERIC, { .n = { 1, 5, 1 } }
+    },
+    {
+        TOK_RANGE_NAME, "Selected range list", "Range list name",
+        "The tx/rx range list name",
+        "Default", RIG_CONF_STRING
     },
 
     {
@@ -371,7 +376,7 @@ static int frontend_set_conf(RIG *rig, token_t token, const char *val)
 
         break;
 
-    case TOK_ITU_REGION:
+    case TOK_RANGE_SELECTED:
         if (1 != sscanf(val, "%d", &val_i))
         {
             return -RIG_EINVAL;//value format error
@@ -394,23 +399,23 @@ static int frontend_set_conf(RIG *rig, token_t token, const char *val)
             break;
 
         case 3:
-            memcpy(rs->tx_range_list, caps->tx_range_list2,
+            memcpy(rs->tx_range_list, caps->tx_range_list3,
                    sizeof(struct freq_range_list)*FRQRANGESIZ);
-            memcpy(rs->rx_range_list, caps->rx_range_list2,
+            memcpy(rs->rx_range_list, caps->rx_range_list3,
                    sizeof(struct freq_range_list)*FRQRANGESIZ);
             break;
 
         case 4:
-            memcpy(rs->tx_range_list, caps->tx_range_list2,
+            memcpy(rs->tx_range_list, caps->tx_range_list4,
                    sizeof(struct freq_range_list)*FRQRANGESIZ);
-            memcpy(rs->rx_range_list, caps->rx_range_list2,
+            memcpy(rs->rx_range_list, caps->rx_range_list4,
                    sizeof(struct freq_range_list)*FRQRANGESIZ);
             break;
 
         case 5:
-            memcpy(rs->tx_range_list, caps->tx_range_list2,
+            memcpy(rs->tx_range_list, caps->tx_range_list5,
                    sizeof(struct freq_range_list)*FRQRANGESIZ);
-            memcpy(rs->rx_range_list, caps->rx_range_list2,
+            memcpy(rs->rx_range_list, caps->rx_range_list5,
                    sizeof(struct freq_range_list)*FRQRANGESIZ);
             break;
 

src/rig.c

@@ -406,7 +406,15 @@ RIG *HAMLIB_API rig_init(rig_model_t rig_model)
     rs->transceive = RIG_TRN_OFF;
     rs->poll_interval = 500;
     rs->lo_freq = 0;
-
+ 
+    // We are using range_list1 as the default
+    // Eventually we will have separate model number for different rig variations
+    // So range_list1 will become just range_list (per model)
+    // See ic9700.c for a 5-model example
+    memcpy(rs->tx_range_list, caps->tx_range_list1,
+           sizeof(struct freq_range_list)*FRQRANGESIZ);
+    memcpy(rs->rx_range_list, caps->rx_range_list1,
+           sizeof(struct freq_range_list)*FRQRANGESIZ);
 #if 0 // this is no longer applicable -- replace it with something?
 
 // we need to be able to figure out what model radio we have

src/token.h

@@ -98,8 +98,10 @@
 #define TOK_POLL_INTERVAL   TOKEN_FRONTEND(111)
 /** \brief rig: lo frequency of any transverters */
 #define TOK_LO_FREQ         TOKEN_FRONTEND(112)
-/** \brief rig: International Telecommunications Union region no. */
-#define TOK_ITU_REGION  TOKEN_FRONTEND(120)
+/** \brief rig: Range index 1-5 */
+#define TOK_RANGE_SELECTED  TOKEN_FRONTEND(121)
+/** \brief rig: Range Name */
+#define TOK_RANGE_NAME  TOKEN_FRONTEND(122)
 /*
  * rotator specific tokens
  * (strictly, should be documented as rotator_internal)